resolve compatible issues and update block traces test data

scroll-tech · Jan 30, 2024 · 79e52c3 · 79e52c3
1 parent 4116338
commit 79e52c3
Show file tree

Hide file tree

Showing 12 changed files with 370 additions and 1,265 deletions.
diff --git a/common/testdata/blockTrace_02.json b/common/testdata/blockTrace_02.json
@@ -73,36 +73,36 @@
     ],
     "transactions": [
         {
-            "type": 0,
-            "nonce": 0,
-            "txHash": "0xb2febc1213baec968f6575789108e175273b8da8f412468098893084229f1542",
-            "gas": 500000,
+            "type": "0x0",
+            "nonce": "0x0",
             "gasPrice": "0x3b9aec2e",
-            "from": "0x1c5a77d9fa7ef466951b2f01f724bca3a5820b63",
-            "to": "0xc0c4c8baea3f6acb49b6e1fb9e2adeceeacb0ca2",
-            "chainId": "0xcf55",
+            "maxPriorityFeePerGas": null,
+            "maxFeePerGas": null,
+            "gas": "0x7a120",
             "value": "0x152d02c7e14af6000000",
-            "data": "0x",
-            "isCreate": false,
+            "input": "0x",
             "v": "0x19ece",
             "r": "0xab07ae99c67aa78e7ba5cf6781e90cc32b219b1de102513d56548a41e86df514",
-            "s": "0x34cbd19feacd73e8ce64d00c4d1996b9b5243c578fd7f51bfaec288bbaf42a8b"
+            "s": "0x34cbd19feacd73e8ce64d00c4d1996b9b5243c578fd7f51bfaec288bbaf42a8b",
+            "to": "0xc0c4c8baea3f6acb49b6e1fb9e2adeceeacb0ca2",
+            "hash": "0xb2febc1213baec968f6575789108e175273b8da8f412468098893084229f1542",
+            "sender": "0x0000000000000000000000000000000000000000"
         },
         {
-            "type": 0,
-            "nonce": 1,
-            "txHash": "0xe6ac2ffc543d07f1e280912a2abe3aa659bf83773740681151297ada1bb211dd",
-            "gas": 500000,
+            "type": "0x0",
+            "nonce": "0x1",
             "gasPrice": "0x3b9aec2e",
-            "from": "0x1c5a77d9fa7ef466951b2f01f724bca3a5820b63",
-            "to": "0x01bae6bf68e9a03fb2bc0615b1bf0d69ce9411ed",
-            "chainId": "0xcf55",
+            "maxPriorityFeePerGas": null,
+            "maxFeePerGas": null,
+            "gas": "0x7a120",
             "value": "0x152d02c7e14af6000000",
-            "data": "0x",
-            "isCreate": false,
+            "input": "0x",
             "v": "0x19ece",
             "r": "0xf039985866d8256f10c1be4f7b2cace28d8f20bde27e2604393eb095b7f77316",
-            "s": "0x5a3e6e81065f2b4604bcec5bd4aba684835996fc3f879380aac1c09c6eed32f1"
+            "s": "0x5a3e6e81065f2b4604bcec5bd4aba684835996fc3f879380aac1c09c6eed32f1",
+            "to": "0x01bae6bf68e9a03fb2bc0615b1bf0d69ce9411ed",
+            "hash": "0xe6ac2ffc543d07f1e280912a2abe3aa659bf83773740681151297ada1bb211dd",
+            "sender": "0x0000000000000000000000000000000000000000"
         }
     ],
     "storageTrace": {
@@ -588,4 +588,4 @@
             ]
         }
     ]
-}
+}
diff --git a/common/testdata/blockTrace_03.json b/common/testdata/blockTrace_03.json
diff --git a/common/testdata/blockTrace_04.json b/common/testdata/blockTrace_04.json
@@ -29,38 +29,39 @@
   "row_consumption": [
   ],
   "transactions": [
-    {
-      "type": 126,
-      "nonce": 10,
-      "txHash": "0xed6dff31c5516b3b9d169781865276cf27501aadd45c131bf8c841c5e619e56a",
-      "gas": 24000,
-      "gasPrice": "0x0",
-      "from": "0x478cdd110520a8e733e2acf9e543d2c687ea5239",
-      "to": "0x1a258d17bf244c4df02d40343a7626a9d321e105",
-      "chainId": "0x0",
-      "value": "0x0",
-      "data": "0x8ef1332e000000000000000000000000ea08a65b1829af779261e768d609e59279b510f2000000000000000000000000f2ec6b6206f6208e8f9b394efc1a01c1cbde77750000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000a4232e87480000000000000000000000002b5ad5c4795c026514f8317c7a215e218dccd6cf0000000000000000000000002b5ad5c4795c026514f8317c7a215e218dccd6cf00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-      "isCreate": false,
-      "v": "0x0",
-      "r": "0x0",
-      "s": "0x0"
-    },
-    {
-      "type": 0,
-      "nonce": 11,
-      "txHash": "0xed6dff31c5516b3b9d169781865276cf27501aadd45c131bf8c841c5e619e56a",
-      "gas": 24000,
-      "gasPrice": "0x0",
-      "from": "0x478cdd110520a8e733e2acf9e543d2c687ea5239",
-      "to": "0x1a258d17bf244c4df02d40343a7626a9d321e105",
-      "chainId": "0x0",
-      "value": "0x0",
-      "data": "0x",
-      "isCreate": false,
-      "v": "0x0",
-      "r": "0x0",
-      "s": "0x0"
-    }
+      {
+          "type": "0x7e",
+          "nonce": null,
+          "gasPrice": null,
+          "maxPriorityFeePerGas": null,
+          "maxFeePerGas": null,
+          "gas": "0x5dc0",
+          "value": "0x0",
+          "input": "0x8ef1332e000000000000000000000000ea08a65b1829af779261e768d609e59279b510f2000000000000000000000000f2ec6b6206f6208e8f9b394efc1a01c1cbde77750000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000a4232e87480000000000000000000000002b5ad5c4795c026514f8317c7a215e218dccd6cf0000000000000000000000002b5ad5c4795c026514f8317c7a215e218dccd6cf00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+          "v": null,
+          "r": null,
+          "s": null,
+          "to": "0x1a258d17bf244c4df02d40343a7626a9d321e105",
+          "hash": "0x99fdabda7425b70c428b9664d384cbc9c71c9bc9fc1d277a24e3da0903ebf4ac",
+          "sender": "0x0000000000000000000000000000000000000000",
+          "queueIndex": "0xa"
+      },
+      {
+          "type": "0x0",
+          "nonce": "0xb",
+          "gasPrice": "0x0",
+          "maxPriorityFeePerGas": null,
+          "maxFeePerGas": null,
+          "gas": "0x5dc0",
+          "value": "0x0",
+          "input": "0x",
+          "v": "0x0",
+          "r": "0x0",
+          "s": "0x0",
+          "to": "0x1a258d17bf244c4df02d40343a7626a9d321e105",
+          "hash": "0xed6dff31c5516b3b9d169781865276cf27501aadd45c131bf8c841c5e619e56a",
+          "sender": "0x0000000000000000000000000000000000000000"
+      }
   ],
   "storageTrace": {
     "rootBefore": "0x16d403e1c55dee3e020457262414ee7a20596922c08cac631385d8ea6d6c2c2b",

diff --git a/common/testdata/blockTrace_05.json b/common/testdata/blockTrace_05.json
@@ -31,86 +31,91 @@
   "row_consumption": [
   ],
   "transactions": [
-      {
-          "type": 126,
-          "nonce": 37,
-          "txHash": "0x9f546503cfc8a8ab4ad1bed5404fd9749f607702842a2a991f7378041854183f",
-          "gas": 24000,
-          "gasPrice": "0x0",
-          "from": "0x478cdd110520a8e733e2acf9e543d2c687ea5239",
-          "to": "0x1a258d17bf244c4df02d40343a7626a9d321e105",
-          "chainId": "0x0",
-          "value": "0x0",
-          "data": "0x8ef1332e000000000000000000000000ea08a65b1829af779261e768d609e59279b510f2000000000000000000000000f2ec6b6206f6208e8f9b394efc1a01c1cbde77750000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002500000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000a4232e87480000000000000000000000002b5ad5c4795c026514f8317c7a215e218dccd6cf0000000000000000000000002b5ad5c4795c026514f8317c7a215e218dccd6cf00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-          "isCreate": false,
-          "v": "0x0",
-          "r": "0x0",
-          "s": "0x0"
-      },
-      {
-          "type": 126,
-          "nonce": 38,
-          "txHash": "0x932534fde469ab4f5e177b6cf83315e9ad4ff58163c61d4c998213904ed23c7f",
-          "gas": 24000,
-          "gasPrice": "0x0",
-          "from": "0x478cdd110520a8e733e2acf9e543d2c687ea5239",
-          "to": "0x1a258d17bf244c4df02d40343a7626a9d321e105",
-          "chainId": "0x0",
-          "value": "0x0",
-          "data": "0x8ef1332e000000000000000000000000ea08a65b1829af779261e768d609e59279b510f2000000000000000000000000f2ec6b6206f6208e8f9b394efc1a01c1cbde77750000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002600000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000a4232e87480000000000000000000000002b5ad5c4795c026514f8317c7a215e218dccd6cf0000000000000000000000002b5ad5c4795c026514f8317c7a215e218dccd6cf00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-          "isCreate": false,
-          "v": "0x0",
-          "r": "0x0",
-          "s": "0x0"
-      },
-      {
-          "type": 126,
-          "nonce": 39,
-          "txHash": "0x385fe2f4ee6060d891bc4b9ee0ac8a631097fe1c3d4b9a5327c7b870682e7552",
-          "gas": 24000,
-          "gasPrice": "0x0",
-          "from": "0x478cdd110520a8e733e2acf9e543d2c687ea5239",
-          "to": "0x1a258d17bf244c4df02d40343a7626a9d321e105",
-          "chainId": "0x0",
-          "value": "0x0",
-          "data": "0x8ef1332e000000000000000000000000ea08a65b1829af779261e768d609e59279b510f2000000000000000000000000f2ec6b6206f6208e8f9b394efc1a01c1cbde77750000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002700000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000a4232e87480000000000000000000000002b5ad5c4795c026514f8317c7a215e218dccd6cf0000000000000000000000002b5ad5c4795c026514f8317c7a215e218dccd6cf00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-          "isCreate": false,
-          "v": "0x0",
-          "r": "0x0",
-          "s": "0x0"
-      },
-      {
-          "type": 126,
-          "nonce": 40,
-          "txHash": "0x3893c2d9caad874ccd3da9d89b61aa7e77a4b94f89855cb1596eee1147cd6f73",
-          "gas": 24000,
-          "gasPrice": "0x0",
-          "from": "0x478cdd110520a8e733e2acf9e543d2c687ea5239",
-          "to": "0x1a258d17bf244c4df02d40343a7626a9d321e105",
-          "chainId": "0x0",
-          "value": "0x0",
-          "data": "0x8ef1332e000000000000000000000000ea08a65b1829af779261e768d609e59279b510f2000000000000000000000000f2ec6b6206f6208e8f9b394efc1a01c1cbde77750000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002800000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000a4232e87480000000000000000000000002b5ad5c4795c026514f8317c7a215e218dccd6cf0000000000000000000000002b5ad5c4795c026514f8317c7a215e218dccd6cf00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-          "isCreate": false,
-          "v": "0x0",
-          "r": "0x0",
-          "s": "0x0"
-      },
-      {
-          "type": 126,
-          "nonce": 41,
-          "txHash": "0x7eaa620a880d881142e6716a8a526d4c16af21cc26c9058ff5bb589aa5d87523",
-          "gas": 24000,
-          "gasPrice": "0x0",
-          "from": "0x478cdd110520a8e733e2acf9e543d2c687ea5239",
-          "to": "0x1a258d17bf244c4df02d40343a7626a9d321e105",
-          "chainId": "0x0",
-          "value": "0x0",
-          "data": "0x8ef1332e000000000000000000000000ea08a65b1829af779261e768d609e59279b510f2000000000000000000000000f2ec6b6206f6208e8f9b394efc1a01c1cbde77750000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002900000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000a4232e87480000000000000000000000002b5ad5c4795c026514f8317c7a215e218dccd6cf0000000000000000000000002b5ad5c4795c026514f8317c7a215e218dccd6cf00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-          "isCreate": false,
-          "v": "0x0",
-          "r": "0x0",
-          "s": "0x0"
-      }
+    {
+        "type": "0x7e",
+        "nonce": null,
+        "gasPrice": null,
+        "maxPriorityFeePerGas": null,
+        "maxFeePerGas": null,
+        "gas": "0x5dc0",
+        "value": "0x0",
+        "input": "0x8ef1332e000000000000000000000000ea08a65b1829af779261e768d609e59279b510f2000000000000000000000000f2ec6b6206f6208e8f9b394efc1a01c1cbde77750000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002500000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000a4232e87480000000000000000000000002b5ad5c4795c026514f8317c7a215e218dccd6cf0000000000000000000000002b5ad5c4795c026514f8317c7a215e218dccd6cf00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+        "v": null,
+        "r": null,
+        "s": null,
+        "to": "0x1a258d17bf244c4df02d40343a7626a9d321e105",
+        "hash": "0x9bd713f7667520fe5eb3eb268ea4b0b6fe8d5ed5ba055876b824ffada71b8602",
+        "sender": "0x0000000000000000000000000000000000000000",
+        "queueIndex": "0x25"
+    },
+    {
+        "type": "0x7e",
+        "nonce": null,
+        "gasPrice": null,
+        "maxPriorityFeePerGas": null,
+        "maxFeePerGas": null,
+        "gas": "0x5dc0",
+        "value": "0x0",
+        "input": "0x8ef1332e000000000000000000000000ea08a65b1829af779261e768d609e59279b510f2000000000000000000000000f2ec6b6206f6208e8f9b394efc1a01c1cbde77750000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002600000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000a4232e87480000000000000000000000002b5ad5c4795c026514f8317c7a215e218dccd6cf0000000000000000000000002b5ad5c4795c026514f8317c7a215e218dccd6cf00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+        "v": null,
+        "r": null,
+        "s": null,
+        "to": "0x1a258d17bf244c4df02d40343a7626a9d321e105",
+        "hash": "0x6bc07396992af19623820e4c537f12a4fd216e7a1383f2da99a81131e6448509",
+        "sender": "0x0000000000000000000000000000000000000000",
+        "queueIndex": "0x26"
+    },
+    {
+        "type": "0x7e",
+        "nonce": null,
+        "gasPrice": null,
+        "maxPriorityFeePerGas": null,
+        "maxFeePerGas": null,
+        "gas": "0x5dc0",
+        "value": "0x0",
+        "input": "0x8ef1332e000000000000000000000000ea08a65b1829af779261e768d609e59279b510f2000000000000000000000000f2ec6b6206f6208e8f9b394efc1a01c1cbde77750000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002700000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000a4232e87480000000000000000000000002b5ad5c4795c026514f8317c7a215e218dccd6cf0000000000000000000000002b5ad5c4795c026514f8317c7a215e218dccd6cf00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+        "v": null,
+        "r": null,
+        "s": null,
+        "to": "0x1a258d17bf244c4df02d40343a7626a9d321e105",
+        "hash": "0xd1981f62eb5181954a625a9352e057427fe818264771eea69803c60868f859eb",
+        "sender": "0x0000000000000000000000000000000000000000",
+        "queueIndex": "0x27"
+    },
+    {
+        "type": "0x7e",
+        "nonce": null,
+        "gasPrice": null,
+        "maxPriorityFeePerGas": null,
+        "maxFeePerGas": null,
+        "gas": "0x5dc0",
+        "value": "0x0",
+        "input": "0x8ef1332e000000000000000000000000ea08a65b1829af779261e768d609e59279b510f2000000000000000000000000f2ec6b6206f6208e8f9b394efc1a01c1cbde77750000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002800000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000a4232e87480000000000000000000000002b5ad5c4795c026514f8317c7a215e218dccd6cf0000000000000000000000002b5ad5c4795c026514f8317c7a215e218dccd6cf00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+        "v": null,
+        "r": null,
+        "s": null,
+        "to": "0x1a258d17bf244c4df02d40343a7626a9d321e105",
+        "hash": "0x17530705fbeedcbb9b28a750ea5a8ac933dac7d45b092223422476a3de1e4741",
+        "sender": "0x0000000000000000000000000000000000000000",
+        "queueIndex": "0x28"
+    },
+    {
+        "type": "0x7e",
+        "nonce": null,
+        "gasPrice": null,
+        "maxPriorityFeePerGas": null,
+        "maxFeePerGas": null,
+        "gas": "0x5dc0",
+        "value": "0x0",
+        "input": "0x8ef1332e000000000000000000000000ea08a65b1829af779261e768d609e59279b510f2000000000000000000000000f2ec6b6206f6208e8f9b394efc1a01c1cbde77750000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002900000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000a4232e87480000000000000000000000002b5ad5c4795c026514f8317c7a215e218dccd6cf0000000000000000000000002b5ad5c4795c026514f8317c7a215e218dccd6cf00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+        "v": null,
+        "r": null,
+        "s": null,
+        "to": "0x1a258d17bf244c4df02d40343a7626a9d321e105",
+        "hash": "0x342f9795dbf54106ea47107b431c9179a118fdf5fc60376e58c948f7fd0ef4df",
+        "sender": "0x0000000000000000000000000000000000000000",
+        "queueIndex": "0x29"
+    }
   ],
   "storageTrace": {
       "rootBefore": "0x175df7d5c86d17089e01563e4b2cb9aece5b5ab51931a0196ca52f4c05c0baa0",