aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* UDP Interop. Limit datagrams to 1280bytes.subtly2015-05-141-1/+1
* Merge pull request #954 from karalabe/fix-downloader-nil-panicPéter Szilágyi2015-05-141-1/+1
|\
| * eth/downloader: fix nil panic caused by wrong variable usePéter Szilágyi2015-05-131-1/+1
|/
* Merge pull request #948 from karalabe/fix-downlaoder-activepeer-shadowJeffrey Wilcke2015-05-133-24/+16
|\
| * eth/downloader: fix active peer shadowing, polish func namesPéter Szilágyi2015-05-133-24/+16
|/
* Merge pull request #946 from Gustav-Simonsson/fix_geth_unlock_accountJeffrey Wilcke2015-05-131-1/+2
|\
| * Fix hex conversion in --unlock and log when successfulGustav Simonsson2015-05-131-1/+2
|/
* Merge branch 'release/0.9.20' into developobscuren2015-05-132-2/+2
|\
| * eth: 100% tx propagationobscuren2015-05-131-1/+1
| * cmd/geth: bump version to 0.9.20obscuren2015-05-131-1/+1
|/
* Merge pull request #631 from Gustav-Simonsson/improve_key_store_cryptoJeffrey Wilcke2015-05-1322-196/+241
|\
| * Change default keystore dirGustav Simonsson2015-05-135-6/+6
| * Fix address type in js testGustav Simonsson2015-05-121-1/+1
| * fix hex conversion bug in RPC for byte slicesGustav Simonsson2015-05-121-1/+8
| * Fix natspec test (again x2) typesGustav Simonsson2015-05-121-1/+2
| * Update key store to new spec but keep address field for nowGustav Simonsson2015-05-127-72/+59
| * Fix natspec e2e test accounts type (again)Gustav Simonsson2015-05-121-1/+1
| * Fix HEX hack in xeth accounts()Gustav Simonsson2015-05-121-1/+1
| * Address pull request comments; key header and hex encodingGustav Simonsson2015-05-123-31/+67
| * Revert "Add key header to unencrypted key file"Gustav Simonsson2015-05-122-16/+8
| * Fix common.Address / []byte type conversionsGustav Simonsson2015-05-122-2/+2
| * Add key header to unencrypted key fileGustav Simonsson2015-05-122-8/+16
| * Add key header to encrypted keysGustav Simonsson2015-05-122-7/+57
| * Correct accounts hex in XETH APIGustav Simonsson2015-05-121-1/+1
| * Use common.Address type for accounts.AddressGustav Simonsson2015-05-1211-64/+69
| * Improve key store passphrase cryptoGustav Simonsson2015-05-124-23/+31
| * Remove the awesome, ever misunderstood entropy mixingGustav Simonsson2015-05-124-64/+15
|/
* Merge pull request #933 from bas-vk/issue928Jeffrey Wilcke2015-05-1218-64/+58
|\
| * fixed identingBas van Kervel2015-05-121-1/+1
| * removed redundant newlines in import blockBas van Kervel2015-05-127-11/+5
| * replaced several path.* with filepath.* which is platform independentBas van Kervel2015-05-1218-64/+64
* | Merge pull request #932 from obscuren/developJeffrey Wilcke2015-05-127-15/+40
|\ \ | |/ |/|
| * sol: skipped source checking stepobscuren2015-05-123-7/+13
| * xeth: use same semantics as block processer for transient callsobscuren2015-05-121-4/+3
| * rpc: hexData => hexNumobscuren2015-05-121-2/+2
| * xeth, rpc: implement eth_estimateGas. Closes #930obscuren2015-05-123-7/+26
| * eth, ethdb: lower the amount of open files & improve err messages for dbobscuren2015-05-121-0/+1
|/
* Merge pull request #899 from ethersphere/solc-test-fixJeffrey Wilcke2015-05-124-6/+21
|\
| * compiler, cli/js: fix solidity compiler tests failing when a different versio...zelig2015-05-124-6/+21
* | Merge pull request #929 from obscuren/developJeffrey Wilcke2015-05-122-5/+8
|\ \ | |/ |/|
| * eth, ethdb: lower the amount of open files & improve err messages for dbobscuren2015-05-122-5/+8
|/
* Merge pull request #925 from obscuren/worker_owned_accountsJeffrey Wilcke2015-05-122-29/+44
|\
| * miner, cmd/geth: miner will not ignored owned account transactionsobscuren2015-05-122-29/+44
|/
* Merge pull request #918 from obscuren/cpu_miner_fixesJeffrey Wilcke2015-05-1211-46/+50
|\
| * eth, eth/downloader: moved pending queue error message to debugobscuren2015-05-112-3/+4
| * cmd/geth, miner, backend, xeth: Fixed miner threads to be settableobscuren2015-05-119-43/+46
| * eth/downloader: use count instead of peers, clearerPéter Szilágyi2015-05-112-4/+4
| * eth/downloader: revert to demotion, use harsher penaltyPéter Szilágyi2015-05-112-8/+19
| * eth/downloader: fix #910, thread safe peers & polishesPéter Szilágyi2015-05-114-161/+210
* | Merge pull request #915 from karalabe/downloader-threading-fixesJeffrey Wilcke2015-05-114-159/+219
|\ \ | |/ |/|
| * eth/downloader: use count instead of peers, clearerPéter Szilágyi2015-05-112-4/+4
| * eth/downloader: revert to demotion, use harsher penaltyPéter Szilágyi2015-05-112-8/+19
| * eth/downloader: fix #910, thread safe peers & polishesPéter Szilágyi2015-05-114-161/+210
* | Merge pull request #920 from tgerring/issue917Jeffrey Wilcke2015-05-111-2/+2
|\ \
| * | Return 32-byte hashes from GetWorkTaylor Gerring2015-05-111-2/+2
* | | Merge pull request #914 from ethersphere/developJeffrey Wilcke2015-05-116-15/+3801
|\ \ \ | |/ / |/| |
| * | Only allow doSign to sign hashes, enforced by using the type common.HashDaniel A. Nagy2015-05-111-4/+4
| * | Interactive signature creation refactored into separate doSign function.Daniel A. Nagy2015-05-111-20/+20
| * | Merge branch 'develop' of github.com:ethereum/go-ethereum into developDaniel A. Nagy2015-05-1122-103/+372
| |\ \ | |/ / |/| |
* | | Merge pull request #908 from obscuren/developJeffrey Wilcke2015-05-119-97/+135
|\ \ \
| * | | miner: added log message for mining operation. #912obscuren2015-05-111-0/+4
| * | | core: optimise pending transaction processingobscuren2015-05-112-86/+102
| * | | rpc: display error message to stdoutobscuren2015-05-111-0/+2
| * | | core, eth, miner: improved tx removal & fatal error on db sync errobscuren2015-05-116-31/+47
|/ / /
* | | Merge pull request #911 from karalabe/whisper-graceful-failJeffrey Wilcke2015-05-114-2/+53
|\ \ \ | |_|/ |/| |
| * | rpc, xeth: fix #881, gracefully handle offline whisperPéter Szilágyi2015-05-114-2/+53
|/ /
* | Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into developobscuren2015-05-100-0/+0
|\ \
| * \ Merge pull request #894 from obscuren/developJeffrey Wilcke2015-05-101-1/+4
| |\ \
| * \ \ Merge pull request #893 from obscuren/developJeffrey Wilcke2015-05-103-2/+106
| |\ \ \
* | | | | cmd/geth, cmd/mist: version 0.9.19obscuren2015-05-102-2/+2
| |_|/ / |/| | |
* | | | ethdb: set open file limit to 128 for all leveldbsobscuren2015-05-101-1/+4
| |/ / |/| |
* | | eth: added a cancel method for the downloaderobscuren2015-05-103-2/+106
|/ /
* | cmd/mist: version bumpobscuren2015-05-091-1/+1
* | Merge pull request #888 from obscuren/developJeffrey Wilcke2015-05-098-15/+88
|\ \
| * | cmd/geth: bump version 0.9.18obscuren2015-05-091-1/+1
| * | miner, tests: fixed block testobscuren2015-05-092-1/+6
| * | miner: start/stop mutex locked. Closes #887obscuren2015-05-091-0/+9
| * | miner: moved gasprice to non-methodobscuren2015-05-091-9/+12
| * | miner, cmd/geth: settable gas price from flags and consoleobscuren2015-05-093-0/+44
| * | cmd/geth, cmd/mist, eth, flags: renamed loglevel to verbosityobscuren2015-05-094-13/+25
|/ /
| * Signature test.Daniel A. Nagy2015-05-091-0/+28
| * Merge branch 'develop' of github.com:ethereum/go-ethereum into developDaniel A. Nagy2015-05-0823-441/+1203
| |\ | |/ |/|
* | version 0.9.17obscuren2015-05-081-1/+1
* | Merge pull request #863 from karalabe/ordered-block-downloadJeffrey Wilcke2015-05-0813-383/+939
|\ \
| * | eth/downloader: fix leftover state between syncsPéter Szilágyi2015-05-081-1/+4
| * | eth, eth/downloader: handle sync errors a bit more gracefullyPéter Szilágyi2015-05-084-48/+48
| * | eth, eth/downloader: make synchronize thread safePéter Szilágyi2015-05-085-82/+22
| * | eth/downloader: fix priority queue reset, add throttling testPéter Szilágyi2015-05-076-21/+111
| * | eth/downloader: fix expiration not running while fetchingPéter Szilágyi2015-05-072-34/+32
| * | eth/downloader: prioritize block fetch based on chain position, cap memory usePéter Szilágyi2015-05-0711-273/+798
* | | Merge pull request #885 from fjl/p2p-fixesJeffrey Wilcke2015-05-086-39/+69
|\ \ \
| * | | p2p: drop connections with no matching protocolsFelix Lange2015-05-082-4/+21
| * | | cmd/utils: bump default maxpeers to 25Felix Lange2015-05-081-1/+1
| * | | p2p: use maxDialingConns instead of maxAcceptConns as dial limitFelix Lange2015-05-081-1/+1
| * | | p2p: fix disconnect at capacityFelix Lange2015-05-084-33/+46
|/ / /
* | | Merge pull request #840 from karalabe/throttled-dialingJeffrey Wilcke2015-05-086-19/+180
|\ \ \
| * | | p2p: increase the handshake timeout in the testsPéter Szilágyi2015-05-071-2/+2
| * | | cmd, eth, p2p: introduce pending peer cli arg, add testsPéter Szilágyi2015-05-076-19/+170
| * | | p2p: reduce the concurrent handshakes to 10/10 in/outPéter Szilágyi2015-05-071-2/+2
| * | | p2p: fix dial throttling race conditionPéter Szilágyi2015-05-071-1/+1
| * | | p2p: fix a dialing race in the throttlerPéter Szilágyi2015-05-071-1/+1
| * | | p2p: limit the outbound dialing tooPéter Szilágyi2015-05-071-1/+11
| |/ /
* | | Merge pull request #882 from zsfelfoldi/developJeffrey Wilcke2015-05-081-2/+17
|\ \ \
| * | | ToVal serialization fixzsfelfoldi2015-05-081-2/+3
| * | | Otto.ToValue concurrency error fixedzsfelfoldi2015-05-081-2/+16
| | | * Signing (almost) works.Daniel A. Nagy2015-05-083-4/+3725
| | | * eth_sign added to API for signing arbitrary data.Daniel A. Nagy2015-05-082-8/+8
| | | * New API call for signatures.Daniel A. Nagy2015-05-083-0/+37
| |_|/ |/| |
* | | Merge pull request #876 from obscuren/jsre_fixesJeffrey Wilcke2015-05-084-13/+7
|\ \ \
| * | | updated ethereum.jsobscuren2015-05-081-0/+0
| * | | jsre, cmd/geth: updated web3.js and altered settimeoutobscuren2015-05-083-13/+7
|/ / /
* | | Merge pull request #875 from Gustav-Simonsson/test_updatesJeffrey Wilcke2015-05-0852-4920/+9983
|\ \ \
| * | | Add bcTotalDifficultyTest and unskip now working tx testsGustav Simonsson2015-05-073-6/+6
| * | | Update JSON test filesGustav Simonsson2015-05-0749-4914/+9977
| | |/ | |/|
* | | Merge pull request #833 from ethersphere/frontier/solidityJeffrey Wilcke2015-05-0821-503/+1449
|\ \ \
| * | | solidity compiler and contract metadocs integrationzelig2015-05-0721-503/+1449
| |/ /
* | | Merge pull request #864 from obscuren/filter_changesJeffrey Wilcke2015-05-086-83/+221
|\ \ \ | |_|/ |/| |
| * | xeth: getTransactionByHash, try pool if db failsobscuren2015-05-081-0/+2
| * | core: get transaction by hash from transaction poolobscuren2015-05-081-0/+21
| * | xeth: check proper queue for pending transaction filterobscuren2015-05-071-1/+1
| * | rpc: eth_transactionFilter => eth_newPendingTransactionFilterobscuren2015-05-071-1/+1
| * | xeth, core, event/filter, rpc: new block and transaction filtersobscuren2015-05-075-83/+198
| |/
* | Merge pull request #877 from Gustav-Simonsson/update_ethash_godepJeffrey Wilcke2015-05-088-21/+65
|\ \ | |/ |/|
| * Update ethash deps (more build fixes, tests)Gustav Simonsson2015-05-088-21/+65
|/
* updated ignoreobscuren2015-05-071-0/+1
* Merge pull request #867 from Gustav-Simonsson/fix_block_tests_genesis_block_t...Jeffrey Wilcke2015-05-073-4/+1
|\
| * Unskip now working tests, remove debug printGustav Simonsson2015-05-072-4/+0
| * Add genesis block total difficulty in testsGustav Simonsson2015-05-071-0/+1
* | Merge pull request #866 from fjl/p2p-last-minuteJeffrey Wilcke2015-05-076-26/+24
|\ \
| * | p2p: stop dialing at half the maximum peer countFelix Lange2015-05-071-1/+1
| * | p2p, whisper: use glog for peer-level loggingFelix Lange2015-05-073-20/+16
| * | p2p/discover: bump packet timeouts to 500msFelix Lange2015-05-071-2/+2
| * | p2p/nat: less confusing error loggingFelix Lange2015-05-071-3/+5
* | | cmd/geth: gofmt screwup fixobscuren2015-05-071-0/+2
* | | cmd/geth: version bumpobscuren2015-05-071-3/+1
* | | Merge branch 'karalabe-cherry-trusted-peers' into developobscuren2015-05-077-39/+317
|\ \ \ | |/ / |/| |
| * | fixed merge issueobscuren2015-05-077-39/+317
|/| |
| * | eth, p2p: add trusted node list beside static listPéter Szilágyi2015-05-045-51/+59
| * | cmd/mist: fix a stale error messagePéter Szilágyi2015-05-041-1/+1
| * | p2p: add static node dialing testPéter Szilágyi2015-05-042-13/+108
| * | p2p: correct a leftover trusted -> staticPéter Szilágyi2015-05-011-4/+4
| * | eth, p2p: rename trusted nodes to static, drop inbound extra slotsPéter Szilágyi2015-05-015-57/+59
| * | cmd, eth, p2p: fix review issues enumerated by FelixPéter Szilágyi2015-04-308-34/+25
| * | p2p: add trust check to handshake, test privileged connectivityPéter Szilágyi2015-04-304-15/+88
| * | p2p: reduce the severity of a debug logPéter Szilágyi2015-04-301-1/+1
| * | cmd/geth, cmd/utils, eth: internalize trusted node config filePéter Szilágyi2015-04-303-30/+20
| * | cmd/geth, cmd/mist, cmd/utils, eth, p2p: support trusted peersPéter Szilágyi2015-04-308-27/+146
* | | Merge pull request #791 from fjl/discover-sha3-distanceJeffrey Wilcke2015-05-0714-292/+651
|\ \ \ | |_|/ |/| |
| * | p2p/discover: new distance metric based on sha3(id)Felix Lange2015-05-066-106/+354
| * | common: add Hash.GenerateFelix Lange2015-04-301-1/+14
| * | p2p/discover: track sha3(ID) in NodeFelix Lange2015-04-308-99/+166
| * | p2p, p2p/discover: protocol version 4Felix Lange2015-04-302-2/+2
| * | p2p/discover: new endpoint formatFelix Lange2015-04-3011-129/+160
| |/
* | Merge pull request #861 from obscuren/transaction_pool_fixesJeffrey Wilcke2015-05-078-7/+133
|\ \
| * | cmd/geth: limit `pendingTransactions` to owned accounts.obscuren2015-05-071-33/+53
| * | cmd/mist: updated xeth transactobscuren2015-05-072-1/+2
| * | cmd/geth: admin, switched price with limit in argumentsobscuren2015-05-071-2/+2
| * | cmd/geth: implemented resending transaction with different gas settingsobscuren2015-05-071-0/+83
| * | core: use removeTx instead of deleteobscuren2015-05-071-1/+1
| * | xeth, rpc: added nonce setting through RPC and xeth transactobscuren2015-05-074-5/+27
* | | Merge pull request #859 from Gustav-Simonsson/ethash_reloadedJeffrey Wilcke2015-05-0749-2394/+3419
|\ \ \ | |/ / |/| |
| * | Add ethash linux & windows build fixesGustav Simonsson2015-05-065-10/+11
| * | Unskip working blocktests following ethash cache reusageGustav Simonsson2015-05-051-10/+4
| * | Integrate new ethash API and change geth makedag cmdGustav Simonsson2015-05-059-27/+41
| * | Update ethash Godeps filesGustav Simonsson2015-05-0539-2353/+3369
* | | Merge pull request #771 from zsfelfoldi/developJeffrey Wilcke2015-05-064-35/+299
|\ \ \ | |/ / |/| |
| * | setTimeout and sendAsync implementedzsfelfoldi2015-05-064-35/+299
|/ /
* | Merge pull request #856 from karalabe/windows-console-color-fixJeffrey Wilcke2015-05-0510-2/+763
|\ \
| * | cmd/geth: fix #853 colorize console output in windowsPéter Szilágyi2015-05-0510-2/+763
|/ /
* | Merge pull request #835 from obscuren/handler_errorsJeffrey Wilcke2015-05-049-318/+547
|\ \ | |/ |/|
| * core: added unix timestamp to debug output for block procobscuren2015-05-041-1/+1
| * downloader: hash downloading recoveryobscuren2015-05-032-29/+71
| * cmd/geth, eth: bump version & tmp fix for incorrect TD peersobscuren2015-05-032-1/+8
| * eth/downloader: put back hashes on block overflow errorobscuren2015-05-031-19/+14
| * eth/downloader: changed has to blockHashes for chain linkingobscuren2015-05-031-1/+1
| * core: print ignored blocksobscuren2015-05-031-1/+1
| * eth/downloader: added additional testsobscuren2015-05-032-4/+73
| * eth,core: changed NewTicker to Tickobscuren2015-05-032-6/+6
| * core: added 'ignored' statusobscuren2015-05-011-2/+3
| * eth, eth/downloader: Moved block processing & graceful shutdownobscuren2015-05-016-291/+347
| * eth/downloader: delete blocks from queueobscuren2015-04-302-3/+15
| * core: added a wait group to chain manager for graceful shutdownobscuren2015-04-302-0/+9
| * core: check for parent in calc TD. TD = (N != 0 == parent.TD) || (== D)obscuren2015-04-301-0/+4
| * core, eth: verify td of received blocksobscuren2015-04-302-3/+25
| * eth, eth/downloader: remove bad peers from peer setobscuren2015-04-302-17/+29
|/
* Merge pull request #830 from obscuren/downloader-missing-parentJeffrey Wilcke2015-04-3015-33/+117
|\
| * cmd/geth: bump version to 0.9.14obscuren2015-04-301-1/+1
| * core: remove txs from queue in addition to removal of pendingobscuren2015-04-302-1/+49
| * core: added some additional chain tests for shortest chainobscuren2015-04-302-5/+30
| * eth: rely on p2p to determine block propagationobscuren2015-04-301-1/+1
| * p2p: added received at to peer messageobscuren2015-04-302-3/+5
| * core/types, eth: meassure and display propagation timesobscuren2015-04-302-1/+5
| * eth/downloader: drop blockobscuren2015-04-301-1/+1
| * core: fixed tetst to reflect (int, error) return by insertChainobscuren2015-04-292-4/+4
| * eth/downloader: ignore orphan blocks in the downloader.obscuren2015-04-291-5/+9
| * core: return the index of the block that failed when inserting a chainobscuren2015-04-297-14/+15
|/
* Merge pull request #825 from obscuren/developJeffrey Wilcke2015-04-296-35/+117
|\
| * eth/downloader: reset the chain when parent is missing during processingobscuren2015-04-291-0/+2
| * cmd/geth: bump version numberobscuren2015-04-291-1/+1
| * core: fixed chain reorg during splitsobscuren2015-04-292-27/+83
| * core/types: added fake parent hash / hash to String() outputobscuren2015-04-291-1/+11
| * eth: check if downloader is busy before showing log messageobscuren2015-04-292-0/+9
| * core: seperated proccing mutex and getting mutexobscuren2015-04-292-42/+48
| * core: bump database versionobscuren2015-04-291-1/+1
| * core: moved mutex locks in insert blocks to start of functionobscuren2015-04-291-41/+40
| * core: set min gas price at startupobscuren2015-04-291-10/+10
* | Merge pull request #822 from fjl/makefile-improvementsJeffrey Wilcke2015-04-2910-98/+121
|\ \ | |/ |/|
| * Use Makefile for Travis testsFelix Lange2015-04-295-36/+37
| * Makefile: add test targetFelix Lange2015-04-291-4/+7
| * cmd/mist: always enable whisperFelix Lange2015-04-291-0/+1
| * cmd/geth, cmd/mist: use gitCommit in node nameFelix Lange2015-04-292-15/+36
| * Makefile: set main.gitCommit when buildingFelix Lange2015-04-292-2/+15
| * cmd/mist: add blockchain version flagFelix Lange2015-04-291-0/+1
| * README: simplify build instructionsFelix Lange2015-04-291-40/+19
| * Makefile: clean should also delete Godeps/_workspace/pkgFelix Lange2015-04-291-1/+1
| * build: run build commands from the fake workspace rootFelix Lange2015-04-291-1/+5
* | Merge pull request #828 from tgerring/pathfixesJeffrey Wilcke2015-04-291-6/+7
|\ \ | |/ |/|
| * Remove path separator literalsTaylor Gerring2015-04-291-6/+7
|/
* Merge pull request #821 from karalabe/nodedb-fixJeffrey Wilcke2015-04-281-4/+6
|\
| * p2p/discover: fix api issues caused by leveldb updatePéter Szilágyi2015-04-281-4/+6
* | Merge pull request #820 from fjl/rlp-readkind-overflowJeffrey Wilcke2015-04-282-14/+40
|\ \ | |/ |/|
| * rlp: fix list bounds check overflow (found by go-fuzz)Felix Lange2015-04-282-14/+40
* | Merge pull request #793 from karalabe/discovery-node-cacheJeffrey Wilcke2015-04-2810-47/+691
|\ \
| * | p2p/discover: fix goroutine leak due to blocking on sync.OncePéter Szilágyi2015-04-282-13/+24
| * | p2p/discover: add node expirer and related testsPéter Szilágyi2015-04-273-4/+116
| * | p2p/discover: parametrize nodedb version, add persistency testsPéter Szilágyi2015-04-273-11/+62
| * | p2p/discover: drop a superfluous warningPéter Szilágyi2015-04-271-1/+1
| * | p2p/discover: wrap the pinger to update the node db tooPéter Szilágyi2015-04-271-4/+15
| * | p2p/discover: use iterator based seeding, drop old protocol testPéter Szilágyi2015-04-272-45/+118
| * | p2p/discover: write the basic tests, catch RLP bugPéter Szilágyi2015-04-273-8/+150
| * | p2p/discovery: fix issues raised in the nodeDb PRPéter Szilágyi2015-04-272-36/+32
| * | cmd/bootnode, eth, p2p, p2p/discover: use a fancier db designPéter Szilágyi2015-04-249-169/+280
| * | cmd/bootnode, eth, p2p, p2p/discover: clean up the seeder and mesh into eth.Péter Szilágyi2015-04-249-144/+168
| * | p2p/discovery: fix broken tests due to API updatePéter Szilágyi2015-04-242-4/+4
| * | p2p/discovery: use the seed table for finding nodes, auto drop stale onesPéter Szilágyi2015-04-242-5/+38
| * | cmd, eth, p2p, p2p/discover: init and clean up the seed cachePéter Szilágyi2015-04-246-9/+29
| * | p2p/discover: store nodes in leveldbFelix Lange2015-04-242-13/+73
| |/
* | Merge pull request #819 from karalabe/leveldb-updateJeffrey Wilcke2015-04-28155-10106/+7571
|\ \
| * | godeps: update leveldb and snappy, dump serpent-goPéter Szilágyi2015-04-28155-10106/+7571
* | | Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into developobscuren2015-04-2820-216/+1024
|\ \ \
| * \ \ Merge pull request #738 from karalabe/whisper-cleanupJeffrey Wilcke2015-04-2820-216/+1024
| |\ \ \ | | |/ / | |/| |
| | * | rpc, xeth: finish cleaning up xethPéter Szilágyi2015-04-282-17/+36
| | * | whisper: add full filter test suitePéter Szilágyi2015-04-282-2/+51
| | * | whisper: fix a small data race duirng peer connectionPéter Szilágyi2015-04-282-14/+12
| | * | xeth: fix un-decoded whisper RPC topic string bugPéter Szilágyi2015-04-281-2/+16
| | * | rpc: use nil topic wildcards instead of ""Péter Szilágyi2015-04-281-1/+1
| | * | ui/qt/qwhisper, whisper, xeth: polish topic filter, fix wildcardsPéter Szilágyi2015-04-287-45/+215
| | * | rpc, ui/qt/qwhisper, whisper, xeth: introduce complex topic filtersPéter Szilágyi2015-04-2811-59/+373
| | * | whisper: fix spurious From identity with untargeted messagesPéter Szilágyi2015-04-281-1/+3
| | * | whisper: fix payload loss in case of plaintext decryptPéter Szilágyi2015-04-282-4/+109