aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* independent flag for json structured loggingzelig2015-03-228-95/+95
* 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
| |\ \
| * | | Removed some commentsobscuren2015-03-212-3/+3
| * | | Fixed state testsobscuren2015-03-211-8/+5
| * | | Fixed incorrect recipient derivedobscuren2015-03-211-1/+1
| * | | Merge branch 'conversion' of github.com-obscure:ethereum/go-ethereum into con...obscuren2015-03-2116-355/+201
| |\ \ \
| | * | | whisper: use common.HashFelix Lange2015-03-214-41/+34
| | * | | eth: enable whisper againFelix Lange2015-03-211-1/+1
| | * | | whisper: use package rlpFelix Lange2015-03-212-37/+24
| | * | | rlp: add Stream.RawFelix Lange2015-03-213-12/+59
| | * | | Merge remote-tracking branch 'ethereum/conversion' into conversionFelix Lange2015-03-2133-1279/+1522
| | |\ \ \
| | * | | | cmd/blocktest: delete packageFelix Lange2015-03-211-213/+0
| | * | | | rlp: fix nil pointer decodingFelix Lange2015-03-212-2/+27
| | * | | | Merge remote-tracking branch 'ethereum/conversion' into conversionFelix Lange2015-03-2037-1707/+5453
| | |\ \ \ \
| | * | | | | common: drop accessors for Value.ValFelix Lange2015-03-204-11/+3
| | * | | | | common: drop unused kind field from ValueFelix Lange2015-03-201-5/+1
| | * | | | | common: make Value encodable with package rlpFelix Lange2015-03-202-28/+55
| | * | | | | crypto: remove use of common.Value.EncodeFelix Lange2015-03-201-9/+1
| * | | | | | Right pad bytes to prevent future programmers making bugsobscuren2015-03-211-14/+18
| | |_|/ / / | |/| | | |
| * | | | | Merge branch 'ethersphere-frontier/blockpool' into conversionobscuren2015-03-2116-544/+736
| |\ \ \ \ \
| | * | | | | iterator returned wrong valueobscuren2015-03-211-2/+1
| | * | | | | Merge branch 'frontier/blockpool' of https://github.com/ethersphere/go-ethere...obscuren2015-03-2116-542/+735
| | |\ \ \ \ \
| | | * | | | | use common.Hash as pool key, no string conversion neededzelig2015-03-202-8/+8
| | | * | | | | fix common.Hash conversionzelig2015-03-203-3/+5
| | | * | | | | fix import in reorganised testzelig2015-03-201-2/+0
| | | * | | | | remove eth/wallet.go (only commented out content)zelig2015-03-201-80/+0
| | | * | | | | improve documentation and move one testzelig2015-03-209-156/+202
| | | * | | | | reduce logging outputzelig2015-03-203-25/+22
| | | * | | | | uncomment status test, hack: skip the 2 unreliable fieldszelig2015-03-202-171/+182
| | | * | | | | 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
| | | | |/ / / | | | |/| | |
| * | / | | | wipobscuren2015-03-214-3/+15
| |/ / / / /
| * | | | | mergeobscuren2015-03-2011-730/+635
| |\ \ \ \ \
| * | | | | | Added caching for block chain. Currently set to 10kobscuren2015-03-204-2/+136
| | |/ / / / | |/| | | |
| * | | | | 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
| |\ \ \ \ \
| * | | | | | :-)obscuren2015-03-201-1/+0
| * | | | | | mergeobscuren2015-03-1912-178/+275
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | Merge remote-tracking branch 'ethereum/conversion' into conversionFelix Lange2015-03-19408-1200/+32257
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge branch 'develop' into conversionobscuren2015-03-191-10/+18
| | |\ \ \ \ \ \
| | * | | | | | | improved test outputobscuren2015-03-191-24/+45
| | * | | | | | | Merge branch 'develop' into conversionobscuren2015-03-19408-1182/+32210
| | |\ \ \ \ \ \ \
| * | | | | | | | | 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 conversionobscuren2015-03-197-97/+97
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ mergeobscuren2015-03-1910-78/+92
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ 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
| | |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | 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
* | | | | | | | | | | | | | 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
|/| |
generated by cgit (git 2.34.1) at 2024-11-15 14:13:06 +0800