Merge branch 'develop' into feat/forward-txs-to-sequencer

colinlyguo · web-flow · commit db790f41cae7 · 2025-07-08T16:42:45.000+08:00
diff --git a/core/vm/instructions.go b/core/vm/instructions.go
@@ -490,6 +490,13 @@ func opBlockhashPostFeynman(pc *uint64, interpreter *EVMInterpreter, scope *Scop
 			witness.AddBlockHash(num64)
 		}
 		num.SetBytes(res[:])
+
+		// for provability, revm loads block hash from the history storage system contract,
+		// so we need to ensure that the corresponding slot is present in the execution witness.
+		ringIndex := num64 % params.HistoryServeWindow
+		var key common.Hash
+		binary.BigEndian.PutUint64(key[24:], ringIndex)
+		interpreter.evm.StateDB.GetState(params.HistoryStorageAddress, key)
 	} else {
 		num.Clear()
 	}
diff --git a/params/protocol_params.go b/params/protocol_params.go
@@ -174,8 +174,6 @@ const (
 	BlobTxBlobGaspriceUpdateFraction = 5007716 // Controls the maximum rate of change for blob gas price, using Prague parameters
 
 	BlobTxTargetBlobGasPerBlock = 6 * BlobTxBlobGasPerBlob // Target consumable blob gas for data blobs per block (for 1559-like pricing), using Prague parameters
-
-	HistoryServeWindow = 8192 // Number of blocks to serve historical block hashes for, EIP-2935.
 )
 
 // Gas discount table for BLS12-381 G1 and G2 multi exponentiation operations
@@ -197,4 +195,5 @@ var (
 	// EIP-2935 - Serve historical block hashes from state
 	HistoryStorageAddress = common.HexToAddress("0x0000F90827F1C53a10cb7A02335B175320002935")
 	HistoryStorageCode    = common.FromHex("3373fffffffffffffffffffffffffffffffffffffffe14604657602036036042575f35600143038111604257611fff81430311604257611fff9006545f5260205ff35b5f5ffd5b5f35611fff60014303065500")
+	HistoryServeWindow    = uint64(8191)
 )

Original file line number	Diff line number	Diff line change
`@@ -490,6 +490,13 @@ func opBlockhashPostFeynman(pc uint64, interpreter EVMInterpreter, scope *Scop`
`490`	`490`	`witness.AddBlockHash(num64)`
`491`	`491`	`}`
`492`	`492`	`num.SetBytes(res[:])`
	`493`	`+`
	`494`	`+ // for provability, revm loads block hash from the history storage system contract,`
	`495`	`+ // so we need to ensure that the corresponding slot is present in the execution witness.`
	`496`	`+ ringIndex := num64 % params.HistoryServeWindow`
	`497`	`+ var key common.Hash`
	`498`	`+ binary.BigEndian.PutUint64(key[24:], ringIndex)`
	`499`	`+ interpreter.evm.StateDB.GetState(params.HistoryStorageAddress, key)`
`493`	`500`	`} else {`
`494`	`501`	`num.Clear()`
`495`	`502`	`}`
Original file line number	Diff line number	Diff line change
`@@ -174,8 +174,6 @@ const (`
`174`	`174`	`BlobTxBlobGaspriceUpdateFraction = 5007716 // Controls the maximum rate of change for blob gas price, using Prague parameters`
`175`	`175`
`176`	`176`	`BlobTxTargetBlobGasPerBlock = 6 * BlobTxBlobGasPerBlob // Target consumable blob gas for data blobs per block (for 1559-like pricing), using Prague parameters`
`177`		`-`
`178`		`- HistoryServeWindow = 8192 // Number of blocks to serve historical block hashes for, EIP-2935.`
`179`	`177`	`)`
`180`	`178`
`181`	`179`	`// Gas discount table for BLS12-381 G1 and G2 multi exponentiation operations`
`@@ -197,4 +195,5 @@ var (`
`197`	`195`	`// EIP-2935 - Serve historical block hashes from state`
`198`	`196`	`HistoryStorageAddress = common.HexToAddress("0x0000F90827F1C53a10cb7A02335B175320002935")`
`199`	`197`	`HistoryStorageCode = common.FromHex("3373fffffffffffffffffffffffffffffffffffffffe14604657602036036042575f35600143038111604257611fff81430311604257611fff9006545f5260205ff35b5f5ffd5b5f35611fff60014303065500")`
	`198`	`+ HistoryServeWindow = uint64(8191)`
`200`	`199`	`)`