Christopher Franko
efc04c3cbd
Merge branch 'rebase-1.5.9'
2017-03-29 19:39:05 -04:00
Christopher Franko
37d12a743b
Merge branch 'rebase-1.5.9' of https://github.com/expanse-org/go-expanse into rebase-1.5.9
2017-03-28 07:48:03 -04:00
Christopher Franko
dfa8796c2f
Merge remote-tracking branch 'refs/remotes/ethereum/master' into rebase-1.5.9
2017-03-28 07:47:58 -04:00
Péter Szilágyi
225c28716f
Merge pull request #3801 from karalabe/ledger-linux-confirm
...
accounts/usbwallet: fix Ledger hidapi/libusb protocol violation
2017-03-28 09:16:23 +03:00
christopher franko
1d42a68577
dont code at night
2017-03-27 22:42:37 -04:00
Christopher Franko
08fcb27ed5
default genesis creation
2017-03-27 21:51:18 -04:00
Christopher Franko
48396cb196
update genesis alloc and util for spurrious
2017-03-27 21:35:27 -04:00
Péter Szilágyi
7419d0c382
Merge pull request #3820 from fjl/core-types-eip155-chainid-mul
...
core/types: ensure all EIP155 signer fields are set by deriveSigner
2017-03-27 00:22:34 +03:00
Ubuntu
b29805df1f
last merge commit
2017-03-26 16:45:28 +00:00
Christopher Franko
6cacf2d0fd
merge continued 3
2017-03-26 12:37:34 -04:00
Christopher Franko
9087902f5d
Merge remote-tracking branch 'refs/remotes/ethereum/master' into rebase-1.5.9 - continued 2
...
git gui conflict management is terrible
2017-03-26 12:32:08 -04:00
Christopher Franko
ab01b1e020
upstream merge continued - straggling conflict closure
2017-03-26 12:11:04 -04:00
Christopher Franko
a85150f0b4
upstream merge continued
2017-03-26 12:08:39 -04:00
Christopher Franko
10ded829b0
update gitignore
2017-03-26 11:42:54 -04:00
Christopher Franko
5822644626
Merge remote-tracking branch 'refs/remotes/ethereum/master' into rebase-1.5.9
2017-03-26 11:40:56 -04:00
Felix Lange
4be37e91b9
core/types: ensure all EIP155 signer fields are set by deriveSigner
...
Fixes #3819
2017-03-24 22:06:10 +01:00
Péter Szilágyi
1018bf6a00
rpc: honour pending requests before tearing conn down ( #3814 )
2017-03-24 12:07:12 +01:00
Péter Szilágyi
37e252587a
Merge pull request #3813 from fjl/build-fixes-2
...
build: unify vendor skipping, always run go vet
2017-03-24 11:52:42 +02:00
Péter Szilágyi
bb7dca275c
ethstats: cleanups, trace logs and "fix" history responses ( #3812 )
2017-03-24 10:42:40 +01:00
Felix Lange
69ac6cc70e
travis.yml: re-add missing build commands for Go 1.7
2017-03-24 10:29:20 +01:00
Felix Lange
df1fbe3c06
build: always run go vet
...
This ensures 'make test' finds all errors that remote CI would find.
Go 1.7 vet reports a false positive in package log, add a workaround.
2017-03-24 10:28:46 +01:00
Péter Szilágyi
8771c3061f
Merge pull request #3794 from fjl/core-genesis-refactor
...
core: refactor genesis handling
2017-03-23 17:36:38 +02:00
Péter Szilágyi
8ff7e55ab5
accounts/usbwallet: if a confirmation is pending, skip refresh
2017-03-23 17:04:39 +02:00
Felix Lange
37dd9086ec
core: refactor genesis handling
...
This commit solves several issues concerning the genesis block:
* Genesis/ChainConfig loading was handled by cmd/geth code. This left
library users in the cold. They could specify a JSON-encoded
string and overwrite the config, but didn't get any of the additional
checks performed by geth.
* Decoding and writing of genesis JSON was conflated in
WriteGenesisBlock. This made it a lot harder to embed the genesis
block into the forthcoming config file loader. This commit changes
things so there is a single Genesis type that represents genesis
blocks. All uses of Write*Genesis* are changed to use the new type
instead.
* If the chain config supplied by the user was incompatible with the
current chain (i.e. the chain had already advanced beyond a scheduled
fork), it got overwritten. This is not an issue in practice because
previous forks have always had the highest total difficulty. It might
matter in the future though. The new code reverts the local chain to
the point of the fork when upgrading configuration.
The change to genesis block data removes compression library
dependencies from package core.
2017-03-23 15:58:43 +01:00
Felix Lange
67c47459f2
core/types: handle nil ChainId in NewEIP155Signer
...
All uses of ChainConfig.ChainId eventually end up in NewEIP155Signer.
This fixes the case where users forget to set the ChainId in their
config.
2017-03-23 15:58:42 +01:00
Felix Lange
0f4b75bea2
core/state: expose CommitTo
2017-03-23 15:58:42 +01:00
Felix Lange
d42a56afc5
common: add UnprefixedHash, UnprefixedAddress
2017-03-23 15:58:42 +01:00
Felix Lange
b4547a560b
common/hexutil: add UnmarshalFixedUnprefixedText
2017-03-23 15:58:42 +01:00
Felix Lange
04fa6a3744
common/math: add HexOrDecimal64, HexOrDecimal256
2017-03-23 15:58:42 +01:00
Péter Szilágyi
26da6daaa9
accounts/usbwallet: fix Ledger hidapi/libusb protocol violation
2017-03-23 16:51:04 +02:00
Felix Lange
e7911ad9ea
build: unify vendor skipping logic
...
This fixes a recent bug where 'make geth' built everything instead of
just geth.
2017-03-23 15:50:05 +01:00
Zahoor Mohamed
11e7a712f4
swarm/api: support mounting manifests via FUSE ( #3690 )
2017-03-23 14:56:06 +01:00
Péter Szilágyi
61d2150a07
Merge pull request #3795 from fjl/pow-fix-test-mode
...
pow: fix Search with ethash test mode
2017-03-23 10:56:12 +02:00
Péter Szilágyi
3fa0fa713b
Merge pull request #3809 from fjl/all-use-normal-context
...
all: import "context" instead of "golang.org/x/net/context"
2017-03-23 10:22:56 +02:00
Felix Lange
f1534f5797
trie, whisper/whisperv5: use math/rand Read function
2017-03-22 20:49:15 +01:00
Felix Lange
9a2720fb35
mobile: remove support for Go < 1.7
2017-03-22 20:49:15 +01:00
Felix Lange
c213fd1fd8
all: import "context" instead of "golang.org/x/net/context"
...
There is no need to depend on the old context package now that the
minimum Go version is 1.7. The move to "context" eliminates our weird
vendoring setup. Some vendored code still uses golang.org/x/net/context
and it is now vendored in the normal way.
This change triggered new vet checks around context.WithTimeout which
didn't fire with golang.org/x/net/context.
2017-03-22 20:49:15 +01:00
Felföldi Zsolt
525116dbff
les: implement request distributor, fix blocking issues ( #3660 )
...
* les: implement request distributor, fix blocking issues
* core: moved header validation before chain mutex lock
2017-03-22 20:44:22 +01:00
Péter Szilágyi
1c1dc0e0fc
Merge pull request #3808 from fjl/build-go-1.7
...
build: require Go >= 1.7
2017-03-22 18:49:50 +02:00
Felix Lange
c6e6f1fec2
build: remove support for the GO_OPENCL environment variable
...
We don't use the opencl build tag anymore.
2017-03-22 16:00:21 +01:00
Felix Lange
da7af44060
build: require Go >= 1.7
...
We have decided to bump the requirement to Go 1.7 because it enables
subtests and allows dropping backwards-compatibility code. This is in
line with Go's support policy. Go 1.6 and earlier no longer receive
security updates.
2017-03-22 16:00:16 +01:00
Yohann Leon
6742fc526f
core/vm: use uint64 instead of *big.Int in tracer ( #3805 )
2017-03-22 15:32:51 +01:00
Péter Szilágyi
9b84caf3a5
core, eth, les: support resuming fast sync on heavy rollback ( #3743 )
2017-03-22 01:37:24 +01:00
Felix Lange
06d6685eb5
Merge pull request #3756 from fjl/core-types-gencodec
...
core/types: use gencodec for JSON marshaling code
2017-03-22 01:36:22 +01:00
Christopher Franko
85d410d34e
move all the deps to the latest repo
...
This was over looked for so long because it was already taken care of in
the newer branches.
2017-03-20 09:11:55 -04:00
Péter Szilágyi
1dfd65f6d0
Merge pull request #3802 from karalabe/cocoapods-stable
...
travis: switch to cocoapods 1.2.0 stable
2017-03-20 14:35:48 +02:00
Péter Szilágyi
7242e4f71b
travis: switch to cocoapods 1.2.0 stable
2017-03-20 14:12:47 +02:00
Péter Szilágyi
be39bf382a
Merge pull request #3800 from karalabe/ethstats-genesis-fixes
...
ethstats: try both ws:// and wss:// if none specified
2017-03-20 13:04:57 +02:00
Péter Szilágyi
2ba9374789
ethstats: try both ws:// and wss:// if none specified
2017-03-20 12:45:43 +02:00
holisticode
d97dea51ec
swarm/network/kademlia: set kademlia log output to debug instead of warn ( #3787 )
2017-03-18 01:45:00 +01:00
