aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| |\ \ \ \
| | * | | | 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
| * | | | | Merge branch 'develop' into rpcfrontierobscuren2015-03-1019-1022/+585
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | mergeobscuren2015-03-102-18/+15
| * | | | | wipobscuren2015-03-10413-2191255/+57399
| |\ \ \ \ \
| * | | | | | Undo client_version changesTaylor Gerring2015-03-107-19/+14
| * | | | | | Remove support for compiling serpentTaylor Gerring2015-03-091-16/+2
| * | | | | | Increased args test coverageTaylor Gerring2015-03-064-56/+393
| * | | | | | Initial args testsTaylor Gerring2015-03-062-13/+138
| * | | | | | Add web3_sha3 testTaylor Gerring2015-03-061-0/+18
| * | | | | | TidyTaylor Gerring2015-03-063-62/+58
| * | | | | | Refactor & cleanupTaylor Gerring2015-03-065-657/+543
| * | | | | | Resolve storage/storageatTaylor Gerring2015-03-063-16/+24
| * | | | | | Revert to hex responseTaylor Gerring2015-03-061-4/+3
| * | | | | | Final name changesTaylor Gerring2015-03-061-8/+9
| * | | | | | Update RPC methodsTaylor Gerring2015-03-051-84/+115
| * | | | | | Output 0x0 instead of 0xTaylor Gerring2015-03-051-1/+6
| * | | | | | Output net_peerCount as hexTaylor Gerring2015-03-041-1/+2
| * | | | | | Return block number as hexTaylor Gerring2015-03-041-1/+1
| * | | | | | Update NewTXArgs to accept hexTaylor Gerring2015-03-042-21/+28
| * | | | | | Add client_version RPC messageTaylor Gerring2015-03-043-1/+11
| * | | | | | Move p2p.MakeName to ethutil.MakeVersionTaylor Gerring2015-03-034-13/+8
| * | | | | | Remove defunct callsTaylor Gerring2015-03-021-62/+30
| * | | | | | Rename "net" methodsTaylor Gerring2015-03-021-4/+4
* | | | | | | Check length of timestring before taking sliceTaylor Gerring2015-03-111-1/+6
| |_|_|_|/ / |/| | | | |
* | | | | | Use ECDSA instead of ellipticobscuren2015-03-111-6/+3
| |_|_|/ / |/| | | |
* | | | | don't log whisper start upsobscuren2015-03-111-2/+2
* | | | | Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into developobscuren2015-03-110-0/+0
|\ \ \ \ \
| * \ \ \ \ Merge pull request #447 from fjl/accounts-integrationJeffrey Wilcke2015-03-1142-1569/+803
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'fjl-accounts-integration' into developobscuren2015-03-110-0/+0
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Merge branch 'accounts-integration' of https://github.com/fjl/go-ethereum int...obscuren2015-03-1038-1545/+701
| |\ \ \ \ \
* | \ \ \ \ \ Merge branch origin/develop into accounts-integrationFelix Lange2015-03-1119-1021/+577
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | Merge pull request #449 from Gustav-Simonsson/add_blockchain_tests2Jeffrey Wilcke2015-03-103-3/+31
| |\ \ \ \ \ \
| | * | | | | | Add empty total difficulty to test blocks and clean up stopping the nodeGustav Simonsson2015-03-103-3/+31
| | | |_|_|/ / | | |/| | | |
| * | | | | | removed debuggerobscuren2015-03-105-436/+1
| * | | | | | Fixed error message. Closes #448obscuren2015-03-101-1/+1
| * | | | | | Merge branch 'poc-9' into developobscuren2015-03-105-138/+199
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | Merge pull request #438 from ethersphere/poc9/cliJeffrey Wilcke2015-03-102-35/+49
| | |\ \ \ \ \
| | | * | | | | version outputzelig2015-03-081-5/+7
| | | * | | | | add export blockchain subcommand, remove BlockDozelig2015-03-082-30/+42
| | * | | | | | Merge pull request #437 from ethersphere/poc9/natspecJeffrey Wilcke2015-03-103-103/+150
| | |\ \ \ \ \ \
| | | * | | | | | rename constructor Newzelig2015-03-082-2/+3
| | | * | | | | | natspec for poc-9zelig2015-03-083-103/+149
| | | |/ / / / /
| * | | | | | | Merge branch 'poc-9' into developobscuren2015-03-10383-2191073/+56919
| |\| | | | | |
| | * | | | | | Right pad zeros. Closes #446obscuren2015-03-101-1/+1
| | * | | | | | reworked stackobscuren2015-03-106-442/+352
| | * | | | | | wipobscuren2015-03-101-7/+6
| | | |/ / / / | | |/| | | |
* | | | | | | cmd/utils: improve CLI help templatesFelix Lange2015-03-101-0/+27
* | | | | | | cmd/ethereum: show some help before prompting for encryption passphraseFelix Lange2015-03-101-0/+3
* | | | | | | Godeps: bump github.com/codegangsta/cliFelix Lange2015-03-105-11/+42
* | | | | | | cmd/ethereum: show more helpful message if no accounts existFelix Lange2015-03-103-9/+23
* | | | | | | eth: return account errors directlyFelix Lange2015-03-101-1/+1
* | | | | | | cmd/utils: remove extra space in fatal error messageFelix Lange2015-03-101-1/+1
* | | | | | | accounts: return ErrNoKeys if key directory does not existFelix Lange2015-03-101-2/+7
* | | | | | | xeth: fix signing transaction after unlockFelix Lange2015-03-101-1/+1
* | | | | | | cmd/ethereum: fix line editing setup and historyFelix Lange2015-03-101-6/+11
| |_|_|/ / / |/| | | | |
* | | | | | cmd/evm, core, ethdb, state, tests/helper: remove ReadConfig callsFelix Lange2015-03-106-12/+0
* | | | | | state: fix testsFelix Lange2015-03-101-3/+3
* | | | | | eth: fix testsFelix Lange2015-03-101-7/+7
* | | | | | cmd/ethereum: remove "prompter" in identifiersFelix Lange2015-03-101-9/+10
* | | | | | crypto: delete old key management stuffFelix Lange2015-03-104-492/+0
* | | | | | cmd/ethereum: unlock accounts on JS REPLFelix Lange2015-03-102-104/+111
* | | | | | xeth: use Frontend interface to unlock accountsFelix Lange2015-03-102-31/+55
* | | | | | cmd/ethereum: allow multiple js filesFelix Lange2015-03-101-5/+5
* | | | | | accounts: add {Timed,}Unlock, remove SignLockedFelix Lange2015-03-103-57/+56
* | | | | | Merge ethereum/poc-9 into accounts-integrationFelix Lange2015-03-1084-6213/+25464
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Max size JSON data. Closes #418obscuren2015-03-101-0/+8
| * | | | | Updated xeth instances to take extra param for ui.Interfaceobscuren2015-03-096-153/+5
| * | | | | Added ui.Interface to xethobscuren2015-03-092-15/+18
| * | | | | Merge commit '3deb470b2d07d28040a381722022cdf8867a829a' into poc-9obscuren2015-03-096-1080/+1890
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | Squashed 'tests/files/' changes from b9e4e74..e390be4obscuren2015-03-096-1080/+1890
| * | | | | Updated tests and fixed suicideobscuren2015-03-094-1/+23
| * | | | | Merge commit 'c1cafb56d5da57a44f1d766c5299f11664b93921' into poc-9obscuren2015-03-0911-1893/+1150
| |\| | | |
| | * | | | Squashed 'tests/files/' changes from 05fe945..b9e4e74obscuren2015-03-0911-1893/+1150
| * | | | | Merge commit 'e2c75b0fa17394553b93fe7ddd62c0f6a6441119' into poc-9obscuren2015-03-083-4/+723
| |\| | | |
| | * | | | Squashed 'tests/files/' changes from 15ce2ab..05fe945obscuren2015-03-083-4/+723
| * | | | | ignoreobscuren2015-03-081-3/+2
| * | | | | ignoreobscuren2015-03-081-0/+3
| | |_|/ / | |/| | |
| * | | | mergeobscuren2015-03-081-8/+6
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Merge pull request #431 from tgerring/jsonlogsTaylor Gerring2015-03-063-11/+26
| | |\ \ \
| | | * | | Added eth.chain.received.new_blockTaylor Gerring2015-03-062-5/+13
| | | * | | Added eth.chain.new_headTaylor Gerring2015-03-062-6/+13
| * | | | | removedobscuren2015-03-0816-610/+0
| * | | | | Merge branch 'poc-9' of github.com-obscure:ethereum/go-ethereum into poc-9obscuren2015-03-081-1/+1
| |\ \ \ \ \
| | * | | | | Fix logger import pathTaylor Gerring2015-03-081-1/+1
| * | | | | | updated ethashobscuren2015-03-082-4/+2
| * | | | | | Bump vobscuren2015-03-083-3/+3
| * | | | | | Updated ethereum.jsobscuren2015-03-081-180/+663
| * | | | | | Added deploy scripts from go-buildobscuren2015-03-0716-0/+506
| |/ / / / /
| * | | | | Merge pull request #435 from zsfelfoldi/poc-9Jeffrey Wilcke2015-03-073-0/+3633
| |\ \ \ \ \
| | * | | | | Now using github.com/obscuren/otto, no need for an Ethereum objectFefe2015-03-073-198/+53
| | * | | | | Natspec + testFefe2015-03-063-0/+3778
| * | | | | | Fixed testsobscuren2015-03-073-9/+11
| * | | | | | Separated block db from state db. Partial fix for #416obscuren2015-03-0713-40/+56
| * | | | | | Debug option for VM & command line flagobscuren2015-03-065-6/+21
| * | | | | | Merge branch 'poc-9' of github.com-obscure:ethereum/go-ethereum into poc-9obscuren2015-03-06126-5679/+9954
| |\| | | | |
| * | | | | | Queued approach to delivering chain eventsobscuren2015-03-064-36/+86
| * | | | | | Merge branch 'ethersphere-blockpool3' into poc-9obscuren2015-03-060-0/+0
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge branch 'blockpool3' of https://github.com/ethersphere/go-ethereum into ...obscuren2015-03-060-0/+0
| | |\ \ \ \ \ \
| | | * | | | | | fix wonky head section loop; correct status countszelig2015-03-052-24/+33
| | | * | | | | | Merge remote-tracking branch 'upstream/poc-9' into blockpool3zelig2015-03-059-30/+44
| | | |\ \ \ \ \ \
| | | * | | | | | | use ethash.Verify in blockpoolzelig2015-03-051-2/+1
| * | | | | | | | | debug comments & pow handlingobscuren2015-03-063-8/+6
| |/ / / / / / / /
| * | | | | | | | Merge branch 'ethersphere-blockpool2' into poc-9obscuren2015-03-062-24/+33
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'blockpool2' of https://github.com/ethersphere/go-ethereum into ...obscuren2015-03-062-24/+33
| | |\ \ \ \ \ \ \ \