aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1879 from obscuren/versioningJeffrey Wilcke2015-10-061-2/+2
|\
| * cmd/geth: dev version numberJeffrey Wilcke2015-10-061-2/+2
* | Merge pull request #1877 from obscuren/head-writeJeffrey Wilcke2015-10-062-0/+16
|\ \ | |/ |/|
| * core: fixed head write on block insertionJeffrey Wilcke2015-10-052-0/+16
|/
* Merge pull request #1756 from obscuren/core-refactorJeffrey Wilcke2015-10-0562-1501/+1354
|\
| * cmd/geth, cmd/utils, core, rpc: renamed to blockchainJeffrey Wilcke2015-10-0435-302/+267
| * cmd/evm, core/vm, test: refactored VM and coreJeffrey Wilcke2015-10-0439-1062/+946
| * core, event/filter, xeth: refactored filter systemJeffrey Wilcke2015-10-034-158/+162
* | Merge pull request #1866 from karalabe/honor-eth-capabilitiesJeffrey Wilcke2015-10-023-8/+53
|\ \ | |/ |/|
| * eth/downloader: match capabilities when querying idle peersPéter Szilágyi2015-10-023-8/+53
* | Merge pull request #1865 from obscuren/deadlock-chainmanager-fixJeffrey Wilcke2015-10-021-1/+3
|\ \ | |/ |/|
| * core: deadlock in chainmanager after posting RemovedTransactionEventJeffrey Wilcke2015-10-021-1/+3
|/
* Merge pull request #1405 from fjl/lean-trieJeffrey Wilcke2015-10-0130-1059/+1515
|\
| * trie: add merkle proof functionsFelix Lange2015-09-232-0/+261
| * core, core/state: batch-based state syncFelix Lange2015-09-2310-90/+90
| * core, trie: new trieFelix Lange2015-09-2320-953/+1110
| * trie: improve benchmarksFelix Lange2015-09-231-34/+72
* | Merge pull request #1856 from karalabe/andorid-path-fixJeffrey Wilcke2015-10-013-21/+41
|\ \
| * | common: fix #1818, secondary datadir paths to fall back toPéter Szilágyi2015-10-013-21/+41
* | | Merge pull request #1859 from fjl/fix-discover-refresh-raceJeffrey Wilcke2015-09-306-183/+199
|\ \ \
| * | | p2p/discover: ignore packet version numbersFelix Lange2015-09-302-5/+0
| * | | p2p/discover: remove unused lastLookup fieldFelix Lange2015-09-301-6/+1
| * | | p2p/discover: fix race involving the seed node iteratorFelix Lange2015-09-305-172/+198
* | | | Merge pull request #1852 from obscuren/filter-nil-fixJeffrey Wilcke2015-09-301-12/+34
|\ \ \ \ | |_|/ / |/| | |
| * | | xeth: fixed nil pointer of filter retrievalJeffrey Wilcke2015-09-251-12/+34
| | |/ | |/|
* | | Merge pull request #1854 from karalabe/badhasherror-formatting-loopJeffrey Wilcke2015-09-291-1/+1
|\ \ \ | |_|/ |/| |
| * | core: fix a formatting loop in BadHashErrorPéter Szilágyi2015-09-291-1/+1
|/ /
* | Merge pull request #1843 from karalabe/cleanup-downloader-channelJeffrey Wilcke2015-09-251-20/+36
|\ \
| * | eth/downloader: always send termination wakes, clean leftoverPéter Szilágyi2015-09-231-20/+36
* | | Merge pull request #1803 from Gustav-Simonsson/badhashesJeffrey Wilcke2015-09-243-2/+66
|\ \ \
| * | | core: Add BadHashErr and test for BadHashes handlingGustav Simonsson2015-09-233-2/+66
|/ / /
* | | Merge pull request #1844 from obscuren/version-fileJeffrey Wilcke2015-09-231-0/+1
|\ \ \
| * | | VERSION: added versionJeffrey Wilcke2015-09-231-0/+1
| | |/ | |/|
* | | Merge pull request #1842 from fjl/rpc-fix-unknown-blockFelix Lange2015-09-233-31/+24
|\ \ \ | |_|/ |/| |
| * | rpc/api: don't crash for unknown blocksFelix Lange2015-09-231-25/+23
| * | cmd/geth, core: make "geth blocktest" work againFelix Lange2015-09-232-6/+1
| |/
* | Merge pull request #1827 from Gustav-Simonsson/common_testsJeffrey Wilcke2015-09-233-1/+6807
|\ \ | |/ |/|
| * tests: add test for StateTests/stCallCodes.jsonGustav Simonsson2015-09-213-1/+6807
* | Merge pull request #1835 from karalabe/make-crossJeffrey Wilcke2015-09-221-0/+27
|\ \
| * | makefile: built in cross compilation targetsPéter Szilágyi2015-09-221-0/+27
* | | Merge pull request #1669 from obscuren/tx-pool-auto-resendJeffrey Wilcke2015-09-2213-57/+231
|\ \ \ | |/ / |/| |
| * | core, core/types: readd transactions after chain re-orgJeffrey Wilcke2015-09-2213-57/+231
* | | cmd/geth: changed version number to 1.2.0Jeffrey Wilcke2015-09-211-2/+2
|/ /
* | Merge pull request #1822 from karalabe/contain-powJeffrey Wilcke2015-09-214-62/+327
|\ \ | |/ |/|
| * core: separate and contain POW verifier, extensive testsPéter Szilágyi2015-09-214-62/+327
|/
* Merge pull request #1814 from Gustav-Simonsson/common_testsJeffrey Wilcke2015-09-198-439/+13127
|\
| * tests: use lastblockhash field to validate reorgs and block headersGustav Simonsson2015-09-182-48/+58
| * tests: update common test wrappers and test filesGustav Simonsson2015-09-187-424/+13102
* | Merge pull request #1817 from obscuren/nonce-fixJeffrey Wilcke2015-09-192-2/+21
|\ \ | |/ |/|
| * core: transaction nonce recovery fixJeffrey Wilcke2015-09-182-2/+21
* | Merge pull request #1815 from karalabe/chain-maker-timerFelix Lange2015-09-181-0/+11
|\ \
| * | core: allow modifying test-chain block timesPéter Szilágyi2015-09-171-0/+11
* | | Merge pull request #1793 from jeffallen/typoFelix Lange2015-09-181-18/+19
|\ \ \
| * | | common: Update README.md for the current package nameJeff R. Allen2015-09-111-18/+19
* | | | Merge pull request #1813 from kobigurk/developFelix Lange2015-09-181-1/+3
|\ \ \ \
| * | | | cmd/geth: extradata is correcly initialized with consoleKobi Gurkan2015-09-171-1/+3
| | |_|/ | |/| |
* | | | Merge pull request #1811 from bas-vk/timer-clearintervalFelix Lange2015-09-181-1/+3
|\ \ \ \ | |_|_|/ |/| | |
| * | | jsre: timer bugfix when clearInterval was called from within the callbackBas van Kervel2015-09-161-1/+3
* | | | Merge pull request #1810 from karalabe/pure-header-verifications-2Jeffrey Wilcke2015-09-174-28/+26
|\ \ \ \ | |_|/ / |/| | |
| * | | core, eth, miner: use pure header validationPéter Szilágyi2015-09-164-28/+26
| |/ /
* | | Merge pull request #1801 from fjl/ethdbJeffrey Wilcke2015-09-1626-125/+142
|\ \ \
| * | | ethdb: remove FlushFelix Lange2015-09-154-51/+10
| * | | ethdb: copy stored memdb valuesFelix Lange2015-09-151-2/+1
| * | | ethdb: add NewBatchFelix Lange2015-09-153-0/+49
| * | | all: move common.Database to package ethdbFelix Lange2015-09-1524-75/+85
* | | | Merge pull request #1784 from karalabe/standard-sync-statsJeffrey Wilcke2015-09-168-251/+1174
|\ \ \ \ | |_|/ / |/| | |
| * | | jsre, rpc/api: pull in new web3 and use hex numbersPéter Szilágyi2015-09-153-187/+612
| * | | eth/downloader: header-chain order and ancestry checkPéter Szilágyi2015-09-153-7/+77
| * | | eth, rpc: standardize the chain sync progress countersPéter Szilágyi2015-09-157-68/+496
* | | | Merge pull request #1744 from kobigurk/developJeffrey Wilcke2015-09-161-1/+15
|\ \ \ \
| * | | | cmd/geth: adds extradata flagKobi Gurkan2015-09-161-1/+15
|/ / / /
* | | | Merge pull request #1806 from ethersphere/solc2Jeffrey Wilcke2015-09-152-14/+14
|\ \ \ \ | |/ / / |/| | |
| * | | new solc api:zelig2015-09-152-14/+14
|/ / /
* | | Merge pull request #1786 from ethersphere/solcFelix Lange2015-09-152-23/+49
|\ \ \
| * | | Solidity Compiler - solc new APIzelig2015-09-122-23/+49
| |/ /
* | | Merge pull request #1797 from karalabe/ensure-ipcpath-existsFelix Lange2015-09-141-1/+6
|\ \ \
| * | | rpc/comms: fix #1795, ensure IPC path exists before bindingPéter Szilágyi2015-09-111-1/+6
* | | | Merge pull request #1792 from jeffallen/uuidFelix Lange2015-09-1421-16/+237
|\ \ \ \ | |_|/ / |/| | |
| * | | Change go-uuid to use the current supported repository.Jeff R. Allen2015-09-1221-16/+237
| | |/ | |/|
* | | Merge pull request #1789 from Gustav-Simonsson/core_remove_unused_functionsJeffrey Wilcke2015-09-126-281/+0
|\ \ \
| * | | core, core/vm, core/state: remove unused functionsGustav Simonsson2015-09-116-281/+0
| |/ /
* | | Merge pull request #1796 from karalabe/ethash-android-supportJeffrey Wilcke2015-09-126-3/+4
|\ \ \
| * | | godeps: pull in ethash android fixPéter Szilágyi2015-09-116-3/+4
| | |/ | |/|
* | | Merge pull request #1779 from karalabe/split-block-storage-3000Jeffrey Wilcke2015-09-1118-381/+881
|\ \ \ | |/ / |/| |
| * | core: split out TD from database and all internalsPéter Szilágyi2015-09-1119-294/+590
| * | core, eth: split the db blocks into headers and bodiesPéter Szilágyi2015-09-119-226/+430
|/ /
* | Merge pull request #1773 from obscuren/dev-modeFelix Lange2015-09-113-7/+42
|\ \
| * | cmd/geth, cmd/utils, eth: added dev mode flagJeffrey Wilcke2015-09-093-7/+42
* | | Merge pull request #1778 from fjl/rlp-trie-changesJeffrey Wilcke2015-09-116-11/+413
|\ \ \ | |_|/ |/| |
| * | rlp: move ListSize to raw.goFelix Lange2015-09-112-6/+6
| * | rlp: add RawValueFelix Lange2015-09-115-1/+39
| * | rlp: add Split functionsFelix Lange2015-09-113-1/+337
| * | rlp: fix encReader returning nil buffers to the poolFelix Lange2015-09-112-4/+32
| |/
* | Merge pull request #1781 from Gustav-Simonsson/state_object_copyFelix Lange2015-09-102-0/+105
|\ \
| * | core/state: test formatting adhering to Go conventionGustav Simonsson2015-09-091-17/+17
| * | core/state: deleted field in StateObject Copy() and unit testGustav Simonsson2015-09-082-0/+105
* | | Merge pull request #1780 from bas-vk/miner-crashJeffrey Wilcke2015-09-091-1/+9
|\ \ \ | |/ / |/| |
| * | put unlock after lockBas van Kervel2015-09-081-5/+3
| * | agent/miner Prevent the CpuAgent to be started multiple timesBas van Kervel2015-09-081-2/+12
| |/
* | Merge pull request #1777 from hectorchu/developPéter Szilágyi2015-09-081-2/+2
|\ \
| * | rpc/comms: fix bug attaching the console over httpHector Chu2015-09-071-2/+2
| |/
* | Merge pull request #1774 from bas-vk/console-crashPéter Szilágyi2015-09-081-1/+1
|\ \ | |/ |/|
| * cmd/geth Autocompletion bugfix which let the console crashBas van Kervel2015-09-061-1/+1
|/
* Merge pull request #1752 from karalabe/fix-eth61-testFelix Lange2015-09-031-1/+3
|\
| * eth/downloader: fix race causing occasional test failurePéter Szilágyi2015-09-011-1/+3
* | Merge pull request #1764 from kobigurk/honor_ipc_datadirPéter Szilágyi2015-09-031-1/+1
|\ \
| * | cmd/geth: honor datadir when attachingKobi Gurkan2015-09-031-1/+1
|/ /
* | Merge pull request #1761 from CJentzsch/patch-3Jeffrey Wilcke2015-09-031-1/+1
|\ \
| * | fix block time issueChristoph Jentzsch2015-09-031-1/+1
|/ /
* | Merge pull request #1726 from Gustav-Simonsson/update_testsFelix Lange2015-09-03750-1865/+2305
|\ \
| * | Add TestBcForkUncleTests and update JSON filesGustav Simonsson2015-08-31750-1865/+2305
| |/
* | Merge pull request #1755 from fjl/coinbaseGustav Simonsson2015-09-022-24/+27
|\ \
| * | core: improve block gas trackingFelix Lange2015-09-022-24/+27
|/ /
* | Merge pull request #1751 from maran/fix_filtersFelix Lange2015-09-021-3/+3
|\ \
| * | Filter on addresses should work as an OR not an AND.Maran2015-09-011-3/+3
* | | Merge pull request #1745 from mrdomino/obsd-build-masterFelix Lange2015-09-029-4/+20
|\ \ \ | |_|/ |/| |
| * | Pull in ethash and go-isatty updatesSteven Dee2015-09-019-4/+20
| |/
* | Merge pull request #1742 from fjl/rpc-receipt-rootFelix Lange2015-08-311-0/+6
|\ \
| * | rpc: add receiptRoot to getBlock* responsesFelix Lange2015-08-291-0/+6
* | | Merge pull request #1734 from fjl/ldflags-warning-go1.5Felix Lange2015-08-311-1/+6
|\ \ \ | |_|/ |/| |
| * | build: avoid -X separator warning with Go >= 1.5Felix Lange2015-08-271-1/+6
| |/
* | Merge pull request #1724 from Gustav-Simonsson/get_workFelix Lange2015-08-294-4/+27
|\ \
| * | Improve error string and remove unneeded else clauseGustav Simonsson2015-08-283-7/+6
| * | rpc: return error code for eth_getWork when no work readyGustav Simonsson2015-08-264-4/+28
* | | Merge pull request #1739 from bas-vk/empty-passwordFelix Lange2015-08-282-4/+4
|\ \ \ | |_|/ |/| |
| * | rpc/api allow empty passwordBas van Kervel2015-08-282-4/+4
|/ /
* | Merge pull request #1701 from karalabe/eth62-sync-rebaseFelix Lange2015-08-2723-1274/+3347
|\ \
| * | eth: update metrics collection to handle eth/62 algosPéter Szilágyi2015-08-257-36/+160
| * | eth: port the synchronisation algo to eth/62Péter Szilágyi2015-08-2510-341/+2010
| * | eth: kill off protocol eth/60 in preparation for eth/62Péter Szilágyi2015-08-246-804/+28
| * | eth, eth/downloader: handle header requests, table driven proto testsPéter Szilágyi2015-08-2414-254/+1209
| * | eth, metrics, p2p: prepare metrics and net packets to eth/62Péter Szilágyi2015-08-217-48/+149
* | | Merge pull request #1717 from karalabe/forward-solidity-errorsFelix Lange2015-08-271-58/+46
|\ \ \
| * | | common/compiler: fix #1598, expose solidity errorsPéter Szilágyi2015-08-261-58/+46
| | |/ | |/|
* | | Merge pull request #1718 from caktux/developFelix Lange2015-08-271-0/+1
|\ \ \
| * | | add missing shh_getMessages to RPC mappingscaktux2015-08-261-0/+1
| |/ /
* | | Merge pull request #1721 from bas-vk/console-error-parsingFelix Lange2015-08-272-8/+7
|\ \ \
| * | | bugfix console error handlingBas van Kervel2015-08-262-8/+7
| |/ /
* | | Merge pull request #1722 from bas-vk/remote-deleteaccountFelix Lange2015-08-273-47/+0
|\ \ \ | |/ / |/| |
| * | rpc/api - remove personal.deleteAccount from RPC interfaceBas van Kervel2015-08-263-47/+0
|/ /
* | Merge pull request #1711 from Gustav-Simonsson/timestamp_big_intFelix Lange2015-08-2521-43/+380
|\ \
| * | Add tests for uncle timestamps and refactor timestamp typeGustav Simonsson2015-08-2521-43/+380
| |/
* | Merge pull request #1710 from bas-vk/useragentFelix Lange2015-08-254-20/+48
|\ \ | |/ |/|
| * Set ipc channel as user agent clientBas van Kervel2015-08-244-20/+48
|/
* cmd/geth: bumped version 1.1.0Jeffrey Wilcke2015-08-211-3/+3
* remove 0xJeffrey Wilcke2015-08-211-1/+1
* canary updateJeffrey Wilcke2015-08-211-4/+4
* core, tests: Double SUICIDE fixJeffrey Wilcke2015-08-215-165/+785
* cmd/geth: bumped version 1.0.3Jeffrey Wilcke2015-08-201-2/+2
* geth: bumped version 1.0.2Jeffrey Wilcke2015-08-201-2/+2
* Merge pull request #1694 from obscuren/hide-fdtrackJeffrey Wilcke2015-08-2015-314/+7
|\
| * Revert "fdtrack: temporary hack for tracking file descriptor usage"Jeffrey Wilcke2015-08-2015-314/+7
* | Merge pull request #1652 from bas-vk/autoreconnectJeffrey Wilcke2015-08-201-3/+5
|\ \
| * | rpc/comms reconnect ipc client after write errorBas van Kervel2015-08-201-3/+5
| |/
* | Merge pull request #1689 from fjl/discover-ignore-temp-errorsJeffrey Wilcke2015-08-204-11/+51
|\ \ | |/ |/|
| * p2p/discover: don't attempt to replace nodes that are being replacedFelix Lange2015-08-192-4/+15
| * p2p: continue listening after temporary errorsFelix Lange2015-08-191-6/+25
| * p2p/discover: continue reading after temporary errorsFelix Lange2015-08-191-1/+11
* | Merge pull request #1688 from karalabe/fix-double-importsJeffrey Wilcke2015-08-191-2/+4
|\ \
| * | eth: fix an issue with pulling and inserting blocks twicePéter Szilágyi2015-08-191-2/+4
| |/
* | Merge pull request #1680 from maran/fix_removedbJeffrey Wilcke2015-08-191-4/+3
|\ \ | |/ |/|
| * cmd/geth: Fix chain purging from cmd lineMaran2015-08-181-4/+3
* | Merge pull request #1454 from ethersphere/frozen-cryptocleanJeffrey Wilcke2015-08-194-1878/+0
|\ \
| * | crypto: remove obsolete key fileszelig2015-08-184-1878/+0
| |/
* | Merge pull request #1683 from ethereum/travisJeffrey Wilcke2015-08-192-24/+13
|\ \
| * | Codecov integrationTaylor Gerring2015-08-192-24/+13
* | | Merge pull request #1682 from obscuren/readme-improvementsJeffrey Wilcke2015-08-192-25/+29
|\ \ \ | |/ / |/| |
| * | Updated README, Added CONTRIBUTINGJeffrey Wilcke2015-08-192-25/+29
* | | Merge pull request #1681 from obscuren/miner-receipt-fixJeffrey Wilcke2015-08-194-9/+14
|\ \ \ | |_|/ |/| |
| * | core, miner: write miner receiptsJeffrey Wilcke2015-08-194-9/+14
| |/
* | Merge pull request #1675 from obscuren/submithashrate-changeJeffrey Wilcke2015-08-181-2/+2
|\ \
| * | rpc/api: return boolean value for eth_submitHashrateJeffrey Wilcke2015-08-171-2/+2
* | | Merge pull request #1673 from karalabe/fix-api-xeth-responsesJeffrey Wilcke2015-08-181-5/+13
|\ \ \ | |_|/ |/| |
| * | rpc: update the xeth over RPC API to use the success/failure messagesPéter Szilágyi2015-08-171-5/+13
* | | Merge pull request #1627 from zsfelfoldi/gpoJeffrey Wilcke2015-08-171-10/+13
|\ \ \
| * | | GPO updatezsfelfoldi2015-08-171-10/+13
* | | | Merge pull request #1649 from maran/pending_tx_responseJeffrey Wilcke2015-08-171-8/+8
|\ \ \ \
| * | | | rpc/api: format pendingTx response. Fixes #1648Maran2015-08-161-8/+8
* | | | | Merge pull request #1674 from tgerring/bootnodesJeffrey Wilcke2015-08-171-3/+4
|\ \ \ \ \
| * | | | | Update CPP pubkeyTaylor Gerring2015-08-171-1/+1
| * | | | | Added SG bootnodeTaylor Gerring2015-08-171-2/+3
| | |_|/ / | |/| | |
* | | | | Merge pull request #1667 from fjl/pretty-printer-improvementsJeffrey Wilcke2015-08-172-6/+18
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | jsre: fix annoying indentation when printing arrays of objectsFelix Lange2015-08-161-6/+9
| * | | | jsre: bind the pretty printer to "inspect" in JSFelix Lange2015-08-162-0/+9
* | | | | Merge pull request #1654 from obscuren/call-gasJeffrey Wilcke2015-08-171-5/+9
|\ \ \ \ \
| * | | | | xeth: max gas limitJeffrey Wilcke2015-08-161-5/+9
| | |_|_|/ | |/| | |
* | | | | Merge pull request #1663 from obscuren/issue-1662Jeffrey Wilcke2015-08-161-4/+4
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | xeth: added a transact muJeffrey Wilcke2015-08-151-4/+4
| |/ / /
* | | | Merge pull request #1659 from bas-vk/exec-outputJeffrey Wilcke2015-08-151-6/+1
|\ \ \ \ | |/ / / |/| | |
| * | | main print console output for js statement given by the exec argumentBas van Kervel2015-08-141-6/+1
* | | | Merge pull request #1658 from bas-vk/liner-ctrl-cJeffrey Wilcke2015-08-141-0/+11
|\ \ \ \
| * | | | main clear current line on ctrl-CBas van Kervel2015-08-141-0/+11
* | | | | Merge pull request #1642 from ethereum/fix-js-console-windowsJeffrey Wilcke2015-08-1427-872/+1941
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | cmd/geth, jsre: restore command line editing on windowsFelix Lange2015-08-1227-872/+1941
* | | | | Merge pull request #1655 from obscuren/db-merge-fixJeffrey Wilcke2015-08-143-21/+19
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | eth, trie: removed key prefixing from state entries & merge db fixJeffrey Wilcke2015-08-143-21/+19
* | | | | Merge pull request #1635 from bas-vk/useragentJeffrey Wilcke2015-08-1419-88/+361
|\ \ \ \ \
| * | | | | support for user agentsBas van Kervel2015-08-1219-88/+361
* | | | | | Merge pull request #1638 from obscuren/jit-fixesJeffrey Wilcke2015-08-1412-41/+34
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | cmd/evm, core/vm, tests: changed DisableVm to EnableVmJeffrey Wilcke2015-08-1210-30/+20
| * | | | | core/vm: fixed jit error & added inline docsJeffrey Wilcke2015-08-112-11/+14
| |/ / / /
* | | | | Merge pull request #1470 from ebuchman/encHandshakeFelix Lange2015-08-131-4/+12
|\ \ \ \ \
| * | | | | p2p: validate recovered ephemeral pubkey against checksum in decodeAuthMsgEthan Buchman2015-07-141-4/+12
* | | | | | Merge pull request #1651 from karalabe/rlp-boolean-supportFelix Lange2015-08-134-0/+53
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | rlp: add support for boolean encoding/decodingPéter Szilágyi2015-08-134-0/+53
|/ / / / /
* | | | | Merge pull request #1647 from fjl/fix-disc-reasonFelix Lange2015-08-131-1/+1
|\ \ \ \ \
| * | | | | p2p: fix value of DiscSubprotocolErrorFelix Lange2015-08-121-1/+1
| | |_|/ / | |/| | |
* | | | | Merge pull request #1646 from fjl/fix-client-identifierFelix Lange2015-08-121-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | cmd/geth: remove spaces in client identifierFelix Lange2015-08-121-1/+1
|/ / / /
* | | | Merge pull request #1621 from ethereum/fix-discover-hangsJeffrey Wilcke2015-08-124-83/+197
|\ \ \ \
| * | | | p2p/discover: fix UDP reply packet timeout handlingFelix Lange2015-08-112-31/+120
| * | | | p2p/discover: unlock the table during ping replacementFelix Lange2015-08-113-52/+77
* | | | | Merge pull request #1641 from obscuren/web3-updateJeffrey Wilcke2015-08-111-931/+2100
|\ \ \ \ \
| * | | | | web3: updatedJeffrey Wilcke2015-08-111-931/+2100
|/ / / / /
* | | | | Merge pull request #1640 from obscuren/trace-flag-ethtestJeffrey Wilcke2015-08-111-1/+7
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | cmd/ethtest: added trace flag for debuggingJeffrey Wilcke2015-08-111-1/+7
|/ / / /
* | | | Merge pull request #1604 from obscuren/db-mergeJeffrey Wilcke2015-08-0921-187/+223
|\ \ \ \
| * | | | core, eth, trie, xeth: merged state, chain, extra databases in oneJeffrey Wilcke2015-08-0821-187/+223
* | | | | Merge pull request #1611 from obscuren/expdiff-olympic-fixJeffrey Wilcke2015-08-092-2/+4
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | cmd/utils, core: disable exp diff for olympic netJeffrey Wilcke2015-08-062-2/+4
* | | | | Merge pull request #1626 from obscuren/defaults-fixJeffrey Wilcke2015-08-092-3/+4
|\ \ \ \ \
| * | | | | cmd/geth, core/vm: setup vm settings and defaulted JIT disabledJeffrey Wilcke2015-08-092-3/+4
|/ / / / /
* | | | | Merge pull request #1490 from obscuren/jit-vmJeffrey Wilcke2015-08-0823-100/+1569
|\ \ \ \ \
| * | | | | core/vm: reduced big int allocationsJeffrey Wilcke2015-08-074-123/+78
| * | | | | core, tests: reduced state copy by N callsJeffrey Wilcke2015-08-079-18/+39
| * | | | | core/vm, tests: implemented semi-jit vmJeffrey Wilcke2015-08-0719-79/+1572
| | |_|/ / | |/| | |
* | | | | Merge pull request #1620 from caktux/developJeffrey Wilcke2015-08-081-1/+1
|\ \ \ \ \
| * | | | | string version for build servercaktux2015-08-081-1/+1
|/ / / / /
* | | | | Merge pull request #1615 from obscuren/contract-addr-fixJeffrey Wilcke2015-08-071-1/+1
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | xeth: fixed contract addr checkJeffrey Wilcke2015-08-071-1/+1
|/ / / /
* | | | Merge pull request #1595 from obscuren/extra-dataJeffrey Wilcke2015-08-074-16/+42
|\ \ \ \
| * | | | miner, rpc: added length check for extra dataJeffrey Wilcke2015-08-072-7/+10
| * | | | cmd/geth, eth: added canonical extra dataJeffrey Wilcke2015-08-072-9/+32
* | | | | Merge pull request #1614 from obscuren/web3-finite-fixJeffrey Wilcke2015-08-071-2/+2
|\ \ \ \ \
| * | | | | web3: regression. Fixes #1613Jeffrey Wilcke2015-08-071-2/+2
| |/ / / /
* | | | | Merge pull request #1596 from obscuren/submit-hashrateJeffrey Wilcke2015-08-074-4/+85
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | miner, rpc: added submit hashrate for remote agentsJeffrey Wilcke2015-08-064-4/+85
| | |/ / | |/| |
* | | | Merge pull request #1610 from obscuren/address-checkJeffrey Wilcke2015-08-072-0/+37
|\ \ \ \ | |_|/ / |/| | |
| * | | xeth: added address hex check and length checkJeffrey Wilcke2015-08-072-0/+37
|/ / /
* | | Merge pull request #1600 from ethereum/fix-tests-windowsJeffrey Wilcke2015-08-0714-96/+59
|\ \ \
| * | | .gitattributes: addFelix Lange2015-08-061-0/+2
| * | | p2p/nat: disable UPnP test on windowsFelix Lange2015-08-061-0/+5
| * | | common/compiler, common/docserver, jsre: fix tests on windowsFelix Lange2015-08-064-17/+38
| * | | cmd/utils: fix path expansion on windowsFelix Lange2015-08-062-10/+4
| * | | common: remove windows path functionsFelix Lange2015-08-064-65/+2
| * | | p2p/discover: close Table during testingFelix Lange2015-08-062-4/+8
* | | | Merge pull request #1603 from ebuchman/trie_hex_fixJeffrey Wilcke2015-08-072-24/+70
|\ \ \ \
| * | | | trie: run codec tests, add benchmarks, fasterEthan Buchman2015-08-072-24/+70
|/ / / /
* | | | Merge pull request #1594 from ebuchman/trie_hex_fixJeffrey Wilcke2015-08-065-39/+30
|\ \ \ \ | |_|/ / |/| | |
| * | | faster hex-prefix codec and string -> []byteEthan Buchman2015-08-065-39/+30