7b2e2777ae
fix unit test
2019-02-10 20:54:25 +08:00
c2b98220eb
Merge remote-tracking branch 'remotes/origin/master' into geth-upgrade-1.8.18-latest
...
# Conflicts:
# .travis.yml
# cmd/geth/consolecmd_test.go
# vendor/github.com/rjeczalik/notify/watcher_readdcw.go
# vendor/golang.org/x/sys/cpu/cpu.go
# vendor/golang.org/x/sys/cpu/cpu_arm.go
# vendor/golang.org/x/sys/cpu/cpu_arm64.go
# vendor/golang.org/x/sys/cpu/cpu_mips64x.go
# vendor/golang.org/x/sys/cpu/cpu_mipsx.go
# vendor/golang.org/x/sys/cpu/cpu_ppc64x.go
# vendor/golang.org/x/sys/cpu/cpu_s390x.go
# vendor/vendor.json
2019-02-10 20:31:51 +08:00
4dbd95947d
Merge branch 'goeth-1.8.18' into geth-upgrade-1.8.18
...
# Conflicts:
# .github/CONTRIBUTING.md
# .travis.yml
# core/blockchain.go
# core/vm/evm.go
# core/vm/logger_test.go
# eth/handler_test.go
# eth/tracers/tracer_test.go
# internal/ethapi/api.go
# internal/web3ext/web3ext.go
# p2p/discover/node.go
# p2p/server.go
# swarm/network/simulations/discovery/discovery_test.go
2019-01-29 19:08:50 +08:00
bc529a509d
Merge branch 'goeth-1.8.18' into geth-upgrade-1.8.18
...
# Conflicts:
# .github/CONTRIBUTING.md
# .travis.yml
# core/blockchain.go
# core/vm/evm.go
# core/vm/logger_test.go
# eth/handler_test.go
# eth/tracers/tracer_test.go
# internal/ethapi/api.go
# internal/web3ext/web3ext.go
# p2p/discover/node.go
# p2p/server.go
# swarm/network/simulations/discovery/discovery_test.go
2019-01-29 19:08:14 +08:00
2914b3c99d
Merge remote-tracking branch 'remotes/origin/master' into geth-upgrade-1.8.18
...
# Conflicts:
# consensus/ethash/consensus.go
# eth/bloombits.go
# params/protocol_params.go
2019-01-25 22:24:03 +08:00
db34314a9a
Updating test
2019-01-07 17:05:56 +00:00
bd558eff27
Cherrypicking go-ethereum#18211 pull
2018-12-13 16:32:48 +00:00
13a9f26f9a
Merge remote-tracking branch 'quorum/master' into geth-upgrade-1.8.16
2018-11-29 17:56:02 +08:00
519337a9d0
Merge remote-tracking branch 'quorum/master' into geth-upgrade-1.8.16
2018-11-29 16:57:27 +08:00
eb8fa3cc89
cmd/swarm, swarm/api/http, swarm/bmt, swarm/fuse, swarm/network/stream, swarm/storage, swarm/storage/encryption, swarm/testutil: use pseudo-random instead of crypto-random for test files content generation ( #18083 )
...
- Replace "crypto/rand" to "math/rand" for files content generation
- Remove swarm/network_test.go.Shuffle and swarm/btm/btm_test.go.Shuffle - because go1.9 support dropped (see https://github.com/ethereum/go-ethereum/pull/17807 and comments to swarm/network_test.go.Shuffle)
2018-11-14 09:21:14 +01:00
a0876f7433
Imply that SwarmApiFlag is the API endpoint to connect to, not to listen on ( #18071 )
2018-11-12 13:04:13 +01:00
1ff152f3a4
rawdb: remove unused parameter for WritePreimages func ( #18059 )
...
* rawdb: remove unused parameter for WritePreimages func and modify a
spelling mistake
* rawdb: update the doc for function WritePreimages
2018-11-09 12:51:07 +02:00
cf3b187bde
swarm, cmd/swarm: address ineffectual assignments ( #18048 )
...
* swarm, cmd/swarm: address ineffectual assignments
* swarm/network: remove unused vars from testHandshake
* swarm/storage/feed: revert cursor changes
2018-11-07 20:39:08 +01:00
126dfde6c9
cmd/swarm: auto resolve default path according to env flag ( #17960 )
2018-11-04 07:59:58 +01:00
3e1cfbae93
cmd/swarm/swarm-smoke: fix issue that loop variable capture in func ( #17992 )
2018-10-29 10:00:00 +01:00
80d3907767
cmd/clef: replace password arg with prompt ( #17897 )
...
* cmd/clef: replace password arg with prompt (#17829 )
Entering passwords on the command line is not secure as it is easy to recover from bash_history or the process table.
1. The clef command addpw was renamed to setpw to better describe the functionality
2. The <password> argument was removed and replaced with an interactive prompt
* cmd/clef: remove undeclared variable
2018-10-25 21:45:56 +02:00
4c0883e20d
core/vm: adds refund as part of the json standard trace ( #17910 )
...
This adds the global accumulated refund counter to the standard
json output as a numeric json value. Previously this was not very
interesting since it was not used much, but with the new sstore
gas changes the value is a lot more interesting from a consensus
investigation perspective.
2018-10-23 16:28:18 +02:00
75060ef96e
cmd/bootnode: fix -writeaddress output ( #17932 )
2018-10-19 16:41:27 +03:00
6c313fff7b
cmd/geth: don't set GOMAXPROCS by default ( #17148 )
...
This is no longer needed because Go uses all CPUs
by default. The change allows setting GOMAXPROCS in environment if needed.
2018-10-16 02:02:53 +02:00
3e92c853fb
cmd/clef: fix typos in README ( #17908 )
2018-10-16 00:33:09 +02:00
862d6f2fbf
cmd/swarm: Smoke test for Swarm Feed ( #17892 )
2018-10-12 16:24:00 +02:00
4868964bb9
cmd/swarm: split flags and cli command declarations to the relevant files ( #17896 )
2018-10-12 14:51:38 +02:00
6f607de5d5
p2p, p2p/discover: add signed ENR generation ( #17753 )
...
This PR adds enode.LocalNode and integrates it into the p2p
subsystem. This new object is the keeper of the local node
record. For now, a new version of the record is produced every
time the client restarts. We'll make it smarter to avoid that in
the future.
There are a couple of other changes in this commit: discovery now
waits for all of its goroutines at shutdown and the p2p server
now closes the node database after discovery has shut down. This
fixes a leveldb crash in tests. p2p server startup is faster
because it doesn't need to wait for the external IP query
anymore.
2018-10-12 11:47:24 +02:00
da290e9707
cmd/swarm: speed up tests ( #17878 )
...
These minor changes already shaved off around 30s.
2018-10-09 14:08:40 +02:00
d5c7a6056a
cmd/clef: encrypt the master seed on disk ( #17704 )
...
* cmd/clef: encrypt master seed of clef
Signed-off-by: YaoZengzeng <yaozengzeng@zju.edu.cn>
* keystore: refactor for external use of encryption
* clef: utilize keystore encryption, check flags correctly
* clef: validate master password
* clef: add json wrapping around encrypted master seed
2018-10-09 11:05:41 +02:00
fcfc7b6d45
merge with quorum upstream master
2018-10-09 16:01:11 +08:00
cfcc47529d
cmd/utils: fix bug when checking for flag value conflicts ( #17803 )
2018-10-08 17:08:56 +03:00
f95811e65b
cmd/abigen: support for --type flag with piped data ( #17648 )
2018-10-06 16:27:12 +02:00
b8a0daf0cc
cmd/puppeth: fix node URL in health check ( #17802 )
...
* cmd/puppeth: fix node URL in health check
* cmd/puppeth: set external IP for geth
* cmd/puppeth: fix enode cast issue
2018-10-04 12:34:49 +03:00
bfa0f96822
cmd/evm: fix state dump ( #17832 )
2018-10-04 10:22:41 +02:00
47571689ee
Merge remote-tracking branch 'remotes/goeth/release/1.8' into geth-upgrade-1.8.15_new
...
# Conflicts:
# .travis.yml
# README.md
# cmd/utils/flags.go
# consensus/consensus.go
# consensus/ethash/consensus.go
# consensus/ethash/ethash.go
# core/blockchain.go
# core/genesis_test.go
# core/state/state_object.go
# core/state_processor.go
# core/vm/errors.go
# core/vm/evm.go
# core/vm/gas_table.go
# core/vm/instructions_test.go
# core/vm/interface.go
# eth/api_tracer.go
# eth/backend.go
# eth/config.go
# eth/filters/filter.go
# les/backend.go
# les/helper_test.go
# miner/worker.go
# params/config.go
# params/version.go
2018-10-04 16:19:02 +08:00
82a1c771ef
cmd/swarm: disable tests under Windows until they are fixed ( #17827 )
2018-10-04 09:18:03 +02:00
e5677114dc
Merge pull request #17796 from epiclabs-io/mru-feeds
...
swarm/storage/feeds: Renamed MRU to Swarm Feeds
2018-10-03 14:59:41 +02:00
303b99663e
swarm: schemas and migrations ( #17813 )
2018-10-03 14:31:59 +02:00
de01178c18
swarm/storage/feed: Renamed package
2018-10-03 09:15:28 +02:00
696bc9b01c
swarm/storage/feeds: renamed vars that can conflict with package name
2018-10-03 09:12:06 +02:00
58c0879c2f
swarm/storage/feeds: removed capital Feed throughout
2018-10-03 09:12:06 +02:00
b6ccc06cda
swarm/storage/feeds: Final package rename and moved files
2018-10-03 09:12:06 +02:00
83705ef6aa
swarm/storage/mru: Renamed rest of MRU references
2018-10-03 09:12:06 +02:00
f1e86ad9cf
swarm/storage/mru: Renamed all identifiers to Feeds
2018-10-03 09:12:06 +02:00
bd1f7ebda2
cmd/swarm: fix appveyor build ( #17808 )
2018-10-02 14:59:58 +02:00
0bf3065fb4
Merge pull request #17771 from ethersphere/cmd-config-errors
...
swarm: handle errors in cmdLineOverride and envVarsOverride
2018-10-02 09:31:44 +02:00
83116a3479
Merge pull request #17799 from ethersphere/correct_swarm_version
...
cmd/swarm: correct swarm version on --help
2018-10-02 08:02:30 +02:00
2ad2e0b4bf
Added a validateConsensus() which exits geth if no consensus is speci… ( #540 )
...
Validate for a Quorum supported consensus and exit if no consensus is specified.
2018-10-01 16:39:01 -04:00
634e963f02
cmd/swarm: disable export and upload tests on Windows
2018-10-01 13:41:47 +02:00
dc5d643bb5
cmd/swarm, swarm: cross-platform Content-Type detection ( #17782 )
...
- Mime types generator (Standard "mime" package rely on system-settings, see mime.osInitMime)
- Changed swarm/api.Upload:
- simplify I/O throttling by semaphore primitive and use file name where possible
- f.Close() must be called in Defer - otherwise panic or future added early return will cause leak of file descriptors
- one error was suppressed
2018-10-01 13:39:39 +02:00
9a749dcde5
cmd/swarm: correct swarm version on --help
2018-10-01 13:28:07 +02:00
01d9f29805
cmd/swarm: remove swarm binary ( #17784 )
2018-09-29 22:15:32 +02:00
d9e324a331
cmd/swarm: respect --loglevel in run_test helpers ( #17739 )
...
When CLI tests were spanning new nodes, the log level verbosity was
hard coded as 6. So the Swarm process was always polluting the test
output with TRACE level logs.
Now `go test -v ./cmd/swarm -loglevel 0` works as expected.
2018-09-28 22:49:15 +02:00
7910dd5179
Merge pull request #17781 from ethersphere/trim_newline
...
cmd/swarm: trim new lines from files
2018-09-28 20:01:43 +02:00
amalraj.manigmail.com
Felix Shnir
Alexey Sharov
Andrew Chiw
Corey Lin
Anton Evangelatov
Elad
Roc Yu
Johns Beharry
Martin Holst Swende
Felix Lange
Wenbiao Zheng
Grachev Mikhail
lash
Ryan Schneider
Philip Schlump
cdetrio
Viktor Trón
Javier Peletier
Jitendra Bhurat
Ferenc Szabo