From 097fe511dc8e3e5e62929901d0401b96dc7055ac Mon Sep 17 00:00:00 2001 From: Jared Wasinger Date: Fri, 30 Jan 2026 12:59:00 -0500 Subject: [PATCH] update bal test fixtures. fix block test runner. fix issue where amsterdam fork was configuring bpo --- build/checksums.txt | 4 ++-- cmd/evm/blockrunner.go | 3 +-- consensus/misc/eip4844/eip4844.go | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/build/checksums.txt b/build/checksums.txt index 49a449f539..39a38e7143 100644 --- a/build/checksums.txt +++ b/build/checksums.txt @@ -7,8 +7,8 @@ a3192784375acec7eaec492799d5c5d0c47a2909a3cc40178898e4ecd20cc416 fixtures_devel # version:spec-tests-bal v5.0.0 # https://github.com/ethereum/execution-spec-tests/releases -# https://github.com/ethereum/execution-spec-tests/releases/download/bal%40v5.0.0 -17aecf8334da7f5d1025635c763a4be0dfbcdb0e659cc70a36e6a81bd3af06f2 fixtures_bal.tar.gz +# https://github.com/ethereum/execution-spec-tests/releases/download/bal%40v5.1.0 +c8a7406e6337c1dfd2540f0477afb8abe965c5ed2a63382d7a483eb818f79939 fixtures_bal.tar.gz # version:golang 1.25.1 # https://go.dev/dl/ diff --git a/cmd/evm/blockrunner.go b/cmd/evm/blockrunner.go index 0090cc12af..c674926825 100644 --- a/cmd/evm/blockrunner.go +++ b/cmd/evm/blockrunner.go @@ -20,7 +20,6 @@ import ( "bufio" "encoding/json" "fmt" - "github.com/ethereum/go-ethereum/cmd/utils" "maps" "os" "regexp" @@ -118,7 +117,7 @@ func runBlockTest(ctx *cli.Context, fname string) ([]testResult, error) { test := tests[name] result := &testResult{Name: name, Pass: true} var finalRoot *common.Hash - if err := test.Run(false, rawdb.PathScheme, ctx.Bool(WitnessCrossCheckFlag.Name), ctx.Bool(utils.ExperimentalBALFlag.Name), tracer, func(res error, chain *core.BlockChain) { + if err := test.Run(false, rawdb.PathScheme, ctx.Bool(WitnessCrossCheckFlag.Name), false, tracer, func(res error, chain *core.BlockChain) { if ctx.Bool(DumpFlag.Name) { if s, _ := chain.State(); s != nil { result.State = dump(s) diff --git a/consensus/misc/eip4844/eip4844.go b/consensus/misc/eip4844/eip4844.go index 6078d21059..5d7c98ec84 100644 --- a/consensus/misc/eip4844/eip4844.go +++ b/consensus/misc/eip4844/eip4844.go @@ -70,7 +70,7 @@ func latestBlobConfig(cfg *params.ChainConfig, time uint64) *BlobConfig { case cfg.IsBPO3(london, time) && s.BPO3 != nil: bc = s.BPO3 case cfg.IsAmsterdam(london, time) && s.Amsterdam != nil: - bc = s.BPO2 + bc = s.Amsterdam case cfg.IsBPO2(london, time) && s.BPO2 != nil: bc = s.BPO2 case cfg.IsBPO1(london, time) && s.BPO1 != nil: