Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #1536 from fjl/fix-go1.5-build | Felix Lange | 2015-07-28 | 1 | -1/+8 |
|\ | | | | | crypto: fix build with Go 1.5 | ||||
| * | crypto: fix build with Go 1.5 | Felix Lange | 2015-07-28 | 1 | -1/+8 |
|/ | |||||
* | Merge pull request #1529 from obscuren/extra-data-fix | Jeffrey Wilcke | 2015-07-27 | 1 | -1/+1 |
|\ | | | | | core: genesis extra data field fix | ||||
| * | core: genesis extra data field fix | Jeffrey Wilcke | 2015-07-26 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #1528 from obscuren/reduce-extra-data | Jeffrey Wilcke | 2015-07-26 | 3 | -4/+13 |
|\ | | | | | params: reduce extra data to 32 bytes & target block time | ||||
| * | params: reduce extra data to 32 bytes | Jeffrey Wilcke | 2015-07-26 | 3 | -4/+13 |
| | | |||||
* | | Merge pull request #1525 from obscuren/genesis-write-fix | Jeffrey Wilcke | 2015-07-26 | 2 | -3/+19 |
|\ \ | |/ |/| | core: fixed genesis write out to write only canon number | ||||
| * | core: fixed genesis write out to write only canon number | Jeffrey Wilcke | 2015-07-26 | 2 | -3/+19 |
|/ | |||||
* | Merge pull request #1524 from obscuren/default-extra | Jeffrey Wilcke | 2015-07-25 | 1 | -0/+7 |
|\ | | | | | eth: set default miner extra to client name | ||||
| * | eth: set default miner extra to client name | Jeffrey Wilcke | 2015-07-25 | 1 | -0/+7 |
| | | |||||
* | | Merge pull request #1520 from obscuren/reward-5eth | Jeffrey Wilcke | 2015-07-25 | 3 | -2/+10 |
|\ \ | | | | | | | core: 5 ether block reward | ||||
| * | | core: 5 ether block reward | Jeffrey Wilcke | 2015-07-25 | 3 | -2/+10 |
| | | | |||||
* | | | Merge pull request #1521 from obscuren/client-update | Jeffrey Wilcke | 2015-07-25 | 7 | -57/+56 |
|\ \ \ | | | | | | | | | cmd/geth, core, eth: Version 1.0.0 | ||||
| * | | | cmd/geth, core, eth: Version 1.0.0 | Jeffrey Wilcke | 2015-07-25 | 7 | -57/+56 |
| |/ / | | | | | | | | | | | | | | | | | | | Genesis release. Closes #1402 Conflicts: cmd/geth/main.go | ||||
* | | | Merge pull request #1497 from obscuren/remove-rle | Jeffrey Wilcke | 2015-07-25 | 2 | -7/+7 |
|\ \ \ | |_|/ |/| | | ethdb, trie: removed RLE compression | ||||
| * | | ethdb, trie: removed RLE compression | Jeffrey Wilcke | 2015-07-23 | 2 | -7/+7 |
| | | | |||||
* | | | Merge pull request #1522 from obscuren/genesis-block-check | Jeffrey Wilcke | 2015-07-25 | 1 | -0/+4 |
|\ \ \ | | | | | | | | | core: check genesis block before writeout | ||||
| * | | | core: check genesis block before writeout | Jeffrey Wilcke | 2015-07-25 | 1 | -0/+4 |
| | |/ | |/| | |||||
* | | | Merge pull request #1523 from obscuren/lower-gasprice | Jeffrey Wilcke | 2015-07-25 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | cmd/util: lowered default gas price | ||||
| * | | | cmd/util: lowered default gas price | Jeffrey Wilcke | 2015-07-25 | 1 | -1/+1 |
| |/ / | |||||
* | | | Merge pull request #1519 from obscuren/develop | Jeffrey Wilcke | 2015-07-25 | 1 | -79/+343 |
|\| | | | | | | | | web3: updated 0.9.1 | ||||
| * | | web3: updated 0.9.1 | Jeffrey Wilcke | 2015-07-25 | 1 | -79/+343 |
|/ / | |||||
* | | Merge pull request #1507 from obscuren/batch-write | Jeffrey Wilcke | 2015-07-23 | 5 | -59/+120 |
|\ \ | |/ |/| | cmd/core,xeth: removed unneeded states & added batch writes | ||||
| * | cmd/core,xeth: removed unneeded states & added batch writes | Jeffrey Wilcke | 2015-07-23 | 5 | -59/+120 |
|/ | |||||
* | Merge pull request #1510 from fjl/license-fixes | Jeffrey Wilcke | 2015-07-23 | 331 | -1333/+1369 |
|\ | | | | | all: license fixes | ||||
| * | remove LICENSE files | Felix Lange | 2015-07-23 | 2 | -32/+0 |
| | | |||||
| * | all: update license headers to distiguish GPL/LGPL | Felix Lange | 2015-07-23 | 328 | -1274/+1330 |
| | | | | | | | | | | All code outside of cmd/ is licensed as LGPL. The headers now reflect this by calling the whole work "the go-ethereum library". | ||||
| * | crypto: fix license of curve.go | Felix Lange | 2015-07-23 | 2 | -27/+39 |
| | | | | | | | | | | crypto/curve.go is not our code and has its own license. This commit excludes it in update-license.go and removes our GPL header. | ||||
* | | Merge pull request #1508 from karalabe/database-caching | Jeffrey Wilcke | 2015-07-23 | 6 | -15/+43 |
|\ \ | | | | | | | cmd, core, eth, ethdb: cache flag to allocate memory for db internal use | ||||
| * | | cmd, core, eth, ethdb: cache flag to allocate memory for db internal use | Péter Szilágyi | 2015-07-22 | 6 | -15/+43 |
| | | | |||||
* | | | Merge pull request #1511 from karalabe/rlp-data-race | Felix Lange | 2015-07-23 | 1 | -2/+2 |
|\ \ \ | |_|/ |/| | | core: fix an RLP encoding data race due to deep struct copy | ||||
| * | | core: fix an RLP encoding data race due to deep struct copy | Péter Szilágyi | 2015-07-23 | 1 | -2/+2 |
|/ / | |||||
* | | Merge pull request #1503 from fjl/fix-accounts-race | Felix Lange | 2015-07-22 | 3 | -21/+45 |
|\ \ | | | | | | | accounts: fix data race when key is locked after the unlock timeout | ||||
| * | | crypto: remove debug print call after decrypting a key from disk | Felix Lange | 2015-07-21 | 1 | -1/+0 |
| | | | |||||
| * | | accounts: fix data race when key is locked after the unlock timeout | Felix Lange | 2015-07-21 | 2 | -20/+45 |
| | | | | | | | | | | | | | | | | | | While here, also improve the docs and speed up the tests. The tests used the scrypt keystore with ridiculous settins and took 20s each. | ||||
* | | | Merge pull request #1481 from tgerring/legalese | Jeffrey Wilcke | 2015-07-22 | 3 | -20/+52 |
|\ \ \ | | | | | | | | | Legalese updates | ||||
| * | | | Update disclaimer | Taylor Gerring | 2015-07-21 | 3 | -20/+52 |
| | | | | |||||
* | | | | Merge pull request #1500 from karalabe/fix-miner-race | Jeffrey Wilcke | 2015-07-22 | 1 | -2/+3 |
|\ \ \ \ | |_|_|/ |/| | | | miner: fix current work data race | ||||
| * | | | miner: fix current work data race | Péter Szilágyi | 2015-07-20 | 1 | -2/+3 |
| | |/ | |/| | |||||
* | | | Merge pull request #1502 from ethereum/canaryFix | Jeffrey Wilcke | 2015-07-21 | 1 | -7/+14 |
|\ \ \ | |/ / |/| | | Fixed canary to require 2+ nonzero, not sum 2+ | ||||
| * | | Fixed canary to require 2+ nonzero, not sum 2+ | Vitalik Buterin | 2015-07-20 | 1 | -7/+14 |
|/ / | |||||
* | | Merge pull request #1496 from karalabe/fix-xeth-races | Jeffrey Wilcke | 2015-07-20 | 1 | -0/+9 |
|\ \ | | | | | | | xeth: fix #1485, data race in fiilter creation and event firing | ||||
| * | | xeth: fix #1485, data race in fiilter creation and event firing | Péter Szilágyi | 2015-07-20 | 1 | -0/+9 |
|/ / | |||||
* | | Merge pull request #1484 from fjl/rlp-json-tests | Jeffrey Wilcke | 2015-07-19 | 6 | -11/+225 |
|\ \ | | | | | | | cmd/ethtest, tests: add support for RLP JSON tests | ||||
| * | | rlp: fix check for canonical byte array size | Felix Lange | 2015-07-18 | 2 | -9/+16 |
| | | | | | | | | | | | | | | | | | | Decoding did not reject byte arrays of length one with a single element b where 55 < b < 128. Such byte arrays must be rejected because they must be encoded as the single byte b instead. | ||||
| * | | rlp: reject trailing data when using DecodeBytes | Felix Lange | 2015-07-18 | 1 | -1/+13 |
| | | | |||||
| * | | tests: document RLP tests | Felix Lange | 2015-07-17 | 1 | -4/+20 |
| | | | |||||
| * | | cmd/ethtest, tests: add support for RLP JSON tests | Felix Lange | 2015-07-17 | 4 | -1/+180 |
| | | | |||||
* | | | Merge pull request #1480 from obscuren/miner-state-sync | Jeffrey Wilcke | 2015-07-19 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | miner: moved state sync | ||||
| * | | | miner: moved state sync | Jeffrey Wilcke | 2015-07-16 | 1 | -1/+1 |
| |/ / | | | | | | | | | | Moved the state sync so it only syncs the state when the block mining yield a possitive result | ||||
* | | | Merge pull request #1488 from ethereum/travis | Jeffrey Wilcke | 2015-07-19 | 1 | -4/+5 |
|\ \ \ | |/ / |/| | | Travis container support | ||||
| * | | Travis container support | Taylor Gerring | 2015-07-18 | 1 | -4/+5 |
|/ / | |||||
* | | Merge pull request #1477 from tgerring/legalese | Jeffrey Wilcke | 2015-07-16 | 3 | -6/+26 |
|\| | | | | | Prompt user to accept legalese when datadir doesn't exist | ||||
| * | Move text to separate file | Taylor Gerring | 2015-07-16 | 2 | -11/+15 |
| | | |||||
| * | Prompt user to accept legalese when datadir doesn't exist | Taylor Gerring | 2015-07-16 | 2 | -6/+22 |
| | | |||||
* | | Merge pull request #1469 from obscuren/smart-mining | Jeffrey Wilcke | 2015-07-16 | 3 | -105/+149 |
|\ \ | | | | | | | miner: smart mining | ||||
| * | | miner: smart mining | Jeffrey Wilcke | 2015-07-16 | 3 | -105/+149 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Work is now handled and carried over multiple sessions. Previously one session only was assumed, potentially resulting in invalid (outdated) work * Larger work / result queue * Full validation option | ||||
* | | | Merge pull request #1476 from obscuren/deadlock-logs | Jeffrey Wilcke | 2015-07-16 | 1 | -3/+0 |
|\ \ \ | |_|/ |/| | | xeth: removed mutex lock | ||||
| * | | xeth: removed unneeded mutex lock | Jeffrey Wilcke | 2015-07-16 | 1 | -3/+0 |
|/ / | |||||
* | | Merge pull request #1475 from obscuren/issue1473 | Jeffrey Wilcke | 2015-07-16 | 3 | -13/+46 |
|\ \ | |/ |/| | core: during chain reorg rewrite receipts and transactions | ||||
| * | core: during chain reorg rewrite receipts and transactions | Jeffrey Wilcke | 2015-07-15 | 3 | -13/+46 |
| | | | | | | | | | | | | | | | | | | Added PutBlockReceipts; storing receipts by blocks. Eventually this will require pruning during some cleanup cycle. During forks the receipts by block are used to get the new canonical receipts and transactions. This PR fixes #1473 by rewriting transactions and receipts from the point of where the fork occured. | ||||
* | | Merge pull request #1468 from Gustav-Simonsson/xeth_transact_logging | Jeffrey Wilcke | 2015-07-16 | 1 | -2/+2 |
|\ \ | |/ |/| | xeth: log signed tx hash | ||||
| * | xeth: log signed tx hash | Gustav Simonsson | 2015-07-13 | 1 | -2/+2 |
|/ | |||||
* | Merge pull request #1462 from obscuren/genesis | Jeffrey Wilcke | 2015-07-12 | 15 | -138/+244 |
|\ | | | | | core: genesis preparation | ||||
| * | cmd, core, eth, common: genesis preparation | Jeffrey Wilcke | 2015-07-10 | 15 | -138/+244 |
|/ | | | | | Implemented the --genesis flag thru which we can set a custom genesis block, including the official Ethereum genesis block. | ||||
* | cmd/geth: bump version 0.9.39 | Jeffrey Wilcke | 2015-07-10 | 1 | -1/+1 |
| | |||||
* | Merge branch 'release/0.9.38' into develop | Jeffrey Wilcke | 2015-07-10 | 1 | -1/+1 |
|\ | |||||
| * | cmd/geth: version bump 0.9.38 | Jeffrey Wilcke | 2015-07-09 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #1452 from obscuren/develop | Jeffrey Wilcke | 2015-07-09 | 1 | -0/+136 |
|\ | | | | | core/vm: added str to op | ||||
| * | core/vm: added str to op | Jeffrey Wilcke | 2015-07-09 | 1 | -0/+136 |
|/ | |||||
* | Merge pull request #1453 from ethersphere/frozen-accounts | Jeffrey Wilcke | 2015-07-09 | 2 | -4/+1 |
|\ | | | | | accounts, crypto: fixed file naming for windows | ||||
| * | fix wallet key duplicate write - how did it get there? mystery. fixes #1411 | zelig | 2015-07-09 | 1 | -3/+0 |
| | | |||||
| * | : colon => dash - in keyfile name - slight deviation from ISO8601 for WIN ↵ | zelig | 2015-07-09 | 1 | -1/+1 |
| | | | | | | | | FS compatibility | ||||
* | | Merge pull request #1441 from obscuren/logs-return-fix | Jeffrey Wilcke | 2015-07-09 | 4 | -12/+24 |
|\ \ | | | | | | | miner, xeth: fire log event during mining. Fix return raw tx | ||||
| * | | web3: updated | Jeffrey Wilcke | 2015-07-08 | 1 | -10/+22 |
| | | | |||||
| * | | miner, xeth: fire log event during mining. Fix return raw tx | Jeffrey Wilcke | 2015-07-08 | 3 | -2/+2 |
| |/ | |||||
* | | Merge pull request #1451 from karalabe/handle-potential-TD-forge-attack | Jeffrey Wilcke | 2015-07-09 | 2 | -99/+44 |
|\ \ | | | | | | | eth/downloader: drop peer if advertised TD but won't delvier | ||||
| * | | eth/downloader: drop peer if advertised TD but won't delvier | Péter Szilágyi | 2015-07-09 | 2 | -99/+44 |
| |/ | |||||
* | | Merge pull request #1450 from karalabe/fix-propagation-td | Jeffrey Wilcke | 2015-07-09 | 2 | -5/+17 |
|\ \ | | | | | | | eth: calculate the correct TD, only update if better | ||||
| * | | eth: calculate the correct TD, only update if better | Péter Szilágyi | 2015-07-09 | 2 | -5/+17 |
| |/ | |||||
* | | Merge pull request #1447 from karalabe/fix-database-metrics-race-3 | Jeffrey Wilcke | 2015-07-09 | 2 | -61/+83 |
|\ \ | | | | | | | eth, ethdb: fix a data race during startup/shutdown | ||||
| * | | eth, ethdb: fix a data race during startup/shutdown | Péter Szilágyi | 2015-07-09 | 2 | -61/+83 |
| |/ | |||||
* | | Merge pull request #1443 from Gustav-Simonsson/core_uint64_ts | Jeffrey Wilcke | 2015-07-09 | 19 | -1749/+1114 |
|\ \ | | | | | | | Core uint64 ts | ||||
| * | | Use uint64 on ts in chain_manager, block_processor | Gustav Simonsson | 2015-07-08 | 5 | -6/+12 |
| | | | |||||
| * | | Unskip SimpleTx3, check err in pre/post state validations | Gustav Simonsson | 2015-07-08 | 2 | -14/+33 |
| | | | |||||
| * | | Update Ethereum JSON test files and wrappers | Gustav Simonsson | 2015-07-08 | 12 | -1729/+1069 |
| |/ | |||||
* | | Merge pull request #1436 from bas-vk/net_version | Jeffrey Wilcke | 2015-07-09 | 4 | -3/+11 |
|\ \ | | | | | | | added net.version | ||||
| * | | added net.version | Bas van Kervel | 2015-07-08 | 4 | -3/+11 |
| |/ | |||||
* | | Merge pull request #1432 from tgerring/develop | Jeffrey Wilcke | 2015-07-09 | 1 | -1/+2 |
|\ \ | |/ |/| | Adjust .mailmap | ||||
| * | Adjust .mailmap | Taylor Gerring | 2015-07-08 | 1 | -1/+2 |
|/ | |||||
* | Merge pull request #1430 from obscuren/web3-0.8.0 | Jeffrey Wilcke | 2015-07-07 | 1 | -14/+73 |
|\ | | | | | web3 update | ||||
| * | web3 update | Jeffrey Wilcke | 2015-07-07 | 1 | -14/+73 |
|/ | |||||
* | Merge branch 'release/0.9.36' into develop | Jeffrey Wilcke | 2015-07-07 | 3 | -14/+21 |
|\ | |||||
| * | Merge branch 'release/0.9.36' of github.com-obscure:ethereum/go-ethereum ↵ | Jeffrey Wilcke | 2015-07-07 | 0 | -0/+0 |
| |\ | | | | | | | | | | into release/0.9.36 | ||||
| | * | common/natspec: fixed test | Jeffrey Wilcke | 2015-07-07 | 1 | -1/+1 |
| | | | |||||
| | * | cmd/geth, cmd/utils: changed ParamsToAddress to return error | Jeffrey Wilcke | 2015-07-07 | 2 | -12/+19 |
| | | | | | | | | | | | | | | | ParamsToAddress no longer aborts the process, it now returns an error instead so that the caller can handle the error properly. | ||||
| | * | cmd/geth: version number 0.9.36 | Jeffrey Wilcke | 2015-07-07 | 1 | -1/+1 |
| | | | |||||
| * | | common/natspec: fixed test | Jeffrey Wilcke | 2015-07-07 | 1 | -1/+1 |
| | | | |||||
| * | | cmd/geth, cmd/utils: changed ParamsToAddress to return error | Jeffrey Wilcke | 2015-07-07 | 2 | -12/+19 |
| | | | | | | | | | | | | | | | ParamsToAddress no longer aborts the process, it now returns an error instead so that the caller can handle the error properly. | ||||
| * | | cmd/geth: version number 0.9.36 | Jeffrey Wilcke | 2015-07-07 | 1 | -1/+1 |
|/ / | |||||
* | | Merge pull request #1426 from fjl/license | Jeffrey Wilcke | 2015-07-07 | 338 | -486/+6543 |
|\ \ | |/ |/| | all: update license information and godoc comments | ||||
| * | README.md: update copyright | Felix Lange | 2015-07-07 | 1 | -1/+1 |
| | | |||||
| * | LICENSE, cmd/LICENSE: the go-ethereum authors have copyright | Felix Lange | 2015-07-07 | 2 | -2/+2 |
| | | |||||
| * | all: goimports -w | Felix Lange | 2015-07-07 | 3 | -4/+7 |
| | | |||||
| * | all: add some godoc synopsis comments | Felix Lange | 2015-07-07 | 24 | -13/+29 |
| | | |||||
| * | all: remove @author comments | Felix Lange | 2015-07-07 | 9 | -52/+0 |
| | | |||||
| * | build: change license regexp for // comments | Felix Lange | 2015-07-07 | 1 | -1/+1 |
| | | |||||
| * | all: update license information | Felix Lange | 2015-07-07 | 332 | -168/+6114 |
| | | |||||
| * | .mailmap: update | Felix Lange | 2015-07-07 | 1 | -0/+46 |
| | | |||||
| * | build: new update-license.go | Felix Lange | 2015-07-07 | 2 | -248/+346 |
|/ | | | | | | | This version is less clever. All names are listed in a single file, AUTHORS. All source files have the same header. This is an improvement over the previous version, which attempted to list copyright holders in each source file. | ||||
* | cmd/geth: fixed test | Jeffrey Wilcke | 2015-07-07 | 1 | -1/+1 |
| | |||||
* | Merge pull request #1428 from obscuren/coinbase-fixes | Jeffrey Wilcke | 2015-07-07 | 12 | -51/+99 |
|\ | | | | | cmd,eth,rpc,tests: default coinbase | ||||
| * | eth,miner,rpc: set coinbase | Jeffrey Wilcke | 2015-07-07 | 4 | -1/+13 |
| | | |||||
| * | cmd,eth,rpc,tests: default coinbase | Jeffrey Wilcke | 2015-07-07 | 10 | -51/+87 |
| | | |||||
* | | Merge pull request #1429 from obscuren/rebase-registrar | Jeffrey Wilcke | 2015-07-07 | 32 | -679/+1944 |
|\ \ | |/ |/| | Rebase registrar | ||||
| * | fix/skip tests, adapt registrar to no contract address | zelig | 2015-07-07 | 5 | -30/+42 |
| | | | | | | | | registry initialisers now return the txhash which caller can use to retrieve receipt | ||||
| * | rebase with zelig/frontier/registrar | Bas van Kervel | 2015-07-07 | 1 | -20/+10 |
| | | |||||
| * | corrected input formatters as suggested during review | Bas van Kervel | 2015-07-07 | 6 | -24/+4 |
| | | |||||
| * | fixed web3 formatters mismatch | Bas van Kervel | 2015-07-07 | 9 | -174/+73 |
| | | |||||
| * | output BigNumbers objects in console as strings | Bas van Kervel | 2015-07-07 | 1 | -1/+9 |
| | | |||||
| * | fix natspec test | zelig | 2015-07-07 | 6 | -81/+99 |
| | | | | | | | | | | | | * registar url string retrieval chop leading zeros now * rewrite test using test mining * remove temporary applyTxs from xeth | ||||
| * | fix js arguments and TestContract passes | zelig | 2015-07-07 | 5 | -30/+296 |
| | | |||||
| * | rename js methods in js_test for new console API | zelig | 2015-07-07 | 2 | -461/+7 |
| | | | | | | | | + rebase fixes | ||||
| * | fix GPO missing flags | zelig | 2015-07-07 | 1 | -0/+6 |
| | | |||||
| * | fix sleepBlocks, implement sleep | zelig | 2015-07-07 | 4 | -19/+45 |
| | | |||||
| * | add missing method to api/admin | zelig | 2015-07-07 | 2 | -2/+17 |
| | | |||||
| * | Registrar and contractInfo handling | zelig | 2015-07-07 | 6 | -15/+964 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * resolver -> common/registrar * global registrar name registry interface * add Call to resolver backend interface * the hashReg and UrlHing contracts now initialised from global registry * initialization of contracts uniform * improve errors and more econsistent method names * common/registrar/ethreg: versioned registrar * integrate new naming and registrar in natspec * js console api: setGlobalRegistrar, setHashReg, setUrlHint * js test TestContract uses mining - tests fixed all pass * eth/backend: allow PoW test mode (small ethash DAG) * console jsre refers to resolver.abi/addr, * cmd/geth/contracts.go moved to common/registrar | ||||
| * | Registrar and contractInfo handling | zelig | 2015-07-07 | 20 | -428/+978 |
|/ | | | | | | | | | | | | | | | | * resolver -> common/registrar * global registrar name registry interface * add Call to resolver backend interface * the hashReg and UrlHing contracts now initialised from global registry * initialization of contracts uniform * improve errors and more econsistent method names * common/registrar/ethreg: versioned registrar * integrate new naming and registrar in natspec * js console api: setGlobalRegistrar, setHashReg, setUrlHint * js test TestContract uses mining - tests fixed all pass * eth/backend: allow PoW test mode (small ethash DAG) * console jsre refers to resolver.abi/addr, * cmd/geth/contracts.go moved to common/registrar | ||||
* | Merge pull request #1423 from obscuren/gasused-receipt-fix | Jeffrey Wilcke | 2015-07-07 | 6 | -9/+13 |
|\ | | | | | core, eth, rpc: proper gas used. Closes #1422 | ||||
| * | core, eth, rpc: proper gas used. Closes #1417 | Jeffrey Wilcke | 2015-07-07 | 6 | -9/+13 |
| | | | | | | | | Added some additional backward compatibility code for old receipts | ||||
* | | Merge pull request #1418 from fjl/one-interrupt | Jeffrey Wilcke | 2015-07-07 | 1 | -1/+1 |
|\ \ | | | | | | | cmd/utils: fix interrupt handling to actually see subsequent interrupts | ||||
| * | | cmd/utils: fix interrupt handling to actually see subsequent interrupts | Felix Lange | 2015-07-06 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #1414 from Gustav-Simonsson/update_tests | Jeffrey Wilcke | 2015-07-06 | 2 | -8/+19 |
|\ \ \ | |_|/ |/| | | Add TestBcGasPricer, comments and unskip tests | ||||
| * | | Add TestBcGasPricer, comments and unskip tests | Gustav Simonsson | 2015-07-06 | 2 | -8/+19 |
| | | | |||||
* | | | Merge pull request #1416 from fjl/one-interrupt | Jeffrey Wilcke | 2015-07-06 | 2 | -37/+17 |
|\ \ \ | | |/ | |/| | cmd/geth, cmd/utils: improve interrupt handling | ||||
| * | | cmd/geth, cmd/utils: improve interrupt handling | Felix Lange | 2015-07-06 | 2 | -37/+17 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The new strategy for interrupts is to handle them explicitly. Ethereum.Stop is now only called once, even if multiple interrupts are sent. Interrupting ten times in a row forces a panic. Fixes #869 Fixes #1359 | ||||
* | | | Merge pull request #1415 from obscuren/web3-update | Jeffrey Wilcke | 2015-07-06 | 1 | -2784/+138 |
|\ \ \ | | | | | | | | | web3: updated | ||||
| * | | | web3: updated | Jeffrey Wilcke | 2015-07-06 | 1 | -2784/+138 |
|/ / / | |||||
* | | | Merge pull request #1413 from obscuren/receipt-fix | Jeffrey Wilcke | 2015-07-06 | 2 | -10/+15 |
|\ \ \ | |_|/ |/| | | rpc, xeth: fixed returned tx hash & receipt logs | ||||
| * | | rpc, xeth: fixed returned tx hash & receipt logs | Jeffrey Wilcke | 2015-07-06 | 2 | -10/+15 |
|/ / | |||||
* | | Merge pull request #1410 from obscuren/newerrors-fix | Jeffrey Wilcke | 2015-07-06 | 5 | -12/+20 |
|\ \ | |/ |/| | core, miner: adopted new style errors | ||||
| * | core, miner: removed vm errors from consensus err checking | Jeffrey Wilcke | 2015-07-06 | 5 | -12/+20 |
|/ | | | | | Removed VM errors from the consensus errors. They now used for output only. | ||||
* | Merge pull request #1400 from obscuren/badblock-reporting | Jeffrey Wilcke | 2015-07-06 | 4 | -2/+61 |
|\ | | | | | core, miner, tests: added test, implemented bad block reporting | ||||
| * | core, miner, tests: added test, implemented bad block reporting | Jeffrey Wilcke | 2015-07-05 | 4 | -2/+61 |
| | | |||||
* | | Merge pull request #1409 from fjl/fix-tx-hash | Jeffrey Wilcke | 2015-07-06 | 3 | -9/+17 |
|\ \ | | | | | | | core/types, xeth: separate tx hash and tx signature hash | ||||
| * | | core/types, xeth: separate tx hash and tx signature hash | Felix Lange | 2015-07-06 | 3 | -9/+17 |
| |/ | |||||
* | | Merge pull request #1397 from tgerring/rpcreceipt | Jeffrey Wilcke | 2015-07-06 | 4 | -1/+60 |
|\ \ | | | | | | | getTransactionReceipt RPC support | ||||
| * | | Add autocomplete support for console | Taylor Gerring | 2015-07-06 | 1 | -0/+1 |
| | | | |||||
| * | | Always return transaction hash | Taylor Gerring | 2015-07-06 | 1 | -1/+0 |
| | | | |||||
| * | | Cleanup | Taylor Gerring | 2015-07-05 | 1 | -4/+4 |
| | | | |||||
| * | | Compose additional fields | Taylor Gerring | 2015-07-05 | 2 | -5/+18 |
| | | | |||||
| * | | Remove redundant function | Taylor Gerring | 2015-07-05 | 3 | -18/+3 |
| | | | |||||
| * | | Rename local variable for clarity | Taylor Gerring | 2015-07-04 | 1 | -2/+2 |
| | | | |||||
| * | | Decode full receipt storage | Taylor Gerring | 2015-07-04 | 3 | -4/+21 |
| | | | |||||
| * | | Fix hex conversion | Taylor Gerring | 2015-07-04 | 1 | -1/+2 |
| | | | |||||
| * | | Initial getTransactionReceipt support | Taylor Gerring | 2015-07-04 | 2 | -0/+43 |
| | | | |||||
* | | | Merge pull request #1395 from Gustav-Simonsson/fix_core_errors_in_apply_txs | Jeffrey Wilcke | 2015-07-06 | 7 | -54/+10 |
|\ \ \ | |_|/ |/| | | Fix core errors in apply txs | ||||
| * | | Fix core error forwarding, unify OOG VM err | Gustav Simonsson | 2015-07-04 | 7 | -54/+10 |
|/ / | |||||
* | | Merge pull request #1369 from obscuren/statedb-update-cleanup | Jeffrey Wilcke | 2015-07-04 | 16 | -49/+106 |
|\ \ | | | | | | | core, core/state: throw out intermediate state | ||||
| * | | trie: removed shallow copies (thanks to @fjl) | Jeffrey Wilcke | 2015-07-04 | 1 | -1/+1 |
| | | | |||||
| * | | trie: dirty tracking | Jeffrey Wilcke | 2015-07-04 | 7 | -28/+73 |
| | | | |||||
| * | | core, miner, tests: renamed state methods | Jeffrey Wilcke | 2015-07-04 | 8 | -11/+13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Update => SyncIntermediate * Added SyncObjects SyncIntermediate only updates whatever has changed, but, as a side effect, requires much more disk space. SyncObjects will only sync whatever is required for a block and will not save intermediate state to disk. As drawback this requires more time when more txs come in. | ||||
| * | | core, core/state: only write necessary state. Skip intermediate | Jeffrey Wilcke | 2015-07-04 | 3 | -11/+21 |
| |/ | |||||
* | | Merge pull request #1283 from ethersphere/frontier/accounts | Jeffrey Wilcke | 2015-07-04 | 10 | -174/+358 |
|\ \ | |/ |/| | Account management improvements | ||||
| * | account update: migrate or change password | zelig | 2015-07-03 | 4 | -25/+149 |
| | | | | | | | | | | | | * account.Update * KeyStore.Cleanup * fix dir rm for old format deleteKey | ||||
| * | fix account ordering | zelig | 2015-07-03 | 6 | -79/+103 |
| | | | | | | | | | | | | | | | | * chronological order of creation * new naming scheme keystore/UTC--<created_at UTC ISO8601>-<address hex> * KeyStore2 -> KeyStore * backward compatibility * refactor keyStore methods | ||||
| * | accounts order by keyfile ctime | zelig | 2015-07-03 | 2 | -5/+28 |
| | | |||||
| * | rpc/js coinbase returns null if no etherbase set | zelig | 2015-07-03 | 2 | -4/+5 |
| | | |||||
| * | no primary when listing accounts | zelig | 2015-07-03 | 1 | -4/+2 |
| | | |||||
| * | require explicit etherbase address for mining. Falling back to primary is ↵ | zelig | 2015-07-03 | 1 | -3/+2 |
| | | | | | | | | risky given it is inconsistent if keys are imported/merged/created or copied/transfered | ||||
| * | unlock multiple passes and obsolete primary | zelig | 2015-07-03 | 6 | -41/+27 |
| | | | | | | | | | | | | | | * multiple passwords allowed in password file * split on "\n", sideeffect: chop trailing slashes. fixes common mistake <(echo 'pass') * remove accounts.Primary method * do not fall back to primary account for mining | ||||
| * | simplify account unlocking | zelig | 2015-07-03 | 2 | -56/+85 |
| | | |||||
* | | Merge pull request #1399 from obscuren/receipts-storing-fix | Jeffrey Wilcke | 2015-07-04 | 8 | -57/+75 |
|\ \ | | | | | | | core, eth, miner, xeth: receipt storage fix | ||||
| * | | core, eth, miner, xeth: receipt storage fix | Jeffrey Wilcke | 2015-07-04 | 8 | -57/+75 |
| | | | | | | | | | | | | | | | * Added GetReceiptsFromBlock, GetReceipt, PutReceipts * Added ContractAddress to receipt. See #1042 | ||||
* | | | Merge pull request #1385 from Gustav-Simonsson/update_tests | Jeffrey Wilcke | 2015-07-04 | 20 | -4520/+1935 |
|\ \ \ | |/ / |/| | | Update Ethereum JSON test files, skip failing tests | ||||
| * | | Update Ethereum JSON tests, skip failing | Gustav Simonsson | 2015-07-03 | 20 | -4520/+1935 |
|/ / | |||||
* | | Merge pull request #1393 from bas-vk/issue1377 | Jeffrey Wilcke | 2015-07-03 | 1 | -103/+2934 |
|\ \ | | | | | | | Upgrade web3 to version 0.7.1 | ||||
| * | | upgrade web3 to version 0.7.1 | Bas van Kervel | 2015-07-03 | 1 | -103/+2934 |
| | | | |||||
* | | | Merge pull request #1392 from bas-vk/ipcpipelining | Jeffrey Wilcke | 2015-07-03 | 4 | -46/+181 |
|\ \ \ | | | | | | | | | Several bugfixes to IPC channel | ||||
| * | | | fixed unittest after new implementation | Bas van Kervel | 2015-07-03 | 1 | -37/+1 |
| | | | | |||||
| * | | | simplified implementation and improved performance | Bas van Kervel | 2015-07-03 | 1 | -103/+20 |
| | | | | |||||
| * | | | display rpc error in console | Bas van Kervel | 2015-07-03 | 2 | -13/+15 |
| | | | | |||||
| * | | | merge conflict | Bas van Kervel | 2015-07-02 | 0 | -0/+0 |
| |\ \ \ | |||||
| | * | | | ipcpath issue fix | Bas van Kervel | 2015-07-02 | 1 | -5/+5 |
| | | | | | |||||
| | * | | | prevent discarding requests when parsing fails | Bas van Kervel | 2015-07-02 | 2 | -26/+273 |
| | | | | | |||||
| | * | | | added pipelining support | Bas van Kervel | 2015-07-01 | 1 | -15/+20 |
| | | | | | |||||
| * | | | | ipcpath issue fix | Bas van Kervel | 2015-07-02 | 1 | -5/+5 |
| | | | | | |||||
| * | | | | prevent discarding requests when parsing fails | Bas van Kervel | 2015-07-02 | 2 | -26/+273 |
| | | | | | |||||
| * | | | | added pipelining support | Bas van Kervel | 2015-07-02 | 1 | -15/+20 |
| | |_|/ | |/| | | |||||
* | | | | Merge pull request #1394 from obscuren/develop | Jeffrey Wilcke | 2015-07-03 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | miner: ignore future errors | ||||
| * | | | | miner: ignore future errors | Jeffrey Wilcke | 2015-07-03 | 1 | -1/+1 |
|/ / / / | |||||
* | | | | Merge pull request #1389 from obscuren/txpool-issues | Jeffrey Wilcke | 2015-07-03 | 15 | -89/+126 |
|\ \ \ \ | | | | | | | | | | | core, miner: miner header validation, transaction & receipt writing | ||||
| * | | | | core, miner: miner header validation, transaction & receipt writing | Jeffrey Wilcke | 2015-07-03 | 15 | -89/+126 |
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | * Miners do now verify their own header, not their state. * Changed old putTx and putReceipts to be exported * Moved writing of transactions and receipts out of the block processer in to the chain manager. Closes #1386 * Miner post ChainHeadEvent & ChainEvent. Closes #1388 | ||||
* | | | | Merge pull request #1391 from tgerring/consolefalse | Jeffrey Wilcke | 2015-07-03 | 1 | -2/+0 |
|\ \ \ \ | |/ / / |/| | | | Prevent false from printing on console | ||||
| * | | | Prevent debug value from printing on console | Taylor Gerring | 2015-07-03 | 1 | -2/+0 |
|/ / / | |||||
* | | | Merge pull request #1390 from karalabe/fix-downloader-test-race | Jeffrey Wilcke | 2015-07-03 | 1 | -1/+7 |
|\ \ \ | |/ / |/| | | eth/downloader: fix a rare test race on the OSX CI | ||||
| * | | eth/downloader: fix a rare test race on the OSX CI | Péter Szilágyi | 2015-07-03 | 1 | -1/+7 |
|/ / | |||||
* | | Merge branch 'develop' of github.com:ethereum/go-ethereum into develop | Vitalik Buterin | 2015-07-02 | 3 | -9/+9 |
|\ \ | |||||
| * \ | Merge pull request #1378 from obscuren/issue1367 | Jeffrey Wilcke | 2015-07-02 | 3 | -9/+9 |
| |\ \ | | | | | | | | | core, xeth: core.AddressFromMessage removed => crypto.CreateAddress | ||||
| | * | | core, xeth: core.AddressFromMessage removed => crypto.CreateAddress | Jeffrey Wilcke | 2015-07-02 | 3 | -9/+9 |
| | | | | |||||
* | | | | Switched canary addresses | Vitalik Buterin | 2015-07-02 | 1 | -4/+4 |
|/ / / | |||||
* | | | Merge pull request #1351 from karalabe/eth61 | Jeffrey Wilcke | 2015-07-01 | 13 | -306/+981 |
|\ \ \ | | | | | | | | | Implement eth/61 | ||||
| * | | | eth, eth/downloader: fix #1231, DOS vulnerability in hash queueing | Péter Szilágyi | 2015-07-01 | 2 | -5/+15 |
| | | | | |||||
| * | | | eth: fix #1371, double lock during block/txn known set limitation | Péter Szilágyi | 2015-07-01 | 1 | -10/+4 |
| | | | | |||||
| * | | | eth/downloader: reduce hash fetches in prep for eth/61 | Péter Szilágyi | 2015-07-01 | 1 | -3/+3 |
| | | | | |||||
| * | | | eth, eth/downloader: transition to eth 61 | Péter Szilágyi | 2015-07-01 | 8 | -140/+689 |
| | | | | |||||
| * | | | eth, eth/downloader: pass the eth protocol version through | Péter Szilágyi | 2015-07-01 | 4 | -36/+45 |
| | | | | |||||
| * | | | eth: add the blocks from numbers protocol message | Péter Szilágyi | 2015-07-01 | 4 | -26/+43 |
| | | | | |||||
| * | | | eth: fix #1319, put an upper limit on the known txns and blocks | Péter Szilágyi | 2015-07-01 | 1 | -0/+19 |
| | | | | |||||
| * | | | eth: clean up peer struct a bit, fix double txn bcast | Péter Szilágyi | 2015-07-01 | 4 | -71/+69 |
| | | | | |||||
| * | | | eth: start cleaning up old protocol implementation, add metrics | Péter Szilágyi | 2015-07-01 | 3 | -39/+105 |
| | | | | |||||
| * | | | cmd/geth, cmd/utils, eth: advertise both eth/60 and eth/61 | Péter Szilágyi | 2015-07-01 | 5 | -48/+61 |
| | | | | |||||
* | | | | Merge pull request #1373 from obscuren/recovery-tools | Jeffrey Wilcke | 2015-07-01 | 3 | -87/+133 |
|\ \ \ \ | |_|/ / |/| | | | core, cmd/geth: improved recover functionality | ||||
| * | | | core, cmd/geth: improved recover functionality | Jeffrey Wilcke | 2015-07-01 | 3 | -87/+133 |
|/ / / | | | | | | | | | | | | | `geth recover` now accepts both hashes and numbers using "#" and no longer requires the ethereum instance. | ||||
* | | | Merge pull request #1370 from obscuren/force-checkpoint | Jeffrey Wilcke | 2015-07-01 | 2 | -2/+34 |
|\ \ \ | | | | | | | | | core, cmd/geth: recover by number | ||||
| * | | | core, cmd/geth: recover by number | Jeffrey Wilcke | 2015-07-01 | 2 | -2/+34 |
| | | | | |||||
* | | | | Merge pull request #1355 from Gustav-Simonsson/block_header_ts_uint64 | Jeffrey Wilcke | 2015-07-01 | 12 | -25/+24 |
|\ \ \ \ | | | | | | | | | | | Use uint64 for block header timestamp | ||||
| * | | | | Use uint64 for block header timestamp | Gustav Simonsson | 2015-06-30 | 12 | -25/+24 |
| |/ / / | |||||
* | | | | Merge pull request #1366 from ethers/rpcRequest | Jeffrey Wilcke | 2015-07-01 | 1 | -1/+1 |
|\ \ \ \ | |/ / / |/| | | | fix logging jsonrpc request #1365 | ||||
| * | | | fix logging jsonrpc request #1365 | ethers | 2015-07-01 | 1 | -1/+1 |
|/ / / | |||||
* | | | Merge pull request #1363 from obscuren/safeguard | Jeffrey Wilcke | 2015-07-01 | 3 | -60/+44 |
|\ \ \ | |/ / |/| | | core: added checkpoint for last block | ||||
| * | | core: txpool listen for ChainHeadEvent instead of ChainEvent | Jeffrey Wilcke | 2015-06-30 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | Changed the transaction pool to listen for ChainHeadEvent when resetting the state instead of ChainEvent. It makes very little sense to burst through transactions while we are catching up (e.g., have more than one block to process) | ||||
| * | | core: added checkpoint for last block | Jeffrey Wilcke | 2015-06-30 | 2 | -58/+42 |
|/ / | | | | | | | | | * Add a checkpoint every X blocks * Removed queued write | ||||
* | | Merge pull request #1328 from bas-vk/issue1327 | Jeffrey Wilcke | 2015-06-30 | 5 | -8/+252 |
|\ \ | |/ |/| | Add pendingTransactions and resend | ||||
| * | solved merge conflicts | Bas van Kervel | 2015-06-30 | 1 | -9/+0 |
| |\ | |||||
| | * | initialize fields to prevent nil pointer exception | Bas van Kervel | 2015-06-29 | 1 | -3/+8 |
| | | | |||||
| | * | add json parsing method for resend transaction | Bas van Kervel | 2015-06-29 | 2 | -2/+76 |
| | | | |||||
| | * | improved error handling in parsing request | Bas van Kervel | 2015-06-29 | 2 | -2/+8 |
| | | | |||||
| | * | fixed unittest compilation issue | Bas van Kervel | 2015-06-24 | 1 | -2/+3 |
| | | | |||||
| | * | added eth.resend | Bas van Kervel | 2015-06-24 | 4 | -0/+76 |
| | | | |||||
| | * | added eth.pendingTransactions | Bas van Kervel | 2015-06-24 | 4 | -6/+79 |
| | | | |||||
| * | | rebase with develop | Bas van Kervel | 2015-06-30 | 2 | -15/+33 |
| | | | |||||
| * | | initialize fields to prevent nil pointer exception | Bas van Kervel | 2015-06-30 | 1 | -3/+8 |
| | | | |||||
| * | | add json parsing method for resend transaction | Bas van Kervel | 2015-06-30 | 2 | -2/+76 |
| | | | |||||
| * | | improved error handling in parsing request | Bas van Kervel | 2015-06-30 | 2 | -2/+8 |
| | | | |||||
| * | | fixed unittest compilation issue | Bas van Kervel | 2015-06-30 | 1 | -2/+3 |
| | | | |||||
| * | | added eth.resend | Bas van Kervel | 2015-06-30 | 4 | -0/+76 |
| | | | |||||
| * | | added eth.pendingTransactions | Bas van Kervel | 2015-06-30 | 4 | -6/+79 |
| | | | |||||
* | | | Merge pull request #1362 from obscuren/txpool-cleanup | Jeffrey Wilcke | 2015-06-30 | 3 | -28/+54 |
|\ \ \ | |/ / |/| | | core: reduce CPU load by reducing calls to checkQueue | ||||
| * | | core: reduce CPU load by reducing calls to checkQueue | Jeffrey Wilcke | 2015-06-30 | 3 | -28/+54 |
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Reduced maxQueue count * Added proper deletion past maxQueue limit * Added cheap stats method to txpool queueCheck was called for **every** transaction instead of: 1. add all txs 2. check queue previously 1. add txs[i] 2. check queue 3. if i < len(txs) goto 1. | ||||
* | | Merge branch 'hotfix/0.9.34-1' into develop | Jeffrey Wilcke | 2015-06-30 | 2 | -16/+19 |
|\ \ | |||||
| * | | core, miner: added queued write to WriteBlock | Jeffrey Wilcke | 2015-06-30 | 2 | -16/+19 |
| | | | | | | | | | | | | | | | | | | | | | | | | This fixes an issue with the lru cache not being available when calling WriteBlock. WriteBlock previously always assumed to be called from the InsertChain where the lru cache was always created prior to calling WriteBlock. When being called from the worker this could lead in to a nil pointer exception being thrown and causing database corruption. | ||||
| * | | Merge branch 'release/0.9.34' | Jeffrey Wilcke | 2015-06-30 | 446 | -332051/+16510 |
| |\ \ | |||||
| * \ \ | Merge branch 'release/0.9.32' | Jeffrey Wilcke | 2015-06-24 | 264 | -36992/+6993 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'release/0.9.30' | obscuren | 2015-06-16 | 91 | -1112/+9448 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'release/0.9.28' | obscuren | 2015-06-10 | 110 | -6415/+28917 |
| |\ \ \ \ \ | |||||
* | | | | | | | cmd/geth: version bump 0.9.35 | Jeffrey Wilcke | 2015-06-30 | 1 | -1/+1 |
| | | | | | | | |||||
* | | | | | | | Merge branch 'release/0.9.34' into develop | Jeffrey Wilcke | 2015-06-30 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | |||||
| * | | | | | | cmd/geth: version bump 0.9.34 | Jeffrey Wilcke | 2015-06-30 | 1 | -1/+1 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #1360 from obscuren/peter-metrics | Jeffrey Wilcke | 2015-06-30 | 13 | -83/+326 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Rebased peter's PR |