From 35238124a828cb125aa4ff523757116e225f467e Mon Sep 17 00:00:00 2001 From: Ori Pomerantz Date: Sun, 13 Aug 2023 10:29:54 +0000 Subject: [PATCH 1/2] stEIP2930 :yul fix --- src/GeneralStateTestsFiller/stEIP2930/coinbaseT01Filler.yml | 3 ++- src/GeneralStateTestsFiller/stEIP2930/coinbaseT2Filler.yml | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/GeneralStateTestsFiller/stEIP2930/coinbaseT01Filler.yml b/src/GeneralStateTestsFiller/stEIP2930/coinbaseT01Filler.yml index 135d9c086dc..f08b4bd4160 100644 --- a/src/GeneralStateTestsFiller/stEIP2930/coinbaseT01Filler.yml +++ b/src/GeneralStateTestsFiller/stEIP2930/coinbaseT01Filler.yml @@ -22,7 +22,8 @@ coinbaseT01: 000000000000000000000000000000000000C0DE: balance: '1000000000000000000' code: | - :yul { + :yul berlin + { mstore(0, gas()) pop(call(gas(), 0xBA5E, 1000000, 0, 0, 0, 0)) mstore(0x20, gas()) diff --git a/src/GeneralStateTestsFiller/stEIP2930/coinbaseT2Filler.yml b/src/GeneralStateTestsFiller/stEIP2930/coinbaseT2Filler.yml index 55ed2f52b85..61e72896bed 100644 --- a/src/GeneralStateTestsFiller/stEIP2930/coinbaseT2Filler.yml +++ b/src/GeneralStateTestsFiller/stEIP2930/coinbaseT2Filler.yml @@ -22,7 +22,8 @@ coinbaseT2: 000000000000000000000000000000000000C0DE: balance: '1000000000000000000' code: | - :yul { + :yul berlin + { mstore(0, gas()) pop(call(gas(), 0xBA5E, 1000000, 0, 0, 0, 0)) mstore(0x20, gas()) From 65eb05bbf31767ea22552b96ad6d246eca0b5e02 Mon Sep 17 00:00:00 2001 From: Ori Pomerantz Date: Sun, 13 Aug 2023 10:30:07 +0000 Subject: [PATCH 2/2] filled tests --- .../stEIP2930/coinbaseT01.json | 96 +++++++++---------- .../stEIP2930/coinbaseT2.json | 48 +++++----- GeneralStateTests/stEIP2930/coinbaseT01.json | 12 ++- GeneralStateTests/stEIP2930/coinbaseT2.json | 12 ++- 4 files changed, 86 insertions(+), 82 deletions(-) diff --git a/BlockchainTests/GeneralStateTests/stEIP2930/coinbaseT01.json b/BlockchainTests/GeneralStateTests/stEIP2930/coinbaseT01.json index 0fd75223588..c8d634d8eef 100644 --- a/BlockchainTests/GeneralStateTests/stEIP2930/coinbaseT01.json +++ b/BlockchainTests/GeneralStateTests/stEIP2930/coinbaseT01.json @@ -2,13 +2,13 @@ "coinbaseT01_d0g0v0_Berlin" : { "_info" : { "comment" : "Ori Pomerantz qbzzt1@gmail.com", - "filling-rpc-server" : "evm version 1.11.4-unstable-e14043db-20230308", - "filling-tool-version" : "retesteth-0.3.0-shanghai+commit.fd2c0a83.Linux.g++", + "filling-rpc-server" : "evm version 1.13.0-unstable-6ddb92ca-20230811", + "filling-tool-version" : "retesteth-0.3.1-cancun+commit.8cf9b032.Linux.g++", "generatedTestHash" : "a830f4d53f82058761f86e3abaa34fceb16a4b828ba17ad01a96b2ceeeda95c0", - "lllcversion" : "Version: 0.5.14-develop.2022.7.30+commit.a096d7a9.Linux.g++", + "lllcversion" : "Version: 0.5.14-develop.2023.8.11+commit.b2b86751.Linux.g++", "solidity" : "Version: 0.8.17+commit.8df45f5f.Linux.g++", "source" : "src/GeneralStateTestsFiller/stEIP2930/coinbaseT01Filler.yml", - "sourceHash" : "c01db10207a27b1e31461a24811015c6e32cf7083372887d8c94505d918ee2f2" + "sourceHash" : "d4c0800ec9fa0a7440981e2818313f6b65e9d2c4e43fc86281fdfbd9cca11234" }, "blocks" : [ { @@ -122,13 +122,13 @@ "coinbaseT01_d0g0v0_London" : { "_info" : { "comment" : "Ori Pomerantz qbzzt1@gmail.com", - "filling-rpc-server" : "evm version 1.11.4-unstable-e14043db-20230308", - "filling-tool-version" : "retesteth-0.3.0-shanghai+commit.fd2c0a83.Linux.g++", + "filling-rpc-server" : "evm version 1.13.0-unstable-6ddb92ca-20230811", + "filling-tool-version" : "retesteth-0.3.1-cancun+commit.8cf9b032.Linux.g++", "generatedTestHash" : "8aba34dfc831d69c0dc9d22954a8b726a41b0838c2d57fa852f2cacd6933540b", - "lllcversion" : "Version: 0.5.14-develop.2022.7.30+commit.a096d7a9.Linux.g++", + "lllcversion" : "Version: 0.5.14-develop.2023.8.11+commit.b2b86751.Linux.g++", "solidity" : "Version: 0.8.17+commit.8df45f5f.Linux.g++", "source" : "src/GeneralStateTestsFiller/stEIP2930/coinbaseT01Filler.yml", - "sourceHash" : "c01db10207a27b1e31461a24811015c6e32cf7083372887d8c94505d918ee2f2" + "sourceHash" : "d4c0800ec9fa0a7440981e2818313f6b65e9d2c4e43fc86281fdfbd9cca11234" }, "blocks" : [ { @@ -244,13 +244,13 @@ "coinbaseT01_d0g0v0_Merge" : { "_info" : { "comment" : "Ori Pomerantz qbzzt1@gmail.com", - "filling-rpc-server" : "evm version 1.11.4-unstable-e14043db-20230308", - "filling-tool-version" : "retesteth-0.3.0-shanghai+commit.fd2c0a83.Linux.g++", + "filling-rpc-server" : "evm version 1.13.0-unstable-6ddb92ca-20230811", + "filling-tool-version" : "retesteth-0.3.1-cancun+commit.8cf9b032.Linux.g++", "generatedTestHash" : "969547fbf480edefe9286b0eb6a37e7835eb5ee31307de06136cf116803223d2", - "lllcversion" : "Version: 0.5.14-develop.2022.7.30+commit.a096d7a9.Linux.g++", + "lllcversion" : "Version: 0.5.14-develop.2023.8.11+commit.b2b86751.Linux.g++", "solidity" : "Version: 0.8.17+commit.8df45f5f.Linux.g++", "source" : "src/GeneralStateTestsFiller/stEIP2930/coinbaseT01Filler.yml", - "sourceHash" : "c01db10207a27b1e31461a24811015c6e32cf7083372887d8c94505d918ee2f2" + "sourceHash" : "d4c0800ec9fa0a7440981e2818313f6b65e9d2c4e43fc86281fdfbd9cca11234" }, "blocks" : [ { @@ -366,13 +366,13 @@ "coinbaseT01_d0g0v0_Shanghai" : { "_info" : { "comment" : "Ori Pomerantz qbzzt1@gmail.com", - "filling-rpc-server" : "evm version 1.11.4-unstable-e14043db-20230308", - "filling-tool-version" : "retesteth-0.3.0-shanghai+commit.fd2c0a83.Linux.g++", + "filling-rpc-server" : "evm version 1.13.0-unstable-6ddb92ca-20230811", + "filling-tool-version" : "retesteth-0.3.1-cancun+commit.8cf9b032.Linux.g++", "generatedTestHash" : "87ec876b6709dc6ec2cbcea51626adf874845bfd2e1927440cf1b2ef4d3743b1", - "lllcversion" : "Version: 0.5.14-develop.2022.7.30+commit.a096d7a9.Linux.g++", + "lllcversion" : "Version: 0.5.14-develop.2023.8.11+commit.b2b86751.Linux.g++", "solidity" : "Version: 0.8.17+commit.8df45f5f.Linux.g++", "source" : "src/GeneralStateTestsFiller/stEIP2930/coinbaseT01Filler.yml", - "sourceHash" : "c01db10207a27b1e31461a24811015c6e32cf7083372887d8c94505d918ee2f2" + "sourceHash" : "d4c0800ec9fa0a7440981e2818313f6b65e9d2c4e43fc86281fdfbd9cca11234" }, "blocks" : [ { @@ -492,13 +492,13 @@ "coinbaseT01_d1g0v0_Berlin" : { "_info" : { "comment" : "Ori Pomerantz qbzzt1@gmail.com", - "filling-rpc-server" : "evm version 1.11.4-unstable-e14043db-20230308", - "filling-tool-version" : "retesteth-0.3.0-shanghai+commit.fd2c0a83.Linux.g++", + "filling-rpc-server" : "evm version 1.13.0-unstable-6ddb92ca-20230811", + "filling-tool-version" : "retesteth-0.3.1-cancun+commit.8cf9b032.Linux.g++", "generatedTestHash" : "4ee8793d6bb6df66a9440688266c8a5aafe777cf1b4af43c900ae3b87beb0191", - "lllcversion" : "Version: 0.5.14-develop.2022.7.30+commit.a096d7a9.Linux.g++", + "lllcversion" : "Version: 0.5.14-develop.2023.8.11+commit.b2b86751.Linux.g++", "solidity" : "Version: 0.8.17+commit.8df45f5f.Linux.g++", "source" : "src/GeneralStateTestsFiller/stEIP2930/coinbaseT01Filler.yml", - "sourceHash" : "c01db10207a27b1e31461a24811015c6e32cf7083372887d8c94505d918ee2f2" + "sourceHash" : "d4c0800ec9fa0a7440981e2818313f6b65e9d2c4e43fc86281fdfbd9cca11234" }, "blocks" : [ { @@ -621,13 +621,13 @@ "coinbaseT01_d1g0v0_London" : { "_info" : { "comment" : "Ori Pomerantz qbzzt1@gmail.com", - "filling-rpc-server" : "evm version 1.11.4-unstable-e14043db-20230308", - "filling-tool-version" : "retesteth-0.3.0-shanghai+commit.fd2c0a83.Linux.g++", + "filling-rpc-server" : "evm version 1.13.0-unstable-6ddb92ca-20230811", + "filling-tool-version" : "retesteth-0.3.1-cancun+commit.8cf9b032.Linux.g++", "generatedTestHash" : "1bcee4a315e5ec8547d53fcaf474d8387d19b4c06a427f3320843aad56b16968", - "lllcversion" : "Version: 0.5.14-develop.2022.7.30+commit.a096d7a9.Linux.g++", + "lllcversion" : "Version: 0.5.14-develop.2023.8.11+commit.b2b86751.Linux.g++", "solidity" : "Version: 0.8.17+commit.8df45f5f.Linux.g++", "source" : "src/GeneralStateTestsFiller/stEIP2930/coinbaseT01Filler.yml", - "sourceHash" : "c01db10207a27b1e31461a24811015c6e32cf7083372887d8c94505d918ee2f2" + "sourceHash" : "d4c0800ec9fa0a7440981e2818313f6b65e9d2c4e43fc86281fdfbd9cca11234" }, "blocks" : [ { @@ -752,13 +752,13 @@ "coinbaseT01_d1g0v0_Merge" : { "_info" : { "comment" : "Ori Pomerantz qbzzt1@gmail.com", - "filling-rpc-server" : "evm version 1.11.4-unstable-e14043db-20230308", - "filling-tool-version" : "retesteth-0.3.0-shanghai+commit.fd2c0a83.Linux.g++", + "filling-rpc-server" : "evm version 1.13.0-unstable-6ddb92ca-20230811", + "filling-tool-version" : "retesteth-0.3.1-cancun+commit.8cf9b032.Linux.g++", "generatedTestHash" : "565703dfcb244b2b3dc02abe182462405323e363e70e59429d7a249fff316cf7", - "lllcversion" : "Version: 0.5.14-develop.2022.7.30+commit.a096d7a9.Linux.g++", + "lllcversion" : "Version: 0.5.14-develop.2023.8.11+commit.b2b86751.Linux.g++", "solidity" : "Version: 0.8.17+commit.8df45f5f.Linux.g++", "source" : "src/GeneralStateTestsFiller/stEIP2930/coinbaseT01Filler.yml", - "sourceHash" : "c01db10207a27b1e31461a24811015c6e32cf7083372887d8c94505d918ee2f2" + "sourceHash" : "d4c0800ec9fa0a7440981e2818313f6b65e9d2c4e43fc86281fdfbd9cca11234" }, "blocks" : [ { @@ -883,13 +883,13 @@ "coinbaseT01_d1g0v0_Shanghai" : { "_info" : { "comment" : "Ori Pomerantz qbzzt1@gmail.com", - "filling-rpc-server" : "evm version 1.11.4-unstable-e14043db-20230308", - "filling-tool-version" : "retesteth-0.3.0-shanghai+commit.fd2c0a83.Linux.g++", + "filling-rpc-server" : "evm version 1.13.0-unstable-6ddb92ca-20230811", + "filling-tool-version" : "retesteth-0.3.1-cancun+commit.8cf9b032.Linux.g++", "generatedTestHash" : "040007b1a8d72e2f6c87dd732569bfcd9866d017dbd7c87ca74435bfc09db02e", - "lllcversion" : "Version: 0.5.14-develop.2022.7.30+commit.a096d7a9.Linux.g++", + "lllcversion" : "Version: 0.5.14-develop.2023.8.11+commit.b2b86751.Linux.g++", "solidity" : "Version: 0.8.17+commit.8df45f5f.Linux.g++", "source" : "src/GeneralStateTestsFiller/stEIP2930/coinbaseT01Filler.yml", - "sourceHash" : "c01db10207a27b1e31461a24811015c6e32cf7083372887d8c94505d918ee2f2" + "sourceHash" : "d4c0800ec9fa0a7440981e2818313f6b65e9d2c4e43fc86281fdfbd9cca11234" }, "blocks" : [ { @@ -1018,13 +1018,13 @@ "coinbaseT01_d2g0v0_Berlin" : { "_info" : { "comment" : "Ori Pomerantz qbzzt1@gmail.com", - "filling-rpc-server" : "evm version 1.11.4-unstable-e14043db-20230308", - "filling-tool-version" : "retesteth-0.3.0-shanghai+commit.fd2c0a83.Linux.g++", + "filling-rpc-server" : "evm version 1.13.0-unstable-6ddb92ca-20230811", + "filling-tool-version" : "retesteth-0.3.1-cancun+commit.8cf9b032.Linux.g++", "generatedTestHash" : "ece2f921eb80dd268f739adb62299f9fced503fbe762b3f53de9dc8402386c80", - "lllcversion" : "Version: 0.5.14-develop.2022.7.30+commit.a096d7a9.Linux.g++", + "lllcversion" : "Version: 0.5.14-develop.2023.8.11+commit.b2b86751.Linux.g++", "solidity" : "Version: 0.8.17+commit.8df45f5f.Linux.g++", "source" : "src/GeneralStateTestsFiller/stEIP2930/coinbaseT01Filler.yml", - "sourceHash" : "c01db10207a27b1e31461a24811015c6e32cf7083372887d8c94505d918ee2f2" + "sourceHash" : "d4c0800ec9fa0a7440981e2818313f6b65e9d2c4e43fc86281fdfbd9cca11234" }, "blocks" : [ { @@ -1147,13 +1147,13 @@ "coinbaseT01_d2g0v0_London" : { "_info" : { "comment" : "Ori Pomerantz qbzzt1@gmail.com", - "filling-rpc-server" : "evm version 1.11.4-unstable-e14043db-20230308", - "filling-tool-version" : "retesteth-0.3.0-shanghai+commit.fd2c0a83.Linux.g++", + "filling-rpc-server" : "evm version 1.13.0-unstable-6ddb92ca-20230811", + "filling-tool-version" : "retesteth-0.3.1-cancun+commit.8cf9b032.Linux.g++", "generatedTestHash" : "1b08cbd4373201c7f83e651b1510a04954965fe0e4a9d0010cc24293de9ed9d2", - "lllcversion" : "Version: 0.5.14-develop.2022.7.30+commit.a096d7a9.Linux.g++", + "lllcversion" : "Version: 0.5.14-develop.2023.8.11+commit.b2b86751.Linux.g++", "solidity" : "Version: 0.8.17+commit.8df45f5f.Linux.g++", "source" : "src/GeneralStateTestsFiller/stEIP2930/coinbaseT01Filler.yml", - "sourceHash" : "c01db10207a27b1e31461a24811015c6e32cf7083372887d8c94505d918ee2f2" + "sourceHash" : "d4c0800ec9fa0a7440981e2818313f6b65e9d2c4e43fc86281fdfbd9cca11234" }, "blocks" : [ { @@ -1278,13 +1278,13 @@ "coinbaseT01_d2g0v0_Merge" : { "_info" : { "comment" : "Ori Pomerantz qbzzt1@gmail.com", - "filling-rpc-server" : "evm version 1.11.4-unstable-e14043db-20230308", - "filling-tool-version" : "retesteth-0.3.0-shanghai+commit.fd2c0a83.Linux.g++", + "filling-rpc-server" : "evm version 1.13.0-unstable-6ddb92ca-20230811", + "filling-tool-version" : "retesteth-0.3.1-cancun+commit.8cf9b032.Linux.g++", "generatedTestHash" : "ff80a18ffa2de6d2dbedd9194cbe7dd7a30433d1e440c8b9d21072b0c01758b7", - "lllcversion" : "Version: 0.5.14-develop.2022.7.30+commit.a096d7a9.Linux.g++", + "lllcversion" : "Version: 0.5.14-develop.2023.8.11+commit.b2b86751.Linux.g++", "solidity" : "Version: 0.8.17+commit.8df45f5f.Linux.g++", "source" : "src/GeneralStateTestsFiller/stEIP2930/coinbaseT01Filler.yml", - "sourceHash" : "c01db10207a27b1e31461a24811015c6e32cf7083372887d8c94505d918ee2f2" + "sourceHash" : "d4c0800ec9fa0a7440981e2818313f6b65e9d2c4e43fc86281fdfbd9cca11234" }, "blocks" : [ { @@ -1409,13 +1409,13 @@ "coinbaseT01_d2g0v0_Shanghai" : { "_info" : { "comment" : "Ori Pomerantz qbzzt1@gmail.com", - "filling-rpc-server" : "evm version 1.11.4-unstable-e14043db-20230308", - "filling-tool-version" : "retesteth-0.3.0-shanghai+commit.fd2c0a83.Linux.g++", + "filling-rpc-server" : "evm version 1.13.0-unstable-6ddb92ca-20230811", + "filling-tool-version" : "retesteth-0.3.1-cancun+commit.8cf9b032.Linux.g++", "generatedTestHash" : "3acea98823905c83ca1bef7b675721f9b7738ef783d53697205362086eb39b9e", - "lllcversion" : "Version: 0.5.14-develop.2022.7.30+commit.a096d7a9.Linux.g++", + "lllcversion" : "Version: 0.5.14-develop.2023.8.11+commit.b2b86751.Linux.g++", "solidity" : "Version: 0.8.17+commit.8df45f5f.Linux.g++", "source" : "src/GeneralStateTestsFiller/stEIP2930/coinbaseT01Filler.yml", - "sourceHash" : "c01db10207a27b1e31461a24811015c6e32cf7083372887d8c94505d918ee2f2" + "sourceHash" : "d4c0800ec9fa0a7440981e2818313f6b65e9d2c4e43fc86281fdfbd9cca11234" }, "blocks" : [ { diff --git a/BlockchainTests/GeneralStateTests/stEIP2930/coinbaseT2.json b/BlockchainTests/GeneralStateTests/stEIP2930/coinbaseT2.json index eeec193e383..6bb52681c77 100644 --- a/BlockchainTests/GeneralStateTests/stEIP2930/coinbaseT2.json +++ b/BlockchainTests/GeneralStateTests/stEIP2930/coinbaseT2.json @@ -2,13 +2,13 @@ "coinbaseT2_d0g0v0_London" : { "_info" : { "comment" : "Ori Pomerantz qbzzt1@gmail.com", - "filling-rpc-server" : "evm version 1.11.4-unstable-e14043db-20230308", - "filling-tool-version" : "retesteth-0.3.0-shanghai+commit.fd2c0a83.Linux.g++", + "filling-rpc-server" : "evm version 1.13.0-unstable-6ddb92ca-20230811", + "filling-tool-version" : "retesteth-0.3.1-cancun+commit.8cf9b032.Linux.g++", "generatedTestHash" : "29cbea2f2cd143b971db01a6791508eb83c5d629cd3dc440dba14af0f5e6670e", - "lllcversion" : "Version: 0.5.14-develop.2022.7.30+commit.a096d7a9.Linux.g++", + "lllcversion" : "Version: 0.5.14-develop.2023.8.11+commit.b2b86751.Linux.g++", "solidity" : "Version: 0.8.17+commit.8df45f5f.Linux.g++", "source" : "src/GeneralStateTestsFiller/stEIP2930/coinbaseT2Filler.yml", - "sourceHash" : "1741001bf70249edad131a859175e52aeee991e4d4580a8bbe018c782b0e252f" + "sourceHash" : "d79321e9a243551d0e6c410965b700d6cb8469052769a2298d80ac556d5b1510" }, "blocks" : [ { @@ -134,13 +134,13 @@ "coinbaseT2_d0g0v0_Merge" : { "_info" : { "comment" : "Ori Pomerantz qbzzt1@gmail.com", - "filling-rpc-server" : "evm version 1.11.4-unstable-e14043db-20230308", - "filling-tool-version" : "retesteth-0.3.0-shanghai+commit.fd2c0a83.Linux.g++", + "filling-rpc-server" : "evm version 1.13.0-unstable-6ddb92ca-20230811", + "filling-tool-version" : "retesteth-0.3.1-cancun+commit.8cf9b032.Linux.g++", "generatedTestHash" : "2c4045f44328b7be2ca438aadff0d2e45ac0e8bc81b3b33ddbff4dccc04fe581", - "lllcversion" : "Version: 0.5.14-develop.2022.7.30+commit.a096d7a9.Linux.g++", + "lllcversion" : "Version: 0.5.14-develop.2023.8.11+commit.b2b86751.Linux.g++", "solidity" : "Version: 0.8.17+commit.8df45f5f.Linux.g++", "source" : "src/GeneralStateTestsFiller/stEIP2930/coinbaseT2Filler.yml", - "sourceHash" : "1741001bf70249edad131a859175e52aeee991e4d4580a8bbe018c782b0e252f" + "sourceHash" : "d79321e9a243551d0e6c410965b700d6cb8469052769a2298d80ac556d5b1510" }, "blocks" : [ { @@ -266,13 +266,13 @@ "coinbaseT2_d0g0v0_Shanghai" : { "_info" : { "comment" : "Ori Pomerantz qbzzt1@gmail.com", - "filling-rpc-server" : "evm version 1.11.4-unstable-e14043db-20230308", - "filling-tool-version" : "retesteth-0.3.0-shanghai+commit.fd2c0a83.Linux.g++", + "filling-rpc-server" : "evm version 1.13.0-unstable-6ddb92ca-20230811", + "filling-tool-version" : "retesteth-0.3.1-cancun+commit.8cf9b032.Linux.g++", "generatedTestHash" : "79e5554ee258e2813414b4b26bcbedbbf995b7b0cf2d10d0baf365c10913c670", - "lllcversion" : "Version: 0.5.14-develop.2022.7.30+commit.a096d7a9.Linux.g++", + "lllcversion" : "Version: 0.5.14-develop.2023.8.11+commit.b2b86751.Linux.g++", "solidity" : "Version: 0.8.17+commit.8df45f5f.Linux.g++", "source" : "src/GeneralStateTestsFiller/stEIP2930/coinbaseT2Filler.yml", - "sourceHash" : "1741001bf70249edad131a859175e52aeee991e4d4580a8bbe018c782b0e252f" + "sourceHash" : "d79321e9a243551d0e6c410965b700d6cb8469052769a2298d80ac556d5b1510" }, "blocks" : [ { @@ -402,13 +402,13 @@ "coinbaseT2_d1g0v0_London" : { "_info" : { "comment" : "Ori Pomerantz qbzzt1@gmail.com", - "filling-rpc-server" : "evm version 1.11.4-unstable-e14043db-20230308", - "filling-tool-version" : "retesteth-0.3.0-shanghai+commit.fd2c0a83.Linux.g++", + "filling-rpc-server" : "evm version 1.13.0-unstable-6ddb92ca-20230811", + "filling-tool-version" : "retesteth-0.3.1-cancun+commit.8cf9b032.Linux.g++", "generatedTestHash" : "ec756aea2c46ae7970d8c81865c32094281ac10eb14a77d07e599583ad0a9806", - "lllcversion" : "Version: 0.5.14-develop.2022.7.30+commit.a096d7a9.Linux.g++", + "lllcversion" : "Version: 0.5.14-develop.2023.8.11+commit.b2b86751.Linux.g++", "solidity" : "Version: 0.8.17+commit.8df45f5f.Linux.g++", "source" : "src/GeneralStateTestsFiller/stEIP2930/coinbaseT2Filler.yml", - "sourceHash" : "1741001bf70249edad131a859175e52aeee991e4d4580a8bbe018c782b0e252f" + "sourceHash" : "d79321e9a243551d0e6c410965b700d6cb8469052769a2298d80ac556d5b1510" }, "blocks" : [ { @@ -534,13 +534,13 @@ "coinbaseT2_d1g0v0_Merge" : { "_info" : { "comment" : "Ori Pomerantz qbzzt1@gmail.com", - "filling-rpc-server" : "evm version 1.11.4-unstable-e14043db-20230308", - "filling-tool-version" : "retesteth-0.3.0-shanghai+commit.fd2c0a83.Linux.g++", + "filling-rpc-server" : "evm version 1.13.0-unstable-6ddb92ca-20230811", + "filling-tool-version" : "retesteth-0.3.1-cancun+commit.8cf9b032.Linux.g++", "generatedTestHash" : "fd63b283059a7acfd665e10b25ddd644c200c22c8a1ceb84eb23dcd2aedaedf8", - "lllcversion" : "Version: 0.5.14-develop.2022.7.30+commit.a096d7a9.Linux.g++", + "lllcversion" : "Version: 0.5.14-develop.2023.8.11+commit.b2b86751.Linux.g++", "solidity" : "Version: 0.8.17+commit.8df45f5f.Linux.g++", "source" : "src/GeneralStateTestsFiller/stEIP2930/coinbaseT2Filler.yml", - "sourceHash" : "1741001bf70249edad131a859175e52aeee991e4d4580a8bbe018c782b0e252f" + "sourceHash" : "d79321e9a243551d0e6c410965b700d6cb8469052769a2298d80ac556d5b1510" }, "blocks" : [ { @@ -666,13 +666,13 @@ "coinbaseT2_d1g0v0_Shanghai" : { "_info" : { "comment" : "Ori Pomerantz qbzzt1@gmail.com", - "filling-rpc-server" : "evm version 1.11.4-unstable-e14043db-20230308", - "filling-tool-version" : "retesteth-0.3.0-shanghai+commit.fd2c0a83.Linux.g++", + "filling-rpc-server" : "evm version 1.13.0-unstable-6ddb92ca-20230811", + "filling-tool-version" : "retesteth-0.3.1-cancun+commit.8cf9b032.Linux.g++", "generatedTestHash" : "ca60a401e044b44095b3388632ac58fa0ea3ab8b51053213d62bcc464bfbf3c5", - "lllcversion" : "Version: 0.5.14-develop.2022.7.30+commit.a096d7a9.Linux.g++", + "lllcversion" : "Version: 0.5.14-develop.2023.8.11+commit.b2b86751.Linux.g++", "solidity" : "Version: 0.8.17+commit.8df45f5f.Linux.g++", "source" : "src/GeneralStateTestsFiller/stEIP2930/coinbaseT2Filler.yml", - "sourceHash" : "1741001bf70249edad131a859175e52aeee991e4d4580a8bbe018c782b0e252f" + "sourceHash" : "d79321e9a243551d0e6c410965b700d6cb8469052769a2298d80ac556d5b1510" }, "blocks" : [ { diff --git a/GeneralStateTests/stEIP2930/coinbaseT01.json b/GeneralStateTests/stEIP2930/coinbaseT01.json index 68f55509576..6d16f44e5ae 100644 --- a/GeneralStateTests/stEIP2930/coinbaseT01.json +++ b/GeneralStateTests/stEIP2930/coinbaseT01.json @@ -2,27 +2,29 @@ "coinbaseT01" : { "_info" : { "comment" : "Ori Pomerantz qbzzt1@gmail.com", - "filling-rpc-server" : "evm version 1.11.4-unstable-e14043db-20230308", - "filling-tool-version" : "retesteth-0.3.0-shanghai+commit.fd2c0a83.Linux.g++", - "generatedTestHash" : "a502c3ce0f1dd85a9415cb5fe9bc2bcb8e36260abf9b9131e434749b0fa085f7", + "filling-rpc-server" : "evm version 1.13.0-unstable-6ddb92ca-20230811", + "filling-tool-version" : "retesteth-0.3.1-cancun+commit.8cf9b032.Linux.g++", + "generatedTestHash" : "51272cc08184aa00bc717c54be35e5e29a6db2517273882151e84b3eac54df9a", "labels" : { "0" : "T0", "1" : "T1baseInList", "2" : "T1baseNotInList" }, - "lllcversion" : "Version: 0.5.14-develop.2022.7.30+commit.a096d7a9.Linux.g++", + "lllcversion" : "Version: 0.5.14-develop.2023.8.11+commit.b2b86751.Linux.g++", "solidity" : "Version: 0.8.17+commit.8df45f5f.Linux.g++", "source" : "src/GeneralStateTestsFiller/stEIP2930/coinbaseT01Filler.yml", - "sourceHash" : "c01db10207a27b1e31461a24811015c6e32cf7083372887d8c94505d918ee2f2" + "sourceHash" : "d4c0800ec9fa0a7440981e2818313f6b65e9d2c4e43fc86281fdfbd9cca11234" }, "env" : { "currentBaseFee" : "0x64", + "currentBeaconRoot" : "0x0000000000000000000000000000000000000000000000000000000000000000", "currentCoinbase" : "0x000000000000000000000000000000000000ba5e", "currentDifficulty" : "0x020000", "currentGasLimit" : "0xff112233445566", "currentNumber" : "0x01", "currentRandom" : "0x0000000000000000000000000000000000000000000000000000000000020000", "currentTimestamp" : "0x03e8", + "currentWithdrawalsRoot" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421", "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, "post" : { diff --git a/GeneralStateTests/stEIP2930/coinbaseT2.json b/GeneralStateTests/stEIP2930/coinbaseT2.json index b136f4b331b..c8038259fdd 100644 --- a/GeneralStateTests/stEIP2930/coinbaseT2.json +++ b/GeneralStateTests/stEIP2930/coinbaseT2.json @@ -2,26 +2,28 @@ "coinbaseT2" : { "_info" : { "comment" : "Ori Pomerantz qbzzt1@gmail.com", - "filling-rpc-server" : "evm version 1.11.4-unstable-e14043db-20230308", - "filling-tool-version" : "retesteth-0.3.0-shanghai+commit.fd2c0a83.Linux.g++", - "generatedTestHash" : "fd5659cbaa77bb4db6bc87ecf93bfc1612571c44edcd6b5acabfc71b8b955e7a", + "filling-rpc-server" : "evm version 1.13.0-unstable-6ddb92ca-20230811", + "filling-tool-version" : "retesteth-0.3.1-cancun+commit.8cf9b032.Linux.g++", + "generatedTestHash" : "42c720678c7fc5de0194fd8d6e6c3d28f32fa8f44d35bd7b19ba8c9a7ce38cdf", "labels" : { "0" : "T2baseInList", "1" : "T2baseNotInList" }, - "lllcversion" : "Version: 0.5.14-develop.2022.7.30+commit.a096d7a9.Linux.g++", + "lllcversion" : "Version: 0.5.14-develop.2023.8.11+commit.b2b86751.Linux.g++", "solidity" : "Version: 0.8.17+commit.8df45f5f.Linux.g++", "source" : "src/GeneralStateTestsFiller/stEIP2930/coinbaseT2Filler.yml", - "sourceHash" : "1741001bf70249edad131a859175e52aeee991e4d4580a8bbe018c782b0e252f" + "sourceHash" : "d79321e9a243551d0e6c410965b700d6cb8469052769a2298d80ac556d5b1510" }, "env" : { "currentBaseFee" : "0x64", + "currentBeaconRoot" : "0x0000000000000000000000000000000000000000000000000000000000000000", "currentCoinbase" : "0x000000000000000000000000000000000000ba5e", "currentDifficulty" : "0x020000", "currentGasLimit" : "0xff112233445566", "currentNumber" : "0x01", "currentRandom" : "0x0000000000000000000000000000000000000000000000000000000000020000", "currentTimestamp" : "0x03e8", + "currentWithdrawalsRoot" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421", "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, "post" : {