Merge pull request #472 from OffchainLabs/accountlookup

eljobe · web-flow · commit a1b7785254c5 · 2025-06-18T10:26:28.000+02:00
Add missing account lookups for trace
diff --git a/eth/tracers/internal/tracetest/calltrace_test.go b/eth/tracers/internal/tracetest/calltrace_test.go
@@ -332,7 +332,7 @@ func TestInternals(t *testing.T) {
 				byte(vm.LOG0),
 			},
 			tracer: mkTracer("prestateTracer", nil),
-			want:   fmt.Sprintf(`{"0x0000000000000000000000000000000000000000":{"balance":"0x0"},"0x00000000000000000000000000000000deadbeef":{"balance":"0x0","code":"0x6001600052600164ffffffffff60016000f560ff6000a0"},"%s":{"balance":"0x1c6bf52634000"}}`, originHex),
+			want:   fmt.Sprintf(`{"0x0000000000000000000000000000000000000000":{"balance":"0x0"},"0x00000000000000000000000000000000deadbeef":{"balance":"0x0","code":"0x6001600052600164ffffffffff60016000f560ff6000a0"},"0x0000f90827f1c53a10cb7a02335b175320002935":{"balance":"0x0"},"%s":{"balance":"0x1c6bf52634000"},"0xa4b05fffffffffffffffffffffffffffffffffff":{"balance":"0x0"}}`, originHex),
 		},
 		{
 			// CREATE2 which requires padding memory by prestate tracer
@@ -351,7 +351,7 @@ func TestInternals(t *testing.T) {
 				byte(vm.LOG0),
 			},
 			tracer: mkTracer("prestateTracer", nil),
-			want:   fmt.Sprintf(`{"0x0000000000000000000000000000000000000000":{"balance":"0x0"},"0x00000000000000000000000000000000deadbeef":{"balance":"0x0","code":"0x6001600052600160ff60016000f560ff6000a0"},"%s":{"balance":"0x1c6bf52634000"}}`, originHex),
+			want:   fmt.Sprintf(`{"0x0000000000000000000000000000000000000000":{"balance":"0x0"},"0x00000000000000000000000000000000deadbeef":{"balance":"0x0","code":"0x6001600052600160ff60016000f560ff6000a0"},"0x0000f90827f1c53a10cb7a02335b175320002935":{"balance":"0x0"},"%s":{"balance":"0x1c6bf52634000"},"0xa4b05fffffffffffffffffffffffffffffffffff":{"balance":"0x0"}}`, originHex),
 		},
 	} {
 		t.Run(tc.name, func(t *testing.T) {
diff --git a/eth/tracers/internal/tracetest/testdata/prestate_tracer/blob_tx.json b/eth/tracers/internal/tracetest/testdata/prestate_tracer/blob_tx.json
@@ -64,6 +64,12 @@
     },
     "0x0c2c51a0990aee1d73c1228de158688341557508": {
       "balance": "0xde0b6b3a7640000"
+    },
+    "0x0000f90827f1c53a10cb7a02335b175320002935":{
+      "balance":"0x0"
+    },
+    "0xa4b05fffffffffffffffffffffffffffffffffff":{
+      "balance":"0x0"
     }
   }
 }
diff --git a/eth/tracers/internal/tracetest/testdata/prestate_tracer/create_create.json b/eth/tracers/internal/tracetest/testdata/prestate_tracer/create_create.json
@@ -54,6 +54,12 @@
     },
     "0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266": {
       "balance": "0x8ac7230489e80000"
+    },
+    "0x0000f90827f1c53a10cb7a02335b175320002935":{
+      "balance":"0x0"
+    },
+    "0xa4b05fffffffffffffffffffffffffffffffffff":{
+      "balance":"0x0"
     }
   }
 }
diff --git a/eth/tracers/internal/tracetest/testdata/prestate_tracer/create_existing_contract.json b/eth/tracers/internal/tracetest/testdata/prestate_tracer/create_existing_contract.json
@@ -78,6 +78,12 @@
     "0x82effbaaaf28614e55b2ba440fb198e0e5789b0f": {
       "balance": "0xb3d0ac5cb94df6f6b0",
       "nonce": 1
+    },
+    "0x0000f90827f1c53a10cb7a02335b175320002935":{
+      "balance":"0x0"
+    },
+    "0xa4b05fffffffffffffffffffffffffffffffffff":{
+      "balance":"0x0"
     }
   }
 }
diff --git a/eth/tracers/internal/tracetest/testdata/prestate_tracer/create_post_eip158.json b/eth/tracers/internal/tracetest/testdata/prestate_tracer/create_post_eip158.json
@@ -59,6 +59,12 @@
     "0x82211934c340b29561381392348d48413e15adc8": {
       "balance": "0x6abd7a808913ed2",
       "nonce": 64
+    },
+    "0x0000f90827f1c53a10cb7a02335b175320002935":{
+      "balance":"0x0"
+    },
+    "0xa4b05fffffffffffffffffffffffffffffffffff":{
+      "balance":"0x0"
     }
   }
 }
diff --git a/eth/tracers/internal/tracetest/testdata/prestate_tracer/disable_code.json b/eth/tracers/internal/tracetest/testdata/prestate_tracer/disable_code.json
@@ -78,6 +78,12 @@
     },
     "0x1585936b53834b021f68cc13eeefdec2efc8e724": {
       "balance": "0x0"
+    },
+    "0x0000f90827f1c53a10cb7a02335b175320002935":{
+      "balance":"0x0"
+    },
+    "0xa4b05fffffffffffffffffffffffffffffffffff":{
+      "balance":"0x0"
     }
   }
 }
diff --git a/eth/tracers/internal/tracetest/testdata/prestate_tracer/disable_code_and_storage.json b/eth/tracers/internal/tracetest/testdata/prestate_tracer/disable_code_and_storage.json
@@ -73,6 +73,12 @@
     },
     "0x1585936b53834b021f68cc13eeefdec2efc8e724": {
       "balance": "0x0"
+    },
+    "0x0000f90827f1c53a10cb7a02335b175320002935":{
+      "balance":"0x0"
+    },
+    "0xa4b05fffffffffffffffffffffffffffffffffff":{
+      "balance":"0x0"
     }
   }
 }
diff --git a/eth/tracers/internal/tracetest/testdata/prestate_tracer/disable_storage.json b/eth/tracers/internal/tracetest/testdata/prestate_tracer/disable_storage.json
@@ -73,6 +73,12 @@
     },
     "0x1585936b53834b021f68cc13eeefdec2efc8e724": {
       "balance": "0x0"
+    },
+    "0x0000f90827f1c53a10cb7a02335b175320002935":{
+      "balance":"0x0"
+    },
+    "0xa4b05fffffffffffffffffffffffffffffffffff":{
+      "balance":"0x0"
     }
   }
 }
diff --git a/eth/tracers/internal/tracetest/testdata/prestate_tracer/setcode_tx.json b/eth/tracers/internal/tracetest/testdata/prestate_tracer/setcode_tx.json
@@ -89,6 +89,12 @@
     },
     "0x71562b71999873db5b286df957af199ec94617f7": {
       "balance": "0xde0b6b3a7640000"
+    },
+    "0x0000f90827f1c53a10cb7a02335b175320002935":{
+      "balance":"0x0"
+    },
+    "0xa4b05fffffffffffffffffffffffffffffffffff":{
+      "balance":"0x0"
     }
   }
 }
diff --git a/eth/tracers/internal/tracetest/testdata/prestate_tracer/simple.json b/eth/tracers/internal/tracetest/testdata/prestate_tracer/simple.json
@@ -77,6 +77,12 @@
     },
     "0x1585936b53834b021f68cc13eeefdec2efc8e724": {
       "balance": "0x0"
+    },
+    "0x0000f90827f1c53a10cb7a02335b175320002935":{
+      "balance":"0x0"
+    },
+    "0xa4b05fffffffffffffffffffffffffffffffffff":{
+      "balance":"0x0"
     }
   }
 }
diff --git a/eth/tracers/native/prestate.go b/eth/tracers/native/prestate.go
@@ -161,6 +161,8 @@ func (t *prestateTracer) OnTxStart(env *tracing.VMContext, tx *types.Transaction
 	t.lookupAccount(from)
 	t.lookupAccount(t.to)
 	t.lookupAccount(env.Coinbase)
+	t.lookupAccount(params.HistoryStorageAddress)
+	t.lookupAccount(types.ArbosStateAddress)
 
 	// Add accounts with authorizations to the prestate before they get applied.
 	for _, auth := range tx.SetCodeAuthorizations() {

Original file line number	Diff line number	Diff line change
`@@ -64,6 +64,12 @@`
`64`	`64`	`},`
`65`	`65`	`"0x0c2c51a0990aee1d73c1228de158688341557508": {`
`66`	`66`	`"balance": "0xde0b6b3a7640000"`
	`67`	`+ },`
	`68`	`+ "0x0000f90827f1c53a10cb7a02335b175320002935":{`
	`69`	`+ "balance":"0x0"`
	`70`	`+ },`
	`71`	`+ "0xa4b05fffffffffffffffffffffffffffffffffff":{`
	`72`	`+ "balance":"0x0"`
`67`	`73`	`}`
`68`	`74`	`}`
`69`	`75`	`}`
Original file line number	Diff line number	Diff line change
`@@ -54,6 +54,12 @@`
`54`	`54`	`},`
`55`	`55`	`"0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266": {`
`56`	`56`	`"balance": "0x8ac7230489e80000"`
	`57`	`+ },`
	`58`	`+ "0x0000f90827f1c53a10cb7a02335b175320002935":{`
	`59`	`+ "balance":"0x0"`
	`60`	`+ },`
	`61`	`+ "0xa4b05fffffffffffffffffffffffffffffffffff":{`
	`62`	`+ "balance":"0x0"`
`57`	`63`	`}`
`58`	`64`	`}`
`59`	`65`	`}`
Original file line number	Diff line number	Diff line change
`@@ -78,6 +78,12 @@`
`78`	`78`	`"0x82effbaaaf28614e55b2ba440fb198e0e5789b0f": {`
`79`	`79`	`"balance": "0xb3d0ac5cb94df6f6b0",`
`80`	`80`	`"nonce": 1`
	`81`	`+ },`
	`82`	`+ "0x0000f90827f1c53a10cb7a02335b175320002935":{`
	`83`	`+ "balance":"0x0"`
	`84`	`+ },`
	`85`	`+ "0xa4b05fffffffffffffffffffffffffffffffffff":{`
	`86`	`+ "balance":"0x0"`
`81`	`87`	`}`
`82`	`88`	`}`
`83`	`89`	`}`
Original file line number	Diff line number	Diff line change
`@@ -59,6 +59,12 @@`
`59`	`59`	`"0x82211934c340b29561381392348d48413e15adc8": {`
`60`	`60`	`"balance": "0x6abd7a808913ed2",`
`61`	`61`	`"nonce": 64`
	`62`	`+ },`
	`63`	`+ "0x0000f90827f1c53a10cb7a02335b175320002935":{`
	`64`	`+ "balance":"0x0"`
	`65`	`+ },`
	`66`	`+ "0xa4b05fffffffffffffffffffffffffffffffffff":{`
	`67`	`+ "balance":"0x0"`
`62`	`68`	`}`
`63`	`69`	`}`
`64`	`70`	`}`
Original file line number	Diff line number	Diff line change
`@@ -73,6 +73,12 @@`
`73`	`73`	`},`
`74`	`74`	`"0x1585936b53834b021f68cc13eeefdec2efc8e724": {`
`75`	`75`	`"balance": "0x0"`
	`76`	`+ },`
	`77`	`+ "0x0000f90827f1c53a10cb7a02335b175320002935":{`
	`78`	`+ "balance":"0x0"`
	`79`	`+ },`
	`80`	`+ "0xa4b05fffffffffffffffffffffffffffffffffff":{`
	`81`	`+ "balance":"0x0"`
`76`	`82`	`}`
`77`	`83`	`}`
`78`	`84`	`}`
Original file line number	Diff line number	Diff line change
`@@ -89,6 +89,12 @@`
`89`	`89`	`},`
`90`	`90`	`"0x71562b71999873db5b286df957af199ec94617f7": {`
`91`	`91`	`"balance": "0xde0b6b3a7640000"`
	`92`	`+ },`
	`93`	`+ "0x0000f90827f1c53a10cb7a02335b175320002935":{`
	`94`	`+ "balance":"0x0"`
	`95`	`+ },`
	`96`	`+ "0xa4b05fffffffffffffffffffffffffffffffffff":{`
	`97`	`+ "balance":"0x0"`
`92`	`98`	`}`
`93`	`99`	`}`
`94`	`100`	`}`
Original file line number	Diff line number	Diff line change
`@@ -77,6 +77,12 @@`
`77`	`77`	`},`
`78`	`78`	`"0x1585936b53834b021f68cc13eeefdec2efc8e724": {`
`79`	`79`	`"balance": "0x0"`
	`80`	`+ },`
	`81`	`+ "0x0000f90827f1c53a10cb7a02335b175320002935":{`
	`82`	`+ "balance":"0x0"`
	`83`	`+ },`
	`84`	`+ "0xa4b05fffffffffffffffffffffffffffffffffff":{`
	`85`	`+ "balance":"0x0"`
`80`	`86`	`}`
`81`	`87`	`}`
`82`	`88`	`}`