diff --git a/.circleci/config.yml b/.circleci/config.yml
index 0c9b7cda88..374313392f 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -112,7 +112,7 @@ jobs:
build-geth:
docker:
- - image: cimg/go:1.19
+ - image: cimg/go:1.20
resource_class: xlarge
steps:
- checkout
@@ -121,7 +121,7 @@ jobs:
unit-test:
resource_class: xlarge
docker:
- - image: cimg/go:1.19
+ - image: cimg/go:1.20
steps:
- checkout
- run:
@@ -129,14 +129,14 @@ jobs:
lint-geth:
resource_class: medium
docker:
- - image: cimg/go:1.19
+ - image: cimg/go:1.20
steps:
- checkout
- run:
command: go run build/ci.go lint
check-releases:
docker:
- - image: cimg/go:1.19
+ - image: cimg/go:1.20
steps:
- checkout
- run:
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 780f2a800e..faf922df01 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -10,7 +10,7 @@ core/ @karalabe @holiman @rjl493456442
eth/ @karalabe @holiman @rjl493456442
eth/catalyst/ @gballet
eth/tracers/ @s1na
-graphql/ @gballet @s1na
+graphql/ @s1na
les/ @zsfelfoldi @rjl493456442
light/ @zsfelfoldi @rjl493456442
node/ @fjl
diff --git a/.github/workflows/docker-release.yml b/.github/workflows/docker-release.yaml
similarity index 99%
rename from .github/workflows/docker-release.yml
rename to .github/workflows/docker-release.yaml
index 612d7a2385..8411bf07d3 100644
--- a/.github/workflows/docker-release.yml
+++ b/.github/workflows/docker-release.yaml
@@ -43,3 +43,4 @@ jobs:
provenance: false
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
+
\ No newline at end of file
diff --git a/.github/workflows/review-assign.yml b/.github/workflows/review-assign.yaml
similarity index 96%
rename from .github/workflows/review-assign.yml
rename to .github/workflows/review-assign.yaml
index 777ed2ad3c..2fa638721e 100644
--- a/.github/workflows/review-assign.yml
+++ b/.github/workflows/review-assign.yaml
@@ -12,3 +12,4 @@ jobs:
with:
reviewers: ${{ vars.REVIEWERS }}
max-num-of-reviewers: 2
+
\ No newline at end of file
diff --git a/.github/workflows/unit-test.yaml b/.github/workflows/unit-test.yaml
index ebb619649b..7c018effc6 100644
--- a/.github/workflows/unit-test.yaml
+++ b/.github/workflows/unit-test.yaml
@@ -2,7 +2,7 @@ name: Unit Test
on:
pull_request:
- types: [ opened, synchronize, reopened ]
+ types: [opened, synchronize, reopened]
push:
branches: [main, develop]
@@ -11,8 +11,10 @@ jobs:
name: unit_test
runs-on: ubuntu-22.04
steps:
- - uses: actions/checkout@v4
- - uses: actions/setup-go@v4
- with:
- go-version: '^1.21.3'
- - run: make test
+ - uses: actions/checkout@v4
+ with:
+ submodules: 'recursive'
+ - uses: actions/setup-go@v4
+ with:
+ go-version-file: go.mod
+ - run: make test
diff --git a/.gitignore b/.gitignore
index 1ee8b83022..3f27cdc00f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -47,3 +47,6 @@ profile.cov
/dashboard/assets/package-lock.json
**/yarn-error.log
+logs/
+
+tests/spec-tests/
diff --git a/.travis.yml b/.travis.yml
index 925e23b1a5..4f5d482c65 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,7 +13,7 @@ jobs:
- stage: lint
os: linux
dist: bionic
- go: 1.20.x
+ go: 1.21.x
env:
- lint
git:
@@ -28,7 +28,7 @@ jobs:
os: linux
arch: amd64
dist: bionic
- go: 1.20.x
+ go: 1.21.x
env:
- docker
services:
@@ -45,7 +45,7 @@ jobs:
os: linux
arch: arm64
dist: bionic
- go: 1.20.x
+ go: 1.21.x
env:
- docker
services:
@@ -63,10 +63,9 @@ jobs:
os: linux
dist: bionic
sudo: required
- go: 1.20.x
+ go: 1.21.x
env:
- azure-linux
- - GO111MODULE=on
git:
submodules: false # avoid cloning ethereum/tests
addons:
@@ -97,10 +96,9 @@ jobs:
- stage: build
if: type = push
os: osx
- go: 1.20.x
+ go: 1.21.x
env:
- azure-osx
- - GO111MODULE=on
git:
submodules: false # avoid cloning ethereum/tests
script:
@@ -112,41 +110,34 @@ jobs:
os: linux
arch: amd64
dist: bionic
- go: 1.20.x
- env:
- - GO111MODULE=on
+ go: 1.21.x
script:
- - go run build/ci.go test $TEST_PACKAGES
+ - travis_wait 30 go run build/ci.go test $TEST_PACKAGES
- stage: build
if: type = pull_request
os: linux
arch: arm64
dist: bionic
- go: 1.19.x
- env:
- - GO111MODULE=on
+ go: 1.20.x
script:
- - go run build/ci.go test $TEST_PACKAGES
+ - travis_wait 30 go run build/ci.go test $TEST_PACKAGES
- stage: build
os: linux
dist: bionic
- go: 1.19.x
- env:
- - GO111MODULE=on
+ go: 1.20.x
script:
- - go run build/ci.go test $TEST_PACKAGES
+ - travis_wait 30 go run build/ci.go test $TEST_PACKAGES
# This builder does the Ubuntu PPA nightly uploads
- stage: build
if: type = cron || (type = push && tag ~= /^v[0-9]/)
os: linux
dist: bionic
- go: 1.20.x
+ go: 1.21.x
env:
- ubuntu-ppa
- - GO111MODULE=on
git:
submodules: false # avoid cloning ethereum/tests
addons:
@@ -167,10 +158,9 @@ jobs:
if: type = cron
os: linux
dist: bionic
- go: 1.20.x
+ go: 1.21.x
env:
- azure-purge
- - GO111MODULE=on
git:
submodules: false # avoid cloning ethereum/tests
script:
@@ -181,9 +171,7 @@ jobs:
if: type = cron
os: linux
dist: bionic
- go: 1.20.x
- env:
- - GO111MODULE=on
+ go: 1.21.x
script:
- - go run build/ci.go test -race $TEST_PACKAGES
+ - travis_wait 30 go run build/ci.go test -race $TEST_PACKAGES
diff --git a/Makefile b/Makefile
index e6286da7fb..226bac2d1e 100644
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,7 @@
GOBIN = ./build/bin
GO ?= latest
-GORUN = env GO111MODULE=on go run
+GORUN = go run
geth:
$(GORUN) build/ci.go install ./cmd/geth
@@ -23,7 +23,7 @@ lint: ## Run linters.
$(GORUN) build/ci.go lint
clean:
- env GO111MODULE=on go clean -cache
+ go clean -cache
rm -fr build/_workspace/pkg/ $(GOBIN)/*
# The devtools target installs tools required for 'go generate'.
@@ -36,3 +36,9 @@ devtools:
env GOBIN= go install ./cmd/abigen
@type "solc" 2> /dev/null || echo 'Please install solc'
@type "protoc" 2> /dev/null || echo 'Please install protoc'
+
+forkdiff:
+ docker run --rm \
+ --mount src=$(shell pwd),target=/host-pwd,type=bind \
+ protolambda/forkdiff:latest \
+ -repo /host-pwd/ -fork /host-pwd/fork.yaml -out /host-pwd/forkdiff.html
diff --git a/README.md b/README.md
index 34bd8b94c9..77317090c1 100644
--- a/README.md
+++ b/README.md
@@ -123,15 +123,6 @@ use separate accounts for play and real money. Unless you manually move
accounts, `geth` will by default correctly separate the two networks and will not make any
accounts available between them.*
-### Full node on the Rinkeby test network
-
-Go Ethereum also supports connecting to the older proof-of-authority based test network
-called [*Rinkeby*](https://www.rinkeby.io) which is operated by members of the community.
-
-```shell
-$ geth --rinkeby console
-```
-
### Configuration
As an alternative to passing the numerous flags to the `geth` binary, you can also pass a
diff --git a/accounts/abi/abi.go b/accounts/abi/abi.go
index 62b860e18c..6e1075c715 100644
--- a/accounts/abi/abi.go
+++ b/accounts/abi/abi.go
@@ -22,6 +22,7 @@ import (
"errors"
"fmt"
"io"
+ "math/big"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/crypto"
@@ -222,6 +223,17 @@ func (abi *ABI) EventByID(topic common.Hash) (*Event, error) {
return nil, fmt.Errorf("no event with id: %#x", topic.Hex())
}
+// ErrorByID looks up an error by the 4-byte id,
+// returns nil if none found.
+func (abi *ABI) ErrorByID(sigdata [4]byte) (*Error, error) {
+ for _, errABI := range abi.Errors {
+ if bytes.Equal(errABI.ID[:4], sigdata[:]) {
+ return &errABI, nil
+ }
+ }
+ return nil, fmt.Errorf("no error with id: %#x", sigdata[:])
+}
+
// HasFallback returns an indicator whether a fallback function is included.
func (abi *ABI) HasFallback() bool {
return abi.Fallback.Type == Fallback
@@ -235,24 +247,65 @@ func (abi *ABI) HasReceive() bool {
// revertSelector is a special function selector for revert reason unpacking.
var revertSelector = crypto.Keccak256([]byte("Error(string)"))[:4]
+// panicSelector is a special function selector for panic reason unpacking.
+var panicSelector = crypto.Keccak256([]byte("Panic(uint256)"))[:4]
+
+// panicReasons map is for readable panic codes
+// see this linkage for the deails
+// https://docs.soliditylang.org/en/v0.8.21/control-structures.html#panic-via-assert-and-error-via-require
+// the reason string list is copied from ether.js
+// https://github.com/ethers-io/ethers.js/blob/fa3a883ff7c88611ce766f58bdd4b8ac90814470/src.ts/abi/interface.ts#L207-L218
+var panicReasons = map[uint64]string{
+ 0x00: "generic panic",
+ 0x01: "assert(false)",
+ 0x11: "arithmetic underflow or overflow",
+ 0x12: "division or modulo by zero",
+ 0x21: "enum overflow",
+ 0x22: "invalid encoded storage byte array accessed",
+ 0x31: "out-of-bounds array access; popping on an empty array",
+ 0x32: "out-of-bounds access of an array or bytesN",
+ 0x41: "out of memory",
+ 0x51: "uninitialized function",
+}
+
// UnpackRevert resolves the abi-encoded revert reason. According to the solidity
// spec https://solidity.readthedocs.io/en/latest/control-structures.html#revert,
-// the provided revert reason is abi-encoded as if it were a call to a function
-// `Error(string)`. So it's a special tool for it.
+// the provided revert reason is abi-encoded as if it were a call to function
+// `Error(string)` or `Panic(uint256)`. So it's a special tool for it.
func UnpackRevert(data []byte) (string, error) {
if len(data) < 4 {
return "", errors.New("invalid data for unpacking")
}
- if !bytes.Equal(data[:4], revertSelector) {
+ switch {
+ case bytes.Equal(data[:4], revertSelector):
+ typ, err := NewType("string", "", nil)
+ if err != nil {
+ return "", err
+ }
+ unpacked, err := (Arguments{{Type: typ}}).Unpack(data[4:])
+ if err != nil {
+ return "", err
+ }
+ return unpacked[0].(string), nil
+ case bytes.Equal(data[:4], panicSelector):
+ typ, err := NewType("uint256", "", nil)
+ if err != nil {
+ return "", err
+ }
+ unpacked, err := (Arguments{{Type: typ}}).Unpack(data[4:])
+ if err != nil {
+ return "", err
+ }
+ pCode := unpacked[0].(*big.Int)
+ // uint64 safety check for future
+ // but the code is not bigger than MAX(uint64) now
+ if pCode.IsUint64() {
+ if reason, ok := panicReasons[pCode.Uint64()]; ok {
+ return reason, nil
+ }
+ }
+ return fmt.Sprintf("unknown panic code: %#x", pCode), nil
+ default:
return "", errors.New("invalid data for unpacking")
}
- typ, err := NewType("string", "", nil)
- if err != nil {
- return "", err
- }
- unpacked, err := (Arguments{{Type: typ}}).Unpack(data[4:])
- if err != nil {
- return "", err
- }
- return unpacked[0].(string), nil
}
diff --git a/accounts/abi/abi_test.go b/accounts/abi/abi_test.go
index 96c11e0964..84175df4bb 100644
--- a/accounts/abi/abi_test.go
+++ b/accounts/abi/abi_test.go
@@ -1057,6 +1057,34 @@ func TestABI_EventById(t *testing.T) {
}
}
+func TestABI_ErrorByID(t *testing.T) {
+ abi, err := JSON(strings.NewReader(`[
+ {"inputs":[{"internalType":"uint256","name":"x","type":"uint256"}],"name":"MyError1","type":"error"},
+ {"inputs":[{"components":[{"internalType":"uint256","name":"a","type":"uint256"},{"internalType":"string","name":"b","type":"string"},{"internalType":"address","name":"c","type":"address"}],"internalType":"struct MyError.MyStruct","name":"x","type":"tuple"},{"internalType":"address","name":"y","type":"address"},{"components":[{"internalType":"uint256","name":"a","type":"uint256"},{"internalType":"string","name":"b","type":"string"},{"internalType":"address","name":"c","type":"address"}],"internalType":"struct MyError.MyStruct","name":"z","type":"tuple"}],"name":"MyError2","type":"error"},
+ {"inputs":[{"internalType":"uint256[]","name":"x","type":"uint256[]"}],"name":"MyError3","type":"error"}
+ ]`))
+ if err != nil {
+ t.Fatal(err)
+ }
+ for name, m := range abi.Errors {
+ a := fmt.Sprintf("%v", &m)
+ var id [4]byte
+ copy(id[:], m.ID[:4])
+ m2, err := abi.ErrorByID(id)
+ if err != nil {
+ t.Fatalf("Failed to look up ABI error: %v", err)
+ }
+ b := fmt.Sprintf("%v", m2)
+ if a != b {
+ t.Errorf("Error %v (id %x) not 'findable' by id in ABI", name, id)
+ }
+ }
+ // test unsuccessful lookups
+ if _, err = abi.ErrorByID([4]byte{}); err == nil {
+ t.Error("Expected error: no error with this id")
+ }
+}
+
// TestDoubleDuplicateMethodNames checks that if transfer0 already exists, there won't be a name
// conflict and that the second transfer method will be renamed transfer1.
func TestDoubleDuplicateMethodNames(t *testing.T) {
@@ -1145,6 +1173,8 @@ func TestUnpackRevert(t *testing.T) {
{"", "", errors.New("invalid data for unpacking")},
{"08c379a1", "", errors.New("invalid data for unpacking")},
{"08c379a00000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000d72657665727420726561736f6e00000000000000000000000000000000000000", "revert reason", nil},
+ {"4e487b710000000000000000000000000000000000000000000000000000000000000000", "generic panic", nil},
+ {"4e487b7100000000000000000000000000000000000000000000000000000000000000ff", "unknown panic code: 0xff", nil},
}
for index, c := range cases {
t.Run(fmt.Sprintf("case %d", index), func(t *testing.T) {
diff --git a/accounts/abi/bind/backend.go b/accounts/abi/bind/backend.go
index c16990f395..34530a6455 100644
--- a/accounts/abi/bind/backend.go
+++ b/accounts/abi/bind/backend.go
@@ -29,7 +29,7 @@ import (
var (
// ErrNoCode is returned by call and transact operations for which the requested
// recipient contract to operate on does not exist in the state db or does not
- // have any code associated with it (i.e. suicided).
+ // have any code associated with it (i.e. self-destructed).
ErrNoCode = errors.New("no contract code at given address")
// ErrNoPendingState is raised when attempting to perform a pending state action
diff --git a/accounts/abi/bind/backends/simulated.go b/accounts/abi/bind/backends/simulated.go
index b2892e3cb1..e9b753b6b2 100644
--- a/accounts/abi/bind/backends/simulated.go
+++ b/accounts/abi/bind/backends/simulated.go
@@ -44,6 +44,7 @@ import (
"github.com/ethereum/go-ethereum/log"
"github.com/ethereum/go-ethereum/params"
"github.com/ethereum/go-ethereum/rpc"
+ "github.com/ethereum/go-ethereum/trie"
)
// This nil assignment ensures at compile time that SimulatedBackend implements bind.ContractBackend.
@@ -157,7 +158,7 @@ func NewSimulatedBackendWithOpts(opts ...SimulatedBackendOpt) *SimulatedBackend
opt(config)
}
- config.genesis.MustCommit(config.database)
+ config.genesis.MustCommit(config.database, trie.NewDatabase(config.database, trie.HashDefaults))
blockchain, _ := core.NewBlockChain(config.database, config.cacheConfig, &config.genesis, nil, config.consensus, config.vmConfig, nil, nil)
backend := &SimulatedBackend{
@@ -270,7 +271,6 @@ func (b *SimulatedBackend) CodeAt(ctx context.Context, contract common.Address,
if err != nil {
return nil, err
}
-
return stateDB.GetCode(contract), nil
}
@@ -283,7 +283,6 @@ func (b *SimulatedBackend) BalanceAt(ctx context.Context, contract common.Addres
if err != nil {
return nil, err
}
-
return stateDB.GetBalance(contract), nil
}
@@ -296,7 +295,6 @@ func (b *SimulatedBackend) NonceAt(ctx context.Context, contract common.Address,
if err != nil {
return 0, err
}
-
return stateDB.GetNonce(contract), nil
}
@@ -309,7 +307,6 @@ func (b *SimulatedBackend) StorageAt(ctx context.Context, contract common.Addres
if err != nil {
return nil, err
}
-
val := stateDB.GetState(contract, key)
return val[:], nil
}
@@ -681,8 +678,7 @@ func (b *SimulatedBackend) callContract(ctx context.Context, call ethereum.CallM
if call.GasPrice != nil && (call.GasFeeCap != nil || call.GasTipCap != nil) {
return nil, errors.New("both gasPrice and (maxFeePerGas or maxPriorityFeePerGas) specified")
}
- head := b.blockchain.CurrentHeader()
- if !b.blockchain.Config().IsLondon(head.Number) {
+ if !b.blockchain.Config().IsLondon(header.Number) {
// If there's no basefee, then it must be a non-1559 execution
if call.GasPrice == nil {
call.GasPrice = new(big.Int)
@@ -704,13 +700,13 @@ func (b *SimulatedBackend) callContract(ctx context.Context, call ethereum.CallM
// Backfill the legacy gasPrice for EVM execution, unless we're all zeroes
call.GasPrice = new(big.Int)
if call.GasFeeCap.BitLen() > 0 || call.GasTipCap.BitLen() > 0 {
- call.GasPrice = math.BigMin(new(big.Int).Add(call.GasTipCap, head.BaseFee), call.GasFeeCap)
+ call.GasPrice = math.BigMin(new(big.Int).Add(call.GasTipCap, header.BaseFee), call.GasFeeCap)
}
}
}
// Ensure message is initialized properly.
if call.Gas == 0 {
- call.Gas = 50000000
+ call.Gas = 10 * header.GasLimit
}
if call.Value == nil {
call.Value = new(big.Int)
@@ -752,10 +748,10 @@ func (b *SimulatedBackend) SendTransaction(ctx context.Context, tx *types.Transa
// Get the last block
block, err := b.blockByHash(ctx, b.pendingBlock.ParentHash())
if err != nil {
- return fmt.Errorf("could not fetch parent")
+ return errors.New("could not fetch parent")
}
// Check transaction validity
- signer := types.MakeSigner(b.blockchain.Config(), block.Number())
+ signer := types.MakeSigner(b.blockchain.Config(), block.Number(), block.Time())
sender, err := types.Sender(signer, tx)
if err != nil {
return fmt.Errorf("invalid transaction: %v", err)
@@ -771,8 +767,10 @@ func (b *SimulatedBackend) SendTransaction(ctx context.Context, tx *types.Transa
}
block.AddTxWithChain(b.blockchain, tx)
})
- stateDB, _ := b.blockchain.State()
-
+ stateDB, err := b.blockchain.State()
+ if err != nil {
+ return err
+ }
b.pendingBlock = blocks[0]
b.pendingState, _ = state.New(b.pendingBlock.Root(), stateDB.Database(), nil)
b.pendingReceipts = receipts[0]
@@ -886,17 +884,18 @@ func (b *SimulatedBackend) AdjustTime(adjustment time.Duration) error {
// Get the last block
block := b.blockchain.GetBlockByHash(b.pendingBlock.ParentHash())
if block == nil {
- return fmt.Errorf("could not find parent")
+ return errors.New("could not find parent")
}
blocks, _ := core.GenerateChain(b.config, block, b.consensus, b.database, 1, func(number int, block *core.BlockGen) {
block.OffsetTime(int64(adjustment.Seconds()))
})
- stateDB, _ := b.blockchain.State()
-
+ stateDB, err := b.blockchain.State()
+ if err != nil {
+ return err
+ }
b.pendingBlock = blocks[0]
b.pendingState, _ = state.New(b.pendingBlock.Root(), stateDB.Database(), nil)
-
return nil
}
@@ -955,11 +954,15 @@ func (fb *filterBackend) GetReceipts(ctx context.Context, hash common.Hash) (typ
if number == nil {
return nil, nil
}
- return rawdb.ReadReceipts(fb.db, hash, *number, fb.bc.Config()), nil
+ header := rawdb.ReadHeader(fb.db, hash, *number)
+ if header == nil {
+ return nil, nil
+ }
+ return rawdb.ReadReceipts(fb.db, hash, *number, header.Time, fb.bc.Config()), nil
}
func (fb *filterBackend) GetLogs(ctx context.Context, hash common.Hash, number uint64) ([][]*types.Log, error) {
- logs := rawdb.ReadLogs(fb.db, hash, number, fb.bc.Config())
+ logs := rawdb.ReadLogs(fb.db, hash, number)
return logs, nil
}
diff --git a/accounts/abi/bind/backends/simulated_test.go b/accounts/abi/bind/backends/simulated_test.go
index 698bfc5765..11900a6cf5 100644
--- a/accounts/abi/bind/backends/simulated_test.go
+++ b/accounts/abi/bind/backends/simulated_test.go
@@ -161,6 +161,7 @@ func TestAdjustTime(t *testing.T) {
func TestNewAdjustTimeFail(t *testing.T) {
testAddr := crypto.PubkeyToAddress(testKey.PublicKey)
sim := simTestBackend(testAddr)
+ defer sim.blockchain.Stop()
// Create tx and send
head, _ := sim.HeaderByNumber(context.Background(), nil) // Should be child's, good enough
diff --git a/accounts/abi/bind/base.go b/accounts/abi/bind/base.go
index df3f52a403..b03f431f77 100644
--- a/accounts/abi/bind/base.go
+++ b/accounts/abi/bind/base.go
@@ -34,6 +34,11 @@ import (
const basefeeWiggleMultiplier = 2
+var (
+ errNoEventSignature = errors.New("no event signature")
+ errEventSignatureMismatch = errors.New("event signature mismatch")
+)
+
// SignerFn is a signer function callback when a contract requires a method to
// sign the transaction before submission.
type SignerFn func(common.Address, *types.Transaction) (*types.Transaction, error)
@@ -488,8 +493,12 @@ func (c *BoundContract) WatchLogs(opts *WatchOpts, name string, query ...[]inter
// UnpackLog unpacks a retrieved log into the provided output structure.
func (c *BoundContract) UnpackLog(out interface{}, event string, log types.Log) error {
+ // Anonymous events are not supported.
+ if len(log.Topics) == 0 {
+ return errNoEventSignature
+ }
if log.Topics[0] != c.abi.Events[event].ID {
- return fmt.Errorf("event signature mismatch")
+ return errEventSignatureMismatch
}
if len(log.Data) > 0 {
if err := c.abi.UnpackIntoInterface(out, event, log.Data); err != nil {
@@ -507,8 +516,12 @@ func (c *BoundContract) UnpackLog(out interface{}, event string, log types.Log)
// UnpackLogIntoMap unpacks a retrieved log into the provided map.
func (c *BoundContract) UnpackLogIntoMap(out map[string]interface{}, event string, log types.Log) error {
+ // Anonymous events are not supported.
+ if len(log.Topics) == 0 {
+ return errNoEventSignature
+ }
if log.Topics[0] != c.abi.Events[event].ID {
- return fmt.Errorf("event signature mismatch")
+ return errEventSignatureMismatch
}
if len(log.Data) > 0 {
if err := c.abi.UnpackIntoMap(out, event, log.Data); err != nil {
diff --git a/accounts/abi/bind/base_test.go b/accounts/abi/bind/base_test.go
index 2307b9874b..ca0128148f 100644
--- a/accounts/abi/bind/base_test.go
+++ b/accounts/abi/bind/base_test.go
@@ -186,6 +186,23 @@ func TestUnpackIndexedStringTyLogIntoMap(t *testing.T) {
unpackAndCheck(t, bc, expectedReceivedMap, mockLog)
}
+func TestUnpackAnonymousLogIntoMap(t *testing.T) {
+ mockLog := newMockLog(nil, common.HexToHash("0x0"))
+
+ abiString := `[{"anonymous":false,"inputs":[{"indexed":false,"name":"amount","type":"uint256"}],"name":"received","type":"event"}]`
+ parsedAbi, _ := abi.JSON(strings.NewReader(abiString))
+ bc := bind.NewBoundContract(common.HexToAddress("0x0"), parsedAbi, nil, nil, nil)
+
+ var received map[string]interface{}
+ err := bc.UnpackLogIntoMap(received, "received", mockLog)
+ if err == nil {
+ t.Error("unpacking anonymous event is not supported")
+ }
+ if err.Error() != "no event signature" {
+ t.Errorf("expected error 'no event signature', got '%s'", err)
+ }
+}
+
func TestUnpackIndexedSliceTyLogIntoMap(t *testing.T) {
sliceBytes, err := rlp.EncodeToBytes([]string{"name1", "name2", "name3", "name4"})
if err != nil {
diff --git a/accounts/abi/bind/bind.go b/accounts/abi/bind/bind.go
index 05cca8e90b..8a54a0e6ef 100644
--- a/accounts/abi/bind/bind.go
+++ b/accounts/abi/bind/bind.go
@@ -133,12 +133,19 @@ func Bind(types []string, abis []string, bytecodes []string, fsigs []map[string]
// Normalize the method for capital cases and non-anonymous inputs/outputs
normalized := original
normalizedName := methodNormalizer[lang](alias(aliases, original.Name))
-
// Ensure there is no duplicated identifier
var identifiers = callIdentifiers
if !original.IsConstant() {
identifiers = transactIdentifiers
}
+ // Name shouldn't start with a digit. It will make the generated code invalid.
+ if len(normalizedName) > 0 && unicode.IsDigit(rune(normalizedName[0])) {
+ normalizedName = fmt.Sprintf("M%s", normalizedName)
+ normalizedName = abi.ResolveNameConflict(normalizedName, func(name string) bool {
+ _, ok := identifiers[name]
+ return ok
+ })
+ }
if identifiers[normalizedName] {
return "", fmt.Errorf("duplicated identifier \"%s\"(normalized \"%s\"), use --alias for renaming", original.Name, normalizedName)
}
@@ -182,6 +189,14 @@ func Bind(types []string, abis []string, bytecodes []string, fsigs []map[string]
// Ensure there is no duplicated identifier
normalizedName := methodNormalizer[lang](alias(aliases, original.Name))
+ // Name shouldn't start with a digit. It will make the generated code invalid.
+ if len(normalizedName) > 0 && unicode.IsDigit(rune(normalizedName[0])) {
+ normalizedName = fmt.Sprintf("E%s", normalizedName)
+ normalizedName = abi.ResolveNameConflict(normalizedName, func(name string) bool {
+ _, ok := eventIdentifiers[name]
+ return ok
+ })
+ }
if eventIdentifiers[normalizedName] {
return "", fmt.Errorf("duplicated identifier \"%s\"(normalized \"%s\"), use --alias for renaming", original.Name, normalizedName)
}
diff --git a/accounts/abi/bind/bind_test.go b/accounts/abi/bind/bind_test.go
index bfceaef33c..5d9c63138e 100644
--- a/accounts/abi/bind/bind_test.go
+++ b/accounts/abi/bind/bind_test.go
@@ -2038,6 +2038,29 @@ var bindTests = []struct {
t.Errorf("error deploying the contract: %v", err)
}
`,
+ }, {
+ name: "NumericMethodName",
+ contract: `
+ // SPDX-License-Identifier: GPL-3.0
+ pragma solidity >=0.4.22 <0.9.0;
+
+ contract NumericMethodName {
+ event _1TestEvent(address _param);
+ function _1test() public pure {}
+ function __1test() public pure {}
+ function __2test() public pure {}
+ }
+ `,
+ bytecode: []string{"0x6080604052348015600f57600080fd5b5060958061001e6000396000f3fe6080604052348015600f57600080fd5b5060043610603c5760003560e01c80639d993132146041578063d02767c7146049578063ffa02795146051575b600080fd5b60476059565b005b604f605b565b005b6057605d565b005b565b565b56fea26469706673582212200382ca602dff96a7e2ba54657985e2b4ac423a56abe4a1f0667bc635c4d4371f64736f6c63430008110033"},
+ abi: []string{`[{"anonymous":false,"inputs":[{"indexed":false,"internalType":"address","name":"_param","type":"address"}],"name":"_1TestEvent","type":"event"},{"inputs":[],"name":"_1test","outputs":[],"stateMutability":"pure","type":"function"},{"inputs":[],"name":"__1test","outputs":[],"stateMutability":"pure","type":"function"},{"inputs":[],"name":"__2test","outputs":[],"stateMutability":"pure","type":"function"}]`},
+ imports: `
+ "github.com/ethereum/go-ethereum/common"
+ `,
+ tester: `
+ if b, err := NewNumericMethodName(common.Address{}, nil); b == nil || err != nil {
+ t.Fatalf("combined binding (%v) nil or error (%v) not nil", b, nil)
+ }
+`,
},
}
@@ -2103,13 +2126,11 @@ func TestGolangBindings(t *testing.T) {
if out, err := replacer.CombinedOutput(); err != nil {
t.Fatalf("failed to replace binding test dependency to current source tree: %v\n%s", err, out)
}
-
replacer = exec.Command(gocmd, "mod", "edit", "-x", "-require", "github.com/cometbft/cometbft@v0.37.2", "-replace", "github.com/cometbft/cometbft=github.com/bnb-chain/greenfield-cometbft@v1.0.0") // Repo root
replacer.Dir = pkg
if out, err := replacer.CombinedOutput(); err != nil {
t.Fatalf("failed to replace cometbft dependency to bnb-chain source: %v\n%s", err, out)
}
-
tidier := exec.Command(gocmd, "mod", "tidy")
tidier.Dir = pkg
if out, err := tidier.CombinedOutput(); err != nil {
diff --git a/accounts/abi/bind/template.go b/accounts/abi/bind/template.go
index c22eb4ae84..95dc13cc18 100644
--- a/accounts/abi/bind/template.go
+++ b/accounts/abi/bind/template.go
@@ -325,7 +325,7 @@ var (
if err != nil {
return *outstruct, err
}
- {{range $i, $t := .Normalized.Outputs}}
+ {{range $i, $t := .Normalized.Outputs}}
outstruct.{{.Name}} = *abi.ConvertType(out[{{$i}}], new({{bindtype .Type $structs}})).(*{{bindtype .Type $structs}}){{end}}
return *outstruct, err
@@ -335,7 +335,7 @@ var (
}
{{range $i, $t := .Normalized.Outputs}}
out{{$i}} := *abi.ConvertType(out[{{$i}}], new({{bindtype .Type $structs}})).(*{{bindtype .Type $structs}}){{end}}
-
+
return {{range $i, $t := .Normalized.Outputs}}out{{$i}}, {{end}} err
{{end}}
}
@@ -378,7 +378,7 @@ var (
}
{{end}}
- {{if .Fallback}}
+ {{if .Fallback}}
// Fallback is a paid mutator transaction binding the contract fallback function.
//
// Solidity: {{.Fallback.Original.String}}
@@ -392,16 +392,16 @@ var (
func (_{{$contract.Type}} *{{$contract.Type}}Session) Fallback(calldata []byte) (*types.Transaction, error) {
return _{{$contract.Type}}.Contract.Fallback(&_{{$contract.Type}}.TransactOpts, calldata)
}
-
+
// Fallback is a paid mutator transaction binding the contract fallback function.
- //
+ //
// Solidity: {{.Fallback.Original.String}}
func (_{{$contract.Type}} *{{$contract.Type}}TransactorSession) Fallback(calldata []byte) (*types.Transaction, error) {
return _{{$contract.Type}}.Contract.Fallback(&_{{$contract.Type}}.TransactOpts, calldata)
}
{{end}}
- {{if .Receive}}
+ {{if .Receive}}
// Receive is a paid mutator transaction binding the contract receive function.
//
// Solidity: {{.Receive.Original.String}}
@@ -415,9 +415,9 @@ var (
func (_{{$contract.Type}} *{{$contract.Type}}Session) Receive() (*types.Transaction, error) {
return _{{$contract.Type}}.Contract.Receive(&_{{$contract.Type}}.TransactOpts)
}
-
+
// Receive is a paid mutator transaction binding the contract receive function.
- //
+ //
// Solidity: {{.Receive.Original.String}}
func (_{{$contract.Type}} *{{$contract.Type}}TransactorSession) Receive() (*types.Transaction, error) {
return _{{$contract.Type}}.Contract.Receive(&_{{$contract.Type}}.TransactOpts)
diff --git a/accounts/abi/error.go b/accounts/abi/error.go
index f53c996def..218a22f1e4 100644
--- a/accounts/abi/error.go
+++ b/accounts/abi/error.go
@@ -32,7 +32,7 @@ type Error struct {
str string
// Sig contains the string signature according to the ABI spec.
- // e.g. error foo(uint32 a, int b) = "foo(uint32,int256)"
+ // e.g. error foo(uint32 a, int b) = "foo(uint32,int256)"
// Please note that "int" is substitute for its canonical representation "int256"
Sig string
@@ -78,7 +78,7 @@ func NewError(name string, inputs Arguments) Error {
}
}
-func (e *Error) String() string {
+func (e Error) String() string {
return e.str
}
diff --git a/accounts/abi/method.go b/accounts/abi/method.go
index f69e3ee9b5..b6e1eef3cf 100644
--- a/accounts/abi/method.go
+++ b/accounts/abi/method.go
@@ -127,11 +127,12 @@ func NewMethod(name string, rawName string, funType FunctionType, mutability str
state = state + " "
}
identity := fmt.Sprintf("function %v", rawName)
- if funType == Fallback {
+ switch funType {
+ case Fallback:
identity = "fallback"
- } else if funType == Receive {
+ case Receive:
identity = "receive"
- } else if funType == Constructor {
+ case Constructor:
identity = "constructor"
}
str := fmt.Sprintf("%v(%v) %sreturns(%v)", identity, strings.Join(inputNames, ", "), state, strings.Join(outputNames, ", "))
diff --git a/accounts/abi/method_test.go b/accounts/abi/method_test.go
index 395a528965..9230e307aa 100644
--- a/accounts/abi/method_test.go
+++ b/accounts/abi/method_test.go
@@ -84,11 +84,12 @@ func TestMethodString(t *testing.T) {
for _, test := range table {
var got string
- if test.method == "fallback" {
+ switch test.method {
+ case "fallback":
got = abi.Fallback.String()
- } else if test.method == "receive" {
+ case "receive":
got = abi.Receive.String()
- } else {
+ default:
got = abi.Methods[test.method].String()
}
if got != test.expectation {
diff --git a/accounts/abi/reflect.go b/accounts/abi/reflect.go
index 1f84b111a3..48d2ef41ec 100644
--- a/accounts/abi/reflect.go
+++ b/accounts/abi/reflect.go
@@ -228,7 +228,7 @@ func mapArgNamesToStructFields(argNames []string, value reflect.Value) (map[stri
structFieldName := ToCamelCase(argName)
if structFieldName == "" {
- return nil, fmt.Errorf("abi: purely underscored output cannot unpack to struct")
+ return nil, errors.New("abi: purely underscored output cannot unpack to struct")
}
// this abi has already been paired, skip it... unless there exists another, yet unassigned
diff --git a/accounts/abi/selector_parser.go b/accounts/abi/selector_parser.go
index d5472e374f..b8ddd7d656 100644
--- a/accounts/abi/selector_parser.go
+++ b/accounts/abi/selector_parser.go
@@ -17,6 +17,7 @@
package abi
import (
+ "errors"
"fmt"
)
@@ -40,7 +41,7 @@ func isIdentifierSymbol(c byte) bool {
func parseToken(unescapedSelector string, isIdent bool) (string, string, error) {
if len(unescapedSelector) == 0 {
- return "", "", fmt.Errorf("empty token")
+ return "", "", errors.New("empty token")
}
firstChar := unescapedSelector[0]
position := 1
@@ -110,7 +111,7 @@ func parseCompositeType(unescapedSelector string) ([]interface{}, string, error)
func parseType(unescapedSelector string) (interface{}, string, error) {
if len(unescapedSelector) == 0 {
- return nil, "", fmt.Errorf("empty type")
+ return nil, "", errors.New("empty type")
}
if unescapedSelector[0] == '(' {
return parseCompositeType(unescapedSelector)
diff --git a/accounts/abi/type.go b/accounts/abi/type.go
index 7f74907a84..2eee11787f 100644
--- a/accounts/abi/type.go
+++ b/accounts/abi/type.go
@@ -70,7 +70,7 @@ var (
func NewType(t string, internalType string, components []ArgumentMarshaling) (typ Type, err error) {
// check that array brackets are equal if they exist
if strings.Count(t, "[") != strings.Count(t, "]") {
- return Type{}, fmt.Errorf("invalid arg type in abi")
+ return Type{}, errors.New("invalid arg type in abi")
}
typ.stringKind = t
@@ -109,7 +109,7 @@ func NewType(t string, internalType string, components []ArgumentMarshaling) (ty
}
typ.stringKind = embeddedType.stringKind + sliced
} else {
- return Type{}, fmt.Errorf("invalid formatting of array type")
+ return Type{}, errors.New("invalid formatting of array type")
}
return typ, err
}
@@ -348,7 +348,7 @@ func (t Type) pack(v reflect.Value) ([]byte, error) {
}
}
-// requireLengthPrefix returns whether the type requires any sort of length
+// requiresLengthPrefix returns whether the type requires any sort of length
// prefixing.
func (t Type) requiresLengthPrefix() bool {
return t.T == StringTy || t.T == BytesTy || t.T == SliceTy
diff --git a/accounts/abi/unpack.go b/accounts/abi/unpack.go
index 1e778a6ff0..905b5ce629 100644
--- a/accounts/abi/unpack.go
+++ b/accounts/abi/unpack.go
@@ -18,6 +18,7 @@ package abi
import (
"encoding/binary"
+ "errors"
"fmt"
"math"
"math/big"
@@ -125,7 +126,7 @@ func readBool(word []byte) (bool, error) {
// readFunctionType enforces that standard by always presenting it as a 24-array (address + sig = 24 bytes)
func readFunctionType(t Type, word []byte) (funcTy [24]byte, err error) {
if t.T != FunctionTy {
- return [24]byte{}, fmt.Errorf("abi: invalid type in call to make function type byte array")
+ return [24]byte{}, errors.New("abi: invalid type in call to make function type byte array")
}
if garbage := binary.BigEndian.Uint64(word[24:32]); garbage != 0 {
err = fmt.Errorf("abi: got improperly encoded function type, got %v", word)
@@ -138,7 +139,7 @@ func readFunctionType(t Type, word []byte) (funcTy [24]byte, err error) {
// ReadFixedBytes uses reflection to create a fixed array to be read from.
func ReadFixedBytes(t Type, word []byte) (interface{}, error) {
if t.T != FixedBytesTy {
- return nil, fmt.Errorf("abi: invalid type in call to make fixed byte array")
+ return nil, errors.New("abi: invalid type in call to make fixed byte array")
}
// convert
array := reflect.New(t.GetType()).Elem()
@@ -159,14 +160,15 @@ func forEachUnpack(t Type, output []byte, start, size int) (interface{}, error)
// this value will become our slice or our array, depending on the type
var refSlice reflect.Value
- if t.T == SliceTy {
+ switch t.T {
+ case SliceTy:
// declare our slice
refSlice = reflect.MakeSlice(t.GetType(), size, size)
- } else if t.T == ArrayTy {
+ case ArrayTy:
// declare our array
refSlice = reflect.New(t.GetType()).Elem()
- } else {
- return nil, fmt.Errorf("abi: invalid type in array/slice unpacking stage")
+ default:
+ return nil, errors.New("abi: invalid type in array/slice unpacking stage")
}
// Arrays have packed elements, resulting in longer unpack steps.
diff --git a/accounts/external/backend.go b/accounts/external/backend.go
index d403b7e562..6f1581f9b8 100644
--- a/accounts/external/backend.go
+++ b/accounts/external/backend.go
@@ -17,6 +17,7 @@
package external
import (
+ "errors"
"fmt"
"math/big"
"sync"
@@ -98,11 +99,11 @@ func (api *ExternalSigner) Status() (string, error) {
}
func (api *ExternalSigner) Open(passphrase string) error {
- return fmt.Errorf("operation not supported on external signers")
+ return errors.New("operation not supported on external signers")
}
func (api *ExternalSigner) Close() error {
- return fmt.Errorf("operation not supported on external signers")
+ return errors.New("operation not supported on external signers")
}
func (api *ExternalSigner) Accounts() []accounts.Account {
@@ -145,7 +146,7 @@ func (api *ExternalSigner) Contains(account accounts.Account) bool {
}
func (api *ExternalSigner) Derive(path accounts.DerivationPath, pin bool) (accounts.Account, error) {
- return accounts.Account{}, fmt.Errorf("operation not supported on external signers")
+ return accounts.Account{}, errors.New("operation not supported on external signers")
}
func (api *ExternalSigner) SelfDerive(bases []accounts.DerivationPath, chain ethereum.ChainStateReader) {
@@ -242,14 +243,14 @@ func (api *ExternalSigner) SignTx(account accounts.Account, tx *types.Transactio
}
func (api *ExternalSigner) SignTextWithPassphrase(account accounts.Account, passphrase string, text []byte) ([]byte, error) {
- return []byte{}, fmt.Errorf("password-operations not supported on external signers")
+ return []byte{}, errors.New("password-operations not supported on external signers")
}
func (api *ExternalSigner) SignTxWithPassphrase(account accounts.Account, passphrase string, tx *types.Transaction, chainID *big.Int) (*types.Transaction, error) {
- return nil, fmt.Errorf("password-operations not supported on external signers")
+ return nil, errors.New("password-operations not supported on external signers")
}
func (api *ExternalSigner) SignDataWithPassphrase(account accounts.Account, passphrase, mimeType string, data []byte) ([]byte, error) {
- return nil, fmt.Errorf("password-operations not supported on external signers")
+ return nil, errors.New("password-operations not supported on external signers")
}
func (api *ExternalSigner) listAccounts() ([]common.Address, error) {
diff --git a/accounts/keystore/account_cache.go b/accounts/keystore/account_cache.go
index 12f92d2619..4ed1439514 100644
--- a/accounts/keystore/account_cache.go
+++ b/accounts/keystore/account_cache.go
@@ -31,6 +31,7 @@ import (
"github.com/ethereum/go-ethereum/accounts"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/log"
+ "golang.org/x/exp/slices"
)
// Minimum amount of time between cache reloads. This limit applies if the platform does
@@ -38,11 +39,10 @@ import (
// exist yet, the code will attempt to create a watcher at most this often.
const minReloadInterval = 2 * time.Second
-type accountsByURL []accounts.Account
-
-func (s accountsByURL) Len() int { return len(s) }
-func (s accountsByURL) Less(i, j int) bool { return s[i].URL.Cmp(s[j].URL) < 0 }
-func (s accountsByURL) Swap(i, j int) { s[i], s[j] = s[j], s[i] }
+// byURL defines the sorting order for accounts.
+func byURL(a, b accounts.Account) int {
+ return a.URL.Cmp(b.URL)
+}
// AmbiguousAddrError is returned when attempting to unlock
// an address for which more than one file exists.
@@ -67,7 +67,7 @@ type accountCache struct {
keydir string
watcher *watcher
mu sync.Mutex
- all accountsByURL
+ all []accounts.Account
byAddr map[common.Address][]accounts.Account
throttle *time.Timer
notify chan struct{}
@@ -194,7 +194,7 @@ func (ac *accountCache) find(a accounts.Account) (accounts.Account, error) {
default:
err := &AmbiguousAddrError{Addr: a.Address, Matches: make([]accounts.Account, len(matches))}
copy(err.Matches, matches)
- sort.Sort(accountsByURL(err.Matches))
+ slices.SortFunc(err.Matches, byURL)
return accounts.Account{}, err
}
}
diff --git a/accounts/keystore/account_cache_test.go b/accounts/keystore/account_cache_test.go
index aa71c12018..3847e9daf6 100644
--- a/accounts/keystore/account_cache_test.go
+++ b/accounts/keystore/account_cache_test.go
@@ -17,12 +17,12 @@
package keystore
import (
+ "errors"
"fmt"
"math/rand"
"os"
"path/filepath"
"reflect"
- "sort"
"testing"
"time"
@@ -30,6 +30,7 @@ import (
"github.com/davecgh/go-spew/spew"
"github.com/ethereum/go-ethereum/accounts"
"github.com/ethereum/go-ethereum/common"
+ "golang.org/x/exp/slices"
)
var (
@@ -74,7 +75,7 @@ func waitForAccounts(wantAccounts []accounts.Account, ks *KeyStore) error {
select {
case <-ks.changes:
default:
- return fmt.Errorf("wasn't notified of new accounts")
+ return errors.New("wasn't notified of new accounts")
}
return nil
}
@@ -202,7 +203,7 @@ func TestCacheAddDeleteOrder(t *testing.T) {
// Check that the account list is sorted by filename.
wantAccounts := make([]accounts.Account, len(accs))
copy(wantAccounts, accs)
- sort.Sort(accountsByURL(wantAccounts))
+ slices.SortFunc(wantAccounts, byURL)
list := cache.accounts()
if !reflect.DeepEqual(list, wantAccounts) {
t.Fatalf("got accounts: %s\nwant %s", spew.Sdump(accs), spew.Sdump(wantAccounts))
diff --git a/accounts/keystore/keystore_test.go b/accounts/keystore/keystore_test.go
index f90d809b55..deb7cae9f9 100644
--- a/accounts/keystore/keystore_test.go
+++ b/accounts/keystore/keystore_test.go
@@ -20,7 +20,6 @@ import (
"math/rand"
"os"
"runtime"
- "sort"
"strings"
"sync"
"sync/atomic"
@@ -31,6 +30,7 @@ import (
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/crypto"
"github.com/ethereum/go-ethereum/event"
+ "golang.org/x/exp/slices"
)
var testSigData = make([]byte, 32)
@@ -397,19 +397,19 @@ func TestImportRace(t *testing.T) {
t.Fatalf("failed to export account: %v", acc)
}
_, ks2 := tmpKeyStore(t, true)
- var atom uint32
+ var atom atomic.Uint32
var wg sync.WaitGroup
wg.Add(2)
for i := 0; i < 2; i++ {
go func() {
defer wg.Done()
if _, err := ks2.Import(json, "new", "new"); err != nil {
- atomic.AddUint32(&atom, 1)
+ atom.Add(1)
}
}()
}
wg.Wait()
- if atom != 1 {
+ if atom.Load() != 1 {
t.Errorf("Import is racy")
}
}
@@ -424,7 +424,7 @@ func checkAccounts(t *testing.T, live map[common.Address]accounts.Account, walle
for _, account := range live {
liveList = append(liveList, account)
}
- sort.Sort(accountsByURL(liveList))
+ slices.SortFunc(liveList, byURL)
for j, wallet := range wallets {
if accs := wallet.Accounts(); len(accs) != 1 {
t.Errorf("wallet %d: contains invalid number of accounts: have %d, want 1", j, len(accs))
diff --git a/accounts/keystore/passphrase.go b/accounts/keystore/passphrase.go
index 1701fbf536..8d6ed2b14e 100644
--- a/accounts/keystore/passphrase.go
+++ b/accounts/keystore/passphrase.go
@@ -225,10 +225,13 @@ func DecryptKey(keyjson []byte, auth string) (*Key, error) {
if err != nil {
return nil, err
}
- key := crypto.ToECDSAUnsafe(keyBytes)
+ key, err := crypto.ToECDSA(keyBytes)
+ if err != nil {
+ return nil, fmt.Errorf("invalid key: %w", err)
+ }
id, err := uuid.FromBytes(keyId)
if err != nil {
- return nil, err
+ return nil, fmt.Errorf("invalid UUID: %w", err)
}
return &Key{
Id: id,
diff --git a/accounts/keystore/watch.go b/accounts/keystore/watch.go
index 3f64b89c58..a9f87e7c32 100644
--- a/accounts/keystore/watch.go
+++ b/accounts/keystore/watch.go
@@ -20,6 +20,7 @@
package keystore
import (
+ "os"
"time"
"github.com/ethereum/go-ethereum/log"
@@ -77,7 +78,9 @@ func (w *watcher) loop() {
}
defer watcher.Close()
if err := watcher.Add(w.ac.keydir); err != nil {
- logger.Warn("Failed to watch keystore folder", "err", err)
+ if !os.IsNotExist(err) {
+ logger.Warn("Failed to watch keystore folder", "err", err)
+ }
return
}
diff --git a/accounts/scwallet/README.md b/accounts/scwallet/README.md
index 4313d9c6b2..28079c4743 100644
--- a/accounts/scwallet/README.md
+++ b/accounts/scwallet/README.md
@@ -8,7 +8,7 @@
## Preparing the smartcard
- **WARNING: FOILLOWING THESE INSTRUCTIONS WILL DESTROY THE MASTER KEY ON YOUR CARD. ONLY PROCEED IF NO FUNDS ARE ASSOCIATED WITH THESE ACCOUNTS**
+ **WARNING: FOLLOWING THESE INSTRUCTIONS WILL DESTROY THE MASTER KEY ON YOUR CARD. ONLY PROCEED IF NO FUNDS ARE ASSOCIATED WITH THESE ACCOUNTS**
You can use status' [keycard-cli](https://github.com/status-im/keycard-cli) and you should get _at least_ version 2.1.1 of their [smartcard application](https://github.com/status-im/status-keycard/releases/download/2.2.1/keycard_v2.2.1.cap)
diff --git a/accounts/scwallet/securechannel.go b/accounts/scwallet/securechannel.go
index b1b533eb72..bbd8b22647 100644
--- a/accounts/scwallet/securechannel.go
+++ b/accounts/scwallet/securechannel.go
@@ -24,6 +24,7 @@ import (
"crypto/rand"
"crypto/sha256"
"crypto/sha512"
+ "errors"
"fmt"
"github.com/ethereum/go-ethereum/crypto"
@@ -125,7 +126,7 @@ func (s *SecureChannelSession) Pair(pairingPassword []byte) error {
// Unpair disestablishes an existing pairing.
func (s *SecureChannelSession) Unpair() error {
if s.PairingKey == nil {
- return fmt.Errorf("cannot unpair: not paired")
+ return errors.New("cannot unpair: not paired")
}
_, err := s.transmitEncrypted(claSCWallet, insUnpair, s.PairingIndex, 0, []byte{})
@@ -141,7 +142,7 @@ func (s *SecureChannelSession) Unpair() error {
// Open initializes the secure channel.
func (s *SecureChannelSession) Open() error {
if s.iv != nil {
- return fmt.Errorf("session already opened")
+ return errors.New("session already opened")
}
response, err := s.open()
@@ -215,7 +216,7 @@ func (s *SecureChannelSession) pair(p1 uint8, data []byte) (*responseAPDU, error
// transmitEncrypted sends an encrypted message, and decrypts and returns the response.
func (s *SecureChannelSession) transmitEncrypted(cla, ins, p1, p2 byte, data []byte) (*responseAPDU, error) {
if s.iv == nil {
- return nil, fmt.Errorf("channel not open")
+ return nil, errors.New("channel not open")
}
data, err := s.encryptAPDU(data)
@@ -254,7 +255,7 @@ func (s *SecureChannelSession) transmitEncrypted(cla, ins, p1, p2 byte, data []b
return nil, err
}
if !bytes.Equal(s.iv, rmac) {
- return nil, fmt.Errorf("invalid MAC in response")
+ return nil, errors.New("invalid MAC in response")
}
rapdu := &responseAPDU{}
@@ -319,7 +320,7 @@ func unpad(data []byte, terminator byte) ([]byte, error) {
return nil, fmt.Errorf("expected end of padding, got %d", data[len(data)-i])
}
}
- return nil, fmt.Errorf("expected end of padding, got 0")
+ return nil, errors.New("expected end of padding, got 0")
}
// updateIV is an internal method that updates the initialization vector after
diff --git a/accounts/scwallet/wallet.go b/accounts/scwallet/wallet.go
index 6a40e28ae6..067bda83f1 100644
--- a/accounts/scwallet/wallet.go
+++ b/accounts/scwallet/wallet.go
@@ -252,7 +252,7 @@ func (w *Wallet) release() error {
// with the wallet.
func (w *Wallet) pair(puk []byte) error {
if w.session.paired() {
- return fmt.Errorf("wallet already paired")
+ return errors.New("wallet already paired")
}
pairing, err := w.session.pair(puk)
if err != nil {
@@ -813,7 +813,7 @@ func (s *Session) pair(secret []byte) (smartcardPairing, error) {
// unpair deletes an existing pairing.
func (s *Session) unpair() error {
if !s.verified {
- return fmt.Errorf("unpair requires that the PIN be verified")
+ return errors.New("unpair requires that the PIN be verified")
}
return s.Channel.Unpair()
}
@@ -907,7 +907,7 @@ func (s *Session) initialize(seed []byte) error {
return err
}
if status == "Online" {
- return fmt.Errorf("card is already initialized, cowardly refusing to proceed")
+ return errors.New("card is already initialized, cowardly refusing to proceed")
}
s.Wallet.lock.Lock()
diff --git a/accounts/usbwallet/hub.go b/accounts/usbwallet/hub.go
index 2139967228..e67942dbc1 100644
--- a/accounts/usbwallet/hub.go
+++ b/accounts/usbwallet/hub.go
@@ -63,9 +63,9 @@ type Hub struct {
stateLock sync.RWMutex // Protects the internals of the hub from racey access
// TODO(karalabe): remove if hotplug lands on Windows
- commsPend int // Number of operations blocking enumeration
- commsLock sync.Mutex // Lock protecting the pending counter and enumeration
- enumFails uint32 // Number of times enumeration has failed
+ commsPend int // Number of operations blocking enumeration
+ commsLock sync.Mutex // Lock protecting the pending counter and enumeration
+ enumFails atomic.Uint32 // Number of times enumeration has failed
}
// NewLedgerHub creates a new hardware wallet manager for Ledger devices.
@@ -151,7 +151,7 @@ func (hub *Hub) refreshWallets() {
return
}
// If USB enumeration is continually failing, don't keep trying indefinitely
- if atomic.LoadUint32(&hub.enumFails) > 2 {
+ if hub.enumFails.Load() > 2 {
return
}
// Retrieve the current list of USB wallet devices
@@ -172,7 +172,7 @@ func (hub *Hub) refreshWallets() {
}
infos, err := usb.Enumerate(hub.vendorID, 0)
if err != nil {
- failcount := atomic.AddUint32(&hub.enumFails, 1)
+ failcount := hub.enumFails.Add(1)
if runtime.GOOS == "linux" {
// See rationale before the enumeration why this is needed and only on Linux.
hub.commsLock.Unlock()
@@ -181,7 +181,7 @@ func (hub *Hub) refreshWallets() {
"vendor", hub.vendorID, "failcount", failcount, "err", err)
return
}
- atomic.StoreUint32(&hub.enumFails, 0)
+ hub.enumFails.Store(0)
for _, info := range infos {
for _, id := range hub.productIDs {
diff --git a/accounts/usbwallet/wallet.go b/accounts/usbwallet/wallet.go
index 0e399a6d09..05add081ab 100644
--- a/accounts/usbwallet/wallet.go
+++ b/accounts/usbwallet/wallet.go
@@ -624,7 +624,7 @@ func (w *wallet) SignTx(account accounts.Account, tx *types.Transaction, chainID
return signed, nil
}
-// SignHashWithPassphrase implements accounts.Wallet, however signing arbitrary
+// SignTextWithPassphrase implements accounts.Wallet, however signing arbitrary
// data is not supported for Ledger wallets, so this method will always return
// an error.
func (w *wallet) SignTextWithPassphrase(account accounts.Account, passphrase string, text []byte) ([]byte, error) {
diff --git a/beacon/engine/errors.go b/beacon/engine/errors.go
index 769001b9e3..62773a0ea9 100644
--- a/beacon/engine/errors.go
+++ b/beacon/engine/errors.go
@@ -80,6 +80,7 @@ var (
InvalidPayloadAttributes = &EngineAPIError{code: -38003, msg: "Invalid payload attributes"}
TooLargeRequest = &EngineAPIError{code: -38004, msg: "Too large request"}
InvalidParams = &EngineAPIError{code: -32602, msg: "Invalid parameters"}
+ UnsupportedFork = &EngineAPIError{code: -38005, msg: "Unsupported fork"}
STATUS_INVALID = ForkChoiceResponse{PayloadStatus: PayloadStatusV1{Status: INVALID}, PayloadID: nil}
STATUS_SYNCING = ForkChoiceResponse{PayloadStatus: PayloadStatusV1{Status: SYNCING}, PayloadID: nil}
diff --git a/beacon/engine/gen_blockparams.go b/beacon/engine/gen_blockparams.go
index 0a76475841..c343e58906 100644
--- a/beacon/engine/gen_blockparams.go
+++ b/beacon/engine/gen_blockparams.go
@@ -19,7 +19,8 @@ func (p PayloadAttributes) MarshalJSON() ([]byte, error) {
Timestamp hexutil.Uint64 `json:"timestamp" gencodec:"required"`
Random common.Hash `json:"prevRandao" gencodec:"required"`
SuggestedFeeRecipient common.Address `json:"suggestedFeeRecipient" gencodec:"required"`
- Withdrawals []*types.Withdrawal `json:"withdrawals,omitempty" gencodec:"optional"`
+ Withdrawals []*types.Withdrawal `json:"withdrawals"`
+ BeaconRoot *common.Hash `json:"parentBeaconBlockRoot"`
Transactions []hexutil.Bytes `json:"transactions,omitempty" gencodec:"optional"`
NoTxPool bool `json:"noTxPool,omitempty" gencodec:"optional"`
GasLimit *hexutil.Uint64 `json:"gasLimit,omitempty" gencodec:"optional"`
@@ -29,6 +30,7 @@ func (p PayloadAttributes) MarshalJSON() ([]byte, error) {
enc.Random = p.Random
enc.SuggestedFeeRecipient = p.SuggestedFeeRecipient
enc.Withdrawals = p.Withdrawals
+ enc.BeaconRoot = p.BeaconRoot
if p.Transactions != nil {
enc.Transactions = make([]hexutil.Bytes, len(p.Transactions))
for k, v := range p.Transactions {
@@ -46,7 +48,8 @@ func (p *PayloadAttributes) UnmarshalJSON(input []byte) error {
Timestamp *hexutil.Uint64 `json:"timestamp" gencodec:"required"`
Random *common.Hash `json:"prevRandao" gencodec:"required"`
SuggestedFeeRecipient *common.Address `json:"suggestedFeeRecipient" gencodec:"required"`
- Withdrawals []*types.Withdrawal `json:"withdrawals,omitempty" gencodec:"optional"`
+ Withdrawals []*types.Withdrawal `json:"withdrawals"`
+ BeaconRoot *common.Hash `json:"parentBeaconBlockRoot"`
Transactions []hexutil.Bytes `json:"transactions,omitempty" gencodec:"optional"`
NoTxPool *bool `json:"noTxPool,omitempty" gencodec:"optional"`
GasLimit *hexutil.Uint64 `json:"gasLimit,omitempty" gencodec:"optional"`
@@ -70,6 +73,9 @@ func (p *PayloadAttributes) UnmarshalJSON(input []byte) error {
if dec.Withdrawals != nil {
p.Withdrawals = dec.Withdrawals
}
+ if dec.BeaconRoot != nil {
+ p.BeaconRoot = dec.BeaconRoot
+ }
if dec.Transactions != nil {
p.Transactions = make([][]byte, len(dec.Transactions))
for k, v := range dec.Transactions {
diff --git a/beacon/engine/gen_ed.go b/beacon/engine/gen_ed.go
index 336dfc6cc7..6893d64a16 100644
--- a/beacon/engine/gen_ed.go
+++ b/beacon/engine/gen_ed.go
@@ -32,6 +32,8 @@ func (e ExecutableData) MarshalJSON() ([]byte, error) {
BlockHash common.Hash `json:"blockHash" gencodec:"required"`
Transactions []hexutil.Bytes `json:"transactions" gencodec:"required"`
Withdrawals []*types.Withdrawal `json:"withdrawals"`
+ BlobGasUsed *hexutil.Uint64 `json:"blobGasUsed"`
+ ExcessBlobGas *hexutil.Uint64 `json:"excessBlobGas"`
}
var enc ExecutableData
enc.ParentHash = e.ParentHash
@@ -54,6 +56,8 @@ func (e ExecutableData) MarshalJSON() ([]byte, error) {
}
}
enc.Withdrawals = e.Withdrawals
+ enc.BlobGasUsed = (*hexutil.Uint64)(e.BlobGasUsed)
+ enc.ExcessBlobGas = (*hexutil.Uint64)(e.ExcessBlobGas)
return json.Marshal(&enc)
}
@@ -75,6 +79,8 @@ func (e *ExecutableData) UnmarshalJSON(input []byte) error {
BlockHash *common.Hash `json:"blockHash" gencodec:"required"`
Transactions []hexutil.Bytes `json:"transactions" gencodec:"required"`
Withdrawals []*types.Withdrawal `json:"withdrawals"`
+ BlobGasUsed *hexutil.Uint64 `json:"blobGasUsed"`
+ ExcessBlobGas *hexutil.Uint64 `json:"excessBlobGas"`
}
var dec ExecutableData
if err := json.Unmarshal(input, &dec); err != nil {
@@ -142,5 +148,11 @@ func (e *ExecutableData) UnmarshalJSON(input []byte) error {
if dec.Withdrawals != nil {
e.Withdrawals = dec.Withdrawals
}
+ if dec.BlobGasUsed != nil {
+ e.BlobGasUsed = (*uint64)(dec.BlobGasUsed)
+ }
+ if dec.ExcessBlobGas != nil {
+ e.ExcessBlobGas = (*uint64)(dec.ExcessBlobGas)
+ }
return nil
}
diff --git a/beacon/engine/gen_epe.go b/beacon/engine/gen_epe.go
index cc66cef6cd..e69f9a5951 100644
--- a/beacon/engine/gen_epe.go
+++ b/beacon/engine/gen_epe.go
@@ -17,10 +17,14 @@ func (e ExecutionPayloadEnvelope) MarshalJSON() ([]byte, error) {
type ExecutionPayloadEnvelope struct {
ExecutionPayload *ExecutableData `json:"executionPayload" gencodec:"required"`
BlockValue *hexutil.Big `json:"blockValue" gencodec:"required"`
+ BlobsBundle *BlobsBundleV1 `json:"blobsBundle"`
+ Override bool `json:"shouldOverrideBuilder"`
}
var enc ExecutionPayloadEnvelope
enc.ExecutionPayload = e.ExecutionPayload
enc.BlockValue = (*hexutil.Big)(e.BlockValue)
+ enc.BlobsBundle = e.BlobsBundle
+ enc.Override = e.Override
return json.Marshal(&enc)
}
@@ -29,6 +33,8 @@ func (e *ExecutionPayloadEnvelope) UnmarshalJSON(input []byte) error {
type ExecutionPayloadEnvelope struct {
ExecutionPayload *ExecutableData `json:"executionPayload" gencodec:"required"`
BlockValue *hexutil.Big `json:"blockValue" gencodec:"required"`
+ BlobsBundle *BlobsBundleV1 `json:"blobsBundle"`
+ Override *bool `json:"shouldOverrideBuilder"`
}
var dec ExecutionPayloadEnvelope
if err := json.Unmarshal(input, &dec); err != nil {
@@ -42,5 +48,11 @@ func (e *ExecutionPayloadEnvelope) UnmarshalJSON(input []byte) error {
return errors.New("missing required field 'blockValue' for ExecutionPayloadEnvelope")
}
e.BlockValue = (*big.Int)(dec.BlockValue)
+ if dec.BlobsBundle != nil {
+ e.BlobsBundle = dec.BlobsBundle
+ }
+ if dec.Override != nil {
+ e.Override = *dec.Override
+ }
return nil
}
diff --git a/beacon/engine/types.go b/beacon/engine/types.go
index 00128cf777..6f3aa006b8 100644
--- a/beacon/engine/types.go
+++ b/beacon/engine/types.go
@@ -34,7 +34,8 @@ type PayloadAttributes struct {
Timestamp uint64 `json:"timestamp" gencodec:"required"`
Random common.Hash `json:"prevRandao" gencodec:"required"`
SuggestedFeeRecipient common.Address `json:"suggestedFeeRecipient" gencodec:"required"`
- Withdrawals []*types.Withdrawal `json:"withdrawals,omitempty" gencodec:"optional"`
+ Withdrawals []*types.Withdrawal `json:"withdrawals"`
+ BeaconRoot *common.Hash `json:"parentBeaconBlockRoot"`
// Transactions is a field for rollups: the transactions list is forced into the block
Transactions [][]byte `json:"transactions,omitempty" gencodec:"optional"`
@@ -72,6 +73,8 @@ type ExecutableData struct {
BlockHash common.Hash `json:"blockHash" gencodec:"required"`
Transactions [][]byte `json:"transactions" gencodec:"required"`
Withdrawals []*types.Withdrawal `json:"withdrawals"`
+ BlobGasUsed *uint64 `json:"blobGasUsed"`
+ ExcessBlobGas *uint64 `json:"excessBlobGas"`
}
// JSON type overrides for executableData.
@@ -84,6 +87,8 @@ type executableDataMarshaling struct {
ExtraData hexutil.Bytes
LogsBloom hexutil.Bytes
Transactions []hexutil.Bytes
+ BlobGasUsed *hexutil.Uint64
+ ExcessBlobGas *hexutil.Uint64
}
//go:generate go run github.com/fjl/gencodec -type ExecutionPayloadEnvelope -field-override executionPayloadEnvelopeMarshaling -out gen_epe.go
@@ -91,6 +96,14 @@ type executableDataMarshaling struct {
type ExecutionPayloadEnvelope struct {
ExecutionPayload *ExecutableData `json:"executionPayload" gencodec:"required"`
BlockValue *big.Int `json:"blockValue" gencodec:"required"`
+ BlobsBundle *BlobsBundleV1 `json:"blobsBundle"`
+ Override bool `json:"shouldOverrideBuilder"`
+}
+
+type BlobsBundleV1 struct {
+ Commitments []hexutil.Bytes `json:"commitments"`
+ Proofs []hexutil.Bytes `json:"proofs"`
+ Blobs []hexutil.Bytes `json:"blobs"`
}
// JSON type overrides for ExecutionPayloadEnvelope.
@@ -163,14 +176,15 @@ func decodeTransactions(enc [][]byte) ([]*types.Transaction, error) {
// ExecutableDataToBlock constructs a block from executable data.
// It verifies that the following fields:
//
-// len(extraData) <= 32
-// uncleHash = emptyUncleHash
-// difficulty = 0
+// len(extraData) <= 32
+// uncleHash = emptyUncleHash
+// difficulty = 0
+// if versionedHashes != nil, versionedHashes match to blob transactions
//
// and that the blockhash of the constructed block matches the parameters. Nil
// Withdrawals value will propagate through the returned block. Empty
// Withdrawals value must be passed via non-nil, length 0 value in params.
-func ExecutableDataToBlock(params ExecutableData) (*types.Block, error) {
+func ExecutableDataToBlock(params ExecutableData, versionedHashes []common.Hash, beaconRoot *common.Hash) (*types.Block, error) {
txs, err := decodeTransactions(params.Transactions)
if err != nil {
return nil, err
@@ -185,6 +199,18 @@ func ExecutableDataToBlock(params ExecutableData) (*types.Block, error) {
if params.BaseFeePerGas != nil && (params.BaseFeePerGas.Sign() == -1 || params.BaseFeePerGas.BitLen() > 256) {
return nil, fmt.Errorf("invalid baseFeePerGas: %v", params.BaseFeePerGas)
}
+ var blobHashes []common.Hash
+ for _, tx := range txs {
+ blobHashes = append(blobHashes, tx.BlobHashes()...)
+ }
+ if len(blobHashes) != len(versionedHashes) {
+ return nil, fmt.Errorf("invalid number of versionedHashes: %v blobHashes: %v", versionedHashes, blobHashes)
+ }
+ for i := 0; i < len(blobHashes); i++ {
+ if blobHashes[i] != versionedHashes[i] {
+ return nil, fmt.Errorf("invalid versionedHash at %v: %v blobHashes: %v", i, versionedHashes, blobHashes)
+ }
+ }
// Only set withdrawalsRoot if it is non-nil. This allows CLs to use
// ExecutableData before withdrawals are enabled by marshaling
// Withdrawals as the json null value.
@@ -194,22 +220,25 @@ func ExecutableDataToBlock(params ExecutableData) (*types.Block, error) {
withdrawalsRoot = &h
}
header := &types.Header{
- ParentHash: params.ParentHash,
- UncleHash: types.EmptyUncleHash,
- Coinbase: params.FeeRecipient,
- Root: params.StateRoot,
- TxHash: types.DeriveSha(types.Transactions(txs), trie.NewStackTrie(nil)),
- ReceiptHash: params.ReceiptsRoot,
- Bloom: types.BytesToBloom(params.LogsBloom),
- Difficulty: common.Big0,
- Number: new(big.Int).SetUint64(params.Number),
- GasLimit: params.GasLimit,
- GasUsed: params.GasUsed,
- Time: params.Timestamp,
- BaseFee: params.BaseFeePerGas,
- Extra: params.ExtraData,
- MixDigest: params.Random,
- WithdrawalsHash: withdrawalsRoot,
+ ParentHash: params.ParentHash,
+ UncleHash: types.EmptyUncleHash,
+ Coinbase: params.FeeRecipient,
+ Root: params.StateRoot,
+ TxHash: types.DeriveSha(types.Transactions(txs), trie.NewStackTrie(nil)),
+ ReceiptHash: params.ReceiptsRoot,
+ Bloom: types.BytesToBloom(params.LogsBloom),
+ Difficulty: common.Big0,
+ Number: new(big.Int).SetUint64(params.Number),
+ GasLimit: params.GasLimit,
+ GasUsed: params.GasUsed,
+ Time: params.Timestamp,
+ BaseFee: params.BaseFeePerGas,
+ Extra: params.ExtraData,
+ MixDigest: params.Random,
+ WithdrawalsHash: withdrawalsRoot,
+ ExcessBlobGas: params.ExcessBlobGas,
+ BlobGasUsed: params.BlobGasUsed,
+ ParentBeaconRoot: beaconRoot,
}
block := types.NewBlockWithHeader(header).WithBody(txs, nil /* uncles */).WithWithdrawals(params.Withdrawals)
if block.Hash() != params.BlockHash {
@@ -220,7 +249,7 @@ func ExecutableDataToBlock(params ExecutableData) (*types.Block, error) {
// BlockToExecutableData constructs the ExecutableData structure by filling the
// fields from the given block. It assumes the given block is post-merge block.
-func BlockToExecutableData(block *types.Block, fees *big.Int) *ExecutionPayloadEnvelope {
+func BlockToExecutableData(block *types.Block, fees *big.Int, sidecars []*types.BlobTxSidecar) *ExecutionPayloadEnvelope {
data := &ExecutableData{
BlockHash: block.Hash(),
ParentHash: block.ParentHash(),
@@ -237,8 +266,22 @@ func BlockToExecutableData(block *types.Block, fees *big.Int) *ExecutionPayloadE
Random: block.MixDigest(),
ExtraData: block.Extra(),
Withdrawals: block.Withdrawals(),
+ BlobGasUsed: block.BlobGasUsed(),
+ ExcessBlobGas: block.ExcessBlobGas(),
+ }
+ bundle := BlobsBundleV1{
+ Commitments: make([]hexutil.Bytes, 0),
+ Blobs: make([]hexutil.Bytes, 0),
+ Proofs: make([]hexutil.Bytes, 0),
+ }
+ for _, sidecar := range sidecars {
+ for j := range sidecar.Blobs {
+ bundle.Blobs = append(bundle.Blobs, hexutil.Bytes(sidecar.Blobs[j][:]))
+ bundle.Commitments = append(bundle.Commitments, hexutil.Bytes(sidecar.Commitments[j][:]))
+ bundle.Proofs = append(bundle.Proofs, hexutil.Bytes(sidecar.Proofs[j][:]))
+ }
}
- return &ExecutionPayloadEnvelope{ExecutionPayload: data, BlockValue: fees}
+ return &ExecutionPayloadEnvelope{ExecutionPayload: data, BlockValue: fees, BlobsBundle: &bundle, Override: false}
}
// ExecutionPayloadBodyV1 is used in the response to GetPayloadBodiesByHashV1 and GetPayloadBodiesByRangeV1
diff --git a/beacon/merkle/merkle.go b/beacon/merkle/merkle.go
new file mode 100644
index 0000000000..30896f9b01
--- /dev/null
+++ b/beacon/merkle/merkle.go
@@ -0,0 +1,67 @@
+// Copyright 2022 The go-ethereum Authors
+// This file is part of the go-ethereum library.
+//
+// The go-ethereum library is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Lesser General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// The go-ethereum library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with the go-ethereum library. If not, see .
+
+// Package merkle implements proof verifications in binary merkle trees.
+package merkle
+
+import (
+ "crypto/sha256"
+ "errors"
+ "reflect"
+
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/common/hexutil"
+)
+
+// Value represents either a 32 byte leaf value or hash node in a binary merkle tree/partial proof.
+type Value [32]byte
+
+// Values represent a series of merkle tree leaves/nodes.
+type Values []Value
+
+var valueT = reflect.TypeOf(Value{})
+
+// UnmarshalJSON parses a merkle value in hex syntax.
+func (m *Value) UnmarshalJSON(input []byte) error {
+ return hexutil.UnmarshalFixedJSON(valueT, input, m[:])
+}
+
+// VerifyProof verifies a Merkle proof branch for a single value in a
+// binary Merkle tree (index is a generalized tree index).
+func VerifyProof(root common.Hash, index uint64, branch Values, value Value) error {
+ hasher := sha256.New()
+ for _, sibling := range branch {
+ hasher.Reset()
+ if index&1 == 0 {
+ hasher.Write(value[:])
+ hasher.Write(sibling[:])
+ } else {
+ hasher.Write(sibling[:])
+ hasher.Write(value[:])
+ }
+ hasher.Sum(value[:0])
+ if index >>= 1; index == 0 {
+ return errors.New("branch has extra items")
+ }
+ }
+ if index != 1 {
+ return errors.New("branch is missing items")
+ }
+ if common.Hash(value) != root {
+ return errors.New("root mismatch")
+ }
+ return nil
+}
diff --git a/consensus/ethash/mmap_help_linux.go b/beacon/params/params.go
similarity index 51%
rename from consensus/ethash/mmap_help_linux.go
rename to beacon/params/params.go
index b40a1dd25c..ee9feb1acb 100644
--- a/consensus/ethash/mmap_help_linux.go
+++ b/beacon/params/params.go
@@ -1,4 +1,4 @@
-// Copyright 2021 The go-ethereum Authors
+// Copyright 2022 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
// The go-ethereum library is free software: you can redistribute it and/or modify
@@ -14,22 +14,31 @@
// You should have received a copy of the GNU Lesser General Public License
// along with the go-ethereum library. If not, see .
-//go:build linux
-// +build linux
+package params
-package ethash
+const (
+ EpochLength = 32
+ SyncPeriodLength = 8192
-import (
- "os"
+ BLSSignatureSize = 96
+ BLSPubkeySize = 48
- "golang.org/x/sys/unix"
+ SyncCommitteeSize = 512
+ SyncCommitteeBitmaskSize = SyncCommitteeSize / 8
+ SyncCommitteeSupermajority = (SyncCommitteeSize*2 + 2) / 3
)
-// ensureSize expands the file to the given size. This is to prevent runtime
-// errors later on, if the underlying file expands beyond the disk capacity,
-// even though it ostensibly is already expanded, but due to being sparse
-// does not actually occupy the full declared size on disk.
-func ensureSize(f *os.File, size int64) error {
- // Docs: https://www.man7.org/linux/man-pages/man2/fallocate.2.html
- return unix.Fallocate(int(f.Fd()), 0, 0, size)
-}
+const (
+ StateIndexGenesisTime = 32
+ StateIndexGenesisValidators = 33
+ StateIndexForkVersion = 141
+ StateIndexLatestHeader = 36
+ StateIndexBlockRoots = 37
+ StateIndexStateRoots = 38
+ StateIndexHistoricRoots = 39
+ StateIndexFinalBlock = 105
+ StateIndexSyncCommittee = 54
+ StateIndexNextSyncCommittee = 55
+ StateIndexExecPayload = 56
+ StateIndexExecHead = 908
+)
diff --git a/beacon/types/committee.go b/beacon/types/committee.go
new file mode 100644
index 0000000000..5f89c27554
--- /dev/null
+++ b/beacon/types/committee.go
@@ -0,0 +1,191 @@
+// Copyright 2023 The go-ethereum Authors
+// This file is part of the go-ethereum library.
+//
+// The go-ethereum library is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Lesser General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// The go-ethereum library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with the go-ethereum library. If not, see .
+
+package types
+
+import (
+ "crypto/sha256"
+ "encoding/json"
+ "fmt"
+ "math/bits"
+
+ "github.com/ethereum/go-ethereum/beacon/params"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/common/hexutil"
+ bls "github.com/protolambda/bls12-381-util"
+)
+
+// SerializedSyncCommitteeSize is the size of the sync committee plus the
+// aggregate public key.
+const SerializedSyncCommitteeSize = (params.SyncCommitteeSize + 1) * params.BLSPubkeySize
+
+// SerializedSyncCommittee is the serialized version of a sync committee
+// plus the aggregate public key.
+type SerializedSyncCommittee [SerializedSyncCommitteeSize]byte
+
+// jsonSyncCommittee is the JSON representation of a sync committee.
+//
+// See data structure definition here:
+// https://github.com/ethereum/consensus-specs/blob/dev/specs/altair/beacon-chain.md#syncaggregate
+type jsonSyncCommittee struct {
+ Pubkeys []hexutil.Bytes `json:"pubkeys"`
+ Aggregate hexutil.Bytes `json:"aggregate_pubkey"`
+}
+
+// MarshalJSON implements json.Marshaler.
+func (s *SerializedSyncCommittee) MarshalJSON() ([]byte, error) {
+ sc := jsonSyncCommittee{Pubkeys: make([]hexutil.Bytes, params.SyncCommitteeSize)}
+ for i := range sc.Pubkeys {
+ sc.Pubkeys[i] = make(hexutil.Bytes, params.BLSPubkeySize)
+ copy(sc.Pubkeys[i][:], s[i*params.BLSPubkeySize:(i+1)*params.BLSPubkeySize])
+ }
+ sc.Aggregate = make(hexutil.Bytes, params.BLSPubkeySize)
+ copy(sc.Aggregate[:], s[params.SyncCommitteeSize*params.BLSPubkeySize:])
+ return json.Marshal(&sc)
+}
+
+// UnmarshalJSON implements json.Marshaler.
+func (s *SerializedSyncCommittee) UnmarshalJSON(input []byte) error {
+ var sc jsonSyncCommittee
+ if err := json.Unmarshal(input, &sc); err != nil {
+ return err
+ }
+ if len(sc.Pubkeys) != params.SyncCommitteeSize {
+ return fmt.Errorf("invalid number of pubkeys %d", len(sc.Pubkeys))
+ }
+ for i, key := range sc.Pubkeys {
+ if len(key) != params.BLSPubkeySize {
+ return fmt.Errorf("pubkey %d has invalid size %d", i, len(key))
+ }
+ copy(s[i*params.BLSPubkeySize:], key[:])
+ }
+ if len(sc.Aggregate) != params.BLSPubkeySize {
+ return fmt.Errorf("invalid aggregate pubkey size %d", len(sc.Aggregate))
+ }
+ copy(s[params.SyncCommitteeSize*params.BLSPubkeySize:], sc.Aggregate[:])
+ return nil
+}
+
+// Root calculates the root hash of the binary tree representation of a sync
+// committee provided in serialized format.
+//
+// TODO(zsfelfoldi): Get rid of this when SSZ encoding lands.
+func (s *SerializedSyncCommittee) Root() common.Hash {
+ var (
+ hasher = sha256.New()
+ padding [64 - params.BLSPubkeySize]byte
+ data [params.SyncCommitteeSize]common.Hash
+ l = params.SyncCommitteeSize
+ )
+ for i := range data {
+ hasher.Reset()
+ hasher.Write(s[i*params.BLSPubkeySize : (i+1)*params.BLSPubkeySize])
+ hasher.Write(padding[:])
+ hasher.Sum(data[i][:0])
+ }
+ for l > 1 {
+ for i := 0; i < l/2; i++ {
+ hasher.Reset()
+ hasher.Write(data[i*2][:])
+ hasher.Write(data[i*2+1][:])
+ hasher.Sum(data[i][:0])
+ }
+ l /= 2
+ }
+ hasher.Reset()
+ hasher.Write(s[SerializedSyncCommitteeSize-params.BLSPubkeySize : SerializedSyncCommitteeSize])
+ hasher.Write(padding[:])
+ hasher.Sum(data[1][:0])
+ hasher.Reset()
+ hasher.Write(data[0][:])
+ hasher.Write(data[1][:])
+ hasher.Sum(data[0][:0])
+ return data[0]
+}
+
+// Deserialize splits open the pubkeys into proper BLS key types.
+func (s *SerializedSyncCommittee) Deserialize() (*SyncCommittee, error) {
+ sc := new(SyncCommittee)
+ for i := 0; i <= params.SyncCommitteeSize; i++ {
+ key := new(bls.Pubkey)
+
+ var bytes [params.BLSPubkeySize]byte
+ copy(bytes[:], s[i*params.BLSPubkeySize:(i+1)*params.BLSPubkeySize])
+
+ if err := key.Deserialize(&bytes); err != nil {
+ return nil, err
+ }
+ if i < params.SyncCommitteeSize {
+ sc.keys[i] = key
+ } else {
+ sc.aggregate = key
+ }
+ }
+ return sc, nil
+}
+
+// SyncCommittee is a set of sync committee signer pubkeys and the aggregate key.
+//
+// See data structure definition here:
+// https://github.com/ethereum/consensus-specs/blob/dev/specs/altair/beacon-chain.md#syncaggregate
+type SyncCommittee struct {
+ keys [params.SyncCommitteeSize]*bls.Pubkey
+ aggregate *bls.Pubkey
+}
+
+// VerifySignature returns true if the given sync aggregate is a valid signature
+// or the given hash.
+func (sc *SyncCommittee) VerifySignature(signingRoot common.Hash, signature *SyncAggregate) bool {
+ var (
+ sig bls.Signature
+ keys = make([]*bls.Pubkey, 0, params.SyncCommitteeSize)
+ )
+ if err := sig.Deserialize(&signature.Signature); err != nil {
+ return false
+ }
+ for i, key := range sc.keys {
+ if signature.Signers[i/8]&(byte(1)<<(i%8)) != 0 {
+ keys = append(keys, key)
+ }
+ }
+ return bls.FastAggregateVerify(keys, signingRoot[:], &sig)
+}
+
+//go:generate go run github.com/fjl/gencodec -type SyncAggregate -field-override syncAggregateMarshaling -out gen_syncaggregate_json.go
+
+// SyncAggregate represents an aggregated BLS signature with Signers referring
+// to a subset of the corresponding sync committee.
+//
+// See data structure definition here:
+// https://github.com/ethereum/consensus-specs/blob/dev/specs/altair/beacon-chain.md#syncaggregate
+type SyncAggregate struct {
+ Signers [params.SyncCommitteeBitmaskSize]byte `gencodec:"required" json:"sync_committee_bits"`
+ Signature [params.BLSSignatureSize]byte `gencodec:"required" json:"sync_committee_signature"`
+}
+
+type syncAggregateMarshaling struct {
+ Signers hexutil.Bytes
+ Signature hexutil.Bytes
+}
+
+// SignerCount returns the number of signers in the aggregate signature.
+func (s *SyncAggregate) SignerCount() int {
+ var count int
+ for _, v := range s.Signers {
+ count += bits.OnesCount8(v)
+ }
+ return count
+}
diff --git a/beacon/types/config.go b/beacon/types/config.go
new file mode 100644
index 0000000000..8cb8808b6f
--- /dev/null
+++ b/beacon/types/config.go
@@ -0,0 +1,176 @@
+// Copyright 2022 The go-ethereum Authors
+// This file is part of the go-ethereum library.
+//
+// The go-ethereum library is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Lesser General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// The go-ethereum library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with the go-ethereum library. If not, see .
+
+package types
+
+import (
+ "crypto/sha256"
+ "fmt"
+ "os"
+ "sort"
+ "strconv"
+ "strings"
+
+ "github.com/ethereum/go-ethereum/beacon/merkle"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/common/hexutil"
+ "gopkg.in/yaml.v3"
+)
+
+// syncCommitteeDomain specifies the signatures specific use to avoid clashes
+// across signing different data structures.
+const syncCommitteeDomain = 7
+
+// Fork describes a single beacon chain fork and also stores the calculated
+// signature domain used after this fork.
+type Fork struct {
+ // Name of the fork in the chain config (config.yaml) file{
+ Name string
+
+ // Epoch when given fork version is activated
+ Epoch uint64
+
+ // Fork version, see https://github.com/ethereum/consensus-specs/blob/dev/specs/phase0/beacon-chain.md#custom-types
+ Version []byte
+
+ // calculated by computeDomain, based on fork version and genesis validators root
+ domain merkle.Value
+}
+
+// computeDomain returns the signature domain based on the given fork version
+// and genesis validator set root.
+func (f *Fork) computeDomain(genesisValidatorsRoot common.Hash) {
+ var (
+ hasher = sha256.New()
+ forkVersion32 merkle.Value
+ forkDataRoot merkle.Value
+ )
+ copy(forkVersion32[:], f.Version)
+ hasher.Write(forkVersion32[:])
+ hasher.Write(genesisValidatorsRoot[:])
+ hasher.Sum(forkDataRoot[:0])
+
+ f.domain[0] = syncCommitteeDomain
+ copy(f.domain[4:], forkDataRoot[:28])
+}
+
+// Forks is the list of all beacon chain forks in the chain configuration.
+type Forks []*Fork
+
+// domain returns the signature domain for the given epoch (assumes that domains
+// have already been calculated).
+func (f Forks) domain(epoch uint64) (merkle.Value, error) {
+ for i := len(f) - 1; i >= 0; i-- {
+ if epoch >= f[i].Epoch {
+ return f[i].domain, nil
+ }
+ }
+ return merkle.Value{}, fmt.Errorf("unknown fork for epoch %d", epoch)
+}
+
+// SigningRoot calculates the signing root of the given header.
+func (f Forks) SigningRoot(header Header) (common.Hash, error) {
+ domain, err := f.domain(header.Epoch())
+ if err != nil {
+ return common.Hash{}, err
+ }
+ var (
+ signingRoot common.Hash
+ headerHash = header.Hash()
+ hasher = sha256.New()
+ )
+ hasher.Write(headerHash[:])
+ hasher.Write(domain[:])
+ hasher.Sum(signingRoot[:0])
+
+ return signingRoot, nil
+}
+
+func (f Forks) Len() int { return len(f) }
+func (f Forks) Swap(i, j int) { f[i], f[j] = f[j], f[i] }
+func (f Forks) Less(i, j int) bool { return f[i].Epoch < f[j].Epoch }
+
+// ChainConfig contains the beacon chain configuration.
+type ChainConfig struct {
+ GenesisTime uint64 // Unix timestamp of slot 0
+ GenesisValidatorsRoot common.Hash // Root hash of the genesis validator set, used for signature domain calculation
+ Forks Forks
+}
+
+// AddFork adds a new item to the list of forks.
+func (c *ChainConfig) AddFork(name string, epoch uint64, version []byte) *ChainConfig {
+ fork := &Fork{
+ Name: name,
+ Epoch: epoch,
+ Version: version,
+ }
+ fork.computeDomain(c.GenesisValidatorsRoot)
+
+ c.Forks = append(c.Forks, fork)
+ sort.Sort(c.Forks)
+
+ return c
+}
+
+// LoadForks parses the beacon chain configuration file (config.yaml) and extracts
+// the list of forks.
+func (c *ChainConfig) LoadForks(path string) error {
+ file, err := os.ReadFile(path)
+ if err != nil {
+ return fmt.Errorf("failed to read beacon chain config file: %v", err)
+ }
+ config := make(map[string]string)
+ if err := yaml.Unmarshal(file, &config); err != nil {
+ return fmt.Errorf("failed to parse beacon chain config file: %v", err)
+ }
+ var (
+ versions = make(map[string][]byte)
+ epochs = make(map[string]uint64)
+ )
+ epochs["GENESIS"] = 0
+
+ for key, value := range config {
+ if strings.HasSuffix(key, "_FORK_VERSION") {
+ name := key[:len(key)-len("_FORK_VERSION")]
+ if v, err := hexutil.Decode(value); err == nil {
+ versions[name] = v
+ } else {
+ return fmt.Errorf("failed to decode hex fork id %q in beacon chain config file: %v", value, err)
+ }
+ }
+ if strings.HasSuffix(key, "_FORK_EPOCH") {
+ name := key[:len(key)-len("_FORK_EPOCH")]
+ if v, err := strconv.ParseUint(value, 10, 64); err == nil {
+ epochs[name] = v
+ } else {
+ return fmt.Errorf("failed to parse epoch number %q in beacon chain config file: %v", value, err)
+ }
+ }
+ }
+ for name, epoch := range epochs {
+ if version, ok := versions[name]; ok {
+ delete(versions, name)
+ c.AddFork(name, epoch, version)
+ } else {
+ return fmt.Errorf("fork id missing for %q in beacon chain config file", name)
+ }
+ }
+ for name := range versions {
+ return fmt.Errorf("epoch number missing for fork %q in beacon chain config file", name)
+ }
+ sort.Sort(c.Forks)
+ return nil
+}
diff --git a/beacon/types/gen_header_json.go b/beacon/types/gen_header_json.go
new file mode 100644
index 0000000000..9b3ffea06f
--- /dev/null
+++ b/beacon/types/gen_header_json.go
@@ -0,0 +1,66 @@
+// Code generated by github.com/fjl/gencodec. DO NOT EDIT.
+
+package types
+
+import (
+ "encoding/json"
+ "errors"
+
+ "github.com/ethereum/go-ethereum/common"
+)
+
+var _ = (*headerMarshaling)(nil)
+
+// MarshalJSON marshals as JSON.
+func (h Header) MarshalJSON() ([]byte, error) {
+ type Header struct {
+ Slot common.Decimal `gencodec:"required" json:"slot"`
+ ProposerIndex common.Decimal `gencodec:"required" json:"proposer_index"`
+ ParentRoot common.Hash `gencodec:"required" json:"parent_root"`
+ StateRoot common.Hash `gencodec:"required" json:"state_root"`
+ BodyRoot common.Hash `gencodec:"required" json:"body_root"`
+ }
+ var enc Header
+ enc.Slot = common.Decimal(h.Slot)
+ enc.ProposerIndex = common.Decimal(h.ProposerIndex)
+ enc.ParentRoot = h.ParentRoot
+ enc.StateRoot = h.StateRoot
+ enc.BodyRoot = h.BodyRoot
+ return json.Marshal(&enc)
+}
+
+// UnmarshalJSON unmarshals from JSON.
+func (h *Header) UnmarshalJSON(input []byte) error {
+ type Header struct {
+ Slot *common.Decimal `gencodec:"required" json:"slot"`
+ ProposerIndex *common.Decimal `gencodec:"required" json:"proposer_index"`
+ ParentRoot *common.Hash `gencodec:"required" json:"parent_root"`
+ StateRoot *common.Hash `gencodec:"required" json:"state_root"`
+ BodyRoot *common.Hash `gencodec:"required" json:"body_root"`
+ }
+ var dec Header
+ if err := json.Unmarshal(input, &dec); err != nil {
+ return err
+ }
+ if dec.Slot == nil {
+ return errors.New("missing required field 'slot' for Header")
+ }
+ h.Slot = uint64(*dec.Slot)
+ if dec.ProposerIndex == nil {
+ return errors.New("missing required field 'proposer_index' for Header")
+ }
+ h.ProposerIndex = uint64(*dec.ProposerIndex)
+ if dec.ParentRoot == nil {
+ return errors.New("missing required field 'parent_root' for Header")
+ }
+ h.ParentRoot = *dec.ParentRoot
+ if dec.StateRoot == nil {
+ return errors.New("missing required field 'state_root' for Header")
+ }
+ h.StateRoot = *dec.StateRoot
+ if dec.BodyRoot == nil {
+ return errors.New("missing required field 'body_root' for Header")
+ }
+ h.BodyRoot = *dec.BodyRoot
+ return nil
+}
diff --git a/beacon/types/gen_syncaggregate_json.go b/beacon/types/gen_syncaggregate_json.go
new file mode 100644
index 0000000000..1547ec5f01
--- /dev/null
+++ b/beacon/types/gen_syncaggregate_json.go
@@ -0,0 +1,51 @@
+// Code generated by github.com/fjl/gencodec. DO NOT EDIT.
+
+package types
+
+import (
+ "encoding/json"
+ "errors"
+
+ "github.com/ethereum/go-ethereum/common/hexutil"
+)
+
+var _ = (*syncAggregateMarshaling)(nil)
+
+// MarshalJSON marshals as JSON.
+func (s SyncAggregate) MarshalJSON() ([]byte, error) {
+ type SyncAggregate struct {
+ Signers hexutil.Bytes `gencodec:"required" json:"sync_committee_bits"`
+ Signature hexutil.Bytes `gencodec:"required" json:"sync_committee_signature"`
+ }
+ var enc SyncAggregate
+ enc.Signers = s.Signers[:]
+ enc.Signature = s.Signature[:]
+ return json.Marshal(&enc)
+}
+
+// UnmarshalJSON unmarshals from JSON.
+func (s *SyncAggregate) UnmarshalJSON(input []byte) error {
+ type SyncAggregate struct {
+ Signers *hexutil.Bytes `gencodec:"required" json:"sync_committee_bits"`
+ Signature *hexutil.Bytes `gencodec:"required" json:"sync_committee_signature"`
+ }
+ var dec SyncAggregate
+ if err := json.Unmarshal(input, &dec); err != nil {
+ return err
+ }
+ if dec.Signers == nil {
+ return errors.New("missing required field 'sync_committee_bits' for SyncAggregate")
+ }
+ if len(*dec.Signers) != len(s.Signers) {
+ return errors.New("field 'sync_committee_bits' has wrong length, need 64 items")
+ }
+ copy(s.Signers[:], *dec.Signers)
+ if dec.Signature == nil {
+ return errors.New("missing required field 'sync_committee_signature' for SyncAggregate")
+ }
+ if len(*dec.Signature) != len(s.Signature) {
+ return errors.New("field 'sync_committee_signature' has wrong length, need 96 items")
+ }
+ copy(s.Signature[:], *dec.Signature)
+ return nil
+}
diff --git a/beacon/types/header.go b/beacon/types/header.go
new file mode 100644
index 0000000000..2ddc4575f1
--- /dev/null
+++ b/beacon/types/header.go
@@ -0,0 +1,121 @@
+// Copyright 2022 The go-ethereum Authors
+// This file is part of the go-ethereum library.
+//
+// The go-ethereum library is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Lesser General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// The go-ethereum library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with the go-ethereum library. If not, see .
+
+// Package types implements a few types of the beacon chain for light client usage.
+package types
+
+import (
+ "crypto/sha256"
+ "encoding/binary"
+
+ "github.com/ethereum/go-ethereum/beacon/merkle"
+ "github.com/ethereum/go-ethereum/beacon/params"
+ "github.com/ethereum/go-ethereum/common"
+)
+
+//go:generate go run github.com/fjl/gencodec -type Header -field-override headerMarshaling -out gen_header_json.go
+
+const (
+ headerIndexSlot = 8
+ headerIndexProposerIndex = 9
+ headerIndexParentRoot = 10
+ headerIndexStateRoot = 11
+ headerIndexBodyRoot = 12
+)
+
+// Header defines a beacon header.
+//
+// See data structure definition here:
+// https://github.com/ethereum/consensus-specs/blob/dev/specs/phase0/beacon-chain.md#beaconblockheader
+type Header struct {
+ // Monotonically increasing slot number for the beacon block (may be gapped)
+ Slot uint64 `gencodec:"required" json:"slot"`
+
+ // Index into the validator table who created the beacon block
+ ProposerIndex uint64 `gencodec:"required" json:"proposer_index"`
+
+ // SSZ hash of the parent beacon header
+ ParentRoot common.Hash `gencodec:"required" json:"parent_root"`
+
+ // SSZ hash of the beacon state (https://github.com/ethereum/consensus-specs/blob/dev/specs/bellatrix/beacon-chain.md#beacon-state)
+ StateRoot common.Hash `gencodec:"required" json:"state_root"`
+
+ // SSZ hash of the beacon block body (https://github.com/ethereum/consensus-specs/blob/dev/specs/bellatrix/beacon-chain.md#beaconblockbody)
+ BodyRoot common.Hash `gencodec:"required" json:"body_root"`
+}
+
+// headerMarshaling is a field type overrides for gencodec.
+type headerMarshaling struct {
+ Slot common.Decimal
+ ProposerIndex common.Decimal
+}
+
+// Hash calculates the block root of the header.
+//
+// TODO(zsfelfoldi): Remove this when an SSZ encoder lands.
+func (h *Header) Hash() common.Hash {
+ var values [16]merkle.Value // values corresponding to indices 8 to 15 of the beacon header tree
+ binary.LittleEndian.PutUint64(values[headerIndexSlot][:8], h.Slot)
+ binary.LittleEndian.PutUint64(values[headerIndexProposerIndex][:8], h.ProposerIndex)
+ values[headerIndexParentRoot] = merkle.Value(h.ParentRoot)
+ values[headerIndexStateRoot] = merkle.Value(h.StateRoot)
+ values[headerIndexBodyRoot] = merkle.Value(h.BodyRoot)
+ hasher := sha256.New()
+ for i := 7; i > 0; i-- {
+ hasher.Reset()
+ hasher.Write(values[i*2][:])
+ hasher.Write(values[i*2+1][:])
+ hasher.Sum(values[i][:0])
+ }
+ return common.Hash(values[1])
+}
+
+// Epoch returns the epoch the header belongs to.
+func (h *Header) Epoch() uint64 {
+ return h.Slot / params.EpochLength
+}
+
+// SyncPeriod returns the sync period the header belongs to.
+func (h *Header) SyncPeriod() uint64 {
+ return SyncPeriod(h.Slot)
+}
+
+// SyncPeriodStart returns the first slot of the given period.
+func SyncPeriodStart(period uint64) uint64 {
+ return period * params.SyncPeriodLength
+}
+
+// SyncPeriod returns the sync period that the given slot belongs to.
+func SyncPeriod(slot uint64) uint64 {
+ return slot / params.SyncPeriodLength
+}
+
+// SignedHeader represents a beacon header signed by a sync committee.
+//
+// This structure is created from either an optimistic update or an instant update:
+// - https://github.com/ethereum/consensus-specs/blob/dev/specs/altair/light-client/sync-protocol.md#lightclientoptimisticupdate
+// - https://github.com/zsfelfoldi/beacon-APIs/blob/instant_update/apis/beacon/light_client/instant_update.yaml
+type SignedHeader struct {
+ // Beacon header being signed
+ Header Header
+
+ // Sync committee BLS signature aggregate
+ Signature SyncAggregate
+
+ // Slot in which the signature has been created (newer than Header.Slot,
+ // determines the signing sync committee)
+ SignatureSlot uint64
+}
diff --git a/beacon/types/update.go b/beacon/types/update.go
new file mode 100644
index 0000000000..06c1b61792
--- /dev/null
+++ b/beacon/types/update.go
@@ -0,0 +1,118 @@
+// Copyright 2022 The go-ethereum Authors
+// This file is part of the go-ethereum library.
+//
+// The go-ethereum library is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Lesser General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// The go-ethereum library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with the go-ethereum library. If not, see .
+
+package types
+
+import (
+ "errors"
+ "fmt"
+
+ "github.com/ethereum/go-ethereum/beacon/merkle"
+ "github.com/ethereum/go-ethereum/beacon/params"
+ "github.com/ethereum/go-ethereum/common"
+)
+
+// LightClientUpdate is a proof of the next sync committee root based on a header
+// signed by the sync committee of the given period. Optionally, the update can
+// prove quasi-finality by the signed header referring to a previous, finalized
+// header from the same period, and the finalized header referring to the next
+// sync committee root.
+//
+// See data structure definition here:
+// https://github.com/ethereum/consensus-specs/blob/dev/specs/altair/light-client/sync-protocol.md#lightclientupdate
+type LightClientUpdate struct {
+ AttestedHeader SignedHeader // Arbitrary header out of the period signed by the sync committee
+ NextSyncCommitteeRoot common.Hash // Sync committee of the next period advertised in the current one
+ NextSyncCommitteeBranch merkle.Values // Proof for the next period's sync committee
+
+ FinalizedHeader *Header `rlp:"nil"` // Optional header to announce a point of finality
+ FinalityBranch merkle.Values // Proof for the announced finality
+
+ score *UpdateScore // Weight of the update to compare between competing ones
+}
+
+// Validate verifies the validity of the update.
+func (update *LightClientUpdate) Validate() error {
+ period := update.AttestedHeader.Header.SyncPeriod()
+ if SyncPeriod(update.AttestedHeader.SignatureSlot) != period {
+ return errors.New("signature slot and signed header are from different periods")
+ }
+ if update.FinalizedHeader != nil {
+ if update.FinalizedHeader.SyncPeriod() != period {
+ return errors.New("finalized header is from different period")
+ }
+ if err := merkle.VerifyProof(update.AttestedHeader.Header.StateRoot, params.StateIndexFinalBlock, update.FinalityBranch, merkle.Value(update.FinalizedHeader.Hash())); err != nil {
+ return fmt.Errorf("invalid finalized header proof: %w", err)
+ }
+ }
+ if err := merkle.VerifyProof(update.AttestedHeader.Header.StateRoot, params.StateIndexNextSyncCommittee, update.NextSyncCommitteeBranch, merkle.Value(update.NextSyncCommitteeRoot)); err != nil {
+ return fmt.Errorf("invalid next sync committee proof: %w", err)
+ }
+ return nil
+}
+
+// Score returns the UpdateScore describing the proof strength of the update
+// Note: thread safety can be ensured by always calling Score on a newly received
+// or decoded update before making it potentially available for other threads
+func (update *LightClientUpdate) Score() UpdateScore {
+ if update.score == nil {
+ update.score = &UpdateScore{
+ SignerCount: uint32(update.AttestedHeader.Signature.SignerCount()),
+ SubPeriodIndex: uint32(update.AttestedHeader.Header.Slot & 0x1fff),
+ FinalizedHeader: update.FinalizedHeader != nil,
+ }
+ }
+ return *update.score
+}
+
+// UpdateScore allows the comparison between updates at the same period in order
+// to find the best update chain that provides the strongest proof of being canonical.
+//
+// UpdateScores have a tightly packed binary encoding format for efficient p2p
+// protocol transmission. Each UpdateScore is encoded in 3 bytes.
+// When interpreted as a 24 bit little indian unsigned integer:
+// - the lowest 10 bits contain the number of signers in the header signature aggregate
+// - the next 13 bits contain the "sub-period index" which is he signed header's
+// slot modulo params.SyncPeriodLength (which is correlated with the risk of the chain being
+// re-orged before the previous period boundary in case of non-finalized updates)
+// - the highest bit is set when the update is finalized (meaning that the finality
+// header referenced by the signed header is in the same period as the signed
+// header, making reorgs before the period boundary impossible
+type UpdateScore struct {
+ SignerCount uint32 // number of signers in the header signature aggregate
+ SubPeriodIndex uint32 // signed header's slot modulo params.SyncPeriodLength
+ FinalizedHeader bool // update is considered finalized if has finalized header from the same period and 2/3 signatures
+}
+
+// finalized returns true if the update has a header signed by at least 2/3 of
+// the committee, referring to a finalized header that refers to the next sync
+// committee. This condition is a close approximation of the actual finality
+// condition that can only be verified by full beacon nodes.
+func (u *UpdateScore) finalized() bool {
+ return u.FinalizedHeader && u.SignerCount >= params.SyncCommitteeSupermajority
+}
+
+// BetterThan returns true if update u is considered better than w.
+func (u UpdateScore) BetterThan(w UpdateScore) bool {
+ var (
+ uFinalized = u.finalized()
+ wFinalized = w.finalized()
+ )
+ if uFinalized != wFinalized {
+ return uFinalized
+ }
+ return u.SignerCount > w.SignerCount
+}
diff --git a/build/checksums.txt b/build/checksums.txt
index e349d3eba0..c752fb8ccd 100644
--- a/build/checksums.txt
+++ b/build/checksums.txt
@@ -1,20 +1,30 @@
# This file contains sha256 checksums of optional build dependencies.
-4d0e2850d197b4ddad3bdb0196300179d095bb3aefd4dfbc3b36702c3728f8ab go1.20.2.src.tar.gz
-c93b8ced9517d07e1cd4c362c6e2d5242cb139e29b417a328fbf19aded08764c go1.20.2.darwin-amd64.tar.gz
-7343c87f19e79c0063532e82e1c4d6f42175a32d99f7a4d15e658e88bf97f885 go1.20.2.darwin-arm64.tar.gz
-14f9be2004e042b3a64d0facb0c020756a9084a5c7333e33b0752b393b6016ea go1.20.2.freebsd-386.tar.gz
-b41b67b4f1b56797a7cecf6ee7f47fcf4f93960b2788a3683c07dd009d30b2a4 go1.20.2.freebsd-amd64.tar.gz
-ee240ed33ae57504c41f04c12236aeaa17fbeb6ea9fcd096cd9dc7a89d10d4db go1.20.2.linux-386.tar.gz
-4eaea32f59cde4dc635fbc42161031d13e1c780b87097f4b4234cfce671f1768 go1.20.2.linux-amd64.tar.gz
-78d632915bb75e9a6356a47a42625fd1a785c83a64a643fedd8f61e31b1b3bef go1.20.2.linux-arm64.tar.gz
-d79d56bafd6b52b8d8cbe3f8e967caaac5383a23d7a4fa9ac0e89778cd16a076 go1.20.2.linux-armv6l.tar.gz
-850564ddb760cb703db63bf20182dc4407abd2ff090a95fa66d6634d172fd095 go1.20.2.linux-ppc64le.tar.gz
-8da24c5c4205fe8115f594237e5db7bcb1d23df67bc1fa9a999954b1976896e8 go1.20.2.linux-s390x.tar.gz
-31838b291117495bbb93683603e98d5118bfabd2eb318b4d07540bfd524bab86 go1.20.2.windows-386.zip
-fe439f0e438f7555a7f5f7194ddb6f4a07b0de1fa414385d19f2aeb26d9f43db go1.20.2.windows-amd64.zip
-ac5010c8b8b22849228a8dea698d58b9c7be2195d30c6d778cce0f709858fa64 go1.20.2.windows-arm64.zip
+# version:spec-tests 1.0.5
+# https://github.com/ethereum/execution-spec-tests/releases
+# https://github.com/ethereum/execution-spec-tests/releases/download/v1.0.5/
+d4fd06a0e5f94beb970f3c68374b38ef9de82d4be77517d326bcf739c3cbf3a2 fixtures_develop.tar.gz
+# version:golang 1.21.3
+# https://go.dev/dl/
+186f2b6f8c8b704e696821b09ab2041a5c1ee13dcbc3156a13adcf75931ee488 go1.21.3.src.tar.gz
+27014fc69e301d7588a169ca239b3cc609f0aa1abf38528bf0d20d3b259211eb go1.21.3.darwin-amd64.tar.gz
+65302a7a9f7a4834932b3a7a14cb8be51beddda757b567a2f9e0cbd0d7b5a6ab go1.21.3.darwin-arm64.tar.gz
+8e0cd2f66cf1bde9d07b4aee01e3d7c3cfdd14e20650488e1683da4b8492594a go1.21.3.freebsd-386.tar.gz
+6e74f65f586e93d1f3947894766f69e9b2ebda488592a09df61f36f06bfe58a8 go1.21.3.freebsd-amd64.tar.gz
+fb209fd070db500a84291c5a95251cceeb1723e8f6142de9baca5af70a927c0e go1.21.3.linux-386.tar.gz
+1241381b2843fae5a9707eec1f8fb2ef94d827990582c7c7c32f5bdfbfd420c8 go1.21.3.linux-amd64.tar.gz
+fc90fa48ae97ba6368eecb914343590bbb61b388089510d0c56c2dde52987ef3 go1.21.3.linux-arm64.tar.gz
+a1ddcaaf0821a12a800884c14cb4268ce1c1f5a0301e9060646f1e15e611c6c7 go1.21.3.linux-armv6l.tar.gz
+3b0e10a3704f164a6e85e0377728ec5fd21524fabe4c925610e34076586d5826 go1.21.3.linux-ppc64le.tar.gz
+4c78e2e6f4c684a3d5a9bdc97202729053f44eb7be188206f0627ef3e18716b6 go1.21.3.linux-s390x.tar.gz
+e36737f4f2fadb4d2f919ec4ce517133a56e06064cca6e82fc883bb000c4d56c go1.21.3.windows-386.zip
+27c8daf157493f288d42a6f38debc6a2cb391f6543139eba9152fceca0be2a10 go1.21.3.windows-amd64.zip
+bfb7a5c56f9ded07d8ae0e0b3702ac07b65e68fa8f33da24ed6df4ce01fe2c5c go1.21.3.windows-arm64.zip
+
+# version:golangci 1.51.1
+# https://github.com/golangci/golangci-lint/releases/
+# https://github.com/golangci/golangci-lint/releases/download/v1.51.1/
fba08acc4027f69f07cef48fbff70b8a7ecdfaa1c2aba9ad3fb31d60d9f5d4bc golangci-lint-1.51.1-darwin-amd64.tar.gz
75b8f0ff3a4e68147156be4161a49d4576f1be37a0b506473f8c482140c1e7f2 golangci-lint-1.51.1-darwin-arm64.tar.gz
e06b3459aaed356e1667580be00b05f41f3b2e29685d12cdee571c23e1edb414 golangci-lint-1.51.1-freebsd-386.tar.gz
@@ -43,4 +53,12 @@ bce02f7232723cb727755ee11f168a700a00896a25d37f87c4b173bce55596b4 golangci-lint-
cf6403f84707ce8c98664736772271bc8874f2e760c2fd0f00cf3e85963507e9 golangci-lint-1.51.1-windows-armv7.zip
# This is the builder on PPA that will build Go itself (inception-y), don't modify!
+#
+# This version is fine to be old and full of security holes, we just use it
+# to build the latest Go. Don't change it. If it ever becomes insufficient,
+# we need to switch over to a recursive builder to jump across supported
+# versions.
+#
+# version:ppa-builder 1.19.6
+# https://go.dev/dl/
d7f0013f82e6d7f862cc6cb5c8cdb48eef5f2e239b35baa97e2f1a7466043767 go1.19.6.src.tar.gz
diff --git a/build/ci.go b/build/ci.go
index c939f7672f..1e8b6f9d93 100644
--- a/build/ci.go
+++ b/build/ci.go
@@ -120,15 +120,15 @@ var (
// Distros for which packages are created.
// Note: vivid is unsupported because there is no golang-1.6 package for it.
// Note: the following Ubuntu releases have been officially deprecated on Launchpad:
- // wily, yakkety, zesty, artful, cosmic, disco, eoan, groovy, hirsuite, impish
+ // wily, yakkety, zesty, artful, cosmic, disco, eoan, groovy, hirsuite, impish,
+ // kinetic
debDistroGoBoots = map[string]string{
- "trusty": "golang-1.11", // EOL: 04/2024
- "xenial": "golang-go", // EOL: 04/2026
- "bionic": "golang-go", // EOL: 04/2028
- "focal": "golang-go", // EOL: 04/2030
- "jammy": "golang-go", // EOL: 04/2032
- "kinetic": "golang-go", // EOL: 07/2023
- "lunar": "golang-go", // EOL: 01/2024
+ "trusty": "golang-1.11", // EOL: 04/2024
+ "xenial": "golang-go", // EOL: 04/2026
+ "bionic": "golang-go", // EOL: 04/2028
+ "focal": "golang-go", // EOL: 04/2030
+ "jammy": "golang-go", // EOL: 04/2032
+ "lunar": "golang-go", // EOL: 01/2024
}
debGoBootPaths = map[string]string{
@@ -136,18 +136,8 @@ var (
"golang-go": "/usr/lib/go",
}
- // This is the version of Go that will be downloaded by
- //
- // go run ci.go install -dlgo
- dlgoVersion = "1.20.2"
-
- // This is the version of Go that will be used to bootstrap the PPA builder.
- //
- // This version is fine to be old and full of security holes, we just use it
- // to build the latest Go. Don't change it. If it ever becomes insufficient,
- // we need to switch over to a recursive builder to jumpt across supported
- // versions.
- gobootVersion = "1.19.6"
+ // This is where the tests should be unpacked.
+ executionSpecTestsDir = "tests/spec-tests"
)
var GOBIN, _ = filepath.Abs(filepath.Join("build", "bin"))
@@ -185,6 +175,8 @@ func main() {
doWindowsInstaller(os.Args[2:])
case "purge":
doPurge(os.Args[2:])
+ case "sanitycheck":
+ doSanityCheck()
default:
log.Fatal("unknown command ", os.Args[1])
}
@@ -200,19 +192,23 @@ func doInstall(cmdline []string) {
staticlink = flag.Bool("static", false, "Create statically-linked executable")
)
flag.CommandLine.Parse(cmdline)
+ env := build.Env()
// Configure the toolchain.
tc := build.GoToolchain{GOARCH: *arch, CC: *cc}
if *dlgo {
csdb := build.MustLoadChecksums("build/checksums.txt")
- tc.Root = build.DownloadGo(csdb, dlgoVersion)
+ tc.Root = build.DownloadGo(csdb)
}
-
// Disable CLI markdown doc generation in release builds.
buildTags := []string{"urfave_cli_no_docs"}
+ // Enable linking the CKZG library since we can make it work with additional flags.
+ if env.UbuntuVersion != "trusty" {
+ buildTags = append(buildTags, "ckzg")
+ }
+
// Configure the build.
- env := build.Env()
gobuild := tc.Go("build", buildFlags(env, *staticlink, buildTags)...)
// arm64 CI builders are memory-constrained and can't handle concurrent builds,
@@ -221,7 +217,6 @@ func doInstall(cmdline []string) {
if env.CI && runtime.GOARCH == "arm64" {
gobuild.Args = append(gobuild.Args, "-p", "1")
}
-
// We use -trimpath to avoid leaking local paths into the built executables.
gobuild.Args = append(gobuild.Args, "-trimpath")
@@ -252,6 +247,9 @@ func buildFlags(env build.Environment, staticLinking bool, buildTags []string) (
ld = append(ld, "-X", "github.com/ethereum/go-ethereum/internal/version.gitCommit="+env.Commit)
ld = append(ld, "-X", "github.com/ethereum/go-ethereum/internal/version.gitDate="+env.Date)
}
+ if env.Tag != "" {
+ ld = append(ld, "-X", "github.com/ethereum/go-ethereum/params.gitTag="+env.Tag)
+ }
// Strip DWARF on darwin. This used to be required for certain things,
// and there is no downside to this, so we just keep doing it.
if runtime.GOOS == "darwin" {
@@ -290,17 +288,27 @@ func doTest(cmdline []string) {
coverage = flag.Bool("coverage", false, "Whether to record code coverage")
verbose = flag.Bool("v", false, "Whether to log verbosely")
race = flag.Bool("race", false, "Execute the race detector")
+ cachedir = flag.String("cachedir", "./build/cache", "directory for caching downloads")
)
flag.CommandLine.Parse(cmdline)
+ // Get test fixtures.
+ csdb := build.MustLoadChecksums("build/checksums.txt")
+ downloadSpecTestFixtures(csdb, *cachedir)
+
// Configure the toolchain.
tc := build.GoToolchain{GOARCH: *arch, CC: *cc}
if *dlgo {
- csdb := build.MustLoadChecksums("build/checksums.txt")
- tc.Root = build.DownloadGo(csdb, dlgoVersion)
+ tc.Root = build.DownloadGo(csdb)
}
gotest := tc.Go("test")
+ // CI needs a bit more time for the statetests (default 10m).
+ gotest.Args = append(gotest.Args, "-timeout=20m")
+
+ // Enable CKZG backend in CI.
+ gotest.Args = append(gotest.Args, "-tags=ckzg")
+
// Test a single package at a time. CI builders are slow
// and some tests run into timeouts under load.
gotest.Args = append(gotest.Args, "-p", "1")
@@ -322,6 +330,25 @@ func doTest(cmdline []string) {
build.MustRun(gotest)
}
+// downloadSpecTestFixtures downloads and extracts the execution-spec-tests fixtures.
+func downloadSpecTestFixtures(csdb *build.ChecksumDB, cachedir string) string {
+ executionSpecTestsVersion, err := build.Version(csdb, "spec-tests")
+ if err != nil {
+ log.Fatal(err)
+ }
+ ext := ".tar.gz"
+ base := "fixtures_develop" // TODO(MariusVanDerWijden) rename once the version becomes part of the filename
+ url := fmt.Sprintf("https://github.com/ethereum/execution-spec-tests/releases/download/v%s/%s%s", executionSpecTestsVersion, base, ext)
+ archivePath := filepath.Join(cachedir, base+ext)
+ if err := csdb.DownloadFile(url, archivePath); err != nil {
+ log.Fatal(err)
+ }
+ if err := build.ExtractArchive(archivePath, executionSpecTestsDir); err != nil {
+ log.Fatal(err)
+ }
+ return filepath.Join(cachedir, base)
+}
+
// doLint runs golangci-lint on requested packages.
func doLint(cmdline []string) {
var (
@@ -341,9 +368,11 @@ func doLint(cmdline []string) {
// downloadLinter downloads and unpacks golangci-lint.
func downloadLinter(cachedir string) string {
- const version = "1.51.1"
-
csdb := build.MustLoadChecksums("build/checksums.txt")
+ version, err := build.Version(csdb, "golangci")
+ if err != nil {
+ log.Fatal(err)
+ }
arch := runtime.GOARCH
ext := ".tar.gz"
@@ -465,10 +494,6 @@ func maybeSkipArchive(env build.Environment) {
log.Printf("skipping archive creation because this is a PR build")
os.Exit(0)
}
- if env.IsCronJob {
- log.Printf("skipping archive creation because this is a cron job")
- os.Exit(0)
- }
if env.Branch != "master" && !strings.HasPrefix(env.Tag, "v1.") {
log.Printf("skipping archive creation because branch %q, tag %q is not on the inclusion list", env.Branch, env.Tag)
os.Exit(0)
@@ -729,6 +754,10 @@ func doDebianSource(cmdline []string) {
// to bootstrap the builder Go.
func downloadGoBootstrapSources(cachedir string) string {
csdb := build.MustLoadChecksums("build/checksums.txt")
+ gobootVersion, err := build.Version(csdb, "ppa-builder")
+ if err != nil {
+ log.Fatal(err)
+ }
file := fmt.Sprintf("go%s.src.tar.gz", gobootVersion)
url := "https://dl.google.com/go/" + file
dst := filepath.Join(cachedir, file)
@@ -741,6 +770,10 @@ func downloadGoBootstrapSources(cachedir string) string {
// downloadGoSources downloads the Go source tarball.
func downloadGoSources(cachedir string) string {
csdb := build.MustLoadChecksums("build/checksums.txt")
+ dlgoVersion, err := build.Version(csdb, "golang")
+ if err != nil {
+ log.Fatal(err)
+ }
file := fmt.Sprintf("go%s.src.tar.gz", dlgoVersion)
url := "https://dl.google.com/go/" + file
dst := filepath.Join(cachedir, file)
@@ -1067,3 +1100,7 @@ func doPurge(cmdline []string) {
log.Fatal(err)
}
}
+
+func doSanityCheck() {
+ build.DownloadAndVerifyChecksums(build.MustLoadChecksums("build/checksums.txt"))
+}
diff --git a/build/deb/ethereum/deb.rules b/build/deb/ethereum/deb.rules
index 475e628b2f..daca793e55 100644
--- a/build/deb/ethereum/deb.rules
+++ b/build/deb/ethereum/deb.rules
@@ -28,7 +28,7 @@ override_dh_auto_build:
mv .mod $(GOPATH)/pkg/mod
# A fresh Go was built, all dependency downloads faked, hope build works now
- ../.go/bin/go run build/ci.go install -git-commit={{.Env.Commit}} -git-branch={{.Env.Branch}} -git-tag={{.Env.Tag}} -buildnum={{.Env.Buildnum}} -pull-request={{.Env.IsPullRequest}}
+ ../.go/bin/go run build/ci.go install -git-commit={{.Env.Commit}} -git-branch={{.Env.Branch}} -git-tag={{.Env.Tag}} -buildnum={{.Env.Buildnum}} -pull-request={{.Env.IsPullRequest}} -ubuntu {{.Distro}}
override_dh_auto_test:
diff --git a/build/update-license.go b/build/update-license.go
index f61536470a..52a54bf66a 100644
--- a/build/update-license.go
+++ b/build/update-license.go
@@ -46,12 +46,13 @@ import (
"path/filepath"
"regexp"
"runtime"
- "sort"
"strconv"
"strings"
"sync"
"text/template"
"time"
+
+ "golang.org/x/exp/slices"
)
var (
@@ -152,13 +153,6 @@ func (i info) gpl() bool {
return false
}
-// authors implements the sort.Interface for strings in case-insensitive mode.
-type authors []string
-
-func (as authors) Len() int { return len(as) }
-func (as authors) Less(i, j int) bool { return strings.ToLower(as[i]) < strings.ToLower(as[j]) }
-func (as authors) Swap(i, j int) { as[i], as[j] = as[j], as[i] }
-
func main() {
var (
files = getFiles()
@@ -299,7 +293,9 @@ func writeAuthors(files []string) {
}
}
// Write sorted list of authors back to the file.
- sort.Sort(authors(list))
+ slices.SortFunc(list, func(a, b string) bool {
+ return strings.ToLower(a) < strings.ToLower(b)
+ })
content := new(bytes.Buffer)
content.WriteString(authorsFileHeader)
for _, a := range list {
diff --git a/cmd/bootnode/main.go b/cmd/bootnode/main.go
index 748113aa48..5c1635de39 100644
--- a/cmd/bootnode/main.go
+++ b/cmd/bootnode/main.go
@@ -23,6 +23,7 @@ import (
"fmt"
"net"
"os"
+ "time"
"github.com/ethereum/go-ethereum/cmd/utils"
"github.com/ethereum/go-ethereum/crypto"
@@ -107,21 +108,20 @@ func main() {
if err != nil {
utils.Fatalf("-ListenUDP: %v", err)
}
+ defer conn.Close()
- realaddr := conn.LocalAddr().(*net.UDPAddr)
- if natm != nil {
- if !realaddr.IP.IsLoopback() {
- go nat.Map(natm, nil, "udp", realaddr.Port, realaddr.Port, "ethereum discovery")
- }
- if ext, err := natm.ExternalIP(); err == nil {
- realaddr = &net.UDPAddr{IP: ext, Port: realaddr.Port}
+ db, _ := enode.OpenDB("")
+ ln := enode.NewLocalNode(db, nodeKey)
+
+ listenerAddr := conn.LocalAddr().(*net.UDPAddr)
+ if natm != nil && !listenerAddr.IP.IsLoopback() {
+ natAddr := doPortMapping(natm, ln, listenerAddr)
+ if natAddr != nil {
+ listenerAddr = natAddr
}
}
- printNotice(&nodeKey.PublicKey, *realaddr)
-
- db, _ := enode.OpenDB("")
- ln := enode.NewLocalNode(db, nodeKey)
+ printNotice(&nodeKey.PublicKey, *listenerAddr)
cfg := discover.Config{
PrivateKey: nodeKey,
NetRestrict: restrictList,
@@ -148,3 +148,61 @@ func printNotice(nodeKey *ecdsa.PublicKey, addr net.UDPAddr) {
fmt.Println("Note: you're using cmd/bootnode, a developer tool.")
fmt.Println("We recommend using a regular node as bootstrap node for production deployments.")
}
+
+func doPortMapping(natm nat.Interface, ln *enode.LocalNode, addr *net.UDPAddr) *net.UDPAddr {
+ const (
+ protocol = "udp"
+ name = "ethereum discovery"
+ )
+ newLogger := func(external int, internal int) log.Logger {
+ return log.New("proto", protocol, "extport", external, "intport", internal, "interface", natm)
+ }
+
+ var (
+ intport = addr.Port
+ extaddr = &net.UDPAddr{IP: addr.IP, Port: addr.Port}
+ mapTimeout = nat.DefaultMapTimeout
+ log = newLogger(addr.Port, intport)
+ )
+ addMapping := func() {
+ // Get the external address.
+ var err error
+ extaddr.IP, err = natm.ExternalIP()
+ if err != nil {
+ log.Debug("Couldn't get external IP", "err", err)
+ return
+ }
+ // Create the mapping.
+ p, err := natm.AddMapping(protocol, extaddr.Port, intport, name, mapTimeout)
+ if err != nil {
+ log.Debug("Couldn't add port mapping", "err", err)
+ return
+ }
+ if p != uint16(extaddr.Port) {
+ extaddr.Port = int(p)
+ log = newLogger(extaddr.Port, intport)
+ log.Info("NAT mapped alternative port")
+ } else {
+ log.Info("NAT mapped port")
+ }
+ // Update IP/port information of the local node.
+ ln.SetStaticIP(extaddr.IP)
+ ln.SetFallbackUDP(extaddr.Port)
+ }
+
+ // Perform mapping once, synchronously.
+ log.Info("Attempting port mapping")
+ addMapping()
+
+ // Refresh the mapping periodically.
+ go func() {
+ refresh := time.NewTimer(mapTimeout)
+ defer refresh.Stop()
+ for range refresh.C {
+ addMapping()
+ refresh.Reset(mapTimeout)
+ }
+ }()
+
+ return extaddr
+}
diff --git a/cmd/checkpoint-admin/README.md b/cmd/checkpoint-admin/README.md
deleted file mode 100644
index 1067ead056..0000000000
--- a/cmd/checkpoint-admin/README.md
+++ /dev/null
@@ -1,103 +0,0 @@
-## Checkpoint-admin
-
-Checkpoint-admin is a tool for updating checkpoint oracle status. It provides a series of functions including deploying checkpoint oracle contract, signing for new checkpoints, and updating checkpoints in the checkpoint oracle contract.
-
-### Checkpoint
-
-In the LES protocol, there is an important concept called checkpoint. In simple terms, whenever a certain number of blocks are generated on the blockchain, a new checkpoint is generated which contains some important information such as
-
-* Block hash at checkpoint
-* Canonical hash trie root at checkpoint
-* Bloom trie root at checkpoint
-
-*For a more detailed introduction to checkpoint, please see the LES [spec](https://github.com/ethereum/devp2p/blob/master/caps/les.md).*
-
-Using this information, light clients can skip all historical block headers when synchronizing data and start synchronization from this checkpoint. Therefore, as long as the light client can obtain some latest and correct checkpoints, the amount of data and time for synchronization will be greatly reduced.
-
-However, from a security perspective, the most critical step in a synchronization algorithm based on checkpoints is to determine whether the checkpoint used by the light client is correct. Otherwise, all blockchain data synchronized based on this checkpoint may be wrong. For this we provide two different ways to ensure the correctness of the checkpoint used by the light client.
-
-#### Hardcoded checkpoint
-
-There are several hardcoded checkpoints in the [source code](https://github.com/ethereum/go-ethereum/blob/master/params/config.go#L38) of the go-ethereum project. These checkpoints are updated by go-ethereum developers when new versions of software are released. Because light client users trust Geth developers to some extent, hardcoded checkpoints in the code can also be considered correct.
-
-#### Checkpoint oracle
-
-Hardcoded checkpoints can solve the problem of verifying the correctness of checkpoints (although this is a more centralized solution). But the pain point of this solution is that developers can only update checkpoints when a new version of software is released. In addition, light client users usually do not keep the Geth version they use always up to date. So hardcoded checkpoints used by users are generally stale. Therefore, it still needs to download a large amount of blockchain data during synchronization.
-
-Checkpoint oracle is a more flexible solution. In simple terms, this is a smart contract that is deployed on the blockchain. The smart contract records several designated trusted signers. Whenever enough trusted signers have issued their signatures for the same checkpoint, it can be considered that the checkpoint has been authenticated by the signers. Checkpoints authenticated by trusted signers can be considered correct.
-
-So this way, even without updating the software version, as long as the trusted signers regularly update the checkpoint in oracle on time, the light client can always use the latest and verified checkpoint for data synchronization.
-
-### Usage
-
-Checkpoint-admin is a command line tool designed for checkpoint oracle. Users can easily deploy contracts and update checkpoints through this tool.
-
-#### Install
-
-```shell
-go get github.com/ethereum/go-ethereum/cmd/checkpoint-admin
-```
-
-#### Deploy
-
-Deploy checkpoint oracle contract. `--signers` indicates the specified trusted signer, and `--threshold` indicates the minimum number of signatures required by trusted signers to update a checkpoint.
-
-```shell
-checkpoint-admin deploy --rpc --clef --signer --signers --threshold 1
-```
-
-It is worth noting that checkpoint-admin only supports clef as a signer for transactions and plain text(checkpoint). For more clef usage, please see the clef [tutorial](https://geth.ethereum.org/docs/tools/clef/tutorial) .
-
-#### Sign
-
-Checkpoint-admin provides two different modes of signing. You can automatically obtain the current stable checkpoint and sign it interactively, and you can also use the information provided by the command line flags to sign checkpoint offline.
-
-**Interactive mode**
-
-```shell
-checkpoint-admin sign --clef --signer --rpc
-```
-
-*It is worth noting that the connected Geth node can be a fullnode or a light client. If it is fullnode, you must enable the LES protocol. E.G. add `--light.serv 50` to the startup command line flags*.
-
-**Offline mode**
-
-```shell
-checkpoint-admin sign --clef --signer --index --hash --oracle
-```
-
-*CHECKPOINT_HASH is obtained based on this [calculation method](https://github.com/ethereum/go-ethereum/blob/master/params/config.go#L251).*
-
-#### Publish
-
-Collect enough signatures from different trusted signers for the same checkpoint and submit them to oracle to update the "authenticated" checkpoint in the contract.
-
-```shell
-checkpoint-admin publish --clef --rpc --signer --index --signatures
-```
-
-#### Status query
-
-Check the latest status of checkpoint oracle.
-
-```shell
-checkpoint-admin status --rpc
-```
-
-### Enable checkpoint oracle in your private network
-
-Currently, only the Ethereum mainnet and the default supported test networks (rinkeby, goerli) activate this feature. If you want to activate this feature in your private network, you can overwrite the relevant checkpoint oracle settings through the configuration file after deploying the oracle contract.
-
-* Get your node configuration file `geth dumpconfig OTHER_COMMAND_LINE_OPTIONS > config.toml`
-* Edit the configuration file and add the following information
-
-```toml
-[Eth.CheckpointOracle]
-Address = CHECKPOINT_ORACLE_ADDRESS
-Signers = [TRUSTED_SIGNER_1, ..., TRUSTED_SIGNER_N]
-Threshold = THRESHOLD
-```
-
-* Start geth with the modified configuration file
-
-*In the private network, all fullnodes and light clients need to be started using the same checkpoint oracle settings.*
\ No newline at end of file
diff --git a/cmd/checkpoint-admin/common.go b/cmd/checkpoint-admin/common.go
deleted file mode 100644
index f86ac24f06..0000000000
--- a/cmd/checkpoint-admin/common.go
+++ /dev/null
@@ -1,120 +0,0 @@
-// Copyright 2019 The go-ethereum Authors
-// This file is part of go-ethereum.
-//
-// go-ethereum is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// go-ethereum is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with go-ethereum. If not, see .
-
-package main
-
-import (
- "strconv"
-
- "github.com/ethereum/go-ethereum/accounts"
- "github.com/ethereum/go-ethereum/accounts/abi/bind"
- "github.com/ethereum/go-ethereum/accounts/external"
- "github.com/ethereum/go-ethereum/cmd/utils"
- "github.com/ethereum/go-ethereum/common"
- "github.com/ethereum/go-ethereum/contracts/checkpointoracle"
- "github.com/ethereum/go-ethereum/ethclient"
- "github.com/ethereum/go-ethereum/params"
- "github.com/ethereum/go-ethereum/rpc"
- "github.com/urfave/cli/v2"
-)
-
-// newClient creates a client with specified remote URL.
-func newClient(ctx *cli.Context) *ethclient.Client {
- client, err := ethclient.Dial(ctx.String(nodeURLFlag.Name))
- if err != nil {
- utils.Fatalf("Failed to connect to Ethereum node: %v", err)
- }
- return client
-}
-
-// newRPCClient creates a rpc client with specified node URL.
-func newRPCClient(url string) *rpc.Client {
- client, err := rpc.Dial(url)
- if err != nil {
- utils.Fatalf("Failed to connect to Ethereum node: %v", err)
- }
- return client
-}
-
-// getContractAddr retrieves the register contract address through
-// rpc request.
-func getContractAddr(client *rpc.Client) common.Address {
- var addr string
- if err := client.Call(&addr, "les_getCheckpointContractAddress"); err != nil {
- utils.Fatalf("Failed to fetch checkpoint oracle address: %v", err)
- }
- return common.HexToAddress(addr)
-}
-
-// getCheckpoint retrieves the specified checkpoint or the latest one
-// through rpc request.
-func getCheckpoint(ctx *cli.Context, client *rpc.Client) *params.TrustedCheckpoint {
- var checkpoint *params.TrustedCheckpoint
-
- if ctx.IsSet(indexFlag.Name) {
- var result [3]string
- index := uint64(ctx.Int64(indexFlag.Name))
- if err := client.Call(&result, "les_getCheckpoint", index); err != nil {
- utils.Fatalf("Failed to get local checkpoint %v, please ensure the les API is exposed", err)
- }
- checkpoint = ¶ms.TrustedCheckpoint{
- SectionIndex: index,
- SectionHead: common.HexToHash(result[0]),
- CHTRoot: common.HexToHash(result[1]),
- BloomRoot: common.HexToHash(result[2]),
- }
- } else {
- var result [4]string
- err := client.Call(&result, "les_latestCheckpoint")
- if err != nil {
- utils.Fatalf("Failed to get local checkpoint %v, please ensure the les API is exposed", err)
- }
- index, err := strconv.ParseUint(result[0], 0, 64)
- if err != nil {
- utils.Fatalf("Failed to parse checkpoint index %v", err)
- }
- checkpoint = ¶ms.TrustedCheckpoint{
- SectionIndex: index,
- SectionHead: common.HexToHash(result[1]),
- CHTRoot: common.HexToHash(result[2]),
- BloomRoot: common.HexToHash(result[3]),
- }
- }
- return checkpoint
-}
-
-// newContract creates a registrar contract instance with specified
-// contract address or the default contracts for mainnet or testnet.
-func newContract(client *rpc.Client) (common.Address, *checkpointoracle.CheckpointOracle) {
- addr := getContractAddr(client)
- if addr == (common.Address{}) {
- utils.Fatalf("No specified registrar contract address")
- }
- contract, err := checkpointoracle.NewCheckpointOracle(addr, ethclient.NewClient(client))
- if err != nil {
- utils.Fatalf("Failed to setup registrar contract %s: %v", addr, err)
- }
- return addr, contract
-}
-
-// newClefSigner sets up a clef backend and returns a clef transaction signer.
-func newClefSigner(ctx *cli.Context) *bind.TransactOpts {
- clef, err := external.NewExternalSigner(ctx.String(clefURLFlag.Name))
- if err != nil {
- utils.Fatalf("Failed to create clef signer %v", err)
- }
- return bind.NewClefTransactor(clef, accounts.Account{Address: common.HexToAddress(ctx.String(signerFlag.Name))})
-}
diff --git a/cmd/checkpoint-admin/exec.go b/cmd/checkpoint-admin/exec.go
deleted file mode 100644
index cb67d0306d..0000000000
--- a/cmd/checkpoint-admin/exec.go
+++ /dev/null
@@ -1,311 +0,0 @@
-// Copyright 2019 The go-ethereum Authors
-// This file is part of go-ethereum.
-//
-// go-ethereum is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// go-ethereum is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with go-ethereum. If not, see .
-
-package main
-
-import (
- "bytes"
- "context"
- "encoding/binary"
- "fmt"
- "math/big"
- "strings"
- "time"
-
- "github.com/ethereum/go-ethereum/accounts"
- "github.com/ethereum/go-ethereum/cmd/utils"
- "github.com/ethereum/go-ethereum/common"
- "github.com/ethereum/go-ethereum/common/hexutil"
- "github.com/ethereum/go-ethereum/contracts/checkpointoracle"
- "github.com/ethereum/go-ethereum/contracts/checkpointoracle/contract"
- "github.com/ethereum/go-ethereum/crypto"
- "github.com/ethereum/go-ethereum/ethclient"
- "github.com/ethereum/go-ethereum/log"
- "github.com/ethereum/go-ethereum/params"
- "github.com/ethereum/go-ethereum/rpc"
- "github.com/urfave/cli/v2"
-)
-
-var commandDeploy = &cli.Command{
- Name: "deploy",
- Usage: "Deploy a new checkpoint oracle contract",
- Flags: []cli.Flag{
- nodeURLFlag,
- clefURLFlag,
- signerFlag,
- signersFlag,
- thresholdFlag,
- },
- Action: deploy,
-}
-
-var commandSign = &cli.Command{
- Name: "sign",
- Usage: "Sign the checkpoint with the specified key",
- Flags: []cli.Flag{
- nodeURLFlag,
- clefURLFlag,
- signerFlag,
- indexFlag,
- hashFlag,
- oracleFlag,
- },
- Action: sign,
-}
-
-var commandPublish = &cli.Command{
- Name: "publish",
- Usage: "Publish a checkpoint into the oracle",
- Flags: []cli.Flag{
- nodeURLFlag,
- clefURLFlag,
- signerFlag,
- indexFlag,
- signaturesFlag,
- },
- Action: publish,
-}
-
-// deploy deploys the checkpoint registrar contract.
-//
-// Note the network where the contract is deployed depends on
-// the network where the connected node is located.
-func deploy(ctx *cli.Context) error {
- // Gather all the addresses that should be permitted to sign
- var addrs []common.Address
- for _, account := range strings.Split(ctx.String(signersFlag.Name), ",") {
- if trimmed := strings.TrimSpace(account); !common.IsHexAddress(trimmed) {
- utils.Fatalf("Invalid account in --signers: '%s'", trimmed)
- }
- addrs = append(addrs, common.HexToAddress(account))
- }
- // Retrieve and validate the signing threshold
- needed := ctx.Int(thresholdFlag.Name)
- if needed == 0 || needed > len(addrs) {
- utils.Fatalf("Invalid signature threshold %d", needed)
- }
- // Print a summary to ensure the user understands what they're signing
- fmt.Printf("Deploying new checkpoint oracle:\n\n")
- for i, addr := range addrs {
- fmt.Printf("Admin %d => %s\n", i+1, addr.Hex())
- }
- fmt.Printf("\nSignatures needed to publish: %d\n", needed)
-
- // setup clef signer, create an abigen transactor and an RPC client
- transactor, client := newClefSigner(ctx), newClient(ctx)
-
- // Deploy the checkpoint oracle
- fmt.Println("Sending deploy request to Clef...")
- oracle, tx, _, err := contract.DeployCheckpointOracle(transactor, client, addrs, big.NewInt(int64(params.CheckpointFrequency)),
- big.NewInt(int64(params.CheckpointProcessConfirmations)), big.NewInt(int64(needed)))
- if err != nil {
- utils.Fatalf("Failed to deploy checkpoint oracle %v", err)
- }
- log.Info("Deployed checkpoint oracle", "address", oracle, "tx", tx.Hash().Hex())
-
- return nil
-}
-
-// sign creates the signature for specific checkpoint
-// with local key. Only contract admins have the permission to
-// sign checkpoint.
-func sign(ctx *cli.Context) error {
- var (
- offline bool // The indicator whether we sign checkpoint by offline.
- chash common.Hash
- cindex uint64
- address common.Address
-
- node *rpc.Client
- oracle *checkpointoracle.CheckpointOracle
- )
- if !ctx.IsSet(nodeURLFlag.Name) {
- // Offline mode signing
- offline = true
- if !ctx.IsSet(hashFlag.Name) {
- utils.Fatalf("Please specify the checkpoint hash (--hash) to sign in offline mode")
- }
- chash = common.HexToHash(ctx.String(hashFlag.Name))
-
- if !ctx.IsSet(indexFlag.Name) {
- utils.Fatalf("Please specify checkpoint index (--index) to sign in offline mode")
- }
- cindex = ctx.Uint64(indexFlag.Name)
-
- if !ctx.IsSet(oracleFlag.Name) {
- utils.Fatalf("Please specify oracle address (--oracle) to sign in offline mode")
- }
- address = common.HexToAddress(ctx.String(oracleFlag.Name))
- } else {
- // Interactive mode signing, retrieve the data from the remote node
- node = newRPCClient(ctx.String(nodeURLFlag.Name))
-
- checkpoint := getCheckpoint(ctx, node)
- chash, cindex, address = checkpoint.Hash(), checkpoint.SectionIndex, getContractAddr(node)
-
- // Check the validity of checkpoint
- reqCtx, cancelFn := context.WithTimeout(context.Background(), 10*time.Second)
- defer cancelFn()
-
- head, err := ethclient.NewClient(node).HeaderByNumber(reqCtx, nil)
- if err != nil {
- return err
- }
- num := head.Number.Uint64()
- if num < ((cindex+1)*params.CheckpointFrequency + params.CheckpointProcessConfirmations) {
- utils.Fatalf("Invalid future checkpoint")
- }
- _, oracle = newContract(node)
- latest, _, h, err := oracle.Contract().GetLatestCheckpoint(nil)
- if err != nil {
- return err
- }
- if cindex < latest {
- utils.Fatalf("Checkpoint is too old")
- }
- if cindex == latest && (latest != 0 || h.Uint64() != 0) {
- utils.Fatalf("Stale checkpoint, latest registered %d, given %d", latest, cindex)
- }
- }
- var (
- signature string
- signer string
- )
- // isAdmin checks whether the specified signer is admin.
- isAdmin := func(addr common.Address) error {
- signers, err := oracle.Contract().GetAllAdmin(nil)
- if err != nil {
- return err
- }
- for _, s := range signers {
- if s == addr {
- return nil
- }
- }
- return fmt.Errorf("signer %v is not the admin", addr.Hex())
- }
- // Print to the user the data thy are about to sign
- fmt.Printf("Oracle => %s\n", address.Hex())
- fmt.Printf("Index %4d => %s\n", cindex, chash.Hex())
-
- // Sign checkpoint in clef mode.
- signer = ctx.String(signerFlag.Name)
-
- if !offline {
- if err := isAdmin(common.HexToAddress(signer)); err != nil {
- return err
- }
- }
- clef := newRPCClient(ctx.String(clefURLFlag.Name))
- p := make(map[string]string)
- buf := make([]byte, 8)
- binary.BigEndian.PutUint64(buf, cindex)
- p["address"] = address.Hex()
- p["message"] = hexutil.Encode(append(buf, chash.Bytes()...))
-
- fmt.Println("Sending signing request to Clef...")
- if err := clef.Call(&signature, "account_signData", accounts.MimetypeDataWithValidator, signer, p); err != nil {
- utils.Fatalf("Failed to sign checkpoint, err %v", err)
- }
- fmt.Printf("Signer => %s\n", signer)
- fmt.Printf("Signature => %s\n", signature)
- return nil
-}
-
-// sighash calculates the hash of the data to sign for the checkpoint oracle.
-func sighash(index uint64, oracle common.Address, hash common.Hash) []byte {
- buf := make([]byte, 8)
- binary.BigEndian.PutUint64(buf, index)
-
- data := append([]byte{0x19, 0x00}, append(oracle[:], append(buf, hash[:]...)...)...)
- return crypto.Keccak256(data)
-}
-
-// ecrecover calculates the sender address from a sighash and signature combo.
-func ecrecover(sighash []byte, sig []byte) common.Address {
- sig[64] -= 27
- defer func() { sig[64] += 27 }()
-
- signer, err := crypto.SigToPub(sighash, sig)
- if err != nil {
- utils.Fatalf("Failed to recover sender from signature %x: %v", sig, err)
- }
- return crypto.PubkeyToAddress(*signer)
-}
-
-// publish registers the specified checkpoint which generated by connected node
-// with a authorised private key.
-func publish(ctx *cli.Context) error {
- // Print the checkpoint oracle's current status to make sure we're interacting
- // with the correct network and contract.
- status(ctx)
-
- // Gather the signatures from the CLI
- var sigs [][]byte
- for _, sig := range strings.Split(ctx.String(signaturesFlag.Name), ",") {
- trimmed := strings.TrimPrefix(strings.TrimSpace(sig), "0x")
- if len(trimmed) != 130 {
- utils.Fatalf("Invalid signature in --signature: '%s'", trimmed)
- } else {
- sigs = append(sigs, common.Hex2Bytes(trimmed))
- }
- }
- // Retrieve the checkpoint we want to sign to sort the signatures
- var (
- client = newRPCClient(ctx.String(nodeURLFlag.Name))
- addr, oracle = newContract(client)
- checkpoint = getCheckpoint(ctx, client)
- sighash = sighash(checkpoint.SectionIndex, addr, checkpoint.Hash())
- )
- for i := 0; i < len(sigs); i++ {
- for j := i + 1; j < len(sigs); j++ {
- signerA := ecrecover(sighash, sigs[i])
- signerB := ecrecover(sighash, sigs[j])
- if bytes.Compare(signerA.Bytes(), signerB.Bytes()) > 0 {
- sigs[i], sigs[j] = sigs[j], sigs[i]
- }
- }
- }
- // Retrieve recent header info to protect replay attack
- reqCtx, cancelFn := context.WithTimeout(context.Background(), 10*time.Second)
- defer cancelFn()
-
- head, err := ethclient.NewClient(client).HeaderByNumber(reqCtx, nil)
- if err != nil {
- return err
- }
- num := head.Number.Uint64()
- recent, err := ethclient.NewClient(client).HeaderByNumber(reqCtx, big.NewInt(int64(num-128)))
- if err != nil {
- return err
- }
- // Print a summary of the operation that's going to be performed
- fmt.Printf("Publishing %d => %s:\n\n", checkpoint.SectionIndex, checkpoint.Hash().Hex())
- for i, sig := range sigs {
- fmt.Printf("Signer %d => %s\n", i+1, ecrecover(sighash, sig).Hex())
- }
- fmt.Println()
- fmt.Printf("Sentry number => %d\nSentry hash => %s\n", recent.Number, recent.Hash().Hex())
-
- // Publish the checkpoint into the oracle
- fmt.Println("Sending publish request to Clef...")
- tx, err := oracle.RegisterCheckpoint(newClefSigner(ctx), checkpoint.SectionIndex, checkpoint.Hash().Bytes(), recent.Number, recent.Hash(), sigs)
- if err != nil {
- utils.Fatalf("Register contract failed %v", err)
- }
- log.Info("Successfully registered checkpoint", "tx", tx.Hash().Hex())
- return nil
-}
diff --git a/cmd/checkpoint-admin/main.go b/cmd/checkpoint-admin/main.go
deleted file mode 100644
index ca0bae7375..0000000000
--- a/cmd/checkpoint-admin/main.go
+++ /dev/null
@@ -1,96 +0,0 @@
-// Copyright 2019 The go-ethereum Authors
-// This file is part of go-ethereum.
-//
-// go-ethereum is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// go-ethereum is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with go-ethereum. If not, see .
-
-// checkpoint-admin is a utility that can be used to query checkpoint information
-// and register stable checkpoints into an oracle contract.
-package main
-
-import (
- "fmt"
- "os"
-
- "github.com/ethereum/go-ethereum/common/fdlimit"
- "github.com/ethereum/go-ethereum/internal/flags"
- "github.com/ethereum/go-ethereum/log"
- "github.com/urfave/cli/v2"
-)
-
-var app = flags.NewApp("ethereum checkpoint helper tool")
-
-func init() {
- app.Commands = []*cli.Command{
- commandStatus,
- commandDeploy,
- commandSign,
- commandPublish,
- }
- app.Flags = []cli.Flag{
- oracleFlag,
- nodeURLFlag,
- }
-}
-
-// Commonly used command line flags.
-var (
- indexFlag = &cli.Int64Flag{
- Name: "index",
- Usage: "Checkpoint index (query latest from remote node if not specified)",
- }
- hashFlag = &cli.StringFlag{
- Name: "hash",
- Usage: "Checkpoint hash (query latest from remote node if not specified)",
- }
- oracleFlag = &cli.StringFlag{
- Name: "oracle",
- Usage: "Checkpoint oracle address (query from remote node if not specified)",
- }
- thresholdFlag = &cli.Int64Flag{
- Name: "threshold",
- Usage: "Minimal number of signatures required to approve a checkpoint",
- }
- nodeURLFlag = &cli.StringFlag{
- Name: "rpc",
- Value: "http://localhost:8545",
- Usage: "The rpc endpoint of a local or remote geth node",
- }
- clefURLFlag = &cli.StringFlag{
- Name: "clef",
- Value: "http://localhost:8550",
- Usage: "The rpc endpoint of clef",
- }
- signerFlag = &cli.StringFlag{
- Name: "signer",
- Usage: "Signer address for clef signing",
- }
- signersFlag = &cli.StringFlag{
- Name: "signers",
- Usage: "Comma separated accounts of trusted checkpoint signers",
- }
- signaturesFlag = &cli.StringFlag{
- Name: "signatures",
- Usage: "Comma separated checkpoint signatures to submit",
- }
-)
-
-func main() {
- log.Root().SetHandler(log.LvlFilterHandler(log.LvlInfo, log.StreamHandler(os.Stderr, log.TerminalFormat(true))))
- fdlimit.Raise(2048)
-
- if err := app.Run(os.Args); err != nil {
- fmt.Fprintln(os.Stderr, err)
- os.Exit(1)
- }
-}
diff --git a/cmd/checkpoint-admin/status.go b/cmd/checkpoint-admin/status.go
deleted file mode 100644
index bec97aed12..0000000000
--- a/cmd/checkpoint-admin/status.go
+++ /dev/null
@@ -1,60 +0,0 @@
-// Copyright 2019 The go-ethereum Authors
-// This file is part of go-ethereum.
-//
-// go-ethereum is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// go-ethereum is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with go-ethereum. If not, see .
-
-package main
-
-import (
- "fmt"
-
- "github.com/ethereum/go-ethereum/common"
- "github.com/urfave/cli/v2"
-)
-
-var commandStatus = &cli.Command{
- Name: "status",
- Usage: "Fetches the signers and checkpoint status of the oracle contract",
- Flags: []cli.Flag{
- nodeURLFlag,
- },
- Action: status,
-}
-
-// status fetches the admin list of specified registrar contract.
-func status(ctx *cli.Context) error {
- // Create a wrapper around the checkpoint oracle contract
- addr, oracle := newContract(newRPCClient(ctx.String(nodeURLFlag.Name)))
- fmt.Printf("Oracle => %s\n", addr.Hex())
- fmt.Println()
-
- // Retrieve the list of authorized signers (admins)
- admins, err := oracle.Contract().GetAllAdmin(nil)
- if err != nil {
- return err
- }
- for i, admin := range admins {
- fmt.Printf("Admin %d => %s\n", i+1, admin.Hex())
- }
- fmt.Println()
-
- // Retrieve the latest checkpoint
- index, checkpoint, height, err := oracle.Contract().GetLatestCheckpoint(nil)
- if err != nil {
- return err
- }
- fmt.Printf("Checkpoint (published at #%d) %d => %s\n", height, index, common.Hash(checkpoint).Hex())
-
- return nil
-}
diff --git a/cmd/clef/README.md b/cmd/clef/README.md
index 3891e55402..85c9c70606 100644
--- a/cmd/clef/README.md
+++ b/cmd/clef/README.md
@@ -29,7 +29,7 @@ GLOBAL OPTIONS:
--loglevel value log level to emit to the screen (default: 4)
--keystore value Directory for the keystore (default: "$HOME/.ethereum/keystore")
--configdir value Directory for Clef configuration (default: "$HOME/.clef")
- --chainid value Chain id to use for signing (1=mainnet, 4=Rinkeby, 5=Goerli) (default: 1)
+ --chainid value Chain id to use for signing (1=mainnet, 5=Goerli) (default: 1)
--lightkdf Reduce key-derivation RAM & CPU usage at some expense of KDF strength
--nousb Disables monitoring for and managing USB hardware wallets
--pcscdpath value Path to the smartcard daemon (pcscd) socket file (default: "/run/pcscd/pcscd.comm")
diff --git a/cmd/clef/main.go b/cmd/clef/main.go
index 2788ddc33b..06a8cd7ab7 100644
--- a/cmd/clef/main.go
+++ b/cmd/clef/main.go
@@ -27,6 +27,7 @@ import (
"fmt"
"io"
"math/big"
+ "net"
"os"
"os/signal"
"path/filepath"
@@ -99,7 +100,7 @@ var (
chainIdFlag = &cli.Int64Flag{
Name: "chainid",
Value: params.MainnetChainConfig.ChainID.Int64(),
- Usage: "Chain id to use for signing (1=mainnet, 4=Rinkeby, 5=Goerli)",
+ Usage: "Chain id to use for signing (1=mainnet, 5=Goerli)",
}
rpcPortFlag = &cli.IntFlag{
Name: "http.port",
@@ -326,7 +327,7 @@ func initializeSecrets(c *cli.Context) error {
return err
}
if num != len(masterSeed) {
- return fmt.Errorf("failed to read enough random")
+ return errors.New("failed to read enough random")
}
n, p := keystore.StandardScryptN, keystore.StandardScryptP
if c.Bool(utils.LightKDFFlag.Name) {
@@ -482,7 +483,7 @@ func initialize(c *cli.Context) error {
}
} else if !c.Bool(acceptFlag.Name) {
if !confirm(legalWarning) {
- return fmt.Errorf("aborted by user")
+ return errors.New("aborted by user")
}
fmt.Println()
}
@@ -590,7 +591,7 @@ func accountImport(c *cli.Context) error {
Address %v
Keystore file: %v
-The key is now encrypted; losing the password will result in permanently losing
+The key is now encrypted; losing the password will result in permanently losing
access to the key and all associated funds!
Make sure to backup keystore and passwords in a safe location.`,
@@ -732,6 +733,7 @@ func signer(c *cli.Context) error {
cors := utils.SplitAndTrim(c.String(utils.HTTPCORSDomainFlag.Name))
srv := rpc.NewServer()
+ srv.SetBatchLimits(node.DefaultConfig.BatchRequestLimit, node.DefaultConfig.BatchResponseMaxSize)
err := node.RegisterApis(rpcAPI, []string{"account"}, srv)
if err != nil {
utils.Fatalf("Could not register API: %w", err)
@@ -742,7 +744,7 @@ func signer(c *cli.Context) error {
port := c.Int(rpcPortFlag.Name)
// start http server
- httpEndpoint := fmt.Sprintf("%s:%d", c.String(utils.HTTPListenAddrFlag.Name), port)
+ httpEndpoint := net.JoinHostPort(c.String(utils.HTTPListenAddrFlag.Name), fmt.Sprintf("%d", port))
httpServer, addr, err := node.StartHTTPEndpoint(httpEndpoint, rpc.DefaultHTTPTimeouts, handler)
if err != nil {
utils.Fatalf("Could not start RPC api: %v", err)
@@ -844,7 +846,7 @@ func readMasterKey(ctx *cli.Context, ui core.UIClientAPI) ([]byte, error) {
}
masterSeed, err := decryptSeed(cipherKey, password)
if err != nil {
- return nil, fmt.Errorf("failed to decrypt the master seed of clef")
+ return nil, errors.New("failed to decrypt the master seed of clef")
}
if len(masterSeed) < 256 {
return nil, fmt.Errorf("master seed of insufficient length, expected >255 bytes, got %d", len(masterSeed))
@@ -1204,7 +1206,7 @@ func GenDoc(ctx *cli.Context) error {
URL: accounts.URL{Path: ".. ignored .."},
},
{
- Address: common.HexToAddress("0xffffffffffffffffffffffffffffffffffffffff"),
+ Address: common.MaxAddress,
},
}})
}
diff --git a/cmd/devp2p/README.md b/cmd/devp2p/README.md
index 0a61304c2b..5ca7b497a2 100644
--- a/cmd/devp2p/README.md
+++ b/cmd/devp2p/README.md
@@ -44,7 +44,7 @@ set to standard output. The following filters are supported:
- `-limit ` limits the output set to N entries, taking the top N nodes by score
- `-ip ` filters nodes by IP subnet
- `-min-age ` filters nodes by 'first seen' time
-- `-eth-network ` filters nodes by "eth" ENR entry
+- `-eth-network ` filters nodes by "eth" ENR entry
- `-les-server` filters nodes by LES server support
- `-snap` filters nodes by snap protocol support
diff --git a/cmd/devp2p/crawl.go b/cmd/devp2p/crawl.go
index 8c9755ac1c..4288a5feb8 100644
--- a/cmd/devp2p/crawl.go
+++ b/cmd/devp2p/crawl.go
@@ -17,6 +17,7 @@
package main
import (
+ "errors"
"sync"
"sync/atomic"
"time"
@@ -51,7 +52,14 @@ type resolver interface {
RequestENR(*enode.Node) (*enode.Node, error)
}
-func newCrawler(input nodeSet, disc resolver, iters ...enode.Iterator) *crawler {
+func newCrawler(input nodeSet, bootnodes []*enode.Node, disc resolver, iters ...enode.Iterator) (*crawler, error) {
+ if len(input) == 0 {
+ input.add(bootnodes...)
+ }
+ if len(input) == 0 {
+ return nil, errors.New("no input nodes to start crawling")
+ }
+
c := &crawler{
input: input,
output: make(nodeSet, len(input)),
@@ -67,7 +75,7 @@ func newCrawler(input nodeSet, disc resolver, iters ...enode.Iterator) *crawler
for id, n := range input {
c.output[id] = n
}
- return c
+ return c, nil
}
func (c *crawler) run(timeout time.Duration, nthreads int) nodeSet {
@@ -87,11 +95,11 @@ func (c *crawler) run(timeout time.Duration, nthreads int) nodeSet {
go c.runIterator(doneCh, it)
}
var (
- added uint64
- updated uint64
- skipped uint64
- recent uint64
- removed uint64
+ added atomic.Uint64
+ updated atomic.Uint64
+ skipped atomic.Uint64
+ recent atomic.Uint64
+ removed atomic.Uint64
wg sync.WaitGroup
)
wg.Add(nthreads)
@@ -103,15 +111,15 @@ func (c *crawler) run(timeout time.Duration, nthreads int) nodeSet {
case n := <-c.ch:
switch c.updateNode(n) {
case nodeSkipIncompat:
- atomic.AddUint64(&skipped, 1)
+ skipped.Add(1)
case nodeSkipRecent:
- atomic.AddUint64(&recent, 1)
+ recent.Add(1)
case nodeRemoved:
- atomic.AddUint64(&removed, 1)
+ removed.Add(1)
case nodeAdded:
- atomic.AddUint64(&added, 1)
+ added.Add(1)
default:
- atomic.AddUint64(&updated, 1)
+ updated.Add(1)
}
case <-c.closed:
return
@@ -138,11 +146,11 @@ loop:
break loop
case <-statusTicker.C:
log.Info("Crawling in progress",
- "added", atomic.LoadUint64(&added),
- "updated", atomic.LoadUint64(&updated),
- "removed", atomic.LoadUint64(&removed),
- "ignored(recent)", atomic.LoadUint64(&removed),
- "ignored(incompatible)", atomic.LoadUint64(&skipped))
+ "added", added.Load(),
+ "updated", updated.Load(),
+ "removed", removed.Load(),
+ "ignored(recent)", recent.Load(),
+ "ignored(incompatible)", skipped.Load())
}
}
diff --git a/cmd/devp2p/discv4cmd.go b/cmd/devp2p/discv4cmd.go
index 6312263478..37b139dea2 100644
--- a/cmd/devp2p/discv4cmd.go
+++ b/cmd/devp2p/discv4cmd.go
@@ -17,6 +17,7 @@
package main
import (
+ "errors"
"fmt"
"net"
"strconv"
@@ -142,7 +143,7 @@ var discoveryNodeFlags = []cli.Flag{
func discv4Ping(ctx *cli.Context) error {
n := getNodeArg(ctx)
- disc := startV4(ctx)
+ disc, _ := startV4(ctx)
defer disc.Close()
start := time.Now()
@@ -155,7 +156,7 @@ func discv4Ping(ctx *cli.Context) error {
func discv4RequestRecord(ctx *cli.Context) error {
n := getNodeArg(ctx)
- disc := startV4(ctx)
+ disc, _ := startV4(ctx)
defer disc.Close()
respN, err := disc.RequestENR(n)
@@ -168,7 +169,7 @@ func discv4RequestRecord(ctx *cli.Context) error {
func discv4Resolve(ctx *cli.Context) error {
n := getNodeArg(ctx)
- disc := startV4(ctx)
+ disc, _ := startV4(ctx)
defer disc.Close()
fmt.Println(disc.Resolve(n).String())
@@ -177,7 +178,7 @@ func discv4Resolve(ctx *cli.Context) error {
func discv4ResolveJSON(ctx *cli.Context) error {
if ctx.NArg() < 1 {
- return fmt.Errorf("need nodes file as argument")
+ return errors.New("need nodes file as argument")
}
nodesFile := ctx.Args().Get(0)
inputSet := make(nodeSet)
@@ -195,10 +196,13 @@ func discv4ResolveJSON(ctx *cli.Context) error {
nodeargs = append(nodeargs, n)
}
- // Run the crawler.
- disc := startV4(ctx)
+ disc, config := startV4(ctx)
defer disc.Close()
- c := newCrawler(inputSet, disc, enode.IterNodes(nodeargs))
+
+ c, err := newCrawler(inputSet, config.Bootnodes, disc, enode.IterNodes(nodeargs))
+ if err != nil {
+ return err
+ }
c.revalidateInterval = 0
output := c.run(0, 1)
writeNodesJSON(nodesFile, output)
@@ -207,17 +211,21 @@ func discv4ResolveJSON(ctx *cli.Context) error {
func discv4Crawl(ctx *cli.Context) error {
if ctx.NArg() < 1 {
- return fmt.Errorf("need nodes file as argument")
+ return errors.New("need nodes file as argument")
}
nodesFile := ctx.Args().First()
- var inputSet nodeSet
+ inputSet := make(nodeSet)
if common.FileExist(nodesFile) {
inputSet = loadNodesJSON(nodesFile)
}
- disc := startV4(ctx)
+ disc, config := startV4(ctx)
defer disc.Close()
- c := newCrawler(inputSet, disc, disc.RandomNodes())
+
+ c, err := newCrawler(inputSet, config.Bootnodes, disc, disc.RandomNodes())
+ if err != nil {
+ return err
+ }
c.revalidateInterval = 10 * time.Minute
output := c.run(ctx.Duration(crawlTimeoutFlag.Name), ctx.Int(crawlParallelismFlag.Name))
writeNodesJSON(nodesFile, output)
@@ -237,14 +245,14 @@ func discv4Test(ctx *cli.Context) error {
}
// startV4 starts an ephemeral discovery V4 node.
-func startV4(ctx *cli.Context) *discover.UDPv4 {
+func startV4(ctx *cli.Context) (*discover.UDPv4, discover.Config) {
ln, config := makeDiscoveryConfig(ctx)
socket := listen(ctx, ln)
disc, err := discover.ListenV4(socket, ln, config)
if err != nil {
exit(err)
}
- return disc
+ return disc, config
}
func makeDiscoveryConfig(ctx *cli.Context) (*enode.LocalNode, discover.Config) {
@@ -336,7 +344,7 @@ func listen(ctx *cli.Context, ln *enode.LocalNode) *net.UDPConn {
}
func parseBootnodes(ctx *cli.Context) ([]*enode.Node, error) {
- s := params.RinkebyBootnodes
+ s := params.MainnetBootnodes
if ctx.IsSet(bootnodesFlag.Name) {
input := ctx.String(bootnodesFlag.Name)
if input == "" {
diff --git a/cmd/devp2p/discv5cmd.go b/cmd/devp2p/discv5cmd.go
index 832a4bc1f4..0dac945269 100644
--- a/cmd/devp2p/discv5cmd.go
+++ b/cmd/devp2p/discv5cmd.go
@@ -17,6 +17,7 @@
package main
import (
+ "errors"
"fmt"
"time"
@@ -80,7 +81,7 @@ var (
func discv5Ping(ctx *cli.Context) error {
n := getNodeArg(ctx)
- disc := startV5(ctx)
+ disc, _ := startV5(ctx)
defer disc.Close()
fmt.Println(disc.Ping(n))
@@ -89,7 +90,7 @@ func discv5Ping(ctx *cli.Context) error {
func discv5Resolve(ctx *cli.Context) error {
n := getNodeArg(ctx)
- disc := startV5(ctx)
+ disc, _ := startV5(ctx)
defer disc.Close()
fmt.Println(disc.Resolve(n))
@@ -98,17 +99,21 @@ func discv5Resolve(ctx *cli.Context) error {
func discv5Crawl(ctx *cli.Context) error {
if ctx.NArg() < 1 {
- return fmt.Errorf("need nodes file as argument")
+ return errors.New("need nodes file as argument")
}
nodesFile := ctx.Args().First()
- var inputSet nodeSet
+ inputSet := make(nodeSet)
if common.FileExist(nodesFile) {
inputSet = loadNodesJSON(nodesFile)
}
- disc := startV5(ctx)
+ disc, config := startV5(ctx)
defer disc.Close()
- c := newCrawler(inputSet, disc, disc.RandomNodes())
+
+ c, err := newCrawler(inputSet, config.Bootnodes, disc, disc.RandomNodes())
+ if err != nil {
+ return err
+ }
c.revalidateInterval = 10 * time.Minute
output := c.run(ctx.Duration(crawlTimeoutFlag.Name), ctx.Int(crawlParallelismFlag.Name))
writeNodesJSON(nodesFile, output)
@@ -126,7 +131,7 @@ func discv5Test(ctx *cli.Context) error {
}
func discv5Listen(ctx *cli.Context) error {
- disc := startV5(ctx)
+ disc, _ := startV5(ctx)
defer disc.Close()
fmt.Println(disc.Self())
@@ -134,12 +139,12 @@ func discv5Listen(ctx *cli.Context) error {
}
// startV5 starts an ephemeral discovery v5 node.
-func startV5(ctx *cli.Context) *discover.UDPv5 {
+func startV5(ctx *cli.Context) (*discover.UDPv5, discover.Config) {
ln, config := makeDiscoveryConfig(ctx)
socket := listen(ctx, ln)
disc, err := discover.ListenV5(socket, ln, config)
if err != nil {
exit(err)
}
- return disc
+ return disc, config
}
diff --git a/cmd/devp2p/dns_cloudflare.go b/cmd/devp2p/dns_cloudflare.go
index bfe92257ee..a3cc69cf19 100644
--- a/cmd/devp2p/dns_cloudflare.go
+++ b/cmd/devp2p/dns_cloudflare.go
@@ -18,6 +18,7 @@ package main
import (
"context"
+ "errors"
"fmt"
"strings"
@@ -48,7 +49,7 @@ type cloudflareClient struct {
func newCloudflareClient(ctx *cli.Context) *cloudflareClient {
token := ctx.String(cloudflareTokenFlag.Name)
if token == "" {
- exit(fmt.Errorf("need cloudflare API token to proceed"))
+ exit(errors.New("need cloudflare API token to proceed"))
}
api, err := cloudflare.NewWithAPIToken(token)
if err != nil {
@@ -113,7 +114,7 @@ func (c *cloudflareClient) uploadRecords(name string, records map[string]string)
records = lrecords
log.Info(fmt.Sprintf("Retrieving existing TXT records on %s", name))
- entries, err := c.DNSRecords(context.Background(), c.zoneID, cloudflare.DNSRecord{Type: "TXT"})
+ entries, _, err := c.ListDNSRecords(context.Background(), cloudflare.ZoneIdentifier(c.zoneID), cloudflare.ListDNSRecordsParams{Type: "TXT"})
if err != nil {
return err
}
@@ -140,14 +141,25 @@ func (c *cloudflareClient) uploadRecords(name string, records map[string]string)
if path != name {
ttl = treeNodeTTLCloudflare // Max TTL permitted by Cloudflare
}
- record := cloudflare.DNSRecord{Type: "TXT", Name: path, Content: val, TTL: ttl}
- _, err = c.CreateDNSRecord(context.Background(), c.zoneID, record)
+ record := cloudflare.CreateDNSRecordParams{Type: "TXT", Name: path, Content: val, TTL: ttl}
+ _, err = c.CreateDNSRecord(context.Background(), cloudflare.ZoneIdentifier(c.zoneID), record)
} else if old.Content != val {
// Entry already exists, only change its content.
- log.Debug(fmt.Sprintf("Updating %s from %q to %q", path, old.Content, val))
+ log.Info(fmt.Sprintf("Updating %s from %q to %q", path, old.Content, val))
updated++
- old.Content = val
- err = c.UpdateDNSRecord(context.Background(), c.zoneID, old.ID, old)
+
+ record := cloudflare.UpdateDNSRecordParams{
+ Type: old.Type,
+ Name: old.Name,
+ Content: val,
+ Data: old.Data,
+ ID: old.ID,
+ Priority: old.Priority,
+ TTL: old.TTL,
+ Proxied: old.Proxied,
+ Tags: old.Tags,
+ }
+ _, err = c.UpdateDNSRecord(context.Background(), cloudflare.ZoneIdentifier(c.zoneID), record)
} else {
skipped++
log.Debug(fmt.Sprintf("Skipping %s = %q", path, val))
@@ -167,7 +179,7 @@ func (c *cloudflareClient) uploadRecords(name string, records map[string]string)
// Stale entry, nuke it.
log.Debug(fmt.Sprintf("Deleting %s = %q", path, entry.Content))
deleted++
- if err := c.DeleteDNSRecord(context.Background(), c.zoneID, entry.ID); err != nil {
+ if err := c.DeleteDNSRecord(context.Background(), cloudflare.ZoneIdentifier(c.zoneID), entry.ID); err != nil {
return fmt.Errorf("failed to delete %s: %v", path, err)
}
}
diff --git a/cmd/devp2p/dns_route53.go b/cmd/devp2p/dns_route53.go
index 81734eb2ad..21a32f9414 100644
--- a/cmd/devp2p/dns_route53.go
+++ b/cmd/devp2p/dns_route53.go
@@ -20,7 +20,6 @@ import (
"context"
"errors"
"fmt"
- "sort"
"strconv"
"strings"
"time"
@@ -33,6 +32,7 @@ import (
"github.com/ethereum/go-ethereum/log"
"github.com/ethereum/go-ethereum/p2p/dnsdisc"
"github.com/urfave/cli/v2"
+ "golang.org/x/exp/slices"
)
const (
@@ -81,7 +81,7 @@ func newRoute53Client(ctx *cli.Context) *route53Client {
akey := ctx.String(route53AccessKeyFlag.Name)
asec := ctx.String(route53AccessSecretFlag.Name)
if akey == "" || asec == "" {
- exit(fmt.Errorf("need Route53 Access Key ID and secret to proceed"))
+ exit(errors.New("need Route53 Access Key ID and secret to proceed"))
}
creds := aws.NewCredentialsCache(credentials.NewStaticCredentialsProvider(akey, asec, ""))
cfg, err := config.LoadDefaultConfig(context.Background(), config.WithCredentialsProvider(creds))
@@ -221,7 +221,13 @@ func (c *route53Client) computeChanges(name string, records map[string]string, e
}
records = lrecords
- var changes []types.Change
+ var (
+ changes []types.Change
+ inserts int
+ upserts int
+ skips int
+ )
+
for path, newValue := range records {
prevRecords, exists := existing[path]
prevValue := strings.Join(prevRecords.values, "")
@@ -237,20 +243,30 @@ func (c *route53Client) computeChanges(name string, records map[string]string, e
if !exists {
// Entry is unknown, push a new one
- log.Info(fmt.Sprintf("Creating %s = %s", path, newValue))
+ log.Debug(fmt.Sprintf("Creating %s = %s", path, newValue))
changes = append(changes, newTXTChange("CREATE", path, ttl, newValue))
+ inserts++
} else if prevValue != newValue || prevRecords.ttl != ttl {
// Entry already exists, only change its content.
log.Info(fmt.Sprintf("Updating %s from %s to %s", path, prevValue, newValue))
changes = append(changes, newTXTChange("UPSERT", path, ttl, newValue))
+ upserts++
} else {
log.Debug(fmt.Sprintf("Skipping %s = %s", path, newValue))
+ skips++
}
}
// Iterate over the old records and delete anything stale.
- changes = append(changes, makeDeletionChanges(existing, records)...)
-
+ deletions := makeDeletionChanges(existing, records)
+ changes = append(changes, deletions...)
+
+ log.Info("Computed DNS changes",
+ "changes", len(changes),
+ "inserts", inserts,
+ "skips", skips,
+ "deleted", len(deletions),
+ "upserts", upserts)
// Ensure changes are in the correct order.
sortChanges(changes)
return changes
@@ -263,7 +279,7 @@ func makeDeletionChanges(records map[string]recordSet, keep map[string]string) [
if _, ok := keep[path]; ok {
continue
}
- log.Info(fmt.Sprintf("Deleting %s = %s", path, strings.Join(set.values, "")))
+ log.Debug(fmt.Sprintf("Deleting %s = %s", path, strings.Join(set.values, "")))
changes = append(changes, newTXTChange("DELETE", path, set.ttl, set.values...))
}
return changes
@@ -272,11 +288,17 @@ func makeDeletionChanges(records map[string]recordSet, keep map[string]string) [
// sortChanges ensures DNS changes are in leaf-added -> root-changed -> leaf-deleted order.
func sortChanges(changes []types.Change) {
score := map[string]int{"CREATE": 1, "UPSERT": 2, "DELETE": 3}
- sort.Slice(changes, func(i, j int) bool {
- if changes[i].Action == changes[j].Action {
- return *changes[i].ResourceRecordSet.Name < *changes[j].ResourceRecordSet.Name
+ slices.SortFunc(changes, func(a, b types.Change) int {
+ if a.Action == b.Action {
+ return strings.Compare(*a.ResourceRecordSet.Name, *b.ResourceRecordSet.Name)
+ }
+ if score[string(a.Action)] < score[string(b.Action)] {
+ return -1
+ }
+ if score[string(a.Action)] > score[string(b.Action)] {
+ return 1
}
- return score[string(changes[i].Action)] < score[string(changes[j].Action)]
+ return 0
})
}
diff --git a/cmd/devp2p/dnscmd.go b/cmd/devp2p/dnscmd.go
index 58eb6e8db1..0fce7b1030 100644
--- a/cmd/devp2p/dnscmd.go
+++ b/cmd/devp2p/dnscmd.go
@@ -19,6 +19,7 @@ package main
import (
"crypto/ecdsa"
"encoding/json"
+ "errors"
"fmt"
"os"
"path/filepath"
@@ -147,7 +148,7 @@ func dnsSync(ctx *cli.Context) error {
func dnsSign(ctx *cli.Context) error {
if ctx.NArg() < 2 {
- return fmt.Errorf("need tree definition directory and key file as arguments")
+ return errors.New("need tree definition directory and key file as arguments")
}
var (
defdir = ctx.Args().Get(0)
@@ -201,7 +202,7 @@ func directoryName(dir string) string {
// dnsToTXT performs dnsTXTCommand.
func dnsToTXT(ctx *cli.Context) error {
if ctx.NArg() < 1 {
- return fmt.Errorf("need tree definition directory as argument")
+ return errors.New("need tree definition directory as argument")
}
output := ctx.Args().Get(1)
if output == "" {
@@ -218,7 +219,7 @@ func dnsToTXT(ctx *cli.Context) error {
// dnsToCloudflare performs dnsCloudflareCommand.
func dnsToCloudflare(ctx *cli.Context) error {
if ctx.NArg() != 1 {
- return fmt.Errorf("need tree definition directory as argument")
+ return errors.New("need tree definition directory as argument")
}
domain, t, err := loadTreeDefinitionForExport(ctx.Args().Get(0))
if err != nil {
@@ -231,7 +232,7 @@ func dnsToCloudflare(ctx *cli.Context) error {
// dnsToRoute53 performs dnsRoute53Command.
func dnsToRoute53(ctx *cli.Context) error {
if ctx.NArg() != 1 {
- return fmt.Errorf("need tree definition directory as argument")
+ return errors.New("need tree definition directory as argument")
}
domain, t, err := loadTreeDefinitionForExport(ctx.Args().Get(0))
if err != nil {
@@ -244,7 +245,7 @@ func dnsToRoute53(ctx *cli.Context) error {
// dnsNukeRoute53 performs dnsRoute53NukeCommand.
func dnsNukeRoute53(ctx *cli.Context) error {
if ctx.NArg() != 1 {
- return fmt.Errorf("need domain name as argument")
+ return errors.New("need domain name as argument")
}
client := newRoute53Client(ctx)
return client.deleteDomain(ctx.Args().First())
@@ -363,10 +364,10 @@ func loadTreeDefinitionForExport(dir string) (domain string, t *dnsdisc.Tree, er
// tree's signature if valid.
func ensureValidTreeSignature(t *dnsdisc.Tree, pubkey *ecdsa.PublicKey, sig string) error {
if sig == "" {
- return fmt.Errorf("missing signature, run 'devp2p dns sign' first")
+ return errors.New("missing signature, run 'devp2p dns sign' first")
}
if err := t.SetSignature(pubkey, sig); err != nil {
- return fmt.Errorf("invalid signature on tree, run 'devp2p dns sign' to update it")
+ return errors.New("invalid signature on tree, run 'devp2p dns sign' to update it")
}
return nil
}
diff --git a/cmd/devp2p/enrcmd.go b/cmd/devp2p/enrcmd.go
index 2110437103..c5a97c8411 100644
--- a/cmd/devp2p/enrcmd.go
+++ b/cmd/devp2p/enrcmd.go
@@ -20,6 +20,7 @@ import (
"bytes"
"encoding/base64"
"encoding/hex"
+ "errors"
"fmt"
"io"
"net"
@@ -48,7 +49,7 @@ func enrdump(ctx *cli.Context) error {
var source string
if file := ctx.String(fileFlag.Name); file != "" {
if ctx.NArg() != 0 {
- return fmt.Errorf("can't dump record from command-line argument in -file mode")
+ return errors.New("can't dump record from command-line argument in -file mode")
}
var b []byte
var err error
@@ -64,7 +65,7 @@ func enrdump(ctx *cli.Context) error {
} else if ctx.NArg() == 1 {
source = ctx.Args().First()
} else {
- return fmt.Errorf("need record as argument")
+ return errors.New("need record as argument")
}
r, err := parseRecord(source)
diff --git a/cmd/devp2p/internal/ethtest/chain.go b/cmd/devp2p/internal/ethtest/chain.go
index f4db05db8e..938159ec52 100644
--- a/cmd/devp2p/internal/ethtest/chain.go
+++ b/cmd/devp2p/internal/ethtest/chain.go
@@ -19,6 +19,7 @@ package ethtest
import (
"compress/gzip"
"encoding/json"
+ "errors"
"fmt"
"io"
"math/big"
@@ -76,7 +77,7 @@ func (c *Chain) RootAt(height int) common.Hash {
// ForkID gets the fork id of the chain.
func (c *Chain) ForkID() forkid.ID {
- return forkid.NewID(c.chainConfig, c.blocks[0].Hash(), uint64(c.Len()), c.blocks[0].Time())
+ return forkid.NewID(c.chainConfig, c.blocks[0], uint64(c.Len()), c.blocks[0].Time())
}
// Shorten returns a copy chain of a desired height from the imported
@@ -98,7 +99,7 @@ func (c *Chain) Head() *types.Block {
func (c *Chain) GetHeaders(req *GetBlockHeaders) ([]*types.Header, error) {
if req.Amount < 1 {
- return nil, fmt.Errorf("no block headers requested")
+ return nil, errors.New("no block headers requested")
}
headers := make([]*types.Header, req.Amount)
diff --git a/cmd/devp2p/internal/ethtest/chain_test.go b/cmd/devp2p/internal/ethtest/chain_test.go
index 67221923a6..de6acfdcda 100644
--- a/cmd/devp2p/internal/ethtest/chain_test.go
+++ b/cmd/devp2p/internal/ethtest/chain_test.go
@@ -145,7 +145,7 @@ func TestChain_GetHeaders(t *testing.T) {
}{
{
req: GetBlockHeaders{
- GetBlockHeadersPacket: ð.GetBlockHeadersPacket{
+ GetBlockHeadersRequest: ð.GetBlockHeadersRequest{
Origin: eth.HashOrNumber{Number: uint64(2)},
Amount: uint64(5),
Skip: 1,
@@ -162,7 +162,7 @@ func TestChain_GetHeaders(t *testing.T) {
},
{
req: GetBlockHeaders{
- GetBlockHeadersPacket: ð.GetBlockHeadersPacket{
+ GetBlockHeadersRequest: ð.GetBlockHeadersRequest{
Origin: eth.HashOrNumber{Number: uint64(chain.Len() - 1)},
Amount: uint64(3),
Skip: 0,
@@ -177,7 +177,7 @@ func TestChain_GetHeaders(t *testing.T) {
},
{
req: GetBlockHeaders{
- GetBlockHeadersPacket: ð.GetBlockHeadersPacket{
+ GetBlockHeadersRequest: ð.GetBlockHeadersRequest{
Origin: eth.HashOrNumber{Hash: chain.Head().Hash()},
Amount: uint64(1),
Skip: 0,
diff --git a/cmd/devp2p/internal/ethtest/helpers.go b/cmd/devp2p/internal/ethtest/helpers.go
index 70ed2d2106..a0339b88cb 100644
--- a/cmd/devp2p/internal/ethtest/helpers.go
+++ b/cmd/devp2p/internal/ethtest/helpers.go
@@ -17,6 +17,7 @@
package ethtest
import (
+ "errors"
"fmt"
"net"
"reflect"
@@ -61,7 +62,6 @@ func (s *Suite) dial() (*Conn, error) {
}
// set default p2p capabilities
conn.caps = []p2p.Cap{
- {Name: "eth", Version: 66},
{Name: "eth", Version: 67},
{Name: "eth", Version: 68},
}
@@ -185,7 +185,7 @@ loop:
}
// make sure eth protocol version is set for negotiation
if c.negotiatedProtoVersion == 0 {
- return nil, fmt.Errorf("eth protocol version must be set in Conn")
+ return nil, errors.New("eth protocol version must be set in Conn")
}
if status == nil {
// default status message
@@ -236,8 +236,8 @@ func (c *Conn) readAndServe(chain *Chain, timeout time.Duration) Message {
return errorf("could not get headers for inbound header request: %v", err)
}
resp := &BlockHeaders{
- RequestId: msg.ReqID(),
- BlockHeadersPacket: eth.BlockHeadersPacket(headers),
+ RequestId: msg.ReqID(),
+ BlockHeadersRequest: eth.BlockHeadersRequest(headers),
}
if err := c.Write(resp); err != nil {
return errorf("could not write to connection: %v", err)
@@ -266,7 +266,7 @@ func (c *Conn) headersRequest(request *GetBlockHeaders, chain *Chain, reqID uint
if !ok {
return nil, fmt.Errorf("unexpected message received: %s", pretty.Sdump(msg))
}
- headers := []*types.Header(resp.BlockHeadersPacket)
+ headers := []*types.Header(resp.BlockHeadersRequest)
return headers, nil
}
@@ -378,7 +378,7 @@ func (s *Suite) waitForBlockImport(conn *Conn, block *types.Block) error {
conn.SetReadDeadline(time.Now().Add(20 * time.Second))
// create request
req := &GetBlockHeaders{
- GetBlockHeadersPacket: ð.GetBlockHeadersPacket{
+ GetBlockHeadersRequest: ð.GetBlockHeadersRequest{
Origin: eth.HashOrNumber{Hash: block.Hash()},
Amount: 1,
},
@@ -603,8 +603,8 @@ func (s *Suite) hashAnnounce() error {
pretty.Sdump(blockHeaderReq))
}
err = sendConn.Write(&BlockHeaders{
- RequestId: blockHeaderReq.ReqID(),
- BlockHeadersPacket: eth.BlockHeadersPacket{nextBlock.Header()},
+ RequestId: blockHeaderReq.ReqID(),
+ BlockHeadersRequest: eth.BlockHeadersRequest{nextBlock.Header()},
})
if err != nil {
return fmt.Errorf("failed to write to connection: %v", err)
diff --git a/cmd/devp2p/internal/ethtest/snap.go b/cmd/devp2p/internal/ethtest/snap.go
index 8fa03660cf..14087af4f8 100644
--- a/cmd/devp2p/internal/ethtest/snap.go
+++ b/cmd/devp2p/internal/ethtest/snap.go
@@ -27,8 +27,8 @@ import (
"github.com/ethereum/go-ethereum/crypto"
"github.com/ethereum/go-ethereum/eth/protocols/snap"
"github.com/ethereum/go-ethereum/internal/utesting"
- "github.com/ethereum/go-ethereum/light"
"github.com/ethereum/go-ethereum/trie"
+ "github.com/ethereum/go-ethereum/trie/trienode"
"golang.org/x/crypto/sha3"
)
@@ -58,7 +58,7 @@ type accRangeTest struct {
func (s *Suite) TestSnapGetAccountRange(t *utesting.T) {
var (
root = s.chain.RootAt(999)
- ffHash = common.HexToHash("0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff")
+ ffHash = common.MaxHash
zero = common.Hash{}
firstKeyMinus1 = common.HexToHash("0x00bf49f440a1cd0527e4d06e2765654c0f56452257516d793a9b8d604dcfdf29")
firstKey = common.HexToHash("0x00bf49f440a1cd0527e4d06e2765654c0f56452257516d793a9b8d604dcfdf2a")
@@ -125,7 +125,7 @@ type stRangesTest struct {
// TestSnapGetStorageRanges various forms of GetStorageRanges requests.
func (s *Suite) TestSnapGetStorageRanges(t *utesting.T) {
var (
- ffHash = common.HexToHash("0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff")
+ ffHash = common.MaxHash
zero = common.Hash{}
firstKey = common.HexToHash("0x00bf49f440a1cd0527e4d06e2765654c0f56452257516d793a9b8d604dcfdf2a")
secondKey = common.HexToHash("0x09e47cd5056a689e708f22fe1f932709a320518e444f5f7d8d46a3da523d6606")
@@ -530,17 +530,13 @@ func (s *Suite) snapGetAccountRange(t *utesting.T, tc *accRangeTest) error {
for i, key := range hashes {
keys[i] = common.CopyBytes(key[:])
}
- nodes := make(light.NodeList, len(proof))
+ nodes := make(trienode.ProofList, len(proof))
for i, node := range proof {
nodes[i] = node
}
- proofdb := nodes.NodeSet()
+ proofdb := nodes.Set()
- var end []byte
- if len(keys) > 0 {
- end = keys[len(keys)-1]
- }
- _, err = trie.VerifyRangeProof(tc.root, tc.origin[:], end, keys, accounts, proofdb)
+ _, err = trie.VerifyRangeProof(tc.root, tc.origin[:], keys, accounts, proofdb)
return err
}
diff --git a/cmd/devp2p/internal/ethtest/suite.go b/cmd/devp2p/internal/ethtest/suite.go
index 815353be72..0b56c8cf4b 100644
--- a/cmd/devp2p/internal/ethtest/suite.go
+++ b/cmd/devp2p/internal/ethtest/suite.go
@@ -112,7 +112,7 @@ func (s *Suite) TestGetBlockHeaders(t *utesting.T) {
}
// write request
req := &GetBlockHeaders{
- GetBlockHeadersPacket: ð.GetBlockHeadersPacket{
+ GetBlockHeadersRequest: ð.GetBlockHeadersRequest{
Origin: eth.HashOrNumber{Hash: s.chain.blocks[1].Hash()},
Amount: 2,
Skip: 1,
@@ -150,7 +150,7 @@ func (s *Suite) TestSimultaneousRequests(t *utesting.T) {
// create two requests
req1 := &GetBlockHeaders{
RequestId: uint64(111),
- GetBlockHeadersPacket: ð.GetBlockHeadersPacket{
+ GetBlockHeadersRequest: ð.GetBlockHeadersRequest{
Origin: eth.HashOrNumber{
Hash: s.chain.blocks[1].Hash(),
},
@@ -161,7 +161,7 @@ func (s *Suite) TestSimultaneousRequests(t *utesting.T) {
}
req2 := &GetBlockHeaders{
RequestId: uint64(222),
- GetBlockHeadersPacket: ð.GetBlockHeadersPacket{
+ GetBlockHeadersRequest: ð.GetBlockHeadersRequest{
Origin: eth.HashOrNumber{
Hash: s.chain.blocks[1].Hash(),
},
@@ -201,10 +201,10 @@ func (s *Suite) TestSimultaneousRequests(t *utesting.T) {
if err != nil {
t.Fatalf("failed to get expected headers for request 2: %v", err)
}
- if !headersMatch(expected1, headers1.BlockHeadersPacket) {
+ if !headersMatch(expected1, headers1.BlockHeadersRequest) {
t.Fatalf("header mismatch: \nexpected %v \ngot %v", expected1, headers1)
}
- if !headersMatch(expected2, headers2.BlockHeadersPacket) {
+ if !headersMatch(expected2, headers2.BlockHeadersRequest) {
t.Fatalf("header mismatch: \nexpected %v \ngot %v", expected2, headers2)
}
}
@@ -224,7 +224,7 @@ func (s *Suite) TestSameRequestID(t *utesting.T) {
reqID := uint64(1234)
request1 := &GetBlockHeaders{
RequestId: reqID,
- GetBlockHeadersPacket: ð.GetBlockHeadersPacket{
+ GetBlockHeadersRequest: ð.GetBlockHeadersRequest{
Origin: eth.HashOrNumber{
Number: 1,
},
@@ -233,7 +233,7 @@ func (s *Suite) TestSameRequestID(t *utesting.T) {
}
request2 := &GetBlockHeaders{
RequestId: reqID,
- GetBlockHeadersPacket: ð.GetBlockHeadersPacket{
+ GetBlockHeadersRequest: ð.GetBlockHeadersRequest{
Origin: eth.HashOrNumber{
Number: 33,
},
@@ -270,10 +270,10 @@ func (s *Suite) TestSameRequestID(t *utesting.T) {
if err != nil {
t.Fatalf("failed to get expected block headers: %v", err)
}
- if !headersMatch(expected1, headers1.BlockHeadersPacket) {
+ if !headersMatch(expected1, headers1.BlockHeadersRequest) {
t.Fatalf("header mismatch: \nexpected %v \ngot %v", expected1, headers1)
}
- if !headersMatch(expected2, headers2.BlockHeadersPacket) {
+ if !headersMatch(expected2, headers2.BlockHeadersRequest) {
t.Fatalf("header mismatch: \nexpected %v \ngot %v", expected2, headers2)
}
}
@@ -290,7 +290,7 @@ func (s *Suite) TestZeroRequestID(t *utesting.T) {
t.Fatalf("peering failed: %v", err)
}
req := &GetBlockHeaders{
- GetBlockHeadersPacket: ð.GetBlockHeadersPacket{
+ GetBlockHeadersRequest: ð.GetBlockHeadersRequest{
Origin: eth.HashOrNumber{Number: 0},
Amount: 2,
},
@@ -322,7 +322,7 @@ func (s *Suite) TestGetBlockBodies(t *utesting.T) {
// create block bodies request
req := &GetBlockBodies{
RequestId: uint64(55),
- GetBlockBodiesPacket: eth.GetBlockBodiesPacket{
+ GetBlockBodiesRequest: eth.GetBlockBodiesRequest{
s.chain.blocks[54].Hash(),
s.chain.blocks[75].Hash(),
},
@@ -336,11 +336,11 @@ func (s *Suite) TestGetBlockBodies(t *utesting.T) {
if !ok {
t.Fatalf("unexpected: %s", pretty.Sdump(msg))
}
- bodies := resp.BlockBodiesPacket
+ bodies := resp.BlockBodiesResponse
t.Logf("received %d block bodies", len(bodies))
- if len(bodies) != len(req.GetBlockBodiesPacket) {
+ if len(bodies) != len(req.GetBlockBodiesRequest) {
t.Fatalf("wrong bodies in response: expected %d bodies, "+
- "got %d", len(req.GetBlockBodiesPacket), len(bodies))
+ "got %d", len(req.GetBlockBodiesRequest), len(bodies))
}
}
@@ -481,8 +481,8 @@ func (s *Suite) TestLargeTxRequest(t *utesting.T) {
hashes = append(hashes, hash)
}
getTxReq := &GetPooledTransactions{
- RequestId: 1234,
- GetPooledTransactionsPacket: hashes,
+ RequestId: 1234,
+ GetPooledTransactionsRequest: hashes,
}
if err = conn.Write(getTxReq); err != nil {
t.Fatalf("could not write to conn: %v", err)
@@ -490,7 +490,7 @@ func (s *Suite) TestLargeTxRequest(t *utesting.T) {
// check that all received transactions match those that were sent to node
switch msg := conn.waitForResponse(s.chain, timeout, getTxReq.RequestId).(type) {
case *PooledTransactions:
- for _, gotTx := range msg.PooledTransactionsPacket {
+ for _, gotTx := range msg.PooledTransactionsResponse {
if _, exists := hashMap[gotTx.Hash()]; !exists {
t.Fatalf("unexpected tx received: %v", gotTx.Hash())
}
@@ -547,8 +547,8 @@ func (s *Suite) TestNewPooledTxs(t *utesting.T) {
msg := conn.readAndServe(s.chain, timeout)
switch msg := msg.(type) {
case *GetPooledTransactions:
- if len(msg.GetPooledTransactionsPacket) != len(hashes) {
- t.Fatalf("unexpected number of txs requested: wanted %d, got %d", len(hashes), len(msg.GetPooledTransactionsPacket))
+ if len(msg.GetPooledTransactionsRequest) != len(hashes) {
+ t.Fatalf("unexpected number of txs requested: wanted %d, got %d", len(hashes), len(msg.GetPooledTransactionsRequest))
}
return
diff --git a/cmd/devp2p/internal/ethtest/suite_test.go b/cmd/devp2p/internal/ethtest/suite_test.go
index 382842029d..7890c31348 100644
--- a/cmd/devp2p/internal/ethtest/suite_test.go
+++ b/cmd/devp2p/internal/ethtest/suite_test.go
@@ -109,21 +109,18 @@ func setupGeth(stack *node.Node) error {
}
backend, err := eth.New(stack, ðconfig.Config{
- Genesis: &chain.genesis,
- NetworkId: chain.genesis.Config.ChainID.Uint64(), // 19763
- DatabaseCache: 10,
- TrieCleanCache: 10,
- TrieCleanCacheJournal: "",
- TrieCleanCacheRejournal: 60 * time.Minute,
- TrieDirtyCache: 16,
- TrieTimeout: 60 * time.Minute,
- TriesInMemory: 128,
- SnapshotCache: 10,
- Preimages: true,
+ Genesis: &chain.genesis,
+ NetworkId: chain.genesis.Config.ChainID.Uint64(), // 19763
+ DatabaseCache: 10,
+ TrieCleanCache: 10,
+ TrieDirtyCache: 16,
+ TrieTimeout: 60 * time.Minute,
+ SnapshotCache: 10,
})
if err != nil {
return err
}
+ backend.SetSynced()
_, err = backend.BlockChain().InsertChain(chain.blocks[1:])
return err
diff --git a/cmd/devp2p/internal/ethtest/testdata/genesis.json b/cmd/devp2p/internal/ethtest/testdata/genesis.json
index d8b5d22502..b4de6e85a5 100644
--- a/cmd/devp2p/internal/ethtest/testdata/genesis.json
+++ b/cmd/devp2p/internal/ethtest/testdata/genesis.json
@@ -6,6 +6,7 @@
"eip155Block": 0,
"eip158Block": 0,
"byzantiumBlock": 0,
+ "terminalTotalDifficultyPassed": true,
"ethash": {}
},
"nonce": "0xdeadbeefdeadbeef",
diff --git a/cmd/devp2p/internal/ethtest/transaction.go b/cmd/devp2p/internal/ethtest/transaction.go
index bf3a4b7f06..db5199d334 100644
--- a/cmd/devp2p/internal/ethtest/transaction.go
+++ b/cmd/devp2p/internal/ethtest/transaction.go
@@ -17,6 +17,7 @@
package ethtest
import (
+ "errors"
"fmt"
"math/big"
"strings"
@@ -39,7 +40,7 @@ func (s *Suite) sendSuccessfulTxs(t *utesting.T) error {
}
for i, tx := range tests {
if tx == nil {
- return fmt.Errorf("could not find tx to send")
+ return errors.New("could not find tx to send")
}
t.Logf("Testing tx propagation %d: sending tx %v %v %v\n", i, tx.Hash().String(), tx.GasPrice(), tx.Gas())
// get previous tx if exists for reference in case of old tx propagation
@@ -348,7 +349,7 @@ func generateTxs(s *Suite, numTxs int) (map[common.Hash]common.Hash, []*types.Tr
nextTx := getNextTxFromChain(s)
if nextTx == nil {
- return nil, nil, fmt.Errorf("failed to get the next transaction")
+ return nil, nil, errors.New("failed to get the next transaction")
}
gas := nextTx.Gas()
@@ -357,7 +358,7 @@ func generateTxs(s *Suite, numTxs int) (map[common.Hash]common.Hash, []*types.Tr
for i := 0; i < numTxs; i++ {
tx := generateTx(s.chain.chainConfig, nonce, gas)
if tx == nil {
- return nil, nil, fmt.Errorf("failed to get the next transaction")
+ return nil, nil, errors.New("failed to get the next transaction")
}
txHashMap[tx.Hash()] = tx.Hash()
txs[i] = tx
diff --git a/cmd/devp2p/internal/ethtest/types.go b/cmd/devp2p/internal/ethtest/types.go
index 3c7b6dbcf1..805d7a81b9 100644
--- a/cmd/devp2p/internal/ethtest/types.go
+++ b/cmd/devp2p/internal/ethtest/types.go
@@ -18,6 +18,7 @@ package ethtest
import (
"crypto/ecdsa"
+ "errors"
"fmt"
"time"
@@ -98,24 +99,24 @@ func (msg Transactions) Code() int { return 18 }
func (msg Transactions) ReqID() uint64 { return 18 }
// GetBlockHeaders represents a block header query.
-type GetBlockHeaders eth.GetBlockHeadersPacket66
+type GetBlockHeaders eth.GetBlockHeadersPacket
func (msg GetBlockHeaders) Code() int { return 19 }
func (msg GetBlockHeaders) ReqID() uint64 { return msg.RequestId }
-type BlockHeaders eth.BlockHeadersPacket66
+type BlockHeaders eth.BlockHeadersPacket
func (msg BlockHeaders) Code() int { return 20 }
func (msg BlockHeaders) ReqID() uint64 { return msg.RequestId }
// GetBlockBodies represents a GetBlockBodies request
-type GetBlockBodies eth.GetBlockBodiesPacket66
+type GetBlockBodies eth.GetBlockBodiesPacket
func (msg GetBlockBodies) Code() int { return 21 }
func (msg GetBlockBodies) ReqID() uint64 { return msg.RequestId }
// BlockBodies is the network packet for block content distribution.
-type BlockBodies eth.BlockBodiesPacket66
+type BlockBodies eth.BlockBodiesPacket
func (msg BlockBodies) Code() int { return 22 }
func (msg BlockBodies) ReqID() uint64 { return msg.RequestId }
@@ -127,7 +128,7 @@ func (msg NewBlock) Code() int { return 23 }
func (msg NewBlock) ReqID() uint64 { return 0 }
// NewPooledTransactionHashes66 is the network packet for the tx hash propagation message.
-type NewPooledTransactionHashes66 eth.NewPooledTransactionHashesPacket66
+type NewPooledTransactionHashes66 eth.NewPooledTransactionHashesPacket67
func (msg NewPooledTransactionHashes66) Code() int { return 24 }
func (msg NewPooledTransactionHashes66) ReqID() uint64 { return 0 }
@@ -138,12 +139,12 @@ type NewPooledTransactionHashes eth.NewPooledTransactionHashesPacket68
func (msg NewPooledTransactionHashes) Code() int { return 24 }
func (msg NewPooledTransactionHashes) ReqID() uint64 { return 0 }
-type GetPooledTransactions eth.GetPooledTransactionsPacket66
+type GetPooledTransactions eth.GetPooledTransactionsPacket
func (msg GetPooledTransactions) Code() int { return 25 }
func (msg GetPooledTransactions) ReqID() uint64 { return msg.RequestId }
-type PooledTransactions eth.PooledTransactionsPacket66
+type PooledTransactions eth.PooledTransactionsPacket
func (msg PooledTransactions) Code() int { return 26 }
func (msg PooledTransactions) ReqID() uint64 { return msg.RequestId }
@@ -179,25 +180,25 @@ func (c *Conn) Read() Message {
case (Status{}).Code():
msg = new(Status)
case (GetBlockHeaders{}).Code():
- ethMsg := new(eth.GetBlockHeadersPacket66)
+ ethMsg := new(eth.GetBlockHeadersPacket)
if err := rlp.DecodeBytes(rawData, ethMsg); err != nil {
return errorf("could not rlp decode message: %v", err)
}
return (*GetBlockHeaders)(ethMsg)
case (BlockHeaders{}).Code():
- ethMsg := new(eth.BlockHeadersPacket66)
+ ethMsg := new(eth.BlockHeadersPacket)
if err := rlp.DecodeBytes(rawData, ethMsg); err != nil {
return errorf("could not rlp decode message: %v", err)
}
return (*BlockHeaders)(ethMsg)
case (GetBlockBodies{}).Code():
- ethMsg := new(eth.GetBlockBodiesPacket66)
+ ethMsg := new(eth.GetBlockBodiesPacket)
if err := rlp.DecodeBytes(rawData, ethMsg); err != nil {
return errorf("could not rlp decode message: %v", err)
}
return (*GetBlockBodies)(ethMsg)
case (BlockBodies{}).Code():
- ethMsg := new(eth.BlockBodiesPacket66)
+ ethMsg := new(eth.BlockBodiesPacket)
if err := rlp.DecodeBytes(rawData, ethMsg); err != nil {
return errorf("could not rlp decode message: %v", err)
}
@@ -216,13 +217,13 @@ func (c *Conn) Read() Message {
}
msg = new(NewPooledTransactionHashes66)
case (GetPooledTransactions{}.Code()):
- ethMsg := new(eth.GetPooledTransactionsPacket66)
+ ethMsg := new(eth.GetPooledTransactionsPacket)
if err := rlp.DecodeBytes(rawData, ethMsg); err != nil {
return errorf("could not rlp decode message: %v", err)
}
return (*GetPooledTransactions)(ethMsg)
case (PooledTransactions{}.Code()):
- ethMsg := new(eth.PooledTransactionsPacket66)
+ ethMsg := new(eth.PooledTransactionsPacket)
if err := rlp.DecodeBytes(rawData, ethMsg); err != nil {
return errorf("could not rlp decode message: %v", err)
}
@@ -286,5 +287,5 @@ func (c *Conn) ReadSnap(id uint64) (Message, error) {
}
return snpMsg.(Message), nil
}
- return nil, fmt.Errorf("request timed out")
+ return nil, errors.New("request timed out")
}
diff --git a/cmd/devp2p/internal/v4test/discv4tests.go b/cmd/devp2p/internal/v4test/discv4tests.go
index d799e4194b..3afcfd0698 100644
--- a/cmd/devp2p/internal/v4test/discv4tests.go
+++ b/cmd/devp2p/internal/v4test/discv4tests.go
@@ -19,6 +19,7 @@ package v4test
import (
"bytes"
"crypto/rand"
+ "errors"
"fmt"
"net"
"time"
@@ -119,7 +120,7 @@ func (te *testenv) checkPingPong(pingHash []byte) error {
// and a PING. The two packets do not have to be in any particular order.
func (te *testenv) checkPong(reply v4wire.Packet, pingHash []byte) error {
if reply == nil {
- return fmt.Errorf("expected PONG reply, got nil")
+ return errors.New("expected PONG reply, got nil")
}
if reply.Kind() != v4wire.PongPacket {
return fmt.Errorf("expected PONG reply, got %v %v", reply.Name(), reply)
diff --git a/cmd/devp2p/keycmd.go b/cmd/devp2p/keycmd.go
index f409057fe0..98d7bd76ae 100644
--- a/cmd/devp2p/keycmd.go
+++ b/cmd/devp2p/keycmd.go
@@ -17,6 +17,7 @@
package main
import (
+ "errors"
"fmt"
"net"
@@ -86,7 +87,7 @@ var (
func genkey(ctx *cli.Context) error {
if ctx.NArg() != 1 {
- return fmt.Errorf("need key file as argument")
+ return errors.New("need key file as argument")
}
file := ctx.Args().Get(0)
@@ -126,7 +127,7 @@ func keyToRecord(ctx *cli.Context) error {
func makeRecord(ctx *cli.Context) (*enode.Node, error) {
if ctx.NArg() != 1 {
- return nil, fmt.Errorf("need key file as argument")
+ return nil, errors.New("need key file as argument")
}
var (
diff --git a/cmd/devp2p/nodeset.go b/cmd/devp2p/nodeset.go
index 33c39f4b9e..7360dc5bcf 100644
--- a/cmd/devp2p/nodeset.go
+++ b/cmd/devp2p/nodeset.go
@@ -21,11 +21,11 @@ import (
"encoding/json"
"fmt"
"os"
- "sort"
"time"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/p2p/enode"
+ "golang.org/x/exp/slices"
)
const jsonIndent = " "
@@ -77,8 +77,8 @@ func (ns nodeSet) nodes() []*enode.Node {
result = append(result, n.N)
}
// Sort by ID.
- sort.Slice(result, func(i, j int) bool {
- return bytes.Compare(result[i].ID().Bytes(), result[j].ID().Bytes()) < 0
+ slices.SortFunc(result, func(a, b *enode.Node) int {
+ return bytes.Compare(a.ID().Bytes(), b.ID().Bytes())
})
return result
}
@@ -103,8 +103,14 @@ func (ns nodeSet) topN(n int) nodeSet {
for _, v := range ns {
byscore = append(byscore, v)
}
- sort.Slice(byscore, func(i, j int) bool {
- return byscore[i].Score >= byscore[j].Score
+ slices.SortFunc(byscore, func(a, b nodeJSON) int {
+ if a.Score > b.Score {
+ return -1
+ }
+ if a.Score < b.Score {
+ return 1
+ }
+ return 0
})
result := make(nodeSet, n)
for _, v := range byscore[:n] {
diff --git a/cmd/devp2p/nodesetcmd.go b/cmd/devp2p/nodesetcmd.go
index 2faa2882e5..6fbc185ad8 100644
--- a/cmd/devp2p/nodesetcmd.go
+++ b/cmd/devp2p/nodesetcmd.go
@@ -25,6 +25,7 @@ import (
"strings"
"time"
+ "github.com/ethereum/go-ethereum/core"
"github.com/ethereum/go-ethereum/core/forkid"
"github.com/ethereum/go-ethereum/p2p/enr"
"github.com/ethereum/go-ethereum/params"
@@ -59,7 +60,7 @@ var (
func nodesetInfo(ctx *cli.Context) error {
if ctx.NArg() < 1 {
- return fmt.Errorf("need nodes file as argument")
+ return errors.New("need nodes file as argument")
}
ns := loadNodesJSON(ctx.Args().First())
@@ -98,7 +99,7 @@ func showAttributeCounts(ns nodeSet) {
func nodesetFilter(ctx *cli.Context) error {
if ctx.NArg() < 1 {
- return fmt.Errorf("need nodes file as argument")
+ return errors.New("need nodes file as argument")
}
// Parse -limit.
limit, err := parseFilterLimit(ctx.Args().Tail())
@@ -228,13 +229,13 @@ func ethFilter(args []string) (nodeFilter, error) {
var filter forkid.Filter
switch args[0] {
case "mainnet":
- filter = forkid.NewStaticFilter(params.MainnetChainConfig, params.MainnetGenesisHash)
- case "rinkeby":
- filter = forkid.NewStaticFilter(params.RinkebyChainConfig, params.RinkebyGenesisHash)
+ filter = forkid.NewStaticFilter(params.MainnetChainConfig, core.DefaultGenesisBlock().ToBlock())
case "goerli":
- filter = forkid.NewStaticFilter(params.GoerliChainConfig, params.GoerliGenesisHash)
+ filter = forkid.NewStaticFilter(params.GoerliChainConfig, core.DefaultGoerliGenesisBlock().ToBlock())
case "sepolia":
- filter = forkid.NewStaticFilter(params.SepoliaChainConfig, params.SepoliaGenesisHash)
+ filter = forkid.NewStaticFilter(params.SepoliaChainConfig, core.DefaultSepoliaGenesisBlock().ToBlock())
+ case "holesky":
+ filter = forkid.NewStaticFilter(params.HoleskyChainConfig, core.DefaultHoleskyGenesisBlock().ToBlock())
default:
return nil, fmt.Errorf("unknown network %q", args[0])
}
diff --git a/cmd/devp2p/rlpxcmd.go b/cmd/devp2p/rlpxcmd.go
index 42b38120c4..dccecf3c37 100644
--- a/cmd/devp2p/rlpxcmd.go
+++ b/cmd/devp2p/rlpxcmd.go
@@ -17,6 +17,7 @@
package main
import (
+ "errors"
"fmt"
"net"
@@ -91,7 +92,7 @@ func rlpxPing(ctx *cli.Context) error {
case 1:
var msg []p2p.DiscReason
if rlp.DecodeBytes(data, &msg); len(msg) == 0 {
- return fmt.Errorf("invalid disconnect message")
+ return errors.New("invalid disconnect message")
}
return fmt.Errorf("received disconnect message: %v", msg[0])
default:
diff --git a/cmd/evm/README.md b/cmd/evm/README.md
index 2962158612..e6c6fe06ad 100644
--- a/cmd/evm/README.md
+++ b/cmd/evm/README.md
@@ -342,7 +342,7 @@ To make `t8n` apply these, the following inputs are required:
- For ethash, it is `5000000000000000000` `wei`,
- If this is not defined, mining rewards are not applied,
- A value of `0` is valid, and causes accounts to be 'touched'.
-- For each ommer, the tool needs to be given an `addres\` and a `delta`. This
+- For each ommer, the tool needs to be given an `address\` and a `delta`. This
is done via the `ommers` field in `env`.
Note: the tool does not verify that e.g. the normal uncle rules apply,
diff --git a/cmd/evm/blockrunner.go b/cmd/evm/blockrunner.go
index ffd76b8fb0..42be6726b5 100644
--- a/cmd/evm/blockrunner.go
+++ b/cmd/evm/blockrunner.go
@@ -21,8 +21,11 @@ import (
"errors"
"fmt"
"os"
+ "sort"
- "github.com/ethereum/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/core/rawdb"
+ "github.com/ethereum/go-ethereum/core/vm"
+ "github.com/ethereum/go-ethereum/eth/tracers/logger"
"github.com/ethereum/go-ethereum/tests"
"github.com/urfave/cli/v2"
)
@@ -38,11 +41,17 @@ func blockTestCmd(ctx *cli.Context) error {
if len(ctx.Args().First()) == 0 {
return errors.New("path-to-test argument required")
}
- // Configure the go-ethereum logger
- glogger := log.NewGlogHandler(log.StreamHandler(os.Stderr, log.TerminalFormat(false)))
- glogger.Verbosity(log.Lvl(ctx.Int(VerbosityFlag.Name)))
- log.Root().SetHandler(glogger)
+ var tracer vm.EVMLogger
+ // Configure the EVM logger
+ if ctx.Bool(MachineFlag.Name) {
+ tracer = logger.NewJSONLogger(&logger.Config{
+ EnableMemory: !ctx.Bool(DisableMemoryFlag.Name),
+ DisableStack: ctx.Bool(DisableStackFlag.Name),
+ DisableStorage: ctx.Bool(DisableStorageFlag.Name),
+ EnableReturnData: !ctx.Bool(DisableReturnDataFlag.Name),
+ }, os.Stderr)
+ }
// Load the test content from the input file
src, err := os.ReadFile(ctx.Args().First())
if err != nil {
@@ -52,9 +61,16 @@ func blockTestCmd(ctx *cli.Context) error {
if err = json.Unmarshal(src, &tests); err != nil {
return err
}
- for i, test := range tests {
- if err := test.Run(false); err != nil {
- return fmt.Errorf("test %v: %w", i, err)
+ // run them in order
+ var keys []string
+ for key := range tests {
+ keys = append(keys, key)
+ }
+ sort.Strings(keys)
+ for _, name := range keys {
+ test := tests[name]
+ if err := test.Run(false, rawdb.HashScheme, tracer); err != nil {
+ return fmt.Errorf("test %v: %w", name, err)
}
}
return nil
diff --git a/cmd/evm/internal/t8ntool/block.go b/cmd/evm/internal/t8ntool/block.go
index 7a9c4b6101..5c0e28e284 100644
--- a/cmd/evm/internal/t8ntool/block.go
+++ b/cmd/evm/internal/t8ntool/block.go
@@ -28,7 +28,6 @@ import (
"github.com/ethereum/go-ethereum/common/hexutil"
"github.com/ethereum/go-ethereum/common/math"
"github.com/ethereum/go-ethereum/consensus/clique"
- "github.com/ethereum/go-ethereum/consensus/ethash"
"github.com/ethereum/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/crypto"
"github.com/ethereum/go-ethereum/log"
@@ -38,33 +37,38 @@ import (
//go:generate go run github.com/fjl/gencodec -type header -field-override headerMarshaling -out gen_header.go
type header struct {
- ParentHash common.Hash `json:"parentHash"`
- OmmerHash *common.Hash `json:"sha3Uncles"`
- Coinbase *common.Address `json:"miner"`
- Root common.Hash `json:"stateRoot" gencodec:"required"`
- TxHash *common.Hash `json:"transactionsRoot"`
- ReceiptHash *common.Hash `json:"receiptsRoot"`
- Bloom types.Bloom `json:"logsBloom"`
- Difficulty *big.Int `json:"difficulty"`
- Number *big.Int `json:"number" gencodec:"required"`
- GasLimit uint64 `json:"gasLimit" gencodec:"required"`
- GasUsed uint64 `json:"gasUsed"`
- Time uint64 `json:"timestamp" gencodec:"required"`
- Extra []byte `json:"extraData"`
- MixDigest common.Hash `json:"mixHash"`
- Nonce *types.BlockNonce `json:"nonce"`
- BaseFee *big.Int `json:"baseFeePerGas" rlp:"optional"`
- WithdrawalsHash *common.Hash `json:"withdrawalsRoot" rlp:"optional"`
+ ParentHash common.Hash `json:"parentHash"`
+ OmmerHash *common.Hash `json:"sha3Uncles"`
+ Coinbase *common.Address `json:"miner"`
+ Root common.Hash `json:"stateRoot" gencodec:"required"`
+ TxHash *common.Hash `json:"transactionsRoot"`
+ ReceiptHash *common.Hash `json:"receiptsRoot"`
+ Bloom types.Bloom `json:"logsBloom"`
+ Difficulty *big.Int `json:"difficulty"`
+ Number *big.Int `json:"number" gencodec:"required"`
+ GasLimit uint64 `json:"gasLimit" gencodec:"required"`
+ GasUsed uint64 `json:"gasUsed"`
+ Time uint64 `json:"timestamp" gencodec:"required"`
+ Extra []byte `json:"extraData"`
+ MixDigest common.Hash `json:"mixHash"`
+ Nonce *types.BlockNonce `json:"nonce"`
+ BaseFee *big.Int `json:"baseFeePerGas" rlp:"optional"`
+ WithdrawalsHash *common.Hash `json:"withdrawalsRoot" rlp:"optional"`
+ BlobGasUsed *uint64 `json:"blobGasUsed" rlp:"optional"`
+ ExcessBlobGas *uint64 `json:"excessBlobGas" rlp:"optional"`
+ ParentBeaconBlockRoot *common.Hash `json:"parentBeaconBlockRoot" rlp:"optional"`
}
type headerMarshaling struct {
- Difficulty *math.HexOrDecimal256
- Number *math.HexOrDecimal256
- GasLimit math.HexOrDecimal64
- GasUsed math.HexOrDecimal64
- Time math.HexOrDecimal64
- Extra hexutil.Bytes
- BaseFee *math.HexOrDecimal256
+ Difficulty *math.HexOrDecimal256
+ Number *math.HexOrDecimal256
+ GasLimit math.HexOrDecimal64
+ GasUsed math.HexOrDecimal64
+ Time math.HexOrDecimal64
+ Extra hexutil.Bytes
+ BaseFee *math.HexOrDecimal256
+ BlobGasUsed *math.HexOrDecimal64
+ ExcessBlobGas *math.HexOrDecimal64
}
type bbInput struct {
@@ -74,11 +78,9 @@ type bbInput struct {
Withdrawals []*types.Withdrawal `json:"withdrawals,omitempty"`
Clique *cliqueInput `json:"clique,omitempty"`
- Ethash bool `json:"-"`
- EthashDir string `json:"-"`
- PowMode ethash.Mode `json:"-"`
- Txs []*types.Transaction `json:"-"`
- Ommers []*types.Header `json:"-"`
+ Ethash bool `json:"-"`
+ Txs []*types.Transaction `json:"-"`
+ Ommers []*types.Header `json:"-"`
}
type cliqueInput struct {
@@ -116,22 +118,25 @@ func (c *cliqueInput) UnmarshalJSON(input []byte) error {
// ToBlock converts i into a *types.Block
func (i *bbInput) ToBlock() *types.Block {
header := &types.Header{
- ParentHash: i.Header.ParentHash,
- UncleHash: types.EmptyUncleHash,
- Coinbase: common.Address{},
- Root: i.Header.Root,
- TxHash: types.EmptyTxsHash,
- ReceiptHash: types.EmptyReceiptsHash,
- Bloom: i.Header.Bloom,
- Difficulty: common.Big0,
- Number: i.Header.Number,
- GasLimit: i.Header.GasLimit,
- GasUsed: i.Header.GasUsed,
- Time: i.Header.Time,
- Extra: i.Header.Extra,
- MixDigest: i.Header.MixDigest,
- BaseFee: i.Header.BaseFee,
- WithdrawalsHash: i.Header.WithdrawalsHash,
+ ParentHash: i.Header.ParentHash,
+ UncleHash: types.EmptyUncleHash,
+ Coinbase: common.Address{},
+ Root: i.Header.Root,
+ TxHash: types.EmptyTxsHash,
+ ReceiptHash: types.EmptyReceiptsHash,
+ Bloom: i.Header.Bloom,
+ Difficulty: common.Big0,
+ Number: i.Header.Number,
+ GasLimit: i.Header.GasLimit,
+ GasUsed: i.Header.GasUsed,
+ Time: i.Header.Time,
+ Extra: i.Header.Extra,
+ MixDigest: i.Header.MixDigest,
+ BaseFee: i.Header.BaseFee,
+ WithdrawalsHash: i.Header.WithdrawalsHash,
+ BlobGasUsed: i.Header.BlobGasUsed,
+ ExcessBlobGas: i.Header.ExcessBlobGas,
+ ParentBeaconRoot: i.Header.ParentBeaconBlockRoot,
}
// Fill optional values.
@@ -153,7 +158,7 @@ func (i *bbInput) ToBlock() *types.Block {
if i.Header.Nonce != nil {
header.Nonce = *i.Header.Nonce
}
- if header.Difficulty != nil {
+ if i.Header.Difficulty != nil {
header.Difficulty = i.Header.Difficulty
}
return types.NewBlockWithHeader(header).WithBody(i.Txs, i.Ommers).WithWithdrawals(i.Withdrawals)
@@ -162,8 +167,6 @@ func (i *bbInput) ToBlock() *types.Block {
// SealBlock seals the given block using the configured engine.
func (i *bbInput) SealBlock(block *types.Block) (*types.Block, error) {
switch {
- case i.Ethash:
- return i.sealEthash(block)
case i.Clique != nil:
return i.sealClique(block)
default:
@@ -171,50 +174,23 @@ func (i *bbInput) SealBlock(block *types.Block) (*types.Block, error) {
}
}
-// sealEthash seals the given block using ethash.
-func (i *bbInput) sealEthash(block *types.Block) (*types.Block, error) {
- if i.Header.Nonce != nil {
- return nil, NewError(ErrorConfig, fmt.Errorf("sealing with ethash will overwrite provided nonce"))
- }
- ethashConfig := ethash.Config{
- PowMode: i.PowMode,
- DatasetDir: i.EthashDir,
- CacheDir: i.EthashDir,
- DatasetsInMem: 1,
- DatasetsOnDisk: 2,
- CachesInMem: 2,
- CachesOnDisk: 3,
- }
- engine := ethash.New(ethashConfig, nil, true)
- defer engine.Close()
- // Use a buffered chan for results.
- // If the testmode is used, the sealer will return quickly, and complain
- // "Sealing result is not read by miner" if it cannot write the result.
- results := make(chan *types.Block, 1)
- if err := engine.Seal(nil, block, results, nil); err != nil {
- panic(fmt.Sprintf("failed to seal block: %v", err))
- }
- found := <-results
- return block.WithSeal(found.Header()), nil
-}
-
// sealClique seals the given block using clique.
func (i *bbInput) sealClique(block *types.Block) (*types.Block, error) {
// If any clique value overwrites an explicit header value, fail
// to avoid silently building a block with unexpected values.
if i.Header.Extra != nil {
- return nil, NewError(ErrorConfig, fmt.Errorf("sealing with clique will overwrite provided extra data"))
+ return nil, NewError(ErrorConfig, errors.New("sealing with clique will overwrite provided extra data"))
}
header := block.Header()
if i.Clique.Voted != nil {
if i.Header.Coinbase != nil {
- return nil, NewError(ErrorConfig, fmt.Errorf("sealing with clique and voting will overwrite provided coinbase"))
+ return nil, NewError(ErrorConfig, errors.New("sealing with clique and voting will overwrite provided coinbase"))
}
header.Coinbase = *i.Clique.Voted
}
if i.Clique.Authorize != nil {
if i.Header.Nonce != nil {
- return nil, NewError(ErrorConfig, fmt.Errorf("sealing with clique and voting will overwrite provided nonce"))
+ return nil, NewError(ErrorConfig, errors.New("sealing with clique and voting will overwrite provided nonce"))
}
if *i.Clique.Authorize {
header.Nonce = [8]byte{}
@@ -267,28 +243,8 @@ func readInput(ctx *cli.Context) (*bbInput, error) {
withdrawalsStr = ctx.String(InputWithdrawalsFlag.Name)
txsStr = ctx.String(InputTxsRlpFlag.Name)
cliqueStr = ctx.String(SealCliqueFlag.Name)
- ethashOn = ctx.Bool(SealEthashFlag.Name)
- ethashDir = ctx.String(SealEthashDirFlag.Name)
- ethashMode = ctx.String(SealEthashModeFlag.Name)
inputData = &bbInput{}
)
- if ethashOn && cliqueStr != "" {
- return nil, NewError(ErrorConfig, fmt.Errorf("both ethash and clique sealing specified, only one may be chosen"))
- }
- if ethashOn {
- inputData.Ethash = ethashOn
- inputData.EthashDir = ethashDir
- switch ethashMode {
- case "normal":
- inputData.PowMode = ethash.ModeNormal
- case "test":
- inputData.PowMode = ethash.ModeTest
- case "fake":
- inputData.PowMode = ethash.ModeFake
- default:
- return nil, NewError(ErrorConfig, fmt.Errorf("unknown pow mode: %s, supported modes: test, fake, normal", ethashMode))
- }
- }
if headerStr == stdinSelector || ommersStr == stdinSelector || txsStr == stdinSelector || cliqueStr == stdinSelector {
decoder := json.NewDecoder(os.Stdin)
if err := decoder.Decode(inputData); err != nil {
@@ -358,7 +314,7 @@ func readInput(ctx *cli.Context) (*bbInput, error) {
return inputData, nil
}
-// dispatchOutput writes the output data to either stderr or stdout, or to the specified
+// dispatchBlock writes the output data to either stderr or stdout, or to the specified
// files
func dispatchBlock(ctx *cli.Context, baseDir string, block *types.Block) error {
raw, _ := rlp.EncodeToBytes(block)
diff --git a/cmd/evm/internal/t8ntool/execution.go b/cmd/evm/internal/t8ntool/execution.go
index b7e463bfd5..d551ca9fe7 100644
--- a/cmd/evm/internal/t8ntool/execution.go
+++ b/cmd/evm/internal/t8ntool/execution.go
@@ -19,12 +19,12 @@ package t8ntool
import (
"fmt"
"math/big"
- "os"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/common/math"
"github.com/ethereum/go-ethereum/consensus/ethash"
"github.com/ethereum/go-ethereum/consensus/misc"
+ "github.com/ethereum/go-ethereum/consensus/misc/eip4844"
"github.com/ethereum/go-ethereum/core"
"github.com/ethereum/go-ethereum/core/rawdb"
"github.com/ethereum/go-ethereum/core/state"
@@ -47,17 +47,19 @@ type Prestate struct {
// ExecutionResult contains the execution status after running a state test, any
// error that might have occurred and a dump of the final state if requested.
type ExecutionResult struct {
- StateRoot common.Hash `json:"stateRoot"`
- TxRoot common.Hash `json:"txRoot"`
- ReceiptRoot common.Hash `json:"receiptsRoot"`
- LogsHash common.Hash `json:"logsHash"`
- Bloom types.Bloom `json:"logsBloom" gencodec:"required"`
- Receipts types.Receipts `json:"receipts"`
- Rejected []*rejectedTx `json:"rejected,omitempty"`
- Difficulty *math.HexOrDecimal256 `json:"currentDifficulty" gencodec:"required"`
- GasUsed math.HexOrDecimal64 `json:"gasUsed"`
- BaseFee *math.HexOrDecimal256 `json:"currentBaseFee,omitempty"`
- WithdrawalsRoot *common.Hash `json:"withdrawalsRoot,omitempty"`
+ StateRoot common.Hash `json:"stateRoot"`
+ TxRoot common.Hash `json:"txRoot"`
+ ReceiptRoot common.Hash `json:"receiptsRoot"`
+ LogsHash common.Hash `json:"logsHash"`
+ Bloom types.Bloom `json:"logsBloom" gencodec:"required"`
+ Receipts types.Receipts `json:"receipts"`
+ Rejected []*rejectedTx `json:"rejected,omitempty"`
+ Difficulty *math.HexOrDecimal256 `json:"currentDifficulty" gencodec:"required"`
+ GasUsed math.HexOrDecimal64 `json:"gasUsed"`
+ BaseFee *math.HexOrDecimal256 `json:"currentBaseFee,omitempty"`
+ WithdrawalsRoot *common.Hash `json:"withdrawalsRoot,omitempty"`
+ CurrentExcessBlobGas *math.HexOrDecimal64 `json:"currentExcessBlobGas,omitempty"`
+ CurrentBlobGasUsed *math.HexOrDecimal64 `json:"blobGasUsed,omitempty"`
}
type ommer struct {
@@ -67,37 +69,44 @@ type ommer struct {
//go:generate go run github.com/fjl/gencodec -type stEnv -field-override stEnvMarshaling -out gen_stenv.go
type stEnv struct {
- Coinbase common.Address `json:"currentCoinbase" gencodec:"required"`
- Difficulty *big.Int `json:"currentDifficulty"`
- Random *big.Int `json:"currentRandom"`
- ParentDifficulty *big.Int `json:"parentDifficulty"`
- ParentBaseFee *big.Int `json:"parentBaseFee,omitempty"`
- ParentGasUsed uint64 `json:"parentGasUsed,omitempty"`
- ParentGasLimit uint64 `json:"parentGasLimit,omitempty"`
- GasLimit uint64 `json:"currentGasLimit" gencodec:"required"`
- Number uint64 `json:"currentNumber" gencodec:"required"`
- Timestamp uint64 `json:"currentTimestamp" gencodec:"required"`
- ParentTimestamp uint64 `json:"parentTimestamp,omitempty"`
- BlockHashes map[math.HexOrDecimal64]common.Hash `json:"blockHashes,omitempty"`
- Ommers []ommer `json:"ommers,omitempty"`
- Withdrawals []*types.Withdrawal `json:"withdrawals,omitempty"`
- BaseFee *big.Int `json:"currentBaseFee,omitempty"`
- ParentUncleHash common.Hash `json:"parentUncleHash"`
+ Coinbase common.Address `json:"currentCoinbase" gencodec:"required"`
+ Difficulty *big.Int `json:"currentDifficulty"`
+ Random *big.Int `json:"currentRandom"`
+ ParentDifficulty *big.Int `json:"parentDifficulty"`
+ ParentBaseFee *big.Int `json:"parentBaseFee,omitempty"`
+ ParentGasUsed uint64 `json:"parentGasUsed,omitempty"`
+ ParentGasLimit uint64 `json:"parentGasLimit,omitempty"`
+ GasLimit uint64 `json:"currentGasLimit" gencodec:"required"`
+ Number uint64 `json:"currentNumber" gencodec:"required"`
+ Timestamp uint64 `json:"currentTimestamp" gencodec:"required"`
+ ParentTimestamp uint64 `json:"parentTimestamp,omitempty"`
+ BlockHashes map[math.HexOrDecimal64]common.Hash `json:"blockHashes,omitempty"`
+ Ommers []ommer `json:"ommers,omitempty"`
+ Withdrawals []*types.Withdrawal `json:"withdrawals,omitempty"`
+ BaseFee *big.Int `json:"currentBaseFee,omitempty"`
+ ParentUncleHash common.Hash `json:"parentUncleHash"`
+ ExcessBlobGas *uint64 `json:"currentExcessBlobGas,omitempty"`
+ ParentExcessBlobGas *uint64 `json:"parentExcessBlobGas,omitempty"`
+ ParentBlobGasUsed *uint64 `json:"parentBlobGasUsed,omitempty"`
+ ParentBeaconBlockRoot *common.Hash `json:"parentBeaconBlockRoot"`
}
type stEnvMarshaling struct {
- Coinbase common.UnprefixedAddress
- Difficulty *math.HexOrDecimal256
- Random *math.HexOrDecimal256
- ParentDifficulty *math.HexOrDecimal256
- ParentBaseFee *math.HexOrDecimal256
- ParentGasUsed math.HexOrDecimal64
- ParentGasLimit math.HexOrDecimal64
- GasLimit math.HexOrDecimal64
- Number math.HexOrDecimal64
- Timestamp math.HexOrDecimal64
- ParentTimestamp math.HexOrDecimal64
- BaseFee *math.HexOrDecimal256
+ Coinbase common.UnprefixedAddress
+ Difficulty *math.HexOrDecimal256
+ Random *math.HexOrDecimal256
+ ParentDifficulty *math.HexOrDecimal256
+ ParentBaseFee *math.HexOrDecimal256
+ ParentGasUsed math.HexOrDecimal64
+ ParentGasLimit math.HexOrDecimal64
+ GasLimit math.HexOrDecimal64
+ Number math.HexOrDecimal64
+ Timestamp math.HexOrDecimal64
+ ParentTimestamp math.HexOrDecimal64
+ BaseFee *math.HexOrDecimal256
+ ExcessBlobGas *math.HexOrDecimal64
+ ParentExcessBlobGas *math.HexOrDecimal64
+ ParentBlobGasUsed *math.HexOrDecimal64
}
type rejectedTx struct {
@@ -125,7 +134,7 @@ func (pre *Prestate) Apply(vmConfig vm.Config, chainConfig *params.ChainConfig,
}
var (
statedb = MakePreState(rawdb.NewMemoryDatabase(), pre.Pre)
- signer = types.MakeSigner(chainConfig, new(big.Int).SetUint64(pre.Env.Number))
+ signer = types.MakeSigner(chainConfig, new(big.Int).SetUint64(pre.Env.Number), pre.Env.Timestamp)
gaspool = new(core.GasPool)
blockHash = common.Hash{0x13, 0x37}
rejectedTxs []*rejectedTx
@@ -154,6 +163,21 @@ func (pre *Prestate) Apply(vmConfig vm.Config, chainConfig *params.ChainConfig,
rnd := common.BigToHash(pre.Env.Random)
vmContext.Random = &rnd
}
+ // Calculate the BlobBaseFee
+ var excessBlobGas uint64
+ if pre.Env.ExcessBlobGas != nil {
+ excessBlobGas := *pre.Env.ExcessBlobGas
+ vmContext.BlobBaseFee = eip4844.CalcBlobFee(excessBlobGas)
+ } else {
+ // If it is not explicitly defined, but we have the parent values, we try
+ // to calculate it ourselves.
+ parentExcessBlobGas := pre.Env.ParentExcessBlobGas
+ parentBlobGasUsed := pre.Env.ParentBlobGasUsed
+ if parentExcessBlobGas != nil && parentBlobGasUsed != nil {
+ excessBlobGas = eip4844.CalcExcessBlobGas(*parentExcessBlobGas, *parentBlobGasUsed)
+ vmContext.BlobBaseFee = eip4844.CalcBlobFee(excessBlobGas)
+ }
+ }
// If DAO is supported/enabled, we need to handle it here. In geth 'proper', it's
// done in StateProcessor.Process(block, ...), right before transactions are applied.
if chainConfig.DAOForkSupport &&
@@ -161,12 +185,24 @@ func (pre *Prestate) Apply(vmConfig vm.Config, chainConfig *params.ChainConfig,
chainConfig.DAOForkBlock.Cmp(new(big.Int).SetUint64(pre.Env.Number)) == 0 {
misc.ApplyDAOHardFork(statedb)
}
-
if chainConfig.PreContractForkBlock != nil && chainConfig.PreContractForkBlock.Cmp(new(big.Int).SetUint64(pre.Env.Number)) == 0 {
misc.ApplyPreContractHardFork(statedb)
}
-
+ if beaconRoot := pre.Env.ParentBeaconBlockRoot; beaconRoot != nil {
+ evm := vm.NewEVM(vmContext, vm.TxContext{}, statedb, chainConfig, vmConfig)
+ core.ProcessBeaconBlockRoot(*beaconRoot, evm, statedb)
+ }
+ var blobGasUsed uint64
for i, tx := range txs {
+ if tx.Type() == types.BlobTxType && vmContext.BlobBaseFee == nil {
+ errMsg := "blob tx used but field env.ExcessBlobGas missing"
+ log.Warn("rejected tx", "index", i, "hash", tx.Hash(), "error", errMsg)
+ rejectedTxs = append(rejectedTxs, &rejectedTx{i, errMsg})
+ continue
+ }
+ if tx.Type() == types.BlobTxType {
+ blobGasUsed += uint64(params.BlobTxBlobGasPerBlob * len(tx.BlobHashes()))
+ }
msg, err := core.TransactionToMessage(tx, signer, pre.Env.BaseFee)
if err != nil {
log.Warn("rejected tx", "index", i, "hash", tx.Hash(), "error", err)
@@ -178,7 +214,6 @@ func (pre *Prestate) Apply(vmConfig vm.Config, chainConfig *params.ChainConfig,
return nil, nil, err
}
vmConfig.Tracer = tracer
- vmConfig.Debug = (tracer != nil)
statedb.SetTxContext(tx.Hash(), txIndex)
var (
@@ -245,7 +280,7 @@ func (pre *Prestate) Apply(vmConfig vm.Config, chainConfig *params.ChainConfig,
if miningReward >= 0 {
// Add mining reward. The mining reward may be `0`, which only makes a difference in the cases
// where
- // - the coinbase suicided, or
+ // - the coinbase self-destructed, or
// - there are only 'bad' transactions, which aren't executed. In those cases,
// the coinbase gets no txfee, so isn't created, and thus needs to be touched
var (
@@ -272,9 +307,8 @@ func (pre *Prestate) Apply(vmConfig vm.Config, chainConfig *params.ChainConfig,
statedb.AddBalance(w.Address, amount)
}
// Commit block
- root, err := statedb.Commit(chainConfig.IsEIP158(vmContext.BlockNumber))
+ root, err := statedb.Commit(vmContext.BlockNumber.Uint64(), chainConfig.IsEIP158(vmContext.BlockNumber))
if err != nil {
- fmt.Fprintf(os.Stderr, "Could not commit state: %v", err)
return nil, nil, NewError(ErrorEVM, fmt.Errorf("could not commit state: %v", err))
}
execRs := &ExecutionResult{
@@ -293,12 +327,22 @@ func (pre *Prestate) Apply(vmConfig vm.Config, chainConfig *params.ChainConfig,
h := types.DeriveSha(types.Withdrawals(pre.Env.Withdrawals), trie.NewStackTrie(nil))
execRs.WithdrawalsRoot = &h
}
+ if vmContext.BlobBaseFee != nil {
+ execRs.CurrentExcessBlobGas = (*math.HexOrDecimal64)(&excessBlobGas)
+ execRs.CurrentBlobGasUsed = (*math.HexOrDecimal64)(&blobGasUsed)
+ }
+ // Re-create statedb instance with new root upon the updated database
+ // for accessing latest states.
+ statedb, err = state.New(root, statedb.Database(), nil)
+ if err != nil {
+ return nil, nil, NewError(ErrorEVM, fmt.Errorf("could not reopen state: %v", err))
+ }
return statedb, execRs, nil
}
func MakePreState(db ethdb.Database, accounts core.GenesisAlloc) *state.StateDB {
sdb := state.NewDatabaseWithConfig(db, &trie.Config{Preimages: true})
- statedb, _ := state.New(common.Hash{}, sdb, nil)
+ statedb, _ := state.New(types.EmptyRootHash, sdb, nil)
for addr, a := range accounts {
statedb.SetCode(addr, a.Code)
statedb.SetNonce(addr, a.Nonce)
@@ -308,7 +352,7 @@ func MakePreState(db ethdb.Database, accounts core.GenesisAlloc) *state.StateDB
}
}
// Commit and re-open to start with a clean state.
- root, _ := statedb.Commit(false)
+ root, _ := statedb.Commit(0, false)
statedb, _ = state.New(root, sdb, nil)
return statedb
}
diff --git a/cmd/evm/internal/t8ntool/flags.go b/cmd/evm/internal/t8ntool/flags.go
index 339523593a..de19dbc851 100644
--- a/cmd/evm/internal/t8ntool/flags.go
+++ b/cmd/evm/internal/t8ntool/flags.go
@@ -125,19 +125,6 @@ var (
Name: "seal.clique",
Usage: "Seal block with Clique. `stdin` or file name of where to find the Clique sealing data.",
}
- SealEthashFlag = &cli.BoolFlag{
- Name: "seal.ethash",
- Usage: "Seal block with ethash.",
- }
- SealEthashDirFlag = &cli.StringFlag{
- Name: "seal.ethash.dir",
- Usage: "Path to ethash DAG. If none exists, a new DAG will be generated.",
- }
- SealEthashModeFlag = &cli.StringFlag{
- Name: "seal.ethash.mode",
- Usage: "Defines the type and amount of PoW verification an ethash engine makes.",
- Value: "normal",
- }
RewardFlag = &cli.Int64Flag{
Name: "state.reward",
Usage: "Mining reward. Set to -1 to disable",
diff --git a/cmd/evm/internal/t8ntool/gen_header.go b/cmd/evm/internal/t8ntool/gen_header.go
index 76228394dc..a8c8668978 100644
--- a/cmd/evm/internal/t8ntool/gen_header.go
+++ b/cmd/evm/internal/t8ntool/gen_header.go
@@ -18,23 +18,26 @@ var _ = (*headerMarshaling)(nil)
// MarshalJSON marshals as JSON.
func (h header) MarshalJSON() ([]byte, error) {
type header struct {
- ParentHash common.Hash `json:"parentHash"`
- OmmerHash *common.Hash `json:"sha3Uncles"`
- Coinbase *common.Address `json:"miner"`
- Root common.Hash `json:"stateRoot" gencodec:"required"`
- TxHash *common.Hash `json:"transactionsRoot"`
- ReceiptHash *common.Hash `json:"receiptsRoot"`
- Bloom types.Bloom `json:"logsBloom"`
- Difficulty *math.HexOrDecimal256 `json:"difficulty"`
- Number *math.HexOrDecimal256 `json:"number" gencodec:"required"`
- GasLimit math.HexOrDecimal64 `json:"gasLimit" gencodec:"required"`
- GasUsed math.HexOrDecimal64 `json:"gasUsed"`
- Time math.HexOrDecimal64 `json:"timestamp" gencodec:"required"`
- Extra hexutil.Bytes `json:"extraData"`
- MixDigest common.Hash `json:"mixHash"`
- Nonce *types.BlockNonce `json:"nonce"`
- BaseFee *math.HexOrDecimal256 `json:"baseFeePerGas" rlp:"optional"`
- WithdrawalsHash *common.Hash `json:"withdrawalsRoot" rlp:"optional"`
+ ParentHash common.Hash `json:"parentHash"`
+ OmmerHash *common.Hash `json:"sha3Uncles"`
+ Coinbase *common.Address `json:"miner"`
+ Root common.Hash `json:"stateRoot" gencodec:"required"`
+ TxHash *common.Hash `json:"transactionsRoot"`
+ ReceiptHash *common.Hash `json:"receiptsRoot"`
+ Bloom types.Bloom `json:"logsBloom"`
+ Difficulty *math.HexOrDecimal256 `json:"difficulty"`
+ Number *math.HexOrDecimal256 `json:"number" gencodec:"required"`
+ GasLimit math.HexOrDecimal64 `json:"gasLimit" gencodec:"required"`
+ GasUsed math.HexOrDecimal64 `json:"gasUsed"`
+ Time math.HexOrDecimal64 `json:"timestamp" gencodec:"required"`
+ Extra hexutil.Bytes `json:"extraData"`
+ MixDigest common.Hash `json:"mixHash"`
+ Nonce *types.BlockNonce `json:"nonce"`
+ BaseFee *math.HexOrDecimal256 `json:"baseFeePerGas" rlp:"optional"`
+ WithdrawalsHash *common.Hash `json:"withdrawalsRoot" rlp:"optional"`
+ BlobGasUsed *math.HexOrDecimal64 `json:"blobGasUsed" rlp:"optional"`
+ ExcessBlobGas *math.HexOrDecimal64 `json:"excessBlobGas" rlp:"optional"`
+ ParentBeaconBlockRoot *common.Hash `json:"parentBeaconBlockRoot" rlp:"optional"`
}
var enc header
enc.ParentHash = h.ParentHash
@@ -54,29 +57,35 @@ func (h header) MarshalJSON() ([]byte, error) {
enc.Nonce = h.Nonce
enc.BaseFee = (*math.HexOrDecimal256)(h.BaseFee)
enc.WithdrawalsHash = h.WithdrawalsHash
+ enc.BlobGasUsed = (*math.HexOrDecimal64)(h.BlobGasUsed)
+ enc.ExcessBlobGas = (*math.HexOrDecimal64)(h.ExcessBlobGas)
+ enc.ParentBeaconBlockRoot = h.ParentBeaconBlockRoot
return json.Marshal(&enc)
}
// UnmarshalJSON unmarshals from JSON.
func (h *header) UnmarshalJSON(input []byte) error {
type header struct {
- ParentHash *common.Hash `json:"parentHash"`
- OmmerHash *common.Hash `json:"sha3Uncles"`
- Coinbase *common.Address `json:"miner"`
- Root *common.Hash `json:"stateRoot" gencodec:"required"`
- TxHash *common.Hash `json:"transactionsRoot"`
- ReceiptHash *common.Hash `json:"receiptsRoot"`
- Bloom *types.Bloom `json:"logsBloom"`
- Difficulty *math.HexOrDecimal256 `json:"difficulty"`
- Number *math.HexOrDecimal256 `json:"number" gencodec:"required"`
- GasLimit *math.HexOrDecimal64 `json:"gasLimit" gencodec:"required"`
- GasUsed *math.HexOrDecimal64 `json:"gasUsed"`
- Time *math.HexOrDecimal64 `json:"timestamp" gencodec:"required"`
- Extra *hexutil.Bytes `json:"extraData"`
- MixDigest *common.Hash `json:"mixHash"`
- Nonce *types.BlockNonce `json:"nonce"`
- BaseFee *math.HexOrDecimal256 `json:"baseFeePerGas" rlp:"optional"`
- WithdrawalsHash *common.Hash `json:"withdrawalsRoot" rlp:"optional"`
+ ParentHash *common.Hash `json:"parentHash"`
+ OmmerHash *common.Hash `json:"sha3Uncles"`
+ Coinbase *common.Address `json:"miner"`
+ Root *common.Hash `json:"stateRoot" gencodec:"required"`
+ TxHash *common.Hash `json:"transactionsRoot"`
+ ReceiptHash *common.Hash `json:"receiptsRoot"`
+ Bloom *types.Bloom `json:"logsBloom"`
+ Difficulty *math.HexOrDecimal256 `json:"difficulty"`
+ Number *math.HexOrDecimal256 `json:"number" gencodec:"required"`
+ GasLimit *math.HexOrDecimal64 `json:"gasLimit" gencodec:"required"`
+ GasUsed *math.HexOrDecimal64 `json:"gasUsed"`
+ Time *math.HexOrDecimal64 `json:"timestamp" gencodec:"required"`
+ Extra *hexutil.Bytes `json:"extraData"`
+ MixDigest *common.Hash `json:"mixHash"`
+ Nonce *types.BlockNonce `json:"nonce"`
+ BaseFee *math.HexOrDecimal256 `json:"baseFeePerGas" rlp:"optional"`
+ WithdrawalsHash *common.Hash `json:"withdrawalsRoot" rlp:"optional"`
+ BlobGasUsed *math.HexOrDecimal64 `json:"blobGasUsed" rlp:"optional"`
+ ExcessBlobGas *math.HexOrDecimal64 `json:"excessBlobGas" rlp:"optional"`
+ ParentBeaconBlockRoot *common.Hash `json:"parentBeaconBlockRoot" rlp:"optional"`
}
var dec header
if err := json.Unmarshal(input, &dec); err != nil {
@@ -137,5 +146,14 @@ func (h *header) UnmarshalJSON(input []byte) error {
if dec.WithdrawalsHash != nil {
h.WithdrawalsHash = dec.WithdrawalsHash
}
+ if dec.BlobGasUsed != nil {
+ h.BlobGasUsed = (*uint64)(dec.BlobGasUsed)
+ }
+ if dec.ExcessBlobGas != nil {
+ h.ExcessBlobGas = (*uint64)(dec.ExcessBlobGas)
+ }
+ if dec.ParentBeaconBlockRoot != nil {
+ h.ParentBeaconBlockRoot = dec.ParentBeaconBlockRoot
+ }
return nil
}
diff --git a/cmd/evm/internal/t8ntool/gen_stenv.go b/cmd/evm/internal/t8ntool/gen_stenv.go
index c2cc3a2c8a..d47db4a876 100644
--- a/cmd/evm/internal/t8ntool/gen_stenv.go
+++ b/cmd/evm/internal/t8ntool/gen_stenv.go
@@ -17,22 +17,26 @@ var _ = (*stEnvMarshaling)(nil)
// MarshalJSON marshals as JSON.
func (s stEnv) MarshalJSON() ([]byte, error) {
type stEnv struct {
- Coinbase common.UnprefixedAddress `json:"currentCoinbase" gencodec:"required"`
- Difficulty *math.HexOrDecimal256 `json:"currentDifficulty"`
- Random *math.HexOrDecimal256 `json:"currentRandom"`
- ParentDifficulty *math.HexOrDecimal256 `json:"parentDifficulty"`
- ParentBaseFee *math.HexOrDecimal256 `json:"parentBaseFee,omitempty"`
- ParentGasUsed math.HexOrDecimal64 `json:"parentGasUsed,omitempty"`
- ParentGasLimit math.HexOrDecimal64 `json:"parentGasLimit,omitempty"`
- GasLimit math.HexOrDecimal64 `json:"currentGasLimit" gencodec:"required"`
- Number math.HexOrDecimal64 `json:"currentNumber" gencodec:"required"`
- Timestamp math.HexOrDecimal64 `json:"currentTimestamp" gencodec:"required"`
- ParentTimestamp math.HexOrDecimal64 `json:"parentTimestamp,omitempty"`
- BlockHashes map[math.HexOrDecimal64]common.Hash `json:"blockHashes,omitempty"`
- Ommers []ommer `json:"ommers,omitempty"`
- Withdrawals []*types.Withdrawal `json:"withdrawals,omitempty"`
- BaseFee *math.HexOrDecimal256 `json:"currentBaseFee,omitempty"`
- ParentUncleHash common.Hash `json:"parentUncleHash"`
+ Coinbase common.UnprefixedAddress `json:"currentCoinbase" gencodec:"required"`
+ Difficulty *math.HexOrDecimal256 `json:"currentDifficulty"`
+ Random *math.HexOrDecimal256 `json:"currentRandom"`
+ ParentDifficulty *math.HexOrDecimal256 `json:"parentDifficulty"`
+ ParentBaseFee *math.HexOrDecimal256 `json:"parentBaseFee,omitempty"`
+ ParentGasUsed math.HexOrDecimal64 `json:"parentGasUsed,omitempty"`
+ ParentGasLimit math.HexOrDecimal64 `json:"parentGasLimit,omitempty"`
+ GasLimit math.HexOrDecimal64 `json:"currentGasLimit" gencodec:"required"`
+ Number math.HexOrDecimal64 `json:"currentNumber" gencodec:"required"`
+ Timestamp math.HexOrDecimal64 `json:"currentTimestamp" gencodec:"required"`
+ ParentTimestamp math.HexOrDecimal64 `json:"parentTimestamp,omitempty"`
+ BlockHashes map[math.HexOrDecimal64]common.Hash `json:"blockHashes,omitempty"`
+ Ommers []ommer `json:"ommers,omitempty"`
+ Withdrawals []*types.Withdrawal `json:"withdrawals,omitempty"`
+ BaseFee *math.HexOrDecimal256 `json:"currentBaseFee,omitempty"`
+ ParentUncleHash common.Hash `json:"parentUncleHash"`
+ ExcessBlobGas *math.HexOrDecimal64 `json:"currentExcessBlobGas,omitempty"`
+ ParentExcessBlobGas *math.HexOrDecimal64 `json:"parentExcessBlobGas,omitempty"`
+ ParentBlobGasUsed *math.HexOrDecimal64 `json:"parentBlobGasUsed,omitempty"`
+ ParentBeaconBlockRoot *common.Hash `json:"parentBeaconBlockRoot"`
}
var enc stEnv
enc.Coinbase = common.UnprefixedAddress(s.Coinbase)
@@ -51,28 +55,36 @@ func (s stEnv) MarshalJSON() ([]byte, error) {
enc.Withdrawals = s.Withdrawals
enc.BaseFee = (*math.HexOrDecimal256)(s.BaseFee)
enc.ParentUncleHash = s.ParentUncleHash
+ enc.ExcessBlobGas = (*math.HexOrDecimal64)(s.ExcessBlobGas)
+ enc.ParentExcessBlobGas = (*math.HexOrDecimal64)(s.ParentExcessBlobGas)
+ enc.ParentBlobGasUsed = (*math.HexOrDecimal64)(s.ParentBlobGasUsed)
+ enc.ParentBeaconBlockRoot = s.ParentBeaconBlockRoot
return json.Marshal(&enc)
}
// UnmarshalJSON unmarshals from JSON.
func (s *stEnv) UnmarshalJSON(input []byte) error {
type stEnv struct {
- Coinbase *common.UnprefixedAddress `json:"currentCoinbase" gencodec:"required"`
- Difficulty *math.HexOrDecimal256 `json:"currentDifficulty"`
- Random *math.HexOrDecimal256 `json:"currentRandom"`
- ParentDifficulty *math.HexOrDecimal256 `json:"parentDifficulty"`
- ParentBaseFee *math.HexOrDecimal256 `json:"parentBaseFee,omitempty"`
- ParentGasUsed *math.HexOrDecimal64 `json:"parentGasUsed,omitempty"`
- ParentGasLimit *math.HexOrDecimal64 `json:"parentGasLimit,omitempty"`
- GasLimit *math.HexOrDecimal64 `json:"currentGasLimit" gencodec:"required"`
- Number *math.HexOrDecimal64 `json:"currentNumber" gencodec:"required"`
- Timestamp *math.HexOrDecimal64 `json:"currentTimestamp" gencodec:"required"`
- ParentTimestamp *math.HexOrDecimal64 `json:"parentTimestamp,omitempty"`
- BlockHashes map[math.HexOrDecimal64]common.Hash `json:"blockHashes,omitempty"`
- Ommers []ommer `json:"ommers,omitempty"`
- Withdrawals []*types.Withdrawal `json:"withdrawals,omitempty"`
- BaseFee *math.HexOrDecimal256 `json:"currentBaseFee,omitempty"`
- ParentUncleHash *common.Hash `json:"parentUncleHash"`
+ Coinbase *common.UnprefixedAddress `json:"currentCoinbase" gencodec:"required"`
+ Difficulty *math.HexOrDecimal256 `json:"currentDifficulty"`
+ Random *math.HexOrDecimal256 `json:"currentRandom"`
+ ParentDifficulty *math.HexOrDecimal256 `json:"parentDifficulty"`
+ ParentBaseFee *math.HexOrDecimal256 `json:"parentBaseFee,omitempty"`
+ ParentGasUsed *math.HexOrDecimal64 `json:"parentGasUsed,omitempty"`
+ ParentGasLimit *math.HexOrDecimal64 `json:"parentGasLimit,omitempty"`
+ GasLimit *math.HexOrDecimal64 `json:"currentGasLimit" gencodec:"required"`
+ Number *math.HexOrDecimal64 `json:"currentNumber" gencodec:"required"`
+ Timestamp *math.HexOrDecimal64 `json:"currentTimestamp" gencodec:"required"`
+ ParentTimestamp *math.HexOrDecimal64 `json:"parentTimestamp,omitempty"`
+ BlockHashes map[math.HexOrDecimal64]common.Hash `json:"blockHashes,omitempty"`
+ Ommers []ommer `json:"ommers,omitempty"`
+ Withdrawals []*types.Withdrawal `json:"withdrawals,omitempty"`
+ BaseFee *math.HexOrDecimal256 `json:"currentBaseFee,omitempty"`
+ ParentUncleHash *common.Hash `json:"parentUncleHash"`
+ ExcessBlobGas *math.HexOrDecimal64 `json:"currentExcessBlobGas,omitempty"`
+ ParentExcessBlobGas *math.HexOrDecimal64 `json:"parentExcessBlobGas,omitempty"`
+ ParentBlobGasUsed *math.HexOrDecimal64 `json:"parentBlobGasUsed,omitempty"`
+ ParentBeaconBlockRoot *common.Hash `json:"parentBeaconBlockRoot"`
}
var dec stEnv
if err := json.Unmarshal(input, &dec); err != nil {
@@ -130,5 +142,17 @@ func (s *stEnv) UnmarshalJSON(input []byte) error {
if dec.ParentUncleHash != nil {
s.ParentUncleHash = *dec.ParentUncleHash
}
+ if dec.ExcessBlobGas != nil {
+ s.ExcessBlobGas = (*uint64)(dec.ExcessBlobGas)
+ }
+ if dec.ParentExcessBlobGas != nil {
+ s.ParentExcessBlobGas = (*uint64)(dec.ParentExcessBlobGas)
+ }
+ if dec.ParentBlobGasUsed != nil {
+ s.ParentBlobGasUsed = (*uint64)(dec.ParentBlobGasUsed)
+ }
+ if dec.ParentBeaconBlockRoot != nil {
+ s.ParentBeaconBlockRoot = dec.ParentBeaconBlockRoot
+ }
return nil
}
diff --git a/cmd/evm/internal/t8ntool/transaction.go b/cmd/evm/internal/t8ntool/transaction.go
index 21279e8f0a..03a2e2eb99 100644
--- a/cmd/evm/internal/t8ntool/transaction.go
+++ b/cmd/evm/internal/t8ntool/transaction.go
@@ -112,7 +112,7 @@ func Transaction(ctx *cli.Context) error {
return NewError(ErrorIO, errors.New("only rlp supported"))
}
}
- signer := types.MakeSigner(chainConfig, new(big.Int))
+ signer := types.MakeSigner(chainConfig, new(big.Int), 0)
// We now have the transactions in 'body', which is supposed to be an
// rlp list of transactions
it, err := rlp.NewListIterator([]byte(body))
@@ -140,7 +140,7 @@ func Transaction(ctx *cli.Context) error {
}
// Check intrinsic gas
if gas, err := core.IntrinsicGas(tx.Data(), tx.AccessList(), tx.To() == nil,
- chainConfig.IsHomestead(new(big.Int)), chainConfig.IsIstanbul(new(big.Int)), chainConfig.IsShanghai(0)); err != nil {
+ chainConfig.IsHomestead(new(big.Int)), chainConfig.IsIstanbul(new(big.Int)), chainConfig.IsShanghai(new(big.Int), 0)); err != nil {
r.Error = err
results = append(results, r)
continue
@@ -172,7 +172,7 @@ func Transaction(ctx *cli.Context) error {
r.Error = errors.New("gas * maxFeePerGas exceeds 256 bits")
}
// Check whether the init code size has been exceeded.
- if chainConfig.IsShanghai(0) && tx.To() == nil && len(tx.Data()) > params.MaxInitCodeSize {
+ if chainConfig.IsShanghai(new(big.Int), 0) && tx.To() == nil && len(tx.Data()) > params.MaxInitCodeSize {
r.Error = errors.New("max initcode size exceeded")
}
results = append(results, r)
diff --git a/cmd/evm/internal/t8ntool/transition.go b/cmd/evm/internal/t8ntool/transition.go
index cb7466d86c..78e7928fc2 100644
--- a/cmd/evm/internal/t8ntool/transition.go
+++ b/cmd/evm/internal/t8ntool/transition.go
@@ -28,7 +28,7 @@ import (
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/common/hexutil"
- "github.com/ethereum/go-ethereum/consensus/misc"
+ "github.com/ethereum/go-ethereum/consensus/misc/eip1559"
"github.com/ethereum/go-ethereum/core"
"github.com/ethereum/go-ethereum/core/state"
"github.com/ethereum/go-ethereum/core/types"
@@ -180,7 +180,6 @@ func Transition(ctx *cli.Context) error {
vmConfig := vm.Config{
Tracer: tracer,
- Debug: (tracer != nil),
}
// Construct the chainconfig
var chainConfig *params.ChainConfig
@@ -193,105 +192,20 @@ func Transition(ctx *cli.Context) error {
// Set the chain id
chainConfig.ChainID = big.NewInt(ctx.Int64(ChainIDFlag.Name))
- var txsWithKeys []*txWithKey
- if txStr != stdinSelector {
- inFile, err := os.Open(txStr)
- if err != nil {
- return NewError(ErrorIO, fmt.Errorf("failed reading txs file: %v", err))
- }
- defer inFile.Close()
- decoder := json.NewDecoder(inFile)
- if strings.HasSuffix(txStr, ".rlp") {
- var body hexutil.Bytes
- if err := decoder.Decode(&body); err != nil {
- return err
- }
- var txs types.Transactions
- if err := rlp.DecodeBytes(body, &txs); err != nil {
- return err
- }
- for _, tx := range txs {
- txsWithKeys = append(txsWithKeys, &txWithKey{
- key: nil,
- tx: tx,
- })
- }
- } else {
- if err := decoder.Decode(&txsWithKeys); err != nil {
- return NewError(ErrorJson, fmt.Errorf("failed unmarshaling txs-file: %v", err))
- }
- }
- } else {
- if len(inputData.TxRlp) > 0 {
- // Decode the body of already signed transactions
- body := common.FromHex(inputData.TxRlp)
- var txs types.Transactions
- if err := rlp.DecodeBytes(body, &txs); err != nil {
- return err
- }
- for _, tx := range txs {
- txsWithKeys = append(txsWithKeys, &txWithKey{
- key: nil,
- tx: tx,
- })
- }
- } else {
- // JSON encoded transactions
- txsWithKeys = inputData.Txs
- }
+ if txs, err = loadTransactions(txStr, inputData, prestate.Env, chainConfig); err != nil {
+ return err
}
- // We may have to sign the transactions.
- signer := types.MakeSigner(chainConfig, big.NewInt(int64(prestate.Env.Number)))
-
- if txs, err = signUnsignedTransactions(txsWithKeys, signer); err != nil {
- return NewError(ErrorJson, fmt.Errorf("failed signing transactions: %v", err))
+ if err := applyLondonChecks(&prestate.Env, chainConfig); err != nil {
+ return err
}
- // Sanity check, to not `panic` in state_transition
- if chainConfig.IsLondon(big.NewInt(int64(prestate.Env.Number))) {
- if prestate.Env.BaseFee != nil {
- // Already set, base fee has precedent over parent base fee.
- } else if prestate.Env.ParentBaseFee != nil {
- parent := &types.Header{
- Number: new(big.Int).SetUint64(prestate.Env.Number),
- BaseFee: prestate.Env.ParentBaseFee,
- GasUsed: prestate.Env.ParentGasUsed,
- GasLimit: prestate.Env.ParentGasLimit,
- }
- prestate.Env.BaseFee = misc.CalcBaseFee(chainConfig, parent)
- } else {
- return NewError(ErrorConfig, errors.New("EIP-1559 config but missing 'currentBaseFee' in env section"))
- }
+ if err := applyShanghaiChecks(&prestate.Env, chainConfig); err != nil {
+ return err
}
- if chainConfig.IsShanghai(prestate.Env.Number) && prestate.Env.Withdrawals == nil {
- return NewError(ErrorConfig, errors.New("Shanghai config but missing 'withdrawals' in env section"))
+ if err := applyMergeChecks(&prestate.Env, chainConfig); err != nil {
+ return err
}
- isMerged := chainConfig.TerminalTotalDifficulty != nil && chainConfig.TerminalTotalDifficulty.BitLen() == 0
- env := prestate.Env
- if isMerged {
- // post-merge:
- // - random must be supplied
- // - difficulty must be zero
- switch {
- case env.Random == nil:
- return NewError(ErrorConfig, errors.New("post-merge requires currentRandom to be defined in env"))
- case env.Difficulty != nil && env.Difficulty.BitLen() != 0:
- return NewError(ErrorConfig, errors.New("post-merge difficulty must be zero (or omitted) in env"))
- }
- prestate.Env.Difficulty = nil
- } else if env.Difficulty == nil {
- // pre-merge:
- // If difficulty was not provided by caller, we need to calculate it.
- switch {
- case env.ParentDifficulty == nil:
- return NewError(ErrorConfig, errors.New("currentDifficulty was not provided, and cannot be calculated due to missing parentDifficulty"))
- case env.Number == 0:
- return NewError(ErrorConfig, errors.New("currentDifficulty needs to be provided for block number 0"))
- case env.Timestamp <= env.ParentTimestamp:
- return NewError(ErrorConfig, fmt.Errorf("currentDifficulty cannot be calculated -- currentTime (%d) needs to be after parent time (%d)",
- env.Timestamp, env.ParentTimestamp))
- }
- prestate.Env.Difficulty = calcDifficulty(chainConfig, env.Number, env.Timestamp,
- env.ParentTimestamp, env.ParentDifficulty, env.ParentUncleHash)
+ if err := applyCancunChecks(&prestate.Env, chainConfig); err != nil {
+ return err
}
// Run the test and aggregate the result
s, result, err := prestate.Apply(vmConfig, chainConfig, txs, ctx.Int64(RewardFlag.Name), getTracer)
@@ -359,38 +273,157 @@ func (t *txWithKey) UnmarshalJSON(input []byte) error {
// and secondly to read them with the standard tx json format
func signUnsignedTransactions(txs []*txWithKey, signer types.Signer) (types.Transactions, error) {
var signedTxs []*types.Transaction
- for i, txWithKey := range txs {
- tx := txWithKey.tx
- key := txWithKey.key
- v, r, s := tx.RawSignatureValues()
- if key != nil && v.BitLen()+r.BitLen()+s.BitLen() == 0 {
- // This transaction needs to be signed
- var (
- signed *types.Transaction
- err error
- )
- if txWithKey.protected {
- signed, err = types.SignTx(tx, signer, key)
- } else {
- signed, err = types.SignTx(tx, types.FrontierSigner{}, key)
- }
- if err != nil {
- return nil, NewError(ErrorJson, fmt.Errorf("tx %d: failed to sign tx: %v", i, err))
- }
- signedTxs = append(signedTxs, signed)
- } else {
+ for i, tx := range txs {
+ var (
+ v, r, s = tx.tx.RawSignatureValues()
+ signed *types.Transaction
+ err error
+ )
+ if tx.key == nil || v.BitLen()+r.BitLen()+s.BitLen() != 0 {
// Already signed
- signedTxs = append(signedTxs, tx)
+ signedTxs = append(signedTxs, tx.tx)
+ continue
}
+ // This transaction needs to be signed
+ if tx.protected {
+ signed, err = types.SignTx(tx.tx, signer, tx.key)
+ } else {
+ signed, err = types.SignTx(tx.tx, types.FrontierSigner{}, tx.key)
+ }
+ if err != nil {
+ return nil, NewError(ErrorJson, fmt.Errorf("tx %d: failed to sign tx: %v", i, err))
+ }
+ signedTxs = append(signedTxs, signed)
}
return signedTxs, nil
}
+func loadTransactions(txStr string, inputData *input, env stEnv, chainConfig *params.ChainConfig) (types.Transactions, error) {
+ var txsWithKeys []*txWithKey
+ var signed types.Transactions
+ if txStr != stdinSelector {
+ data, err := os.ReadFile(txStr)
+ if err != nil {
+ return nil, NewError(ErrorIO, fmt.Errorf("failed reading txs file: %v", err))
+ }
+ if strings.HasSuffix(txStr, ".rlp") { // A file containing an rlp list
+ var body hexutil.Bytes
+ if err := json.Unmarshal(data, &body); err != nil {
+ return nil, err
+ }
+ // Already signed transactions
+ if err := rlp.DecodeBytes(body, &signed); err != nil {
+ return nil, err
+ }
+ return signed, nil
+ }
+ if err := json.Unmarshal(data, &txsWithKeys); err != nil {
+ return nil, NewError(ErrorJson, fmt.Errorf("failed unmarshaling txs-file: %v", err))
+ }
+ } else {
+ if len(inputData.TxRlp) > 0 {
+ // Decode the body of already signed transactions
+ body := common.FromHex(inputData.TxRlp)
+ // Already signed transactions
+ if err := rlp.DecodeBytes(body, &signed); err != nil {
+ return nil, err
+ }
+ return signed, nil
+ }
+ // JSON encoded transactions
+ txsWithKeys = inputData.Txs
+ }
+ // We may have to sign the transactions.
+ signer := types.LatestSignerForChainID(chainConfig.ChainID)
+ return signUnsignedTransactions(txsWithKeys, signer)
+}
+
+func applyLondonChecks(env *stEnv, chainConfig *params.ChainConfig) error {
+ if !chainConfig.IsLondon(big.NewInt(int64(env.Number))) {
+ return nil
+ }
+ // Sanity check, to not `panic` in state_transition
+ if env.BaseFee != nil {
+ // Already set, base fee has precedent over parent base fee.
+ return nil
+ }
+ if env.ParentBaseFee == nil || env.Number == 0 {
+ return NewError(ErrorConfig, errors.New("EIP-1559 config but missing 'currentBaseFee' in env section"))
+ }
+ env.BaseFee = eip1559.CalcBaseFee(chainConfig, &types.Header{
+ Number: new(big.Int).SetUint64(env.Number - 1),
+ BaseFee: env.ParentBaseFee,
+ GasUsed: env.ParentGasUsed,
+ GasLimit: env.ParentGasLimit,
+ }, env.Timestamp)
+ return nil
+}
+
+func applyShanghaiChecks(env *stEnv, chainConfig *params.ChainConfig) error {
+ if !chainConfig.IsShanghai(big.NewInt(int64(env.Number)), env.Timestamp) {
+ return nil
+ }
+ if env.Withdrawals == nil {
+ return NewError(ErrorConfig, errors.New("Shanghai config but missing 'withdrawals' in env section"))
+ }
+ return nil
+}
+
+func applyMergeChecks(env *stEnv, chainConfig *params.ChainConfig) error {
+ isMerged := chainConfig.TerminalTotalDifficulty != nil && chainConfig.TerminalTotalDifficulty.BitLen() == 0
+ if !isMerged {
+ // pre-merge: If difficulty was not provided by caller, we need to calculate it.
+ if env.Difficulty != nil {
+ // already set
+ return nil
+ }
+ switch {
+ case env.ParentDifficulty == nil:
+ return NewError(ErrorConfig, errors.New("currentDifficulty was not provided, and cannot be calculated due to missing parentDifficulty"))
+ case env.Number == 0:
+ return NewError(ErrorConfig, errors.New("currentDifficulty needs to be provided for block number 0"))
+ case env.Timestamp <= env.ParentTimestamp:
+ return NewError(ErrorConfig, fmt.Errorf("currentDifficulty cannot be calculated -- currentTime (%d) needs to be after parent time (%d)",
+ env.Timestamp, env.ParentTimestamp))
+ }
+ env.Difficulty = calcDifficulty(chainConfig, env.Number, env.Timestamp,
+ env.ParentTimestamp, env.ParentDifficulty, env.ParentUncleHash)
+ return nil
+ }
+ // post-merge:
+ // - random must be supplied
+ // - difficulty must be zero
+ switch {
+ case env.Random == nil:
+ return NewError(ErrorConfig, errors.New("post-merge requires currentRandom to be defined in env"))
+ case env.Difficulty != nil && env.Difficulty.BitLen() != 0:
+ return NewError(ErrorConfig, errors.New("post-merge difficulty must be zero (or omitted) in env"))
+ }
+ env.Difficulty = nil
+ return nil
+}
+
+func applyCancunChecks(env *stEnv, chainConfig *params.ChainConfig) error {
+ if !chainConfig.IsCancun(big.NewInt(int64(env.Number)), env.Timestamp) {
+ env.ParentBeaconBlockRoot = nil // un-set it if it has been set too early
+ return nil
+ }
+ // Post-cancun
+ // We require EIP-4788 beacon root to be set in the env
+ if env.ParentBeaconBlockRoot == nil {
+ return NewError(ErrorConfig, errors.New("post-cancun env requires parentBeaconBlockRoot to be set"))
+ }
+ return nil
+}
+
type Alloc map[common.Address]core.GenesisAccount
func (g Alloc) OnRoot(common.Hash) {}
-func (g Alloc) OnAccount(addr common.Address, dumpAccount state.DumpAccount) {
+func (g Alloc) OnAccount(addr *common.Address, dumpAccount state.DumpAccount) {
+ if addr == nil {
+ return
+ }
balance, _ := new(big.Int).SetString(dumpAccount.Balance, 10)
var storage map[common.Hash]common.Hash
if dumpAccount.Storage != nil {
@@ -405,7 +438,7 @@ func (g Alloc) OnAccount(addr common.Address, dumpAccount state.DumpAccount) {
Balance: balance,
Nonce: dumpAccount.Nonce,
}
- g[addr] = genesisAccount
+ g[*addr] = genesisAccount
}
// saveFile marshals the object to the given file
diff --git a/cmd/evm/main.go b/cmd/evm/main.go
index 35f3e37ae5..1f6500b78c 100644
--- a/cmd/evm/main.go
+++ b/cmd/evm/main.go
@@ -23,107 +23,116 @@ import (
"os"
"github.com/ethereum/go-ethereum/cmd/evm/internal/t8ntool"
+ "github.com/ethereum/go-ethereum/internal/debug"
"github.com/ethereum/go-ethereum/internal/flags"
"github.com/urfave/cli/v2"
)
var (
DebugFlag = &cli.BoolFlag{
- Name: "debug",
- Usage: "output full trace logs",
- }
- MemProfileFlag = &cli.StringFlag{
- Name: "memprofile",
- Usage: "creates a memory profile at the given path",
- }
- CPUProfileFlag = &cli.StringFlag{
- Name: "cpuprofile",
- Usage: "creates a CPU profile at the given path",
+ Name: "debug",
+ Usage: "output full trace logs",
+ Category: flags.VMCategory,
}
StatDumpFlag = &cli.BoolFlag{
- Name: "statdump",
- Usage: "displays stack and heap memory information",
+ Name: "statdump",
+ Usage: "displays stack and heap memory information",
+ Category: flags.VMCategory,
}
CodeFlag = &cli.StringFlag{
- Name: "code",
- Usage: "EVM code",
+ Name: "code",
+ Usage: "EVM code",
+ Category: flags.VMCategory,
}
CodeFileFlag = &cli.StringFlag{
- Name: "codefile",
- Usage: "File containing EVM code. If '-' is specified, code is read from stdin ",
+ Name: "codefile",
+ Usage: "File containing EVM code. If '-' is specified, code is read from stdin ",
+ Category: flags.VMCategory,
}
GasFlag = &cli.Uint64Flag{
- Name: "gas",
- Usage: "gas limit for the evm",
- Value: 10000000000,
+ Name: "gas",
+ Usage: "gas limit for the evm",
+ Value: 10000000000,
+ Category: flags.VMCategory,
}
PriceFlag = &flags.BigFlag{
- Name: "price",
- Usage: "price set for the evm",
- Value: new(big.Int),
+ Name: "price",
+ Usage: "price set for the evm",
+ Value: new(big.Int),
+ Category: flags.VMCategory,
}
ValueFlag = &flags.BigFlag{
- Name: "value",
- Usage: "value set for the evm",
- Value: new(big.Int),
+ Name: "value",
+ Usage: "value set for the evm",
+ Value: new(big.Int),
+ Category: flags.VMCategory,
}
DumpFlag = &cli.BoolFlag{
- Name: "dump",
- Usage: "dumps the state after the run",
+ Name: "dump",
+ Usage: "dumps the state after the run",
+ Category: flags.VMCategory,
}
InputFlag = &cli.StringFlag{
- Name: "input",
- Usage: "input for the EVM",
+ Name: "input",
+ Usage: "input for the EVM",
+ Category: flags.VMCategory,
}
InputFileFlag = &cli.StringFlag{
- Name: "inputfile",
- Usage: "file containing input for the EVM",
- }
- VerbosityFlag = &cli.IntFlag{
- Name: "verbosity",
- Usage: "sets the verbosity level",
+ Name: "inputfile",
+ Usage: "file containing input for the EVM",
+ Category: flags.VMCategory,
}
BenchFlag = &cli.BoolFlag{
- Name: "bench",
- Usage: "benchmark the execution",
+ Name: "bench",
+ Usage: "benchmark the execution",
+ Category: flags.VMCategory,
}
CreateFlag = &cli.BoolFlag{
- Name: "create",
- Usage: "indicates the action should be create rather than call",
+ Name: "create",
+ Usage: "indicates the action should be create rather than call",
+ Category: flags.VMCategory,
}
GenesisFlag = &cli.StringFlag{
- Name: "prestate",
- Usage: "JSON file with prestate (genesis) config",
+ Name: "prestate",
+ Usage: "JSON file with prestate (genesis) config",
+ Category: flags.VMCategory,
}
MachineFlag = &cli.BoolFlag{
- Name: "json",
- Usage: "output trace logs in machine readable format (json)",
+ Name: "json",
+ Usage: "output trace logs in machine readable format (json)",
+ Category: flags.VMCategory,
}
SenderFlag = &cli.StringFlag{
- Name: "sender",
- Usage: "The transaction origin",
+ Name: "sender",
+ Usage: "The transaction origin",
+ Category: flags.VMCategory,
}
ReceiverFlag = &cli.StringFlag{
- Name: "receiver",
- Usage: "The transaction receiver (execution context)",
+ Name: "receiver",
+ Usage: "The transaction receiver (execution context)",
+ Category: flags.VMCategory,
}
DisableMemoryFlag = &cli.BoolFlag{
- Name: "nomemory",
- Value: true,
- Usage: "disable memory output",
+ Name: "nomemory",
+ Value: true,
+ Usage: "disable memory output",
+ Category: flags.VMCategory,
}
DisableStackFlag = &cli.BoolFlag{
- Name: "nostack",
- Usage: "disable stack output",
+ Name: "nostack",
+ Usage: "disable stack output",
+ Category: flags.VMCategory,
}
DisableStorageFlag = &cli.BoolFlag{
- Name: "nostorage",
- Usage: "disable storage output",
+ Name: "nostorage",
+ Usage: "disable storage output",
+ Category: flags.VMCategory,
}
DisableReturnDataFlag = &cli.BoolFlag{
- Name: "noreturndata",
- Value: true,
- Usage: "enable return data output",
+ Name: "noreturndata",
+ Value: true,
+ Usage: "enable return data output",
+ Category: flags.VMCategory,
}
)
@@ -179,41 +188,42 @@ var blockBuilderCommand = &cli.Command{
t8ntool.InputWithdrawalsFlag,
t8ntool.InputTxsRlpFlag,
t8ntool.SealCliqueFlag,
- t8ntool.SealEthashFlag,
- t8ntool.SealEthashDirFlag,
- t8ntool.SealEthashModeFlag,
t8ntool.VerbosityFlag,
},
}
+// vmFlags contains flags related to running the EVM.
+var vmFlags = []cli.Flag{
+ CodeFlag,
+ CodeFileFlag,
+ CreateFlag,
+ GasFlag,
+ PriceFlag,
+ ValueFlag,
+ InputFlag,
+ InputFileFlag,
+ GenesisFlag,
+ SenderFlag,
+ ReceiverFlag,
+}
+
+// traceFlags contains flags that configure tracing output.
+var traceFlags = []cli.Flag{
+ BenchFlag,
+ DebugFlag,
+ DumpFlag,
+ MachineFlag,
+ StatDumpFlag,
+ DisableMemoryFlag,
+ DisableStackFlag,
+ DisableStorageFlag,
+ DisableReturnDataFlag,
+}
+
var app = flags.NewApp("the evm command line interface")
func init() {
- app.Flags = []cli.Flag{
- BenchFlag,
- CreateFlag,
- DebugFlag,
- VerbosityFlag,
- CodeFlag,
- CodeFileFlag,
- GasFlag,
- PriceFlag,
- ValueFlag,
- DumpFlag,
- InputFlag,
- InputFileFlag,
- MemProfileFlag,
- CPUProfileFlag,
- StatDumpFlag,
- GenesisFlag,
- MachineFlag,
- SenderFlag,
- ReceiverFlag,
- DisableMemoryFlag,
- DisableStackFlag,
- DisableStorageFlag,
- DisableReturnDataFlag,
- }
+ app.Flags = flags.Merge(vmFlags, traceFlags, debug.Flags)
app.Commands = []*cli.Command{
compileCommand,
disasmCommand,
@@ -224,6 +234,14 @@ func init() {
transactionCommand,
blockBuilderCommand,
}
+ app.Before = func(ctx *cli.Context) error {
+ flags.MigrateGlobalFlags(ctx)
+ return debug.Setup(ctx)
+ }
+ app.After = func(ctx *cli.Context) error {
+ debug.Exit()
+ return nil
+ }
}
func main() {
diff --git a/cmd/evm/runner.go b/cmd/evm/runner.go
index 3a010da9f2..45fc985351 100644
--- a/cmd/evm/runner.go
+++ b/cmd/evm/runner.go
@@ -24,7 +24,6 @@ import (
"math/big"
"os"
goruntime "runtime"
- "runtime/pprof"
"testing"
"time"
@@ -38,8 +37,9 @@ import (
"github.com/ethereum/go-ethereum/core/vm/runtime"
"github.com/ethereum/go-ethereum/eth/tracers/logger"
"github.com/ethereum/go-ethereum/internal/flags"
- "github.com/ethereum/go-ethereum/log"
"github.com/ethereum/go-ethereum/params"
+ "github.com/ethereum/go-ethereum/trie"
+ "github.com/ethereum/go-ethereum/trie/triedb/hashdb"
"github.com/urfave/cli/v2"
)
@@ -49,6 +49,7 @@ var runCommand = &cli.Command{
Usage: "run arbitrary evm binary",
ArgsUsage: "",
Description: `The run command runs arbitrary EVM code.`,
+ Flags: flags.Merge(vmFlags, traceFlags),
}
// readGenesis will read the given JSON format genesis file and return
@@ -106,9 +107,6 @@ func timedExec(bench bool, execFunc func() ([]byte, uint64, error)) (output []by
}
func runCmd(ctx *cli.Context) error {
- glogger := log.NewGlogHandler(log.StreamHandler(os.Stderr, log.TerminalFormat(false)))
- glogger.Verbosity(log.Lvl(ctx.Int(VerbosityFlag.Name)))
- log.Root().SetHandler(glogger)
logconfig := &logger.Config{
EnableMemory: !ctx.Bool(DisableMemoryFlag.Name),
DisableStack: ctx.Bool(DisableStackFlag.Name),
@@ -118,13 +116,15 @@ func runCmd(ctx *cli.Context) error {
}
var (
- tracer vm.EVMLogger
- debugLogger *logger.StructLogger
- statedb *state.StateDB
- chainConfig *params.ChainConfig
- sender = common.BytesToAddress([]byte("sender"))
- receiver = common.BytesToAddress([]byte("receiver"))
- genesisConfig *core.Genesis
+ tracer vm.EVMLogger
+ debugLogger *logger.StructLogger
+ statedb *state.StateDB
+ chainConfig *params.ChainConfig
+ sender = common.BytesToAddress([]byte("sender"))
+ receiver = common.BytesToAddress([]byte("receiver"))
+ preimages = ctx.Bool(DumpFlag.Name)
+ blobHashes []common.Hash // TODO (MariusVanDerWijden) implement blob hashes in state tests
+ blobBaseFee = new(big.Int) // TODO (MariusVanDerWijden) implement blob fee in state tests
)
if ctx.Bool(MachineFlag.Name) {
tracer = logger.NewJSONLogger(logconfig, os.Stdout)
@@ -134,17 +134,30 @@ func runCmd(ctx *cli.Context) error {
} else {
debugLogger = logger.NewStructLogger(logconfig)
}
+
+ initialGas := ctx.Uint64(GasFlag.Name)
+ genesisConfig := new(core.Genesis)
+ genesisConfig.GasLimit = initialGas
if ctx.String(GenesisFlag.Name) != "" {
- gen := readGenesis(ctx.String(GenesisFlag.Name))
- genesisConfig = gen
- db := rawdb.NewMemoryDatabase()
- genesis := gen.MustCommit(db)
- statedb, _ = state.New(genesis.Root(), state.NewDatabase(db), nil)
- chainConfig = gen.Config
+ genesisConfig = readGenesis(ctx.String(GenesisFlag.Name))
+ if genesisConfig.GasLimit != 0 {
+ initialGas = genesisConfig.GasLimit
+ }
} else {
- statedb, _ = state.New(common.Hash{}, state.NewDatabase(rawdb.NewMemoryDatabase()), nil)
- genesisConfig = new(core.Genesis)
+ genesisConfig.Config = params.AllEthashProtocolChanges
}
+
+ db := rawdb.NewMemoryDatabase()
+ triedb := trie.NewDatabase(db, &trie.Config{
+ Preimages: preimages,
+ HashDB: hashdb.Defaults,
+ })
+ defer triedb.Close()
+ genesis := genesisConfig.MustCommit(db, triedb)
+ sdb := state.NewDatabaseWithNodeDB(db, triedb)
+ statedb, _ = state.New(genesis.Root(), sdb, nil)
+ chainConfig = genesisConfig.Config
+
if ctx.String(SenderFlag.Name) != "" {
sender = common.HexToAddress(ctx.String(SenderFlag.Name))
}
@@ -198,10 +211,6 @@ func runCmd(ctx *cli.Context) error {
}
code = common.Hex2Bytes(bin)
}
- initialGas := ctx.Uint64(GasFlag.Name)
- if genesisConfig.GasLimit != 0 {
- initialGas = genesisConfig.GasLimit
- }
runtimeConfig := runtime.Config{
Origin: sender,
State: statedb,
@@ -212,25 +221,13 @@ func runCmd(ctx *cli.Context) error {
Time: genesisConfig.Timestamp,
Coinbase: genesisConfig.Coinbase,
BlockNumber: new(big.Int).SetUint64(genesisConfig.Number),
+ BlobHashes: blobHashes,
+ BlobBaseFee: blobBaseFee,
EVMConfig: vm.Config{
Tracer: tracer,
- Debug: ctx.Bool(DebugFlag.Name) || ctx.Bool(MachineFlag.Name),
},
}
- if cpuProfilePath := ctx.String(CPUProfileFlag.Name); cpuProfilePath != "" {
- f, err := os.Create(cpuProfilePath)
- if err != nil {
- fmt.Println("could not create CPU profile: ", err)
- os.Exit(1)
- }
- if err := pprof.StartCPUProfile(f); err != nil {
- fmt.Println("could not start CPU profile: ", err)
- os.Exit(1)
- }
- defer pprof.StopCPUProfile()
- }
-
if chainConfig != nil {
runtimeConfig.ChainConfig = chainConfig
} else {
@@ -274,24 +271,10 @@ func runCmd(ctx *cli.Context) error {
output, leftOverGas, stats, err := timedExec(bench, execFunc)
if ctx.Bool(DumpFlag.Name) {
- statedb.Commit(true)
- statedb.IntermediateRoot(true)
+ statedb.Commit(genesisConfig.Number, true)
fmt.Println(string(statedb.Dump(nil)))
}
- if memProfilePath := ctx.String(MemProfileFlag.Name); memProfilePath != "" {
- f, err := os.Create(memProfilePath)
- if err != nil {
- fmt.Println("could not create memory profile: ", err)
- os.Exit(1)
- }
- if err := pprof.WriteHeapProfile(f); err != nil {
- fmt.Println("could not write memory profile: ", err)
- os.Exit(1)
- }
- f.Close()
- }
-
if ctx.Bool(DebugFlag.Name) {
if debugLogger != nil {
fmt.Fprintln(os.Stderr, "#### TRACE ####")
diff --git a/cmd/evm/staterunner.go b/cmd/evm/staterunner.go
index 5eba25c725..8a07fccdf8 100644
--- a/cmd/evm/staterunner.go
+++ b/cmd/evm/staterunner.go
@@ -17,16 +17,17 @@
package main
import (
+ "bufio"
"encoding/json"
- "errors"
"fmt"
"os"
"github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/core/rawdb"
"github.com/ethereum/go-ethereum/core/state"
+ "github.com/ethereum/go-ethereum/core/state/snapshot"
"github.com/ethereum/go-ethereum/core/vm"
"github.com/ethereum/go-ethereum/eth/tracers/logger"
- "github.com/ethereum/go-ethereum/log"
"github.com/ethereum/go-ethereum/tests"
"github.com/urfave/cli/v2"
)
@@ -34,7 +35,7 @@ import (
var stateTestCommand = &cli.Command{
Action: stateTestCmd,
Name: "statetest",
- Usage: "executes the given state tests",
+ Usage: "Executes the given state tests. Filenames can be fed via standard input (batch mode) or as an argument (one-off execution).",
ArgsUsage: "",
}
@@ -50,14 +51,6 @@ type StatetestResult struct {
}
func stateTestCmd(ctx *cli.Context) error {
- if len(ctx.Args().First()) == 0 {
- return errors.New("path-to-test argument required")
- }
- // Configure the go-ethereum logger
- glogger := log.NewGlogHandler(log.StreamHandler(os.Stderr, log.TerminalFormat(false)))
- glogger.Verbosity(log.Lvl(ctx.Int(VerbosityFlag.Name)))
- log.Root().SetHandler(glogger)
-
// Configure the EVM logger
config := &logger.Config{
EnableMemory: !ctx.Bool(DisableMemoryFlag.Name),
@@ -65,67 +58,66 @@ func stateTestCmd(ctx *cli.Context) error {
DisableStorage: ctx.Bool(DisableStorageFlag.Name),
EnableReturnData: !ctx.Bool(DisableReturnDataFlag.Name),
}
- var (
- tracer vm.EVMLogger
- debugger *logger.StructLogger
- )
+ var cfg vm.Config
switch {
case ctx.Bool(MachineFlag.Name):
- tracer = logger.NewJSONLogger(config, os.Stderr)
+ cfg.Tracer = logger.NewJSONLogger(config, os.Stderr)
case ctx.Bool(DebugFlag.Name):
- debugger = logger.NewStructLogger(config)
- tracer = debugger
-
- default:
- debugger = logger.NewStructLogger(config)
+ cfg.Tracer = logger.NewStructLogger(config)
}
// Load the test content from the input file
- src, err := os.ReadFile(ctx.Args().First())
+ if len(ctx.Args().First()) != 0 {
+ return runStateTest(ctx.Args().First(), cfg, ctx.Bool(MachineFlag.Name), ctx.Bool(DumpFlag.Name))
+ }
+ // Read filenames from stdin and execute back-to-back
+ scanner := bufio.NewScanner(os.Stdin)
+ for scanner.Scan() {
+ fname := scanner.Text()
+ if len(fname) == 0 {
+ return nil
+ }
+ if err := runStateTest(fname, cfg, ctx.Bool(MachineFlag.Name), ctx.Bool(DumpFlag.Name)); err != nil {
+ return err
+ }
+ }
+ return nil
+}
+
+// runStateTest loads the state-test given by fname, and executes the test.
+func runStateTest(fname string, cfg vm.Config, jsonOut, dump bool) error {
+ src, err := os.ReadFile(fname)
if err != nil {
return err
}
var tests map[string]tests.StateTest
- if err = json.Unmarshal(src, &tests); err != nil {
+ if err := json.Unmarshal(src, &tests); err != nil {
return err
}
// Iterate over all the tests, run them and aggregate the results
- cfg := vm.Config{
- Tracer: tracer,
- Debug: ctx.Bool(DebugFlag.Name) || ctx.Bool(MachineFlag.Name),
- }
results := make([]StatetestResult, 0, len(tests))
for key, test := range tests {
for _, st := range test.Subtests() {
// Run the test and aggregate the result
result := &StatetestResult{Name: key, Fork: st.Fork, Pass: true}
- _, s, err := test.Run(st, cfg, false)
- // print state root for evmlab tracing
- if s != nil {
- root := s.IntermediateRoot(false)
- result.Root = &root
- if ctx.Bool(MachineFlag.Name) {
- fmt.Fprintf(os.Stderr, "{\"stateRoot\": \"%#x\"}\n", root)
+ test.Run(st, cfg, false, rawdb.HashScheme, func(err error, snaps *snapshot.Tree, state *state.StateDB) {
+ if state != nil {
+ root := state.IntermediateRoot(false)
+ result.Root = &root
+ if jsonOut {
+ fmt.Fprintf(os.Stderr, "{\"stateRoot\": \"%#x\"}\n", root)
+ }
}
- }
- if err != nil {
- // Test failed, mark as so and dump any state to aid debugging
- result.Pass, result.Error = false, err.Error()
- if ctx.Bool(DumpFlag.Name) && s != nil {
- dump := s.RawDump(nil)
- result.State = &dump
+ if err != nil {
+ // Test failed, mark as so and dump any state to aid debugging
+ result.Pass, result.Error = false, err.Error()
+ if dump {
+ dump := state.RawDump(nil)
+ result.State = &dump
+ }
}
- }
-
+ })
results = append(results, *result)
-
- // Print any structured logs collected
- if ctx.Bool(DebugFlag.Name) {
- if debugger != nil {
- fmt.Fprintln(os.Stderr, "#### TRACE ####")
- logger.WriteTrace(os.Stderr, debugger.StructLogs())
- }
- }
}
}
out, _ := json.MarshalIndent(results, "", " ")
diff --git a/cmd/evm/t8n_test.go b/cmd/evm/t8n_test.go
index 067660c7e7..ad09a6b4d6 100644
--- a/cmd/evm/t8n_test.go
+++ b/cmd/evm/t8n_test.go
@@ -259,6 +259,22 @@ func TestT8n(t *testing.T) {
output: t8nOutput{alloc: true, result: true},
expOut: "exp.json",
},
+ { // Cancun tests
+ base: "./testdata/28",
+ input: t8nInput{
+ "alloc.json", "txs.rlp", "env.json", "Cancun", "",
+ },
+ output: t8nOutput{alloc: true, result: true},
+ expOut: "exp.json",
+ },
+ { // More cancun tests
+ base: "./testdata/29",
+ input: t8nInput{
+ "alloc.json", "txs.json", "env.json", "Cancun", "",
+ },
+ output: t8nOutput{alloc: true, result: true},
+ expOut: "exp.json",
+ },
} {
args := []string{"t8n"}
args = append(args, tc.output.get()...)
@@ -275,7 +291,8 @@ func TestT8n(t *testing.T) {
tt.Run("evm-test", args...)
// Compare the expected output, if provided
if tc.expOut != "" {
- want, err := os.ReadFile(fmt.Sprintf("%v/%v", tc.base, tc.expOut))
+ file := fmt.Sprintf("%v/%v", tc.base, tc.expOut)
+ want, err := os.ReadFile(file)
if err != nil {
t.Fatalf("test %d: could not read expected output: %v", i, err)
}
@@ -283,9 +300,9 @@ func TestT8n(t *testing.T) {
ok, err := cmpJson(have, want)
switch {
case err != nil:
- t.Fatalf("test %d, json parsing failed: %v", i, err)
+ t.Fatalf("test %d, file %v: json parsing failed: %v", i, file, err)
case !ok:
- t.Fatalf("test %d: output wrong, have \n%v\nwant\n%v\n", i, string(have), string(want))
+ t.Fatalf("test %d, file %v: output wrong, have \n%v\nwant\n%v\n", i, file, string(have), string(want))
}
}
tt.WaitExit()
diff --git a/cmd/evm/testdata/1/exp.json b/cmd/evm/testdata/1/exp.json
index 7d3805012d..d1351e5b76 100644
--- a/cmd/evm/testdata/1/exp.json
+++ b/cmd/evm/testdata/1/exp.json
@@ -28,6 +28,7 @@
"transactionHash": "0x0557bacce3375c98d806609b8d5043072f0b6a8bae45ae5a67a00d3a1a18d673",
"contractAddress": "0x0000000000000000000000000000000000000000",
"gasUsed": "0x5208",
+ "effectiveGasPrice": null,
"blockHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
"transactionIndex": "0x0"
}
diff --git a/cmd/evm/testdata/13/exp2.json b/cmd/evm/testdata/13/exp2.json
index cbad6552c1..babce35929 100644
--- a/cmd/evm/testdata/13/exp2.json
+++ b/cmd/evm/testdata/13/exp2.json
@@ -16,6 +16,7 @@
"transactionHash": "0xa98a24882ea90916c6a86da650fbc6b14238e46f0af04a131ce92be897507476",
"contractAddress": "0x0000000000000000000000000000000000000000",
"gasUsed": "0x84d0",
+ "effectiveGasPrice": null,
"blockHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
"transactionIndex": "0x0"
},
@@ -29,6 +30,7 @@
"transactionHash": "0x36bad80acce7040c45fd32764b5c2b2d2e6f778669fb41791f73f546d56e739a",
"contractAddress": "0x0000000000000000000000000000000000000000",
"gasUsed": "0x84d0",
+ "effectiveGasPrice": null,
"blockHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
"transactionIndex": "0x1"
}
diff --git a/cmd/evm/testdata/13/readme.md b/cmd/evm/testdata/13/readme.md
index 64f52fc9a9..889975d47e 100644
--- a/cmd/evm/testdata/13/readme.md
+++ b/cmd/evm/testdata/13/readme.md
@@ -1,4 +1,4 @@
## Input transactions in RLP form
-This testdata folder is used to examplify how transaction input can be provided in rlp form.
+This testdata folder is used to exemplify how transaction input can be provided in rlp form.
Please see the README in `evm` folder for how this is performed.
\ No newline at end of file
diff --git a/cmd/evm/testdata/2/readme.md b/cmd/evm/testdata/2/readme.md
index c116f0e792..4bcf0f0fa0 100644
--- a/cmd/evm/testdata/2/readme.md
+++ b/cmd/evm/testdata/2/readme.md
@@ -1 +1 @@
-These files examplify a selfdestruct to the `0`-address.
\ No newline at end of file
+These files exemplify a selfdestruct to the `0`-address.
\ No newline at end of file
diff --git a/cmd/evm/testdata/23/exp.json b/cmd/evm/testdata/23/exp.json
index e51f37d9c7..22dde0a27c 100644
--- a/cmd/evm/testdata/23/exp.json
+++ b/cmd/evm/testdata/23/exp.json
@@ -15,6 +15,7 @@
"transactionHash": "0x72fadbef39cd251a437eea619cfeda752271a5faaaa2147df012e112159ffb81",
"contractAddress": "0x0000000000000000000000000000000000000000",
"gasUsed": "0x520b",
+ "effectiveGasPrice": null,
"blockHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
"transactionIndex": "0x0"
}
diff --git a/cmd/evm/testdata/23/readme.md b/cmd/evm/testdata/23/readme.md
index 85fe8db66c..f31b64de2f 100644
--- a/cmd/evm/testdata/23/readme.md
+++ b/cmd/evm/testdata/23/readme.md
@@ -1 +1 @@
-These files examplify how to sign a transaction using the pre-EIP155 scheme.
+These files exemplify how to sign a transaction using the pre-EIP155 scheme.
diff --git a/cmd/evm/testdata/24/exp.json b/cmd/evm/testdata/24/exp.json
index d8cec59d6a..ac571d149b 100644
--- a/cmd/evm/testdata/24/exp.json
+++ b/cmd/evm/testdata/24/exp.json
@@ -31,6 +31,7 @@
"transactionHash": "0x92ea4a28224d033afb20e0cc2b290d4c7c2d61f6a4800a680e4e19ac962ee941",
"contractAddress": "0x0000000000000000000000000000000000000000",
"gasUsed": "0xa861",
+ "effectiveGasPrice": null,
"blockHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
"transactionIndex": "0x0"
},
@@ -43,6 +44,7 @@
"transactionHash": "0x16b1d912f1d664f3f60f4e1b5f296f3c82a64a1a253117b4851d18bc03c4f1da",
"contractAddress": "0x0000000000000000000000000000000000000000",
"gasUsed": "0x5aa5",
+ "effectiveGasPrice": null,
"blockHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
"transactionIndex": "0x1"
}
diff --git a/cmd/evm/testdata/25/exp.json b/cmd/evm/testdata/25/exp.json
index a9c310a1e1..1cb521794c 100644
--- a/cmd/evm/testdata/25/exp.json
+++ b/cmd/evm/testdata/25/exp.json
@@ -27,6 +27,7 @@
"transactionHash": "0x92ea4a28224d033afb20e0cc2b290d4c7c2d61f6a4800a680e4e19ac962ee941",
"contractAddress": "0x0000000000000000000000000000000000000000",
"gasUsed": "0x5208",
+ "effectiveGasPrice": null,
"blockHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
"transactionIndex": "0x0"
}
diff --git a/cmd/evm/testdata/28/alloc.json b/cmd/evm/testdata/28/alloc.json
new file mode 100644
index 0000000000..680a89f4ed
--- /dev/null
+++ b/cmd/evm/testdata/28/alloc.json
@@ -0,0 +1,16 @@
+{
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x016345785d8a0000",
+ "code" : "0x",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x016345785d8a0000",
+ "code" : "0x60004960015500",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ }
+}
\ No newline at end of file
diff --git a/cmd/evm/testdata/28/env.json b/cmd/evm/testdata/28/env.json
new file mode 100644
index 0000000000..82f22ac62f
--- /dev/null
+++ b/cmd/evm/testdata/28/env.json
@@ -0,0 +1,22 @@
+{
+ "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentNumber" : "0x01",
+ "currentTimestamp" : "0x079e",
+ "currentGasLimit" : "0x7fffffffffffffff",
+ "previousHash" : "0x3a9b485972e7353edd9152712492f0c58d89ef80623686b6bf947a4a6dce6cb6",
+ "currentBlobGasUsed" : "0x00",
+ "parentTimestamp" : "0x03b6",
+ "parentDifficulty" : "0x00",
+ "parentUncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
+ "currentRandom" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "withdrawals" : [],
+ "parentBaseFee" : "0x0a",
+ "parentGasUsed" : "0x00",
+ "parentGasLimit" : "0x7fffffffffffffff",
+ "parentExcessBlobGas" : "0x00",
+ "parentBlobGasUsed" : "0x00",
+ "blockHashes" : {
+ "0" : "0x3a9b485972e7353edd9152712492f0c58d89ef80623686b6bf947a4a6dce6cb6"
+ },
+ "parentBeaconBlockRoot": "0x0000beac00beac00beac00beac00beac00beac00beac00beac00beac00beac00"
+}
diff --git a/cmd/evm/testdata/28/exp.json b/cmd/evm/testdata/28/exp.json
new file mode 100644
index 0000000000..75c715e972
--- /dev/null
+++ b/cmd/evm/testdata/28/exp.json
@@ -0,0 +1,47 @@
+{
+ "alloc": {
+ "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba": {
+ "balance": "0x150ca"
+ },
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b": {
+ "balance": "0x16345785d80c3a9",
+ "nonce": "0x1"
+ },
+ "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b": {
+ "code": "0x60004960015500",
+ "storage": {
+ "0x0000000000000000000000000000000000000000000000000000000000000001": "0x01a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8"
+ },
+ "balance": "0x16345785d8a0000"
+ }
+ },
+ "result": {
+ "stateRoot": "0xa40cb3fab01848e922a48bd24191815df9f721ad4b60376edac75161517663e8",
+ "txRoot": "0x4409cc4b699384ba5f8248d92b784713610c5ff9c1de51e9239da0dac76de9ce",
+ "receiptsRoot": "0xbff643da765981266133094092d98c81d2ac8e9a83a7bbda46c3d736f1f874ac",
+ "logsHash": "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
+ "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+ "receipts": [
+ {
+ "type": "0x3",
+ "root": "0x",
+ "status": "0x1",
+ "cumulativeGasUsed": "0xa865",
+ "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+ "logs": null,
+ "transactionHash": "0x7508d7139d002a4b3a26a4f12dec0d87cb46075c78bf77a38b569a133b509262",
+ "contractAddress": "0x0000000000000000000000000000000000000000",
+ "gasUsed": "0xa865",
+ "effectiveGasPrice": null,
+ "blockHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+ "transactionIndex": "0x0"
+ }
+ ],
+ "currentDifficulty": null,
+ "gasUsed": "0xa865",
+ "currentBaseFee": "0x9",
+ "withdrawalsRoot": "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "currentExcessBlobGas": "0x0",
+ "blobGasUsed": "0x20000"
+ }
+}
diff --git a/cmd/evm/testdata/28/txs.rlp b/cmd/evm/testdata/28/txs.rlp
new file mode 100644
index 0000000000..8df20e3aa2
--- /dev/null
+++ b/cmd/evm/testdata/28/txs.rlp
@@ -0,0 +1 @@
+"0xf88bb88903f8860180026483061a8094b94f5374fce5edbc8e2a8697c15331677e6ebf0b8080c00ae1a001a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d801a025e16bb498552165016751911c3608d79000ab89dc3100776e729e6ea13091c7a03acacff7fc0cff6eda8a927dec93ca17765e1ee6cbc06c5954ce102e097c01d2"
\ No newline at end of file
diff --git a/cmd/evm/testdata/29/alloc.json b/cmd/evm/testdata/29/alloc.json
new file mode 100644
index 0000000000..d2c879a45c
--- /dev/null
+++ b/cmd/evm/testdata/29/alloc.json
@@ -0,0 +1,16 @@
+{
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x016345785d8a0000",
+ "code" : "0x",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0x000F3df6D732807Ef1319fB7B8bB8522d0Beac02" : {
+ "balance" : "0x1",
+ "code" : "0x3373fffffffffffffffffffffffffffffffffffffffe14604457602036146024575f5ffd5b620180005f350680545f35146037575f5ffd5b6201800001545f5260205ff35b6201800042064281555f359062018000015500",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ }
+}
\ No newline at end of file
diff --git a/cmd/evm/testdata/29/env.json b/cmd/evm/testdata/29/env.json
new file mode 100644
index 0000000000..e752a909ad
--- /dev/null
+++ b/cmd/evm/testdata/29/env.json
@@ -0,0 +1,20 @@
+{
+ "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentNumber" : "0x01",
+ "currentTimestamp" : "0x079e",
+ "currentGasLimit" : "0x7fffffffffffffff",
+ "previousHash" : "0x3a9b485972e7353edd9152712492f0c58d89ef80623686b6bf947a4a6dce6cb6",
+ "currentBlobGasUsed" : "0x00",
+ "parentTimestamp" : "0x03b6",
+ "parentDifficulty" : "0x00",
+ "parentUncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
+ "currentRandom" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "withdrawals" : [
+ ],
+ "parentBaseFee" : "0x0a",
+ "parentGasUsed" : "0x00",
+ "parentGasLimit" : "0x7fffffffffffffff",
+ "parentExcessBlobGas" : "0x00",
+ "parentBlobGasUsed" : "0x00",
+ "parentBeaconBlockRoot": "0x0000beac00beac00beac00beac00beac00beac00beac00beac00beac00beac00"
+}
\ No newline at end of file
diff --git a/cmd/evm/testdata/29/exp.json b/cmd/evm/testdata/29/exp.json
new file mode 100644
index 0000000000..c4c001ec14
--- /dev/null
+++ b/cmd/evm/testdata/29/exp.json
@@ -0,0 +1,45 @@
+{
+ "alloc": {
+ "0x000f3df6d732807ef1319fb7b8bb8522d0beac02": {
+ "code": "0x3373fffffffffffffffffffffffffffffffffffffffe14604457602036146024575f5ffd5b620180005f350680545f35146037575f5ffd5b6201800001545f5260205ff35b6201800042064281555f359062018000015500",
+ "storage": {
+ "0x000000000000000000000000000000000000000000000000000000000000079e": "0x000000000000000000000000000000000000000000000000000000000000079e",
+ "0x000000000000000000000000000000000000000000000000000000000001879e": "0x0000beac00beac00beac00beac00beac00beac00beac00beac00beac00beac00"
+ },
+ "balance": "0x1"
+ },
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b": {
+ "balance": "0x16345785d871db8",
+ "nonce": "0x1"
+ }
+ },
+ "result": {
+ "stateRoot": "0x19a4f821a7c0a6f4c934f9acb0fe9ce5417b68086e12513ecbc3e3f57e01573c",
+ "txRoot": "0x248074fabe112f7d93917f292b64932394f835bb98da91f21501574d58ec92ab",
+ "receiptsRoot": "0xf78dfb743fbd92ade140711c8bbc542b5e307f0ab7984eff35d751969fe57efa",
+ "logsHash": "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
+ "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+ "receipts": [
+ {
+ "type": "0x2",
+ "root": "0x",
+ "status": "0x1",
+ "cumulativeGasUsed": "0x5208",
+ "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+ "logs": null,
+ "transactionHash": "0x84f70aba406a55628a0620f26d260f90aeb6ccc55fed6ec2ac13dd4f727032ed",
+ "contractAddress": "0x0000000000000000000000000000000000000000",
+ "gasUsed": "0x5208",
+ "effectiveGasPrice": null,
+ "blockHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+ "transactionIndex": "0x0"
+ }
+ ],
+ "currentDifficulty": null,
+ "gasUsed": "0x5208",
+ "currentBaseFee": "0x9",
+ "withdrawalsRoot": "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "currentExcessBlobGas": "0x0",
+ "blobGasUsed": "0x0"
+ }
+}
diff --git a/cmd/evm/testdata/29/readme.md b/cmd/evm/testdata/29/readme.md
new file mode 100644
index 0000000000..ab02ce9cf8
--- /dev/null
+++ b/cmd/evm/testdata/29/readme.md
@@ -0,0 +1,29 @@
+## EIP 4788
+
+This test contains testcases for EIP-4788. The 4788-contract is
+located at address `0x000F3df6D732807Ef1319fB7B8bB8522d0Beac02`, and this test executes a simple transaction. It also
+implicitly invokes the system tx, which sets calls the contract and sets the
+storage values
+
+```
+$ dir=./testdata/29/ && go run . t8n --state.fork=Cancun --input.alloc=$dir/alloc.json --input.txs=$dir/txs.json --input.env=$dir/env.json --output.alloc=stdout
+INFO [09-27|15:34:53.049] Trie dumping started root=19a4f8..01573c
+INFO [09-27|15:34:53.049] Trie dumping complete accounts=2 elapsed="192.759µs"
+INFO [09-27|15:34:53.050] Wrote file file=result.json
+{
+ "alloc": {
+ "0x000f3df6d732807ef1319fb7b8bb8522d0beac02": {
+ "code": "0x3373fffffffffffffffffffffffffffffffffffffffe14604457602036146024575f5ffd5b620180005f350680545f35146037575f5ffd5b6201800001545f5260205ff35b6201800042064281555f359062018000015500",
+ "storage": {
+ "0x000000000000000000000000000000000000000000000000000000000000079e": "0x000000000000000000000000000000000000000000000000000000000000079e",
+ "0x000000000000000000000000000000000000000000000000000000000001879e": "0x0000beac00beac00beac00beac00beac00beac00beac00beac00beac00beac00"
+ },
+ "balance": "0x1"
+ },
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b": {
+ "balance": "0x16345785d871db8",
+ "nonce": "0x1"
+ }
+ }
+}
+```
diff --git a/cmd/evm/testdata/29/txs.json b/cmd/evm/testdata/29/txs.json
new file mode 100644
index 0000000000..d6743cc4d2
--- /dev/null
+++ b/cmd/evm/testdata/29/txs.json
@@ -0,0 +1,19 @@
+[
+ {
+ "input" : "0x",
+ "gas" : "0x10000000",
+ "nonce" : "0x0",
+ "to" : "0x1111111111111111111111111111111111111111",
+ "value" : "0x0",
+ "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "chainId" : "0x1",
+ "type" : "0x2",
+ "v": "0x0",
+ "r": "0x0",
+ "s": "0x0",
+ "maxFeePerGas" : "0xfa0",
+ "maxPriorityFeePerGas" : "0x0",
+ "accessList" : [
+ ]
+ }
+]
\ No newline at end of file
diff --git a/cmd/evm/testdata/3/exp.json b/cmd/evm/testdata/3/exp.json
index 71b3d2f559..7230dca2cf 100644
--- a/cmd/evm/testdata/3/exp.json
+++ b/cmd/evm/testdata/3/exp.json
@@ -28,6 +28,7 @@
"transactionHash": "0x72fadbef39cd251a437eea619cfeda752271a5faaaa2147df012e112159ffb81",
"contractAddress": "0x0000000000000000000000000000000000000000",
"gasUsed": "0x521f",
+ "effectiveGasPrice": null,
"blockHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
"transactionIndex": "0x0"
}
diff --git a/cmd/evm/testdata/3/readme.md b/cmd/evm/testdata/3/readme.md
index 499f03d7aa..246c58ef3b 100644
--- a/cmd/evm/testdata/3/readme.md
+++ b/cmd/evm/testdata/3/readme.md
@@ -1,2 +1,2 @@
-These files examplify a transition where a transaction (excuted on block 5) requests
+These files exemplify a transition where a transaction (executed on block 5) requests
the blockhash for block `1`.
diff --git a/cmd/evm/testdata/4/readme.md b/cmd/evm/testdata/4/readme.md
index 08840d37bd..eede41a9fd 100644
--- a/cmd/evm/testdata/4/readme.md
+++ b/cmd/evm/testdata/4/readme.md
@@ -1,3 +1,3 @@
-These files examplify a transition where a transaction (excuted on block 5) requests
+These files exemplify a transition where a transaction (executed on block 5) requests
the blockhash for block `4`, but where the hash for that block is missing.
It's expected that executing these should cause `exit` with errorcode `4`.
diff --git a/cmd/evm/testdata/5/readme.md b/cmd/evm/testdata/5/readme.md
index e2b608face..1a84afaab6 100644
--- a/cmd/evm/testdata/5/readme.md
+++ b/cmd/evm/testdata/5/readme.md
@@ -1 +1 @@
-These files examplify a transition where there are no transcations, two ommers, at block `N-1` (delta 1) and `N-2` (delta 2).
\ No newline at end of file
+These files exemplify a transition where there are no transactions, two ommers, at block `N-1` (delta 1) and `N-2` (delta 2).
\ No newline at end of file
diff --git a/cmd/evm/testdata/8/readme.md b/cmd/evm/testdata/8/readme.md
index c991fb2177..85aae18924 100644
--- a/cmd/evm/testdata/8/readme.md
+++ b/cmd/evm/testdata/8/readme.md
@@ -7,7 +7,7 @@ This test contains testcases for EIP-2930, which uses transactions with access l
The alloc portion contains one contract (`0x000000000000000000000000000000000000aaaa`), containing the
following code: `0x5854505854`: `PC ;SLOAD; POP; PC; SLOAD`.
-Essentialy, this contract does `SLOAD(0)` and `SLOAD(3)`.
+Essentially, this contract does `SLOAD(0)` and `SLOAD(3)`.
The alloc also contains some funds on `0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b`.
@@ -32,7 +32,7 @@ dir=./testdata/8 && ./evm t8n --state.fork=Berlin --input.alloc=$dir/alloc.json
{"pc":4,"op":84,"gas":"0x48456","gasCost":"0x64","memSize":0,"stack":["0x3"],"depth":1,"refund":0,"opName":"SLOAD"}
```
-Simlarly, we can provide the input transactions via `stdin` instead of as file:
+Similarly, we can provide the input transactions via `stdin` instead of as file:
```
$ dir=./testdata/8 \
diff --git a/cmd/evm/testdata/9/readme.md b/cmd/evm/testdata/9/readme.md
index b144644655..357e200682 100644
--- a/cmd/evm/testdata/9/readme.md
+++ b/cmd/evm/testdata/9/readme.md
@@ -1,13 +1,13 @@
## EIP-1559 testing
-This test contains testcases for EIP-1559, which uses an new transaction type and has a new block parameter.
+This test contains testcases for EIP-1559, which uses a new transaction type and has a new block parameter.
### Prestate
The alloc portion contains one contract (`0x000000000000000000000000000000000000aaaa`), containing the
following code: `0x58585454`: `PC; PC; SLOAD; SLOAD`.
-Essentialy, this contract does `SLOAD(0)` and `SLOAD(1)`.
+Essentially, this contract does `SLOAD(0)` and `SLOAD(1)`.
The alloc also contains some funds on `0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b`.
diff --git a/cmd/evm/transition-test.sh b/cmd/evm/transition-test.sh
index a2ea534189..8cc6aa41de 100644
--- a/cmd/evm/transition-test.sh
+++ b/cmd/evm/transition-test.sh
@@ -280,7 +280,7 @@ To make `t8n` apply these, the following inputs are required:
- For ethash, it is `5000000000000000000` `wei`,
- If this is not defined, mining rewards are not applied,
- A value of `0` is valid, and causes accounts to be 'touched'.
-- For each ommer, the tool needs to be given an `addres\` and a `delta`. This
+- For each ommer, the tool needs to be given an `address\` and a `delta`. This
is done via the `ommers` field in `env`.
Note: the tool does not verify that e.g. the normal uncle rules apply,
diff --git a/cmd/faucet/README.md b/cmd/faucet/README.md
index 6e9b14ebc7..7e857fa0ee 100644
--- a/cmd/faucet/README.md
+++ b/cmd/faucet/README.md
@@ -12,7 +12,6 @@ First things first, the `faucet` needs to connect to an Ethereum network, for wh
- `-genesis` is a path to a file containing the network `genesis.json`. or using:
- `-goerli` with the faucet with Görli network config
- - `-rinkeby` with the faucet with Rinkeby network config
- `-sepolia` with the faucet with Sepolia network config
- `-network` is the devp2p network id used during connection
- `-bootnodes` is a list of `enode://` ids to join the network through
diff --git a/cmd/faucet/faucet.go b/cmd/faucet/faucet.go
index 3dfd639144..e4d6ad6977 100644
--- a/cmd/faucet/faucet.go
+++ b/cmd/faucet/faucet.go
@@ -86,7 +86,6 @@ var (
twitterTokenV1Flag = flag.String("twitter.token.v1", "", "Bearer token to authenticate with the v1.1 Twitter API")
goerliFlag = flag.Bool("goerli", false, "Initializes the faucet with Görli network config")
- rinkebyFlag = flag.Bool("rinkeby", false, "Initializes the faucet with Rinkeby network config")
sepoliaFlag = flag.Bool("sepolia", false, "Initializes the faucet with Sepolia network config")
)
@@ -140,7 +139,7 @@ func main() {
log.Crit("Failed to render the faucet template", "err", err)
}
// Load and parse the genesis block requested by the user
- genesis, err := getGenesis(*genesisFlag, *goerliFlag, *rinkebyFlag, *sepoliaFlag)
+ genesis, err := getGenesis(*genesisFlag, *goerliFlag, *sepoliaFlag)
if err != nil {
log.Crit("Failed to parse genesis config", "err", err)
}
@@ -269,11 +268,7 @@ func newFaucet(genesis *core.Genesis, port int, enodes []*enode.Node, network ui
}
}
// Attach to the client and retrieve and interesting metadatas
- api, err := stack.Attach()
- if err != nil {
- stack.Close()
- return nil, err
- }
+ api := stack.Attach()
client := ethclient.NewClient(api)
return &faucet{
@@ -880,7 +875,7 @@ func authNoAuth(url string) (string, string, common.Address, error) {
}
// getGenesis returns a genesis based on input args
-func getGenesis(genesisFlag string, goerliFlag bool, rinkebyFlag bool, sepoliaFlag bool) (*core.Genesis, error) {
+func getGenesis(genesisFlag string, goerliFlag bool, sepoliaFlag bool) (*core.Genesis, error) {
switch {
case genesisFlag != "":
var genesis core.Genesis
@@ -888,11 +883,9 @@ func getGenesis(genesisFlag string, goerliFlag bool, rinkebyFlag bool, sepoliaFl
return &genesis, err
case goerliFlag:
return core.DefaultGoerliGenesisBlock(), nil
- case rinkebyFlag:
- return core.DefaultRinkebyGenesisBlock(), nil
case sepoliaFlag:
return core.DefaultSepoliaGenesisBlock(), nil
default:
- return nil, fmt.Errorf("no genesis flag provided")
+ return nil, errors.New("no genesis flag provided")
}
}
diff --git a/cmd/geth/accountcmd.go b/cmd/geth/accountcmd.go
index 5158b7606c..cc22684e0b 100644
--- a/cmd/geth/accountcmd.go
+++ b/cmd/geth/accountcmd.go
@@ -188,15 +188,34 @@ nodes.
}
)
+// makeAccountManager creates an account manager with backends
+func makeAccountManager(ctx *cli.Context) *accounts.Manager {
+ cfg := loadBaseConfig(ctx)
+ am := accounts.NewManager(&accounts.Config{InsecureUnlockAllowed: cfg.Node.InsecureUnlockAllowed})
+ keydir, isEphemeral, err := cfg.Node.GetKeyStoreDir()
+ if err != nil {
+ utils.Fatalf("Failed to get the keystore directory: %v", err)
+ }
+ if isEphemeral {
+ utils.Fatalf("Can't use ephemeral directory as keystore path")
+ }
+
+ if err := setAccountManagerBackends(&cfg.Node, am, keydir); err != nil {
+ utils.Fatalf("Failed to set account manager backends: %v", err)
+ }
+ return am
+}
+
func accountList(ctx *cli.Context) error {
- stack, _ := makeConfigNode(ctx)
+ am := makeAccountManager(ctx)
var index int
- for _, wallet := range stack.AccountManager().Wallets() {
+ for _, wallet := range am.Wallets() {
for _, account := range wallet.Accounts() {
fmt.Printf("Account #%d: {%x} %s\n", index, account.Address, &account.URL)
index++
}
}
+
return nil
}
@@ -258,17 +277,13 @@ func ambiguousAddrRecovery(ks *keystore.KeyStore, err *keystore.AmbiguousAddrErr
// accountCreate creates a new account into the keystore defined by the CLI flags.
func accountCreate(ctx *cli.Context) error {
- cfg := gethConfig{Node: defaultNodeConfig()}
- // Load config file.
- if file := ctx.String(configFileFlag.Name); file != "" {
- if err := loadConfig(file, &cfg); err != nil {
- utils.Fatalf("%v", err)
- }
- }
- utils.SetNodeConfig(ctx, &cfg.Node)
- keydir, err := cfg.Node.KeyDirConfig()
+ cfg := loadBaseConfig(ctx)
+ keydir, isEphemeral, err := cfg.Node.GetKeyStoreDir()
if err != nil {
- utils.Fatalf("Failed to read configuration: %v", err)
+ utils.Fatalf("Failed to get the keystore directory: %v", err)
+ }
+ if isEphemeral {
+ utils.Fatalf("Can't use ephemeral directory as keystore path")
}
scryptN := keystore.StandardScryptN
scryptP := keystore.StandardScryptP
@@ -300,8 +315,12 @@ func accountUpdate(ctx *cli.Context) error {
if ctx.Args().Len() == 0 {
utils.Fatalf("No accounts specified to update")
}
- stack, _ := makeConfigNode(ctx)
- ks := stack.AccountManager().Backends(keystore.KeyStoreType)[0].(*keystore.KeyStore)
+ am := makeAccountManager(ctx)
+ backends := am.Backends(keystore.KeyStoreType)
+ if len(backends) == 0 {
+ utils.Fatalf("Keystore is not available")
+ }
+ ks := backends[0].(*keystore.KeyStore)
for _, addr := range ctx.Args().Slice() {
account, oldPassword := unlockAccount(ks, addr, 0, nil)
@@ -323,10 +342,14 @@ func importWallet(ctx *cli.Context) error {
utils.Fatalf("Could not read wallet file: %v", err)
}
- stack, _ := makeConfigNode(ctx)
+ am := makeAccountManager(ctx)
+ backends := am.Backends(keystore.KeyStoreType)
+ if len(backends) == 0 {
+ utils.Fatalf("Keystore is not available")
+ }
+ ks := backends[0].(*keystore.KeyStore)
passphrase := utils.GetPassPhraseWithList("", false, 0, utils.MakePasswordList(ctx))
- ks := stack.AccountManager().Backends(keystore.KeyStoreType)[0].(*keystore.KeyStore)
acct, err := ks.ImportPreSaleKey(keyJSON, passphrase)
if err != nil {
utils.Fatalf("%v", err)
@@ -344,10 +367,14 @@ func accountImport(ctx *cli.Context) error {
if err != nil {
utils.Fatalf("Failed to load the private key: %v", err)
}
- stack, _ := makeConfigNode(ctx)
+ am := makeAccountManager(ctx)
+ backends := am.Backends(keystore.KeyStoreType)
+ if len(backends) == 0 {
+ utils.Fatalf("Keystore is not available")
+ }
+ ks := backends[0].(*keystore.KeyStore)
passphrase := utils.GetPassPhraseWithList("Your new account is locked with a password. Please give a password. Do not forget this password.", true, 0, utils.MakePasswordList(ctx))
- ks := stack.AccountManager().Backends(keystore.KeyStoreType)[0].(*keystore.KeyStore)
acct, err := ks.ImportECDSA(key, passphrase)
if err != nil {
utils.Fatalf("Could not create the account: %v", err)
diff --git a/cmd/geth/attach_test.go b/cmd/geth/attach_test.go
index 7c5f951750..91007ccf65 100644
--- a/cmd/geth/attach_test.go
+++ b/cmd/geth/attach_test.go
@@ -61,7 +61,7 @@ func TestRemoteDbWithHeaders(t *testing.T) {
}
func testReceiveHeaders(t *testing.T, ln net.Listener, gethArgs ...string) {
- var ok uint32
+ var ok atomic.Uint32
server := &http.Server{
Addr: "localhost:0",
Handler: &testHandler{func(w http.ResponseWriter, r *http.Request) {
@@ -72,12 +72,12 @@ func testReceiveHeaders(t *testing.T, ln net.Listener, gethArgs ...string) {
if have, want := r.Header.Get("second"), "two"; have != want {
t.Fatalf("missing header, have %v want %v", have, want)
}
- atomic.StoreUint32(&ok, 1)
+ ok.Store(1)
}}}
go server.Serve(ln)
defer server.Close()
runGeth(t, gethArgs...).WaitExit()
- if atomic.LoadUint32(&ok) != 1 {
+ if ok.Load() != 1 {
t.Fatal("Test fail, expected invocation to succeed")
}
}
diff --git a/cmd/geth/chaincmd.go b/cmd/geth/chaincmd.go
index 30fe09008b..a6bb2c2d2c 100644
--- a/cmd/geth/chaincmd.go
+++ b/cmd/geth/chaincmd.go
@@ -39,7 +39,6 @@ import (
"github.com/ethereum/go-ethereum/log"
"github.com/ethereum/go-ethereum/metrics"
"github.com/ethereum/go-ethereum/node"
- "github.com/ethereum/go-ethereum/trie"
"github.com/urfave/cli/v2"
)
@@ -49,7 +48,9 @@ var (
Name: "init",
Usage: "Bootstrap and initialize a new genesis block",
ArgsUsage: "",
- Flags: flags.Merge([]cli.Flag{utils.CachePreimagesFlag}, utils.DatabasePathFlags),
+ Flags: flags.Merge([]cli.Flag{
+ utils.CachePreimagesFlag,
+ }, utils.DatabaseFlags),
Description: `
The init command initializes a new genesis block and definition for the network.
This is a destructive action and changes the network in which you will be
@@ -94,7 +95,9 @@ if one is set. Otherwise it prints the genesis from the datadir.`,
utils.MetricsInfluxDBBucketFlag,
utils.MetricsInfluxDBOrganizationFlag,
utils.TxLookupLimitFlag,
- }, utils.DatabasePathFlags),
+ utils.TransactionHistoryFlag,
+ utils.StateHistoryFlag,
+ }, utils.DatabaseFlags),
Description: `
The import command imports blocks from an RLP-encoded form. The form can be one file
with several RLP-encoded blocks, or several files can be used.
@@ -110,7 +113,7 @@ processing will proceed even if an individual RLP-file import failure occurs.`,
Flags: flags.Merge([]cli.Flag{
utils.CacheFlag,
utils.SyncModeFlag,
- }, utils.DatabasePathFlags),
+ }, utils.DatabaseFlags),
Description: `
Requires a first argument of the file to write to.
Optional second and third arguments control the first and
@@ -126,7 +129,7 @@ be gzipped.`,
Flags: flags.Merge([]cli.Flag{
utils.CacheFlag,
utils.SyncModeFlag,
- }, utils.DatabasePathFlags),
+ }, utils.DatabaseFlags),
Description: `
The import-preimages command imports hash preimages from an RLP encoded stream.
It's deprecated, please use "geth db import" instead.
@@ -140,7 +143,7 @@ It's deprecated, please use "geth db import" instead.
Flags: flags.Merge([]cli.Flag{
utils.CacheFlag,
utils.SyncModeFlag,
- }, utils.DatabasePathFlags),
+ }, utils.DatabaseFlags),
Description: `
The export-preimages command exports hash preimages to an RLP encoded stream.
It's deprecated, please use "geth db export" instead.
@@ -159,7 +162,7 @@ It's deprecated, please use "geth db export" instead.
utils.IncludeIncompletesFlag,
utils.StartKeyFlag,
utils.DumpLimitFlag,
- }, utils.DatabasePathFlags),
+ }, utils.DatabaseFlags),
Description: `
This command dumps out the state for a given block (or latest, if none provided).
`,
@@ -195,14 +198,15 @@ func initGenesis(ctx *cli.Context) error {
if err != nil {
utils.Fatalf("Failed to open database: %v", err)
}
- triedb := trie.NewDatabaseWithConfig(chaindb, &trie.Config{
- Preimages: ctx.Bool(utils.CachePreimagesFlag.Name),
- })
+ defer chaindb.Close()
+
+ triedb := utils.MakeTrieDatabase(ctx, chaindb, ctx.Bool(utils.CachePreimagesFlag.Name), false)
+ defer triedb.Close()
+
_, hash, err := core.SetupGenesisBlock(chaindb, triedb, genesis)
if err != nil {
utils.Fatalf("Failed to write genesis block: %v", err)
}
- chaindb.Close()
log.Info("Successfully wrote genesis state", "database", name, "hash", hash)
}
return nil
@@ -241,7 +245,7 @@ func dumpGenesis(ctx *cli.Context) error {
if ctx.IsSet(utils.DataDirFlag.Name) {
utils.Fatalf("no existing datadir at %s", stack.Config().DataDir)
}
- utils.Fatalf("no network preset provided. no exisiting genesis in the default datadir")
+ utils.Fatalf("no network preset provided, no existing genesis in the default datadir")
return nil
}
@@ -261,16 +265,16 @@ func importChain(ctx *cli.Context) error {
defer db.Close()
// Start periodically gathering memory profiles
- var peakMemAlloc, peakMemSys uint64
+ var peakMemAlloc, peakMemSys atomic.Uint64
go func() {
stats := new(runtime.MemStats)
for {
runtime.ReadMemStats(stats)
- if atomic.LoadUint64(&peakMemAlloc) < stats.Alloc {
- atomic.StoreUint64(&peakMemAlloc, stats.Alloc)
+ if peakMemAlloc.Load() < stats.Alloc {
+ peakMemAlloc.Store(stats.Alloc)
}
- if atomic.LoadUint64(&peakMemSys) < stats.Sys {
- atomic.StoreUint64(&peakMemSys, stats.Sys)
+ if peakMemSys.Load() < stats.Sys {
+ peakMemSys.Store(stats.Sys)
}
time.Sleep(5 * time.Second)
}
@@ -303,8 +307,8 @@ func importChain(ctx *cli.Context) error {
mem := new(runtime.MemStats)
runtime.ReadMemStats(mem)
- fmt.Printf("Object memory: %.3f MB current, %.3f MB peak\n", float64(mem.Alloc)/1024/1024, float64(atomic.LoadUint64(&peakMemAlloc))/1024/1024)
- fmt.Printf("System memory: %.3f MB current, %.3f MB peak\n", float64(mem.Sys)/1024/1024, float64(atomic.LoadUint64(&peakMemSys))/1024/1024)
+ fmt.Printf("Object memory: %.3f MB current, %.3f MB peak\n", float64(mem.Alloc)/1024/1024, float64(peakMemAlloc.Load())/1024/1024)
+ fmt.Printf("System memory: %.3f MB current, %.3f MB peak\n", float64(mem.Sys)/1024/1024, float64(peakMemSys.Load())/1024/1024)
fmt.Printf("Allocations: %.3f million\n", float64(mem.Mallocs)/1000000)
fmt.Printf("GC pause: %v\n\n", time.Duration(mem.PauseTotalNs))
@@ -332,7 +336,8 @@ func exportChain(ctx *cli.Context) error {
stack, _ := makeConfigNode(ctx)
defer stack.Close()
- chain, _ := utils.MakeChain(ctx, stack, true)
+ chain, db := utils.MakeChain(ctx, stack, true)
+ defer db.Close()
start := time.Now()
var err error
@@ -372,6 +377,7 @@ func importPreimages(ctx *cli.Context) error {
defer stack.Close()
db := utils.MakeChainDatabase(ctx, stack, false)
+ defer db.Close()
start := time.Now()
if err := utils.ImportPreimages(db, ctx.Args().First()); err != nil {
@@ -390,6 +396,7 @@ func exportPreimages(ctx *cli.Context) error {
defer stack.Close()
db := utils.MakeChainDatabase(ctx, stack, true)
+ defer db.Close()
start := time.Now()
if err := utils.ExportPreimages(db, ctx.Args().First()); err != nil {
@@ -401,6 +408,8 @@ func exportPreimages(ctx *cli.Context) error {
func parseDumpConfig(ctx *cli.Context, stack *node.Node) (*state.DumpConfig, ethdb.Database, common.Hash, error) {
db := utils.MakeChainDatabase(ctx, stack, true)
+ defer db.Close()
+
var header *types.Header
if ctx.NArg() > 1 {
return nil, nil, common.Hash{}, fmt.Errorf("expected 1 argument (number or hash), got %d", ctx.NArg())
@@ -465,10 +474,10 @@ func dump(ctx *cli.Context) error {
if err != nil {
return err
}
- config := &trie.Config{
- Preimages: true, // always enable preimage lookup
- }
- state, err := state.New(root, state.NewDatabaseWithConfigAndCache(db, config), nil)
+ triedb := utils.MakeTrieDatabase(ctx, db, true, true) // always enable preimage lookup
+ defer triedb.Close()
+
+ state, err := state.New(root, state.NewDatabaseWithNodeDB(db, triedb), nil)
if err != nil {
return err
}
@@ -478,7 +487,7 @@ func dump(ctx *cli.Context) error {
if conf.OnlyWithAddresses {
fmt.Fprintf(os.Stderr, "If you want to include accounts with missing preimages, you need iterative output, since"+
" otherwise the accounts will overwrite each other in the resulting mapping.")
- return fmt.Errorf("incompatible options")
+ return errors.New("incompatible options")
}
fmt.Println(string(state.Dump(conf)))
}
diff --git a/cmd/geth/config.go b/cmd/geth/config.go
index 10a519c2cb..81128ab007 100644
--- a/cmd/geth/config.go
+++ b/cmd/geth/config.go
@@ -22,15 +22,19 @@ import (
"fmt"
"os"
"reflect"
+ "runtime"
+ "strings"
"unicode"
- "github.com/urfave/cli/v2"
-
+ "github.com/ethereum/go-ethereum/accounts"
"github.com/ethereum/go-ethereum/accounts/external"
"github.com/ethereum/go-ethereum/accounts/keystore"
"github.com/ethereum/go-ethereum/accounts/scwallet"
"github.com/ethereum/go-ethereum/accounts/usbwallet"
"github.com/ethereum/go-ethereum/cmd/utils"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/common/hexutil"
+ "github.com/ethereum/go-ethereum/eth/catalyst"
"github.com/ethereum/go-ethereum/eth/downloader"
"github.com/ethereum/go-ethereum/eth/ethconfig"
"github.com/ethereum/go-ethereum/internal/ethapi"
@@ -41,6 +45,7 @@ import (
"github.com/ethereum/go-ethereum/node"
"github.com/ethereum/go-ethereum/params"
"github.com/naoina/toml"
+ "github.com/urfave/cli/v2"
)
var (
@@ -119,8 +124,9 @@ func defaultNodeConfig() node.Config {
return cfg
}
-// makeConfigNode loads geth configuration and creates a blank node instance.
-func makeConfigNode(ctx *cli.Context) (*node.Node, gethConfig) {
+// loadBaseConfig loads the gethConfig based on the given command line
+// parameters and config file.
+func loadBaseConfig(ctx *cli.Context) gethConfig {
// Load defaults.
cfg := gethConfig{
Eth: ethconfig.Defaults,
@@ -137,12 +143,18 @@ func makeConfigNode(ctx *cli.Context) (*node.Node, gethConfig) {
// Apply flags.
utils.SetNodeConfig(ctx, &cfg.Node)
+ return cfg
+}
+
+// makeConfigNode loads geth configuration and creates a blank node instance.
+func makeConfigNode(ctx *cli.Context) (*node.Node, gethConfig) {
+ cfg := loadBaseConfig(ctx)
stack, err := node.New(&cfg.Node)
if err != nil {
utils.Fatalf("Failed to create the protocol stack: %v", err)
}
// Node doesn't by default populate account manager backends
- if err := setAccountManagerBackends(stack); err != nil {
+ if err := setAccountManagerBackends(stack.Config(), stack.AccountManager(), stack.KeyStoreDir()); err != nil {
utils.Fatalf("Failed to set account manager backends: %v", err)
}
@@ -158,25 +170,37 @@ func makeConfigNode(ctx *cli.Context) (*node.Node, gethConfig) {
// makeFullNode loads geth configuration and creates the Ethereum backend.
func makeFullNode(ctx *cli.Context) (*node.Node, ethapi.Backend) {
stack, cfg := makeConfigNode(ctx)
- if ctx.IsSet(utils.OverrideShanghai.Name) {
- v := ctx.Uint64(utils.OverrideShanghai.Name)
- cfg.Eth.OverrideShanghai = &v
+ if ctx.IsSet(utils.OverrideCancun.Name) {
+ v := ctx.Uint64(utils.OverrideCancun.Name)
+ cfg.Eth.OverrideCancun = &v
}
- if ctx.IsSet(utils.OverrideOptimismBedrock.Name) {
- cfg.Eth.OverrideOptimismBedrock = flags.GlobalBig(ctx, utils.OverrideOptimismBedrock.Name)
+ if ctx.IsSet(utils.OverrideOptimismCanyon.Name) {
+ v := ctx.Uint64(utils.OverrideOptimismCanyon.Name)
+ cfg.Eth.OverrideOptimismCanyon = &v
}
- if ctx.IsSet(utils.OverrideOptimismRegolith.Name) {
- v := ctx.Uint64(utils.OverrideOptimismRegolith.Name)
- cfg.Eth.OverrideOptimismRegolith = &v
- }
- if ctx.IsSet(utils.OverrideOptimism.Name) {
- override := ctx.Bool(utils.OverrideOptimism.Name)
- cfg.Eth.OverrideOptimism = &override
+
+ if ctx.IsSet(utils.OverrideVerkle.Name) {
+ v := ctx.Uint64(utils.OverrideVerkle.Name)
+ cfg.Eth.OverrideVerkle = &v
}
backend, eth := utils.RegisterEthService(stack, &cfg.Eth)
+ // Create gauge with geth system and build information
+ if eth != nil { // The 'eth' backend may be nil in light mode
+ var protos []string
+ for _, p := range eth.Protocols() {
+ protos = append(protos, fmt.Sprintf("%v/%d", p.Name, p.Version))
+ }
+ metrics.NewRegisteredGaugeInfo("geth/info", nil).Update(metrics.GaugeInfoValue{
+ "arch": runtime.GOARCH,
+ "os": runtime.GOOS,
+ "version": cfg.Node.Version,
+ "protocols": strings.Join(protos, ","),
+ })
+ }
+
// Configure log filter RPC API.
filterSystem := utils.RegisterFilterAPI(stack, backend, &cfg.Eth)
@@ -184,15 +208,32 @@ func makeFullNode(ctx *cli.Context) (*node.Node, ethapi.Backend) {
if ctx.IsSet(utils.GraphQLEnabledFlag.Name) {
utils.RegisterGraphQLService(stack, backend, filterSystem, &cfg.Node)
}
-
// Add the Ethereum Stats daemon if requested.
if cfg.Ethstats.URL != "" {
utils.RegisterEthStatsService(stack, backend, cfg.Ethstats.URL)
}
-
// Configure full-sync tester service if requested
- if ctx.IsSet(utils.SyncTargetFlag.Name) && cfg.Eth.SyncMode == downloader.FullSync {
- utils.RegisterFullSyncTester(stack, eth, ctx.Path(utils.SyncTargetFlag.Name))
+ if ctx.IsSet(utils.SyncTargetFlag.Name) {
+ hex := hexutil.MustDecode(ctx.String(utils.SyncTargetFlag.Name))
+ if len(hex) != common.HashLength {
+ utils.Fatalf("invalid sync target length: have %d, want %d", len(hex), common.HashLength)
+ }
+ utils.RegisterFullSyncTester(stack, eth, common.BytesToHash(hex))
+ }
+ // Start the dev mode if requested, or launch the engine API for
+ // interacting with external consensus client.
+ if ctx.IsSet(utils.DeveloperFlag.Name) {
+ simBeacon, err := catalyst.NewSimulatedBeacon(ctx.Uint64(utils.DeveloperPeriodFlag.Name), eth)
+ if err != nil {
+ utils.Fatalf("failed to register dev mode catalyst service: %v", err)
+ }
+ catalyst.RegisterSimulatedBeaconAPIs(stack, simBeacon)
+ stack.RegisterLifecycle(simBeacon)
+ } else if cfg.Eth.SyncMode != downloader.LightSync {
+ err := catalyst.Register(stack, eth)
+ if err != nil {
+ utils.Fatalf("failed to register catalyst service: %v", err)
+ }
}
return stack, backend
}
@@ -277,15 +318,16 @@ func deprecated(field string) bool {
return true
case "ethconfig.Config.EWASMInterpreter":
return true
+ case "ethconfig.Config.TrieCleanCacheJournal":
+ return true
+ case "ethconfig.Config.TrieCleanCacheRejournal":
+ return true
default:
return false
}
}
-func setAccountManagerBackends(stack *node.Node) error {
- conf := stack.Config()
- am := stack.AccountManager()
- keydir := stack.KeyStoreDir()
+func setAccountManagerBackends(conf *node.Config, am *accounts.Manager, keydir string) error {
scryptN := keystore.StandardScryptN
scryptP := keystore.StandardScryptP
if conf.UseLightweightKDF {
@@ -296,8 +338,8 @@ func setAccountManagerBackends(stack *node.Node) error {
// Assemble the supported backends
if len(conf.ExternalSigner) > 0 {
log.Info("Using external signer", "url", conf.ExternalSigner)
- if extapi, err := external.NewExternalBackend(conf.ExternalSigner); err == nil {
- am.AddBackend(extapi)
+ if extBackend, err := external.NewExternalBackend(conf.ExternalSigner); err == nil {
+ am.AddBackend(extBackend)
return nil
} else {
return fmt.Errorf("error connecting to external signer: %v", err)
diff --git a/cmd/geth/consolecmd.go b/cmd/geth/consolecmd.go
index aeee6f9c9e..526ede9619 100644
--- a/cmd/geth/consolecmd.go
+++ b/cmd/geth/consolecmd.go
@@ -75,10 +75,7 @@ func localConsole(ctx *cli.Context) error {
defer stack.Close()
// Attach to the newly started node and create the JavaScript console.
- client, err := stack.Attach()
- if err != nil {
- return fmt.Errorf("failed to attach to the inproc geth: %v", err)
- }
+ client := stack.Attach()
config := console.Config{
DataDir: utils.MakeDataDir(ctx),
DocRoot: ctx.String(utils.JSpathFlag.Name),
diff --git a/cmd/geth/consolecmd_test.go b/cmd/geth/consolecmd_test.go
index 46bdf3c90d..5046906c0a 100644
--- a/cmd/geth/consolecmd_test.go
+++ b/cmd/geth/consolecmd_test.go
@@ -116,7 +116,7 @@ func TestAttachWelcome(t *testing.T) {
waitForEndpoint(t, endpoint, 3*time.Second)
testAttachWelcome(t, geth, endpoint, httpAPIs)
})
- geth.ExpectExit()
+ geth.Kill()
}
func testAttachWelcome(t *testing.T, geth *testgeth, endpoint, apis string) {
diff --git a/cmd/geth/dao_test.go b/cmd/geth/dao_test.go
deleted file mode 100644
index 0701a2d5a2..0000000000
--- a/cmd/geth/dao_test.go
+++ /dev/null
@@ -1,152 +0,0 @@
-// Copyright 2016 The go-ethereum Authors
-// This file is part of go-ethereum.
-//
-// go-ethereum is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// go-ethereum is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with go-ethereum. If not, see .
-
-package main
-
-import (
- "math/big"
- "os"
- "path/filepath"
- "testing"
-
- "github.com/ethereum/go-ethereum/common"
- "github.com/ethereum/go-ethereum/core/rawdb"
- "github.com/ethereum/go-ethereum/params"
-)
-
-// Genesis block for nodes which don't care about the DAO fork (i.e. not configured)
-var daoOldGenesis = `{
- "alloc" : {},
- "coinbase" : "0x0000000000000000000000000000000000000000",
- "difficulty" : "0x20000",
- "extraData" : "",
- "gasLimit" : "0x2fefd8",
- "nonce" : "0x0000000000000042",
- "mixhash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
- "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
- "timestamp" : "0x00",
- "config" : {
- "homesteadBlock" : 0
- }
-}`
-
-// Genesis block for nodes which actively oppose the DAO fork
-var daoNoForkGenesis = `{
- "alloc" : {},
- "coinbase" : "0x0000000000000000000000000000000000000000",
- "difficulty" : "0x20000",
- "extraData" : "",
- "gasLimit" : "0x2fefd8",
- "nonce" : "0x0000000000000042",
- "mixhash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
- "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
- "timestamp" : "0x00",
- "config" : {
- "homesteadBlock" : 0,
- "daoForkBlock" : 314,
- "daoForkSupport" : false
- }
-}`
-
-// Genesis block for nodes which actively support the DAO fork
-var daoProForkGenesis = `{
- "alloc" : {},
- "coinbase" : "0x0000000000000000000000000000000000000000",
- "difficulty" : "0x20000",
- "extraData" : "",
- "gasLimit" : "0x2fefd8",
- "nonce" : "0x0000000000000042",
- "mixhash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
- "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
- "timestamp" : "0x00",
- "config" : {
- "homesteadBlock" : 0,
- "daoForkBlock" : 314,
- "daoForkSupport" : true
- }
-}`
-
-var daoGenesisHash = common.HexToHash("5e1fc79cb4ffa4739177b5408045cd5d51c6cf766133f23f7cd72ee1f8d790e0")
-var daoGenesisForkBlock = big.NewInt(314)
-
-// TestDAOForkBlockNewChain tests that the DAO hard-fork number and the nodes support/opposition is correctly
-// set in the database after various initialization procedures and invocations.
-func TestDAOForkBlockNewChain(t *testing.T) {
- for i, arg := range []struct {
- genesis string
- expectBlock *big.Int
- expectVote bool
- }{
- // Test DAO Default Mainnet
- {"", params.MainnetChainConfig.DAOForkBlock, true},
- // test DAO Init Old Privnet
- {daoOldGenesis, nil, false},
- // test DAO Default No Fork Privnet
- {daoNoForkGenesis, daoGenesisForkBlock, false},
- // test DAO Default Pro Fork Privnet
- {daoProForkGenesis, daoGenesisForkBlock, true},
- } {
- testDAOForkBlockNewChain(t, i, arg.genesis, arg.expectBlock, arg.expectVote)
- }
-}
-
-func testDAOForkBlockNewChain(t *testing.T, test int, genesis string, expectBlock *big.Int, expectVote bool) {
- // Create a temporary data directory to use and inspect later
- datadir := t.TempDir()
-
- // Start a Geth instance with the requested flags set and immediately terminate
- if genesis != "" {
- json := filepath.Join(datadir, "genesis.json")
- if err := os.WriteFile(json, []byte(genesis), 0600); err != nil {
- t.Fatalf("test %d: failed to write genesis file: %v", test, err)
- }
- runGeth(t, "--datadir", datadir, "--networkid", "1337", "init", json).WaitExit()
- } else {
- // Force chain initialization
- args := []string{"--port", "0", "--networkid", "1337", "--maxpeers", "0", "--nodiscover", "--nat", "none", "--ipcdisable", "--datadir", datadir}
- runGeth(t, append(args, []string{"--exec", "2+2", "console"}...)...).WaitExit()
- }
- // Retrieve the DAO config flag from the database
- path := filepath.Join(datadir, "geth", "chaindata")
- db, err := rawdb.NewLevelDBDatabase(path, 0, 0, "", false)
- if err != nil {
- t.Fatalf("test %d: failed to open test database: %v", test, err)
- }
- defer db.Close()
-
- genesisHash := common.HexToHash("0xd4e56740f876aef8c010b86a40d5f56745a118d0906a34e69aec8c0db1cb8fa3")
- if genesis != "" {
- genesisHash = daoGenesisHash
- }
- config := rawdb.ReadChainConfig(db, genesisHash)
- if config == nil {
- t.Errorf("test %d: failed to retrieve chain config: %v", test, err)
- return // we want to return here, the other checks can't make it past this point (nil panic).
- }
- // Validate the DAO hard-fork block number against the expected value
- if config.DAOForkBlock == nil {
- if expectBlock != nil {
- t.Errorf("test %d: dao hard-fork block mismatch: have nil, want %v", test, expectBlock)
- }
- } else if expectBlock == nil {
- t.Errorf("test %d: dao hard-fork block mismatch: have %v, want nil", test, config.DAOForkBlock)
- } else if config.DAOForkBlock.Cmp(expectBlock) != 0 {
- t.Errorf("test %d: dao hard-fork block mismatch: have %v, want %v", test, config.DAOForkBlock, expectBlock)
- }
- if config.DAOForkSupport != expectVote {
- t.Errorf("test %d: dao hard-fork support mismatch: have %v, want %v", test, config.DAOForkSupport, expectVote)
- }
-}
diff --git a/cmd/geth/dbcmd.go b/cmd/geth/dbcmd.go
index e182b7ed08..6f802716c5 100644
--- a/cmd/geth/dbcmd.go
+++ b/cmd/geth/dbcmd.go
@@ -30,7 +30,6 @@ import (
"github.com/ethereum/go-ethereum/cmd/utils"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/common/hexutil"
- "github.com/ethereum/go-ethereum/common/math"
"github.com/ethereum/go-ethereum/console/prompt"
"github.com/ethereum/go-ethereum/core/rawdb"
"github.com/ethereum/go-ethereum/core/state/snapshot"
@@ -49,7 +48,7 @@ var (
Name: "removedb",
Usage: "Remove blockchain and state databases",
ArgsUsage: "",
- Flags: utils.DatabasePathFlags,
+ Flags: utils.DatabaseFlags,
Description: `
Remove blockchain and state databases`,
}
@@ -63,7 +62,6 @@ Remove blockchain and state databases`,
dbCompactCmd,
dbGetCmd,
dbDeleteCmd,
- dbInspectTrieCmd,
dbPutCmd,
dbGetSlotsCmd,
dbDumpFreezerIndex,
@@ -79,26 +77,15 @@ Remove blockchain and state databases`,
ArgsUsage: " ",
Flags: flags.Merge([]cli.Flag{
utils.SyncModeFlag,
- }, utils.NetworkFlags, utils.DatabasePathFlags),
+ }, utils.NetworkFlags, utils.DatabaseFlags),
Usage: "Inspect the storage size for each type of data in the database",
Description: `This commands iterates the entire database. If the optional 'prefix' and 'start' arguments are provided, then the iteration is limited to the given subset of data.`,
}
- dbInspectTrieCmd = &cli.Command{
- Action: inspectTrie,
- Name: "inspect-trie",
- ArgsUsage: " ",
- Flags: []cli.Flag{
- utils.DataDirFlag,
- utils.SyncModeFlag,
- },
- Usage: "Inspect the MPT tree of the account and contract.",
- Description: `This commands iterates the entrie WorldState.`,
- }
dbCheckStateContentCmd = &cli.Command{
Action: checkStateContent,
Name: "check-state-content",
ArgsUsage: "",
- Flags: flags.Merge(utils.NetworkFlags, utils.DatabasePathFlags),
+ Flags: flags.Merge(utils.NetworkFlags, utils.DatabaseFlags),
Usage: "Verify that state data is cryptographically correct",
Description: `This command iterates the entire database for 32-byte keys, looking for rlp-encoded trie nodes.
For each trie node encountered, it checks that the key corresponds to the keccak256(value). If this is not true, this indicates
@@ -110,7 +97,7 @@ a data corruption.`,
Usage: "Print leveldb statistics",
Flags: flags.Merge([]cli.Flag{
utils.SyncModeFlag,
- }, utils.NetworkFlags, utils.DatabasePathFlags),
+ }, utils.NetworkFlags, utils.DatabaseFlags),
}
dbCompactCmd = &cli.Command{
Action: dbCompact,
@@ -120,7 +107,7 @@ a data corruption.`,
utils.SyncModeFlag,
utils.CacheFlag,
utils.CacheDatabaseFlag,
- }, utils.NetworkFlags, utils.DatabasePathFlags),
+ }, utils.NetworkFlags, utils.DatabaseFlags),
Description: `This command performs a database compaction.
WARNING: This operation may take a very long time to finish, and may cause database
corruption if it is aborted during execution'!`,
@@ -132,7 +119,7 @@ corruption if it is aborted during execution'!`,
ArgsUsage: "",
Flags: flags.Merge([]cli.Flag{
utils.SyncModeFlag,
- }, utils.NetworkFlags, utils.DatabasePathFlags),
+ }, utils.NetworkFlags, utils.DatabaseFlags),
Description: "This command looks up the specified database key from the database.",
}
dbDeleteCmd = &cli.Command{
@@ -142,7 +129,7 @@ corruption if it is aborted during execution'!`,
ArgsUsage: "",
Flags: flags.Merge([]cli.Flag{
utils.SyncModeFlag,
- }, utils.NetworkFlags, utils.DatabasePathFlags),
+ }, utils.NetworkFlags, utils.DatabaseFlags),
Description: `This command deletes the specified database key from the database.
WARNING: This is a low-level operation which may cause database corruption!`,
}
@@ -153,7 +140,7 @@ WARNING: This is a low-level operation which may cause database corruption!`,
ArgsUsage: " ",
Flags: flags.Merge([]cli.Flag{
utils.SyncModeFlag,
- }, utils.NetworkFlags, utils.DatabasePathFlags),
+ }, utils.NetworkFlags, utils.DatabaseFlags),
Description: `This command sets a given database key to the given value.
WARNING: This is a low-level operation which may cause database corruption!`,
}
@@ -164,7 +151,7 @@ WARNING: This is a low-level operation which may cause database corruption!`,
ArgsUsage: " ",
Flags: flags.Merge([]cli.Flag{
utils.SyncModeFlag,
- }, utils.NetworkFlags, utils.DatabasePathFlags),
+ }, utils.NetworkFlags, utils.DatabaseFlags),
Description: "This command looks up the specified database key from the database.",
}
dbDumpFreezerIndex = &cli.Command{
@@ -174,7 +161,7 @@ WARNING: This is a low-level operation which may cause database corruption!`,
ArgsUsage: " ",
Flags: flags.Merge([]cli.Flag{
utils.SyncModeFlag,
- }, utils.NetworkFlags, utils.DatabasePathFlags),
+ }, utils.NetworkFlags, utils.DatabaseFlags),
Description: "This command displays information about the freezer index.",
}
dbImportCmd = &cli.Command{
@@ -184,7 +171,7 @@ WARNING: This is a low-level operation which may cause database corruption!`,
ArgsUsage: " ",
Flags: flags.Merge([]cli.Flag{
utils.SyncModeFlag,
- }, utils.NetworkFlags, utils.DatabasePathFlags),
+ }, utils.NetworkFlags, utils.DatabaseFlags),
Description: "Exports the specified chain data to an RLP encoded stream, optionally gzip-compressed.",
}
dbMetadataCmd = &cli.Command{
@@ -203,7 +190,7 @@ WARNING: This is a low-level operation which may cause database corruption!`,
Usage: "Shows metadata about the chain status.",
Flags: flags.Merge([]cli.Flag{
utils.SyncModeFlag,
- }, utils.NetworkFlags, utils.DatabasePathFlags),
+ }, utils.NetworkFlags, utils.DatabaseFlags),
Description: "Shows metadata about the chain status.",
}
)
@@ -268,82 +255,6 @@ func confirmAndRemoveDB(database string, kind string) {
}
}
-func inspectTrie(ctx *cli.Context) error {
- if ctx.NArg() < 1 {
- return fmt.Errorf("required arguments: %v", ctx.Command.ArgsUsage)
- }
-
- if ctx.NArg() > 3 {
- return fmt.Errorf("Max 3 arguments: %v", ctx.Command.ArgsUsage)
- }
-
- var (
- blockNumber uint64
- trieRootHash common.Hash
- jobnum uint64
- )
-
- stack, _ := makeConfigNode(ctx)
- defer stack.Close()
-
- db := utils.MakeChainDatabase(ctx, stack, true)
- defer db.Close()
-
- var headerBlockHash common.Hash
- if ctx.NArg() >= 1 {
- if ctx.Args().Get(0) == "latest" {
- headerHash := rawdb.ReadHeadHeaderHash(db)
- blockNumber = *(rawdb.ReadHeaderNumber(db, headerHash))
- } else if ctx.Args().Get(0) == "snapshot" {
- trieRootHash = rawdb.ReadSnapshotRoot(db)
- blockNumber = math.MaxUint64
- } else {
- var err error
- blockNumber, err = strconv.ParseUint(ctx.Args().Get(0), 10, 64)
- if err != nil {
- return fmt.Errorf("failed to Parse blocknum, Args[0]: %v, err: %v", ctx.Args().Get(0), err)
- }
- }
-
- if ctx.NArg() == 1 {
- jobnum = 1000
- } else {
- var err error
- jobnum, err = strconv.ParseUint(ctx.Args().Get(1), 10, 64)
- if err != nil {
- return fmt.Errorf("failed to Parse jobnum, Args[1]: %v, err: %v", ctx.Args().Get(1), err)
- }
- }
-
- if blockNumber != math.MaxUint64 {
- headerBlockHash = rawdb.ReadCanonicalHash(db, blockNumber)
- if headerBlockHash == (common.Hash{}) {
- return fmt.Errorf("ReadHeadBlockHash empty hash")
- }
- blockHeader := rawdb.ReadHeader(db, headerBlockHash, blockNumber)
- trieRootHash = blockHeader.Root
- }
- if (trieRootHash == common.Hash{}) {
- log.Error("Empty root hash")
- }
- fmt.Printf("ReadBlockHeader, root: %v, blocknum: %v\n", trieRootHash, blockNumber)
-
- triedb := trie.NewDatabase(db)
- theTrie, err := trie.New(trie.TrieID(trieRootHash), triedb)
- if err != nil {
- fmt.Printf("fail to new trie tree, err: %v, rootHash: %v\n", err, trieRootHash.String())
- return err
- }
- theInspect, err := trie.NewInspector(theTrie, triedb, trieRootHash, blockNumber, jobnum)
- if err != nil {
- return err
- }
- theInspect.Run()
- theInspect.DisplayResult()
- }
- return nil
-}
-
func inspect(ctx *cli.Context) error {
var (
prefix []byte
@@ -571,6 +482,9 @@ func dbDumpTrie(ctx *cli.Context) error {
db := utils.MakeChainDatabase(ctx, stack, true)
defer db.Close()
+ triedb := utils.MakeTrieDatabase(ctx, db, false, true)
+ defer triedb.Close()
+
var (
state []byte
storage []byte
@@ -604,12 +518,16 @@ func dbDumpTrie(ctx *cli.Context) error {
}
}
id := trie.StorageTrieID(common.BytesToHash(state), common.BytesToHash(account), common.BytesToHash(storage))
- theTrie, err := trie.New(id, trie.NewDatabase(db))
+ theTrie, err := trie.New(id, triedb)
+ if err != nil {
+ return err
+ }
+ trieIt, err := theTrie.NodeIterator(start)
if err != nil {
return err
}
var count int64
- it := trie.NewIterator(theTrie.NodeIterator(start))
+ it := trie.NewIterator(trieIt)
for it.Next() {
if max > 0 && count == max {
fmt.Printf("Exiting after %d values\n", count)
@@ -676,6 +594,7 @@ func importLDBdata(ctx *cli.Context) error {
close(stop)
}()
db := utils.MakeChainDatabase(ctx, stack, false)
+ defer db.Close()
return utils.ImportLDBData(db, fName, int64(start), stop)
}
@@ -772,6 +691,7 @@ func exportChaindata(ctx *cli.Context) error {
close(stop)
}()
db := utils.MakeChainDatabase(ctx, stack, true)
+ defer db.Close()
return utils.ExportChaindata(ctx.Args().Get(1), kind, exporter(db), stop)
}
@@ -779,6 +699,8 @@ func showMetaData(ctx *cli.Context) error {
stack, _ := makeConfigNode(ctx)
defer stack.Close()
db := utils.MakeChainDatabase(ctx, stack, true)
+ defer db.Close()
+
ancients, err := db.Ancients()
if err != nil {
fmt.Fprintf(os.Stderr, "Error accessing ancients: %v", err)
diff --git a/cmd/geth/genesis_test.go b/cmd/geth/genesis_test.go
index 8e379b867a..ffe8176b01 100644
--- a/cmd/geth/genesis_test.go
+++ b/cmd/geth/genesis_test.go
@@ -41,7 +41,9 @@ var customGenesisTests = []struct {
"mixhash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
"parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
"timestamp" : "0x00",
- "config" : {}
+ "config" : {
+ "terminalTotalDifficultyPassed": true
+ }
}`,
query: "eth.getBlock(0).nonce",
result: "0x0000000000001338",
@@ -59,9 +61,10 @@ var customGenesisTests = []struct {
"parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
"timestamp" : "0x00",
"config" : {
- "homesteadBlock" : 42,
- "daoForkBlock" : 141,
- "daoForkSupport" : true
+ "homesteadBlock" : 42,
+ "daoForkBlock" : 141,
+ "daoForkSupport" : true,
+ "terminalTotalDifficultyPassed" : true
}
}`,
query: "eth.getBlock(0).nonce",
@@ -111,8 +114,10 @@ func TestCustomBackend(t *testing.T) {
"mixhash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
"parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
"timestamp" : "0x00",
- "config" : {}
- }`
+ "config" : {
+ "terminalTotalDifficultyPassed": true
+ }
+ }`
type backendTest struct {
initArgs []string
initExpect string
@@ -146,8 +151,8 @@ func TestCustomBackend(t *testing.T) {
return nil
}
for i, tt := range []backendTest{
- { // When not specified, it should default to leveldb
- execArgs: []string{"--db.engine", "leveldb"},
+ { // When not specified, it should default to pebble
+ execArgs: []string{"--db.engine", "pebble"},
execExpect: "0x0000000000001338",
},
{ // Explicit leveldb
diff --git a/cmd/geth/les_test.go b/cmd/geth/les_test.go
index 607b454ead..b36c3265a3 100644
--- a/cmd/geth/les_test.go
+++ b/cmd/geth/les_test.go
@@ -107,10 +107,10 @@ func ipcEndpoint(ipcPath, datadir string) string {
// but windows require pipes to sit in "\\.\pipe\". Therefore, to run several
// nodes simultaneously, we need to distinguish between them, which we do by
// the pipe filename instead of folder.
-var nextIPC = uint32(0)
+var nextIPC atomic.Uint32
func startGethWithIpc(t *testing.T, name string, args ...string) *gethrpc {
- ipcName := fmt.Sprintf("geth-%d.ipc", atomic.AddUint32(&nextIPC, 1))
+ ipcName := fmt.Sprintf("geth-%d.ipc", nextIPC.Add(1))
args = append([]string{"--networkid=42", "--port=0", "--authrpc.port", "0", "--ipcpath", ipcName}, args...)
t.Logf("Starting %v with rpc: %v", name, args)
@@ -146,13 +146,13 @@ func startLightServer(t *testing.T) *gethrpc {
t.Logf("Importing keys to geth")
runGeth(t, "account", "import", "--datadir", datadir, "--password", "./testdata/password.txt", "--lightkdf", "./testdata/key.prv").WaitExit()
account := "0x02f0d131f1f97aef08aec6e3291b957d9efe7105"
- server := startGethWithIpc(t, "lightserver", "--allow-insecure-unlock", "--datadir", datadir, "--password", "./testdata/password.txt", "--unlock", account, "--miner.etherbase=0x02f0d131f1f97aef08aec6e3291b957d9efe7105", "--mine", "--light.serve=100", "--light.maxpeers=1", "--nodiscover", "--nat=extip:127.0.0.1", "--verbosity=4")
+ server := startGethWithIpc(t, "lightserver", "--allow-insecure-unlock", "--datadir", datadir, "--password", "./testdata/password.txt", "--unlock", account, "--miner.etherbase=0x02f0d131f1f97aef08aec6e3291b957d9efe7105", "--mine", "--light.serve=100", "--light.maxpeers=1", "--discv4=false", "--nat=extip:127.0.0.1", "--verbosity=4")
return server
}
func startClient(t *testing.T, name string) *gethrpc {
datadir := initGeth(t)
- return startGethWithIpc(t, name, "--datadir", datadir, "--nodiscover", "--syncmode=light", "--nat=extip:127.0.0.1", "--verbosity=4")
+ return startGethWithIpc(t, name, "--datadir", datadir, "--discv4=false", "--syncmode=light", "--nat=extip:127.0.0.1", "--verbosity=4")
}
func TestPriorityClient(t *testing.T) {
diff --git a/cmd/geth/main.go b/cmd/geth/main.go
index b5ad595a84..05b34344a0 100644
--- a/cmd/geth/main.go
+++ b/cmd/geth/main.go
@@ -39,6 +39,7 @@ import (
"github.com/ethereum/go-ethereum/log"
"github.com/ethereum/go-ethereum/metrics"
"github.com/ethereum/go-ethereum/node"
+ "go.uber.org/automaxprocs/maxprocs"
// Force-load the tracer engines to trigger registration
_ "github.com/ethereum/go-ethereum/eth/tracers/js"
@@ -64,22 +65,14 @@ var (
utils.NoUSBFlag,
utils.USBFlag,
utils.SmartCardDaemonPathFlag,
- utils.OverrideShanghai,
+ utils.OverrideCancun,
+ utils.OverrideVerkle,
+ utils.OverrideOptimismCanyon,
utils.EnablePersonal,
- utils.OverrideOptimismBedrock,
- utils.OverrideOptimismRegolith,
- utils.OverrideOptimism,
- utils.EthashCacheDirFlag,
- utils.EthashCachesInMemoryFlag,
- utils.EthashCachesOnDiskFlag,
- utils.EthashCachesLockMmapFlag,
- utils.EthashDatasetDirFlag,
- utils.EthashDatasetsInMemoryFlag,
- utils.EthashDatasetsOnDiskFlag,
- utils.EthashDatasetsLockMmapFlag,
utils.TxPoolLocalsFlag,
utils.TxPoolNoLocalsFlag,
utils.TxPoolJournalFlag,
+ utils.TxPoolJournalRemotesFlag,
utils.TxPoolRejournalFlag,
utils.TxPoolPriceLimitFlag,
utils.TxPoolPriceBumpFlag,
@@ -90,22 +83,23 @@ var (
utils.TxPoolLifetimeFlag,
utils.TxPoolReannounceTimeFlag,
utils.TxPoolReannounceRemotesFlag,
+ utils.BlobPoolDataDirFlag,
+ utils.BlobPoolDataCapFlag,
+ utils.BlobPoolPriceBumpFlag,
utils.SyncModeFlag,
utils.SyncTargetFlag,
utils.ExitWhenSyncedFlag,
utils.GCModeFlag,
- utils.TriesInMemoryFlag,
utils.SnapshotFlag,
utils.TxLookupLimitFlag,
+ utils.TransactionHistoryFlag,
+ utils.StateHistoryFlag,
utils.LightServeFlag,
utils.LightIngressFlag,
utils.LightEgressFlag,
utils.LightMaxPeersFlag,
utils.LightNoPruneFlag,
utils.LightKDFFlag,
- utils.UltraLightServersFlag,
- utils.UltraLightFractionFlag,
- utils.UltraLightOnlyAnnounceFlag,
utils.LightNoSyncServeFlag,
utils.EthRequiredBlocksFlag,
utils.LegacyWhitelistFlag,
@@ -121,47 +115,48 @@ var (
utils.CachePreimagesFlag,
utils.CacheLogSizeFlag,
utils.FDLimitFlag,
+ utils.CryptoKZGFlag,
utils.ListenPortFlag,
utils.DiscoveryPortFlag,
utils.MaxPeersFlag,
utils.MaxPendingPeersFlag,
utils.MiningEnabledFlag,
- utils.MinerThreadsFlag,
- utils.MinerNotifyFlag,
utils.MinerGasLimitFlag,
utils.MinerGasPriceFlag,
utils.MinerEtherbaseFlag,
utils.MinerExtraDataFlag,
utils.MinerRecommitIntervalFlag,
- utils.MinerNoVerifyFlag,
utils.MinerNewPayloadTimeout,
utils.NATFlag,
utils.NoDiscoverFlag,
+ utils.DiscoveryV4Flag,
utils.DiscoveryV5Flag,
+ utils.LegacyDiscoveryV5Flag,
utils.NetrestrictFlag,
utils.NodeKeyFileFlag,
utils.NodeKeyHexFlag,
utils.DNSDiscoveryFlag,
utils.DeveloperFlag,
- utils.DeveloperPeriodFlag,
utils.DeveloperGasLimitFlag,
+ utils.DeveloperPeriodFlag,
utils.VMEnableDebugFlag,
utils.NetworkIdFlag,
utils.EthStatsURLFlag,
- utils.FakePoWFlag,
utils.NoCompactionFlag,
utils.GpoBlocksFlag,
utils.GpoPercentileFlag,
utils.GpoMaxGasPriceFlag,
utils.GpoIgnoreGasPriceFlag,
- utils.MinerNotifyFullFlag,
+ utils.GpoMinSuggestedPriorityFeeFlag,
utils.RollupSequencerHTTPFlag,
utils.RollupHistoricalRPCFlag,
utils.RollupHistoricalRPCTimeoutFlag,
utils.RollupDisableTxPoolGossipFlag,
utils.RollupComputePendingBlock,
+ utils.RollupHaltOnIncompatibleProtocolVersionFlag,
+ utils.RollupSuperchainUpgradesFlag,
configFileFlag,
- }, utils.NetworkFlags, utils.DatabasePathFlags)
+ }, utils.NetworkFlags, utils.DatabaseFlags)
rpcFlags = []cli.Flag{
utils.HTTPEnabledFlag,
@@ -191,6 +186,8 @@ var (
utils.RPCGlobalEVMTimeoutFlag,
utils.RPCGlobalTxFeeCapFlag,
utils.AllowUnprotectedTxs,
+ utils.BatchRequestLimit,
+ utils.BatchResponseMaxSize,
}
metricsFlags = []cli.Flag{
@@ -235,8 +232,6 @@ func init() {
attachCommand,
javascriptCommand,
// See misccmd.go:
- makecacheCommand,
- makedagCommand,
versionCommand,
versionCheckCommand,
licenseCommand,
@@ -260,10 +255,16 @@ func init() {
debug.Flags,
metricsFlags,
)
+ flags.AutoEnvVars(app.Flags, "GETH")
app.Before = func(ctx *cli.Context) error {
+ maxprocs.Set() // Automatically set GOMAXPROCS to match Linux container CPU quota.
flags.MigrateGlobalFlags(ctx)
- return debug.Setup(ctx)
+ if err := debug.Setup(ctx); err != nil {
+ return err
+ }
+ flags.CheckEnvVars(ctx, app.Flags, "GETH")
+ return nil
}
app.After = func(ctx *cli.Context) error {
debug.Exit()
@@ -284,15 +285,15 @@ func main() {
func prepare(ctx *cli.Context) {
// If we're running a known preset, log it for convenience.
switch {
- case ctx.IsSet(utils.RinkebyFlag.Name):
- log.Info("Starting Geth on Rinkeby testnet...")
-
case ctx.IsSet(utils.GoerliFlag.Name):
log.Info("Starting Geth on Görli testnet...")
case ctx.IsSet(utils.SepoliaFlag.Name):
log.Info("Starting Geth on Sepolia testnet...")
+ case ctx.IsSet(utils.HoleskyFlag.Name):
+ log.Info("Starting Geth on Holesky testnet...")
+
case ctx.IsSet(utils.DeveloperFlag.Name):
log.Info("Starting Geth in ephemeral dev mode...")
log.Warn(`You are running Geth in --dev mode. Please note the following:
@@ -311,20 +312,43 @@ func prepare(ctx *cli.Context) {
to 0, and discovery is disabled.
`)
+ case ctx.IsSet(utils.OPNetworkFlag.Name):
+ log.Info("Starting geth on an OP network...", "network", ctx.String(utils.OPNetworkFlag.Name))
+
+ case ctx.IsSet(utils.OpBNBMainnetFlag.Name):
+ log.Info("Starting geth on an opBNB Mainnet network...", "network", ctx.String(utils.OpBNBMainnetFlag.Name))
+
+ case ctx.IsSet(utils.OpBNBTestnetFlag.Name):
+ log.Info("Starting geth on an opBNB Testnet network...", "network", ctx.String(utils.OpBNBTestnetFlag.Name))
+
+ case ctx.IsSet(utils.OpBNBQANetFlag.Name):
+ log.Info("Starting geth on an opBNB QAnet network...", "network", ctx.String(utils.OpBNBQANetFlag.Name))
+
case !ctx.IsSet(utils.NetworkIdFlag.Name):
log.Info("Starting Geth on Ethereum mainnet...")
}
// If we're a full node on mainnet without --cache specified, bump default cache allowance
if ctx.String(utils.SyncModeFlag.Name) != "light" && !ctx.IsSet(utils.CacheFlag.Name) && !ctx.IsSet(utils.NetworkIdFlag.Name) {
// Make sure we're not on any supported preconfigured testnet either
- if !ctx.IsSet(utils.SepoliaFlag.Name) &&
- !ctx.IsSet(utils.RinkebyFlag.Name) &&
+ if !ctx.IsSet(utils.HoleskyFlag.Name) &&
+ !ctx.IsSet(utils.SepoliaFlag.Name) &&
!ctx.IsSet(utils.GoerliFlag.Name) &&
!ctx.IsSet(utils.DeveloperFlag.Name) {
// Nope, we're really on mainnet. Bump that cache up!
+ // Note: If we don't set the OPNetworkFlag and have already initialized the database, we may hit this case.
log.Info("Bumping default cache on mainnet", "provided", ctx.Int(utils.CacheFlag.Name), "updated", 4096)
ctx.Set(utils.CacheFlag.Name, strconv.Itoa(4096))
}
+ } else if ctx.String(utils.SyncModeFlag.Name) != "light" && !ctx.IsSet(utils.CacheFlag.Name) && ctx.IsSet(utils.OPNetworkFlag.Name) {
+ // We haven't set the cache, but may used the OP network flag we may be on an OP stack mainnet.
+ if strings.Contains(ctx.String(utils.OPNetworkFlag.Name), "mainnet") {
+ log.Info("Bumping default cache on mainnet", "provided", ctx.Int(utils.CacheFlag.Name), "updated", 4096, "network", ctx.String(utils.OPNetworkFlag.Name))
+ ctx.Set(utils.CacheFlag.Name, strconv.Itoa(4096))
+ }
+ } else if ctx.String(utils.SyncModeFlag.Name) != "light" && !ctx.IsSet(utils.CacheFlag.Name) && ctx.IsSet(utils.OpBNBMainnetFlag.Name) {
+ // we're really on opBNB mainnet. Bump that cache up
+ log.Info("Bumping default cache on mainnet", "provided", ctx.Int(utils.CacheFlag.Name), "updated", 4096, "network", ctx.String(utils.OpBNBMainnetFlag.Name))
+ ctx.Set(utils.CacheFlag.Name, strconv.Itoa(4096))
}
// If we're running a light client on any network, drop the cache to some meaningfully low amount
if ctx.String(utils.SyncModeFlag.Name) == "light" && !ctx.IsSet(utils.CacheFlag.Name) {
@@ -373,10 +397,7 @@ func startNode(ctx *cli.Context, stack *node.Node, backend ethapi.Backend, isCon
stack.AccountManager().Subscribe(events)
// Create a client to interact with local geth node.
- rpcClient, err := stack.Attach()
- if err != nil {
- utils.Fatalf("Failed to attach to self: %v", err)
- }
+ rpcClient := stack.Attach()
ethClient := ethclient.NewClient(rpcClient)
go func() {
@@ -437,7 +458,7 @@ func startNode(ctx *cli.Context, stack *node.Node, backend ethapi.Backend, isCon
}
// Start auxiliary services if enabled
- if ctx.Bool(utils.MiningEnabledFlag.Name) || ctx.Bool(utils.DeveloperFlag.Name) {
+ if ctx.Bool(utils.MiningEnabledFlag.Name) {
// Mining only makes sense if a full Ethereum node is running
if ctx.String(utils.SyncModeFlag.Name) == "light" {
utils.Fatalf("Light clients do not support mining")
@@ -448,10 +469,8 @@ func startNode(ctx *cli.Context, stack *node.Node, backend ethapi.Backend, isCon
}
// Set the gas price to the limits from the CLI and start mining
gasprice := flags.GlobalBig(ctx, utils.MinerGasPriceFlag.Name)
- ethBackend.TxPool().SetGasPrice(gasprice)
- // start mining
- threads := ctx.Int(utils.MinerThreadsFlag.Name)
- if err := ethBackend.StartMining(threads); err != nil {
+ ethBackend.TxPool().SetGasTip(gasprice)
+ if err := ethBackend.StartMining(); err != nil {
utils.Fatalf("Failed to start mining: %v", err)
}
}
@@ -475,7 +494,12 @@ func unlockAccounts(ctx *cli.Context, stack *node.Node) {
if !stack.Config().InsecureUnlockAllowed && stack.Config().ExtRPCEnabled() {
utils.Fatalf("Account unlock with HTTP access is forbidden!")
}
- ks := stack.AccountManager().Backends(keystore.KeyStoreType)[0].(*keystore.KeyStore)
+ backends := stack.AccountManager().Backends(keystore.KeyStoreType)
+ if len(backends) == 0 {
+ log.Warn("Failed to unlock accounts, keystore is not available")
+ return
+ }
+ ks := backends[0].(*keystore.KeyStore)
passwords := utils.MakePasswordList(ctx)
for i, account := range unlocks {
unlockAccount(ks, account, i, passwords)
diff --git a/cmd/geth/misccmd.go b/cmd/geth/misccmd.go
index 5ca1732e07..e7fb108ebf 100644
--- a/cmd/geth/misccmd.go
+++ b/cmd/geth/misccmd.go
@@ -20,11 +20,8 @@ import (
"fmt"
"os"
"runtime"
- "strconv"
"strings"
- "github.com/ethereum/go-ethereum/cmd/utils"
- "github.com/ethereum/go-ethereum/consensus/ethash"
"github.com/ethereum/go-ethereum/internal/version"
"github.com/ethereum/go-ethereum/params"
"github.com/urfave/cli/v2"
@@ -41,30 +38,6 @@ var (
Usage: "Version to check",
Value: version.ClientName(clientIdentifier),
}
- makecacheCommand = &cli.Command{
- Action: makecache,
- Name: "makecache",
- Usage: "Generate ethash verification cache (for testing)",
- ArgsUsage: " ",
- Description: `
-The makecache command generates an ethash cache in .
-
-This command exists to support the system testing project.
-Regular users do not need to execute it.
-`,
- }
- makedagCommand = &cli.Command{
- Action: makedag,
- Name: "makedag",
- Usage: "Generate ethash mining DAG (for testing)",
- ArgsUsage: " ",
- Description: `
-The makedag command generates an ethash DAG in .
-
-This command exists to support the system testing project.
-Regular users do not need to execute it.
-`,
- }
versionCommand = &cli.Command{
Action: printVersion,
Name: "version",
@@ -96,36 +69,6 @@ and displays information about any security vulnerabilities that affect the curr
}
)
-// makecache generates an ethash verification cache into the provided folder.
-func makecache(ctx *cli.Context) error {
- args := ctx.Args().Slice()
- if len(args) != 2 {
- utils.Fatalf(`Usage: geth makecache `)
- }
- block, err := strconv.ParseUint(args[0], 0, 64)
- if err != nil {
- utils.Fatalf("Invalid block number: %v", err)
- }
- ethash.MakeCache(block, args[1])
-
- return nil
-}
-
-// makedag generates an ethash mining DAG into the provided folder.
-func makedag(ctx *cli.Context) error {
- args := ctx.Args().Slice()
- if len(args) != 2 {
- utils.Fatalf(`Usage: geth makedag `)
- }
- block, err := strconv.ParseUint(args[0], 0, 64)
- if err != nil {
- utils.Fatalf("Invalid block number: %v", err)
- }
- ethash.MakeDataset(block, args[1])
-
- return nil
-}
-
func printVersion(ctx *cli.Context) error {
git, _ := version.VCS()
diff --git a/cmd/geth/snapshot.go b/cmd/geth/snapshot.go
index 665c89e8e2..6413482511 100644
--- a/cmd/geth/snapshot.go
+++ b/cmd/geth/snapshot.go
@@ -23,8 +23,6 @@ import (
"os"
"time"
- cli "github.com/urfave/cli/v2"
-
"github.com/ethereum/go-ethereum/cmd/utils"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/core/rawdb"
@@ -37,6 +35,7 @@ import (
"github.com/ethereum/go-ethereum/log"
"github.com/ethereum/go-ethereum/rlp"
"github.com/ethereum/go-ethereum/trie"
+ cli "github.com/urfave/cli/v2"
)
var (
@@ -51,10 +50,8 @@ var (
ArgsUsage: "",
Action: pruneState,
Flags: flags.Merge([]cli.Flag{
- utils.CacheTrieJournalFlag,
utils.BloomFilterSizeFlag,
- utils.TriesInMemoryFlag,
- }, utils.NetworkFlags, utils.DatabasePathFlags),
+ }, utils.NetworkFlags, utils.DatabaseFlags),
Description: `
geth snapshot prune-state
will prune historical state data with the help of the state snapshot.
@@ -64,10 +61,7 @@ two version states are available: genesis and the specific one.
The default pruning target is the HEAD-127 state.
-WARNING: It's necessary to delete the trie clean cache after the pruning.
-If you specify another directory for the trie clean cache via "--cache.trie.journal"
-during the use of Geth, please also specify it here for correct deletion. Otherwise
-the trie clean cache with default directory will be deleted.
+WARNING: it's only supported in hash mode(--state.scheme=hash)".
`,
},
{
@@ -75,7 +69,7 @@ the trie clean cache with default directory will be deleted.
Usage: "Recalculate state hash based on the snapshot for verification",
ArgsUsage: "",
Action: verifyState,
- Flags: flags.Merge(utils.NetworkFlags, utils.DatabasePathFlags, []cli.Flag{utils.TriesInMemoryFlag}),
+ Flags: flags.Merge(utils.NetworkFlags, utils.DatabaseFlags),
Description: `
geth snapshot verify-state
will traverse the whole accounts and storages set based on the specified
@@ -88,7 +82,7 @@ In other words, this command does the snapshot to trie conversion.
Usage: "Check that there is no 'dangling' snap storage",
ArgsUsage: "",
Action: checkDanglingStorage,
- Flags: flags.Merge(utils.NetworkFlags, utils.DatabasePathFlags),
+ Flags: flags.Merge(utils.NetworkFlags, utils.DatabaseFlags),
Description: `
geth snapshot check-dangling-storage traverses the snap storage
data, and verifies that all snapshot storage data has a corresponding account.
@@ -99,7 +93,7 @@ data, and verifies that all snapshot storage data has a corresponding account.
Usage: "Check all snapshot layers for the a specific account",
ArgsUsage: "",
Action: checkAccount,
- Flags: flags.Merge(utils.NetworkFlags, utils.DatabasePathFlags),
+ Flags: flags.Merge(utils.NetworkFlags, utils.DatabaseFlags),
Description: `
geth snapshot inspect-account checks all snapshot layers and prints out
information about the specified address.
@@ -110,7 +104,7 @@ information about the specified address.
Usage: "Traverse the state with given root hash and perform quick verification",
ArgsUsage: "",
Action: traverseState,
- Flags: flags.Merge(utils.NetworkFlags, utils.DatabasePathFlags),
+ Flags: flags.Merge(utils.NetworkFlags, utils.DatabaseFlags),
Description: `
geth snapshot traverse-state
will traverse the whole state from the given state root and will abort if any
@@ -125,7 +119,7 @@ It's also usable without snapshot enabled.
Usage: "Traverse the state with given root hash and perform detailed verification",
ArgsUsage: "",
Action: traverseRawState,
- Flags: flags.Merge(utils.NetworkFlags, utils.DatabasePathFlags),
+ Flags: flags.Merge(utils.NetworkFlags, utils.DatabaseFlags),
Description: `
geth snapshot traverse-rawstate
will traverse the whole state from the given root and will abort if any referenced
@@ -146,8 +140,7 @@ It's also usable without snapshot enabled.
utils.ExcludeStorageFlag,
utils.StartKeyFlag,
utils.DumpLimitFlag,
- utils.TriesInMemoryFlag,
- }, utils.NetworkFlags, utils.DatabasePathFlags),
+ }, utils.NetworkFlags, utils.DatabaseFlags),
Description: `
This command is semantically equivalent to 'geth dump', but uses the snapshots
as the backend data source, making this command a lot faster.
@@ -163,25 +156,20 @@ block is used.
// Deprecation: this command should be deprecated once the hash-based
// scheme is deprecated.
func pruneState(ctx *cli.Context) error {
- stack, config := makeConfigNode(ctx)
+ stack, _ := makeConfigNode(ctx)
defer stack.Close()
chaindb := utils.MakeChainDatabase(ctx, stack, false)
defer chaindb.Close()
+ if rawdb.ReadStateScheme(chaindb) != rawdb.HashScheme {
+ log.Crit("Offline pruning is not required for path scheme")
+ }
prunerconfig := pruner.Config{
Datadir: stack.ResolvePath(""),
- Cachedir: stack.ResolvePath(config.Eth.TrieCleanCacheJournal),
BloomSize: ctx.Uint64(utils.BloomFilterSizeFlag.Name),
}
- pruner, err := pruner.NewPruner(chaindb, prunerconfig, pruner.CombinedOptions{
- PrunerOptions: []pruner.PrunerOption{
- pruner.WithTriesInMemory(ctx.Uint64(utils.TriesInMemoryFlag.Name)),
- },
- SnapshotOptions: []snapshot.SnapshotOption{
- snapshot.SetCapLimit(int(ctx.Uint64(utils.TriesInMemoryFlag.Name))),
- },
- })
+ pruner, err := pruner.NewPruner(chaindb, prunerconfig)
if err != nil {
log.Error("Failed to open snapshot tree", "err", err)
return err
@@ -217,14 +205,16 @@ func verifyState(ctx *cli.Context) error {
log.Error("Failed to load head block")
return errors.New("no head block")
}
- snapconfig := snapshot.Config{
+ triedb := utils.MakeTrieDatabase(ctx, chaindb, false, true)
+ defer triedb.Close()
+
+ snapConfig := snapshot.Config{
CacheSize: 256,
Recovery: false,
NoBuild: true,
AsyncBuild: false,
}
- snaptree, err := snapshot.New(snapconfig, chaindb, trie.NewDatabase(chaindb), headBlock.Root(),
- snapshot.SetCapLimit(int(ctx.Uint64(utils.TriesInMemoryFlag.Name))))
+ snaptree, err := snapshot.New(snapConfig, chaindb, triedb, headBlock.Root())
if err != nil {
log.Error("Failed to open snapshot tree", "err", err)
return err
@@ -255,7 +245,9 @@ func checkDanglingStorage(ctx *cli.Context) error {
stack, _ := makeConfigNode(ctx)
defer stack.Close()
- return snapshot.CheckDanglingStorage(utils.MakeChainDatabase(ctx, stack, true))
+ db := utils.MakeChainDatabase(ctx, stack, true)
+ defer db.Close()
+ return snapshot.CheckDanglingStorage(db)
}
// traverseState is a helper function used for pruning verification.
@@ -266,6 +258,11 @@ func traverseState(ctx *cli.Context) error {
defer stack.Close()
chaindb := utils.MakeChainDatabase(ctx, stack, true)
+ defer chaindb.Close()
+
+ triedb := utils.MakeTrieDatabase(ctx, chaindb, false, true)
+ defer triedb.Close()
+
headBlock := rawdb.ReadHeadBlock(chaindb)
if headBlock == nil {
log.Error("Failed to load head block")
@@ -290,7 +287,6 @@ func traverseState(ctx *cli.Context) error {
root = headBlock.Root()
log.Info("Start traversing the state", "root", root, "number", headBlock.NumberU64())
}
- triedb := trie.NewDatabase(chaindb)
t, err := trie.NewStateTrie(trie.StateTrieID(root), triedb)
if err != nil {
log.Error("Failed to open trie", "root", root, "err", err)
@@ -303,7 +299,12 @@ func traverseState(ctx *cli.Context) error {
lastReport time.Time
start = time.Now()
)
- accIter := trie.NewIterator(t.NodeIterator(nil))
+ acctIt, err := t.NodeIterator(nil)
+ if err != nil {
+ log.Error("Failed to open iterator", "root", root, "err", err)
+ return err
+ }
+ accIter := trie.NewIterator(acctIt)
for accIter.Next() {
accounts += 1
var acc types.StateAccount
@@ -318,9 +319,19 @@ func traverseState(ctx *cli.Context) error {
log.Error("Failed to open storage trie", "root", acc.Root, "err", err)
return err
}
- storageIter := trie.NewIterator(storageTrie.NodeIterator(nil))
+ storageIt, err := storageTrie.NodeIterator(nil)
+ if err != nil {
+ log.Error("Failed to open storage iterator", "root", acc.Root, "err", err)
+ return err
+ }
+ storageIter := trie.NewIterator(storageIt)
for storageIter.Next() {
slots += 1
+
+ if time.Since(lastReport) > time.Second*8 {
+ log.Info("Traversing state", "accounts", accounts, "slots", slots, "codes", codes, "elapsed", common.PrettyDuration(time.Since(start)))
+ lastReport = time.Now()
+ }
}
if storageIter.Err != nil {
log.Error("Failed to traverse storage trie", "root", acc.Root, "err", storageIter.Err)
@@ -356,6 +367,11 @@ func traverseRawState(ctx *cli.Context) error {
defer stack.Close()
chaindb := utils.MakeChainDatabase(ctx, stack, true)
+ defer chaindb.Close()
+
+ triedb := utils.MakeTrieDatabase(ctx, chaindb, false, true)
+ defer triedb.Close()
+
headBlock := rawdb.ReadHeadBlock(chaindb)
if headBlock == nil {
log.Error("Failed to load head block")
@@ -380,7 +396,6 @@ func traverseRawState(ctx *cli.Context) error {
root = headBlock.Root()
log.Info("Start traversing the state", "root", root, "number", headBlock.NumberU64())
}
- triedb := trie.NewDatabase(chaindb)
t, err := trie.NewStateTrie(trie.StateTrieID(root), triedb)
if err != nil {
log.Error("Failed to open trie", "root", root, "err", err)
@@ -396,7 +411,16 @@ func traverseRawState(ctx *cli.Context) error {
hasher = crypto.NewKeccakState()
got = make([]byte, 32)
)
- accIter := t.NodeIterator(nil)
+ accIter, err := t.NodeIterator(nil)
+ if err != nil {
+ log.Error("Failed to open iterator", "root", root, "err", err)
+ return err
+ }
+ reader, err := triedb.Reader(root)
+ if err != nil {
+ log.Error("State is non-existent", "root", root)
+ return nil
+ }
for accIter.Next(true) {
nodes += 1
node := accIter.Hash()
@@ -404,7 +428,7 @@ func traverseRawState(ctx *cli.Context) error {
// Check the present for non-empty hash node(embedded node doesn't
// have their own hash).
if node != (common.Hash{}) {
- blob := rawdb.ReadLegacyTrieNode(chaindb, node)
+ blob, _ := reader.Node(common.Hash{}, accIter.Path(), node)
if len(blob) == 0 {
log.Error("Missing trie node(account)", "hash", node)
return errors.New("missing account")
@@ -433,7 +457,11 @@ func traverseRawState(ctx *cli.Context) error {
log.Error("Failed to open storage trie", "root", acc.Root, "err", err)
return errors.New("missing storage trie")
}
- storageIter := storageTrie.NodeIterator(nil)
+ storageIter, err := storageTrie.NodeIterator(nil)
+ if err != nil {
+ log.Error("Failed to open storage iterator", "root", acc.Root, "err", err)
+ return err
+ }
for storageIter.Next(true) {
nodes += 1
node := storageIter.Hash()
@@ -441,7 +469,7 @@ func traverseRawState(ctx *cli.Context) error {
// Check the presence for non-empty hash node(embedded node doesn't
// have their own hash).
if node != (common.Hash{}) {
- blob := rawdb.ReadLegacyTrieNode(chaindb, node)
+ blob, _ := reader.Node(common.BytesToHash(accIter.LeafKey()), storageIter.Path(), node)
if len(blob) == 0 {
log.Error("Missing trie node(storage)", "hash", node)
return errors.New("missing storage")
@@ -458,6 +486,10 @@ func traverseRawState(ctx *cli.Context) error {
if storageIter.Leaf() {
slots += 1
}
+ if time.Since(lastReport) > time.Second*8 {
+ log.Info("Traversing state", "nodes", nodes, "accounts", accounts, "slots", slots, "codes", codes, "elapsed", common.PrettyDuration(time.Since(start)))
+ lastReport = time.Now()
+ }
}
if storageIter.Error() != nil {
log.Error("Failed to traverse storage trie", "root", acc.Root, "err", storageIter.Error())
@@ -501,14 +533,16 @@ func dumpState(ctx *cli.Context) error {
if err != nil {
return err
}
+ triedb := utils.MakeTrieDatabase(ctx, db, false, true)
+ defer triedb.Close()
+
snapConfig := snapshot.Config{
CacheSize: 256,
Recovery: false,
NoBuild: true,
AsyncBuild: false,
}
- snaptree, err := snapshot.New(snapConfig, db, trie.NewDatabase(db), root,
- snapshot.SetCapLimit(int(ctx.Uint64(utils.TriesInMemoryFlag.Name))))
+ snaptree, err := snapshot.New(snapConfig, db, triedb, root)
if err != nil {
return err
}
@@ -529,14 +563,14 @@ func dumpState(ctx *cli.Context) error {
Root common.Hash `json:"root"`
}{root})
for accIt.Next() {
- account, err := snapshot.FullAccount(accIt.Account())
+ account, err := types.FullAccount(accIt.Account())
if err != nil {
return err
}
da := &state.DumpAccount{
Balance: account.Balance.String(),
Nonce: account.Nonce,
- Root: account.Root,
+ Root: account.Root.Bytes(),
CodeHash: account.CodeHash,
SecureKey: accIt.Hash().Bytes(),
}
diff --git a/cmd/geth/testdata/vcheck/minisig-sigs-new/data.json.minisig b/cmd/geth/testdata/vcheck/minisig-sigs-new/data.json.minisig
new file mode 100644
index 0000000000..eaea9f9053
--- /dev/null
+++ b/cmd/geth/testdata/vcheck/minisig-sigs-new/data.json.minisig
@@ -0,0 +1,4 @@
+untrusted comment: signature from minisign secret key
+RUQkliYstQBOKLK05Sy5f3bVRMBqJT26ABo6Vbp3BNJAVjejoqYCu4GWE/+7qcDfHBqYIniDCbFIUvYEnOHxV6vZ93wO1xJWDQw=
+trusted comment: timestamp:1693986492 file:data.json hashed
+6Fdw2H+W1ZXK7QXSF77Z5AWC7+AEFAfDmTSxNGylU5HLT1AuSJQmxslj+VjtUBamYCvOuET7plbXza942AlWDw==
diff --git a/cmd/geth/verkle.go b/cmd/geth/verkle.go
index a5756ceab0..aa79889e8c 100644
--- a/cmd/geth/verkle.go
+++ b/cmd/geth/verkle.go
@@ -45,7 +45,7 @@ var (
Usage: "verify the conversion of a MPT into a verkle tree",
ArgsUsage: "",
Action: verifyVerkle,
- Flags: flags.Merge(utils.NetworkFlags, utils.DatabasePathFlags),
+ Flags: flags.Merge(utils.NetworkFlags, utils.DatabaseFlags),
Description: `
geth verkle verify
This command takes a root commitment and attempts to rebuild the tree.
@@ -56,7 +56,7 @@ This command takes a root commitment and attempts to rebuild the tree.
Usage: "Dump a verkle tree to a DOT file",
ArgsUsage: " [ ...]",
Action: expandVerkle,
- Flags: flags.Merge(utils.NetworkFlags, utils.DatabasePathFlags),
+ Flags: flags.Merge(utils.NetworkFlags, utils.DatabaseFlags),
Description: `
geth verkle dump [ ...]
This command will produce a dot file representing the tree, rooted at .
@@ -74,7 +74,7 @@ func checkChildren(root verkle.VerkleNode, resolver verkle.NodeResolverFn) error
switch node := root.(type) {
case *verkle.InternalNode:
for i, child := range node.Children() {
- childC := child.ComputeCommitment().Bytes()
+ childC := child.Commit().Bytes()
childS, err := resolver(childC[:])
if bytes.Equal(childC[:], zero[:]) {
@@ -86,7 +86,7 @@ func checkChildren(root verkle.VerkleNode, resolver verkle.NodeResolverFn) error
// depth is set to 0, the tree isn't rebuilt so it's not a problem
childN, err := verkle.ParseNode(childS, 0, childC[:])
if err != nil {
- return fmt.Errorf("decode error child %x in db: %w", child.ComputeCommitment().Bytes(), err)
+ return fmt.Errorf("decode error child %x in db: %w", child.Commitment().Bytes(), err)
}
if err := checkChildren(childN, resolver); err != nil {
return fmt.Errorf("%x%w", i, err) // write the path to the erroring node
@@ -100,7 +100,7 @@ func checkChildren(root verkle.VerkleNode, resolver verkle.NodeResolverFn) error
return nil
}
}
- return fmt.Errorf("Both balance and nonce are 0")
+ return errors.New("both balance and nonce are 0")
case verkle.Empty:
// nothing to do
default:
@@ -115,6 +115,7 @@ func verifyVerkle(ctx *cli.Context) error {
defer stack.Close()
chaindb := utils.MakeChainDatabase(ctx, stack, true)
+ defer chaindb.Close()
headBlock := rawdb.ReadHeadBlock(chaindb)
if headBlock == nil {
log.Error("Failed to load head block")
@@ -163,6 +164,7 @@ func expandVerkle(ctx *cli.Context) error {
defer stack.Close()
chaindb := utils.MakeChainDatabase(ctx, stack, true)
+ defer chaindb.Close()
var (
rootC common.Hash
keylist [][]byte
diff --git a/cmd/geth/version_check_test.go b/cmd/geth/version_check_test.go
index bd4d820a79..4458ab5c06 100644
--- a/cmd/geth/version_check_test.go
+++ b/cmd/geth/version_check_test.go
@@ -30,17 +30,24 @@ import (
)
func TestVerification(t *testing.T) {
- // Signatures generated with `minisign`
- t.Run("minisig", func(t *testing.T) {
- // For this test, the pubkey is in testdata/minisign.pub
+ // Signatures generated with `minisign`. Legacy format, not pre-hashed file.
+ t.Run("minisig-legacy", func(t *testing.T) {
+ // For this test, the pubkey is in testdata/vcheck/minisign.pub
// (the privkey is `minisign.sec`, if we want to expand this test. Password 'test' )
pub := "RWQkliYstQBOKOdtClfgC3IypIPX6TAmoEi7beZ4gyR3wsaezvqOMWsp"
testVerification(t, pub, "./testdata/vcheck/minisig-sigs/")
})
+ t.Run("minisig-new", func(t *testing.T) {
+ // For this test, the pubkey is in testdata/vcheck/minisign.pub
+ // (the privkey is `minisign.sec`, if we want to expand this test. Password 'test' )
+ // `minisign -S -s ./minisign.sec -m data.json -x ./minisig-sigs-new/data.json.minisig`
+ pub := "RWQkliYstQBOKOdtClfgC3IypIPX6TAmoEi7beZ4gyR3wsaezvqOMWsp"
+ testVerification(t, pub, "./testdata/vcheck/minisig-sigs-new/")
+ })
// Signatures generated with `signify-openbsd`
t.Run("signify-openbsd", func(t *testing.T) {
t.Skip("This currently fails, minisign expects 4 lines of data, signify provides only 2")
- // For this test, the pubkey is in testdata/signifykey.pub
+ // For this test, the pubkey is in testdata/vcheck/signifykey.pub
// (the privkey is `signifykey.sec`, if we want to expand this test. Password 'test' )
pub := "RWSKLNhZb0KdATtRT7mZC/bybI3t3+Hv/O2i3ye04Dq9fnT9slpZ1a2/"
testVerification(t, pub, "./testdata/vcheck/signify-sigs/")
@@ -58,6 +65,9 @@ func testVerification(t *testing.T, pubkey, sigdir string) {
if err != nil {
t.Fatal(err)
}
+ if len(files) == 0 {
+ t.Fatal("Missing tests")
+ }
for _, f := range files {
sig, err := os.ReadFile(filepath.Join(sigdir, f.Name()))
if err != nil {
diff --git a/cmd/utils/cmd.go b/cmd/utils/cmd.go
index e1bafc53c3..16b1260572 100644
--- a/cmd/utils/cmd.go
+++ b/cmd/utils/cmd.go
@@ -118,6 +118,9 @@ func StartNode(ctx *cli.Context, stack *node.Node, isConsole bool) {
}
func monitorFreeDiskSpace(sigc chan os.Signal, path string, freeDiskSpaceCritical uint64) {
+ if path == "" {
+ return
+ }
for {
freeSpace, err := getFreeDiskSpace(path)
if err != nil {
@@ -181,7 +184,7 @@ func ImportChain(chain *core.BlockChain, fn string) error {
for batch := 0; ; batch++ {
// Load a batch of RLP blocks.
if checkInterrupt() {
- return fmt.Errorf("interrupted")
+ return errors.New("interrupted")
}
i := 0
for ; i < importBatchSize; i++ {
@@ -204,15 +207,21 @@ func ImportChain(chain *core.BlockChain, fn string) error {
}
// Import the batch.
if checkInterrupt() {
- return fmt.Errorf("interrupted")
+ return errors.New("interrupted")
}
missing := missingBlocks(chain, blocks[:i])
if len(missing) == 0 {
log.Info("Skipping batch as all blocks present", "batch", batch, "first", blocks[0].Hash(), "last", blocks[i-1].Hash())
continue
}
- if _, err := chain.InsertChain(missing); err != nil {
- return fmt.Errorf("invalid block %d: %v", n, err)
+ if failindex, err := chain.InsertChain(missing); err != nil {
+ var failnumber uint64
+ if failindex > 0 && failindex < len(missing) {
+ failnumber = missing[failindex].NumberU64()
+ } else {
+ failnumber = missing[0].NumberU64()
+ }
+ return fmt.Errorf("invalid block %d: %v", failnumber, err)
}
}
return nil
diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go
index 7994e671d4..f15a187ef8 100644
--- a/cmd/utils/flags.go
+++ b/cmd/utils/flags.go
@@ -18,7 +18,6 @@
package utils
import (
- "bytes"
"context"
"crypto/ecdsa"
"encoding/hex"
@@ -26,6 +25,7 @@ import (
"fmt"
"math"
"math/big"
+ "net"
"net/http"
"os"
"path/filepath"
@@ -34,24 +34,18 @@ import (
"strings"
"time"
- pcsclite "github.com/gballet/go-libpcsclite"
- gopsutil "github.com/shirou/gopsutil/mem"
- "github.com/urfave/cli/v2"
-
"github.com/ethereum/go-ethereum/accounts"
"github.com/ethereum/go-ethereum/accounts/keystore"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/common/fdlimit"
- "github.com/ethereum/go-ethereum/common/hexutil"
- "github.com/ethereum/go-ethereum/consensus/ethash"
"github.com/ethereum/go-ethereum/core"
"github.com/ethereum/go-ethereum/core/rawdb"
- "github.com/ethereum/go-ethereum/core/txpool"
- "github.com/ethereum/go-ethereum/core/types"
+ "github.com/ethereum/go-ethereum/core/txpool/legacypool"
"github.com/ethereum/go-ethereum/core/vm"
"github.com/ethereum/go-ethereum/crypto"
+ "github.com/ethereum/go-ethereum/crypto/kzg4844"
"github.com/ethereum/go-ethereum/eth"
- ethcatalyst "github.com/ethereum/go-ethereum/eth/catalyst"
+ "github.com/ethereum/go-ethereum/eth/catalyst"
"github.com/ethereum/go-ethereum/eth/downloader"
"github.com/ethereum/go-ethereum/eth/ethconfig"
"github.com/ethereum/go-ethereum/eth/filters"
@@ -64,7 +58,6 @@ import (
"github.com/ethereum/go-ethereum/internal/ethapi"
"github.com/ethereum/go-ethereum/internal/flags"
"github.com/ethereum/go-ethereum/les"
- lescatalyst "github.com/ethereum/go-ethereum/les/catalyst"
"github.com/ethereum/go-ethereum/log"
"github.com/ethereum/go-ethereum/metrics"
"github.com/ethereum/go-ethereum/metrics/exp"
@@ -76,8 +69,13 @@ import (
"github.com/ethereum/go-ethereum/p2p/nat"
"github.com/ethereum/go-ethereum/p2p/netutil"
"github.com/ethereum/go-ethereum/params"
- "github.com/ethereum/go-ethereum/rlp"
"github.com/ethereum/go-ethereum/rpc"
+ "github.com/ethereum/go-ethereum/trie"
+ "github.com/ethereum/go-ethereum/trie/triedb/hashdb"
+ "github.com/ethereum/go-ethereum/trie/triedb/pathdb"
+ pcsclite "github.com/gballet/go-libpcsclite"
+ gopsutil "github.com/shirou/gopsutil/mem"
+ "github.com/urfave/cli/v2"
)
// These are all the command line flags we support.
@@ -102,8 +100,8 @@ var (
}
DBEngineFlag = &cli.StringFlag{
Name: "db.engine",
- Usage: "Backing database implementation to use ('leveldb' or 'pebble')",
- Value: "leveldb",
+ Usage: "Backing database implementation to use ('pebble' or 'leveldb')",
+ Value: node.DefaultConfig.DBEngine,
Category: flags.EthCategory,
}
AncientFlag = &flags.DirectoryFlag{
@@ -134,7 +132,7 @@ var (
}
NetworkIdFlag = &cli.Uint64Flag{
Name: "networkid",
- Usage: "Explicitly set network id (integer)(For testnets: use --rinkeby, --goerli, --sepolia instead)",
+ Usage: "Explicitly set network id (integer)(For testnets: use --goerli, --sepolia, --holesky instead)",
Value: ethconfig.Defaults.NetworkId,
Category: flags.EthCategory,
}
@@ -143,11 +141,6 @@ var (
Usage: "Ethereum mainnet",
Category: flags.EthCategory,
}
- RinkebyFlag = &cli.BoolFlag{
- Name: "rinkeby",
- Usage: "Rinkeby network: pre-configured proof-of-authority test network",
- Category: flags.EthCategory,
- }
GoerliFlag = &cli.BoolFlag{
Name: "goerli",
Usage: "Görli network: pre-configured proof-of-authority test network",
@@ -158,6 +151,35 @@ var (
Usage: "Sepolia network: pre-configured proof-of-work test network",
Category: flags.EthCategory,
}
+ HoleskyFlag = &cli.BoolFlag{
+ Name: "holesky",
+ Usage: "Holesky network: pre-configured proof-of-stake test network",
+ Category: flags.EthCategory,
+ }
+
+ OPNetworkFlag = &cli.StringFlag{
+ Name: "op-network",
+ Aliases: []string{"beta.op-network"},
+ Usage: "Select a pre-configured OP-Stack network (warning: op-mainnet and op-goerli require special sync," +
+ " datadir is recommended), options: " + strings.Join(params.OPStackChainNames(), ", "),
+ Category: flags.EthCategory,
+ }
+
+ OpBNBMainnetFlag = &cli.BoolFlag{
+ Name: "opBNBMainnet",
+ Usage: "opBNB mainnet",
+ Category: flags.EthCategory,
+ }
+ OpBNBTestnetFlag = &cli.BoolFlag{
+ Name: "opBNBTestnet",
+ Usage: "opBNB Testnet",
+ Category: flags.EthCategory,
+ }
+ OpBNBQANetFlag = &cli.BoolFlag{
+ Name: "opBNBQAnet",
+ Usage: "opBNB QANet just for internal test",
+ Category: flags.EthCategory,
+ }
// Dev mode
DeveloperFlag = &cli.BoolFlag{
@@ -165,7 +187,7 @@ var (
Usage: "Ephemeral proof-of-authority network with a pre-funded developer account, mining enabled",
Category: flags.DevCategory,
}
- DeveloperPeriodFlag = &cli.IntFlag{
+ DeveloperPeriodFlag = &cli.Uint64Flag{
Name: "dev.period",
Usage: "Block period to use in developer mode (0 = mine only if transaction pending)",
Category: flags.DevCategory,
@@ -224,35 +246,12 @@ var (
}
defaultSyncMode = ethconfig.Defaults.SyncMode
- SyncModeFlag = &flags.TextMarshalerFlag{
- Name: "syncmode",
- Usage: `Blockchain sync mode ("snap", "full" or "light")`,
- Value: &defaultSyncMode,
- Category: flags.EthCategory,
- }
- GCModeFlag = &cli.StringFlag{
- Name: "gcmode",
- Usage: `Blockchain garbage collection mode ("full", "archive")`,
- Value: "full",
- Category: flags.EthCategory,
- }
- SnapshotFlag = &cli.BoolFlag{
+ SnapshotFlag = &cli.BoolFlag{
Name: "snapshot",
Usage: `Enables snapshot-database mode (default = enable)`,
Value: true,
Category: flags.EthCategory,
}
- TriesInMemoryFlag = &cli.Uint64Flag{
- Name: "triesInMemory",
- Usage: "The layer of tries trees that keep in memory",
- Value: 128,
- }
- TxLookupLimitFlag = &cli.Uint64Flag{
- Name: "txlookuplimit",
- Usage: "Number of recent blocks to maintain transactions index for (default = about one year, 0 = entire chain)",
- Value: ethconfig.Defaults.TxLookupLimit,
- Category: flags.EthCategory,
- }
LightKDFFlag = &cli.BoolFlag{
Name: "lightkdf",
Usage: "Reduce key-derivation RAM & CPU usage at some expense of KDF strength",
@@ -263,36 +262,55 @@ var (
Usage: "Comma separated block number-to-hash mappings to require for peering (=)",
Category: flags.EthCategory,
}
- LegacyWhitelistFlag = &cli.StringFlag{
- Name: "whitelist",
- Usage: "Comma separated block number-to-hash mappings to enforce (=) (deprecated in favor of --eth.requiredblocks)",
- Category: flags.DeprecatedCategory,
- }
BloomFilterSizeFlag = &cli.Uint64Flag{
Name: "bloomfilter.size",
Usage: "Megabytes of memory allocated to bloom-filter for pruning",
Value: 2048,
Category: flags.EthCategory,
}
- OverrideShanghai = &cli.Uint64Flag{
- Name: "override.shanghai",
- Usage: "Manually specify the Shanghai fork timestamp, overriding the bundled setting",
+ OverrideCancun = &cli.Uint64Flag{
+ Name: "override.cancun",
+ Usage: "Manually specify the Cancun fork timestamp, overriding the bundled setting",
Category: flags.EthCategory,
}
- OverrideOptimismBedrock = &flags.BigFlag{
- Name: "override.bedrock",
- Usage: "Manually specify OptimsimBedrock, overriding the bundled setting",
+ OverrideVerkle = &cli.Uint64Flag{
+ Name: "override.verkle",
+ Usage: "Manually specify the Verkle fork timestamp, overriding the bundled setting",
Category: flags.EthCategory,
}
- OverrideOptimismRegolith = &flags.BigFlag{
- Name: "override.regolith",
- Usage: "Manually specify the OptimsimRegolith fork timestamp, overriding the bundled setting",
+ OverrideOptimismCanyon = &flags.BigFlag{
+ Name: "override.canyon",
+ Usage: "Manually specify the Optimsim Canyon fork timestamp, overriding the bundled setting",
Category: flags.EthCategory,
}
- OverrideOptimism = &cli.BoolFlag{
- Name: "override.optimism",
- Usage: "Manually specify optimism",
- Category: flags.EthCategory,
+ SyncModeFlag = &flags.TextMarshalerFlag{
+ Name: "syncmode",
+ Usage: `Blockchain sync mode ("snap", "full" or "light")`,
+ Value: &defaultSyncMode,
+ Category: flags.StateCategory,
+ }
+ GCModeFlag = &cli.StringFlag{
+ Name: "gcmode",
+ Usage: `Blockchain garbage collection mode, only relevant in state.scheme=hash ("full", "archive")`,
+ Value: "full",
+ Category: flags.StateCategory,
+ }
+ StateSchemeFlag = &cli.StringFlag{
+ Name: "state.scheme",
+ Usage: "Scheme to use for storing ethereum state ('hash' or 'path')",
+ Category: flags.StateCategory,
+ }
+ StateHistoryFlag = &cli.Uint64Flag{
+ Name: "history.state",
+ Usage: "Number of recent blocks to retain state history for (default = 90,000 blocks, 0 = entire chain)",
+ Value: ethconfig.Defaults.StateHistory,
+ Category: flags.StateCategory,
+ }
+ TransactionHistoryFlag = &cli.Uint64Flag{
+ Name: "history.transactions",
+ Usage: "Number of recent blocks to maintain transactions index for (default = about one year, 0 = entire chain)",
+ Value: ethconfig.Defaults.TransactionHistory,
+ Category: flags.StateCategory,
}
// Light server and client settings
LightServeFlag = &cli.IntFlag{
@@ -319,23 +337,6 @@ var (
Value: ethconfig.Defaults.LightPeers,
Category: flags.LightCategory,
}
- UltraLightServersFlag = &cli.StringFlag{
- Name: "ulc.servers",
- Usage: "List of trusted ultra-light servers",
- Value: strings.Join(ethconfig.Defaults.UltraLightServers, ","),
- Category: flags.LightCategory,
- }
- UltraLightFractionFlag = &cli.IntFlag{
- Name: "ulc.fraction",
- Usage: "Minimum % of trusted ultra-light servers required to announce a new head",
- Value: ethconfig.Defaults.UltraLightFraction,
- Category: flags.LightCategory,
- }
- UltraLightOnlyAnnounceFlag = &cli.BoolFlag{
- Name: "ulc.onlyannounce",
- Usage: "Ultra light server sends announcements only",
- Category: flags.LightCategory,
- }
LightNoPruneFlag = &cli.BoolFlag{
Name: "light.nopruning",
Usage: "Disable ancient light chain data pruning",
@@ -346,54 +347,6 @@ var (
Usage: "Enables serving light clients before syncing",
Category: flags.LightCategory,
}
-
- // Ethash settings
- EthashCacheDirFlag = &flags.DirectoryFlag{
- Name: "ethash.cachedir",
- Usage: "Directory to store the ethash verification caches (default = inside the datadir)",
- Category: flags.EthashCategory,
- }
- EthashCachesInMemoryFlag = &cli.IntFlag{
- Name: "ethash.cachesinmem",
- Usage: "Number of recent ethash caches to keep in memory (16MB each)",
- Value: ethconfig.Defaults.Ethash.CachesInMem,
- Category: flags.EthashCategory,
- }
- EthashCachesOnDiskFlag = &cli.IntFlag{
- Name: "ethash.cachesondisk",
- Usage: "Number of recent ethash caches to keep on disk (16MB each)",
- Value: ethconfig.Defaults.Ethash.CachesOnDisk,
- Category: flags.EthashCategory,
- }
- EthashCachesLockMmapFlag = &cli.BoolFlag{
- Name: "ethash.cacheslockmmap",
- Usage: "Lock memory maps of recent ethash caches",
- Category: flags.EthashCategory,
- }
- EthashDatasetDirFlag = &flags.DirectoryFlag{
- Name: "ethash.dagdir",
- Usage: "Directory to store the ethash mining DAGs",
- Value: flags.DirectoryString(ethconfig.Defaults.Ethash.DatasetDir),
- Category: flags.EthashCategory,
- }
- EthashDatasetsInMemoryFlag = &cli.IntFlag{
- Name: "ethash.dagsinmem",
- Usage: "Number of recent ethash mining DAGs to keep in memory (1+GB each)",
- Value: ethconfig.Defaults.Ethash.DatasetsInMem,
- Category: flags.EthashCategory,
- }
- EthashDatasetsOnDiskFlag = &cli.IntFlag{
- Name: "ethash.dagsondisk",
- Usage: "Number of recent ethash mining DAGs to keep on disk (1+GB each)",
- Value: ethconfig.Defaults.Ethash.DatasetsOnDisk,
- Category: flags.EthashCategory,
- }
- EthashDatasetsLockMmapFlag = &cli.BoolFlag{
- Name: "ethash.dagslockmmap",
- Usage: "Lock memory maps for recent ethash mining DAGs",
- Category: flags.EthashCategory,
- }
-
// Transaction pool settings
TxPoolLocalsFlag = &cli.StringFlag{
Name: "txpool.locals",
@@ -408,18 +361,23 @@ var (
TxPoolJournalFlag = &cli.StringFlag{
Name: "txpool.journal",
Usage: "Disk journal for local transaction to survive node restarts",
- Value: txpool.DefaultConfig.Journal,
+ Value: ethconfig.Defaults.TxPool.Journal,
+ Category: flags.TxPoolCategory,
+ }
+ TxPoolJournalRemotesFlag = &cli.BoolFlag{
+ Name: "txpool.journalremotes",
+ Usage: "Includes remote transactions in the journal",
Category: flags.TxPoolCategory,
}
TxPoolRejournalFlag = &cli.DurationFlag{
Name: "txpool.rejournal",
Usage: "Time interval to regenerate the local transaction journal",
- Value: txpool.DefaultConfig.Rejournal,
+ Value: ethconfig.Defaults.TxPool.Rejournal,
Category: flags.TxPoolCategory,
}
TxPoolPriceLimitFlag = &cli.Uint64Flag{
Name: "txpool.pricelimit",
- Usage: "Minimum gas price limit to enforce for acceptance into the pool",
+ Usage: "Minimum gas price tip to enforce for acceptance into the pool",
Value: ethconfig.Defaults.TxPool.PriceLimit,
Category: flags.TxPoolCategory,
}
@@ -471,7 +429,25 @@ var (
Value: ethconfig.Defaults.TxPool.ReannounceRemotes,
Category: flags.TxPoolCategory,
}
-
+ // Blob transaction pool settings
+ BlobPoolDataDirFlag = &cli.StringFlag{
+ Name: "blobpool.datadir",
+ Usage: "Data directory to store blob transactions in",
+ Value: ethconfig.Defaults.BlobPool.Datadir,
+ Category: flags.BlobPoolCategory,
+ }
+ BlobPoolDataCapFlag = &cli.Uint64Flag{
+ Name: "blobpool.datacap",
+ Usage: "Disk space to allocate for pending blob transactions (soft limit)",
+ Value: ethconfig.Defaults.BlobPool.Datacap,
+ Category: flags.BlobPoolCategory,
+ }
+ BlobPoolPriceBumpFlag = &cli.Uint64Flag{
+ Name: "blobpool.pricebump",
+ Usage: "Price bump percentage to replace an already existing blob transaction",
+ Value: ethconfig.Defaults.BlobPool.PriceBump,
+ Category: flags.BlobPoolCategory,
+ }
// Performance tuning settings
CacheFlag = &cli.IntFlag{
Name: "cache",
@@ -482,7 +458,7 @@ var (
CacheDatabaseFlag = &cli.IntFlag{
Name: "cache.database",
Usage: "Percentage of cache memory allowance to use for database io",
- Value: 40,
+ Value: 50,
Category: flags.PerfCategory,
}
CacheTrieFlag = &cli.IntFlag{
@@ -491,18 +467,6 @@ var (
Value: 15,
Category: flags.PerfCategory,
}
- CacheTrieJournalFlag = &cli.StringFlag{
- Name: "cache.trie.journal",
- Usage: "Disk journal directory for trie cache to survive node restarts",
- Value: ethconfig.Defaults.TrieCleanCacheJournal,
- Category: flags.PerfCategory,
- }
- CacheTrieRejournalFlag = &cli.DurationFlag{
- Name: "cache.trie.rejournal",
- Usage: "Time interval to regenerate the trie cache journal",
- Value: ethconfig.Defaults.TrieCleanCacheRejournal,
- Category: flags.PerfCategory,
- }
CacheGCFlag = &cli.IntFlag{
Name: "cache.gc",
Usage: "Percentage of cache memory allowance to use for trie pruning (default = 25% full mode, 0% archive mode)",
@@ -536,6 +500,12 @@ var (
Usage: "Raise the open file descriptor resource limit (default = system fd limit)",
Category: flags.PerfCategory,
}
+ CryptoKZGFlag = &cli.StringFlag{
+ Name: "crypto.kzg",
+ Usage: "KZG library implementation to use; gokzg (recommended) or ckzg",
+ Value: "gokzg",
+ Category: flags.PerfCategory,
+ }
// Miner settings
MiningEnabledFlag = &cli.BoolFlag{
@@ -543,22 +513,6 @@ var (
Usage: "Enable mining",
Category: flags.MinerCategory,
}
- MinerThreadsFlag = &cli.IntFlag{
- Name: "miner.threads",
- Usage: "Number of CPU threads to use for mining",
- Value: 0,
- Category: flags.MinerCategory,
- }
- MinerNotifyFlag = &cli.StringFlag{
- Name: "miner.notify",
- Usage: "Comma separated HTTP URL list to notify of new work packages",
- Category: flags.MinerCategory,
- }
- MinerNotifyFullFlag = &cli.BoolFlag{
- Name: "miner.notify.full",
- Usage: "Notify with pending block headers instead of work packages",
- Category: flags.MinerCategory,
- }
MinerGasLimitFlag = &cli.Uint64Flag{
Name: "miner.gaslimit",
Usage: "Target gas ceiling for mined blocks",
@@ -587,11 +541,6 @@ var (
Value: ethconfig.Defaults.Miner.Recommit,
Category: flags.MinerCategory,
}
- MinerNoVerifyFlag = &cli.BoolFlag{
- Name: "miner.noverify",
- Usage: "Disable remote sealing verification",
- Category: flags.MinerCategory,
- }
MinerNewPayloadTimeout = &cli.DurationFlag{
Name: "miner.newpayload-timeout",
Usage: "Specify the maximum time allowance for creating a new payload",
@@ -681,11 +630,6 @@ var (
Usage: "Reporting URL of a ethstats service (nodename:secret@host:port)",
Category: flags.MetricsCategory,
}
- FakePoWFlag = &cli.BoolFlag{
- Name: "fakepow",
- Usage: "Disables proof-of-work verification",
- Category: flags.LoggingCategory,
- }
NoCompactionFlag = &cli.BoolFlag{
Name: "nocompaction",
Usage: "Disables db compaction after import",
@@ -693,9 +637,9 @@ var (
}
// MISC settings
- SyncTargetFlag = &cli.PathFlag{
+ SyncTargetFlag = &cli.StringFlag{
Name: "synctarget",
- Usage: `File for containing the hex-encoded block-rlp as sync target(dev feature)`,
+ Usage: `Hash of the block to full sync to (dev testing feature)`,
TakesFile: true,
Category: flags.MiscCategory,
}
@@ -819,6 +763,18 @@ var (
Usage: "Allow for unprotected (non EIP155 signed) transactions to be submitted via RPC",
Category: flags.APICategory,
}
+ BatchRequestLimit = &cli.IntFlag{
+ Name: "rpc.batch-request-limit",
+ Usage: "Maximum number of requests in a batch",
+ Value: node.DefaultConfig.BatchRequestLimit,
+ Category: flags.APICategory,
+ }
+ BatchResponseMaxSize = &cli.IntFlag{
+ Name: "rpc.batch-response-max-size",
+ Usage: "Maximum number of bytes returned from a batched call",
+ Value: node.DefaultConfig.BatchResponseMaxSize,
+ Category: flags.APICategory,
+ }
EnablePersonal = &cli.BoolFlag{
Name: "rpc.enabledeprecatedpersonal",
Usage: "Enables the (deprecated) personal namespace",
@@ -871,8 +827,16 @@ var (
Usage: "Disables the peer discovery mechanism (manual peer addition)",
Category: flags.NetworkingCategory,
}
+ DiscoveryV4Flag = &cli.BoolFlag{
+ Name: "discovery.v4",
+ Aliases: []string{"discv4"},
+ Usage: "Enables the V4 discovery mechanism",
+ Category: flags.NetworkingCategory,
+ Value: true,
+ }
DiscoveryV5Flag = &cli.BoolFlag{
- Name: "v5disc",
+ Name: "discovery.v5",
+ Aliases: []string{"discv5"},
Usage: "Enables the experimental RLPx V5 (Topic Discovery) mechanism",
Category: flags.NetworkingCategory,
}
@@ -932,6 +896,12 @@ var (
Value: ethconfig.Defaults.GPO.IgnorePrice.Int64(),
Category: flags.GasPriceCategory,
}
+ GpoMinSuggestedPriorityFeeFlag = &cli.Int64Flag{
+ Name: "gpo.minsuggestedpriorityfee",
+ Usage: "Minimum transaction priority fee to suggest. Used on OP chains when blocks are not full.",
+ Value: ethconfig.Defaults.GPO.MinSuggestedPriorityFee.Int64(),
+ Category: flags.GasPriceCategory,
+ }
// Rollup Flags
RollupSequencerHTTPFlag = &cli.StringFlag{
@@ -958,11 +928,27 @@ var (
Usage: "Disable transaction pool gossip.",
Category: flags.RollupCategory,
}
+ RollupEnableTxPoolAdmissionFlag = &cli.BoolFlag{
+ Name: "rollup.enabletxpooladmission",
+ Usage: "Add RPC-submitted transactions to the txpool (on by default if --rollup.sequencerhttp is not set).",
+ Category: flags.RollupCategory,
+ }
RollupComputePendingBlock = &cli.BoolFlag{
Name: "rollup.computependingblock",
Usage: "By default the pending block equals the latest block to save resources and not leak txs from the tx-pool, this flag enables computing of the pending block from the tx-pool instead.",
Category: flags.RollupCategory,
}
+ RollupHaltOnIncompatibleProtocolVersionFlag = &cli.StringFlag{
+ Name: "rollup.halt",
+ Usage: "Opt-in option to halt on incompatible protocol version requirements of the given level (major/minor/patch/none), as signaled through the Engine API by the rollup node",
+ Category: flags.RollupCategory,
+ }
+ RollupSuperchainUpgradesFlag = &cli.BoolFlag{
+ Name: "rollup.superchain-upgrades",
+ Aliases: []string{"beta.rollup.superchain-upgrades"},
+ Usage: "Apply superchain-registry config changes to the local chain-configuration",
+ Category: flags.RollupCategory,
+ }
// Metrics flags
MetricsEnabledFlag = &cli.BoolFlag{
@@ -1063,42 +1049,43 @@ Please note that --` + MetricsHTTPFlag.Name + ` must be set to start the server.
var (
// TestnetFlags is the flag group of all built-in supported testnets.
TestnetFlags = []cli.Flag{
- RinkebyFlag,
GoerliFlag,
SepoliaFlag,
+ HoleskyFlag,
+ OpBNBTestnetFlag,
+ OpBNBQANetFlag,
}
// NetworkFlags is the flag group of all built-in supported networks.
- NetworkFlags = append([]cli.Flag{MainnetFlag}, TestnetFlags...)
+ NetworkFlags = append([]cli.Flag{MainnetFlag, OPNetworkFlag, OpBNBMainnetFlag}, TestnetFlags...)
- // DatabasePathFlags is the flag group of all database path flags.
- DatabasePathFlags = []cli.Flag{
+ // DatabaseFlags is the flag group of all database flags.
+ DatabaseFlags = []cli.Flag{
DataDirFlag,
AncientFlag,
RemoteDBFlag,
+ DBEngineFlag,
+ StateSchemeFlag,
HttpHeaderFlag,
}
)
-func init() {
- if rawdb.PebbleEnabled {
- DatabasePathFlags = append(DatabasePathFlags, DBEngineFlag)
- }
-}
-
// MakeDataDir retrieves the currently requested data directory, terminating
// if none (or the empty string) is specified. If the node is starting a testnet,
// then a subdirectory of the specified datadir will be used.
func MakeDataDir(ctx *cli.Context) string {
if path := ctx.String(DataDirFlag.Name); path != "" {
- if ctx.Bool(RinkebyFlag.Name) {
- return filepath.Join(path, "rinkeby")
- }
if ctx.Bool(GoerliFlag.Name) {
return filepath.Join(path, "goerli")
}
if ctx.Bool(SepoliaFlag.Name) {
return filepath.Join(path, "sepolia")
}
+ if ctx.Bool(HoleskyFlag.Name) {
+ return filepath.Join(path, "holesky")
+ }
+ if ctx.IsSet(OPNetworkFlag.Name) {
+ return filepath.Join(path, ctx.String(OPNetworkFlag.Name))
+ }
return path
}
Fatalf("Cannot determine default data directory, please set manually (--datadir)")
@@ -1107,7 +1094,7 @@ func MakeDataDir(ctx *cli.Context) string {
// setNodeKey creates a node key from set command line flags, either loading it
// from a file or as a specified hex value. If neither flags were provided, this
-// method returns nil and an emphemeral key is to be generated.
+// method returns nil and an ephemeral key is to be generated.
func setNodeKey(ctx *cli.Context, cfg *p2p.Config) {
var (
hex = ctx.String(NodeKeyHexFlag.Name)
@@ -1140,41 +1127,49 @@ func setNodeUserIdent(ctx *cli.Context, cfg *node.Config) {
// setBootstrapNodes creates a list of bootstrap nodes from the command line
// flags, reverting to pre-configured ones if none have been specified.
+// Priority order for bootnodes configuration:
+//
+// 1. --bootnodes flag
+// 2. Config file
+// 3. Network preset flags (e.g. --goerli)
+// 4. default to opbnb mainnet nodes
func setBootstrapNodes(ctx *cli.Context, cfg *p2p.Config) {
urls := params.OpBNBMainnetBootnodes
- if ctx.IsSet(NetworkIdFlag.Name) {
- networkId := ctx.Uint64(NetworkIdFlag.Name)
- if networkId == params.OpBNBTestnet {
- urls = params.OpBNBTestnetBootnodes
- }
- }
- switch {
- case ctx.IsSet(BootnodesFlag.Name):
+ if ctx.IsSet(BootnodesFlag.Name) {
urls = SplitAndTrim(ctx.String(BootnodesFlag.Name))
- case ctx.Bool(SepoliaFlag.Name):
- urls = params.SepoliaBootnodes
- case ctx.Bool(RinkebyFlag.Name):
- urls = params.RinkebyBootnodes
- case ctx.Bool(GoerliFlag.Name):
- urls = params.GoerliBootnodes
- }
-
- // don't apply defaults if BootstrapNodes is already set
- if cfg.BootstrapNodes != nil {
- return
+ } else {
+ if cfg.BootstrapNodes != nil {
+ return // Already set by config file, don't apply defaults.
+ }
+ switch {
+ case ctx.Bool(HoleskyFlag.Name):
+ urls = params.HoleskyBootnodes
+ case ctx.Bool(SepoliaFlag.Name):
+ urls = params.SepoliaBootnodes
+ case ctx.Bool(GoerliFlag.Name):
+ urls = params.GoerliBootnodes
+ case ctx.Bool(NetworkIdFlag.Name):
+ if ctx.Uint64(NetworkIdFlag.Name) == params.OpBNBTestnet {
+ urls = params.OpBNBTestnetBootnodes
+ }
+ }
}
+ cfg.BootstrapNodes = mustParseBootnodes(urls)
+}
- cfg.BootstrapNodes = make([]*enode.Node, 0, len(urls))
+func mustParseBootnodes(urls []string) []*enode.Node {
+ nodes := make([]*enode.Node, 0, len(urls))
for _, url := range urls {
if url != "" {
node, err := enode.Parse(enode.ValidSchemes, url)
if err != nil {
log.Crit("Bootstrap URL invalid", "enode", url, "err", err)
- continue
+ return nil
}
- cfg.BootstrapNodes = append(cfg.BootstrapNodes, node)
+ nodes = append(nodes, node)
}
}
+ return nodes
}
// setBootstrapNodesV5 creates a list of bootstrap nodes from the command line
@@ -1279,6 +1274,14 @@ func setHTTP(ctx *cli.Context, cfg *node.Config) {
if ctx.IsSet(AllowUnprotectedTxs.Name) {
cfg.AllowUnprotectedTxs = ctx.Bool(AllowUnprotectedTxs.Name)
}
+
+ if ctx.IsSet(BatchRequestLimit.Name) {
+ cfg.BatchRequestLimit = ctx.Int(BatchRequestLimit.Name)
+ }
+
+ if ctx.IsSet(BatchResponseMaxSize.Name) {
+ cfg.BatchResponseMaxSize = ctx.Int(BatchResponseMaxSize.Name)
+ }
}
// setGraphQL creates the GraphQL listener interface string from the set
@@ -1344,19 +1347,6 @@ func setLes(ctx *cli.Context, cfg *ethconfig.Config) {
if ctx.IsSet(LightMaxPeersFlag.Name) {
cfg.LightPeers = ctx.Int(LightMaxPeersFlag.Name)
}
- if ctx.IsSet(UltraLightServersFlag.Name) {
- cfg.UltraLightServers = strings.Split(ctx.String(UltraLightServersFlag.Name), ",")
- }
- if ctx.IsSet(UltraLightFractionFlag.Name) {
- cfg.UltraLightFraction = ctx.Int(UltraLightFractionFlag.Name)
- }
- if cfg.UltraLightFraction <= 0 && cfg.UltraLightFraction > 100 {
- log.Error("Ultra light fraction is invalid", "had", cfg.UltraLightFraction, "updated", ethconfig.Defaults.UltraLightFraction)
- cfg.UltraLightFraction = ethconfig.Defaults.UltraLightFraction
- }
- if ctx.IsSet(UltraLightOnlyAnnounceFlag.Name) {
- cfg.UltraLightOnlyAnnounce = ctx.Bool(UltraLightOnlyAnnounceFlag.Name)
- }
if ctx.IsSet(LightNoPruneFlag.Name) {
cfg.LightNoPrune = ctx.Bool(LightNoPruneFlag.Name)
}
@@ -1497,13 +1487,17 @@ func SetP2PConfig(ctx *cli.Context, cfg *p2p.Config) {
cfg.NoDiscovery = true
}
- // if we're running a light client or server, force enable the v5 peer discovery
- // unless it is explicitly disabled with --nodiscover note that explicitly specifying
- // --v5disc overrides --nodiscover, in which case the later only disables v4 discovery
- forceV5Discovery := (lightClient || lightServer) && !ctx.Bool(NoDiscoverFlag.Name)
- if ctx.IsSet(DiscoveryV5Flag.Name) {
- cfg.DiscoveryV5 = ctx.Bool(DiscoveryV5Flag.Name)
- } else if forceV5Discovery {
+ // Disallow --nodiscover when used in conjunction with light mode.
+ if (lightClient || lightServer) && ctx.Bool(NoDiscoverFlag.Name) {
+ Fatalf("Cannot use --" + NoDiscoverFlag.Name + " in light client or light server mode")
+ }
+ CheckExclusive(ctx, DiscoveryV4Flag, NoDiscoverFlag)
+ CheckExclusive(ctx, DiscoveryV5Flag, NoDiscoverFlag)
+ cfg.DiscoveryV4 = ctx.Bool(DiscoveryV4Flag.Name)
+ cfg.DiscoveryV5 = ctx.Bool(DiscoveryV5Flag.Name)
+
+ // If we're running a light client or server, force enable the v5 peer discovery.
+ if lightClient || lightServer {
cfg.DiscoveryV5 = true
}
@@ -1602,12 +1596,14 @@ func SetDataDir(ctx *cli.Context, cfg *node.Config) {
cfg.DataDir = ctx.String(DataDirFlag.Name)
case ctx.Bool(DeveloperFlag.Name):
cfg.DataDir = "" // unless explicitly requested, use memory databases
- case ctx.Bool(RinkebyFlag.Name) && cfg.DataDir == node.DefaultDataDir():
- cfg.DataDir = filepath.Join(node.DefaultDataDir(), "rinkeby")
case ctx.Bool(GoerliFlag.Name) && cfg.DataDir == node.DefaultDataDir():
cfg.DataDir = filepath.Join(node.DefaultDataDir(), "goerli")
case ctx.Bool(SepoliaFlag.Name) && cfg.DataDir == node.DefaultDataDir():
cfg.DataDir = filepath.Join(node.DefaultDataDir(), "sepolia")
+ case ctx.Bool(HoleskyFlag.Name) && cfg.DataDir == node.DefaultDataDir():
+ cfg.DataDir = filepath.Join(node.DefaultDataDir(), "holesky")
+ case ctx.IsSet(OPNetworkFlag.Name) && cfg.DataDir == node.DefaultDataDir():
+ cfg.DataDir = filepath.Join(node.DefaultDataDir(), ctx.String(OPNetworkFlag.Name))
}
}
@@ -1629,9 +1625,12 @@ func setGPO(ctx *cli.Context, cfg *gasprice.Config, light bool) {
if ctx.IsSet(GpoIgnoreGasPriceFlag.Name) {
cfg.IgnorePrice = big.NewInt(ctx.Int64(GpoIgnoreGasPriceFlag.Name))
}
+ if ctx.IsSet(GpoMinSuggestedPriorityFeeFlag.Name) {
+ cfg.MinSuggestedPriorityFee = big.NewInt(ctx.Int64(GpoMinSuggestedPriorityFeeFlag.Name))
+ }
}
-func setTxPool(ctx *cli.Context, cfg *txpool.Config) {
+func setTxPool(ctx *cli.Context, cfg *legacypool.Config) {
if ctx.IsSet(TxPoolLocalsFlag.Name) {
locals := strings.Split(ctx.String(TxPoolLocalsFlag.Name), ",")
for _, account := range locals {
@@ -1648,6 +1647,9 @@ func setTxPool(ctx *cli.Context, cfg *txpool.Config) {
if ctx.IsSet(TxPoolJournalFlag.Name) {
cfg.Journal = ctx.String(TxPoolJournalFlag.Name)
}
+ if ctx.IsSet(TxPoolJournalRemotesFlag.Name) {
+ cfg.JournalRemote = ctx.Bool(TxPoolJournalRemotesFlag.Name)
+ }
if ctx.IsSet(TxPoolRejournalFlag.Name) {
cfg.Rejournal = ctx.Duration(TxPoolRejournalFlag.Name)
}
@@ -1680,38 +1682,7 @@ func setTxPool(ctx *cli.Context, cfg *txpool.Config) {
}
}
-func setEthash(ctx *cli.Context, cfg *ethconfig.Config) {
- if ctx.IsSet(EthashCacheDirFlag.Name) {
- cfg.Ethash.CacheDir = ctx.String(EthashCacheDirFlag.Name)
- }
- if ctx.IsSet(EthashDatasetDirFlag.Name) {
- cfg.Ethash.DatasetDir = ctx.String(EthashDatasetDirFlag.Name)
- }
- if ctx.IsSet(EthashCachesInMemoryFlag.Name) {
- cfg.Ethash.CachesInMem = ctx.Int(EthashCachesInMemoryFlag.Name)
- }
- if ctx.IsSet(EthashCachesOnDiskFlag.Name) {
- cfg.Ethash.CachesOnDisk = ctx.Int(EthashCachesOnDiskFlag.Name)
- }
- if ctx.IsSet(EthashCachesLockMmapFlag.Name) {
- cfg.Ethash.CachesLockMmap = ctx.Bool(EthashCachesLockMmapFlag.Name)
- }
- if ctx.IsSet(EthashDatasetsInMemoryFlag.Name) {
- cfg.Ethash.DatasetsInMem = ctx.Int(EthashDatasetsInMemoryFlag.Name)
- }
- if ctx.IsSet(EthashDatasetsOnDiskFlag.Name) {
- cfg.Ethash.DatasetsOnDisk = ctx.Int(EthashDatasetsOnDiskFlag.Name)
- }
- if ctx.IsSet(EthashDatasetsLockMmapFlag.Name) {
- cfg.Ethash.DatasetsLockMmap = ctx.Bool(EthashDatasetsLockMmapFlag.Name)
- }
-}
-
func setMiner(ctx *cli.Context, cfg *miner.Config) {
- if ctx.IsSet(MinerNotifyFlag.Name) {
- cfg.Notify = strings.Split(ctx.String(MinerNotifyFlag.Name), ",")
- }
- cfg.NotifyFull = ctx.Bool(MinerNotifyFullFlag.Name)
if ctx.IsSet(MinerExtraDataFlag.Name) {
cfg.ExtraData = []byte(ctx.String(MinerExtraDataFlag.Name))
}
@@ -1724,9 +1695,6 @@ func setMiner(ctx *cli.Context, cfg *miner.Config) {
if ctx.IsSet(MinerRecommitIntervalFlag.Name) {
cfg.Recommit = ctx.Duration(MinerRecommitIntervalFlag.Name)
}
- if ctx.IsSet(MinerNoVerifyFlag.Name) {
- cfg.Noverify = ctx.Bool(MinerNoVerifyFlag.Name)
- }
if ctx.IsSet(MinerNewPayloadTimeout.Name) {
cfg.NewPayloadTimeout = ctx.Duration(MinerNewPayloadTimeout.Name)
}
@@ -1807,20 +1775,14 @@ func CheckExclusive(ctx *cli.Context, args ...interface{}) {
// SetEthConfig applies eth-related command line flags to the config.
func SetEthConfig(ctx *cli.Context, stack *node.Node, cfg *ethconfig.Config) {
// Avoid conflicting network flags
- CheckExclusive(ctx, MainnetFlag, DeveloperFlag, RinkebyFlag, GoerliFlag, SepoliaFlag)
+ CheckExclusive(ctx, MainnetFlag, DeveloperFlag, GoerliFlag, SepoliaFlag, HoleskyFlag, OPNetworkFlag, OpBNBMainnetFlag, OpBNBTestnetFlag, OpBNBQANetFlag)
CheckExclusive(ctx, LightServeFlag, SyncModeFlag, "light")
CheckExclusive(ctx, DeveloperFlag, ExternalSignerFlag) // Can't use both ephemeral unlocked and external signer
- if ctx.String(GCModeFlag.Name) == "archive" && ctx.Uint64(TxLookupLimitFlag.Name) != 0 {
- ctx.Set(TxLookupLimitFlag.Name, "0")
- log.Warn("Disable transaction unindexing for archive node")
- }
- if ctx.IsSet(LightServeFlag.Name) && ctx.Uint64(TxLookupLimitFlag.Name) != 0 {
- log.Warn("LES server cannot serve old transaction status and cannot connect below les/4 protocol version if transaction lookup index is limited")
- }
+
+ // Set configurations from CLI flags
setEtherbase(ctx, cfg)
setGPO(ctx, &cfg.GPO, ctx.String(SyncModeFlag.Name) == "light")
setTxPool(ctx, &cfg.TxPool)
- setEthash(ctx, cfg)
setMiner(ctx, &cfg.Miner)
setRequiredBlocks(ctx, cfg)
setLes(ctx, cfg)
@@ -1845,7 +1807,9 @@ func SetEthConfig(ctx *cli.Context, stack *node.Node, cfg *ethconfig.Config) {
log.Debug("Sanitizing Go's GC trigger", "percent", int(gogc))
godebug.SetGCPercent(int(gogc))
- if ctx.IsSet(SyncModeFlag.Name) {
+ if ctx.IsSet(SyncTargetFlag.Name) {
+ cfg.SyncMode = downloader.FullSync // dev sync target forces full sync
+ } else if ctx.IsSet(SyncModeFlag.Name) {
cfg.SyncMode = *flags.GlobalTextMarshaler(ctx, SyncModeFlag.Name).(*downloader.SyncMode)
}
if ctx.IsSet(NetworkIdFlag.Name) {
@@ -1874,24 +1838,37 @@ func SetEthConfig(ctx *cli.Context, stack *node.Node, cfg *ethconfig.Config) {
cfg.Preimages = true
log.Info("Enabling recording of key preimages since archive mode is used")
}
- if ctx.IsSet(TxLookupLimitFlag.Name) {
- cfg.TxLookupLimit = ctx.Uint64(TxLookupLimitFlag.Name)
+ if ctx.IsSet(StateHistoryFlag.Name) {
+ cfg.StateHistory = ctx.Uint64(StateHistoryFlag.Name)
}
- if ctx.IsSet(CacheFlag.Name) || ctx.IsSet(CacheTrieFlag.Name) {
- cfg.TrieCleanCache = ctx.Int(CacheFlag.Name) * ctx.Int(CacheTrieFlag.Name) / 100
+ if ctx.IsSet(StateSchemeFlag.Name) {
+ cfg.StateScheme = ctx.String(StateSchemeFlag.Name)
+ }
+ // Parse transaction history flag, if user is still using legacy config
+ // file with 'TxLookupLimit' configured, copy the value to 'TransactionHistory'.
+ if cfg.TransactionHistory == ethconfig.Defaults.TransactionHistory && cfg.TxLookupLimit != ethconfig.Defaults.TxLookupLimit {
+ log.Warn("The config option 'TxLookupLimit' is deprecated and will be removed, please use 'TransactionHistory'")
+ cfg.TransactionHistory = cfg.TxLookupLimit
+ }
+ if ctx.IsSet(TransactionHistoryFlag.Name) {
+ cfg.TransactionHistory = ctx.Uint64(TransactionHistoryFlag.Name)
+ } else if ctx.IsSet(TxLookupLimitFlag.Name) {
+ log.Warn("The flag --txlookuplimit is deprecated and will be removed, please use --history.transactions")
+ cfg.TransactionHistory = ctx.Uint64(TxLookupLimitFlag.Name)
}
- if ctx.IsSet(CacheTrieJournalFlag.Name) {
- cfg.TrieCleanCacheJournal = ctx.String(CacheTrieJournalFlag.Name)
+ if ctx.String(GCModeFlag.Name) == "archive" && cfg.TransactionHistory != 0 {
+ cfg.TransactionHistory = 0
+ log.Warn("Disabled transaction unindexing for archive node")
}
- if ctx.IsSet(CacheTrieRejournalFlag.Name) {
- cfg.TrieCleanCacheRejournal = ctx.Duration(CacheTrieRejournalFlag.Name)
+ if ctx.IsSet(LightServeFlag.Name) && cfg.TransactionHistory != 0 {
+ log.Warn("LES server cannot serve old transaction status and cannot connect below les/4 protocol version if transaction lookup index is limited")
+ }
+ if ctx.IsSet(CacheFlag.Name) || ctx.IsSet(CacheTrieFlag.Name) {
+ cfg.TrieCleanCache = ctx.Int(CacheFlag.Name) * ctx.Int(CacheTrieFlag.Name) / 100
}
if ctx.IsSet(CacheFlag.Name) || ctx.IsSet(CacheGCFlag.Name) {
cfg.TrieDirtyCache = ctx.Int(CacheFlag.Name) * ctx.Int(CacheGCFlag.Name) / 100
}
- if ctx.IsSet(TriesInMemoryFlag.Name) {
- cfg.TriesInMemory = ctx.Uint64(TriesInMemoryFlag.Name)
- }
if ctx.IsSet(CacheFlag.Name) || ctx.IsSet(CacheSnapshotFlag.Name) {
cfg.SnapshotCache = ctx.Int(CacheFlag.Name) * ctx.Int(CacheSnapshotFlag.Name) / 100
}
@@ -1950,6 +1927,9 @@ func SetEthConfig(ctx *cli.Context, stack *node.Node, cfg *ethconfig.Config) {
cfg.RollupHistoricalRPCTimeout = ctx.Duration(RollupHistoricalRPCTimeoutFlag.Name)
}
cfg.RollupDisableTxPoolGossip = ctx.Bool(RollupDisableTxPoolGossipFlag.Name)
+ cfg.RollupDisableTxPoolAdmission = cfg.RollupSequencerHTTP != "" && !ctx.Bool(RollupEnableTxPoolAdmissionFlag.Name)
+ cfg.RollupHaltOnIncompatibleProtocolVersion = ctx.String(RollupHaltOnIncompatibleProtocolVersionFlag.Name)
+ cfg.ApplySuperchainUpgrades = ctx.Bool(RollupSuperchainUpgradesFlag.Name)
// Override any default configs for hard coded networks.
switch {
case ctx.Bool(MainnetFlag.Name):
@@ -1958,28 +1938,18 @@ func SetEthConfig(ctx *cli.Context, stack *node.Node, cfg *ethconfig.Config) {
}
cfg.Genesis = core.DefaultGenesisBlock()
SetDNSDiscoveryDefaults(cfg, params.MainnetGenesisHash)
+ case ctx.Bool(HoleskyFlag.Name):
+ if !ctx.IsSet(NetworkIdFlag.Name) {
+ cfg.NetworkId = 17000
+ }
+ cfg.Genesis = core.DefaultHoleskyGenesisBlock()
+ SetDNSDiscoveryDefaults(cfg, params.HoleskyGenesisHash)
case ctx.Bool(SepoliaFlag.Name):
if !ctx.IsSet(NetworkIdFlag.Name) {
cfg.NetworkId = 11155111
}
cfg.Genesis = core.DefaultSepoliaGenesisBlock()
SetDNSDiscoveryDefaults(cfg, params.SepoliaGenesisHash)
- case ctx.Bool(RinkebyFlag.Name):
- log.Warn("")
- log.Warn("--------------------------------------------------------------------------------")
- log.Warn("Please note, Rinkeby has been deprecated. It will still work for the time being,")
- log.Warn("but there will be no further hard-forks shipped for it.")
- log.Warn("The network will be permanently halted in Q2/Q3 of 2023.")
- log.Warn("For the most future proof testnet, choose Sepolia as")
- log.Warn("your replacement environment (--sepolia instead of --rinkeby).")
- log.Warn("--------------------------------------------------------------------------------")
- log.Warn("")
-
- if !ctx.IsSet(NetworkIdFlag.Name) {
- cfg.NetworkId = 4
- }
- cfg.Genesis = core.DefaultRinkebyGenesisBlock()
- SetDNSDiscoveryDefaults(cfg, params.RinkebyGenesisHash)
case ctx.Bool(GoerliFlag.Name):
if !ctx.IsSet(NetworkIdFlag.Name) {
cfg.NetworkId = 5
@@ -2035,17 +2005,9 @@ func SetEthConfig(ctx *cli.Context, stack *node.Node, cfg *ethconfig.Config) {
log.Info("Using developer account", "address", developer.Address)
// Create a new developer genesis block or reuse existing one
- cfg.Genesis = core.DeveloperGenesisBlock(uint64(ctx.Int(DeveloperPeriodFlag.Name)), ctx.Uint64(DeveloperGasLimitFlag.Name), developer.Address)
+ cfg.Genesis = core.DeveloperGenesisBlock(ctx.Uint64(DeveloperGasLimitFlag.Name), developer.Address)
if ctx.IsSet(DataDirFlag.Name) {
- // If datadir doesn't exist we need to open db in write-mode
- // so leveldb can create files.
- readonly := true
- if !common.FileExist(stack.ResolvePath("chaindata")) {
- readonly = false
- }
- // Check if we have an already initialized chain and fall back to
- // that if so. Otherwise we need to generate a new genesis spec.
- chaindb := MakeChainDatabase(ctx, stack, readonly)
+ chaindb := tryMakeReadOnlyDatabase(ctx, stack)
if rawdb.ReadCanonicalHash(chaindb, 0) != (common.Hash{}) {
cfg.Genesis = nil // fallback to db content
}
@@ -2054,11 +2016,40 @@ func SetEthConfig(ctx *cli.Context, stack *node.Node, cfg *ethconfig.Config) {
if !ctx.IsSet(MinerGasPriceFlag.Name) {
cfg.Miner.GasPrice = big.NewInt(1)
}
+ case ctx.IsSet(OPNetworkFlag.Name):
+ genesis := MakeGenesis(ctx)
+ if !ctx.IsSet(NetworkIdFlag.Name) {
+ cfg.NetworkId = genesis.Config.ChainID.Uint64()
+ }
+ cfg.Genesis = genesis
+ case ctx.Bool(OpBNBMainnetFlag.Name):
+ if !ctx.IsSet(NetworkIdFlag.Name) {
+ cfg.NetworkId = 204
+ }
+ cfg.Genesis = MakeGenesis(ctx)
+ case ctx.Bool(OpBNBTestnetFlag.Name):
+ if !ctx.IsSet(NetworkIdFlag.Name) {
+ cfg.NetworkId = 5611
+ }
+ cfg.Genesis = MakeGenesis(ctx)
+ case ctx.Bool(OpBNBQANetFlag.Name):
+ if !ctx.IsSet(NetworkIdFlag.Name) {
+ cfg.NetworkId = 1322
+ }
+ cfg.Genesis = MakeGenesis(ctx)
default:
if cfg.NetworkId == 1 {
SetDNSDiscoveryDefaults(cfg, params.MainnetGenesisHash)
}
}
+ // Set any dangling config values
+ if ctx.String(CryptoKZGFlag.Name) != "gokzg" && ctx.String(CryptoKZGFlag.Name) != "ckzg" {
+ Fatalf("--%s flag must be 'gokzg' or 'ckzg'", CryptoKZGFlag.Name)
+ }
+ log.Info("Initializing the KZG library", "backend", ctx.String(CryptoKZGFlag.Name))
+ if err := kzg4844.UseCKZG(ctx.String(CryptoKZGFlag.Name) == "ckzg"); err != nil {
+ Fatalf("Failed to set KZG library implementation to %s: %v", ctx.String(CryptoKZGFlag.Name), err)
+ }
}
// SetDNSDiscoveryDefaults configures DNS discovery with the given URL if
@@ -2087,9 +2078,6 @@ func RegisterEthService(stack *node.Node, cfg *ethconfig.Config) (ethapi.Backend
Fatalf("Failed to register the Ethereum service: %v", err)
}
stack.RegisterAPIs(tracers.APIs(backend.ApiBackend))
- if err := lescatalyst.Register(stack, backend); err != nil {
- Fatalf("Failed to register the Engine API service: %v", err)
- }
return backend.ApiBackend, nil
}
backend, err := eth.New(stack, cfg)
@@ -2102,9 +2090,6 @@ func RegisterEthService(stack *node.Node, cfg *ethconfig.Config) (ethapi.Backend
Fatalf("Failed to create the LES server: %v", err)
}
}
- if err := ethcatalyst.Register(stack, backend); err != nil {
- Fatalf("Failed to register the Engine API service: %v", err)
- }
stack.RegisterAPIs(tracers.APIs(backend.APIBackend))
return backend.APIBackend, backend
}
@@ -2138,21 +2123,9 @@ func RegisterFilterAPI(stack *node.Node, backend ethapi.Backend, ethcfg *ethconf
}
// RegisterFullSyncTester adds the full-sync tester service into node.
-func RegisterFullSyncTester(stack *node.Node, eth *eth.Ethereum, path string) {
- blob, err := os.ReadFile(path)
- if err != nil {
- Fatalf("Failed to read block file: %v", err)
- }
- rlpBlob, err := hexutil.Decode(string(bytes.TrimRight(blob, "\r\n")))
- if err != nil {
- Fatalf("Failed to decode block blob: %v", err)
- }
- var block types.Block
- if err := rlp.DecodeBytes(rlpBlob, &block); err != nil {
- Fatalf("Failed to decode block: %v", err)
- }
- ethcatalyst.RegisterFullSyncTester(stack, eth, &block)
- log.Info("Registered full-sync tester", "number", block.NumberU64(), "hash", block.Hash())
+func RegisterFullSyncTester(stack *node.Node, eth *eth.Ethereum, target common.Hash) {
+ catalyst.RegisterFullSyncTester(stack, eth, target)
+ log.Info("Registered full-sync tester", "hash", target)
}
func SetupMetrics(ctx *cli.Context) {
@@ -2207,7 +2180,7 @@ func SetupMetrics(ctx *cli.Context) {
}
if ctx.IsSet(MetricsHTTPFlag.Name) {
- address := fmt.Sprintf("%s:%d", ctx.String(MetricsHTTPFlag.Name), ctx.Int(MetricsPortFlag.Name))
+ address := net.JoinHostPort(ctx.String(MetricsHTTPFlag.Name), fmt.Sprintf("%d", ctx.Int(MetricsPortFlag.Name)))
log.Info("Enabling stand-alone metrics HTTP endpoint", "address", address)
exp.Setup(address)
} else if ctx.IsSet(MetricsPortFlag.Name) {
@@ -2261,10 +2234,21 @@ func MakeChainDatabase(ctx *cli.Context, stack *node.Node, readonly bool) ethdb.
return chainDb
}
+// tryMakeReadOnlyDatabase try to open the chain database in read-only mode,
+// or fallback to write mode if the database is not initialized.
+func tryMakeReadOnlyDatabase(ctx *cli.Context, stack *node.Node) ethdb.Database {
+ // If the database doesn't exist we need to open it in write-mode to allow
+ // the engine to create files.
+ readonly := true
+ if rawdb.PreexistingDatabase(stack.ResolvePath("chaindata")) == "" {
+ readonly = false
+ }
+ return MakeChainDatabase(ctx, stack, readonly)
+}
+
func IsNetworkPreset(ctx *cli.Context) bool {
for _, flag := range NetworkFlags {
- bFlag, _ := flag.(*cli.BoolFlag)
- if ctx.IsSet(bFlag.Name) {
+ if ctx.IsSet(flag.Names()[0]) {
return true
}
}
@@ -2282,7 +2266,7 @@ func DialRPCWithHeaders(endpoint string, headers []string) (*rpc.Client, error)
}
var opts []rpc.ClientOption
if len(headers) > 0 {
- var customHeaders = make(http.Header)
+ customHeaders := make(http.Header)
for _, h := range headers {
kv := strings.Split(h, ":")
if len(kv) != 2 {
@@ -2300,14 +2284,46 @@ func MakeGenesis(ctx *cli.Context) *core.Genesis {
switch {
case ctx.Bool(MainnetFlag.Name):
genesis = core.DefaultGenesisBlock()
+ case ctx.Bool(HoleskyFlag.Name):
+ genesis = core.DefaultHoleskyGenesisBlock()
case ctx.Bool(SepoliaFlag.Name):
genesis = core.DefaultSepoliaGenesisBlock()
- case ctx.Bool(RinkebyFlag.Name):
- genesis = core.DefaultRinkebyGenesisBlock()
case ctx.Bool(GoerliFlag.Name):
genesis = core.DefaultGoerliGenesisBlock()
+ case ctx.IsSet(OPNetworkFlag.Name):
+ name := ctx.String(OPNetworkFlag.Name)
+ ch, err := params.OPStackChainIDByName(name)
+ if err != nil {
+ Fatalf("failed to load OP-Stack chain %q: %v", name, err)
+ }
+ genesis, err := core.LoadOPStackGenesis(ch)
+ if err != nil {
+ Fatalf("failed to load genesis for OP-Stack chain %q (%d): %v", name, ch, err)
+ }
+ return genesis
case ctx.Bool(DeveloperFlag.Name):
Fatalf("Developer chains are ephemeral")
+ case ctx.Bool(OpBNBMainnetFlag.Name):
+ genesis, err := core.LoadOpBNBGenesis(params.OPBNBMainnetChainID)
+ if err != nil {
+ Fatalf("failed to load genesis for opBNB mainnet: %v", err)
+ }
+ genesis.Config = params.OPBNBMainNetConfig
+ return genesis
+ case ctx.Bool(OpBNBTestnetFlag.Name):
+ genesis, err := core.LoadOpBNBGenesis(params.OPBNBTestNetChainID)
+ if err != nil {
+ Fatalf("failed to load genesis for opBNB testnet: %v", err)
+ }
+ genesis.Config = params.OPBNBTestNetConfig
+ return genesis
+ case ctx.Bool(OpBNBQANetFlag.Name):
+ genesis, err := core.LoadOpBNBGenesis(params.OPBNBQANetChainID)
+ if err != nil {
+ Fatalf("failed to load genesis for opBNB qanet: %v", err)
+ }
+ genesis.Config = params.OPBNBQANetConfig
+ return genesis
}
return genesis
}
@@ -2318,27 +2334,31 @@ func MakeChain(ctx *cli.Context, stack *node.Node, readonly bool) (*core.BlockCh
gspec = MakeGenesis(ctx)
chainDb = MakeChainDatabase(ctx, stack, readonly)
)
- cliqueConfig, err := core.LoadCliqueConfig(chainDb, gspec)
+ config, err := core.LoadChainConfig(chainDb, gspec)
if err != nil {
Fatalf("%v", err)
}
- ethashConfig := ethconfig.Defaults.Ethash
- if ctx.Bool(FakePoWFlag.Name) {
- ethashConfig.PowMode = ethash.ModeFake
+ engine, err := ethconfig.CreateConsensusEngine(config, chainDb)
+ if err != nil {
+ Fatalf("%v", err)
}
- engine := ethconfig.CreateConsensusEngine(stack, ðashConfig, cliqueConfig, nil, false, chainDb)
if gcmode := ctx.String(GCModeFlag.Name); gcmode != "full" && gcmode != "archive" {
Fatalf("--%s must be either 'full' or 'archive'", GCModeFlag.Name)
}
+ scheme, err := rawdb.ParseStateScheme(ctx.String(StateSchemeFlag.Name), chainDb)
+ if err != nil {
+ Fatalf("%v", err)
+ }
cache := &core.CacheConfig{
TrieCleanLimit: ethconfig.Defaults.TrieCleanCache,
TrieCleanNoPrefetch: ctx.Bool(CacheNoPrefetchFlag.Name),
TrieDirtyLimit: ethconfig.Defaults.TrieDirtyCache,
TrieDirtyDisabled: ctx.String(GCModeFlag.Name) == "archive",
TrieTimeLimit: ethconfig.Defaults.TrieTimeout,
- TriesInMemory: ethconfig.Defaults.TriesInMemory,
SnapshotLimit: ethconfig.Defaults.SnapshotCache,
Preimages: ctx.Bool(CachePreimagesFlag.Name),
+ StateScheme: scheme,
+ StateHistory: ctx.Uint64(StateHistoryFlag.Name),
}
if cache.TrieDirtyDisabled && !cache.Preimages {
cache.Preimages = true
@@ -2383,3 +2403,27 @@ func MakeConsolePreloads(ctx *cli.Context) []string {
}
return preloads
}
+
+// MakeTrieDatabase constructs a trie database based on the configured scheme.
+func MakeTrieDatabase(ctx *cli.Context, disk ethdb.Database, preimage bool, readOnly bool) *trie.Database {
+ config := &trie.Config{
+ Preimages: preimage,
+ }
+ scheme, err := rawdb.ParseStateScheme(ctx.String(StateSchemeFlag.Name), disk)
+ if err != nil {
+ Fatalf("%v", err)
+ }
+ if scheme == rawdb.HashScheme {
+ // Read-only mode is not implemented in hash mode,
+ // ignore the parameter silently. TODO(rjl493456442)
+ // please config it if read mode is implemented.
+ config.HashDB = hashdb.Defaults
+ return trie.NewDatabase(disk, config)
+ }
+ if readOnly {
+ config.PathDB = pathdb.ReadOnly
+ } else {
+ config.PathDB = pathdb.Defaults
+ }
+ return trie.NewDatabase(disk, config)
+}
diff --git a/cmd/utils/flags_legacy.go b/cmd/utils/flags_legacy.go
index 930b68fb91..6669ff176f 100644
--- a/cmd/utils/flags_legacy.go
+++ b/cmd/utils/flags_legacy.go
@@ -19,6 +19,7 @@ package utils
import (
"fmt"
+ "github.com/ethereum/go-ethereum/eth/ethconfig"
"github.com/ethereum/go-ethereum/internal/flags"
"github.com/urfave/cli/v2"
)
@@ -33,15 +34,49 @@ var ShowDeprecated = &cli.Command{
var DeprecatedFlags = []cli.Flag{
NoUSBFlag,
+ LegacyWhitelistFlag,
+ CacheTrieJournalFlag,
+ CacheTrieRejournalFlag,
+ LegacyDiscoveryV5Flag,
+ TxLookupLimitFlag,
}
var (
- // (Deprecated May 2020, shown in aliased flags section)
+ // Deprecated May 2020, shown in aliased flags section
NoUSBFlag = &cli.BoolFlag{
Name: "nousb",
Usage: "Disables monitoring for and managing USB hardware wallets (deprecated)",
Category: flags.DeprecatedCategory,
}
+ // Deprecated March 2022
+ LegacyWhitelistFlag = &cli.StringFlag{
+ Name: "whitelist",
+ Usage: "Comma separated block number-to-hash mappings to enforce (=) (deprecated in favor of --eth.requiredblocks)",
+ Category: flags.DeprecatedCategory,
+ }
+ // Deprecated July 2023
+ CacheTrieJournalFlag = &cli.StringFlag{
+ Name: "cache.trie.journal",
+ Usage: "Disk journal directory for trie cache to survive node restarts",
+ Category: flags.DeprecatedCategory,
+ }
+ CacheTrieRejournalFlag = &cli.DurationFlag{
+ Name: "cache.trie.rejournal",
+ Usage: "Time interval to regenerate the trie cache journal",
+ Category: flags.DeprecatedCategory,
+ }
+ LegacyDiscoveryV5Flag = &cli.BoolFlag{
+ Name: "v5disc",
+ Usage: "Enables the experimental RLPx V5 (Topic Discovery) mechanism (deprecated, use --discv5 instead)",
+ Category: flags.DeprecatedCategory,
+ }
+ // Deprecated August 2023
+ TxLookupLimitFlag = &cli.Uint64Flag{
+ Name: "txlookuplimit",
+ Usage: "Number of recent blocks to maintain transactions index for (default = about one year, 0 = entire chain) (deprecated, use history.transactions instead)",
+ Value: ethconfig.Defaults.TransactionHistory,
+ Category: flags.DeprecatedCategory,
+ }
)
// showDeprecated displays deprecated flags that will be soon removed from the codebase.
diff --git a/common/gopool/pool.go b/common/gopool/pool.go
deleted file mode 100644
index 990db4313b..0000000000
--- a/common/gopool/pool.go
+++ /dev/null
@@ -1,64 +0,0 @@
-package gopool
-
-import (
- "time"
-
- "github.com/ethereum/go-ethereum/log"
- "github.com/panjf2000/ants/v2"
-)
-
-const (
- // DefaultAntsPoolSize is the default expire time of ants pool.
- defaultGoroutineExpireDuration = 10 * time.Second
-)
-
-var (
- // defaultPool is the default ants pool for gopool package.
- defaultPool *ants.Pool
-)
-
-func init() {
- // Init a instance pool when importing ants.
- pool, err := ants.NewPool(
- ants.DefaultAntsPoolSize,
- ants.WithExpiryDuration(defaultGoroutineExpireDuration),
- )
- if err != nil {
- panic(err)
- }
-
- defaultPool = pool
-}
-
-// Submit submits a task to pool.
-func Submit(task func()) {
- err := defaultPool.Submit(task)
- if err != nil {
- log.Error("pool submit task fail", "err", err, "task", task)
- }
-}
-
-// Running returns the number of the currently running goroutines.
-func Running() int {
- return defaultPool.Running()
-}
-
-// Cap returns the capacity of this default pool.
-func Cap() int {
- return defaultPool.Cap()
-}
-
-// Free returns the available goroutines to work.
-func Free() int {
- return defaultPool.Free()
-}
-
-// Release Closes the default pool.
-func Release() {
- defaultPool.Release()
-}
-
-// Reboot reboots the default pool.
-func Reboot() {
- defaultPool.Reboot()
-}
diff --git a/common/lru/basiclru_test.go b/common/lru/basiclru_test.go
index e2d3559f55..29812bda15 100644
--- a/common/lru/basiclru_test.go
+++ b/common/lru/basiclru_test.go
@@ -170,6 +170,20 @@ func TestBasicLRUContains(t *testing.T) {
}
}
+// Test that Peek doesn't update recent-ness
+func TestBasicLRUPeek(t *testing.T) {
+ cache := NewBasicLRU[int, int](2)
+ cache.Add(1, 1)
+ cache.Add(2, 2)
+ if v, ok := cache.Peek(1); !ok || v != 1 {
+ t.Errorf("1 should be set to 1")
+ }
+ cache.Add(3, 3)
+ if cache.Contains(1) {
+ t.Errorf("should not have updated recent-ness of 1")
+ }
+}
+
func BenchmarkLRU(b *testing.B) {
var (
capacity = 1000
diff --git a/common/lru/lru.go b/common/lru/lru.go
index 5afa7b98ab..45965adb0d 100644
--- a/common/lru/lru.go
+++ b/common/lru/lru.go
@@ -93,11 +93,3 @@ func (c *Cache[K, V]) Keys() []K {
return c.cache.Keys()
}
-
-// GetOldest returns the oldest entry in the cache.
-func (c *Cache[K, V]) GetOldest() (key K, value V, ok bool) {
- c.mu.Lock()
- defer c.mu.Unlock()
-
- return c.cache.GetOldest()
-}
diff --git a/common/math/big.go b/common/math/big.go
index 1c2afa749a..013c0ba4b6 100644
--- a/common/math/big.go
+++ b/common/math/big.go
@@ -82,7 +82,7 @@ func (i *HexOrDecimal256) MarshalText() ([]byte, error) {
// it however accepts either "0x"-prefixed (hex encoded) or non-prefixed (decimal)
type Decimal256 big.Int
-// NewHexOrDecimal256 creates a new Decimal256
+// NewDecimal256 creates a new Decimal256
func NewDecimal256(x int64) *Decimal256 {
b := big.NewInt(x)
d := Decimal256(*b)
diff --git a/common/path.go b/common/path.go
index 69820cfe5d..c1e382fd29 100644
--- a/common/path.go
+++ b/common/path.go
@@ -17,19 +17,10 @@
package common
import (
- "fmt"
"os"
"path/filepath"
- "runtime"
)
-// MakeName creates a node name that follows the ethereum convention
-// for such names. It adds the operation system name and Go runtime version
-// the name.
-func MakeName(name, version string) string {
- return fmt.Sprintf("%s/v%s/%s/%s", name, version, runtime.GOOS, runtime.Version())
-}
-
// FileExist checks if a file exists at filePath.
func FileExist(filePath string) bool {
_, err := os.Stat(filePath)
diff --git a/common/types.go b/common/types.go
index 218ca0be4c..aadca87f82 100644
--- a/common/types.go
+++ b/common/types.go
@@ -26,6 +26,7 @@ import (
"math/big"
"math/rand"
"reflect"
+ "strconv"
"strings"
"github.com/ethereum/go-ethereum/common/hexutil"
@@ -43,6 +44,12 @@ const (
var (
hashT = reflect.TypeOf(Hash{})
addressT = reflect.TypeOf(Address{})
+
+ // MaxAddress represents the maximum possible address value.
+ MaxAddress = HexToAddress("0xffffffffffffffffffffffffffffffffffffffff")
+
+ // MaxHash represents the maximum possible hash value.
+ MaxHash = HexToHash("0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff")
)
// Hash represents the 32 byte Keccak256 hash of arbitrary data.
@@ -64,6 +71,11 @@ func BigToHash(b *big.Int) Hash { return BytesToHash(b.Bytes()) }
// If b is larger than len(h), b will be cropped from the left.
func HexToHash(s string) Hash { return BytesToHash(FromHex(s)) }
+// Cmp compares two hashes.
+func (h Hash) Cmp(other Hash) int {
+ return bytes.Compare(h[:], other[:])
+}
+
// Bytes gets the byte representation of the underlying hash.
func (h Hash) Bytes() []byte { return h[:] }
@@ -225,12 +237,14 @@ func IsHexAddress(s string) bool {
return len(s) == 2*AddressLength && isHex(s)
}
+// Cmp compares two addresses.
+func (a Address) Cmp(other Address) int {
+ return bytes.Compare(a[:], other[:])
+}
+
// Bytes gets the string representation of the underlying address.
func (a Address) Bytes() []byte { return a[:] }
-// Hash converts an address to a hash by left-padding it with zeros.
-func (a Address) Hash() Hash { return BytesToHash(a[:]) }
-
// Big converts an address to a big integer.
func (a Address) Big() *big.Int { return new(big.Int).SetBytes(a[:]) }
@@ -400,7 +414,7 @@ func (ma *MixedcaseAddress) UnmarshalJSON(input []byte) error {
}
// MarshalJSON marshals the original value
-func (ma *MixedcaseAddress) MarshalJSON() ([]byte, error) {
+func (ma MixedcaseAddress) MarshalJSON() ([]byte, error) {
if strings.HasPrefix(ma.original, "0x") || strings.HasPrefix(ma.original, "0X") {
return json.Marshal(fmt.Sprintf("0x%s", ma.original[2:]))
}
@@ -429,3 +443,35 @@ func (ma *MixedcaseAddress) ValidChecksum() bool {
func (ma *MixedcaseAddress) Original() string {
return ma.original
}
+
+// AddressEIP55 is an alias of Address with a customized json marshaller
+type AddressEIP55 Address
+
+// String returns the hex representation of the address in the manner of EIP55.
+func (addr AddressEIP55) String() string {
+ return Address(addr).Hex()
+}
+
+// MarshalJSON marshals the address in the manner of EIP55.
+func (addr AddressEIP55) MarshalJSON() ([]byte, error) {
+ return json.Marshal(addr.String())
+}
+
+type Decimal uint64
+
+func isString(input []byte) bool {
+ return len(input) >= 2 && input[0] == '"' && input[len(input)-1] == '"'
+}
+
+// UnmarshalJSON parses a hash in hex syntax.
+func (d *Decimal) UnmarshalJSON(input []byte) error {
+ if !isString(input) {
+ return &json.UnmarshalTypeError{Value: "non-string", Type: reflect.TypeOf(uint64(0))}
+ }
+ if i, err := strconv.ParseInt(string(input[1:len(input)-1]), 10, 64); err == nil {
+ *d = Decimal(i)
+ return nil
+ } else {
+ return err
+ }
+}
diff --git a/common/types_test.go b/common/types_test.go
index 94492278d8..cec689ea39 100644
--- a/common/types_test.go
+++ b/common/types_test.go
@@ -25,6 +25,7 @@ import (
"reflect"
"strings"
"testing"
+ "time"
)
func TestBytesConversion(t *testing.T) {
@@ -154,6 +155,31 @@ func BenchmarkAddressHex(b *testing.B) {
}
}
+// Test checks if the customized json marshaller of MixedcaseAddress object
+// is invoked correctly. In golang the struct pointer will inherit the
+// non-pointer receiver methods, the reverse is not true. In the case of
+// MixedcaseAddress, it must define the MarshalJSON method in the object
+// but not the pointer level, so that this customized marshalled can be used
+// for both MixedcaseAddress object and pointer.
+func TestMixedcaseAddressMarshal(t *testing.T) {
+ var (
+ output string
+ input = "0xae967917c465db8578ca9024c205720b1a3651A9"
+ )
+ addr, err := NewMixedcaseAddressFromString(input)
+ if err != nil {
+ t.Fatal(err)
+ }
+ blob, err := json.Marshal(*addr)
+ if err != nil {
+ t.Fatal(err)
+ }
+ json.Unmarshal(blob, &output)
+ if output != input {
+ t.Fatal("Failed to marshal/unmarshal MixedcaseAddress object")
+ }
+}
+
func TestMixedcaseAccount_Address(t *testing.T) {
// https://github.com/ethereum/EIPs/blob/master/EIPS/eip-55.md
// Note: 0X{checksum_addr} is not valid according to spec above
@@ -177,7 +203,7 @@ func TestMixedcaseAccount_Address(t *testing.T) {
}
}
- //These should throw exceptions:
+ // These should throw exceptions:
var r2 []MixedcaseAddress
for _, r := range []string{
`["0x11111111111111111111122222222222233333"]`, // Too short
@@ -534,3 +560,38 @@ func TestHash_Format(t *testing.T) {
})
}
}
+
+func TestAddressEIP55(t *testing.T) {
+ addr := HexToAddress("0x5aaeb6053f3e94c9b9a09f33669435e7ef1beaed")
+ addrEIP55 := AddressEIP55(addr)
+
+ if addr.Hex() != addrEIP55.String() {
+ t.Fatal("AddressEIP55 should match original address hex")
+ }
+
+ blob, err := addrEIP55.MarshalJSON()
+ if err != nil {
+ t.Fatal("Failed to marshal AddressEIP55", err)
+ }
+ if strings.Trim(string(blob), "\"") != addr.Hex() {
+ t.Fatal("Address with checksum is expected")
+ }
+ var dec Address
+ if err := json.Unmarshal(blob, &dec); err != nil {
+ t.Fatal("Failed to unmarshal AddressEIP55", err)
+ }
+ if addr != dec {
+ t.Fatal("Unexpected address after unmarshal")
+ }
+}
+
+func BenchmarkPrettyDuration(b *testing.B) {
+ var x = PrettyDuration(time.Duration(int64(1203123912312)))
+ b.Logf("Pre %s", time.Duration(x).String())
+ var a string
+ b.ResetTimer()
+ for i := 0; i < b.N; i++ {
+ a = x.String()
+ }
+ b.Logf("Post %s", a)
+}
diff --git a/consensus/beacon/consensus.go b/consensus/beacon/consensus.go
index acc4228a55..a7d0e58161 100644
--- a/consensus/beacon/consensus.go
+++ b/consensus/beacon/consensus.go
@@ -23,7 +23,8 @@ import (
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/consensus"
- "github.com/ethereum/go-ethereum/consensus/misc"
+ "github.com/ethereum/go-ethereum/consensus/misc/eip1559"
+ "github.com/ethereum/go-ethereum/consensus/misc/eip4844"
"github.com/ethereum/go-ethereum/core/state"
"github.com/ethereum/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/params"
@@ -78,13 +79,13 @@ func (beacon *Beacon) Author(header *types.Header) (common.Address, error) {
// VerifyHeader checks whether a header conforms to the consensus rules of the
// stock Ethereum consensus engine.
-func (beacon *Beacon) VerifyHeader(chain consensus.ChainHeaderReader, header *types.Header, seal bool) error {
+func (beacon *Beacon) VerifyHeader(chain consensus.ChainHeaderReader, header *types.Header) error {
reached, err := IsTTDReached(chain, header.ParentHash, header.Number.Uint64()-1)
if err != nil {
return err
}
if !reached {
- return beacon.ethone.VerifyHeader(chain, header, seal)
+ return beacon.ethone.VerifyHeader(chain, header)
}
// Short circuit if the parent is not known
parent := chain.GetHeader(header.ParentHash, header.Number.Uint64()-1)
@@ -149,13 +150,13 @@ func (beacon *Beacon) splitHeaders(chain consensus.ChainHeaderReader, headers []
// concurrently. The method returns a quit channel to abort the operations and
// a results channel to retrieve the async verifications.
// VerifyHeaders expect the headers to be ordered and continuous.
-func (beacon *Beacon) VerifyHeaders(chain consensus.ChainHeaderReader, headers []*types.Header, seals []bool) (chan<- struct{}, <-chan error) {
+func (beacon *Beacon) VerifyHeaders(chain consensus.ChainHeaderReader, headers []*types.Header) (chan<- struct{}, <-chan error) {
preHeaders, postHeaders, err := beacon.splitHeaders(chain, headers)
if err != nil {
return make(chan struct{}), errOut(len(headers), err)
}
if len(postHeaders) == 0 {
- return beacon.ethone.VerifyHeaders(chain, headers, seals)
+ return beacon.ethone.VerifyHeaders(chain, headers)
}
if len(preHeaders) == 0 {
return beacon.verifyHeaders(chain, headers, nil)
@@ -171,7 +172,7 @@ func (beacon *Beacon) VerifyHeaders(chain consensus.ChainHeaderReader, headers [
old, new, out = 0, len(preHeaders), 0
errors = make([]error, len(headers))
done = make([]bool, len(headers))
- oldDone, oldResult = beacon.ethone.VerifyHeaders(chain, preHeaders, seals[:len(preHeaders)])
+ oldDone, oldResult = beacon.ethone.VerifyHeaders(chain, preHeaders)
newDone, newResult = beacon.verifyHeaders(chain, postHeaders, preHeaders[len(preHeaders)-1])
)
// Collect the results
@@ -257,17 +258,36 @@ func (beacon *Beacon) verifyHeader(chain consensus.ChainHeaderReader, header, pa
return consensus.ErrInvalidNumber
}
// Verify the header's EIP-1559 attributes.
- if err := misc.VerifyEip1559Header(chain.Config(), parent, header); err != nil {
+ if err := eip1559.VerifyEIP1559Header(chain.Config(), parent, header); err != nil {
return err
}
// Verify existence / non-existence of withdrawalsHash.
- shanghai := chain.Config().IsShanghai(header.Time)
+ shanghai := chain.Config().IsShanghai(header.Number, header.Time)
if shanghai && header.WithdrawalsHash == nil {
- return fmt.Errorf("missing withdrawalsHash")
+ return errors.New("missing withdrawalsHash")
}
if !shanghai && header.WithdrawalsHash != nil {
return fmt.Errorf("invalid withdrawalsHash: have %x, expected nil", header.WithdrawalsHash)
}
+ // Verify the existence / non-existence of cancun-specific header fields
+ cancun := chain.Config().IsCancun(header.Number, header.Time)
+ if !cancun {
+ switch {
+ case header.ExcessBlobGas != nil:
+ return fmt.Errorf("invalid excessBlobGas: have %d, expected nil", header.ExcessBlobGas)
+ case header.BlobGasUsed != nil:
+ return fmt.Errorf("invalid blobGasUsed: have %d, expected nil", header.BlobGasUsed)
+ case header.ParentBeaconRoot != nil:
+ return fmt.Errorf("invalid parentBeaconRoot, have %#x, expected nil", header.ParentBeaconRoot)
+ }
+ } else {
+ if header.ParentBeaconRoot == nil {
+ return errors.New("header is missing beaconRoot")
+ }
+ if err := eip4844.VerifyEIP4844Header(parent, header); err != nil {
+ return err
+ }
+ }
return nil
}
@@ -348,7 +368,7 @@ func (beacon *Beacon) FinalizeAndAssemble(chain consensus.ChainHeaderReader, hea
if !beacon.IsPoSHeader(header) {
return beacon.ethone.FinalizeAndAssemble(chain, header, state, txs, uncles, receipts, nil)
}
- shanghai := chain.Config().IsShanghai(header.Time)
+ shanghai := chain.Config().IsShanghai(header.Number, header.Time)
if shanghai {
// All blocks after Shanghai must include a withdrawals root.
if withdrawals == nil {
diff --git a/consensus/clique/api.go b/consensus/clique/api.go
index cb270d321d..374b50692d 100644
--- a/consensus/clique/api.go
+++ b/consensus/clique/api.go
@@ -205,7 +205,7 @@ func (sb *blockNumberOrHashOrRLP) UnmarshalJSON(data []byte) error {
}
// GetSigner returns the signer for a specific clique block.
-// Can be called with either a blocknumber, blockhash or an rlp encoded blob.
+// Can be called with a block number, a block hash or a rlp encoded blob.
// The RLP encoded blob can either be a block or a header.
func (api *API) GetSigner(rlpOrBlockNr *blockNumberOrHashOrRLP) (common.Address, error) {
if len(rlpOrBlockNr.RLP) == 0 {
diff --git a/consensus/clique/clique.go b/consensus/clique/clique.go
index 6c20803b2a..f708050abd 100644
--- a/consensus/clique/clique.go
+++ b/consensus/clique/clique.go
@@ -33,6 +33,7 @@ import (
lru "github.com/ethereum/go-ethereum/common/lru"
"github.com/ethereum/go-ethereum/consensus"
"github.com/ethereum/go-ethereum/consensus/misc"
+ "github.com/ethereum/go-ethereum/consensus/misc/eip1559"
"github.com/ethereum/go-ethereum/core/state"
"github.com/ethereum/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/crypto"
@@ -214,14 +215,14 @@ func (c *Clique) Author(header *types.Header) (common.Address, error) {
}
// VerifyHeader checks whether a header conforms to the consensus rules.
-func (c *Clique) VerifyHeader(chain consensus.ChainHeaderReader, header *types.Header, seal bool) error {
+func (c *Clique) VerifyHeader(chain consensus.ChainHeaderReader, header *types.Header) error {
return c.verifyHeader(chain, header, nil)
}
// VerifyHeaders is similar to VerifyHeader, but verifies a batch of headers. The
// method returns a quit channel to abort the operations and a results channel to
// retrieve the async verifications (the order is that of the input slice).
-func (c *Clique) VerifyHeaders(chain consensus.ChainHeaderReader, headers []*types.Header, seals []bool) (chan<- struct{}, <-chan error) {
+func (c *Clique) VerifyHeaders(chain consensus.ChainHeaderReader, headers []*types.Header) (chan<- struct{}, <-chan error) {
abort := make(chan struct{})
results := make(chan error, len(headers))
@@ -298,12 +299,11 @@ func (c *Clique) verifyHeader(chain consensus.ChainHeaderReader, header *types.H
if header.GasLimit > params.MaxGasLimit {
return fmt.Errorf("invalid gasLimit: have %v, max %v", header.GasLimit, params.MaxGasLimit)
}
- if chain.Config().IsShanghai(header.Time) {
- return fmt.Errorf("clique does not support shanghai fork")
+ if chain.Config().IsShanghai(header.Number, header.Time) {
+ return errors.New("clique does not support shanghai fork")
}
- // If all checks passed, validate any special fields for hard forks
- if err := misc.VerifyForkHashes(chain.Config(), header, false); err != nil {
- return err
+ if chain.Config().IsCancun(header.Number, header.Time) {
+ return errors.New("clique does not support cancun fork")
}
// All basic checks passed, verify cascading fields
return c.verifyCascadingFields(chain, header, parents)
@@ -344,7 +344,7 @@ func (c *Clique) verifyCascadingFields(chain consensus.ChainHeaderReader, header
if err := misc.VerifyGaslimit(parent.GasLimit, header.GasLimit); err != nil {
return err
}
- } else if err := misc.VerifyEip1559Header(chain.Config(), parent, header); err != nil {
+ } else if err := eip1559.VerifyEIP1559Header(chain.Config(), parent, header); err != nil {
// Verify the header's EIP-1559 attributes.
return err
}
diff --git a/consensus/clique/clique_test.go b/consensus/clique/clique_test.go
index f2c6d740c0..7cd5919c5e 100644
--- a/consensus/clique/clique_test.go
+++ b/consensus/clique/clique_test.go
@@ -30,7 +30,7 @@ import (
)
// This test case is a repro of an annoying bug that took us forever to catch.
-// In Clique PoA networks (Rinkeby, Görli, etc), consecutive blocks might have
+// In Clique PoA networks (Görli, etc), consecutive blocks might have
// the same state root (no block subsidy, empty block). If a node crashes, the
// chain ends up losing the recent state and needs to regenerate it from blocks
// already in the database. The bug was that processing the block *prior* to an
diff --git a/consensus/clique/snapshot.go b/consensus/clique/snapshot.go
index e5efa5108f..a97115121b 100644
--- a/consensus/clique/snapshot.go
+++ b/consensus/clique/snapshot.go
@@ -19,7 +19,6 @@ package clique
import (
"bytes"
"encoding/json"
- "sort"
"time"
"github.com/ethereum/go-ethereum/common"
@@ -29,6 +28,7 @@ import (
"github.com/ethereum/go-ethereum/ethdb"
"github.com/ethereum/go-ethereum/log"
"github.com/ethereum/go-ethereum/params"
+ "golang.org/x/exp/slices"
)
// Vote represents a single vote that an authorized signer made to modify the
@@ -62,13 +62,6 @@ type Snapshot struct {
Tally map[common.Address]Tally `json:"tally"` // Current vote tally to avoid recalculating
}
-// signersAscending implements the sort interface to allow sorting a list of addresses
-type signersAscending []common.Address
-
-func (s signersAscending) Len() int { return len(s) }
-func (s signersAscending) Less(i, j int) bool { return bytes.Compare(s[i][:], s[j][:]) < 0 }
-func (s signersAscending) Swap(i, j int) { s[i], s[j] = s[j], s[i] }
-
// newSnapshot creates a new snapshot with the specified startup parameters. This
// method does not initialize the set of recent signers, so only ever use if for
// the genesis block.
@@ -315,7 +308,7 @@ func (s *Snapshot) signers() []common.Address {
for sig := range s.Signers {
sigs = append(sigs, sig)
}
- sort.Sort(signersAscending(sigs))
+ slices.SortFunc(sigs, common.Address.Cmp)
return sigs
}
diff --git a/consensus/clique/snapshot_test.go b/consensus/clique/snapshot_test.go
index 66e667276f..26cebe008a 100644
--- a/consensus/clique/snapshot_test.go
+++ b/consensus/clique/snapshot_test.go
@@ -21,7 +21,6 @@ import (
"crypto/ecdsa"
"fmt"
"math/big"
- "sort"
"testing"
"github.com/ethereum/go-ethereum/common"
@@ -31,6 +30,7 @@ import (
"github.com/ethereum/go-ethereum/core/vm"
"github.com/ethereum/go-ethereum/crypto"
"github.com/ethereum/go-ethereum/params"
+ "golang.org/x/exp/slices"
)
// testerAccountPool is a pool to maintain currently active tester accounts,
@@ -53,7 +53,7 @@ func (ap *testerAccountPool) checkpoint(header *types.Header, signers []string)
for i, signer := range signers {
auths[i] = ap.address(signer)
}
- sort.Sort(signersAscending(auths))
+ slices.SortFunc(auths, common.Address.Cmp)
for i, auth := range auths {
copy(header.Extra[extraVanity+i*common.AddressLength:], auth.Bytes())
}
diff --git a/consensus/consensus.go b/consensus/consensus.go
index a9fd8dd1cf..3a2c2d2229 100644
--- a/consensus/consensus.go
+++ b/consensus/consensus.go
@@ -66,15 +66,14 @@ type Engine interface {
Author(header *types.Header) (common.Address, error)
// VerifyHeader checks whether a header conforms to the consensus rules of a
- // given engine. Verifying the seal may be done optionally here, or explicitly
- // via the VerifySeal method.
- VerifyHeader(chain ChainHeaderReader, header *types.Header, seal bool) error
+ // given engine.
+ VerifyHeader(chain ChainHeaderReader, header *types.Header) error
// VerifyHeaders is similar to VerifyHeader, but verifies a batch of headers
// concurrently. The method returns a quit channel to abort the operations and
// a results channel to retrieve the async verifications (the order is that of
// the input slice).
- VerifyHeaders(chain ChainHeaderReader, headers []*types.Header, seals []bool) (chan<- struct{}, <-chan error)
+ VerifyHeaders(chain ChainHeaderReader, headers []*types.Header) (chan<- struct{}, <-chan error)
// VerifyUncles verifies that the given block's uncles conform to the consensus
// rules of a given engine.
diff --git a/consensus/ethash/algorithm.go b/consensus/ethash/algorithm.go
deleted file mode 100644
index d539183822..0000000000
--- a/consensus/ethash/algorithm.go
+++ /dev/null
@@ -1,1152 +0,0 @@
-// Copyright 2017 The go-ethereum Authors
-// This file is part of the go-ethereum library.
-//
-// The go-ethereum library is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// The go-ethereum library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public License
-// along with the go-ethereum library. If not, see .
-
-package ethash
-
-import (
- "encoding/binary"
- "hash"
- "math/big"
- "reflect"
- "runtime"
- "sync"
- "sync/atomic"
- "time"
- "unsafe"
-
- "github.com/ethereum/go-ethereum/common"
- "github.com/ethereum/go-ethereum/common/bitutil"
- "github.com/ethereum/go-ethereum/crypto"
- "github.com/ethereum/go-ethereum/log"
- "golang.org/x/crypto/sha3"
-)
-
-const (
- datasetInitBytes = 1 << 30 // Bytes in dataset at genesis
- datasetGrowthBytes = 1 << 23 // Dataset growth per epoch
- cacheInitBytes = 1 << 24 // Bytes in cache at genesis
- cacheGrowthBytes = 1 << 17 // Cache growth per epoch
- epochLength = 30000 // Blocks per epoch
- mixBytes = 128 // Width of mix
- hashBytes = 64 // Hash length in bytes
- hashWords = 16 // Number of 32 bit ints in a hash
- datasetParents = 256 // Number of parents of each dataset element
- cacheRounds = 3 // Number of rounds in cache production
- loopAccesses = 64 // Number of accesses in hashimoto loop
-)
-
-// cacheSize returns the size of the ethash verification cache that belongs to a certain
-// block number.
-func cacheSize(block uint64) uint64 {
- epoch := int(block / epochLength)
- if epoch < maxEpoch {
- return cacheSizes[epoch]
- }
- return calcCacheSize(epoch)
-}
-
-// calcCacheSize calculates the cache size for epoch. The cache size grows linearly,
-// however, we always take the highest prime below the linearly growing threshold in order
-// to reduce the risk of accidental regularities leading to cyclic behavior.
-func calcCacheSize(epoch int) uint64 {
- size := cacheInitBytes + cacheGrowthBytes*uint64(epoch) - hashBytes
- for !new(big.Int).SetUint64(size / hashBytes).ProbablyPrime(1) { // Always accurate for n < 2^64
- size -= 2 * hashBytes
- }
- return size
-}
-
-// datasetSize returns the size of the ethash mining dataset that belongs to a certain
-// block number.
-func datasetSize(block uint64) uint64 {
- epoch := int(block / epochLength)
- if epoch < maxEpoch {
- return datasetSizes[epoch]
- }
- return calcDatasetSize(epoch)
-}
-
-// calcDatasetSize calculates the dataset size for epoch. The dataset size grows linearly,
-// however, we always take the highest prime below the linearly growing threshold in order
-// to reduce the risk of accidental regularities leading to cyclic behavior.
-func calcDatasetSize(epoch int) uint64 {
- size := datasetInitBytes + datasetGrowthBytes*uint64(epoch) - mixBytes
- for !new(big.Int).SetUint64(size / mixBytes).ProbablyPrime(1) { // Always accurate for n < 2^64
- size -= 2 * mixBytes
- }
- return size
-}
-
-// hasher is a repetitive hasher allowing the same hash data structures to be
-// reused between hash runs instead of requiring new ones to be created.
-type hasher func(dest []byte, data []byte)
-
-// makeHasher creates a repetitive hasher, allowing the same hash data structures to
-// be reused between hash runs instead of requiring new ones to be created. The returned
-// function is not thread safe!
-func makeHasher(h hash.Hash) hasher {
- // sha3.state supports Read to get the sum, use it to avoid the overhead of Sum.
- // Read alters the state but we reset the hash before every operation.
- type readerHash interface {
- hash.Hash
- Read([]byte) (int, error)
- }
- rh, ok := h.(readerHash)
- if !ok {
- panic("can't find Read method on hash")
- }
- outputLen := rh.Size()
- return func(dest []byte, data []byte) {
- rh.Reset()
- rh.Write(data)
- rh.Read(dest[:outputLen])
- }
-}
-
-// seedHash is the seed to use for generating a verification cache and the mining
-// dataset.
-func seedHash(block uint64) []byte {
- seed := make([]byte, 32)
- if block < epochLength {
- return seed
- }
- keccak256 := makeHasher(sha3.NewLegacyKeccak256())
- for i := 0; i < int(block/epochLength); i++ {
- keccak256(seed, seed)
- }
- return seed
-}
-
-// generateCache creates a verification cache of a given size for an input seed.
-// The cache production process involves first sequentially filling up 32 MB of
-// memory, then performing two passes of Sergio Demian Lerner's RandMemoHash
-// algorithm from Strict Memory Hard Hashing Functions (2014). The output is a
-// set of 524288 64-byte values.
-// This method places the result into dest in machine byte order.
-func generateCache(dest []uint32, epoch uint64, seed []byte) {
- // Print some debug logs to allow analysis on low end devices
- logger := log.New("epoch", epoch)
-
- start := time.Now()
- defer func() {
- elapsed := time.Since(start)
-
- logFn := logger.Debug
- if elapsed > 3*time.Second {
- logFn = logger.Info
- }
- logFn("Generated ethash verification cache", "elapsed", common.PrettyDuration(elapsed))
- }()
- // Convert our destination slice to a byte buffer
- var cache []byte
- cacheHdr := (*reflect.SliceHeader)(unsafe.Pointer(&cache))
- dstHdr := (*reflect.SliceHeader)(unsafe.Pointer(&dest))
- cacheHdr.Data = dstHdr.Data
- cacheHdr.Len = dstHdr.Len * 4
- cacheHdr.Cap = dstHdr.Cap * 4
-
- // Calculate the number of theoretical rows (we'll store in one buffer nonetheless)
- size := uint64(len(cache))
- rows := int(size) / hashBytes
-
- // Start a monitoring goroutine to report progress on low end devices
- var progress uint32
-
- done := make(chan struct{})
- defer close(done)
-
- go func() {
- for {
- select {
- case <-done:
- return
- case <-time.After(3 * time.Second):
- logger.Info("Generating ethash verification cache", "percentage", atomic.LoadUint32(&progress)*100/uint32(rows)/(cacheRounds+1), "elapsed", common.PrettyDuration(time.Since(start)))
- }
- }
- }()
- // Create a hasher to reuse between invocations
- keccak512 := makeHasher(sha3.NewLegacyKeccak512())
-
- // Sequentially produce the initial dataset
- keccak512(cache, seed)
- for offset := uint64(hashBytes); offset < size; offset += hashBytes {
- keccak512(cache[offset:], cache[offset-hashBytes:offset])
- atomic.AddUint32(&progress, 1)
- }
- // Use a low-round version of randmemohash
- temp := make([]byte, hashBytes)
-
- for i := 0; i < cacheRounds; i++ {
- for j := 0; j < rows; j++ {
- var (
- srcOff = ((j - 1 + rows) % rows) * hashBytes
- dstOff = j * hashBytes
- xorOff = (binary.LittleEndian.Uint32(cache[dstOff:]) % uint32(rows)) * hashBytes
- )
- bitutil.XORBytes(temp, cache[srcOff:srcOff+hashBytes], cache[xorOff:xorOff+hashBytes])
- keccak512(cache[dstOff:], temp)
-
- atomic.AddUint32(&progress, 1)
- }
- }
- // Swap the byte order on big endian systems and return
- if !isLittleEndian() {
- swap(cache)
- }
-}
-
-// swap changes the byte order of the buffer assuming a uint32 representation.
-func swap(buffer []byte) {
- for i := 0; i < len(buffer); i += 4 {
- binary.BigEndian.PutUint32(buffer[i:], binary.LittleEndian.Uint32(buffer[i:]))
- }
-}
-
-// fnv is an algorithm inspired by the FNV hash, which in some cases is used as
-// a non-associative substitute for XOR. Note that we multiply the prime with
-// the full 32-bit input, in contrast with the FNV-1 spec which multiplies the
-// prime with one byte (octet) in turn.
-func fnv(a, b uint32) uint32 {
- return a*0x01000193 ^ b
-}
-
-// fnvHash mixes in data into mix using the ethash fnv method.
-func fnvHash(mix []uint32, data []uint32) {
- for i := 0; i < len(mix); i++ {
- mix[i] = mix[i]*0x01000193 ^ data[i]
- }
-}
-
-// generateDatasetItem combines data from 256 pseudorandomly selected cache nodes,
-// and hashes that to compute a single dataset node.
-func generateDatasetItem(cache []uint32, index uint32, keccak512 hasher) []byte {
- // Calculate the number of theoretical rows (we use one buffer nonetheless)
- rows := uint32(len(cache) / hashWords)
-
- // Initialize the mix
- mix := make([]byte, hashBytes)
-
- binary.LittleEndian.PutUint32(mix, cache[(index%rows)*hashWords]^index)
- for i := 1; i < hashWords; i++ {
- binary.LittleEndian.PutUint32(mix[i*4:], cache[(index%rows)*hashWords+uint32(i)])
- }
- keccak512(mix, mix)
-
- // Convert the mix to uint32s to avoid constant bit shifting
- intMix := make([]uint32, hashWords)
- for i := 0; i < len(intMix); i++ {
- intMix[i] = binary.LittleEndian.Uint32(mix[i*4:])
- }
- // fnv it with a lot of random cache nodes based on index
- for i := uint32(0); i < datasetParents; i++ {
- parent := fnv(index^i, intMix[i%16]) % rows
- fnvHash(intMix, cache[parent*hashWords:])
- }
- // Flatten the uint32 mix into a binary one and return
- for i, val := range intMix {
- binary.LittleEndian.PutUint32(mix[i*4:], val)
- }
- keccak512(mix, mix)
- return mix
-}
-
-// generateDataset generates the entire ethash dataset for mining.
-// This method places the result into dest in machine byte order.
-func generateDataset(dest []uint32, epoch uint64, cache []uint32) {
- // Print some debug logs to allow analysis on low end devices
- logger := log.New("epoch", epoch)
-
- start := time.Now()
- defer func() {
- elapsed := time.Since(start)
-
- logFn := logger.Debug
- if elapsed > 3*time.Second {
- logFn = logger.Info
- }
- logFn("Generated ethash verification cache", "elapsed", common.PrettyDuration(elapsed))
- }()
-
- // Figure out whether the bytes need to be swapped for the machine
- swapped := !isLittleEndian()
-
- // Convert our destination slice to a byte buffer
- var dataset []byte
- datasetHdr := (*reflect.SliceHeader)(unsafe.Pointer(&dataset))
- destHdr := (*reflect.SliceHeader)(unsafe.Pointer(&dest))
- datasetHdr.Data = destHdr.Data
- datasetHdr.Len = destHdr.Len * 4
- datasetHdr.Cap = destHdr.Cap * 4
-
- // Generate the dataset on many goroutines since it takes a while
- threads := runtime.NumCPU()
- size := uint64(len(dataset))
-
- var pend sync.WaitGroup
- pend.Add(threads)
-
- var progress uint64
- for i := 0; i < threads; i++ {
- go func(id int) {
- defer pend.Done()
-
- // Create a hasher to reuse between invocations
- keccak512 := makeHasher(sha3.NewLegacyKeccak512())
-
- // Calculate the data segment this thread should generate
- batch := (size + hashBytes*uint64(threads) - 1) / (hashBytes * uint64(threads))
- first := uint64(id) * batch
- limit := first + batch
- if limit > size/hashBytes {
- limit = size / hashBytes
- }
- // Calculate the dataset segment
- percent := size / hashBytes / 100
- for index := first; index < limit; index++ {
- item := generateDatasetItem(cache, uint32(index), keccak512)
- if swapped {
- swap(item)
- }
- copy(dataset[index*hashBytes:], item)
-
- if status := atomic.AddUint64(&progress, 1); status%percent == 0 {
- logger.Info("Generating DAG in progress", "percentage", (status*100)/(size/hashBytes), "elapsed", common.PrettyDuration(time.Since(start)))
- }
- }
- }(i)
- }
- // Wait for all the generators to finish and return
- pend.Wait()
-}
-
-// hashimoto aggregates data from the full dataset in order to produce our final
-// value for a particular header hash and nonce.
-func hashimoto(hash []byte, nonce uint64, size uint64, lookup func(index uint32) []uint32) ([]byte, []byte) {
- // Calculate the number of theoretical rows (we use one buffer nonetheless)
- rows := uint32(size / mixBytes)
-
- // Combine header+nonce into a 40 byte seed
- seed := make([]byte, 40)
- copy(seed, hash)
- binary.LittleEndian.PutUint64(seed[32:], nonce)
-
- seed = crypto.Keccak512(seed)
- seedHead := binary.LittleEndian.Uint32(seed)
-
- // Start the mix with replicated seed
- mix := make([]uint32, mixBytes/4)
- for i := 0; i < len(mix); i++ {
- mix[i] = binary.LittleEndian.Uint32(seed[i%16*4:])
- }
- // Mix in random dataset nodes
- temp := make([]uint32, len(mix))
-
- for i := 0; i < loopAccesses; i++ {
- parent := fnv(uint32(i)^seedHead, mix[i%len(mix)]) % rows
- for j := uint32(0); j < mixBytes/hashBytes; j++ {
- copy(temp[j*hashWords:], lookup(2*parent+j))
- }
- fnvHash(mix, temp)
- }
- // Compress mix
- for i := 0; i < len(mix); i += 4 {
- mix[i/4] = fnv(fnv(fnv(mix[i], mix[i+1]), mix[i+2]), mix[i+3])
- }
- mix = mix[:len(mix)/4]
-
- digest := make([]byte, common.HashLength)
- for i, val := range mix {
- binary.LittleEndian.PutUint32(digest[i*4:], val)
- }
- return digest, crypto.Keccak256(append(seed, digest...))
-}
-
-// hashimotoLight aggregates data from the full dataset (using only a small
-// in-memory cache) in order to produce our final value for a particular header
-// hash and nonce.
-func hashimotoLight(size uint64, cache []uint32, hash []byte, nonce uint64) ([]byte, []byte) {
- keccak512 := makeHasher(sha3.NewLegacyKeccak512())
-
- lookup := func(index uint32) []uint32 {
- rawData := generateDatasetItem(cache, index, keccak512)
-
- data := make([]uint32, len(rawData)/4)
- for i := 0; i < len(data); i++ {
- data[i] = binary.LittleEndian.Uint32(rawData[i*4:])
- }
- return data
- }
- return hashimoto(hash, nonce, size, lookup)
-}
-
-// hashimotoFull aggregates data from the full dataset (using the full in-memory
-// dataset) in order to produce our final value for a particular header hash and
-// nonce.
-func hashimotoFull(dataset []uint32, hash []byte, nonce uint64) ([]byte, []byte) {
- lookup := func(index uint32) []uint32 {
- offset := index * hashWords
- return dataset[offset : offset+hashWords]
- }
- return hashimoto(hash, nonce, uint64(len(dataset))*4, lookup)
-}
-
-const maxEpoch = 2048
-
-// datasetSizes is a lookup table for the ethash dataset size for the first 2048
-// epochs (i.e. 61440000 blocks).
-var datasetSizes = [maxEpoch]uint64{
- 1073739904, 1082130304, 1090514816, 1098906752, 1107293056,
- 1115684224, 1124070016, 1132461952, 1140849536, 1149232768,
- 1157627776, 1166013824, 1174404736, 1182786944, 1191180416,
- 1199568512, 1207958912, 1216345216, 1224732032, 1233124736,
- 1241513344, 1249902464, 1258290304, 1266673792, 1275067264,
- 1283453312, 1291844992, 1300234112, 1308619904, 1317010048,
- 1325397376, 1333787776, 1342176128, 1350561664, 1358954368,
- 1367339392, 1375731584, 1384118144, 1392507008, 1400897408,
- 1409284736, 1417673344, 1426062464, 1434451072, 1442839168,
- 1451229056, 1459615616, 1468006016, 1476394112, 1484782976,
- 1493171584, 1501559168, 1509948032, 1518337664, 1526726528,
- 1535114624, 1543503488, 1551892096, 1560278656, 1568669056,
- 1577056384, 1585446272, 1593831296, 1602219392, 1610610304,
- 1619000192, 1627386752, 1635773824, 1644164224, 1652555648,
- 1660943488, 1669332608, 1677721216, 1686109312, 1694497664,
- 1702886272, 1711274624, 1719661184, 1728047744, 1736434816,
- 1744829056, 1753218944, 1761606272, 1769995904, 1778382464,
- 1786772864, 1795157888, 1803550592, 1811937664, 1820327552,
- 1828711552, 1837102976, 1845488768, 1853879936, 1862269312,
- 1870656896, 1879048064, 1887431552, 1895825024, 1904212096,
- 1912601216, 1920988544, 1929379456, 1937765504, 1946156672,
- 1954543232, 1962932096, 1971321728, 1979707264, 1988093056,
- 1996487552, 2004874624, 2013262208, 2021653888, 2030039936,
- 2038430848, 2046819968, 2055208576, 2063596672, 2071981952,
- 2080373632, 2088762752, 2097149056, 2105539712, 2113928576,
- 2122315136, 2130700672, 2139092608, 2147483264, 2155872128,
- 2164257664, 2172642176, 2181035392, 2189426048, 2197814912,
- 2206203008, 2214587264, 2222979712, 2231367808, 2239758208,
- 2248145024, 2256527744, 2264922752, 2273312128, 2281701248,
- 2290086272, 2298476672, 2306867072, 2315251072, 2323639168,
- 2332032128, 2340420224, 2348808064, 2357196416, 2365580416,
- 2373966976, 2382363008, 2390748544, 2399139968, 2407530368,
- 2415918976, 2424307328, 2432695424, 2441084288, 2449472384,
- 2457861248, 2466247808, 2474637184, 2483026816, 2491414144,
- 2499803776, 2508191872, 2516582272, 2524970368, 2533359232,
- 2541743488, 2550134144, 2558525056, 2566913408, 2575301504,
- 2583686528, 2592073856, 2600467328, 2608856192, 2617240448,
- 2625631616, 2634022016, 2642407552, 2650796416, 2659188352,
- 2667574912, 2675965312, 2684352896, 2692738688, 2701130624,
- 2709518464, 2717907328, 2726293376, 2734685056, 2743073152,
- 2751462016, 2759851648, 2768232832, 2776625536, 2785017728,
- 2793401984, 2801794432, 2810182016, 2818571648, 2826959488,
- 2835349376, 2843734144, 2852121472, 2860514432, 2868900992,
- 2877286784, 2885676928, 2894069632, 2902451584, 2910843008,
- 2919234688, 2927622784, 2936011648, 2944400768, 2952789376,
- 2961177728, 2969565568, 2977951616, 2986338944, 2994731392,
- 3003120256, 3011508352, 3019895936, 3028287104, 3036675968,
- 3045063808, 3053452928, 3061837696, 3070228352, 3078615424,
- 3087003776, 3095394944, 3103782272, 3112173184, 3120562048,
- 3128944768, 3137339264, 3145725056, 3154109312, 3162505088,
- 3170893184, 3179280256, 3187669376, 3196056704, 3204445568,
- 3212836736, 3221224064, 3229612928, 3238002304, 3246391168,
- 3254778496, 3263165824, 3271556224, 3279944576, 3288332416,
- 3296719232, 3305110912, 3313500032, 3321887104, 3330273152,
- 3338658944, 3347053184, 3355440512, 3363827072, 3372220288,
- 3380608384, 3388997504, 3397384576, 3405774208, 3414163072,
- 3422551936, 3430937984, 3439328384, 3447714176, 3456104576,
- 3464493952, 3472883584, 3481268864, 3489655168, 3498048896,
- 3506434432, 3514826368, 3523213952, 3531603584, 3539987072,
- 3548380288, 3556763264, 3565157248, 3573545344, 3581934464,
- 3590324096, 3598712704, 3607098752, 3615488384, 3623877248,
- 3632265856, 3640646528, 3649043584, 3657430144, 3665821568,
- 3674207872, 3682597504, 3690984832, 3699367808, 3707764352,
- 3716152448, 3724541056, 3732925568, 3741318016, 3749706368,
- 3758091136, 3766481536, 3774872704, 3783260032, 3791650432,
- 3800036224, 3808427648, 3816815488, 3825204608, 3833592704,
- 3841981568, 3850370432, 3858755968, 3867147904, 3875536256,
- 3883920512, 3892313728, 3900702592, 3909087872, 3917478784,
- 3925868416, 3934256512, 3942645376, 3951032192, 3959422336,
- 3967809152, 3976200064, 3984588416, 3992974976, 4001363584,
- 4009751168, 4018141312, 4026530432, 4034911616, 4043308928,
- 4051695488, 4060084352, 4068472448, 4076862848, 4085249408,
- 4093640576, 4102028416, 4110413696, 4118805632, 4127194496,
- 4135583104, 4143971968, 4152360832, 4160746112, 4169135744,
- 4177525888, 4185912704, 4194303616, 4202691968, 4211076736,
- 4219463552, 4227855488, 4236246656, 4244633728, 4253022848,
- 4261412224, 4269799808, 4278184832, 4286578048, 4294962304,
- 4303349632, 4311743104, 4320130432, 4328521088, 4336909184,
- 4345295488, 4353687424, 4362073472, 4370458496, 4378852736,
- 4387238528, 4395630208, 4404019072, 4412407424, 4420790656,
- 4429182848, 4437571456, 4445962112, 4454344064, 4462738048,
- 4471119232, 4479516544, 4487904128, 4496289664, 4504682368,
- 4513068416, 4521459584, 4529846144, 4538232704, 4546619776,
- 4555010176, 4563402112, 4571790208, 4580174464, 4588567936,
- 4596957056, 4605344896, 4613734016, 4622119808, 4630511488,
- 4638898816, 4647287936, 4655675264, 4664065664, 4672451968,
- 4680842624, 4689231488, 4697620352, 4706007424, 4714397056,
- 4722786176, 4731173248, 4739562368, 4747951744, 4756340608,
- 4764727936, 4773114496, 4781504384, 4789894784, 4798283648,
- 4806667648, 4815059584, 4823449472, 4831835776, 4840226176,
- 4848612224, 4857003392, 4865391488, 4873780096, 4882169728,
- 4890557312, 4898946944, 4907333248, 4915722368, 4924110976,
- 4932499328, 4940889728, 4949276032, 4957666432, 4966054784,
- 4974438016, 4982831488, 4991221376, 4999607168, 5007998848,
- 5016386432, 5024763776, 5033164672, 5041544576, 5049941888,
- 5058329728, 5066717056, 5075107456, 5083494272, 5091883904,
- 5100273536, 5108662144, 5117048192, 5125436032, 5133827456,
- 5142215296, 5150605184, 5158993024, 5167382144, 5175769472,
- 5184157568, 5192543872, 5200936064, 5209324928, 5217711232,
- 5226102656, 5234490496, 5242877312, 5251263872, 5259654016,
- 5268040832, 5276434304, 5284819328, 5293209728, 5301598592,
- 5309986688, 5318374784, 5326764416, 5335151488, 5343542144,
- 5351929472, 5360319872, 5368706944, 5377096576, 5385484928,
- 5393871232, 5402263424, 5410650496, 5419040384, 5427426944,
- 5435816576, 5444205952, 5452594816, 5460981376, 5469367936,
- 5477760896, 5486148736, 5494536832, 5502925952, 5511315328,
- 5519703424, 5528089984, 5536481152, 5544869504, 5553256064,
- 5561645696, 5570032768, 5578423936, 5586811264, 5595193216,
- 5603585408, 5611972736, 5620366208, 5628750464, 5637143936,
- 5645528192, 5653921408, 5662310272, 5670694784, 5679082624,
- 5687474048, 5695864448, 5704251008, 5712641408, 5721030272,
- 5729416832, 5737806208, 5746194304, 5754583936, 5762969984,
- 5771358592, 5779748224, 5788137856, 5796527488, 5804911232,
- 5813300608, 5821692544, 5830082176, 5838468992, 5846855552,
- 5855247488, 5863636096, 5872024448, 5880411008, 5888799872,
- 5897186432, 5905576832, 5913966976, 5922352768, 5930744704,
- 5939132288, 5947522432, 5955911296, 5964299392, 5972688256,
- 5981074304, 5989465472, 5997851008, 6006241408, 6014627968,
- 6023015552, 6031408256, 6039796096, 6048185216, 6056574848,
- 6064963456, 6073351808, 6081736064, 6090128768, 6098517632,
- 6106906496, 6115289216, 6123680896, 6132070016, 6140459648,
- 6148849024, 6157237376, 6165624704, 6174009728, 6182403712,
- 6190792064, 6199176064, 6207569792, 6215952256, 6224345216,
- 6232732544, 6241124224, 6249510272, 6257899136, 6266287744,
- 6274676864, 6283065728, 6291454336, 6299843456, 6308232064,
- 6316620928, 6325006208, 6333395584, 6341784704, 6350174848,
- 6358562176, 6366951296, 6375337856, 6383729536, 6392119168,
- 6400504192, 6408895616, 6417283456, 6425673344, 6434059136,
- 6442444672, 6450837376, 6459223424, 6467613056, 6476004224,
- 6484393088, 6492781952, 6501170048, 6509555072, 6517947008,
- 6526336384, 6534725504, 6543112832, 6551500672, 6559888768,
- 6568278656, 6576662912, 6585055616, 6593443456, 6601834112,
- 6610219648, 6618610304, 6626999168, 6635385472, 6643777408,
- 6652164224, 6660552832, 6668941952, 6677330048, 6685719424,
- 6694107776, 6702493568, 6710882176, 6719274112, 6727662976,
- 6736052096, 6744437632, 6752825984, 6761213824, 6769604224,
- 6777993856, 6786383488, 6794770816, 6803158144, 6811549312,
- 6819937664, 6828326528, 6836706176, 6845101696, 6853491328,
- 6861880448, 6870269312, 6878655104, 6887046272, 6895433344,
- 6903822208, 6912212864, 6920596864, 6928988288, 6937377152,
- 6945764992, 6954149248, 6962544256, 6970928768, 6979317376,
- 6987709312, 6996093824, 7004487296, 7012875392, 7021258624,
- 7029652352, 7038038912, 7046427776, 7054818944, 7063207808,
- 7071595136, 7079980928, 7088372608, 7096759424, 7105149824,
- 7113536896, 7121928064, 7130315392, 7138699648, 7147092352,
- 7155479168, 7163865728, 7172249984, 7180648064, 7189036672,
- 7197424768, 7205810816, 7214196608, 7222589824, 7230975104,
- 7239367552, 7247755904, 7256145536, 7264533376, 7272921472,
- 7281308032, 7289694848, 7298088832, 7306471808, 7314864512,
- 7323253888, 7331643008, 7340029568, 7348419712, 7356808832,
- 7365196672, 7373585792, 7381973888, 7390362752, 7398750592,
- 7407138944, 7415528576, 7423915648, 7432302208, 7440690304,
- 7449080192, 7457472128, 7465860992, 7474249088, 7482635648,
- 7491023744, 7499412608, 7507803008, 7516192384, 7524579968,
- 7532967296, 7541358464, 7549745792, 7558134656, 7566524032,
- 7574912896, 7583300992, 7591690112, 7600075136, 7608466816,
- 7616854912, 7625244544, 7633629824, 7642020992, 7650410368,
- 7658794112, 7667187328, 7675574912, 7683961984, 7692349568,
- 7700739712, 7709130368, 7717519232, 7725905536, 7734295424,
- 7742683264, 7751069056, 7759457408, 7767849088, 7776238208,
- 7784626816, 7793014912, 7801405312, 7809792128, 7818179968,
- 7826571136, 7834957184, 7843347328, 7851732352, 7860124544,
- 7868512384, 7876902016, 7885287808, 7893679744, 7902067072,
- 7910455936, 7918844288, 7927230848, 7935622784, 7944009344,
- 7952400256, 7960786048, 7969176704, 7977565312, 7985953408,
- 7994339968, 8002730368, 8011119488, 8019508096, 8027896192,
- 8036285056, 8044674688, 8053062272, 8061448832, 8069838464,
- 8078227328, 8086616704, 8095006592, 8103393664, 8111783552,
- 8120171392, 8128560256, 8136949376, 8145336704, 8153726848,
- 8162114944, 8170503296, 8178891904, 8187280768, 8195669632,
- 8204058496, 8212444544, 8220834176, 8229222272, 8237612672,
- 8246000768, 8254389376, 8262775168, 8271167104, 8279553664,
- 8287944064, 8296333184, 8304715136, 8313108352, 8321497984,
- 8329885568, 8338274432, 8346663296, 8355052928, 8363441536,
- 8371828352, 8380217984, 8388606592, 8396996224, 8405384576,
- 8413772672, 8422161536, 8430549376, 8438939008, 8447326592,
- 8455715456, 8464104832, 8472492928, 8480882048, 8489270656,
- 8497659776, 8506045312, 8514434944, 8522823808, 8531208832,
- 8539602304, 8547990656, 8556378752, 8564768384, 8573154176,
- 8581542784, 8589933952, 8598322816, 8606705024, 8615099264,
- 8623487872, 8631876992, 8640264064, 8648653952, 8657040256,
- 8665430656, 8673820544, 8682209152, 8690592128, 8698977152,
- 8707374464, 8715763328, 8724151424, 8732540032, 8740928384,
- 8749315712, 8757704576, 8766089344, 8774480768, 8782871936,
- 8791260032, 8799645824, 8808034432, 8816426368, 8824812928,
- 8833199488, 8841591424, 8849976448, 8858366336, 8866757248,
- 8875147136, 8883532928, 8891923328, 8900306816, 8908700288,
- 8917088384, 8925478784, 8933867392, 8942250368, 8950644608,
- 8959032704, 8967420544, 8975809664, 8984197504, 8992584064,
- 9000976256, 9009362048, 9017752448, 9026141312, 9034530688,
- 9042917504, 9051307904, 9059694208, 9068084864, 9076471424,
- 9084861824, 9093250688, 9101638528, 9110027648, 9118416512,
- 9126803584, 9135188096, 9143581312, 9151969664, 9160356224,
- 9168747136, 9177134464, 9185525632, 9193910144, 9202302848,
- 9210690688, 9219079552, 9227465344, 9235854464, 9244244864,
- 9252633472, 9261021824, 9269411456, 9277799296, 9286188928,
- 9294574208, 9302965888, 9311351936, 9319740032, 9328131968,
- 9336516736, 9344907392, 9353296768, 9361685888, 9370074752,
- 9378463616, 9386849408, 9395239808, 9403629184, 9412016512,
- 9420405376, 9428795008, 9437181568, 9445570688, 9453960832,
- 9462346624, 9470738048, 9479121536, 9487515008, 9495903616,
- 9504289664, 9512678528, 9521067904, 9529456256, 9537843584,
- 9546233728, 9554621312, 9563011456, 9571398784, 9579788672,
- 9588178304, 9596567168, 9604954496, 9613343104, 9621732992,
- 9630121856, 9638508416, 9646898816, 9655283584, 9663675776,
- 9672061312, 9680449664, 9688840064, 9697230464, 9705617536,
- 9714003584, 9722393984, 9730772608, 9739172224, 9747561088,
- 9755945344, 9764338816, 9772726144, 9781116544, 9789503872,
- 9797892992, 9806282624, 9814670464, 9823056512, 9831439232,
- 9839833984, 9848224384, 9856613504, 9865000576, 9873391232,
- 9881772416, 9890162816, 9898556288, 9906940544, 9915333248,
- 9923721088, 9932108672, 9940496512, 9948888448, 9957276544,
- 9965666176, 9974048384, 9982441088, 9990830464, 9999219584,
- 10007602816, 10015996544, 10024385152, 10032774016, 10041163648,
- 10049548928, 10057940096, 10066329472, 10074717824, 10083105152,
- 10091495296, 10099878784, 10108272256, 10116660608, 10125049216,
- 10133437312, 10141825664, 10150213504, 10158601088, 10166991232,
- 10175378816, 10183766144, 10192157312, 10200545408, 10208935552,
- 10217322112, 10225712768, 10234099328, 10242489472, 10250876032,
- 10259264896, 10267656064, 10276042624, 10284429184, 10292820352,
- 10301209472, 10309598848, 10317987712, 10326375296, 10334763392,
- 10343153536, 10351541632, 10359930752, 10368318592, 10376707456,
- 10385096576, 10393484672, 10401867136, 10410262144, 10418647424,
- 10427039104, 10435425664, 10443810176, 10452203648, 10460589952,
- 10468982144, 10477369472, 10485759104, 10494147712, 10502533504,
- 10510923392, 10519313536, 10527702656, 10536091264, 10544478592,
- 10552867712, 10561255808, 10569642368, 10578032768, 10586423168,
- 10594805632, 10603200128, 10611588992, 10619976064, 10628361344,
- 10636754048, 10645143424, 10653531776, 10661920384, 10670307968,
- 10678696832, 10687086464, 10695475072, 10703863168, 10712246144,
- 10720639616, 10729026688, 10737414784, 10745806208, 10754190976,
- 10762581376, 10770971264, 10779356288, 10787747456, 10796135552,
- 10804525184, 10812915584, 10821301888, 10829692288, 10838078336,
- 10846469248, 10854858368, 10863247232, 10871631488, 10880023424,
- 10888412032, 10896799616, 10905188992, 10913574016, 10921964672,
- 10930352768, 10938742912, 10947132544, 10955518592, 10963909504,
- 10972298368, 10980687488, 10989074816, 10997462912, 11005851776,
- 11014241152, 11022627712, 11031017344, 11039403904, 11047793024,
- 11056184704, 11064570752, 11072960896, 11081343872, 11089737856,
- 11098128256, 11106514816, 11114904448, 11123293568, 11131680128,
- 11140065152, 11148458368, 11156845696, 11165236864, 11173624192,
- 11182013824, 11190402688, 11198790784, 11207179136, 11215568768,
- 11223957376, 11232345728, 11240734592, 11249122688, 11257511296,
- 11265899648, 11274285952, 11282675584, 11291065472, 11299452544,
- 11307842432, 11316231296, 11324616832, 11333009024, 11341395584,
- 11349782656, 11358172288, 11366560384, 11374950016, 11383339648,
- 11391721856, 11400117376, 11408504192, 11416893568, 11425283456,
- 11433671552, 11442061184, 11450444672, 11458837888, 11467226752,
- 11475611776, 11484003968, 11492392064, 11500780672, 11509169024,
- 11517550976, 11525944448, 11534335616, 11542724224, 11551111808,
- 11559500672, 11567890304, 11576277376, 11584667008, 11593056128,
- 11601443456, 11609830016, 11618221952, 11626607488, 11634995072,
- 11643387776, 11651775104, 11660161664, 11668552576, 11676940928,
- 11685330304, 11693718656, 11702106496, 11710496128, 11718882688,
- 11727273088, 11735660416, 11744050048, 11752437376, 11760824704,
- 11769216128, 11777604736, 11785991296, 11794381952, 11802770048,
- 11811157888, 11819548544, 11827932544, 11836324736, 11844713344,
- 11853100928, 11861486464, 11869879936, 11878268032, 11886656896,
- 11895044992, 11903433088, 11911822976, 11920210816, 11928600448,
- 11936987264, 11945375872, 11953761152, 11962151296, 11970543488,
- 11978928512, 11987320448, 11995708288, 12004095104, 12012486272,
- 12020875136, 12029255552, 12037652096, 12046039168, 12054429568,
- 12062813824, 12071206528, 12079594624, 12087983744, 12096371072,
- 12104759936, 12113147264, 12121534592, 12129924992, 12138314624,
- 12146703232, 12155091584, 12163481216, 12171864704, 12180255872,
- 12188643968, 12197034112, 12205424512, 12213811328, 12222199424,
- 12230590336, 12238977664, 12247365248, 12255755392, 12264143488,
- 12272531584, 12280920448, 12289309568, 12297694592, 12306086528,
- 12314475392, 12322865024, 12331253632, 12339640448, 12348029312,
- 12356418944, 12364805248, 12373196672, 12381580928, 12389969024,
- 12398357632, 12406750592, 12415138432, 12423527552, 12431916416,
- 12440304512, 12448692352, 12457081216, 12465467776, 12473859968,
- 12482245504, 12490636672, 12499025536, 12507411584, 12515801728,
- 12524190592, 12532577152, 12540966272, 12549354368, 12557743232,
- 12566129536, 12574523264, 12582911872, 12591299456, 12599688064,
- 12608074624, 12616463488, 12624845696, 12633239936, 12641631616,
- 12650019968, 12658407296, 12666795136, 12675183232, 12683574656,
- 12691960192, 12700350592, 12708740224, 12717128576, 12725515904,
- 12733906816, 12742295168, 12750680192, 12759071872, 12767460736,
- 12775848832, 12784236928, 12792626816, 12801014656, 12809404288,
- 12817789312, 12826181504, 12834568832, 12842954624, 12851345792,
- 12859732352, 12868122496, 12876512128, 12884901248, 12893289088,
- 12901672832, 12910067584, 12918455168, 12926842496, 12935232896,
- 12943620736, 12952009856, 12960396928, 12968786816, 12977176192,
- 12985563776, 12993951104, 13002341504, 13010730368, 13019115392,
- 13027506304, 13035895168, 13044272512, 13052673152, 13061062528,
- 13069446272, 13077838976, 13086227072, 13094613632, 13103000192,
- 13111393664, 13119782528, 13128157568, 13136559232, 13144945024,
- 13153329536, 13161724288, 13170111872, 13178502784, 13186884736,
- 13195279744, 13203667072, 13212057472, 13220445824, 13228832128,
- 13237221248, 13245610624, 13254000512, 13262388352, 13270777472,
- 13279166336, 13287553408, 13295943296, 13304331904, 13312719488,
- 13321108096, 13329494656, 13337885824, 13346274944, 13354663808,
- 13363051136, 13371439232, 13379825024, 13388210816, 13396605056,
- 13404995456, 13413380224, 13421771392, 13430159744, 13438546048,
- 13446937216, 13455326848, 13463708288, 13472103808, 13480492672,
- 13488875648, 13497269888, 13505657728, 13514045312, 13522435712,
- 13530824576, 13539210112, 13547599232, 13555989376, 13564379008,
- 13572766336, 13581154432, 13589544832, 13597932928, 13606320512,
- 13614710656, 13623097472, 13631477632, 13639874944, 13648264064,
- 13656652928, 13665041792, 13673430656, 13681818496, 13690207616,
- 13698595712, 13706982272, 13715373184, 13723762048, 13732150144,
- 13740536704, 13748926592, 13757316224, 13765700992, 13774090112,
- 13782477952, 13790869376, 13799259008, 13807647872, 13816036736,
- 13824425344, 13832814208, 13841202304, 13849591424, 13857978752,
- 13866368896, 13874754688, 13883145344, 13891533184, 13899919232,
- 13908311168, 13916692096, 13925085056, 13933473152, 13941866368,
- 13950253696, 13958643584, 13967032192, 13975417216, 13983807616,
- 13992197504, 14000582272, 14008973696, 14017363072, 14025752192,
- 14034137984, 14042528384, 14050918016, 14059301504, 14067691648,
- 14076083584, 14084470144, 14092852352, 14101249664, 14109635968,
- 14118024832, 14126407552, 14134804352, 14143188608, 14151577984,
- 14159968384, 14168357248, 14176741504, 14185127296, 14193521024,
- 14201911424, 14210301824, 14218685056, 14227067264, 14235467392,
- 14243855488, 14252243072, 14260630144, 14269021568, 14277409408,
- 14285799296, 14294187904, 14302571392, 14310961792, 14319353728,
- 14327738752, 14336130944, 14344518784, 14352906368, 14361296512,
- 14369685376, 14378071424, 14386462592, 14394848128, 14403230848,
- 14411627392, 14420013952, 14428402304, 14436793472, 14445181568,
- 14453569664, 14461959808, 14470347904, 14478737024, 14487122816,
- 14495511424, 14503901824, 14512291712, 14520677504, 14529064832,
- 14537456768, 14545845632, 14554234496, 14562618496, 14571011456,
- 14579398784, 14587789184, 14596172672, 14604564608, 14612953984,
- 14621341312, 14629724288, 14638120832, 14646503296, 14654897536,
- 14663284864, 14671675264, 14680061056, 14688447616, 14696835968,
- 14705228416, 14713616768, 14722003328, 14730392192, 14738784128,
- 14747172736, 14755561088, 14763947648, 14772336512, 14780725376,
- 14789110144, 14797499776, 14805892736, 14814276992, 14822670208,
- 14831056256, 14839444352, 14847836032, 14856222848, 14864612992,
- 14872997504, 14881388672, 14889775744, 14898165376, 14906553472,
- 14914944896, 14923329664, 14931721856, 14940109696, 14948497024,
- 14956887424, 14965276544, 14973663616, 14982053248, 14990439808,
- 14998830976, 15007216768, 15015605888, 15023995264, 15032385152,
- 15040768384, 15049154944, 15057549184, 15065939072, 15074328448,
- 15082715008, 15091104128, 15099493504, 15107879296, 15116269184,
- 15124659584, 15133042304, 15141431936, 15149824384, 15158214272,
- 15166602368, 15174991232, 15183378304, 15191760512, 15200154496,
- 15208542592, 15216931712, 15225323392, 15233708416, 15242098048,
- 15250489216, 15258875264, 15267265408, 15275654528, 15284043136,
- 15292431488, 15300819584, 15309208192, 15317596544, 15325986176,
- 15334374784, 15342763648, 15351151744, 15359540608, 15367929728,
- 15376318336, 15384706432, 15393092992, 15401481856, 15409869952,
- 15418258816, 15426649984, 15435037568, 15443425664, 15451815296,
- 15460203392, 15468589184, 15476979328, 15485369216, 15493755776,
- 15502146944, 15510534272, 15518924416, 15527311232, 15535699072,
- 15544089472, 15552478336, 15560866688, 15569254528, 15577642624,
- 15586031488, 15594419072, 15602809472, 15611199104, 15619586432,
- 15627975296, 15636364928, 15644753792, 15653141888, 15661529216,
- 15669918848, 15678305152, 15686696576, 15695083136, 15703474048,
- 15711861632, 15720251264, 15728636288, 15737027456, 15745417088,
- 15753804928, 15762194048, 15770582656, 15778971008, 15787358336,
- 15795747712, 15804132224, 15812523392, 15820909696, 15829300096,
- 15837691264, 15846071936, 15854466944, 15862855808, 15871244672,
- 15879634816, 15888020608, 15896409728, 15904799104, 15913185152,
- 15921577088, 15929966464, 15938354816, 15946743424, 15955129472,
- 15963519872, 15971907968, 15980296064, 15988684928, 15997073024,
- 16005460864, 16013851264, 16022241152, 16030629248, 16039012736,
- 16047406976, 16055794816, 16064181376, 16072571264, 16080957824,
- 16089346688, 16097737856, 16106125184, 16114514816, 16122904192,
- 16131292544, 16139678848, 16148066944, 16156453504, 16164839552,
- 16173236096, 16181623424, 16190012032, 16198401152, 16206790528,
- 16215177344, 16223567744, 16231956352, 16240344704, 16248731008,
- 16257117824, 16265504384, 16273898624, 16282281856, 16290668672,
- 16299064192, 16307449216, 16315842176, 16324230016, 16332613504,
- 16341006464, 16349394304, 16357783168, 16366172288, 16374561664,
- 16382951296, 16391337856, 16399726208, 16408116352, 16416505472,
- 16424892032, 16433282176, 16441668224, 16450058624, 16458448768,
- 16466836864, 16475224448, 16483613056, 16492001408, 16500391808,
- 16508779648, 16517166976, 16525555328, 16533944192, 16542330752,
- 16550719616, 16559110528, 16567497088, 16575888512, 16584274816,
- 16592665472, 16601051008, 16609442944, 16617832064, 16626218624,
- 16634607488, 16642996096, 16651385728, 16659773824, 16668163712,
- 16676552576, 16684938112, 16693328768, 16701718144, 16710095488,
- 16718492288, 16726883968, 16735272832, 16743661184, 16752049792,
- 16760436608, 16768827008, 16777214336, 16785599104, 16793992832,
- 16802381696, 16810768768, 16819151744, 16827542656, 16835934848,
- 16844323712, 16852711552, 16861101952, 16869489536, 16877876864,
- 16886265728, 16894653056, 16903044736, 16911431296, 16919821696,
- 16928207488, 16936592768, 16944987776, 16953375616, 16961763968,
- 16970152832, 16978540928, 16986929536, 16995319168, 17003704448,
- 17012096896, 17020481152, 17028870784, 17037262208, 17045649536,
- 17054039936, 17062426496, 17070814336, 17079205504, 17087592064,
- 17095978112, 17104369024, 17112759424, 17121147776, 17129536384,
- 17137926016, 17146314368, 17154700928, 17163089792, 17171480192,
- 17179864192, 17188256896, 17196644992, 17205033856, 17213423488,
- 17221811072, 17230198912, 17238588032, 17246976896, 17255360384,
- 17263754624, 17272143232, 17280530048, 17288918912, 17297309312,
- 17305696384, 17314085504, 17322475136, 17330863744, 17339252096,
- 17347640192, 17356026496, 17364413824, 17372796544, 17381190016,
- 17389583488, 17397972608, 17406360704, 17414748544, 17423135872,
- 17431527296, 17439915904, 17448303232, 17456691584, 17465081728,
- 17473468288, 17481857408, 17490247552, 17498635904, 17507022464,
- 17515409024, 17523801728, 17532189824, 17540577664, 17548966016,
- 17557353344, 17565741184, 17574131584, 17582519168, 17590907008,
- 17599296128, 17607687808, 17616076672, 17624455808, 17632852352,
- 17641238656, 17649630848, 17658018944, 17666403968, 17674794112,
- 17683178368, 17691573376, 17699962496, 17708350592, 17716739968,
- 17725126528, 17733517184, 17741898112, 17750293888, 17758673024,
- 17767070336, 17775458432, 17783848832, 17792236928, 17800625536,
- 17809012352, 17817402752, 17825785984, 17834178944, 17842563968,
- 17850955648, 17859344512, 17867732864, 17876119424, 17884511872,
- 17892900224, 17901287296, 17909677696, 17918058112, 17926451072,
- 17934843776, 17943230848, 17951609216, 17960008576, 17968397696,
- 17976784256, 17985175424, 17993564032, 18001952128, 18010339712,
- 18018728576, 18027116672, 18035503232, 18043894144, 18052283264,
- 18060672128, 18069056384, 18077449856, 18085837184, 18094225792,
- 18102613376, 18111004544, 18119388544, 18127781248, 18136170368,
- 18144558976, 18152947328, 18161336192, 18169724288, 18178108544,
- 18186498944, 18194886784, 18203275648, 18211666048, 18220048768,
- 18228444544, 18236833408, 18245220736}
-
-// cacheSizes is a lookup table for the ethash verification cache size for the
-// first 2048 epochs (i.e. 61440000 blocks).
-var cacheSizes = [maxEpoch]uint64{
- 16776896, 16907456, 17039296, 17170112, 17301056, 17432512, 17563072,
- 17693888, 17824192, 17955904, 18087488, 18218176, 18349504, 18481088,
- 18611392, 18742336, 18874304, 19004224, 19135936, 19267264, 19398208,
- 19529408, 19660096, 19791424, 19922752, 20053952, 20184896, 20315968,
- 20446912, 20576576, 20709184, 20840384, 20971072, 21102272, 21233216,
- 21364544, 21494848, 21626816, 21757376, 21887552, 22019392, 22151104,
- 22281536, 22412224, 22543936, 22675264, 22806464, 22935872, 23068096,
- 23198272, 23330752, 23459008, 23592512, 23723968, 23854912, 23986112,
- 24116672, 24247616, 24378688, 24509504, 24640832, 24772544, 24903488,
- 25034432, 25165376, 25296704, 25427392, 25558592, 25690048, 25820096,
- 25951936, 26081728, 26214208, 26345024, 26476096, 26606656, 26737472,
- 26869184, 26998208, 27131584, 27262528, 27393728, 27523904, 27655744,
- 27786688, 27917888, 28049344, 28179904, 28311488, 28441792, 28573504,
- 28700864, 28835648, 28966208, 29096768, 29228608, 29359808, 29490752,
- 29621824, 29752256, 29882816, 30014912, 30144448, 30273728, 30406976,
- 30538432, 30670784, 30799936, 30932672, 31063744, 31195072, 31325248,
- 31456192, 31588288, 31719232, 31850432, 31981504, 32110784, 32243392,
- 32372672, 32505664, 32636608, 32767808, 32897344, 33029824, 33160768,
- 33289664, 33423296, 33554368, 33683648, 33816512, 33947456, 34076992,
- 34208704, 34340032, 34471744, 34600256, 34734016, 34864576, 34993984,
- 35127104, 35258176, 35386688, 35518528, 35650624, 35782336, 35910976,
- 36044608, 36175808, 36305728, 36436672, 36568384, 36699968, 36830656,
- 36961984, 37093312, 37223488, 37355072, 37486528, 37617472, 37747904,
- 37879232, 38009792, 38141888, 38272448, 38403392, 38535104, 38660672,
- 38795584, 38925632, 39059264, 39190336, 39320768, 39452096, 39581632,
- 39713984, 39844928, 39974848, 40107968, 40238144, 40367168, 40500032,
- 40631744, 40762816, 40894144, 41023552, 41155904, 41286208, 41418304,
- 41547712, 41680448, 41811904, 41942848, 42073792, 42204992, 42334912,
- 42467008, 42597824, 42729152, 42860096, 42991552, 43122368, 43253696,
- 43382848, 43515712, 43646912, 43777088, 43907648, 44039104, 44170432,
- 44302144, 44433344, 44564288, 44694976, 44825152, 44956864, 45088448,
- 45219008, 45350464, 45481024, 45612608, 45744064, 45874496, 46006208,
- 46136768, 46267712, 46399424, 46529344, 46660672, 46791488, 46923328,
- 47053504, 47185856, 47316928, 47447872, 47579072, 47710144, 47839936,
- 47971648, 48103232, 48234176, 48365248, 48496192, 48627136, 48757312,
- 48889664, 49020736, 49149248, 49283008, 49413824, 49545152, 49675712,
- 49807168, 49938368, 50069056, 50200256, 50331584, 50462656, 50593472,
- 50724032, 50853952, 50986048, 51117632, 51248576, 51379904, 51510848,
- 51641792, 51773248, 51903296, 52035136, 52164032, 52297664, 52427968,
- 52557376, 52690112, 52821952, 52952896, 53081536, 53213504, 53344576,
- 53475776, 53608384, 53738816, 53870528, 54000832, 54131776, 54263744,
- 54394688, 54525248, 54655936, 54787904, 54918592, 55049152, 55181248,
- 55312064, 55442752, 55574336, 55705024, 55836224, 55967168, 56097856,
- 56228672, 56358592, 56490176, 56621888, 56753728, 56884928, 57015488,
- 57146816, 57278272, 57409216, 57540416, 57671104, 57802432, 57933632,
- 58064576, 58195264, 58326976, 58457408, 58588864, 58720192, 58849984,
- 58981696, 59113024, 59243456, 59375552, 59506624, 59637568, 59768512,
- 59897792, 60030016, 60161984, 60293056, 60423872, 60554432, 60683968,
- 60817216, 60948032, 61079488, 61209664, 61341376, 61471936, 61602752,
- 61733696, 61865792, 61996736, 62127808, 62259136, 62389568, 62520512,
- 62651584, 62781632, 62910784, 63045056, 63176128, 63307072, 63438656,
- 63569216, 63700928, 63831616, 63960896, 64093888, 64225088, 64355392,
- 64486976, 64617664, 64748608, 64879424, 65009216, 65142464, 65273792,
- 65402816, 65535424, 65666752, 65797696, 65927744, 66060224, 66191296,
- 66321344, 66453056, 66584384, 66715328, 66846656, 66977728, 67108672,
- 67239104, 67370432, 67501888, 67631296, 67763776, 67895104, 68026304,
- 68157248, 68287936, 68419264, 68548288, 68681408, 68811968, 68942912,
- 69074624, 69205568, 69337024, 69467584, 69599168, 69729472, 69861184,
- 69989824, 70122944, 70253888, 70385344, 70515904, 70647232, 70778816,
- 70907968, 71040832, 71171648, 71303104, 71432512, 71564992, 71695168,
- 71826368, 71958464, 72089536, 72219712, 72350144, 72482624, 72613568,
- 72744512, 72875584, 73006144, 73138112, 73268672, 73400128, 73530944,
- 73662272, 73793344, 73924544, 74055104, 74185792, 74316992, 74448832,
- 74579392, 74710976, 74841664, 74972864, 75102784, 75233344, 75364544,
- 75497024, 75627584, 75759296, 75890624, 76021696, 76152256, 76283072,
- 76414144, 76545856, 76676672, 76806976, 76937792, 77070016, 77200832,
- 77331392, 77462464, 77593664, 77725376, 77856448, 77987776, 78118336,
- 78249664, 78380992, 78511424, 78642496, 78773056, 78905152, 79033664,
- 79166656, 79297472, 79429568, 79560512, 79690816, 79822784, 79953472,
- 80084672, 80214208, 80346944, 80477632, 80608576, 80740288, 80870848,
- 81002048, 81133504, 81264448, 81395648, 81525952, 81657536, 81786304,
- 81919808, 82050112, 82181312, 82311616, 82443968, 82573376, 82705984,
- 82835776, 82967744, 83096768, 83230528, 83359552, 83491264, 83622464,
- 83753536, 83886016, 84015296, 84147776, 84277184, 84409792, 84540608,
- 84672064, 84803008, 84934336, 85065152, 85193792, 85326784, 85458496,
- 85589312, 85721024, 85851968, 85982656, 86112448, 86244416, 86370112,
- 86506688, 86637632, 86769344, 86900672, 87031744, 87162304, 87293632,
- 87424576, 87555392, 87687104, 87816896, 87947968, 88079168, 88211264,
- 88341824, 88473152, 88603712, 88735424, 88862912, 88996672, 89128384,
- 89259712, 89390272, 89521984, 89652544, 89783872, 89914816, 90045376,
- 90177088, 90307904, 90438848, 90569152, 90700096, 90832832, 90963776,
- 91093696, 91223744, 91356992, 91486784, 91618496, 91749824, 91880384,
- 92012224, 92143552, 92273344, 92405696, 92536768, 92666432, 92798912,
- 92926016, 93060544, 93192128, 93322816, 93453632, 93583936, 93715136,
- 93845056, 93977792, 94109504, 94240448, 94371776, 94501184, 94632896,
- 94764224, 94895552, 95023424, 95158208, 95287744, 95420224, 95550016,
- 95681216, 95811904, 95943872, 96075328, 96203584, 96337856, 96468544,
- 96599744, 96731072, 96860992, 96992576, 97124288, 97254848, 97385536,
- 97517248, 97647808, 97779392, 97910464, 98041408, 98172608, 98303168,
- 98434496, 98565568, 98696768, 98827328, 98958784, 99089728, 99220928,
- 99352384, 99482816, 99614272, 99745472, 99876416, 100007104,
- 100138048, 100267072, 100401088, 100529984, 100662592, 100791872,
- 100925248, 101056064, 101187392, 101317952, 101449408, 101580608,
- 101711296, 101841728, 101973824, 102104896, 102235712, 102366016,
- 102498112, 102628672, 102760384, 102890432, 103021888, 103153472,
- 103284032, 103415744, 103545152, 103677248, 103808576, 103939648,
- 104070976, 104201792, 104332736, 104462528, 104594752, 104725952,
- 104854592, 104988608, 105118912, 105247808, 105381184, 105511232,
- 105643072, 105774784, 105903296, 106037056, 106167872, 106298944,
- 106429504, 106561472, 106691392, 106822592, 106954304, 107085376,
- 107216576, 107346368, 107478464, 107609792, 107739712, 107872192,
- 108003136, 108131392, 108265408, 108396224, 108527168, 108657344,
- 108789568, 108920384, 109049792, 109182272, 109312576, 109444928,
- 109572928, 109706944, 109837888, 109969088, 110099648, 110230976,
- 110362432, 110492992, 110624704, 110755264, 110886208, 111017408,
- 111148864, 111279296, 111410752, 111541952, 111673024, 111803456,
- 111933632, 112066496, 112196416, 112328512, 112457792, 112590784,
- 112715968, 112852672, 112983616, 113114944, 113244224, 113376448,
- 113505472, 113639104, 113770304, 113901376, 114031552, 114163264,
- 114294592, 114425536, 114556864, 114687424, 114818624, 114948544,
- 115080512, 115212224, 115343296, 115473472, 115605184, 115736128,
- 115867072, 115997248, 116128576, 116260288, 116391488, 116522944,
- 116652992, 116784704, 116915648, 117046208, 117178304, 117308608,
- 117440192, 117569728, 117701824, 117833024, 117964096, 118094656,
- 118225984, 118357312, 118489024, 118617536, 118749632, 118882112,
- 119012416, 119144384, 119275328, 119406016, 119537344, 119668672,
- 119798464, 119928896, 120061376, 120192832, 120321728, 120454336,
- 120584512, 120716608, 120848192, 120979136, 121109056, 121241408,
- 121372352, 121502912, 121634752, 121764416, 121895744, 122027072,
- 122157632, 122289088, 122421184, 122550592, 122682944, 122813888,
- 122945344, 123075776, 123207488, 123338048, 123468736, 123600704,
- 123731264, 123861952, 123993664, 124124608, 124256192, 124386368,
- 124518208, 124649024, 124778048, 124911296, 125041088, 125173696,
- 125303744, 125432896, 125566912, 125696576, 125829056, 125958592,
- 126090304, 126221248, 126352832, 126483776, 126615232, 126746432,
- 126876608, 127008704, 127139392, 127270336, 127401152, 127532224,
- 127663552, 127794752, 127925696, 128055232, 128188096, 128319424,
- 128449856, 128581312, 128712256, 128843584, 128973632, 129103808,
- 129236288, 129365696, 129498944, 129629888, 129760832, 129892288,
- 130023104, 130154048, 130283968, 130416448, 130547008, 130678336,
- 130807616, 130939456, 131071552, 131202112, 131331776, 131464384,
- 131594048, 131727296, 131858368, 131987392, 132120256, 132250816,
- 132382528, 132513728, 132644672, 132774976, 132905792, 133038016,
- 133168832, 133299392, 133429312, 133562048, 133692992, 133823296,
- 133954624, 134086336, 134217152, 134348608, 134479808, 134607296,
- 134741056, 134872384, 135002944, 135134144, 135265472, 135396544,
- 135527872, 135659072, 135787712, 135921472, 136052416, 136182848,
- 136313792, 136444864, 136576448, 136707904, 136837952, 136970048,
- 137099584, 137232064, 137363392, 137494208, 137625536, 137755712,
- 137887424, 138018368, 138149824, 138280256, 138411584, 138539584,
- 138672832, 138804928, 138936128, 139066688, 139196864, 139328704,
- 139460032, 139590208, 139721024, 139852864, 139984576, 140115776,
- 140245696, 140376512, 140508352, 140640064, 140769856, 140902336,
- 141032768, 141162688, 141294016, 141426496, 141556544, 141687488,
- 141819584, 141949888, 142080448, 142212544, 142342336, 142474432,
- 142606144, 142736192, 142868288, 142997824, 143129408, 143258944,
- 143392448, 143523136, 143653696, 143785024, 143916992, 144045632,
- 144177856, 144309184, 144440768, 144570688, 144701888, 144832448,
- 144965056, 145096384, 145227584, 145358656, 145489856, 145620928,
- 145751488, 145883072, 146011456, 146144704, 146275264, 146407232,
- 146538176, 146668736, 146800448, 146931392, 147062336, 147193664,
- 147324224, 147455936, 147586624, 147717056, 147848768, 147979456,
- 148110784, 148242368, 148373312, 148503232, 148635584, 148766144,
- 148897088, 149028416, 149159488, 149290688, 149420224, 149551552,
- 149683136, 149814976, 149943616, 150076352, 150208064, 150338624,
- 150470464, 150600256, 150732224, 150862784, 150993088, 151125952,
- 151254976, 151388096, 151519168, 151649728, 151778752, 151911104,
- 152042944, 152174144, 152304704, 152435648, 152567488, 152698816,
- 152828992, 152960576, 153091648, 153222976, 153353792, 153484096,
- 153616192, 153747008, 153878336, 154008256, 154139968, 154270912,
- 154402624, 154533824, 154663616, 154795712, 154926272, 155057984,
- 155188928, 155319872, 155450816, 155580608, 155712064, 155843392,
- 155971136, 156106688, 156237376, 156367424, 156499264, 156630976,
- 156761536, 156892352, 157024064, 157155008, 157284416, 157415872,
- 157545536, 157677248, 157810496, 157938112, 158071744, 158203328,
- 158334656, 158464832, 158596288, 158727616, 158858048, 158988992,
- 159121216, 159252416, 159381568, 159513152, 159645632, 159776192,
- 159906496, 160038464, 160169536, 160300352, 160430656, 160563008,
- 160693952, 160822208, 160956352, 161086784, 161217344, 161349184,
- 161480512, 161611456, 161742272, 161873216, 162002752, 162135872,
- 162266432, 162397888, 162529216, 162660032, 162790976, 162922048,
- 163052096, 163184576, 163314752, 163446592, 163577408, 163707968,
- 163839296, 163969984, 164100928, 164233024, 164364224, 164494912,
- 164625856, 164756672, 164887616, 165019072, 165150016, 165280064,
- 165412672, 165543104, 165674944, 165805888, 165936832, 166067648,
- 166198336, 166330048, 166461248, 166591552, 166722496, 166854208,
- 166985408, 167116736, 167246656, 167378368, 167508416, 167641024,
- 167771584, 167903168, 168034112, 168164032, 168295744, 168427456,
- 168557632, 168688448, 168819136, 168951616, 169082176, 169213504,
- 169344832, 169475648, 169605952, 169738048, 169866304, 169999552,
- 170131264, 170262464, 170393536, 170524352, 170655424, 170782016,
- 170917696, 171048896, 171179072, 171310784, 171439936, 171573184,
- 171702976, 171835072, 171966272, 172097216, 172228288, 172359232,
- 172489664, 172621376, 172747712, 172883264, 173014208, 173144512,
- 173275072, 173407424, 173539136, 173669696, 173800768, 173931712,
- 174063424, 174193472, 174325696, 174455744, 174586816, 174718912,
- 174849728, 174977728, 175109696, 175242688, 175374272, 175504832,
- 175636288, 175765696, 175898432, 176028992, 176159936, 176291264,
- 176422592, 176552512, 176684864, 176815424, 176946496, 177076544,
- 177209152, 177340096, 177470528, 177600704, 177731648, 177864256,
- 177994816, 178126528, 178257472, 178387648, 178518464, 178650176,
- 178781888, 178912064, 179044288, 179174848, 179305024, 179436736,
- 179568448, 179698496, 179830208, 179960512, 180092608, 180223808,
- 180354752, 180485696, 180617152, 180748096, 180877504, 181009984,
- 181139264, 181272512, 181402688, 181532608, 181663168, 181795136,
- 181926592, 182057536, 182190016, 182320192, 182451904, 182582336,
- 182713792, 182843072, 182976064, 183107264, 183237056, 183368384,
- 183494848, 183631424, 183762752, 183893824, 184024768, 184154816,
- 184286656, 184417984, 184548928, 184680128, 184810816, 184941248,
- 185072704, 185203904, 185335616, 185465408, 185596352, 185727296,
- 185859904, 185989696, 186121664, 186252992, 186383552, 186514112,
- 186645952, 186777152, 186907328, 187037504, 187170112, 187301824,
- 187429184, 187562048, 187693504, 187825472, 187957184, 188087104,
- 188218304, 188349376, 188481344, 188609728, 188743616, 188874304,
- 189005248, 189136448, 189265088, 189396544, 189528128, 189660992,
- 189791936, 189923264, 190054208, 190182848, 190315072, 190447424,
- 190577984, 190709312, 190840768, 190971328, 191102656, 191233472,
- 191364032, 191495872, 191626816, 191758016, 191888192, 192020288,
- 192148928, 192282176, 192413504, 192542528, 192674752, 192805952,
- 192937792, 193068608, 193198912, 193330496, 193462208, 193592384,
- 193723456, 193854272, 193985984, 194116672, 194247232, 194379712,
- 194508352, 194641856, 194772544, 194900672, 195035072, 195166016,
- 195296704, 195428032, 195558592, 195690304, 195818176, 195952576,
- 196083392, 196214336, 196345792, 196476736, 196607552, 196739008,
- 196869952, 197000768, 197130688, 197262784, 197394368, 197523904,
- 197656384, 197787584, 197916608, 198049472, 198180544, 198310208,
- 198442432, 198573632, 198705088, 198834368, 198967232, 199097792,
- 199228352, 199360192, 199491392, 199621696, 199751744, 199883968,
- 200014016, 200146624, 200276672, 200408128, 200540096, 200671168,
- 200801984, 200933312, 201062464, 201194944, 201326144, 201457472,
- 201588544, 201719744, 201850816, 201981632, 202111552, 202244032,
- 202374464, 202505152, 202636352, 202767808, 202898368, 203030336,
- 203159872, 203292608, 203423296, 203553472, 203685824, 203816896,
- 203947712, 204078272, 204208192, 204341056, 204472256, 204603328,
- 204733888, 204864448, 204996544, 205125568, 205258304, 205388864,
- 205517632, 205650112, 205782208, 205913536, 206044736, 206176192,
- 206307008, 206434496, 206569024, 206700224, 206831168, 206961856,
- 207093056, 207223616, 207355328, 207486784, 207616832, 207749056,
- 207879104, 208010048, 208141888, 208273216, 208404032, 208534336,
- 208666048, 208796864, 208927424, 209059264, 209189824, 209321792,
- 209451584, 209582656, 209715136, 209845568, 209976896, 210106432,
- 210239296, 210370112, 210501568, 210630976, 210763712, 210894272,
- 211024832, 211156672, 211287616, 211418176, 211549376, 211679296,
- 211812032, 211942592, 212074432, 212204864, 212334016, 212467648,
- 212597824, 212727616, 212860352, 212991424, 213120832, 213253952,
- 213385024, 213515584, 213645632, 213777728, 213909184, 214040128,
- 214170688, 214302656, 214433728, 214564544, 214695232, 214826048,
- 214956992, 215089088, 215219776, 215350592, 215482304, 215613248,
- 215743552, 215874752, 216005312, 216137024, 216267328, 216399296,
- 216530752, 216661696, 216790592, 216923968, 217054528, 217183168,
- 217316672, 217448128, 217579072, 217709504, 217838912, 217972672,
- 218102848, 218233024, 218364736, 218496832, 218627776, 218759104,
- 218888896, 219021248, 219151936, 219281728, 219413056, 219545024,
- 219675968, 219807296, 219938624, 220069312, 220200128, 220331456,
- 220461632, 220592704, 220725184, 220855744, 220987072, 221117888,
- 221249216, 221378368, 221510336, 221642048, 221772736, 221904832,
- 222031808, 222166976, 222297536, 222428992, 222559936, 222690368,
- 222820672, 222953152, 223083968, 223213376, 223345984, 223476928,
- 223608512, 223738688, 223869376, 224001472, 224132672, 224262848,
- 224394944, 224524864, 224657344, 224788288, 224919488, 225050432,
- 225181504, 225312704, 225443776, 225574592, 225704768, 225834176,
- 225966784, 226097216, 226229824, 226360384, 226491712, 226623424,
- 226754368, 226885312, 227015104, 227147456, 227278528, 227409472,
- 227539904, 227669696, 227802944, 227932352, 228065216, 228196288,
- 228326464, 228457792, 228588736, 228720064, 228850112, 228981056,
- 229113152, 229243328, 229375936, 229505344, 229636928, 229769152,
- 229894976, 230030272, 230162368, 230292416, 230424512, 230553152,
- 230684864, 230816704, 230948416, 231079616, 231210944, 231342016,
- 231472448, 231603776, 231733952, 231866176, 231996736, 232127296,
- 232259392, 232388672, 232521664, 232652608, 232782272, 232914496,
- 233043904, 233175616, 233306816, 233438528, 233569984, 233699776,
- 233830592, 233962688, 234092224, 234221888, 234353984, 234485312,
- 234618304, 234749888, 234880832, 235011776, 235142464, 235274048,
- 235403456, 235535936, 235667392, 235797568, 235928768, 236057152,
- 236190272, 236322752, 236453312, 236583616, 236715712, 236846528,
- 236976448, 237108544, 237239104, 237371072, 237501632, 237630784,
- 237764416, 237895232, 238026688, 238157632, 238286912, 238419392,
- 238548032, 238681024, 238812608, 238941632, 239075008, 239206336,
- 239335232, 239466944, 239599168, 239730496, 239861312, 239992384,
- 240122816, 240254656, 240385856, 240516928, 240647872, 240779072,
- 240909632, 241040704, 241171904, 241302848, 241433408, 241565248,
- 241696192, 241825984, 241958848, 242088256, 242220224, 242352064,
- 242481856, 242611648, 242744896, 242876224, 243005632, 243138496,
- 243268672, 243400384, 243531712, 243662656, 243793856, 243924544,
- 244054592, 244187072, 244316608, 244448704, 244580032, 244710976,
- 244841536, 244972864, 245104448, 245233984, 245365312, 245497792,
- 245628736, 245759936, 245889856, 246021056, 246152512, 246284224,
- 246415168, 246545344, 246675904, 246808384, 246939584, 247070144,
- 247199552, 247331648, 247463872, 247593536, 247726016, 247857088,
- 247987648, 248116928, 248249536, 248380736, 248512064, 248643008,
- 248773312, 248901056, 249036608, 249167552, 249298624, 249429184,
- 249560512, 249692096, 249822784, 249954112, 250085312, 250215488,
- 250345792, 250478528, 250608704, 250739264, 250870976, 251002816,
- 251133632, 251263552, 251395136, 251523904, 251657792, 251789248,
- 251919424, 252051392, 252182464, 252313408, 252444224, 252575552,
- 252706624, 252836032, 252968512, 253099712, 253227584, 253361728,
- 253493056, 253623488, 253754432, 253885504, 254017216, 254148032,
- 254279488, 254410432, 254541376, 254672576, 254803264, 254933824,
- 255065792, 255196736, 255326528, 255458752, 255589952, 255721408,
- 255851072, 255983296, 256114624, 256244416, 256374208, 256507712,
- 256636096, 256768832, 256900544, 257031616, 257162176, 257294272,
- 257424448, 257555776, 257686976, 257818432, 257949632, 258079552,
- 258211136, 258342464, 258473408, 258603712, 258734656, 258867008,
- 258996544, 259127744, 259260224, 259391296, 259522112, 259651904,
- 259784384, 259915328, 260045888, 260175424, 260308544, 260438336,
- 260570944, 260700992, 260832448, 260963776, 261092672, 261226304,
- 261356864, 261487936, 261619648, 261750592, 261879872, 262011968,
- 262143424, 262274752, 262404416, 262537024, 262667968, 262799296,
- 262928704, 263061184, 263191744, 263322944, 263454656, 263585216,
- 263716672, 263847872, 263978944, 264108608, 264241088, 264371648,
- 264501184, 264632768, 264764096, 264895936, 265024576, 265158464,
- 265287488, 265418432, 265550528, 265681216, 265813312, 265943488,
- 266075968, 266206144, 266337728, 266468032, 266600384, 266731072,
- 266862272, 266993344, 267124288, 267255616, 267386432, 267516992,
- 267648704, 267777728, 267910592, 268040512, 268172096, 268302784,
- 268435264, 268566208, 268696256, 268828096, 268959296, 269090368,
- 269221312, 269352256, 269482688, 269614784, 269745856, 269876416,
- 270007616, 270139328, 270270272, 270401216, 270531904, 270663616,
- 270791744, 270924736, 271056832, 271186112, 271317184, 271449536,
- 271580992, 271711936, 271843136, 271973056, 272105408, 272236352,
- 272367296, 272498368, 272629568, 272759488, 272891456, 273022784,
- 273153856, 273284672, 273415616, 273547072, 273677632, 273808448,
- 273937088, 274071488, 274200896, 274332992, 274463296, 274595392,
- 274726208, 274857536, 274988992, 275118656, 275250496, 275382208,
- 275513024, 275643968, 275775296, 275906368, 276037184, 276167872,
- 276297664, 276429376, 276560576, 276692672, 276822976, 276955072,
- 277085632, 277216832, 277347008, 277478848, 277609664, 277740992,
- 277868608, 278002624, 278134336, 278265536, 278395328, 278526784,
- 278657728, 278789824, 278921152, 279052096, 279182912, 279313088,
- 279443776, 279576256, 279706048, 279838528, 279969728, 280099648,
- 280230976, 280361408, 280493632, 280622528, 280755392, 280887104,
- 281018176, 281147968, 281278912, 281411392, 281542592, 281673152,
- 281803712, 281935552, 282066496, 282197312, 282329024, 282458816,
- 282590272, 282720832, 282853184, 282983744, 283115072, 283246144,
- 283377344, 283508416, 283639744, 283770304, 283901504, 284032576,
- 284163136, 284294848, 284426176, 284556992, 284687296, 284819264,
- 284950208, 285081536}
diff --git a/consensus/ethash/algorithm_test.go b/consensus/ethash/algorithm_test.go
deleted file mode 100644
index 3ecd730681..0000000000
--- a/consensus/ethash/algorithm_test.go
+++ /dev/null
@@ -1,815 +0,0 @@
-// Copyright 2017 The go-ethereum Authors
-// This file is part of the go-ethereum library.
-//
-// The go-ethereum library is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// The go-ethereum library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public License
-// along with the go-ethereum library. If not, see .
-
-package ethash
-
-import (
- "bytes"
- "encoding/binary"
- "math/big"
- "os"
- "reflect"
- "sync"
- "testing"
-
- "github.com/ethereum/go-ethereum/common"
- "github.com/ethereum/go-ethereum/common/hexutil"
- "github.com/ethereum/go-ethereum/core/types"
-)
-
-// prepare converts an ethash cache or dataset from a byte stream into the internal
-// int representation. All ethash methods work with ints to avoid constant byte to
-// int conversions as well as to handle both little and big endian systems.
-func prepare(dest []uint32, src []byte) {
- for i := 0; i < len(dest); i++ {
- dest[i] = binary.LittleEndian.Uint32(src[i*4:])
- }
-}
-
-// Tests whether the dataset size calculator works correctly by cross checking the
-// hard coded lookup table with the value generated by it.
-func TestSizeCalculations(t *testing.T) {
- // Verify all the cache and dataset sizes from the lookup table.
- for epoch, want := range cacheSizes {
- if size := calcCacheSize(epoch); size != want {
- t.Errorf("cache %d: cache size mismatch: have %d, want %d", epoch, size, want)
- }
- }
- for epoch, want := range datasetSizes {
- if size := calcDatasetSize(epoch); size != want {
- t.Errorf("dataset %d: dataset size mismatch: have %d, want %d", epoch, size, want)
- }
- }
-}
-
-// Tests that verification caches can be correctly generated.
-func TestCacheGeneration(t *testing.T) {
- tests := []struct {
- size uint64
- epoch uint64
- cache []byte
- }{
- {
- size: 1024,
- epoch: 0,
- cache: hexutil.MustDecode("0x" +
- "7ce2991c951f7bf4c4c1bb119887ee07871eb5339d7b97b8588e85c742de90e5bafd5bbe6ce93a134fb6be9ad3e30db99d9528a2ea7846833f52e9ca119b6b54" +
- "8979480c46e19972bd0738779c932c1b43e665a2fd3122fc3ddb2691f353ceb0ed3e38b8f51fd55b6940290743563c9f8fa8822e611924657501a12aafab8a8d" +
- "88fb5fbae3a99d14792406672e783a06940a42799b1c38bc28715db6d37cb11f9f6b24e386dc52dd8c286bd8c36fa813dffe4448a9f56ebcbeea866b42f68d22" +
- "6c32aae4d695a23cab28fd74af53b0c2efcc180ceaaccc0b2e280103d097a03c1d1b0f0f26ce5f32a90238f9bc49f645db001ef9cd3d13d44743f841fad11a37" +
- "fa290c62c16042f703578921f30b9951465aae2af4a5dad43a7341d7b4a62750954965a47a1c3af638dc3495c4d62a9bab843168c9fc0114e79cffd1b2827b01" +
- "75d30ba054658f214e946cf24c43b40d3383fbb0493408e5c5392434ca21bbcf43200dfb876c713d201813934fa485f48767c5915745cf0986b1dc0f33e57748" +
- "bf483ee2aff4248dfe461ec0504a13628401020fc22638584a8f2f5206a13b2f233898c78359b21c8226024d0a7a93df5eb6c282bdbf005a4aab497e096f2847" +
- "76c71cee57932a8fb89f6d6b8743b60a4ea374899a94a2e0f218d5c55818cefb1790c8529a76dba31ebb0f4592d709b49587d2317970d39c086f18dd244291d9" +
- "eedb16705e53e3350591bd4ff4566a3595ac0f0ce24b5e112a3d033bc51b6fea0a92296dea7f5e20bf6ee6bc347d868fda193c395b9bb147e55e5a9f67cfe741" +
- "7eea7d699b155bd13804204df7ea91fa9249e4474dddf35188f77019c67d201e4c10d7079c5ad492a71afff9a23ca7e900ba7d1bdeaf3270514d8eb35eab8a0a" +
- "718bb7273aeb37768fa589ed8ab01fbf4027f4ebdbbae128d21e485f061c20183a9bc2e31edbda0727442e9d58eb0fe198440fe199e02e77c0f7b99973f1f74c" +
- "c9089a51ab96c94a84d66e6aa48b2d0a4543adb5a789039a2aa7b335ca85c91026c7d3c894da53ae364188c3fd92f78e01d080399884a47385aa792e38150cda" +
- "a8620b2ebeca41fbc773bb837b5e724d6eb2de570d99858df0d7d97067fb8103b21757873b735097b35d3bea8fd1c359a9e8a63c1540c76c9784cf8d975e995c" +
- "778401b94a2e66e6993ad67ad3ecdc2acb17779f1ea8606827ec92b11c728f8c3b6d3f04a3e6ed05ff81dd76d5dc5695a50377bc135aaf1671cf68b750315493" +
- "6c64510164d53312bf3c41740c7a237b05faf4a191bd8a95dafa068dbcf370255c725900ce5c934f36feadcfe55b687c440574c1f06f39d207a8553d39156a24" +
- "845f64fd8324bb85312979dead74f764c9677aab89801ad4f927f1c00f12e28f22422bb44200d1969d9ab377dd6b099dc6dbc3222e9321b2c1e84f8e2f07731c"),
- },
- {
- size: 1024,
- epoch: 1,
- cache: hexutil.MustDecode("0x" +
- "1f56855d59cc5a085720899b4377a0198f1abe948d85fe5820dc0e346b7c0931b9cde8e541d751de3b2b3275d0aabfae316209d5879297d8bd99f8a033c9d4df" +
- "35add1029f4e6404a022d504fb8023e42989aba985a65933b0109c7218854356f9284983c9e7de97de591828ae348b63d1fc78d8db58157344d4e06530ffd422" +
- "5c7f6080d451ff94961ec2dd9e28e6d81b49102451676dbdcb6ef1094c1e8b29e7e808d47b2ba5aeb52dabf00d5f0ee08c116289cbf56d8132e5ca557c3d6220" +
- "5ba3a48539acabfd4ca3c89e3aaa668e24ffeaeb9eb0136a9fc5a8a676b6d5ad76175eeda0a1fa44b5ff5591079e4b7f581569b6c82416adcb82d7e92980df67" +
- "2248c4024013e7be52cf91a82491627d9e6d80eda2770ab82badc5e120cd33a4c84495f718b57396a8f397e797087fad81fa50f0e2f5da71e40816a85de35a96" +
- "3cd351364905c45b3116ff25851d43a2ca1d2aa5cdb408440dabef8c57778fc18608bf431d0c7ffd37649a21a7bb9d90def39c821669dbaf165c0262434dfb08" +
- "5d057a12de4a7a59fd2dfc931c29c20371abf748b69b618a9bd485b3fb3166cad4d3d27edf0197aabeceb28b96670bdf020f26d1bb9b564aaf82d866bdffd6d4" +
- "1aea89e20b15a5d1264ab01d1556bfc2a266081609d60928216bd9646038f07de9fedcc9f2b86ab1b07d7bd88ba1df08b3d89b2ac789001b48a723f217debcb7" +
- "090303a3ef50c1d5d99a75c640ec2b401ab149e06511753d8c49cafdde2929ae61e09cc0f0319d262869d21ead9e0cf5ff2de3dbedfb994f32432d2e4aa44c82" +
- "7c42781d1477fe03ea0772998e776d63363c6c3edd2d52c89b4d2c9d89cdd90fa33b2b41c8e3f78ef06fe90bcf5cc5756d33a032f16b744141aaa8852bb4cb3a" +
- "40792b93489c6d6e56c235ec4aa36c263e9b766a4daaff34b2ea709f9f811aef498a65bfbc1deffd36fcc4d1a123345fac7bf57a1fb50394843cd28976a6c7ff" +
- "fe70f7b8d8f384aa06e2c9964c92a8788cef397fffdd35181b42a35d5d98cd7244bbd09e802888d7efc0311ae58e0961e3656205df4bdc553f317df4b6ede4ca" +
- "846294a32aec830ab1aa5aac4e78b821c35c70fd752fec353e373bf9be656e775a0111bcbeffdfebd3bd5251d27b9f6971aa561a2bd27a99d61b2ce3965c3726" +
- "1e114353e6a31b09340f4078b8a8c6ce6ff4213067a8f21020f78aff4f8b472b701ef730aacb8ce7806ea31b14abe8f8efdd6357ca299d339abc4e43ba324ad1" +
- "efe6eb1a5a6e137daa6ec9f6be30931ca368a944cfcf2a0a29f9a9664188f0466e6f078c347f9fe26a9a89d2029462b19245f24ace47aecace6ef85a4e96b31b" +
- "5f470eb0165c6375eb8f245d50a25d521d1e569e3b2dccce626752bb26eae624a24511e831a81fab6898a791579f462574ca4851e6588116493dbccc3072e0c5"),
- },
- }
- for i, tt := range tests {
- cache := make([]uint32, tt.size/4)
- generateCache(cache, tt.epoch, seedHash(tt.epoch*epochLength+1))
-
- want := make([]uint32, tt.size/4)
- prepare(want, tt.cache)
-
- if !reflect.DeepEqual(cache, want) {
- t.Errorf("cache %d: content mismatch: have %x, want %x", i, cache, want)
- }
- }
-}
-
-func TestDatasetGeneration(t *testing.T) {
- tests := []struct {
- epoch uint64
- cacheSize uint64
- datasetSize uint64
- dataset []byte
- }{
- {
- epoch: 0,
- cacheSize: 1024,
- datasetSize: 32 * 1024,
- dataset: hexutil.MustDecode("0x" +
- "4bc09fbd530a041dd2ec296110a29e8f130f179c59d223f51ecce3126e8b0c74326abc2f32ccd9d7f976bd0944e3ccf8479db39343cbbffa467046ca97e2da63" +
- "da5f9d9688c7c33ab7b8aace570e422fa48b24659b72fc534669209d66389ca15b099c5604601e7581488e3bd6925cec0f12d465f8004d4fa84793f8e1e46a1b" +
- "31b7298991c6142f4f0b6e6b296728ae5fa63ccb667b61fbb1b078003d18d97b906af157debed5e6c55d5a61cae90c85f9e97d565314a2f9fd9e0c08430547d0" +
- "7cfcee3271f921b95c32a11596219abaa30abc62c2c72c6725078c436c677320594df6bcb92134c1b114fffec982a1f68f13a9f812f074b9fb9c78f2cd4c1c90" +
- "7ebf1e447f7a422b06303921e3d54f430584d849eaa4b7d652e92a5d659bdfc462adcdd7991e8c66a19da4ddb5390463d073941491859397f135ebbbdbdf5801" +
- "cafb873c383893390141ae385515504d74a33608273310c312ba468046d2e20c271a38cc0e3920b39705050e752f34f244fc23ddd17ff18677756a87671d4145" +
- "3aebf97e4890da1d645f41eb20da92a8537c787ce419580073c46aa3bb154952993142ec5b4fb6e8f108fd15fc618cd5c27b45a37ee6dcd52a4ce656c0f58604" +
- "717ec55f5e592355f1f20e8316f8fd77243734a8b0f50ad93c1d95b5b0482afb22cd0667d935bd6053d7198b54974e10d100df7ca3ec2e0bb5ccce5807b266e0" +
- "8429d5fec2ae6ae1cc7c5efc27f19c89d4b4a6c5c0b9397886dac635ba37446ff528b582457a4fe7f803f1a47903574f8982d4a679b627396a4e97aaa12fa179" +
- "0d31ba52e9010bc3c26ace81f702f86649fe9eeda9ec03b74a8a5cf540d82e22af33ab893564397dfc4edd8b1677350df5b82ab61d24db95f58fd2d78afb49c7" +
- "2d2b1fefa8ff6606b8623829cc752ea37d663b945f3f1d48ad07b1416af252f81b55acd8f164da4faa9d9453721b3b795041ce7df7c77edc13865dbe04fee331" +
- "47daebe18c183c4a6594a6df3a4d2dc5e3811d805102c9c49286e3d12b38927fa49a7b0cdcb1d799f57118953e31c560aae213a1799d59a78ae68f0590347061" +
- "fc2668caf08f860452f6b7d3ebc1efecc2e1227d33296b1f1850360dee7236e85274eaede4d18a58b4261ce1f6a7d283dcf64e6d021813f82a566354445327e5" +
- "6217279b2393fe5aa0f9eb149d4866e1105106bcc221810ceaf053f2ec733d8a22f409c1baf955e50184005c5d55de907de97f5f713b62ae10937e1a7af6267b" +
- "d2a239e8589017197c343b81540bc26bc52bffd5336fb1da1202a511c7175014d2f500b9d9ce78e4b9f2b158d0fb27af352b6f78c129cad642fe909612c9d658" +
- "17a8d7f9195ee97201675a918e3cf520fdc19f92b7e6a3db806d4f3799361334082cc58a22ddb4e4f5760bd1667c177b26be325166c6bbed669a158fc87acd43" +
- "a2462e12578d72db6606f9e24ae659ff411ac9b31d696b8354fd08a591622967a14f8468eaaae3907b7818154ba2d6e4581589354d178bb6ae1c03651c44bbf0" +
- "e7fa52cb0da09508b5a444aed05a54f416841247a4fe36bd5529029e3adf78b105e22468ed775f4d0954504dd55f2c9b9e6b3a086370b2c0b6fec7efd6914e07" +
- "26627edb7a04869a874e31f448271077a7de3031cf81bdbc39848efee6075e0d65fa3a32640e9f0395cf7ec12139992aff0a54e0a7dfe5048b3cc03246b56f7d" +
- "3093538a7b87538d8792a665bc589373621b2f3cf47d2c1f8f580fe34d79c6b2a66323ce89808ce0e5cf77700f5a4446c4be01a310e8f7c7ebefe756b0044886" +
- "a0477c88ee8ea8c71503748a4cf9eb40ad5c1c8accf7c63c0f43a94ed2b8a5999df3ab9b11b80de73310e036ca88668e640015fcf9cd18eed05517d54896f43e" +
- "25e7931b44872c4e4183500e0e8c5103292bca1c0d6b0b00c9acce25d31204bb3e4f255c03a0a0916664e9c831b28b364078109a74411a11afb1e610c7d1c9d4" +
- "ba5e10d0ee0da409654d9e7308395e17caeb9caebccb0192679866e6f2ecb5f10044333bb70d61712adb6d74cdec6918ed9a71d9925da576a1e6f4e906a5cd5f" +
- "0e94a25e48a4141e4e2770144b63e2449b0f84c82879f34d78440cc430196ba85a213fdac1bcf279a46d7592fa29a876bb7a2efb7081365522a3f06fdceaedd3" +
- "cc0335cef9ea570733fe8799bb1b918aa7732b4d175929d80c7844a78e19f2dc6a6febf648f49b40320b0f7d784e7f84e45408d70b046bd01cbd8fdaf606fcd3" +
- "02f4e5a48ab8d13e93a246adfcc94f3109e02a7a969986e75b6ced6bf2d11a55ab77488e131b65a06398fa8e384dc90d875584c9b17cdcf2da5dd72a461cd07c" +
- "4a955c5fe48509b3284476c42247e086de7d63839b7358cf4ebd9edf9ac8b6fd0c096166405de19c51e8785009d30feb67cdb8ff9ba55459dfdffba8c022e26c" +
- "0ebd399e4b76ccb4d5491a862c2c4d8cdf1461a96c9b98150e170efacec980edc00a2c7f6d7c6bea3075627e1eb386a7f1ede1059da81a4ac5cf35aa173c88c5" +
- "1818dc0fbc688b68b82ddc225b6c87588e0c680e303e737c82a13e34be58df8b0cb336aeacc698c79e7682ebb69e6cd6bdc5d11790c96afcfa9290f39515142f" +
- "5f90b938216a1d14bc049ce3f0ac135722208b989d2557d3520c2186479f179e50fe5b125b8d6638a65047729c6249b9b2c6381c9103c97d1b389cc9cdb31c21" +
- "8a2eecbf4b9ad1dcfa57446cde88f96563a544c49d6f5303a84a1b7cf074fca78e67e72c9ffa0c542fb646418c6434b16b771088140725cf2dc723c1a975c4ca" +
- "8a80e633721274907353f51e95952c2b403b45750b42ad10961f60473eb54616f61f7b038c5b7eca475d6a2b844994a9eeddce4f7bb49782e50ef78bc13b85d1" +
- "9e956f47c60823f3d1981413cb78d309f63a844694861b11b5238961c71f61d82daef6795734f0961e92b9167c57f48e91693e9656fcc6e88f9ce2d373da26bf" +
- "45b3dff50211fec72387005a7e04828e4ae7ddd10fc2332acf5f1b0f67adcd863752573c2d24488857bfc58c41af45be7641f5cfff611f184612fc0d695866f4" +
- "2b396b1d9881f442c4a995f4b500f02d4ab4b53ad6e01776ab0e244583f01301203a1515f3dbb73906014e36c7143bf882b005f0228ca0562623893c8a24b7c6" +
- "4c2c561912010c121b5c3a1e35e75c0b094731e9c0d6acf5a2b1e5b179355525a175640579705f898feb98bffa25633bc126613fa27d2ceb214812902ada23f4" +
- "367a78655d0d2276095c9e83dfa79153730103963499c367c5621fecfd0888253df82b3d5716703ef92594cf269310b9e6c892c488edb3bba1d0b216e92f622a" +
- "7f8f7f00d2926d81a4c7ca6cef40d240576a8d5541ccf561c8e0e699925d20347ba7493ed6e182cfe3b633e70b3ce3a0d90813574f6fe329c495d3cd46fd5d7e" +
- "bdde58d7eafcb134a9a5d3e5d66136e8c9b5d9ecac195dcc44158941c9fe2d87db52a7ddcedc9f82ec160901cc36a9c877af80ceae0563dfa75cabde5d7a7c94" +
- "9f24bc190f7c2045368356474ff6eee284e7125d1c5f9a036fbde24cecfd3a30481ce077f20cbcb31924368296abf66ce4834102cf7cb949d1b4c6faa6d006ef" +
- "21379cead5d5a39324d41555c46e0b42a1e871143e47f8e6b3d794e75d7a43c282732766d856e04e666ea346657b157404b0fc8534a2dee8243d40a5e37609e6" +
- "18bc1d52b91a7623aaf8214a97e4c8c5d860b31c3792b129354a121a7a7e42b50dfbe3ab6590769401eb280545547a43c3a1455355d5d5fdedccb472abfe75b8" +
- "f5e7d62b0b31553d8d55de0c3c71e6f5a2abba6fe81e9a42ec1968f235bc4296c1ac5df7430917453384450ab56dafa7c7af764cefa3b0bc861c52ae27692365" +
- "9d7d9ed7609958884147acca867909a75bb6a2c364debefaf98c7ff70c7f4acb5cdb81100fd79a48c5139f8bbdc6553b509f1eb0f5d5d31886a602cd669b3f9f" +
- "59195a1fa2bcff1170003ba1b2e5e9ad7f2bfcd0573d0f2be9d8fc1773c3a63a2b9292cdbf9b4515c0b1d51772e5ee95303ff493d85314c989e269df4ec3a916" +
- "40988a11c6a4ad96f7d0541a150edf444c2b1672aa6d37564453b835c2d39864c05c4366492fc9164bf73795410e7aae8206430403357fec6389142b4976b218" +
- "d70622b4098e322f73020a0d045f07668d1e512c6eeed6e2befbfc3a6ac64054396df96fd41f7aeefa0ab1f66bb52ee1a1df066f365fc43ff0800b0398b621f9" +
- "a415895268505a81517c44a56dc94e76580fd107dba034bab9f4f4b8a9f881ff34c60c406c47b6d4a998894401006aa88f328393f9cd55a2b4d24db5abbcb05e" +
- "20d392f3feab3ca12dac475eb3690f2bf9c699d7d90900d9a840068c8cdda2ca7a27bebd685a26eb01a768259a65ab4d7efc1811c87a5a1f4e5038f6b3dc74a6" +
- "b46d9ac58d31bfc22dac23645aeef819329c9419326f22e1c24c53457baf62ae9b92ab5f999d4ef0ccfb5a21b7598340eb2d399ec81588b6a674c5a1e45aa238" +
- "c55cae8e1af0f5d64ea378b8afeab263a3a2e5c71cdda4cdb824ae55df2b0260aadf386275ef57781d46f6da3d0b300ea68c14a620c25b5df738c54aef04d63b" +
- "7dee06cd225e9ed00e78abcddca5a133d8b5e0d9b287e6436014c5da729442239bddb7ecd3fe34e6f6e530134a03ef45de4ae4fe3bf507f16cdfb9bab1fc90e8" +
- "dc565e4a7ead95352c5a894661e5d82c6d0fc47843d5cab12c4013db76c90734cbff34c73d0d873ac9b27b417665f4948469865f33179624860604a9aba2ceb1" +
- "68e74b6af3d1ad0bfcac4180ea844339a034b6b2c3e2f61f0c7afbaa76c1ebe93727df1d3db27d59a5cf51b2baaf637b6eb8a20302ef9af0b25dbe3a5e74331c" +
- "6b0c8a0cf2a2ad72d2e19797983e09468ea95270dc229f2fa084dd2aa96e722016504f6d82508572d9c30711c3ef41ae3ae2f36cc6f5dddbcb0b40d9499b24c5" +
- "4cd36d2927a6b9d57e335e4fca7f0f16887711a8c1ffa0b48bda46c506ca444b7c23e2c8dd086c2a87283d5fc0d58e9a384106837318dc84ffe65b52d4cb9141" +
- "2672adfe139c3327350fe3cf355a08c0ca43598a253833e114243c5253077d65643323f5d69b3c7902d91bab7a0928754e7d80afab8d48539fcbe0d9ab83b4db" +
- "43a6594c4071df2ef35acd1f53006a570f09104f1776b26a303e2aec93a00d2fd8c952d1ca0e54504cd9b469be7c1e71557ec31467ecc773ee817b17c4418712" +
- "163ae86646b20b80c85860e828c48e88f1309c9ff018e6a95f4c1178de6a4f9f5860039511845da7d8727b5d824ba2502d0a3d76ce74372db77c2050c728dd65" +
- "b3a15da4f1e1e41c3c2acfebc5618e5e923d503c43a3421d2628ac037c5ce13c74c4ee14d47af02323872f6bf2e8bf09d017ea6e8ec4d3f9fc4fb203ac4e1663" +
- "756b11629224c676713a42b1f43dfd6362876be1c4865928688765589e26c8dd8bc04ca18d76ced7f786cdb0fa5028ae53991d5b7b45f93bbd50aeb97300f04e" +
- "69c6736f270907f6a7ad76dde0a365183a961bc8385511e0f22ce0cb8f3c42c5d3928621841e30285fb625294865409267dbb0cf91730ba2fb1088fb79789a54" +
- "a856311bdca5b0ac0e95fbc79b11c561dc03ea82db182808031e86ec327097143ee761bb62dae8a9f4101fabcac1fc87b3c2080820582dc8a7a8287364550013" +
- "08053c781b3eb279c89e817fe97103b6930fef2dbf7728def389403a4283f63ec04ae953784b749f0ea6f08749781cd17fadfd15bb197afd2f4e0a8aade2b1ad" +
- "5100cbdce49ed59658993c00e06bf57c0026b97beadc30cd25f586ff03ab40fcd731535c9a1ccb2c99dc7f8815feab767e1237cb069981f28d8fe26bdec24218" +
- "488e6086c0ab0efc5d4211fa0726b3a11387df9bb62b863a7b154ca390a268f5e49f50dec45d24bece2a06575cc07a24bfff017d7445024739efb050ace5f345" +
- "98dacda843d4ef5bfb2c931dc16ee3dd8b61a6f01d9a7de8bbb6d89ca8695f8ef8bd1cc6e0455848fac7691e6789218790270aef40fba114557fd88ff74fe8fc" +
- "476d9b9665d7e45582540710ce92c8dcad1ad8c05642a23a0d58c02db37ae1a0e70fbc5f71b1300fe398c74cbad37fd57379f58dd3e2d3de6860a17acf3c9321" +
- "02eb4f9d596497bd849c5bfaf59a83113ef389b6896aa4d4665504a22486299993a9987b2bbdb47d59b3f6ce5d2c9f9ba33b5f0760388ca7f8d8af07c1cd28f5" +
- "67a417a59ebde4bb9867d4e7b7b79dd8665602c029e9a16a7718efde3d034f13f7f0b9af1702c335893526cb87afc2100e874b25c37fd666bf34bf6a653c7cf5" +
- "44e1fe0286a6723c7d33461dea380b392dad68f79a78fe1b785d7833ca0d1cd68cff472991a625e3099f3ad2cdc99bd37eae35353cecf424098389dbaf1885fd" +
- "7db54909a92ee879609eb2e9ef4de1f4338f0df53dbde486ede944ae69869fac701d4f1f48c83757b470ea28c9de2ae5f1ef5d1c91118d16ca0d80b1baf3d314" +
- "056949df27a09eff70c9ac50b54feff67a165ce5e22ba2222defedc7c39e02356c3553e97524c1506441527da4f5de121142ccd494f83114b3ca2dc37e15c752" +
- "e2faed7d50254124d68f67e26f4f50c9f0edf6e58b916ca830c4e33801dc11039b18292b87b08f4f2edbaaacddcdab78ff3a0004f86034080f2ca4394b14aed4" +
- "31e38e3605e6b257bd772954d2f4b846a17df7ed6e5dafa33964d9e56a07a19898fb4dfe8b2ddbd11fa0013e6ebc0e429a5166a43d1ec45557cd1fc1bddbec4b" +
- "2e9ca26395394c96395ff8f557bd0f7f805c09f0c18534585b7c7fc1d07f145372983ad77fa804fbb7765934e72beae0929a87cc6bf7f6c242ff5db2d4d5541c" +
- "8c366d22e24e1da5379836fc0eb484683285f99f178b98ca170464bdff60ee04584c12c65408102ac6dc7d10bf58a7d770bf1b3c636a48f934f6f4bbdbcc75d3" +
- "fc551de3ebaf77006707f6120b3804f2bef9b4bd59f5996610c09ba3953994d1b78a9f3bc3bafeb52266f10755ea842e5b4370c937c09afd34a092ff9b98b4d3" +
- "518bc2480d4b132455b7f03774ad76b83b254742117921c31cebeab5f39c145f7f373a5603d17dd95217ba1af37a0aa95b2992efcd02d0bb4ad08ebafb31440f" +
- "1ccfce45882b547ee4bf6ec7ecae11ed79fc63b03636c8a14ec4e0f6877eb658d839be2eac0f10a8948e74203f46078ce66aad2764ff05590e2ac7a8dd8b3036" +
- "901fcb7ff3369ee989a28e34b9b62e1e607d14da3049ded1a4ee50257195eaaef995bed79ec85111abb522aba1fb306869a1ab381e82943f35345bb5502bb90a" +
- "e2a0af77526a84754ee4d600ba7f8ac98705ee687bab949a081849889d7b83a21a3dd34af84dc2b9458230ef0ff44c6398d3c6e48e5c09c399ac4d4c7b285549" +
- "e0bcab7fd96de42f072f1cb633e3e250745321049d0d7ecdef4636e70e94c8414e76ecaedd6ee0792e97de11e7dc1e1e1801ad68f9147278e268d7ad76c5bbb7" +
- "98386fdc13ca8c77569d96e0debba8ea3b751352136c8f1c8d611a69f1baa9aa4b9d0a476ebd5dd21339ef7f97f09aa86b69a7b114cebe17a6b0e58bf52803d6" +
- "fd47d9eac3a988b51e9bca95c546d49367a3126bf8ee44fbd0e77611473a1d3d2de0ce4ea54f9bb7f9dd0d0c065f613a623fad43a445eba294fd00037492914f" +
- "b74d10d0b97a0cf9bd3151c3cade89521f36b6fe1aca7f352e79a77d063da5337a7c88d90e9e566bcd97732baa4459305967c2f65adf1a4a4c7991cbc99df3b7" +
- "14335a107a97a4ab104bc94fecd1d003fe6d2f22e717853c449881c4ccaa7e7a1e44961a14a47a0d0aa1b1493dd02760ff4d31fbddf5941f93c8e5925d1886e2" +
- "8761baef8610fa6be016c8f4fe65bb0f335152d5e94893e274f2ab90118e4c07957d252963755b4b638ffc0a734fbe6e32c2e304b10a46a4eed330d101c4f0ae" +
- "011e7f94b89bc0eb9d358a6548b3f0c47ccc3c2d986d381437c49041629c6cbf61bdf0825efe17e4abef128003681450ceeff0e28842895d8e338c247abf81cb" +
- "7260fd45042c1f6c630a4b195579721392e577fbfdb9f5b003a8b9a6bc15ae754f6255131a0be600c7b07e2cee1ffe32aad4687f9a429998ed9059a99fd879ea" +
- "c4dcb55f4551bbb70c187cf1b162e2ca4a929edd6ec9260877df652622ae073fc63c0d8522d3882ba888ac50a67a68fb6530193f93165093a1d8132e87d8887e" +
- "ff2fdab0fbae6ab9506dae61fada4023133d166bcf1956aedc3237c77d1c81dcc84ae957d89367b0fc950c78e58f2cb9c4fd93e16b94421fdecd46c3ff55592e" +
- "4374a7f7d8ede9923115770cb416071e8f102d4ad78b891464ffd14f589c238c8e13a4e2a81744d179e7d3ae36cffee75ceb99633face85d077d0c15b3970930" +
- "075dc08b420e0a545200895207c5a746a18ce9ab64a50d3dcf44da857fb65e4efc29b2b4d532dc6a03b699dcfd77030a4945e6431273e25f06ad8f913c2a9eb7" +
- "59d8d3049868d337e451726d95c4cf8baf381096fc9b62679175dc8f14e52f8b99f212cab6544414c62f17c8323256cce95356dcd351e34c7a1576b17c1406d7" +
- "5b8bcca8099a1993df1541ded61b876ae83396b191b719c4b1cbe50d73fc13da352d827ba09aa7fdfef3e4e0273c31ef4fd38b93cf64199c3969a7c09dd5e0f3" +
- "ff93a5a7db9c2c1ec25e3060bcb5481c6802e1eca78f31862842ea08e8f92b8e52856c4c9fedd0bf20e386cfdf926425f7756ff41fd3567c5bf334e96e3f492f" +
- "74bd0519d8d98efa0b427ba681b8b1be8fab041ff084dc5f8c4d5d48f481115d7e407ad8a6034f481c2be86f8451980c3aa83a3fff245d90d13801a54527e97b" +
- "e392b25867882d43e3819f4a8aa380db63954ec23d2f0c11a7aa5bc7a3aedc43ecd3b024280ed8843399e28deb954bfc11a3197fb14a9c9a895859e390e9586e" +
- "2ad21da39bb9ba79a62222d228a0fc96a24e801f00afc3f98d2168a8a253f24deffe461f6313de9b433e1d2e307239c0e3fd5d9fe4c8352c2c6797b1737e93fc" +
- "14d411bc69bbc9d78cf91734052b8aa1dab348e4c243b8e6d623865c135f807de8d5fd88f3921327affa37066dd538351bc4ec52eece88856de0a424a87d062a" +
- "f68cf24db37dbaa8e8e96a812fbf32ccafdf1b9d27f11bea23df02143bd09061a881c010819a315a5b6ee44b3c60979b3f7b41f488b2429d49377d6542fb0e22" +
- "d09a0ef5b81aa7c8134c0aecdc7a4f9228559d0bb826d30fd77fe0f834212647ce61e22fef0a1c10eb4177de81c31c12054a15f81b605619f3045646110673d0" +
- "b2d79d80577fa43284266fd2ed54f9a3b9df3509f79559c5bc51a58521bfeb2f95d8851527b7ea47b92a694f6ea2b67dc2d4f506d11d2db32c2929cdf5c8816b" +
- "7f0c310cceb7ede08d5965ed2c7be6c0a317251c7d31cc4a15f6d7976a8a1e6a2f386fe0071d43a50bd0ce5e864a8e449fe9600c6e4a84866879c490de9f9d46" +
- "3f22708abf34d3e180dbb6005484a6afad373838cdac335f05c034e3090b2fbaaa53fa2db1f96bbe141d570f17363ff98672500e16994b79be74634755b09e66" +
- "f1b37e338c946bf85e06c97e31dbddf257d58fd10468278648d86f38710c2ca0b6ea7cac4ea0e2c49b96bf1998bde1b3d38aa853736308e12b4a0d467fdb8a73" +
- "0d810ce45518614bd5845f58a9835a5cfbe745f45ef59ce9a677d10d8c9f6294f1a0565301efb3c6610afda35167150bd326c77057e530c213da63af3e6a600a" +
- "d87b16ec5cbf76a13764f71b3e7e0c867086ebd9fad02e1d747030064e071a13da4758cd0fa20872b3dc350f4cbfcde1b68a97aca41e32207b40beddec412c0e" +
- "c75d87c6671ed94bda5170aa2866509161c28d550190675f60139a7b460469f3d4829b3c65f5d185936582629160522fcfdcc53fd0dcc8fc46de11d52bfcc5e6" +
- "3407ecbbb682cc1693d6543756fa4e068e92ae1a94924a1ff6891361e5f262b7d3c3a3bc2866f54e6d03ebd5479afa3f424077d51668cc60e23b35fb0222ae22" +
- "5223ba8a8c416b68c8853022d150c951f06f8f85c2078d3035b8ac3ae984ffcfb024431acaae8bfbeb981870f9ad6bbb88d7d5ff34ba21a44cbffd0aeaa435ba" +
- "7d40d22602e807ac9a69db514ab13248133142cf03fac999a2b185f34d83fdb495ef042d4a5e92f2624193c88858d91c0812b18fd67046cf50635e6ab1ea9ade" +
- "7b1fe783dc5147f14f9194cfa92c03a0456f4171f9e5c156fee1c607a1e9e06535f2dac49b92ddf5fdacbf88a062bd7ca5439bae645100121e598deee6043baa" +
- "85cc0d727f08d37a766a55a9ca21ffb6594fb73f9aad15be4a64bafddb6c85d00f7bb5705d9e56b410dd80df8b087b6d67c7ca84eff2ad699f901415fab21343" +
- "6351a9bdf83b440e29f3950c7e4c49963ab109686d78fce629e9207db2e17eb5f02f01db6441002d72c06c6c6bbcdc0a7443589ba29909a5a78864ad51e1dfda" +
- "14782d869e4989ac3c5ef0aa1eabe540e9e7cd4e8eabe25b07f300a134a92718186f085d5c10a711ed0e574bf7550f6bccfc3c094d6e59619bde9fd892af8ef2" +
- "50e1cc3afdcd9c84ccb97344542843028b00064b0c3d18ac0f0703fe6f9683d40813abbb883e164c5797bc1555338566cf8cdd358e9fcb0e93f08f7ae06a5121" +
- "c67a231106ad8fd42f0798d7185c2de78b8b76c10e82272a405212ce3b904f90236eeea02054953b967cb614e8f8ac49b977152a52df981c86fa4a92f7f70eb6" +
- "cd4eb65986564039b0d77f8bafedb4fcbf9c34b8fe9c5fa87b0785c118a8624498fb0184a0dbbfb16777579e1964330c12e494449f6aa5cf69ec4a32054be553" +
- "6027e0d27c7044abd4c0b8e43db703209037efcfd08944647a90a1ab0c71011753354990cac5a472fae44dc370aac8131ebdf31456a8484e7fdefd268cbf5cb5" +
- "85ac615039d3655b1348fc0b3b078ac41cbcaf6aaedcc1153bb8d55c307f45405ad6a959abb37bf8891c8dec79a9d7ccd9b791cb60361d4a28f33ec0dfd13fa8" +
- "e0b9b29e14bf36f5047e51a39c2efcefcc156bd08e46c5c1000a3cdc2bb20713e19d6f492c40e51eb93628cf85d07041ae5353e7decc824cbb1db8ab3a7a7fca" +
- "ff04c2af423bcfb1864ddc864624b827ddcff2a2f8fdb7a3d86d76e72b4f850ec1262d8fc89e7b12e4cc618afe6a2bdf205075c2008f93b7281d80180199409c" +
- "de850d1f14ca0ff960f69772385cf0f0a0f47cafd5489ea4fd8b68ec7aa539b942379139756c95bb90818842cd43511edbb7577ae469f46728b13a61e6eede06" +
- "3a4cdfab5ed590feb807d55d76e518d1d74bfa6704f7c8ccc672824b4d5ef5fa5b3ab8fdf2b6c1753404ba35b76aaa931a4e0e5ca7e440524166b23e9a8be9e8" +
- "635381f6c9086802d428fece81395dada6b3b866e905ec00ccc4fb9b8415dd15e443f84b7220e3b28700ce3d88f9c6df2afea39e0ead537a50ee11f0c247ee86" +
- "d4b3074e8761de4de611c409c6d4c369c2c11742a7763f6550edfaae49afeec33353a14d2ae60687dbeefd2fe29689da6ae79d7b06042dfd25a68bde9182fba4" +
- "1ac53706a8b96535057fc2f99ac84a9cfc6549920c3e2cab44e48a08e77207b6a95b2f6179d6dfd6c2d9e3c91106a7a687e40bb2a1c5ccf566c0e31a0fdbd0a4" +
- "f270f9812208f939efd9698a8b28ce9c5633f18ace7ab0a7550d9e7e26cf62eef49200331e19a64bed648b5d18ceb389bafbcb3f280ba78e4cf03b053f2a5f08" +
- "3c852452837138004073cf6726143179386279f1a8f15d44876c19bf6c2e2992ce6056191bb1a386f0e1f6f249495cff126991c6560e3f613e56525c0c49b5cc" +
- "2ea4e736d83480f2b45d7dc840b849887f54a2aa072e72e3fd0db34e5cddb02221fdf2a40fb6ec271ba3a09de8dc73c24328c5d9a33ae0adc9874902f25d5bef" +
- "4d85914557e2983c93fba16cdd4bd929e878b5d51b142b6e9aa0ce84871b7b03ee6cc13251e17547c2d20a7d4e948760e207e29de58a7ccb71b87f99d79837db" +
- "d0f293ad3d33ffe91435598e8a4584b7b7ef5b1a895a2827b4976f81d335e4aa6feda3539690899619a4cb34fdcbbecf1b8b38cec2ec7c07ce84ec3044f49656" +
- "28fdba8971585afb509526640d36425777b6ddf5b2a49d795fdcf71e57fd35f29fff37890541b6e152f14fb6ea4c70a1b9f159d02ed895a68dcc276f5d5ae83e" +
- "47c021392ee22a398c8c73b3446d61562b3ec596036959aa645a65e5d24f733e142ec0e184b72a2adcbe3913932b2c9503c856a7e989d24f306e01e99268188d" +
- "f858694e297803effeb8e28bf8fb63ed6787acc2c61f509e19099607512d40928a08e649474a43728b63523175fad12ad088aade0c1e20815c7c12773bc959e8" +
- "640ee23eef2b1653ae8918615b45158a01be5a5f39a75a7c6cd8f1f6b463516539771ad251d5c2d40c5049877765512c44e58bd3b9ac3a0ac281771097880fe2" +
- "c9516dcd6f1373e1e8a52fc485d104004dcc839fe3d120f1432b213388dd37980ce8238c87a70d5abe95d78d696d2436eb23a8f620ce74335d5e47f6524b11c3" +
- "e22288644b539e3ab664dd5fd6bafb02897aab35adaef204f82d9318b22f45b787f5bacd74b01d23537973060868a47f2e3a45c1d8805a1d657f2332af8170e2" +
- "9435d7540e70e92a8c8794bf22d3e11d54ff2d48cbc7a1ac3cecfc48f80fe521f6852f97aafa0605f3e7084b15e61a74869512c9c2d84180686ea07b562cf35b" +
- "5a0ca529481ddbdba9c60729f821dc7a5a8b5c7eaef1ea7927d455a702aab538e7441933c4fff2d27de5659d6fa41f0ee72bb13a829839267f3a7b51a81a85b0" +
- "d737194d94e1bf8173248cb057cee19eb5e2cdda38c529298f3c4d3b95400198063c5b27e9262f9c66425c65568a09035bed9cd55c1f2ec4becb6b9c59445398" +
- "ad5b7c85142e713b6dd32493dcb817c8bcdbd728e325c25c5a14d764b63f960d1e48a0bc7f4d2bf51060f83b1d1f2591c6a9b79182e686b887a2c1461442e2f9" +
- "16e8582e298f87ca95a8052df33af20ebded7bb1c528920233d1aca3b3789494d97084890fa3db0ea7eb561b0087c4a90000db41ea072613f91ebba82790f33c" +
- "fd52cdd92d2ef1246911ef1dd82ad083881b72a08a40ee55884380dd136a7c0724cded69c6abf1f156b14ecd7284abcbf66522264145ee78ab0ef0d2a74eb390" +
- "10946d5efefb7175164e96621d3f158de8b57956b8b1155c35b32007e47d915cb61dabd556a370537737574741fcf9a8a23f7155bf1f0e3d3c0d2088d1191d9c" +
- "9c974139303f3dda55a70ab4810fddca3561114969d370f4e6bad60a53815eab1c4613854d04ba8b049dd7ab1a935c728299d1502ff9aa3fbb356f87f2a52b6e" +
- "947dc79b5fd211ed31dee722d3fd857f43aad973fbfacb7cbfe1b2553bdc76142ccae5b4021a4647b8d8087925dd3191a57198792b6f918de87a92705ce57905" +
- "f2dcfb67a20f8c77e700933432d60a4536d0959415f15f3eb8a788f1b19c497d3b68194e27ee736231835469d8bf0ce1717ecf533ab77dd97b35881d8eda959f" +
- "54a7935b1bc11d7f2e472757734afaf0463da3fad9804eb948e8d6444e8394b33f1c187618c7c02371ee6d378ebb7a20b6049a5504daa71999d15944ee82650a" +
- "2388f374f3ec3afd4ca58ef3f2588997d194a2741252cf6562e00cd6b5c5fe4066454d2b3150317694052b4dafb40c2f04c850e4062cd8f0af2da75280046850" +
- "77990788b27fa457ae9d0b622d18fc070f1d2661ecab529b5cb82f30a29610dc6a9e93ca9a2617ab0109957a45c1204e5eedb8860c6f4d57122060f39a4194fc" +
- "a285f1e9e7a75cc3511b8cb4865719c2260a630845051876e7795bba59573b6ce5faf7e5708eda7be25dd49c8cace4c04c541074d703e6601e043f6c63a0a371" +
- "1a381f0ff83d136f4aa29de266169ce5b3105cbfeffba370fa306a93830e3c0519a495b8b9f4b72078e2c45421b4b0667f903676a1339c70ddd1a90dbd21853b" +
- "2826ac3fa5add5073c634d4c5e87db0efe18638ee93c460257e52aacb8600ff36739818056110b2e974a1959e3784903aa97b0fcd9264f7d8f6bb5d8b7d9f03c" +
- "4b643955bf7966250936d4e7d651712db5e695a6a36b5e6f56c651ff737042b5bb73638e21ca6ce9a3e63fbb1906675d97001d7ee240d277d62df18acb169677" +
- "963d231c5276bdf5767ec35fbedb062e61c23d759aefd287b2dd62a0d6f0518d90b3c1756fde50afd33cab395ddf3cd538b9ad8862a199141331c63110c9ddaf" +
- "fa3d6c63a1fb1b45529eace826cc29a1df5df327bb782e573c41864c18e6d31401d19719326e5c35bb50de7fdc67177a6a6015b4264fecba2360ab72ae8b060a" +
- "6c66c5a05782a15fe3c1833b47e3495d29f2cfa579fcb08f02fd064e9ef2ef5564ac6a43cfbcae7d79e9f87ebc2176611823c6624db11892f8c47f8c96a49539" +
- "1c18f821ecdefb343eae3fd98dae1ef96fa3527788543c0d06d9793579cc62d91dc4d25312901c6368ba81c8536c6287230e8f97d25f6c77366609580cf26a27" +
- "88502a9aada84a794d3674ae11cd1742cf245e9d9502dbb5b340c2a6c79e3607f6b47666e1ea991ccfbdf6cc41ede46d043bc4d3e5e6882414dc65d62f9f47b9" +
- "fb7b828a89afd6361ae458c2cdc82f459c54977072702ee5a4c22955b8019d8b8d91f558897c4b661f8e5412ccdc10c40521303c0ffd353a0c04cebca5622a71" +
- "192b144d0f9c5c0706a130df887526b7b6e0f358ad9f7d0fd4d87c5fdb29a7453388c0d009da0d4c47a5d6cf8363892ac42b6ce3388771f698802b4dbfd66aa3" +
- "5fa6a6f8b42dd8446324501c807b6e72cdd35cfe08956a52f86bb4709fe2980f62152dba3571f18fcc4c1cf7a25384c4b5174e93e5afc9b9f12db2bd505ddade" +
- "d670d0d71b9548f9a07ef98521961cd96e8f363cf3222336bc4baa284b5305aab47dace615c1b3f3fb1ee23ad9ca3f58b086d9169ee5b2d3c2831e1db4f905da" +
- "11e1fe79e3d48c01bd9879ed68391e4d24d6db8d6774cb8747e7ea368aba3bbf355386408af4a59b23fce74a5e673a1044db66ed8529a65462269480736cdaa5" +
- "0784fbd77e1c41197335b4c517af8a67eef5b7165c5fd6022cceed0396089c3985c36595497db0a0fcae478e4e4d68c57b93f466aae86dd4244633beaa8116a0" +
- "de25d2a54353b7ee85fee58ad4780a2957d69816585a64f65e75f332614aa6786d1a1432f6acde385d3d6e870bc968c60c81401726a958f0caae336c83a9523a" +
- "c174faed43ec67473dcd151506e334a6aaf1731dd3aaa831f934be83beaefafa11810e7eb140f4fe80cfba574e6106c1bfe9f0b20173a4ec2663ce0580df6daa" +
- "7966a3a8906677ab680025782c61b95cec6a73b5deb16599e6521f9c6c4cae0d9286566388d5181d6ba11c51a25c62b510d9b1793f3ce9f73ff0c9226c8aae69" +
- "5d014287df074a244014720ee38e3968557db00aa63dab71854b8573c42c65116e3d88bf040d53ef3165a5827c717179e2939e310be5eaf6fb75447ba98ce925" +
- "98e83a32a90eea848500a30eaaaceb307d37b1201b83a744468a1a52632ce5525c1fce5f702421e42e7cc4c61caed539dc09001cd31a8a2b48a783c36c56a3a2" +
- "d50de42c63981c86642cc92bcceeec8a66b4afad3c1be1df4bcb8beedd442c281080c94692bf453196ed1a66a074d56a8e7f60238ce18358373efc173e70c691" +
- "f832e1139bc04e6258d77cf7529af7ce5eca28ca5cda818625c0bb5beca96d99fc9b6689a7771434aa96e23c55a41cff7b7b718df58260b3bc91762034debf49" +
- "7d8ca8d5764c52bc9665bf86db5407ee1b786d90f8d7772597eceb98f0121e3996e771d951568a162f6b71042998db8208ece5b8b0c68107b8e2079765b0d8c3" +
- "2747597072756208b0d84415a5334a88d916bda390e26ccf3046b860e7ccbe22c48cd3d3f51bb65a98ace74d52613f782db726babd02780b8d620655bf9d551c" +
- "ae9ef3056e3d24f5e7c3105c4857492fedd244ac2b8c30a874c1446630b042d819bc6b6d2d96829de903db22af706e93c5ae876d72c633600222443d1765bc62" +
- "a8a20c458ae55bce8cbbef753cccc5e7d929408d6a3709467373651f0163128aba4142ecc56ef11ff1fabf5eaf6e955b4252d1350e9002300a1236ab2fa0ed34" +
- "c9cc7dc1d4f09bd31296cec1493e725b57cc496fdac4e8d26197376bda7f74c0965c4352bc9d5c731df04f9908899cce6ec3afe15210d115992b2d95308dd032" +
- "13c557ac527424c7db02475a2fc78b88d022d212c3d02d5ee490e2436e6e572e8a1330465b9052f8a3de01aab76662d18fa3d076fb77103fe432d549bc861fcf" +
- "f63f3401cda31673ee48826b68b387802fea4471deb1fc928586f1b1614c16311c9820b563ab0112c28af5c1af5121818540c4b7d7f549b33906c1b86c6674ad" +
- "799acee7342e4a79d9295493b2430fd08f373338795764621bca444868f3f42b0e40abd4b8e148cad2861fb4980b83bb58d40eeecd8d8cb1ef1ece17b0ab72e5" +
- "06c6e650a3a43081f545acbac51ed7e121df51edb75120cce30ef7dbf41fad331120e537fb35be45d93de4fac0cadc7e5f644e2b767a285facd5f12845559785" +
- "57f4afc276e21d77f6162062430dc8918435f035f435ea419ae9f1ddb6afd46b243f8bd6a3a33e7970e7e76fab9ba6afa72a4806189462f9d0f231a23e3ee1cc" +
- "51cd10cb9043a27deecaca866751f971254fbe3084c243ef5f516bb652988b770896ae5abfa12db2eb2abe404cf694e9f60d47e734e260ae668b750e11b26001" +
- "0d2bee5ca555a44523742fb069e484f7a69c12d4bad026c03ed7af10ebc9cf2f54d143fbe4de83448df80668217a11f5a1187f35ff306e6c685cfc2417c14aa7" +
- "aeba1fb7dab05c913fbcbb8e677dd0f89324048862220ab6f5340c38b70804f625f5a526d6675a49fdc22ea6ceed477097fc723a7b6eaffd65c48dbee13df566" +
- "f8f3449d91abb367cf37a8460fc8072c4ac75f88be8b9c840ef438cbf12a2e7d55799f641316e3381f72265425f3e90fbeaa9919533d8f9262da27f1f933d4f9" +
- "a83e07aeb968016fed89e7b16babf0b6af3800a27c9c3d330b6bf8be447d31bedcc526b1bb53ecb10c3ea098bfa7d014d93274bec70b6e82bd5c443e860835f0" +
- "ae82b7be7c78cd996e0990e3cac8c1c431481c8159ae1dbc40c03f4ac543e5758f347e12715822d86c881030de83a76ba1c49e4d4836bab7b5287122ccf523d2" +
- "33935d802d2bca303cf57b36a5ff17e7c611f1cf99699881ae464da2911d77580587a7228db8325f204adb14413a13fe318e995d60e35c88bb47b99ba9ee8daa" +
- "3e40ce5818876a3911107a159125dcf768ba04074e5771334e0de430c439070422508577e474e9532f7dfbc489d0c87d37103920415b6c116a422ac15e0736a8" +
- "1e1e317adc87005f868815950882fc7497794c5eaf76f9def434d198304ff495bd2f9f4026aea330450741fb969700b953ab265aabf1fe146d861ba2aedc53d4" +
- "f929abec2dee710aed8fa605fbb9bba914eaff01fdc113836d34d855383e4a311b4ec6ef6e80dfe32bc8035d84ddc4e2c305c112b93560112c1f3dff800d6043" +
- "7eab01991f924075b4dea4db01c377ee1ca374d383ff1fbb463bf7078f6cc7509a0ecf536871abe7c95bf89f29c71f72f1a2002854113cb0d6d2192c00123010" +
- "8dc9477808a218f84afb81f0274718c024393d5be66edaac7406e520b0c8e2c02ab98ee7b290db261f2122ea68bd79f2cc6dc64936af5064cce2b4d1b7078703" +
- "951b6b81b9b60b99da4c2d12bbb50351a5b7713541db0958740910ff69e748c71bc7470a3c05489febefd384e06d267371935f652736bbcaacb20c34bd50144c" +
- "71923b5a521ac4b1ba694d024ba51b4bef3ffcff74d5dc63810b2c0f529073e13ec3232d8647ad124b21ff73402d371c0db39d46cf4d2d4cf7ad43fd8dd365f6" +
- "9b6b7bcdf664df0e62ba58f3ca0c62ad6fdcc9b091fb4926cb47b5ff8de7d3b12bd8709a46e5c3d5f0d22934c7a0574ee70b87af97d0fa46f7d9673915fed1d5" +
- "a6c57197524ec9978d1bdf65633721ea2ccc25626dcb5e7f5e090b00e413c10a6d20b45fb8e98c22928de6dda184e856c86792c7cd09d38e4333a76882d363f1" +
- "7f4d773ba104b2d04fd81027da087258fb175bfa8005c035a4719bac5b9630ae57889fb3b52a0fd47ec4060137b0f95fa5d5684172d07ca91e91eaf20dbfdea8" +
- "a3e23937f33d8774f30c7e8e5d4b2d5371e5ea5e8d290970904c4c1ff33baf675ed79599653808f652ec4fd0088877f7dd7973023ccc8377d1ada2b80c07d077" +
- "d7208686354f511925a3514c9e93c13525353b3d9528ab678e3e783c290ead88c2c3d6230bd4cb3bf79fce6dc3e95bfebda41e5d994e61ab083d73408ff6b627" +
- "6996a263d2920170fff6869c2311441837a2fc190bee104328591b402defa38b421b972b01d020bd20b1b6a6ae884b23eb829fdf032a81d4f199a87ef125d4cc" +
- "8662e24deb93700980e6ebc6882bcbaaa0283492e81f81e76bbe2ce18df4fb665436310658918ee217b5da262f1a1adbd59eb3c555cfebb12280058c75b5b33f" +
- "8aa8c2d7cebf12ce46c5f49ecec5a865a9f0b65476793884f0021f8731b1bd288f55dfa1665776b2aee1007bcaa6d92a76a2ba9925bcfa68db7cc727b2a07ebc" +
- "e24c0314c96ee4d6164c699e585461388dd73476a1e0519d92f51b64eb2842a7b17bb55d512d52da802df63206ee926f6a6a8c32de7b30e7cd3f23e37e0fd82a" +
- "556323736ecd9de77494a2f8702463f40fb837c2a99270b9050b0cbbc2c305a32380ff5fa94bf9c101c667f36293c12ff9aaf6e0a810b75230caf915135cbe6e" +
- "63ffb2a0e8632d32f72a65aa965fc556e10ddf6d5e40be919066eebda09d581a32156e1675300f52c8b355e88696fc2a67dd8e350a6e902e082af28a9809ba11" +
- "ae0a5fd9c6627fb808d757147e5d59cffd9c45874478ab226e72909ccba6592a54391d072c7eb0221f1ff7be9924b9d037e4f8c31e94fdc814a8c4cc7ad4c9f6" +
- "eacd5af66dd76bb6222b2fd3ea50a828fc3a91ef8b084214bfdcca56348517be18ca472166dd7f18c8e444e3641486e7dada626ced8710fc73a2b09b6e9395b0" +
- "31ee2c48c9183851357d230204c911b345457de602824273193b795fc21e90a0c1cdaaba36787424b23ce73e2116947f143f9641d39a4c07c2e40e02f3bd7c68" +
- "6899fd57e3eb23c6f5615c9dbc279fca0d4218bc79d928e70018533a85b4646bdc78015149b4d41d77ec7b46900e7fd5250116ce978f825569bd887bf3fd0365" +
- "e1259a7514116fdcdd6da3ffdf432bbe8e59b9bca9222c5dca1eaa61caf29b8461ddced6f312838fe490f742db696fadddd19bab8de6bedaade878be07aca4ac" +
- "76d69b81a6890e66dccd702720c3bd5601c6abdab95fbe4ccde6e35385b75e1977d5085ace928adfa382ea2890889017b9c4c81d9ba4629771f84cced6280db7" +
- "a6cd83ff9375ffb0a75a6bebba9a209f048788ba39127c1036e4bd0aad9be40754fd75295611e455909a818a3541af32eae98df7222353a4405da0e7be9f1cf1" +
- "bcb823fdea7976a810e8a3c7bf93fd947f961a344a93aa1ba99bf2df48ec82769d8c08e7b14191050d5706a9467c9122f34e27f060dd4d6e936c414c4e551b9e" +
- "5d6b5b58347ed0012a8a323f41b43bf5e960b2806de59da85b998affdb490fbc965d569114223db3ca65df69a617f6808bea23017327ddaf32990070aaf5f444" +
- "a9db44a57b5c92bc27bc71c5f8a2b6929edfed8e182bf5942564ef045c75448450eb1a4e4e09a1875e8a4a74f229879ccb7a2f2cd0359abd91a782c2ec1f68bb" +
- "40ce0a63bcc014b198adc222fc957eec0483f5b93f0db91b7ab3b3e3c59841dae057eec97abb55fc42b2de124946e66ed2a7fe8cd047cb79051b55f82594ab45" +
- "711c92364f932a5fd274fe184c85583ac7cfaf258c57e296f9c18fd181308565315e27272cbad3b21cb4490ca0e5f675365caac42f299e22d8a74ca51a9d0883" +
- "bb376804e234502db66067e7a434d38c3dc075346e888e4558b1745d00458df99db02f0e4c37702fb0989387f74d002a924790a6b7351ee0f41684bef079be26" +
- "ee9d70b560c006cff4b08b9578afb5019c21ab9418ae4ecaa7a1cfed2d880a06a03c2c7711b601a2cb3d9193e1577b4f1d0e614c0be1f69205fa6524fee80bf1" +
- "e1f1906b50e75fea2d19b8a83071a460145e1730581e5e9538888d2e797ee3cbd3b31399ecb4d6244ee44362493802b142ea397c2e7a3c1bc86f0ea0546a38ce" +
- "574e1df0c27ad8a28dca70f659ae6a1369d8b3aee7d0dd24ea370cc2bc1b1a4dc9f63911b63e60fe4ed8552bbca10e01c82d11b0ddf748d234b4aa3b31683c09" +
- "86358fad680dd2178902beadc4646b3eceff572631ff9e6b64d8a622ad9f0308cc46b7d422ce792fe5573e9b9480e1ae9fedf31edaaac3b08c5a2c6c27d6b033" +
- "6b92a3da7b838bb0a2916ebb6ee72bf33a7fa70630491f49c67031ce4b9dec2315088d0a5cbf7473fd121e0ef5f4e92d43114014c9f8c6e671086a446eb1f66f" +
- "70f0cb0c668998ed96ee0ad2687946681fe40dc46cbd170e0cabb6f6216be61221f171fb2f4273f58c10d5c4eccafd1df62fdc8ac2c5c8f6d5eb637b71fa89e3" +
- "f8347343f89667a4450c5c6e3791034d2dc3a593185b55bb95d8f8f2984ef981e4b692c1383ace4cb2c4adb80d5d582857b5d0e3ccb12845a59587b47232ad20" +
- "926efa78e05a57b136e284401c516296b6b194d541ec165d11ef94f166cb52f45145d745ff3deaf643b5c45573ed0e69a22f0e0c9c5367f6d1398105516729b6" +
- "3f2edf1b01ad9633edf80efbba6555d4253fd99b45a36f16ba98ea0bb0d80533aed806544a084a398a692f698c78b9bcfc9b4d3328dd869dbf7085893b8dafe1" +
- "59e0517c2f6a3ddfd4a8c670072b30c96b90f81fcc08523e4fd75919752bfa52a1db7c374debbd83ca8e311b98b0d8275bedad215847fa8984cb50e108f69550" +
- "f6517d719dbb5dade1d3c283357e14b6d9e85d61e33813546517e1262a7cbac814d79cf6b7e21b0fbbee9b6314f02b2d4e6995d2231670884c78cfd86a2acbcf" +
- "0a178ba64de2f13f022e22b9b968ceefaff374aff02b703811f3dc541a69a21d6e1c5d1aca48889b125ff1274e65413f61e42bb0194b60b65a3454c696033cc8" +
- "e3cc3613a52850296a0154bde0e2a81b7a6489bfce505dbe1bc44e0e1052f678297bb19cbdf7970bfa5268af8a54eee004063f9894118ddce7fae8bbba53a428" +
- "678cec8a2bf6cca2b1a5f4a2e95562437e4eae41167f39d2a150f7c46c1eb6da35587f7234d870b16ed91c7db548ddc99967381b4bb4f3a2b0a5ebcbc7ab1b06" +
- "7d5418768eaf7d526ca116e239ceb3ab393c45f3b32b713c11fa8e5ae8d7611e6008fa08d1305d5655315a72c85a04dc853da3e8ea9d46674194e15226f126c1" +
- "a233c26dd7d3cc04ae572320d0c351911b6fcdbc0b8450523e96022f4b964d4e479b6cb1c40a6d27699b57ed2952ef7fb3172c69ba7beb8c8633a01070ac4344" +
- "d4c401acf8ca7fcafeaa59e1d4c2ff251bb67dbe10a862103df1b416fd2097fe412b3da9d4095b48ea094fc3bbf2ca41e4452af3a179580e3bc11a7d97ba050c" +
- "ae1d6b8075da267b3ae2231a1fcfce0c976402f34963c007d4f85d9ca95646990d1bb09691ceea3b34211dc58409e052d0acf8c2296a7e8fb52d7c673506d89b" +
- "847c369daec7909da8657e8976f59f2ef4c8a049b46fdf30d6d223ea4175e4d60e469bcea0eb3bdcaa4d6024f2b43cf6de9bb40efa9172381291079dd82ac5b2" +
- "39f2051a7f1aabcb8d50333e8c160de19ce1c76ced8056a0724ac630dd45ec4e315437391158a633c179a3d1f364b475454fd29c1e539077b9d5f7227786a5d9" +
- "d8ec78e5615c25e517e9fcaf07611b85dff2c131a1b11a901a431a601854e5cb627cf7b8b0c5e66ad6cf60b7ffd6c6441f9ecd58f414013279e9de533d8d797b" +
- "936cfdbfcc78342b7ab586457541df5f3b7d1873612df200896e2929f44c6fe10d24f7e6dbe52b6c42c0a40c947c1cbda2a41437079eebcdc29716d80957c159" +
- "627e7366cc16df92cdedfa9f52edc848335f1c7152652fe24661a469fd503393229063c7ab20d8d895139a2f580dceac9f6dd4c4ac652b1d60c2b8a1b0b2923a" +
- "86c31742807549e6d523b3c88d31e8534b9e05a6c63f6c8fb8a1eb4dad733d92e7071e410f0087ca3074f4a2df511ae89cefe9ed09a8df603d61f23754e43cc2" +
- "e42bcdcbe58b0587aba9a62f32c7507116fdc8a9db3d65d6c0097c8f473eb7f3bcd11ab81d5b636b0812b7982201a63d0b8d40f2c38f65ffd953668eaa5751b3" +
- "dab7f038aa7adbcd1f1102267c9d55d43649f9b4f65f1851546c5a9ef2c7ef56e84b16f12641e9d5ddaa78ec778b5f113b2e06bad5821e1a5203b006a774e36f" +
- "56c9336d92c8cd8bddcf014b6d58c394e2a93554af6361fc1bbd13c359fed98bb5adfa4dd1266e2744e126e1bc029ab28fd68b648a2ab26ac23252171b298641" +
- "2621f2a8697a00ab3fdc1b3b04921390ee16d213601ab249a51830661051d34eb777f690fc2d8dfb8e0898567e388830bac8b0bc896f43003feadf34256a927e" +
- "b4d9293e32ca135351a19d1246cda30551c87de1e148ff5ea576b67e19e1a0389b88a5548b3b1a8cbee19eecc7de5c2333264c711d50d688a1c57eebc28dd6f3" +
- "3dc0e4cb857973c3d0f28683a6f3c09db9f54b8fabeca9e4f9b86d794ca55d6611858f0d48736adc10dd6763ed7199bad81369ab1f3de30f521d43382bcccb7b" +
- "be0178f716d5c3cb87488cebd7d9e2bbe671dfcf2512f1b815075777ea92a867f35e09ff0110e61db24423d0598eb6fd078dde0dc2b5d7f5e0bb6fee207da109" +
- "2e656b5c982866d5fe01e6db79809646559a6f2b9088e977789aac74435dc625b54296b25788bfbbda9bbb25247d428f5141b03172fa11f12339b91ca96c92e7" +
- "ea5a128c8046087dc7a7eba63e3bdb200565d8a103e7b3c292b088eb06aa27b43688c8516bbffcf123499574f00908ff43d66b79106cebaf16725f1dee600a29" +
- "7b3a3da878940867f9549e65c73ea798ca923b012fb8a7ef3e2ded1d2c4e85635219f627dc4feb90f884ae6436e7b44f9159f9889d8e194828e079cd2ee60a7a" +
- "6fbb6b8fc1f7355d7322709fabddd76e4283ddda3018b7882ad79b32bac133da415453eecd5bb1f0deb4f3b987a71a2f2e60194cde63a42b91b39bfe51b4aa8c" +
- "20952b601df11d170c65a7fe935915890849a367936e97bd242edf305eaf2f4f4fb9e5ee1464c51a899ba5cc69cf56731502c1b75d0d565b1dce15440b0de0f5" +
- "58bd4f810bf058af99c158a2be0dd02a01bb5317f55675f4d42c6766fc61271954b6988c33a84518bcedbac8de305946d060d19c4691c026953ebd680a4c9012" +
- "0e8bd54675d6c33cc86e65f5cd3c34cb1e6fd47784a64f39e95a1945b5c21df2b3288f963863b33366908b05c2bd499dd25c1b8e97329d7e435899afeaed174d" +
- "2a2471b6e8d6ad7a0b1b6a8b19fbd976362283e5abffcbd2cd310245092749b23e0d114e727622953487f373c833281a74a1b97742ca99e49cac14d9102e3680" +
- "404509889ace009c47d075ba9891e7f67b89aca3e213150f3c715cbab1869135601612d7dffda3cc104b6508f56eb8b7e7f379b21e1ce290ce5fb96f53e3a7eb" +
- "c7f7bddcbdfc266f23b775602d8d12527d30446cb4144df7fe3c2756e232a8ffca625d7b6ea2c8c0a92e6425ba67ab75160623c39f01fd96856b582e257a6930" +
- "224c6da90a6eac4249214c3b85aef52835d904a8a5e224d59eae0c80a33b3141ffb31a7d8e62833fa4c850fa6be135558fff5434777df45feed00316c475759f" +
- "ac6e014e9d3cf23e7322281ed75623ed69a81d6f05ee7de193f6b44ede4a94ced27aef5ab9056144593a836da80f5297875e7bd84d8ca6df95de8650b00b3528" +
- "123132f26aabf755d00450648e44f3beafa4dc746775958c6dd88bee825c29112a3af582bb2ebe628d70364fe9ad01b8a9961d5b71018690440151486114af1a" +
- "d85679bcd3eca510c6d6887e70e0d04b04fc2db5ab1eb21fff925b66f08f4fcbf31be3d743154056ba137727b63576e72f1756029c86bbcf9452fc6cfd89f3b5" +
- "9f243d84c410253ba7c9284191a0ed87b2513901a93606f1aeb736c90dfe40c0a343d45e9a992ea894b22ee5d49e0f7d55d9bddaa6c74bde8ca5839db67b77a9" +
- "ef740f9a47241f05e5dc1b9c95c459cc9db560b1db090daa3f4c6de46f695a158baaf357a1fc63ebc0d9db8144137ec4bd69c5af89cdf9cfa66e06bff6339d62" +
- "2c372fbe5a855d14fa7ff3726512f966e4da0556b29ca6d7517803f897d0e1911f9b46a291002a8320091aa7016cb7ac993e35c8b0f5aed3c94ff0b5dadd8b77" +
- "056d06d1bed59aaf7bca8516c3bba6b33e12df2e5ca4aa40664b3bf48c4dc2c57cfd74c765fe9f794f55b5df6ac6dd2b3592bbc71354c8dd9ae41b0a05e1c7c0" +
- "d3bd1a0ac6b671c48c01d4a0fec7a01ad11040f213461759f9e029c835ca1d22f9a661b69d72bc46e34b1be7ed85a21830fb87baa74d7ab145ac1647f5f2df68" +
- "671100d4d9e41082d3c81f3b5a6e603bb33fd56c1dbcbdce5e213c651da45d9d1dd7532d9a955202338387af6315137dc458fed62920a0e721aa7ff1660981c0" +
- "e4c3de0a4863f6f660a7c1b9745ea26036a25cfa37e1337ded405ebb0401d7041a7938800a97a032fcababcc06391a77a580b1a61de014db9d7e280ffa6b2381" +
- "ab6969ae5cfcca00a47ac2fa05be02aae7beb806d2afcc11dc0642d2a12ecde2d2926efd9fe790e1bee19f9114d22ca42f438ef656a1311e4931ab7fac93ed17" +
- "3f68ea0abed18cc2c8905bb2d599780690eabe4996e38872a3190fee361df9fecd5906f664106de4835f8fbb657366327871a2d38cbb671df04e0d14fe97e260" +
- "c42eb07bd1d70514913c7a64a51e405cc92e06845e5a78981fef9822fc79e9937ce0513138f6bbf247f5c457da708cf84e30d083b4ba48d2d43d70e7c31e9482" +
- "4472617910a3de4369217b4daf892c2c3250d1de0457e88b3bcb5c4568f9b26aa675c551a9a730fe9ea8145ce7f8e23ec825be9be3b9edd588c391295fe31ac5" +
- "bfc97d2e438ca9bf6551728b3be6d6c6ac064baca763e0eaa24f754f4bbc84a4377de45fb6a8f37150865df18749df1af4ea911b62f616dd4dd4b25b27c7b6fd" +
- "99d8c00ce8a53fde3ced091891e8daf43cade10086be046ee5607003de24101db49b1a4fb0ac270d05bab12583e263e903e94dab8bba7c785e40499ab01ff92b" +
- "b82c2e5342dce84881adedf77cab593f541e4c963f4f9ffc80a16bd4eb7f20ef4bf3f57abc7cbd86332d8be80f0794fc82767d13c71d8ee20468ee35c13308b0" +
- "dc29ebe8c6a81e02ee9a21807ff57e4d932edcaf59ae9e76f7cdad46b32f94a74982f0887d7083c90ff54058e873b10cec67fba1b717deba5356e170dec1a40d" +
- "36c57674ad8d43c5c98022b553fe060251b994271585f702de3e71fb1c8e36293dd44a4b99a1baf33f6205e9fbc9acdfe8cfdf007224f93a7104e7803454fdc0" +
- "9fc5a20be59f600ee734847257a5ad62c599a7fa836d1174a6291e61c1be4b310bd4d7b7cb9be976dbdfdd2b99340a9863c8c0e5009165d7097317e6c3a29cfc" +
- "dc84b19bc68f38694998f626567b80ce6699124b12bae4bb9e661c2484f5109517318341287e142a849d61d0d7b11d4996547e7325f28842dcaed26367f7a888" +
- "e58c24c857da2f48a9fb91c78cf351a23e82ae443223580a9fe15a6a778f6c13be66888219e3e15971170712b6c356520cc15e4e75167993b66e6f125799cd40" +
- "86c72588a85f68361f1c2f09e87f9a4de95ef9a3b92c3313664a706cb72916b96a9cb50771f6917ddcf696ce8d7f2525745fb6edc30bf3fdaad66ca5b013300a" +
- "7ec7cd274327b1b9cd931c068d8fa9fd6336d59f6ac79b84a24b34c47e408b3bcb8ead49428c123922e54bfcaec7e39c4d6ef79e5645a35f715d151e679ef5c6" +
- "6f86cd013fdaab978ee4e52eea5e2753e693271344a1f215e1c690de06f29c856c469ccb484d445bacb16694f4def1537cdb32260705e8a50fd65e98a24967a2" +
- "456af6cf90643638999389a35de6e192068fd2e2ec29aced58611560c792ea5c7fa37583ebd5452a8d94cbf1898937dd8aa6656047e6e03f84dfd0bded514a6c" +
- "b47ca71c2cf1e76f606c04374663712fd96925eecf0ac1c38392390c8cb095f39e1814252ded78b55ebeb9915dc5e2ec14fe99e3a075bd389ac601681f154286" +
- "885289e568a8646d94abc806b4637492e3a407cde582d42764eef0d56ab14b00e9aa1f64d8fdd533d4314145c8255c44d0c746af6da844d285eb044d57e8cafb" +
- "ab6c3b962e0177f11a839f4a5c0d2c2e8d5f76375ac115e0a89f460ea1be238f974a68e0693d15790117106c1a65ab5f7aa08e738aa888d5b56be39d2078837d" +
- "fb2357d86f5be85a9af41aed611b231495564493e46acc90c6a3e67d5b055320290aef508aa6a1896f19cb5633edc0fec023216726e50960a44d81e0614ce748" +
- "6ccfdaf620eaac0517e8cdeb1095d55f3a60d61dd27d967eb26128b84c9ea8418779e074cee8961c5dac811ce5ee8134d3910a47de7a1344293f5c64ae8f1b38" +
- "9d6c457dc74e7005c339394f5f24630f5e40cf270640d1e4c27cb6a74fb440f3203026acfcd31f39cd4844ede7e785290878fac8770f930e96c3edf61748dc6f" +
- "b7476832cf77ddfbe8eb8e12fd002038630301439ef8a7659bb10593a92cb84018e1ec78856f403e1eb9d6343aa0bbd77a63d776f1d12838f27f3cf6296ab0b3" +
- "b4436f0ec545a5a1e92a5351fb273b3ed56a40e5a5d25e0057f4077bfeba2e2d8cb17a553b157609b20bfb5cd2699af9936f50d823bb59a950a24b8fd15ed705" +
- "b1628663f0eb5b5c2b18f000ab039bc425ebafb2010e1a2264c38fa2bbd0f77e38eac8acd670565490fd60cac7fd28d988c8dc0658505dd98425f22c94647d44" +
- "5d0236b97ea58b3c71feee90be0055ce1fabda5ebfced9d9bf5efaeac8408c4b6bcdb39851cfe038d88ada5211de2f0f69e9e3c62453106c366cf0c40971c0e8" +
- "e8f2a790aa66999a0cb4cdb57a8c2d812e9e4a66df2f001a57e291864339257ec26c9bc2dc6cb2eb5c3301c167e1ed0387f9ce9f76c6759ebe5c68e8be378c42" +
- "e0350b344acbc8b40c95cee9e82bb43cef5e91a32a6be8a727d5fbe089321ede3abee4da6b9f41775d7e9abc36f6a5d26ab88ba32978b5ea0ad63f0ce8a772be" +
- "5aa51143bcd00d78bdcbd69beb652139ad658dc7ad242b2057eacee092aab4940d6ff993a8c7d8fbe93c08c93c45d5f3a01058f3c75c94be9da1a19a97754734" +
- "b713e1ad6b7cd472619ec1abd4cf42f50b0648661c2b8dbe8976037c094c7176090ba94618e1918db44f5d2c367a0c7f911132d9a8b2398b9417542c7ad99b53" +
- "a7ca48253bab8382a1a24d35b9b9818bda513f4b52fc576a71fa63e72aa8042ee1fc806c6fd3fc16e07ed2caf9f82bd3bb6b393b2708c051c24c2e05aaf72531" +
- "d865888db06f719314d6094b2c4f0718c151c88958d2d6c8a6f49464f81cc46709dde026f4e05325ea4ca2dddf9a79bf98bff3aa5eb412434f0b7457b4ed47ab" +
- "85a212e0c7720c78c961d56141bff0f964622d4d3984c1017de6f5846c72fae0c771a819ba6c111bd739fcf16f4b85f8101e7c3f0daefe753ec130a6f34c7697" +
- "4dc531f83715ecae28bf2e55111778ae42aef17fa95340584cfae3d4599af9dbd10211baf3aafa8ac8a07edf8243daffd6a6486b1e3be4b60711194261e2b646" +
- "e2667554cc0bb2fc07054b653231cede43154c9002890ca20b0ac81c4788847c6ecf7c174e528f36f8cfc53f3366fa9ce07b1843939cf6d318ed11f7ba6eb791" +
- "ce25e75cbe37d2ee3d45bea487d969de041011959c0fed4e6c86802a7485fad70059ece14a29b03d4df41677acf71419ee63f1101060ca5e4ca0ab2edd71fe77" +
- "46c6bd9f36bdbbf0a9956eaaf974f7bef982cd34881abd686fe77b536c85d042d77dadd00c5cb0130737e5318a025e6ae6af96ca28cbd41094d86a85765ff891" +
- "af825793910c406470cc61be5d9282911d2faf82abfb309598fce0101ca64abe3920701a958c20ac35927733466a23de809afa2bdf331f68c3ab0cfa08b0c549" +
- "a20e9b50dbe85d22d215d0e5fef854ba271a4c0f95e6abca19018bdd4a042721887418136b4a60cf291bf06ec47a5a4d2f9b29f988733c6bf6f65da5a95f8939" +
- "fe0f2bab0bdce98569a81f861014e532f6a995542db02b6bdf3169191d300fb0429c1cae1d2dd4d29e0b61751576e04b558d38d3afcce8326c2871e969c1492a" +
- "8391c0becec29edcf7f038a8093471763db9f13b97114acf7a979f5ba3bf6f990317890ee0705850fb97bfacf306a0ad621b2c3b633af01fc5aa059c0e22ed17" +
- "23584dde6cf140bd1d0087ca9090ca9f07d3b93c60938af8df976555455bafbd8cc986ba32fc3f15b5962dbb2d37b6ae55a7de0c0c6f2366be0278e26bf9a725" +
- "f61f2bcb545d66f79261783f7f03395f2a5d27e56af62a01ffcf778c3c686e244bd9b7e5029d1d40dd2250705c6825bf78e83730212640cb5ba54191b61fce33" +
- "ce6df7721b15662162b631d99e6431efd24ec35639c2b97f10374fa5b9e2ca4231f523195206fb9695ec7721c98d74f29533cf714866adae8edbe8ed2d0969c4" +
- "9ed36200c4b8b75131e6d1efa913106bb0759aa8255bd6a9dc2b00407358f4523486575b111676730094f46d0a7b95427df74f053c6611b4c465efa5310f760c" +
- "5ff081e841e5f90c2de35855d45a7f35ce73d7c7f9f61fbfa953398e042c3946aaa4b7a2094d95410b8a5ef76c8b57d49f77311192b3f4578f37bda1a426de7c" +
- "7cc54b5400bd16bb30cd8d1b7b42ff31c5e3759e3c9a7668174c02bc5a08f1bcc7e3ba145fa5f5c41e48877b41b0ef8fffd0f75c6547047c2e7b7c7e1aef2cda" +
- "c4a778adbf71257618b4eb3c6dbd8211f829c1d6373415b969cc48f33d586d2678e7c1b441364a9fe2bb426a33b2a132741fac547766d196df3505fdb17977de" +
- "7853cdcd8d9932eb9452620aa4921b4416f65055d77573b132a40795bf142815b655e670bf2c4464adb5d826a1744c8049d7a6cfbc8a4634e66eb32f0cb6fa17" +
- "ffa8925131c3a253101733406a2a3a0dc61ec3ca1448623b6295791d4e2d65d303f78038e15d0ef75d823759bcb4b277b51410c37d5efbbb2e3a9e0cd78a8475" +
- "05d44bb1fed7f72b1bf1a96ad0148e816d34c66b1b5faf172b8141ba007bf2e5dbbfee4b09ef66656ea3cde54f086040d14116aa7f3584ab6773f6091a2fbcee" +
- "f59d6ea115f88ef9fcb358c87c35caf7c1a6022e141a3c688beef17da5a619e733d854218b30d5edc39b933b19dedd6750acabc52234934b08f930b608a18008" +
- "838cb0fb73d4c78af0c468d9fa4fc5852135ae91ae00a99a6c603371d09b031ee37f87586cdc83897d8fd8ee2e07b9d0478a812d3f7eddca08860386e3ad9521" +
- "98d5fc04fd0aba4b3da6ab8bdd9eca8e0399a2012d6158ed75ced5f432a223449b4e3db3fd4b19c494a69e9f2670833f8a88f7b2873319e9495f03fc69b6d098" +
- "6006e3ffd8cdb9c1b98f72345848deea1b98ff6ef766f4398e642e5f2b217c1a87a608c1dc701bbb79d75a4433ca1d600061836888a220ee262124d145d371f6" +
- "576f04cf71701133787a97aaa615ca98138c2be1046604d885e2f274b0de8743af50ad5dfc4c3a09164448e102be577eecf77ffaec1724f91f00f908ff6af41e" +
- "57056dfa8f5dbcade85a66c10e524bae55922b4084407fb36ca8d6b7322f76a8139be9455a34440c719d0db8a36385efa48841170c8d35046407b586f5bbd169" +
- "7cbaf6819b663fb17d0f0ae89691a099a8ccf47fa61fb6dbb22b3298e5cf2465e4b93c49da70fa76924fdf29389194cc5c61cb4b3084d0851bc3018270d1a24c" +
- "b4b04e8af927d9fec9ea1c9ce18d4dbe61f7aac0ffd4e7c2e9729b49ed9874b883ec644864c6d9ad0422c4d89f87df1dfb2c96314b6a3e19afd21783f365445f" +
- "bef10562a26b48df42dc344ddd63fcc03220dbde98f1109cade221027c40f0f996f4beb29513c3979ba374c4c6a2c2dc6276ca6be66eecf1dcb245d6efe78aea" +
- "e49ece37f87894bef3c0cb1b993d974685564e2476c12c8d8f63a1aaf142fe34a6840be340b64f96d441f4537dff434ddce630101ed9f78e807881f6b7590697" +
- "bc97e60accd7a135d8915781f4fc22e437145154dad0a39e5e306c117b11deb10462ba74d58e81de7674ef0bcb20b38511991447f63ad906b11abd4ba88df3c9" +
- "e6931f87fece49f48543fed0439c88ad78f82aabb32dea03d030bdd76efef6b737daac2de2db1cce10e2ec74565b0a609606cbb6aa259ba88715229b8176c874" +
- "db3fc4f6db9f167e7b2d55b33a261f9eecb69a0d36ecf9ec4f8f9cee5b74bcdc5d77b02ada89f56259edeec0d9ea866ccf454b9abd29d5d21041179912a5c302" +
- "1862d850c3ff483e09479957df5bde03a29504b4a43e1fd40af2b8a2653a37cae89c8d917aecdec3959fecd32b7fd313a61e134abc15ad008aa993aba9629a5f" +
- "0af0ec713f742bee096e171729e70530b60f910ef83746a61580f0cc6d67723792c0e0e94775d5b1edf37864a50678d197bb34a97e84d7f764c0bfe05f4b2d0c" +
- "dc431d1f4410500dbe2758eb05bb6b19b154707c255a97cedc6aec1841f1817f6bcba0b9a9c1d3aebf747bec4423c71309fb8b4ada90dd9f7adbcffebbc905de" +
- "74ce531403df33457c4d0b970fea5df4f85732e3c33c5b8242b041141a8c51a62f0bb14dbe07b14d3f5ce646d76e87b258e9b62128f9c0c0a8014f2c5b3d3dbd" +
- "a3a77be6222419cd3fbbd3b842c46c099f142bcd36442961e8205ec5d7fd159befdbff12693953307026f1e06fd57b6447dd3cb52df466f0352cc46f27d1fc56" +
- "56e06f68ca2847d291421bc9e0af6bbcfb7b3ce07600827809506ba3f96f40ca22766f8cba32d4461488f6596082a52c11e9ac908922075a7b443c41e55b719d" +
- "9cac9fb587cf02432e1accf3cb7a16de0d5bc3a1c0aeff5a1795680b4551316e3d7b5a9bc63a09c6f75b0f00eb69fb6ef5130c1ec40c7a7d5d6ccce364b74f63" +
- "a836a4a711027e592d6a70e10e573cc6d730a0def4a7a2d4dfcf3b0aba37fa2060ae6935710191c023a0b8e123a67ee811ed43b5127a1c4cf82d52ad6c40fd66" +
- "1160f77dc320bbed349c8b6d08b2a7a6234a8dc88e4744b51d2d7c56e02f1c3bea9e6c2c3d5522ca02ec7e0b8160555eaf28797ed30b5c931a73562791f5f0a1" +
- "b7ce83824bae17de449cff41312bd441f34df62904f4a0265d6fb9b8a352895ac6f0025d6b2074570970b4e679c559d03ef40794708eae36567008d9c33f7fc3" +
- "5f8df7e901c27f408cc7fcc52631f1178695ea660d07df541e5a32721d145a32e8d32f06301b5073149e8798371fdb1a2daa5e1d02c24da07682a2cbacf5af55" +
- "64810e479e5966dc6bfe14b4472c42cb154e19f7b8659d42de5ac926224cc6b0d8f3fa797058fd6e21ea85146838c4612760d84e24341825b6931a6417327394" +
- "0154125254d4e11ac80e475a178605e851e1be39695cdc0781da241f232cedb32a04b1cc7352882fb635162ec3f5fc5004cfa7d03780753c14173ae7b12a71cd" +
- "b40d4835023a00a4803bdfb6916956ade9f687af567e6f29981120d306084ad061ca1585f0e9497fdb27f9d54cbac8fecff176145114ebfc17e3f346b246ab91" +
- "094dac0e684a708b45dcea16378fc29683dd033310068339b13d995dce77a50f9ee9cb4cf564566b05ce352a21159ad21e720e05ce6069a5ef4e9fe8ffd28516" +
- "8356a0b80c4d1da547776f486a117f6f7ff6557edae7d68834cd71973517cfe4af045ad0fecdead68edc8017000958b69410247a51bd9bd3152dd57389f25223" +
- "d5e88c0d343ab3aeb89b763eeb7ee48b3966fee147a4614e436c9a1a398487c80a001700666251b3dd6a2e5dc96814d21e6498e75811ba4c51160cbecb7d5510" +
- "62697171a25a6abbc41fd806c3dfc83daaa10d7ce47f5a29ef0d85dda5a61429c637520e6a4048624cbb25f53977254cf803848ad81f25eda07690fe7a0466e4" +
- "d18a2fd145dda1c94a994bc4ba5ce1aa1b50c38151febee757afceeaa91c7b35e57b90ff7b62efa929dcb962d32dde5a0bc3159524728621a3d7487eb7c3edd8" +
- "6df3f8a18e590039bfc84a22b23b11468c90dcdc8506187233d8a6b3dc9785ddf6f341709fefccde91a7a0925a8446b1896aabd6a6826ef88b756a9711cb3b78" +
- "1ab1f4df4d0515070e41fd5b0c5483270307e60eaaaf0b3a48f6bb96eef6141075445285675bb12f2ce38b42c91c1e063400d7bba9b322a0783e7d2f5d3f8874" +
- "52ceb65bdedaa032336d969d2e0e3007d2ac07bcf054b9d0330f2e26c486c054bfa709fdabe283ed9a4ae67cee24f40f2a5c4e70160e6ceead208ca400959922" +
- "70bc35be104c9ad94cdbe288b1c599db1758331340c9e927bc9d688e4186d5badd463bd3ba116bdc22a39c604778cd95503ce4ce642041e89bcdeb86fb19ab25" +
- "e1f94ed2a2f857b228ed4a582ad411d7273a0d5189bf7a2b87a135753e03383033b989ea532041ab9ed397ecb3ce61e01923b3729068f6828ffd12e2ab1d28db" +
- "6ed7423d458decb00476657a0580b4af3aa5615bf07df55beaa2bec71447aeb39791477dd09349bf573e29e9c4fd454b4bbf1e19591bf38dc47c83bf39babdc8" +
- "737d69ce4b586cd10ed406426b88e686c11072f04c680e8b6275166e2dbe91f701642b1b4ed92d23d6fe14f39ff7f5a09401f3a398eb4bb742f6cf10aa35e767" +
- "7e6e92aec791e94f8122e8c9cc9d0bc979e3eac6562ab614ff20330b00d9cdbd08e9deaeaf5cd67b49164f550c5f5c2d7523fe5ad71a2bd03fe2a97329980cb3" +
- "049ecf6d677d815e56f7cc27407cf73528549ea98265ef90277c14763d5acb3572f5a482432cd8288972af580fdd3418889bfa6a373c4813c4c45e933ea4ec72" +
- "cdd068089c2a30897dd57031445834de9f23faf506ad930d843b1cabad2c0aa8965d1b5e57032c969f9f55fe2a3049f4e63d5b5c6f5f760da5ba44e3bb9307e9" +
- "ea39973d05a74a49e15bb71eaecf62373153ca316fdd40b1c64ce2896c95a7b5df970c2bec85edbd5ed84fa7949c08d5ec4d987052fffe357d444e2408a22295" +
- "6ac1fb272f5023740b381e00dae9f09751a33bc6ad673c4221ce3f932164deb99f1da3eb3581caf475e385bcc56d47a7a1615a9543403750f0121d5482c4ea5c" +
- "94fa3428178f6a4deea08d754ba2abb3d1aa48c3e06f06ffcdf4571579d398cd991e60599e9633fae6a0c07e10e538aebb7d33aa127c830f14b083728f6ad7eb" +
- "c9a60a0ba222f47780eaa82a21393a49defee97aa8c3aa2fa53a2af86059a7587074128c2fee7060f398ae70b156d53aba0bf1af4bff10a966ce7e6382cec4b6" +
- "054a8f6b9ef0e8729ee182f86c862f9b7d5ea36ef7e15bed10ed41b25738c380e58cf42795e3202749074fe5cb6e8fcb49a116f54d84734a834609a3443b8b42" +
- "97c05ced428f5756ba59bfc1535bc7e16d370d81b72b1f3f78ba75c820b22e485dc042e4f38e93cc2918a491750c92998f03aee571cbe9abce4d00fdf9801f9e" +
- "8e0fa276822e1e5349945f1d337e656b431c48c1a2e9d4142ea14e9427881bf201ad8cd8effaa6fe6a7e07c8112299db1b327a0cc34c9fbd35596f4ee25caeee" +
- "221afad93ce7df64aa6ac766cf4fe1660446dcbafdfb86b4e0fea78c29c3e84ce42da4a503178bd250a6dbc4fc65e397062229001da05d5be118dea7ca5ce67f" +
- "b4ee07a8b01e408aebef2c913434921df686a242b7d015a559f9efdc54ad62d7f31ceb72463041843d7fb60f948fed03ff143fe24ab81bd4ef6bdabb856ef1b7" +
- "174cc987436322271bf48423114e05758a08cdbf300931fc7e950830b7ee920f7033541f1db9b0d2b91cad80d06c049b05fd0a76d6dc211bef2a08d53b1d16d4" +
- "2232fb263941daac4e004542517807341bde98e9990a97739ef86d66c7a51324f1f6911cce4c3db37ebacb6e58eb02d8f7d6ea31338b56a99649c4e730a01bca" +
- "deb6fc87cabe00addf1bf76b83927de26bc2bb3f0cd5945d863b0c31cfe8fd4b60462000a911755cbecdb6a98139041d52df498aa99aa3876836ce5b5bb426e7" +
- "c22b5977902e0b3425fdbdb8f44e8758b207b469c3e5363f552c89fbf778e95e8b7ff6566ab591fb68a8bde38d8169c708a321b669c08d9ecf1a06c5321bb1cc" +
- "9c8a585b6381645edfbd1ea4a2ad7e7eb8be6c431958add393c0a257aeb283644c6fe97580aef613f1b9d83e5b009f7a4d059025c11e0a0a67801be511dc097e" +
- "4e7c065684effcafab83e0e716e2d0862e83b295f82089ed3ba4f6897c8d8eb2b358231f95eef840e1fe22e9065de2b3dfb3633e2968135756cd9c109e8acbb3" +
- "172bbb6680c2e4fd69e179916a7849315c9f4dc86991d75cc6358617454694b3fcf2471ec7fca6ea2d99f704b9aa37a25a3b3183c5e32e3711346ba2336d6001" +
- "489afb9cbd8822dbe4f0323ebf7cfa9367b6548213d473c0f07b1bb6d16e1c66fd2bfa1ca623e03149fc81eb6f71c12e7b4b76ca588548bb4872469687f334f9" +
- "7e114a16a0a58ec70ed74ef69dd96666a85aa52d1ca812235796d90b9af4296247f4c1ab632effeaaef6acbb637f1aa9379195b3b668ca541bc6eb595bbc430b" +
- "28adc5d1a26fd4cc2239516ac9ca9c0c028110926a2f88881a5886554c31539f4c8260e16364f4ac27710d2becdadf573f4a2b7b55d76ef059432c91c6f5beb1" +
- "56686a620bdb4aea50df564cc0c5ccd8a93c454e06b8969a0f59d63ae5a29105149c08a5de65e87b0dc445dc5d86db8788ba77b83e22125c69621140d7f17906" +
- "4ec0157a877cc51ce3c0d565bdf6c884f69b0ca631d6863770f6db30eff847e33c8b30d5714668a38a09f454ee44ff2b7f97207f10efcba74325378f6f272ef9" +
- "9f09c501c12bd0a4155f559a604204b36751ce8d4c0af35a8b445a9290c305d5d3ea21f944e31df9a711ee90bd16a37850e2a87c3bd3fdecdc6e2f261a5d6d0d" +
- "580990fcab9228cbb39f8c79608d821ce27c10b0ee0b5a96474759f67970cbe03cec9fe594765bc935abccf867b9717a4087465c8604eae89497c8ffae7e46f7" +
- "ade2848916b54aa796809cb98a4364b7b44c17944dbc408909a92d4cbb24a514b72fe8de7d1cbba0a101973fa9b29d97dcf1f4ed8a05d5e0cb38849dc6e2d041" +
- "16892ce649e0a553a727bfbb1d5794a059d6a411e43876e561d83bd22c054680cc8fa928f5f4be2d849f02ddf9c6d11ba35810b81553e1938ab013663f6ef35b" +
- "08f06260932d7acf99f57967eec57a61f03d880c3225e53102a672f5842da21aaaee02444d372ab8ed7096235a4926e3288912d9c736c2c4dc49918abdfdd6d6" +
- "d0df5be0133abd61b02a6f008909c5350f9077598ab2e612603431bddd3826e314feb280585b37eb89e597f7f0bdb738a9a93d9af224659d50c8f7479b240487" +
- "76c2a960eb18923fa2d3b31b3d20ef538759cf22f5b415d19bdae689f2bab651d79ff99f77a721bc1b2233da12c12be0c9881ad82fc97a6343b3af8207dda8b6" +
- "5c600644d741b8a16750964e341e060260c4de26f991f3a1f6a606d1153565f1c9cfee58eef327edc0e9cfaa206ce930b191f521be2344949bc75d583a413a96" +
- "ee4edac424cbf9bdad2883c96a1306b96ee059d8044e3b7af4e7138697f142774ed6409a86a3c6c456600d4e405e6117ec759f4b22d7e5a185b0f9c67ad987bc" +
- "58d2e8c929d4a487e5b77201d7c1416878e8d63258b2f58727cb631494cf1d68b99c28493b99b0409ccc1f9c218a2b95c45ff36563f0045ae5c3098f641ea6a9" +
- "b48a3e1489831b2d176a1e0cb2afe6bd8cc5e797de01391e47e798c1aa945d33d5e7dd607aa73c9efe93f0646adcd7e211303ac7deea4d02c80370e8e867e2ad" +
- "9942bfd5a66143560a1f59e5be1f3aeecd7eab689a4a481aec78045ae0604f69d9eea550152f6e2bc692529357b509d60e5a497bd94e63dc698cdfa2a3a55976" +
- "0b2d072a2fe9c1fd41f31518aae0edaab532591476a9c5a61cd76937575cef71ff5dd66e158e7820b4b6bff4067cc26ee9aa66f41b80f078645b920512b5efd8" +
- "88b3644601a72e3f665b9c8f0ee246593667379b8fa043718f2d75c21d2a11640c328971c32d5743c11ada6c95cfabf1c6b66e0b09342afc899e1f272ec48a7f" +
- "ba5a51943763bf969cbac879363e14dad1952517d8f4b463511adccf25e655bced7cd9666d01dd4f2a0a21729ac4f44970c9c478a995d1c3b358a244110f1db9" +
- "fe6335685701e0c2660ae69d33a93a75e44f5374b979a5af140200db43ff612be2728548192ebfd0a3860a9e135b910fe3fb249926d334167622bf4123bdf0d5" +
- "38e9ff2a3bb67a44f8407328e3c94b47d92e0401aa1db85459967699804df245a7808f972683afded9cad8fbce15c1be38fd10c62c7abc302eb0537d5cc573ec" +
- "245513a87c1a8d386f7ef0c4a91ec3c602b14a14ae395da13284df3391b929c7379e181c5d3d4597e3c955ef6e3dc2fc55890df04785bdd4e3fa35ac775f44ef" +
- "9d7813cc036d6bcc316e869eeddf7b30e4b837e9285eb20397b4d7e0d12080c502c750268bcd6ffc323cb094afbe8304ae840d37be833878697f2cf931faf06d" +
- "28dc6c7e1b5df69327127b47eddd0237f1bb5942ee5903d8cbfe1b11484199e90fe7c8e7f2f725deb2293630bd8c8a377d539736e2ccc2b90c08b97abd8c5ce4" +
- "ea91a6219ab06c61c31eb48a35587b3c1719f387bd8c2063c5a79d041ca8a9ffac2e3c728f74efdb74ee0730f84cb3a8aefff7c8a1b570127cfc93eb6d3327f5" +
- "ba7f886dee8be0548f710d6bfb18cbe5910bf61aed2c95028006f419241d968933aa00bb0760a41d2693465827a00837a84cadaf8a8e804d175adc5915c6cb6e" +
- "fefb2cf70db063f2f3812da17586436c176aa0a815dfc7983eb88bfb1b6d1db7ab119cd3058c0db4d1910034f70f6eedfee8b742ea45af9780f415be2f851061" +
- "313a218ad48e992b75afaa07c33ca47ee0155fe72e13d7e5736e512c5e5a45d351f7c7902d8b0fa31b34569a9aea31b018d63d572a9898c389d07caa427f114d" +
- "251263d56cf5d6663159c2b32683b266fb909ba9d4caadaeda6700c03b25307cdea597a3287fd76082dbf33f073482872fdb494b892112c594d7f265d2799b5e" +
- "5ec46a30fbf1557fa344a664a7af457a4e8ce2c014a270215d3f95d47a42d8f86a61d6d6b363d04a99a0d8f06c5b15cd803d951aea0ca185a807ca4c677db789" +
- "fca64f0c5ba95b8c64f930eda658f9f773a9e1c8669589a7d98ade8dbc2c2c4cbbaf6ea2bbc6e762d4098f4db0d3f055958ae9da15ae57ee0b60fb9513dacf5a" +
- "d65e34613570186acecf9e165bfa470aabcd35f22620497fbcabf220c53cff84eec12cf9965297b364f0e9122895c175d213fc2a9c9cbf27ebe1cf96fdacaf1c" +
- "1c79ede66cfaa5057d33e09b31b43869812e5a0ce730663c18c4333141ae9565e437d99ade6b2cbe005214e8b3392c55bf4d7b38ef16e7f84b4ba3c85e1dfd1a" +
- "ca8da1a5c75fd190e7752926533327880aed1461c7e9de2443ba0a2d094f4a14d5fffd3b102ea78acd34d162e82ab78fbb82bfbc8a9708ab532aa861643c39cd" +
- "2bc89f2be53c583f9930fb2da14f1c5d5f218384b1740a76bd8b7ddd2c9888c8d7e7e78cc7a3304fa41995c7c1c3316894296caeeb9711f0e6bf16abc380bd41" +
- "10448be3cb03cc3246ee7b9559c858307001033c84ecf89690526544c05c146f206d4a21e710597bb57759d232154a1f9d88eb3f3440374bad1e901da7a154b8" +
- "39a6d1b1b6b2ab0be872ff036a9f9f769a169fbf91bada732d8f28c453b9be49011b211155fa5c588b43018775f99e3b92b322a4c41282326b79fd26541ccafc" +
- "c0e2f09797e3217fb0e5785b72e654dbcde8ba14b2d56faa2218748c6789c158bb635d43c9a64690b004ab70f457e9fd959b2d90875966968c7ac44b103283e7" +
- "50b60deeb1f89444aee25fbdb7fa3a96d70c3dce38246f111e466cdfa3b807c54ed584f5b1a64456e923dcf37f45b36cea3d602ba3a55a4fd883ebb6dc198650" +
- "b522461614656897b9b7d408d48b12e594af06c91f715b32a4ed65a379f0ab461acb9b8b20d1f1b12e9f7fea422c0c7d545eff4152e06002cbd120fd74b483d3" +
- "a0ee30cfd851c98e9aa8fb19b60528de4a75b412bed656933ae8ab600aeaef5befdcca4d35fa472ed38ffb91a9017c19c5d500426f262ba379034c45cf5d1627" +
- "48da223207721b4bc4504b79309f3d622c53dfe3c83ff8866dd7614a2e90a85c077b2e18bf1cb6008f0d785d6a0ffd5f15a83a343036f3fdd25314bfe47b5a12" +
- "58a7c89475f39a58a671d0a17f6fd100a8928181b94d8d53149316d5addf14bd398b538e2593273f02cf296fd73ff92d02230de939dae94e03d44ce93dd4dfa1" +
- "b9219fd369c854ec409d7bf94b316e5e9c16e1ba525a783e24bd3fc0ecc949be245c402efae8ea77aaca74c78703506cfd5a5a614793e04c76652b4f344f79fd" +
- "f2da1e34f650fc1094116ead723813d204ffe375d20707fd94d90f21c009194201c88d22afaee83a8a6be7518dc915331b863664e033d397c64e1516c0fd9324" +
- "11614a1bdf2feb86e0d0ae21e784a55086c596c7eedd44d3afd7295455450f507f1c1a33c9ba94d50931ec054d8740510ea23990c266f30678a74fdd485b482b" +
- "cbfb4070e3f10b66c65a4210794a3137adabe887ffb9bcf2a30c625138f840b2666610e76e5a0abc183088a94930c025836653eddbc440621bbf94761c74e108" +
- "3672c6a914a753fd452e8e7a02c54b21d7bab4b705b4509b9b5b27e2e5144289eece950c3634b410b5e3cf8c5a5f74d98b55d17d45d7014390cf696a7e693777" +
- "4c028517062a69276910cf5f139078e8ef6e77aa8b35aa55fd4f53e48ae6b4875d1732b286ffe8bf852b73af7b964fdf1aa4c4f16d9f14485a2b1a704c2615ac" +
- "8ac74eaaacec7e8e4e506e1b418d377e4d5a271dfab47b3d3c11a809beda596fdf37935dfe06c147dfe7d5be696ffb2a0cff907d1eb2a88477c261d5a7aba06c" +
- "d70dc52d00b9a9d851e849f86e1cba91b4c40d1ae3d4f21a2763369dde34d084adfc09d2a6cb5f09114cd8d6fa26d15f1ec428adc245064e5b8e80f21b0b3ff2" +
- "6690398d3080f5355fc082bc4bf3a38576c7da00efbc80839dc9a06fab2b998a152553c36fab42e03e3e4b54456ed954e53bd63902d89e2617a263e70146d1eb" +
- "71557baf43aeb0a681f600a784778c895afce26fe17e3ac33990c54cd96fcb2432de79d4f95ab2fb96effdd37f4e4247ae5b4c1fa461ca3269d45a90af090333" +
- "fc3ab5152bd5aed4445eab93466701382ba76fc8745abd911bdb45a494e1c62647670380c04377bcdb5e631318dfa79850469a988094acd48a4110bbc7289617" +
- "ce436294ff242302d154ad75437ae2f551df5b84f884c87497de0bb2ef7bd41a8c758e4b158084c78ef047389d88974faafa00ce7396e849509d39c403fdcca6" +
- "8f47e1d0fc294e5510a07af24c165e1a4b4ba9498e7b333c4e8624c552801079775fc684b6e98b72ff133164a2052c2aadcef168d9cdeab8a935c98f08e23b95" +
- "859277381a2ce23ea61fbe9ec1439a489523161ed370b0069aa6a5c7981e4a80c04e304ff2fd85f80b51e3de3484b53084f376cc72a390aaefc49baddf4d2545" +
- "93dcb5a49326c9c15c3d1c0e0709c9879d68bee07b956d018a995bf1e7f8fa03ef2079d01e0bec601519704cced98854c94f1f0ae837653f14c0221e12f2cbdb" +
- "1564066062bc1d4dcf7ed8b2c980b90e8101842d5844375cb370f402d858dffd9eb52572f8420d4d246462230ca0dbd567250e4f065730a6aecbd804b1acf949" +
- "30e2890a39fdd4c1eb693f7e345504dbad5ac207f1a649968c3a7b416bd972b6a6bfde04375337a93b0ac08f6fae62c0fa7df8ae9deeee421f7ac62d8cf5ecf3" +
- "b5ff39877ee4abaeb9db03d8a8f13f7925e54267a2651c55ecf580d5cbb24bf504fb01291e3e97ad1696ed995608fceda79f2441ca67bfe3c31f4f4bf0fffcd6" +
- "55408744524412cd4d3cbdbdd216694aa7477e88b25f7efeb34abf491a50695ff686829a8fea9e999877bcb37291b8dbeeddfd44465a2c28a215aa532590c487" +
- "d4747b6ece4e1aeaef725cb305d11b965a9647bef36a5c2fb45cc334d35ff4e308cd8813b6de3953b35a4ef6a3ae07794f8b54ef6365a573135320612bd1acfe" +
- "6cac5524c0e98b6f2a33a790b94f5134f0cba075a6fa93c191f4176ca62ea2e365557d6b3363a17b9ee52f3c347c82cd19f8432d16a934ae9c5d4d4505e7d20e" +
- "1ae31bb64ccb084f7a59744b27d58c2388d449ff4b63604878ae858240348ecfcb51761678265bd60d5dd7d51e25e91668fdf80f6b726b29ef6c3f0f229d8af4" +
- "b2cdadc3ca7fbadab49b28819b9c9b92b49cbe9a281e5891f4eae7616013777605a0623dd7a650baf9a9dad66ca9aae3c76ef1e27db32bd9514a2776eb0c8d05" +
- "65eec06fc4c8a69c417efa336842e248e5a51e3b5f3ba3227e3f78f1bd12d81595e03a01f4259c772fd481ab5f3d7a945e1c95fe0dc3c4742eeb7e15c9426ec3" +
- "ed4c90ee07d56acc78fecfd7c5ce1e04e7db1a970091f15c90f0aae2865d135395d27787aaf68c6a179064d82691e0b6c795f61875f317dc6d2e8feea55a28f2" +
- "461d74e14e350351720b6f536adfe3addd4111f08e3a84da2656fd4bc83989b329b383da9f01cf2392aa0b19577884d1281f2e6c106df451c078a472b36057d3" +
- "065dfc4bbb47ce4e5dce4acf6da095bdd10322f3ae12bcdd1f805e73b303f1fc7a7e16cf3ffd822bd8b25fbc93be065019e394113182713f1ad299ae6537f6bf" +
- "57116e8dc9ec775519b797ab4107c2ac5129ba85188852c3bc5f116044bbd8985b6dc8b8da4659589bf9d2351c4c3adaed87fe2ea20ef6bf62224c7af86fe8b4" +
- "973e558f39465dff43bf23cf1f78957514e4e82a3009d40d97bf8d8442a11deabde806e2fa84c1ba75273da75ce8dad3b2a34786b2958ac4bfd248ebe604a173" +
- "83c727b11dd922b1f72476af700b663fbd7033d0ac74b463d40a92d26c938b69f96fb4a9cb7a9ca2bd9496251270c0c5fcae6b3c2eda5377b897891648a97125" +
- "8ac71fed8dce8e02c30961a299cb7f3145845dbe8f4dfaaaf4baf0ca3fb730abdd258e98215f072a943d5aee8d8bc4c86023524f7b69186d99ad88ccdfc0b4bd" +
- "7db422bbad7eaa0824ce24b5c186e172c8c584f1cc5c126c901a69ebee8dbd230a653a3643b7875672d22fd86079daf8d834ba33664f5ad0b6eec767b4f58b45" +
- "e67b776b90e0a5e130aa5365003eb7fd78b757b1cf9133f6a1d51064b293cb42c8c41b15b7e95e2a39fa5dae19c6e20031d2bfa4632c37779163fdecc6b45624" +
- "4d6bfd01a8877f6fe7739591917a86e7dd795ad85cc3f256cff5961e8b62e92a0754a51f2c6d59819446eec8bdd08b87cf9f4fb5373e809d52240d2dd691cd50" +
- "37fc79d35b61d63851917cfdba164868a3f79e2061bd4610c1f5216ed77df00baa75f949ad37142db4fd282a5c7d2e2636ca590f92fc4781d4f51efa69f53947" +
- "d4fca1dc7dd2429837b6d7e5c9528effdecf6f731f676587785e5c4096bdb6f1f44e72f5f77d9025813e848881506f65bfb0f2b2d3ae6f9e00731929b5ac083d" +
- "b1c9c324703e63fef6319e1d8150aa0ff7d9a2049961df9158f3e1f2e540a91feb742625d2a859a452186d2ccaa3ec2ba086ee0868a4dc24ae6818fc02f9c1df" +
- "dc326cc31c46feefda97265238592f638968627ec24903b97513ab05ed58ce5b516decda0e2fbf01a70e6cb2e53c3e7b8855f80cd7e007b78da727ef0893e099" +
- "592ba684d62ae2d1f06ad148fa7f34cfc724d804149cda21aee7eac064ad20d29132b260c2c2867fa6a2e747739fc30df2f002c2a99da6c7e64ee51e806af7d9" +
- "768aec456b93a05002666cb61b2229c99f2cdef9afc9cea1c4ee3a85dd189823399781ee33cde2abedff09c47960c035e075a29156005d75845a11fa06abcc50" +
- "5f7f849a0caaf683f334e9e7bbbef90fe6cf94cbf87767219440d31713daef6ad1e4a1cc720ce59fee4cf7731e46bbba9ec1648908ea345030aa8f10ade10ffa" +
- "3d2acfd480b0b11eadc4fb2b740596b204e911456cb2f35ad9993ab7dd6a48b35ba0c207625384bb3c2ff24437810bd13c7ee96cd6f97f19ffd537ad182a3657" +
- "b0e83d42fd6e2ebac6cbf5ea1bde97465b7cec6954ff5b5be049e59a49ea25ed6667dbace765401bde12031e5cfabf2df7afb728d2a0b2a38b24d79bf23a313c" +
- "40fe5adef97487641c6088dd8712c0c352708e474b02c08fd2d71b6d44f16d82f291ccd61c43a339408379a8de54cfdbbae5e421e084112fbc17fb5561e084d1" +
- "4149bf4bb06fd161878d8574f856867cff974d5898e161923d55bdac8699c9df6a220bcb6c800d3ae7f107b8c4acab206d780aafaf6c2e2379de8c900700d9c9" +
- "c87d464772514c5aa3e5f5bfc00fb54f2b74702838b4731c5ac8a070b50783e81dd97fa8d55c739d026b607a2a78aba1bb79b1a7a3c22c78368672ac020061e6" +
- "d9683d57d6989c6c6f08b8d5d74720f5cb25505fbe81d2bf53a68e972a54784705b20f83fd1ab5afff30764ef89dba4465b56f48b325ab3810bf8dcbf4faa61f" +
- "676e2043ac8540df9e3af4c0f51d816e89c09bf67253be45fc5f75f64be97f6c7dc0c6392af6fa8e75aab58eda976b36773cd37d315771400a2cb846fdef3d8a" +
- "a15bce5dfda0379e526f87cf67767a2ab93d41c85b4ed016ed0a89d2f94737433a3ebade813def29eaa18a1fb925fca7d08d1020f64caebc562cb4ad2fb241e2" +
- "94923b2f2df5e6c4953c4b73be0f5568defe57ce49d16e2a205323e46cbb5a3e77fff1557671503bd7b5de5320f1fb951fbe26400cfa854af2d12fab0215310c" +
- "f070add34dc4565d1757d7e10a03e3bb73a607ed7e10861b1274ddee76183cf7e56c1de7162c805c2dba0e0331d36f3a4e2019a2e0705ee2747ed1e52bc3a6fb" +
- "3b061f784348204cdf8d643ff6c271fa72b56900edcc2f77201f3bd4fc296ad6534a7029ea66761bb9a3589a1f6ef566504c70297b98fbb603214fed2e4b7ca1" +
- "06e3f0e993118897fa641fb9722d4667fa98d07a6837e5ab2144e5ec1548a7dbca28c559f2a9a99d54b8e55f56d0e59bcef1ac45e2046835b60579da0d2261e7" +
- "30dab9009d138421c6458d146e870358b0b3fa20257e50b58f167c6b47edf7053513d58f33547d06ce52458baaa4dcf15f77b103565c66a81f183c827801b455" +
- "b61b6287a46a37a96884075a7eada9ba7f0ddcc14654bf87a26d2e27a978b415257773796923a220e06b25af16fb5aaded9b2d081a4c64106df460ddce9c3b2a" +
- "c8553e1521e501ad29a4b7f7681c9b60576a127087a5237c4c2bacf9b163dd590e63f2bc80e7f1e613773f87d034313064710404739d63363d204be7b14800c4" +
- "d8c1b6a2a21da70223be51d281fee302ef806454f9d7d28244ba537c1d9f8f1bcc5d47038d986a8f95ca48437ffe94fd44a90bb03014a259112a97508adb3db4" +
- "34f72a5268c1af6bc6d5801e579aab2228ca33600ebbf1a1959081c3a4ca99e444f97409f5e0ca4779241c9aacad1f4ee7fb4369bd6ae076378e4f63000b9a5c" +
- "849ba6e72e47e2454a44659149338ac0767cd25d8693c0d143e354bd600f1c1d3a44eeb024923ea659060665d5cd9a4ca1ca86162819556535fd59b9fde90caa" +
- "29920efe99479fe7e4b4e5371e13ccb43a1419cf023433239d840900d31bab37fabc3fd20e31bb7dbcb3ae8df66f67e2844944bcf544b658364f9e3d0b6d84b4" +
- "63ad4eb621644fd7d774b501407a1178814b15149345d551b474347188067db2ab4d7f4d1abd3027133039e855e129f3f5649550da8c04fe2db57cb89bf1bf4f" +
- "72eb35ccfe31afb92f6136d4c2a1c115b07b721b2da43151f11c356256230408979c5d95243714429e2c9500e7b043b20dac8a9763e5b487d1cbdb34ac379b9c" +
- "6409454c79385b6e562459c4fdaad1b7f9297c1473e9b90fffe6d1c5390e241a187a4cefa2eb0cb0c11f4ca6c5b961c18ceb57892295290dbc991692556bffa3" +
- "b8c405cf285e6bcb8a90246ad0ac15122f4cf73adc129d23aa2240733404beb6d74bf698e5589288a522573c774ce9f514b5d5c086382ea1dd4e89ff5facbf23" +
- "d36bc3d203941e17747ede4b82820351f4df278ddb787ce8f6f1cc468ef953399efb072ce706e253f1bab76444bb70be6443cd0db633e958dc57bd223e00418e" +
- "915a7c2e4d94c0623f9788276480cdfe798387d35e2ea2d304d066aec7627794cdd4200a44208d6c87f242c76e2d4a3f966b6fb96eaa63d892c1a177bef249b4" +
- "fdd1a4c06c791f677dd9919f739ccf318bd77835330b0219786249c9c9736161dac771a838724f2dd70afba46a6782fd27601cf8a7126ae95a66e526131a68d7" +
- "7a809e513533ed8021eecdbc5851dfcf95e10f1bbe47b5c7f079275a1837836245266b66d89fab25ac4bd6c1225560bea3259b67bf50a58ee056754d574da79e" +
- "f9a1a0df3a5defed0f74fe74ce0bf65a04086f17e94a8451828c723c97932f26f9349f1a2c7866c617a528602721de4f3cc8916bcfc66cdc106bafa26ea87a13" +
- "94dfa37e396365fb7f92df007b46a50ff04c7f85bfa679230ebedf18c2fb876fc7098dd1c4328adf85de71c31d94687a308053bfcdc158cfa7772170fbed63f5" +
- "37dda41f65196dfacdd1186b5de0f3369d841ce6502192292d05a19ce7464f5bcab3015c721cac13ddca561b92dc1ee25d3068dc1945a1b4e2bd1e6604c42e4c" +
- "3c04b490f6365828957990007394557854a903e19feb06906e41cbc8766bf37bd7dece90f4cdc987709b1129e84bfdc502543b5bfa887bf78553a5ec10ad68c5" +
- "d10eff75f7aa495e7d934a55577fdc0aead31aee4522db0259d7d4ea8438a7996d80a787465a2980457193d1c4bf1a0a1e01741d72e5fc4dfe58475c1c01026b" +
- "5a3bc973b902280753e9c3226db9cc778e2506c56ee86ae85b4d54dbf05394107329b2d1ee56522cb1ce562fb1aa4e592199d9c29f64cc3ab1d757531e209eec" +
- "aa138d8388169b5e28c45f5aba267eeaa57f69869f0b6855d82b0eafcde63895251f41e8e676a0ab12ef3f569bb7de91b79fa46ad9637da01ca004f4d30259c1" +
- "f5b00761f6ca9c17721a6718390624a10a11f7f52d7afb71ee5f8338828910e48f94a1347761abac87897b2dd0e23f1d325aec5031ef58f2972e8b402e05f8c1" +
- "ae7053a90380a1ae0d4d06645548c23e13afa31aac8ff83b10f8341418af4114632f6406d6e33076391696c9161d63c8bcfd1c625fc737f68198046212d1638a" +
- "d2d2d42ff7029c1fcc682a046edc4d4f24862d82c600180b1e8f57ff6a3865dfe9274f9886d00efa523a1b3b3757c4489200fec3dc5583854c955492336253dd" +
- "767f2a60ce3d224afcff9cdc19e9b28830d33affda6af99942a8fe39562055f3e884fd6c1ebc1908ac159061f35e9b0da80434ce9673d9c6b87265170077c670" +
- "743e37474d7605cd01c44af600f16d9ffaf24acf87fbe5ccf39bac41047a810d210051c87f06147a0bb8f1427a406700483679638f1af23f1dafb7aa0c468669" +
- "71c3a82f535c26cf6cb335e8e915fda393799d3dbe0e04b907ed3612d12ac95783a6876cd986d2a13b82192532e02c250eaa42f891d2481655fa4494c723fe00" +
- "87d224444245eb5b0eade5f741b025db1992a8ad0dce51b0c1af4a18a9e244f9f755891adf0f19179c7baa6c32bffc91e0b03c4ed3aaee1978b6a1f03b87ac6a" +
- "fc3b9e7030bb212b17de198edfccde29d04224798c1204e47ea235f048724fac62d637d1ba0ee3922048fcf79c746b6c0c036d882e3491fd72bad6e009c6403e" +
- "55876f4d31330caa02aedd0b0c121c3c41e736853a08071f0dd4ddc7412db0bbe274a9ac2932552bb37c40e72c2ef1d7cca8236942e480d709d3ea9d5ae0a1b7",
- ),
- },
- }
- for i, tt := range tests {
- cache := make([]uint32, tt.cacheSize/4)
- generateCache(cache, tt.epoch, seedHash(tt.epoch*epochLength+1))
-
- dataset := make([]uint32, tt.datasetSize/4)
- generateDataset(dataset, tt.epoch, cache)
-
- want := make([]uint32, tt.datasetSize/4)
- prepare(want, tt.dataset)
-
- if !reflect.DeepEqual(dataset, want) {
- t.Errorf("dataset %d: content mismatch: have %x, want %x", i, dataset, want)
- }
- }
-}
-
-// Tests whether the hashimoto lookup works for both light as well as the full
-// datasets.
-func TestHashimoto(t *testing.T) {
- // Create the verification cache and mining dataset
- cache := make([]uint32, 1024/4)
- generateCache(cache, 0, make([]byte, 32))
-
- dataset := make([]uint32, 32*1024/4)
- generateDataset(dataset, 0, cache)
-
- // Create a block to verify
- hash := hexutil.MustDecode("0xc9149cc0386e689d789a1c2f3d5d169a61a6218ed30e74414dc736e442ef3d1f")
- nonce := uint64(0)
-
- wantDigest := hexutil.MustDecode("0xe4073cffaef931d37117cefd9afd27ea0f1cad6a981dd2605c4a1ac97c519800")
- wantResult := hexutil.MustDecode("0xd3539235ee2e6f8db665c0a72169f55b7f6c605712330b778ec3944f0eb5a557")
-
- digest, result := hashimotoLight(32*1024, cache, hash, nonce)
- if !bytes.Equal(digest, wantDigest) {
- t.Errorf("light hashimoto digest mismatch: have %x, want %x", digest, wantDigest)
- }
- if !bytes.Equal(result, wantResult) {
- t.Errorf("light hashimoto result mismatch: have %x, want %x", result, wantResult)
- }
- digest, result = hashimotoFull(dataset, hash, nonce)
- if !bytes.Equal(digest, wantDigest) {
- t.Errorf("full hashimoto digest mismatch: have %x, want %x", digest, wantDigest)
- }
- if !bytes.Equal(result, wantResult) {
- t.Errorf("full hashimoto result mismatch: have %x, want %x", result, wantResult)
- }
-}
-
-// Tests that caches generated on disk may be done concurrently.
-func TestConcurrentDiskCacheGeneration(t *testing.T) {
- // Create a temp folder to generate the caches into
- // TODO: t.TempDir fails to remove the directory on Windows
- // \AppData\Local\Temp\1\TestConcurrentDiskCacheGeneration2382060137\001\cache-R23-1dca8a85e74aa763: Access is denied.
- cachedir, err := os.MkdirTemp("", "")
- if err != nil {
- t.Fatalf("Failed to create temporary cache dir: %v", err)
- }
- defer os.RemoveAll(cachedir)
-
- // Define a heavy enough block, one from mainnet should do
- block := types.NewBlockWithHeader(&types.Header{
- Number: big.NewInt(3311058),
- ParentHash: common.HexToHash("0xd783efa4d392943503f28438ad5830b2d5964696ffc285f338585e9fe0a37a05"),
- UncleHash: types.EmptyUncleHash,
- Coinbase: common.HexToAddress("0xc0ea08a2d404d3172d2add29a45be56da40e2949"),
- Root: common.HexToHash("0x77d14e10470b5850332524f8cd6f69ad21f070ce92dca33ab2858300242ef2f1"),
- TxHash: types.EmptyTxsHash,
- ReceiptHash: types.EmptyReceiptsHash,
- Difficulty: big.NewInt(167925187834220),
- GasLimit: 4015682,
- GasUsed: 0,
- Time: 1488928920,
- Extra: []byte("www.bw.com"),
- MixDigest: common.HexToHash("0x3e140b0784516af5e5ec6730f2fb20cca22f32be399b9e4ad77d32541f798cd0"),
- Nonce: types.EncodeNonce(0xf400cd0006070c49),
- })
- // Simulate multiple processes sharing the same datadir
- var pend sync.WaitGroup
-
- for i := 0; i < 3; i++ {
- pend.Add(1)
- go func(idx int) {
- defer pend.Done()
-
- config := Config{
- CacheDir: cachedir,
- CachesOnDisk: 1,
- }
- ethash := New(config, nil, false)
- defer ethash.Close()
- if err := ethash.verifySeal(nil, block.Header(), false); err != nil {
- t.Errorf("proc %d: block verification failed: %v", idx, err)
- }
- }(i)
- }
- pend.Wait()
-}
-
-// Benchmarks the cache generation performance.
-func BenchmarkCacheGeneration(b *testing.B) {
- for i := 0; i < b.N; i++ {
- cache := make([]uint32, cacheSize(1)/4)
- generateCache(cache, 0, make([]byte, 32))
- }
-}
-
-// Benchmarks the dataset (small) generation performance.
-func BenchmarkSmallDatasetGeneration(b *testing.B) {
- cache := make([]uint32, 65536/4)
- generateCache(cache, 0, make([]byte, 32))
-
- b.ResetTimer()
- for i := 0; i < b.N; i++ {
- dataset := make([]uint32, 32*65536/4)
- generateDataset(dataset, 0, cache)
- }
-}
-
-// Benchmarks the light verification performance.
-func BenchmarkHashimotoLight(b *testing.B) {
- cache := make([]uint32, cacheSize(1)/4)
- generateCache(cache, 0, make([]byte, 32))
-
- hash := hexutil.MustDecode("0xc9149cc0386e689d789a1c2f3d5d169a61a6218ed30e74414dc736e442ef3d1f")
-
- b.ResetTimer()
- for i := 0; i < b.N; i++ {
- hashimotoLight(datasetSize(1), cache, hash, 0)
- }
-}
-
-// Benchmarks the full (small) verification performance.
-func BenchmarkHashimotoFullSmall(b *testing.B) {
- cache := make([]uint32, 65536/4)
- generateCache(cache, 0, make([]byte, 32))
-
- dataset := make([]uint32, 32*65536/4)
- generateDataset(dataset, 0, cache)
-
- hash := hexutil.MustDecode("0xc9149cc0386e689d789a1c2f3d5d169a61a6218ed30e74414dc736e442ef3d1f")
-
- b.ResetTimer()
- for i := 0; i < b.N; i++ {
- hashimotoFull(dataset, hash, 0)
- }
-}
-
-func benchmarkHashimotoFullMmap(b *testing.B, name string, lock bool) {
- b.Run(name, func(b *testing.B) {
- tmpdir := b.TempDir()
-
- d := &dataset{epoch: 0}
- d.generate(tmpdir, 1, lock, false)
- var hash [common.HashLength]byte
- b.ResetTimer()
- for i := 0; i < b.N; i++ {
- binary.PutVarint(hash[:], int64(i))
- hashimotoFull(d.dataset, hash[:], 0)
- }
- })
-}
-
-// Benchmarks the full verification performance for mmap
-func BenchmarkHashimotoFullMmap(b *testing.B) {
- benchmarkHashimotoFullMmap(b, "WithLock", true)
- benchmarkHashimotoFullMmap(b, "WithoutLock", false)
-}
diff --git a/consensus/ethash/api.go b/consensus/ethash/api.go
deleted file mode 100644
index da3b0751be..0000000000
--- a/consensus/ethash/api.go
+++ /dev/null
@@ -1,113 +0,0 @@
-// Copyright 2018 The go-ethereum Authors
-// This file is part of the go-ethereum library.
-//
-// The go-ethereum library is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// The go-ethereum library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public License
-// along with the go-ethereum library. If not, see .
-
-package ethash
-
-import (
- "errors"
-
- "github.com/ethereum/go-ethereum/common"
- "github.com/ethereum/go-ethereum/common/hexutil"
- "github.com/ethereum/go-ethereum/core/types"
-)
-
-var errEthashStopped = errors.New("ethash stopped")
-
-// API exposes ethash related methods for the RPC interface.
-type API struct {
- ethash *Ethash
-}
-
-// GetWork returns a work package for external miner.
-//
-// The work package consists of 3 strings:
-//
-// result[0] - 32 bytes hex encoded current block header pow-hash
-// result[1] - 32 bytes hex encoded seed hash used for DAG
-// result[2] - 32 bytes hex encoded boundary condition ("target"), 2^256/difficulty
-// result[3] - hex encoded block number
-func (api *API) GetWork() ([4]string, error) {
- if api.ethash.remote == nil {
- return [4]string{}, errors.New("not supported")
- }
-
- var (
- workCh = make(chan [4]string, 1)
- errc = make(chan error, 1)
- )
- select {
- case api.ethash.remote.fetchWorkCh <- &sealWork{errc: errc, res: workCh}:
- case <-api.ethash.remote.exitCh:
- return [4]string{}, errEthashStopped
- }
- select {
- case work := <-workCh:
- return work, nil
- case err := <-errc:
- return [4]string{}, err
- }
-}
-
-// SubmitWork can be used by external miner to submit their POW solution.
-// It returns an indication if the work was accepted.
-// Note either an invalid solution, a stale work a non-existent work will return false.
-func (api *API) SubmitWork(nonce types.BlockNonce, hash, digest common.Hash) bool {
- if api.ethash.remote == nil {
- return false
- }
-
- var errc = make(chan error, 1)
- select {
- case api.ethash.remote.submitWorkCh <- &mineResult{
- nonce: nonce,
- mixDigest: digest,
- hash: hash,
- errc: errc,
- }:
- case <-api.ethash.remote.exitCh:
- return false
- }
- err := <-errc
- return err == nil
-}
-
-// SubmitHashrate can be used for remote miners to submit their hash rate.
-// This enables the node to report the combined hash rate of all miners
-// which submit work through this node.
-//
-// It accepts the miner hash rate and an identifier which must be unique
-// between nodes.
-func (api *API) SubmitHashrate(rate hexutil.Uint64, id common.Hash) bool {
- if api.ethash.remote == nil {
- return false
- }
-
- var done = make(chan struct{}, 1)
- select {
- case api.ethash.remote.submitRateCh <- &hashrate{done: done, rate: uint64(rate), id: id}:
- case <-api.ethash.remote.exitCh:
- return false
- }
-
- // Block until hash rate submitted successfully.
- <-done
- return true
-}
-
-// GetHashrate returns the current hashrate for local CPU miner and remote miner.
-func (api *API) GetHashrate() uint64 {
- return uint64(api.ethash.Hashrate())
-}
diff --git a/consensus/ethash/consensus.go b/consensus/ethash/consensus.go
index c3c06c541c..8eb9863da1 100644
--- a/consensus/ethash/consensus.go
+++ b/consensus/ethash/consensus.go
@@ -17,11 +17,9 @@
package ethash
import (
- "bytes"
"errors"
"fmt"
"math/big"
- "runtime"
"time"
mapset "github.com/deckarep/golang-set/v2"
@@ -29,6 +27,7 @@ import (
"github.com/ethereum/go-ethereum/common/math"
"github.com/ethereum/go-ethereum/consensus"
"github.com/ethereum/go-ethereum/consensus/misc"
+ "github.com/ethereum/go-ethereum/consensus/misc/eip1559"
"github.com/ethereum/go-ethereum/core/state"
"github.com/ethereum/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/params"
@@ -84,14 +83,11 @@ var (
// codebase, inherently breaking if the engine is swapped out. Please put common
// error types into the consensus package.
var (
- errOlderBlockTime = errors.New("timestamp older than parent")
- errTooManyUncles = errors.New("too many uncles")
- errDuplicateUncle = errors.New("duplicate uncle")
- errUncleIsAncestor = errors.New("uncle is ancestor")
- errDanglingUncle = errors.New("uncle's parent is not ancestor")
- errInvalidDifficulty = errors.New("non-positive difficulty")
- errInvalidMixDigest = errors.New("invalid mix digest")
- errInvalidPoW = errors.New("invalid proof-of-work")
+ errOlderBlockTime = errors.New("timestamp older than parent")
+ errTooManyUncles = errors.New("too many uncles")
+ errDuplicateUncle = errors.New("duplicate uncle")
+ errUncleIsAncestor = errors.New("uncle is ancestor")
+ errDanglingUncle = errors.New("uncle's parent is not ancestor")
)
// Author implements consensus.Engine, returning the header's coinbase as the
@@ -102,11 +98,7 @@ func (ethash *Ethash) Author(header *types.Header) (common.Address, error) {
// VerifyHeader checks whether a header conforms to the consensus rules of the
// stock Ethereum ethash engine.
-func (ethash *Ethash) VerifyHeader(chain consensus.ChainHeaderReader, header *types.Header, seal bool) error {
- // If we're running a full engine faking, accept any input as valid
- if ethash.config.PowMode == ModeFullFake {
- return nil
- }
+func (ethash *Ethash) VerifyHeader(chain consensus.ChainHeaderReader, header *types.Header) error {
// Short circuit if the header is known, or its parent not
number := header.Number.Uint64()
if chain.GetHeader(header.Hash(), number) != nil {
@@ -117,93 +109,54 @@ func (ethash *Ethash) VerifyHeader(chain consensus.ChainHeaderReader, header *ty
return consensus.ErrUnknownAncestor
}
// Sanity checks passed, do a proper verification
- return ethash.verifyHeader(chain, header, parent, false, seal, time.Now().Unix())
+ return ethash.verifyHeader(chain, header, parent, false, time.Now().Unix())
}
// VerifyHeaders is similar to VerifyHeader, but verifies a batch of headers
// concurrently. The method returns a quit channel to abort the operations and
// a results channel to retrieve the async verifications.
-func (ethash *Ethash) VerifyHeaders(chain consensus.ChainHeaderReader, headers []*types.Header, seals []bool) (chan<- struct{}, <-chan error) {
+func (ethash *Ethash) VerifyHeaders(chain consensus.ChainHeaderReader, headers []*types.Header) (chan<- struct{}, <-chan error) {
// If we're running a full engine faking, accept any input as valid
- if ethash.config.PowMode == ModeFullFake || len(headers) == 0 {
+ if ethash.fakeFull || len(headers) == 0 {
abort, results := make(chan struct{}), make(chan error, len(headers))
for i := 0; i < len(headers); i++ {
results <- nil
}
return abort, results
}
+ abort := make(chan struct{})
+ results := make(chan error, len(headers))
+ unixNow := time.Now().Unix()
- // Spawn as many workers as allowed threads
- workers := runtime.GOMAXPROCS(0)
- if len(headers) < workers {
- workers = len(headers)
- }
-
- // Create a task channel and spawn the verifiers
- var (
- inputs = make(chan int)
- done = make(chan int, workers)
- errors = make([]error, len(headers))
- abort = make(chan struct{})
- unixNow = time.Now().Unix()
- )
- for i := 0; i < workers; i++ {
- go func() {
- for index := range inputs {
- errors[index] = ethash.verifyHeaderWorker(chain, headers, seals, index, unixNow)
- done <- index
- }
- }()
- }
-
- errorsOut := make(chan error, len(headers))
go func() {
- defer close(inputs)
- var (
- in, out = 0, 0
- checked = make([]bool, len(headers))
- inputs = inputs
- )
- for {
+ for i, header := range headers {
+ var parent *types.Header
+ if i == 0 {
+ parent = chain.GetHeader(headers[0].ParentHash, headers[0].Number.Uint64()-1)
+ } else if headers[i-1].Hash() == headers[i].ParentHash {
+ parent = headers[i-1]
+ }
+ var err error
+ if parent == nil {
+ err = consensus.ErrUnknownAncestor
+ } else {
+ err = ethash.verifyHeader(chain, header, parent, false, unixNow)
+ }
select {
- case inputs <- in:
- if in++; in == len(headers) {
- // Reached end of headers. Stop sending to workers.
- inputs = nil
- }
- case index := <-done:
- for checked[index] = true; checked[out]; out++ {
- errorsOut <- errors[out]
- if out == len(headers)-1 {
- return
- }
- }
case <-abort:
return
+ case results <- err:
}
}
}()
- return abort, errorsOut
-}
-
-func (ethash *Ethash) verifyHeaderWorker(chain consensus.ChainHeaderReader, headers []*types.Header, seals []bool, index int, unixNow int64) error {
- var parent *types.Header
- if index == 0 {
- parent = chain.GetHeader(headers[0].ParentHash, headers[0].Number.Uint64()-1)
- } else if headers[index-1].Hash() == headers[index].ParentHash {
- parent = headers[index-1]
- }
- if parent == nil {
- return consensus.ErrUnknownAncestor
- }
- return ethash.verifyHeader(chain, headers[index], parent, false, seals[index], unixNow)
+ return abort, results
}
// VerifyUncles verifies that the given block's uncles conform to the consensus
// rules of the stock Ethereum ethash engine.
func (ethash *Ethash) VerifyUncles(chain consensus.ChainReader, block *types.Block) error {
// If we're running a full engine faking, accept any input as valid
- if ethash.config.PowMode == ModeFullFake {
+ if ethash.fakeFull {
return nil
}
// Verify that there are at most 2 uncles included in this block
@@ -255,7 +208,7 @@ func (ethash *Ethash) VerifyUncles(chain consensus.ChainReader, block *types.Blo
if ancestors[uncle.ParentHash] == nil || uncle.ParentHash == block.ParentHash() {
return errDanglingUncle
}
- if err := ethash.verifyHeader(chain, uncle, ancestors[uncle.ParentHash], true, true, time.Now().Unix()); err != nil {
+ if err := ethash.verifyHeader(chain, uncle, ancestors[uncle.ParentHash], true, time.Now().Unix()); err != nil {
return err
}
}
@@ -265,7 +218,7 @@ func (ethash *Ethash) VerifyUncles(chain consensus.ChainReader, block *types.Blo
// verifyHeader checks whether a header conforms to the consensus rules of the
// stock Ethereum ethash engine.
// See YP section 4.3.4. "Block Header Validity"
-func (ethash *Ethash) verifyHeader(chain consensus.ChainHeaderReader, header, parent *types.Header, uncle bool, seal bool, unixNow int64) error {
+func (ethash *Ethash) verifyHeader(chain consensus.ChainHeaderReader, header, parent *types.Header, uncle bool, unixNow int64) error {
// Ensure that the header's extra-data section is of a reasonable size
if uint64(len(header.Extra)) > params.MaximumExtraDataSize {
return fmt.Errorf("extra-data too long: %d > %d", len(header.Extra), params.MaximumExtraDataSize)
@@ -302,7 +255,7 @@ func (ethash *Ethash) verifyHeader(chain consensus.ChainHeaderReader, header, pa
if err := misc.VerifyGaslimit(parent.GasLimit, header.GasLimit); err != nil {
return err
}
- } else if err := misc.VerifyEip1559Header(chain.Config(), parent, header); err != nil {
+ } else if err := eip1559.VerifyEIP1559Header(chain.Config(), parent, header); err != nil {
// Verify the header's EIP-1559 attributes.
return err
}
@@ -310,22 +263,23 @@ func (ethash *Ethash) verifyHeader(chain consensus.ChainHeaderReader, header, pa
if diff := new(big.Int).Sub(header.Number, parent.Number); diff.Cmp(big.NewInt(1)) != 0 {
return consensus.ErrInvalidNumber
}
- if chain.Config().IsShanghai(header.Time) {
- return fmt.Errorf("ethash does not support shanghai fork")
+ if chain.Config().IsShanghai(header.Number, header.Time) {
+ return errors.New("ethash does not support shanghai fork")
}
- // Verify the engine specific seal securing the block
- if seal {
- if err := ethash.verifySeal(chain, header, false); err != nil {
- return err
- }
+ if chain.Config().IsCancun(header.Number, header.Time) {
+ return errors.New("ethash does not support cancun fork")
+ }
+ // Add some fake checks for tests
+ if ethash.fakeDelay != nil {
+ time.Sleep(*ethash.fakeDelay)
+ }
+ if ethash.fakeFail != nil && *ethash.fakeFail == header.Number.Uint64() {
+ return errors.New("invalid tester pow")
}
// If all checks passed, validate any special fields for hard forks
if err := misc.VerifyDAOHeaderExtraData(chain.Config(), header); err != nil {
return err
}
- if err := misc.VerifyForkHashes(chain.Config(), header, uncle); err != nil {
- return err
- }
return nil
}
@@ -521,72 +475,6 @@ var FrontierDifficultyCalculator = calcDifficultyFrontier
var HomesteadDifficultyCalculator = calcDifficultyHomestead
var DynamicDifficultyCalculator = makeDifficultyCalculator
-// verifySeal checks whether a block satisfies the PoW difficulty requirements,
-// either using the usual ethash cache for it, or alternatively using a full DAG
-// to make remote mining fast.
-func (ethash *Ethash) verifySeal(chain consensus.ChainHeaderReader, header *types.Header, fulldag bool) error {
- // If we're running a fake PoW, accept any seal as valid
- if ethash.config.PowMode == ModeFake || ethash.config.PowMode == ModeFullFake {
- time.Sleep(ethash.fakeDelay)
- if ethash.fakeFail == header.Number.Uint64() {
- return errInvalidPoW
- }
- return nil
- }
- // If we're running a shared PoW, delegate verification to it
- if ethash.shared != nil {
- return ethash.shared.verifySeal(chain, header, fulldag)
- }
- // Ensure that we have a valid difficulty for the block
- if header.Difficulty.Sign() <= 0 {
- return errInvalidDifficulty
- }
- // Recompute the digest and PoW values
- number := header.Number.Uint64()
-
- var (
- digest []byte
- result []byte
- )
- // If fast-but-heavy PoW verification was requested, use an ethash dataset
- if fulldag {
- dataset := ethash.dataset(number, true)
- if dataset.generated() {
- digest, result = hashimotoFull(dataset.dataset, ethash.SealHash(header).Bytes(), header.Nonce.Uint64())
-
- // Datasets are unmapped in a finalizer. Ensure that the dataset stays alive
- // until after the call to hashimotoFull so it's not unmapped while being used.
- runtime.KeepAlive(dataset)
- } else {
- // Dataset not yet generated, don't hang, use a cache instead
- fulldag = false
- }
- }
- // If slow-but-light PoW verification was requested (or DAG not yet ready), use an ethash cache
- if !fulldag {
- cache := ethash.cache(number)
-
- size := datasetSize(number)
- if ethash.config.PowMode == ModeTest {
- size = 32 * 1024
- }
- digest, result = hashimotoLight(size, cache.cache, ethash.SealHash(header).Bytes(), header.Nonce.Uint64())
-
- // Caches are unmapped in a finalizer. Ensure that the cache stays alive
- // until after the call to hashimotoLight so it's not unmapped while being used.
- runtime.KeepAlive(cache)
- }
- // Verify the calculated values against the ones provided in the header
- if !bytes.Equal(header.MixDigest[:], digest) {
- return errInvalidMixDigest
- }
- target := new(big.Int).Div(two256, header.Difficulty)
- if new(big.Int).SetBytes(result).Cmp(target) > 0 {
- return errInvalidPoW
- }
- return nil
-}
-
// Prepare implements consensus.Engine, initializing the difficulty field of a
// header to conform to the ethash protocol. The changes are done inline.
func (ethash *Ethash) Prepare(chain consensus.ChainHeaderReader, header *types.Header) error {
diff --git a/consensus/ethash/ethash.go b/consensus/ethash/ethash.go
index 6cb3124827..f37ec26056 100644
--- a/consensus/ethash/ethash.go
+++ b/consensus/ethash/ethash.go
@@ -18,503 +18,26 @@
package ethash
import (
- "errors"
- "fmt"
- "math"
- "math/big"
- "math/rand"
- "os"
- "path/filepath"
- "reflect"
- "runtime"
- "strconv"
- "sync"
- "sync/atomic"
"time"
- "unsafe"
- "github.com/edsrzf/mmap-go"
- lrupkg "github.com/ethereum/go-ethereum/common/lru"
"github.com/ethereum/go-ethereum/consensus"
- "github.com/ethereum/go-ethereum/log"
- "github.com/ethereum/go-ethereum/metrics"
+ "github.com/ethereum/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/rpc"
)
-var ErrInvalidDumpMagic = errors.New("invalid dump magic")
-
-var (
- // two256 is a big integer representing 2^256
- two256 = new(big.Int).Exp(big.NewInt(2), big.NewInt(256), big.NewInt(0))
-
- // sharedEthash is a full instance that can be shared between multiple users.
- sharedEthash *Ethash
-
- // algorithmRevision is the data structure version used for file naming.
- algorithmRevision = 23
-
- // dumpMagic is a dataset dump header to sanity check a data dump.
- dumpMagic = []uint32{0xbaddcafe, 0xfee1dead}
-)
-
-func init() {
- sharedConfig := Config{
- PowMode: ModeNormal,
- CachesInMem: 3,
- DatasetsInMem: 1,
- }
- sharedEthash = New(sharedConfig, nil, false)
-}
-
-// isLittleEndian returns whether the local system is running in little or big
-// endian byte order.
-func isLittleEndian() bool {
- n := uint32(0x01020304)
- return *(*byte)(unsafe.Pointer(&n)) == 0x04
-}
-
-// memoryMap tries to memory map a file of uint32s for read only access.
-func memoryMap(path string, lock bool) (*os.File, mmap.MMap, []uint32, error) {
- file, err := os.OpenFile(path, os.O_RDONLY, 0644)
- if err != nil {
- return nil, nil, nil, err
- }
- mem, buffer, err := memoryMapFile(file, false)
- if err != nil {
- file.Close()
- return nil, nil, nil, err
- }
- for i, magic := range dumpMagic {
- if buffer[i] != magic {
- mem.Unmap()
- file.Close()
- return nil, nil, nil, ErrInvalidDumpMagic
- }
- }
- if lock {
- if err := mem.Lock(); err != nil {
- mem.Unmap()
- file.Close()
- return nil, nil, nil, err
- }
- }
- return file, mem, buffer[len(dumpMagic):], err
-}
-
-// memoryMapFile tries to memory map an already opened file descriptor.
-func memoryMapFile(file *os.File, write bool) (mmap.MMap, []uint32, error) {
- // Try to memory map the file
- flag := mmap.RDONLY
- if write {
- flag = mmap.RDWR
- }
- mem, err := mmap.Map(file, flag, 0)
- if err != nil {
- return nil, nil, err
- }
- // The file is now memory-mapped. Create a []uint32 view of the file.
- var view []uint32
- header := (*reflect.SliceHeader)(unsafe.Pointer(&view))
- header.Data = (*reflect.SliceHeader)(unsafe.Pointer(&mem)).Data
- header.Cap = len(mem) / 4
- header.Len = header.Cap
- return mem, view, nil
-}
-
-// memoryMapAndGenerate tries to memory map a temporary file of uint32s for write
-// access, fill it with the data from a generator and then move it into the final
-// path requested.
-func memoryMapAndGenerate(path string, size uint64, lock bool, generator func(buffer []uint32)) (*os.File, mmap.MMap, []uint32, error) {
- // Ensure the data folder exists
- if err := os.MkdirAll(filepath.Dir(path), 0755); err != nil {
- return nil, nil, nil, err
- }
- // Create a huge temporary empty file to fill with data
- temp := path + "." + strconv.Itoa(rand.Int())
-
- dump, err := os.Create(temp)
- if err != nil {
- return nil, nil, nil, err
- }
- if err = ensureSize(dump, int64(len(dumpMagic))*4+int64(size)); err != nil {
- dump.Close()
- os.Remove(temp)
- return nil, nil, nil, err
- }
- // Memory map the file for writing and fill it with the generator
- mem, buffer, err := memoryMapFile(dump, true)
- if err != nil {
- dump.Close()
- os.Remove(temp)
- return nil, nil, nil, err
- }
- copy(buffer, dumpMagic)
-
- data := buffer[len(dumpMagic):]
- generator(data)
-
- if err := mem.Unmap(); err != nil {
- return nil, nil, nil, err
- }
- if err := dump.Close(); err != nil {
- return nil, nil, nil, err
- }
- if err := os.Rename(temp, path); err != nil {
- return nil, nil, nil, err
- }
- return memoryMap(path, lock)
-}
-
-type cacheOrDataset interface {
- *cache | *dataset
-}
-
-// lru tracks caches or datasets by their last use time, keeping at most N of them.
-type lru[T cacheOrDataset] struct {
- what string
- new func(epoch uint64) T
- mu sync.Mutex
- // Items are kept in a LRU cache, but there is a special case:
- // We always keep an item for (highest seen epoch) + 1 as the 'future item'.
- cache lrupkg.BasicLRU[uint64, T]
- future uint64
- futureItem T
-}
-
-// newlru create a new least-recently-used cache for either the verification caches
-// or the mining datasets.
-func newlru[T cacheOrDataset](maxItems int, new func(epoch uint64) T) *lru[T] {
- var what string
- switch any(T(nil)).(type) {
- case *cache:
- what = "cache"
- case *dataset:
- what = "dataset"
- default:
- panic("unknown type")
- }
- return &lru[T]{
- what: what,
- new: new,
- cache: lrupkg.NewBasicLRU[uint64, T](maxItems),
- }
-}
-
-// get retrieves or creates an item for the given epoch. The first return value is always
-// non-nil. The second return value is non-nil if lru thinks that an item will be useful in
-// the near future.
-func (lru *lru[T]) get(epoch uint64) (item, future T) {
- lru.mu.Lock()
- defer lru.mu.Unlock()
-
- // Get or create the item for the requested epoch.
- item, ok := lru.cache.Get(epoch)
- if !ok {
- if lru.future > 0 && lru.future == epoch {
- item = lru.futureItem
- } else {
- log.Trace("Requiring new ethash "+lru.what, "epoch", epoch)
- item = lru.new(epoch)
- }
- lru.cache.Add(epoch, item)
- }
- // Update the 'future item' if epoch is larger than previously seen.
- if epoch < maxEpoch-1 && lru.future < epoch+1 {
- log.Trace("Requiring new future ethash "+lru.what, "epoch", epoch+1)
- future = lru.new(epoch + 1)
- lru.future = epoch + 1
- lru.futureItem = future
- }
- return item, future
-}
-
-// cache wraps an ethash cache with some metadata to allow easier concurrent use.
-type cache struct {
- epoch uint64 // Epoch for which this cache is relevant
- dump *os.File // File descriptor of the memory mapped cache
- mmap mmap.MMap // Memory map itself to unmap before releasing
- cache []uint32 // The actual cache data content (may be memory mapped)
- once sync.Once // Ensures the cache is generated only once
-}
-
-// newCache creates a new ethash verification cache.
-func newCache(epoch uint64) *cache {
- return &cache{epoch: epoch}
-}
-
-// generate ensures that the cache content is generated before use.
-func (c *cache) generate(dir string, limit int, lock bool, test bool) {
- c.once.Do(func() {
- size := cacheSize(c.epoch*epochLength + 1)
- seed := seedHash(c.epoch*epochLength + 1)
- if test {
- size = 1024
- }
- // If we don't store anything on disk, generate and return.
- if dir == "" {
- c.cache = make([]uint32, size/4)
- generateCache(c.cache, c.epoch, seed)
- return
- }
- // Disk storage is needed, this will get fancy
- var endian string
- if !isLittleEndian() {
- endian = ".be"
- }
- path := filepath.Join(dir, fmt.Sprintf("cache-R%d-%x%s", algorithmRevision, seed[:8], endian))
- logger := log.New("epoch", c.epoch)
-
- // We're about to mmap the file, ensure that the mapping is cleaned up when the
- // cache becomes unused.
- runtime.SetFinalizer(c, (*cache).finalizer)
-
- // Try to load the file from disk and memory map it
- var err error
- c.dump, c.mmap, c.cache, err = memoryMap(path, lock)
- if err == nil {
- logger.Debug("Loaded old ethash cache from disk")
- return
- }
- logger.Debug("Failed to load old ethash cache", "err", err)
-
- // No previous cache available, create a new cache file to fill
- c.dump, c.mmap, c.cache, err = memoryMapAndGenerate(path, size, lock, func(buffer []uint32) { generateCache(buffer, c.epoch, seed) })
- if err != nil {
- logger.Error("Failed to generate mapped ethash cache", "err", err)
-
- c.cache = make([]uint32, size/4)
- generateCache(c.cache, c.epoch, seed)
- }
- // Iterate over all previous instances and delete old ones
- for ep := int(c.epoch) - limit; ep >= 0; ep-- {
- seed := seedHash(uint64(ep)*epochLength + 1)
- path := filepath.Join(dir, fmt.Sprintf("cache-R%d-%x%s*", algorithmRevision, seed[:8], endian))
- files, _ := filepath.Glob(path) // find also the temp files that are generated.
- for _, file := range files {
- os.Remove(file)
- }
- }
- })
-}
-
-// finalizer unmaps the memory and closes the file.
-func (c *cache) finalizer() {
- if c.mmap != nil {
- c.mmap.Unmap()
- c.dump.Close()
- c.mmap, c.dump = nil, nil
- }
-}
-
-// dataset wraps an ethash dataset with some metadata to allow easier concurrent use.
-type dataset struct {
- epoch uint64 // Epoch for which this cache is relevant
- dump *os.File // File descriptor of the memory mapped cache
- mmap mmap.MMap // Memory map itself to unmap before releasing
- dataset []uint32 // The actual cache data content
- once sync.Once // Ensures the cache is generated only once
- done uint32 // Atomic flag to determine generation status
-}
-
-// newDataset creates a new ethash mining dataset and returns it as a plain Go
-// interface to be usable in an LRU cache.
-func newDataset(epoch uint64) *dataset {
- return &dataset{epoch: epoch}
-}
-
-// generate ensures that the dataset content is generated before use.
-func (d *dataset) generate(dir string, limit int, lock bool, test bool) {
- d.once.Do(func() {
- // Mark the dataset generated after we're done. This is needed for remote
- defer atomic.StoreUint32(&d.done, 1)
-
- csize := cacheSize(d.epoch*epochLength + 1)
- dsize := datasetSize(d.epoch*epochLength + 1)
- seed := seedHash(d.epoch*epochLength + 1)
- if test {
- csize = 1024
- dsize = 32 * 1024
- }
- // If we don't store anything on disk, generate and return
- if dir == "" {
- cache := make([]uint32, csize/4)
- generateCache(cache, d.epoch, seed)
-
- d.dataset = make([]uint32, dsize/4)
- generateDataset(d.dataset, d.epoch, cache)
-
- return
- }
- // Disk storage is needed, this will get fancy
- var endian string
- if !isLittleEndian() {
- endian = ".be"
- }
- path := filepath.Join(dir, fmt.Sprintf("full-R%d-%x%s", algorithmRevision, seed[:8], endian))
- logger := log.New("epoch", d.epoch)
-
- // We're about to mmap the file, ensure that the mapping is cleaned up when the
- // cache becomes unused.
- runtime.SetFinalizer(d, (*dataset).finalizer)
-
- // Try to load the file from disk and memory map it
- var err error
- d.dump, d.mmap, d.dataset, err = memoryMap(path, lock)
- if err == nil {
- logger.Debug("Loaded old ethash dataset from disk")
- return
- }
- logger.Debug("Failed to load old ethash dataset", "err", err)
-
- // No previous dataset available, create a new dataset file to fill
- cache := make([]uint32, csize/4)
- generateCache(cache, d.epoch, seed)
-
- d.dump, d.mmap, d.dataset, err = memoryMapAndGenerate(path, dsize, lock, func(buffer []uint32) { generateDataset(buffer, d.epoch, cache) })
- if err != nil {
- logger.Error("Failed to generate mapped ethash dataset", "err", err)
-
- d.dataset = make([]uint32, dsize/4)
- generateDataset(d.dataset, d.epoch, cache)
- }
- // Iterate over all previous instances and delete old ones
- for ep := int(d.epoch) - limit; ep >= 0; ep-- {
- seed := seedHash(uint64(ep)*epochLength + 1)
- path := filepath.Join(dir, fmt.Sprintf("full-R%d-%x%s", algorithmRevision, seed[:8], endian))
- os.Remove(path)
- }
- })
-}
-
-// generated returns whether this particular dataset finished generating already
-// or not (it may not have been started at all). This is useful for remote miners
-// to default to verification caches instead of blocking on DAG generations.
-func (d *dataset) generated() bool {
- return atomic.LoadUint32(&d.done) == 1
-}
-
-// finalizer closes any file handlers and memory maps open.
-func (d *dataset) finalizer() {
- if d.mmap != nil {
- d.mmap.Unmap()
- d.dump.Close()
- d.mmap, d.dump = nil, nil
- }
-}
-
-// MakeCache generates a new ethash cache and optionally stores it to disk.
-func MakeCache(block uint64, dir string) {
- c := cache{epoch: block / epochLength}
- c.generate(dir, math.MaxInt32, false, false)
-}
-
-// MakeDataset generates a new ethash dataset and optionally stores it to disk.
-func MakeDataset(block uint64, dir string) {
- d := dataset{epoch: block / epochLength}
- d.generate(dir, math.MaxInt32, false, false)
-}
-
-// Mode defines the type and amount of PoW verification an ethash engine makes.
-type Mode uint
-
-const (
- ModeNormal Mode = iota
- ModeShared
- ModeTest
- ModeFake
- ModeFullFake
-)
-
-// Config are the configuration parameters of the ethash.
-type Config struct {
- CacheDir string
- CachesInMem int
- CachesOnDisk int
- CachesLockMmap bool
- DatasetDir string
- DatasetsInMem int
- DatasetsOnDisk int
- DatasetsLockMmap bool
- PowMode Mode
-
- // When set, notifications sent by the remote sealer will
- // be block header JSON objects instead of work package arrays.
- NotifyFull bool
-
- Log log.Logger `toml:"-"`
-}
-
// Ethash is a consensus engine based on proof-of-work implementing the ethash
// algorithm.
type Ethash struct {
- config Config
-
- caches *lru[*cache] // In memory caches to avoid regenerating too often
- datasets *lru[*dataset] // In memory datasets to avoid regenerating too often
-
- // Mining related fields
- rand *rand.Rand // Properly seeded random source for nonces
- threads int // Number of threads to mine on if mining
- update chan struct{} // Notification channel to update mining parameters
- hashrate metrics.Meter // Meter tracking the average hashrate
- remote *remoteSealer
-
- // The fields below are hooks for testing
- shared *Ethash // Shared PoW verifier to avoid cache regeneration
- fakeFail uint64 // Block number which fails PoW check even in fake mode
- fakeDelay time.Duration // Time delay to sleep for before returning from verify
-
- lock sync.Mutex // Ensures thread safety for the in-memory caches and mining fields
- closeOnce sync.Once // Ensures exit channel will not be closed twice.
-}
-
-// New creates a full sized ethash PoW scheme and starts a background thread for
-// remote mining, also optionally notifying a batch of remote services of new work
-// packages.
-func New(config Config, notify []string, noverify bool) *Ethash {
- if config.Log == nil {
- config.Log = log.Root()
- }
- if config.CachesInMem <= 0 {
- config.Log.Warn("One ethash cache must always be in memory", "requested", config.CachesInMem)
- config.CachesInMem = 1
- }
- if config.CacheDir != "" && config.CachesOnDisk > 0 {
- config.Log.Info("Disk storage enabled for ethash caches", "dir", config.CacheDir, "count", config.CachesOnDisk)
- }
- if config.DatasetDir != "" && config.DatasetsOnDisk > 0 {
- config.Log.Info("Disk storage enabled for ethash DAGs", "dir", config.DatasetDir, "count", config.DatasetsOnDisk)
- }
- ethash := &Ethash{
- config: config,
- caches: newlru(config.CachesInMem, newCache),
- datasets: newlru(config.DatasetsInMem, newDataset),
- update: make(chan struct{}),
- hashrate: metrics.NewMeterForced(),
- }
- if config.PowMode == ModeShared {
- ethash.shared = sharedEthash
- }
- ethash.remote = startRemoteSealer(ethash, notify, noverify)
- return ethash
+ fakeFail *uint64 // Block number which fails PoW check even in fake mode
+ fakeDelay *time.Duration // Time delay to sleep for before returning from verify
+ fakeFull bool // Accepts everything as valid
}
-// NewTester creates a small sized ethash PoW scheme useful only for testing
-// purposes.
-func NewTester(notify []string, noverify bool) *Ethash {
- return New(Config{PowMode: ModeTest}, notify, noverify)
-}
-
-// NewFaker creates a ethash consensus engine with a fake PoW scheme that accepts
+// NewFaker creates an ethash consensus engine with a fake PoW scheme that accepts
// all blocks' seal as valid, though they still have to conform to the Ethereum
// consensus rules.
func NewFaker() *Ethash {
- return &Ethash{
- config: Config{
- PowMode: ModeFake,
- Log: log.Root(),
- },
- }
+ return new(Ethash)
}
// NewFakeFailer creates a ethash consensus engine with a fake PoW scheme that
@@ -522,11 +45,7 @@ func NewFaker() *Ethash {
// still have to conform to the Ethereum consensus rules.
func NewFakeFailer(fail uint64) *Ethash {
return &Ethash{
- config: Config{
- PowMode: ModeFake,
- Log: log.Root(),
- },
- fakeFail: fail,
+ fakeFail: &fail,
}
}
@@ -535,11 +54,7 @@ func NewFakeFailer(fail uint64) *Ethash {
// they still have to conform to the Ethereum consensus rules.
func NewFakeDelayer(delay time.Duration) *Ethash {
return &Ethash{
- config: Config{
- PowMode: ModeFake,
- Log: log.Root(),
- },
- fakeDelay: delay,
+ fakeDelay: &delay,
}
}
@@ -547,154 +62,24 @@ func NewFakeDelayer(delay time.Duration) *Ethash {
// accepts all blocks as valid, without checking any consensus rules whatsoever.
func NewFullFaker() *Ethash {
return &Ethash{
- config: Config{
- PowMode: ModeFullFake,
- Log: log.Root(),
- },
+ fakeFull: true,
}
}
-// NewShared creates a full sized ethash PoW shared between all requesters running
-// in the same process.
-func NewShared() *Ethash {
- return &Ethash{shared: sharedEthash}
-}
-
// Close closes the exit channel to notify all backend threads exiting.
func (ethash *Ethash) Close() error {
- return ethash.StopRemoteSealer()
-}
-
-// StopRemoteSealer stops the remote sealer
-func (ethash *Ethash) StopRemoteSealer() error {
- ethash.closeOnce.Do(func() {
- // Short circuit if the exit channel is not allocated.
- if ethash.remote == nil {
- return
- }
- close(ethash.remote.requestExit)
- <-ethash.remote.exitCh
- })
return nil
}
-// cache tries to retrieve a verification cache for the specified block number
-// by first checking against a list of in-memory caches, then against caches
-// stored on disk, and finally generating one if none can be found.
-func (ethash *Ethash) cache(block uint64) *cache {
- epoch := block / epochLength
- current, future := ethash.caches.get(epoch)
-
- // Wait for generation finish.
- current.generate(ethash.config.CacheDir, ethash.config.CachesOnDisk, ethash.config.CachesLockMmap, ethash.config.PowMode == ModeTest)
-
- // If we need a new future cache, now's a good time to regenerate it.
- if future != nil {
- go future.generate(ethash.config.CacheDir, ethash.config.CachesOnDisk, ethash.config.CachesLockMmap, ethash.config.PowMode == ModeTest)
- }
- return current
-}
-
-// dataset tries to retrieve a mining dataset for the specified block number
-// by first checking against a list of in-memory datasets, then against DAGs
-// stored on disk, and finally generating one if none can be found.
-//
-// If async is specified, not only the future but the current DAG is also
-// generates on a background thread.
-func (ethash *Ethash) dataset(block uint64, async bool) *dataset {
- // Retrieve the requested ethash dataset
- epoch := block / epochLength
- current, future := ethash.datasets.get(epoch)
-
- // If async is specified, generate everything in a background thread
- if async && !current.generated() {
- go func() {
- current.generate(ethash.config.DatasetDir, ethash.config.DatasetsOnDisk, ethash.config.DatasetsLockMmap, ethash.config.PowMode == ModeTest)
- if future != nil {
- future.generate(ethash.config.DatasetDir, ethash.config.DatasetsOnDisk, ethash.config.DatasetsLockMmap, ethash.config.PowMode == ModeTest)
- }
- }()
- } else {
- // Either blocking generation was requested, or already done
- current.generate(ethash.config.DatasetDir, ethash.config.DatasetsOnDisk, ethash.config.DatasetsLockMmap, ethash.config.PowMode == ModeTest)
- if future != nil {
- go future.generate(ethash.config.DatasetDir, ethash.config.DatasetsOnDisk, ethash.config.DatasetsLockMmap, ethash.config.PowMode == ModeTest)
- }
- }
- return current
-}
-
-// Threads returns the number of mining threads currently enabled. This doesn't
-// necessarily mean that mining is running!
-func (ethash *Ethash) Threads() int {
- ethash.lock.Lock()
- defer ethash.lock.Unlock()
-
- return ethash.threads
-}
-
-// SetThreads updates the number of mining threads currently enabled. Calling
-// this method does not start mining, only sets the thread count. If zero is
-// specified, the miner will use all cores of the machine. Setting a thread
-// count below zero is allowed and will cause the miner to idle, without any
-// work being done.
-func (ethash *Ethash) SetThreads(threads int) {
- ethash.lock.Lock()
- defer ethash.lock.Unlock()
-
- // If we're running a shared PoW, set the thread count on that instead
- if ethash.shared != nil {
- ethash.shared.SetThreads(threads)
- return
- }
- // Update the threads and ping any running seal to pull in any changes
- ethash.threads = threads
- select {
- case ethash.update <- struct{}{}:
- default:
- }
-}
-
-// Hashrate implements PoW, returning the measured rate of the search invocations
-// per second over the last minute.
-// Note the returned hashrate includes local hashrate, but also includes the total
-// hashrate of all remote miner.
-func (ethash *Ethash) Hashrate() float64 {
- // Short circuit if we are run the ethash in normal/test mode.
- if ethash.config.PowMode != ModeNormal && ethash.config.PowMode != ModeTest {
- return ethash.hashrate.Rate1()
- }
- var res = make(chan uint64, 1)
-
- select {
- case ethash.remote.fetchRateCh <- res:
- case <-ethash.remote.exitCh:
- // Return local hashrate only if ethash is stopped.
- return ethash.hashrate.Rate1()
- }
-
- // Gather total submitted hash rate of remote sealers.
- return ethash.hashrate.Rate1() + float64(<-res)
-}
-
-// APIs implements consensus.Engine, returning the user facing RPC APIs.
+// APIs implements consensus.Engine, returning no APIs as ethash is an empty
+// shell in the post-merge world.
func (ethash *Ethash) APIs(chain consensus.ChainHeaderReader) []rpc.API {
- // In order to ensure backward compatibility, we exposes ethash RPC APIs
- // to both eth and ethash namespaces.
- return []rpc.API{
- {
- Namespace: "eth",
- Service: &API{ethash},
- },
- {
- Namespace: "ethash",
- Service: &API{ethash},
- },
- }
+ return []rpc.API{}
}
-// SeedHash is the seed to use for generating a verification cache and the mining
-// dataset.
-func SeedHash(block uint64) []byte {
- return seedHash(block)
+// Seal generates a new sealing request for the given input block and pushes
+// the result into the given channel. For the ethash engine, this method will
+// just panic as sealing is not supported anymore.
+func (ethash *Ethash) Seal(chain consensus.ChainHeaderReader, block *types.Block, results chan<- *types.Block, stop <-chan struct{}) error {
+ panic("ethash (pow) sealing not supported any more")
}
diff --git a/consensus/ethash/ethash_test.go b/consensus/ethash/ethash_test.go
deleted file mode 100644
index eb6bad9622..0000000000
--- a/consensus/ethash/ethash_test.go
+++ /dev/null
@@ -1,177 +0,0 @@
-// Copyright 2017 The go-ethereum Authors
-// This file is part of the go-ethereum library.
-//
-// The go-ethereum library is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// The go-ethereum library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public License
-// along with the go-ethereum library. If not, see .
-
-package ethash
-
-import (
- "math/big"
- "math/rand"
- "os"
- "sync"
- "testing"
- "time"
-
- "github.com/ethereum/go-ethereum/common"
- "github.com/ethereum/go-ethereum/common/hexutil"
- "github.com/ethereum/go-ethereum/core/types"
-)
-
-// Tests that ethash works correctly in test mode.
-func TestTestMode(t *testing.T) {
- header := &types.Header{Number: big.NewInt(1), Difficulty: big.NewInt(100)}
-
- ethash := NewTester(nil, false)
- defer ethash.Close()
-
- results := make(chan *types.Block)
- err := ethash.Seal(nil, types.NewBlockWithHeader(header), results, nil)
- if err != nil {
- t.Fatalf("failed to seal block: %v", err)
- }
- select {
- case block := <-results:
- header.Nonce = types.EncodeNonce(block.Nonce())
- header.MixDigest = block.MixDigest()
- if err := ethash.verifySeal(nil, header, false); err != nil {
- t.Fatalf("unexpected verification error: %v", err)
- }
- case <-time.NewTimer(4 * time.Second).C:
- t.Error("sealing result timeout")
- }
-}
-
-// This test checks that cache lru logic doesn't crash under load.
-// It reproduces https://github.com/ethereum/go-ethereum/issues/14943
-func TestCacheFileEvict(t *testing.T) {
- // TODO: t.TempDir fails to remove the directory on Windows
- // \AppData\Local\Temp\1\TestCacheFileEvict2179435125\001\cache-R23-0000000000000000: Access is denied.
- tmpdir, err := os.MkdirTemp("", "ethash-test")
- if err != nil {
- t.Fatal(err)
- }
- defer os.RemoveAll(tmpdir)
-
- config := Config{
- CachesInMem: 3,
- CachesOnDisk: 10,
- CacheDir: tmpdir,
- PowMode: ModeTest,
- }
- e := New(config, nil, false)
- defer e.Close()
-
- workers := 8
- epochs := 100
- var wg sync.WaitGroup
- wg.Add(workers)
- for i := 0; i < workers; i++ {
- go verifyTest(&wg, e, i, epochs)
- }
- wg.Wait()
-}
-
-func verifyTest(wg *sync.WaitGroup, e *Ethash, workerIndex, epochs int) {
- defer wg.Done()
-
- const wiggle = 4 * epochLength
- r := rand.New(rand.NewSource(int64(workerIndex)))
- for epoch := 0; epoch < epochs; epoch++ {
- block := int64(epoch)*epochLength - wiggle/2 + r.Int63n(wiggle)
- if block < 0 {
- block = 0
- }
- header := &types.Header{Number: big.NewInt(block), Difficulty: big.NewInt(100)}
- e.verifySeal(nil, header, false)
- }
-}
-
-func TestRemoteSealer(t *testing.T) {
- ethash := NewTester(nil, false)
- defer ethash.Close()
-
- api := &API{ethash}
- if _, err := api.GetWork(); err != errNoMiningWork {
- t.Error("expect to return an error indicate there is no mining work")
- }
- header := &types.Header{Number: big.NewInt(1), Difficulty: big.NewInt(100)}
- block := types.NewBlockWithHeader(header)
- sealhash := ethash.SealHash(header)
-
- // Push new work.
- results := make(chan *types.Block)
- ethash.Seal(nil, block, results, nil)
-
- var (
- work [4]string
- err error
- )
- if work, err = api.GetWork(); err != nil || work[0] != sealhash.Hex() {
- t.Error("expect to return a mining work has same hash")
- }
-
- if res := api.SubmitWork(types.BlockNonce{}, sealhash, common.Hash{}); res {
- t.Error("expect to return false when submit a fake solution")
- }
- // Push new block with same block number to replace the original one.
- header = &types.Header{Number: big.NewInt(1), Difficulty: big.NewInt(1000)}
- block = types.NewBlockWithHeader(header)
- sealhash = ethash.SealHash(header)
- ethash.Seal(nil, block, results, nil)
-
- if work, err = api.GetWork(); err != nil || work[0] != sealhash.Hex() {
- t.Error("expect to return the latest pushed work")
- }
-}
-
-func TestHashrate(t *testing.T) {
- var (
- hashrate = []hexutil.Uint64{100, 200, 300}
- expect uint64
- ids = []common.Hash{common.HexToHash("a"), common.HexToHash("b"), common.HexToHash("c")}
- )
- ethash := NewTester(nil, false)
- defer ethash.Close()
-
- if tot := ethash.Hashrate(); tot != 0 {
- t.Error("expect the result should be zero")
- }
-
- api := &API{ethash}
- for i := 0; i < len(hashrate); i += 1 {
- if res := api.SubmitHashrate(hashrate[i], ids[i]); !res {
- t.Error("remote miner submit hashrate failed")
- }
- expect += uint64(hashrate[i])
- }
- if tot := ethash.Hashrate(); tot != float64(expect) {
- t.Error("expect total hashrate should be same")
- }
-}
-
-func TestClosedRemoteSealer(t *testing.T) {
- ethash := NewTester(nil, false)
- time.Sleep(1 * time.Second) // ensure exit channel is listening
- ethash.Close()
-
- api := &API{ethash}
- if _, err := api.GetWork(); err != errEthashStopped {
- t.Error("expect to return an error to indicate ethash is stopped")
- }
-
- if res := api.SubmitHashrate(hexutil.Uint64(100), common.HexToHash("a")); res {
- t.Error("expect to return false when submit hashrate to a stopped ethash")
- }
-}
diff --git a/consensus/ethash/mmap_help_other.go b/consensus/ethash/mmap_help_other.go
deleted file mode 100644
index 8ad514ce42..0000000000
--- a/consensus/ethash/mmap_help_other.go
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright 2021 The go-ethereum Authors
-// This file is part of the go-ethereum library.
-//
-// The go-ethereum library is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// The go-ethereum library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public License
-// along with the go-ethereum library. If not, see .
-
-//go:build !linux
-// +build !linux
-
-package ethash
-
-import (
- "os"
-)
-
-// ensureSize expands the file to the given size. This is to prevent runtime
-// errors later on, if the underlying file expands beyond the disk capacity,
-// even though it ostensibly is already expanded, but due to being sparse
-// does not actually occupy the full declared size on disk.
-func ensureSize(f *os.File, size int64) error {
- // On systems which do not support fallocate, we merely truncate it.
- // More robust alternatives would be to
- // - Use posix_fallocate, or
- // - explicitly fill the file with zeroes.
- return f.Truncate(size)
-}
diff --git a/consensus/ethash/sealer.go b/consensus/ethash/sealer.go
deleted file mode 100644
index 340ad440f3..0000000000
--- a/consensus/ethash/sealer.go
+++ /dev/null
@@ -1,451 +0,0 @@
-// Copyright 2017 The go-ethereum Authors
-// This file is part of the go-ethereum library.
-//
-// The go-ethereum library is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// The go-ethereum library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public License
-// along with the go-ethereum library. If not, see .
-
-package ethash
-
-import (
- "bytes"
- "context"
- crand "crypto/rand"
- "encoding/json"
- "errors"
- "math"
- "math/big"
- "math/rand"
- "net/http"
- "runtime"
- "sync"
- "time"
-
- "github.com/ethereum/go-ethereum/common"
- "github.com/ethereum/go-ethereum/common/hexutil"
- "github.com/ethereum/go-ethereum/consensus"
- "github.com/ethereum/go-ethereum/core/types"
-)
-
-const (
- // staleThreshold is the maximum depth of the acceptable stale but valid ethash solution.
- staleThreshold = 7
-)
-
-var (
- errNoMiningWork = errors.New("no mining work available yet")
- errInvalidSealResult = errors.New("invalid or stale proof-of-work solution")
-)
-
-// Seal implements consensus.Engine, attempting to find a nonce that satisfies
-// the block's difficulty requirements.
-func (ethash *Ethash) Seal(chain consensus.ChainHeaderReader, block *types.Block, results chan<- *types.Block, stop <-chan struct{}) error {
- // If we're running a fake PoW, simply return a 0 nonce immediately
- if ethash.config.PowMode == ModeFake || ethash.config.PowMode == ModeFullFake {
- header := block.Header()
- header.Nonce, header.MixDigest = types.BlockNonce{}, common.Hash{}
- select {
- case results <- block.WithSeal(header):
- default:
- ethash.config.Log.Warn("Sealing result is not read by miner", "mode", "fake", "sealhash", ethash.SealHash(block.Header()))
- }
- return nil
- }
- // If we're running a shared PoW, delegate sealing to it
- if ethash.shared != nil {
- return ethash.shared.Seal(chain, block, results, stop)
- }
- // Create a runner and the multiple search threads it directs
- abort := make(chan struct{})
-
- ethash.lock.Lock()
- threads := ethash.threads
- if ethash.rand == nil {
- seed, err := crand.Int(crand.Reader, big.NewInt(math.MaxInt64))
- if err != nil {
- ethash.lock.Unlock()
- return err
- }
- ethash.rand = rand.New(rand.NewSource(seed.Int64()))
- }
- ethash.lock.Unlock()
- if threads == 0 {
- threads = runtime.NumCPU()
- }
- if threads < 0 {
- threads = 0 // Allows disabling local mining without extra logic around local/remote
- }
- // Push new work to remote sealer
- if ethash.remote != nil {
- ethash.remote.workCh <- &sealTask{block: block, results: results}
- }
- var (
- pend sync.WaitGroup
- locals = make(chan *types.Block)
- )
- for i := 0; i < threads; i++ {
- pend.Add(1)
- go func(id int, nonce uint64) {
- defer pend.Done()
- ethash.mine(block, id, nonce, abort, locals)
- }(i, uint64(ethash.rand.Int63()))
- }
- // Wait until sealing is terminated or a nonce is found
- go func() {
- var result *types.Block
- select {
- case <-stop:
- // Outside abort, stop all miner threads
- close(abort)
- case result = <-locals:
- // One of the threads found a block, abort all others
- select {
- case results <- result:
- default:
- ethash.config.Log.Warn("Sealing result is not read by miner", "mode", "local", "sealhash", ethash.SealHash(block.Header()))
- }
- close(abort)
- case <-ethash.update:
- // Thread count was changed on user request, restart
- close(abort)
- if err := ethash.Seal(chain, block, results, stop); err != nil {
- ethash.config.Log.Error("Failed to restart sealing after update", "err", err)
- }
- }
- // Wait for all miners to terminate and return the block
- pend.Wait()
- }()
- return nil
-}
-
-// mine is the actual proof-of-work miner that searches for a nonce starting from
-// seed that results in correct final block difficulty.
-func (ethash *Ethash) mine(block *types.Block, id int, seed uint64, abort chan struct{}, found chan *types.Block) {
- // Extract some data from the header
- var (
- header = block.Header()
- hash = ethash.SealHash(header).Bytes()
- target = new(big.Int).Div(two256, header.Difficulty)
- number = header.Number.Uint64()
- dataset = ethash.dataset(number, false)
- )
- // Start generating random nonces until we abort or find a good one
- var (
- attempts = int64(0)
- nonce = seed
- powBuffer = new(big.Int)
- )
- logger := ethash.config.Log.New("miner", id)
- logger.Trace("Started ethash search for new nonces", "seed", seed)
-search:
- for {
- select {
- case <-abort:
- // Mining terminated, update stats and abort
- logger.Trace("Ethash nonce search aborted", "attempts", nonce-seed)
- ethash.hashrate.Mark(attempts)
- break search
-
- default:
- // We don't have to update hash rate on every nonce, so update after after 2^X nonces
- attempts++
- if (attempts % (1 << 15)) == 0 {
- ethash.hashrate.Mark(attempts)
- attempts = 0
- }
- // Compute the PoW value of this nonce
- digest, result := hashimotoFull(dataset.dataset, hash, nonce)
- if powBuffer.SetBytes(result).Cmp(target) <= 0 {
- // Correct nonce found, create a new header with it
- header = types.CopyHeader(header)
- header.Nonce = types.EncodeNonce(nonce)
- header.MixDigest = common.BytesToHash(digest)
-
- // Seal and return a block (if still needed)
- select {
- case found <- block.WithSeal(header):
- logger.Trace("Ethash nonce found and reported", "attempts", nonce-seed, "nonce", nonce)
- case <-abort:
- logger.Trace("Ethash nonce found but discarded", "attempts", nonce-seed, "nonce", nonce)
- }
- break search
- }
- nonce++
- }
- }
- // Datasets are unmapped in a finalizer. Ensure that the dataset stays live
- // during sealing so it's not unmapped while being read.
- runtime.KeepAlive(dataset)
-}
-
-// This is the timeout for HTTP requests to notify external miners.
-const remoteSealerTimeout = 1 * time.Second
-
-type remoteSealer struct {
- works map[common.Hash]*types.Block
- rates map[common.Hash]hashrate
- currentBlock *types.Block
- currentWork [4]string
- notifyCtx context.Context
- cancelNotify context.CancelFunc // cancels all notification requests
- reqWG sync.WaitGroup // tracks notification request goroutines
-
- ethash *Ethash
- noverify bool
- notifyURLs []string
- results chan<- *types.Block
- workCh chan *sealTask // Notification channel to push new work and relative result channel to remote sealer
- fetchWorkCh chan *sealWork // Channel used for remote sealer to fetch mining work
- submitWorkCh chan *mineResult // Channel used for remote sealer to submit their mining result
- fetchRateCh chan chan uint64 // Channel used to gather submitted hash rate for local or remote sealer.
- submitRateCh chan *hashrate // Channel used for remote sealer to submit their mining hashrate
- requestExit chan struct{}
- exitCh chan struct{}
-}
-
-// sealTask wraps a seal block with relative result channel for remote sealer thread.
-type sealTask struct {
- block *types.Block
- results chan<- *types.Block
-}
-
-// mineResult wraps the pow solution parameters for the specified block.
-type mineResult struct {
- nonce types.BlockNonce
- mixDigest common.Hash
- hash common.Hash
-
- errc chan error
-}
-
-// hashrate wraps the hash rate submitted by the remote sealer.
-type hashrate struct {
- id common.Hash
- ping time.Time
- rate uint64
-
- done chan struct{}
-}
-
-// sealWork wraps a seal work package for remote sealer.
-type sealWork struct {
- errc chan error
- res chan [4]string
-}
-
-func startRemoteSealer(ethash *Ethash, urls []string, noverify bool) *remoteSealer {
- ctx, cancel := context.WithCancel(context.Background())
- s := &remoteSealer{
- ethash: ethash,
- noverify: noverify,
- notifyURLs: urls,
- notifyCtx: ctx,
- cancelNotify: cancel,
- works: make(map[common.Hash]*types.Block),
- rates: make(map[common.Hash]hashrate),
- workCh: make(chan *sealTask),
- fetchWorkCh: make(chan *sealWork),
- submitWorkCh: make(chan *mineResult),
- fetchRateCh: make(chan chan uint64),
- submitRateCh: make(chan *hashrate),
- requestExit: make(chan struct{}),
- exitCh: make(chan struct{}),
- }
- go s.loop()
- return s
-}
-
-func (s *remoteSealer) loop() {
- defer func() {
- s.ethash.config.Log.Trace("Ethash remote sealer is exiting")
- s.cancelNotify()
- s.reqWG.Wait()
- close(s.exitCh)
- }()
-
- ticker := time.NewTicker(5 * time.Second)
- defer ticker.Stop()
-
- for {
- select {
- case work := <-s.workCh:
- // Update current work with new received block.
- // Note same work can be past twice, happens when changing CPU threads.
- s.results = work.results
- s.makeWork(work.block)
- s.notifyWork()
-
- case work := <-s.fetchWorkCh:
- // Return current mining work to remote miner.
- if s.currentBlock == nil {
- work.errc <- errNoMiningWork
- } else {
- work.res <- s.currentWork
- }
-
- case result := <-s.submitWorkCh:
- // Verify submitted PoW solution based on maintained mining blocks.
- if s.submitWork(result.nonce, result.mixDigest, result.hash) {
- result.errc <- nil
- } else {
- result.errc <- errInvalidSealResult
- }
-
- case result := <-s.submitRateCh:
- // Trace remote sealer's hash rate by submitted value.
- s.rates[result.id] = hashrate{rate: result.rate, ping: time.Now()}
- close(result.done)
-
- case req := <-s.fetchRateCh:
- // Gather all hash rate submitted by remote sealer.
- var total uint64
- for _, rate := range s.rates {
- // this could overflow
- total += rate.rate
- }
- req <- total
-
- case <-ticker.C:
- // Clear stale submitted hash rate.
- for id, rate := range s.rates {
- if time.Since(rate.ping) > 10*time.Second {
- delete(s.rates, id)
- }
- }
- // Clear stale pending blocks
- if s.currentBlock != nil {
- for hash, block := range s.works {
- if block.NumberU64()+staleThreshold <= s.currentBlock.NumberU64() {
- delete(s.works, hash)
- }
- }
- }
-
- case <-s.requestExit:
- return
- }
- }
-}
-
-// makeWork creates a work package for external miner.
-//
-// The work package consists of 3 strings:
-//
-// result[0], 32 bytes hex encoded current block header pow-hash
-// result[1], 32 bytes hex encoded seed hash used for DAG
-// result[2], 32 bytes hex encoded boundary condition ("target"), 2^256/difficulty
-// result[3], hex encoded block number
-func (s *remoteSealer) makeWork(block *types.Block) {
- hash := s.ethash.SealHash(block.Header())
- s.currentWork[0] = hash.Hex()
- s.currentWork[1] = common.BytesToHash(SeedHash(block.NumberU64())).Hex()
- s.currentWork[2] = common.BytesToHash(new(big.Int).Div(two256, block.Difficulty()).Bytes()).Hex()
- s.currentWork[3] = hexutil.EncodeBig(block.Number())
-
- // Trace the seal work fetched by remote sealer.
- s.currentBlock = block
- s.works[hash] = block
-}
-
-// notifyWork notifies all the specified mining endpoints of the availability of
-// new work to be processed.
-func (s *remoteSealer) notifyWork() {
- work := s.currentWork
-
- // Encode the JSON payload of the notification. When NotifyFull is set,
- // this is the complete block header, otherwise it is a JSON array.
- var blob []byte
- if s.ethash.config.NotifyFull {
- blob, _ = json.Marshal(s.currentBlock.Header())
- } else {
- blob, _ = json.Marshal(work)
- }
-
- s.reqWG.Add(len(s.notifyURLs))
- for _, url := range s.notifyURLs {
- go s.sendNotification(s.notifyCtx, url, blob, work)
- }
-}
-
-func (s *remoteSealer) sendNotification(ctx context.Context, url string, json []byte, work [4]string) {
- defer s.reqWG.Done()
-
- req, err := http.NewRequest(http.MethodPost, url, bytes.NewReader(json))
- if err != nil {
- s.ethash.config.Log.Warn("Can't create remote miner notification", "err", err)
- return
- }
- ctx, cancel := context.WithTimeout(ctx, remoteSealerTimeout)
- defer cancel()
- req = req.WithContext(ctx)
- req.Header.Set("Content-Type", "application/json")
-
- resp, err := http.DefaultClient.Do(req)
- if err != nil {
- s.ethash.config.Log.Warn("Failed to notify remote miner", "err", err)
- } else {
- s.ethash.config.Log.Trace("Notified remote miner", "miner", url, "hash", work[0], "target", work[2])
- resp.Body.Close()
- }
-}
-
-// submitWork verifies the submitted pow solution, returning
-// whether the solution was accepted or not (not can be both a bad pow as well as
-// any other error, like no pending work or stale mining result).
-func (s *remoteSealer) submitWork(nonce types.BlockNonce, mixDigest common.Hash, sealhash common.Hash) bool {
- if s.currentBlock == nil {
- s.ethash.config.Log.Error("Pending work without block", "sealhash", sealhash)
- return false
- }
- // Make sure the work submitted is present
- block := s.works[sealhash]
- if block == nil {
- s.ethash.config.Log.Warn("Work submitted but none pending", "sealhash", sealhash, "curnumber", s.currentBlock.NumberU64())
- return false
- }
- // Verify the correctness of submitted result.
- header := block.Header()
- header.Nonce = nonce
- header.MixDigest = mixDigest
-
- start := time.Now()
- if !s.noverify {
- if err := s.ethash.verifySeal(nil, header, true); err != nil {
- s.ethash.config.Log.Warn("Invalid proof-of-work submitted", "sealhash", sealhash, "elapsed", common.PrettyDuration(time.Since(start)), "err", err)
- return false
- }
- }
- // Make sure the result channel is assigned.
- if s.results == nil {
- s.ethash.config.Log.Warn("Ethash result channel is empty, submitted mining result is rejected")
- return false
- }
- s.ethash.config.Log.Trace("Verified correct proof-of-work", "sealhash", sealhash, "elapsed", common.PrettyDuration(time.Since(start)))
-
- // Solutions seems to be valid, return to the miner and notify acceptance.
- solution := block.WithSeal(header)
-
- // The submitted solution is within the scope of acceptance.
- if solution.NumberU64()+staleThreshold > s.currentBlock.NumberU64() {
- select {
- case s.results <- solution:
- s.ethash.config.Log.Debug("Work submitted is acceptable", "number", solution.NumberU64(), "sealhash", sealhash, "hash", solution.Hash())
- return true
- default:
- s.ethash.config.Log.Warn("Sealing result is not read by miner", "mode", "remote", "sealhash", sealhash)
- return false
- }
- }
- // The submitted block is too old to accept, drop it.
- s.ethash.config.Log.Warn("Work submitted is too old", "number", solution.NumberU64(), "sealhash", sealhash, "hash", solution.Hash())
- return false
-}
diff --git a/consensus/ethash/sealer_test.go b/consensus/ethash/sealer_test.go
deleted file mode 100644
index e338f75290..0000000000
--- a/consensus/ethash/sealer_test.go
+++ /dev/null
@@ -1,298 +0,0 @@
-// Copyright 2018 The go-ethereum Authors
-// This file is part of the go-ethereum library.
-//
-// The go-ethereum library is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// The go-ethereum library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public License
-// along with the go-ethereum library. If not, see .
-
-package ethash
-
-import (
- "encoding/json"
- "io"
- "math/big"
- "net/http"
- "net/http/httptest"
- "strconv"
- "testing"
- "time"
-
- "github.com/ethereum/go-ethereum/common"
- "github.com/ethereum/go-ethereum/core/types"
- "github.com/ethereum/go-ethereum/internal/testlog"
- "github.com/ethereum/go-ethereum/log"
-)
-
-// Tests whether remote HTTP servers are correctly notified of new work.
-func TestRemoteNotify(t *testing.T) {
- // Start a simple web server to capture notifications.
- sink := make(chan [3]string)
- server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
- blob, err := io.ReadAll(req.Body)
- if err != nil {
- t.Errorf("failed to read miner notification: %v", err)
- }
- var work [3]string
- if err := json.Unmarshal(blob, &work); err != nil {
- t.Errorf("failed to unmarshal miner notification: %v", err)
- }
- sink <- work
- }))
- defer server.Close()
-
- // Create the custom ethash engine.
- ethash := NewTester([]string{server.URL}, false)
- defer ethash.Close()
-
- // Stream a work task and ensure the notification bubbles out.
- header := &types.Header{Number: big.NewInt(1), Difficulty: big.NewInt(100)}
- block := types.NewBlockWithHeader(header)
-
- ethash.Seal(nil, block, nil, nil)
- select {
- case work := <-sink:
- if want := ethash.SealHash(header).Hex(); work[0] != want {
- t.Errorf("work packet hash mismatch: have %s, want %s", work[0], want)
- }
- if want := common.BytesToHash(SeedHash(header.Number.Uint64())).Hex(); work[1] != want {
- t.Errorf("work packet seed mismatch: have %s, want %s", work[1], want)
- }
- target := new(big.Int).Div(new(big.Int).Lsh(big.NewInt(1), 256), header.Difficulty)
- if want := common.BytesToHash(target.Bytes()).Hex(); work[2] != want {
- t.Errorf("work packet target mismatch: have %s, want %s", work[2], want)
- }
- case <-time.After(3 * time.Second):
- t.Fatalf("notification timed out")
- }
-}
-
-// Tests whether remote HTTP servers are correctly notified of new work. (Full pending block body / --miner.notify.full)
-func TestRemoteNotifyFull(t *testing.T) {
- // Start a simple web server to capture notifications.
- sink := make(chan map[string]interface{})
- server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
- blob, err := io.ReadAll(req.Body)
- if err != nil {
- t.Errorf("failed to read miner notification: %v", err)
- }
- var work map[string]interface{}
- if err := json.Unmarshal(blob, &work); err != nil {
- t.Errorf("failed to unmarshal miner notification: %v", err)
- }
- sink <- work
- }))
- defer server.Close()
-
- // Create the custom ethash engine.
- config := Config{
- PowMode: ModeTest,
- NotifyFull: true,
- Log: testlog.Logger(t, log.LvlWarn),
- }
- ethash := New(config, []string{server.URL}, false)
- defer ethash.Close()
-
- // Stream a work task and ensure the notification bubbles out.
- header := &types.Header{Number: big.NewInt(1), Difficulty: big.NewInt(100)}
- block := types.NewBlockWithHeader(header)
-
- ethash.Seal(nil, block, nil, nil)
- select {
- case work := <-sink:
- if want := "0x" + strconv.FormatUint(header.Number.Uint64(), 16); work["number"] != want {
- t.Errorf("pending block number mismatch: have %v, want %v", work["number"], want)
- }
- if want := "0x" + header.Difficulty.Text(16); work["difficulty"] != want {
- t.Errorf("pending block difficulty mismatch: have %s, want %s", work["difficulty"], want)
- }
- case <-time.After(3 * time.Second):
- t.Fatalf("notification timed out")
- }
-}
-
-// Tests that pushing work packages fast to the miner doesn't cause any data race
-// issues in the notifications.
-func TestRemoteMultiNotify(t *testing.T) {
- // Start a simple web server to capture notifications.
- sink := make(chan [3]string, 64)
- server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
- blob, err := io.ReadAll(req.Body)
- if err != nil {
- t.Errorf("failed to read miner notification: %v", err)
- }
- var work [3]string
- if err := json.Unmarshal(blob, &work); err != nil {
- t.Errorf("failed to unmarshal miner notification: %v", err)
- }
- sink <- work
- }))
- defer server.Close()
-
- // Create the custom ethash engine.
- ethash := NewTester([]string{server.URL}, false)
- ethash.config.Log = testlog.Logger(t, log.LvlWarn)
- defer ethash.Close()
-
- // Provide a results reader.
- // Otherwise the unread results will be logged asynchronously
- // and this can happen after the test is finished, causing a panic.
- results := make(chan *types.Block, cap(sink))
-
- // Stream a lot of work task and ensure all the notifications bubble out.
- for i := 0; i < cap(sink); i++ {
- header := &types.Header{Number: big.NewInt(int64(i)), Difficulty: big.NewInt(100)}
- block := types.NewBlockWithHeader(header)
- ethash.Seal(nil, block, results, nil)
- }
-
- for i := 0; i < cap(sink); i++ {
- select {
- case <-sink:
- <-results
- case <-time.After(10 * time.Second):
- t.Fatalf("notification %d timed out", i)
- }
- }
-}
-
-// Tests that pushing work packages fast to the miner doesn't cause any data race
-// issues in the notifications. Full pending block body / --miner.notify.full)
-func TestRemoteMultiNotifyFull(t *testing.T) {
- // Start a simple web server to capture notifications.
- sink := make(chan map[string]interface{}, 64)
- server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
- blob, err := io.ReadAll(req.Body)
- if err != nil {
- t.Errorf("failed to read miner notification: %v", err)
- }
- var work map[string]interface{}
- if err := json.Unmarshal(blob, &work); err != nil {
- t.Errorf("failed to unmarshal miner notification: %v", err)
- }
- sink <- work
- }))
- defer server.Close()
-
- // Create the custom ethash engine.
- config := Config{
- PowMode: ModeTest,
- NotifyFull: true,
- Log: testlog.Logger(t, log.LvlWarn),
- }
- ethash := New(config, []string{server.URL}, false)
- defer ethash.Close()
-
- // Provide a results reader.
- // Otherwise the unread results will be logged asynchronously
- // and this can happen after the test is finished, causing a panic.
- results := make(chan *types.Block, cap(sink))
-
- // Stream a lot of work task and ensure all the notifications bubble out.
- for i := 0; i < cap(sink); i++ {
- header := &types.Header{Number: big.NewInt(int64(i)), Difficulty: big.NewInt(100)}
- block := types.NewBlockWithHeader(header)
- ethash.Seal(nil, block, results, nil)
- }
-
- for i := 0; i < cap(sink); i++ {
- select {
- case <-sink:
- <-results
- case <-time.After(10 * time.Second):
- t.Fatalf("notification %d timed out", i)
- }
- }
-}
-
-// Tests whether stale solutions are correctly processed.
-func TestStaleSubmission(t *testing.T) {
- ethash := NewTester(nil, true)
- defer ethash.Close()
- api := &API{ethash}
-
- fakeNonce, fakeDigest := types.BlockNonce{0x01, 0x02, 0x03}, common.HexToHash("deadbeef")
-
- testcases := []struct {
- headers []*types.Header
- submitIndex int
- submitRes bool
- }{
- // Case1: submit solution for the latest mining package
- {
- []*types.Header{
- {ParentHash: common.BytesToHash([]byte{0xa}), Number: big.NewInt(1), Difficulty: big.NewInt(100000000)},
- },
- 0,
- true,
- },
- // Case2: submit solution for the previous package but have same parent.
- {
- []*types.Header{
- {ParentHash: common.BytesToHash([]byte{0xb}), Number: big.NewInt(2), Difficulty: big.NewInt(100000000)},
- {ParentHash: common.BytesToHash([]byte{0xb}), Number: big.NewInt(2), Difficulty: big.NewInt(100000001)},
- },
- 0,
- true,
- },
- // Case3: submit stale but acceptable solution
- {
- []*types.Header{
- {ParentHash: common.BytesToHash([]byte{0xc}), Number: big.NewInt(3), Difficulty: big.NewInt(100000000)},
- {ParentHash: common.BytesToHash([]byte{0xd}), Number: big.NewInt(9), Difficulty: big.NewInt(100000000)},
- },
- 0,
- true,
- },
- // Case4: submit very old solution
- {
- []*types.Header{
- {ParentHash: common.BytesToHash([]byte{0xe}), Number: big.NewInt(10), Difficulty: big.NewInt(100000000)},
- {ParentHash: common.BytesToHash([]byte{0xf}), Number: big.NewInt(17), Difficulty: big.NewInt(100000000)},
- },
- 0,
- false,
- },
- }
- results := make(chan *types.Block, 16)
-
- for id, c := range testcases {
- for _, h := range c.headers {
- ethash.Seal(nil, types.NewBlockWithHeader(h), results, nil)
- }
- if res := api.SubmitWork(fakeNonce, ethash.SealHash(c.headers[c.submitIndex]), fakeDigest); res != c.submitRes {
- t.Errorf("case %d submit result mismatch, want %t, get %t", id+1, c.submitRes, res)
- }
- if !c.submitRes {
- continue
- }
- select {
- case res := <-results:
- if res.Header().Nonce != fakeNonce {
- t.Errorf("case %d block nonce mismatch, want %x, get %x", id+1, fakeNonce, res.Header().Nonce)
- }
- if res.Header().MixDigest != fakeDigest {
- t.Errorf("case %d block digest mismatch, want %x, get %x", id+1, fakeDigest, res.Header().MixDigest)
- }
- if res.Header().Difficulty.Uint64() != c.headers[c.submitIndex].Difficulty.Uint64() {
- t.Errorf("case %d block difficulty mismatch, want %d, get %d", id+1, c.headers[c.submitIndex].Difficulty, res.Header().Difficulty)
- }
- if res.Header().Number.Uint64() != c.headers[c.submitIndex].Number.Uint64() {
- t.Errorf("case %d block number mismatch, want %d, get %d", id+1, c.headers[c.submitIndex].Number.Uint64(), res.Header().Number.Uint64())
- }
- if res.Header().ParentHash != c.headers[c.submitIndex].ParentHash {
- t.Errorf("case %d block parent hash mismatch, want %s, get %s", id+1, c.headers[c.submitIndex].ParentHash.Hex(), res.Header().ParentHash.Hex())
- }
- case <-time.NewTimer(time.Second).C:
- t.Errorf("case %d fetch ethash result timeout", id+1)
- }
- }
-}
diff --git a/consensus/misc/create2deployer.go b/consensus/misc/create2deployer.go
new file mode 100644
index 0000000000..27c87a4a8c
--- /dev/null
+++ b/consensus/misc/create2deployer.go
@@ -0,0 +1,37 @@
+package misc
+
+import (
+ "github.com/ethereum-optimism/superchain-registry/superchain"
+
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/core/vm"
+ "github.com/ethereum/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/params"
+)
+
+// The original create2deployer contract could not be deployed to Base mainnet at
+// the canonical address of 0x13b0D85CcB8bf860b6b79AF3029fCA081AE9beF2 due to
+// an accidental nonce increment from a deposit transaction. See
+// https://github.com/pcaversaccio/create2deployer/issues/128 for context. This
+// file applies the contract code to the canonical address manually in the Canyon
+// hardfork.
+
+var create2DeployerAddress = common.HexToAddress("0x13b0D85CcB8bf860b6b79AF3029fCA081AE9beF2")
+var create2DeployerCodeHash = common.HexToHash("0xb0550b5b431e30d38000efb7107aaa0ade03d48a7198a140edda9d27134468b2")
+var create2DeployerCode []byte
+
+func init() {
+ code, err := superchain.LoadContractBytecode(superchain.Hash(create2DeployerCodeHash))
+ if err != nil {
+ panic(err)
+ }
+ create2DeployerCode = code
+}
+
+func EnsureCreate2Deployer(c *params.ChainConfig, timestamp uint64, db vm.StateDB) {
+ if !c.IsOptimism() || c.CanyonTime == nil || *c.CanyonTime != timestamp {
+ return
+ }
+ log.Info("Setting Create2Deployer code", "address", create2DeployerAddress, "codeHash", create2DeployerCodeHash)
+ db.SetCode(create2DeployerAddress, create2DeployerCode)
+}
diff --git a/consensus/misc/create2deployer_test.go b/consensus/misc/create2deployer_test.go
new file mode 100644
index 0000000000..fc0ef79fd7
--- /dev/null
+++ b/consensus/misc/create2deployer_test.go
@@ -0,0 +1,95 @@
+package misc
+
+import (
+ "math/big"
+ "testing"
+
+ "github.com/stretchr/testify/assert"
+
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/core/vm"
+ "github.com/ethereum/go-ethereum/params"
+)
+
+func TestEnsureCreate2Deployer(t *testing.T) {
+ canyonTime := uint64(1000)
+ var tests = []struct {
+ name string
+ override func(cfg *params.ChainConfig)
+ timestamp uint64
+ codeExists bool
+ applied bool
+ }{
+ {
+ name: "at hardfork",
+ timestamp: canyonTime,
+ applied: true,
+ },
+ {
+ name: "another chain ID",
+ override: func(cfg *params.ChainConfig) {
+ cfg.ChainID = big.NewInt(params.OPMainnetChainID)
+ },
+ timestamp: canyonTime,
+ applied: true,
+ },
+ {
+ name: "code already exists",
+ timestamp: canyonTime,
+ codeExists: true,
+ applied: true,
+ },
+ {
+ name: "pre canyon",
+ timestamp: canyonTime - 1,
+ applied: false,
+ },
+ {
+ name: "post hardfork",
+ timestamp: canyonTime + 1,
+ applied: false,
+ },
+ {
+ name: "canyon not configured",
+ override: func(cfg *params.ChainConfig) {
+ cfg.CanyonTime = nil
+ },
+ timestamp: canyonTime,
+ applied: false,
+ },
+ }
+ for _, tt := range tests {
+ t.Run(tt.name, func(t *testing.T) {
+ cfg := params.ChainConfig{
+ ChainID: big.NewInt(params.BaseMainnetChainID),
+ Optimism: ¶ms.OptimismConfig{},
+ CanyonTime: &canyonTime,
+ }
+ if tt.override != nil {
+ tt.override(&cfg)
+ }
+ state := &stateDb{
+ codeExists: tt.codeExists,
+ }
+ EnsureCreate2Deployer(&cfg, tt.timestamp, state)
+ assert.Equal(t, tt.applied, state.codeSet)
+ })
+ }
+}
+
+type stateDb struct {
+ vm.StateDB
+ codeExists bool
+ codeSet bool
+}
+
+func (s *stateDb) GetCodeSize(_ common.Address) int {
+ if s.codeExists {
+ return 1
+ }
+ return 0
+}
+
+func (s *stateDb) SetCode(_ common.Address, _ []byte) {
+ s.codeSet = true
+}
diff --git a/consensus/misc/eip1559.go b/consensus/misc/eip1559/eip1559.go
similarity index 83%
rename from consensus/misc/eip1559.go
rename to consensus/misc/eip1559/eip1559.go
index 0b6c8532ac..a66298af69 100644
--- a/consensus/misc/eip1559.go
+++ b/consensus/misc/eip1559/eip1559.go
@@ -14,38 +14,40 @@
// You should have received a copy of the GNU Lesser General Public License
// along with the go-ethereum library. If not, see .
-package misc
+package eip1559
import (
+ "errors"
"fmt"
"math/big"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/common/math"
+ "github.com/ethereum/go-ethereum/consensus/misc"
"github.com/ethereum/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/params"
)
-// VerifyEip1559Header verifies some header attributes which were changed in EIP-1559,
+// VerifyEIP1559Header verifies some header attributes which were changed in EIP-1559,
// - gas limit check
// - basefee check
-func VerifyEip1559Header(config *params.ChainConfig, parent, header *types.Header) error {
+func VerifyEIP1559Header(config *params.ChainConfig, parent, header *types.Header) error {
// Verify that the gas limit remains within allowed bounds
parentGasLimit := parent.GasLimit
if !config.IsLondon(parent.Number) {
parentGasLimit = parent.GasLimit * config.ElasticityMultiplier()
}
if config.Optimism == nil { // gasLimit can adjust instantly in optimism
- if err := VerifyGaslimit(parentGasLimit, header.GasLimit); err != nil {
+ if err := misc.VerifyGaslimit(parentGasLimit, header.GasLimit); err != nil {
return err
}
}
// Verify the header is not malformed
if header.BaseFee == nil {
- return fmt.Errorf("header is missing baseFee")
+ return errors.New("header is missing baseFee")
}
// Verify the baseFee is correct based on the parent header.
- expectedBaseFee := CalcBaseFee(config, parent)
+ expectedBaseFee := CalcBaseFee(config, parent, header.Time)
if header.BaseFee.Cmp(expectedBaseFee) != 0 {
return fmt.Errorf("invalid baseFee: have %s, want %s, parentBaseFee %s, parentGasUsed %d",
header.BaseFee, expectedBaseFee, parent.BaseFee, parent.GasUsed)
@@ -54,7 +56,8 @@ func VerifyEip1559Header(config *params.ChainConfig, parent, header *types.Heade
}
// CalcBaseFee calculates the basefee of the header.
-func CalcBaseFee(config *params.ChainConfig, parent *types.Header) *big.Int {
+// The time belongs to the new block to check if Canyon is activted or not
+func CalcBaseFee(config *params.ChainConfig, parent *types.Header, time uint64) *big.Int {
// If the current block is the first EIP-1559 block, return the InitialBaseFee.
if !config.IsLondon(parent.Number) {
return new(big.Int).SetUint64(params.InitialBaseFee)
@@ -77,7 +80,7 @@ func CalcBaseFee(config *params.ChainConfig, parent *types.Header) *big.Int {
num.SetUint64(parent.GasUsed - parentGasTarget)
num.Mul(num, parent.BaseFee)
num.Div(num, denom.SetUint64(parentGasTarget))
- num.Div(num, denom.SetUint64(config.BaseFeeChangeDenominator()))
+ num.Div(num, denom.SetUint64(config.BaseFeeChangeDenominator(time)))
baseFeeDelta := math.BigMax(num, common.Big1)
return num.Add(parent.BaseFee, baseFeeDelta)
@@ -87,7 +90,7 @@ func CalcBaseFee(config *params.ChainConfig, parent *types.Header) *big.Int {
num.SetUint64(parentGasTarget - parent.GasUsed)
num.Mul(num, parent.BaseFee)
num.Div(num, denom.SetUint64(parentGasTarget))
- num.Div(num, denom.SetUint64(config.BaseFeeChangeDenominator()))
+ num.Div(num, denom.SetUint64(config.BaseFeeChangeDenominator(time)))
baseFee := num.Sub(parent.BaseFee, num)
return math.BigMax(baseFee, common.Big0)
diff --git a/consensus/misc/eip1559_test.go b/consensus/misc/eip1559/eip1559_test.go
similarity index 70%
rename from consensus/misc/eip1559_test.go
rename to consensus/misc/eip1559/eip1559_test.go
index 23cd9023de..d34da8fd8b 100644
--- a/consensus/misc/eip1559_test.go
+++ b/consensus/misc/eip1559/eip1559_test.go
@@ -14,7 +14,7 @@
// You should have received a copy of the GNU Lesser General Public License
// along with the go-ethereum library. If not, see .
-package misc
+package eip1559
import (
"math/big"
@@ -34,7 +34,6 @@ func copyConfig(original *params.ChainConfig) *params.ChainConfig {
DAOForkBlock: original.DAOForkBlock,
DAOForkSupport: original.DAOForkSupport,
EIP150Block: original.EIP150Block,
- EIP150Hash: original.EIP150Hash,
EIP155Block: original.EIP155Block,
EIP158Block: original.EIP158Block,
ByzantiumBlock: original.ByzantiumBlock,
@@ -56,6 +55,19 @@ func config() *params.ChainConfig {
return config
}
+func opConfig() *params.ChainConfig {
+ config := copyConfig(params.TestChainConfig)
+ config.LondonBlock = big.NewInt(5)
+ ct := uint64(10)
+ config.CanyonTime = &ct
+ config.Optimism = ¶ms.OptimismConfig{
+ EIP1559Elasticity: 6,
+ EIP1559Denominator: 50,
+ EIP1559DenominatorCanyon: 250,
+ }
+ return config
+}
+
// TestBlockGasLimits tests the gasLimit checks for blocks both across
// the EIP-1559 boundary and post-1559 blocks
func TestBlockGasLimits(t *testing.T) {
@@ -96,7 +108,7 @@ func TestBlockGasLimits(t *testing.T) {
BaseFee: initial,
Number: big.NewInt(tc.pNum + 1),
}
- err := VerifyEip1559Header(config(), parent, header)
+ err := VerifyEIP1559Header(config(), parent, header)
if tc.ok && err != nil {
t.Errorf("test %d: Expected valid header: %s", i, err)
}
@@ -125,7 +137,40 @@ func TestCalcBaseFee(t *testing.T) {
GasUsed: test.parentGasUsed,
BaseFee: big.NewInt(test.parentBaseFee),
}
- if have, want := CalcBaseFee(config(), parent), big.NewInt(test.expectedBaseFee); have.Cmp(want) != 0 {
+ if have, want := CalcBaseFee(config(), parent, 0), big.NewInt(test.expectedBaseFee); have.Cmp(want) != 0 {
+ t.Errorf("test %d: have %d want %d, ", i, have, want)
+ }
+ }
+}
+
+// TestCalcBaseFeeOptimism assumes all blocks are 1559-blocks but tests the Canyon activation
+func TestCalcBaseFeeOptimism(t *testing.T) {
+ tests := []struct {
+ parentBaseFee int64
+ parentGasLimit uint64
+ parentGasUsed uint64
+ expectedBaseFee int64
+ postCanyon bool
+ }{
+ {params.InitialBaseFee, 30_000_000, 5_000_000, params.InitialBaseFee, false}, // usage == target
+ {params.InitialBaseFee, 30_000_000, 4_000_000, 996000000, false}, // usage below target
+ {params.InitialBaseFee, 30_000_000, 10_000_000, 1020000000, false}, // usage above target
+ {params.InitialBaseFee, 30_000_000, 5_000_000, params.InitialBaseFee, true}, // usage == target
+ {params.InitialBaseFee, 30_000_000, 4_000_000, 999200000, true}, // usage below target
+ {params.InitialBaseFee, 30_000_000, 10_000_000, 1004000000, true}, // usage above target
+ }
+ for i, test := range tests {
+ parent := &types.Header{
+ Number: common.Big32,
+ GasLimit: test.parentGasLimit,
+ GasUsed: test.parentGasUsed,
+ BaseFee: big.NewInt(test.parentBaseFee),
+ Time: 6,
+ }
+ if test.postCanyon {
+ parent.Time = 8
+ }
+ if have, want := CalcBaseFee(opConfig(), parent, parent.Time+2), big.NewInt(test.expectedBaseFee); have.Cmp(want) != 0 {
t.Errorf("test %d: have %d want %d, ", i, have, want)
}
}
diff --git a/consensus/misc/eip4844/eip4844.go b/consensus/misc/eip4844/eip4844.go
new file mode 100644
index 0000000000..2dad9a0cd3
--- /dev/null
+++ b/consensus/misc/eip4844/eip4844.go
@@ -0,0 +1,98 @@
+// Copyright 2023 The go-ethereum Authors
+// This file is part of the go-ethereum library.
+//
+// The go-ethereum library is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Lesser General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// The go-ethereum library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with the go-ethereum library. If not, see .
+
+package eip4844
+
+import (
+ "errors"
+ "fmt"
+ "math/big"
+
+ "github.com/ethereum/go-ethereum/core/types"
+ "github.com/ethereum/go-ethereum/params"
+)
+
+var (
+ minBlobGasPrice = big.NewInt(params.BlobTxMinBlobGasprice)
+ blobGaspriceUpdateFraction = big.NewInt(params.BlobTxBlobGaspriceUpdateFraction)
+)
+
+// VerifyEIP4844Header verifies the presence of the excessBlobGas field and that
+// if the current block contains no transactions, the excessBlobGas is updated
+// accordingly.
+func VerifyEIP4844Header(parent, header *types.Header) error {
+ // Verify the header is not malformed
+ if header.ExcessBlobGas == nil {
+ return errors.New("header is missing excessBlobGas")
+ }
+ if header.BlobGasUsed == nil {
+ return errors.New("header is missing blobGasUsed")
+ }
+ // Verify that the blob gas used remains within reasonable limits.
+ if *header.BlobGasUsed > params.MaxBlobGasPerBlock {
+ return fmt.Errorf("blob gas used %d exceeds maximum allowance %d", *header.BlobGasUsed, params.MaxBlobGasPerBlock)
+ }
+ if *header.BlobGasUsed%params.BlobTxBlobGasPerBlob != 0 {
+ return fmt.Errorf("blob gas used %d not a multiple of blob gas per blob %d", header.BlobGasUsed, params.BlobTxBlobGasPerBlob)
+ }
+ // Verify the excessBlobGas is correct based on the parent header
+ var (
+ parentExcessBlobGas uint64
+ parentBlobGasUsed uint64
+ )
+ if parent.ExcessBlobGas != nil {
+ parentExcessBlobGas = *parent.ExcessBlobGas
+ parentBlobGasUsed = *parent.BlobGasUsed
+ }
+ expectedExcessBlobGas := CalcExcessBlobGas(parentExcessBlobGas, parentBlobGasUsed)
+ if *header.ExcessBlobGas != expectedExcessBlobGas {
+ return fmt.Errorf("invalid excessBlobGas: have %d, want %d, parent excessBlobGas %d, parent blobDataUsed %d",
+ *header.ExcessBlobGas, expectedExcessBlobGas, parentExcessBlobGas, parentBlobGasUsed)
+ }
+ return nil
+}
+
+// CalcExcessBlobGas calculates the excess blob gas after applying the set of
+// blobs on top of the excess blob gas.
+func CalcExcessBlobGas(parentExcessBlobGas uint64, parentBlobGasUsed uint64) uint64 {
+ excessBlobGas := parentExcessBlobGas + parentBlobGasUsed
+ if excessBlobGas < params.BlobTxTargetBlobGasPerBlock {
+ return 0
+ }
+ return excessBlobGas - params.BlobTxTargetBlobGasPerBlock
+}
+
+// CalcBlobFee calculates the blobfee from the header's excess blob gas field.
+func CalcBlobFee(excessBlobGas uint64) *big.Int {
+ return fakeExponential(minBlobGasPrice, new(big.Int).SetUint64(excessBlobGas), blobGaspriceUpdateFraction)
+}
+
+// fakeExponential approximates factor * e ** (numerator / denominator) using
+// Taylor expansion.
+func fakeExponential(factor, numerator, denominator *big.Int) *big.Int {
+ var (
+ output = new(big.Int)
+ accum = new(big.Int).Mul(factor, denominator)
+ )
+ for i := 1; accum.Sign() > 0; i++ {
+ output.Add(output, accum)
+
+ accum.Mul(accum, numerator)
+ accum.Div(accum, denominator)
+ accum.Div(accum, big.NewInt(int64(i)))
+ }
+ return output.Div(output, denominator)
+}
diff --git a/consensus/misc/eip4844/eip4844_test.go b/consensus/misc/eip4844/eip4844_test.go
new file mode 100644
index 0000000000..ec417380fc
--- /dev/null
+++ b/consensus/misc/eip4844/eip4844_test.go
@@ -0,0 +1,114 @@
+// Copyright 2023 The go-ethereum Authors
+// This file is part of the go-ethereum library.
+//
+// The go-ethereum library is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Lesser General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// The go-ethereum library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with the go-ethereum library. If not, see .
+
+package eip4844
+
+import (
+ "fmt"
+ "math/big"
+ "testing"
+
+ "github.com/ethereum/go-ethereum/params"
+)
+
+func TestCalcExcessBlobGas(t *testing.T) {
+ var tests = []struct {
+ excess uint64
+ blobs uint64
+ want uint64
+ }{
+ // The excess blob gas should not increase from zero if the used blob
+ // slots are below - or equal - to the target.
+ {0, 0, 0},
+ {0, 1, 0},
+ {0, params.BlobTxTargetBlobGasPerBlock / params.BlobTxBlobGasPerBlob, 0},
+
+ // If the target blob gas is exceeded, the excessBlobGas should increase
+ // by however much it was overshot
+ {0, (params.BlobTxTargetBlobGasPerBlock / params.BlobTxBlobGasPerBlob) + 1, params.BlobTxBlobGasPerBlob},
+ {1, (params.BlobTxTargetBlobGasPerBlock / params.BlobTxBlobGasPerBlob) + 1, params.BlobTxBlobGasPerBlob + 1},
+ {1, (params.BlobTxTargetBlobGasPerBlock / params.BlobTxBlobGasPerBlob) + 2, 2*params.BlobTxBlobGasPerBlob + 1},
+
+ // The excess blob gas should decrease by however much the target was
+ // under-shot, capped at zero.
+ {params.BlobTxTargetBlobGasPerBlock, params.BlobTxTargetBlobGasPerBlock / params.BlobTxBlobGasPerBlob, params.BlobTxTargetBlobGasPerBlock},
+ {params.BlobTxTargetBlobGasPerBlock, (params.BlobTxTargetBlobGasPerBlock / params.BlobTxBlobGasPerBlob) - 1, params.BlobTxTargetBlobGasPerBlock - params.BlobTxBlobGasPerBlob},
+ {params.BlobTxTargetBlobGasPerBlock, (params.BlobTxTargetBlobGasPerBlock / params.BlobTxBlobGasPerBlob) - 2, params.BlobTxTargetBlobGasPerBlock - (2 * params.BlobTxBlobGasPerBlob)},
+ {params.BlobTxBlobGasPerBlob - 1, (params.BlobTxTargetBlobGasPerBlock / params.BlobTxBlobGasPerBlob) - 1, 0},
+ }
+ for i, tt := range tests {
+ result := CalcExcessBlobGas(tt.excess, tt.blobs*params.BlobTxBlobGasPerBlob)
+ if result != tt.want {
+ t.Errorf("test %d: excess blob gas mismatch: have %v, want %v", i, result, tt.want)
+ }
+ }
+}
+
+func TestCalcBlobFee(t *testing.T) {
+ tests := []struct {
+ excessBlobGas uint64
+ blobfee int64
+ }{
+ {0, 1},
+ {2314057, 1},
+ {2314058, 2},
+ {10 * 1024 * 1024, 23},
+ }
+ for i, tt := range tests {
+ have := CalcBlobFee(tt.excessBlobGas)
+ if have.Int64() != tt.blobfee {
+ t.Errorf("test %d: blobfee mismatch: have %v want %v", i, have, tt.blobfee)
+ }
+ }
+}
+
+func TestFakeExponential(t *testing.T) {
+ tests := []struct {
+ factor int64
+ numerator int64
+ denominator int64
+ want int64
+ }{
+ // When numerator == 0 the return value should always equal the value of factor
+ {1, 0, 1, 1},
+ {38493, 0, 1000, 38493},
+ {0, 1234, 2345, 0}, // should be 0
+ {1, 2, 1, 6}, // approximate 7.389
+ {1, 4, 2, 6},
+ {1, 3, 1, 16}, // approximate 20.09
+ {1, 6, 2, 18},
+ {1, 4, 1, 49}, // approximate 54.60
+ {1, 8, 2, 50},
+ {10, 8, 2, 542}, // approximate 540.598
+ {11, 8, 2, 596}, // approximate 600.58
+ {1, 5, 1, 136}, // approximate 148.4
+ {1, 5, 2, 11}, // approximate 12.18
+ {2, 5, 2, 23}, // approximate 24.36
+ {1, 50000000, 2225652, 5709098764},
+ }
+ for i, tt := range tests {
+ f, n, d := big.NewInt(tt.factor), big.NewInt(tt.numerator), big.NewInt(tt.denominator)
+ original := fmt.Sprintf("%d %d %d", f, n, d)
+ have := fakeExponential(f, n, d)
+ if have.Int64() != tt.want {
+ t.Errorf("test %d: fake exponential mismatch: have %v want %v", i, have, tt.want)
+ }
+ later := fmt.Sprintf("%d %d %d", f, n, d)
+ if original != later {
+ t.Errorf("test %d: fake exponential modified arguments: have\n%v\nwant\n%v", i, later, original)
+ }
+ }
+}
diff --git a/consensus/misc/gaslimit.go b/consensus/misc/gaslimit.go
index 25f35300b9..dfcabd9a80 100644
--- a/consensus/misc/gaslimit.go
+++ b/consensus/misc/gaslimit.go
@@ -17,7 +17,6 @@
package misc
import (
- "errors"
"fmt"
"github.com/ethereum/go-ethereum/params"
@@ -36,7 +35,7 @@ func VerifyGaslimit(parentGasLimit, headerGasLimit uint64) error {
return fmt.Errorf("invalid gas limit: have %d, want %d +-= %d", headerGasLimit, parentGasLimit, limit-1)
}
if headerGasLimit < params.MinGasLimit {
- return errors.New("invalid gas limit below 5000")
+ return fmt.Errorf("invalid gas limit below %d", params.MinGasLimit)
}
return nil
}
diff --git a/consensus/misc/precontract.go b/consensus/misc/precontract.go
index 3b381479e2..b426eb815a 100644
--- a/consensus/misc/precontract.go
+++ b/consensus/misc/precontract.go
@@ -38,5 +38,5 @@ var (
func ApplyPreContractHardFork(statedb *state.StateDB) {
statedb.SetState(WBNBContract, nameSlot, nameValue)
statedb.SetState(WBNBContract, symbolSlot, symbolValue)
- statedb.Suicide(governanceToken)
+ statedb.SelfDestruct(governanceToken)
}
diff --git a/console/bridge.go b/console/bridge.go
index 21ef0e8e7b..c67686d6c3 100644
--- a/console/bridge.go
+++ b/console/bridge.go
@@ -18,6 +18,7 @@ package console
import (
"encoding/json"
+ "errors"
"fmt"
"io"
"reflect"
@@ -77,18 +78,18 @@ func (b *bridge) NewAccount(call jsre.Call) (goja.Value, error) {
return nil, err
}
if password != confirm {
- return nil, fmt.Errorf("passwords don't match!")
+ return nil, errors.New("passwords don't match!")
}
// A single string password was specified, use that
case len(call.Arguments) == 1 && call.Argument(0).ToString() != nil:
password = call.Argument(0).ToString().String()
default:
- return nil, fmt.Errorf("expected 0 or 1 string argument")
+ return nil, errors.New("expected 0 or 1 string argument")
}
// Password acquired, execute the call and return
newAccount, callable := goja.AssertFunction(getJeth(call.VM).Get("newAccount"))
if !callable {
- return nil, fmt.Errorf("jeth.newAccount is not callable")
+ return nil, errors.New("jeth.newAccount is not callable")
}
ret, err := newAccount(goja.Null(), call.VM.ToValue(password))
if err != nil {
@@ -102,7 +103,7 @@ func (b *bridge) NewAccount(call jsre.Call) (goja.Value, error) {
func (b *bridge) OpenWallet(call jsre.Call) (goja.Value, error) {
// Make sure we have a wallet specified to open
if call.Argument(0).ToObject(call.VM).ClassName() != "String" {
- return nil, fmt.Errorf("first argument must be the wallet URL to open")
+ return nil, errors.New("first argument must be the wallet URL to open")
}
wallet := call.Argument(0)
@@ -115,7 +116,7 @@ func (b *bridge) OpenWallet(call jsre.Call) (goja.Value, error) {
// Open the wallet and return if successful in itself
openWallet, callable := goja.AssertFunction(getJeth(call.VM).Get("openWallet"))
if !callable {
- return nil, fmt.Errorf("jeth.openWallet is not callable")
+ return nil, errors.New("jeth.openWallet is not callable")
}
val, err := openWallet(goja.Null(), wallet, passwd)
if err == nil {
@@ -198,7 +199,7 @@ func (b *bridge) readPassphraseAndReopenWallet(call jsre.Call) (goja.Value, erro
}
openWallet, callable := goja.AssertFunction(getJeth(call.VM).Get("openWallet"))
if !callable {
- return nil, fmt.Errorf("jeth.openWallet is not callable")
+ return nil, errors.New("jeth.openWallet is not callable")
}
return openWallet(goja.Null(), wallet, call.VM.ToValue(input))
}
@@ -219,7 +220,7 @@ func (b *bridge) readPinAndReopenWallet(call jsre.Call) (goja.Value, error) {
}
openWallet, callable := goja.AssertFunction(getJeth(call.VM).Get("openWallet"))
if !callable {
- return nil, fmt.Errorf("jeth.openWallet is not callable")
+ return nil, errors.New("jeth.openWallet is not callable")
}
return openWallet(goja.Null(), wallet, call.VM.ToValue(input))
}
@@ -230,13 +231,13 @@ func (b *bridge) readPinAndReopenWallet(call jsre.Call) (goja.Value, error) {
// the RPC call.
func (b *bridge) UnlockAccount(call jsre.Call) (goja.Value, error) {
if len(call.Arguments) < 1 {
- return nil, fmt.Errorf("usage: unlockAccount(account, [ password, duration ])")
+ return nil, errors.New("usage: unlockAccount(account, [ password, duration ])")
}
account := call.Argument(0)
// Make sure we have an account specified to unlock.
if goja.IsUndefined(account) || goja.IsNull(account) || account.ExportType().Kind() != reflect.String {
- return nil, fmt.Errorf("first argument must be the account to unlock")
+ return nil, errors.New("first argument must be the account to unlock")
}
// If password is not given or is the null value, prompt the user for it.
@@ -250,7 +251,7 @@ func (b *bridge) UnlockAccount(call jsre.Call) (goja.Value, error) {
passwd = call.VM.ToValue(input)
} else {
if call.Argument(1).ExportType().Kind() != reflect.String {
- return nil, fmt.Errorf("password must be a string")
+ return nil, errors.New("password must be a string")
}
passwd = call.Argument(1)
}
@@ -259,7 +260,7 @@ func (b *bridge) UnlockAccount(call jsre.Call) (goja.Value, error) {
duration := goja.Null()
if !goja.IsUndefined(call.Argument(2)) && !goja.IsNull(call.Argument(2)) {
if !isNumber(call.Argument(2)) {
- return nil, fmt.Errorf("unlock duration must be a number")
+ return nil, errors.New("unlock duration must be a number")
}
duration = call.Argument(2)
}
@@ -267,7 +268,7 @@ func (b *bridge) UnlockAccount(call jsre.Call) (goja.Value, error) {
// Send the request to the backend and return.
unlockAccount, callable := goja.AssertFunction(getJeth(call.VM).Get("unlockAccount"))
if !callable {
- return nil, fmt.Errorf("jeth.unlockAccount is not callable")
+ return nil, errors.New("jeth.unlockAccount is not callable")
}
return unlockAccount(goja.Null(), account, passwd, duration)
}
@@ -277,7 +278,7 @@ func (b *bridge) UnlockAccount(call jsre.Call) (goja.Value, error) {
// jeth.sign) with it to actually execute the RPC call.
func (b *bridge) Sign(call jsre.Call) (goja.Value, error) {
if nArgs := len(call.Arguments); nArgs < 2 {
- return nil, fmt.Errorf("usage: sign(message, account, [ password ])")
+ return nil, errors.New("usage: sign(message, account, [ password ])")
}
var (
message = call.Argument(0)
@@ -286,10 +287,10 @@ func (b *bridge) Sign(call jsre.Call) (goja.Value, error) {
)
if goja.IsUndefined(message) || message.ExportType().Kind() != reflect.String {
- return nil, fmt.Errorf("first argument must be the message to sign")
+ return nil, errors.New("first argument must be the message to sign")
}
if goja.IsUndefined(account) || account.ExportType().Kind() != reflect.String {
- return nil, fmt.Errorf("second argument must be the account to sign with")
+ return nil, errors.New("second argument must be the account to sign with")
}
// if the password is not given or null ask the user and ensure password is a string
@@ -301,13 +302,13 @@ func (b *bridge) Sign(call jsre.Call) (goja.Value, error) {
}
passwd = call.VM.ToValue(input)
} else if passwd.ExportType().Kind() != reflect.String {
- return nil, fmt.Errorf("third argument must be the password to unlock the account")
+ return nil, errors.New("third argument must be the password to unlock the account")
}
// Send the request to the backend and return
sign, callable := goja.AssertFunction(getJeth(call.VM).Get("sign"))
if !callable {
- return nil, fmt.Errorf("jeth.sign is not callable")
+ return nil, errors.New("jeth.sign is not callable")
}
return sign(goja.Null(), message, account, passwd)
}
@@ -315,11 +316,11 @@ func (b *bridge) Sign(call jsre.Call) (goja.Value, error) {
// Sleep will block the console for the specified number of seconds.
func (b *bridge) Sleep(call jsre.Call) (goja.Value, error) {
if nArgs := len(call.Arguments); nArgs < 1 {
- return nil, fmt.Errorf("usage: sleep()")
+ return nil, errors.New("usage: sleep()")
}
sleepObj := call.Argument(0)
if goja.IsUndefined(sleepObj) || goja.IsNull(sleepObj) || !isNumber(sleepObj) {
- return nil, fmt.Errorf("usage: sleep()")
+ return nil, errors.New("usage: sleep()")
}
sleep := sleepObj.ToFloat()
time.Sleep(time.Duration(sleep * float64(time.Second)))
@@ -336,17 +337,17 @@ func (b *bridge) SleepBlocks(call jsre.Call) (goja.Value, error) {
)
nArgs := len(call.Arguments)
if nArgs == 0 {
- return nil, fmt.Errorf("usage: sleepBlocks([, max sleep in seconds])")
+ return nil, errors.New("usage: sleepBlocks([, max sleep in seconds])")
}
if nArgs >= 1 {
if goja.IsNull(call.Argument(0)) || goja.IsUndefined(call.Argument(0)) || !isNumber(call.Argument(0)) {
- return nil, fmt.Errorf("expected number as first argument")
+ return nil, errors.New("expected number as first argument")
}
blocks = call.Argument(0).ToInteger()
}
if nArgs >= 2 {
if goja.IsNull(call.Argument(1)) || goja.IsUndefined(call.Argument(1)) || !isNumber(call.Argument(1)) {
- return nil, fmt.Errorf("expected number as second argument")
+ return nil, errors.New("expected number as second argument")
}
sleep = call.Argument(1).ToInteger()
}
@@ -421,7 +422,7 @@ func (b *bridge) Send(call jsre.Call) (goja.Value, error) {
JSON := call.VM.Get("JSON").ToObject(call.VM)
parse, callable := goja.AssertFunction(JSON.Get("parse"))
if !callable {
- return nil, fmt.Errorf("JSON.parse is not a function")
+ return nil, errors.New("JSON.parse is not a function")
}
resultVal, err := parse(goja.Null(), call.VM.ToValue(string(result)))
if err != nil {
diff --git a/console/console_test.go b/console/console_test.go
index 35341fcba0..ee5c36be4a 100644
--- a/console/console_test.go
+++ b/console/console_test.go
@@ -26,7 +26,6 @@ import (
"time"
"github.com/ethereum/go-ethereum/common"
- "github.com/ethereum/go-ethereum/consensus/ethash"
"github.com/ethereum/go-ethereum/console/prompt"
"github.com/ethereum/go-ethereum/core"
"github.com/ethereum/go-ethereum/eth"
@@ -95,13 +94,10 @@ func newTester(t *testing.T, confOverride func(*ethconfig.Config)) *tester {
t.Fatalf("failed to create node: %v", err)
}
ethConf := ðconfig.Config{
- Genesis: core.DeveloperGenesisBlock(15, 11_500_000, common.Address{}),
+ Genesis: core.DeveloperGenesisBlock(11_500_000, common.Address{}),
Miner: miner.Config{
Etherbase: common.HexToAddress(testAddress),
},
- Ethash: ethash.Config{
- PowMode: ethash.ModeTest,
- },
}
if confOverride != nil {
confOverride(ethConf)
@@ -114,10 +110,11 @@ func newTester(t *testing.T, confOverride func(*ethconfig.Config)) *tester {
if err = stack.Start(); err != nil {
t.Fatalf("failed to start test stack: %v", err)
}
- client, err := stack.Attach()
- if err != nil {
- t.Fatalf("failed to attach to node: %v", err)
- }
+ client := stack.Attach()
+ t.Cleanup(func() {
+ client.Close()
+ })
+
prompter := &hookedPrompter{scheduler: make(chan string)}
printer := new(bytes.Buffer)
diff --git a/contracts/checkpointoracle/contract/oracle.go b/contracts/checkpointoracle/contract/oracle.go
deleted file mode 100644
index a4a308f5c5..0000000000
--- a/contracts/checkpointoracle/contract/oracle.go
+++ /dev/null
@@ -1,428 +0,0 @@
-// Code generated - DO NOT EDIT.
-// This file is a generated binding and any manual changes will be lost.
-
-package contract
-
-import (
- "math/big"
- "strings"
-
- ethereum "github.com/ethereum/go-ethereum"
- "github.com/ethereum/go-ethereum/accounts/abi"
- "github.com/ethereum/go-ethereum/accounts/abi/bind"
- "github.com/ethereum/go-ethereum/common"
- "github.com/ethereum/go-ethereum/core/types"
- "github.com/ethereum/go-ethereum/event"
-)
-
-// Reference imports to suppress errors if they are not otherwise used.
-var (
- _ = big.NewInt
- _ = strings.NewReader
- _ = ethereum.NotFound
- _ = bind.Bind
- _ = common.Big1
- _ = types.BloomLookup
- _ = event.NewSubscription
-)
-
-// CheckpointOracleABI is the input ABI used to generate the binding from.
-const CheckpointOracleABI = "[{\"inputs\":[{\"internalType\":\"address[]\",\"name\":\"_adminlist\",\"type\":\"address[]\"},{\"internalType\":\"uint256\",\"name\":\"_sectionSize\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"_processConfirms\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"_threshold\",\"type\":\"uint256\"}],\"stateMutability\":\"nonpayable\",\"type\":\"constructor\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"uint64\",\"name\":\"index\",\"type\":\"uint64\"},{\"indexed\":false,\"internalType\":\"bytes32\",\"name\":\"checkpointHash\",\"type\":\"bytes32\"},{\"indexed\":false,\"internalType\":\"uint8\",\"name\":\"v\",\"type\":\"uint8\"},{\"indexed\":false,\"internalType\":\"bytes32\",\"name\":\"r\",\"type\":\"bytes32\"},{\"indexed\":false,\"internalType\":\"bytes32\",\"name\":\"s\",\"type\":\"bytes32\"}],\"name\":\"NewCheckpointVote\",\"type\":\"event\"},{\"inputs\":[],\"name\":\"GetAllAdmin\",\"outputs\":[{\"internalType\":\"address[]\",\"name\":\"\",\"type\":\"address[]\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"GetLatestCheckpoint\",\"outputs\":[{\"internalType\":\"uint64\",\"name\":\"\",\"type\":\"uint64\"},{\"internalType\":\"bytes32\",\"name\":\"\",\"type\":\"bytes32\"},{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"_recentNumber\",\"type\":\"uint256\"},{\"internalType\":\"bytes32\",\"name\":\"_recentHash\",\"type\":\"bytes32\"},{\"internalType\":\"bytes32\",\"name\":\"_hash\",\"type\":\"bytes32\"},{\"internalType\":\"uint64\",\"name\":\"_sectionIndex\",\"type\":\"uint64\"},{\"internalType\":\"uint8[]\",\"name\":\"v\",\"type\":\"uint8[]\"},{\"internalType\":\"bytes32[]\",\"name\":\"r\",\"type\":\"bytes32[]\"},{\"internalType\":\"bytes32[]\",\"name\":\"s\",\"type\":\"bytes32[]\"}],\"name\":\"SetCheckpoint\",\"outputs\":[{\"internalType\":\"bool\",\"name\":\"\",\"type\":\"bool\"}],\"stateMutability\":\"nonpayable\",\"type\":\"function\"}]"
-
-// CheckpointOracleFuncSigs maps the 4-byte function signature to its string representation.
-var CheckpointOracleFuncSigs = map[string]string{
- "45848dfc": "GetAllAdmin()",
- "4d6a304c": "GetLatestCheckpoint()",
- "d459fc46": "SetCheckpoint(uint256,bytes32,bytes32,uint64,uint8[],bytes32[],bytes32[])",
-}
-
-// CheckpointOracleBin is the compiled bytecode used for deploying new contracts.
-var CheckpointOracleBin = "0x608060405234801561001057600080fd5b506040516108703803806108708339818101604052608081101561003357600080fd5b810190808051604051939291908464010000000082111561005357600080fd5b90830190602082018581111561006857600080fd5b825186602082028301116401000000008211171561008557600080fd5b82525081516020918201928201910280838360005b838110156100b257818101518382015260200161009a565b50505050919091016040908152602083015190830151606090930151909450919250600090505b84518110156101855760016000808784815181106100f357fe5b60200260200101516001600160a01b03166001600160a01b0316815260200190815260200160002060006101000a81548160ff021916908315150217905550600185828151811061014057fe5b60209081029190910181015182546001808201855560009485529290932090920180546001600160a01b0319166001600160a01b0390931692909217909155016100d9565b50600592909255600655600755506106ce806101a26000396000f3fe608060405234801561001057600080fd5b50600436106100415760003560e01c806345848dfc146100465780634d6a304c1461009e578063d459fc46146100cf575b600080fd5b61004e6102b0565b60408051602080825283518183015283519192839290830191858101910280838360005b8381101561008a578181015183820152602001610072565b505050509050019250505060405180910390f35b6100a6610365565b6040805167ffffffffffffffff9094168452602084019290925282820152519081900360600190f35b61029c600480360360e08110156100e557600080fd5b81359160208101359160408201359167ffffffffffffffff6060820135169181019060a08101608082013564010000000081111561012257600080fd5b82018360208201111561013457600080fd5b8035906020019184602083028401116401000000008311171561015657600080fd5b91908080602002602001604051908101604052809392919081815260200183836020028082843760009201919091525092959493602081019350359150506401000000008111156101a657600080fd5b8201836020820111156101b857600080fd5b803590602001918460208302840111640100000000831117156101da57600080fd5b919080806020026020016040519081016040528093929190818152602001838360200280828437600092019190915250929594936020810193503591505064010000000081111561022a57600080fd5b82018360208201111561023c57600080fd5b8035906020019184602083028401116401000000008311171561025e57600080fd5b919080806020026020016040519081016040528093929190818152602001838360200280828437600092019190915250929550610380945050505050565b604080519115158252519081900360200190f35b600154606090819067ffffffffffffffff811180156102ce57600080fd5b506040519080825280602002602001820160405280156102f8578160200160208202803683370190505b50905060005b60015481101561035f576001818154811061031557fe5b9060005260206000200160009054906101000a90046001600160a01b031682828151811061033f57fe5b6001600160a01b03909216602092830291909101909101526001016102fe565b50905090565b60025460045460035467ffffffffffffffff90921691909192565b3360009081526020819052604081205460ff1661039c57600080fd5b868840146103a957600080fd5b82518451146103b757600080fd5b81518451146103c557600080fd5b6006546005548660010167ffffffffffffffff1602014310156103ea5750600061068d565b60025467ffffffffffffffff908116908616101561040a5750600061068d565b60025467ffffffffffffffff868116911614801561043c575067ffffffffffffffff851615158061043c575060035415155b156104495750600061068d565b856104565750600061068d565b60408051601960f81b6020808301919091526000602183018190523060601b60228401526001600160c01b031960c08a901b166036840152603e8084018b905284518085039091018152605e909301909352815191012090805b86518110156106875760006001848984815181106104ca57fe5b60200260200101518985815181106104de57fe5b60200260200101518986815181106104f257fe5b602002602001015160405160008152602001604052604051808581526020018460ff1660ff1681526020018381526020018281526020019450505050506020604051602081039080840390855afa158015610551573d6000803e3d6000fd5b505060408051601f1901516001600160a01b03811660009081526020819052919091205490925060ff16905061058657600080fd5b826001600160a01b0316816001600160a01b0316116105a457600080fd5b8092508867ffffffffffffffff167fce51ffa16246bcaf0899f6504f473cd0114f430f566cef71ab7e03d3dde42a418b8a85815181106105e057fe5b60200260200101518a86815181106105f457fe5b60200260200101518a878151811061060857fe5b6020026020010151604051808581526020018460ff1660ff16815260200183815260200182815260200194505050505060405180910390a2600754826001011061067e5750505060048790555050436003556002805467ffffffffffffffff191667ffffffffffffffff8616179055600161068d565b506001016104b0565b50600080fd5b97965050505050505056fea26469706673582212202ddf9eda76bf59c0fc65584c0b22d84ecef2c703765de60439596d6ac34c2b7264736f6c634300060b0033"
-
-// DeployCheckpointOracle deploys a new Ethereum contract, binding an instance of CheckpointOracle to it.
-func DeployCheckpointOracle(auth *bind.TransactOpts, backend bind.ContractBackend, _adminlist []common.Address, _sectionSize *big.Int, _processConfirms *big.Int, _threshold *big.Int) (common.Address, *types.Transaction, *CheckpointOracle, error) {
- parsed, err := abi.JSON(strings.NewReader(CheckpointOracleABI))
- if err != nil {
- return common.Address{}, nil, nil, err
- }
-
- address, tx, contract, err := bind.DeployContract(auth, parsed, common.FromHex(CheckpointOracleBin), backend, _adminlist, _sectionSize, _processConfirms, _threshold)
- if err != nil {
- return common.Address{}, nil, nil, err
- }
- return address, tx, &CheckpointOracle{CheckpointOracleCaller: CheckpointOracleCaller{contract: contract}, CheckpointOracleTransactor: CheckpointOracleTransactor{contract: contract}, CheckpointOracleFilterer: CheckpointOracleFilterer{contract: contract}}, nil
-}
-
-// CheckpointOracle is an auto generated Go binding around an Ethereum contract.
-type CheckpointOracle struct {
- CheckpointOracleCaller // Read-only binding to the contract
- CheckpointOracleTransactor // Write-only binding to the contract
- CheckpointOracleFilterer // Log filterer for contract events
-}
-
-// CheckpointOracleCaller is an auto generated read-only Go binding around an Ethereum contract.
-type CheckpointOracleCaller struct {
- contract *bind.BoundContract // Generic contract wrapper for the low level calls
-}
-
-// CheckpointOracleTransactor is an auto generated write-only Go binding around an Ethereum contract.
-type CheckpointOracleTransactor struct {
- contract *bind.BoundContract // Generic contract wrapper for the low level calls
-}
-
-// CheckpointOracleFilterer is an auto generated log filtering Go binding around an Ethereum contract events.
-type CheckpointOracleFilterer struct {
- contract *bind.BoundContract // Generic contract wrapper for the low level calls
-}
-
-// CheckpointOracleSession is an auto generated Go binding around an Ethereum contract,
-// with pre-set call and transact options.
-type CheckpointOracleSession struct {
- Contract *CheckpointOracle // Generic contract binding to set the session for
- CallOpts bind.CallOpts // Call options to use throughout this session
- TransactOpts bind.TransactOpts // Transaction auth options to use throughout this session
-}
-
-// CheckpointOracleCallerSession is an auto generated read-only Go binding around an Ethereum contract,
-// with pre-set call options.
-type CheckpointOracleCallerSession struct {
- Contract *CheckpointOracleCaller // Generic contract caller binding to set the session for
- CallOpts bind.CallOpts // Call options to use throughout this session
-}
-
-// CheckpointOracleTransactorSession is an auto generated write-only Go binding around an Ethereum contract,
-// with pre-set transact options.
-type CheckpointOracleTransactorSession struct {
- Contract *CheckpointOracleTransactor // Generic contract transactor binding to set the session for
- TransactOpts bind.TransactOpts // Transaction auth options to use throughout this session
-}
-
-// CheckpointOracleRaw is an auto generated low-level Go binding around an Ethereum contract.
-type CheckpointOracleRaw struct {
- Contract *CheckpointOracle // Generic contract binding to access the raw methods on
-}
-
-// CheckpointOracleCallerRaw is an auto generated low-level read-only Go binding around an Ethereum contract.
-type CheckpointOracleCallerRaw struct {
- Contract *CheckpointOracleCaller // Generic read-only contract binding to access the raw methods on
-}
-
-// CheckpointOracleTransactorRaw is an auto generated low-level write-only Go binding around an Ethereum contract.
-type CheckpointOracleTransactorRaw struct {
- Contract *CheckpointOracleTransactor // Generic write-only contract binding to access the raw methods on
-}
-
-// NewCheckpointOracle creates a new instance of CheckpointOracle, bound to a specific deployed contract.
-func NewCheckpointOracle(address common.Address, backend bind.ContractBackend) (*CheckpointOracle, error) {
- contract, err := bindCheckpointOracle(address, backend, backend, backend)
- if err != nil {
- return nil, err
- }
- return &CheckpointOracle{CheckpointOracleCaller: CheckpointOracleCaller{contract: contract}, CheckpointOracleTransactor: CheckpointOracleTransactor{contract: contract}, CheckpointOracleFilterer: CheckpointOracleFilterer{contract: contract}}, nil
-}
-
-// NewCheckpointOracleCaller creates a new read-only instance of CheckpointOracle, bound to a specific deployed contract.
-func NewCheckpointOracleCaller(address common.Address, caller bind.ContractCaller) (*CheckpointOracleCaller, error) {
- contract, err := bindCheckpointOracle(address, caller, nil, nil)
- if err != nil {
- return nil, err
- }
- return &CheckpointOracleCaller{contract: contract}, nil
-}
-
-// NewCheckpointOracleTransactor creates a new write-only instance of CheckpointOracle, bound to a specific deployed contract.
-func NewCheckpointOracleTransactor(address common.Address, transactor bind.ContractTransactor) (*CheckpointOracleTransactor, error) {
- contract, err := bindCheckpointOracle(address, nil, transactor, nil)
- if err != nil {
- return nil, err
- }
- return &CheckpointOracleTransactor{contract: contract}, nil
-}
-
-// NewCheckpointOracleFilterer creates a new log filterer instance of CheckpointOracle, bound to a specific deployed contract.
-func NewCheckpointOracleFilterer(address common.Address, filterer bind.ContractFilterer) (*CheckpointOracleFilterer, error) {
- contract, err := bindCheckpointOracle(address, nil, nil, filterer)
- if err != nil {
- return nil, err
- }
- return &CheckpointOracleFilterer{contract: contract}, nil
-}
-
-// bindCheckpointOracle binds a generic wrapper to an already deployed contract.
-func bindCheckpointOracle(address common.Address, caller bind.ContractCaller, transactor bind.ContractTransactor, filterer bind.ContractFilterer) (*bind.BoundContract, error) {
- parsed, err := abi.JSON(strings.NewReader(CheckpointOracleABI))
- if err != nil {
- return nil, err
- }
- return bind.NewBoundContract(address, parsed, caller, transactor, filterer), nil
-}
-
-// Call invokes the (constant) contract method with params as input values and
-// sets the output to result. The result type might be a single field for simple
-// returns, a slice of interfaces for anonymous returns and a struct for named
-// returns.
-func (_CheckpointOracle *CheckpointOracleRaw) Call(opts *bind.CallOpts, result *[]interface{}, method string, params ...interface{}) error {
- return _CheckpointOracle.Contract.CheckpointOracleCaller.contract.Call(opts, result, method, params...)
-}
-
-// Transfer initiates a plain transaction to move funds to the contract, calling
-// its default method if one is available.
-func (_CheckpointOracle *CheckpointOracleRaw) Transfer(opts *bind.TransactOpts) (*types.Transaction, error) {
- return _CheckpointOracle.Contract.CheckpointOracleTransactor.contract.Transfer(opts)
-}
-
-// Transact invokes the (paid) contract method with params as input values.
-func (_CheckpointOracle *CheckpointOracleRaw) Transact(opts *bind.TransactOpts, method string, params ...interface{}) (*types.Transaction, error) {
- return _CheckpointOracle.Contract.CheckpointOracleTransactor.contract.Transact(opts, method, params...)
-}
-
-// Call invokes the (constant) contract method with params as input values and
-// sets the output to result. The result type might be a single field for simple
-// returns, a slice of interfaces for anonymous returns and a struct for named
-// returns.
-func (_CheckpointOracle *CheckpointOracleCallerRaw) Call(opts *bind.CallOpts, result *[]interface{}, method string, params ...interface{}) error {
- return _CheckpointOracle.Contract.contract.Call(opts, result, method, params...)
-}
-
-// Transfer initiates a plain transaction to move funds to the contract, calling
-// its default method if one is available.
-func (_CheckpointOracle *CheckpointOracleTransactorRaw) Transfer(opts *bind.TransactOpts) (*types.Transaction, error) {
- return _CheckpointOracle.Contract.contract.Transfer(opts)
-}
-
-// Transact invokes the (paid) contract method with params as input values.
-func (_CheckpointOracle *CheckpointOracleTransactorRaw) Transact(opts *bind.TransactOpts, method string, params ...interface{}) (*types.Transaction, error) {
- return _CheckpointOracle.Contract.contract.Transact(opts, method, params...)
-}
-
-// GetAllAdmin is a free data retrieval call binding the contract method 0x45848dfc.
-//
-// Solidity: function GetAllAdmin() view returns(address[])
-func (_CheckpointOracle *CheckpointOracleCaller) GetAllAdmin(opts *bind.CallOpts) ([]common.Address, error) {
- var out []interface{}
- err := _CheckpointOracle.contract.Call(opts, &out, "GetAllAdmin")
-
- if err != nil {
- return *new([]common.Address), err
- }
-
- out0 := *abi.ConvertType(out[0], new([]common.Address)).(*[]common.Address)
-
- return out0, err
-
-}
-
-// GetAllAdmin is a free data retrieval call binding the contract method 0x45848dfc.
-//
-// Solidity: function GetAllAdmin() view returns(address[])
-func (_CheckpointOracle *CheckpointOracleSession) GetAllAdmin() ([]common.Address, error) {
- return _CheckpointOracle.Contract.GetAllAdmin(&_CheckpointOracle.CallOpts)
-}
-
-// GetAllAdmin is a free data retrieval call binding the contract method 0x45848dfc.
-//
-// Solidity: function GetAllAdmin() view returns(address[])
-func (_CheckpointOracle *CheckpointOracleCallerSession) GetAllAdmin() ([]common.Address, error) {
- return _CheckpointOracle.Contract.GetAllAdmin(&_CheckpointOracle.CallOpts)
-}
-
-// GetLatestCheckpoint is a free data retrieval call binding the contract method 0x4d6a304c.
-//
-// Solidity: function GetLatestCheckpoint() view returns(uint64, bytes32, uint256)
-func (_CheckpointOracle *CheckpointOracleCaller) GetLatestCheckpoint(opts *bind.CallOpts) (uint64, [32]byte, *big.Int, error) {
- var out []interface{}
- err := _CheckpointOracle.contract.Call(opts, &out, "GetLatestCheckpoint")
-
- if err != nil {
- return *new(uint64), *new([32]byte), *new(*big.Int), err
- }
-
- out0 := *abi.ConvertType(out[0], new(uint64)).(*uint64)
- out1 := *abi.ConvertType(out[1], new([32]byte)).(*[32]byte)
- out2 := *abi.ConvertType(out[2], new(*big.Int)).(**big.Int)
-
- return out0, out1, out2, err
-
-}
-
-// GetLatestCheckpoint is a free data retrieval call binding the contract method 0x4d6a304c.
-//
-// Solidity: function GetLatestCheckpoint() view returns(uint64, bytes32, uint256)
-func (_CheckpointOracle *CheckpointOracleSession) GetLatestCheckpoint() (uint64, [32]byte, *big.Int, error) {
- return _CheckpointOracle.Contract.GetLatestCheckpoint(&_CheckpointOracle.CallOpts)
-}
-
-// GetLatestCheckpoint is a free data retrieval call binding the contract method 0x4d6a304c.
-//
-// Solidity: function GetLatestCheckpoint() view returns(uint64, bytes32, uint256)
-func (_CheckpointOracle *CheckpointOracleCallerSession) GetLatestCheckpoint() (uint64, [32]byte, *big.Int, error) {
- return _CheckpointOracle.Contract.GetLatestCheckpoint(&_CheckpointOracle.CallOpts)
-}
-
-// SetCheckpoint is a paid mutator transaction binding the contract method 0xd459fc46.
-//
-// Solidity: function SetCheckpoint(uint256 _recentNumber, bytes32 _recentHash, bytes32 _hash, uint64 _sectionIndex, uint8[] v, bytes32[] r, bytes32[] s) returns(bool)
-func (_CheckpointOracle *CheckpointOracleTransactor) SetCheckpoint(opts *bind.TransactOpts, _recentNumber *big.Int, _recentHash [32]byte, _hash [32]byte, _sectionIndex uint64, v []uint8, r [][32]byte, s [][32]byte) (*types.Transaction, error) {
- return _CheckpointOracle.contract.Transact(opts, "SetCheckpoint", _recentNumber, _recentHash, _hash, _sectionIndex, v, r, s)
-}
-
-// SetCheckpoint is a paid mutator transaction binding the contract method 0xd459fc46.
-//
-// Solidity: function SetCheckpoint(uint256 _recentNumber, bytes32 _recentHash, bytes32 _hash, uint64 _sectionIndex, uint8[] v, bytes32[] r, bytes32[] s) returns(bool)
-func (_CheckpointOracle *CheckpointOracleSession) SetCheckpoint(_recentNumber *big.Int, _recentHash [32]byte, _hash [32]byte, _sectionIndex uint64, v []uint8, r [][32]byte, s [][32]byte) (*types.Transaction, error) {
- return _CheckpointOracle.Contract.SetCheckpoint(&_CheckpointOracle.TransactOpts, _recentNumber, _recentHash, _hash, _sectionIndex, v, r, s)
-}
-
-// SetCheckpoint is a paid mutator transaction binding the contract method 0xd459fc46.
-//
-// Solidity: function SetCheckpoint(uint256 _recentNumber, bytes32 _recentHash, bytes32 _hash, uint64 _sectionIndex, uint8[] v, bytes32[] r, bytes32[] s) returns(bool)
-func (_CheckpointOracle *CheckpointOracleTransactorSession) SetCheckpoint(_recentNumber *big.Int, _recentHash [32]byte, _hash [32]byte, _sectionIndex uint64, v []uint8, r [][32]byte, s [][32]byte) (*types.Transaction, error) {
- return _CheckpointOracle.Contract.SetCheckpoint(&_CheckpointOracle.TransactOpts, _recentNumber, _recentHash, _hash, _sectionIndex, v, r, s)
-}
-
-// CheckpointOracleNewCheckpointVoteIterator is returned from FilterNewCheckpointVote and is used to iterate over the raw logs and unpacked data for NewCheckpointVote events raised by the CheckpointOracle contract.
-type CheckpointOracleNewCheckpointVoteIterator struct {
- Event *CheckpointOracleNewCheckpointVote // Event containing the contract specifics and raw log
-
- contract *bind.BoundContract // Generic contract to use for unpacking event data
- event string // Event name to use for unpacking event data
-
- logs chan types.Log // Log channel receiving the found contract events
- sub ethereum.Subscription // Subscription for errors, completion and termination
- done bool // Whether the subscription completed delivering logs
- fail error // Occurred error to stop iteration
-}
-
-// Next advances the iterator to the subsequent event, returning whether there
-// are any more events found. In case of a retrieval or parsing error, false is
-// returned and Error() can be queried for the exact failure.
-func (it *CheckpointOracleNewCheckpointVoteIterator) Next() bool {
- // If the iterator failed, stop iterating
- if it.fail != nil {
- return false
- }
- // If the iterator completed, deliver directly whatever's available
- if it.done {
- select {
- case log := <-it.logs:
- it.Event = new(CheckpointOracleNewCheckpointVote)
- if err := it.contract.UnpackLog(it.Event, it.event, log); err != nil {
- it.fail = err
- return false
- }
- it.Event.Raw = log
- return true
-
- default:
- return false
- }
- }
- // Iterator still in progress, wait for either a data or an error event
- select {
- case log := <-it.logs:
- it.Event = new(CheckpointOracleNewCheckpointVote)
- if err := it.contract.UnpackLog(it.Event, it.event, log); err != nil {
- it.fail = err
- return false
- }
- it.Event.Raw = log
- return true
-
- case err := <-it.sub.Err():
- it.done = true
- it.fail = err
- return it.Next()
- }
-}
-
-// Error returns any retrieval or parsing error occurred during filtering.
-func (it *CheckpointOracleNewCheckpointVoteIterator) Error() error {
- return it.fail
-}
-
-// Close terminates the iteration process, releasing any pending underlying
-// resources.
-func (it *CheckpointOracleNewCheckpointVoteIterator) Close() error {
- it.sub.Unsubscribe()
- return nil
-}
-
-// CheckpointOracleNewCheckpointVote represents a NewCheckpointVote event raised by the CheckpointOracle contract.
-type CheckpointOracleNewCheckpointVote struct {
- Index uint64
- CheckpointHash [32]byte
- V uint8
- R [32]byte
- S [32]byte
- Raw types.Log // Blockchain specific contextual infos
-}
-
-// FilterNewCheckpointVote is a free log retrieval operation binding the contract event 0xce51ffa16246bcaf0899f6504f473cd0114f430f566cef71ab7e03d3dde42a41.
-//
-// Solidity: event NewCheckpointVote(uint64 indexed index, bytes32 checkpointHash, uint8 v, bytes32 r, bytes32 s)
-func (_CheckpointOracle *CheckpointOracleFilterer) FilterNewCheckpointVote(opts *bind.FilterOpts, index []uint64) (*CheckpointOracleNewCheckpointVoteIterator, error) {
-
- var indexRule []interface{}
- for _, indexItem := range index {
- indexRule = append(indexRule, indexItem)
- }
-
- logs, sub, err := _CheckpointOracle.contract.FilterLogs(opts, "NewCheckpointVote", indexRule)
- if err != nil {
- return nil, err
- }
- return &CheckpointOracleNewCheckpointVoteIterator{contract: _CheckpointOracle.contract, event: "NewCheckpointVote", logs: logs, sub: sub}, nil
-}
-
-// WatchNewCheckpointVote is a free log subscription operation binding the contract event 0xce51ffa16246bcaf0899f6504f473cd0114f430f566cef71ab7e03d3dde42a41.
-//
-// Solidity: event NewCheckpointVote(uint64 indexed index, bytes32 checkpointHash, uint8 v, bytes32 r, bytes32 s)
-func (_CheckpointOracle *CheckpointOracleFilterer) WatchNewCheckpointVote(opts *bind.WatchOpts, sink chan<- *CheckpointOracleNewCheckpointVote, index []uint64) (event.Subscription, error) {
-
- var indexRule []interface{}
- for _, indexItem := range index {
- indexRule = append(indexRule, indexItem)
- }
-
- logs, sub, err := _CheckpointOracle.contract.WatchLogs(opts, "NewCheckpointVote", indexRule)
- if err != nil {
- return nil, err
- }
- return event.NewSubscription(func(quit <-chan struct{}) error {
- defer sub.Unsubscribe()
- for {
- select {
- case log := <-logs:
- // New log arrived, parse the event and forward to the user
- event := new(CheckpointOracleNewCheckpointVote)
- if err := _CheckpointOracle.contract.UnpackLog(event, "NewCheckpointVote", log); err != nil {
- return err
- }
- event.Raw = log
-
- select {
- case sink <- event:
- case err := <-sub.Err():
- return err
- case <-quit:
- return nil
- }
- case err := <-sub.Err():
- return err
- case <-quit:
- return nil
- }
- }
- }), nil
-}
-
-// ParseNewCheckpointVote is a log parse operation binding the contract event 0xce51ffa16246bcaf0899f6504f473cd0114f430f566cef71ab7e03d3dde42a41.
-//
-// Solidity: event NewCheckpointVote(uint64 indexed index, bytes32 checkpointHash, uint8 v, bytes32 r, bytes32 s)
-func (_CheckpointOracle *CheckpointOracleFilterer) ParseNewCheckpointVote(log types.Log) (*CheckpointOracleNewCheckpointVote, error) {
- event := new(CheckpointOracleNewCheckpointVote)
- if err := _CheckpointOracle.contract.UnpackLog(event, "NewCheckpointVote", log); err != nil {
- return nil, err
- }
- return event, nil
-}
diff --git a/contracts/checkpointoracle/contract/oracle.sol b/contracts/checkpointoracle/contract/oracle.sol
deleted file mode 100644
index 65bac09d28..0000000000
--- a/contracts/checkpointoracle/contract/oracle.sol
+++ /dev/null
@@ -1,174 +0,0 @@
-pragma solidity ^0.6.0;
-
-/**
- * @title CheckpointOracle
- * @author Gary Rong, Martin Swende
- * @dev Implementation of the blockchain checkpoint registrar.
- */
-contract CheckpointOracle {
- /*
- Events
- */
-
- // NewCheckpointVote is emitted when a new checkpoint proposal receives a vote.
- event NewCheckpointVote(uint64 indexed index, bytes32 checkpointHash, uint8 v, bytes32 r, bytes32 s);
-
- /*
- Public Functions
- */
- constructor(address[] memory _adminlist, uint _sectionSize, uint _processConfirms, uint _threshold) public {
- for (uint i = 0; i < _adminlist.length; i++) {
- admins[_adminlist[i]] = true;
- adminList.push(_adminlist[i]);
- }
- sectionSize = _sectionSize;
- processConfirms = _processConfirms;
- threshold = _threshold;
- }
-
- /**
- * @dev Get latest stable checkpoint information.
- * @return section index
- * @return checkpoint hash
- * @return block height associated with checkpoint
- */
- function GetLatestCheckpoint()
- view
- public
- returns(uint64, bytes32, uint) {
- return (sectionIndex, hash, height);
- }
-
- // SetCheckpoint sets a new checkpoint. It accepts a list of signatures
- // @_recentNumber: a recent blocknumber, for replay protection
- // @_recentHash : the hash of `_recentNumber`
- // @_hash : the hash to set at _sectionIndex
- // @_sectionIndex : the section index to set
- // @v : the list of v-values
- // @r : the list or r-values
- // @s : the list of s-values
- function SetCheckpoint(
- uint _recentNumber,
- bytes32 _recentHash,
- bytes32 _hash,
- uint64 _sectionIndex,
- uint8[] memory v,
- bytes32[] memory r,
- bytes32[] memory s)
- public
- returns (bool)
- {
- // Ensure the sender is authorized.
- require(admins[msg.sender]);
-
- // These checks replay protection, so it cannot be replayed on forks,
- // accidentally or intentionally
- require(blockhash(_recentNumber) == _recentHash);
-
- // Ensure the batch of signatures are valid.
- require(v.length == r.length);
- require(v.length == s.length);
-
- // Filter out "future" checkpoint.
- if (block.number < (_sectionIndex+1)*sectionSize+processConfirms) {
- return false;
- }
- // Filter out "old" announcement
- if (_sectionIndex < sectionIndex) {
- return false;
- }
- // Filter out "stale" announcement
- if (_sectionIndex == sectionIndex && (_sectionIndex != 0 || height != 0)) {
- return false;
- }
- // Filter out "invalid" announcement
- if (_hash == ""){
- return false;
- }
-
- // EIP 191 style signatures
- //
- // Arguments when calculating hash to validate
- // 1: byte(0x19) - the initial 0x19 byte
- // 2: byte(0) - the version byte (data with intended validator)
- // 3: this - the validator address
- // -- Application specific data
- // 4 : checkpoint section_index(uint64)
- // 5 : checkpoint hash (bytes32)
- // hash = keccak256(checkpoint_index, section_head, cht_root, bloom_root)
- bytes32 signedHash = keccak256(abi.encodePacked(byte(0x19), byte(0), this, _sectionIndex, _hash));
-
- address lastVoter = address(0);
-
- // In order for us not to have to maintain a mapping of who has already
- // voted, and we don't want to count a vote twice, the signatures must
- // be submitted in strict ordering.
- for (uint idx = 0; idx < v.length; idx++){
- address signer = ecrecover(signedHash, v[idx], r[idx], s[idx]);
- require(admins[signer]);
- require(uint256(signer) > uint256(lastVoter));
- lastVoter = signer;
- emit NewCheckpointVote(_sectionIndex, _hash, v[idx], r[idx], s[idx]);
-
- // Sufficient signatures present, update latest checkpoint.
- if (idx+1 >= threshold){
- hash = _hash;
- height = block.number;
- sectionIndex = _sectionIndex;
- return true;
- }
- }
- // We shouldn't wind up here, reverting un-emits the events
- revert();
- }
-
- /**
- * @dev Get all admin addresses
- * @return address list
- */
- function GetAllAdmin()
- public
- view
- returns(address[] memory)
- {
- address[] memory ret = new address[](adminList.length);
- for (uint i = 0; i < adminList.length; i++) {
- ret[i] = adminList[i];
- }
- return ret;
- }
-
- /*
- Fields
- */
- // A map of admin users who have the permission to update CHT and bloom Trie root
- mapping(address => bool) admins;
-
- // A list of admin users so that we can obtain all admin users.
- address[] adminList;
-
- // Latest stored section id
- uint64 sectionIndex;
-
- // The block height associated with latest registered checkpoint.
- uint height;
-
- // The hash of latest registered checkpoint.
- bytes32 hash;
-
- // The frequency for creating a checkpoint
- //
- // The default value should be the same as the checkpoint size(32768) in the ethereum.
- uint sectionSize;
-
- // The number of confirmations needed before a checkpoint can be registered.
- // We have to make sure the checkpoint registered will not be invalid due to
- // chain reorg.
- //
- // The default value should be the same as the checkpoint process confirmations(256)
- // in the ethereum.
- uint processConfirms;
-
- // The required signatures to finalize a stable checkpoint.
- uint threshold;
-}
diff --git a/contracts/checkpointoracle/oracle.go b/contracts/checkpointoracle/oracle.go
deleted file mode 100644
index dec01db244..0000000000
--- a/contracts/checkpointoracle/oracle.go
+++ /dev/null
@@ -1,97 +0,0 @@
-// Copyright 2019 The go-ethereum Authors
-// This file is part of the go-ethereum library.
-//
-// The go-ethereum library is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// The go-ethereum library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public License
-// along with the go-ethereum library. If not, see .
-
-// Package checkpointoracle is a an on-chain light client checkpoint oracle.
-package checkpointoracle
-
-//go:generate solc contract/oracle.sol --combined-json bin,bin-runtime,srcmap,srcmap-runtime,abi,userdoc,devdoc,metadata,hashes --optimize -o ./ --overwrite
-//go:generate go run ../../cmd/abigen --pkg contract --out contract/oracle.go --combined-json ./combined.json
-
-import (
- "errors"
- "math/big"
-
- "github.com/ethereum/go-ethereum/accounts/abi/bind"
- "github.com/ethereum/go-ethereum/common"
- "github.com/ethereum/go-ethereum/contracts/checkpointoracle/contract"
- "github.com/ethereum/go-ethereum/core/types"
-)
-
-// CheckpointOracle is a Go wrapper around an on-chain checkpoint oracle contract.
-type CheckpointOracle struct {
- address common.Address
- contract *contract.CheckpointOracle
-}
-
-// NewCheckpointOracle binds checkpoint contract and returns a registrar instance.
-func NewCheckpointOracle(contractAddr common.Address, backend bind.ContractBackend) (*CheckpointOracle, error) {
- c, err := contract.NewCheckpointOracle(contractAddr, backend)
- if err != nil {
- return nil, err
- }
- return &CheckpointOracle{address: contractAddr, contract: c}, nil
-}
-
-// ContractAddr returns the address of contract.
-func (oracle *CheckpointOracle) ContractAddr() common.Address {
- return oracle.address
-}
-
-// Contract returns the underlying contract instance.
-func (oracle *CheckpointOracle) Contract() *contract.CheckpointOracle {
- return oracle.contract
-}
-
-// LookupCheckpointEvents searches checkpoint event for specific section in the
-// given log batches.
-func (oracle *CheckpointOracle) LookupCheckpointEvents(blockLogs [][]*types.Log, section uint64, hash common.Hash) []*contract.CheckpointOracleNewCheckpointVote {
- var votes []*contract.CheckpointOracleNewCheckpointVote
-
- for _, logs := range blockLogs {
- for _, log := range logs {
- event, err := oracle.contract.ParseNewCheckpointVote(*log)
- if err != nil {
- continue
- }
- if event.Index == section && event.CheckpointHash == hash {
- votes = append(votes, event)
- }
- }
- }
- return votes
-}
-
-// RegisterCheckpoint registers the checkpoint with a batch of associated signatures
-// that are collected off-chain and sorted by lexicographical order.
-//
-// Notably all signatures given should be transformed to "ethereum style" which transforms
-// v from 0/1 to 27/28 according to the yellow paper.
-func (oracle *CheckpointOracle) RegisterCheckpoint(opts *bind.TransactOpts, index uint64, hash []byte, rnum *big.Int, rhash [32]byte, sigs [][]byte) (*types.Transaction, error) {
- var (
- r [][32]byte
- s [][32]byte
- v []uint8
- )
- for i := 0; i < len(sigs); i++ {
- if len(sigs[i]) != 65 {
- return nil, errors.New("invalid signature")
- }
- r = append(r, common.BytesToHash(sigs[i][:32]))
- s = append(s, common.BytesToHash(sigs[i][32:64]))
- v = append(v, sigs[i][64])
- }
- return oracle.contract.SetCheckpoint(opts, rnum, rhash, common.BytesToHash(hash), index, v, r, s)
-}
diff --git a/contracts/checkpointoracle/oracle_test.go b/contracts/checkpointoracle/oracle_test.go
deleted file mode 100644
index 61dd8aec79..0000000000
--- a/contracts/checkpointoracle/oracle_test.go
+++ /dev/null
@@ -1,342 +0,0 @@
-// Copyright 2019 The go-ethereum Authors
-// This file is part of the go-ethereum library.
-//
-// The go-ethereum library is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// The go-ethereum library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public License
-// along with the go-ethereum library. If not, see .
-
-package checkpointoracle
-
-import (
- "bytes"
- "crypto/ecdsa"
- "encoding/binary"
- "errors"
- "math/big"
- "reflect"
- "sort"
- "testing"
- "time"
-
- "github.com/ethereum/go-ethereum/accounts/abi/bind"
- "github.com/ethereum/go-ethereum/accounts/abi/bind/backends"
- "github.com/ethereum/go-ethereum/common"
- "github.com/ethereum/go-ethereum/contracts/checkpointoracle/contract"
- "github.com/ethereum/go-ethereum/core"
- "github.com/ethereum/go-ethereum/crypto"
- "github.com/ethereum/go-ethereum/params"
-)
-
-var (
- emptyHash = [32]byte{}
-
- checkpoint0 = params.TrustedCheckpoint{
- SectionIndex: 0,
- SectionHead: common.HexToHash("0x7fa3c32f996c2bfb41a1a65b3d8ea3e0a33a1674cde43678ad6f4235e764d17d"),
- CHTRoot: common.HexToHash("0x98fc5d3de23a0fecebad236f6655533c157d26a1aedcd0852a514dc1169e6350"),
- BloomRoot: common.HexToHash("0x99b5adb52b337fe25e74c1c6d3835b896bd638611b3aebddb2317cce27a3f9fa"),
- }
- checkpoint1 = params.TrustedCheckpoint{
- SectionIndex: 1,
- SectionHead: common.HexToHash("0x2d4dee68102125e59b0cc61b176bd89f0d12b3b91cfaf52ef8c2c82fb920c2d2"),
- CHTRoot: common.HexToHash("0x7d428008ece3b4c4ef5439f071930aad0bb75108d381308df73beadcd01ded95"),
- BloomRoot: common.HexToHash("0x652571f7736de17e7bbb427ac881474da684c6988a88bf51b10cca9a2ee148f4"),
- }
- checkpoint2 = params.TrustedCheckpoint{
- SectionIndex: 2,
- SectionHead: common.HexToHash("0x61c0de578c0115b1dff8ef39aa600588c7c6ecb8a2f102003d7cf4c4146e9291"),
- CHTRoot: common.HexToHash("0x407a08a407a2bc3838b74ca3eb206903c9c8a186ccf5ef14af07794efff1970b"),
- BloomRoot: common.HexToHash("0x058b4161f558ce295a92925efc57f34f9210d5a30088d7475c183e0d3e58f5ac"),
- }
-)
-
-var (
- // The block frequency for creating checkpoint(only used in test)
- sectionSize = big.NewInt(512)
-
- // The number of confirmations needed to generate a checkpoint(only used in test).
- processConfirms = big.NewInt(4)
-)
-
-// validateOperation executes the operation, watches and delivers all events fired by the backend and ensures the
-// correctness by assert function.
-func validateOperation(t *testing.T, c *contract.CheckpointOracle, backend *backends.SimulatedBackend, operation func(),
- assert func(<-chan *contract.CheckpointOracleNewCheckpointVote) error, opName string) {
- // Watch all events and deliver them to assert function
- var (
- sink = make(chan *contract.CheckpointOracleNewCheckpointVote)
- sub, _ = c.WatchNewCheckpointVote(nil, sink, nil)
- )
- defer func() {
- // Close all subscribers
- sub.Unsubscribe()
- }()
- operation()
-
- // flush pending block
- backend.Commit()
- if err := assert(sink); err != nil {
- t.Errorf("operation {%s} failed, err %s", opName, err)
- }
-}
-
-// validateEvents checks that the correct number of contract events
-// fired by contract backend.
-func validateEvents(target int, sink interface{}) (bool, []reflect.Value) {
- chanval := reflect.ValueOf(sink)
- chantyp := chanval.Type()
- if chantyp.Kind() != reflect.Chan || chantyp.ChanDir()&reflect.RecvDir == 0 {
- return false, nil
- }
- count := 0
- var recv []reflect.Value
- timeout := time.After(1 * time.Second)
- cases := []reflect.SelectCase{{Chan: chanval, Dir: reflect.SelectRecv}, {Chan: reflect.ValueOf(timeout), Dir: reflect.SelectRecv}}
- for {
- chose, v, _ := reflect.Select(cases)
- if chose == 1 {
- // Not enough event received
- return false, nil
- }
- count += 1
- recv = append(recv, v)
- if count == target {
- break
- }
- }
- done := time.After(50 * time.Millisecond)
- cases = cases[:1]
- cases = append(cases, reflect.SelectCase{Chan: reflect.ValueOf(done), Dir: reflect.SelectRecv})
- chose, _, _ := reflect.Select(cases)
- // If chose equal 0, it means receiving redundant events.
- return chose == 1, recv
-}
-
-func signCheckpoint(addr common.Address, privateKey *ecdsa.PrivateKey, index uint64, hash common.Hash) []byte {
- // EIP 191 style signatures
- //
- // Arguments when calculating hash to validate
- // 1: byte(0x19) - the initial 0x19 byte
- // 2: byte(0) - the version byte (data with intended validator)
- // 3: this - the validator address
- // -- Application specific data
- // 4 : checkpoint section_index(uint64)
- // 5 : checkpoint hash (bytes32)
- // hash = keccak256(checkpoint_index, section_head, cht_root, bloom_root)
- buf := make([]byte, 8)
- binary.BigEndian.PutUint64(buf, index)
- data := append([]byte{0x19, 0x00}, append(addr.Bytes(), append(buf, hash.Bytes()...)...)...)
- sig, _ := crypto.Sign(crypto.Keccak256(data), privateKey)
- sig[64] += 27 // Transform V from 0/1 to 27/28 according to the yellow paper
- return sig
-}
-
-// assertSignature verifies whether the recovered signers are equal with expected.
-func assertSignature(addr common.Address, index uint64, hash [32]byte, r, s [32]byte, v uint8, expect common.Address) bool {
- buf := make([]byte, 8)
- binary.BigEndian.PutUint64(buf, index)
- data := append([]byte{0x19, 0x00}, append(addr.Bytes(), append(buf, hash[:]...)...)...)
- pubkey, err := crypto.Ecrecover(crypto.Keccak256(data), append(r[:], append(s[:], v-27)...))
- if err != nil {
- return false
- }
- var signer common.Address
- copy(signer[:], crypto.Keccak256(pubkey[1:])[12:])
- return bytes.Equal(signer.Bytes(), expect.Bytes())
-}
-
-type Account struct {
- key *ecdsa.PrivateKey
- addr common.Address
-}
-type Accounts []Account
-
-func (a Accounts) Len() int { return len(a) }
-func (a Accounts) Swap(i, j int) { a[i], a[j] = a[j], a[i] }
-func (a Accounts) Less(i, j int) bool { return bytes.Compare(a[i].addr.Bytes(), a[j].addr.Bytes()) < 0 }
-
-func TestCheckpointRegister(t *testing.T) {
- // Initialize test accounts
- var accounts Accounts
- for i := 0; i < 3; i++ {
- key, _ := crypto.GenerateKey()
- addr := crypto.PubkeyToAddress(key.PublicKey)
- accounts = append(accounts, Account{key: key, addr: addr})
- }
- sort.Sort(accounts)
-
- // Deploy registrar contract
- contractBackend := backends.NewSimulatedBackend(
- core.GenesisAlloc{
- accounts[0].addr: {Balance: big.NewInt(10000000000000000)},
- accounts[1].addr: {Balance: big.NewInt(10000000000000000)},
- accounts[2].addr: {Balance: big.NewInt(10000000000000000)},
- }, 10000000,
- )
- defer contractBackend.Close()
-
- transactOpts, _ := bind.NewKeyedTransactorWithChainID(accounts[0].key, big.NewInt(1337))
-
- // 3 trusted signers, threshold 2
- contractAddr, _, c, err := contract.DeployCheckpointOracle(transactOpts, contractBackend, []common.Address{accounts[0].addr, accounts[1].addr, accounts[2].addr}, sectionSize, processConfirms, big.NewInt(2))
- if err != nil {
- t.Error("Failed to deploy registrar contract", err)
- }
- contractBackend.Commit()
-
- // getRecent returns block height and hash of the head parent.
- getRecent := func() (*big.Int, common.Hash) {
- parentNumber := new(big.Int).Sub(contractBackend.Blockchain().CurrentHeader().Number, big.NewInt(1))
- parentHash := contractBackend.Blockchain().CurrentHeader().ParentHash
- return parentNumber, parentHash
- }
- // collectSig generates specified number signatures.
- collectSig := func(index uint64, hash common.Hash, n int, unauthorized *ecdsa.PrivateKey) (v []uint8, r [][32]byte, s [][32]byte) {
- for i := 0; i < n; i++ {
- sig := signCheckpoint(contractAddr, accounts[i].key, index, hash)
- if unauthorized != nil {
- sig = signCheckpoint(contractAddr, unauthorized, index, hash)
- }
- r = append(r, common.BytesToHash(sig[:32]))
- s = append(s, common.BytesToHash(sig[32:64]))
- v = append(v, sig[64])
- }
- return v, r, s
- }
- // insertEmptyBlocks inserts a batch of empty blocks to blockchain.
- insertEmptyBlocks := func(number int) {
- for i := 0; i < number; i++ {
- contractBackend.Commit()
- }
- }
- // assert checks whether the current contract status is same with
- // the expected.
- assert := func(index uint64, hash [32]byte, height *big.Int) error {
- lindex, lhash, lheight, err := c.GetLatestCheckpoint(nil)
- if err != nil {
- return err
- }
- if lindex != index {
- return errors.New("latest checkpoint index mismatch")
- }
- if !bytes.Equal(lhash[:], hash[:]) {
- return errors.New("latest checkpoint hash mismatch")
- }
- if lheight.Cmp(height) != 0 {
- return errors.New("latest checkpoint height mismatch")
- }
- return nil
- }
-
- // Test future checkpoint registration
- validateOperation(t, c, contractBackend, func() {
- number, hash := getRecent()
- v, r, s := collectSig(0, checkpoint0.Hash(), 2, nil)
- c.SetCheckpoint(transactOpts, number, hash, checkpoint0.Hash(), 0, v, r, s)
- }, func(events <-chan *contract.CheckpointOracleNewCheckpointVote) error {
- return assert(0, emptyHash, big.NewInt(0))
- }, "test future checkpoint registration")
-
- insertEmptyBlocks(int(sectionSize.Uint64() + processConfirms.Uint64()))
-
- // Test transaction replay protection
- validateOperation(t, c, contractBackend, func() {
- number, _ := getRecent()
- v, r, s := collectSig(0, checkpoint0.Hash(), 2, nil)
- hash := common.HexToHash("deadbeef")
- c.SetCheckpoint(transactOpts, number, hash, checkpoint0.Hash(), 0, v, r, s)
- }, func(events <-chan *contract.CheckpointOracleNewCheckpointVote) error {
- return assert(0, emptyHash, big.NewInt(0))
- }, "test transaction replay protection")
-
- // Test unauthorized signature checking
- validateOperation(t, c, contractBackend, func() {
- number, hash := getRecent()
- u, _ := crypto.GenerateKey()
- v, r, s := collectSig(0, checkpoint0.Hash(), 2, u)
- c.SetCheckpoint(transactOpts, number, hash, checkpoint0.Hash(), 0, v, r, s)
- }, func(events <-chan *contract.CheckpointOracleNewCheckpointVote) error {
- return assert(0, emptyHash, big.NewInt(0))
- }, "test unauthorized signature checking")
-
- // Test un-multi-signature checkpoint registration
- validateOperation(t, c, contractBackend, func() {
- number, hash := getRecent()
- v, r, s := collectSig(0, checkpoint0.Hash(), 1, nil)
- c.SetCheckpoint(transactOpts, number, hash, checkpoint0.Hash(), 0, v, r, s)
- }, func(events <-chan *contract.CheckpointOracleNewCheckpointVote) error {
- return assert(0, emptyHash, big.NewInt(0))
- }, "test un-multi-signature checkpoint registration")
-
- // Test valid checkpoint registration
- validateOperation(t, c, contractBackend, func() {
- number, hash := getRecent()
- v, r, s := collectSig(0, checkpoint0.Hash(), 2, nil)
- c.SetCheckpoint(transactOpts, number, hash, checkpoint0.Hash(), 0, v, r, s)
- }, func(events <-chan *contract.CheckpointOracleNewCheckpointVote) error {
- if valid, recv := validateEvents(2, events); !valid {
- return errors.New("receive incorrect number of events")
- } else {
- for i := 0; i < len(recv); i++ {
- event := recv[i].Interface().(*contract.CheckpointOracleNewCheckpointVote)
- if !assertSignature(contractAddr, event.Index, event.CheckpointHash, event.R, event.S, event.V, accounts[i].addr) {
- return errors.New("recover signer failed")
- }
- }
- }
- number, _ := getRecent()
- return assert(0, checkpoint0.Hash(), number.Add(number, big.NewInt(1)))
- }, "test valid checkpoint registration")
-
- distance := 3*sectionSize.Uint64() + processConfirms.Uint64() - contractBackend.Blockchain().CurrentHeader().Number.Uint64()
- insertEmptyBlocks(int(distance))
-
- // Test uncontinuous checkpoint registration
- validateOperation(t, c, contractBackend, func() {
- number, hash := getRecent()
- v, r, s := collectSig(2, checkpoint2.Hash(), 2, nil)
- c.SetCheckpoint(transactOpts, number, hash, checkpoint2.Hash(), 2, v, r, s)
- }, func(events <-chan *contract.CheckpointOracleNewCheckpointVote) error {
- if valid, recv := validateEvents(2, events); !valid {
- return errors.New("receive incorrect number of events")
- } else {
- for i := 0; i < len(recv); i++ {
- event := recv[i].Interface().(*contract.CheckpointOracleNewCheckpointVote)
- if !assertSignature(contractAddr, event.Index, event.CheckpointHash, event.R, event.S, event.V, accounts[i].addr) {
- return errors.New("recover signer failed")
- }
- }
- }
- number, _ := getRecent()
- return assert(2, checkpoint2.Hash(), number.Add(number, big.NewInt(1)))
- }, "test uncontinuous checkpoint registration")
-
- // Test old checkpoint registration
- validateOperation(t, c, contractBackend, func() {
- number, hash := getRecent()
- v, r, s := collectSig(1, checkpoint1.Hash(), 2, nil)
- c.SetCheckpoint(transactOpts, number, hash, checkpoint1.Hash(), 1, v, r, s)
- }, func(events <-chan *contract.CheckpointOracleNewCheckpointVote) error {
- number, _ := getRecent()
- return assert(2, checkpoint2.Hash(), number)
- }, "test uncontinuous checkpoint registration")
-
- // Test stale checkpoint registration
- validateOperation(t, c, contractBackend, func() {
- number, hash := getRecent()
- v, r, s := collectSig(2, checkpoint2.Hash(), 2, nil)
- c.SetCheckpoint(transactOpts, number, hash, checkpoint2.Hash(), 2, v, r, s)
- }, func(events <-chan *contract.CheckpointOracleNewCheckpointVote) error {
- number, _ := getRecent()
- return assert(2, checkpoint2.Hash(), number.Sub(number, big.NewInt(1)))
- }, "test stale checkpoint registration")
-}
diff --git a/core/asm/asm.go b/core/asm/asm.go
index 7c1e14ec01..294eb6ffaa 100644
--- a/core/asm/asm.go
+++ b/core/asm/asm.go
@@ -34,7 +34,7 @@ type instructionIterator struct {
started bool
}
-// NewInstructionIterator create a new instruction iterator.
+// NewInstructionIterator creates a new instruction iterator.
func NewInstructionIterator(code []byte) *instructionIterator {
it := new(instructionIterator)
it.code = code
diff --git a/core/asm/compiler.go b/core/asm/compiler.go
index ce2d23abd0..02c589b2c1 100644
--- a/core/asm/compiler.go
+++ b/core/asm/compiler.go
@@ -17,6 +17,8 @@
package asm
import (
+ "encoding/hex"
+ "errors"
"fmt"
"math/big"
"os"
@@ -30,7 +32,7 @@ import (
// and holds the tokens for the program.
type Compiler struct {
tokens []token
- binary []interface{}
+ out []byte
labels map[string]int
@@ -47,15 +49,13 @@ func NewCompiler(debug bool) *Compiler {
}
}
-// Feed feeds tokens in to ch and are interpreted by
+// Feed feeds tokens into ch and are interpreted by
// the compiler.
//
-// feed is the first pass in the compile stage as it
-// collects the used labels in the program and keeps a
-// program counter which is used to determine the locations
-// of the jump dests. The labels can than be used in the
-// second stage to push labels and determine the right
-// position.
+// feed is the first pass in the compile stage as it collects the used labels in the
+// program and keeps a program counter which is used to determine the locations of the
+// jump dests. The labels can than be used in the second stage to push labels and
+// determine the right position.
func (c *Compiler) Feed(ch <-chan token) {
var prev token
for i := range ch {
@@ -79,7 +79,6 @@ func (c *Compiler) Feed(ch <-chan token) {
c.pc++
}
}
-
c.tokens = append(c.tokens, i)
prev = i
}
@@ -88,12 +87,11 @@ func (c *Compiler) Feed(ch <-chan token) {
}
}
-// Compile compiles the current tokens and returns a
-// binary string that can be interpreted by the EVM
-// and an error if it failed.
+// Compile compiles the current tokens and returns a binary string that can be interpreted
+// by the EVM and an error if it failed.
//
-// compile is the second stage in the compile phase
-// which compiles the tokens to EVM instructions.
+// compile is the second stage in the compile phase which compiles the tokens to EVM
+// instructions.
func (c *Compiler) Compile() (string, []error) {
var errors []error
// continue looping over the tokens until
@@ -105,16 +103,8 @@ func (c *Compiler) Compile() (string, []error) {
}
// turn the binary to hex
- var bin strings.Builder
- for _, v := range c.binary {
- switch v := v.(type) {
- case vm.OpCode:
- bin.WriteString(fmt.Sprintf("%x", []byte{byte(v)}))
- case []byte:
- bin.WriteString(fmt.Sprintf("%x", v))
- }
- }
- return bin.String(), errors
+ h := hex.EncodeToString(c.out)
+ return h, errors
}
// next returns the next token and increments the
@@ -156,88 +146,114 @@ func (c *Compiler) compileLine() error {
return nil
}
-// compileNumber compiles the number to bytes
-func (c *Compiler) compileNumber(element token) (int, error) {
- num := math.MustParseBig256(element.text).Bytes()
- if len(num) == 0 {
- num = []byte{0}
+// parseNumber compiles the number to bytes
+func parseNumber(tok token) ([]byte, error) {
+ if tok.typ != number {
+ panic("parseNumber of non-number token")
+ }
+ num, ok := math.ParseBig256(tok.text)
+ if !ok {
+ return nil, errors.New("invalid number")
}
- c.pushBin(num)
- return len(num), nil
+ bytes := num.Bytes()
+ if len(bytes) == 0 {
+ bytes = []byte{0}
+ }
+ return bytes, nil
}
// compileElement compiles the element (push & label or both)
// to a binary representation and may error if incorrect statements
// where fed.
func (c *Compiler) compileElement(element token) error {
- // check for a jump. jumps must be read and compiled
- // from right to left.
- if isJump(element.text) {
- rvalue := c.next()
- switch rvalue.typ {
- case number:
- // TODO figure out how to return the error properly
- c.compileNumber(rvalue)
- case stringValue:
- // strings are quoted, remove them.
- c.pushBin(rvalue.text[1 : len(rvalue.text)-2])
- case label:
- c.pushBin(vm.PUSH4)
- pos := big.NewInt(int64(c.labels[rvalue.text])).Bytes()
- pos = append(make([]byte, 4-len(pos)), pos...)
- c.pushBin(pos)
- case lineEnd:
- c.pos--
- default:
- return compileErr(rvalue, rvalue.text, "number, string or label")
- }
- // push the operation
- c.pushBin(toBinary(element.text))
+ switch {
+ case isJump(element.text):
+ return c.compileJump(element.text)
+ case isPush(element.text):
+ return c.compilePush()
+ default:
+ c.outputOpcode(toBinary(element.text))
return nil
- } else if isPush(element.text) {
- // handle pushes. pushes are read from left to right.
- var value []byte
+ }
+}
- rvalue := c.next()
- switch rvalue.typ {
- case number:
- value = math.MustParseBig256(rvalue.text).Bytes()
- if len(value) == 0 {
- value = []byte{0}
- }
- case stringValue:
- value = []byte(rvalue.text[1 : len(rvalue.text)-1])
- case label:
- value = big.NewInt(int64(c.labels[rvalue.text])).Bytes()
- value = append(make([]byte, 4-len(value)), value...)
- default:
- return compileErr(rvalue, rvalue.text, "number, string or label")
+func (c *Compiler) compileJump(jumpType string) error {
+ rvalue := c.next()
+ switch rvalue.typ {
+ case number:
+ numBytes, err := parseNumber(rvalue)
+ if err != nil {
+ return err
}
+ c.outputBytes(numBytes)
- if len(value) > 32 {
- return fmt.Errorf("%d type error: unsupported string or number with size > 32", rvalue.lineno)
- }
+ case stringValue:
+ // strings are quoted, remove them.
+ str := rvalue.text[1 : len(rvalue.text)-2]
+ c.outputBytes([]byte(str))
+
+ case label:
+ c.outputOpcode(vm.PUSH4)
+ pos := big.NewInt(int64(c.labels[rvalue.text])).Bytes()
+ pos = append(make([]byte, 4-len(pos)), pos...)
+ c.outputBytes(pos)
+
+ case lineEnd:
+ // push without argument is supported, it just takes the destination from the stack.
+ c.pos--
- c.pushBin(vm.OpCode(int(vm.PUSH1) - 1 + len(value)))
- c.pushBin(value)
- } else {
- c.pushBin(toBinary(element.text))
+ default:
+ return compileErr(rvalue, rvalue.text, "number, string or label")
}
+ // push the operation
+ c.outputOpcode(toBinary(jumpType))
+ return nil
+}
+func (c *Compiler) compilePush() error {
+ // handle pushes. pushes are read from left to right.
+ var value []byte
+ rvalue := c.next()
+ switch rvalue.typ {
+ case number:
+ value = math.MustParseBig256(rvalue.text).Bytes()
+ if len(value) == 0 {
+ value = []byte{0}
+ }
+ case stringValue:
+ value = []byte(rvalue.text[1 : len(rvalue.text)-1])
+ case label:
+ value = big.NewInt(int64(c.labels[rvalue.text])).Bytes()
+ value = append(make([]byte, 4-len(value)), value...)
+ default:
+ return compileErr(rvalue, rvalue.text, "number, string or label")
+ }
+ if len(value) > 32 {
+ return fmt.Errorf("%d: string or number size > 32 bytes", rvalue.lineno+1)
+ }
+ c.outputOpcode(vm.OpCode(int(vm.PUSH1) - 1 + len(value)))
+ c.outputBytes(value)
return nil
}
// compileLabel pushes a jumpdest to the binary slice.
func (c *Compiler) compileLabel() {
- c.pushBin(vm.JUMPDEST)
+ c.outputOpcode(vm.JUMPDEST)
+}
+
+func (c *Compiler) outputOpcode(op vm.OpCode) {
+ if c.debug {
+ fmt.Printf("%d: %v\n", len(c.out), op)
+ }
+ c.out = append(c.out, byte(op))
}
-// pushBin pushes the value v to the binary stack.
-func (c *Compiler) pushBin(v interface{}) {
+// output pushes the value v to the binary stack.
+func (c *Compiler) outputBytes(b []byte) {
if c.debug {
- fmt.Printf("%d: %v\n", len(c.binary), v)
+ fmt.Printf("%d: %x\n", len(c.out), b)
}
- c.binary = append(c.binary, v)
+ c.out = append(c.out, b...)
}
// isPush returns whether the string op is either any of
@@ -264,13 +280,13 @@ type compileError struct {
}
func (err compileError) Error() string {
- return fmt.Sprintf("%d syntax error: unexpected %v, expected %v", err.lineno, err.got, err.want)
+ return fmt.Sprintf("%d: syntax error: unexpected %v, expected %v", err.lineno, err.got, err.want)
}
func compileErr(c token, got, want string) error {
return compileError{
got: got,
want: want,
- lineno: c.lineno,
+ lineno: c.lineno + 1,
}
}
diff --git a/core/asm/compiler_test.go b/core/asm/compiler_test.go
index ce9df436bd..3d64c96bc8 100644
--- a/core/asm/compiler_test.go
+++ b/core/asm/compiler_test.go
@@ -54,6 +54,14 @@ func TestCompiler(t *testing.T) {
`,
output: "6300000006565b",
},
+ {
+ input: `
+ JUMP @label
+label: ;; comment
+ ADD ;; comment
+`,
+ output: "6300000006565b01",
+ },
}
for _, test := range tests {
ch := Lex([]byte(test.input), false)
diff --git a/core/asm/lex_test.go b/core/asm/lex_test.go
index 53e05fbbba..1e62d776d4 100644
--- a/core/asm/lex_test.go
+++ b/core/asm/lex_test.go
@@ -72,6 +72,16 @@ func TestLexer(t *testing.T) {
input: "@label123",
tokens: []token{{typ: lineStart}, {typ: label, text: "label123"}, {typ: eof}},
},
+ // Comment after label
+ {
+ input: "@label123 ;; comment",
+ tokens: []token{{typ: lineStart}, {typ: label, text: "label123"}, {typ: eof}},
+ },
+ // Comment after instruction
+ {
+ input: "push 3 ;; comment\nadd",
+ tokens: []token{{typ: lineStart}, {typ: element, text: "push"}, {typ: number, text: "3"}, {typ: lineEnd, text: "\n"}, {typ: lineStart, lineno: 1}, {typ: element, lineno: 1, text: "add"}, {typ: eof, lineno: 1}},
+ },
}
for _, test := range tests {
diff --git a/core/asm/lexer.go b/core/asm/lexer.go
index fb705848d2..e025c6f363 100644
--- a/core/asm/lexer.go
+++ b/core/asm/lexer.go
@@ -22,8 +22,6 @@ import (
"strings"
"unicode"
"unicode/utf8"
-
- "github.com/ethereum/go-ethereum/common/gopool"
)
// stateFn is used through the lifetime of the
@@ -44,6 +42,8 @@ type token struct {
// is able to parse and return.
type tokenType int
+//go:generate go run golang.org/x/tools/cmd/stringer -type tokenType
+
const (
eof tokenType = iota // end of file
lineStart // emitted when a line starts
@@ -54,31 +54,13 @@ const (
labelDef // label definition is emitted when a new label is found
number // number is emitted when a number is found
stringValue // stringValue is emitted when a string has been found
-
- Numbers = "1234567890" // characters representing any decimal number
- HexadecimalNumbers = Numbers + "aAbBcCdDeEfF" // characters representing any hexadecimal
- Alpha = "abcdefghijklmnopqrstuwvxyzABCDEFGHIJKLMNOPQRSTUWVXYZ" // characters representing alphanumeric
)
-// String implements stringer
-func (it tokenType) String() string {
- if int(it) > len(stringtokenTypes) {
- return "invalid"
- }
- return stringtokenTypes[it]
-}
-
-var stringtokenTypes = []string{
- eof: "EOF",
- lineStart: "new line",
- lineEnd: "end of line",
- invalidStatement: "invalid statement",
- element: "element",
- label: "label",
- labelDef: "label definition",
- number: "number",
- stringValue: "string",
-}
+const (
+ decimalNumbers = "1234567890" // characters representing any decimal number
+ hexNumbers = decimalNumbers + "aAbBcCdDeEfF" // characters representing any hexadecimal
+ alpha = "abcdefghijklmnopqrstuwvxyzABCDEFGHIJKLMNOPQRSTUWVXYZ" // characters representing alphanumeric
+)
// lexer is the basic construct for parsing
// source code and turning them in to tokens.
@@ -105,14 +87,14 @@ func Lex(source []byte, debug bool) <-chan token {
state: lexLine,
debug: debug,
}
- gopool.Submit(func() {
+ go func() {
l.emit(lineStart)
for l.state != nil {
l.state = l.state(l)
}
l.emit(eof)
close(l.tokens)
- })
+ }()
return ch
}
@@ -202,7 +184,6 @@ func lexLine(l *lexer) stateFn {
l.emit(lineEnd)
l.ignore()
l.lineno++
-
l.emit(lineStart)
case r == ';' && l.peek() == ';':
return lexComment
@@ -227,6 +208,7 @@ func lexLine(l *lexer) stateFn {
// of the line and discards the text.
func lexComment(l *lexer) stateFn {
l.acceptRunUntil('\n')
+ l.backup()
l.ignore()
return lexLine
@@ -236,7 +218,7 @@ func lexComment(l *lexer) stateFn {
// the lex text state function to advance the parsing
// process.
func lexLabel(l *lexer) stateFn {
- l.acceptRun(Alpha + "_" + Numbers)
+ l.acceptRun(alpha + "_" + decimalNumbers)
l.emit(label)
@@ -255,9 +237,9 @@ func lexInsideString(l *lexer) stateFn {
}
func lexNumber(l *lexer) stateFn {
- acceptance := Numbers
+ acceptance := decimalNumbers
if l.accept("xX") {
- acceptance = HexadecimalNumbers
+ acceptance = hexNumbers
}
l.acceptRun(acceptance)
@@ -267,7 +249,7 @@ func lexNumber(l *lexer) stateFn {
}
func lexElement(l *lexer) stateFn {
- l.acceptRun(Alpha + "_" + Numbers)
+ l.acceptRun(alpha + "_" + decimalNumbers)
if l.peek() == ':' {
l.emit(labelDef)
diff --git a/core/asm/tokentype_string.go b/core/asm/tokentype_string.go
new file mode 100644
index 0000000000..ade76aa360
--- /dev/null
+++ b/core/asm/tokentype_string.go
@@ -0,0 +1,31 @@
+// Code generated by "stringer -type tokenType"; DO NOT EDIT.
+
+package asm
+
+import "strconv"
+
+func _() {
+ // An "invalid array index" compiler error signifies that the constant values have changed.
+ // Re-run the stringer command to generate them again.
+ var x [1]struct{}
+ _ = x[eof-0]
+ _ = x[lineStart-1]
+ _ = x[lineEnd-2]
+ _ = x[invalidStatement-3]
+ _ = x[element-4]
+ _ = x[label-5]
+ _ = x[labelDef-6]
+ _ = x[number-7]
+ _ = x[stringValue-8]
+}
+
+const _tokenType_name = "eoflineStartlineEndinvalidStatementelementlabellabelDefnumberstringValue"
+
+var _tokenType_index = [...]uint8{0, 3, 12, 19, 35, 42, 47, 55, 61, 72}
+
+func (i tokenType) String() string {
+ if i <