From 66b07acfcfe5661b2fbf73c96a1523c1407f3023 Mon Sep 17 00:00:00 2001 From: Felix H Date: Mon, 12 May 2025 10:16:57 +0000 Subject: [PATCH 1/3] adjusted static_tests to only allow gasLimit of up to 30mil as enforced in eip-7825 --- .../Cancun/stEIP1153_transientStorage/transStorageOKFiller.yml | 2 +- .../stEIP1153_transientStorage/transStorageResetFiller.yml | 2 +- tests/static/state_tests/VMTests/vmArithmeticTest/addFiller.yml | 2 +- .../state_tests/VMTests/vmArithmeticTest/addmodFiller.yml | 2 +- .../static/state_tests/VMTests/vmArithmeticTest/arithFiller.yml | 2 +- .../state_tests/VMTests/vmArithmeticTest/divByZeroFiller.yml | 2 +- tests/static/state_tests/VMTests/vmArithmeticTest/divFiller.yml | 2 +- tests/static/state_tests/VMTests/vmArithmeticTest/expFiller.yml | 2 +- .../state_tests/VMTests/vmArithmeticTest/expPower256Filler.yml | 2 +- .../VMTests/vmArithmeticTest/expPower256Of256Filler.yml | 2 +- .../state_tests/VMTests/vmArithmeticTest/expPower2Filler.yml | 2 +- tests/static/state_tests/VMTests/vmArithmeticTest/fibFiller.yml | 2 +- tests/static/state_tests/VMTests/vmArithmeticTest/modFiller.yml | 2 +- tests/static/state_tests/VMTests/vmArithmeticTest/mulFiller.yml | 2 +- .../state_tests/VMTests/vmArithmeticTest/mulmodFiller.yml | 2 +- tests/static/state_tests/VMTests/vmArithmeticTest/notFiller.yml | 2 +- .../static/state_tests/VMTests/vmArithmeticTest/sdivFiller.yml | 2 +- .../state_tests/VMTests/vmArithmeticTest/signextendFiller.yml | 2 +- .../static/state_tests/VMTests/vmArithmeticTest/smodFiller.yml | 2 +- tests/static/state_tests/VMTests/vmArithmeticTest/subFiller.yml | 2 +- .../state_tests/VMTests/vmArithmeticTest/twoOpsFiller.yml | 2 +- .../state_tests/VMTests/vmBitwiseLogicOperation/andFiller.yml | 2 +- .../state_tests/VMTests/vmBitwiseLogicOperation/byteFiller.yml | 2 +- .../state_tests/VMTests/vmBitwiseLogicOperation/eqFiller.yml | 2 +- .../state_tests/VMTests/vmBitwiseLogicOperation/gtFiller.yml | 2 +- .../VMTests/vmBitwiseLogicOperation/iszeroFiller.yml | 2 +- .../state_tests/VMTests/vmBitwiseLogicOperation/ltFiller.yml | 2 +- .../state_tests/VMTests/vmBitwiseLogicOperation/notFiller.yml | 2 +- .../state_tests/VMTests/vmBitwiseLogicOperation/orFiller.yml | 2 +- .../state_tests/VMTests/vmBitwiseLogicOperation/sgtFiller.yml | 2 +- .../state_tests/VMTests/vmBitwiseLogicOperation/sltFiller.yml | 2 +- .../state_tests/VMTests/vmBitwiseLogicOperation/xorFiller.yml | 2 +- .../VMTests/vmIOandFlowOperations/codecopyFiller.yml | 2 +- .../state_tests/VMTests/vmIOandFlowOperations/gasFiller.yml | 2 +- .../state_tests/VMTests/vmIOandFlowOperations/jumpFiller.yml | 2 +- .../VMTests/vmIOandFlowOperations/jumpToPushFiller.yml | 2 +- .../state_tests/VMTests/vmIOandFlowOperations/jumpiFiller.yml | 2 +- .../VMTests/vmIOandFlowOperations/loop_stacklimitFiller.yml | 2 +- .../VMTests/vmIOandFlowOperations/loopsConditionalsFiller.yml | 2 +- .../state_tests/VMTests/vmIOandFlowOperations/mloadFiller.yml | 2 +- .../state_tests/VMTests/vmIOandFlowOperations/msizeFiller.yml | 2 +- .../state_tests/VMTests/vmIOandFlowOperations/mstore8Filler.yml | 2 +- .../state_tests/VMTests/vmIOandFlowOperations/mstoreFiller.yml | 2 +- .../state_tests/VMTests/vmIOandFlowOperations/pcFiller.yml | 2 +- .../state_tests/VMTests/vmIOandFlowOperations/popFiller.yml | 2 +- .../state_tests/VMTests/vmIOandFlowOperations/returnFiller.yml | 2 +- .../VMTests/vmIOandFlowOperations/sstore_sloadFiller.yml | 2 +- tests/static/state_tests/VMTests/vmLogTest/log0Filler.yml | 2 +- tests/static/state_tests/VMTests/vmLogTest/log1Filler.yml | 2 +- tests/static/state_tests/VMTests/vmLogTest/log2Filler.yml | 2 +- tests/static/state_tests/VMTests/vmLogTest/log3Filler.yml | 2 +- tests/static/state_tests/VMTests/vmLogTest/log4Filler.yml | 2 +- tests/static/state_tests/VMTests/vmTests/blockInfoFiller.yml | 2 +- tests/static/state_tests/VMTests/vmTests/envInfoFiller.yml | 2 +- tests/static/state_tests/VMTests/vmTests/randomFiller.yml | 2 +- tests/static/state_tests/VMTests/vmTests/sha3Filler.yml | 2 +- tests/static/state_tests/VMTests/vmTests/suicideFiller.yml | 2 +- tests/static/state_tests/VMTests/vmTests/swapFiller.yml | 2 +- tests/static/state_tests/stBadOpcode/invalidAddrFiller.yml | 2 +- tests/static/state_tests/stBadOpcode/measureGasFiller.yml | 2 +- tests/static/state_tests/stBadOpcode/operationDiffGasFiller.yml | 2 +- .../state_tests/stBadOpcode/undefinedOpcodeFirstByteFiller.yml | 2 +- .../state_tests/stCreate2/CREATE2_FirstByte_loopFiller.yml | 2 +- .../stCreate2/CREATE2_HighNonceDelegatecallFiller.yml | 2 +- tests/static/state_tests/stCreate2/CREATE2_HighNonceFiller.yml | 2 +- .../state_tests/stCreate2/CREATE2_HighNonceMinus1Filler.yml | 2 +- .../stCreateTest/CREATE_ContractRETURNBigOffsetFiller.yml | 2 +- .../state_tests/stCreateTest/CREATE_FirstByte_loopFiller.yml | 2 +- .../static/state_tests/stCreateTest/CREATE_HighNonceFiller.yml | 2 +- .../state_tests/stCreateTest/CREATE_HighNonceMinus1Filler.yml | 2 +- .../stCreateTest/CreateAddressWarmAfterFailFiller.yml | 2 +- .../state_tests/stCreateTest/CreateCollisionResultsFiller.yml | 2 +- .../stCreateTest/CreateOOGafterMaxCodesizeFiller.yml | 2 +- .../static/state_tests/stCreateTest/createFailResultFiller.yml | 2 +- .../static/state_tests/stCreateTest/createLargeResultFiller.yml | 2 +- .../stEIP150singleCodeGasPrices/eip2929-ffFiller.yml | 2 +- .../state_tests/stEIP150singleCodeGasPrices/eip2929Filler.yml | 2 +- .../stEIP150singleCodeGasPrices/eip2929OOGFiller.yml | 2 +- .../stEIP150singleCodeGasPrices/gasCostBerlinFiller.yml | 2 +- .../stEIP150singleCodeGasPrices/gasCostExpFiller.yml | 2 +- .../state_tests/stEIP150singleCodeGasPrices/gasCostFiller.yml | 2 +- .../stEIP150singleCodeGasPrices/gasCostJumpFiller.yml | 2 +- .../stEIP150singleCodeGasPrices/gasCostMemSegFiller.yml | 2 +- .../stEIP150singleCodeGasPrices/gasCostMemoryFiller.yml | 2 +- .../stEIP150singleCodeGasPrices/gasCostReturnFiller.yml | 2 +- tests/static/state_tests/stEIP1559/baseFeeDiffPlacesFiller.yml | 2 +- tests/static/state_tests/stEIP1559/gasPriceDiffPlacesFiller.yml | 2 +- tests/static/state_tests/stEIP1559/outOfFundsFiller.yml | 2 +- tests/static/state_tests/stEIP1559/outOfFundsOldTypesFiller.yml | 2 +- tests/static/state_tests/stEIP2930/addressOpcodesFiller.yml | 2 +- tests/static/state_tests/stEIP2930/coinbaseT01Filler.yml | 2 +- tests/static/state_tests/stEIP2930/coinbaseT2Filler.yml | 2 +- tests/static/state_tests/stEIP2930/variedContextFiller.yml | 2 +- tests/static/state_tests/stExample/yulExampleFiller.yml | 2 +- .../state_tests/stExtCodeHash/extcodehashEmpty_ParisFiller.yml | 2 +- tests/static/state_tests/stMemoryTest/bufferFiller.yml | 2 +- tests/static/state_tests/stMemoryTest/bufferSrcOffsetFiller.yml | 2 +- tests/static/state_tests/stMemoryTest/memCopySelfFiller.yml | 2 +- tests/static/state_tests/stMemoryTest/oogFiller.yml | 2 +- .../state_tests/stPreCompiledContracts/modexpTestsFiller.yml | 2 +- .../stPreCompiledContracts/precompsEIP2929CancunFiller.yml | 2 +- .../stPreCompiledContracts2/ecrecoverWeirdVFiller.yml | 2 +- tests/static/state_tests/stRandom/randomStatetest384Filler.yml | 2 +- .../state_tests/stReturnDataTest/clearReturnBufferFiller.yml | 2 +- .../state_tests/stReturnDataTest/revertRetDataSizeFiller.yml | 2 +- .../stReturnDataTest/tooLongReturnDataCopyFiller.yml | 2 +- tests/static/state_tests/stRevertTest/costRevertFiller.yml | 2 +- tests/static/state_tests/stRevertTest/stateRevertFiller.yml | 2 +- tests/static/state_tests/stSStoreTest/sstoreGasFiller.yml | 2 +- tests/static/state_tests/stSelfBalance/diffPlacesFiller.yml | 2 +- tests/static/state_tests/stShift/shiftCombinationsFiller.yml | 2 +- .../state_tests/stShift/shiftSignedCombinationsFiller.yml | 2 +- .../stSystemOperationsTest/doubleSelfdestructTestFiller.yml | 2 +- 113 files changed, 113 insertions(+), 113 deletions(-) diff --git a/tests/static/state_tests/Cancun/stEIP1153_transientStorage/transStorageOKFiller.yml b/tests/static/state_tests/Cancun/stEIP1153_transientStorage/transStorageOKFiller.yml index 63f28e40812..fc4b7edb8b8 100644 --- a/tests/static/state_tests/Cancun/stEIP1153_transientStorage/transStorageOKFiller.yml +++ b/tests/static/state_tests/Cancun/stEIP1153_transientStorage/transStorageOKFiller.yml @@ -810,7 +810,7 @@ transStorageOK: - :label static_call :abi staticCall() gasLimit: - - 80000000 + - 30000000 gasPrice: 10 nonce: 1 to: cccccccccccccccccccccccccccccccccccccccc diff --git a/tests/static/state_tests/Cancun/stEIP1153_transientStorage/transStorageResetFiller.yml b/tests/static/state_tests/Cancun/stEIP1153_transientStorage/transStorageResetFiller.yml index f92652dd854..2f8ea408cdb 100644 --- a/tests/static/state_tests/Cancun/stEIP1153_transientStorage/transStorageResetFiller.yml +++ b/tests/static/state_tests/Cancun/stEIP1153_transientStorage/transStorageResetFiller.yml @@ -247,7 +247,7 @@ transStorageReset: gasLimit: - - 80000000 + - 30000000 gasPrice: 10 nonce: 1 to: cccccccccccccccccccccccccccccccccccccccc diff --git a/tests/static/state_tests/VMTests/vmArithmeticTest/addFiller.yml b/tests/static/state_tests/VMTests/vmArithmeticTest/addFiller.yml index 3f1963c35f4..fd962252f48 100644 --- a/tests/static/state_tests/VMTests/vmArithmeticTest/addFiller.yml +++ b/tests/static/state_tests/VMTests/vmArithmeticTest/addFiller.yml @@ -101,7 +101,7 @@ add: - :label add_0_0 :abi f(uint) 3 - :label add_1_neg1 :abi f(uint) 4 gasLimit: - - '80000000' + - '30000000' gasPrice: '10' nonce: '0' to: cccccccccccccccccccccccccccccccccccccccc diff --git a/tests/static/state_tests/VMTests/vmArithmeticTest/addmodFiller.yml b/tests/static/state_tests/VMTests/vmArithmeticTest/addmodFiller.yml index 1bc6f702804..3895fb9b88e 100644 --- a/tests/static/state_tests/VMTests/vmArithmeticTest/addmodFiller.yml +++ b/tests/static/state_tests/VMTests/vmArithmeticTest/addmodFiller.yml @@ -200,7 +200,7 @@ addmod: - :label addmod_1_0_0 :abi f(uint) 0x0e - :label addmod_0_0_0_min_1 :abi f(uint) 0x0f gasLimit: - - '80000000' + - '30000000' gasPrice: '10' nonce: '0' to: cccccccccccccccccccccccccccccccccccccccc diff --git a/tests/static/state_tests/VMTests/vmArithmeticTest/arithFiller.yml b/tests/static/state_tests/VMTests/vmArithmeticTest/arithFiller.yml index 8ee4182d3df..2796512b3ae 100644 --- a/tests/static/state_tests/VMTests/vmArithmeticTest/arithFiller.yml +++ b/tests/static/state_tests/VMTests/vmArithmeticTest/arithFiller.yml @@ -66,7 +66,7 @@ arith: data: - :raw 0x00 gasLimit: - - '80000000' + - '30000000' gasPrice: '10' nonce: '0' to: cccccccccccccccccccccccccccccccccccccccc diff --git a/tests/static/state_tests/VMTests/vmArithmeticTest/divByZeroFiller.yml b/tests/static/state_tests/VMTests/vmArithmeticTest/divByZeroFiller.yml index 34cb58d9cf4..8b4d404faa9 100644 --- a/tests/static/state_tests/VMTests/vmArithmeticTest/divByZeroFiller.yml +++ b/tests/static/state_tests/VMTests/vmArithmeticTest/divByZeroFiller.yml @@ -206,7 +206,7 @@ divByZero: gasLimit: - - '80000000' + - '30000000' gasPrice: '10' nonce: '0' to: cccccccccccccccccccccccccccccccccccccccc diff --git a/tests/static/state_tests/VMTests/vmArithmeticTest/divFiller.yml b/tests/static/state_tests/VMTests/vmArithmeticTest/divFiller.yml index 01f5b51b0a3..692681e4591 100644 --- a/tests/static/state_tests/VMTests/vmArithmeticTest/divFiller.yml +++ b/tests/static/state_tests/VMTests/vmArithmeticTest/divFiller.yml @@ -123,7 +123,7 @@ div: - :label div_2_0 :abi f(uint) 6 - :label div_0_add :abi f(uint) 7 gasLimit: - - '80000000' + - '30000000' gasPrice: '10' nonce: '0' to: cccccccccccccccccccccccccccccccccccccccc diff --git a/tests/static/state_tests/VMTests/vmArithmeticTest/expFiller.yml b/tests/static/state_tests/VMTests/vmArithmeticTest/expFiller.yml index 5015f2eccd4..2a24c1412e6 100644 --- a/tests/static/state_tests/VMTests/vmArithmeticTest/expFiller.yml +++ b/tests/static/state_tests/VMTests/vmArithmeticTest/expFiller.yml @@ -173,7 +173,7 @@ exp: - :label exp_2_big :abi f(uint) 9 - :label exp_2_15 :abi f(uint) 0x0a gasLimit: - - '80000000' + - '30000000' gasPrice: '10' nonce: '0' to: cccccccccccccccccccccccccccccccccccccccc diff --git a/tests/static/state_tests/VMTests/vmArithmeticTest/expPower256Filler.yml b/tests/static/state_tests/VMTests/vmArithmeticTest/expPower256Filler.yml index 03d4b6a830a..0afe17de46a 100644 --- a/tests/static/state_tests/VMTests/vmArithmeticTest/expPower256Filler.yml +++ b/tests/static/state_tests/VMTests/vmArithmeticTest/expPower256Filler.yml @@ -78,7 +78,7 @@ expPower256: data: - :abi f(uint) 0 gasLimit: - - '80000000' + - '30000000' gasPrice: '10' nonce: '0' to: cccccccccccccccccccccccccccccccccccccccc diff --git a/tests/static/state_tests/VMTests/vmArithmeticTest/expPower256Of256Filler.yml b/tests/static/state_tests/VMTests/vmArithmeticTest/expPower256Of256Filler.yml index 904986dc645..ef2b78a8a4d 100644 --- a/tests/static/state_tests/VMTests/vmArithmeticTest/expPower256Of256Filler.yml +++ b/tests/static/state_tests/VMTests/vmArithmeticTest/expPower256Of256Filler.yml @@ -87,7 +87,7 @@ expPower256Of256: data: - :abi f(uint) 0 gasLimit: - - '80000000' + - '30000000' gasPrice: '10' nonce: '0' to: cccccccccccccccccccccccccccccccccccccccc diff --git a/tests/static/state_tests/VMTests/vmArithmeticTest/expPower2Filler.yml b/tests/static/state_tests/VMTests/vmArithmeticTest/expPower2Filler.yml index a0e3be4d8b3..9d4d26fd082 100644 --- a/tests/static/state_tests/VMTests/vmArithmeticTest/expPower2Filler.yml +++ b/tests/static/state_tests/VMTests/vmArithmeticTest/expPower2Filler.yml @@ -54,7 +54,7 @@ expPower2: data: - :abi f(uint) 0 gasLimit: - - '80000000' + - '30000000' gasPrice: '10' nonce: '0' to: cccccccccccccccccccccccccccccccccccccccc diff --git a/tests/static/state_tests/VMTests/vmArithmeticTest/fibFiller.yml b/tests/static/state_tests/VMTests/vmArithmeticTest/fibFiller.yml index ce8355c7b5b..139d7b9211e 100644 --- a/tests/static/state_tests/VMTests/vmArithmeticTest/fibFiller.yml +++ b/tests/static/state_tests/VMTests/vmArithmeticTest/fibFiller.yml @@ -48,7 +48,7 @@ fib: data: - :raw 0x01 gasLimit: - - '80000000' + - '30000000' gasPrice: '10' nonce: '0' to: cccccccccccccccccccccccccccccccccccccccc diff --git a/tests/static/state_tests/VMTests/vmArithmeticTest/modFiller.yml b/tests/static/state_tests/VMTests/vmArithmeticTest/modFiller.yml index d9a99d46255..5d8cda61345 100644 --- a/tests/static/state_tests/VMTests/vmArithmeticTest/modFiller.yml +++ b/tests/static/state_tests/VMTests/vmArithmeticTest/modFiller.yml @@ -112,7 +112,7 @@ mod: - :label mod_neg2_3 :abi f(uint) 4 - :label mod_16_0 :abi f(uint) 5 gasLimit: - - '80000000' + - '30000000' gasPrice: '10' nonce: '0' to: cccccccccccccccccccccccccccccccccccccccc diff --git a/tests/static/state_tests/VMTests/vmArithmeticTest/mulFiller.yml b/tests/static/state_tests/VMTests/vmArithmeticTest/mulFiller.yml index be7de6f2473..fa2fa5f197c 100644 --- a/tests/static/state_tests/VMTests/vmArithmeticTest/mulFiller.yml +++ b/tests/static/state_tests/VMTests/vmArithmeticTest/mulFiller.yml @@ -174,7 +174,7 @@ mul: - :label big_pow_3 :abi f(uint) 7 - :label stack_underflow :abi f(uint) 8 gasLimit: - - '80000000' + - '30000000' gasPrice: '10' nonce: '0' to: cccccccccccccccccccccccccccccccccccccccc diff --git a/tests/static/state_tests/VMTests/vmArithmeticTest/mulmodFiller.yml b/tests/static/state_tests/VMTests/vmArithmeticTest/mulmodFiller.yml index 88f8794e126..42475fdd493 100644 --- a/tests/static/state_tests/VMTests/vmArithmeticTest/mulmodFiller.yml +++ b/tests/static/state_tests/VMTests/vmArithmeticTest/mulmodFiller.yml @@ -258,7 +258,7 @@ mulmod: - :label one_minus_mm_0_0_0 :abi f(uint) 0x0e - :label mm_5_1_0 :abi f(uint) 0x0d gasLimit: - - '80000000' + - '30000000' gasPrice: '10' nonce: '0' to: cccccccccccccccccccccccccccccccccccccccc diff --git a/tests/static/state_tests/VMTests/vmArithmeticTest/notFiller.yml b/tests/static/state_tests/VMTests/vmArithmeticTest/notFiller.yml index 65f9fc7c0b6..1ec05c64223 100644 --- a/tests/static/state_tests/VMTests/vmArithmeticTest/notFiller.yml +++ b/tests/static/state_tests/VMTests/vmArithmeticTest/notFiller.yml @@ -48,7 +48,7 @@ not: data: - :abi f(uint) 0 gasLimit: - - '80000000' + - '30000000' gasPrice: '10' nonce: '0' to: cccccccccccccccccccccccccccccccccccccccc diff --git a/tests/static/state_tests/VMTests/vmArithmeticTest/sdivFiller.yml b/tests/static/state_tests/VMTests/vmArithmeticTest/sdivFiller.yml index 5de1b638870..ff39cd45ead 100644 --- a/tests/static/state_tests/VMTests/vmArithmeticTest/sdivFiller.yml +++ b/tests/static/state_tests/VMTests/vmArithmeticTest/sdivFiller.yml @@ -297,7 +297,7 @@ sdiv: gasLimit: - - '80000000' + - '30000000' gasPrice: '10' nonce: '0' to: cccccccccccccccccccccccccccccccccccccccc diff --git a/tests/static/state_tests/VMTests/vmArithmeticTest/signextendFiller.yml b/tests/static/state_tests/VMTests/vmArithmeticTest/signextendFiller.yml index b7bb78ec077..cbd2232f72e 100644 --- a/tests/static/state_tests/VMTests/vmArithmeticTest/signextendFiller.yml +++ b/tests/static/state_tests/VMTests/vmArithmeticTest/signextendFiller.yml @@ -245,7 +245,7 @@ signextend: - :label byte31_neg :abi f(uint) 0x0E gasLimit: - - '80000000' + - '30000000' gasPrice: '10' nonce: '0' to: cccccccccccccccccccccccccccccccccccccccc diff --git a/tests/static/state_tests/VMTests/vmArithmeticTest/smodFiller.yml b/tests/static/state_tests/VMTests/vmArithmeticTest/smodFiller.yml index fd66ddd9960..1777be941b7 100644 --- a/tests/static/state_tests/VMTests/vmArithmeticTest/smodFiller.yml +++ b/tests/static/state_tests/VMTests/vmArithmeticTest/smodFiller.yml @@ -107,7 +107,7 @@ smod: - :label smod_neg2_3 :abi f(uint) 4 - :label smod_16_0 :abi f(uint) 5 gasLimit: - - '80000000' + - '30000000' gasPrice: '10' nonce: '0' to: cccccccccccccccccccccccccccccccccccccccc diff --git a/tests/static/state_tests/VMTests/vmArithmeticTest/subFiller.yml b/tests/static/state_tests/VMTests/vmArithmeticTest/subFiller.yml index a56a4335384..bec8a496be1 100644 --- a/tests/static/state_tests/VMTests/vmArithmeticTest/subFiller.yml +++ b/tests/static/state_tests/VMTests/vmArithmeticTest/subFiller.yml @@ -97,7 +97,7 @@ sub: - :label sub_0_neg1 :abi f(uint) 3 - :label sub_neg1_0 :abi f(uint) 4 gasLimit: - - '80000000' + - '30000000' gasPrice: '10' nonce: '0' to: cccccccccccccccccccccccccccccccccccccccc diff --git a/tests/static/state_tests/VMTests/vmArithmeticTest/twoOpsFiller.yml b/tests/static/state_tests/VMTests/vmArithmeticTest/twoOpsFiller.yml index 21fadca74c0..d7a513dfa1d 100644 --- a/tests/static/state_tests/VMTests/vmArithmeticTest/twoOpsFiller.yml +++ b/tests/static/state_tests/VMTests/vmArithmeticTest/twoOpsFiller.yml @@ -1189,7 +1189,7 @@ twoOps: data: - :raw 0x00 gasLimit: - - '80000000' + - '30000000' gasPrice: '10' nonce: '0' to: cccccccccccccccccccccccccccccccccccccccc diff --git a/tests/static/state_tests/VMTests/vmBitwiseLogicOperation/andFiller.yml b/tests/static/state_tests/VMTests/vmBitwiseLogicOperation/andFiller.yml index a66f6c171fa..55c1b4e238a 100644 --- a/tests/static/state_tests/VMTests/vmBitwiseLogicOperation/andFiller.yml +++ b/tests/static/state_tests/VMTests/vmBitwiseLogicOperation/andFiller.yml @@ -99,7 +99,7 @@ and: - :label and_allones_bignum :abi f(uint) 3 - :label and_allones_eefee :abi f(uint) 4 gasLimit: - - '80000000' + - '30000000' gasPrice: '10' nonce: '0' to: cccccccccccccccccccccccccccccccccccccccc diff --git a/tests/static/state_tests/VMTests/vmBitwiseLogicOperation/byteFiller.yml b/tests/static/state_tests/VMTests/vmBitwiseLogicOperation/byteFiller.yml index c8c2c160241..3249cf8344d 100644 --- a/tests/static/state_tests/VMTests/vmBitwiseLogicOperation/byteFiller.yml +++ b/tests/static/state_tests/VMTests/vmBitwiseLogicOperation/byteFiller.yml @@ -199,7 +199,7 @@ byte: # A test for all possible byte positions - :label byte_all :abi f(uint) 0x200 gasLimit: - - '80000000' + - '30000000' gasPrice: '10' nonce: '0' to: cccccccccccccccccccccccccccccccccccccccc diff --git a/tests/static/state_tests/VMTests/vmBitwiseLogicOperation/eqFiller.yml b/tests/static/state_tests/VMTests/vmBitwiseLogicOperation/eqFiller.yml index ad95ecfb459..7704344e3c6 100644 --- a/tests/static/state_tests/VMTests/vmBitwiseLogicOperation/eqFiller.yml +++ b/tests/static/state_tests/VMTests/vmBitwiseLogicOperation/eqFiller.yml @@ -70,7 +70,7 @@ eq: - :label eq_0_0 :abi f(uint) 1 - :label eq_neg1_neg1 :abi f(uint) 2 gasLimit: - - '80000000' + - '30000000' gasPrice: '10' nonce: '0' to: cccccccccccccccccccccccccccccccccccccccc diff --git a/tests/static/state_tests/VMTests/vmBitwiseLogicOperation/gtFiller.yml b/tests/static/state_tests/VMTests/vmBitwiseLogicOperation/gtFiller.yml index f75ade113f3..2156bad69a0 100644 --- a/tests/static/state_tests/VMTests/vmBitwiseLogicOperation/gtFiller.yml +++ b/tests/static/state_tests/VMTests/vmBitwiseLogicOperation/gtFiller.yml @@ -84,7 +84,7 @@ gt: - :label gt_neg1_0 :abi f(uint) 2 - :label gt_0_neg1 :abi f(uint) 3 gasLimit: - - '80000000' + - '30000000' gasPrice: '10' nonce: '0' to: cccccccccccccccccccccccccccccccccccccccc diff --git a/tests/static/state_tests/VMTests/vmBitwiseLogicOperation/iszeroFiller.yml b/tests/static/state_tests/VMTests/vmBitwiseLogicOperation/iszeroFiller.yml index 6c265cff0df..8a394432e99 100644 --- a/tests/static/state_tests/VMTests/vmBitwiseLogicOperation/iszeroFiller.yml +++ b/tests/static/state_tests/VMTests/vmBitwiseLogicOperation/iszeroFiller.yml @@ -70,7 +70,7 @@ iszero: - :label iszero_0 :abi f(uint) 1 - :label iszero_neg2 :abi f(uint) 2 gasLimit: - - '80000000' + - '30000000' gasPrice: '10' nonce: '0' to: cccccccccccccccccccccccccccccccccccccccc diff --git a/tests/static/state_tests/VMTests/vmBitwiseLogicOperation/ltFiller.yml b/tests/static/state_tests/VMTests/vmBitwiseLogicOperation/ltFiller.yml index 50acf222db7..daa781d6e62 100644 --- a/tests/static/state_tests/VMTests/vmBitwiseLogicOperation/ltFiller.yml +++ b/tests/static/state_tests/VMTests/vmBitwiseLogicOperation/ltFiller.yml @@ -84,7 +84,7 @@ lt: - :label lt_neg1_0 :abi f(uint) 2 - :label lt_0_neg1 :abi f(uint) 3 gasLimit: - - '80000000' + - '30000000' gasPrice: '10' nonce: '0' to: cccccccccccccccccccccccccccccccccccccccc diff --git a/tests/static/state_tests/VMTests/vmBitwiseLogicOperation/notFiller.yml b/tests/static/state_tests/VMTests/vmBitwiseLogicOperation/notFiller.yml index f9beca33c3b..ffaa7b84033 100644 --- a/tests/static/state_tests/VMTests/vmBitwiseLogicOperation/notFiller.yml +++ b/tests/static/state_tests/VMTests/vmBitwiseLogicOperation/notFiller.yml @@ -116,7 +116,7 @@ not: - :label not_neg_2_pow_256 :abi f(uint) 4 - :label not_neg0 :abi f(uint) 5 gasLimit: - - '80000000' + - '30000000' gasPrice: '10' nonce: '0' to: cccccccccccccccccccccccccccccccccccccccc diff --git a/tests/static/state_tests/VMTests/vmBitwiseLogicOperation/orFiller.yml b/tests/static/state_tests/VMTests/vmBitwiseLogicOperation/orFiller.yml index 0a3a6e17ee6..e62c74e904c 100644 --- a/tests/static/state_tests/VMTests/vmBitwiseLogicOperation/orFiller.yml +++ b/tests/static/state_tests/VMTests/vmBitwiseLogicOperation/orFiller.yml @@ -114,7 +114,7 @@ or: - :label or_allones_1110s :abi f(uint) 4 - :label or_allones_eefee :abi f(uint) 5 gasLimit: - - '80000000' + - '30000000' gasPrice: '10' nonce: '0' to: cccccccccccccccccccccccccccccccccccccccc diff --git a/tests/static/state_tests/VMTests/vmBitwiseLogicOperation/sgtFiller.yml b/tests/static/state_tests/VMTests/vmBitwiseLogicOperation/sgtFiller.yml index c299bc0aedf..31c4c618e67 100644 --- a/tests/static/state_tests/VMTests/vmBitwiseLogicOperation/sgtFiller.yml +++ b/tests/static/state_tests/VMTests/vmBitwiseLogicOperation/sgtFiller.yml @@ -84,7 +84,7 @@ sgt: - :label sgt_neg1_0 :abi f(uint) 2 - :label sgt_0_neg1 :abi f(uint) 3 gasLimit: - - '80000000' + - '30000000' gasPrice: '10' nonce: '0' to: cccccccccccccccccccccccccccccccccccccccc diff --git a/tests/static/state_tests/VMTests/vmBitwiseLogicOperation/sltFiller.yml b/tests/static/state_tests/VMTests/vmBitwiseLogicOperation/sltFiller.yml index 451172677c9..b9700c851ce 100644 --- a/tests/static/state_tests/VMTests/vmBitwiseLogicOperation/sltFiller.yml +++ b/tests/static/state_tests/VMTests/vmBitwiseLogicOperation/sltFiller.yml @@ -84,7 +84,7 @@ slt: - :label slt_neg1_0 :abi f(uint) 2 - :label slt_0_neg1 :abi f(uint) 3 gasLimit: - - '80000000' + - '30000000' gasPrice: '10' nonce: '0' to: cccccccccccccccccccccccccccccccccccccccc diff --git a/tests/static/state_tests/VMTests/vmBitwiseLogicOperation/xorFiller.yml b/tests/static/state_tests/VMTests/vmBitwiseLogicOperation/xorFiller.yml index 2b37baea3e1..b273aa13f41 100644 --- a/tests/static/state_tests/VMTests/vmBitwiseLogicOperation/xorFiller.yml +++ b/tests/static/state_tests/VMTests/vmBitwiseLogicOperation/xorFiller.yml @@ -114,7 +114,7 @@ xor: - :label xor_allones_1110s :abi f(uint) 4 - :label xor_allones_eefee :abi f(uint) 5 gasLimit: - - '80000000' + - '30000000' gasPrice: '10' nonce: '0' to: cccccccccccccccccccccccccccccccccccccccc diff --git a/tests/static/state_tests/VMTests/vmIOandFlowOperations/codecopyFiller.yml b/tests/static/state_tests/VMTests/vmIOandFlowOperations/codecopyFiller.yml index a9b115e6e00..c771f5b42ac 100644 --- a/tests/static/state_tests/VMTests/vmIOandFlowOperations/codecopyFiller.yml +++ b/tests/static/state_tests/VMTests/vmIOandFlowOperations/codecopyFiller.yml @@ -145,7 +145,7 @@ codecopy: gasLimit: - - '80000000' + - '30000000' gasPrice: '10' nonce: '0' to: cccccccccccccccccccccccccccccccccccccccc diff --git a/tests/static/state_tests/VMTests/vmIOandFlowOperations/gasFiller.yml b/tests/static/state_tests/VMTests/vmIOandFlowOperations/gasFiller.yml index 5d53e909afb..a7de6b04439 100644 --- a/tests/static/state_tests/VMTests/vmIOandFlowOperations/gasFiller.yml +++ b/tests/static/state_tests/VMTests/vmIOandFlowOperations/gasFiller.yml @@ -67,7 +67,7 @@ gas: - :label gas1 :abi f(uint) 0 - :label gas2 :abi f(uint) 1 gasLimit: - - '80000000' + - '30000000' gasPrice: '10' nonce: '0' to: cccccccccccccccccccccccccccccccccccccccc diff --git a/tests/static/state_tests/VMTests/vmIOandFlowOperations/jumpFiller.yml b/tests/static/state_tests/VMTests/vmIOandFlowOperations/jumpFiller.yml index 0bc9b2ae73b..595816c202d 100644 --- a/tests/static/state_tests/VMTests/vmIOandFlowOperations/jumpFiller.yml +++ b/tests/static/state_tests/VMTests/vmIOandFlowOperations/jumpFiller.yml @@ -352,7 +352,7 @@ jump: gasLimit: - - '80000000' + - '30000000' gasPrice: '10' nonce: '0' to: cccccccccccccccccccccccccccccccccccccccc diff --git a/tests/static/state_tests/VMTests/vmIOandFlowOperations/jumpToPushFiller.yml b/tests/static/state_tests/VMTests/vmIOandFlowOperations/jumpToPushFiller.yml index c9ce2b24a32..dd6d540d7c7 100644 --- a/tests/static/state_tests/VMTests/vmIOandFlowOperations/jumpToPushFiller.yml +++ b/tests/static/state_tests/VMTests/vmIOandFlowOperations/jumpToPushFiller.yml @@ -1834,7 +1834,7 @@ jumpToPush: - :label jump-fail :abi f(uint) 0x20C gasLimit: - - '80000000' + - '30000000' gasPrice: '10' nonce: '0' to: cccccccccccccccccccccccccccccccccccccccc diff --git a/tests/static/state_tests/VMTests/vmIOandFlowOperations/jumpiFiller.yml b/tests/static/state_tests/VMTests/vmIOandFlowOperations/jumpiFiller.yml index 02b9578b916..e48a9107d12 100644 --- a/tests/static/state_tests/VMTests/vmIOandFlowOperations/jumpiFiller.yml +++ b/tests/static/state_tests/VMTests/vmIOandFlowOperations/jumpiFiller.yml @@ -533,7 +533,7 @@ jumpi: gasLimit: - - '80000000' + - '30000000' gasPrice: '10' nonce: '0' to: cccccccccccccccccccccccccccccccccccccccc diff --git a/tests/static/state_tests/VMTests/vmIOandFlowOperations/loop_stacklimitFiller.yml b/tests/static/state_tests/VMTests/vmIOandFlowOperations/loop_stacklimitFiller.yml index 9401460e7e6..39c481e7da3 100644 --- a/tests/static/state_tests/VMTests/vmIOandFlowOperations/loop_stacklimitFiller.yml +++ b/tests/static/state_tests/VMTests/vmIOandFlowOperations/loop_stacklimitFiller.yml @@ -82,7 +82,7 @@ loop_stacklimit: - :label loop_1021 :abi f(uint) 0 - :label loop_1020 :abi f(uint) 1 gasLimit: - - '80000000' + - '30000000' gasPrice: '10' nonce: '0' to: cccccccccccccccccccccccccccccccccccccccc diff --git a/tests/static/state_tests/VMTests/vmIOandFlowOperations/loopsConditionalsFiller.yml b/tests/static/state_tests/VMTests/vmIOandFlowOperations/loopsConditionalsFiller.yml index 70e729df044..c9e481ac0ca 100644 --- a/tests/static/state_tests/VMTests/vmIOandFlowOperations/loopsConditionalsFiller.yml +++ b/tests/static/state_tests/VMTests/vmIOandFlowOperations/loopsConditionalsFiller.yml @@ -219,7 +219,7 @@ loopsConditionals: - :label for_loop1 :abi f(uint) 9 - :label for_loop2 :abi f(uint) 10 gasLimit: - - '80000000' + - '30000000' gasPrice: '10' nonce: '0' to: cccccccccccccccccccccccccccccccccccccccc diff --git a/tests/static/state_tests/VMTests/vmIOandFlowOperations/mloadFiller.yml b/tests/static/state_tests/VMTests/vmIOandFlowOperations/mloadFiller.yml index feca566737e..4234c59d6dc 100644 --- a/tests/static/state_tests/VMTests/vmIOandFlowOperations/mloadFiller.yml +++ b/tests/static/state_tests/VMTests/vmIOandFlowOperations/mloadFiller.yml @@ -80,7 +80,7 @@ mload: - :label mloadOOG :abi f(uint) 1 - :label mloadOOG :abi f(uint) 2 gasLimit: - - '80000000' + - '30000000' gasPrice: '10' nonce: '0' to: cccccccccccccccccccccccccccccccccccccccc diff --git a/tests/static/state_tests/VMTests/vmIOandFlowOperations/msizeFiller.yml b/tests/static/state_tests/VMTests/vmIOandFlowOperations/msizeFiller.yml index 146c2b32bfb..f2f8edf4357 100644 --- a/tests/static/state_tests/VMTests/vmIOandFlowOperations/msizeFiller.yml +++ b/tests/static/state_tests/VMTests/vmIOandFlowOperations/msizeFiller.yml @@ -141,7 +141,7 @@ msize: # Off in hyperspace, is the chunk size still 0x20? - :label farChunk :abi f(uint) 5 gasLimit: - - 0x10000000 + - 0x1c9c380 gasPrice: '10' nonce: '0' to: cccccccccccccccccccccccccccccccccccccccc diff --git a/tests/static/state_tests/VMTests/vmIOandFlowOperations/mstore8Filler.yml b/tests/static/state_tests/VMTests/vmIOandFlowOperations/mstore8Filler.yml index 3167a474d37..8e3601f875a 100644 --- a/tests/static/state_tests/VMTests/vmIOandFlowOperations/mstore8Filler.yml +++ b/tests/static/state_tests/VMTests/vmIOandFlowOperations/mstore8Filler.yml @@ -80,7 +80,7 @@ mstore8: - :label mstore8_twobytes :abi f(uint) 1 - :label mstore8_neg1 :abi f(uint) 2 gasLimit: - - '80000000' + - '30000000' gasPrice: '10' nonce: '0' to: cccccccccccccccccccccccccccccccccccccccc diff --git a/tests/static/state_tests/VMTests/vmIOandFlowOperations/mstoreFiller.yml b/tests/static/state_tests/VMTests/vmIOandFlowOperations/mstoreFiller.yml index 0be92c55231..f8fbfccb200 100644 --- a/tests/static/state_tests/VMTests/vmIOandFlowOperations/mstoreFiller.yml +++ b/tests/static/state_tests/VMTests/vmIOandFlowOperations/mstoreFiller.yml @@ -106,7 +106,7 @@ mstore: - :label mstore_byte32 :abi f(uint) 3 - :label mstore_byte31 :abi f(uint) 4 gasLimit: - - '80000000' + - '30000000' gasPrice: '10' nonce: '0' to: cccccccccccccccccccccccccccccccccccccccc diff --git a/tests/static/state_tests/VMTests/vmIOandFlowOperations/pcFiller.yml b/tests/static/state_tests/VMTests/vmIOandFlowOperations/pcFiller.yml index d25e7b89382..7d1e9c6c4e2 100644 --- a/tests/static/state_tests/VMTests/vmIOandFlowOperations/pcFiller.yml +++ b/tests/static/state_tests/VMTests/vmIOandFlowOperations/pcFiller.yml @@ -63,7 +63,7 @@ pc: - :label pc1 :abi f(uint) 0 - :label pc2 :abi f(uint) 1 gasLimit: - - '80000000' + - '30000000' gasPrice: '10' nonce: '0' to: cccccccccccccccccccccccccccccccccccccccc diff --git a/tests/static/state_tests/VMTests/vmIOandFlowOperations/popFiller.yml b/tests/static/state_tests/VMTests/vmIOandFlowOperations/popFiller.yml index d837f97f31b..8bad30bed81 100644 --- a/tests/static/state_tests/VMTests/vmIOandFlowOperations/popFiller.yml +++ b/tests/static/state_tests/VMTests/vmIOandFlowOperations/popFiller.yml @@ -65,7 +65,7 @@ pop: - :label pop1 :abi f(uint) 0 - :label pop2 :abi f(uint) 1 gasLimit: - - '80000000' + - '30000000' gasPrice: '10' nonce: '0' to: cccccccccccccccccccccccccccccccccccccccc diff --git a/tests/static/state_tests/VMTests/vmIOandFlowOperations/returnFiller.yml b/tests/static/state_tests/VMTests/vmIOandFlowOperations/returnFiller.yml index 901b60c634e..a454e81d148 100644 --- a/tests/static/state_tests/VMTests/vmIOandFlowOperations/returnFiller.yml +++ b/tests/static/state_tests/VMTests/vmIOandFlowOperations/returnFiller.yml @@ -141,7 +141,7 @@ return: - :label returnOld :abi f(uint) 4 gasLimit: - - '80000000' + - '30000000' gasPrice: '10' nonce: '0' to: cccccccccccccccccccccccccccccccccccccccc diff --git a/tests/static/state_tests/VMTests/vmIOandFlowOperations/sstore_sloadFiller.yml b/tests/static/state_tests/VMTests/vmIOandFlowOperations/sstore_sloadFiller.yml index ea0e998cd1c..4e8634e57dd 100644 --- a/tests/static/state_tests/VMTests/vmIOandFlowOperations/sstore_sloadFiller.yml +++ b/tests/static/state_tests/VMTests/vmIOandFlowOperations/sstore_sloadFiller.yml @@ -85,7 +85,7 @@ sstore_sload: - :label sstore_sload_noinit :abi f(uint) 1 - :label sstore_sload_4 :abi f(uint) 2 gasLimit: - - '80000000' + - '30000000' gasPrice: '10' nonce: '0' to: cccccccccccccccccccccccccccccccccccccccc diff --git a/tests/static/state_tests/VMTests/vmLogTest/log0Filler.yml b/tests/static/state_tests/VMTests/vmLogTest/log0Filler.yml index 7e908988e9d..fc943587818 100644 --- a/tests/static/state_tests/VMTests/vmLogTest/log0Filler.yml +++ b/tests/static/state_tests/VMTests/vmLogTest/log0Filler.yml @@ -144,7 +144,7 @@ log0: - :label logTwice :abi f(uint) 10 gasLimit: - - '80000000' + - '30000000' gasPrice: '10' nonce: '0' to: cccccccccccccccccccccccccccccccccccccccc diff --git a/tests/static/state_tests/VMTests/vmLogTest/log1Filler.yml b/tests/static/state_tests/VMTests/vmLogTest/log1Filler.yml index 68024d0d404..217288b58fe 100644 --- a/tests/static/state_tests/VMTests/vmLogTest/log1Filler.yml +++ b/tests/static/state_tests/VMTests/vmLogTest/log1Filler.yml @@ -160,7 +160,7 @@ log1: - :label maxTopic :abi f(uint) 8 gasLimit: - - '80000000' + - '30000000' gasPrice: '10' nonce: '0' to: cccccccccccccccccccccccccccccccccccccccc diff --git a/tests/static/state_tests/VMTests/vmLogTest/log2Filler.yml b/tests/static/state_tests/VMTests/vmLogTest/log2Filler.yml index e460d3d7752..e7992e645b6 100644 --- a/tests/static/state_tests/VMTests/vmLogTest/log2Filler.yml +++ b/tests/static/state_tests/VMTests/vmLogTest/log2Filler.yml @@ -164,7 +164,7 @@ log2: - :label maxTopic :abi f(uint) 8 gasLimit: - - '80000000' + - '30000000' gasPrice: '10' nonce: '0' to: cccccccccccccccccccccccccccccccccccccccc diff --git a/tests/static/state_tests/VMTests/vmLogTest/log3Filler.yml b/tests/static/state_tests/VMTests/vmLogTest/log3Filler.yml index 88bef2955b2..790cf285094 100644 --- a/tests/static/state_tests/VMTests/vmLogTest/log3Filler.yml +++ b/tests/static/state_tests/VMTests/vmLogTest/log3Filler.yml @@ -177,7 +177,7 @@ log3: - :label maxTopic :abi f(uint) 8 - :label pc :abi f(uint) 9 gasLimit: - - '80000000' + - '30000000' gasPrice: '10' nonce: '0' to: cccccccccccccccccccccccccccccccccccccccc diff --git a/tests/static/state_tests/VMTests/vmLogTest/log4Filler.yml b/tests/static/state_tests/VMTests/vmLogTest/log4Filler.yml index 69a578a4e45..30c64182678 100644 --- a/tests/static/state_tests/VMTests/vmLogTest/log4Filler.yml +++ b/tests/static/state_tests/VMTests/vmLogTest/log4Filler.yml @@ -177,7 +177,7 @@ log4: - :label maxTopic :abi f(uint) 8 - :label pc :abi f(uint) 9 gasLimit: - - '80000000' + - '30000000' gasPrice: '10' nonce: '0' to: cccccccccccccccccccccccccccccccccccccccc diff --git a/tests/static/state_tests/VMTests/vmTests/blockInfoFiller.yml b/tests/static/state_tests/VMTests/vmTests/blockInfoFiller.yml index 2869667b0f4..4dabddadf6c 100644 --- a/tests/static/state_tests/VMTests/vmTests/blockInfoFiller.yml +++ b/tests/static/state_tests/VMTests/vmTests/blockInfoFiller.yml @@ -91,7 +91,7 @@ blockInfo: - :label number :abi f(uint) 3 - :label timestamp :abi f(uint) 4 gasLimit: - - '80000000' + - '30000000' gasPrice: '10' nonce: '0' to: cccccccccccccccccccccccccccccccccccccccc diff --git a/tests/static/state_tests/VMTests/vmTests/envInfoFiller.yml b/tests/static/state_tests/VMTests/vmTests/envInfoFiller.yml index 5efcbc0f154..0b02c30ca3a 100644 --- a/tests/static/state_tests/VMTests/vmTests/envInfoFiller.yml +++ b/tests/static/state_tests/VMTests/vmTests/envInfoFiller.yml @@ -167,7 +167,7 @@ envInfo: - :label origin :abi f(uint) 8 - :label calldatasize :abi f(uint) 9 gasLimit: - - '80000000' + - '30000000' gasPrice: 0x1234 nonce: '0' to: cccccccccccccccccccccccccccccccccccccccc diff --git a/tests/static/state_tests/VMTests/vmTests/randomFiller.yml b/tests/static/state_tests/VMTests/vmTests/randomFiller.yml index bd0e5a5b5ad..3d0169191d3 100644 --- a/tests/static/state_tests/VMTests/vmTests/randomFiller.yml +++ b/tests/static/state_tests/VMTests/vmTests/randomFiller.yml @@ -92,7 +92,7 @@ random: - :label random5 :abi f(uint) 5 gasLimit: - - '80000000' + - '30000000' gasPrice: '10' nonce: '0' to: cccccccccccccccccccccccccccccccccccccccc diff --git a/tests/static/state_tests/VMTests/vmTests/sha3Filler.yml b/tests/static/state_tests/VMTests/vmTests/sha3Filler.yml index 54f64796536..ab833ae877e 100644 --- a/tests/static/state_tests/VMTests/vmTests/sha3Filler.yml +++ b/tests/static/state_tests/VMTests/vmTests/sha3Filler.yml @@ -290,7 +290,7 @@ sha3: gasLimit: - - '80000000' + - '30000000' gasPrice: '10' nonce: '0' to: cccccccccccccccccccccccccccccccccccccccc diff --git a/tests/static/state_tests/VMTests/vmTests/suicideFiller.yml b/tests/static/state_tests/VMTests/vmTests/suicideFiller.yml index 24b44f22dac..b03b47fd1b7 100644 --- a/tests/static/state_tests/VMTests/vmTests/suicideFiller.yml +++ b/tests/static/state_tests/VMTests/vmTests/suicideFiller.yml @@ -73,7 +73,7 @@ suicide: - :label random :abi f(uint) 0x1001 - :label myself :abi f(uint) 0x1002 gasLimit: - - '80000000' + - '30000000' gasPrice: '10' nonce: '0' to: cccccccccccccccccccccccccccccccccccccccc diff --git a/tests/static/state_tests/VMTests/vmTests/swapFiller.yml b/tests/static/state_tests/VMTests/vmTests/swapFiller.yml index 6865e9fa40d..667e3e21faf 100644 --- a/tests/static/state_tests/VMTests/vmTests/swapFiller.yml +++ b/tests/static/state_tests/VMTests/vmTests/swapFiller.yml @@ -268,7 +268,7 @@ swap: - :label swap16 :abi f(uint) 15 gasLimit: - - '80000000' + - '30000000' gasPrice: '10' nonce: '0' to: cccccccccccccccccccccccccccccccccccccccc diff --git a/tests/static/state_tests/stBadOpcode/invalidAddrFiller.yml b/tests/static/state_tests/stBadOpcode/invalidAddrFiller.yml index 390997c1789..8925eeb5a58 100644 --- a/tests/static/state_tests/stBadOpcode/invalidAddrFiller.yml +++ b/tests/static/state_tests/stBadOpcode/invalidAddrFiller.yml @@ -330,7 +330,7 @@ invalidAddr: gasLimit: - - '80000000' + - '30000000' gasPrice: '10' nonce: '0' to: cccccccccccccccccccccccccccccccccccccccc diff --git a/tests/static/state_tests/stBadOpcode/measureGasFiller.yml b/tests/static/state_tests/stBadOpcode/measureGasFiller.yml index c8107ee158c..cf19fae7a2e 100644 --- a/tests/static/state_tests/stBadOpcode/measureGasFiller.yml +++ b/tests/static/state_tests/stBadOpcode/measureGasFiller.yml @@ -214,7 +214,7 @@ measureGas: - :label EXTCODE :abi f(uint) 0x3B gasLimit: - - 80000000 + - 30000000 gasPrice: 10 nonce: 1 to: cccccccccccccccccccccccccccccccccccccccc diff --git a/tests/static/state_tests/stBadOpcode/operationDiffGasFiller.yml b/tests/static/state_tests/stBadOpcode/operationDiffGasFiller.yml index 8581eb59ad1..12ba158f2f1 100644 --- a/tests/static/state_tests/stBadOpcode/operationDiffGasFiller.yml +++ b/tests/static/state_tests/stBadOpcode/operationDiffGasFiller.yml @@ -215,7 +215,7 @@ operationDiffGas: - :label EXTCODE :abi f(uint,uint,uint) 0x3B 0 100 gasLimit: - - 80000000 + - 30000000 gasPrice: 10 nonce: 1 to: cccccccccccccccccccccccccccccccccccccccc diff --git a/tests/static/state_tests/stBadOpcode/undefinedOpcodeFirstByteFiller.yml b/tests/static/state_tests/stBadOpcode/undefinedOpcodeFirstByteFiller.yml index c31a1bdcdcc..34d09029ef1 100644 --- a/tests/static/state_tests/stBadOpcode/undefinedOpcodeFirstByteFiller.yml +++ b/tests/static/state_tests/stBadOpcode/undefinedOpcodeFirstByteFiller.yml @@ -1330,7 +1330,7 @@ undefinedOpcodeFirstByte: data: - '' gasLimit: - - 70000000 + - 30000000 gasPrice: 10 nonce: 0 secretKey: 45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8 diff --git a/tests/static/state_tests/stCreate2/CREATE2_FirstByte_loopFiller.yml b/tests/static/state_tests/stCreate2/CREATE2_FirstByte_loopFiller.yml index 9c56cb9a228..25962d38be9 100644 --- a/tests/static/state_tests/stCreate2/CREATE2_FirstByte_loopFiller.yml +++ b/tests/static/state_tests/stCreate2/CREATE2_FirstByte_loopFiller.yml @@ -35,7 +35,7 @@ CREATE2_FirstByte_loop: data: - '' gasLimit: - - 70000000 + - 30000000 gasPrice: 10 nonce: 0 secretKey: 45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8 diff --git a/tests/static/state_tests/stCreate2/CREATE2_HighNonceDelegatecallFiller.yml b/tests/static/state_tests/stCreate2/CREATE2_HighNonceDelegatecallFiller.yml index 998c74befb2..b7b8b951a69 100644 --- a/tests/static/state_tests/stCreate2/CREATE2_HighNonceDelegatecallFiller.yml +++ b/tests/static/state_tests/stCreate2/CREATE2_HighNonceDelegatecallFiller.yml @@ -180,7 +180,7 @@ CREATE2_HighNonceDelegatecall: - ':label A_MaxNonce_Call_B_MaxNonce_Create2 :abi f(uint,uint,uint,uint) 0x02 0xffffffffffffffff 0xffffffffffffffff 0x1' gasLimit: - - 70000000 + - 30000000 gasPrice: 10 nonce: 0 secretKey: 45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8 diff --git a/tests/static/state_tests/stCreate2/CREATE2_HighNonceFiller.yml b/tests/static/state_tests/stCreate2/CREATE2_HighNonceFiller.yml index 2cf93b5e436..8bc3a096104 100644 --- a/tests/static/state_tests/stCreate2/CREATE2_HighNonceFiller.yml +++ b/tests/static/state_tests/stCreate2/CREATE2_HighNonceFiller.yml @@ -31,7 +31,7 @@ CREATE2_HighNonce: data: - '' gasLimit: - - 70000000 + - 30000000 gasPrice: 10 nonce: 0 secretKey: 45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8 diff --git a/tests/static/state_tests/stCreate2/CREATE2_HighNonceMinus1Filler.yml b/tests/static/state_tests/stCreate2/CREATE2_HighNonceMinus1Filler.yml index eb433954068..9bd49ca6317 100644 --- a/tests/static/state_tests/stCreate2/CREATE2_HighNonceMinus1Filler.yml +++ b/tests/static/state_tests/stCreate2/CREATE2_HighNonceMinus1Filler.yml @@ -31,7 +31,7 @@ CREATE2_HighNonceMinus1: data: - '' gasLimit: - - 70000000 + - 30000000 gasPrice: 10 nonce: 0 secretKey: 45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8 diff --git a/tests/static/state_tests/stCreateTest/CREATE_ContractRETURNBigOffsetFiller.yml b/tests/static/state_tests/stCreateTest/CREATE_ContractRETURNBigOffsetFiller.yml index c7bee956181..8e226d925a4 100644 --- a/tests/static/state_tests/stCreateTest/CREATE_ContractRETURNBigOffsetFiller.yml +++ b/tests/static/state_tests/stCreateTest/CREATE_ContractRETURNBigOffsetFiller.yml @@ -36,7 +36,7 @@ CREATE_ContractRETURNBigOffset: - ':raw 0x62051eb962074ac2f3' - ':raw 0x620d15bc62074ac2f3' gasLimit: - - '0x5000001' + - '0x1c9c380' gasPrice: '0x0a' nonce: '0x00' secretKey: 45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8 diff --git a/tests/static/state_tests/stCreateTest/CREATE_FirstByte_loopFiller.yml b/tests/static/state_tests/stCreateTest/CREATE_FirstByte_loopFiller.yml index c65375af737..97538bf60c7 100644 --- a/tests/static/state_tests/stCreateTest/CREATE_FirstByte_loopFiller.yml +++ b/tests/static/state_tests/stCreateTest/CREATE_FirstByte_loopFiller.yml @@ -35,7 +35,7 @@ CREATE_FirstByte_loop: data: - '' gasLimit: - - 70000000 + - 30000000 gasPrice: 10 nonce: 0 secretKey: 45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8 diff --git a/tests/static/state_tests/stCreateTest/CREATE_HighNonceFiller.yml b/tests/static/state_tests/stCreateTest/CREATE_HighNonceFiller.yml index 49a2df519a5..c2c04527419 100644 --- a/tests/static/state_tests/stCreateTest/CREATE_HighNonceFiller.yml +++ b/tests/static/state_tests/stCreateTest/CREATE_HighNonceFiller.yml @@ -34,7 +34,7 @@ CREATE_HighNonce: data: - '' gasLimit: - - 70000000 + - 30000000 gasPrice: 10 nonce: 0 secretKey: 45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8 diff --git a/tests/static/state_tests/stCreateTest/CREATE_HighNonceMinus1Filler.yml b/tests/static/state_tests/stCreateTest/CREATE_HighNonceMinus1Filler.yml index 74318696600..d248267d01a 100644 --- a/tests/static/state_tests/stCreateTest/CREATE_HighNonceMinus1Filler.yml +++ b/tests/static/state_tests/stCreateTest/CREATE_HighNonceMinus1Filler.yml @@ -34,7 +34,7 @@ CREATE_HighNonceMinus1: data: - '' gasLimit: - - 70000000 + - 30000000 gasPrice: 10 nonce: 0 secretKey: 45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8 diff --git a/tests/static/state_tests/stCreateTest/CreateAddressWarmAfterFailFiller.yml b/tests/static/state_tests/stCreateTest/CreateAddressWarmAfterFailFiller.yml index a73c0f5d593..c07824a2c1a 100644 --- a/tests/static/state_tests/stCreateTest/CreateAddressWarmAfterFailFiller.yml +++ b/tests/static/state_tests/stCreateTest/CreateAddressWarmAfterFailFiller.yml @@ -319,7 +319,7 @@ CreateAddressWarmAfterFail: - :label create-ok :abi fail(uint) 7 # Successfully create the account - :label create2-ok :abi fail(uint) 17 # Successfully create2 the account gasLimit: - - 400000000 + - 30000000 gasPrice: 10 nonce: 0 to: "00000000000000000000000000000000000c0deC" diff --git a/tests/static/state_tests/stCreateTest/CreateCollisionResultsFiller.yml b/tests/static/state_tests/stCreateTest/CreateCollisionResultsFiller.yml index 3ae547a4c61..859b1051b0f 100644 --- a/tests/static/state_tests/stCreateTest/CreateCollisionResultsFiller.yml +++ b/tests/static/state_tests/stCreateTest/CreateCollisionResultsFiller.yml @@ -144,7 +144,7 @@ CreateCollisionResults: - :raw 0x01 - :raw 0x02 gasLimit: - - 0xf0000000 + - 0x1c9c380 gasPrice: '10' nonce: '0' diff --git a/tests/static/state_tests/stCreateTest/CreateOOGafterMaxCodesizeFiller.yml b/tests/static/state_tests/stCreateTest/CreateOOGafterMaxCodesizeFiller.yml index 8e60889a5ae..4dd08304dc5 100644 --- a/tests/static/state_tests/stCreateTest/CreateOOGafterMaxCodesizeFiller.yml +++ b/tests/static/state_tests/stCreateTest/CreateOOGafterMaxCodesizeFiller.yml @@ -165,7 +165,7 @@ CreateOOGafterMaxCodesize: # - High number of contracts (250): Create 250 contracts at 0xc0dea, 250 contracts at 0xc0deb, don't OOG on 0xc0deb, call 494 out of 500 contracts to self-destruct. - :label HighContractCount_DelegateCreate_CallCreate_SelfDestruct :abi f(uint,uint,bool,uint) 0xfa 0xfa 0x00 0x01ee gasLimit: - - 0x100000000 + - 0x1c9c380 gasPrice: '10' nonce: '0' to: 00000000000000000000000000000000000c0dea diff --git a/tests/static/state_tests/stCreateTest/createFailResultFiller.yml b/tests/static/state_tests/stCreateTest/createFailResultFiller.yml index faf746f4c00..31be117957b 100644 --- a/tests/static/state_tests/stCreateTest/createFailResultFiller.yml +++ b/tests/static/state_tests/stCreateTest/createFailResultFiller.yml @@ -292,7 +292,7 @@ createFailResult: - :label CREATE--BAD-BOOM :abi f(uint,uint) 0xEE 0x0BAD gasLimit: - - 80000000 + - 30000000 gasPrice: 10 nonce: 1 to: cccccccccccccccccccccccccccccccccccccccc diff --git a/tests/static/state_tests/stCreateTest/createLargeResultFiller.yml b/tests/static/state_tests/stCreateTest/createLargeResultFiller.yml index 5bb1c8e2fea..4e02b631bbc 100644 --- a/tests/static/state_tests/stCreateTest/createLargeResultFiller.yml +++ b/tests/static/state_tests/stCreateTest/createLargeResultFiller.yml @@ -125,7 +125,7 @@ createLargeResult: gasLimit: - - 80000000 + - 30000000 gasPrice: 10 nonce: 1 to: cccccccccccccccccccccccccccccccccccccccc diff --git a/tests/static/state_tests/stEIP150singleCodeGasPrices/eip2929-ffFiller.yml b/tests/static/state_tests/stEIP150singleCodeGasPrices/eip2929-ffFiller.yml index a2ecbc4a59d..e7fbac6fef0 100644 --- a/tests/static/state_tests/stEIP150singleCodeGasPrices/eip2929-ffFiller.yml +++ b/tests/static/state_tests/stEIP150singleCodeGasPrices/eip2929-ffFiller.yml @@ -110,7 +110,7 @@ eip2929-ff: - :label staticcall :abi f(uint) 0xFA gasLimit: - - '80000000' + - '30000000' gasPrice: '10' nonce: '0' to: cccccccccccccccccccccccccccccccccccccccc diff --git a/tests/static/state_tests/stEIP150singleCodeGasPrices/eip2929Filler.yml b/tests/static/state_tests/stEIP150singleCodeGasPrices/eip2929Filler.yml index 74e1a75a31e..43a4578a0cd 100644 --- a/tests/static/state_tests/stEIP150singleCodeGasPrices/eip2929Filler.yml +++ b/tests/static/state_tests/stEIP150singleCodeGasPrices/eip2929Filler.yml @@ -221,7 +221,7 @@ eip2929: gasLimit: - - '80000000' + - '30000000' gasPrice: '10' nonce: '0' to: cccccccccccccccccccccccccccccccccccccccc diff --git a/tests/static/state_tests/stEIP150singleCodeGasPrices/eip2929OOGFiller.yml b/tests/static/state_tests/stEIP150singleCodeGasPrices/eip2929OOGFiller.yml index 52f7172f194..194e75b9f33 100644 --- a/tests/static/state_tests/stEIP150singleCodeGasPrices/eip2929OOGFiller.yml +++ b/tests/static/state_tests/stEIP150singleCodeGasPrices/eip2929OOGFiller.yml @@ -184,7 +184,7 @@ eip2929OOG: - :label failEIP2929 :abi f(uint,uint) 0x10FA 1750 gasLimit: - - '80000000' + - '30000000' gasPrice: '10' nonce: 1 to: cccccccccccccccccccccccccccccccccccccccc diff --git a/tests/static/state_tests/stEIP150singleCodeGasPrices/gasCostBerlinFiller.yml b/tests/static/state_tests/stEIP150singleCodeGasPrices/gasCostBerlinFiller.yml index 2d25c25d374..0a1a4fc337b 100644 --- a/tests/static/state_tests/stEIP150singleCodeGasPrices/gasCostBerlinFiller.yml +++ b/tests/static/state_tests/stEIP150singleCodeGasPrices/gasCostBerlinFiller.yml @@ -321,7 +321,7 @@ gasCostBerlin: gasLimit: - - 80000000 + - 30000000 gasPrice: 10 nonce: 0 to: 095e7baea6a6c7c4c2dfeb977efac326af552d87 diff --git a/tests/static/state_tests/stEIP150singleCodeGasPrices/gasCostExpFiller.yml b/tests/static/state_tests/stEIP150singleCodeGasPrices/gasCostExpFiller.yml index 7c69cf20c60..9f53479643e 100644 --- a/tests/static/state_tests/stEIP150singleCodeGasPrices/gasCostExpFiller.yml +++ b/tests/static/state_tests/stEIP150singleCodeGasPrices/gasCostExpFiller.yml @@ -76,7 +76,7 @@ gasCostExp: gasLimit: - - 80000000 + - 30000000 gasPrice: 10 nonce: 0 to: 095e7baea6a6c7c4c2dfeb977efac326af552d87 diff --git a/tests/static/state_tests/stEIP150singleCodeGasPrices/gasCostFiller.yml b/tests/static/state_tests/stEIP150singleCodeGasPrices/gasCostFiller.yml index 5105a5518ee..292003a6666 100644 --- a/tests/static/state_tests/stEIP150singleCodeGasPrices/gasCostFiller.yml +++ b/tests/static/state_tests/stEIP150singleCodeGasPrices/gasCostFiller.yml @@ -326,7 +326,7 @@ gasCost: gasLimit: - - 80000000 + - 30000000 gasPrice: 10 nonce: 0 to: 095e7baea6a6c7c4c2dfeb977efac326af552d87 diff --git a/tests/static/state_tests/stEIP150singleCodeGasPrices/gasCostJumpFiller.yml b/tests/static/state_tests/stEIP150singleCodeGasPrices/gasCostJumpFiller.yml index 5e71b3a4d9c..18d1c36d600 100644 --- a/tests/static/state_tests/stEIP150singleCodeGasPrices/gasCostJumpFiller.yml +++ b/tests/static/state_tests/stEIP150singleCodeGasPrices/gasCostJumpFiller.yml @@ -174,7 +174,7 @@ gasCostJump: gasLimit: - - 80000000 + - 30000000 gasPrice: 10 nonce: 0 to: 095e7baea6a6c7c4c2dfeb977efac326af552d87 diff --git a/tests/static/state_tests/stEIP150singleCodeGasPrices/gasCostMemSegFiller.yml b/tests/static/state_tests/stEIP150singleCodeGasPrices/gasCostMemSegFiller.yml index 2264693f77a..dbb65daf194 100644 --- a/tests/static/state_tests/stEIP150singleCodeGasPrices/gasCostMemSegFiller.yml +++ b/tests/static/state_tests/stEIP150singleCodeGasPrices/gasCostMemSegFiller.yml @@ -234,7 +234,7 @@ gasCostMemSeg: gasLimit: - - 80000000 + - 30000000 gasPrice: 10 nonce: 0 to: 095e7baea6a6c7c4c2dfeb977efac326af552d87 diff --git a/tests/static/state_tests/stEIP150singleCodeGasPrices/gasCostMemoryFiller.yml b/tests/static/state_tests/stEIP150singleCodeGasPrices/gasCostMemoryFiller.yml index fd2cdba9698..e85695baa2d 100644 --- a/tests/static/state_tests/stEIP150singleCodeGasPrices/gasCostMemoryFiller.yml +++ b/tests/static/state_tests/stEIP150singleCodeGasPrices/gasCostMemoryFiller.yml @@ -332,7 +332,7 @@ gasCostMemory: gasLimit: - - 80000000 + - 30000000 gasPrice: 10 nonce: 0 to: 095e7baea6a6c7c4c2dfeb977efac326af552d87 diff --git a/tests/static/state_tests/stEIP150singleCodeGasPrices/gasCostReturnFiller.yml b/tests/static/state_tests/stEIP150singleCodeGasPrices/gasCostReturnFiller.yml index 00715450b99..c13a422e196 100644 --- a/tests/static/state_tests/stEIP150singleCodeGasPrices/gasCostReturnFiller.yml +++ b/tests/static/state_tests/stEIP150singleCodeGasPrices/gasCostReturnFiller.yml @@ -96,7 +96,7 @@ gasCostReturn: data: - :raw 0x00 gasLimit: - - 80000000 + - 30000000 gasPrice: 10 nonce: 0 to: 095e7baea6a6c7c4c2dfeb977efac326af552d87 diff --git a/tests/static/state_tests/stEIP1559/baseFeeDiffPlacesFiller.yml b/tests/static/state_tests/stEIP1559/baseFeeDiffPlacesFiller.yml index ec6467824ed..1e365821a90 100644 --- a/tests/static/state_tests/stEIP1559/baseFeeDiffPlacesFiller.yml +++ b/tests/static/state_tests/stEIP1559/baseFeeDiffPlacesFiller.yml @@ -675,7 +675,7 @@ baseFeeDiffPlaces: gasLimit: - - 0x10000000000000 + - 0x1c9c380 nonce: 1 to: cccccccccccccccccccccccccccccccccccccccc value: diff --git a/tests/static/state_tests/stEIP1559/gasPriceDiffPlacesFiller.yml b/tests/static/state_tests/stEIP1559/gasPriceDiffPlacesFiller.yml index 6672dfff1c7..5e14b9eaf74 100644 --- a/tests/static/state_tests/stEIP1559/gasPriceDiffPlacesFiller.yml +++ b/tests/static/state_tests/stEIP1559/gasPriceDiffPlacesFiller.yml @@ -633,7 +633,7 @@ gasPriceDiffPlaces: gasLimit: - - 0x10000000000000 + - 0x1c9c380 nonce: 1 to: cccccccccccccccccccccccccccccccccccccccc value: diff --git a/tests/static/state_tests/stEIP1559/outOfFundsFiller.yml b/tests/static/state_tests/stEIP1559/outOfFundsFiller.yml index a2397011a9e..a04d47f854f 100644 --- a/tests/static/state_tests/stEIP1559/outOfFundsFiller.yml +++ b/tests/static/state_tests/stEIP1559/outOfFundsFiller.yml @@ -36,7 +36,7 @@ outOfFunds: maxFeePerGas: 10000000000 maxPriorityFeePerGas: 10000000000 gasLimit: - - 40000000000000 + - 30000000 - 40000 nonce: 1 to: cccccccccccccccccccccccccccccccccccccccc diff --git a/tests/static/state_tests/stEIP1559/outOfFundsOldTypesFiller.yml b/tests/static/state_tests/stEIP1559/outOfFundsOldTypesFiller.yml index af2a1bf8ad8..3a07fb6f52f 100644 --- a/tests/static/state_tests/stEIP1559/outOfFundsOldTypesFiller.yml +++ b/tests/static/state_tests/stEIP1559/outOfFundsOldTypesFiller.yml @@ -36,7 +36,7 @@ outOfFundsOldTypes: accessList: [] gasPrice: 10000000000 gasLimit: - - 40000000000000 + - 30000000 - 40000 nonce: 1 to: cccccccccccccccccccccccccccccccccccccccc diff --git a/tests/static/state_tests/stEIP2930/addressOpcodesFiller.yml b/tests/static/state_tests/stEIP2930/addressOpcodesFiller.yml index d1548002b25..65470414fe0 100644 --- a/tests/static/state_tests/stEIP2930/addressOpcodesFiller.yml +++ b/tests/static/state_tests/stEIP2930/addressOpcodesFiller.yml @@ -509,7 +509,7 @@ addressOpcodes: gasLimit: - - '40000000' + - '30000000' gasPrice: '10' nonce: '0' secretKey: 45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8 diff --git a/tests/static/state_tests/stEIP2930/coinbaseT01Filler.yml b/tests/static/state_tests/stEIP2930/coinbaseT01Filler.yml index ef48b76145c..263e741c5dd 100644 --- a/tests/static/state_tests/stEIP2930/coinbaseT01Filler.yml +++ b/tests/static/state_tests/stEIP2930/coinbaseT01Filler.yml @@ -73,7 +73,7 @@ coinbaseT01: gasLimit: - - 40000000 + - 30000000 gasPrice: 1000 nonce: 1 secretKey: 45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8 diff --git a/tests/static/state_tests/stEIP2930/coinbaseT2Filler.yml b/tests/static/state_tests/stEIP2930/coinbaseT2Filler.yml index 811ad4371a3..aef0dff2865 100644 --- a/tests/static/state_tests/stEIP2930/coinbaseT2Filler.yml +++ b/tests/static/state_tests/stEIP2930/coinbaseT2Filler.yml @@ -66,7 +66,7 @@ coinbaseT2: storageKeys: [] gasLimit: - - 40000000 + - 30000000 maxFeePerGas: 10000 maxPriorityFeePerGas: 100 nonce: 1 diff --git a/tests/static/state_tests/stEIP2930/variedContextFiller.yml b/tests/static/state_tests/stEIP2930/variedContextFiller.yml index 1000095b823..946d3431940 100644 --- a/tests/static/state_tests/stEIP2930/variedContextFiller.yml +++ b/tests/static/state_tests/stEIP2930/variedContextFiller.yml @@ -1105,7 +1105,7 @@ variedContext: gasLimit: - - '40000000' + - '30000000' gasPrice: '10' nonce: '0' secretKey: 45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8 diff --git a/tests/static/state_tests/stExample/yulExampleFiller.yml b/tests/static/state_tests/stExample/yulExampleFiller.yml index b39f46fcc83..4b51cfb4fb9 100644 --- a/tests/static/state_tests/stExample/yulExampleFiller.yml +++ b/tests/static/state_tests/stExample/yulExampleFiller.yml @@ -53,7 +53,7 @@ yulExample: data: - "" gasLimit: - - '80000000' + - '30000000' gasPrice: '10' nonce: '0' to: 095e7baea6a6c7c4c2dfeb977efac326af552d87 diff --git a/tests/static/state_tests/stExtCodeHash/extcodehashEmpty_ParisFiller.yml b/tests/static/state_tests/stExtCodeHash/extcodehashEmpty_ParisFiller.yml index 4ef83e70225..b302164fd97 100644 --- a/tests/static/state_tests/stExtCodeHash/extcodehashEmpty_ParisFiller.yml +++ b/tests/static/state_tests/stExtCodeHash/extcodehashEmpty_ParisFiller.yml @@ -233,7 +233,7 @@ extcodehashEmpty_Paris: gasLimit: - - '80000000' + - '30000000' gasPrice: '10' nonce: '0' to: cccccccccccccccccccccccccccccccccccccccc diff --git a/tests/static/state_tests/stMemoryTest/bufferFiller.yml b/tests/static/state_tests/stMemoryTest/bufferFiller.yml index f9a4bfb36dd..21f78730ea0 100644 --- a/tests/static/state_tests/stMemoryTest/bufferFiller.yml +++ b/tests/static/state_tests/stMemoryTest/bufferFiller.yml @@ -652,7 +652,7 @@ buffer: gasLimit: - - '80000000' + - '30000000' gasPrice: '10' nonce: '0' to: cccccccccccccccccccccccccccccccccccccccc diff --git a/tests/static/state_tests/stMemoryTest/bufferSrcOffsetFiller.yml b/tests/static/state_tests/stMemoryTest/bufferSrcOffsetFiller.yml index c26b027ea0f..641654b19b9 100644 --- a/tests/static/state_tests/stMemoryTest/bufferSrcOffsetFiller.yml +++ b/tests/static/state_tests/stMemoryTest/bufferSrcOffsetFiller.yml @@ -299,7 +299,7 @@ bufferSrcOffset: - :label fail :abi f(uint,uint,uint) 0x13E 11 1 gasLimit: - - '80000000' + - '30000000' gasPrice: '10' nonce: '0' to: cccccccccccccccccccccccccccccccccccccccc diff --git a/tests/static/state_tests/stMemoryTest/memCopySelfFiller.yml b/tests/static/state_tests/stMemoryTest/memCopySelfFiller.yml index 15c050a0975..ab4d9270654 100644 --- a/tests/static/state_tests/stMemoryTest/memCopySelfFiller.yml +++ b/tests/static/state_tests/stMemoryTest/memCopySelfFiller.yml @@ -65,7 +65,7 @@ memCopySelf: data: - 0x gasLimit: - - 80000000 + - 30000000 gasPrice: 10 nonce: 1 to: cccccccccccccccccccccccccccccccccccccccc diff --git a/tests/static/state_tests/stMemoryTest/oogFiller.yml b/tests/static/state_tests/stMemoryTest/oogFiller.yml index 033b03147fe..84d85758113 100644 --- a/tests/static/state_tests/stMemoryTest/oogFiller.yml +++ b/tests/static/state_tests/stMemoryTest/oogFiller.yml @@ -402,7 +402,7 @@ oog: gasLimit: - - 80000000 + - 30000000 gasPrice: 10 nonce: 1 to: cccccccccccccccccccccccccccccccccccccccc diff --git a/tests/static/state_tests/stPreCompiledContracts/modexpTestsFiller.yml b/tests/static/state_tests/stPreCompiledContracts/modexpTestsFiller.yml index b9c67d6234f..34292f286cd 100644 --- a/tests/static/state_tests/stPreCompiledContracts/modexpTestsFiller.yml +++ b/tests/static/state_tests/stPreCompiledContracts/modexpTestsFiller.yml @@ -187,7 +187,7 @@ modexpTests: - :label 39936_1_55201 :abi f(uint,uint,uint) 39936 1 55201 - :label 55190_55190_42965 :abi f(uint,uint,uint) 55190 55190 42965 gasLimit: - - 80000000 + - 30000000 gasPrice: 10 nonce: 1 to: cccccccccccccccccccccccccccccccccccccccc diff --git a/tests/static/state_tests/stPreCompiledContracts/precompsEIP2929CancunFiller.yml b/tests/static/state_tests/stPreCompiledContracts/precompsEIP2929CancunFiller.yml index 03c551c2ac3..53ec91357e9 100644 --- a/tests/static/state_tests/stPreCompiledContracts/precompsEIP2929CancunFiller.yml +++ b/tests/static/state_tests/stPreCompiledContracts/precompsEIP2929CancunFiller.yml @@ -861,7 +861,7 @@ precompsEIP2929Cancun: - :label yes :abi f(uint,uint) 0x101157 0x3b # 395 gasLimit: - - '40000000' + - '30000000' gasPrice: '10' nonce: '0' secretKey: 45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8 diff --git a/tests/static/state_tests/stPreCompiledContracts2/ecrecoverWeirdVFiller.yml b/tests/static/state_tests/stPreCompiledContracts2/ecrecoverWeirdVFiller.yml index 23c17baba4b..18677b25654 100644 --- a/tests/static/state_tests/stPreCompiledContracts2/ecrecoverWeirdVFiller.yml +++ b/tests/static/state_tests/stPreCompiledContracts2/ecrecoverWeirdVFiller.yml @@ -143,7 +143,7 @@ ecrecoverWeirdV: - :label fail :abi f(uint,uint,uint,uint) 0x01 0xdeadbeef0100 0x541c4ce1565a646ddde26e1b483a88a6500ce15bd24622492f05cdd18b97161d 0x1827e364c15cfa61dab02339904b1e542f3939c6e8d6367d352026e71ffd6af5 gasLimit: - - 40000000 + - 30000000 gasPrice: 10 nonce: 1 to: 000000000000000000000000000000000000c0de diff --git a/tests/static/state_tests/stRandom/randomStatetest384Filler.yml b/tests/static/state_tests/stRandom/randomStatetest384Filler.yml index 9ba6a5da27e..40472074baf 100644 --- a/tests/static/state_tests/stRandom/randomStatetest384Filler.yml +++ b/tests/static/state_tests/stRandom/randomStatetest384Filler.yml @@ -209,7 +209,7 @@ randomStatetest384: data: - 0x gasLimit: - - 0x10000000000000 + - 0x1c9c380 nonce: 1 to: cccccccccccccccccccccccccccccccccccccccc value: diff --git a/tests/static/state_tests/stReturnDataTest/clearReturnBufferFiller.yml b/tests/static/state_tests/stReturnDataTest/clearReturnBufferFiller.yml index f63718c657f..a8c31f2038b 100644 --- a/tests/static/state_tests/stReturnDataTest/clearReturnBufferFiller.yml +++ b/tests/static/state_tests/stReturnDataTest/clearReturnBufferFiller.yml @@ -521,7 +521,7 @@ clearReturnBuffer: gasLimit: - - '80000000' + - '30000000' gasPrice: '10' nonce: 1 to: cccccccccccccccccccccccccccccccccccccccc diff --git a/tests/static/state_tests/stReturnDataTest/revertRetDataSizeFiller.yml b/tests/static/state_tests/stReturnDataTest/revertRetDataSizeFiller.yml index 686f70b8da3..5b0545f4cdc 100644 --- a/tests/static/state_tests/stReturnDataTest/revertRetDataSizeFiller.yml +++ b/tests/static/state_tests/stReturnDataTest/revertRetDataSizeFiller.yml @@ -350,7 +350,7 @@ revertRetDataSize: gasLimit: - - '80000000' + - '30000000' gasPrice: '10' nonce: '0' to: cccccccccccccccccccccccccccccccccccccccc diff --git a/tests/static/state_tests/stReturnDataTest/tooLongReturnDataCopyFiller.yml b/tests/static/state_tests/stReturnDataTest/tooLongReturnDataCopyFiller.yml index 8cc9c36b385..ee731273d50 100644 --- a/tests/static/state_tests/stReturnDataTest/tooLongReturnDataCopyFiller.yml +++ b/tests/static/state_tests/stReturnDataTest/tooLongReturnDataCopyFiller.yml @@ -222,7 +222,7 @@ tooLongReturnDataCopy: gasLimit: - - 0x10000000000000 + - 0x1c9c380 nonce: 1 to: cccccccccccccccccccccccccccccccccccccccc value: diff --git a/tests/static/state_tests/stRevertTest/costRevertFiller.yml b/tests/static/state_tests/stRevertTest/costRevertFiller.yml index d7e3e637b63..6474f0be6aa 100644 --- a/tests/static/state_tests/stRevertTest/costRevertFiller.yml +++ b/tests/static/state_tests/stRevertTest/costRevertFiller.yml @@ -240,7 +240,7 @@ costRevert: - :label stackOver :abi f(uint,uint) 0x1006 3 gasLimit: - - '80000000' + - '30000000' gasPrice: '10' nonce: '0' to: cccccccccccccccccccccccccccccccccccccccc diff --git a/tests/static/state_tests/stRevertTest/stateRevertFiller.yml b/tests/static/state_tests/stRevertTest/stateRevertFiller.yml index 5bd82764286..03c839bab35 100644 --- a/tests/static/state_tests/stRevertTest/stateRevertFiller.yml +++ b/tests/static/state_tests/stRevertTest/stateRevertFiller.yml @@ -139,7 +139,7 @@ stateRevert: - :label stackUnder :abi f(uint) 5 - :label stackOver :abi f(uint) 6 gasLimit: - - '80000000' + - '30000000' gasPrice: '10' nonce: '0' to: cccccccccccccccccccccccccccccccccccccccc diff --git a/tests/static/state_tests/stSStoreTest/sstoreGasFiller.yml b/tests/static/state_tests/stSStoreTest/sstoreGasFiller.yml index 12c9aca8db7..7fc2d6f891a 100644 --- a/tests/static/state_tests/stSStoreTest/sstoreGasFiller.yml +++ b/tests/static/state_tests/stSStoreTest/sstoreGasFiller.yml @@ -114,7 +114,7 @@ sstoreGas: data: - 0x gasLimit: - - 80000000 + - 30000000 gasPrice: 10 nonce: 1 to: cccccccccccccccccccccccccccccccccccccccc diff --git a/tests/static/state_tests/stSelfBalance/diffPlacesFiller.yml b/tests/static/state_tests/stSelfBalance/diffPlacesFiller.yml index cd4558943ca..68682037c4e 100644 --- a/tests/static/state_tests/stSelfBalance/diffPlacesFiller.yml +++ b/tests/static/state_tests/stSelfBalance/diffPlacesFiller.yml @@ -633,7 +633,7 @@ diffPlaces: gasLimit: - - 0x10000000000000 + - 0x1c9c380 nonce: 1 to: cccccccccccccccccccccccccccccccccccccccc value: diff --git a/tests/static/state_tests/stShift/shiftCombinationsFiller.yml b/tests/static/state_tests/stShift/shiftCombinationsFiller.yml index 46ce2eb97d1..de5f8bf89b9 100644 --- a/tests/static/state_tests/stShift/shiftCombinationsFiller.yml +++ b/tests/static/state_tests/stShift/shiftCombinationsFiller.yml @@ -2143,7 +2143,7 @@ shiftCombinations: data: - '' gasLimit: - - '80000000' + - '30000000' gasPrice: '10' nonce: '0' secretKey: 45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8 diff --git a/tests/static/state_tests/stShift/shiftSignedCombinationsFiller.yml b/tests/static/state_tests/stShift/shiftSignedCombinationsFiller.yml index 4920cf84c44..a1f6f1743bf 100644 --- a/tests/static/state_tests/stShift/shiftSignedCombinationsFiller.yml +++ b/tests/static/state_tests/stShift/shiftSignedCombinationsFiller.yml @@ -993,7 +993,7 @@ shiftSignedCombinations: data: - '' gasLimit: - - '80000000' + - '30000000' gasPrice: '10' nonce: '0' secretKey: 45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8 diff --git a/tests/static/state_tests/stSystemOperationsTest/doubleSelfdestructTestFiller.yml b/tests/static/state_tests/stSystemOperationsTest/doubleSelfdestructTestFiller.yml index 600e56d120c..ff6901b8eac 100644 --- a/tests/static/state_tests/stSystemOperationsTest/doubleSelfdestructTestFiller.yml +++ b/tests/static/state_tests/stSystemOperationsTest/doubleSelfdestructTestFiller.yml @@ -86,7 +86,7 @@ doubleSelfdestructTest: - :label caller-self-destruct :raw 0xFA1001c0de # STATICCALL gasLimit: - - 1000000000 + - 30000000 gasPrice: 10 nonce: 1 secretKey: 45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8 From 09630a176f9ba3ae207518f60059071fc43b977d Mon Sep 17 00:00:00 2001 From: Dimitry Kh Date: Mon, 12 May 2025 14:42:16 +0200 Subject: [PATCH 2/3] adjust some tests for 30M gas limit --- .../vmIOandFlowOperations/gasFiller.yml | 6 +- ...{msizeFiller.yml => msizeCancunFiller.yml} | 12 +- .../msizePragueFiller.yml | 225 ++++++ ....yml => baseFeeDiffPlacesCancunFiller.yml} | 4 +- .../baseFeeDiffPlacesPragueFiller.yml | 712 ++++++++++++++++++ ...yml => gasPriceDiffPlacesCancunFiller.yml} | 72 +- .../gasPriceDiffPlacesPragueFiller.yml | 670 ++++++++++++++++ .../stEIP1559/outOfFundsFiller.yml | 4 +- .../stEIP1559/outOfFundsOldTypesFiller.yml | 4 +- .../stRevertTest/costRevertFiller.yml | 6 +- .../stShift/shiftCombinationsFiller.yml | 2 +- 11 files changed, 1662 insertions(+), 55 deletions(-) rename tests/static/state_tests/VMTests/vmIOandFlowOperations/{msizeFiller.yml => msizeCancunFiller.yml} (97%) create mode 100644 tests/static/state_tests/VMTests/vmIOandFlowOperations/msizePragueFiller.yml rename tests/static/state_tests/stEIP1559/{baseFeeDiffPlacesFiller.yml => baseFeeDiffPlacesCancunFiller.yml} (99%) create mode 100644 tests/static/state_tests/stEIP1559/baseFeeDiffPlacesPragueFiller.yml rename tests/static/state_tests/stEIP1559/{gasPriceDiffPlacesFiller.yml => gasPriceDiffPlacesCancunFiller.yml} (94%) create mode 100644 tests/static/state_tests/stEIP1559/gasPriceDiffPlacesPragueFiller.yml diff --git a/tests/static/state_tests/VMTests/vmIOandFlowOperations/gasFiller.yml b/tests/static/state_tests/VMTests/vmIOandFlowOperations/gasFiller.yml index a7de6b04439..4daf6399bf6 100644 --- a/tests/static/state_tests/VMTests/vmIOandFlowOperations/gasFiller.yml +++ b/tests/static/state_tests/VMTests/vmIOandFlowOperations/gasFiller.yml @@ -67,7 +67,7 @@ gas: - :label gas1 :abi f(uint) 0 - :label gas2 :abi f(uint) 1 gasLimit: - - '30000000' + - '1000000' gasPrice: '10' nonce: '0' to: cccccccccccccccccccccccccccccccccccccccc @@ -93,7 +93,7 @@ gas: result: cccccccccccccccccccccccccccccccccccccccc: storage: - 0x00: 0x04b1457b + 0x00: 960898 @@ -107,4 +107,4 @@ gas: result: cccccccccccccccccccccccccccccccccccccccc: storage: - 0x00: 0x04b1458d + 0x00: 960916 diff --git a/tests/static/state_tests/VMTests/vmIOandFlowOperations/msizeFiller.yml b/tests/static/state_tests/VMTests/vmIOandFlowOperations/msizeCancunFiller.yml similarity index 97% rename from tests/static/state_tests/VMTests/vmIOandFlowOperations/msizeFiller.yml rename to tests/static/state_tests/VMTests/vmIOandFlowOperations/msizeCancunFiller.yml index f2f8edf4357..48c9e51f483 100644 --- a/tests/static/state_tests/VMTests/vmIOandFlowOperations/msizeFiller.yml +++ b/tests/static/state_tests/VMTests/vmIOandFlowOperations/msizeCancunFiller.yml @@ -141,7 +141,7 @@ msize: # Off in hyperspace, is the chunk size still 0x20? - :label farChunk :abi f(uint) 5 gasLimit: - - 0x1c9c380 + - 270_000_000 gasPrice: '10' nonce: '0' to: cccccccccccccccccccccccccccccccccccccccc @@ -158,7 +158,7 @@ msize: gas: !!int -1 value: !!int -1 network: - - '>=Cancun' + - 'Cancun' result: cccccccccccccccccccccccccccccccccccccccc: storage: @@ -173,7 +173,7 @@ msize: gas: !!int -1 value: !!int -1 network: - - '>=Cancun' + - 'Cancun' result: cccccccccccccccccccccccccccccccccccccccc: storage: @@ -187,7 +187,7 @@ msize: gas: !!int -1 value: !!int -1 network: - - '>=Cancun' + - 'Cancun' result: cccccccccccccccccccccccccccccccccccccccc: storage: @@ -201,7 +201,7 @@ msize: gas: !!int -1 value: !!int -1 network: - - '>=Cancun' + - 'Cancun' result: cccccccccccccccccccccccccccccccccccccccc: storage: @@ -218,7 +218,7 @@ msize: gas: !!int -1 value: !!int -1 network: - - '>=Cancun' + - 'Cancun' result: cccccccccccccccccccccccccccccccccccccccc: storage: diff --git a/tests/static/state_tests/VMTests/vmIOandFlowOperations/msizePragueFiller.yml b/tests/static/state_tests/VMTests/vmIOandFlowOperations/msizePragueFiller.yml new file mode 100644 index 00000000000..42c172790d6 --- /dev/null +++ b/tests/static/state_tests/VMTests/vmIOandFlowOperations/msizePragueFiller.yml @@ -0,0 +1,225 @@ +# Memory size tests + + +msize: + + env: + currentCoinbase: 2adc25665018aa1fe0e6bc666dac8fc2697ff9ba + currentDifficulty: 0x20000 + currentGasLimit: 0x100000000 + currentNumber: 1 + currentTimestamp: 1000 + + _info: + comment: Ori Pomerantz qbzzt1@gmail.com + + pre: + + 0000000000000000000000000000000000001000: + balance: '0x0ba1a9ce0ba1a9ce' + code: | + { + ; Store an entire 32 byte value + [0] 0xFF + [[0]] (msize) + } + nonce: '0' + storage: {} + + + 0000000000000000000000000000000000001001: + balance: '0x0ba1a9ce0ba1a9ce' + code: | + { + ; Store an entire 32 byte value + [0] 0xffffffffff + [[0]] (msize) + } + nonce: '0' + storage: {} + + + + 0000000000000000000000000000000000001002: + balance: '0x0ba1a9ce0ba1a9ce' + code: | + { + ; Store two values + [0] 0xffffffffff + [0x20] 0xeeee + [[0]] (msize) + } + nonce: '0' + storage: {} + + + + 0000000000000000000000000000000000001003: + balance: '0x0ba1a9ce0ba1a9ce' + code: | + { + ; Store two values + [0] 0xffffffffff + [0x5a] 0xeeee + [[0]] (msize) + + ; The 0xEEEE value is stored 0x5a-0x79, + ; and memory is allocated in 0x20 byte chunks + } + nonce: '0' + storage: {} + + + # chunks + 0000000000000000000000000000000000001004: + balance: '0x0ba1a9ce0ba1a9ce' + code: | + { + ; Store at the very end of the first chunk + (mstore8 0x1F 1) + [[0]] (msize) + + ; Store at the beginning of the second chuck + (mstore8 0x20 1) + [[1]] (msize) + + ; Does it matter if we reset the memory? + ; Spoiler alert, it doesn't + (mstore8 0x20 0) + [[2]] (msize) + + } + nonce: '0' + storage: {} + + + # farChunk + 0000000000000000000000000000000000001005: + balance: '0x0ba1a9ce0ba1a9ce' + code: | + { + ; Does the chunk size change in very high offsets? + ; + ; Note: It doesn't + (mstore8 0xa0000 1) + [[0]] (msize) + } + nonce: '0' + storage: {} + + + + # Using DELEGATECALL lets us group results together, because everything + # is written to the same storage. + cccccccccccccccccccccccccccccccccccccccc: + balance: '0x0ba1a9ce0ba1a9ce' + code: | + { + (delegatecall (gas) (+ 0x1000 $4) 0 0 0 0) + } + nonce: '0' + storage: {} + + + a94f5374fce5edbc8e2a8697c15331677e6ebf0b: + balance: 0x100000000000 + code: '0x' + nonce: '0' + storage: {} + + + + + transaction: + data: + - :label msize0 :abi f(uint) 0 + - :label msize1 :abi f(uint) 1 + - :label msize2 :abi f(uint) 2 + - :label msize3 :abi f(uint) 3 + - :label chunks :abi f(uint) 4 + + # Off in hyperspace, is the chunk size still 0x20? + - :label farChunk :abi f(uint) 5 + gasLimit: + - 1_000_000 + gasPrice: '10' + nonce: '0' + to: cccccccccccccccccccccccccccccccccccccccc + value: + - '1' + secretKey: "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8" + + + expect: + - indexes: + data: + - :label msize0 + - :label msize1 + gas: !!int -1 + value: !!int -1 + network: + - '>=Prague' + result: + cccccccccccccccccccccccccccccccccccccccc: + storage: + 0x00: 0x20 + + + + + - indexes: + data: + - :label msize2 + gas: !!int -1 + value: !!int -1 + network: + - '>=Prague' + result: + cccccccccccccccccccccccccccccccccccccccc: + storage: + 0x00: 0x40 + + + + - indexes: + data: + - :label msize3 + gas: !!int -1 + value: !!int -1 + network: + - '>=Prague' + result: + cccccccccccccccccccccccccccccccccccccccc: + storage: + 0x00: 0x80 + + + + - indexes: + data: + - :label chunks + gas: !!int -1 + value: !!int -1 + network: + - '>=Prague' + result: + cccccccccccccccccccccccccccccccccccccccc: + storage: + 0x00: 0x20 + 0x01: 0x40 + 0x02: 0x40 + + + + + - indexes: + data: + - :label farChunk + gas: !!int -1 + value: !!int -1 + network: + - '>=Prague' + result: + cccccccccccccccccccccccccccccccccccccccc: + storage: + 0x00: 0xa0020 diff --git a/tests/static/state_tests/stEIP1559/baseFeeDiffPlacesFiller.yml b/tests/static/state_tests/stEIP1559/baseFeeDiffPlacesCancunFiller.yml similarity index 99% rename from tests/static/state_tests/stEIP1559/baseFeeDiffPlacesFiller.yml rename to tests/static/state_tests/stEIP1559/baseFeeDiffPlacesCancunFiller.yml index 1e365821a90..7075ed501b8 100644 --- a/tests/static/state_tests/stEIP1559/baseFeeDiffPlacesFiller.yml +++ b/tests/static/state_tests/stEIP1559/baseFeeDiffPlacesCancunFiller.yml @@ -675,7 +675,7 @@ baseFeeDiffPlaces: gasLimit: - - 0x1c9c380 + - 0x10000000000000 nonce: 1 to: cccccccccccccccccccccccccccccccccccccccc value: @@ -691,7 +691,7 @@ baseFeeDiffPlaces: value: !!int -1 network: - - '>=Cancun' + - 'Cancun' result: cccccccccccccccccccccccccccccccccccccccc: diff --git a/tests/static/state_tests/stEIP1559/baseFeeDiffPlacesPragueFiller.yml b/tests/static/state_tests/stEIP1559/baseFeeDiffPlacesPragueFiller.yml new file mode 100644 index 00000000000..b1fcc13a1b4 --- /dev/null +++ b/tests/static/state_tests/stEIP1559/baseFeeDiffPlacesPragueFiller.yml @@ -0,0 +1,712 @@ + +# Created by tests/src/Templates/DiffPlaces/templateGen.js +# +# With the template code: +# // basefee is still not supported in Yul 0.8.5 +# +# +# mstore(0, verbatim_0i_1o(hex"48")) +# +# +# +# Expected result: 10 +# +baseFeeDiffPlaces: + _info: + comment: Ori Pomerantz qbzzt1@gmail.com + + env: + currentCoinbase: 2adc25665018aa1fe0e6bc666dac8fc2697ff9ba + currentDifficulty: 0x20000 + currentNumber: 1 + currentTimestamp: 1000 + currentGasLimit: 0x10000000000000 + currentBaseFee: 10 + + pre: + + # It is not trivial to use the Yul compiler to get the + # binary code for the code we're checking, so we'll use EXTCODECOPY + # from this contract + 000000000000000000000000000000000000C0DE: + balance: 1000000000000000000 + code: | + :yul berlin { + // basefee is still not supported in Yul 0.8.5 + + + mstore(0, verbatim_0i_1o(hex"48")) + + + + // Here the result is is mload(0). We want to run it, but + // prefix it with a zero so we'll be safe from being considered + // an invalid program. + // + // If we use this as a contructor the result will be + // the code of the created contract, but we can live + // with that. We won't call it. + mstore(0x40, mload(0x00)) + return(0x3F, 0x21) + } + nonce: 1 + storage: {} + + # When we create a contract and then call it, we don't want the + # zero prefix in the return value + 000000000000000000000000000000000020C0DE: + balance: 1000000000000000000 + code: | + :yul berlin { + // basefee is still not supported in Yul 0.8.5 + + + mstore(0, verbatim_0i_1o(hex"48")) + + + + // Here the result is is mload(0). + return(0x00, 0x20) + } + nonce: 1 + storage: {} + + + + # Code for a construct to create a contract with the template code + 00000000000000000000000000000000C0DEC0DE: + balance: 1000000000000000000 + code: | + :yul berlin { + let addr := 0x20C0DE + let length := extcodesize(addr) + + // Read the code from 0x20C0DE + extcodecopy(addr, 0, 0, length) + + // Return this memory as the code for the contract + return(0, length) + } + nonce: 1 + storage: {} + + + # Perform the action (directly or indirectly). Either way, + # store the result in sload(0). + cccccccccccccccccccccccccccccccccccccccc: + balance: 1000000000000000000 + code: | + :yul berlin { + let action := calldataload(4) + let res := 1 // If the result of a call is revert, revert here too + let addr := 1 // If the result of CREATE[2] is zero, it reverted + + // For when we need code in our memory + let codeBuffer := 0x20 + // When running the template in the constructor + let codeLength := extcodesize(0xC0DE) + // When running the template in the created code + let codeLength2 := extcodesize(0xC0DEC0DE) + + // Goat should be overwritten + mstore(0, 0x60A7) + + switch action + case 0 { // run the code snippet as normal code + // basefee is still not supported in Yul 0.8.5 + + + mstore(0, verbatim_0i_1o(hex"48")) + + + } + + // One level of call stack + case 0xF1 { // call a contract to run this code + res := call(gas(), 0xca11, 0, 0, 0, 0, 0x20) // call template code + } + case 0xF2 { // callcode a contract to run this code + res := callcode(gas(), 0xca11, 0, 0, 0, 0, 0x20) + } + case 0xF4 { // delegate call a contract to run this code + res := delegatecall(gas(), 0xca11, 0, 0, 0, 0x20) + } + case 0xFA { // static call a contract to run this code + res := staticcall(gas(), 0xca11, 0, 0, 0, 0x20) + } + + // Two levels of call stack + case 0xF1F1 { // call, call + res := call(gas(), 0xca1100f1, 0, 0, 0, 0, 0x20) + } + case 0xF2F1 { // callcode, call + res := callcode(gas(), 0xca1100f1, 0, 0, 0, 0, 0x20) + } + case 0xF4F1 { // delegatecall, call + res := delegatecall(gas(), 0xca1100f1, 0, 0, 0, 0x20) + } + case 0xFAF1 { // staticcall, call + res := staticcall(gas(), 0xca1100f1, 0, 0, 0, 0x20) + } + case 0xF1F2 { // call, callcode + res := call(gas(), 0xca1100f2, 0, 0, 0, 0, 0x20) + } + case 0xF2F2 { // callcode, callcode + res := callcode(gas(), 0xca1100f2, 0, 0, 0, 0, 0x20) + } + case 0xF4F2 { // delegatecall, callcode + res := delegatecall(gas(), 0xca1100f2, 0, 0, 0, 0x20) + } + case 0xFAF2 { // staticcall, callcode + res := staticcall(gas(), 0xca1100f2, 0, 0, 0, 0x20) + } + case 0xF1F4 { // call, delegatecall + res := call(gas(), 0xca1100f4, 0, 0, 0, 0, 0x20) + } + case 0xF2F4 { // callcode, delegatecall + res := callcode(gas(), 0xca1100f4, 0, 0, 0, 0, 0x20) + } + case 0xF4F4 { // delegatecall, delegatecall + res := delegatecall(gas(), 0xca1100f4, 0, 0, 0, 0x20) + } + case 0xFAF4 { // staticcall, delegatecall + res := staticcall(gas(), 0xca1100f4, 0, 0, 0, 0x20) + } + case 0xF1FA { // call, staticcall + res := call(gas(), 0xca1100fa, 0, 0, 0, 0, 0x20) + } + case 0xF2FA { // callcode, staticcall + res := callcode(gas(), 0xca1100fa, 0, 0, 0, 0, 0x20) + } + case 0xF4FA { // delegatecall, staticcall + res := delegatecall(gas(), 0xca1100fa, 0, 0, 0, 0x20) + } + case 0xFAFA { // staticcall, staticcall + res := staticcall(gas(), 0xca1100fa, 0, 0, 0, 0x20) + } + case 0xFD { // Rerun the code after a REVERT + // basefee is still not supported in Yul 0.8.5 + + + mstore(0, verbatim_0i_1o(hex"48")) + + + sstore(0, mload(0)) + + pop(call(gas(), 0x60BACC, 0, 0, 0, 0, 0)) + // basefee is still not supported in Yul 0.8.5 + + + mstore(0, verbatim_0i_1o(hex"48")) + + + + // The two results should be equal + if iszero(eq(sload(0), mload(0))) {mstore(0, 0xBADBADBAD)} + } + case 0xFE { // Rerun the code after an out of gas + // basefee is still not supported in Yul 0.8.5 + + + mstore(0, verbatim_0i_1o(hex"48")) + + + sstore(0, mload(0)) + + pop(call(25000, 0x60006, 0, 0, 0, 0, 0)) + // basefee is still not supported in Yul 0.8.5 + + + mstore(0, verbatim_0i_1o(hex"48")) + + + + // The two results should be equal + if iszero(eq(sload(0), mload(0))) {mstore(0, 0xBADBADBAD)} + } + case 0xFF { // Rerun the code after a SELFDESTRUCT + // basefee is still not supported in Yul 0.8.5 + + + mstore(0, verbatim_0i_1o(hex"48")) + + + sstore(0, mload(0)) + + pop(call(gas(), 0xDEADDEAD, 0, 0, 0, 0, 0)) + // basefee is still not supported in Yul 0.8.5 + + + mstore(0, verbatim_0i_1o(hex"48")) + + + + // The two results should be equal + if iszero(eq(sload(0), mload(0))) {mstore(0, 0xBADBADBAD)} + } + + + + case 0xF0 { // CREATE, run the code in the constructor + // Read the code from 0xC0DE and create a contract based on it + extcodecopy(0xC0DE, codeBuffer, 0, codeLength) + addr := create(1000000000000000000, codeBuffer, codeLength) + + // Read the created contract, that is the result + // We start it from the second byte so the first byte of + // code will be STOP (0x00). Otherwise we might run into + // invalid program issues (because the result isn't a valid + // program + extcodecopy(addr, 0, 1, 0x20) + } + + + case 0xF5 { // CREATE2, run the code in the constructor + // Read the code from 0xC0DE and create a contract based on it + extcodecopy(0xC0DE, codeBuffer, 0, codeLength) + addr := create2(1000000000000000000, codeBuffer, codeLength, 0x5a17) + + // Read the created contract, that is the result + // We start it from the second byte so the first byte of + // code will be STOP (0x00). Otherwise we might run into + // invalid program issues (because the result isn't a valid + // program + extcodecopy(addr, 0, 1, 0x20) + } + + case 0xF0F1 { // CREATE, then CALL the created code for the result + + // Read the code from 0xC0DEC0DE and create a + // contract based on it + extcodecopy(0xC0DEC0DE, codeBuffer, 0, codeLength2) + addr := create(1000000000000000000, codeBuffer, codeLength2) + + // Call the contract + res := call(gas(), addr, 0, 0, 0, 0, 0x20) + + } + + case 0xF5F1 { // CREATE2, then CALL the created code for the result + + // Read the code from 0xC0DEC0DE and create a + // contract based on it + extcodecopy(0xC0DEC0DE, codeBuffer, 0, codeLength2) + addr := create2(1000000000000000000, codeBuffer, codeLength2, 0x5a17) + + // Call the contract + res := call(gas(), addr, 0, 0, 0, 0, 0x20) + + } + + + case 0xF0F2 { // CREATE, then CALLCODE the created code + // for the result + + // Read the code from 0xC0DEC0DE and create a + // contract based on it + extcodecopy(0xC0DEC0DE, codeBuffer, 0, codeLength2) + + // Here we don't transfer cc..cc's ETH to the new contract + // because if we run SELFBALANCE it will run in the context + // of CC....CC and therefore return 0 + addr := create(0, codeBuffer, codeLength2) + + // Call the contract + res := callcode(gas(), addr, 0, 0, 0, 0, 0x20) + + } + + case 0xF5F2 { // CREATE2, then CALLCODE the created code for + // the result + + // Read the code from 0xC0DEC0DE and create a + // contract based on it + extcodecopy(0xC0DEC0DE, codeBuffer, 0, codeLength2) + + // Here we don't transfer cc..cc's ETH to the new contract + // because if we run SELFBALANCE it will run in the context + // of CC....CC and therefore return 0 + addr := create2(0, codeBuffer, codeLength2, 0x5a17) + + // Call the contract + res := callcode(gas(), addr, 0, 0, 0, 0, 0x20) + + } + + + case 0xF0F4 { // CREATE, then DELEGATECALL the created code + // for the result + + // Read the code from 0xC0DEC0DE and create a + // contract based on it + extcodecopy(0xC0DEC0DE, codeBuffer, 0, codeLength2) + + // Here we don't transfer cc..cc's ETH to the new contract + // because if we run SELFBALANCE it will run in the context + // of CC....CC and therefore return 0 + addr := create(0, codeBuffer, codeLength2) + + // Call the contract + res := delegatecall(gas(), addr, 0, 0, 0, 0x20) + + } + + case 0xF5F4 { // CREATE2, then DELEGATECALL the created code + // for the result + + // Read the code from 0xC0DEC0DE and create a + // contract based on it + extcodecopy(0xC0DEC0DE, codeBuffer, 0, codeLength2) + + // Here we don't transfer cc..cc's ETH to the new contract + // because if we run SELFBALANCE it will run in the context + // of CC....CC and therefore return 0 + addr := create2(0, codeBuffer, codeLength2, 0x5a17) + + // Call the contract + res := delegatecall(gas(), addr, 0, 0, 0, 0x20) + + } + + + case 0xF0FA { // CREATE, then CALLSTATIC the created code + // for the result + + // Read the code from 0xC0DEC0DE and create a + // contract based on it + extcodecopy(0xC0DEC0DE, codeBuffer, 0, codeLength2) + addr := create(1000000000000000000, codeBuffer, codeLength2) + + // Call the contract + res := staticcall(gas(), addr, 0, 0, 0, 0x20) + + } + + case 0xF5FA { // CREATE2, then STATICCALL the created code + // for the result + + // Read the code from 0xC0DEC0DE and create a + // contract based on it + extcodecopy(0xC0DEC0DE, codeBuffer, 0, codeLength2) + addr := create2(1000000000000000000, codeBuffer, codeLength2, 0x5a17) + + // Call the contract + res := staticcall(gas(), addr, 0, 0, 0, 0x20) + + } + + // Recurse (= run backwards) + case 0x60BACCFA57 { + mstore(0, 1023) + res := call(gas(), 0x60BACCFA57, 0, 0, 0x20, 0, 0x20) + } + + + default { // Fail, we should never get here + mstore(0, 0xBAD0BAD0BAD0) + } + + // If res is zero, that means a call failed, so fail too + if iszero(res) { revert(0,0x20) } + + // If addr is zero, that means a create failed, so fail too + if iszero(addr) { revert(0,0x20) } + + // Here the result is is mload(0), store it so + // the test can check it + sstore(0, mload(0)) + } + nonce: 1 + storage: + 0: 0x60A7 # To be overwritten by the code snippet + + + + # Called to perform the code snippet and return the result + 000000000000000000000000000000000000ca11: + balance: '1000000000000000000' + code: | + :yul berlin { + // basefee is still not supported in Yul 0.8.5 + + + mstore(0, verbatim_0i_1o(hex"48")) + + + return(0, 0x20) // return the result as our return value + } + nonce: 1 + storage: {} + + + # Called to CALL the code (two level call stack) + 00000000000000000000000000000000ca1100f1: + balance: '1000000000000000000' + code: | + :yul berlin { + if iszero(call(gas(), 0xca11, 0, 0, 0, 0, 0x20)) + { revert(0,0x20) } + + return(0, 0x20) // return the result as our return value + } + nonce: 1 + storage: {} + + + # Called to CALLCODE the code (two level call stack) + 00000000000000000000000000000000ca1100f2: + balance: '1000000000000000000' + code: | + :yul berlin { + if iszero(callcode(gas(), 0xca11, 0, 0, 0, 0, 0x20)) + { revert(0,0x20) } + + return(0, 0x20) // return the result as our return value + } + nonce: 1 + storage: {} + + + # Called to DELEGATECALL the code (two level call stack) + 00000000000000000000000000000000ca1100f4: + balance: '1000000000000000000' + code: | + :yul berlin { + if iszero(delegatecall(gas(), 0xca11, 0, 0, 0, 0x20)) + { revert(0,0x20) } + + return(0, 0x20) // return the result as our return value + } + nonce: 1 + storage: {} + + + # Called to STATICCALL the code (two level call stack) + 00000000000000000000000000000000ca1100fa: + balance: '1000000000000000000' + code: | + :yul berlin { + if iszero(staticcall(gas(), 0xca11, 0, 0, 0, 0x20)) + { revert(0,0x20) } + + return(0, 0x20) // return the result as our return value + } + nonce: 1 + storage: {} + + + # Failures (to run the code after a failure, see it works) + + # Out of gas + 0000000000000000000000000000000000060006: + balance: '1000000000000000000' + code: | + :yul berlin { + // basefee is still not supported in Yul 0.8.5 + + + mstore(0, verbatim_0i_1o(hex"48")) + + + sstore(0,mload(0)) + invalid() + } + nonce: 1 + storage: + 0: 0x60A7 # If it changes, we have a problem + + + # REVERT + 000000000000000000000000000000000060BACC: + balance: '1000000000000000000' + code: | + :yul berlin { + // basefee is still not supported in Yul 0.8.5 + + + mstore(0, verbatim_0i_1o(hex"48")) + + + sstore(0,mload(0)) + revert(0,0x20) + } + nonce: 1 + storage: + 0: 0x60A7 # If it changes, we have a problem + + + # SELFDESTRUCT + 00000000000000000000000000000000DEADDEAD: + balance: '1000000000000000000' + code: | + :yul berlin { + selfdestruct(0) + } + nonce: 1 + storage: {} + + + + + # Recursively call until reaching the stack depth, then run the template + 00000000000000000000000000000060BACCFA57: + balance: 1000000000000000000 + code: | + :yul berlin { + let depth := calldataload(0) + + if eq(depth,0) { + // basefee is still not supported in Yul 0.8.5 + + + mstore(0, verbatim_0i_1o(hex"48")) + + + return(0, 0x20) + } + + // Dig deeper + mstore(0, sub(depth,1)) + + // Call yourself with depth-1 + if iszero(call(gas(), 0x60BACCFA57, 0, 0, 0x20, 0, 0x20)) { + // Propagate failure if we failed + revert(0, 0x20) + } + + // Propagate success + return (0, 0x20) + } + nonce: 1 + storage: {} + + + + a94f5374fce5edbc8e2a8697c15331677e6ebf0b: + balance: 1000000000000000000000 + code: '0x' + nonce: 1 + storage: {} + + + transaction: + data: + # Run the code snippet normally + - :label normal :abi f(uint) 0x00 + + # Single level call stack + # CALL + - :label normal :abi f(uint) 0xf1 + # CALLCODE + - :label normal :abi f(uint) 0xf2 + # DELEGATECALL + - :abi f(uint) 0xf4 + # STATICCALL + - :abi f(uint) 0xfa + + # Two level call stack + # CALL CALL + - :abi f(uint) 0xf1f1 + # CALLCODE CALL + - :abi f(uint) 0xf2f1 + # DELEGATECALL CALL + - :abi f(uint) 0xf4f1 + # STATICCALL CALL + - :abi f(uint) 0xfaf1 + # CALL CALLCODE + - :abi f(uint) 0xf1f2 + # CALLCODE CALLCODE + - :abi f(uint) 0xf2f2 + # DELEGATECALL CALLCODE + - :abi f(uint) 0xf4f2 + # STATICCALL CALLCODE + - :abi f(uint) 0xfaf2 + # CALL DELEGATECALL + - :abi f(uint) 0xf1f4 + # CALLCODE DELEGATECALL + - :abi f(uint) 0xf2f4 + # DELEGATECALL DELEGATECALL + - :abi f(uint) 0xf4f4 + # STATICCALL DELEGATECALL + - :abi f(uint) 0xfaf4 + # CALL STATICCALL + - :abi f(uint) 0xf1fa + # CALLCODE STATICCALL + - :abi f(uint) 0xf2fa + # DELEGATECALL STATICCALL + - :abi f(uint) 0xf4fa + # STATICCALL STATICCALL + - :abi f(uint) 0xfafa + + # Call after something fails + # REVERT + - :abi f(uint) 0xfd + # Out of gas + - :abi f(uint) 0xfe + # SELFDESTRUCT + - :abi f(uint) 0xff + + + # Combined with creation of contracts + # CREATE (run code in the constructor) + - :abi f(uint) 0xf0 + # CREATE2 (run code in the constructor) + - :abi f(uint) 0xf5 + # CREATE and then CALL + - :abi f(uint) 0xf0f1 + # CREATE2 and then CALL + - :abi f(uint) 0xf5f1 + # CREATE and then CALLCODE + - :abi f(uint) 0xf0f2 + # CREATE2 and then CALLCODE + - :abi f(uint) 0xf5f2 + # CREATE and then DELEGATECALL + - :abi f(uint) 0xf0f4 + # CREATE2 and then DELEGATECALL + - :abi f(uint) 0xf5f4 + # CREATE and then STATICCALL + - :abi f(uint) 0xf0fa + # CREATE2 and then STATICCALL + - :abi f(uint) 0xf5fa + + + # Recurse almost until the limit + # - :abi f(uint) 0x60BACCFA57 + + + gasLimit: + - 2_000_000 + nonce: 1 + to: cccccccccccccccccccccccccccccccccccccccc + value: + - 0 + secretKey: "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8" + gasPrice: 2000 + + + expect: + - indexes: + data: !!int -1 + gas: !!int -1 + value: !!int -1 + + network: + - '>=Prague' + + result: + cccccccccccccccccccccccccccccccccccccccc: + storage: + # The result we expect + 0x00: 10 + + 000000000000000000000000000000000060BACC: + storage: + 0x00: 0x60A7 # Anything that happens should be reverted out of + + 0000000000000000000000000000000000060006: + storage: + 0x00: 0x60A7 # Anything that happens should be reverted out of + + + + diff --git a/tests/static/state_tests/stEIP1559/gasPriceDiffPlacesFiller.yml b/tests/static/state_tests/stEIP1559/gasPriceDiffPlacesCancunFiller.yml similarity index 94% rename from tests/static/state_tests/stEIP1559/gasPriceDiffPlacesFiller.yml rename to tests/static/state_tests/stEIP1559/gasPriceDiffPlacesCancunFiller.yml index 5e14b9eaf74..360eda5a803 100644 --- a/tests/static/state_tests/stEIP1559/gasPriceDiffPlacesFiller.yml +++ b/tests/static/state_tests/stEIP1559/gasPriceDiffPlacesCancunFiller.yml @@ -549,91 +549,91 @@ gasPriceDiffPlaces: transaction: data: - # Run the code snippet normally + # Run the code snippet normally 0 - :label normal :abi f(uint) 0x00 - # Single level call stack + # Single level call stack 1 # CALL - :label normal :abi f(uint) 0xf1 - # CALLCODE + # CALLCODE 2 - :label normal :abi f(uint) 0xf2 - # DELEGATECALL + # DELEGATECALL 3 - :abi f(uint) 0xf4 - # STATICCALL + # STATICCALL 4 - :abi f(uint) 0xfa # Two level call stack - # CALL CALL + # CALL CALL 5 - :abi f(uint) 0xf1f1 - # CALLCODE CALL + # CALLCODE CALL 6 - :abi f(uint) 0xf2f1 - # DELEGATECALL CALL + # DELEGATECALL CALL 7 - :abi f(uint) 0xf4f1 - # STATICCALL CALL + # STATICCALL CALL 8 - :abi f(uint) 0xfaf1 - # CALL CALLCODE + # CALL CALLCODE 9 - :abi f(uint) 0xf1f2 - # CALLCODE CALLCODE + # CALLCODE CALLCODE 10 - :abi f(uint) 0xf2f2 - # DELEGATECALL CALLCODE + # DELEGATECALL CALLCODE 11 - :abi f(uint) 0xf4f2 - # STATICCALL CALLCODE + # STATICCALL CALLCODE 12 - :abi f(uint) 0xfaf2 - # CALL DELEGATECALL + # CALL DELEGATECALL 13 - :abi f(uint) 0xf1f4 - # CALLCODE DELEGATECALL + # CALLCODE DELEGATECALL 14 - :abi f(uint) 0xf2f4 - # DELEGATECALL DELEGATECALL + # DELEGATECALL DELEGATECALL 15 - :abi f(uint) 0xf4f4 - # STATICCALL DELEGATECALL + # STATICCALL DELEGATECALL 16 - :abi f(uint) 0xfaf4 - # CALL STATICCALL + # CALL STATICCALL 17 - :abi f(uint) 0xf1fa - # CALLCODE STATICCALL + # CALLCODE STATICCALL 18 - :abi f(uint) 0xf2fa - # DELEGATECALL STATICCALL + # DELEGATECALL STATICCALL 19 - :abi f(uint) 0xf4fa - # STATICCALL STATICCALL + # STATICCALL STATICCALL 20 - :abi f(uint) 0xfafa # Call after something fails - # REVERT + # REVERT 21 - :abi f(uint) 0xfd - # Out of gas + # Out of gas 22 - :abi f(uint) 0xfe - # SELFDESTRUCT + # SELFDESTRUCT 23 - :abi f(uint) 0xff # Combined with creation of contracts - # CREATE (run code in the constructor) + # CREATE (run code in the constructor) 24 - :abi f(uint) 0xf0 - # CREATE2 (run code in the constructor) + # CREATE2 (run code in the constructor) 25 - :abi f(uint) 0xf5 - # CREATE and then CALL + # CREATE and then CALL 26 - :abi f(uint) 0xf0f1 - # CREATE2 and then CALL + # CREATE2 and then CALL 27 - :abi f(uint) 0xf5f1 - # CREATE and then CALLCODE + # CREATE and then CALLCODE 28 - :abi f(uint) 0xf0f2 - # CREATE2 and then CALLCODE + # CREATE2 and then CALLCODE 29 - :abi f(uint) 0xf5f2 - # CREATE and then DELEGATECALL + # CREATE and then DELEGATECALL 30 - :abi f(uint) 0xf0f4 - # CREATE2 and then DELEGATECALL + # CREATE2 and then DELEGATECALL 31 - :abi f(uint) 0xf5f4 - # CREATE and then STATICCALL + # CREATE and then STATICCALL 32 - :abi f(uint) 0xf0fa - # CREATE2 and then STATICCALL + # CREATE2 and then STATICCALL 33 - :abi f(uint) 0xf5fa - # Recurse almost until the limit + # Recurse almost until the limit 34 - :abi f(uint) 0x60BACCFA57 gasLimit: - - 0x1c9c380 + - 40000000000000 nonce: 1 to: cccccccccccccccccccccccccccccccccccccccc value: diff --git a/tests/static/state_tests/stEIP1559/gasPriceDiffPlacesPragueFiller.yml b/tests/static/state_tests/stEIP1559/gasPriceDiffPlacesPragueFiller.yml new file mode 100644 index 00000000000..9a496277493 --- /dev/null +++ b/tests/static/state_tests/stEIP1559/gasPriceDiffPlacesPragueFiller.yml @@ -0,0 +1,670 @@ + +# Created by tests/src/Templates/DiffPlaces/templateGen.js +# +# With the template code: +# mstore(0, gasprice()) +# +# +# +# Expected result: 2000 +# +gasPriceDiffPlaces: + _info: + comment: Ori Pomerantz qbzzt1@gmail.com + + env: + currentCoinbase: 2adc25665018aa1fe0e6bc666dac8fc2697ff9ba + currentDifficulty: 0x20000 + currentNumber: 1 + currentTimestamp: 1000 + currentGasLimit: 0x10000000000000 + currentBaseFee: 10 + + pre: + + # It is not trivial to use the Yul compiler to get the + # binary code for the code we're checking, so we'll use EXTCODECOPY + # from this contract + 000000000000000000000000000000000000C0DE: + balance: 1000000000000000000 + code: | + :yul berlin { + mstore(0, gasprice()) + + + + // Here the result is is mload(0). We want to run it, but + // prefix it with a zero so we'll be safe from being considered + // an invalid program. + // + // If we use this as a contructor the result will be + // the code of the created contract, but we can live + // with that. We won't call it. + mstore(0x40, mload(0x00)) + return(0x3F, 0x21) + } + nonce: 1 + storage: {} + + # When we create a contract and then call it, we don't want the + # zero prefix in the return value + 000000000000000000000000000000000020C0DE: + balance: 1000000000000000000 + code: | + :yul berlin { + mstore(0, gasprice()) + + + + // Here the result is is mload(0). + return(0x00, 0x20) + } + nonce: 1 + storage: {} + + + + # Code for a construct to create a contract with the template code + 00000000000000000000000000000000C0DEC0DE: + balance: 1000000000000000000 + code: | + :yul berlin { + let addr := 0x20C0DE + let length := extcodesize(addr) + + // Read the code from 0x20C0DE + extcodecopy(addr, 0, 0, length) + + // Return this memory as the code for the contract + return(0, length) + } + nonce: 1 + storage: {} + + + # Perform the action (directly or indirectly). Either way, + # store the result in sload(0). + cccccccccccccccccccccccccccccccccccccccc: + balance: 1000000000000000000 + code: | + :yul berlin { + let action := calldataload(4) + let res := 1 // If the result of a call is revert, revert here too + let addr := 1 // If the result of CREATE[2] is zero, it reverted + + // For when we need code in our memory + let codeBuffer := 0x20 + // When running the template in the constructor + let codeLength := extcodesize(0xC0DE) + // When running the template in the created code + let codeLength2 := extcodesize(0xC0DEC0DE) + + // Goat should be overwritten + mstore(0, 0x60A7) + + switch action + case 0 { // run the code snippet as normal code + mstore(0, gasprice()) + + + } + + // One level of call stack + case 0xF1 { // call a contract to run this code + res := call(gas(), 0xca11, 0, 0, 0, 0, 0x20) // call template code + } + case 0xF2 { // callcode a contract to run this code + res := callcode(gas(), 0xca11, 0, 0, 0, 0, 0x20) + } + case 0xF4 { // delegate call a contract to run this code + res := delegatecall(gas(), 0xca11, 0, 0, 0, 0x20) + } + case 0xFA { // static call a contract to run this code + res := staticcall(gas(), 0xca11, 0, 0, 0, 0x20) + } + + // Two levels of call stack + case 0xF1F1 { // call, call + res := call(gas(), 0xca1100f1, 0, 0, 0, 0, 0x20) + } + case 0xF2F1 { // callcode, call + res := callcode(gas(), 0xca1100f1, 0, 0, 0, 0, 0x20) + } + case 0xF4F1 { // delegatecall, call + res := delegatecall(gas(), 0xca1100f1, 0, 0, 0, 0x20) + } + case 0xFAF1 { // staticcall, call + res := staticcall(gas(), 0xca1100f1, 0, 0, 0, 0x20) + } + case 0xF1F2 { // call, callcode + res := call(gas(), 0xca1100f2, 0, 0, 0, 0, 0x20) + } + case 0xF2F2 { // callcode, callcode + res := callcode(gas(), 0xca1100f2, 0, 0, 0, 0, 0x20) + } + case 0xF4F2 { // delegatecall, callcode + res := delegatecall(gas(), 0xca1100f2, 0, 0, 0, 0x20) + } + case 0xFAF2 { // staticcall, callcode + res := staticcall(gas(), 0xca1100f2, 0, 0, 0, 0x20) + } + case 0xF1F4 { // call, delegatecall + res := call(gas(), 0xca1100f4, 0, 0, 0, 0, 0x20) + } + case 0xF2F4 { // callcode, delegatecall + res := callcode(gas(), 0xca1100f4, 0, 0, 0, 0, 0x20) + } + case 0xF4F4 { // delegatecall, delegatecall + res := delegatecall(gas(), 0xca1100f4, 0, 0, 0, 0x20) + } + case 0xFAF4 { // staticcall, delegatecall + res := staticcall(gas(), 0xca1100f4, 0, 0, 0, 0x20) + } + case 0xF1FA { // call, staticcall + res := call(gas(), 0xca1100fa, 0, 0, 0, 0, 0x20) + } + case 0xF2FA { // callcode, staticcall + res := callcode(gas(), 0xca1100fa, 0, 0, 0, 0, 0x20) + } + case 0xF4FA { // delegatecall, staticcall + res := delegatecall(gas(), 0xca1100fa, 0, 0, 0, 0x20) + } + case 0xFAFA { // staticcall, staticcall + res := staticcall(gas(), 0xca1100fa, 0, 0, 0, 0x20) + } + case 0xFD { // Rerun the code after a REVERT + mstore(0, gasprice()) + + + sstore(0, mload(0)) + + pop(call(gas(), 0x60BACC, 0, 0, 0, 0, 0)) + mstore(0, gasprice()) + + + + // The two results should be equal + if iszero(eq(sload(0), mload(0))) {mstore(0, 0xBADBADBAD)} + } + case 0xFE { // Rerun the code after an out of gas + mstore(0, gasprice()) + + + sstore(0, mload(0)) + + pop(call(25000, 0x60006, 0, 0, 0, 0, 0)) + mstore(0, gasprice()) + + + + // The two results should be equal + if iszero(eq(sload(0), mload(0))) {mstore(0, 0xBADBADBAD)} + } + case 0xFF { // Rerun the code after a SELFDESTRUCT + mstore(0, gasprice()) + + + sstore(0, mload(0)) + + pop(call(gas(), 0xDEADDEAD, 0, 0, 0, 0, 0)) + mstore(0, gasprice()) + + + + // The two results should be equal + if iszero(eq(sload(0), mload(0))) {mstore(0, 0xBADBADBAD)} + } + + + + case 0xF0 { // CREATE, run the code in the constructor + // Read the code from 0xC0DE and create a contract based on it + extcodecopy(0xC0DE, codeBuffer, 0, codeLength) + addr := create(1000000000000000000, codeBuffer, codeLength) + + // Read the created contract, that is the result + // We start it from the second byte so the first byte of + // code will be STOP (0x00). Otherwise we might run into + // invalid program issues (because the result isn't a valid + // program + extcodecopy(addr, 0, 1, 0x20) + } + + + case 0xF5 { // CREATE2, run the code in the constructor + // Read the code from 0xC0DE and create a contract based on it + extcodecopy(0xC0DE, codeBuffer, 0, codeLength) + addr := create2(1000000000000000000, codeBuffer, codeLength, 0x5a17) + + // Read the created contract, that is the result + // We start it from the second byte so the first byte of + // code will be STOP (0x00). Otherwise we might run into + // invalid program issues (because the result isn't a valid + // program + extcodecopy(addr, 0, 1, 0x20) + } + + case 0xF0F1 { // CREATE, then CALL the created code for the result + + // Read the code from 0xC0DEC0DE and create a + // contract based on it + extcodecopy(0xC0DEC0DE, codeBuffer, 0, codeLength2) + addr := create(1000000000000000000, codeBuffer, codeLength2) + + // Call the contract + res := call(gas(), addr, 0, 0, 0, 0, 0x20) + + } + + case 0xF5F1 { // CREATE2, then CALL the created code for the result + + // Read the code from 0xC0DEC0DE and create a + // contract based on it + extcodecopy(0xC0DEC0DE, codeBuffer, 0, codeLength2) + addr := create2(1000000000000000000, codeBuffer, codeLength2, 0x5a17) + + // Call the contract + res := call(gas(), addr, 0, 0, 0, 0, 0x20) + + } + + + case 0xF0F2 { // CREATE, then CALLCODE the created code + // for the result + + // Read the code from 0xC0DEC0DE and create a + // contract based on it + extcodecopy(0xC0DEC0DE, codeBuffer, 0, codeLength2) + + // Here we don't transfer cc..cc's ETH to the new contract + // because if we run SELFBALANCE it will run in the context + // of CC....CC and therefore return 0 + addr := create(0, codeBuffer, codeLength2) + + // Call the contract + res := callcode(gas(), addr, 0, 0, 0, 0, 0x20) + + } + + case 0xF5F2 { // CREATE2, then CALLCODE the created code for + // the result + + // Read the code from 0xC0DEC0DE and create a + // contract based on it + extcodecopy(0xC0DEC0DE, codeBuffer, 0, codeLength2) + + // Here we don't transfer cc..cc's ETH to the new contract + // because if we run SELFBALANCE it will run in the context + // of CC....CC and therefore return 0 + addr := create2(0, codeBuffer, codeLength2, 0x5a17) + + // Call the contract + res := callcode(gas(), addr, 0, 0, 0, 0, 0x20) + + } + + + case 0xF0F4 { // CREATE, then DELEGATECALL the created code + // for the result + + // Read the code from 0xC0DEC0DE and create a + // contract based on it + extcodecopy(0xC0DEC0DE, codeBuffer, 0, codeLength2) + + // Here we don't transfer cc..cc's ETH to the new contract + // because if we run SELFBALANCE it will run in the context + // of CC....CC and therefore return 0 + addr := create(0, codeBuffer, codeLength2) + + // Call the contract + res := delegatecall(gas(), addr, 0, 0, 0, 0x20) + + } + + case 0xF5F4 { // CREATE2, then DELEGATECALL the created code + // for the result + + // Read the code from 0xC0DEC0DE and create a + // contract based on it + extcodecopy(0xC0DEC0DE, codeBuffer, 0, codeLength2) + + // Here we don't transfer cc..cc's ETH to the new contract + // because if we run SELFBALANCE it will run in the context + // of CC....CC and therefore return 0 + addr := create2(0, codeBuffer, codeLength2, 0x5a17) + + // Call the contract + res := delegatecall(gas(), addr, 0, 0, 0, 0x20) + + } + + + case 0xF0FA { // CREATE, then CALLSTATIC the created code + // for the result + + // Read the code from 0xC0DEC0DE and create a + // contract based on it + extcodecopy(0xC0DEC0DE, codeBuffer, 0, codeLength2) + addr := create(1000000000000000000, codeBuffer, codeLength2) + + // Call the contract + res := staticcall(gas(), addr, 0, 0, 0, 0x20) + + } + + case 0xF5FA { // CREATE2, then STATICCALL the created code + // for the result + + // Read the code from 0xC0DEC0DE and create a + // contract based on it + extcodecopy(0xC0DEC0DE, codeBuffer, 0, codeLength2) + addr := create2(1000000000000000000, codeBuffer, codeLength2, 0x5a17) + + // Call the contract + res := staticcall(gas(), addr, 0, 0, 0, 0x20) + + } + + // Recurse (= run backwards) + case 0x60BACCFA57 { + mstore(0, 1023) + res := call(gas(), 0x60BACCFA57, 0, 0, 0x20, 0, 0x20) + } + + + default { // Fail, we should never get here + mstore(0, 0xBAD0BAD0BAD0) + } + + // If res is zero, that means a call failed, so fail too + if iszero(res) { revert(0,0x20) } + + // If addr is zero, that means a create failed, so fail too + if iszero(addr) { revert(0,0x20) } + + // Here the result is is mload(0), store it so + // the test can check it + sstore(0, mload(0)) + } + nonce: 1 + storage: + 0: 0x60A7 # To be overwritten by the code snippet + + + + # Called to perform the code snippet and return the result + 000000000000000000000000000000000000ca11: + balance: '1000000000000000000' + code: | + :yul berlin { + mstore(0, gasprice()) + + + return(0, 0x20) // return the result as our return value + } + nonce: 1 + storage: {} + + + # Called to CALL the code (two level call stack) + 00000000000000000000000000000000ca1100f1: + balance: '1000000000000000000' + code: | + :yul berlin { + if iszero(call(gas(), 0xca11, 0, 0, 0, 0, 0x20)) + { revert(0,0x20) } + + return(0, 0x20) // return the result as our return value + } + nonce: 1 + storage: {} + + + # Called to CALLCODE the code (two level call stack) + 00000000000000000000000000000000ca1100f2: + balance: '1000000000000000000' + code: | + :yul berlin { + if iszero(callcode(gas(), 0xca11, 0, 0, 0, 0, 0x20)) + { revert(0,0x20) } + + return(0, 0x20) // return the result as our return value + } + nonce: 1 + storage: {} + + + # Called to DELEGATECALL the code (two level call stack) + 00000000000000000000000000000000ca1100f4: + balance: '1000000000000000000' + code: | + :yul berlin { + if iszero(delegatecall(gas(), 0xca11, 0, 0, 0, 0x20)) + { revert(0,0x20) } + + return(0, 0x20) // return the result as our return value + } + nonce: 1 + storage: {} + + + # Called to STATICCALL the code (two level call stack) + 00000000000000000000000000000000ca1100fa: + balance: '1000000000000000000' + code: | + :yul berlin { + if iszero(staticcall(gas(), 0xca11, 0, 0, 0, 0x20)) + { revert(0,0x20) } + + return(0, 0x20) // return the result as our return value + } + nonce: 1 + storage: {} + + + # Failures (to run the code after a failure, see it works) + + # Out of gas + 0000000000000000000000000000000000060006: + balance: '1000000000000000000' + code: | + :yul berlin { + mstore(0, gasprice()) + + + sstore(0,mload(0)) + invalid() + } + nonce: 1 + storage: + 0: 0x60A7 # If it changes, we have a problem + + + # REVERT + 000000000000000000000000000000000060BACC: + balance: '1000000000000000000' + code: | + :yul berlin { + mstore(0, gasprice()) + + + sstore(0,mload(0)) + revert(0,0x20) + } + nonce: 1 + storage: + 0: 0x60A7 # If it changes, we have a problem + + + # SELFDESTRUCT + 00000000000000000000000000000000DEADDEAD: + balance: '1000000000000000000' + code: | + :yul berlin { + selfdestruct(0) + } + nonce: 1 + storage: {} + + + + + # Recursively call until reaching the stack depth, then run the template + 00000000000000000000000000000060BACCFA57: + balance: 1000000000000000000 + code: | + :yul berlin { + let depth := calldataload(0) + + if eq(depth,0) { + mstore(0, gasprice()) + + + return(0, 0x20) + } + + // Dig deeper + mstore(0, sub(depth,1)) + + // Call yourself with depth-1 + if iszero(call(gas(), 0x60BACCFA57, 0, 0, 0x20, 0, 0x20)) { + // Propagate failure if we failed + revert(0, 0x20) + } + + // Propagate success + return (0, 0x20) + } + nonce: 1 + storage: {} + + + + a94f5374fce5edbc8e2a8697c15331677e6ebf0b: + balance: 1000000000000000000000 + code: '0x' + nonce: 1 + storage: {} + + + transaction: + data: + # Run the code snippet normally 0 + - :label normal :abi f(uint) 0x00 + + # Single level call stack 1 + # CALL + - :label normal :abi f(uint) 0xf1 + # CALLCODE 2 + - :label normal :abi f(uint) 0xf2 + # DELEGATECALL 3 + - :abi f(uint) 0xf4 + # STATICCALL 4 + - :abi f(uint) 0xfa + + # Two level call stack + # CALL CALL 5 + - :abi f(uint) 0xf1f1 + # CALLCODE CALL 6 + - :abi f(uint) 0xf2f1 + # DELEGATECALL CALL 7 + - :abi f(uint) 0xf4f1 + # STATICCALL CALL 8 + - :abi f(uint) 0xfaf1 + # CALL CALLCODE 9 + - :abi f(uint) 0xf1f2 + # CALLCODE CALLCODE 10 + - :abi f(uint) 0xf2f2 + # DELEGATECALL CALLCODE 11 + - :abi f(uint) 0xf4f2 + # STATICCALL CALLCODE 12 + - :abi f(uint) 0xfaf2 + # CALL DELEGATECALL 13 + - :abi f(uint) 0xf1f4 + # CALLCODE DELEGATECALL 14 + - :abi f(uint) 0xf2f4 + # DELEGATECALL DELEGATECALL 15 + - :abi f(uint) 0xf4f4 + # STATICCALL DELEGATECALL 16 + - :abi f(uint) 0xfaf4 + # CALL STATICCALL 17 + - :abi f(uint) 0xf1fa + # CALLCODE STATICCALL 18 + - :abi f(uint) 0xf2fa + # DELEGATECALL STATICCALL 19 + - :abi f(uint) 0xf4fa + # STATICCALL STATICCALL 20 + - :abi f(uint) 0xfafa + + # Call after something fails + # REVERT 21 + - :abi f(uint) 0xfd + # Out of gas 22 + - :abi f(uint) 0xfe + # SELFDESTRUCT 23 + - :abi f(uint) 0xff + + + # Combined with creation of contracts + # CREATE (run code in the constructor) 24 + - :abi f(uint) 0xf0 + # CREATE2 (run code in the constructor) 25 + - :abi f(uint) 0xf5 + # CREATE and then CALL 26 + - :abi f(uint) 0xf0f1 + # CREATE2 and then CALL 27 + - :abi f(uint) 0xf5f1 + # CREATE and then CALLCODE 28 + - :abi f(uint) 0xf0f2 + # CREATE2 and then CALLCODE 29 + - :abi f(uint) 0xf5f2 + # CREATE and then DELEGATECALL 30 + - :abi f(uint) 0xf0f4 + # CREATE2 and then DELEGATECALL 31 + - :abi f(uint) 0xf5f4 + # CREATE and then STATICCALL 32 + - :abi f(uint) 0xf0fa + # CREATE2 and then STATICCALL 33 + - :abi f(uint) 0xf5fa + + + # Recurse almost until the limit 34 + # - :abi f(uint) 0x60BACCFA57 + + + gasLimit: + - 2_000_000 + nonce: 1 + to: cccccccccccccccccccccccccccccccccccccccc + value: + - 0 + secretKey: "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8" + gasPrice: 2000 + + + expect: + - indexes: + data: !!int -1 + gas: !!int -1 + value: !!int -1 + + network: + - '>=Prague' + + result: + cccccccccccccccccccccccccccccccccccccccc: + storage: + # The result we expect + 0x00: 2000 + + 000000000000000000000000000000000060BACC: + storage: + 0x00: 0x60A7 # Anything that happens should be reverted out of + + 0000000000000000000000000000000000060006: + storage: + 0x00: 0x60A7 # Anything that happens should be reverted out of + + + + diff --git a/tests/static/state_tests/stEIP1559/outOfFundsFiller.yml b/tests/static/state_tests/stEIP1559/outOfFundsFiller.yml index a04d47f854f..9c1b991725b 100644 --- a/tests/static/state_tests/stEIP1559/outOfFundsFiller.yml +++ b/tests/static/state_tests/stEIP1559/outOfFundsFiller.yml @@ -23,7 +23,7 @@ outOfFunds: storage: {} a94f5374fce5edbc8e2a8697c15331677e6ebf0b: - balance: '1000000000000000000' + balance: '30000000000000000' code: '0x' nonce: 1 storage: {} @@ -36,7 +36,7 @@ outOfFunds: maxFeePerGas: 10000000000 maxPriorityFeePerGas: 10000000000 gasLimit: - - 30000000 + - 30_000_000 - 40000 nonce: 1 to: cccccccccccccccccccccccccccccccccccccccc diff --git a/tests/static/state_tests/stEIP1559/outOfFundsOldTypesFiller.yml b/tests/static/state_tests/stEIP1559/outOfFundsOldTypesFiller.yml index 3a07fb6f52f..cd7fe3463df 100644 --- a/tests/static/state_tests/stEIP1559/outOfFundsOldTypesFiller.yml +++ b/tests/static/state_tests/stEIP1559/outOfFundsOldTypesFiller.yml @@ -23,7 +23,7 @@ outOfFundsOldTypes: storage: {} a94f5374fce5edbc8e2a8697c15331677e6ebf0b: - balance: '1000000000000000000' + balance: '30000000000000000' code: '0x' nonce: 1 storage: {} @@ -36,7 +36,7 @@ outOfFundsOldTypes: accessList: [] gasPrice: 10000000000 gasLimit: - - 30000000 + - 30_000_000 - 40000 nonce: 1 to: cccccccccccccccccccccccccccccccccccccccc diff --git a/tests/static/state_tests/stRevertTest/costRevertFiller.yml b/tests/static/state_tests/stRevertTest/costRevertFiller.yml index 6474f0be6aa..432ccd366a6 100644 --- a/tests/static/state_tests/stRevertTest/costRevertFiller.yml +++ b/tests/static/state_tests/stRevertTest/costRevertFiller.yml @@ -184,8 +184,8 @@ costRevert: } 0) - ; If the gas cost is above 0x04000000, assume it means "all the gas" - [[0]] (if (> @@0 0x04000000) 0xFFFFFF @@0) + ; If the gas cost is above 3000000, assume it means "all the gas" + [[0]] (if (> @@0 3000000) 0xFFFFFF @@0) } nonce: '0' storage: {} @@ -240,7 +240,7 @@ costRevert: - :label stackOver :abi f(uint,uint) 0x1006 3 gasLimit: - - '30000000' + - '4_000_000' gasPrice: '10' nonce: '0' to: cccccccccccccccccccccccccccccccccccccccc diff --git a/tests/static/state_tests/stShift/shiftCombinationsFiller.yml b/tests/static/state_tests/stShift/shiftCombinationsFiller.yml index de5f8bf89b9..947e26f58ad 100644 --- a/tests/static/state_tests/stShift/shiftCombinationsFiller.yml +++ b/tests/static/state_tests/stShift/shiftCombinationsFiller.yml @@ -2143,7 +2143,7 @@ shiftCombinations: data: - '' gasLimit: - - '30000000' + - '30_000_000' gasPrice: '10' nonce: '0' secretKey: 45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8 From 8703a5aede1d4a6cae5e8e60b1c5b10dfca32dfc Mon Sep 17 00:00:00 2001 From: Dimitry Kh Date: Wed, 14 May 2025 12:35:25 +0200 Subject: [PATCH 3/3] optimise createLargeResult test --- .../stCreateTest/createLargeResultFiller.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/static/state_tests/stCreateTest/createLargeResultFiller.yml b/tests/static/state_tests/stCreateTest/createLargeResultFiller.yml index 4e02b631bbc..65133d472e6 100644 --- a/tests/static/state_tests/stCreateTest/createLargeResultFiller.yml +++ b/tests/static/state_tests/stCreateTest/createLargeResultFiller.yml @@ -125,7 +125,7 @@ createLargeResult: gasLimit: - - 30000000 + - 6_000_000 gasPrice: 10 nonce: 1 to: cccccccccccccccccccccccccccccccccccccccc @@ -276,7 +276,7 @@ createLargeResult: # Address (REVERT, so nothing) 0: 0 # Remaining gas - 1: 0x04b16491 + 1: 0x59e2ab # Hash when there is no contract 2: 0 @@ -293,7 +293,7 @@ createLargeResult: # Address (REVERT, so nothing) 0: 0 # Remaining gas - 1: 0x04b16492 + 1: 0x59e2ac # Hash when there is no contract 2: 0 @@ -343,7 +343,7 @@ createLargeResult: # Address (REVERT, so nothing) 0: 0 # Remaining gas - 1: 0x04b1649d + 1: 0x59e2b7 # Hash when there is no contract 2: 0 @@ -360,7 +360,7 @@ createLargeResult: # Address (REVERT, so nothing) 0: 0 # Remaining gas - 1: 0x04b1649e + 1: 0x59e2b8 # Hash when there is no contract 2: 0