aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1536 from fjl/fix-go1.5-buildFelix Lange2015-07-281-1/+8
|\ | | | | crypto: fix build with Go 1.5
| * crypto: fix build with Go 1.5Felix Lange2015-07-281-1/+8
|/
* Merge pull request #1529 from obscuren/extra-data-fixJeffrey Wilcke2015-07-271-1/+1
|\ | | | | core: genesis extra data field fix
| * core: genesis extra data field fixJeffrey Wilcke2015-07-261-1/+1
|/
* Merge pull request #1528 from obscuren/reduce-extra-dataJeffrey Wilcke2015-07-263-4/+13
|\ | | | | params: reduce extra data to 32 bytes & target block time
| * params: reduce extra data to 32 bytesJeffrey Wilcke2015-07-263-4/+13
| |
* | Merge pull request #1525 from obscuren/genesis-write-fixJeffrey Wilcke2015-07-262-3/+19
|\ \ | |/ |/| core: fixed genesis write out to write only canon number
| * core: fixed genesis write out to write only canon numberJeffrey Wilcke2015-07-262-3/+19
|/
* Merge pull request #1524 from obscuren/default-extraJeffrey Wilcke2015-07-251-0/+7
|\ | | | | eth: set default miner extra to client name
| * eth: set default miner extra to client nameJeffrey Wilcke2015-07-251-0/+7
| |
* | Merge pull request #1520 from obscuren/reward-5ethJeffrey Wilcke2015-07-253-2/+10
|\ \ | | | | | | core: 5 ether block reward
| * | core: 5 ether block rewardJeffrey Wilcke2015-07-253-2/+10
| | |
* | | Merge pull request #1521 from obscuren/client-updateJeffrey Wilcke2015-07-257-57/+56
|\ \ \ | | | | | | | | cmd/geth, core, eth: Version 1.0.0
| * | | cmd/geth, core, eth: Version 1.0.0Jeffrey Wilcke2015-07-257-57/+56
| |/ / | | | | | | | | | | | | | | | | | | Genesis release. Closes #1402 Conflicts: cmd/geth/main.go
* | | Merge pull request #1497 from obscuren/remove-rleJeffrey Wilcke2015-07-252-7/+7
|\ \ \ | |_|/ |/| | ethdb, trie: removed RLE compression
| * | ethdb, trie: removed RLE compressionJeffrey Wilcke2015-07-232-7/+7
| | |
* | | Merge pull request #1522 from obscuren/genesis-block-checkJeffrey Wilcke2015-07-251-0/+4
|\ \ \ | | | | | | | | core: check genesis block before writeout
| * | | core: check genesis block before writeoutJeffrey Wilcke2015-07-251-0/+4
| | |/ | |/|
* | | Merge pull request #1523 from obscuren/lower-gaspriceJeffrey Wilcke2015-07-251-1/+1
|\ \ \ | | | | | | | | cmd/util: lowered default gas price
| * | | cmd/util: lowered default gas priceJeffrey Wilcke2015-07-251-1/+1
| |/ /
* | | Merge pull request #1519 from obscuren/developJeffrey Wilcke2015-07-251-79/+343
|\| | | | | | | | web3: updated 0.9.1
| * | web3: updated 0.9.1Jeffrey Wilcke2015-07-251-79/+343
|/ /
* | Merge pull request #1507 from obscuren/batch-writeJeffrey Wilcke2015-07-235-59/+120
|\ \ | |/ |/| cmd/core,xeth: removed unneeded states & added batch writes
| * cmd/core,xeth: removed unneeded states & added batch writesJeffrey Wilcke2015-07-235-59/+120
|/
* Merge pull request #1510 from fjl/license-fixesJeffrey Wilcke2015-07-23331-1333/+1369
|\ | | | | all: license fixes
| * remove LICENSE filesFelix Lange2015-07-232-32/+0
| |
| * all: update license headers to distiguish GPL/LGPLFelix Lange2015-07-23328-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.goFelix Lange2015-07-232-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-cachingJeffrey Wilcke2015-07-236-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 usePéter Szilágyi2015-07-226-15/+43
| | |
* | | Merge pull request #1511 from karalabe/rlp-data-raceFelix Lange2015-07-231-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 copyPéter Szilágyi2015-07-231-2/+2
|/ /
* | Merge pull request #1503 from fjl/fix-accounts-raceFelix Lange2015-07-223-21/+45
|\ \ | | | | | | accounts: fix data race when key is locked after the unlock timeout
| * | crypto: remove debug print call after decrypting a key from diskFelix Lange2015-07-211-1/+0
| | |
| * | accounts: fix data race when key is locked after the unlock timeoutFelix Lange2015-07-212-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/legaleseJeffrey Wilcke2015-07-223-20/+52
|\ \ \ | | | | | | | | Legalese updates
| * | | Update disclaimerTaylor Gerring2015-07-213-20/+52
| | | |
* | | | Merge pull request #1500 from karalabe/fix-miner-raceJeffrey Wilcke2015-07-221-2/+3
|\ \ \ \ | |_|_|/ |/| | | miner: fix current work data race
| * | | miner: fix current work data racePéter Szilágyi2015-07-201-2/+3
| | |/ | |/|
* | | Merge pull request #1502 from ethereum/canaryFixJeffrey Wilcke2015-07-211-7/+14
|\ \ \ | |/ / |/| | Fixed canary to require 2+ nonzero, not sum 2+
| * | Fixed canary to require 2+ nonzero, not sum 2+Vitalik Buterin2015-07-201-7/+14
|/ /
* | Merge pull request #1496 from karalabe/fix-xeth-racesJeffrey Wilcke2015-07-201-0/+9
|\ \ | | | | | | xeth: fix #1485, data race in fiilter creation and event firing
| * | xeth: fix #1485, data race in fiilter creation and event firingPéter Szilágyi2015-07-201-0/+9
|/ /
* | Merge pull request #1484 from fjl/rlp-json-testsJeffrey Wilcke2015-07-196-11/+225
|\ \ | | | | | | cmd/ethtest, tests: add support for RLP JSON tests
| * | rlp: fix check for canonical byte array sizeFelix Lange2015-07-182-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 DecodeBytesFelix Lange2015-07-181-1/+13
| | |
| * | tests: document RLP testsFelix Lange2015-07-171-4/+20
| | |
| * | cmd/ethtest, tests: add support for RLP JSON testsFelix Lange2015-07-174-1/+180
| | |
* | | Merge pull request #1480 from obscuren/miner-state-syncJeffrey Wilcke2015-07-191-1/+1
|\ \ \ | | | | | | | | miner: moved state sync
| * | | miner: moved state syncJeffrey Wilcke2015-07-161-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/travisJeffrey Wilcke2015-07-191-4/+5
|\ \ \ | |/ / |/| | Travis container support
| * | Travis container supportTaylor Gerring2015-07-181-4/+5
|/ /
* | Merge pull request #1477 from tgerring/legaleseJeffrey Wilcke2015-07-163-6/+26
|\| | | | | Prompt user to accept legalese when datadir doesn't exist
| * Move text to separate fileTaylor Gerring2015-07-162-11/+15
| |
| * Prompt user to accept legalese when datadir doesn't existTaylor Gerring2015-07-162-6/+22
| |
* | Merge pull request #1469 from obscuren/smart-miningJeffrey Wilcke2015-07-163-105/+149
|\ \ | | | | | | miner: smart mining
| * | miner: smart miningJeffrey Wilcke2015-07-163-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-logsJeffrey Wilcke2015-07-161-3/+0
|\ \ \ | |_|/ |/| | xeth: removed mutex lock
| * | xeth: removed unneeded mutex lockJeffrey Wilcke2015-07-161-3/+0
|/ /
* | Merge pull request #1475 from obscuren/issue1473Jeffrey Wilcke2015-07-163-13/+46
|\ \ | |/ |/| core: during chain reorg rewrite receipts and transactions
| * core: during chain reorg rewrite receipts and transactionsJeffrey Wilcke2015-07-153-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_loggingJeffrey Wilcke2015-07-161-2/+2
|\ \ | |/ |/| xeth: log signed tx hash
| * xeth: log signed tx hashGustav Simonsson2015-07-131-2/+2
|/
* Merge pull request #1462 from obscuren/genesisJeffrey Wilcke2015-07-1215-138/+244
|\ | | | | core: genesis preparation
| * cmd, core, eth, common: genesis preparationJeffrey Wilcke2015-07-1015-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.39Jeffrey Wilcke2015-07-101-1/+1
|
* Merge branch 'release/0.9.38' into developJeffrey Wilcke2015-07-101-1/+1
|\
| * cmd/geth: version bump 0.9.38Jeffrey Wilcke2015-07-091-1/+1
|/
* Merge pull request #1452 from obscuren/developJeffrey Wilcke2015-07-091-0/+136
|\ | | | | core/vm: added str to op
| * core/vm: added str to opJeffrey Wilcke2015-07-091-0/+136
|/
* Merge pull request #1453 from ethersphere/frozen-accountsJeffrey Wilcke2015-07-092-4/+1
|\ | | | | accounts, crypto: fixed file naming for windows
| * fix wallet key duplicate write - how did it get there? mystery. fixes #1411zelig2015-07-091-3/+0
| |
| * : colon => dash - in keyfile name - slight deviation from ISO8601 for WIN ↵zelig2015-07-091-1/+1
| | | | | | | | FS compatibility
* | Merge pull request #1441 from obscuren/logs-return-fixJeffrey Wilcke2015-07-094-12/+24
|\ \ | | | | | | miner, xeth: fire log event during mining. Fix return raw tx
| * | web3: updatedJeffrey Wilcke2015-07-081-10/+22
| | |
| * | miner, xeth: fire log event during mining. Fix return raw txJeffrey Wilcke2015-07-083-2/+2
| |/
* | Merge pull request #1451 from karalabe/handle-potential-TD-forge-attackJeffrey Wilcke2015-07-092-99/+44
|\ \ | | | | | | eth/downloader: drop peer if advertised TD but won't delvier
| * | eth/downloader: drop peer if advertised TD but won't delvierPéter Szilágyi2015-07-092-99/+44
| |/
* | Merge pull request #1450 from karalabe/fix-propagation-tdJeffrey Wilcke2015-07-092-5/+17
|\ \ | | | | | | eth: calculate the correct TD, only update if better
| * | eth: calculate the correct TD, only update if betterPéter Szilágyi2015-07-092-5/+17
| |/
* | Merge pull request #1447 from karalabe/fix-database-metrics-race-3Jeffrey Wilcke2015-07-092-61/+83
|\ \ | | | | | | eth, ethdb: fix a data race during startup/shutdown
| * | eth, ethdb: fix a data race during startup/shutdownPéter Szilágyi2015-07-092-61/+83
| |/
* | Merge pull request #1443 from Gustav-Simonsson/core_uint64_tsJeffrey Wilcke2015-07-0919-1749/+1114
|\ \ | | | | | | Core uint64 ts
| * | Use uint64 on ts in chain_manager, block_processorGustav Simonsson2015-07-085-6/+12
| | |
| * | Unskip SimpleTx3, check err in pre/post state validationsGustav Simonsson2015-07-082-14/+33
| | |
| * | Update Ethereum JSON test files and wrappersGustav Simonsson2015-07-0812-1729/+1069
| |/
* | Merge pull request #1436 from bas-vk/net_versionJeffrey Wilcke2015-07-094-3/+11
|\ \ | | | | | | added net.version
| * | added net.versionBas van Kervel2015-07-084-3/+11
| |/
* | Merge pull request #1432 from tgerring/developJeffrey Wilcke2015-07-091-1/+2
|\ \ | |/ |/| Adjust .mailmap
| * Adjust .mailmapTaylor Gerring2015-07-081-1/+2
|/
* Merge pull request #1430 from obscuren/web3-0.8.0Jeffrey Wilcke2015-07-071-14/+73
|\ | | | | web3 update
| * web3 updateJeffrey Wilcke2015-07-071-14/+73
|/
* Merge branch 'release/0.9.36' into developJeffrey Wilcke2015-07-073-14/+21
|\
| * Merge branch 'release/0.9.36' of github.com-obscure:ethereum/go-ethereum ↵Jeffrey Wilcke2015-07-070-0/+0
| |\ | | | | | | | | | into release/0.9.36
| | * common/natspec: fixed testJeffrey Wilcke2015-07-071-1/+1
| | |
| | * cmd/geth, cmd/utils: changed ParamsToAddress to return errorJeffrey Wilcke2015-07-072-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.36Jeffrey Wilcke2015-07-071-1/+1
| | |
| * | common/natspec: fixed testJeffrey Wilcke2015-07-071-1/+1
| | |
| * | cmd/geth, cmd/utils: changed ParamsToAddress to return errorJeffrey Wilcke2015-07-072-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.36Jeffrey Wilcke2015-07-071-1/+1
|/ /
* | Merge pull request #1426 from fjl/licenseJeffrey Wilcke2015-07-07338-486/+6543
|\ \ | |/ |/| all: update license information and godoc comments
| * README.md: update copyrightFelix Lange2015-07-071-1/+1
| |
| * LICENSE, cmd/LICENSE: the go-ethereum authors have copyrightFelix Lange2015-07-072-2/+2
| |
| * all: goimports -wFelix Lange2015-07-073-4/+7
| |
| * all: add some godoc synopsis commentsFelix Lange2015-07-0724-13/+29
| |
| * all: remove @author commentsFelix Lange2015-07-079-52/+0
| |
| * build: change license regexp for // commentsFelix Lange2015-07-071-1/+1
| |
| * all: update license informationFelix Lange2015-07-07332-168/+6114
| |
| * .mailmap: updateFelix Lange2015-07-071-0/+46
| |
| * build: new update-license.goFelix Lange2015-07-072-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 testJeffrey Wilcke2015-07-071-1/+1
|
* Merge pull request #1428 from obscuren/coinbase-fixesJeffrey Wilcke2015-07-0712-51/+99
|\ | | | | cmd,eth,rpc,tests: default coinbase
| * eth,miner,rpc: set coinbaseJeffrey Wilcke2015-07-074-1/+13
| |
| * cmd,eth,rpc,tests: default coinbaseJeffrey Wilcke2015-07-0710-51/+87
| |
* | Merge pull request #1429 from obscuren/rebase-registrarJeffrey Wilcke2015-07-0732-679/+1944
|\ \ | |/ |/| Rebase registrar
| * fix/skip tests, adapt registrar to no contract addresszelig2015-07-075-30/+42
| | | | | | | | registry initialisers now return the txhash which caller can use to retrieve receipt
| * rebase with zelig/frontier/registrarBas van Kervel2015-07-071-20/+10
| |
| * corrected input formatters as suggested during reviewBas van Kervel2015-07-076-24/+4
| |
| * fixed web3 formatters mismatchBas van Kervel2015-07-079-174/+73
| |
| * output BigNumbers objects in console as stringsBas van Kervel2015-07-071-1/+9
| |
| * fix natspec testzelig2015-07-076-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 passeszelig2015-07-075-30/+296
| |
| * rename js methods in js_test for new console APIzelig2015-07-072-461/+7
| | | | | | | | + rebase fixes
| * fix GPO missing flagszelig2015-07-071-0/+6
| |
| * fix sleepBlocks, implement sleepzelig2015-07-074-19/+45
| |
| * add missing method to api/adminzelig2015-07-072-2/+17
| |
| * Registrar and contractInfo handlingzelig2015-07-076-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 handlingzelig2015-07-0720-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-fixJeffrey Wilcke2015-07-076-9/+13
|\ | | | | core, eth, rpc: proper gas used. Closes #1422
| * core, eth, rpc: proper gas used. Closes #1417Jeffrey Wilcke2015-07-076-9/+13
| | | | | | | | Added some additional backward compatibility code for old receipts
* | Merge pull request #1418 from fjl/one-interruptJeffrey Wilcke2015-07-071-1/+1
|\ \ | | | | | | cmd/utils: fix interrupt handling to actually see subsequent interrupts
| * | cmd/utils: fix interrupt handling to actually see subsequent interruptsFelix Lange2015-07-061-1/+1
| | |
* | | Merge pull request #1414 from Gustav-Simonsson/update_testsJeffrey Wilcke2015-07-062-8/+19
|\ \ \ | |_|/ |/| | Add TestBcGasPricer, comments and unskip tests
| * | Add TestBcGasPricer, comments and unskip testsGustav Simonsson2015-07-062-8/+19
| | |
* | | Merge pull request #1416 from fjl/one-interruptJeffrey Wilcke2015-07-062-37/+17
|\ \ \ | | |/ | |/| cmd/geth, cmd/utils: improve interrupt handling
| * | cmd/geth, cmd/utils: improve interrupt handlingFelix Lange2015-07-062-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-updateJeffrey Wilcke2015-07-061-2784/+138
|\ \ \ | | | | | | | | web3: updated
| * | | web3: updatedJeffrey Wilcke2015-07-061-2784/+138
|/ / /
* | | Merge pull request #1413 from obscuren/receipt-fixJeffrey Wilcke2015-07-062-10/+15
|\ \ \ | |_|/ |/| | rpc, xeth: fixed returned tx hash & receipt logs
| * | rpc, xeth: fixed returned tx hash & receipt logsJeffrey Wilcke2015-07-062-10/+15
|/ /
* | Merge pull request #1410 from obscuren/newerrors-fixJeffrey Wilcke2015-07-065-12/+20
|\ \ | |/ |/| core, miner: adopted new style errors
| * core, miner: removed vm errors from consensus err checkingJeffrey Wilcke2015-07-065-12/+20
|/ | | | | Removed VM errors from the consensus errors. They now used for output only.
* Merge pull request #1400 from obscuren/badblock-reportingJeffrey Wilcke2015-07-064-2/+61
|\ | | | | core, miner, tests: added test, implemented bad block reporting
| * core, miner, tests: added test, implemented bad block reportingJeffrey Wilcke2015-07-054-2/+61
| |
* | Merge pull request #1409 from fjl/fix-tx-hashJeffrey Wilcke2015-07-063-9/+17
|\ \ | | | | | | core/types, xeth: separate tx hash and tx signature hash
| * | core/types, xeth: separate tx hash and tx signature hashFelix Lange2015-07-063-9/+17
| |/
* | Merge pull request #1397 from tgerring/rpcreceiptJeffrey Wilcke2015-07-064-1/+60
|\ \ | | | | | | getTransactionReceipt RPC support
| * | Add autocomplete support for consoleTaylor Gerring2015-07-061-0/+1
| | |
| * | Always return transaction hashTaylor Gerring2015-07-061-1/+0
| | |
| * | CleanupTaylor Gerring2015-07-051-4/+4
| | |
| * | Compose additional fieldsTaylor Gerring2015-07-052-5/+18
| | |
| * | Remove redundant functionTaylor Gerring2015-07-053-18/+3
| | |
| * | Rename local variable for clarityTaylor Gerring2015-07-041-2/+2
| | |
| * | Decode full receipt storageTaylor Gerring2015-07-043-4/+21
| | |
| * | Fix hex conversionTaylor Gerring2015-07-041-1/+2
| | |
| * | Initial getTransactionReceipt supportTaylor Gerring2015-07-042-0/+43
| | |
* | | Merge pull request #1395 from Gustav-Simonsson/fix_core_errors_in_apply_txsJeffrey Wilcke2015-07-067-54/+10
|\ \ \ | |_|/ |/| | Fix core errors in apply txs
| * | Fix core error forwarding, unify OOG VM errGustav Simonsson2015-07-047-54/+10
|/ /
* | Merge pull request #1369 from obscuren/statedb-update-cleanupJeffrey Wilcke2015-07-0416-49/+106
|\ \ | | | | | | core, core/state: throw out intermediate state
| * | trie: removed shallow copies (thanks to @fjl)Jeffrey Wilcke2015-07-041-1/+1
| | |
| * | trie: dirty trackingJeffrey Wilcke2015-07-047-28/+73
| | |
| * | core, miner, tests: renamed state methodsJeffrey Wilcke2015-07-048-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 intermediateJeffrey Wilcke2015-07-043-11/+21
| |/
* | Merge pull request #1283 from ethersphere/frontier/accountsJeffrey Wilcke2015-07-0410-174/+358
|\ \ | |/ |/| Account management improvements
| * account update: migrate or change passwordzelig2015-07-034-25/+149
| | | | | | | | | | | | * account.Update * KeyStore.Cleanup * fix dir rm for old format deleteKey
| * fix account orderingzelig2015-07-036-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 ctimezelig2015-07-032-5/+28
| |
| * rpc/js coinbase returns null if no etherbase setzelig2015-07-032-4/+5
| |
| * no primary when listing accountszelig2015-07-031-4/+2
| |
| * require explicit etherbase address for mining. Falling back to primary is ↵zelig2015-07-031-3/+2
| | | | | | | | risky given it is inconsistent if keys are imported/merged/created or copied/transfered
| * unlock multiple passes and obsolete primaryzelig2015-07-036-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 unlockingzelig2015-07-032-56/+85
| |
* | Merge pull request #1399 from obscuren/receipts-storing-fixJeffrey Wilcke2015-07-048-57/+75
|\ \ | | | | | | core, eth, miner, xeth: receipt storage fix
| * | core, eth, miner, xeth: receipt storage fixJeffrey Wilcke2015-07-048-57/+75
| | | | | | | | | | | | | | | * Added GetReceiptsFromBlock, GetReceipt, PutReceipts * Added ContractAddress to receipt. See #1042
* | | Merge pull request #1385 from Gustav-Simonsson/update_testsJeffrey Wilcke2015-07-0420-4520/+1935
|\ \ \ | |/ / |/| | Update Ethereum JSON test files, skip failing tests
| * | Update Ethereum JSON tests, skip failingGustav Simonsson2015-07-0320-4520/+1935
|/ /
* | Merge pull request #1393 from bas-vk/issue1377Jeffrey Wilcke2015-07-031-103/+2934
|\ \ | | | | | | Upgrade web3 to version 0.7.1
| * | upgrade web3 to version 0.7.1Bas van Kervel2015-07-031-103/+2934
| | |
* | | Merge pull request #1392 from bas-vk/ipcpipeliningJeffrey Wilcke2015-07-034-46/+181
|\ \ \ | | | | | | | | Several bugfixes to IPC channel
| * | | fixed unittest after new implementationBas van Kervel2015-07-031-37/+1
| | | |
| * | | simplified implementation and improved performanceBas van Kervel2015-07-031-103/+20
| | | |
| * | | display rpc error in consoleBas van Kervel2015-07-032-13/+15
| | | |
| * | | merge conflictBas van Kervel2015-07-020-0/+0
| |\ \ \
| | * | | ipcpath issue fixBas van Kervel2015-07-021-5/+5
| | | | |
| | * | | prevent discarding requests when parsing failsBas van Kervel2015-07-022-26/+273
| | | | |
| | * | | added pipelining supportBas van Kervel2015-07-011-15/+20
| | | | |
| * | | | ipcpath issue fixBas van Kervel2015-07-021-5/+5
| | | | |
| * | | | prevent discarding requests when parsing failsBas van Kervel2015-07-022-26/+273
| | | | |
| * | | | added pipelining supportBas van Kervel2015-07-021-15/+20
| | |_|/ | |/| |
* | | | Merge pull request #1394 from obscuren/developJeffrey Wilcke2015-07-031-1/+1
|\ \ \ \ | | | | | | | | | | miner: ignore future errors
| * | | | miner: ignore future errorsJeffrey Wilcke2015-07-031-1/+1
|/ / / /
* | | | Merge pull request #1389 from obscuren/txpool-issuesJeffrey Wilcke2015-07-0315-89/+126
|\ \ \ \ | | | | | | | | | | core, miner: miner header validation, transaction & receipt writing
| * | | | core, miner: miner header validation, transaction & receipt writingJeffrey Wilcke2015-07-0315-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/consolefalseJeffrey Wilcke2015-07-031-2/+0
|\ \ \ \ | |/ / / |/| | | Prevent false from printing on console
| * | | Prevent debug value from printing on consoleTaylor Gerring2015-07-031-2/+0
|/ / /
* | | Merge pull request #1390 from karalabe/fix-downloader-test-raceJeffrey Wilcke2015-07-031-1/+7
|\ \ \ | |/ / |/| | eth/downloader: fix a rare test race on the OSX CI
| * | eth/downloader: fix a rare test race on the OSX CIPéter Szilágyi2015-07-031-1/+7
|/ /
* | Merge branch 'develop' of github.com:ethereum/go-ethereum into developVitalik Buterin2015-07-023-9/+9
|\ \
| * \ Merge pull request #1378 from obscuren/issue1367Jeffrey Wilcke2015-07-023-9/+9
| |\ \ | | | | | | | | core, xeth: core.AddressFromMessage removed => crypto.CreateAddress
| | * | core, xeth: core.AddressFromMessage removed => crypto.CreateAddressJeffrey Wilcke2015-07-023-9/+9
| | | |
* | | | Switched canary addressesVitalik Buterin2015-07-021-4/+4
|/ / /
* | | Merge pull request #1351 from karalabe/eth61Jeffrey Wilcke2015-07-0113-306/+981
|\ \ \ | | | | | | | | Implement eth/61
| * | | eth, eth/downloader: fix #1231, DOS vulnerability in hash queueingPéter Szilágyi2015-07-012-5/+15
| | | |
| * | | eth: fix #1371, double lock during block/txn known set limitationPéter Szilágyi2015-07-011-10/+4
| | | |
| * | | eth/downloader: reduce hash fetches in prep for eth/61Péter Szilágyi2015-07-011-3/+3
| | | |
| * | | eth, eth/downloader: transition to eth 61Péter Szilágyi2015-07-018-140/+689
| | | |
| * | | eth, eth/downloader: pass the eth protocol version throughPéter Szilágyi2015-07-014-36/+45
| | | |
| * | | eth: add the blocks from numbers protocol messagePéter Szilágyi2015-07-014-26/+43
| | | |
| * | | eth: fix #1319, put an upper limit on the known txns and blocksPéter Szilágyi2015-07-011-0/+19
| | | |
| * | | eth: clean up peer struct a bit, fix double txn bcastPéter Szilágyi2015-07-014-71/+69
| | | |
| * | | eth: start cleaning up old protocol implementation, add metricsPéter Szilágyi2015-07-013-39/+105
| | | |
| * | | cmd/geth, cmd/utils, eth: advertise both eth/60 and eth/61Péter Szilágyi2015-07-015-48/+61
| | | |
* | | | Merge pull request #1373 from obscuren/recovery-toolsJeffrey Wilcke2015-07-013-87/+133
|\ \ \ \ | |_|/ / |/| | | core, cmd/geth: improved recover functionality
| * | | core, cmd/geth: improved recover functionalityJeffrey Wilcke2015-07-013-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-checkpointJeffrey Wilcke2015-07-012-2/+34
|\ \ \ | | | | | | | | core, cmd/geth: recover by number
| * | | core, cmd/geth: recover by numberJeffrey Wilcke2015-07-012-2/+34
| | | |
* | | | Merge pull request #1355 from Gustav-Simonsson/block_header_ts_uint64Jeffrey Wilcke2015-07-0112-25/+24
|\ \ \ \ | | | | | | | | | | Use uint64 for block header timestamp
| * | | | Use uint64 for block header timestampGustav Simonsson2015-06-3012-25/+24
| |/ / /
* | | | Merge pull request #1366 from ethers/rpcRequestJeffrey Wilcke2015-07-011-1/+1
|\ \ \ \ | |/ / / |/| | | fix logging jsonrpc request #1365
| * | | fix logging jsonrpc request #1365ethers2015-07-011-1/+1
|/ / /
* | | Merge pull request #1363 from obscuren/safeguardJeffrey Wilcke2015-07-013-60/+44
|\ \ \ | |/ / |/| | core: added checkpoint for last block
| * | core: txpool listen for ChainHeadEvent instead of ChainEventJeffrey Wilcke2015-06-301-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 blockJeffrey Wilcke2015-06-302-58/+42
|/ / | | | | | | | | * Add a checkpoint every X blocks * Removed queued write
* | Merge pull request #1328 from bas-vk/issue1327Jeffrey Wilcke2015-06-305-8/+252
|\ \ | |/ |/| Add pendingTransactions and resend
| * solved merge conflictsBas van Kervel2015-06-301-9/+0
| |\
| | * initialize fields to prevent nil pointer exceptionBas van Kervel2015-06-291-3/+8
| | |
| | * add json parsing method for resend transactionBas van Kervel2015-06-292-2/+76
| | |
| | * improved error handling in parsing requestBas van Kervel2015-06-292-2/+8
| | |
| | * fixed unittest compilation issueBas van Kervel2015-06-241-2/+3
| | |
| | * added eth.resendBas van Kervel2015-06-244-0/+76
| | |
| | * added eth.pendingTransactionsBas van Kervel2015-06-244-6/+79
| | |
| * | rebase with developBas van Kervel2015-06-302-15/+33
| | |
| * | initialize fields to prevent nil pointer exceptionBas van Kervel2015-06-301-3/+8
| | |
| * | add json parsing method for resend transactionBas van Kervel2015-06-302-2/+76
| | |
| * | improved error handling in parsing requestBas van Kervel2015-06-302-2/+8
| | |
| * | fixed unittest compilation issueBas van Kervel2015-06-301-2/+3
| | |
| * | added eth.resendBas van Kervel2015-06-304-0/+76
| | |
| * | added eth.pendingTransactionsBas van Kervel2015-06-304-6/+79
| | |
* | | Merge pull request #1362 from obscuren/txpool-cleanupJeffrey Wilcke2015-06-303-28/+54
|\ \ \ | |/ / |/| | core: reduce CPU load by reducing calls to checkQueue
| * | core: reduce CPU load by reducing calls to checkQueueJeffrey Wilcke2015-06-303-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 developJeffrey Wilcke2015-06-302-16/+19
|\ \
| * | core, miner: added queued write to WriteBlockJeffrey Wilcke2015-06-302-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 Wilcke2015-06-30446-332051/+16510
| |\ \
| * \ \ Merge branch 'release/0.9.32'Jeffrey Wilcke2015-06-24264-36992/+6993
| |\ \ \
| * \ \ \ Merge branch 'release/0.9.30'obscuren2015-06-1691-1112/+9448
| |\ \ \ \
| * \ \ \ \ Merge branch 'release/0.9.28'obscuren2015-06-10110-6415/+28917
| |\ \ \ \ \
* | | | | | | cmd/geth: version bump 0.9.35Jeffrey Wilcke2015-06-301-1/+1
| | | | | | |
* | | | | | | Merge branch 'release/0.9.34' into developJeffrey Wilcke2015-06-301-1/+1
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | cmd/geth: version bump 0.9.34Jeffrey Wilcke2015-06-301-1/+1
|/ / / / / /
* | | | | | Merge pull request #1360 from obscuren/peter-metricsJeffrey Wilcke2015-06-3013-83/+326
|\ \ \ \ \ \ | | | | | | | | | | | | | | Rebased peter's PR