diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 26e5aa627c..b569180852 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,24 +1,36 @@
# Lines starting with '#' are comments.
# Each line is a file pattern followed by one or more owners.
-accounts/usbwallet @karalabe
-accounts/scwallet @gballet
-accounts/abi @gballet @MariusVanDerWijden
-beacon/engine @lightclient
-cmd/clef @holiman
-cmd/evm @holiman @MariusVanDerWijden @lightclient
-consensus @karalabe
-core/ @karalabe @holiman @rjl493456442
-eth/ @karalabe @holiman @rjl493456442
-eth/catalyst/ @gballet @lightclient
+
+accounts/usbwallet/ @gballet
+accounts/scwallet/ @gballet
+accounts/abi/ @gballet @MariusVanDerWijden
+beacon/engine/ @MariusVanDerWijden @lightclient @fjl
+beacon/light/ @zsfelfoldi
+beacon/merkle/ @zsfelfoldi
+beacon/types/ @zsfelfoldi @fjl
+beacon/params/ @zsfelfoldi @fjl
+cmd/clef/ @holiman
+cmd/evm/ @holiman @MariusVanDerWijden @lightclient
+core/state/ @rjl493456442 @holiman
+crypto/ @gballet @jwasinger @holiman @fjl
+core/ @holiman @rjl493456442
+eth/ @holiman @rjl493456442
+eth/catalyst/ @MariusVanDerWijden @lightclient @fjl @jwasinger
eth/tracers/ @s1na
+ethclient/ @fjl
+ethdb/ @rjl493456442
+event/ @fjl
+trie/ @rjl493456442
+triedb/ @rjl493456442
core/tracing/ @s1na
graphql/ @s1na
-internal/ethapi @lightclient
-internal/era @lightclient
-les/ @zsfelfoldi @rjl493456442
-light/ @zsfelfoldi @rjl493456442
+internal/ethapi/ @fjl @s1na @lightclient
+internal/era/ @lightclient
+metrics/ @holiman
+miner/ @MariusVanDerWijden @holiman @fjl @rjl493456442
node/ @fjl
p2p/ @fjl @zsfelfoldi
+rlp/ @fjl
params/ @fjl @holiman @karalabe @gballet @rjl493456442 @zsfelfoldi
rpc/ @fjl @holiman
signer/ @holiman
diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
index 85794600c3..718fb894a0 100644
--- a/.github/workflows/build-test.yml
+++ b/.github/workflows/build-test.yml
@@ -45,5 +45,7 @@ jobs:
- name: Test Build
run: |
- go mod download
- make geth
+ go run build/ci.go check_tidy
+ go run build/ci.go check_generate
+ go run build/ci.go check_baddeps
+ go mod download && make geth
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 8d55c7780d..e9edbb78c5 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -15,7 +15,7 @@ jobs:
golang-lint:
strategy:
matrix:
- go-version: [1.21.x]
+ go-version: [1.23.x]
os: [ubuntu-latest]
runs-on: ${{ matrix.os }}
steps:
@@ -47,12 +47,9 @@ jobs:
go mod tidy
- name: golangci-lint
- uses: golangci/golangci-lint-action@v3
- with:
- # Optional: version of golangci-lint to use in form of v1.2 or v1.2.3 or `latest` to use the latest version
- version: v1.55.2
- working-directory: ./
- skip-pkg-cache: true
- skip-cache: true
- skip-build-cache: true
- args: --timeout=99m --config ./.golangci.yml
+ env:
+ CGO_CFLAGS: "-O -D__BLST_PORTABLE__"
+ CGO_CFLAGS_ALLOW: "-O -D__BLST_PORTABLE__"
+ ANDROID_HOME: "" # Skip android test
+ run: |
+ make lint
diff --git a/.gitignore b/.gitignore
index 6496f59bd7..f2d85f68a0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,16 +4,11 @@
# or operating system, you probably want to add a global ignore instead:
# git config --global core.excludesfile ~/.gitignore_global
-/tmp
*/**/*un~
*/**/*.test
*un~
.DS_Store
*/**/.DS_Store
-.ethtest
-*/**/*tx_database*
-*/**/*dapps*
-build/_vendor/pkg
#*
.#*
@@ -42,23 +37,14 @@ profile.cov
# IdeaIDE
.idea
+*.iml
# VS Code
.vscode
-# dashboard
-/dashboard/assets/flow-typed
-/dashboard/assets/node_modules
-/dashboard/assets/stats.json
-/dashboard/assets/bundle.js
-/dashboard/assets/bundle.js.map
-/dashboard/assets/package-lock.json
-
-**/yarn-error.log
cmd/geth/node/
cmd/geth/__debug_bin
cmd/bootnode/bootnode
graphql/__debug_bin
-logs/
tests/spec-tests/
diff --git a/.golangci.yml b/.golangci.yml
index f7e3427bb5..f064a5f5e6 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -24,10 +24,14 @@ linters:
- staticcheck
- bidichk
- durationcheck
- - exportloopref
+ - copyloopvar
- whitespace
- revive # only certain checks enabled
-
+ - durationcheck
+ - gocheckcompilerdirectives
+ - reassign
+ - mirror
+ - tenv
### linters we tried and will not be using:
###
# - structcheck # lots of false positives
diff --git a/.travis.yml b/.travis.yml
index 31c944641f..2ba3af9419 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,7 +25,7 @@ jobs:
before_install:
- export DOCKER_CLI_EXPERIMENTAL=enabled
script:
- - go run build/ci.go dockerx -platform "linux/amd64,linux/arm64" -upload ethereum/client-go
+ - go run build/ci.go dockerx -platform "linux/amd64,linux/arm64,linux/riscv64" -upload ethereum/client-go
# This builder does the Linux Azure uploads
- stage: build
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 465dad9741..835d2481e7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,28 @@
# Changelog
+## v1.5.2
+v1.5.2-alpha is another release for upstream code sync, it catches up with [go-ethereum release [v1.14.12]](https://github.com/ethereum/go-ethereum/releases/tag/v1.14.12) and supported 4 BEPs for BSC Pascal hard fork.
+- BEP-439: Implement EIP-2537: Precompile for BLS12-381 curve operations
+- BEP-440: Implement EIP-2935: Serve historical block hashes from state
+- BEP-441: Implement EIP-7702: Set EOA account code
+- BEP-466: Make the block format compatible with EIP-7685
+
+#### Code Sync
+- [upstream: merge geth v1.14.12](https://github.com/bnb-chain/bsc/pull/2791)
+- [upstream: merge geth date 1210](https://github.com/bnb-chain/bsc/pull/2799)
+- [upstream: merge geth date 1213](https://github.com/bnb-chain/bsc/pull/2806)
+
+#### Pascal BEPs
+- [BEP-441: Implement EIP-7702: Set EOA account code](https://github.com/bnb-chain/bsc/pull/2807)
+- [BEP-466: Make the block header format compatible with EIP-7685](https://github.com/bnb-chain/bsc/pull/2777)
+- Note: BEP-439 and BEP-440 have already been implemented in previous v1.5.1-alpha release
+
+#### Others
+- [eth/fetcher: remove light mode in block fetcher](https://github.com/bnb-chain/bsc/pull/2804)
+- [fix: Opt pruneancient issues](https://github.com/bnb-chain/bsc/pull/2800)
+- [build(deps): bump github.com/golang-jwt/jwt/v4 from 4.5.0 to 4.5.1](https://github.com/bnb-chain/bsc/pull/2788)
+- [build(deps): bump golang.org/x/crypto from 0.22.0 to 0.31.0](https://github.com/bnb-chain/bsc/pull/2797)
+- [misc: mini fix and clearup](https://github.com/bnb-chain/bsc/pull/2811)
+
## v1.5.1
v1.5.1-alpha is for upstream code sync, it catches up with[go-ethereum release [v1.13.15, v1.14.11]](https://github.com/ethereum/go-ethereum/releases)
diff --git a/README.md b/README.md
index 241e20a514..6b1562b204 100644
--- a/README.md
+++ b/README.md
@@ -139,15 +139,11 @@ Download latest chaindata snapshot from [here](https://github.com/bnb-chain/bsc-
#### 4. Start a full node
```shell
+## It will run with Path-Base Storage Scheme by default and enable inline state prune, keeping the latest 90000 blocks' history state.
./geth --config ./config.toml --datadir ./node --cache 8000 --rpc.allow-unprotected-txs --history.transactions 0
-## It is recommend to run fullnode with `--tries-verify-mode none` if you want high performance and care little about state consistency
-## It will run with Hash-Base Storage Scheme by default
+## It is recommend to run fullnode with `--tries-verify-mode none` if you want high performance and care little about state consistency.
./geth --config ./config.toml --datadir ./node --cache 8000 --rpc.allow-unprotected-txs --history.transactions 0 --tries-verify-mode none
-
-## It runs fullnode with Path-Base Storage Scheme.
-## It will enable inline state prune, keeping the latest 90000 blocks' history state by default.
-./geth --config ./config.toml --datadir ./node --cache 8000 --rpc.allow-unprotected-txs --history.transactions 0 --tries-verify-mode none --state.scheme path
```
#### 5. Monitor node status
diff --git a/accounts/abi/abi.go b/accounts/abi/abi.go
index c7bc2b4541..f75278c8b1 100644
--- a/accounts/abi/abi.go
+++ b/accounts/abi/abi.go
@@ -84,7 +84,7 @@ func (abi ABI) Pack(name string, args ...interface{}) ([]byte, error) {
func (abi ABI) getArguments(name string, data []byte) (Arguments, error) {
// since there can't be naming collisions with contracts and events,
- // we need to decide whether we're calling a method or an event
+ // we need to decide whether we're calling a method, event or an error
var args Arguments
if method, ok := abi.Methods[name]; ok {
if len(data)%32 != 0 {
@@ -95,8 +95,11 @@ func (abi ABI) getArguments(name string, data []byte) (Arguments, error) {
if event, ok := abi.Events[name]; ok {
args = event.Inputs
}
+ if err, ok := abi.Errors[name]; ok {
+ args = err.Inputs
+ }
if args == nil {
- return nil, fmt.Errorf("abi: could not locate named method or event: %s", name)
+ return nil, fmt.Errorf("abi: could not locate named method, event or error: %s", name)
}
return args, nil
}
diff --git a/accounts/abi/abi_test.go b/accounts/abi/abi_test.go
index dfcd059393..db9a4c55a5 100644
--- a/accounts/abi/abi_test.go
+++ b/accounts/abi/abi_test.go
@@ -29,6 +29,7 @@ import (
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/common/math"
"github.com/ethereum/go-ethereum/crypto"
+ "github.com/ethereum/go-ethereum/internal/testrand"
)
const jsondata = `
@@ -317,6 +318,38 @@ func TestCustomErrors(t *testing.T) {
check("MyError", "MyError(uint256)")
}
+func TestCustomErrorUnpackIntoInterface(t *testing.T) {
+ t.Parallel()
+ errorName := "MyError"
+ json := fmt.Sprintf(`[{"inputs":[{"internalType":"address","name":"sender","type":"address"},{"internalType":"uint256","name":"balance","type":"uint256"}],"name":"%s","type":"error"}]`, errorName)
+ abi, err := JSON(strings.NewReader(json))
+ if err != nil {
+ t.Fatal(err)
+ }
+ type MyError struct {
+ Sender common.Address
+ Balance *big.Int
+ }
+
+ sender := testrand.Address()
+ balance := new(big.Int).SetBytes(testrand.Bytes(8))
+ encoded, err := abi.Errors[errorName].Inputs.Pack(sender, balance)
+ if err != nil {
+ t.Fatal(err)
+ }
+ result := MyError{}
+ err = abi.UnpackIntoInterface(&result, errorName, encoded)
+ if err != nil {
+ t.Fatal(err)
+ }
+ if result.Sender != sender {
+ t.Errorf("expected %x got %x", sender, result.Sender)
+ }
+ if result.Balance.Cmp(balance) != 0 {
+ t.Errorf("expected %v got %v", balance, result.Balance)
+ }
+}
+
func TestMultiPack(t *testing.T) {
t.Parallel()
abi, err := JSON(strings.NewReader(jsondata))
@@ -1199,7 +1232,6 @@ func TestUnpackRevert(t *testing.T) {
{"4e487b7100000000000000000000000000000000000000000000000000000000000000ff", "unknown panic code: 0xff", nil},
}
for index, c := range cases {
- index, c := index, c
t.Run(fmt.Sprintf("case %d", index), func(t *testing.T) {
t.Parallel()
got, err := UnpackRevert(common.Hex2Bytes(c.input))
diff --git a/accounts/abi/bind/bind.go b/accounts/abi/bind/bind.go
index e902345f09..71357c7a8c 100644
--- a/accounts/abi/bind/bind.go
+++ b/accounts/abi/bind/bind.go
@@ -252,7 +252,7 @@ func Bind(types []string, abis []string, bytecodes []string, fsigs []map[string]
}
// Parse library references.
for pattern, name := range libs {
- matched, err := regexp.Match("__\\$"+pattern+"\\$__", []byte(contracts[types[i]].InputBin))
+ matched, err := regexp.MatchString("__\\$"+pattern+"\\$__", contracts[types[i]].InputBin)
if err != nil {
log.Error("Could not search for pattern", "pattern", pattern, "contract", contracts[types[i]], "err", err)
}
diff --git a/accounts/abi/event_test.go b/accounts/abi/event_test.go
index fffe28ea63..c548fd8db6 100644
--- a/accounts/abi/event_test.go
+++ b/accounts/abi/event_test.go
@@ -331,7 +331,6 @@ func TestEventTupleUnpack(t *testing.T) {
for _, tc := range testCases {
assert := assert.New(t)
- tc := tc
t.Run(tc.name, func(t *testing.T) {
err := unpackTestEventData(tc.dest, tc.data, tc.jsonLog, assert)
if tc.error == "" {
diff --git a/accounts/abi/pack_test.go b/accounts/abi/pack_test.go
index 00bdae469e..cda31b6204 100644
--- a/accounts/abi/pack_test.go
+++ b/accounts/abi/pack_test.go
@@ -34,7 +34,6 @@ import (
func TestPack(t *testing.T) {
t.Parallel()
for i, test := range packUnpackTests {
- i, test := i, test
t.Run(strconv.Itoa(i), func(t *testing.T) {
t.Parallel()
encb, err := hex.DecodeString(test.packed)
diff --git a/accounts/abi/reflect_test.go b/accounts/abi/reflect_test.go
index 6c7ae57087..577fa6ca71 100644
--- a/accounts/abi/reflect_test.go
+++ b/accounts/abi/reflect_test.go
@@ -172,7 +172,6 @@ var reflectTests = []reflectTest{
func TestReflectNameToStruct(t *testing.T) {
t.Parallel()
for _, test := range reflectTests {
- test := test
t.Run(test.name, func(t *testing.T) {
t.Parallel()
m, err := mapArgNamesToStructFields(test.args, reflect.ValueOf(test.struc))
diff --git a/accounts/abi/topics.go b/accounts/abi/topics.go
index 7ce9b7273c..4819334ae6 100644
--- a/accounts/abi/topics.go
+++ b/accounts/abi/topics.go
@@ -42,7 +42,7 @@ func MakeTopics(query ...[]interface{}) ([][]common.Hash, error) {
case common.Address:
copy(topic[common.HashLength-common.AddressLength:], rule[:])
case *big.Int:
- copy(topic[:], math.U256Bytes(rule))
+ copy(topic[:], math.U256Bytes(new(big.Int).Set(rule)))
case bool:
if rule {
topic[common.HashLength-1] = 1
diff --git a/accounts/abi/topics_test.go b/accounts/abi/topics_test.go
index 9e1efd3821..161867e2d9 100644
--- a/accounts/abi/topics_test.go
+++ b/accounts/abi/topics_test.go
@@ -137,7 +137,6 @@ func TestMakeTopics(t *testing.T) {
},
}
for _, tt := range tests {
- tt := tt
t.Run(tt.name, func(t *testing.T) {
t.Parallel()
got, err := MakeTopics(tt.args.query...)
@@ -150,6 +149,23 @@ func TestMakeTopics(t *testing.T) {
}
})
}
+
+ t.Run("does not mutate big.Int", func(t *testing.T) {
+ t.Parallel()
+ want := [][]common.Hash{{common.HexToHash("ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff")}}
+
+ in := big.NewInt(-1)
+ got, err := MakeTopics([]interface{}{in})
+ if err != nil {
+ t.Fatalf("makeTopics() error = %v", err)
+ }
+ if !reflect.DeepEqual(got, want) {
+ t.Fatalf("makeTopics() = %v, want %v", got, want)
+ }
+ if orig := big.NewInt(-1); in.Cmp(orig) != 0 {
+ t.Fatalf("makeTopics() mutated an input parameter from %v to %v", orig, in)
+ }
+ })
}
type args struct {
@@ -373,7 +389,6 @@ func TestParseTopics(t *testing.T) {
tests := setupTopicsTests()
for _, tt := range tests {
- tt := tt
t.Run(tt.name, func(t *testing.T) {
t.Parallel()
createObj := tt.args.createObj()
@@ -393,7 +408,6 @@ func TestParseTopicsIntoMap(t *testing.T) {
tests := setupTopicsTests()
for _, tt := range tests {
- tt := tt
t.Run(tt.name, func(t *testing.T) {
t.Parallel()
outMap := make(map[string]interface{})
diff --git a/accounts/abi/unpack_test.go b/accounts/abi/unpack_test.go
index 29891ec0a4..7df7b9c403 100644
--- a/accounts/abi/unpack_test.go
+++ b/accounts/abi/unpack_test.go
@@ -389,7 +389,6 @@ func TestMethodMultiReturn(t *testing.T) {
"Can not unpack into a slice with wrong types",
}}
for _, tc := range testCases {
- tc := tc
t.Run(tc.name, func(t *testing.T) {
require := require.New(t)
err := abi.UnpackIntoInterface(tc.dest, "multi", data)
@@ -947,7 +946,7 @@ func TestOOMMaliciousInput(t *testing.T) {
}
encb, err := hex.DecodeString(test.enc)
if err != nil {
- t.Fatalf("invalid hex: %s" + test.enc)
+ t.Fatalf("invalid hex: %s", test.enc)
}
_, err = abi.Methods["method"].Outputs.UnpackValues(encb)
if err == nil {
diff --git a/accounts/external/backend.go b/accounts/external/backend.go
index d2fcf5a3c9..76f69958de 100644
--- a/accounts/external/backend.go
+++ b/accounts/external/backend.go
@@ -215,7 +215,7 @@ func (api *ExternalSigner) SignTx(account accounts.Account, tx *types.Transactio
switch tx.Type() {
case types.LegacyTxType, types.AccessListTxType:
args.GasPrice = (*hexutil.Big)(tx.GasPrice())
- case types.DynamicFeeTxType, types.BlobTxType:
+ case types.DynamicFeeTxType, types.BlobTxType, types.SetCodeTxType:
args.MaxFeePerGas = (*hexutil.Big)(tx.GasFeeCap())
args.MaxPriorityFeePerGas = (*hexutil.Big)(tx.GasTipCap())
default:
diff --git a/accounts/usbwallet/ledger.go b/accounts/usbwallet/ledger.go
index 81836b3717..2be6edd44f 100644
--- a/accounts/usbwallet/ledger.go
+++ b/accounts/usbwallet/ledger.go
@@ -338,8 +338,22 @@ func (w *ledgerDriver) ledgerSign(derivationPath []uint32, tx *types.Transaction
return common.Address{}, nil, err
}
} else {
- if txrlp, err = rlp.EncodeToBytes([]interface{}{tx.Nonce(), tx.GasPrice(), tx.Gas(), tx.To(), tx.Value(), tx.Data(), chainID, big.NewInt(0), big.NewInt(0)}); err != nil {
- return common.Address{}, nil, err
+ if tx.Type() == types.DynamicFeeTxType {
+ if txrlp, err = rlp.EncodeToBytes([]interface{}{chainID, tx.Nonce(), tx.GasTipCap(), tx.GasFeeCap(), tx.Gas(), tx.To(), tx.Value(), tx.Data(), tx.AccessList()}); err != nil {
+ return common.Address{}, nil, err
+ }
+ // append type to transaction
+ txrlp = append([]byte{tx.Type()}, txrlp...)
+ } else if tx.Type() == types.AccessListTxType {
+ if txrlp, err = rlp.EncodeToBytes([]interface{}{chainID, tx.Nonce(), tx.GasPrice(), tx.Gas(), tx.To(), tx.Value(), tx.Data(), tx.AccessList()}); err != nil {
+ return common.Address{}, nil, err
+ }
+ // append type to transaction
+ txrlp = append([]byte{tx.Type()}, txrlp...)
+ } else if tx.Type() == types.LegacyTxType {
+ if txrlp, err = rlp.EncodeToBytes([]interface{}{tx.Nonce(), tx.GasPrice(), tx.Gas(), tx.To(), tx.Value(), tx.Data(), chainID, big.NewInt(0), big.NewInt(0)}); err != nil {
+ return common.Address{}, nil, err
+ }
}
}
payload := append(path, txrlp...)
@@ -353,7 +367,9 @@ func (w *ledgerDriver) ledgerSign(derivationPath []uint32, tx *types.Transaction
// Chunk size selection to mitigate an underlying RLP deserialization issue on the ledger app.
// https://github.com/LedgerHQ/app-ethereum/issues/409
chunk := 255
- for ; len(payload)%chunk <= ledgerEip155Size; chunk-- {
+ if tx.Type() == types.LegacyTxType {
+ for ; len(payload)%chunk <= ledgerEip155Size; chunk-- {
+ }
}
for len(payload) > 0 {
@@ -381,8 +397,11 @@ func (w *ledgerDriver) ledgerSign(derivationPath []uint32, tx *types.Transaction
if chainID == nil {
signer = new(types.HomesteadSigner)
} else {
- signer = types.NewEIP155Signer(chainID)
- signature[64] -= byte(chainID.Uint64()*2 + 35)
+ signer = types.LatestSignerForChainID(chainID)
+ // For non-legacy transactions, V is 0 or 1, no need to subtract here.
+ if tx.Type() == types.LegacyTxType {
+ signature[64] -= byte(chainID.Uint64()*2 + 35)
+ }
}
signed, err := tx.WithSignature(signer, signature)
if err != nil {
diff --git a/appveyor.yml b/appveyor.yml
index 92369537cd..1543211edc 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -24,7 +24,9 @@ for:
- image: Ubuntu
build_script:
- go run build/ci.go lint
- - go run build/ci.go generate -verify
+ - go run build/ci.go check_tidy
+ - go run build/ci.go check_generate
+ - go run build/ci.go check_baddeps
- go run build/ci.go install -dlgo
test_script:
- go run build/ci.go test -dlgo -short
diff --git a/beacon/engine/gen_ed.go b/beacon/engine/gen_ed.go
index b2eb1dc982..0ae5a3b8f1 100644
--- a/beacon/engine/gen_ed.go
+++ b/beacon/engine/gen_ed.go
@@ -34,7 +34,6 @@ func (e ExecutableData) MarshalJSON() ([]byte, error) {
Withdrawals []*types.Withdrawal `json:"withdrawals"`
BlobGasUsed *hexutil.Uint64 `json:"blobGasUsed"`
ExcessBlobGas *hexutil.Uint64 `json:"excessBlobGas"`
- Deposits types.Deposits `json:"depositRequests"`
ExecutionWitness *types.ExecutionWitness `json:"executionWitness,omitempty"`
}
var enc ExecutableData
@@ -60,7 +59,6 @@ func (e ExecutableData) MarshalJSON() ([]byte, error) {
enc.Withdrawals = e.Withdrawals
enc.BlobGasUsed = (*hexutil.Uint64)(e.BlobGasUsed)
enc.ExcessBlobGas = (*hexutil.Uint64)(e.ExcessBlobGas)
- enc.Deposits = e.Deposits
enc.ExecutionWitness = e.ExecutionWitness
return json.Marshal(&enc)
}
@@ -85,7 +83,6 @@ func (e *ExecutableData) UnmarshalJSON(input []byte) error {
Withdrawals []*types.Withdrawal `json:"withdrawals"`
BlobGasUsed *hexutil.Uint64 `json:"blobGasUsed"`
ExcessBlobGas *hexutil.Uint64 `json:"excessBlobGas"`
- Deposits *types.Deposits `json:"depositRequests"`
ExecutionWitness *types.ExecutionWitness `json:"executionWitness,omitempty"`
}
var dec ExecutableData
@@ -160,9 +157,6 @@ func (e *ExecutableData) UnmarshalJSON(input []byte) error {
if dec.ExcessBlobGas != nil {
e.ExcessBlobGas = (*uint64)(dec.ExcessBlobGas)
}
- if dec.Deposits != nil {
- e.Deposits = *dec.Deposits
- }
if dec.ExecutionWitness != nil {
e.ExecutionWitness = dec.ExecutionWitness
}
diff --git a/beacon/engine/gen_epe.go b/beacon/engine/gen_epe.go
index fa45d94c4c..deada06166 100644
--- a/beacon/engine/gen_epe.go
+++ b/beacon/engine/gen_epe.go
@@ -18,13 +18,20 @@ func (e ExecutionPayloadEnvelope) MarshalJSON() ([]byte, error) {
ExecutionPayload *ExecutableData `json:"executionPayload" gencodec:"required"`
BlockValue *hexutil.Big `json:"blockValue" gencodec:"required"`
BlobsBundle *BlobsBundleV1 `json:"blobsBundle"`
+ Requests []hexutil.Bytes `json:"executionRequests"`
Override bool `json:"shouldOverrideBuilder"`
- Witness *hexutil.Bytes `json:"witness"`
+ Witness *hexutil.Bytes `json:"witness,omitempty"`
}
var enc ExecutionPayloadEnvelope
enc.ExecutionPayload = e.ExecutionPayload
enc.BlockValue = (*hexutil.Big)(e.BlockValue)
enc.BlobsBundle = e.BlobsBundle
+ if e.Requests != nil {
+ enc.Requests = make([]hexutil.Bytes, len(e.Requests))
+ for k, v := range e.Requests {
+ enc.Requests[k] = v
+ }
+ }
enc.Override = e.Override
enc.Witness = e.Witness
return json.Marshal(&enc)
@@ -36,8 +43,9 @@ func (e *ExecutionPayloadEnvelope) UnmarshalJSON(input []byte) error {
ExecutionPayload *ExecutableData `json:"executionPayload" gencodec:"required"`
BlockValue *hexutil.Big `json:"blockValue" gencodec:"required"`
BlobsBundle *BlobsBundleV1 `json:"blobsBundle"`
+ Requests []hexutil.Bytes `json:"executionRequests"`
Override *bool `json:"shouldOverrideBuilder"`
- Witness *hexutil.Bytes `json:"witness"`
+ Witness *hexutil.Bytes `json:"witness,omitempty"`
}
var dec ExecutionPayloadEnvelope
if err := json.Unmarshal(input, &dec); err != nil {
@@ -54,6 +62,12 @@ func (e *ExecutionPayloadEnvelope) UnmarshalJSON(input []byte) error {
if dec.BlobsBundle != nil {
e.BlobsBundle = dec.BlobsBundle
}
+ if dec.Requests != nil {
+ e.Requests = make([][]byte, len(dec.Requests))
+ for k, v := range dec.Requests {
+ e.Requests[k] = v
+ }
+ }
if dec.Override != nil {
e.Override = *dec.Override
}
diff --git a/beacon/engine/types.go b/beacon/engine/types.go
index 93e2af8954..984090ef89 100644
--- a/beacon/engine/types.go
+++ b/beacon/engine/types.go
@@ -76,7 +76,6 @@ type ExecutableData struct {
Withdrawals []*types.Withdrawal `json:"withdrawals"`
BlobGasUsed *uint64 `json:"blobGasUsed"`
ExcessBlobGas *uint64 `json:"excessBlobGas"`
- Deposits types.Deposits `json:"depositRequests"`
ExecutionWitness *types.ExecutionWitness `json:"executionWitness,omitempty"`
}
@@ -108,8 +107,9 @@ type ExecutionPayloadEnvelope struct {
ExecutionPayload *ExecutableData `json:"executionPayload" gencodec:"required"`
BlockValue *big.Int `json:"blockValue" gencodec:"required"`
BlobsBundle *BlobsBundleV1 `json:"blobsBundle"`
+ Requests [][]byte `json:"executionRequests"`
Override bool `json:"shouldOverrideBuilder"`
- Witness *hexutil.Bytes `json:"witness"`
+ Witness *hexutil.Bytes `json:"witness,omitempty"`
}
type BlobsBundleV1 struct {
@@ -118,9 +118,15 @@ type BlobsBundleV1 struct {
Blobs []hexutil.Bytes `json:"blobs"`
}
+type BlobAndProofV1 struct {
+ Blob hexutil.Bytes `json:"blob"`
+ Proof hexutil.Bytes `json:"proof"`
+}
+
// JSON type overrides for ExecutionPayloadEnvelope.
type executionPayloadEnvelopeMarshaling struct {
BlockValue *hexutil.Big
+ Requests []hexutil.Bytes
}
type PayloadStatusV1 struct {
@@ -207,8 +213,8 @@ func decodeTransactions(enc [][]byte) ([]*types.Transaction, error) {
// 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 data.
-func ExecutableDataToBlock(data ExecutableData, versionedHashes []common.Hash, beaconRoot *common.Hash) (*types.Block, error) {
- block, err := ExecutableDataToBlockNoHash(data, versionedHashes, beaconRoot)
+func ExecutableDataToBlock(data ExecutableData, versionedHashes []common.Hash, beaconRoot *common.Hash, requests [][]byte) (*types.Block, error) {
+ block, err := ExecutableDataToBlockNoHash(data, versionedHashes, beaconRoot, requests)
if err != nil {
return nil, err
}
@@ -221,7 +227,7 @@ func ExecutableDataToBlock(data ExecutableData, versionedHashes []common.Hash, b
// ExecutableDataToBlockNoHash is analogous to ExecutableDataToBlock, but is used
// for stateless execution, so it skips checking if the executable data hashes to
// the requested hash (stateless has to *compute* the root hash, it's not given).
-func ExecutableDataToBlockNoHash(data ExecutableData, versionedHashes []common.Hash, beaconRoot *common.Hash) (*types.Block, error) {
+func ExecutableDataToBlockNoHash(data ExecutableData, versionedHashes []common.Hash, beaconRoot *common.Hash, requests [][]byte) (*types.Block, error) {
txs, err := decodeTransactions(data.Transactions)
if err != nil {
return nil, err
@@ -256,19 +262,13 @@ func ExecutableDataToBlockNoHash(data ExecutableData, versionedHashes []common.H
h := types.DeriveSha(types.Withdrawals(data.Withdrawals), trie.NewStackTrie(nil))
withdrawalsRoot = &h
}
- // Compute requestsHash if any requests are non-nil.
- var (
- requestsHash *common.Hash
- requests types.Requests
- )
- if data.Deposits != nil {
- requests = make(types.Requests, 0)
- for _, d := range data.Deposits {
- requests = append(requests, types.NewRequest(d))
- }
- h := types.DeriveSha(requests, trie.NewStackTrie(nil))
+
+ var requestsHash *common.Hash
+ if requests != nil {
+ h := types.CalcRequestsHash(requests)
requestsHash = &h
}
+
header := &types.Header{
ParentHash: data.ParentHash,
UncleHash: types.EmptyUncleHash,
@@ -292,14 +292,14 @@ func ExecutableDataToBlockNoHash(data ExecutableData, versionedHashes []common.H
RequestsHash: requestsHash,
}
return types.NewBlockWithHeader(header).
- WithBody(types.Body{Transactions: txs, Uncles: nil, Withdrawals: data.Withdrawals, Requests: requests}).
+ WithBody(types.Body{Transactions: txs, Uncles: nil, Withdrawals: data.Withdrawals}).
WithWitness(data.ExecutionWitness),
nil
}
// 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, sidecars types.BlobSidecars) *ExecutionPayloadEnvelope {
+func BlockToExecutableData(block *types.Block, fees *big.Int, sidecars []*types.BlobTxSidecar, requests [][]byte) *ExecutionPayloadEnvelope {
data := &ExecutableData{
BlockHash: block.Hash(),
ParentHash: block.ParentHash(),
@@ -320,6 +320,8 @@ func BlockToExecutableData(block *types.Block, fees *big.Int, sidecars types.Blo
ExcessBlobGas: block.ExcessBlobGas(),
ExecutionWitness: block.ExecutionWitness(),
}
+
+ // Add blobs.
bundle := BlobsBundleV1{
Commitments: make([]hexutil.Bytes, 0),
Blobs: make([]hexutil.Bytes, 0),
@@ -332,22 +334,13 @@ func BlockToExecutableData(block *types.Block, fees *big.Int, sidecars types.Blo
bundle.Proofs = append(bundle.Proofs, hexutil.Bytes(sidecar.Proofs[j][:]))
}
}
- setRequests(block.Requests(), data)
- return &ExecutionPayloadEnvelope{ExecutionPayload: data, BlockValue: fees, BlobsBundle: &bundle, Override: false}
-}
-// setRequests differentiates the different request types and
-// assigns them to the associated fields in ExecutableData.
-func setRequests(requests types.Requests, data *ExecutableData) {
- if requests != nil {
- // If requests is non-nil, it means deposits are available in block and we
- // should return an empty slice instead of nil if there are no deposits.
- data.Deposits = make(types.Deposits, 0)
- }
- for _, r := range requests {
- if d, ok := r.Inner().(*types.Deposit); ok {
- data.Deposits = append(data.Deposits, d)
- }
+ return &ExecutionPayloadEnvelope{
+ ExecutionPayload: data,
+ BlockValue: fees,
+ BlobsBundle: &bundle,
+ Requests: requests,
+ Override: false,
}
}
@@ -355,7 +348,6 @@ func setRequests(requests types.Requests, data *ExecutableData) {
type ExecutionPayloadBody struct {
TransactionData []hexutil.Bytes `json:"transactions"`
Withdrawals []*types.Withdrawal `json:"withdrawals"`
- Deposits types.Deposits `json:"depositRequests"`
}
// Client identifiers to support ClientVersionV1.
diff --git a/beacon/types/config.go b/beacon/params/config.go
similarity index 94%
rename from beacon/types/config.go
rename to beacon/params/config.go
index 7706e85f6c..be2a40f171 100644
--- a/beacon/types/config.go
+++ b/beacon/params/config.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 types
+package params
import (
"crypto/sha256"
@@ -39,81 +39,13 @@ const syncCommitteeDomain = 7
var knownForks = []string{"GENESIS", "ALTAIR", "BELLATRIX", "CAPELLA", "DENEB"}
-// 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
-
- // index in list of known forks or MaxInt if unknown
- knownIndex int
-
- // 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 {
- if f[i].Epoch != f[j].Epoch {
- return f[i].Epoch < f[j].Epoch
- }
- return f[i].knownIndex < f[j].knownIndex
+// ClientConfig contains beacon light client configuration.
+type ClientConfig struct {
+ ChainConfig
+ Apis []string
+ CustomHeader map[string]string
+ Threshold int
+ NoFilter bool
}
// ChainConfig contains the beacon chain configuration.
@@ -121,6 +53,7 @@ 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
+ Checkpoint common.Hash
}
// ForkAtEpoch returns the latest active fork at the given epoch.
@@ -202,3 +135,79 @@ func (c *ChainConfig) LoadForks(path string) error {
}
return nil
}
+
+// 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
+
+ // index in list of known forks or MaxInt if unknown
+ knownIndex int
+
+ // 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(epoch uint64, root common.Hash) (common.Hash, error) {
+ domain, err := f.domain(epoch)
+ if err != nil {
+ return common.Hash{}, err
+ }
+ var (
+ signingRoot common.Hash
+ hasher = sha256.New()
+ )
+ hasher.Write(root[:])
+ 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 {
+ if f[i].Epoch != f[j].Epoch {
+ return f[i].Epoch < f[j].Epoch
+ }
+ return f[i].knownIndex < f[j].knownIndex
+}
diff --git a/beacon/params/networks.go b/beacon/params/networks.go
new file mode 100644
index 0000000000..5b00b27953
--- /dev/null
+++ b/beacon/params/networks.go
@@ -0,0 +1,56 @@
+// Copyright 2016 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 params
+
+import (
+ "github.com/ethereum/go-ethereum/common"
+)
+
+var (
+ MainnetLightConfig = (&ChainConfig{
+ GenesisValidatorsRoot: common.HexToHash("0x4b363db94e286120d76eb905340fdd4e54bfe9f06bf33ff6cf5ad27f511bfe95"),
+ GenesisTime: 1606824023,
+ Checkpoint: common.HexToHash("0x6509b691f4de4f7b083f2784938fd52f0e131675432b3fd85ea549af9aebd3d0"),
+ }).
+ AddFork("GENESIS", 0, []byte{0, 0, 0, 0}).
+ AddFork("ALTAIR", 74240, []byte{1, 0, 0, 0}).
+ AddFork("BELLATRIX", 144896, []byte{2, 0, 0, 0}).
+ AddFork("CAPELLA", 194048, []byte{3, 0, 0, 0}).
+ AddFork("DENEB", 269568, []byte{4, 0, 0, 0})
+
+ SepoliaLightConfig = (&ChainConfig{
+ GenesisValidatorsRoot: common.HexToHash("0xd8ea171f3c94aea21ebc42a1ed61052acf3f9209c00e4efbaaddac09ed9b8078"),
+ GenesisTime: 1655733600,
+ Checkpoint: common.HexToHash("0x456e85f5608afab3465a0580bff8572255f6d97af0c5f939e3f7536b5edb2d3f"),
+ }).
+ AddFork("GENESIS", 0, []byte{144, 0, 0, 105}).
+ AddFork("ALTAIR", 50, []byte{144, 0, 0, 112}).
+ AddFork("BELLATRIX", 100, []byte{144, 0, 0, 113}).
+ AddFork("CAPELLA", 56832, []byte{144, 0, 0, 114}).
+ AddFork("DENEB", 132608, []byte{144, 0, 0, 115})
+
+ HoleskyLightConfig = (&ChainConfig{
+ GenesisValidatorsRoot: common.HexToHash("0x9143aa7c615a7f7115e2b6aac319c03529df8242ae705fba9df39b79c59fa8b1"),
+ GenesisTime: 1695902400,
+ Checkpoint: common.HexToHash("0x6456a1317f54d4b4f2cb5bc9d153b5af0988fe767ef0609f0236cf29030bcff7"),
+ }).
+ AddFork("GENESIS", 0, []byte{1, 1, 112, 0}).
+ AddFork("ALTAIR", 0, []byte{2, 1, 112, 0}).
+ AddFork("BELLATRIX", 0, []byte{3, 1, 112, 0}).
+ AddFork("CAPELLA", 256, []byte{4, 1, 112, 0}).
+ AddFork("DENEB", 29696, []byte{5, 1, 112, 0})
+)
diff --git a/build/checksums.txt b/build/checksums.txt
index 06de819c70..b8061c9244 100644
--- a/build/checksums.txt
+++ b/build/checksums.txt
@@ -5,88 +5,88 @@
# https://github.com/ethereum/execution-spec-tests/releases/download/v2.1.0/
ca89c76851b0900bfcc3cbb9a26cbece1f3d7c64a3bed38723e914713290df6c fixtures_develop.tar.gz
-# version:golang 1.23.1
+# version:golang 1.23.4
# https://go.dev/dl/
-6ee44e298379d146a5e5aa6b1c5b5d5f5d0a3365eabdd70741e6e21340ec3b0d go1.23.1.src.tar.gz
-f17f2791717c15728ec63213a014e244c35f9c8846fb29f5a1b63d0c0556f756 go1.23.1.aix-ppc64.tar.gz
-dd9e772686ed908bcff94b6144322d4e2473a7dcd7c696b7e8b6d12f23c887fd go1.23.1.darwin-amd64.pkg
-488d9e4ca3e3ed513ee4edd91bef3a2360c65fa6d6be59cf79640bf840130a58 go1.23.1.darwin-amd64.tar.gz
-be34b488157ec69d94e26e1554558219a2c90789bcb7e3686965a7f9c8cfcbe7 go1.23.1.darwin-arm64.pkg
-e223795ca340e285a760a6446ce57a74500b30e57469a4109961d36184d3c05a go1.23.1.darwin-arm64.tar.gz
-6af626176923a6ae6c5de6dc1c864f38365793c0e4ecd0d6eab847bdc23953e5 go1.23.1.dragonfly-amd64.tar.gz
-cc957c1a019702e6cdc2e257202d42799011ebc1968b6c3bcd6b1965952607d5 go1.23.1.freebsd-386.tar.gz
-a7d57781c50bb80886a8f04066791956d45aa3eea0f83070c5268b6223afb2ff go1.23.1.freebsd-amd64.tar.gz
-c7b09f3fef456048e596db9bea746eb66796aeb82885622b0388feee18f36a3e go1.23.1.freebsd-arm.tar.gz
-b05cd6a77995a0c8439d88df124811c725fb78b942d0b6dd1643529d7ba62f1f go1.23.1.freebsd-arm64.tar.gz
-56236ae70be1613f2915943b94f53c96be5bffc0719314078facd778a89bc57e go1.23.1.freebsd-riscv64.tar.gz
-8644c52df4e831202114fd67c9fcaf1f7233ad27bf945ac53fa7217cf1a0349f go1.23.1.illumos-amd64.tar.gz
-cdee2f4e2efa001f7ee75c90f2efc310b63346cfbba7b549987e9139527c6b17 go1.23.1.linux-386.tar.gz
-49bbb517cfa9eee677e1e7897f7cf9cfdbcf49e05f61984a2789136de359f9bd go1.23.1.linux-amd64.tar.gz
-faec7f7f8ae53fda0f3d408f52182d942cc89ef5b7d3d9f23ff117437d4b2d2f go1.23.1.linux-arm64.tar.gz
-6c7832c7dcd8fb6d4eb308f672a725393403c74ee7be1aeccd8a443015df99de go1.23.1.linux-armv6l.tar.gz
-649ce3856ddc808c00b14a46232eab0bf95e7911cdf497010b17d76656f5ca4e go1.23.1.linux-loong64.tar.gz
-201911048f234e5a0c51ec94b1a11d4e47062fee4398b1d2faa6c820dc026724 go1.23.1.linux-mips.tar.gz
-2bce3743df463915e45d2612f9476ffb03d0b3750b1cb3879347de08715b5fc6 go1.23.1.linux-mips64.tar.gz
-54e301f266e33431b0703136e0bbd4cf02461b1ecedd37b7cbd90cb862a98e5f go1.23.1.linux-mips64le.tar.gz
-8efd495e93d17408c0803595cdc3bf13cb28e0f957aeabd9cc18245fb8e64019 go1.23.1.linux-mipsle.tar.gz
-52bd68689095831ad9af7160844c23b28bb8d0acd268de7e300ff5f0662b7a07 go1.23.1.linux-ppc64.tar.gz
-042888cae54b5fbfd9dd1e3b6bc4a5134879777fe6497fc4c62ec394b5ecf2da go1.23.1.linux-ppc64le.tar.gz
-1a4a609f0391bea202d9095453cbfaf7368fa88a04c206bf9dd715a738664dc3 go1.23.1.linux-riscv64.tar.gz
-47dc49ad45c45e192efa0df7dc7bc5403f5f2d15b5d0dc74ef3018154b616f4d go1.23.1.linux-s390x.tar.gz
-fbfbd5efa6a5d581ea7f5e65015f927db0e52135cab057e43d39d5482da54b61 go1.23.1.netbsd-386.tar.gz
-e96e1cc5cf36113ee6099d1a7306b22cd9c3f975a36bdff954c59f104f22b853 go1.23.1.netbsd-amd64.tar.gz
-c394dfc06bfc276a591209a37e09cd39089ec9a9cc3db30b94814ce2e39eb1d4 go1.23.1.netbsd-arm.tar.gz
-b3b35d64f32821a68b3e2994032dbefb81978f2ec3f218c7a770623b82d36b8e go1.23.1.netbsd-arm64.tar.gz
-3c775c4c16c182e33c2c4ac090d9a247a93b3fb18a3df01d87d490f29599faff go1.23.1.openbsd-386.tar.gz
-5edbe53b47c57b32707fd7154536fbe9eaa79053fea01650c93b54cdba13fc0f go1.23.1.openbsd-amd64.tar.gz
-c30903dd8fa98b8aca8e9db0962ce9f55502aed93e0ef41e5ae148aaa0088de1 go1.23.1.openbsd-arm.tar.gz
-12da183489e58f9c6b357bc1b626f85ed7d4220cab31a49d6a49e6ac6a718b67 go1.23.1.openbsd-arm64.tar.gz
-9cc9aad37696a4a10c31dcec9e35a308de0b369dad354d54cf07406ac6fa7c6f go1.23.1.openbsd-ppc64.tar.gz
-e1d740dda062ce5a276a0c3ed7d8b6353238bc8ff405f63e2e3480bfd26a5ec5 go1.23.1.openbsd-riscv64.tar.gz
-da2a37f9987f01f096859230aa13ecc4ad2e7884465bce91004bc78c64435d65 go1.23.1.plan9-386.tar.gz
-fd8fff8b0697d55c4a4d02a8dc998192b80a9dc2a057647373d6ff607cad29de go1.23.1.plan9-amd64.tar.gz
-52efbc5804c1c86ba7868aa8ebbc31cc8c2a27b62a60fd57944970d48fc67525 go1.23.1.plan9-arm.tar.gz
-f54205f21e2143f2ada1bf1c00ddf64590f5139d5c3fb77cc06175f0d8cc7567 go1.23.1.solaris-amd64.tar.gz
-369a17f0cfd29e5c848e58ffe0d772da20abe334d1c7ca01dbcd55bb3db0b440 go1.23.1.windows-386.msi
-ab866f47d7be56e6b1c67f1d529bf4c23331a339fb0785f435a0552d352cb257 go1.23.1.windows-386.zip
-e99dac215ee437b9bb8f8b14bbfe0e8756882c1ed291f30818e8363bc9c047a5 go1.23.1.windows-amd64.msi
-32dedf277c86610e380e1765593edb66876f00223df71690bd6be68ee17675c0 go1.23.1.windows-amd64.zip
-23169c79dc6b54e0dffb25be6b67425ad9759392a58309bc057430a9bf4c8f6a go1.23.1.windows-arm.msi
-1a57615a09f13534f88e9f2d7efd5743535d1a5719b19e520eef965a634f8efb go1.23.1.windows-arm.zip
-313e1a543931ad8735b4df8969e00f5f4c2ef07be21f54015ede961a70263d35 go1.23.1.windows-arm64.msi
-64ad0954d2c33f556fb1018d62de091254aa6e3a94f1c8a8b16af0d3701d194e go1.23.1.windows-arm64.zip
+ad345ac421e90814293a9699cca19dd5238251c3f687980bbcae28495b263531 go1.23.4.src.tar.gz
+459a09504f7ebf2cbcee6ac282c8f34f97651217b1feae64557dcdd392b9bb62 go1.23.4.aix-ppc64.tar.gz
+0f4e569b2d38cb75cb2efcaf56beb42778ab5e46d89318fef39060fe36d7b9b7 go1.23.4.darwin-amd64.pkg
+6700067389a53a1607d30aa8d6e01d198230397029faa0b109e89bc871ab5a0e go1.23.4.darwin-amd64.tar.gz
+19c054eaf40c5fac65b027f7443c01382e493d3c8c42cf8b2504832ebddce037 go1.23.4.darwin-arm64.pkg
+87d2bb0ad4fe24d2a0685a55df321e0efe4296419a9b3de03369dbe60b8acd3a go1.23.4.darwin-arm64.tar.gz
+5e73dc89b44626677ec9d9aa4257d6d2ef1245502bc36a99385284910d0ade0a go1.23.4.dragonfly-amd64.tar.gz
+8df26b1e71234756c1f0e82cfffba3f427c5a91a251844ada2c7694a6986c546 go1.23.4.freebsd-386.tar.gz
+7de078d94d2af50ee9506ef7df85e4d12d4018b23e0b2cbcbc61d686f549b41a go1.23.4.freebsd-amd64.tar.gz
+3f23e0a01cfe24e4160124cd7ab02bdd188264652074abdbce401c93f41e58a4 go1.23.4.freebsd-arm.tar.gz
+986a20e7c94431f03b44b3c415abc698c7b4edc2ae8431f7ecae1c2429d4cfa2 go1.23.4.freebsd-arm64.tar.gz
+25e39f005f977778ce963fc43089510fe7514f3cfc0358eab584de4ce9f181fb go1.23.4.freebsd-riscv64.tar.gz
+7e1d52f93da68c3bab39e3d83f89944d7d151208e54fdc30b0eda2a3812661d7 go1.23.4.illumos-amd64.tar.gz
+4a4a0e7587ef8c8a326439b957027f2791795e2d29d4ae3885b4091a48f843bc go1.23.4.linux-386.tar.gz
+6924efde5de86fe277676e929dc9917d466efa02fb934197bc2eba35d5680971 go1.23.4.linux-amd64.tar.gz
+16e5017863a7f6071363782b1b8042eb12c6ca4f4cd71528b2123f0a1275b13e go1.23.4.linux-arm64.tar.gz
+1f1dda0dc7ce0b2295f57258ec5ef0803fd31b9ed0aa20e2e9222334e5755de1 go1.23.4.linux-armv6l.tar.gz
+4f469179a335a1a7bb9f991ad0c567f3d3eeb9b412ecd192206ab5c3e1a52b5a go1.23.4.linux-loong64.tar.gz
+86b68185bcc43ea07190e95137c3442f062acc7ae10c3f1cf900fbe23e07df24 go1.23.4.linux-mips.tar.gz
+3a19245eec76533b3d01c90f3a40a38d63684028f0fd54d442dc9a9d03197891 go1.23.4.linux-mips64.tar.gz
+b53a06fc8455f6a875329e8d2e24d39db298122c9cce6e948117022191f6c613 go1.23.4.linux-mips64le.tar.gz
+66120a8105b8ba6559f4e6a13b1e39b433fb8032df9d1744e4486876fa1723ce go1.23.4.linux-mipsle.tar.gz
+33be2bfb27f2821a65e9f6aba744c85ea7c5e233e16bac27bb3ec253bcd4e970 go1.23.4.linux-ppc64.tar.gz
+65a303ef51e48ff77e004a6a5b4db6ce59495cd59c6af51b54bf4f786c01a1b9 go1.23.4.linux-ppc64le.tar.gz
+7c40e9e0d722cef14ede765159ba297f4c6e3093bb106f10fbccf8564780049a go1.23.4.linux-riscv64.tar.gz
+74aab82bf4eca7c26c830a5b0e2a31d193a4d5ba47045526b92473cc7188d7d7 go1.23.4.linux-s390x.tar.gz
+dba009d8bf9928cb5a1e31fcbe0eb41335cce4fe63755d95cef6b5987df4ed5a go1.23.4.netbsd-386.tar.gz
+54b081cc36355aa5ecb6db9544cf7e77366a7b08ce96cb98a45d043e393660c7 go1.23.4.netbsd-amd64.tar.gz
+f05fec348c7c9f07e1ad4e436db4122e98de99ebcfbf6ac6176869785f334a02 go1.23.4.netbsd-arm.tar.gz
+317878da2bface5a57a8eaf5c1fe2b40b1c82d8172a10453ad3eea36f6946bdb go1.23.4.netbsd-arm64.tar.gz
+0d84350dfd72c505c6ad474e51676b04e95ffb748c614bd5bf8510026873059b go1.23.4.openbsd-386.tar.gz
+cc62f5a14ea3d573d8edbce1833f70a8f99ca048a9db0fcc9e738fd48e950505 go1.23.4.openbsd-amd64.tar.gz
+326aba6cf5bb9348fa3e41217abd2c84eac92608684e2fe8c5474fdab23a0db9 go1.23.4.openbsd-arm.tar.gz
+51ea2a2588bf3da8e1476f3e2bd4d6724d74126e99f9c6ea9af4ebe389e64de6 go1.23.4.openbsd-arm64.tar.gz
+44c5c82ab23e40225b2ba1e7d19150a5973ea58e93b4931e426e6e6f0d108872 go1.23.4.openbsd-ppc64.tar.gz
+5fa31fc13d1e3c123a5e96ba38683fa2c947baed23ac9c7c341afcfe007c8993 go1.23.4.openbsd-riscv64.tar.gz
+e5952fc93eeaa0094ef09a0e72a9f06f0621ce841a39f9637fb5b9062e77d67a go1.23.4.plan9-386.tar.gz
+fb2a9ee3ae5a77e734862e257a9395b43e707ac45e060dfa84c5a40688e73170 go1.23.4.plan9-amd64.tar.gz
+e1b95563b19fdebd6ea0d20c07641e69580976fa754e586c831ad7a3ae987140 go1.23.4.plan9-arm.tar.gz
+088c282509fc9e1a8f29fc0dd16fe486854d05b8ceba08d077d17d11d6979a41 go1.23.4.solaris-amd64.tar.gz
+e5865c1bfc3fee5d003819b2e2c800f598fe9994931bac63f573e8d05a10d91f go1.23.4.windows-386.msi
+e544e0e356147ba998e267002bd0f2c4bf3370d495467a55baf2c63595a2026d go1.23.4.windows-386.zip
+5f8cc5991eb8f4f96b6c611d839453cd11c9a2c3f23672a4188342c97ee159fa go1.23.4.windows-amd64.msi
+16c59ac9196b63afb872ce9b47f945b9821a3e1542ec125f16f6085a1c0f3c39 go1.23.4.windows-amd64.zip
+fc77c0531406d092c5356167e45c05a22d16bea84e3fa555e0f03af085c11763 go1.23.4.windows-arm.msi
+1012cfd8ca7241c2beecb5c345dd61f01897c6f6baca80ea1bfed357035c868a go1.23.4.windows-arm.zip
+8347c1aa4e1e67954d12830f88dbe44bd7ac0ec134bb472783dbfb5a3a8865d0 go1.23.4.windows-arm64.msi
+db69cae5006753c785345c3215ad941f8b6224e2f81fec471c42d6857bee0e6f go1.23.4.windows-arm64.zip
-# version:golangci 1.59.0
+# version:golangci 1.61.0
# https://github.com/golangci/golangci-lint/releases/
-# https://github.com/golangci/golangci-lint/releases/download/v1.59.0/
-418acf7e255ddc0783e97129c9b03d9311b77826a5311d425a01c708a86417e7 golangci-lint-1.59.0-darwin-amd64.tar.gz
-5f6a1d95a6dd69f6e328eb56dd311a38e04cfab79a1305fbf4957f4e203f47b6 golangci-lint-1.59.0-darwin-arm64.tar.gz
-8899bf589185d49f747f3e5db9f0bde8a47245a100c64a3dd4d65e8e92cfc4f2 golangci-lint-1.59.0-freebsd-386.tar.gz
-658212f138d9df2ac89427e22115af34bf387c0871d70f2a25101718946a014f golangci-lint-1.59.0-freebsd-amd64.tar.gz
-4c6395ea40f314d3b6fa17d8997baab93464d5d1deeaab513155e625473bd03a golangci-lint-1.59.0-freebsd-armv6.tar.gz
-ff37da4fbaacdb6bbae70fdbdbb1ba932a859956f788c82822fa06bef5b7c6b3 golangci-lint-1.59.0-freebsd-armv7.tar.gz
-439739469ed2bda182b1ec276d40c40e02f195537f78e3672996741ad223d6b6 golangci-lint-1.59.0-illumos-amd64.tar.gz
-940801d46790e40d0a097d8fee34e2606f0ef148cd039654029b0b8750a15ed6 golangci-lint-1.59.0-linux-386.tar.gz
-3b14a439f33c4fff83dbe0349950d984042b9a1feb6c62f82787b598fc3ab5f4 golangci-lint-1.59.0-linux-amd64.tar.gz
-c57e6c0b0fa03089a2611dceddd5bc5d206716cccdff8b149da8baac598719a1 golangci-lint-1.59.0-linux-arm64.tar.gz
-93149e2d3b25ac754df9a23172403d8aa6d021a7e0d9c090a12f51897f68c9a0 golangci-lint-1.59.0-linux-armv6.tar.gz
-d10ac38239d9efee3ee87b55c96cdf3fa09e1a525babe3ffdaaf65ccc48cf3dc golangci-lint-1.59.0-linux-armv7.tar.gz
-047338114b4f0d5f08f0fb9a397b03cc171916ed0960be7dfb355c2320cd5e9c golangci-lint-1.59.0-linux-loong64.tar.gz
-5632df0f7f8fc03a80a266130faef0b5902d280cf60621f1b2bdc1aef6d97ee9 golangci-lint-1.59.0-linux-mips64.tar.gz
-71dd638c82fa4439171e7126d2c7a32b5d103bfdef282cea40c83632cb3d1f4b golangci-lint-1.59.0-linux-mips64le.tar.gz
-6cf9ea0d34e91669948483f9ae7f07da319a879344373a1981099fbd890cde00 golangci-lint-1.59.0-linux-ppc64le.tar.gz
-af0205fa6fbab197cee613c359947711231739095d21b5c837086233b36ad971 golangci-lint-1.59.0-linux-riscv64.tar.gz
-a9d2fb93f3c688ebccef94f5dc96c0b07c4d20bf6556cddebd8442159b0c80f6 golangci-lint-1.59.0-linux-s390x.tar.gz
-68ab4c57a847b8ace9679887f2f8b2b6760e57ee29dcde8c3f40dd8bb2654fa2 golangci-lint-1.59.0-netbsd-386.tar.gz
-d277b8b435c19406d00de4d509eadf5a024a5782878332e9a1b7c02bb76e87a7 golangci-lint-1.59.0-netbsd-amd64.tar.gz
-83211656be8dcfa1545af4f92894409f412d1f37566798cb9460a526593ad62c golangci-lint-1.59.0-netbsd-arm64.tar.gz
-6c6866d28bf79fa9817a0f7d2b050890ed109cae80bdb4dfa39536a7226da237 golangci-lint-1.59.0-netbsd-armv6.tar.gz
-11587566363bd03ca586b7df9776ccaed569fcd1f3489930ac02f9375b307503 golangci-lint-1.59.0-netbsd-armv7.tar.gz
-466181a8967bafa495e41494f93a0bec829c2cf715de874583b0460b3b8ae2b8 golangci-lint-1.59.0-windows-386.zip
-3317d8a87a99a49a0a1321d295c010790e6dbf43ee96b318f4b8bb23eae7a565 golangci-lint-1.59.0-windows-amd64.zip
-b3af955c7fceac8220a36fc799e1b3f19d3b247d32f422caac5f9845df8f7316 golangci-lint-1.59.0-windows-arm64.zip
-6f083c7d0c764e5a0e5bde46ee3e91ae357d80c194190fe1d9754392e9064c7e golangci-lint-1.59.0-windows-armv6.zip
-3709b4dd425deadab27748778d08e03c0f804d7748f7dd5b6bb488d98aa031c7 golangci-lint-1.59.0-windows-armv7.zip
+# https://github.com/golangci/golangci-lint/releases/download/v1.61.0/
+5c280ef3284f80c54fd90d73dc39ca276953949da1db03eb9dd0fbf868cc6e55 golangci-lint-1.61.0-darwin-amd64.tar.gz
+544334890701e4e04a6e574bc010bea8945205c08c44cced73745a6378012d36 golangci-lint-1.61.0-darwin-arm64.tar.gz
+e885a6f561092055930ebd298914d80e8fd2e10d2b1e9942836c2c6a115301fa golangci-lint-1.61.0-freebsd-386.tar.gz
+b13f6a3f11f65e7ff66b734d7554df3bbae0f485768848424e7554ed289e19c2 golangci-lint-1.61.0-freebsd-amd64.tar.gz
+cd8e7bbe5b8f33ed1597aa1cc588da96a3b9f22e1b9ae60d93511eae1a0ee8c5 golangci-lint-1.61.0-freebsd-armv6.tar.gz
+7ade524dbd88bd250968f45e190af90e151fa5ee63dd6aa7f7bb90e8155db61d golangci-lint-1.61.0-freebsd-armv7.tar.gz
+0fe3cd8a1ed8d9f54f48670a5af3df056d6040d94017057f0f4d65c930660ad9 golangci-lint-1.61.0-illumos-amd64.tar.gz
+b463fc5053a612abd26393ebaff1d85d7d56058946f4f0f7bf25ed44ea899415 golangci-lint-1.61.0-linux-386.tar.gz
+77cb0af99379d9a21d5dc8c38364d060e864a01bd2f3e30b5e8cc550c3a54111 golangci-lint-1.61.0-linux-amd64.tar.gz
+af60ac05566d9351615cb31b4cc070185c25bf8cbd9b09c1873aa5ec6f3cc17e golangci-lint-1.61.0-linux-arm64.tar.gz
+1f307f2fcc5d7d674062a967a0d83a7091e300529aa237ec6ad2b3dd14c897f5 golangci-lint-1.61.0-linux-armv6.tar.gz
+3ad8cbaae75a547450844811300f99c4cd290277398e43d22b9eb1792d15af4c golangci-lint-1.61.0-linux-armv7.tar.gz
+9be2ca67d961d7699079739cf6f7c8291c5183d57e34d1677de21ca19d0bd3ed golangci-lint-1.61.0-linux-loong64.tar.gz
+90d005e1648115ebf0861b408eab9c936079a24763e883058b0a227cd3135d31 golangci-lint-1.61.0-linux-mips64.tar.gz
+6d2ed4f49407115460b8c10ccfc40fd177e0887a48864a2879dd16e84ba2a48c golangci-lint-1.61.0-linux-mips64le.tar.gz
+633089589af5a58b7430afb6eee107d4e9c99e8d91711ddc219eb13a07e8d3b8 golangci-lint-1.61.0-linux-ppc64le.tar.gz
+4c1a097d9e0d1b4a8144dae6a1f5583a38d662f3bdc1498c4e954b6ed856be98 golangci-lint-1.61.0-linux-riscv64.tar.gz
+30581d3c987d287b7064617f1a2694143e10dffc40bc25be6636006ee82d7e1c golangci-lint-1.61.0-linux-s390x.tar.gz
+42530bf8100bd43c07f5efe6d92148ba6c5a7a712d510c6f24be85af6571d5eb golangci-lint-1.61.0-netbsd-386.tar.gz
+b8bb07c920f6601edf718d5e82ec0784fd590b0992b42b6ec18da99f26013ed4 golangci-lint-1.61.0-netbsd-amd64.tar.gz
+353a51527c60bd0776b0891b03f247c791986f625fca689d121972c624e54198 golangci-lint-1.61.0-netbsd-arm64.tar.gz
+957a6272c3137910514225704c5dac0723b9c65eb7d9587366a997736e2d7580 golangci-lint-1.61.0-netbsd-armv6.tar.gz
+a89eb28ff7f18f5cd52b914739360fa95cf2f643de4adeca46e26bec3a07e8d8 golangci-lint-1.61.0-netbsd-armv7.tar.gz
+d8d74c43600b271393000717a4ed157d7a15bb85bab7db2efad9b63a694d4634 golangci-lint-1.61.0-windows-386.zip
+e7bc2a81929a50f830244d6d2e657cce4f19a59aff49fa9000176ff34fda64ce golangci-lint-1.61.0-windows-amd64.zip
+ed97c221596dd771e3dd9344872c140340bee2e819cd7a90afa1de752f1f2e0f golangci-lint-1.61.0-windows-arm64.zip
+4b365233948b13d02d45928a5c390045e00945e919747b9887b5f260247541ae golangci-lint-1.61.0-windows-armv6.zip
+595538fb64d152173959d28f6235227f9cd969a828e5af0c4e960d02af4ffd0e golangci-lint-1.61.0-windows-armv7.zip
# This is the builder on PPA that will build Go itself (inception-y), don't modify!
#
diff --git a/build/ci.go b/build/ci.go
index c78e330823..929a45ea4a 100644
--- a/build/ci.go
+++ b/build/ci.go
@@ -24,9 +24,14 @@ Usage: go run build/ci.go
Available commands are:
- install [ -arch architecture ] [ -cc compiler ] [ packages... ] -- builds packages and executables
- test [ -coverage ] [ packages... ] -- runs the tests
- lint -- runs certain pre-selected linters
+ lint -- runs certain pre-selected linters
+ check_tidy -- verifies that everything is 'go mod tidy'-ed
+ check_generate -- verifies that everything is 'go generate'-ed
+ check_baddeps -- verifies that certain dependencies are avoided
+
+ install [ -arch architecture ] [ -cc compiler ] [ packages... ] -- builds packages and executables
+ test [ -coverage ] [ packages... ] -- runs the tests
+
archive [ -arch architecture ] [ -type zip|tar ] [ -signer key-envvar ] [ -signify key-envvar ] [ -upload dest ] -- archives build artifacts
importkeys -- imports signing keys from env
debsrc [ -signer key-id ] [ -upload dest ] -- creates a debian source package
@@ -39,25 +44,23 @@ package main
import (
"bytes"
- "crypto/sha256"
"encoding/base64"
"flag"
"fmt"
- "io"
"log"
"os"
"os/exec"
"path"
"path/filepath"
"runtime"
+ "slices"
"strings"
"time"
"github.com/cespare/cp"
- "github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/crypto/signify"
"github.com/ethereum/go-ethereum/internal/build"
- "github.com/ethereum/go-ethereum/params"
+ "github.com/ethereum/go-ethereum/internal/version"
)
var (
@@ -109,7 +112,7 @@ var (
// A debian package is created for all executables listed here.
debEthereum = debPackage{
Name: "ethereum",
- Version: params.Version,
+ Version: version.Semantic,
Executables: debExecutables,
}
@@ -120,11 +123,12 @@ var (
// Distros for which packages are created
debDistros = []string{
- "xenial", // 16.04, EOL: 04/2026
- "bionic", // 18.04, EOL: 04/2028
- "focal", // 20.04, EOL: 04/2030
- "jammy", // 22.04, EOL: 04/2032
- "noble", // 24.04, EOL: 04/2034
+ "xenial", // 16.04, EOL: 04/2026
+ "bionic", // 18.04, EOL: 04/2028
+ "focal", // 20.04, EOL: 04/2030
+ "jammy", // 22.04, EOL: 04/2032
+ "noble", // 24.04, EOL: 04/2034
+ "oracular", // 24.10, EOL: 07/2025
}
// This is where the tests should be unpacked.
@@ -143,7 +147,7 @@ func executablePath(name string) string {
func main() {
log.SetFlags(log.Lshortfile)
- if !common.FileExist(filepath.Join("build", "ci.go")) {
+ if !build.FileExist(filepath.Join("build", "ci.go")) {
log.Fatal("this script must be run from the root of the repository")
}
if len(os.Args) < 2 {
@@ -156,6 +160,12 @@ func main() {
doTest(os.Args[2:])
case "lint":
doLint(os.Args[2:])
+ case "check_tidy":
+ doCheckTidy()
+ case "check_generate":
+ doCheckGenerate()
+ case "check_baddeps":
+ doCheckBadDeps()
case "archive":
doArchive(os.Args[2:])
case "dockerx":
@@ -168,8 +178,6 @@ func main() {
doPurge(os.Args[2:])
case "sanitycheck":
doSanityCheck()
- case "generate":
- doGenerate()
default:
log.Fatal("unknown command ", os.Args[1])
}
@@ -205,12 +213,6 @@ func doInstall(cmdline []string) {
// Configure the build.
gobuild := tc.Go("build", buildFlags(env, *staticlink, buildTags)...)
- // arm64 CI builders are memory-constrained and can't handle concurrent builds,
- // better disable it. This check isn't the best, it should probably
- // check for something in env instead.
- 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")
@@ -226,8 +228,7 @@ func doInstall(cmdline []string) {
// Do the build!
for _, pkg := range packages {
- args := make([]string, len(gobuild.Args))
- copy(args, gobuild.Args)
+ args := slices.Clone(gobuild.Args)
outputPath := executablePath(path.Base(pkg))
if output != nil && *output != "" {
outputPath = *output
@@ -260,7 +261,7 @@ func buildFlags(env build.Environment, staticLinking bool, buildTags []string) (
// See https://sourceware.org/binutils/docs-2.23.1/ld/Options.html#Options
// regarding the options --build-id=none and --strip-all. It is needed for
// reproducible builds; removing references to temporary files in C-land, and
- // making build-id reproducably absent.
+ // making build-id reproducibly absent.
extld := []string{"-Wl,-z,stack-size=0x800000,--build-id=none,--strip-all"}
if staticLinking {
extld = append(extld, "-static")
@@ -363,128 +364,93 @@ func downloadSpecTestFixtures(csdb *build.ChecksumDB, cachedir string) string {
return filepath.Join(cachedir, base)
}
-// hashAllSourceFiles iterates all files under the top-level project directory
-// computing the hash of each file (excluding files within the tests
-// subrepo)
-func hashAllSourceFiles() (map[string]common.Hash, error) {
- res := make(map[string]common.Hash)
- err := filepath.WalkDir(".", func(path string, d os.DirEntry, err error) error {
- if strings.HasPrefix(path, filepath.FromSlash("tests/testdata")) {
- return filepath.SkipDir
- }
- if !d.Type().IsRegular() {
- return nil
- }
- // open the file and hash it
- f, err := os.OpenFile(path, os.O_RDONLY, 0666)
- if err != nil {
- return err
- }
- hasher := sha256.New()
- if _, err := io.Copy(hasher, f); err != nil {
- return err
- }
- res[path] = common.Hash(hasher.Sum(nil))
- return nil
- })
- if err != nil {
- return nil, err
- }
- return res, nil
-}
-
-// hashSourceFiles iterates the provided set of filepaths (relative to the top-level geth project directory)
-// computing the hash of each file.
-func hashSourceFiles(files []string) (map[string]common.Hash, error) {
- res := make(map[string]common.Hash)
- for _, filePath := range files {
- f, err := os.OpenFile(filePath, os.O_RDONLY, 0666)
- if err != nil {
- return nil, err
- }
- hasher := sha256.New()
- if _, err := io.Copy(hasher, f); err != nil {
- return nil, err
- }
- res[filePath] = common.Hash(hasher.Sum(nil))
- }
- return res, nil
-}
+// doCheckTidy assets that the Go modules files are tidied already.
+func doCheckTidy() {
+ targets := []string{"go.mod", "go.sum"}
-// compareHashedFilesets compares two maps (key is relative file path to top-level geth directory, value is its hash)
-// and returns the list of file paths whose hashes differed.
-func compareHashedFilesets(preHashes map[string]common.Hash, postHashes map[string]common.Hash) []string {
- updates := []string{}
- for path, postHash := range postHashes {
- preHash, ok := preHashes[path]
- if !ok || preHash != postHash {
- updates = append(updates, path)
- }
+ hashes, err := build.HashFiles(targets)
+ if err != nil {
+ log.Fatalf("failed to hash go.mod/go.sum: %v", err)
}
- return updates
-}
+ build.MustRun(new(build.GoToolchain).Go("mod", "tidy"))
-func doGoModTidy() {
- targetFiles := []string{"go.mod", "go.sum"}
- preHashes, err := hashSourceFiles(targetFiles)
+ tidied, err := build.HashFiles(targets)
if err != nil {
- log.Fatal("failed to hash go.mod/go.sum", "err", err)
+ log.Fatalf("failed to rehash go.mod/go.sum: %v", err)
}
- tc := new(build.GoToolchain)
- c := tc.Go("mod", "tidy")
- build.MustRun(c)
- postHashes, err := hashSourceFiles(targetFiles)
- updates := compareHashedFilesets(preHashes, postHashes)
- for _, updatedFile := range updates {
- fmt.Fprintf(os.Stderr, "changed file %s\n", updatedFile)
- }
- if len(updates) != 0 {
- log.Fatal("go.sum and/or go.mod were updated by running 'go mod tidy'")
+ if updates := build.DiffHashes(hashes, tidied); len(updates) > 0 {
+ log.Fatalf("files changed on running 'go mod tidy': %v", updates)
}
+ fmt.Println("No untidy module files detected.")
}
-// doGenerate ensures that re-generating generated files does not cause
-// any mutations in the source file tree: i.e. all generated files were
-// updated and committed. Any stale generated files are updated.
-func doGenerate() {
+// doCheckGenerate ensures that re-generating generated files does not cause
+// any mutations in the source file tree.
+func doCheckGenerate() {
var (
- tc = new(build.GoToolchain)
cachedir = flag.String("cachedir", "./build/cache", "directory for caching binaries.")
- verify = flag.Bool("verify", false, "check whether any files are changed by go generate")
)
+ // Compute the origin hashes of all the files
+ var hashes map[string][32]byte
- protocPath := downloadProtoc(*cachedir)
- protocGenGoPath := downloadProtocGenGo(*cachedir)
-
- var preHashes map[string]common.Hash
- if *verify {
- var err error
- preHashes, err = hashAllSourceFiles()
- if err != nil {
- log.Fatal("failed to compute map of source hashes", "err", err)
- }
+ var err error
+ hashes, err = build.HashFolder(".", []string{"tests/testdata", "build/cache"})
+ if err != nil {
+ log.Fatal("Error computing hashes", "err", err)
}
-
- c := tc.Go("generate", "./...")
+ // Run any go generate steps we might be missing
+ var (
+ protocPath = downloadProtoc(*cachedir)
+ protocGenGoPath = downloadProtocGenGo(*cachedir)
+ )
+ c := new(build.GoToolchain).Go("generate", "./...")
pathList := []string{filepath.Join(protocPath, "bin"), protocGenGoPath, os.Getenv("PATH")}
c.Env = append(c.Env, "PATH="+strings.Join(pathList, string(os.PathListSeparator)))
build.MustRun(c)
- if !*verify {
- return
- }
- // Check if files were changed.
- postHashes, err := hashAllSourceFiles()
+ // Check if generate file hashes have changed
+ generated, err := build.HashFolder(".", []string{"tests/testdata", "build/cache"})
if err != nil {
- log.Fatal("error computing source tree file hashes", "err", err)
+ log.Fatalf("Error re-computing hashes: %v", err)
}
- updates := compareHashedFilesets(preHashes, postHashes)
- for _, updatedFile := range updates {
- fmt.Fprintf(os.Stderr, "changed file %s\n", updatedFile)
+ updates := build.DiffHashes(hashes, generated)
+ for _, file := range updates {
+ log.Printf("File changed: %s", file)
}
if len(updates) != 0 {
log.Fatal("One or more generated files were updated by running 'go generate ./...'")
}
+ fmt.Println("No stale files detected.")
+}
+
+// doCheckBadDeps verifies whether certain unintended dependencies between some
+// packages leak into the codebase due to a refactor. This is not an exhaustive
+// list, rather something we build up over time at sensitive places.
+func doCheckBadDeps() {
+ baddeps := [][2]string{
+ // Rawdb tends to be a dumping ground for db utils, sometimes leaking the db itself
+ {"github.com/ethereum/go-ethereum/core/rawdb", "github.com/ethereum/go-ethereum/ethdb/leveldb"},
+ {"github.com/ethereum/go-ethereum/core/rawdb", "github.com/ethereum/go-ethereum/ethdb/pebbledb"},
+ }
+ tc := new(build.GoToolchain)
+
+ var failed bool
+ for _, rule := range baddeps {
+ out, err := tc.Go("list", "-deps", rule[0]).CombinedOutput()
+ if err != nil {
+ log.Fatalf("Failed to list '%s' dependencies: %v", rule[0], err)
+ }
+ for _, line := range strings.Split(string(out), "\n") {
+ if strings.TrimSpace(line) == rule[1] {
+ log.Printf("Found bad dependency '%s' -> '%s'", rule[0], rule[1])
+ failed = true
+ }
+ }
+ }
+ if failed {
+ log.Fatalf("Bad dependencies detected.")
+ }
+ fmt.Println("No bad dependencies detected.")
}
// doLint runs golangci-lint on requested packages.
@@ -501,8 +467,6 @@ func doLint(cmdline []string) {
linter := downloadLinter(*cachedir)
lflags := []string{"run", "--config", ".golangci.yml"}
build.MustRunCommandWithOutput(linter, append(lflags, packages...)...)
-
- doGoModTidy()
fmt.Println("You have achieved perfection.")
}
@@ -646,7 +610,7 @@ func doArchive(cmdline []string) {
var (
env = build.Env()
- basegeth = archiveBasename(*arch, params.ArchiveVersion(env.Commit))
+ basegeth = archiveBasename(*arch, version.Archive(env.Commit))
geth = "geth-" + basegeth + ext
alltools = "geth-alltools-" + basegeth + ext
)
@@ -766,7 +730,7 @@ func doDockerBuildx(cmdline []string) {
case env.Branch == "master":
tags = []string{"latest"}
case strings.HasPrefix(env.Tag, "v1."):
- tags = []string{"stable", fmt.Sprintf("release-1.%d", params.VersionMinor), "v" + params.Version}
+ tags = []string{"stable", fmt.Sprintf("release-%v", version.Family), "v" + version.Semantic}
}
// Need to create a mult-arch builder
build.MustRunCommand("docker", "buildx", "create", "--use", "--name", "multi-arch-builder", "--platform", *platform)
@@ -782,7 +746,7 @@ func doDockerBuildx(cmdline []string) {
gethImage := fmt.Sprintf("%s%s", spec.base, tag)
build.MustRunCommand("docker", "buildx", "build",
"--build-arg", "COMMIT="+env.Commit,
- "--build-arg", "VERSION="+params.VersionWithMeta,
+ "--build-arg", "VERSION="+version.WithMeta,
"--build-arg", "BUILDNUM="+env.Buildnum,
"--tag", gethImage,
"--platform", *platform,
@@ -929,7 +893,7 @@ func ppaUpload(workdir, ppa, sshUser string, files []string) {
var idfile string
if sshkey := getenvBase64("PPA_SSH_KEY"); len(sshkey) > 0 {
idfile = filepath.Join(workdir, "sshkey")
- if !common.FileExist(idfile) {
+ if !build.FileExist(idfile) {
os.WriteFile(idfile, sshkey, 0600)
}
}
@@ -1154,19 +1118,19 @@ func doWindowsInstaller(cmdline []string) {
// Build the installer. This assumes that all the needed files have been previously
// built (don't mix building and packaging to keep cross compilation complexity to a
// minimum).
- version := strings.Split(params.Version, ".")
+ ver := strings.Split(version.Semantic, ".")
if env.Commit != "" {
- version[2] += "-" + env.Commit[:8]
+ ver[2] += "-" + env.Commit[:8]
}
- installer, err := filepath.Abs("geth-" + archiveBasename(*arch, params.ArchiveVersion(env.Commit)) + ".exe")
+ installer, err := filepath.Abs("geth-" + archiveBasename(*arch, version.Archive(env.Commit)) + ".exe")
if err != nil {
log.Fatalf("Failed to convert installer file path: %v", err)
}
build.MustRunCommand("makensis.exe",
"/DOUTPUTFILE="+installer,
- "/DMAJORVERSION="+version[0],
- "/DMINORVERSION="+version[1],
- "/DBUILDVERSION="+version[2],
+ "/DMAJORVERSION="+ver[0],
+ "/DMINORVERSION="+ver[1],
+ "/DBUILDVERSION="+ver[2],
"/DARCH="+*arch,
filepath.Join(*workdir, "geth.nsi"),
)
diff --git a/cmd/devp2p/discv4cmd.go b/cmd/devp2p/discv4cmd.go
index 3b5400ca3a..8c48b3a557 100644
--- a/cmd/devp2p/discv4cmd.go
+++ b/cmd/devp2p/discv4cmd.go
@@ -21,6 +21,7 @@ import (
"fmt"
"net"
"net/http"
+ "slices"
"strconv"
"strings"
"time"
@@ -28,7 +29,6 @@ import (
"github.com/ethereum/go-ethereum/cmd/devp2p/internal/v4test"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/crypto"
- "github.com/ethereum/go-ethereum/internal/flags"
"github.com/ethereum/go-ethereum/log"
"github.com/ethereum/go-ethereum/p2p/discover"
"github.com/ethereum/go-ethereum/p2p/enode"
@@ -83,7 +83,7 @@ var (
Name: "listen",
Usage: "Runs a discovery node",
Action: discv4Listen,
- Flags: flags.Merge(discoveryNodeFlags, []cli.Flag{
+ Flags: slices.Concat(discoveryNodeFlags, []cli.Flag{
httpAddrFlag,
}),
}
@@ -91,7 +91,7 @@ var (
Name: "crawl",
Usage: "Updates a nodes.json file with random nodes found in the DHT",
Action: discv4Crawl,
- Flags: flags.Merge(discoveryNodeFlags, []cli.Flag{crawlTimeoutFlag, crawlParallelismFlag}),
+ Flags: slices.Concat(discoveryNodeFlags, []cli.Flag{crawlTimeoutFlag, crawlParallelismFlag}),
}
discv4TestCommand = &cli.Command{
Name: "test",
diff --git a/cmd/devp2p/discv5cmd.go b/cmd/devp2p/discv5cmd.go
index 0dac945269..2422ef6644 100644
--- a/cmd/devp2p/discv5cmd.go
+++ b/cmd/devp2p/discv5cmd.go
@@ -19,11 +19,11 @@ package main
import (
"errors"
"fmt"
+ "slices"
"time"
"github.com/ethereum/go-ethereum/cmd/devp2p/internal/v5test"
"github.com/ethereum/go-ethereum/common"
- "github.com/ethereum/go-ethereum/internal/flags"
"github.com/ethereum/go-ethereum/p2p/discover"
"github.com/urfave/cli/v2"
)
@@ -56,7 +56,7 @@ var (
Name: "crawl",
Usage: "Updates a nodes.json file with random nodes found in the DHT",
Action: discv5Crawl,
- Flags: flags.Merge(discoveryNodeFlags, []cli.Flag{
+ Flags: slices.Concat(discoveryNodeFlags, []cli.Flag{
crawlTimeoutFlag,
}),
}
diff --git a/cmd/devp2p/internal/ethtest/chain.go b/cmd/devp2p/internal/ethtest/chain.go
index 268ba1d192..2cdbd38ad8 100644
--- a/cmd/devp2p/internal/ethtest/chain.go
+++ b/cmd/devp2p/internal/ethtest/chain.go
@@ -100,7 +100,6 @@ func (c *Chain) AccountsInHashOrder() []state.DumpAccount {
list := make([]state.DumpAccount, len(c.state))
i := 0
for addr, acc := range c.state {
- addr := addr
list[i] = acc
list[i].Address = &addr
if len(acc.AddressHash) != 32 {
diff --git a/cmd/devp2p/internal/ethtest/snap.go b/cmd/devp2p/internal/ethtest/snap.go
index 4f1b6f8656..9c1efa0e8e 100644
--- a/cmd/devp2p/internal/ethtest/snap.go
+++ b/cmd/devp2p/internal/ethtest/snap.go
@@ -286,7 +286,6 @@ a key before startingHash (wrong order). The server should return the first avai
}
for i, tc := range tests {
- tc := tc
if i > 0 {
t.Log("\n")
}
@@ -429,7 +428,6 @@ of the test account. The server should return slots [2,3] (i.e. the 'next availa
}
for i, tc := range tests {
- tc := tc
if i > 0 {
t.Log("\n")
}
@@ -526,7 +524,6 @@ func (s *Suite) TestSnapGetByteCodes(t *utesting.T) {
}
for i, tc := range tests {
- tc := tc
if i > 0 {
t.Log("\n")
}
@@ -723,7 +720,6 @@ The server should reject the request.`,
}
for i, tc := range tests {
- tc := tc
if i > 0 {
t.Log("\n")
}
diff --git a/cmd/devp2p/internal/ethtest/testdata/genesis.json b/cmd/devp2p/internal/ethtest/testdata/genesis.json
index e8bb66bb3c..4cfebdcac1 100644
--- a/cmd/devp2p/internal/ethtest/testdata/genesis.json
+++ b/cmd/devp2p/internal/ethtest/testdata/genesis.json
@@ -18,7 +18,6 @@
"shanghaiTime": 780,
"cancunTime": 840,
"terminalTotalDifficulty": 9454784,
- "terminalTotalDifficultyPassed": true,
"ethash": {}
},
"nonce": "0x0",
diff --git a/cmd/evm/blockrunner.go b/cmd/evm/blockrunner.go
index d5cd8d8e3d..2cb0531e28 100644
--- a/cmd/evm/blockrunner.go
+++ b/cmd/evm/blockrunner.go
@@ -22,79 +22,84 @@ import (
"fmt"
"os"
"regexp"
- "sort"
+ "slices"
"github.com/ethereum/go-ethereum/core"
"github.com/ethereum/go-ethereum/core/rawdb"
- "github.com/ethereum/go-ethereum/core/tracing"
- "github.com/ethereum/go-ethereum/eth/tracers/logger"
"github.com/ethereum/go-ethereum/tests"
"github.com/urfave/cli/v2"
+ "golang.org/x/exp/maps"
)
-var RunFlag = &cli.StringFlag{
- Name: "run",
- Value: ".*",
- Usage: "Run only those tests matching the regular expression.",
-}
-
var blockTestCommand = &cli.Command{
Action: blockTestCmd,
Name: "blocktest",
Usage: "Executes the given blockchain tests",
- ArgsUsage: "",
- Flags: []cli.Flag{RunFlag},
+ ArgsUsage: "",
+ Flags: slices.Concat([]cli.Flag{
+ DumpFlag,
+ HumanReadableFlag,
+ RunFlag,
+ WitnessCrossCheckFlag,
+ }, traceFlags),
}
func blockTestCmd(ctx *cli.Context) error {
- if len(ctx.Args().First()) == 0 {
- return errors.New("path-to-test argument required")
+ path := ctx.Args().First()
+ if len(path) == 0 {
+ return errors.New("path argument required")
}
-
- var tracer *tracing.Hooks
- // 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)
+ var (
+ collected = collectJSONFiles(path)
+ results []testResult
+ )
+ for _, fname := range collected {
+ r, err := runBlockTest(ctx, fname)
+ if err != nil {
+ return err
+ }
+ results = append(results, r...)
}
- // Load the test content from the input file
- src, err := os.ReadFile(ctx.Args().First())
+ report(ctx, results)
+ return nil
+}
+
+func runBlockTest(ctx *cli.Context, fname string) ([]testResult, error) {
+ src, err := os.ReadFile(fname)
if err != nil {
- return err
+ return nil, err
}
- var tests map[string]tests.BlockTest
+ var tests map[string]*tests.BlockTest
if err = json.Unmarshal(src, &tests); err != nil {
- return err
+ return nil, err
}
re, err := regexp.Compile(ctx.String(RunFlag.Name))
if err != nil {
- return fmt.Errorf("invalid regex -%s: %v", RunFlag.Name, err)
+ return nil, fmt.Errorf("invalid regex -%s: %v", RunFlag.Name, err)
}
+ tracer := tracerFromFlags(ctx)
- // Run them in order
- var keys []string
- for key := range tests {
- keys = append(keys, key)
- }
- sort.Strings(keys)
+ // Pull out keys to sort and ensure tests are run in order.
+ keys := maps.Keys(tests)
+ slices.Sort(keys)
+
+ // Run all the tests.
+ var results []testResult
for _, name := range keys {
if !re.MatchString(name) {
continue
}
- test := tests[name]
- if err := test.Run(false, rawdb.HashScheme, false, tracer, func(res error, chain *core.BlockChain) {
+ result := &testResult{Name: name, Pass: true}
+ if err := tests[name].Run(false, rawdb.HashScheme, ctx.Bool(WitnessCrossCheckFlag.Name), tracer, func(res error, chain *core.BlockChain) {
if ctx.Bool(DumpFlag.Name) {
- if state, _ := chain.State(); state != nil {
- fmt.Println(string(state.Dump(nil)))
+ if s, _ := chain.State(); s != nil {
+ result.State = dump(s)
}
}
}); err != nil {
- return fmt.Errorf("test %v: %w", name, err)
+ result.Pass, result.Error = false, err.Error()
}
+ results = append(results, *result)
}
- return nil
+ return results, nil
}
diff --git a/cmd/evm/compiler.go b/cmd/evm/compiler.go
deleted file mode 100644
index c071834b59..0000000000
--- a/cmd/evm/compiler.go
+++ /dev/null
@@ -1,55 +0,0 @@
-// Copyright 2017 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 (
- "errors"
- "fmt"
- "os"
-
- "github.com/ethereum/go-ethereum/cmd/evm/internal/compiler"
-
- "github.com/urfave/cli/v2"
-)
-
-var compileCommand = &cli.Command{
- Action: compileCmd,
- Name: "compile",
- Usage: "Compiles easm source to evm binary",
- ArgsUsage: "",
-}
-
-func compileCmd(ctx *cli.Context) error {
- debug := ctx.Bool(DebugFlag.Name)
-
- if len(ctx.Args().First()) == 0 {
- return errors.New("filename required")
- }
-
- fn := ctx.Args().First()
- src, err := os.ReadFile(fn)
- if err != nil {
- return err
- }
-
- bin, err := compiler.Compile(fn, src, debug)
- if err != nil {
- return err
- }
- fmt.Println(bin)
- return nil
-}
diff --git a/cmd/evm/disasm.go b/cmd/evm/disasm.go
deleted file mode 100644
index b1f35cbaf5..0000000000
--- a/cmd/evm/disasm.go
+++ /dev/null
@@ -1,55 +0,0 @@
-// Copyright 2017 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 (
- "errors"
- "fmt"
- "os"
- "strings"
-
- "github.com/ethereum/go-ethereum/core/asm"
- "github.com/urfave/cli/v2"
-)
-
-var disasmCommand = &cli.Command{
- Action: disasmCmd,
- Name: "disasm",
- Usage: "Disassembles evm binary",
- ArgsUsage: "",
-}
-
-func disasmCmd(ctx *cli.Context) error {
- var in string
- switch {
- case len(ctx.Args().First()) > 0:
- fn := ctx.Args().First()
- input, err := os.ReadFile(fn)
- if err != nil {
- return err
- }
- in = string(input)
- case ctx.IsSet(InputFlag.Name):
- in = ctx.String(InputFlag.Name)
- default:
- return errors.New("missing filename or --input value")
- }
-
- code := strings.TrimSpace(in)
- fmt.Printf("%v\n", code)
- return asm.PrintDisassembled(code)
-}
diff --git a/cmd/evm/eest.go b/cmd/evm/eest.go
new file mode 100644
index 0000000000..43071a3e5d
--- /dev/null
+++ b/cmd/evm/eest.go
@@ -0,0 +1,49 @@
+// Copyright 2024 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 "regexp"
+
+// testMetadata provides more granular access to the test information encoded
+// within its filename by the execution spec test (EEST).
+type testMetadata struct {
+ fork string
+ module string // which python module gnerated the test, e.g. eip7702
+ file string // exact file the test came from, e.g. test_gas.py
+ function string // func that created the test, e.g. test_valid_mcopy_operations
+ parameters string // the name of the parameters which were used to fill the test, e.g. zero_inputs
+}
+
+// parseTestMetadata reads a test name and parses out more specific information
+// about the test.
+func parseTestMetadata(s string) *testMetadata {
+ var (
+ pattern = `tests\/([^\/]+)\/([^\/]+)\/([^:]+)::([^[]+)\[fork_([^-\]]+)-[^-]+-(.+)\]`
+ re = regexp.MustCompile(pattern)
+ )
+ match := re.FindStringSubmatch(s)
+ if len(match) == 0 {
+ return nil
+ }
+ return &testMetadata{
+ fork: match[5],
+ module: match[2],
+ file: match[3],
+ function: match[4],
+ parameters: match[6],
+ }
+}
diff --git a/cmd/evm/eofparse.go b/cmd/evm/eofparse.go
new file mode 100644
index 0000000000..92182a53b3
--- /dev/null
+++ b/cmd/evm/eofparse.go
@@ -0,0 +1,228 @@
+// Copyright 2023 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 (
+ "bufio"
+ "encoding/hex"
+ "encoding/json"
+ "fmt"
+ "io/fs"
+ "os"
+ "path/filepath"
+ "strings"
+
+ "github.com/ethereum/go-ethereum/core/vm"
+ "github.com/ethereum/go-ethereum/log"
+ "github.com/urfave/cli/v2"
+)
+
+var jt vm.JumpTable
+
+const initcode = "INITCODE"
+
+func init() {
+ jt = vm.NewEOFInstructionSetForTesting()
+}
+
+var (
+ hexFlag = &cli.StringFlag{
+ Name: "hex",
+ Usage: "Single container data parse and validation",
+ }
+ refTestFlag = &cli.StringFlag{
+ Name: "test",
+ Usage: "Path to EOF validation reference test.",
+ }
+ eofParseCommand = &cli.Command{
+ Name: "eofparse",
+ Aliases: []string{"eof"},
+ Usage: "Parses hex eof container and returns validation errors (if any)",
+ Action: eofParseAction,
+ Flags: []cli.Flag{
+ hexFlag,
+ refTestFlag,
+ },
+ }
+ eofDumpCommand = &cli.Command{
+ Name: "eofdump",
+ Usage: "Parses hex eof container and prints out human-readable representation of the container.",
+ Action: eofDumpAction,
+ Flags: []cli.Flag{
+ hexFlag,
+ },
+ }
+)
+
+func eofParseAction(ctx *cli.Context) error {
+ // If `--test` is set, parse and validate the reference test at the provided path.
+ if ctx.IsSet(refTestFlag.Name) {
+ var (
+ file = ctx.String(refTestFlag.Name)
+ executedTests int
+ passedTests int
+ )
+ err := filepath.Walk(file, func(path string, info fs.FileInfo, err error) error {
+ if err != nil {
+ return err
+ }
+ if info.IsDir() {
+ return nil
+ }
+ log.Debug("Executing test", "name", info.Name())
+ passed, tot, err := executeTest(path)
+ passedTests += passed
+ executedTests += tot
+ return err
+ })
+ if err != nil {
+ return err
+ }
+ log.Info("Executed tests", "passed", passedTests, "total executed", executedTests)
+ return nil
+ }
+ // If `--hex` is set, parse and validate the hex string argument.
+ if ctx.IsSet(hexFlag.Name) {
+ if _, err := parseAndValidate(ctx.String(hexFlag.Name), false); err != nil {
+ return fmt.Errorf("err: %w", err)
+ }
+ fmt.Println("OK")
+ return nil
+ }
+ // If neither are passed in, read input from stdin.
+ scanner := bufio.NewScanner(os.Stdin)
+ scanner.Buffer(make([]byte, 1024*1024), 10*1024*1024)
+ for scanner.Scan() {
+ l := strings.TrimSpace(scanner.Text())
+ if strings.HasPrefix(l, "#") || l == "" {
+ continue
+ }
+ if _, err := parseAndValidate(l, false); err != nil {
+ fmt.Printf("err: %v\n", err)
+ } else {
+ fmt.Println("OK")
+ }
+ }
+ if err := scanner.Err(); err != nil {
+ fmt.Println(err.Error())
+ }
+ return nil
+}
+
+type refTests struct {
+ Vectors map[string]eOFTest `json:"vectors"`
+}
+
+type eOFTest struct {
+ Code string `json:"code"`
+ Results map[string]etResult `json:"results"`
+ ContainerKind string `json:"containerKind"`
+}
+
+type etResult struct {
+ Result bool `json:"result"`
+ Exception string `json:"exception,omitempty"`
+}
+
+func executeTest(path string) (int, int, error) {
+ src, err := os.ReadFile(path)
+ if err != nil {
+ return 0, 0, err
+ }
+ var testsByName map[string]refTests
+ if err := json.Unmarshal(src, &testsByName); err != nil {
+ return 0, 0, err
+ }
+ passed, total := 0, 0
+ for testsName, tests := range testsByName {
+ for name, tt := range tests.Vectors {
+ for fork, r := range tt.Results {
+ total++
+ _, err := parseAndValidate(tt.Code, tt.ContainerKind == initcode)
+ if r.Result && err != nil {
+ log.Error("Test failure, expected validation success", "name", testsName, "idx", name, "fork", fork, "err", err)
+ continue
+ }
+ if !r.Result && err == nil {
+ log.Error("Test failure, expected validation error", "name", testsName, "idx", name, "fork", fork, "have err", r.Exception, "err", err)
+ continue
+ }
+ passed++
+ }
+ }
+ }
+ return passed, total, nil
+}
+
+func parseAndValidate(s string, isInitCode bool) (*vm.Container, error) {
+ if len(s) >= 2 && strings.HasPrefix(s, "0x") {
+ s = s[2:]
+ }
+ b, err := hex.DecodeString(s)
+ if err != nil {
+ return nil, fmt.Errorf("unable to decode data: %w", err)
+ }
+ return parse(b, isInitCode)
+}
+
+func parse(b []byte, isInitCode bool) (*vm.Container, error) {
+ var c vm.Container
+ if err := c.UnmarshalBinary(b, isInitCode); err != nil {
+ return nil, err
+ }
+ if err := c.ValidateCode(&jt, isInitCode); err != nil {
+ return nil, err
+ }
+ return &c, nil
+}
+
+func eofDumpAction(ctx *cli.Context) error {
+ // If `--hex` is set, parse and validate the hex string argument.
+ if ctx.IsSet(hexFlag.Name) {
+ return eofDump(ctx.String(hexFlag.Name))
+ }
+ // Otherwise read from stdin
+ scanner := bufio.NewScanner(os.Stdin)
+ scanner.Buffer(make([]byte, 1024*1024), 10*1024*1024)
+ for scanner.Scan() {
+ l := strings.TrimSpace(scanner.Text())
+ if strings.HasPrefix(l, "#") || l == "" {
+ continue
+ }
+ if err := eofDump(l); err != nil {
+ return err
+ }
+ fmt.Println("")
+ }
+ return scanner.Err()
+}
+
+func eofDump(hexdata string) error {
+ if len(hexdata) >= 2 && strings.HasPrefix(hexdata, "0x") {
+ hexdata = hexdata[2:]
+ }
+ b, err := hex.DecodeString(hexdata)
+ if err != nil {
+ return fmt.Errorf("unable to decode data: %w", err)
+ }
+ var c vm.Container
+ if err := c.UnmarshalBinary(b, false); err != nil {
+ return err
+ }
+ fmt.Println(c.String())
+ return nil
+}
diff --git a/cmd/evm/eofparse_test.go b/cmd/evm/eofparse_test.go
new file mode 100644
index 0000000000..cda4b38fc9
--- /dev/null
+++ b/cmd/evm/eofparse_test.go
@@ -0,0 +1,166 @@
+package main
+
+import (
+ "bufio"
+ "bytes"
+ "encoding/hex"
+ "fmt"
+ "os"
+ "strings"
+ "testing"
+
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/core/vm"
+)
+
+func FuzzEofParsing(f *testing.F) {
+ // Seed with corpus from execution-spec-tests
+ for i := 0; ; i++ {
+ fname := fmt.Sprintf("testdata/eof/eof_corpus_%d.txt", i)
+ corpus, err := os.Open(fname)
+ if err != nil {
+ break
+ }
+ f.Logf("Reading seed data from %v", fname)
+ scanner := bufio.NewScanner(corpus)
+ scanner.Buffer(make([]byte, 1024), 10*1024*1024)
+ for scanner.Scan() {
+ s := scanner.Text()
+ if len(s) >= 2 && strings.HasPrefix(s, "0x") {
+ s = s[2:]
+ }
+ b, err := hex.DecodeString(s)
+ if err != nil {
+ panic(err) // rotten corpus
+ }
+ f.Add(b)
+ }
+ corpus.Close()
+ if err := scanner.Err(); err != nil {
+ panic(err) // rotten corpus
+ }
+ }
+ // And do the fuzzing
+ f.Fuzz(func(t *testing.T, data []byte) {
+ var (
+ jt = vm.NewEOFInstructionSetForTesting()
+ c vm.Container
+ )
+ cpy := common.CopyBytes(data)
+ if err := c.UnmarshalBinary(data, true); err == nil {
+ c.ValidateCode(&jt, true)
+ if have := c.MarshalBinary(); !bytes.Equal(have, data) {
+ t.Fatal("Unmarshal-> Marshal failure!")
+ }
+ }
+ if err := c.UnmarshalBinary(data, false); err == nil {
+ c.ValidateCode(&jt, false)
+ if have := c.MarshalBinary(); !bytes.Equal(have, data) {
+ t.Fatal("Unmarshal-> Marshal failure!")
+ }
+ }
+ if !bytes.Equal(cpy, data) {
+ panic("data modified during unmarshalling")
+ }
+ })
+}
+
+func TestEofParseInitcode(t *testing.T) {
+ testEofParse(t, true, "testdata/eof/results.initcode.txt")
+}
+
+func TestEofParseRegular(t *testing.T) {
+ testEofParse(t, false, "testdata/eof/results.regular.txt")
+}
+
+func testEofParse(t *testing.T, isInitCode bool, wantFile string) {
+ var wantFn func() string
+ var wantLoc = 0
+ { // Configure the want-reader
+ wants, err := os.Open(wantFile)
+ if err != nil {
+ t.Fatal(err)
+ }
+ scanner := bufio.NewScanner(wants)
+ scanner.Buffer(make([]byte, 1024), 10*1024*1024)
+ wantFn = func() string {
+ if scanner.Scan() {
+ wantLoc++
+ return scanner.Text()
+ }
+ return "end of file reached"
+ }
+ }
+
+ for i := 0; ; i++ {
+ fname := fmt.Sprintf("testdata/eof/eof_corpus_%d.txt", i)
+ corpus, err := os.Open(fname)
+ if err != nil {
+ break
+ }
+ t.Logf("# Reading seed data from %v", fname)
+ scanner := bufio.NewScanner(corpus)
+ scanner.Buffer(make([]byte, 1024), 10*1024*1024)
+ line := 1
+ for scanner.Scan() {
+ s := scanner.Text()
+ if len(s) >= 2 && strings.HasPrefix(s, "0x") {
+ s = s[2:]
+ }
+ b, err := hex.DecodeString(s)
+ if err != nil {
+ panic(err) // rotten corpus
+ }
+ have := "OK"
+ if _, err := parse(b, isInitCode); err != nil {
+ have = fmt.Sprintf("ERR: %v", err)
+ }
+ if false { // Change this to generate the want-output
+ fmt.Printf("%v\n", have)
+ } else {
+ want := wantFn()
+ if have != want {
+ if len(want) > 100 {
+ want = want[:100]
+ }
+ if len(b) > 100 {
+ b = b[:100]
+ }
+ t.Errorf("%v:%d\n%v\ninput %x\nisInit: %v\nhave: %q\nwant: %q\n",
+ fname, line, fmt.Sprintf("%v:%d", wantFile, wantLoc), b, isInitCode, have, want)
+ }
+ }
+ line++
+ }
+ corpus.Close()
+ }
+}
+
+func BenchmarkEofParse(b *testing.B) {
+ corpus, err := os.Open("testdata/eof/eof_benches.txt")
+ if err != nil {
+ b.Fatal(err)
+ }
+ defer corpus.Close()
+ scanner := bufio.NewScanner(corpus)
+ scanner.Buffer(make([]byte, 1024), 10*1024*1024)
+ line := 1
+ for scanner.Scan() {
+ s := scanner.Text()
+ if len(s) >= 2 && strings.HasPrefix(s, "0x") {
+ s = s[2:]
+ }
+ data, err := hex.DecodeString(s)
+ if err != nil {
+ b.Fatal(err) // rotten corpus
+ }
+ b.Run(fmt.Sprintf("test-%d", line), func(b *testing.B) {
+ b.ReportAllocs()
+ b.SetBytes(int64(len(data)))
+ for i := 0; i < b.N; i++ {
+ _, _ = parse(data, false)
+ }
+ })
+ line++
+ }
+}
diff --git a/cmd/evm/internal/compiler/compiler.go b/cmd/evm/internal/compiler/compiler.go
deleted file mode 100644
index 54981b6697..0000000000
--- a/cmd/evm/internal/compiler/compiler.go
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright 2017 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 compiler
-
-import (
- "errors"
- "fmt"
-
- "github.com/ethereum/go-ethereum/core/asm"
-)
-
-func Compile(fn string, src []byte, debug bool) (string, error) {
- compiler := asm.NewCompiler(debug)
- compiler.Feed(asm.Lex(src, debug))
-
- bin, compileErrors := compiler.Compile()
- if len(compileErrors) > 0 {
- // report errors
- for _, err := range compileErrors {
- fmt.Printf("%s:%v\n", fn, err)
- }
- return "", errors.New("compiling failed")
- }
- return bin, nil
-}
diff --git a/cmd/evm/internal/t8ntool/execution.go b/cmd/evm/internal/t8ntool/execution.go
index d404771946..434b12fb64 100644
--- a/cmd/evm/internal/t8ntool/execution.go
+++ b/cmd/evm/internal/t8ntool/execution.go
@@ -23,6 +23,7 @@ import (
"math/big"
"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/consensus/ethash"
"github.com/ethereum/go-ethereum/consensus/misc"
@@ -50,6 +51,8 @@ type Prestate struct {
Pre types.GenesisAlloc `json:"pre"`
}
+//go:generate go run github.com/fjl/gencodec -type ExecutionResult -field-override executionResultMarshaling -out gen_execresult.go
+
// 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 {
@@ -66,8 +69,12 @@ type ExecutionResult struct {
WithdrawalsRoot *common.Hash `json:"withdrawalsRoot,omitempty"`
CurrentExcessBlobGas *math.HexOrDecimal64 `json:"currentExcessBlobGas,omitempty"`
CurrentBlobGasUsed *math.HexOrDecimal64 `json:"blobGasUsed,omitempty"`
- RequestsHash *common.Hash `json:"requestsRoot,omitempty"`
- DepositRequests *types.Deposits `json:"depositRequests,omitempty"`
+ RequestsHash *common.Hash `json:"requestsHash,omitempty"`
+ Requests [][]byte `json:"requests"`
+}
+
+type executionResultMarshaling struct {
+ Requests []hexutil.Bytes `json:"requests"`
}
type ommer struct {
@@ -125,7 +132,7 @@ type rejectedTx struct {
// Apply applies a set of transactions to a pre-state
func (pre *Prestate) Apply(vmConfig vm.Config, chainConfig *params.ChainConfig,
txIt txIterator, miningReward int64,
- getTracerFn func(txIndex int, txHash common.Hash) (*tracers.Tracer, io.WriteCloser, error)) (*state.StateDB, *ExecutionResult, []byte, error) {
+ getTracerFn func(txIndex int, txHash common.Hash, chainConfig *params.ChainConfig) (*tracers.Tracer, io.WriteCloser, error)) (*state.StateDB, *ExecutionResult, []byte, error) {
// Capture errors for BLOCKHASH operation, if we haven't been supplied the
// required blockhashes
var hashError error
@@ -194,17 +201,16 @@ func (pre *Prestate) Apply(vmConfig vm.Config, chainConfig *params.ChainConfig,
chainConfig.DAOForkBlock.Cmp(new(big.Int).SetUint64(pre.Env.Number)) == 0 {
misc.ApplyDAOHardFork(statedb)
}
+ evm := vm.NewEVM(vmContext, statedb, chainConfig, vmConfig)
if beaconRoot := pre.Env.ParentBeaconBlockRoot; beaconRoot != nil {
- evm := vm.NewEVM(vmContext, vm.TxContext{}, statedb, chainConfig, vmConfig)
- core.ProcessBeaconBlockRoot(*beaconRoot, evm, statedb)
+ core.ProcessBeaconBlockRoot(*beaconRoot, evm)
}
if pre.Env.BlockHashes != nil && chainConfig.IsPrague(new(big.Int).SetUint64(pre.Env.Number), pre.Env.Timestamp) {
var (
prevNumber = pre.Env.Number - 1
prevHash = pre.Env.BlockHashes[math.HexOrDecimal64(prevNumber)]
- evm = vm.NewEVM(vmContext, vm.TxContext{}, statedb, chainConfig, vmConfig)
)
- core.ProcessParentBlockHash(prevHash, evm, statedb)
+ core.ProcessParentBlockHash(prevHash, evm)
}
for i := 0; txIt.Next(); i++ {
tx, err := txIt.Tx()
@@ -235,22 +241,21 @@ func (pre *Prestate) Apply(vmConfig vm.Config, chainConfig *params.ChainConfig,
continue
}
}
- tracer, traceOutput, err := getTracerFn(txIndex, tx.Hash())
+ tracer, traceOutput, err := getTracerFn(txIndex, tx.Hash(), chainConfig)
if err != nil {
return nil, nil, nil, err
}
+ // TODO (rjl493456442) it's a bit weird to reset the tracer in the
+ // middle of block execution, please improve it somehow.
if tracer != nil {
- vmConfig.Tracer = tracer.Hooks
+ evm.SetTracer(tracer.Hooks)
}
statedb.SetTxContext(tx.Hash(), txIndex)
var (
- txContext = core.NewEVMTxContext(msg)
- snapshot = statedb.Snapshot()
- prevGas = gaspool.Gas()
+ snapshot = statedb.Snapshot()
+ prevGas = gaspool.Gas()
)
- evm := vm.NewEVM(vmContext, txContext, statedb, chainConfig, vmConfig)
-
if tracer != nil && tracer.OnTxStart != nil {
tracer.OnTxStart(evm.GetVMContext(), tx, msg.From)
}
@@ -354,6 +359,25 @@ func (pre *Prestate) Apply(vmConfig vm.Config, chainConfig *params.ChainConfig,
amount := new(big.Int).Mul(new(big.Int).SetUint64(w.Amount), big.NewInt(params.GWei))
statedb.AddBalance(w.Address, uint256.MustFromBig(amount), tracing.BalanceIncreaseWithdrawal)
}
+
+ // Gather the execution-layer triggered requests.
+ var requests [][]byte
+ if chainConfig.IsPrague(vmContext.BlockNumber, vmContext.Time) {
+ requests = [][]byte{}
+ // EIP-6110
+ var allLogs []*types.Log
+ for _, receipt := range receipts {
+ allLogs = append(allLogs, receipt.Logs...)
+ }
+ if err := core.ParseDepositLogs(&requests, allLogs, chainConfig); err != nil {
+ return nil, nil, nil, NewError(ErrorEVM, fmt.Errorf("could not parse requests logs: %v", err))
+ }
+ // EIP-7002
+ core.ProcessWithdrawalQueue(&requests, evm)
+ // EIP-7251
+ core.ProcessConsolidationQueue(&requests, evm)
+ }
+
// Commit block
root, _, err := statedb.Commit(vmContext.BlockNumber.Uint64(), chainConfig.IsEIP158(vmContext.BlockNumber))
if err != nil {
@@ -379,28 +403,17 @@ func (pre *Prestate) Apply(vmConfig vm.Config, chainConfig *params.ChainConfig,
execRs.CurrentExcessBlobGas = (*math.HexOrDecimal64)(&excessBlobGas)
execRs.CurrentBlobGasUsed = (*math.HexOrDecimal64)(&blobGasUsed)
}
- if chainConfig.IsPrague(vmContext.BlockNumber, vmContext.Time) {
- // Parse the requests from the logs
- var allLogs []*types.Log
- for _, receipt := range receipts {
- allLogs = append(allLogs, receipt.Logs...)
- }
- requests, err := core.ParseDepositLogs(allLogs, chainConfig)
- if err != nil {
- return nil, nil, nil, NewError(ErrorEVM, fmt.Errorf("could not parse requests logs: %v", err))
- }
- // Calculate the requests root
- h := types.DeriveSha(requests, trie.NewStackTrie(nil))
+ if requests != nil {
+ // Set requestsHash on block.
+ h := types.CalcRequestsHash(requests)
execRs.RequestsHash = &h
- // Get the deposits from the requests
- deposits := make(types.Deposits, 0)
- for _, req := range requests {
- if dep, ok := req.Inner().(*types.Deposit); ok {
- deposits = append(deposits, dep)
- }
+ for i := range requests {
+ // remove prefix
+ requests[i] = requests[i][1:]
}
- execRs.DepositRequests = &deposits
+ execRs.Requests = requests
}
+
// Re-create statedb instance with new root upon the updated database
// for accessing latest states.
statedb, err = state.New(root, statedb.Database())
diff --git a/cmd/evm/internal/t8ntool/gen_execresult.go b/cmd/evm/internal/t8ntool/gen_execresult.go
new file mode 100644
index 0000000000..38310b9f2b
--- /dev/null
+++ b/cmd/evm/internal/t8ntool/gen_execresult.go
@@ -0,0 +1,134 @@
+// Code generated by github.com/fjl/gencodec. DO NOT EDIT.
+
+package t8ntool
+
+import (
+ "encoding/json"
+ "errors"
+
+ "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/core/types"
+)
+
+var _ = (*executionResultMarshaling)(nil)
+
+// MarshalJSON marshals as JSON.
+func (e ExecutionResult) MarshalJSON() ([]byte, error) {
+ 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"`
+ CurrentExcessBlobGas *math.HexOrDecimal64 `json:"currentExcessBlobGas,omitempty"`
+ CurrentBlobGasUsed *math.HexOrDecimal64 `json:"blobGasUsed,omitempty"`
+ RequestsHash *common.Hash `json:"requestsHash,omitempty"`
+ Requests []hexutil.Bytes `json:"requests"`
+ }
+ var enc ExecutionResult
+ enc.StateRoot = e.StateRoot
+ enc.TxRoot = e.TxRoot
+ enc.ReceiptRoot = e.ReceiptRoot
+ enc.LogsHash = e.LogsHash
+ enc.Bloom = e.Bloom
+ enc.Receipts = e.Receipts
+ enc.Rejected = e.Rejected
+ enc.Difficulty = e.Difficulty
+ enc.GasUsed = e.GasUsed
+ enc.BaseFee = e.BaseFee
+ enc.WithdrawalsRoot = e.WithdrawalsRoot
+ enc.CurrentExcessBlobGas = e.CurrentExcessBlobGas
+ enc.CurrentBlobGasUsed = e.CurrentBlobGasUsed
+ enc.RequestsHash = e.RequestsHash
+ if e.Requests != nil {
+ enc.Requests = make([]hexutil.Bytes, len(e.Requests))
+ for k, v := range e.Requests {
+ enc.Requests[k] = v
+ }
+ }
+ return json.Marshal(&enc)
+}
+
+// UnmarshalJSON unmarshals from JSON.
+func (e *ExecutionResult) UnmarshalJSON(input []byte) error {
+ 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"`
+ CurrentExcessBlobGas *math.HexOrDecimal64 `json:"currentExcessBlobGas,omitempty"`
+ CurrentBlobGasUsed *math.HexOrDecimal64 `json:"blobGasUsed,omitempty"`
+ RequestsHash *common.Hash `json:"requestsHash,omitempty"`
+ Requests []hexutil.Bytes `json:"requests"`
+ }
+ var dec ExecutionResult
+ if err := json.Unmarshal(input, &dec); err != nil {
+ return err
+ }
+ if dec.StateRoot != nil {
+ e.StateRoot = *dec.StateRoot
+ }
+ if dec.TxRoot != nil {
+ e.TxRoot = *dec.TxRoot
+ }
+ if dec.ReceiptRoot != nil {
+ e.ReceiptRoot = *dec.ReceiptRoot
+ }
+ if dec.LogsHash != nil {
+ e.LogsHash = *dec.LogsHash
+ }
+ if dec.Bloom == nil {
+ return errors.New("missing required field 'logsBloom' for ExecutionResult")
+ }
+ e.Bloom = *dec.Bloom
+ if dec.Receipts != nil {
+ e.Receipts = *dec.Receipts
+ }
+ if dec.Rejected != nil {
+ e.Rejected = dec.Rejected
+ }
+ if dec.Difficulty == nil {
+ return errors.New("missing required field 'currentDifficulty' for ExecutionResult")
+ }
+ e.Difficulty = dec.Difficulty
+ if dec.GasUsed != nil {
+ e.GasUsed = *dec.GasUsed
+ }
+ if dec.BaseFee != nil {
+ e.BaseFee = dec.BaseFee
+ }
+ if dec.WithdrawalsRoot != nil {
+ e.WithdrawalsRoot = dec.WithdrawalsRoot
+ }
+ if dec.CurrentExcessBlobGas != nil {
+ e.CurrentExcessBlobGas = dec.CurrentExcessBlobGas
+ }
+ if dec.CurrentBlobGasUsed != nil {
+ e.CurrentBlobGasUsed = dec.CurrentBlobGasUsed
+ }
+ if dec.RequestsHash != nil {
+ e.RequestsHash = dec.RequestsHash
+ }
+ if dec.Requests != nil {
+ e.Requests = make([][]byte, len(dec.Requests))
+ for k, v := range dec.Requests {
+ e.Requests[k] = v
+ }
+ }
+ return nil
+}
diff --git a/cmd/evm/internal/t8ntool/transaction.go b/cmd/evm/internal/t8ntool/transaction.go
index 7f66ba4d85..64e21b24fd 100644
--- a/cmd/evm/internal/t8ntool/transaction.go
+++ b/cmd/evm/internal/t8ntool/transaction.go
@@ -133,7 +133,7 @@ func Transaction(ctx *cli.Context) error {
r.Address = sender
}
// Check intrinsic gas
- if gas, err := core.IntrinsicGas(tx.Data(), tx.AccessList(), tx.To() == nil,
+ if gas, err := core.IntrinsicGas(tx.Data(), tx.AccessList(), tx.AuthList(), tx.To() == 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)
diff --git a/cmd/evm/internal/t8ntool/transition.go b/cmd/evm/internal/t8ntool/transition.go
index d5d0890d98..33e244f947 100644
--- a/cmd/evm/internal/t8ntool/transition.go
+++ b/cmd/evm/internal/t8ntool/transition.go
@@ -82,7 +82,9 @@ type input struct {
}
func Transition(ctx *cli.Context) error {
- var getTracer = func(txIndex int, txHash common.Hash) (*tracers.Tracer, io.WriteCloser, error) { return nil, nil, nil }
+ var getTracer = func(txIndex int, txHash common.Hash, chainConfig *params.ChainConfig) (*tracers.Tracer, io.WriteCloser, error) {
+ return nil, nil, nil
+ }
baseDir, err := createBasedir(ctx)
if err != nil {
@@ -95,9 +97,8 @@ func Transition(ctx *cli.Context) error {
DisableStack: ctx.Bool(TraceDisableStackFlag.Name),
EnableMemory: ctx.Bool(TraceEnableMemoryFlag.Name),
EnableReturnData: ctx.Bool(TraceEnableReturnDataFlag.Name),
- Debug: true,
}
- getTracer = func(txIndex int, txHash common.Hash) (*tracers.Tracer, io.WriteCloser, error) {
+ getTracer = func(txIndex int, txHash common.Hash, _ *params.ChainConfig) (*tracers.Tracer, io.WriteCloser, error) {
traceFile, err := os.Create(filepath.Join(baseDir, fmt.Sprintf("trace-%d-%v.jsonl", txIndex, txHash.String())))
if err != nil {
return nil, nil, NewError(ErrorIO, fmt.Errorf("failed creating trace-file: %v", err))
@@ -121,12 +122,12 @@ func Transition(ctx *cli.Context) error {
if ctx.IsSet(TraceTracerConfigFlag.Name) {
config = []byte(ctx.String(TraceTracerConfigFlag.Name))
}
- getTracer = func(txIndex int, txHash common.Hash) (*tracers.Tracer, io.WriteCloser, error) {
+ getTracer = func(txIndex int, txHash common.Hash, chainConfig *params.ChainConfig) (*tracers.Tracer, io.WriteCloser, error) {
traceFile, err := os.Create(filepath.Join(baseDir, fmt.Sprintf("trace-%d-%v.json", txIndex, txHash.String())))
if err != nil {
return nil, nil, NewError(ErrorIO, fmt.Errorf("failed creating trace-file: %v", err))
}
- tracer, err := tracers.DefaultDirectory.New(ctx.String(TraceTracerFlag.Name), nil, config)
+ tracer, err := tracers.DefaultDirectory.New(ctx.String(TraceTracerFlag.Name), nil, config, chainConfig)
if err != nil {
return nil, nil, NewError(ErrorConfig, fmt.Errorf("failed instantiating tracer: %w", err))
}
diff --git a/cmd/evm/main.go b/cmd/evm/main.go
index f9a2a075d0..0e6f6fa5be 100644
--- a/cmd/evm/main.go
+++ b/cmd/evm/main.go
@@ -19,10 +19,14 @@ package main
import (
"fmt"
- "math/big"
+ "io/fs"
"os"
+ "path/filepath"
"github.com/ethereum/go-ethereum/cmd/evm/internal/t8ntool"
+ "github.com/ethereum/go-ethereum/core/state"
+ "github.com/ethereum/go-ethereum/core/tracing"
+ "github.com/ethereum/go-ethereum/eth/tracers/logger"
"github.com/ethereum/go-ethereum/internal/debug"
"github.com/ethereum/go-ethereum/internal/flags"
"github.com/urfave/cli/v2"
@@ -32,209 +36,182 @@ import (
_ "github.com/ethereum/go-ethereum/eth/tracers/native"
)
+// Some other nice-to-haves:
+// * accumulate traces into an object to bundle with test
+// * write tx identifier for trace before hand (blocktest only)
+// * combine blocktest and statetest runner logic using unified test interface
+
+const traceCategory = "TRACING"
+
var (
- DebugFlag = &cli.BoolFlag{
- Name: "debug",
- Usage: "output full trace logs",
- Category: flags.VMCategory,
- }
- StatDumpFlag = &cli.BoolFlag{
- Name: "statdump",
- Usage: "displays stack and heap memory information",
- Category: flags.VMCategory,
- }
- CodeFlag = &cli.StringFlag{
- 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 ",
- Category: flags.VMCategory,
- }
- GasFlag = &cli.Uint64Flag{
- 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),
- Category: flags.VMCategory,
- }
- ValueFlag = &flags.BigFlag{
- 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",
- Category: flags.VMCategory,
- }
- InputFlag = &cli.StringFlag{
- Name: "input",
- Usage: "input for the EVM",
- Category: flags.VMCategory,
- }
- InputFileFlag = &cli.StringFlag{
- Name: "inputfile",
- Usage: "file containing input for the EVM",
- Category: flags.VMCategory,
+ // Test running flags.
+ RunFlag = &cli.StringFlag{
+ Name: "run",
+ Value: ".*",
+ Usage: "Run only those tests matching the regular expression.",
}
BenchFlag = &cli.BoolFlag{
Name: "bench",
Usage: "benchmark the execution",
Category: flags.VMCategory,
}
- CreateFlag = &cli.BoolFlag{
- Name: "create",
- Usage: "indicates the action should be create rather than call",
- Category: flags.VMCategory,
+ WitnessCrossCheckFlag = &cli.BoolFlag{
+ Name: "cross-check",
+ Aliases: []string{"xc"},
+ Usage: "Cross-check stateful execution against stateless, verifying the witness generation.",
}
- GenesisFlag = &cli.StringFlag{
- Name: "prestate",
- Usage: "JSON file with prestate (genesis) config",
- Category: flags.VMCategory,
+
+ // Debugging flags.
+ DumpFlag = &cli.BoolFlag{
+ Name: "dump",
+ Usage: "dumps the state after the run",
}
- MachineFlag = &cli.BoolFlag{
- Name: "json",
- Usage: "output trace logs in machine readable format (json)",
- Category: flags.VMCategory,
+ HumanReadableFlag = &cli.BoolFlag{
+ Name: "human",
+ Usage: "\"Human-readable\" output",
}
- SenderFlag = &cli.StringFlag{
- Name: "sender",
- Usage: "The transaction origin",
- Category: flags.VMCategory,
+ StatDumpFlag = &cli.BoolFlag{
+ Name: "statdump",
+ Usage: "displays stack and heap memory information",
}
- ReceiverFlag = &cli.StringFlag{
- Name: "receiver",
- Usage: "The transaction receiver (execution context)",
- Category: flags.VMCategory,
+
+ // Tracing flags.
+ TraceFlag = &cli.BoolFlag{
+ Name: "trace",
+ Usage: "Enable tracing and output trace log.",
+ Category: traceCategory,
+ }
+ TraceFormatFlag = &cli.StringFlag{
+ Name: "trace.format",
+ Usage: "Trace output format to use (struct|json)",
+ Value: "struct",
+ Category: traceCategory,
}
- DisableMemoryFlag = &cli.BoolFlag{
- Name: "nomemory",
+ TraceDisableMemoryFlag = &cli.BoolFlag{
+ Name: "trace.nomemory",
+ Aliases: []string{"nomemory"},
Value: true,
Usage: "disable memory output",
- Category: flags.VMCategory,
+ Category: traceCategory,
}
- DisableStackFlag = &cli.BoolFlag{
- Name: "nostack",
+ TraceDisableStackFlag = &cli.BoolFlag{
+ Name: "trace.nostack",
+ Aliases: []string{"nostack"},
Usage: "disable stack output",
- Category: flags.VMCategory,
+ Category: traceCategory,
}
- DisableStorageFlag = &cli.BoolFlag{
- Name: "nostorage",
+ TraceDisableStorageFlag = &cli.BoolFlag{
+ Name: "trace.nostorage",
+ Aliases: []string{"nostorage"},
Usage: "disable storage output",
- Category: flags.VMCategory,
+ Category: traceCategory,
}
- DisableReturnDataFlag = &cli.BoolFlag{
- Name: "noreturndata",
+ TraceDisableReturnDataFlag = &cli.BoolFlag{
+ Name: "trace.noreturndata",
+ Aliases: []string{"noreturndata"},
Value: true,
Usage: "enable return data output",
- Category: flags.VMCategory,
+ Category: traceCategory,
}
-)
-var stateTransitionCommand = &cli.Command{
- Name: "transition",
- Aliases: []string{"t8n"},
- Usage: "Executes a full state transition",
- Action: t8ntool.Transition,
- Flags: []cli.Flag{
- t8ntool.TraceFlag,
- t8ntool.TraceTracerFlag,
- t8ntool.TraceTracerConfigFlag,
- t8ntool.TraceEnableMemoryFlag,
- t8ntool.TraceDisableStackFlag,
- t8ntool.TraceEnableReturnDataFlag,
- t8ntool.TraceEnableCallFramesFlag,
- t8ntool.OutputBasedir,
- t8ntool.OutputAllocFlag,
- t8ntool.OutputResultFlag,
- t8ntool.OutputBodyFlag,
- t8ntool.InputAllocFlag,
- t8ntool.InputEnvFlag,
- t8ntool.InputTxsFlag,
- t8ntool.ForknameFlag,
- t8ntool.ChainIDFlag,
- t8ntool.RewardFlag,
- },
-}
-
-var transactionCommand = &cli.Command{
- Name: "transaction",
- Aliases: []string{"t9n"},
- Usage: "Performs transaction validation",
- Action: t8ntool.Transaction,
- Flags: []cli.Flag{
- t8ntool.InputTxsFlag,
- t8ntool.ChainIDFlag,
- t8ntool.ForknameFlag,
- },
-}
+ // Deprecated flags.
+ DebugFlag = &cli.BoolFlag{
+ Name: "debug",
+ Usage: "output full trace logs (deprecated)",
+ Hidden: true,
+ Category: traceCategory,
+ }
+ MachineFlag = &cli.BoolFlag{
+ Name: "json",
+ Usage: "output trace logs in machine readable format, json (deprecated)",
+ Hidden: true,
+ Category: traceCategory,
+ }
+)
-var blockBuilderCommand = &cli.Command{
- Name: "block-builder",
- Aliases: []string{"b11r"},
- Usage: "Builds a block",
- Action: t8ntool.BuildBlock,
- Flags: []cli.Flag{
- t8ntool.OutputBasedir,
- t8ntool.OutputBlockFlag,
- t8ntool.InputHeaderFlag,
- t8ntool.InputOmmersFlag,
- t8ntool.InputWithdrawalsFlag,
- t8ntool.InputTxsRlpFlag,
- t8ntool.SealCliqueFlag,
- },
-}
+// Command definitions.
+var (
+ stateTransitionCommand = &cli.Command{
+ Name: "transition",
+ Aliases: []string{"t8n"},
+ Usage: "Executes a full state transition",
+ Action: t8ntool.Transition,
+ Flags: []cli.Flag{
+ t8ntool.TraceFlag,
+ t8ntool.TraceTracerFlag,
+ t8ntool.TraceTracerConfigFlag,
+ t8ntool.TraceEnableMemoryFlag,
+ t8ntool.TraceDisableStackFlag,
+ t8ntool.TraceEnableReturnDataFlag,
+ t8ntool.TraceEnableCallFramesFlag,
+ t8ntool.OutputBasedir,
+ t8ntool.OutputAllocFlag,
+ t8ntool.OutputResultFlag,
+ t8ntool.OutputBodyFlag,
+ t8ntool.InputAllocFlag,
+ t8ntool.InputEnvFlag,
+ t8ntool.InputTxsFlag,
+ t8ntool.ForknameFlag,
+ t8ntool.ChainIDFlag,
+ t8ntool.RewardFlag,
+ },
+ }
+ transactionCommand = &cli.Command{
+ Name: "transaction",
+ Aliases: []string{"t9n"},
+ Usage: "Performs transaction validation",
+ Action: t8ntool.Transaction,
+ Flags: []cli.Flag{
+ t8ntool.InputTxsFlag,
+ t8ntool.ChainIDFlag,
+ t8ntool.ForknameFlag,
+ },
+ }
-// vmFlags contains flags related to running the EVM.
-var vmFlags = []cli.Flag{
- CodeFlag,
- CodeFileFlag,
- CreateFlag,
- GasFlag,
- PriceFlag,
- ValueFlag,
- InputFlag,
- InputFileFlag,
- GenesisFlag,
- SenderFlag,
- ReceiverFlag,
-}
+ blockBuilderCommand = &cli.Command{
+ Name: "block-builder",
+ Aliases: []string{"b11r"},
+ Usage: "Builds a block",
+ Action: t8ntool.BuildBlock,
+ Flags: []cli.Flag{
+ t8ntool.OutputBasedir,
+ t8ntool.OutputBlockFlag,
+ t8ntool.InputHeaderFlag,
+ t8ntool.InputOmmersFlag,
+ t8ntool.InputWithdrawalsFlag,
+ t8ntool.InputTxsRlpFlag,
+ t8ntool.SealCliqueFlag,
+ },
+ }
+)
// traceFlags contains flags that configure tracing output.
var traceFlags = []cli.Flag{
- BenchFlag,
+ TraceFlag,
+ TraceFormatFlag,
+ TraceDisableStackFlag,
+ TraceDisableMemoryFlag,
+ TraceDisableStorageFlag,
+ TraceDisableReturnDataFlag,
+
+ // deprecated
DebugFlag,
- DumpFlag,
MachineFlag,
- StatDumpFlag,
- DisableMemoryFlag,
- DisableStackFlag,
- DisableStorageFlag,
- DisableReturnDataFlag,
}
var app = flags.NewApp("the evm command line interface")
func init() {
- app.Flags = flags.Merge(vmFlags, traceFlags, debug.Flags)
+ app.Flags = debug.Flags
app.Commands = []*cli.Command{
- compileCommand,
- disasmCommand,
runCommand,
blockTestCommand,
stateTestCommand,
stateTransitionCommand,
transactionCommand,
blockBuilderCommand,
+ eofParseCommand,
+ eofDumpCommand,
}
app.Before = func(ctx *cli.Context) error {
flags.MigrateGlobalFlags(ctx)
@@ -248,11 +225,66 @@ func init() {
func main() {
if err := app.Run(os.Args); err != nil {
- code := 1
- if ec, ok := err.(*t8ntool.NumberedError); ok {
- code = ec.ExitCode()
+ fmt.Fprintln(os.Stderr, err)
+ os.Exit(1)
+ }
+}
+
+// tracerFromFlags parses the cli flags and returns the specified tracer.
+func tracerFromFlags(ctx *cli.Context) *tracing.Hooks {
+ config := &logger.Config{
+ EnableMemory: !ctx.Bool(TraceDisableMemoryFlag.Name),
+ DisableStack: ctx.Bool(TraceDisableStackFlag.Name),
+ DisableStorage: ctx.Bool(TraceDisableStorageFlag.Name),
+ EnableReturnData: !ctx.Bool(TraceDisableReturnDataFlag.Name),
+ }
+ switch {
+ case ctx.Bool(TraceFlag.Name):
+ switch format := ctx.String(TraceFormatFlag.Name); format {
+ case "struct":
+ return logger.NewStreamingStructLogger(config, os.Stderr).Hooks()
+ case "json":
+ return logger.NewJSONLogger(config, os.Stderr)
+ case "md", "markdown":
+ return logger.NewMarkdownLogger(config, os.Stderr).Hooks()
+ default:
+ fmt.Fprintf(os.Stderr, "unknown trace format: %q\n", format)
+ os.Exit(1)
+ return nil
}
+ // Deprecated ways of configuring tracing.
+ case ctx.Bool(MachineFlag.Name):
+ return logger.NewJSONLogger(config, os.Stderr)
+ case ctx.Bool(DebugFlag.Name):
+ return logger.NewStreamingStructLogger(config, os.Stderr).Hooks()
+ default:
+ return nil
+ }
+}
+
+// collectJSONFiles walks the given path and accumulates all files with json
+// extension.
+func collectJSONFiles(path string) []string {
+ var out []string
+ err := filepath.Walk(path, func(path string, info fs.FileInfo, err error) error {
+ if err != nil {
+ return err
+ }
+ if !info.IsDir() && filepath.Ext(info.Name()) == ".json" {
+ out = append(out, path)
+ }
+ return nil
+ })
+ if err != nil {
fmt.Fprintln(os.Stderr, err)
- os.Exit(code)
}
+ return out
+}
+
+// dump returns a state dump for the most current trie.
+func dump(s *state.StateDB) *state.Dump {
+ root := s.IntermediateRoot(false)
+ cpy, _ := state.New(root, s.Database())
+ dump := cpy.RawDump(nil)
+ return &dump
}
diff --git a/cmd/evm/reporter.go b/cmd/evm/reporter.go
new file mode 100644
index 0000000000..f6249e1843
--- /dev/null
+++ b/cmd/evm/reporter.go
@@ -0,0 +1,87 @@
+// Copyright 2024 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 (
+ "encoding/json"
+ "fmt"
+
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/core/state"
+ "github.com/urfave/cli/v2"
+)
+
+const (
+ PASS = "\033[32mPASS\033[0m"
+ FAIL = "\033[31mFAIL\033[0m"
+)
+
+// testResult 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 testResult struct {
+ Name string `json:"name"`
+ Pass bool `json:"pass"`
+ Root *common.Hash `json:"stateRoot,omitempty"`
+ Fork string `json:"fork"`
+ Error string `json:"error,omitempty"`
+ State *state.Dump `json:"state,omitempty"`
+ Stats *execStats `json:"benchStats,omitempty"`
+}
+
+func (r testResult) String() string {
+ var status string
+ if r.Pass {
+ status = fmt.Sprintf("[%s]", PASS)
+ } else {
+ status = fmt.Sprintf("[%s]", FAIL)
+ }
+ info := r.Name
+ m := parseTestMetadata(r.Name)
+ if m != nil {
+ info = fmt.Sprintf("%s %s, param=%s", m.module, m.function, m.parameters)
+ }
+ var extra string
+ if !r.Pass {
+ extra = fmt.Sprintf(", err=%v, fork=%s", r.Error, r.Fork)
+ }
+ out := fmt.Sprintf("%s %s%s", status, info, extra)
+ if r.State != nil {
+ state, _ := json.MarshalIndent(r.State, "", " ")
+ out += "\n" + string(state)
+ }
+ return out
+}
+
+// report prints the after-test summary.
+func report(ctx *cli.Context, results []testResult) {
+ if ctx.Bool(HumanReadableFlag.Name) {
+ pass := 0
+ for _, r := range results {
+ if r.Pass {
+ pass++
+ }
+ }
+ for _, r := range results {
+ fmt.Println(r)
+ }
+ fmt.Println("--")
+ fmt.Printf("%d tests passed, %d tests failed.\n", pass, len(results)-pass)
+ return
+ }
+ out, _ := json.MarshalIndent(results, "", " ")
+ fmt.Println(string(out))
+}
diff --git a/cmd/evm/runner.go b/cmd/evm/runner.go
index c9923dab02..ab1b140f9f 100644
--- a/cmd/evm/runner.go
+++ b/cmd/evm/runner.go
@@ -18,25 +18,27 @@ package main
import (
"bytes"
+ "encoding/hex"
"encoding/json"
"fmt"
"io"
"math/big"
"os"
goruntime "runtime"
+ "slices"
+ "strings"
"testing"
"time"
- "github.com/ethereum/go-ethereum/cmd/evm/internal/compiler"
"github.com/ethereum/go-ethereum/cmd/utils"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/core"
"github.com/ethereum/go-ethereum/core/rawdb"
"github.com/ethereum/go-ethereum/core/state"
"github.com/ethereum/go-ethereum/core/tracing"
+ "github.com/ethereum/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/core/vm"
"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/params"
"github.com/ethereum/go-ethereum/triedb"
@@ -50,14 +52,83 @@ var runCommand = &cli.Command{
Usage: "Run arbitrary evm binary",
ArgsUsage: "",
Description: `The run command runs arbitrary EVM code.`,
- Flags: flags.Merge(vmFlags, traceFlags),
+ Flags: slices.Concat([]cli.Flag{
+ BenchFlag,
+ CodeFileFlag,
+ CreateFlag,
+ GasFlag,
+ GenesisFlag,
+ InputFlag,
+ InputFileFlag,
+ PriceFlag,
+ ReceiverFlag,
+ SenderFlag,
+ ValueFlag,
+ StatDumpFlag,
+ DumpFlag,
+ }, traceFlags),
}
+var (
+ CodeFileFlag = &cli.StringFlag{
+ Name: "codefile",
+ Usage: "File containing EVM code. If '-' is specified, code is read from stdin ",
+ Category: flags.VMCategory,
+ }
+ CreateFlag = &cli.BoolFlag{
+ Name: "create",
+ Usage: "Indicates the action should be create rather than call",
+ Category: flags.VMCategory,
+ }
+ GasFlag = &cli.Uint64Flag{
+ Name: "gas",
+ Usage: "Gas limit for the evm",
+ Value: 10000000000,
+ Category: flags.VMCategory,
+ }
+ GenesisFlag = &cli.StringFlag{
+ Name: "prestate",
+ Usage: "JSON file with prestate (genesis) config",
+ Category: flags.VMCategory,
+ }
+ InputFlag = &cli.StringFlag{
+ Name: "input",
+ Usage: "Input for the EVM",
+ Category: flags.VMCategory,
+ }
+ InputFileFlag = &cli.StringFlag{
+ Name: "inputfile",
+ Usage: "File containing input for the EVM",
+ Category: flags.VMCategory,
+ }
+ PriceFlag = &flags.BigFlag{
+ Name: "price",
+ Usage: "Price set for the evm",
+ Value: new(big.Int),
+ Category: flags.VMCategory,
+ }
+ ReceiverFlag = &cli.StringFlag{
+ Name: "receiver",
+ Usage: "The transaction receiver (execution context)",
+ Category: flags.VMCategory,
+ }
+ SenderFlag = &cli.StringFlag{
+ Name: "sender",
+ Usage: "The transaction origin",
+ Category: flags.VMCategory,
+ }
+ ValueFlag = &flags.BigFlag{
+ Name: "value",
+ Usage: "Value set for the evm",
+ Value: new(big.Int),
+ Category: flags.VMCategory,
+ }
+)
+
// readGenesis will read the given JSON format genesis file and return
// the initialized Genesis structure
func readGenesis(genesisPath string) *core.Genesis {
// Make sure we have a valid genesis JSON
- //genesisPath := ctx.Args().First()
if len(genesisPath) == 0 {
utils.Fatalf("Must supply path to genesis JSON file")
}
@@ -75,51 +146,60 @@ func readGenesis(genesisPath string) *core.Genesis {
}
type execStats struct {
- time time.Duration // The execution time.
- allocs int64 // The number of heap allocations during execution.
- bytesAllocated int64 // The cumulative number of bytes allocated during execution.
+ Time time.Duration `json:"time"` // The execution Time.
+ Allocs int64 `json:"allocs"` // The number of heap allocations during execution.
+ BytesAllocated int64 `json:"bytesAllocated"` // The cumulative number of bytes allocated during execution.
+ GasUsed uint64 `json:"gasUsed"` // the amount of gas used during execution
}
-func timedExec(bench bool, execFunc func() ([]byte, uint64, error)) (output []byte, gasLeft uint64, stats execStats, err error) {
+func timedExec(bench bool, execFunc func() ([]byte, uint64, error)) ([]byte, execStats, error) {
if bench {
+ testing.Init()
+ // Do one warm-up run
+ output, gasUsed, err := execFunc()
result := testing.Benchmark(func(b *testing.B) {
for i := 0; i < b.N; i++ {
- output, gasLeft, err = execFunc()
+ haveOutput, haveGasUsed, haveErr := execFunc()
+ if !bytes.Equal(haveOutput, output) {
+ panic(fmt.Sprintf("output differs\nhave %x\nwant %x\n", haveOutput, output))
+ }
+ if haveGasUsed != gasUsed {
+ panic(fmt.Sprintf("gas differs, have %v want %v", haveGasUsed, gasUsed))
+ }
+ if haveErr != err {
+ panic(fmt.Sprintf("err differs, have %v want %v", haveErr, err))
+ }
}
})
-
// Get the average execution time from the benchmarking result.
// There are other useful stats here that could be reported.
- stats.time = time.Duration(result.NsPerOp())
- stats.allocs = result.AllocsPerOp()
- stats.bytesAllocated = result.AllocedBytesPerOp()
- } else {
- var memStatsBefore, memStatsAfter goruntime.MemStats
- goruntime.ReadMemStats(&memStatsBefore)
- startTime := time.Now()
- output, gasLeft, err = execFunc()
- stats.time = time.Since(startTime)
- goruntime.ReadMemStats(&memStatsAfter)
- stats.allocs = int64(memStatsAfter.Mallocs - memStatsBefore.Mallocs)
- stats.bytesAllocated = int64(memStatsAfter.TotalAlloc - memStatsBefore.TotalAlloc)
+ stats := execStats{
+ Time: time.Duration(result.NsPerOp()),
+ Allocs: result.AllocsPerOp(),
+ BytesAllocated: result.AllocedBytesPerOp(),
+ GasUsed: gasUsed,
+ }
+ return output, stats, err
}
-
- return output, gasLeft, stats, err
+ var memStatsBefore, memStatsAfter goruntime.MemStats
+ goruntime.ReadMemStats(&memStatsBefore)
+ t0 := time.Now()
+ output, gasUsed, err := execFunc()
+ duration := time.Since(t0)
+ goruntime.ReadMemStats(&memStatsAfter)
+ stats := execStats{
+ Time: duration,
+ Allocs: int64(memStatsAfter.Mallocs - memStatsBefore.Mallocs),
+ BytesAllocated: int64(memStatsAfter.TotalAlloc - memStatsBefore.TotalAlloc),
+ GasUsed: gasUsed,
+ }
+ return output, stats, err
}
func runCmd(ctx *cli.Context) error {
- logconfig := &logger.Config{
- EnableMemory: !ctx.Bool(DisableMemoryFlag.Name),
- DisableStack: ctx.Bool(DisableStackFlag.Name),
- DisableStorage: ctx.Bool(DisableStorageFlag.Name),
- EnableReturnData: !ctx.Bool(DisableReturnDataFlag.Name),
- Debug: ctx.Bool(DebugFlag.Name),
- }
-
var (
tracer *tracing.Hooks
- debugLogger *logger.StructLogger
- statedb *state.StateDB
+ prestate *state.StateDB
chainConfig *params.ChainConfig
sender = common.BytesToAddress([]byte("sender"))
receiver = common.BytesToAddress([]byte("receiver"))
@@ -127,15 +207,7 @@ func runCmd(ctx *cli.Context) error {
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)
- } else if ctx.Bool(DebugFlag.Name) {
- debugLogger = logger.NewStructLogger(logconfig)
- tracer = debugLogger.Hooks()
- } else {
- debugLogger = logger.NewStructLogger(logconfig)
- }
-
+ tracer = tracerFromFlags(ctx)
initialGas := ctx.Uint64(GasFlag.Name)
genesisConfig := new(core.Genesis)
genesisConfig.GasLimit = initialGas
@@ -156,7 +228,7 @@ func runCmd(ctx *cli.Context) error {
defer triedb.Close()
genesis := genesisConfig.MustCommit(db, triedb)
sdb := state.NewDatabase(triedb, nil)
- statedb, _ = state.New(genesis.Root(), sdb)
+ prestate, _ = state.New(genesis.Root(), sdb)
chainConfig = genesisConfig.Config
if ctx.String(SenderFlag.Name) != "" {
@@ -169,51 +241,38 @@ func runCmd(ctx *cli.Context) error {
var code []byte
codeFileFlag := ctx.String(CodeFileFlag.Name)
- codeFlag := ctx.String(CodeFlag.Name)
+ hexcode := ctx.Args().First()
- // The '--code' or '--codefile' flag overrides code in state
- if codeFileFlag != "" || codeFlag != "" {
- var hexcode []byte
- if codeFileFlag != "" {
- var err error
- // If - is specified, it means that code comes from stdin
- if codeFileFlag == "-" {
- //Try reading from stdin
- if hexcode, err = io.ReadAll(os.Stdin); err != nil {
- fmt.Printf("Could not load code from stdin: %v\n", err)
- os.Exit(1)
- }
- } else {
- // Codefile with hex assembly
- if hexcode, err = os.ReadFile(codeFileFlag); err != nil {
- fmt.Printf("Could not load code from file: %v\n", err)
- os.Exit(1)
- }
- }
- } else {
- hexcode = []byte(codeFlag)
- }
- hexcode = bytes.TrimSpace(hexcode)
- if len(hexcode)%2 != 0 {
- fmt.Printf("Invalid input length for hex data (%d)\n", len(hexcode))
- os.Exit(1)
- }
- code = common.FromHex(string(hexcode))
- } else if fn := ctx.Args().First(); len(fn) > 0 {
- // EASM-file to compile
- src, err := os.ReadFile(fn)
+ // The '--codefile' flag overrides code in state
+ if codeFileFlag == "-" {
+ // If - is specified, it means that code comes from stdin
+ // Try reading from stdin
+ input, err := io.ReadAll(os.Stdin)
if err != nil {
- return err
+ fmt.Printf("Could not load code from stdin: %v\n", err)
+ os.Exit(1)
}
- bin, err := compiler.Compile(fn, src, false)
+ hexcode = string(input)
+ } else if codeFileFlag != "" {
+ // Codefile with hex assembly
+ input, err := os.ReadFile(codeFileFlag)
if err != nil {
- return err
+ fmt.Printf("Could not load code from file: %v\n", err)
+ os.Exit(1)
}
- code = common.Hex2Bytes(bin)
+ hexcode = string(input)
+ }
+
+ hexcode = strings.TrimSpace(hexcode)
+ if len(hexcode)%2 != 0 {
+ fmt.Printf("Invalid input length for hex data (%d)\n", len(hexcode))
+ os.Exit(1)
}
+ code = common.FromHex(hexcode)
+
runtimeConfig := runtime.Config{
Origin: sender,
- State: statedb,
+ State: prestate,
GasLimit: initialGas,
GasPrice: flags.GlobalBig(ctx, PriceFlag.Name),
Value: flags.GlobalBig(ctx, ValueFlag.Name),
@@ -256,23 +315,28 @@ func runCmd(ctx *cli.Context) error {
if ctx.Bool(CreateFlag.Name) {
input = append(code, input...)
execFunc = func() ([]byte, uint64, error) {
+ // don't mutate the state!
+ runtimeConfig.State = prestate.Copy()
output, _, gasLeft, err := runtime.Create(input, &runtimeConfig)
return output, gasLeft, err
}
} else {
if len(code) > 0 {
- statedb.SetCode(receiver, code)
+ prestate.SetCode(receiver, code)
}
execFunc = func() ([]byte, uint64, error) {
- return runtime.Call(receiver, input, &runtimeConfig)
+ // don't mutate the state!
+ runtimeConfig.State = prestate.Copy()
+ output, gasLeft, err := runtime.Call(receiver, input, &runtimeConfig)
+ return output, initialGas - gasLeft, err
}
}
bench := ctx.Bool(BenchFlag.Name)
- output, leftOverGas, stats, err := timedExec(bench, execFunc)
+ output, stats, err := timedExec(bench, execFunc)
if ctx.Bool(DumpFlag.Name) {
- root, _, err := statedb.Commit(genesisConfig.Number, true)
+ root, _, err := runtimeConfig.State.Commit(genesisConfig.Number, true)
if err != nil {
fmt.Printf("Failed to commit changes %v\n", err)
return err
@@ -286,12 +350,10 @@ func runCmd(ctx *cli.Context) error {
}
if ctx.Bool(DebugFlag.Name) {
- if debugLogger != nil {
- fmt.Fprintln(os.Stderr, "#### TRACE ####")
- logger.WriteTrace(os.Stderr, debugLogger.StructLogs())
+ if logs := runtimeConfig.State.Logs(); len(logs) > 0 {
+ fmt.Fprintln(os.Stderr, "### LOGS")
+ writeLogs(os.Stderr, logs)
}
- fmt.Fprintln(os.Stderr, "#### LOGS ####")
- logger.WriteLogs(os.Stderr, statedb.Logs())
}
if bench || ctx.Bool(StatDumpFlag.Name) {
@@ -299,7 +361,7 @@ func runCmd(ctx *cli.Context) error {
execution time: %v
allocations: %d
allocated bytes: %d
-`, initialGas-leftOverGas, stats.time, stats.allocs, stats.bytesAllocated)
+`, stats.GasUsed, stats.Time, stats.Allocs, stats.BytesAllocated)
}
if tracer == nil {
fmt.Printf("%#x\n", output)
@@ -310,3 +372,16 @@ allocated bytes: %d
return nil
}
+
+// writeLogs writes vm logs in a readable format to the given writer
+func writeLogs(writer io.Writer, logs []*types.Log) {
+ for _, log := range logs {
+ fmt.Fprintf(writer, "LOG%d: %x bn=%d txi=%x\n", len(log.Topics), log.Address, log.BlockNumber, log.TxIndex)
+
+ for i, topic := range log.Topics {
+ fmt.Fprintf(writer, "%08d %x\n", i, topic)
+ }
+ fmt.Fprint(writer, hex.Dump(log.Data))
+ fmt.Fprintln(writer)
+ }
+}
diff --git a/cmd/evm/staterunner.go b/cmd/evm/staterunner.go
index 4514367e8a..323b7d60ab 100644
--- a/cmd/evm/staterunner.go
+++ b/cmd/evm/staterunner.go
@@ -21,106 +21,138 @@ import (
"encoding/json"
"fmt"
"os"
+ "regexp"
+ "slices"
"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/vm"
- "github.com/ethereum/go-ethereum/eth/tracers/logger"
+ "github.com/ethereum/go-ethereum/internal/flags"
"github.com/ethereum/go-ethereum/tests"
"github.com/urfave/cli/v2"
)
+var (
+ forkFlag = &cli.StringFlag{
+ Name: "statetest.fork",
+ Usage: "Only run tests for the specified fork.",
+ Category: flags.VMCategory,
+ }
+ idxFlag = &cli.IntFlag{
+ Name: "statetest.index",
+ Usage: "The index of the subtest to run.",
+ Category: flags.VMCategory,
+ Value: -1, // default to select all subtest indices
+ }
+)
var stateTestCommand = &cli.Command{
Action: stateTestCmd,
Name: "statetest",
Usage: "Executes the given state tests. Filenames can be fed via standard input (batch mode) or as an argument (one-off execution).",
ArgsUsage: "