core, eth, tests: v1.17.3 upstream merge, develop gap & remaining CI/UT fixes

.github/workflows/commit-lint.yml

@@ -35,8 +35,8 @@ jobs:
             ${{ runner.os }}-node-
       - name: Install Deps
         run: |
-          npm install -g commitlint-plugin-function-rules @commitlint/cli
-          npm install --save-dev commitlint-plugin-function-rules @commitlint/cli
+          npm install -g commitlint-plugin-function-rules@2 @commitlint/cli@18 @commitlint/config-conventional@18
+          npm install --save-dev commitlint-plugin-function-rules@2 @commitlint/cli@18 @commitlint/config-conventional@18
       - uses: wagoid/commitlint-github-action@v5
         id: commitlint
         env:

.github/workflows/evm-tests.yml

@@ -7,7 +7,7 @@ on:
       - develop
 
   pull_request:
-    branches: 
+    branches:
       - master
       - develop
 
@@ -26,6 +26,10 @@ jobs:
 
     - name: Checkout code
       uses: actions/checkout@v4
+      with:
+        # Non-recursive: fetches testdata/evm-benchmarks but not the nested
+        # LegacyTests, so TestLegacyState self-skips (matching upstream).
+        submodules: true
 
     - uses: actions/cache@v4
       with:
@@ -50,5 +54,8 @@ jobs:
         ANDROID_HOME: "" # Skip android test
       run: |
         go mod download
-        cd tests && bash -x run-evm-tests.sh
+        # ci.go downloads the pinned fixtures (build/checksums.txt) and runs the
+        # suite — no shell wrapper or source patch. Non-short so fixtures download;
+        # -timeout 1h because full statetests exceed ci.go's 10m default.
+        go run build/ci.go test -timeout 1h ./tests/
         

build/checksums.txt

@@ -1,8 +1,8 @@
 # This file contains sha256 checksums of optional build dependencies.
 
-# version:spec-tests v5.4.0
+# version:spec-tests v5.1.0
 # https://github.com/ethereum/execution-spec-tests/releases
-# https://github.com/ethereum/execution-spec-tests/releases/download/v5.4.0
+# https://github.com/ethereum/execution-spec-tests/releases/download/v5.1.0
 a3192784375acec7eaec492799d5c5d0c47a2909a3cc40178898e4ecd20cc416  fixtures_develop.tar.gz
 
 # version:golang 1.25.10

build/ci.go

@@ -401,8 +401,8 @@ func doTest(cmdline []string) {
 		timeout  = flag.String("timeout", "10m", `Timeout of running tests`)
 		race     = flag.Bool("race", false, "Execute the race detector")
 		short    = flag.Bool("short", false, "Pass the 'short'-flag to go test")
-		// cachedir = flag.String("cachedir", "./build/cache", "directory for caching downloads")
-		threads = flag.Int("p", 1, "Number of CPU threads to use for testing")
+		cachedir = flag.String("cachedir", "./build/cache", "directory for caching downloads")
+		threads  = flag.Int("p", 1, "Number of CPU threads to use for testing")
 	)
 	flag.CommandLine.Parse(cmdline)
 
@@ -411,7 +411,7 @@ func doTest(cmdline []string) {
 
 	// Get test fixtures.
 	if !*short {
-		// downloadSpecTestFixtures(csdb, *cachedir)
+		downloadSpecTestFixtures(csdb, *cachedir)
 	}
 
 	// Configure the toolchain.

cmd/devp2p/internal/ethtest/chain_test.go

@@ -113,6 +113,16 @@ func TestEthProtocolNegotiation(t *testing.T) {
 			},
 			expected: uint32(64),
 		},
+		{
+			conn: &Conn{
+				ourHighestProtoVersion: eth.ETH70,
+			},
+			caps: []p2p.Cap{
+				{Name: "eth", Version: eth.ETH68},
+				{Name: "eth", Version: eth.ETH70},
+			},
+			expected: eth.ETH70,
+		},
 	}
 
 	for i, tt := range tests {

cmd/devp2p/internal/ethtest/conn.go

@@ -66,11 +66,10 @@ func (s *Suite) dialAs(key *ecdsa.PrivateKey) (*Conn, error) {
 		return nil, err
 	}
 	conn.caps = []p2p.Cap{
-		// TODO(Nathan): if Eth70 is enabled, change related test cases back to Eth70
-		{Name: "eth", Version: 70},
-		{Name: "eth", Version: 68},
+		{Name: "eth", Version: eth.ETH70},
+		{Name: "eth", Version: eth.ETH68},
 	}
-	conn.ourHighestProtoVersion = 68
+	conn.ourHighestProtoVersion = eth.ETH70
 	return &conn, nil
 }
 
@@ -157,7 +156,7 @@ func (c *Conn) ReadEth() (any, error) {
 		var msg any
 		switch int(code) {
 		case eth.StatusMsg:
-			msg = new(eth.StatusPacket68)
+			msg = new(eth.StatusPacket)
 		case eth.GetBlockHeadersMsg:
 			msg = new(eth.GetBlockHeadersPacket)
 		case eth.BlockHeadersMsg:
@@ -196,7 +195,7 @@ func (c *Conn) ReadSnap() (any, error) {
 			// Read until snap message.
 			continue
 		}
-		code -= baseProtoLen + ethProtoLen
+		code -= protoOffset(snapProto)
 
 		var msg any
 		switch int(code) {
@@ -227,7 +226,7 @@ func (c *Conn) ReadSnap() (any, error) {
 }
 
 // dialAndPeer creates a peer connection and runs the handshake.
-func (s *Suite) dialAndPeer(status *eth.StatusPacket68) (*Conn, error) {
+func (s *Suite) dialAndPeer(status *eth.StatusPacket) (*Conn, error) {
 	c, err := s.dial()
 	if err != nil {
 		return nil, err
@@ -240,7 +239,7 @@ func (s *Suite) dialAndPeer(status *eth.StatusPacket68) (*Conn, error) {
 
 // peer performs both the protocol handshake and the status message
 // exchange with the node in order to peer with it.
-func (c *Conn) peer(chain *Chain, status *eth.StatusPacket68) error {
+func (c *Conn) peer(chain *Chain, status *eth.StatusPacket) error {
 	if err := c.handshake(); err != nil {
 		return fmt.Errorf("handshake failed: %v", err)
 	}
@@ -313,58 +312,53 @@ func (c *Conn) negotiateEthProtocol(caps []p2p.Cap) {
 }
 
 // statusExchange performs a `Status` message exchange with the given node.
-func (c *Conn) statusExchange(chain *Chain, status *eth.StatusPacket68) error {
-loop:
+func (c *Conn) statusExchange(chain *Chain, status *eth.StatusPacket) error {
 	for {
 		code, data, err := c.Read()
 		if err != nil {
 			return fmt.Errorf("failed to read from connection: %w", err)
 		}
 		switch code {
 		case eth.StatusMsg + protoOffset(ethProto):
-			msg := new(eth.StatusPacket68)
-			if err := rlp.DecodeBytes(data, &msg); err != nil {
-				return fmt.Errorf("error decoding status packet: %w", err)
+			if c.negotiatedProtoVersion == 0 {
+				return errors.New("eth protocol version must be set in Conn")
+			}
+			msg := new(eth.StatusPacket)
+			if err := rlp.DecodeBytes(data, msg); err != nil {
+				return fmt.Errorf("error decoding eth/70 status packet: %w", err)
+			}
+			if uint(msg.ProtocolVersion) != c.negotiatedProtoVersion {
+				return fmt.Errorf("mismatched eth protocol version: node %d, negotiated %d", msg.ProtocolVersion, c.negotiatedProtoVersion)
 			}
-			if have, want := msg.Head, chain.blocks[chain.Len()-1].Hash(); have != want {
-				return fmt.Errorf("wrong head block in status, want:  %#x (block %d) have %#x",
+			if have, want := msg.LatestBlock, chain.blocks[chain.Len()-1].NumberU64(); have != want {
+				return fmt.Errorf("wrong latest block number in status: have %d, want %d", have, want)
+			}
+			if have, want := msg.LatestBlockHash, chain.blocks[chain.Len()-1].Hash(); have != want {
+				return fmt.Errorf("wrong latest block in status, want %#x (block %d), have %#x",
 					want, chain.blocks[chain.Len()-1].NumberU64(), have)
 			}
+			if msg.TD == nil || msg.TD.Cmp(chain.TD()) != 0 {
+				return fmt.Errorf("wrong total difficulty in status: have %v, want %v", msg.TD, chain.TD())
+			}
 			if have, want := msg.ForkID, chain.ForkID(); !reflect.DeepEqual(have, want) {
 				return fmt.Errorf("wrong fork ID in status: have %v, want %v", have, want)
 			}
-			for _, cap := range c.caps {
-				if cap.Name == "eth" && cap.Version == uint(msg.ProtocolVersion) {
-					break loop
-				}
-			}
-			// make sure eth protocol version is set for negotiation
-			if c.negotiatedProtoVersion == 0 {
-				return errors.New("eth protocol version must be set in Conn")
-			}
 			if status == nil {
-				// default status message
-				status = &eth.StatusPacket68{
+				status = &eth.StatusPacket{
 					ProtocolVersion: uint32(c.negotiatedProtoVersion),
 					NetworkID:       chain.config.ChainID.Uint64(),
 					TD:              chain.TD(),
-					Head:            chain.blocks[chain.Len()-1].Hash(),
 					Genesis:         chain.blocks[0].Hash(),
 					ForkID:          chain.ForkID(),
+					EarliestBlock:   0,
+					LatestBlock:     chain.blocks[chain.Len()-1].NumberU64(),
+					LatestBlockHash: chain.blocks[chain.Len()-1].Hash(),
 				}
 			}
 			if err := c.Write(ethProto, eth.StatusMsg, status); err != nil {
 				return fmt.Errorf("write to connection failed: %v", err)
 			}
-		case eth.UpgradeStatusMsg + protoOffset(ethProto):
-			msg := new(eth.UpgradeStatusPacket)
-			if err := rlp.DecodeBytes(data, &msg); err != nil {
-				return fmt.Errorf("error decoding status packet: %w", err)
-			}
-			if err := c.Write(ethProto, eth.UpgradeStatusMsg, msg); err != nil {
-				return fmt.Errorf("write to connection failed: %v", err)
-			}
-			break loop
+			return nil
 		case discMsg:
 			var msg []p2p.DiscReason
 			if rlp.DecodeBytes(data, &msg); len(msg) == 0 {
@@ -379,5 +373,4 @@ loop:
 			return fmt.Errorf("bad status message: code %d", code)
 		}
 	}
-	return nil
 }

cmd/devp2p/internal/ethtest/protocol.go

@@ -32,7 +32,7 @@ const (
 // Unexported devp2p protocol lengths from p2p package.
 const (
 	baseProtoLen = 16
-	ethProtoLen  = 17
+	ethProtoLen  = 18
 	snapProtoLen = 8
 )
 

cmd/geth/dbcmd.go

@@ -94,7 +94,6 @@ Remove blockchain and state databases`,
 			dbCompactCmd,
 			dbGetCmd,
 			dbDeleteCmd,
-			dbInspectTrieCmd,
 			dbPutCmd,
 			dbGetSlotsCmd,
 			dbDumpFreezerIndex,

cmd/keeper/go.mod

@@ -56,13 +56,11 @@ require (
 	github.com/kr/pretty v0.3.1 // indirect
 	github.com/kr/text v0.2.0 // indirect
 	github.com/libp2p/go-buffer-pool v0.1.0 // indirect
-	github.com/mattn/go-runewidth v0.0.15 // indirect
 	github.com/mimoo/StrobeGo v0.0.0-20210601165009-122bf33a46e0 // indirect
 	github.com/minio/sha256-simd v1.0.1 // indirect
 	github.com/mitchellh/mapstructure v1.5.0 // indirect
 	github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
-	github.com/olekukonko/tablewriter v0.0.5 // indirect
 	github.com/panjf2000/ants/v2 v2.4.5 // indirect
 	github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5 // indirect
 	github.com/pierrec/lz4/v4 v4.1.22 // indirect
@@ -76,7 +74,6 @@ require (
 	github.com/prysmaticlabs/gohashtree v0.0.4-beta.0.20240624100937-73632381301b // indirect
 	github.com/prysmaticlabs/prysm/v5 v5.3.2 // indirect
 	github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect
-	github.com/rivo/uniseg v0.4.7 // indirect
 	github.com/rogpeppe/go-internal v1.14.1 // indirect
 	github.com/rs/cors v1.8.2 // indirect
 	github.com/sasha-s/go-deadlock v0.3.1 // indirect

cmd/keeper/go.sum

@@ -146,8 +146,6 @@ github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0=
 github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/orderedcode v0.0.1 h1:UzfcAexk9Vhv8+9pNOgRu41f16lHq725vPwnSeiG/Us=
 github.com/google/orderedcode v0.0.1/go.mod h1:iVyU4/qPKHY5h/wSd6rZZCDcLJNxiWO6dvsYES2Sb20=
-github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad h1:a6HEuzUHeKH6hwfN/ZoQgRgVIWFJljSWa/zetS2WTvg=
-github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144=
 github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aNNg=
@@ -188,9 +186,6 @@ github.com/lib/pq v1.10.7 h1:p7ZhMD+KsSRozJr34udlUrhboJwWAgCg34+/ZZNvZZw=
 github.com/lib/pq v1.10.7/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
 github.com/libp2p/go-buffer-pool v0.1.0 h1:oK4mSFcQz7cTQIfqbe4MIj9gLW+mnanjyFtc6cdF0Y8=
 github.com/libp2p/go-buffer-pool v0.1.0/go.mod h1:N+vh8gMqimBzdKkSMVuydVDq+UV5QTWy5HSiZacSbPg=
-github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
-github.com/mattn/go-runewidth v0.0.15 h1:UNAjwbU9l54TA3KzvqLGxwWjHmMgBUVhBiTjelZgg3U=
-github.com/mattn/go-runewidth v0.0.15/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
 github.com/mimoo/StrobeGo v0.0.0-20181016162300-f8f6d4d2b643/go.mod h1:43+3pMjjKimDBf5Kr4ZFNGbLql1zKkbImw+fZbw3geM=
 github.com/mimoo/StrobeGo v0.0.0-20210601165009-122bf33a46e0 h1:QRUSJEgZn2Snx0EmT/QLXibWjSUDjKWvXIT19NBVp94=
 github.com/mimoo/StrobeGo v0.0.0-20210601165009-122bf33a46e0/go.mod h1:43+3pMjjKimDBf5Kr4ZFNGbLql1zKkbImw+fZbw3geM=
@@ -210,8 +205,6 @@ github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
 github.com/nxadm/tail v1.4.4 h1:DQuhQpB1tVlglWS2hLQ5OV6B5r8aGxSrPc5Qo6uTN78=
 github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
-github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec=
-github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY=
 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk=
 github.com/onsi/ginkgo v1.14.0 h1:2mOpI4JVVPBN+WQRa0WKH2eXR+Ey+uK4n7Zj0aYpIQA=
@@ -253,9 +246,6 @@ github.com/prysmaticlabs/prysm/v5 v5.3.2 h1:yV44gm5DENWG2l17JjjaWMCagJkwSZz5ZG6z
 github.com/prysmaticlabs/prysm/v5 v5.3.2/go.mod h1:2SaUMpJ+O8r/pcnNDMHbrk0Ki9ObQXvfRc+rQHovzVk=
 github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 h1:N/ElC8H3+5XpJzTSTfLsJV/mx9Q9g7kxmchpfZyxgzM=
 github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4=
-github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
-github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ=
-github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
 github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
 github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ=
 github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc=

cmd/utils/flags.go

@@ -2623,7 +2623,7 @@ func SetDNSDiscoveryDefaults(cfg *ethconfig.Config, genesis common.Hash) {
 
 // RegisterEthService adds an Ethereum client to the stack.
 // The second return value is the full node instance.
-func RegisterEthService(stack *node.Node, cfg *ethconfig.Config) (ethapi.Backend, *eth.Ethereum) {
+func RegisterEthService(stack *node.Node, cfg *ethconfig.Config) (*eth.EthAPIBackend, *eth.Ethereum) {
 	backend, err := eth.New(stack, cfg)
 	if err != nil {
 		Fatalf("Failed to register the Ethereum service: %v", err)
@@ -2633,7 +2633,7 @@ func RegisterEthService(stack *node.Node, cfg *ethconfig.Config) (ethapi.Backend
 }
 
 // RegisterEthStatsService configures the Ethereum Stats daemon and adds it to the node.
-func RegisterEthStatsService(stack *node.Node, backend ethapi.Backend, url string) {
+func RegisterEthStatsService(stack *node.Node, backend *eth.EthAPIBackend, url string) {
 	if err := ethstats.New(stack, backend, backend.Engine(), url); err != nil {
 		Fatalf("Failed to register the Ethereum Stats service: %v", err)
 	}

consensus/parlia/parlia.go

@@ -2104,8 +2104,6 @@ func (p *Parlia) getSystemMessage(from, toAddress common.Address, data []byte, v
 	}
 }
 
-// TODO(Nathan): need reflect EIP-7778 where called
-// use gp `*core.GasPool“ to replace `usedGas *uint64`
 func (p *Parlia) applyTransaction(
 	msg *core.Message,
 	state vm.StateDB,
@@ -2198,7 +2196,13 @@ func (p *Parlia) applyTransaction(
 		root = state.IntermediateRoot(p.chainConfig.IsEIP158(header.Number)).Bytes()
 	}
 	*usedGas += gasUsed
-	tracingReceipt = types.NewReceipt(root, false, *usedGas)
+	// Continue the receipt (refund-inclusive) chain from the previous receipt;
+	// usedGas carries the block-level (refund-exclusive, EIP-7778) chain.
+	cumulativeGasUsed := gasUsed
+	if n := len(*receipts); n > 0 {
+		cumulativeGasUsed += (*receipts)[n-1].CumulativeGasUsed
+	}
+	tracingReceipt = types.NewReceipt(root, false, cumulativeGasUsed)
 	tracingReceipt.TxHash = expectedTx.Hash()
 	tracingReceipt.GasUsed = gasUsed
 
@@ -2505,7 +2509,6 @@ func applyMessage(
 	if err != nil {
 		log.Error("apply message failed", "msg", string(ret), "err", err)
 	}
-	// TODO(Nathan): need confirm
 	return leftOverGas.Used(gasBudget), err
 }