Christopher Franko
e959453cda
Merge remote-tracking branch 'refs/remotes/ethereum/master' into rebase-1.4.4
2016-06-14 18:14:19 -04:00
Péter Szilágyi
0f036f6209
Merge branch 'release/1.4'
2016-06-06 17:22:55 +03:00
Péter Szilágyi
71a89b7c75
VERSION, cmd/geth: bumped version 1.4.6
2016-06-06 16:23:33 +03:00
Péter Szilágyi
ecb8e23e88
[release/1.4.6] eth: don't accept transactions until we sync up with the network
...
(cherry picked from commit 32559ccad1 )
2016-06-06 16:22:08 +03:00
Péter Szilágyi
058c5fe960
[release/1.4.6] eth/downloader: adaptive quality of service tuning
...
(cherry picked from commit 88f174a014 )
2016-06-06 16:22:05 +03:00
Péter Szilágyi
a29bdf547c
[release/1.4.6] eth/downloader: make fast sync resilient to critical section fails
...
(cherry picked from commit 61ee9f299d )
2016-06-06 16:22:03 +03:00
Felix Lange
44b912ec64
[release/1.4.6] core: add missing lock in TxPool.{GetTransaction,RemoveTx}
...
Fixes #2650
(cherry picked from commit fc85dd175e )
2016-06-06 16:22:00 +03:00
Felix Lange
3d69970c15
[release/1.4.6] cmd/geth: make console tests more robust
...
* use --port 0 to avoid p2p port conflicts
* use --maxpeers 0 so it doesn't connect to bootstrap nodes
* use geth.expectExit() to wait for termination
(cherry picked from commit b57b6e341e )
2016-06-06 16:21:58 +03:00
Felix Lange
8b90a49f3d
[release/1.4.6] console: remove unnecessary JS evaluation in Welcome
...
(cherry picked from commit ad0e6e971e )
2016-06-06 16:21:56 +03:00
Felix Lange
c046126c87
[release/1.4.6] internal/jsre: ensure Stop can be called more than once
...
This makes "geth js file.js" terminate again.
(cherry picked from commit fdba0cb03c )
2016-06-06 16:21:53 +03:00
Péter Szilágyi
cd134178f7
[release/1.4.6] eth/downloader: ensure cancel channel is closed post sync
...
(cherry picked from commit 4496a44f68 )
2016-06-06 16:21:51 +03:00
Péter Szilágyi
4918c820c6
[release/1.4.6] eth/downloader, trie: pull head state concurrently with chain
...
(cherry picked from commit 4f1d92b332 )
2016-06-06 16:21:49 +03:00
Péter Szilágyi
5904d58a96
[release/1.4.6] cmd/geth, console: fix reviewer issues
...
(cherry picked from commit da729e5b38 )
2016-06-06 16:21:46 +03:00
Péter Szilágyi
7c90a2e42e
[release/1.4.6] console, internal/jsre: colorize JavaScript exceptions too
...
(cherry picked from commit 14ae5708d6 )
2016-06-06 16:21:44 +03:00
Péter Szilágyi
c39de61a0a
[release/1.4.6] cmd, console: split off the console into a reusable package
...
(cherry picked from commit ffaf58f0a9 )
2016-06-06 16:21:41 +03:00
Péter Szilágyi
af53767e16
[release/1.4.6] core, core/state, trie: enterprise hand-tuned multi-level caching
...
(cherry picked from commit 748d1c171d )
2016-06-06 16:21:39 +03:00
Péter Szilágyi
7632acf6b4
[release/1.4.6] core/state: return the starting nonce for non-existent accs (testnet)
...
(cherry picked from commit 8ee84584a4 )
2016-06-06 16:21:37 +03:00
Felix Lange
9ccb70da7b
[release/1.4.6] eth: enable bad block reports
...
We used to have reporting of bad blocks, but it was disabled
before the Frontier release. We need it back because users
are usually unable to provide the full RLP data of a bad
block when it occurs.
A shortcoming of this particular implementation is that the
origin peer is not tracked for blocks received during eth/63
sync. No origin peer info is still better than no report at
all though.
(cherry picked from commit ca18202eb9 )
2016-06-06 16:21:34 +03:00
Obulapathi N Challa
8fefee7132
[release/1.4.6] misc: fix spelling mistake
...
(cherry picked from commit f3769a97d5 )
2016-06-06 16:21:31 +03:00
Rémy Roy
7a4073a758
[release/1.4.6] eth/api: fixed GetCompilers when there is no error creating Solc
...
(cherry picked from commit f86ea9aad5 )
2016-06-06 16:21:27 +03:00
Rémy Roy
ab522d3bc7
[release/1.4.6] common/compiler: support relative path to solc
...
(cherry picked from commit 5eb60a6da2 )
2016-06-06 16:21:23 +03:00
Gianfranco Cecconi
c45c424073
[release/1.4.6] Just to make it clear how to build all executables
...
(cherry picked from commit 2e530f4889 )
2016-06-06 16:21:11 +03:00
Fabio Berger
8d2775e3d7
[release/1.4.6] core: Simplify bloom9 tests with available convenience method TestBytes
...
(cherry picked from commit faf663133b )
2016-06-06 16:21:07 +03:00
Péter Szilágyi
170036289b
[release/1.4.6] eth/downloader: fix reviewer comments
...
(cherry picked from commit 8906b2fe09 )
2016-06-06 16:21:04 +03:00
Péter Szilágyi
8ebbd9b7c7
[release/1.4.6] eth/downloader: stream partial skeleton filling to processor
...
(cherry picked from commit e86619e75d )
2016-06-06 16:21:01 +03:00
Péter Szilágyi
7df36e5ec1
[release/1.4.6] eth/downloader: implement concurrent header downloads
...
(cherry picked from commit b40dc8a1da )
2016-06-06 16:20:58 +03:00
Felix Lange
5fb29fd45f
[release/1.4.6] node, p2p: move network config out of Server
...
This silences a go vet message about copying p2p.Server in package node.
(cherry picked from commit 542b839ec7 )
2016-06-06 16:20:56 +03:00
Changhoon Lee
90beb6112e
[release/1.4.6] README: fix typos
...
README: fix typos
(cherry picked from commit 2348f8e2a8 )
2016-06-06 16:20:53 +03:00
Péter Szilágyi
efa2b3da7e
[release/1.4.6] cmd/geth: use text/templates in the tester, not html
...
(cherry picked from commit 284f1d6beb )
2016-06-06 16:20:51 +03:00
Péter Szilágyi
e3b3c298df
[release/1.4.6] cmd/geth, internal/web3ext, rpc: surface rpc module, fix shh, fix miner
...
(cherry picked from commit bc6fdad786 )
2016-06-06 16:20:48 +03:00
Péter Szilágyi
3752507a11
[release/1.4.6] travis: run CI builds against multiple Go versions
...
(cherry picked from commit bc3b406bff )
2016-06-06 16:20:18 +03:00
Christopher Franko
40b4de5346
fixed strange character
2016-05-26 13:16:58 -04:00
Christopher Franko
7db52dcdb5
Merge remote-tracking branch 'refs/remotes/ethereum/master' into rebase-1.4.4
2016-05-26 13:11:02 -04:00
Péter Szilágyi
a269a713d6
Merge pull request #2606 from ethereum/release/1.4
...
VERSION, cmd/geth: bumped version 1.4.5
2016-05-24 11:31:56 +03:00
Péter Szilágyi
27df30f30f
VERSION, cmd/geth: bumped version 1.4.5
2016-05-24 11:26:21 +03:00
Jeffrey Wilcke
311f5a0ed1
Merge branch 'release/1.4'
2016-05-24 10:03:21 +02:00
Péter Szilágyi
68ae6b52e9
[release 1.4.5] accounts/abi: fix abi test for go vet...
...
(cherry picked from commit 251b3c6406 )
2016-05-24 09:45:40 +02:00
Péter Szilágyi
1776c717bf
[release 1.4.5] accounts/abi/bind, eth: rely on getCode for sanity checks, not estimate and call
...
(cherry picked from commit 1580ec1804 )
2016-05-24 09:33:15 +02:00
Jeffrey Wilcke
0f6e3e873a
[release 1.4.5] eth: fixed regression in eth_signTransaction fixes #2578
...
Sign transaction returned the unsigned transaction rather than the
signed one.
(cherry picked from commit 4b1a7d3868 )
2016-05-24 09:33:10 +02:00
Bas van Kervel
7a7a5acc9f
[release 1.4.5] eth/filter: bugfix which can cause a nil pointer crash when parsing filter arguments
...
(cherry picked from commit 67cd4ee8d2 )
2016-05-24 09:33:05 +02:00
Felix Lange
66d74dfb75
[release 1.4.5] cmd/geth: fix console history exclusion
...
Calls to 'personal' API should be excluded from console history because
they can be called with an account passphrase as argument. The check for
such calls was inverted and didn't work.
(cherry picked from commit 86da6feb40 )
Conflicts:
cmd/geth/js.go
2016-05-24 09:32:55 +02:00
Bas van Kervel
b950a2977c
[release/1.4.5] eth: add new RPC method (personal.) SignAndSendTransaction
...
(cherry picked from commit 64a6c2c1b6 )
Conflicts:
cmd/geth/js.go
internal/web3ext/web3ext.go
2016-05-24 09:32:45 +02:00
Christopher Franko
dc0a57520f
Merge remote-tracking branch 'refs/remotes/origin/master' into rebase-1.4.4
2016-05-22 16:52:08 -04:00
Christopher Franko
bb79e8c2e3
update travis
2016-05-22 16:38:32 -04:00
Christopher Franko
58e149906c
Merge pull request #13 from expanse-project/rebase-1.4.4
...
fix jeth.go
2016-05-22 13:42:38 -04:00
Christopher Franko
990f6f38de
fix jeth.go
2016-05-22 13:37:06 -04:00
Christopher Franko
b118fdab7b
Merge pull request #12 from expanse-project/rebase-1.4.4
...
Rebase 1.4.4
2016-05-22 11:17:11 -04:00
Christopher Franko
5ba12acaa6
Merge branch 'rebase-1.4.4' of https://github.com/expanse-project/go-expanse into rebase-1.4.4
2016-05-18 23:09:49 -04:00
Christopher Franko
61796668c8
continue merging 1
...
Merge continue 2
Fake commit to restart the build servers
Fake commit to hopefully fix the PPA issue.
update versionOracle address for expanse
Merge continue 3
Merge continue 4
cleaned up a few Eth stragglers
Merge continue 5
Not sure why the merge tool changed this file and removed that but it
did.
merge continue 6
fixing expanse.js
Again not sure why this one got edited from the last one but -shrug-
fixing rpc calls for eth_ for compatibility
rpc calls still acting crazy
more rpc fixes
make jsre console accept both exp and eth cmds
rpc fixes continued
adding eth api calls
rpc and js-console both have eth calls on by default now
2016-05-18 23:06:16 -04:00
Christopher Franko
fd63e0317b
rpc and js-console both have eth calls on by default now
2016-05-18 22:52:39 -04:00