aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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 #1835 from karalabe/make-crossJeffrey Wilcke2015-09-221-0/+27
|\ | | | | makefile: built in cross compilation targets
| * 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, xeth: chain reorg move missing transactions to transaction pool
| * core, core/types: readd transactions after chain re-orgJeffrey Wilcke2015-09-2213-57/+231
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Added a `Difference` method to `types.Transactions` which sets the receiver to the difference of a to b (NOTE: not a **and** b). Transaction pool subscribes to RemovedTransactionEvent adding back to those potential missing from the chain. When a chain re-org occurs remove any transactions that were removed from the canonical chain during the re-org as well as the receipts that were generated in the process. Closes #1746
* | cmd/geth: changed version number to 1.2.0Jeffrey Wilcke2015-09-211-2/+2
|/ | | Changed the version number of geth to 1.2.0 so that dev builds are now properly build (instead of master). Note to self; increase version number to 1.2.1 for our next actual release.
* Merge pull request #1822 from karalabe/contain-powJeffrey Wilcke2015-09-214-62/+327
|\ | | | | core: separate and contain POW verifier, extensive tests
| * 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: update common test wrappers and test files
| * 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
| * core: transaction nonce recovery fixJeffrey Wilcke2015-09-182-2/+21
| | | | | | | | | | | | | | | | When the transaction state recovery kicked in it assigned the last (incorrect) nonce to the pending state which caused transactions with the same nonce to occur. Added test for nonce recovery
* | Merge pull request #1815 from karalabe/chain-maker-timerFelix Lange2015-09-181-0/+11
|\ \ | | | | | | core: allow modifying test-chain block times
| * | 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 name
| * | | 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 console
| * | | | 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
|\ \ \ \ | |_|_|/ |/| | | timer bugfix when clearInterval was called from within the callback
| * | | 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 validation
| * | | 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
|\ \ \ | | | | | | | | all: move common.Database to ethdb and add NewBatch
| * | | ethdb: remove FlushFelix Lange2015-09-154-51/+10
| | | |
| * | | ethdb: copy stored memdb valuesFelix Lange2015-09-151-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | Storing a value in LevelDB copies the bytes, modifying the value afterwards does not affect the content of the database. This commit ensures that MemDatabase satisfies the same property.
| * | | 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
|\ \ \ \ | |_|/ / |/| | | eth, rpc: standardize the chain sync progress counters
| * | | 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
|\ \ \ \ | | | | | | | | | | adds extradata flag
| * | | | 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 - late fixes
| * | | new solc api:zelig2015-09-152-14/+14
|/ / / | | | | | | | | | | | | | | | * use legacy version matcher * optimise just a boolean flag * skipf for messages in tests
* | | Merge pull request #1786 from ethersphere/solcFelix Lange2015-09-152-23/+49
|\ \ \ | | | | | | | | common/compiler: new solc API
| * | | Solidity Compiler - solc new APIzelig2015-09-122-23/+49
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | * adapt to new compiler versioning * use compiler version as language version * implement new solc API for versions >= 0.1.[2-9][0-9]* fixes #1770 * add optimize=1 to options * backward compatibility (for now) for <= 0.1.1, and old versions (0.[2-9][0-9]*.[0-9]+) * introduce compilerOptions to ContractInfo * clean up flair, include full version string to version line and ContractInfo
* | | Merge pull request #1797 from karalabe/ensure-ipcpath-existsFelix Lange2015-09-141-1/+6
|\ \ \ | | | | | | | | rpc/comms: fix #1795, ensure IPC path exists before binding
| * | | 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.
| * | | 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 functions
| * | | 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 fix
| * | | 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 the db blocks into components, move TD out top level
| * | 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 flag
| * | cmd/geth, cmd/utils, eth: added dev mode flagJeffrey Wilcke2015-09-093-7/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Dev mode enabled some debugging flags such as: * VM debugging mode * Simpler proof of work * Whisper enabled by default * Datadir to a tmp datadir * Maxpeers set to 0 * Gas price of 0 * Random listen port
* | | Merge pull request #1778 from fjl/rlp-trie-changesJeffrey Wilcke2015-09-116-11/+413
|\ \ \ | |_|/ |/| | rlp: precursor changes for trie, p2p
| * | 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
| | | | | | | | | | | | | | | These functions allow destructuring of raw rlp-encoded bytes without the overhead of reflection or copying.
| * | rlp: fix encReader returning nil buffers to the poolFelix Lange2015-09-112-4/+32
| |/ | | | | | | | | | | The bug can cause crashes if Read is called after EOF has been returned. No code performs such calls right now, but hitting the bug gets more likely as rlp.EncodeToReader gets used in more places.
* | Merge pull request #1781 from Gustav-Simonsson/state_object_copyFelix Lange2015-09-102-0/+105
|\ \ | | | | | | core/state: deleted field in StateObject Copy() and unit test
| * | 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
|\ \ \ | |/ / |/| | agent/miner Prevent the CpuAgent to be started multiple times
| * | 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 http
| * | 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 crash
| * 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 failure
| * 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
|\ \ | | | | | | honors datadir when attaching
| * | 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 issue
| * | fix block time issueChristoph Jentzsch2015-09-031-1/+1
|/ / | | | | | | | | | | | | currently, under normal circumstances, you always set the timestamp to previous.Time() + 1. credits to https://www.reddit.com/r/ethereum/comments/3jcs5r/code_avg_block_time_vs_difficulty_adjustment/cuoi4op style
* | Merge pull request #1726 from Gustav-Simonsson/update_testsFelix Lange2015-09-03750-1865/+2305
|\ \ | | | | | | Add TestBcForkUncle tests & update JSON files
| * | 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 tracking
| * | core: improve block gas trackingFelix Lange2015-09-022-24/+27
|/ /
* | Merge pull request #1751 from maran/fix_filtersFelix Lange2015-09-021-3/+3
|\ \ | | | | | | core: Filter on addresses should work as an OR not an AND.
| * | 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 updates
| * | Pull in ethash and go-isatty updatesSteven Dee2015-09-019-4/+20
| |/ | | | | | | Fixes build on OpenBSD.
* | Merge pull request #1742 from fjl/rpc-receipt-rootFelix Lange2015-08-311-0/+6
|\ \ | | | | | | rpc: add receiptRoot to getBlock* responses
| * | rpc: add receiptRoot to getBlock* responsesFelix Lange2015-08-291-0/+6
| | | | | | | | | | | | Fixes #1679
* | | Merge pull request #1734 from fjl/ldflags-warning-go1.5Felix Lange2015-08-311-1/+6
|\ \ \ | |_|/ |/| | build: avoid -X separator warning with Go >= 1.5
| * | 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
|\ \ | | | | | | rpc: return error code for eth_getWork when no work ready
| * | 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 password
| * | 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: implement eth/62 synchronization logic
| * | 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 errors
| * | | 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 mappings
| * | | 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
|\ \ \ | | | | | | | | Improved console error handling
| * | | bugfix console error handlingBas van Kervel2015-08-262-8/+7
| |/ /
* | | Merge pull request #1722 from bas-vk/remote-deleteaccountFelix Lange2015-08-273-47/+0
|\ \ \ | |/ / |/| | Remove personal.deleteAccount from RPC interface
| * | 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 type
| * | 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
|\ \ | |/ |/| user agent messages were dumped in some cases
| * 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
|\ | | | | fdtrack: hide message
| * Revert "fdtrack: temporary hack for tracking file descriptor usage"Jeffrey Wilcke2015-08-2015-314/+7
| | | | | | | | This reverts commit 5c949d3b3ba81ea0563575b19a7b148aeac4bf61.
* | Merge pull request #1652 from bas-vk/autoreconnectJeffrey Wilcke2015-08-201-3/+5
|\ \ | | | | | | rpc/comms: reconnect ipc client after write error
| * | 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, p2p/discover: small fixes
| * p2p/discover: don't attempt to replace nodes that are being replacedFelix Lange2015-08-192-4/+15
| | | | | | | | | | | | | | | | PR #1621 changed Table locking so the mutex is not held while a contested node is being pinged. If multiple nodes ping the local node during this time window, multiple ping packets will be sent to the contested node. The changes in this commit prevent multiple packets by tracking whether the node is being replaced.
| * p2p: continue listening after temporary errorsFelix Lange2015-08-191-6/+25
| |
| * p2p/discover: continue reading after temporary errorsFelix Lange2015-08-191-1/+11
| | | | | | | | Might solve #1579
* | Merge pull request #1688 from karalabe/fix-double-importsJeffrey Wilcke2015-08-191-2/+4
|\ \ | | | | | | eth: fix an issue with pulling and inserting blocks twice
| * | 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 line
| * 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 code
| * | crypto: remove obsolete key fileszelig2015-08-184-1878/+0
| |/
* | Merge pull request #1683 from ethereum/travisJeffrey Wilcke2015-08-192-24/+13
|\ \ | | | | | | Switch from Coveralls to Codecov code coverage service
| * | Codecov integrationTaylor Gerring2015-08-192-24/+13
| | |
* | | Merge pull request #1682 from obscuren/readme-improvementsJeffrey Wilcke2015-08-192-25/+29
|\ \ \ | |/ / |/| | Updated README, Added CONTRIBUTING
| * | 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 receipts
| * | 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_submitHashrate
| * | 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 messages
| * | 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 update
| * | | 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 #1648
| * | | | rpc/api: format pendingTx response. Fixes #1648Maran2015-08-161-8/+8
| | | | |
* | | | | Merge pull request #1674 from tgerring/bootnodesJeffrey Wilcke2015-08-171-3/+4
|\ \ \ \ \ | | | | | | | | | | | | Added SG bootnode
| * | | | | 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: pretty printer improvements
| * | | | jsre: fix annoying indentation when printing arrays of objectsFelix Lange2015-08-161-6/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The pretty printer, dumb as it is, printed arrays of objects as [{ ... }] With this change, they now print as: [{ ... }]
| * | | | 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: call fix when doing 'create'-like calls
| * | | | | 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 mu
| * | | | xeth: added a transact muJeffrey Wilcke2015-08-151-4/+4
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added a transact mutex. The transact mutex will fix an issue where transactions were created with the same nonce resulting in some transactions being dropped. This happened when two concurrent calls would call the `Transact` method (which is OK) which would both call `GetNonce`. While the managed is thread safe it does not help us in this case.
* | | | Merge pull request #1659 from bas-vk/exec-outputJeffrey Wilcke2015-08-151-6/+1
|\ \ \ \ | |/ / / |/| | | Javascript --exec output
| * | | 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
|\ \ \ \ | | | | | | | | | | Clear current line on ctrl-C
| * | | | 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 windows
| * | | | cmd/geth, jsre: restore command line editing on windowsFelix Lange2015-08-1227-872/+1941
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PR #856 broke command line editing by wrapping stdout with a filter that interprets ANSI escape sequences to fix colored printing on windows. Implement the printer in Go instead so it can do its own platform-dependent coloring. As a nice side effect, the JS console is now noticeably more responsive when printing results. Fixes #1608 Fixes #1612
* | | | | Merge pull request #1655 from obscuren/db-merge-fixJeffrey Wilcke2015-08-143-21/+19
|\ \ \ \ \ | |_|/ / / |/| | | | eth, trie: removed key prefixing from state entries & merge db fix
| * | | | eth, trie: removed key prefixing from state entries & merge db fixJeffrey Wilcke2015-08-143-21/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed database merge strategy to use the correct database. Due to a copy paste fail when doing type evaluation the same database was being iterated (chain), all others were ignored. Removed state prefixing because {H(code): code} is stored in the same database as the rest of the state.
* | | | | Merge pull request #1635 from bas-vk/useragentJeffrey Wilcke2015-08-1419-88/+361
|\ \ \ \ \ | | | | | | | | | | | | support for user agents
| * | | | | support for user agentsBas van Kervel2015-08-1219-88/+361
| | | | | |
* | | | | | Merge pull request #1638 from obscuren/jit-fixesJeffrey Wilcke2015-08-1412-41/+34
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | core/vm: fixed jit error & added inline docs
| * | | | | 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
| |/ / / / | | | | | | | | | | | | | | | | | | | | opNumber did not create a new big int which could lead to the block's number being modified.
* | | | | Merge pull request #1470 from ebuchman/encHandshakeFelix Lange2015-08-131-4/+12
|\ \ \ \ \ | | | | | | | | | | | | p2p: validate recovered ephemeral pubkey
| * | | | | 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: boolean support
| * | | | | 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 DiscSubprotocolError
| * | | | | p2p: fix value of DiscSubprotocolErrorFelix Lange2015-08-121-1/+1
| | |_|/ / | |/| | | | | | | | | | | | | We had the wrong value (12) since forever.
* | | | | Merge pull request #1646 from fjl/fix-client-identifierFelix Lange2015-08-121-1/+1
|\ \ \ \ \ | |/ / / / |/| | | | cmd/geth: remove spaces in client identifier
| * | | | 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 two major bugs in reply packet handling
| * | | | p2p/discover: fix UDP reply packet timeout handlingFelix Lange2015-08-112-31/+120
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the timeout fired (even just nanoseconds) before the deadline of the next pending reply, the timer was not rescheduled. The timer would've been rescheduled anyway once the next packet was sent, but there were cases where no next packet could ever be sent due to the locking issue fixed in the previous commit. As timing-related bugs go, this issue had been present for a long time and I could never reproduce it. The test added in this commit did reproduce the issue on about one out of 15 runs.
| * | | | p2p/discover: unlock the table during ping replacementFelix Lange2015-08-113-52/+77
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Table.mutex was being held while waiting for a reply packet, which effectively made many parts of the whole stack block on that packet, including the net_peerCount RPC call.
* | | | | Merge pull request #1641 from obscuren/web3-updateJeffrey Wilcke2015-08-111-931/+2100
|\ \ \ \ \ | | | | | | | | | | | | web3: updated
| * | | | | 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 debugging
| * | | | 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 one
| * | | | 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 net
| * | | | 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 disabled
| * | | | | 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: jit vm
| * | | | | core/vm: reduced big int allocationsJeffrey Wilcke2015-08-074-123/+78
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reduced big int allocation by making stack items modifiable. Instead of adding items such as `common.Big0` to the stack, `new(big.Int)` is added instead. One must expect that any item that is added to the stack might change.
| * | | | | core, tests: reduced state copy by N callsJeffrey Wilcke2015-08-079-18/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reduced the amount of state copied that are required by N calls by doing a balance check prior to any state modifications.
| * | | | | core/vm, tests: implemented semi-jit vmJeffrey Wilcke2015-08-0719-79/+1572
| | |_|/ / | |/| | | | | | | | | | | | | * changed stack and removed stack ptr. Let go decide on slice reuse.
* | | | | Merge pull request #1620 from caktux/developJeffrey Wilcke2015-08-081-1/+1
|\ \ \ \ \ | | | | | | | | | | | | string version for build server
| * | | | | 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 check
| * | | | xeth: fixed contract addr checkJeffrey Wilcke2015-08-071-1/+1
|/ / / /
* | | | Merge pull request #1595 from obscuren/extra-dataJeffrey Wilcke2015-08-074-16/+42
|\ \ \ \ | | | | | | | | | | cmd/geth, eth: added canonical extra data
| * | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | Implemented canonical extra data according to https://github.com/ethereum/wiki/wiki/Extra-Data
* | | | | Merge pull request #1614 from obscuren/web3-finite-fixJeffrey Wilcke2015-08-071-2/+2
|\ \ \ \ \ | | | | | | | | | | | | web3: regression. Fixes #1613
| * | | | | 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 agents
| * | | | 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 check
| * | | 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
|\ \ \ | | | | | | | | Fix tests on windows
| * | | .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
| | | | | | | | | | | | | | | | They were unused and their tests failed on Windows.
| * | | p2p/discover: close Table during testingFelix Lange2015-08-062-4/+8
| | | | | | | | | | | | | | | | Not closing the table used to be fine, but now the table has a database.
* | | | Merge pull request #1603 from ebuchman/trie_hex_fixJeffrey Wilcke2015-08-072-24/+70
|\ \ \ \ | | | | | | | | | | trie: hex fix
| * | | | 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 -> []byte
| * | | faster hex-prefix codec and string -> []byteEthan Buchman2015-08-065-39/+30
| | | |
* | | | Merge branch 'develop'v1.0.1Jeffrey Wilcke2015-08-061-1/+1
|\ \ \ \
| * | | | fake commit for build server :(Jeffrey Wilcke2015-08-061-1/+1
| |/ / /
* | | | Merge branch 'develop'Jeffrey Wilcke2015-08-061-1/+1
|\| | |
| * | | cmd/geth: bumped version numberJeffrey Wilcke2015-08-061-1/+1
| | | |
* | | | Merge branch 'develop'Jeffrey Wilcke2015-08-061115-11942/+12520
|\| | |
| * | | Merge pull request #1583 from obscuren/miner-price-orderJeffrey Wilcke2015-08-062-1/+53
| |\ \ \ | | |/ / | |/| | miner, core: sort txs by price, nonce
| | * | miner, core: sort txs by price, nonceJeffrey Wilcke2015-08-052-1/+53
| |/ /
| * | Merge pull request #1588 from obscuren/diff-bombJeffrey Wilcke2015-08-056-7/+196
| |\ \ | | | | | | | | core, miner: added difficulty bomb
| | * | core, miner: added difficulty bombJeffrey Wilcke2015-08-056-7/+196
| | | |
| * | | Merge pull request #1587 from obscuren/miner-raceJeffrey Wilcke2015-08-051-43/+44
| |\ \ \ | | |/ / | |/| | miner: fixed worker race condition
| | * | miner: fixed worker race conditionJeffrey Wilcke2015-08-051-43/+44
| |/ /
| * | Merge pull request #1578 from Gustav-Simonsson/frontier_thawingJeffrey Wilcke2015-08-054-8/+22
| |\ \ | | | | | | | | miner: gas limit strategy, target 3141592 & def gas price 50 Shannon
| | * | miner: gas limit strategy, target 3141592 & def gas price 50 ShannonGustav Simonsson2015-08-044-8/+22
| | | |
| * | | Merge pull request #1574 from fjl/fdtrackJeffrey Wilcke2015-08-0417-212/+477
| |\ \ \ | | |/ / | |/| | fdtrack: hack to track file descriptor usage
| | * | fdtrack: temporary hack for tracking file descriptor usageFelix Lange2015-08-0415-7/+314
| | | | | | | | | | | | | | | | | | | | Package fdtrack logs statistics about open file descriptors. This should help identify the source of #1549.
| | * | metrics: fix file descriptor leak when reading disk stats on linuxFelix Lange2015-08-031-0/+1
| | | | | | | | | | | | | | | | The disk stats file was not closed after reading.
| | * | rpc/comms: use ConnState to track HTTP connectionsFelix Lange2015-08-032-205/+162
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The JSON-RPC server wraps TCP connections in order to be able to shut down them down when RPC is stopped. This is rather scary code. Go 1.3 introduced the http.Server.ConnState hook for such purposes. We can use this facility now that we depend on Go 1.4. There are multiple reasons for the switch apart from making the code less scary: * the TCP listener no longer ticks every second to check a channel * pending requests are allowed to finish after stopping the server * we can time out idle keep-alive connections
| * | | Merge pull request #1562 from ethersphere/blankpasswdJeffrey Wilcke2015-08-041-2/+17
| |\ \ \ | | | | | | | | | | jsre: leave out lines from history possibly containing passwords
| | * | | jsre: leave out lines from history containing methods of the personal modulezelig2015-07-311-2/+17
| | | | |
| * | | | Merge pull request #1581 from obscuren/olympicJeffrey Wilcke2015-08-044-0/+42
| |\ \ \ \ | | |_|/ / | |/| | | cmd, core, eth: support for the olympic network
| | * | | cmd, core, eth: support for the olympic networkJeffrey Wilcke2015-08-044-0/+42
| | |/ / | | | | | | | | | | | | Added a --olympic flag which initialiser the olympic protocol settings
| * | | Merge pull request #1479 from tgerring/ethtestJeffrey Wilcke2015-08-031-2/+8
| |\ \ \ | | | | | | | | | | Update ethtest default path for BlockTests
| | * | | Disassociate test directory from test nameTaylor Gerring2015-07-221-2/+8
| | | | |
| * | | | Merge pull request #1548 from fjl/accounts-test-deflakeJeffrey Wilcke2015-08-031-1/+2
| |\ \ \ \ | | | | | | | | | | | | accounts: bump timeout in TestSignRace
| | * | | | accounts: bump timeout and spin less in TestSignRaceFelix Lange2015-08-021-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | This should fix the flakeyness.
| * | | | | Merge pull request #1568 from obscuren/issue-1559Jeffrey Wilcke2015-08-031-1/+5
| |\ \ \ \ \ | | | | | | | | | | | | | | core: added a running flag to prevent panics in the chainmanager
| | * | | | | core: added a running flag to prevent panics in the chainmanagerJeffrey Wilcke2015-08-011-1/+5
| | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The running flag will determine whether the chain manager is still running or not. This will prevent the quit channel from being closed twice resulting in a panic. This PR should fix this issue. Closes #1559
| * | | | | Merge pull request #1569 from obscuren/default-genesisJeffrey Wilcke2015-08-033-2/+40
| |\ \ \ \ \ | | | | | | | | | | | | | | core: added default genesis block
| | * | | | | core: added default genesis blockJeffrey Wilcke2015-08-023-2/+40
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | When a user runs a freshly setup geth w/o a database initialised the default genesis block is decoded and inserted in to the database.
| * | | | | Merge pull request #1461 from bas-vk/eth_resendJeffrey Wilcke2015-08-024-10/+23
| |\ \ \ \ \ | | | | | | | | | | | | | | Old transaction after resend was not removed from pool
| | * | | | | bugfix, pending transaction was resend with new gas price/limit but not ↵Bas van Kervel2015-07-284-10/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | removed from transaction pool
| * | | | | | Merge pull request #1541 from bas-vk/issue1518Jeffrey Wilcke2015-08-012-12/+14
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Improved error handling for NewTransactionFromBytes
| | * | | | | | improved error detection and handling for NewTransactionFromBytesBas van Kervel2015-07-292-12/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | integrated review comments
| * | | | | | | Merge pull request #1545 from obscuren/log-indexJeffrey Wilcke2015-08-011-0/+5
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | core/state: Set log index. Closes #1226