fix test

OffchainLabs · Jul 31, 2024 · 4d6cd19 · 4d6cd19
1 parent a0dd632
commit 4d6cd19
Show file tree

Hide file tree

Showing 7 changed files with 797 additions and 31 deletions.
diff --git a/eth/tracers/internal/tracetest/calltrace_test.go b/eth/tracers/internal/tracetest/calltrace_test.go
@@ -320,7 +320,7 @@ func TestInternals(t *testing.T) {
 				byte(vm.LOG0),
 			},
 			tracer: mkTracer("callTracer", json.RawMessage(`{ "withLog": true }`)),
-			want:   fmt.Sprintf(`{"beforeEVMTransfers":[{"purpose":"feePayment","from":"%s","to":null,"value":"0x13880"}],"afterEVMTransfers":[{"purpose":"gasRefund","from":null,"to":"%s","value":"0xdce2"},{"purpose":"tip","from":null,"to":"0x0000000000000000000000000000000000000000","value":"0x5b9e"}],"from":"%s","gas":"0x13880","gasUsed":"0x5b9e","to":"0x00000000000000000000000000000000deadbeef","input":"0x","logs":[{"address":"0x00000000000000000000000000000000deadbeef","topics":[],"data":"0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000","position":"0x0"}],"value":"0x0","type":"CALL"}`, origin.Hex(), origin.Hex(), originHex),
+			want:   fmt.Sprintf(`{"beforeEVMTransfers":[{"purpose":"feePayment","from":"%s","to":null,"value":"0x13880"}],"afterEVMTransfers":[{"purpose":"gasRefund","from":null,"to":"%s","value":"0xdce2"},{"purpose":"tip","from":null,"to":"0x0000000000000000000000000000000000000000","value":"0x5b9e"}],"from":"%s","gas":"0x13880","gasUsed":"0x5b9e","to":"0x00000000000000000000000000000000deadbeef","input":"0x","logs":[{"address":"0x00000000000000000000000000000000deadbeef","topics":[],"data":"0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000","position":"0x0"}, {"address":"0x00000000000000000000000000000000deadbeef","topics":[],"data":"0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000","position":"0x0"}],"value":"0x0","type":"CALL"}`, origin.Hex(), origin.Hex(), originHex),
 		},
 		{
 			// Leads to OOM on the prestate tracer

diff --git a/eth/tracers/internal/tracetest/testdata/call_tracer_withLog/delegatecall.json b/eth/tracers/internal/tracetest/testdata/call_tracer_withLog/delegatecall.json
@@ -207,8 +207,8 @@
             "to": "0xef3487d24a0702703e04a26cef479e313c8fc7ae",
             "input": "0x872fb2b50000000000000000000000000000000000000000000000000000000000000000",
             "output": "0x00000000000000000000000000000000000000000000000100000016aee6e8ef",
-            "type": "DELEGATECALL",
-            "value": "0x0"
+            "value": "0x0",
+            "type": "DELEGATECALL"
           },
           {
             "from": "0x8695e5e79dab06fbbb05f445316fa4edb0da30f0",
@@ -272,6 +272,16 @@
         "input": "0x23b872dd0000000000000000000000003de712784baf97260455ae25fb74f574ec9c1add0000000000000000000000006ca7f214ab2ddbb9a8e1a1e2c8550e3164e9dba500000000000000000000000000000000000000000000000080d29fa5cccfadac",
         "output": "0x0000000000000000000000000000000000000000000000000000000000000001",
         "logs": [
+          {
+            "address": "0x92f1dbea03ce08225e31e95cc926ddbe0198e6f2",
+            "topics": [
+              "0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef",
+              "0x0000000000000000000000003de712784baf97260455ae25fb74f574ec9c1add",
+              "0x0000000000000000000000006ca7f214ab2ddbb9a8e1a1e2c8550e3164e9dba5"
+            ],
+            "data": "0x00000000000000000000000000000000000000000000000080d29fa5cccfadac",
+            "position": "0x0"
+          },
           {
             "address": "0x92f1dbea03ce08225e31e95cc926ddbe0198e6f2",
             "topics": [
@@ -294,6 +304,16 @@
         "input": "0x095ea7b30000000000000000000000005aae5c59d642e5fd45b427df6ed478b49d55fefd00000000000000000000000000000000000000000000000080d29fa5cccfadac",
         "output": "0x0000000000000000000000000000000000000000000000000000000000000001",
         "logs": [
+          {
+            "address": "0x92f1dbea03ce08225e31e95cc926ddbe0198e6f2",
+            "topics": [
+              "0x8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925",
+              "0x0000000000000000000000006ca7f214ab2ddbb9a8e1a1e2c8550e3164e9dba5",
+              "0x0000000000000000000000005aae5c59d642e5fd45b427df6ed478b49d55fefd"
+            ],
+            "data": "0x00000000000000000000000000000000000000000000000080d29fa5cccfadac",
+            "position": "0x0"
+          },
           {
             "address": "0x92f1dbea03ce08225e31e95cc926ddbe0198e6f2",
             "topics": [
@@ -324,6 +344,16 @@
             "input": "0x23b872dd0000000000000000000000006ca7f214ab2ddbb9a8e1a1e2c8550e3164e9dba50000000000000000000000005aae5c59d642e5fd45b427df6ed478b49d55fefd00000000000000000000000000000000000000000000000080d29fa5cccfadac",
             "output": "0x0000000000000000000000000000000000000000000000000000000000000001",
             "logs": [
+              {
+                "address": "0x92f1dbea03ce08225e31e95cc926ddbe0198e6f2",
+                "topics": [
+                  "0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef",
+                  "0x0000000000000000000000006ca7f214ab2ddbb9a8e1a1e2c8550e3164e9dba5",
+                  "0x0000000000000000000000005aae5c59d642e5fd45b427df6ed478b49d55fefd"
+                ],
+                "data": "0x00000000000000000000000000000000000000000000000080d29fa5cccfadac",
+                "position": "0x0"
+              },
               {
                 "address": "0x92f1dbea03ce08225e31e95cc926ddbe0198e6f2",
                 "topics": [
@@ -346,6 +376,16 @@
             "input": "0xa9059cbb000000000000000000000000950ca4a06c78934a148b7a3ff3ea8fc366f77a060000000000000000000000000000000000000000000000000041f50e27d56848",
             "output": "0x0000000000000000000000000000000000000000000000000000000000000001",
             "logs": [
+              {
+                "address": "0x92f1dbea03ce08225e31e95cc926ddbe0198e6f2",
+                "topics": [
+                  "0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef",
+                  "0x0000000000000000000000005aae5c59d642e5fd45b427df6ed478b49d55fefd",
+                  "0x000000000000000000000000950ca4a06c78934a148b7a3ff3ea8fc366f77a06"
+                ],
+                "data": "0x0000000000000000000000000000000000000000000000000041f50e27d56848",
+                "position": "0x0"
+              },
               {
                 "address": "0x92f1dbea03ce08225e31e95cc926ddbe0198e6f2",
                 "topics": [
@@ -410,6 +450,16 @@
             "input": "0x88d5fecb00000000000000000000000000000000000000000000000000000000000000010000000000000000000000003de712784baf97260455ae25fb74f574ec9c1add000000000000000000000000000000000000000000000000de0b6b3a76400000",
             "output": "0x0000000000000000000000000000000000000000000000000000000000000001",
             "logs": [
+              {
+                "address": "0xf4cbd7e037b80c2e67b80512d482685f15b1fb28",
+                "topics": [
+                  "0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef",
+                  "0x0000000000000000000000006ca7f214ab2ddbb9a8e1a1e2c8550e3164e9dba5",
+                  "0x0000000000000000000000003de712784baf97260455ae25fb74f574ec9c1add"
+                ],
+                "data": "0x000000000000000000000000000000000000000000000000de0b6b3a76400000",
+                "position": "0x0"
+              },
               {
                 "address": "0xf4cbd7e037b80c2e67b80512d482685f15b1fb28",
                 "topics": [