aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* check and penalise td misreportingzelig2015-03-207-52/+129
* fix missing hexification on IdleTooLong error logzelig2015-03-201-1/+1
* use own total difficulty to limit best peerzelig2015-03-207-26/+87
* peer suspension to disallow reconnect after disconnect on fatal error for se...zelig2015-03-208-44/+125
* fixed ethashobscuren2015-03-202-4/+4
* updated ethashobscuren2015-03-2016-237/+1107
* copy over loopobscuren2015-03-202-14/+4
* Removed more castsobscuren2015-03-205-24/+14
* Merge branch 'develop' into conversionobscuren2015-03-204-1254/+4054
|\
| * Merge commit 'f144a95940a5df0809bb028eef7b337125423602' into developobscuren2015-03-203-1253/+4053
| |\
| | * Squashed 'tests/files/' changes from e558aa4..559268bobscuren2015-03-203-1253/+4053
| * | Merge branch 'rpcfrontier' into developobscuren2015-03-201-1/+1
| |\ \
| | * | moved back to debugobscuren2015-03-191-1/+1
* | | | :-)obscuren2015-03-201-1/+0
* | | | mergeobscuren2015-03-1912-178/+275
|\| | |
| * | | re-enabled json loggingobscuren2015-03-191-2/+0
| * | | Merge branch 'rpcfrontier' into developobscuren2015-03-1912-242/+341
| |\| |
| | * | fixed chain event. Closes #529obscuren2015-03-198-38/+58
| | * | Removed frontier in version :-(obscuren2015-03-191-1/+1
| | * | Merge branch 'develop' into rpcfrontierobscuren2015-03-19409-1191/+32227
| | |\ \
| | * | | Validate NewTx From field is not blankTaylor Gerring2015-03-193-0/+40
| | * | | Merge branch 'rpcutil' into rpcfrontierTaylor Gerring2015-03-194-137/+178
| | |\ \ \
| | | * | | TestsTaylor Gerring2015-03-191-1/+51
| | | * | | BlockNumber as int fixTaylor Gerring2015-03-191-2/+2
| | | * | | Remove UnmarshalRawMessagesTaylor Gerring2015-03-192-124/+125
| | | * | | Remove i2hexTaylor Gerring2015-03-182-7/+2
| | | * | | Remove RpcServerTaylor Gerring2015-03-181-5/+0
| * | | | | Removed frontier from version :-(obscuren2015-03-191-1/+1
| | |_|/ / | |/| | |
* | | | | Merge remote-tracking branch 'ethereum/conversion' into conversionFelix Lange2015-03-19408-1200/+32257
|\ \ \ \ \
| * | | | | Merge branch 'develop' into conversionobscuren2015-03-191-10/+18
| |\| | | |
| | * | | | Removed uint castsobscuren2015-03-191-10/+18
| * | | | | improved test outputobscuren2015-03-191-24/+45
| * | | | | Merge branch 'develop' into conversionobscuren2015-03-19408-1182/+32210
| |\| | | |
| | * | | | fixed testsobscuren2015-03-194-20/+16
| | * | | | Fixed mkdnode & added some testsobscuren2015-03-198-16/+55
| | * | | | Merge commit '85fa3790ac9f67232f0e31e7f861c66ef0e0047e' into developobscuren2015-03-19399-1150/+32143
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | | * | | Squashed 'tests/files/' changes from 641ebaa..e558aa4obscuren2015-03-19399-1150/+32143
* | | | | | eth, whisper: adapt for RLP encoder switch in package p2pFelix Lange2015-03-195-175/+124
* | | | | | p2p: interrupt MsgPipe payload read/writeFelix Lange2015-03-191-3/+6
* | | | | | p2p: log disconnect requestsFelix Lange2015-03-191-0/+1
* | | | | | p2p: use package rlp to encode messagesFelix Lange2015-03-198-68/+64
* | | | | | p2p: export ExpectMsg (for eth protocol testing)Felix Lange2015-03-192-32/+32
|/ / / / /
* | | | | Merge remote-tracking branch 'ethereum/conversion' into conversionFelix Lange2015-03-1919-244/+304
|\ \ \ \ \
| * \ \ \ \ Merge branch 'rpcfrontier' into conversionobscuren2015-03-192-67/+65
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | Merge branch 'develop' into rpcfrontierobscuren2015-03-198-106/+126
| | |\| | | | | | |_|/ | | |/| |
| | * | | merge developTaylor Gerring2015-03-188-111/+106
| | |\ \ \
| | * | | | Remove JsonWrapperTaylor Gerring2015-03-182-22/+19
| | * | | | Support JSON RPC batch requestsTaylor Gerring2015-03-182-52/+53
| | |\ \ \ \
| | | * | | | Add JSON RPC batch supportTaylor Gerring2015-03-182-52/+53
| * | | | | | Merge branch 'develop' into conversionobscuren2015-03-197-97/+97
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | * | | | | Merge branch 'ethersphere-frontier/cli-private-network' into developobscuren2015-03-197-102/+102
| | |\ \ \ \ \
| | | * | | | | added frontier to versionobscuren2015-03-191-1/+1
| | | * | | | | Merge branch 'frontier/cli-private-network' of https://github.com/ethersphere...obscuren2015-03-197-101/+101
| | |/| | | | |
| | | * | | | | fix eth testszelig2015-03-181-3/+3
| | | * | | | | private network supportzelig2015-03-186-74/+98
| | | * | | | | eth/backend: remove spurious and incorrent PeerInfo()zelig2015-03-181-5/+4
| | | * | | | | eth: remove disused peer_util.gozelig2015-03-181-23/+0
| | | | |_|/ / | | | |/| | |
| * | | | | | mergeobscuren2015-03-1910-78/+92
| |\| | | | |
| | * | | | | Merge pull request #523 from fjl/docker-fastTaylor Gerring2015-03-191-4/+3
| | |\ \ \ \ \
| | | * | | | | Dockerfile: use fastâ„¢ build stepsFelix Lange2015-03-171-4/+3
| | | |/ / / /
| | * | | | | Merge pull request #522 from fjl/makedagFelix Lange2015-03-181-0/+21
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | cmd/ethereum: add makedag command for testingFelix Lange2015-03-171-0/+21
| | |/ / / /
| | * | | | Merge pull request #498 from maran/feature/drytoHexJeffrey Wilcke2015-03-188-111/+106
| | |\ \ \ \
| | | * | | | DRY up the use of toHex in the project and move it to commonMaran2015-03-168-113/+108
| * | | | | | Merge branch 'conversion' of github.com-obscure:ethereum/go-ethereum into con...obscuren2015-03-1815-114/+216
| |\ \ \ \ \ \
| * | | | | | | prep template for fixed size hashesobscuren2015-03-182-2/+50
* | | | | | | | rlp: fix encoding of one element strings and byte slicesFelix Lange2015-03-192-7/+20
| |/ / / / / / |/| | | | | |
* | | | | | | cmd/ethereum, cmd/utils: partial fix for chain importFelix Lange2015-03-182-8/+4
* | | | | | | Merge remote-tracking branch 'ethereum/conversion' into conversionFelix Lange2015-03-1840-660/+1366
|\| | | | | |
| * | | | | | conversions. -compilable-obscuren2015-03-1812-130/+139
| * | | | | | conversionsobscuren2015-03-184-27/+30
| * | | | | | Added Hex methodsobscuren2015-03-181-0/+2
| * | | | | | Merge branch 'develop' into conversionobscuren2015-03-1829-505/+1197
| |\| | | | |
| | * | | | | Merge branch 'rpcfrontier' into developobscuren2015-03-186-42/+179
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | |
| | | * | | | Merge branch 'develop' into rpcfrontierobscuren2015-03-18144-1423/+13716
| | | |\ \ \ \ | | | |/ / / / | | |/| | / / | | | | |/ / | | | |/| |
| | * | | | bumpobscuren2015-03-181-1/+1
| | * | | | Merge pull request #485 from ethersphere/frontier/nodeadmin.jsFelix Lange2015-03-1823-462/+1017
| | |\ \ \ \
| | | * | | | remove long-running mining test, ethutil -> commonzelig2015-03-162-46/+8
| | | * | | | Merge branch 'frontier/js' into frontier/nodeadmin.jszelig2015-03-16116-619/+607
| | | |\ \ \ \
| | | | * | | | we do not use the name Frontier Consolezelig2015-03-161-4/+4
| | | | * | | | ethutil -> commonzelig2015-03-162-5/+5
| | | | * | | | Merge remote-tracking branch 'upstream/develop' into frontier/jszelig2015-03-16122-727/+611
| | | | |\ \ \ \ | | | | | | |/ / | | | | | |/| |
| | | * | | | | Merge remote-tracking branch 'upstream/develop' into frontier/nodeadmin.jszelig2015-03-169-116/+12
| | | |\ \ \ \ \
| | | * \ \ \ \ \ Merge branch 'frontier/js' into frontier/nodeadmin.jszelig2015-03-151-0/+89
| | | |\ \ \ \ \ \ | | | | | |/ / / / | | | | |/| | | |
| | | | * | | | | menubar back to mist main.qmlzelig2015-03-151-0/+89
| | | * | | | | | Merge branch 'frontier/js' into frontier/nodeadmin.jszelig2015-03-151-21/+20
| | | |\| | | | |
| | | | * | | | | jsre: remove assetpath using GOPATH from testzelig2015-03-151-21/+20
| | | * | | | | | node admin interface for Frontier Console, see spec https://github.com/ethere...zelig2015-03-153-0/+550
| | | * | | | | | eth:zelig2015-03-151-3/+65
| | | * | | | | | p2p: server>discover table Self=Node exportedzelig2015-03-152-8/+12
| | | |/ / / / /
| | | * | | | | CLI:zelig2015-03-153-130/+92
| | | * | | | | rpczelig2015-03-153-13/+56
| | | * | | | | remove jsre from mistzelig2015-03-154-193/+63
| | | * | | | | jsre:zelig2015-03-158-202/+216
| | | | | | * | Comment out whisper remove identity stubsTaylor Gerring2015-03-173-21/+21
| | | | | | * | More empty param testsTaylor Gerring2015-03-172-0/+55
| | | | | | * | RPC empty args testsTaylor Gerring2015-03-171-0/+47
| | | | | | * | Return error when filter params are not stringsTaylor Gerring2015-03-171-14/+20
| | | | | | * | Initial support to remove Whisper identities per #491Taylor Gerring2015-03-173-2/+26
| | | | | | * | Merge branch 'develop' into rpcfrontierTaylor Gerring2015-03-172-22/+4
| | | | | | |\ \ | | | | | | |/ / | | | | | |/| |
| | | | | | * | Allow latest/pending in filter optionsTaylor Gerring2015-03-162-40/+45
* | | | | | | | core: fix testsFelix Lange2015-03-185-19/+13
* | | | | | | | core: use package rlp to encode blocksFelix Lange2015-03-182-30/+34
* | | | | | | | core/types: use package rlp instead of common.DecodeFelix Lange2015-03-184-60/+155
* | | | | | | | rlp: add DecodeBytesFelix Lange2015-03-181-0/+7
* | | | | | | | rlp: don't panic for nil *big.IntFelix Lange2015-03-182-1/+7
|/ / / / / / /
* | | | | | | Fixed tests and bloomobscuren2015-03-183-19/+35
* | | | | | | bloomobscuren2015-03-173-14/+20
* | | | | | | Fixed VM & Tests w/ conversionobscuren2015-03-177-22/+30
* | | | | | | Merge branch 'develop' into conversionobscuren2015-03-17124-989/+12704
|\| | | | | |
| * | | | | | Merge commit 'dffaa678f966f87dcd011671a16b554b29a37549' into developobscuren2015-03-17121-960/+12698
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | / | | | |_|_|/ | | |/| | |
| | * | | | Squashed 'tests/files/' changes from 0749546..641ebaaobscuren2015-03-17121-960/+12698
| * | | | | removed compileobscuren2015-03-162-22/+4
| | |_|_|/ | |/| | |
| * | | | tmpobscuren2015-03-161-2/+2
* | | | | fixed toobscuren2015-03-172-50/+65
* | | | | core: actually convert transaction poolFelix Lange2015-03-173-17/+19
* | | | | Merge remote-tracking branch 'ethereum/conversion' into conversionFelix Lange2015-03-1711-72/+88
|\ \ \ \ \
| * | | | | converted vmobscuren2015-03-1711-72/+88
* | | | | | pow/ezp: use common.HashFelix Lange2015-03-171-7/+4
* | | | | | core: adapt Message for new Transaction.From signatureFelix Lange2015-03-172-3/+5
* | | | | | core: convert transaction pool to common.{Address,Hash}Felix Lange2015-03-171-33/+21
* | | | | | core/types: don't use Address zero value for invalid addressesFelix Lange2015-03-172-27/+37
* | | | | | core/types: fix Transaction.Hash and add support for encoding with package rlpFelix Lange2015-03-172-6/+75
* | | | | | crypto: fix Sha3Hash and add a test for itFelix Lange2015-03-172-2/+8
|/ / / / /
* | | | | converted chain managerobscuren2015-03-177-57/+63
* | | | | updated vm envobscuren2015-03-173-21/+23
* | | | | updated blockpoolobscuren2015-03-1711-106/+151
* | | | | Moved gasobscuren2015-03-173-66/+65
* | | | | Merge branch 'conversion' of github.com-obscure:ethereum/go-ethereum into con...obscuren2015-03-173-69/+36
|\ \ \ \ \
| * | | | | core/types: use common.{Hash,Address} in for transactionsFelix Lange2015-03-172-68/+26
| * | | | | Merge branch 'conversion' of https://github.com/ethereum/go-ethereumFelix Lange2015-03-176-37/+75
| |\ \ \ \ \
| * | | | | | crypto: add Sha3HashFelix Lange2015-03-171-1/+10
* | | | | | | converted vmobscuren2015-03-176-58/+75
| |/ / / / / |/| | | | |
* | | | | | block conversionobscuren2015-03-176-37/+75
|/ / / / /
* | | | | conversion stateobscuren2015-03-176-36/+40
* | | | | Getters shouldn't need to be pointer receiverobscuren2015-03-161-8/+7
* | | | | undoobscuren2015-03-165-90/+68
* | | | | compilable trie (tests fail)obscuren2015-03-166-71/+90
* | | | | Added functions to Hash & Addressobscuren2015-03-161-1/+37
* | | | | Added ToString methodsobscuren2015-03-161-3/+6
* | | | | new type + additional methodsobscuren2015-03-167-62/+107
|/ / / /
* | | / Moved ethutil => commonobscuren2015-03-16116-604/+610
| |_|/ |/| |
* | | updated godep ethashobscuren2015-03-162-4/+6
* | | moved to detailobscuren2015-03-161-1/+1
* | | cleaning up unused codeobscuren2015-03-155-108/+0
* | | Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into developobscuren2015-03-151-1/+1
|\ \ \
| * | | Linux build linksobscuren2015-03-151-3/+5
| | |/ | |/|
* / | Linux build linksobscuren2015-03-151-3/+5
|/ /
* | removed seed hashobscuren2015-03-151-1/+1
* | Merge branch 'fjl-block-tests' into developobscuren2015-03-157-20/+346
|\ \
| * | mergeobscuren2015-03-157-20/+346
|/| |
| * | cmd/ethereum: add blocktest commandFelix Lange2015-03-142-0/+67
| * | eth: add ResetWithGenesisBlockFelix Lange2015-03-141-4/+11
| * | eth: add hook for database creationFelix Lange2015-03-141-2/+10
| * | cmd/utils: GetEthereum -> MakeEthConfigFelix Lange2015-03-143-12/+16
| * | tests: add helper functions for block testsFelix Lange2015-03-141-0/+240
| * | core/types: make Block.{ParentHash,SeedHash,MixDigest} []byteFelix Lange2015-03-141-3/+3
* | | Increased filter ticker time to 5 minutesobscuren2015-03-151-2/+2
* | | Updated ethashobscuren2015-03-1430-597/+1254
* | | POW fixesobscuren2015-03-144-12/+1
* | | typoobscuren2015-03-141-1/+1
* | | Merge branch 'rpcfrontier' into developobscuren2015-03-141-1/+7
|\ \ \
| * | | Return null coinbase when accounts not createdTaylor Gerring2015-03-141-1/+7
* | | | Improved errors. Closes #475obscuren2015-03-142-7/+5
* | | | Merge pull request #481 from maran/feature/fromHexDryJeffrey Wilcke2015-03-1411-91/+76
|\ \ \ \
| * | | | Support for addresses with or without 0x. Fixes #472Maran2015-03-141-1/+1
| * | | | DRY up the use of fromHex and put it in ethutilMaran2015-03-1410-90/+75
|/ / / /
* | | | GetBlockByNumber now properly looks for a number in the databaseobscuren2015-03-141-28/+33
* | | | more tests for remote updateobscuren2015-03-141-0/+8
* | | | Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into developobscuren2015-03-142-3529/+13
|\ \ \ \
| * \ \ \ Merge pull request #467 from ethersphere/frontier/natspecJeffrey Wilcke2015-03-132-3529/+13
| |\ \ \ \
| | * | | | include new minified natspec with RE fix; fix test for the improved error mes...zelig2015-03-122-3529/+13
| | | |/ / | | |/| |
* | | | | Return proper errorobscuren2015-03-144-1/+7
* | | | | Make remote dominantobscuren2015-03-142-7/+48
|/ / / /
* | | | Merge branch 'rpcfrontier' into developobscuren2015-03-137-119/+201
|\ \ \ \ | | |/ / | |/| |
| * | | Rename db_put db_getTaylor Gerring2015-03-131-2/+4
| * | | Consolidate error type switchTaylor Gerring2015-03-131-14/+2
| * | | Fix eth_newBlockFilterTaylor Gerring2015-03-132-6/+15
| * | | Add web3_clientVersionTaylor Gerring2015-03-133-7/+11
| * | | Convert to proper errorsTaylor Gerring2015-03-135-104/+183
* | | | Implemented managed stateobscuren2015-03-134-24/+90
* | | | Implemented a manage state for keeping track of noncesobscuren2015-03-133-6/+63
* | | | Bump protocol version 58obscuren2015-03-131-1/+1
* | | | Increased genesis gas & gas floor limit to 3141592obscuren2015-03-132-4/+3
* | | | Changed context and ADDMOD, MULMODobscuren2015-03-136-24/+44
* | | | more obvious failure for ethtestobscuren2015-03-134-10/+9
* | | | Merge commit '6051345bc9ab8ccf74a49c43342771e0c2cba588' into developobscuren2015-03-1314-0/+1003
|\ \ \ \ | | |_|/ | |/| |
| * | | Squashed 'tests/files/' changes from d6c987f..0749546obscuren2015-03-1314-0/+1003
* | | | Merge branch 'rpcfrontier' into developobscuren2015-03-132-4/+5
|\ \ \ \ | | |/ / | |/| |
| * | | Fix arg names in testsTaylor Gerring2015-03-131-3/+3
| * | | #469Taylor Gerring2015-03-131-1/+2
* | | | Removed some of that gas pre pay magicobscuren2015-03-136-56/+53
* | | | Merge commit '3ff7a627d1921be0aeacdd8eb2853ba4537487eb' into developobscuren2015-03-131-0/+71
|\ \ \ \ | | |/ / | |/| |
| * | | Squashed 'tests/files/' changes from 9e19ff9..d6c987fobscuren2015-03-131-0/+71
* | | | run all testobscuren2015-03-131-6/+0
* | | | fixed ethtestobscuren2015-03-134-13/+21
* | | | Merge commit '412e8b0e377bd89fc8fc858bd09c89deee805c1e' into developobscuren2015-03-1316-3/+932
|\| | |
| * | | Squashed 'tests/files/' changes from dbdd0f8..9e19ff9obscuren2015-03-1316-3/+932
* | | | Return 1 on failobscuren2015-03-131-0/+5
* | | | Changed to big.Int.Notobscuren2015-03-131-10/+7
| |/ / |/| |
* | | Update path to web3 libraryTaylor Gerring2015-03-121-1/+1
* | | Update ethereum.jsTaylor Gerring2015-03-1245-6328/+3
* | | Merge branch 'rpcfrontier' of github.com-obscure:ethereum/go-ethereum into rp...obscuren2015-03-120-0/+0
|\ \ \
| * \ \ Merge branch 'develop' into rpcfrontierTaylor Gerring2015-03-1228-462/+2568356
| |\ \ \
* | | | | Get transaction implementedobscuren2015-03-123-10/+27
* | | | | Merge branch 'develop' into rpcfrontierobscuren2015-03-1233-475/+2568387
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into developobscuren2015-03-123-11/+9
| |\| | |
| | * | | Merge pull request #460 from tgerring/ethutilFelix Lange2015-03-123-11/+9
| | |\ \ \ | | | |_|/ | | |/| |
| | | * | Move MakeName to ethutilTaylor Gerring2015-03-123-11/+9
| * | | | Add additional extra database for non-protocol related dataobscuren2015-03-125-13/+31
| |/ / /
| * | | updated rnd vm test => state testobscuren2015-03-122-30/+91
| * | | Merge commit '92c6150199395eea6c9893b631cc990e3ff72a33' into developobscuren2015-03-1223-421/+2568256
| |\ \ \ | | | |/ | | |/|
| | * | Squashed 'tests/files/' changes from e390be4..dbdd0f8obscuren2015-03-1223-421/+2568256
* | | | Should on empty params #466Taylor Gerring2015-03-122-1/+46
* | | | Output filter ID as hexTaylor Gerring2015-03-121-1/+1
* | | | Check for existance of key before deleteTaylor Gerring2015-03-121-1/+4
* | | | Merge branch 'develop' into rpcfrontierobscuren2015-03-129-100/+80
|\| | |
| * | | Changed V to byte. Closes #456obscuren2015-03-121-4/+4
| * | | Merge pull request #462 from fjl/miner-coinbaseJeffrey Wilcke2015-03-128-96/+76
| |\ \ \
| | * | | cmd/ethereum: remove extra check for 'no accounts' errorFelix Lange2015-03-121-9/+2
| | * | | miner: provide coinbase when starting the minerFelix Lange2015-03-128-87/+74
| |/ / /
* | | | shh_uninstallFilterTaylor Gerring2015-03-121-1/+11
* | | | block&index args unmarshal plus testTaylor Gerring2015-03-122-0/+96
|/ / /
* | / Comment out broken test (return type does not exist)Taylor Gerring2015-03-121-4/+5
| |/ |/|
* | Merge branch 'fjl-unencrypted-keys' into developobscuren2015-03-122-16/+29
|\ \
| * | mergeobscuren2015-03-122-16/+29
|/| |
| * | cmd/ethereum: add a flag to switch to unencrytped keystoreFelix Lange2015-03-112-14/+28
* | | Merge branch 'rpcfrontier' into developobscuren2015-03-1219-1881/+3180
|\ \ \
| * | | Lowered default gas price and increased default gas limitobscuren2015-03-123-10/+17
| * | | Merge branch 'rpcfrontier' of github.com-obscure:ethereum/go-ethereum into rp...obscuren2015-03-124-15/+56
| |\ \ \
| | * | | Rename Topic to TopicsTaylor Gerring2015-03-113-7/+7
| | * | | Get UnclesTaylor Gerring2015-03-111-1/+36
| | * | | BlockHash must be a stringTaylor Gerring2015-03-111-1/+6
| | * | | TxIndex -> IndexTaylor Gerring2015-03-113-6/+7
| * | | | Default block number changesobscuren2015-03-122-45/+27
| * | | | Changed logging to use internal loggerobscuren2015-03-111-4/+4
| * | | | Improved error reporting and removed commented codeobscuren2015-03-112-43/+7
| * | | | Reverted globalobscuren2015-03-112-8/+3
| * | | | Use the state to up the balance of the coinbaseobscuren2015-03-111-2/+6
| |/ / /
| * | | Merge branch 'rpcfrontier' of github.com:ethereum/go-ethereum into rpcfrontierTaylor Gerring2015-03-1145-1566/+848
| |\ \ \
| | * | | Merge branch 'develop' into rpcfrontierobscuren2015-03-111-6/+3
| | |\| |
| | * | | Merge branch 'rpcfrontier' of github.com-obscure:ethereum/go-ethereum into rp...obscuren2015-03-114-34/+64
| | |\ \ \
| | * \ \ \ Merge branch 'develop' into rpcfrontierobscuren2015-03-1142-1558/+841
| | |\ \ \ \
| | * | | | | fallbackobscuren2015-03-113-2/+4
| * | | | | | Get transaction via block & indexTaylor Gerring2015-03-112-0/+37
| * | | | | | Nil check blockTaylor Gerring2015-03-111-0/+4
| | |_|/ / / | |/| | | |
| * | | | | Output hex should be prepended with 0xTaylor Gerring2015-03-113-34/+36
| * | | | | Left-pad odd length hex inputs and testsTaylor Gerring2015-03-112-0/+28
| |/ / / /
| * | | | id to hexobscuren2015-03-111-1/+1
| * | | | Merge branch 'rpcfrontier' of github.com-obscure:ethereum/go-ethereum into rp...obscuren2015-03-115-11/+318
| |\ \ \ \