aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #535 from maran/fixReadmeLinkJeffrey Wilcke2015-03-221-1/+1
|\
| * Fix link to build instructions in the readmeMaran2015-03-201-1/+1
* | Merge branch 'rpcfrontier' into developobscuren2015-03-211-3/+3
|\ \
| * | Rename topic to topics #544Taylor Gerring2015-03-211-3/+3
* | | Merge branch 'rpcfrontier' into developobscuren2015-03-2111-729/+630
|\| |
| * | Merge branch 'rpcxeth' into rpcfrontierTaylor Gerring2015-03-207-668/+555
| |\ \
| | * | Add xethAtStateNum convenience methodTaylor Gerring2015-03-201-6/+10
| | * | Move Account register to xethTaylor Gerring2015-03-202-46/+48
| | * | inline GetStorageAtTaylor Gerring2015-03-201-23/+8
| | * | Make prettyTaylor Gerring2015-03-201-12/+14
| | * | inline TransactTaylor Gerring2015-03-201-14/+10
| | * | Move transact gas check to XEthTaylor Gerring2015-03-202-14/+14
| | * | inline CallTaylor Gerring2015-03-201-11/+7
| | * | inline GetBlockByNumberTaylor Gerring2015-03-201-20/+13
| | * | inline GetBlockByHashTaylor Gerring2015-03-201-31/+20
| | * | Reorg for clarityTaylor Gerring2015-03-202-59/+59
| | * | Move gas defaults to XEthTaylor Gerring2015-03-202-15/+8
| | * | Rename FilterOptions to BlockFilterArgsTaylor Gerring2015-03-203-15/+15
| | * | Remove unnecessary event muxTaylor Gerring2015-03-201-3/+1
| | * | Move stateAt func to XEthTaylor Gerring2015-03-202-30/+24
| | * | Rename for clarityTaylor Gerring2015-03-203-21/+21
| | * | inline MessagesChangedTaylor Gerring2015-03-201-6/+1
| | * | inline UninstallWhisperFilterTaylor Gerring2015-03-201-7/+1
| | * | inline NewWhisperFilterTaylor Gerring2015-03-201-11/+6
| | * | inline AllLogsTaylor Gerring2015-03-201-8/+2
| | * | inline LogsTaylor Gerring2015-03-201-7/+1
| | * | inline FilterChangedTaylor Gerring2015-03-201-6/+1
| | * | inline NewFilterStringTaylor Gerring2015-03-201-11/+6
| | * | inline UninstallFilterTaylor Gerring2015-03-201-7/+1
| | * | inline NewFilterTaylor Gerring2015-03-201-9/+4
| | * | Merge branch 'rpcinline' into rpcxethTaylor Gerring2015-03-201-156/+69
| | |\ \
| | | * | inline WhisperPostTaylor Gerring2015-03-201-11/+7
| | | * | inline GetBlockTransactionCountByHashTaylor Gerring2015-03-201-11/+3
| | | * | inline GetBlockTransactionCountByNumberTaylor Gerring2015-03-201-11/+3
| | | * | inline GetBlockUncleCountByHashTaylor Gerring2015-03-201-11/+3
| | | * | inline GetBlockUncleCountByNumberTaylor Gerring2015-03-201-11/+3
| | | * | fixesTaylor Gerring2015-03-201-2/+2
| | | * | inline UninstallWhisperFilterTaylor Gerring2015-03-201-7/+6
| | | * | inline WhisperMessagesTaylor Gerring2015-03-201-6/+1
| | | * | inline GetTransactionByHashTaylor Gerring2015-03-201-9/+4
| | | * | inline RemoveWhisperIdentityTaylor Gerring2015-03-201-6/+1
| | | * | inline NewWhisperIdentityTaylor Gerring2015-03-201-6/+2
| | | * | inline DbGetTaylor Gerring2015-03-201-11/+6
| | | * | inline DbPutTaylor Gerring2015-03-201-11/+7
| | | * | inline GetCompilersTaylor Gerring2015-03-201-7/+2
| | | * | inline GetDataTaylor Gerring2015-03-201-9/+4
| | | * | inline GetTxCountAtTaylor Gerring2015-03-201-10/+7
| | | * | inline GetStorageTaylor Gerring2015-03-201-9/+6
| | | * | inline GetBalanceTaylor Gerring2015-03-201-9/+6
| | | * | inline HasWhisperIdentityTaylor Gerring2015-03-201-6/+1
| | | * | Inline getStateWithNumTaylor Gerring2015-03-201-8/+4
| | * | | Reorg filter logic to XEthTaylor Gerring2015-03-206-203/+273
| * | | | Merge branch 'rpcfrontier' of github.com-obscure:ethereum/go-ethereum into rp...obscuren2015-03-205-97/+111
| |\ \ \ \
| | * \ \ \ Merge branch 'rpcfrontier' of github.com:ethereum/go-ethereum into rpcfrontierTaylor Gerring2015-03-205-1256/+4054
| | |\ \ \ \
| | * | | | | Add tests for errorsTaylor Gerring2015-03-201-0/+41
| | | |/ / / | | |/| | |
| | * | | | Merge branch 'rpcutil' into rpcfrontierTaylor Gerring2015-03-204-97/+70
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | | * | | Make send internalTaylor Gerring2015-03-201-6/+6
| | | * | | Remove utilTaylor Gerring2015-03-202-57/+33
| | | * | | Remove extra loggerTaylor Gerring2015-03-202-5/+2
| | | * | | Move Log to LogResTaylor Gerring2015-03-203-29/+29
* | | | | | Add json LogSystem #538Taylor Gerring2015-03-213-2/+27
| |_|_|_|/ |/| | | |
* | | | | %#x => %xobscuren2015-03-203-4/+4
* | | | | testobscuren2015-03-201-1/+1
|/ / / /
* | | / Listen to tx pre event and trigger 'pending'obscuren2015-03-203-16/+20
| |_|/ |/| |
* | | 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
| | |/ / | |/| |
* | | | 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
| * | | | 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
* | | | | | | Removed frontier from version :-(obscuren2015-03-191-1/+1
| |_|_|_|/ / |/| | | | |
* | | | | | Removed uint castsobscuren2015-03-191-10/+18
* | | | | | 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
* | | | | 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
| | |_|_|/ | |/| | |
* | | | | 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 '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
* | | | | | Merge commit 'dffaa678f966f87dcd011671a16b554b29a37549' into developobscuren2015-03-17121-960/+12698
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | / | | |_|_|/ | |/| | |
| * | | | Squashed 'tests/files/' changes from 0749546..641ebaaobscuren2015-03-17121-960/+12698
| | | | * 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
| | | | |\ | |_|_|_|/ |/| | | |
* | | | | removed compileobscuren2015-03-162-22/+4
| | | | * Allow latest/pending in filter optionsTaylor Gerring2015-03-162-40/+45
| |_|_|/ |/| | |
* | | | tmpobscuren2015-03-161-2/+2
* | | | 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
| |\ \ \ \
| | * | | | Update response typesTaylor Gerring2015-03-114-6/+312
| | * | | | Merge branch 'rpcfrontier' of github.com:ethereum/go-ethereum into rpcfrontierTaylor Gerring2015-03-1122-2039/+2095
| | |\ \ \ \
| | * | | | | Allow integers for BlockNumberTaylor Gerring2015-03-101-6/+21
| * | | | | | Updated RPCobscuren2015-03-115-135/+151
| | |/ / / / | |/| | | |
| * | | | | Added unmarshalStateobscuren2015-03-103-1017/+1510