update l2geth util for l1 queue index

Author: noel2004

external-tracer/src/lib.rs

@@ -27,6 +27,9 @@ pub struct TraceConfig {
     pub logger_config: LoggerConfig,
     /// chain config
     pub chain_config: Option<ChainConfig>,
+    /// beginning index of l1 queue
+    #[cfg(feature = "scroll")]
+    pub l1_queue_index: u64,
 }
 
 /// Configuration structure for `logger.Config`

geth-utils/l2geth/go.mod

@@ -5,7 +5,7 @@ go 1.18
 require (
 	github.com/holiman/uint256 v1.2.0
 	github.com/imdario/mergo v0.3.15
-	github.com/scroll-tech/go-ethereum v1.10.14-0.20230809083042-eed2b93a7953
+	github.com/scroll-tech/go-ethereum v1.10.14-0.20230815053544-f828d88a8c6a
 )
 
 require (

geth-utils/l2geth/go.sum

@@ -103,8 +103,8 @@ github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7q
 github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
 github.com/prometheus/tsdb v0.7.1 h1:YZcsG11NqnK4czYLrWd9mpEuAJIHVQLwdrleYfszMAA=
 github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU=
-github.com/scroll-tech/go-ethereum v1.10.14-0.20230809083042-eed2b93a7953 h1:cNFBGyQuk5NVcOZJpYhClSUkvS/OiM6JThNm5eO5Qxw=
-github.com/scroll-tech/go-ethereum v1.10.14-0.20230809083042-eed2b93a7953/go.mod h1:DiN3p2inoXOxGffxSswDKqWjQ7bU+Mp0c9v0XQXKmaA=
+github.com/scroll-tech/go-ethereum v1.10.14-0.20230815053544-f828d88a8c6a h1:MAFYEgBGPwKkJv34Ep/tWxnDX9oOVaOJSSVjKFcjUYA=
+github.com/scroll-tech/go-ethereum v1.10.14-0.20230815053544-f828d88a8c6a/go.mod h1:DiN3p2inoXOxGffxSswDKqWjQ7bU+Mp0c9v0XQXKmaA=
 github.com/scroll-tech/zktrie v0.6.0 h1:xLrMAO31Yo2BiPg1jtYKzcjpEFnXy8acbB7iIsyshPs=
 github.com/scroll-tech/zktrie v0.6.0/go.mod h1:XvNo7vAk8yxNyTjBDj5WIiFzYW4bx/gJ78+NK6Zn6Uk=
 github.com/shirou/gopsutil v3.21.4-0.20210419000835-c7a38de76ee5+incompatible h1:Bn1aCHHRnjv4Bl16T8rcaFjYSrGrIZvpiGO6P3Q4GpU=

geth-utils/l2geth/trace.go

@@ -52,7 +52,8 @@ type Transaction struct {
 }
 
 type TraceConfig struct {
-	ChainID uint64 `json:"chain_id"`
+	ChainID           uint64 `json:"chain_id"`
+	StartL1QueueIndex uint64 `json:"l1_queue_index"`
 	// HistoryHashes contains most recent 256 block hashes in history,
 	// where the lastest one is at HistoryHashes[len(HistoryHashes)-1].
 	HistoryHashes []*hexutil.Big             `json:"history_hashes"`
@@ -216,6 +217,7 @@ func L2Trace(config TraceConfig) (*types.BlockTrace, error) {
 		&chainConfig,
 		config.LoggerConfig,
 		blockCtx,
+		config.StartL1QueueIndex,
 		blockCtx.Coinbase,
 		stateDB,
 		parent,

mock/src/test_ctx.rs

@@ -288,6 +288,7 @@ pub fn gen_trace_config(
         chain_config: Some(external_tracer::ChainConfig::shanghai()),
         #[cfg(not(feature = "shanghai"))]
         chain_config: None,
+        ..Default::default()
     })
 }
 

testool/src/statetest/executor.rs

@@ -205,6 +205,7 @@ fn into_traceconfig(st: StateTest) -> (String, TraceConfig, StateTestResult) {
             chain_config: Some(external_tracer::ChainConfig::shanghai()),
             #[cfg(not(feature = "shanghai"))]
             chain_config: None,
+            ..Default::default()
         },
         st.result,
     )