Skip to content

TurboGeth 2021.04 - #4

Merged
sambacha merged 508 commits into
trunk-syncfrom
ledger-sync
Apr 5, 2021
Merged

sambacha merged 508 commits into
trunk-syncfrom
ledger-sync

Conversation

@sambacha

@sambacha sambacha commented Apr 5, 2021

Copy link
Copy Markdown

No description provided.

MariusVanDerWijden and others added 30 commits April 5, 2021 03:29
This replaces the github.com/pborman/uuid dependency with
github.com/google/uuid because the former is only a wrapper for
the latter (since v1.0.0).

Co-authored-by: Felix Lange <fjl@twurst.com>
# Conflicts:
#	accounts/keystore/key.go
#	accounts/keystore/passphrase.go
#	accounts/keystore/presale.go
#	cmd/ethkey/generate.go
#	go.mod
#	go.sum
This PR implements the first one of the "lespay" UDP queries which
is already useful in itself: the capacity query. The server pool is making
use of this query by doing a cheap UDP query to determine whether it is
worth starting the more expensive TCP connection process.
# Conflicts:
#	les/client.go
#	les/clientpool.go
#	les/clientpool_test.go
#	les/enr_entry.go
#	les/server.go
#	les/vflux/client/serverpool.go
#	les/vflux/client/serverpool_test.go
#	les/vflux/server/balance.go
#	les/vflux/server/balance_test.go
#	les/vflux/server/prioritypool.go
#	les/vflux/server/prioritypool_test.go
#	p2p/nodestate/nodestate.go
# Conflicts:
#	core/rawdb/chain_iterator.go
# Conflicts:
#	core/vm/contract.go
#	core/vm/gen_structlog.go
#	core/vm/instructions.go
#	core/vm/instructions_test.go
#	core/vm/interpreter.go
#	core/vm/logger.go
#	core/vm/logger_json.go
#	core/vm/logger_test.go
#	core/vm/stack/stack.go
#	eth/tracers/tracer.go
#	eth/tracers/tracer_test.go
# Conflicts:
#	core/vm/runtime/runtime_test.go
* cmd/utils: fix exclusive check for archive node

* cmd/utils: set the txlookuplimit to 0
# Conflicts:
#	cmd/utils/flags.go
# Conflicts:
#	les/client.go
#	les/vflux/client/serverpool.go
#	les/vflux/client/serverpool_test.go
* cmd: retire whisper flags

* cmd/geth: remove whisper configs
# Conflicts:
#	cmd/geth/config.go
#	cmd/geth/consolecmd.go
#	cmd/geth/main.go
#	cmd/geth/usage.go
#	cmd/utils/flags.go
This updates the consensus tests to commit 31d6630 and
adds support for access list transactions in the test runner.

Co-authored-by: Martin Holst Swende <martin@swende.se>
# Conflicts:
#	tests/block_test.go
#	tests/gen_sttransaction.go
#	tests/state_test_util.go
# Conflicts:
#	params/version.go
# Conflicts:
#	params/version.go
# Conflicts:
#	params/version.go
@sambacha
sambacha changed the base branch from master to trunk-sync April 5, 2021 10:45
@sambacha
sambacha merged commit cc31536 into trunk-sync Apr 5, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.