fix baseFee

ethereum · Jun 12, 2021 · 5d65138 · 5d65138
1 parent 74b1100
commit 5d65138
Show file tree

Hide file tree

Showing 9 changed files with 3,548 additions and 3,548 deletions.
diff --git a/BlockchainTests/GeneralStateTests/stEIP1559/intrinsic.json b/BlockchainTests/GeneralStateTests/stEIP1559/intrinsic.json
diff --git a/BlockchainTests/GeneralStateTests/stEIP1559/lowFeeCap.json b/BlockchainTests/GeneralStateTests/stEIP1559/lowFeeCap.json
@@ -25,7 +25,7 @@
             "timestamp" : "0x00",
             "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
-            "baseFee" : "0x0476"
+            "baseFeePerGas" : "0x0476"
         },
         "pre" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -90,7 +90,7 @@
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
-                    "baseFee" : "0x03e8"
+                    "baseFeePerGas" : "0x03e8"
                 },
                 "transactions" : [
                 ],

diff --git a/BlockchainTests/GeneralStateTests/stEIP1559/lowGasLimit.json b/BlockchainTests/GeneralStateTests/stEIP1559/lowGasLimit.json
@@ -25,7 +25,7 @@
             "timestamp" : "0x00",
             "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
-            "baseFee" : "0x0476"
+            "baseFeePerGas" : "0x0476"
         },
         "pre" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -92,7 +92,7 @@
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
-                    "baseFee" : "0x03e8"
+                    "baseFeePerGas" : "0x03e8"
                 },
                 "transactions" : [
                 ],
@@ -134,7 +134,7 @@
             "timestamp" : "0x00",
             "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
-            "baseFee" : "0x0476"
+            "baseFeePerGas" : "0x0476"
         },
         "pre" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -201,7 +201,7 @@
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x79f4ef4f2e00e562c82c4d08dd6231a69cd4b6c6402a181b70159b2911ffab92",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
-                    "baseFee" : "0x03e8"
+                    "baseFeePerGas" : "0x03e8"
                 },
                 "transactions" : [
                     {
@@ -252,7 +252,7 @@
             "timestamp" : "0x00",
             "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
-            "baseFee" : "0x0476"
+            "baseFeePerGas" : "0x0476"
         },
         "pre" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -319,7 +319,7 @@
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x02ed930dddaf00d2a91917f7f27881333a029628e236183b4fc91d66e72d8aa2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
-                    "baseFee" : "0x03e8"
+                    "baseFeePerGas" : "0x03e8"
                 },
                 "transactions" : [
                     {
@@ -370,7 +370,7 @@
             "timestamp" : "0x00",
             "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
-            "baseFee" : "0x0476"
+            "baseFeePerGas" : "0x0476"
         },
         "pre" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -437,7 +437,7 @@
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
-                    "baseFee" : "0x03e8"
+                    "baseFeePerGas" : "0x03e8"
                 },
                 "transactions" : [
                 ],

diff --git a/BlockchainTests/GeneralStateTests/stEIP1559/lowGasPriceOldTypes.json b/BlockchainTests/GeneralStateTests/stEIP1559/lowGasPriceOldTypes.json
@@ -25,7 +25,7 @@
             "timestamp" : "0x00",
             "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
-            "baseFee" : "0x0476"
+            "baseFeePerGas" : "0x0476"
         },
         "pre" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -90,7 +90,7 @@
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
-                    "baseFee" : "0x03e8"
+                    "baseFeePerGas" : "0x03e8"
                 },
                 "transactions" : [
                 ],
@@ -132,7 +132,7 @@
             "timestamp" : "0x00",
             "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
-            "baseFee" : "0x0476"
+            "baseFeePerGas" : "0x0476"
         },
         "pre" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -197,7 +197,7 @@
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
-                    "baseFee" : "0x03e8"
+                    "baseFeePerGas" : "0x03e8"
                 },
                 "transactions" : [
                 ],

diff --git a/BlockchainTests/GeneralStateTests/stEIP1559/outOfFunds.json b/BlockchainTests/GeneralStateTests/stEIP1559/outOfFunds.json
@@ -25,7 +25,7 @@
             "timestamp" : "0x00",
             "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
-            "baseFee" : "0x0476"
+            "baseFeePerGas" : "0x0476"
         },
         "pre" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -90,7 +90,7 @@
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
-                    "baseFee" : "0x03e8"
+                    "baseFeePerGas" : "0x03e8"
                 },
                 "transactions" : [
                 ],
@@ -132,7 +132,7 @@
             "timestamp" : "0x00",
             "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
-            "baseFee" : "0x0476"
+            "baseFeePerGas" : "0x0476"
         },
         "pre" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -197,7 +197,7 @@
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
-                    "baseFee" : "0x03e8"
+                    "baseFeePerGas" : "0x03e8"
                 },
                 "transactions" : [
                 ],
@@ -239,7 +239,7 @@
             "timestamp" : "0x00",
             "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
-            "baseFee" : "0x0476"
+            "baseFeePerGas" : "0x0476"
         },
         "pre" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -304,7 +304,7 @@
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x3e033d854459d65526a8a5c11901e10c668d382e69b99a1e119c4415bc9fad41",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
-                    "baseFee" : "0x03e8"
+                    "baseFeePerGas" : "0x03e8"
                 },
                 "transactions" : [
                     {
@@ -355,7 +355,7 @@
             "timestamp" : "0x00",
             "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
-            "baseFee" : "0x0476"
+            "baseFeePerGas" : "0x0476"
         },
         "pre" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -420,7 +420,7 @@
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
-                    "baseFee" : "0x03e8"
+                    "baseFeePerGas" : "0x03e8"
                 },
                 "transactions" : [
                 ],

diff --git a/BlockchainTests/GeneralStateTests/stEIP1559/outOfFundsOldTypes.json b/BlockchainTests/GeneralStateTests/stEIP1559/outOfFundsOldTypes.json
@@ -25,7 +25,7 @@
             "timestamp" : "0x00",
             "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
-            "baseFee" : "0x0476"
+            "baseFeePerGas" : "0x0476"
         },
         "pre" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -90,7 +90,7 @@
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
-                    "baseFee" : "0x03e8"
+                    "baseFeePerGas" : "0x03e8"
                 },
                 "transactions" : [
                 ],
@@ -132,7 +132,7 @@
             "timestamp" : "0x00",
             "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
-            "baseFee" : "0x0476"
+            "baseFeePerGas" : "0x0476"
         },
         "pre" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -197,7 +197,7 @@
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
-                    "baseFee" : "0x03e8"
+                    "baseFeePerGas" : "0x03e8"
                 },
                 "transactions" : [
                 ],
@@ -239,7 +239,7 @@
             "timestamp" : "0x00",
             "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
-            "baseFee" : "0x0476"
+            "baseFeePerGas" : "0x0476"
         },
         "pre" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -304,7 +304,7 @@
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
-                    "baseFee" : "0x03e8"
+                    "baseFeePerGas" : "0x03e8"
                 },
                 "transactions" : [
                 ],
@@ -346,7 +346,7 @@
             "timestamp" : "0x00",
             "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
-            "baseFee" : "0x0476"
+            "baseFeePerGas" : "0x0476"
         },
         "pre" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -411,7 +411,7 @@
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
-                    "baseFee" : "0x03e8"
+                    "baseFeePerGas" : "0x03e8"
                 },
                 "transactions" : [
                 ],
@@ -453,7 +453,7 @@
             "timestamp" : "0x00",
             "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
-            "baseFee" : "0x0476"
+            "baseFeePerGas" : "0x0476"
         },
         "pre" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -518,7 +518,7 @@
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x346675bf0d91ef276df0e9d70600e3c21f038888975d470586774cf911b3f3c2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
-                    "baseFee" : "0x03e8"
+                    "baseFeePerGas" : "0x03e8"
                 },
                 "transactions" : [
                     {
@@ -564,7 +564,7 @@
             "timestamp" : "0x00",
             "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
-            "baseFee" : "0x0476"
+            "baseFeePerGas" : "0x0476"
         },
         "pre" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -629,7 +629,7 @@
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x4d2d579abe145c4af5933dc0ed3968e27342b578cca7547377757c8d9ffe8868",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
-                    "baseFee" : "0x03e8"
+                    "baseFeePerGas" : "0x03e8"
                 },
                 "transactions" : [
                     {
@@ -679,7 +679,7 @@
             "timestamp" : "0x00",
             "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
-            "baseFee" : "0x0476"
+            "baseFeePerGas" : "0x0476"
         },
         "pre" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -744,7 +744,7 @@
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
-                    "baseFee" : "0x03e8"
+                    "baseFeePerGas" : "0x03e8"
                 },
                 "transactions" : [
                 ],
@@ -786,7 +786,7 @@
             "timestamp" : "0x00",
             "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
-            "baseFee" : "0x0476"
+            "baseFeePerGas" : "0x0476"
         },
         "pre" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -851,7 +851,7 @@
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
-                    "baseFee" : "0x03e8"
+                    "baseFeePerGas" : "0x03e8"
                 },
                 "transactions" : [
                 ],

diff --git a/BlockchainTests/GeneralStateTests/stEIP1559/tipTooHigh.json b/BlockchainTests/GeneralStateTests/stEIP1559/tipTooHigh.json
@@ -25,7 +25,7 @@
             "timestamp" : "0x00",
             "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
-            "baseFee" : "0x0476"
+            "baseFeePerGas" : "0x0476"
         },
         "pre" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -90,7 +90,7 @@
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
-                    "baseFee" : "0x03e8"
+                    "baseFeePerGas" : "0x03e8"
                 },
                 "transactions" : [
                 ],

diff --git a/BlockchainTests/GeneralStateTests/stEIP1559/typeTwoBerlin.json b/BlockchainTests/GeneralStateTests/stEIP1559/typeTwoBerlin.json
@@ -130,7 +130,7 @@
             "timestamp" : "0x00",
             "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
-            "baseFee" : "0x0476"
+            "baseFeePerGas" : "0x0476"
         },
         "pre" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -196,7 +196,7 @@
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x35fb3cd0f13d62cc44ad0fc6d54416cff4a398863654c0df3bd844e1266c23a9",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
-                    "baseFee" : "0x03e8"
+                    "baseFeePerGas" : "0x03e8"
                 },
                 "transactions" : [
                     {