aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | New CallArgsTaylor Gerring2015-03-303-9/+357
| * | | | Store and retrieve tx context metadata #608Taylor Gerring2015-04-013-8/+51
| * | | | Remove custom MarshalJSON methodsTaylor Gerring2015-04-013-314/+202
| * | | | Make new types StringersTaylor Gerring2015-04-011-4/+11
| * | | | Index is zero-based #607Taylor Gerring2015-03-311-4/+4
| * | | | Update output types to use hexnum or hexdataTaylor Gerring2015-03-312-106/+112
| * | | | Add hexdata and hexnum typesTaylor Gerring2015-03-311-0/+76
* | | | | ethereum.js updateobscuren2015-04-011-0/+0
* | | | | Protocol bumpobscuren2015-04-011-1/+1
* | | | | fixed testsobscuren2015-04-012-3/+3
* | | | | Blocktest fixed, Execution fixedobscuren2015-04-018-43/+77
* | | | | Added gas generator defaultsobscuren2015-04-012-0/+118
* | | | | Merge commit 'ec181b308addc30c04973e9058960d579c84eef5' into developobscuren2015-03-3110-91/+701
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| |
| * | | Squashed 'tests/files/' changes from c6d9629..29da5eaobscuren2015-03-3110-91/+701
* | | | Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into developobscuren2015-03-311-1/+1
|\ \ \ \
| * \ \ \ Merge pull request #606 from tgerring/bootnodeFelix Lange2015-03-311-1/+1
| |\ \ \ \
| | * | | | Update Go bootnode addressTaylor Gerring2015-03-311-1/+1
| |/ / / /
* / / / / Added Code fieldobscuren2015-03-311-2/+6
|/ / / /
* | | | Merge pull request #594 from Gustav-Simonsson/fix_block_header_gas_limit_vali...Jeffrey Wilcke2015-03-311-1/+4
|\ \ \ \ | |_|/ / |/| | |
| * | | Correct gas limit validation according to new algorithmGustav Simonsson2015-03-301-1/+4
|/ / /
* | / General repo cleanupTaylor Gerring2015-03-304-7/+10
| |/ |/|
* | Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into developobscuren2015-03-297-26/+18
|\ \
| * | Add ExtraData field to RPC outputTaylor Gerring2015-03-291-2/+2
| * | Docker rename ethereum to gethTaylor Gerring2015-03-291-2/+2
| * | Remove old go cover locationTaylor Gerring2015-03-291-1/+1
| * | Added Coveralls badgesTaylor Gerring2015-03-291-2/+2
| * | Prefer hex prefixed with 0xTaylor Gerring2015-03-291-2/+2
| * | Report InvalidTypeError as -32602 to JSON RPCTaylor Gerring2015-03-291-1/+1
| * | CleanupTaylor Gerring2015-03-292-15/+7
| * | eth_getStorageAt output hex should begin with 0xTaylor Gerring2015-03-291-1/+1
* | | Merge branch 'ebuchman-fix_ecrecover' into developobscuren2015-03-292-16/+31
|\ \ \ | |/ / |/| |
| * | Cleanup.obscuren2015-03-292-19/+20
| * | Merge branch 'fix_ecrecover' of https://github.com/ebuchman/go-ethereum into ...obscuren2015-03-291-7/+21
|/| |
| * | vm: explicit error checks in ecrecover. closes #505Ethan Buchman2015-03-231-7/+21
* | | Merge branch 'kobigurk-develop' into developTaylor Gerring2015-03-291-1/+2
|\ \ \
| * | | Merge branch 'develop' of https://github.com/kobigurk/go-ethereum into kobigu...Taylor Gerring2015-03-291-1/+2
|/| | |
| * | | eth_getTransactionCount now returns a hex stringKobi Gurkan2015-03-281-2/+2
* | | | Merge pull request #579 from tgerring/rpcargsJeffrey Wilcke2015-03-297-370/+1612
|\ \ \ \
| * | | | Decouple core from rpcTaylor Gerring2015-03-273-62/+34
| * | | | Merge branch 'develop' into rpcargsTaylor Gerring2015-03-2713-143/+301
| |\ \ \ \
| * | | | | BlockFilterArgsTaylor Gerring2015-03-273-62/+319
| * | | | | More explicit formatting for protocol versionTaylor Gerring2015-03-271-3/+3
| * | | | | Test blockHeightFromJsonInvalidTaylor Gerring2015-03-271-0/+9
| * | | | | NewTxArgs accept numbers or strings for value/gas/gaspriceTaylor Gerring2015-03-272-16/+162
| * | | | | tidyTaylor Gerring2015-03-272-9/+15
| * | | | | Merge remote-tracking branch 'origin' into rpcargsTaylor Gerring2015-03-2725-203/+396
| |\ \ \ \ \
| * | | | | | Prefer args as strings not objectsTaylor Gerring2015-03-273-53/+51
| * | | | | | Merge branch 'rpcargs' of github.com:tgerring/go-ethereum into rpcargsTaylor Gerring2015-03-273-7/+7
| |\ \ \ \ \ \
| | * | | | | | Undo xeth changesTaylor Gerring2015-03-274-14/+11
| * | | | | | | Undo XEth changesTaylor Gerring2015-03-272-12/+9
| |/ / / / / /
| * | | | | | WhisperMessageArgsTaylor Gerring2015-03-272-5/+104
| * | | | | | WhisperFilterArgsTaylor Gerring2015-03-273-13/+60
| * | | | | | CompileArgsTaylor Gerring2015-03-272-4/+38
| * | | | | | SubmitWorkArgs testsTaylor Gerring2015-03-271-0/+48
| * | | | | | WhisperIdentityArgsTaylor Gerring2015-03-272-4/+40
| * | | | | | FilterIdArgsTaylor Gerring2015-03-272-4/+37
| * | | | | | FilterStringArgs testsTaylor Gerring2015-03-273-18/+35
| * | | | | | DbHexArgs testsTaylor Gerring2015-03-272-2/+80
| * | | | | | DbArgs testsTaylor Gerring2015-03-271-0/+79
| * | | | | | Accept number or string for BlockFilterArgs limit/offsetTaylor Gerring2015-03-271-14/+26
| * | | | | | Accept number or string for BlockFilterArgs to/fromBlockTaylor Gerring2015-03-272-11/+14
| * | | | | | Sha3ArgsTaylor Gerring2015-03-262-13/+48
| * | | | | | Convert error checks to Expect functionsTaylor Gerring2015-03-261-312/+168
| * | | | | | HashIndexArgsTaylor Gerring2015-03-263-6/+66
| * | | | | | BlockNumIndexArgsTaylor Gerring2015-03-262-4/+62
| * | | | | | GetDataArgsTaylor Gerring2015-03-263-20/+56
| * | | | | | DecodeParamError -> InvalidTypeError for unexpected input typeTaylor Gerring2015-03-262-53/+53
| * | | | | | Add InvalidTypeErrorTaylor Gerring2015-03-262-0/+25
| * | | | | | GetBalanceArgsTaylor Gerring2015-03-263-26/+56
| * | | | | | GetTxCountArgsTaylor Gerring2015-03-263-23/+57
| * | | | | | GetStorageAtArgsTaylor Gerring2015-03-263-27/+74
| * | | | | | improved NewTxArgs testsTaylor Gerring2015-03-262-7/+55
| * | | | | | Add blockHeightFromJson convenience functionTaylor Gerring2015-03-261-2/+10
| * | | | | | improved GetBlockByNumber testsTaylor Gerring2015-03-262-4/+60
| * | | | | | improved GetBlockByHashArgs testsTaylor Gerring2015-03-261-2/+37
| * | | | | | GetStorageArgsTaylor Gerring2015-03-263-21/+56
| * | | | | | NewTxArgsTaylor Gerring2015-03-263-38/+17
| * | | | | | GetBlockByHashArgsTaylor Gerring2015-03-264-9/+12
* | | | | | | Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into developobscuren2015-03-291-1/+1
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge pull request #585 from aperseghin/patch-2Jeffrey Wilcke2015-03-280-0/+0
| |\ \ \ \ \ \ \
| | * | | | | | | Minor fixaperseghin2015-03-271-1/+1
| | | |_|/ / / / | | |/| | | | |
| * | | | | | | Merge pull request #586 from aperseghin/patch-3Jeffrey Wilcke2015-03-280-0/+0
| |\ \ \ \ \ \ \
| | * | | | | | | Update README.mdaperseghin2015-03-271-1/+1
| | |/ / / / / /
| * | | | / / / ethereum -> gethTaylor Gerring2015-03-281-1/+1
| | |_|_|/ / / | |/| | | | |
* | | | | | | Cleanup VM.obscuren2015-03-294-56/+45
* | | | | | | Cleanup VMobscuren2015-03-295-29/+40
|/ / / / / /
* | | | | | PUSH gas fixobscuren2015-03-272-21/+5
* | | | | | Removed commentsobscuren2015-03-271-15/+0
* | | | | | Removed defer/panic. #503obscuren2015-03-274-120/+180
* | | | | | Explicitly check memory's data store. #515obscuren2015-03-271-1/+8
|/ / / / /
* | | | | Etherbase => etherbaseobscuren2015-03-271-1/+1
* | | | | Merge pull request #581 from aperseghin/patch-1Jeffrey Wilcke2015-03-271-6/+6
|\ \ \ \ \
| * | | | | Update README.mdaperseghin2015-03-271-6/+6
| | |/ / / | |/| | |
* | | | | Merge pull request #580 from ethersphere/frontier/cli-keyJeffrey Wilcke2015-03-275-18/+37
|\ \ \ \ \
| * | | | | settable etherbasezelig2015-03-275-18/+37
| |/ / / /
* | | | | Merge pull request #584 from tgerring/issue577Jeffrey Wilcke2015-03-277-61/+56
|\ \ \ \ \
| * | | | | Use ExtraDB for storage. Fixes #577Taylor Gerring2015-03-277-61/+56
| |/ / / /
* | | | | Merge pull request #565 from tgerring/responsetypesJeffrey Wilcke2015-03-272-58/+202
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Update response types + testsTaylor Gerring2015-03-252-58/+202
* | | | | renamed ethereum => gethobscuren2015-03-275-5/+5
* | | | | Merge pull request #550 from ethersphere/frontier/cli-keyJeffrey Wilcke2015-03-2714-183/+308
|\ \ \ \ \
| * | | | | max paranoia mode to UNsupport unencrypted keys entirelyzelig2015-03-273-92/+73
| * | | | | output error message if unlock address is invalid (fixes the wierd "read /pat...zelig2015-03-271-1/+5
| * | | | | unlocking coinbase without knowing addresszelig2015-03-272-17/+10
| * | | | | common: remove WriteFile and ReadAllFile (use ioutil instead)zelig2015-03-278-92/+22
| * | | | | Applying: fix adming js test regression (maybe otto update?)zelig2015-03-271-1/+1
| * | | | | cli test: fix test newJSRE interactive argumentzelig2015-03-271-1/+1
| * | | | | cli: implement ethereum presale wallet import via clizelig2015-03-272-27/+59
| * | | | | cli: help formattingzelig2015-03-272-14/+19
| * | | | | cli: fix liner not closing (spuriously opened) in noninteractive jsrezelig2015-03-272-4/+4
| * | | | | unlocking coinbasezelig2015-03-272-3/+17
| * | | | | blockpool: wrap intermittent status test in a loopzelig2015-03-272-40/+55
| * | | | | import/export accountszelig2015-03-275-37/+188
|/ / / / /
* | | | | bumpobscuren2015-03-271-1/+1
* | | | | Stack limitobscuren2015-03-271-0/+6
* | | | | Fixed minerobscuren2015-03-273-15/+35
* | | | | Merge commit 'a718515b3d43f00497231f981b5ea757b71d55ff' into developobscuren2015-03-261-0/+11
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Squashed 'tests/files/' changes from a7081bc..c6d9629obscuren2015-03-261-0/+11
* | | | | moved helperobscuren2015-03-261-20/+20
* | | | | fixed block filter argsobscuren2015-03-261-1/+1
* | | | | debug logobscuren2015-03-261-1/+1
* | | | | updated web3.js light for consoleobscuren2015-03-262-2/+2
* | | | | updated web3.jsobscuren2015-03-261-0/+0
* | | | | Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into developobscuren2015-03-261-6/+2
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Don't return empty block for "pending" #568Taylor Gerring2015-03-261-6/+2
* | | | | Fixed filter and refactored codeobscuren2015-03-262-24/+29
|/ / / /
* | | | Updated example for new ethereum.jsobscuren2015-03-261-4/+4
* | | | Godep issue?obscuren2015-03-261-1/+1
* | | | Moved output to debugobscuren2015-03-261-1/+1
* | | | Fixed storage. Closes #516obscuren2015-03-262-3/+3
* | | | added tx tests and fixed block testsobscuren2015-03-264-4/+59
* | | | Merge pull request #564 from fjl/rlp-nil-arrayJeffrey Wilcke2015-03-262-8/+28
|\ \ \ \ | |_|/ / |/| | |
| * | | rlp: encode nil array pointers as empty list or stringFelix Lange2015-03-252-8/+28
|/ / /
* | | updated ethashobscuren2015-03-2516-1109/+239
* | | removed big num from ppobscuren2015-03-251-2/+0
* | | Merge pull request #560 from tgerring/xethcleanupJeffrey Wilcke2015-03-256-161/+153
|\ \ \
| * | | Improve protocol version reportingTaylor Gerring2015-03-253-21/+36
| * | | Move version to const and expose via Version()Taylor Gerring2015-03-251-3/+8
| * | | WithState -> withStateTaylor Gerring2015-03-251-2/+3
| * | | DRY up height logicTaylor Gerring2015-03-251-31/+20
| * | | ShuffleTaylor Gerring2015-03-251-5/+6
| * | | Move Frontend interface to separate fileTaylor Gerring2015-03-242-27/+32
| * | | Update internal calls to use CurrentBlock()Taylor Gerring2015-03-241-3/+3
| * | | Don't expose backend directlyTaylor Gerring2015-03-242-9/+20
| * | | Remove redundant fieldsTaylor Gerring2015-03-241-33/+24
| * | | rename eth to backendTaylor Gerring2015-03-242-17/+17
| * | | Backend no longer needed to resolve import cycleTaylor Gerring2015-03-241-30/+4
* | | | Merge pull request #561 from ethersphere/frontier/blockpoolFelix Lange2015-03-253-10/+17
|\ \ \ \
| * | | | header check for testzelig2015-03-252-3/+8
| * | | | bugfix with idle too long triggered after peer switchzelig2015-03-252-8/+10
* | | | | updated ethereum.jsobscuren2015-03-251-0/+0
* | | | | Removed full pathobscuren2015-03-251-1/+1
* | | | | Improved miner recoveryobscuren2015-03-251-22/+16
* | | | | Improved pretty printer for consoleobscuren2015-03-251-8/+21
|/ / / /
* | | | bumpobscuren2015-03-251-2/+2
* | | | fixed testobscuren2015-03-251-3/+13
* | | | Store protocol version in the block db **NOT** extra dbobscuren2015-03-251-2/+2
* | | | back to debug logobscuren2015-03-251-1/+1
* | | | Temp fix for console outputobscuren2015-03-251-2/+4
* | | | updated depsobscuren2015-03-2525-288/+1194
* | | | Merge branch 'master' of github.com-obscure:ethereum/go-ethereum into developobscuren2015-03-250-0/+0
|\ \ \ \
| * \ \ \ Merge branch 'hotfix/0.8.5-2'obscuren2015-02-274-7/+4
| |\ \ \ \
* | \ \ \ \ Merge pull request #559 from Gustav-Simonsson/blocktests_update_ethashJeffrey Wilcke2015-03-2519-1674/+1268
|\ \ \ \ \ \
| * | | | | | Update ethash libGustav Simonsson2015-03-2419-1674/+1268
* | | | | | | Better error reporting in the console. Updated ethereum.jsobscuren2015-03-255-14/+28
| |_|_|/ / / |/| | | | |
* | | | | | fixed testsobscuren2015-03-242-5/+5
* | | | | | Cleaned up changesobscuren2015-03-245-13/+9
* | | | | | Modified according to poc 9 changesobscuren2015-03-245-9/+16
* | | | | | Secure trie shakey / key matchingobscuren2015-03-242-5/+14
* | | | | | Merge commit '24066dca4646c8a376aa5dfbceec0a4b3f872c11' into developobscuren2015-03-2471-6350/+3223
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Squashed 'tests/files/' changes from 8f3fbe6..a7081bcobscuren2015-03-2471-6350/+3223
* | | | | | Copy fixobscuren2015-03-242-3/+10
* | | | | | Event fixes for minerobscuren2015-03-241-5/+3
* | | | | | Updated for PV59obscuren2015-03-243-19/+16
* | | | | | Merge commit '58c6cc8fd7ff8a27004ed62d912e0a61ae1b73bb' into developobscuren2015-03-2439-3403/+5526
|\| | | | | | |/ / / / |/| | | |
| * | | | Squashed 'tests/files/' changes from 559268b..8f3fbe6obscuren2015-03-2439-3403/+5526
* | | | | Added gitter integration for travisobscuren2015-03-241-0/+7
* | | | | Changed minerobscuren2015-03-244-38/+48
* | | | | Added copy functionobscuren2015-03-241-0/+17
* | | | | better block propagationobscuren2015-03-242-4/+4
* | | | | removed legacy codeobscuren2015-03-243-5/+2
* | | | | Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into developobscuren2015-03-241-2/+2
|\ \ \ \ \
| * \ \ \ \ Merge pull request #553 from ethersphere/jsonlogTaylor Gerring2015-03-241-2/+2
| |\ \ \ \ \
| | * | | | | natspec: minor fix in testzelig2015-03-241-2/+2
* | | | | | | Gas validation and clean up of legacy codeobscuren2015-03-241-12/+11
* | | | | | | Decrement depthobscuren2015-03-241-1/+3
|/ / / / / /
* | | | | | Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into developobscuren2015-03-2410-38/+74
|\| | | | |
| * | | | | Merge pull request #552 from ethersphere/jsonlogTaylor Gerring2015-03-244-17/+13
| |\ \ \ \ \
| | * | | | | fix ethtest loggingzelig2015-03-243-12/+11
| | * | | | | fix p2p/testlog_testzelig2015-03-241-5/+2
| * | | | | | Implement RPC net_versionTaylor Gerring2015-03-243-7/+11
| * | | | | | Merge pull request #551 from ethersphere/frontier/eth-version-exportsTaylor Gerring2015-03-241-9/+10
| |\ \ \ \ \ \
| | * | | | | | eth: fix protocol version/network id copied from config to Ethereum fieldzelig2015-03-241-9/+10
| * | | | | | | Add Close() method to EthereumApiTaylor Gerring2015-03-242-0/+5
| * | | | | | | tests + fixesTaylor Gerring2015-03-242-7/+37
| | |/ / / / / | |/| | | | |
* / | | | | | fixed bad unclesobscuren2015-03-244-6/+16
|/ / / / / /
* | | | | | moved state and vm to coreobscuren2015-03-2358-40/+40
* | | | | | moved to errorobscuren2015-03-231-9/+2
* | | | | | Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into developobscuren2015-03-237-24/+78
|\ \ \ \ \ \
| * \ \ \ \ \ Merge pull request #537 from Gustav-Simonsson/blocktests2Jeffrey Wilcke2015-03-235-15/+56
| |\ \ \ \ \ \
| | * | | | | | Correct difficulty calculation to use new difficulty minimumGustav Simonsson2015-03-231-2/+4
| | * | | | | | Fix new types for blocktests and comment out non-working log level setterGustav Simonsson2015-03-232-5/+5
| | * | | | | | gofmtGustav Simonsson2015-03-232-5/+3
| | * | | | | | Add validation of post state accounts to block testsGustav Simonsson2015-03-232-6/+40
| | * | | | | | In blocktest cmd, disable network and add RPC flagGustav Simonsson2015-03-232-5/+12
| * | | | | | | "pending" convention should be -2 instead of 0Taylor Gerring2015-03-232-2/+15
| * | | | | | | Rename blockAge to blockHeightTaylor Gerring2015-03-231-7/+7
| |/ / / / / /
* | | | | | | Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into developobscuren2015-03-234-15/+181
|\| | | | | |
| * | | | | | db_putHex/db_getHex + testsTaylor Gerring2015-03-234-15/+181
| |/ / / / /
* | | | | | Fixed issues with stalled remote minerobscuren2015-03-232-4/+9
* | | | | | logging for possible unclesobscuren2015-03-234-25/+44
* | | | | | added some nil checks for cache (testing specific)obscuren2015-03-231-6/+19
* | | | | | Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into developobscuren2015-03-237-94/+94
|\| | | | |
| * | | | | Merge pull request #548 from tgerring/typescleanupJeffrey Wilcke2015-03-234-10/+10
| |\ \ \ \ \
| | * | | | | Fix Mist types build errorsTaylor Gerring2015-03-224-10/+10
| * | | | | | Move RemoteAgent to miner pkgTaylor Gerring2015-03-232-8/+7
| * | | | | | Rename Agent to RemoteAgentTaylor Gerring2015-03-232-14/+14
| * | | | | | Add DAG seed hash and difficulty to GetWorkTaylor Gerring2015-03-231-5/+6
* | | | | | | finally merged *the missing*obscuren2015-03-233-15/+52
|/ / / / / /
* | | | | | go away!Taylor Gerring2015-03-231-81/+0
* | | | | | Move remote mining agent to XEthTaylor Gerring2015-03-233-9/+93
* | | | | | Consistent var namesTaylor Gerring2015-03-231-60/+60
* | | | | | Always return 3 stringsTaylor Gerring2015-03-231-6/+5
* | | | | | Stub corrected getWork responseTaylor Gerring2015-03-232-4/+9
* | | | | | Rename for filename typoTaylor Gerring2015-03-231-0/+0
* | | | | | Cleanup get/submitWorkTaylor Gerring2015-03-233-12/+54
* | | | | | Merge pull request #547 from tgerring/commoncleanupJeffrey Wilcke2015-03-239-265/+250
|\ \ \ \ \ \
| * | | | | | Remove common.goTaylor Gerring2015-03-221-12/+0
| * | | | | | Move Big* vars to big.goTaylor Gerring2015-03-222-14/+13
| * | | | | | Move MakeName to pathTaylor Gerring2015-03-222-8/+8
| * | | | | | Move OS-specific funcs to path.goTaylor Gerring2015-03-224-98/+91
| * | | | | | Move CurrencyToString to sizeTaylor Gerring2015-03-224-91/+95
| * | | | | | Move ToHex/FromHex into bytesTaylor Gerring2015-03-224-42/+43
| |/ / / / /
* | | | | | Merge pull request #536 from zsfelfoldi/developJeffrey Wilcke2015-03-23144-13116/+4986
|\ \ \ \ \ \
| * | | | | | fixed jsre testzsfelfoldi2015-03-201-1/+1
| * | | | | | using robertkrimen/otto, godeps updatedzsfelfoldi2015-03-20144-13116/+4986
* | | | | | | Merge branch 'ethersphere-jsonlog' into developobscuren2015-03-239-110/+105
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Merge branch 'jsonlog' of https://github.com/ethersphere/go-ethereum into eth...obscuren2015-03-239-110/+105
|/| | | | | |
| * | | | | | fix blockpool test loggerzelig2015-03-221-12/+6
| * | | | | | independent flag for json structured loggingzelig2015-03-228-95/+95
* | | | | | | check for nil ptrsobscuren2015-03-221-2/+2
* | | | | | | Get work / submit work partially implemented.obscuren2015-03-225-8/+101
| |_|/ / / / |/| | | | |
* | | | | | Merge pull request #526 from ethersphere/frontier/blockpoolJeffrey Wilcke2015-03-224-28/+31
|\ \ \ \ \ \
| * | | | | | Idle too long error incorrectly triggered even when peer sending new blockszelig2015-03-224-28/+31
| |/ / / / /
* | | | | | bumpobscuren2015-03-221-1/+1
* | | | | | converted to proper typesobscuren2015-03-221-29/+29
|/ / / / /
* | | | | Merge branch 'conversion' into developobscuren2015-03-22117-2346/+3812
|\ \ \ \ \
| * | | | | Added new ethereum.jsobscuren2015-03-211-1/+1
| * | | | | Merge branch 'develop' into conversionobscuren2015-03-211-3/+3
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'develop' into conversionobscuren2015-03-216-7/+32
| |\ \ \ \ \ \