aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| |\
| | * Use ECDSA instead of ellipticobscuren2015-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
| |\ \ \ | | | |/ | | |/|
| | * | 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
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | |
| | * | | | | 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
| | |\ \ \ \
| | * | | | | cmd/utils: delete InitConfig, KeyTasksFelix Lange2015-03-101-40/+0
| | * | | | | cmd/mist: use cli library and package accountsFelix Lange2015-03-106-304/+58
| | * | | | | accounts: add Manager.HasAccount, delete Manager.DefaultFelix Lange2015-03-101-9/+11
| | * | | | | eth: delete unused RpcServer fieldFelix Lange2015-03-101-7/+0
| | * | | | | rpc/http: delete packageFelix Lange2015-03-101-116/+0
| | * | | | | rpc: add dataDir parameter and JSON-RPC handlerFelix Lange2015-03-105-17/+64
| | * | | | | cmd/utils: add NewAppFelix Lange2015-03-102-5/+12
| | * | | | | xeth: don't sign transactions for tx callFelix Lange2015-03-102-27/+32
| | * | | | | core: remove Hash method from Message interfaceFelix Lange2015-03-101-3/+2
| | * | | | | cmd/blocktest: simplify to fix buildFelix Lange2015-03-102-189/+34
| | * | | | | accounts: don't store address in unlocked and add commentaryFelix Lange2015-03-081-8/+10
| | * | | | | accounts: AccountManager -> ManagerFelix Lange2015-03-086-36/+37
| | * | | | | accounts: prevent early drops and zero keys in memory when droppingFelix Lange2015-03-081-19/+50
| | * | | | | accounts: fix uses of sync.RWMutexFelix Lange2015-03-081-4/+6
| | * | | | | accounts: use time.Duration correctlyFelix Lange2015-03-082-13/+14
| | * | | | | accounts: use pointers consistentlyFelix Lange2015-03-083-17/+14
| | * | | | | cmd/ethereum: add account commandsFelix Lange2015-03-072-34/+93
| | * | | | | accounts, core, eth, xeth: use account manager for everythingFelix Lange2015-03-074-48/+58
| | * | | | | Integrate eth_accounts and eth_transact to use new account managerGustav Simonsson2015-03-0610-58/+83
| * | | | | | 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
|\ \ \ \ \ \ | |/ / / / / |/| | | / / | | |_|/ / | |/| | |
| * | | | 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
| | | |/ / | | |/| |
* | | | | mergeobscuren2015-03-102-18/+15
* | | | | wipobscuren2015-03-10413-2191255/+57399
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | 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
| |\| | | |
| | * | | | Merge pull request #433 from fjl/newcliFelix Lange2015-03-0664-3145/+6683
| | |\ \ \ \
| | | * | | | cmd/ethereum: fix JS REPL exit and add support for dumb terminalsFelix Lange2015-03-062-31/+60
| | | * | | | Godeps: add github.com/peterh/linerFelix Lange2015-03-0622-0/+2579
| | | * | | | cmd/ethereum: new JS repl with cross-platform line editingFelix Lange2015-03-067-538/+209
| | | * | | | cmd/ethereum: improve command line interfaceFelix Lange2015-03-0623-272/+3805
| | | * | | | Godeps: delete golang.org/x/net/websocketFelix Lange2015-03-069-2266/+0
| | | * | | | ethutil: remove Config variableFelix Lange2015-03-067-37/+29
| | * | | | | Merge pull request #434 from fjl/poc-9Felix Lange2015-03-0663-2534/+3271
| | |\ \ \ \ \
| | | * | | | | Godeps: bump github.com/ethereum/ethashFelix Lange2015-03-0663-2534/+3271
| | |/ / / / /
| * | | | | | 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
| | |\ \ \ \ \ \ \
| | | * | | | | | | fix wonky head section loop; correct status countszelig2015-03-062-24/+33
| * | | | | | | | | Spec changes.obscuren2015-03-064-7/+37
| * | | | | | | | | Merge commit '4e8a9a1cd4a10370fc4a888af0fb2def6f1b961b' into poc-9obscuren2015-03-0635-3914/+18363
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ | | |/| | | | | | |
| | * | | | | | | | Squashed 'tests/files/' changes from 9e3fe72..15ce2abobscuren2015-03-0635-3914/+18363
| * | | | | | | | | mergeobscuren2015-03-061-4/+0
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | / / | | | |_|_|_|_|/ / | | |/| | | | | |
| | * | | | | | | Merge pull request #429 from chfast/pr/fix_vm_testsJeffrey Wilcke2015-03-061-4/+0
| | |\ \ \ \ \ \ \
| | | * | | | | | | Fix VM tests not checkedPaweł Bylica2015-03-051-4/+0
| * | | | | | | | | Merge branch 'poc-9' of github.com-obscure:ethereum/go-ethereum into poc-9obscuren2015-03-064-1/+377
| |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge pull request #426 from Gustav-Simonsson/add_blockchain_testsJeffrey Wilcke2015-03-064-1/+377
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Add initial implementation of block testsGustav Simonsson2015-03-054-1/+377
| | | | |_|_|_|_|/ / / | | | |/| | | | | | |
| * | | | | | | | | | Merge branch 'develop' into poc-9obscuren2015-03-062-8/+22
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | / / / / / / / | | | |/ / / / / / / | | |/| | | | | | |
| | * | | | | | | | Merge branch 'tendermint-develop_pull_request' into developobscuren2015-03-062-9/+22
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Start at 0obscuren2015-03-061-2/+1
| | | * | | | | | | | Merge branch 'develop_pull_request' of https://github.com/tendermint/ethermin...obscuren2015-03-061-7/+21
| | |/| | | | | | | |
| | | * | | | | | | | Fixed iterator bug which skips the 0x000...000 key=2015-03-051-7/+21
| | | | |/ / / / / / | | | |/| | | | | |
| * | | | | | | | | Merge branch 'develop' into poc-9obscuren2015-03-0627-36/+544
| |\| | | | | | | |
| | * | | | | | | | Merge branch 'alexvandesande-ui' into developobscuren2015-03-0627-36/+544
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
| | | * | | | | | | Removed unused variablesobscuren2015-03-061-2/+1
| | | * | | | | | | network back to local filesAlexandre Van de Sande2015-03-051-5/+0
| | | * | | | | | | Fixed Average Return calculationAlexandre Van de Sande2015-03-052-3/+3
| | | * | | | | | | updated network app to latest buildAlexandre Van de Sande2015-03-043-4/+5
| | | * | | | | | | Merge branch 'develop' into uiAlexandre Van de Sande2015-03-0465-1325/+1402
| | | |\ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
| | | * | | | | | | network dashboard is now a local fileAlexandre Van de Sande2015-03-0423-1/+346
| | | * | | | | | | updating to new network health pageAlexandre Van de Sande2015-03-042-4/+5
| | | * | | | | | | Network Health Panel with miningAlexandre Van de Sande2015-03-035-27/+178
| | | * | | | | | | Merge branch 'develop' into uiAlexandre Van de Sande2015-02-23111-2977/+1988
| | | |\ \ \ \ \ \ \
| | | * | | | | | | | changes to sidebar sizesAlexandre Van de Sande2015-02-231-17/+32
| * | | | | | | | | | Merge branch 'fjl-p2p-handshake-2' into poc-9obscuren2015-03-0615-747/+763
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Merge branch 'p2p-handshake-2' of https://github.com/fjl/go-ethereum into fjl...obscuren2015-03-0615-747/+763
| |/| | | | | | | | | |
| | * | | | | | | | | | eth, p2p: delete p2p.BlacklistFelix Lange2015-03-042-67/+1
| | * | | | | | | | | | p2p: reject messages that cannot be written as simple RLPx framesFelix Lange2015-03-041-0/+5
| | * | | | | | | | | | p2p: restore read/write timeoutsFelix Lange2015-03-045-37/+37
| | * | | | | | | | | | eth, whisper: fix msg.Payload readsFelix Lange2015-03-042-32/+31
| | * | | | | | | | | | p2p: msg.Payload contains list dataFelix Lange2015-03-047-75/+25
| | * | | | | | | | | | p2p: verify protocol handshake node IDFelix Lange2015-03-041-0/+3
| | * | | | | | | | | | p2p: make encryption handshake code easier to followFelix Lange2015-03-042-302/+272
| | * | | | | | | | | | p2p/discover: add NodeID.PubkeyFelix Lange2015-03-042-0/+33
| | * | | | | | | | | | p2p: make RLPx frame MAC 16 bytes as defined in the specFelix Lange2015-03-042-13/+19
| | * | | | | | | | | | p2p: delete frameRWFelix Lange2015-03-042-184/+0
| | * | | | | | | | | | p2p: use RLPx frames for messagingFelix Lange2015-03-046-50/+73
| | * | | | | | | | | | p2p: encrypted and authenticated RLPx frame I/OFelix Lange2015-03-044-172/+197
| | * | | | | | | | | | p2p: add basic RLPx frame I/OFelix Lange2015-03-042-0/+252
| | | |_|_|/ / / / / / | | |/| | | | | | | |
| * | | | | | | | | | wip mathobscuren2015-03-063-0/+152
| | |_|_|_|_|_|_|/ / | |/| | | | | | | |
| * | | | | | | | | Miner fixes and updates (including miner)obscuren2015-03-0510-32/+45
| |/ / / / / / / /
| * | | | | | | | Clean up REPLobscuren2015-03-047-166/+141
| * | | | | | | | Merge branch 'develop' into poc-9obscuren2015-03-042-14/+12
| |\| | | | | | |
| | * | | | | | | removed double flag. Closes #421obscuren2015-03-041-1/+0
| | * | | | | | | Merge pull request #413 from chfast/pr/jit_build_fixesJeffrey Wilcke2015-03-041-13/+12
| | |\ \ \ \ \ \ \
| | | * | | | | | | Fix JitVm buildPaweł Bylica2015-03-031-1/+1
| | | * | | | | | | Merge remote-tracking branch 'upstream/develop' into evmjitPaweł Bylica2015-03-0347-833/+1204
| | | |\ \ \ \ \ \ \
| | | * | | | | | | | Add required block numberPaweł Bylica2015-03-031-1/+1
| | | * | | | | | | | Merge remote-tracking branch 'upstream/develop' into evmjitPaweł Bylica2015-02-248-26/+60
| | | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/develop' into evmjitPaweł Bylica2015-02-24803-3573/+442114
| | | |\ \ \ \ \ \ \ \ \ | | | | | |_|_|/ / / / / | | | | |/| | | | | | |
| | | * | | | | | | | | Update JIT interface to ABI 0.2: code hash added to input data, gas counter p...Paweł Bylica2015-02-161-11/+10
| * | | | | | | | | | | uncle validationobscuren2015-03-044-30/+46
| * | | | | | | | | | | Fixed genesisobscuren2015-03-043-20/+31
| * | | | | | | | | | | updated genesisobscuren2015-03-042-1/+4
| * | | | | | | | | | | Changed nonce to a uint64obscuren2015-03-0410-25/+30
| * | | | | | | | | | | Merge branch 'develop' into poc-9obscuren2015-03-042-34/+0
| |\| | | | | | | | | |
| | * | | | | | | | | | removed all old filtersobscuren2015-03-042-34/+0
| * | | | | | | | | | | Merge branch 'develop' into poc-9obscuren2015-03-049-285/+49
| |\| | | | | | | | | |
| | * | | | | | | | | | Merge pull request #411 from ethersphere/readmeJeffrey Wilcke2015-03-045-132/+48
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | db name database -> blockchain in backend error messagezelig2015-03-031-1/+1
| | | * | | | | | | | | | remove threatening coding standards section from READMEzelig2015-03-031-31/+0
| | | * | | | | | | | | | remove obsolete install scriptzelig2015-03-031-53/+0
| | | * | | | | | | | | | minor cleanupzelig2015-03-032-6/+7
| | | * | | | | | | | | | update READMEzelig2015-03-031-42/+41
| | | | |_|_|/ / / / / / | | | |/| | | | | | | |
| | * | | | | | | | | | Merge pull request #409 from tgerring/jsonlogsJeffrey Wilcke2015-03-047-24/+40
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|/ | | | |/| | | | | | | |
| | * | | | | | | | | | Merge pull request #408 from tgerring/removewsJeffrey Wilcke2015-03-047-153/+1
| | |\ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ Merge branch 'develop' of github.com:ethereum/go-ethereum into removewsTaylor Gerring2015-03-0215-150/+153
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / | | | | |/| | | | | | | |
| | | * | | | | | | | | | Remove Websockets RPC transportTaylor Gerring2015-03-017-152/+1
| * | | | | | | | | | | | Merge branch 'ethersphere-jsonlogs' into poc-9obscuren2015-03-046-29/+64
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Merge branch 'jsonlogs' of https://github.com/ethersphere/go-ethereum into et...obscuren2015-03-046-29/+64
| |/| | | | | | | | | | | |
| | * | | | | | | | | | | | add eth.chain.new_head log to core/chain_managerzelig2015-03-031-3/+12
| | * | | | | | | | | | | | add eth.chain.received.new_block log to eth protocolzelig2015-03-031-1/+9
| | * | | | | | | | | | | | block number is *big.Int, remoteID is stringzelig2015-03-031-9/+9
| | * | | | | | | | | | | | Merge remote-tracking branch 'tgerring/jsonlogs' into jsonlogszelig2015-03-037-24/+40
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / | | |/| | | / / / / / / / / | | | | |_|/ / / / / / / / | | | |/| | | | | | | | |
| | | * | | | | | | | | | Fix logger import in testsTaylor Gerring2015-03-022-5/+5
| | | * | | | | | | | | | Add event eth.tx.receivedTaylor Gerring2015-03-021-0/+7
| | | * | | | | | | | | | Don't import logger as ethloggerTaylor Gerring2015-03-022-14/+14
| | | * | | | | | | | | | Implement eth.miner.new_block eventTaylor Gerring2015-03-012-5/+14
| | | | |/ / / / / / / / | | | |/| | | | | | | |
| * | | | | | | | | | | Merge branch 'ethersphere-blockpool2' into poc-9obscuren2015-03-045-51/+89
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / | | |/| | | | | | | | |
| | * | | | | | | | | | Merge branch 'blockpool2' of https://github.com/ethersphere/go-ethereum into ...obscuren2015-03-045-51/+89
| |/| | | | | | | | | | | | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | |
| | * | | | | | | | | partial fix to idle best peer issuezelig2015-03-043-13/+33
| | * | | | | | | | | log when added peer is behind (hash found in blockchain)zelig2015-03-031-0/+1
| | * | | | | | | | | Merge remote-tracking branch 'upstream/develop' into blockpool2zelig2015-03-0341-624/+1032
| | |\| | | | | | | |
| | * | | | | | | | | - fix peer disconnect by adding severity function to errszelig2015-03-034-38/+55
| * | | | | | | | | | Fixes and debug addedobscuren2015-03-044-6/+8
| * | | | | | | | | | mergeobscuren2015-03-0415-209/+169
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / | | |/| | | | | | | |
| | * | | | | | | | | Filter accepts multiple topics per entry. Fixes #403obscuren2015-03-024-104/+40
| | * | | | | | | | | GetOrNew for accessors. Fixes #404obscuren2015-03-022-17/+9
| | | |/ / / / / / / | | |/| | | | | | |
| * | | | | | | | | Merge branch 'xcthulhu-publictests' into poc-9obscuren2015-03-0458-95/+17748
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | fixed pow stuffobscuren2015-03-0410-58/+28
| | * | | | | | | | | Merge branch 'publictests' of https://github.com/xcthulhu/go-ethereum into xc...obscuren2015-03-0452-42/+17725
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Introducing ethashMatthew Wampler-Doty2015-03-0352-70/+17425
| | | * | | | | | | | | Only one uncleMatthew Wampler-Doty2015-03-031-0/+4
| | | * | | | | | | | | Exposing stuff for ethashMatthew Wampler-Doty2015-02-283-2/+5
| | | * | | | | | | | | Merge branch 'publictests' of github.com:ebuchman/go-ethereum into ethash_powMatthew Wampler-Doty2015-02-2852-744/+1508
| | | |\ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | public functions for making chains on the flyEthan Buchman2015-02-282-96/+131
| | | | * | | | | | | | | Merge branch 'develop' of https://github.com/ethereum/go-ethereum into developEthan Buchman2015-02-2782-1558/+2687
| | | | |\ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | core: chain manager forking testsEthan Buchman2015-02-181-0/+276
| | | | * | | | | | | | | | Merge branch 'develop' of https://github.com/ethereum/go-ethereum into developEthan Buchman2015-02-18962-10616/+457352
| | | | |\ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | fix unchecked slice index on tx.From()Ethan Buchman2015-01-271-2/+7
| | | * | | | | | | | | | | | Introducign MixDigest and SeedHashMatthew Wampler-Doty2015-02-283-4/+9
| * | | | | | | | | | | | | | changed messageobscuren2015-03-041-1/+1
| |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | GasLimit check updatedobscuren2015-03-043-6/+17
| * | | | | | | | | | | | | Fixed error for invalid transactionobscuren2015-03-034-12/+29
| * | | | | | | | | | | | | Merge commit 'a6e04ab05150d1b5aa4adb297f3e5146b1559b02' into poc-9obscuren2015-03-0313-135/+378
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | Squashed 'tests/files/' changes from 13be3e3..9e3fe72obscuren2015-03-0313-135/+378
| * | | | | | | | | | | | | Merge commit '42a210b571b9358df16da148d9724c2ef9abbca5' into poc-9obscuren2015-03-0312-289/+457
| |\| | | | | | | | | | | |
| | * | | | | | | | | | | | Squashed 'tests/files/' changes from 402e748..13be3e3obscuren2015-03-0312-289/+457
| * | | | | | | | | | | | | Merge commit 'd9d40888ce9498b25925ccbf1447b1f62597aa2f' into poc-9obscuren2015-03-0312-459/+291
| |\| | | | | | | | | | | |
| | * | | | | | | | | | | | Squashed 'tests/files/' changes from 2bfb7db..402e748obscuren2015-03-0312-459/+291