aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* xeth: added a transact muJeffrey Wilcke2015-08-151-4/+4
* Merge pull request #1658 from bas-vk/liner-ctrl-cJeffrey Wilcke2015-08-141-0/+11
|\
| * main clear current line on ctrl-CBas van Kervel2015-08-141-0/+11
* | Merge pull request #1642 from ethereum/fix-js-console-windowsJeffrey Wilcke2015-08-1427-872/+1941
|\ \
| * | cmd/geth, jsre: restore command line editing on windowsFelix Lange2015-08-1227-872/+1941
* | | Merge pull request #1655 from obscuren/db-merge-fixJeffrey Wilcke2015-08-143-21/+19
|\ \ \ | |_|/ |/| |
| * | eth, trie: removed key prefixing from state entries & merge db fixJeffrey Wilcke2015-08-143-21/+19
* | | Merge pull request #1635 from bas-vk/useragentJeffrey Wilcke2015-08-1419-88/+361
|\ \ \
| * | | support for user agentsBas van Kervel2015-08-1219-88/+361
* | | | Merge pull request #1638 from obscuren/jit-fixesJeffrey Wilcke2015-08-1412-41/+34
|\ \ \ \ | |_|/ / |/| | |
| * | | cmd/evm, core/vm, tests: changed DisableVm to EnableVmJeffrey Wilcke2015-08-1210-30/+20
| * | | core/vm: fixed jit error & added inline docsJeffrey Wilcke2015-08-112-11/+14
| |/ /
* | | Merge pull request #1470 from ebuchman/encHandshakeFelix Lange2015-08-131-4/+12
|\ \ \
| * | | p2p: validate recovered ephemeral pubkey against checksum in decodeAuthMsgEthan Buchman2015-07-141-4/+12
* | | | Merge pull request #1651 from karalabe/rlp-boolean-supportFelix Lange2015-08-134-0/+53
|\ \ \ \
| * | | | rlp: add support for boolean encoding/decodingPéter Szilágyi2015-08-134-0/+53
|/ / / /
* | | | Merge pull request #1647 from fjl/fix-disc-reasonFelix Lange2015-08-131-1/+1
|\ \ \ \
| * | | | p2p: fix value of DiscSubprotocolErrorFelix Lange2015-08-121-1/+1
| | |_|/ | |/| |
* | | | Merge pull request #1646 from fjl/fix-client-identifierFelix Lange2015-08-121-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | cmd/geth: remove spaces in client identifierFelix Lange2015-08-121-1/+1
|/ / /
* | | Merge pull request #1621 from ethereum/fix-discover-hangsJeffrey Wilcke2015-08-124-83/+197
|\ \ \
| * | | p2p/discover: fix UDP reply packet timeout handlingFelix Lange2015-08-112-31/+120
| * | | p2p/discover: unlock the table during ping replacementFelix Lange2015-08-113-52/+77
* | | | Merge pull request #1641 from obscuren/web3-updateJeffrey Wilcke2015-08-111-931/+2100
|\ \ \ \
| * | | | web3: updatedJeffrey Wilcke2015-08-111-931/+2100
|/ / / /
* | | | Merge pull request #1640 from obscuren/trace-flag-ethtestJeffrey Wilcke2015-08-111-1/+7
|\ \ \ \ | |_|_|/ |/| | |
| * | | cmd/ethtest: added trace flag for debuggingJeffrey Wilcke2015-08-111-1/+7
|/ / /
* | | Merge pull request #1604 from obscuren/db-mergeJeffrey Wilcke2015-08-0921-187/+223
|\ \ \
| * | | core, eth, trie, xeth: merged state, chain, extra databases in oneJeffrey Wilcke2015-08-0821-187/+223
* | | | Merge pull request #1611 from obscuren/expdiff-olympic-fixJeffrey Wilcke2015-08-092-2/+4
|\ \ \ \
| * | | | cmd/utils, core: disable exp diff for olympic netJeffrey Wilcke2015-08-062-2/+4
* | | | | Merge pull request #1626 from obscuren/defaults-fixJeffrey Wilcke2015-08-092-3/+4
|\ \ \ \ \
| * | | | | cmd/geth, core/vm: setup vm settings and defaulted JIT disabledJeffrey Wilcke2015-08-092-3/+4
|/ / / / /
* | | | | Merge pull request #1490 from obscuren/jit-vmJeffrey Wilcke2015-08-0823-100/+1569
|\ \ \ \ \
| * | | | | core/vm: reduced big int allocationsJeffrey Wilcke2015-08-074-123/+78
| * | | | | core, tests: reduced state copy by N callsJeffrey Wilcke2015-08-079-18/+39
| * | | | | core/vm, tests: implemented semi-jit vmJeffrey Wilcke2015-08-0719-79/+1572
| | |_|/ / | |/| | |
* | | | | Merge pull request #1620 from caktux/developJeffrey Wilcke2015-08-081-1/+1
|\ \ \ \ \
| * | | | | string version for build servercaktux2015-08-081-1/+1
|/ / / / /
* | | | | Merge pull request #1615 from obscuren/contract-addr-fixJeffrey Wilcke2015-08-071-1/+1
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | xeth: fixed contract addr checkJeffrey Wilcke2015-08-071-1/+1
|/ / / /
* | | | Merge pull request #1595 from obscuren/extra-dataJeffrey Wilcke2015-08-074-16/+42
|\ \ \ \
| * | | | miner, rpc: added length check for extra dataJeffrey Wilcke2015-08-072-7/+10
| * | | | cmd/geth, eth: added canonical extra dataJeffrey Wilcke2015-08-072-9/+32
* | | | | Merge pull request #1614 from obscuren/web3-finite-fixJeffrey Wilcke2015-08-071-2/+2
|\ \ \ \ \
| * | | | | web3: regression. Fixes #1613Jeffrey Wilcke2015-08-071-2/+2
| |/ / / /
* | | | | Merge pull request #1596 from obscuren/submit-hashrateJeffrey Wilcke2015-08-074-4/+85
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | miner, rpc: added submit hashrate for remote agentsJeffrey Wilcke2015-08-064-4/+85
| | |/ / | |/| |
* | | | Merge pull request #1610 from obscuren/address-checkJeffrey Wilcke2015-08-072-0/+37
|\ \ \ \ | |_|/ / |/| | |
| * | | xeth: added address hex check and length checkJeffrey Wilcke2015-08-072-0/+37
|/ / /
* | | Merge pull request #1600 from ethereum/fix-tests-windowsJeffrey Wilcke2015-08-0714-96/+59
|\ \ \
| * | | .gitattributes: addFelix Lange2015-08-061-0/+2
| * | | p2p/nat: disable UPnP test on windowsFelix Lange2015-08-061-0/+5
| * | | common/compiler, common/docserver, jsre: fix tests on windowsFelix Lange2015-08-064-17/+38
| * | | cmd/utils: fix path expansion on windowsFelix Lange2015-08-062-10/+4
| * | | common: remove windows path functionsFelix Lange2015-08-064-65/+2
| * | | p2p/discover: close Table during testingFelix Lange2015-08-062-4/+8
* | | | Merge pull request #1603 from ebuchman/trie_hex_fixJeffrey Wilcke2015-08-072-24/+70
|\ \ \ \
| * | | | trie: run codec tests, add benchmarks, fasterEthan Buchman2015-08-072-24/+70
|/ / / /
* | | | Merge pull request #1594 from ebuchman/trie_hex_fixJeffrey Wilcke2015-08-065-39/+30
|\ \ \ \ | |_|/ / |/| | |
| * | | faster hex-prefix codec and string -> []byteEthan Buchman2015-08-065-39/+30
* | | | 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, nonceJeffrey Wilcke2015-08-052-1/+53
| |/ /
| * | Merge pull request #1588 from obscuren/diff-bombJeffrey Wilcke2015-08-056-7/+196
| |\ \
| | * | 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 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 ShannonGustav Simonsson2015-08-044-8/+22
| * | | Merge pull request #1574 from fjl/fdtrackJeffrey Wilcke2015-08-0417-212/+477
| |\ \ \ | | |/ / | |/| |
| | * | fdtrack: temporary hack for tracking file descriptor usageFelix Lange2015-08-0415-7/+314
| | * | metrics: fix file descriptor leak when reading disk stats on linuxFelix Lange2015-08-031-0/+1
| | * | rpc/comms: use ConnState to track HTTP connectionsFelix Lange2015-08-032-205/+162
| * | | Merge pull request #1562 from ethersphere/blankpasswdJeffrey Wilcke2015-08-041-2/+17
| |\ \ \
| | * | | 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 networkJeffrey Wilcke2015-08-044-0/+42
| | |/ /
| * | | Merge pull request #1479 from tgerring/ethtestJeffrey Wilcke2015-08-031-2/+8
| |\ \ \
| | * | | 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 and spin less in TestSignRaceFelix Lange2015-08-021-1/+2
| * | | | | Merge pull request #1568 from obscuren/issue-1559Jeffrey Wilcke2015-08-031-1/+5
| |\ \ \ \ \
| | * | | | | core: added a running flag to prevent panics in the chainmanagerJeffrey Wilcke2015-08-011-1/+5
| | | |_|/ / | | |/| | |
| * | | | | Merge pull request #1569 from obscuren/default-genesisJeffrey Wilcke2015-08-033-2/+40
| |\ \ \ \ \
| | * | | | | core: added default genesis blockJeffrey Wilcke2015-08-023-2/+40
| | |/ / / /
| * | | | | Merge pull request #1461 from bas-vk/eth_resendJeffrey Wilcke2015-08-024-10/+23
| |\ \ \ \ \
| | * | | | | bugfix, pending transaction was resend with new gas price/limit but not remov...Bas van Kervel2015-07-284-10/+23
| * | | | | | Merge pull request #1541 from bas-vk/issue1518Jeffrey Wilcke2015-08-012-12/+14
| |\ \ \ \ \ \
| | * | | | | | improved error detection and handling for NewTransactionFromBytesBas van Kervel2015-07-292-12/+14
| * | | | | | | Merge pull request #1545 from obscuren/log-indexJeffrey Wilcke2015-08-011-0/+5
| |\ \ \ \ \ \ \
| | * | | | | | | core/state: Set log index. Closes #1226Jeffrey Wilcke2015-07-291-0/+5
| * | | | | | | | Merge pull request #1561 from karalabe/add-missing-autocompletesJeffrey Wilcke2015-07-311-5/+12
| |\ \ \ \ \ \ \ \
| | * | | | | | | | rpc/api: add missing autocomplete commandsPéter Szilágyi2015-07-311-5/+12
| |/ / / / / / / /
| * | | | | | | | Merge pull request #1553 from prusnak/developJeffrey Wilcke2015-07-302-14/+1
| |\ \ \ \ \ \ \ \
| | * | | | | | | | remove elliptic.P224 usagePavol Rusnak2015-07-302-14/+1
| | | |_|_|/ / / / | | |/| | | | | |
| * | | | | | | | Merge pull request #1534 from obscuren/issue-1040Jeffrey Wilcke2015-07-303-8/+4
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | rpc: to in Call no longer required. Fixed eth_estimateGasJeffrey Wilcke2015-07-293-8/+4
| | |/ / / / / /
| * | | | | | | Merge pull request #1544 from karalabe/fix-stall-detectorJeffrey Wilcke2015-07-293-43/+65
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | eth, eth/downloader: don't report stall if fetcher filled the blockPéter Szilágyi2015-07-293-43/+65
| * | | | | | | Merge pull request #1546 from obscuren/tests-updateJeffrey Wilcke2015-07-29751-8227/+8337
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | tests: updatedJeffrey Wilcke2015-07-29751-8227/+8337
| | |/ / / / /
| * | | | | | Merge pull request #1543 from enriquefynn/developJeffrey Wilcke2015-07-291-0/+2
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | FreeBSD supportFynn2015-07-291-0/+2
| |/ / / / /
| * | | | | Merge pull request #1533 from ethersphere/frontier/etherbaseJeffrey Wilcke2015-07-282-2/+7
| |\ \ \ \ \
| | * | | | | etherbase defaults to first account even if created during the sessionzelig2015-07-272-2/+7
| | | |/ / / | | |/| | |
| * | | | | Merge pull request #1515 from fjl/license-fixesJeffrey Wilcke2015-07-28332-1505/+380
| |\ \ \ \ \
| | * | | | | Godeps: use BSD-licensed version of gopkg.in/karalabe/cookiejar.v2Felix Lange2015-07-245-53/+17
| | * | | | | crypto/sha3: add full license headersFelix Lange2015-07-242-4/+52
| | * | | | | common: remove config.goFelix Lange2015-07-2415-1137/+0
| | * | | | | all: fix license headers one more timeFelix Lange2015-07-24312-312/+312
| * | | | | | Merge pull request #1536 from fjl/fix-go1.5-buildFelix Lange2015-07-281-1/+8
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | 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 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 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 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 nameJeffrey Wilcke2015-07-251-0/+7
| * | | | | | Merge pull request #1520 from obscuren/reward-5ethJeffrey Wilcke2015-07-253-2/+10
| |\ \ \ \ \ \
| | * | | | | | 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.0Jeffrey Wilcke2015-07-257-57/+56
| | |/ / / / / /
| * | | | | | | Merge pull request #1497 from obscuren/remove-rleJeffrey Wilcke2015-07-252-7/+7
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| | * | | | | | 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 writeoutJeffrey Wilcke2015-07-251-0/+4
| | | |/ / / / / | | |/| | | | |
| * | | | | | | Merge pull request #1523 from obscuren/lower-gaspriceJeffrey Wilcke2015-07-251-1/+1
| |\ \ \ \ \ \ \
| | * | | | | | | 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.1v0.9.39Jeffrey 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 writesJeffrey Wilcke2015-07-235-59/+120
| |/ / / / /
| * | | | | Merge pull request #1510 from fjl/license-fixesJeffrey Wilcke2015-07-23331-1333/+1369
| |\| | | |
| | * | | | remove LICENSE filesFelix Lange2015-07-232-32/+0
| | * | | | all: update license headers to distiguish GPL/LGPLFelix Lange2015-07-23328-1274/+1330
| | * | | | crypto: fix license of curve.goFelix Lange2015-07-232-27/+39
| * | | | | 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 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 copyPéter Szilágyi2015-07-231-2/+2
| |/ / / / /
| * | | | | Merge pull request #1503 from fjl/fix-accounts-raceFelix Lange2015-07-223-21/+45
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | 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
| * | | | | Merge pull request #1481 from tgerring/legaleseJeffrey Wilcke2015-07-223-20/+52
| |\ \ \ \ \
| | * | | | | 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 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+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 firingPéter Szilágyi2015-07-201-0/+9
| |/ / / /
| * | | | Merge pull request #1484 from fjl/rlp-json-testsJeffrey Wilcke2015-07-196-11/+225
| |\ \ \ \
| | * | | | rlp: fix check for canonical byte array sizeFelix Lange2015-07-182-9/+16
| | * | | | 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 syncJeffrey Wilcke2015-07-161-1/+1
| | |/ / / /
| * | | | | Merge pull request #1488 from ethereum/travisJeffrey Wilcke2015-07-191-4/+5
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Travis container supportTaylor Gerring2015-07-181-4/+5
| |/ / / /
| * | | | Merge pull request #1477 from tgerring/legaleseJeffrey Wilcke2015-07-163-6/+26
| |\| | |
| | * | | 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 miningJeffrey Wilcke2015-07-163-105/+149
| * | | | | Merge pull request #1476 from obscuren/deadlock-logsJeffrey Wilcke2015-07-161-3/+0
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | 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 transactionsJeffrey Wilcke2015-07-153-13/+46
| | | |/ | | |/|
| * | | Merge pull request #1468 from Gustav-Simonsson/xeth_transact_loggingJeffrey Wilcke2015-07-161-2/+2
| |\ \ \ | | |/ / | |/| |
| | * | xeth: log signed tx hashGustav Simonsson2015-07-131-2/+2
| |/ /
| * | Merge pull request #1462 from obscuren/genesisJeffrey Wilcke2015-07-1215-138/+244
| |\ \ | | |/ | |/|
| | * cmd, core, eth, common: genesis preparationJeffrey Wilcke2015-07-1015-138/+244
| |/
| * 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
| |\
* | \ Merge branch 'release/0.9.38'v0.9.38Jeffrey Wilcke2015-07-1037-1935/+1433
|\ \ \ | | |/ | |/|
| * | 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 opJeffrey Wilcke2015-07-091-0/+136
| |/
| * Merge pull request #1453 from ethersphere/frozen-accountsJeffrey Wilcke2015-07-092-4/+1
| |\
| | * 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 FS...zelig2015-07-091-1/+1
| * | Merge pull request #1441 from obscuren/logs-return-fixJeffrey Wilcke2015-07-094-12/+24
| |\ \
| | * | 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 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 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/shutdownPéter Szilágyi2015-07-092-61/+83
| | |/
| * | Merge pull request #1443 from Gustav-Simonsson/core_uint64_tsJeffrey Wilcke2015-07-0919-1749/+1114
| |\ \
| | * | 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.versionBas van Kervel2015-07-084-3/+11
| | |/
| * | Merge pull request #1432 from tgerring/developJeffrey Wilcke2015-07-091-1/+2
| |\ \ | | |/ | |/|
| | * Adjust .mailmapTaylor Gerring2015-07-081-1/+2
| |/
* | Merge branch 'release/0.9.36'v0.9.36Jeffrey Wilcke2015-07-071-14/+73
|\|
| * Merge pull request #1430 from obscuren/web3-0.8.0Jeffrey Wilcke2015-07-071-14/+73
| |\
| | * web3 updateJeffrey Wilcke2015-07-071-14/+73
| |/
* | Merge branch 'release/0.9.36'Jeffrey Wilcke2015-07-070-0/+0
|\|
| * Merge branch 'release/0.9.36' into developJeffrey Wilcke2015-07-073-14/+21
| |\
* | \ Merge branch 'release/0.9.36'Jeffrey Wilcke2015-07-07361-7009/+13517
|\ \ \ | | |/ | |/|
| * | Merge branch 'release/0.9.36' of github.com-obscure:ethereum/go-ethereum into...Jeffrey Wilcke2015-07-070-0/+0
| |\ \
| | * | common/natspec: fixed testJeffrey Wilcke2015-07-071-1/+1
| | * | cmd/geth, cmd/utils: changed ParamsToAddress to return errorJeffrey Wilcke2015-07-072-12/+19
| | * | 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
| * | | cmd/geth: version number 0.9.36Jeffrey Wilcke2015-07-071-1/+1
| | |/ | |/|
| * | Merge pull request #1426 from fjl/licenseJeffrey Wilcke2015-07-07338-486/+6543
| |\ \ | | |/ | |/|
| | * 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
| |/
| * cmd/geth: fixed testJeffrey Wilcke2015-07-071-1/+1
| * Merge pull request #1428 from obscuren/coinbase-fixesJeffrey Wilcke2015-07-0712-51/+99
| |\
| | * 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
| |\ \ | | |/ | |/|
| | * fix/skip tests, adapt registrar to no contract addresszelig2015-07-075-30/+42
| | * 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
| | * fix js arguments and TestContract passeszelig2015-07-075-30/+296
| | * rename js methods in js_test for new console APIzelig2015-07-072-461/+7
| | * 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
| | * Registrar and contractInfo handlingzelig2015-07-0720-428/+978
| |/
| * Merge pull request #1423 from obscuren/gasused-receipt-fixJeffrey Wilcke2015-07-076-9/+13
| |\
| | * core, eth, rpc: proper gas used. Closes #1417Jeffrey Wilcke2015-07-076-9/+13
| * | Merge pull request #1418 from fjl/one-interruptJeffrey Wilcke2015-07-071-1/+1
| |\ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 16:09:52 +0800