fix(static_tests): adjusted gasLimit to only allow gasLimit of up to 30mil

tests/static/state_tests/Cancun/stEIP1153_transientStorage/15_tstoreCannotBeDosdFiller.yml

@@ -7,6 +7,8 @@
 15_tstoreCannotBeDosd:
   _info:
     comment: Transient storage cannot be DOS’d.
+    pytest_marks:
+      - skip  # Superseded by tests/benchmark/test_worst_compute.py::test_worst_tload, test_worst_tstore
 
   env:
     currentCoinbase: 2adc25665018aa1fe0e6bc666dac8fc2697ff9ba
@@ -72,7 +74,7 @@
       - data: :abi doCall(uint) 0x249F0
         accessList: []
     gasLimit:
-      - "30000000"
+      - "16777216"
     nonce: 0
     to: <contract:target:0xa00000000000000000000000000000000000000a>
     value:

tests/static/state_tests/Cancun/stEIP1153_transientStorage/21_tstoreCannotBeDosdOOOFiller.yml

@@ -8,6 +8,8 @@
 21_tstoreCannotBeDosdOOO:
   _info:
     comment: Transient storage cannot be DOS’d.
+    pytest_marks:
+      - skip  # Superseded by tests/benchmark/test_worst_compute.py::test_worst_tload, test_worst_tstore
 
   env:
     currentCoinbase: 2adc25665018aa1fe0e6bc666dac8fc2697ff9ba
@@ -87,7 +89,7 @@
       - data: :abi doCall(uint) 0x186A0
         accessList: []
     gasLimit:
-      - "30000000"
+      - "16777216"
     nonce: 0
     to: <contract:target:0xa00000000000000000000000000000000000000a>
     value:

tests/static/state_tests/Cancun/stEIP1153_transientStorage/transStorageOKFiller.yml

@@ -810,7 +810,7 @@ transStorageOK:
     - :label static_call :abi staticCall()
 
     gasLimit:
-    - 80000000
+    - 16777216
     gasPrice: 10
     nonce: 1
     to: <contract:target:0xcccccccccccccccccccccccccccccccccccccccc>

tests/static/state_tests/Cancun/stEIP1153_transientStorage/transStorageResetFiller.yml

@@ -260,7 +260,7 @@ transStorageReset:
 
 
     gasLimit:
-    - 80000000
+    - 16777216
     gasPrice: 10
     nonce: 1
     to: <contract:target:0xcccccccccccccccccccccccccccccccccccccccc>

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'
+    - '16777216'
     gasPrice: '10'
     nonce: '0'
     to: cccccccccccccccccccccccccccccccccccccccc

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'
+    - '16777216'
     gasPrice: '10'
     nonce: '0'
     to: cccccccccccccccccccccccccccccccccccccccc

tests/static/state_tests/VMTests/vmArithmeticTest/arithFiller.yml

@@ -66,7 +66,7 @@ arith:
     data:
     - :raw 0x00
     gasLimit:
-    - '80000000'
+    - '16777216'
     gasPrice: '10'
     nonce: '0'
     to: <contract:target:0xcccccccccccccccccccccccccccccccccccccccc>

tests/static/state_tests/VMTests/vmArithmeticTest/divByZeroFiller.yml

@@ -206,7 +206,7 @@ divByZero:
 
 
     gasLimit:
-    - '80000000'
+    - '16777216'
     gasPrice: '10'
     nonce: '0'
     to: <contract:target:0xcccccccccccccccccccccccccccccccccccccccc>

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'
+    - '16777216'
     gasPrice: '10'
     nonce: '0'
     to: cccccccccccccccccccccccccccccccccccccccc

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'
+    - '16777216'
     gasPrice: '10'
     nonce: '0'
     to: cccccccccccccccccccccccccccccccccccccccc

tests/static/state_tests/VMTests/vmArithmeticTest/expPower256Filler.yml

@@ -78,7 +78,7 @@ expPower256:
     data:
     - :abi f(uint) 0
     gasLimit:
-    - '80000000'
+    - '16777216'
     gasPrice: '10'
     nonce: '0'
     to: <contract:target:0xcccccccccccccccccccccccccccccccccccccccc>

tests/static/state_tests/VMTests/vmArithmeticTest/expPower256Of256Filler.yml

@@ -87,7 +87,7 @@ expPower256Of256:
     data:
     - :abi f(uint) 0
     gasLimit:
-    - '80000000'
+    - '16777216'
     gasPrice: '10'
     nonce: '0'
     to: <contract:target:0xcccccccccccccccccccccccccccccccccccccccc>

tests/static/state_tests/VMTests/vmArithmeticTest/expPower2Filler.yml

@@ -54,7 +54,7 @@ expPower2:
     data:
     - :abi f(uint) 0
     gasLimit:
-    - '80000000'
+    - '16777216'
     gasPrice: '10'
     nonce: '0'
     to: <contract:target:0xcccccccccccccccccccccccccccccccccccccccc>

tests/static/state_tests/VMTests/vmArithmeticTest/fibFiller.yml

@@ -48,7 +48,7 @@ fib:
     data: 
     - :raw 0x01
     gasLimit:
-    - '80000000'
+    - '16777216'
     gasPrice: '10'
     nonce: '0'
     to: <contract:target:0xcccccccccccccccccccccccccccccccccccccccc>

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'
+    - '16777216'
     gasPrice: '10'
     nonce: '0'
     to: cccccccccccccccccccccccccccccccccccccccc

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'
+    - '16777216'
     gasPrice: '10'
     nonce: '0'
     to: cccccccccccccccccccccccccccccccccccccccc

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'
+    - '16777216'
     gasPrice: '10'
     nonce: '0'
     to: cccccccccccccccccccccccccccccccccccccccc

tests/static/state_tests/VMTests/vmArithmeticTest/notFiller.yml

@@ -48,7 +48,7 @@ not:
     data:
     - :abi f(uint) 0
     gasLimit:
-    - '80000000'
+    - '16777216'
     gasPrice: '10'
     nonce: '0'
     to: cccccccccccccccccccccccccccccccccccccccc

tests/static/state_tests/VMTests/vmArithmeticTest/sdivFiller.yml

@@ -297,7 +297,7 @@ sdiv:
 
 
     gasLimit:
-    - '80000000'
+    - '16777216'
     gasPrice: '10'
     nonce: '0'
     to: cccccccccccccccccccccccccccccccccccccccc

tests/static/state_tests/VMTests/vmArithmeticTest/signextendFiller.yml

@@ -245,7 +245,7 @@ signextend:
     - :label byte31_neg          :abi f(uint) 0x0E
 
     gasLimit:
-    - '80000000'
+    - '16777216'
     gasPrice: '10'
     nonce: '0'
     to: cccccccccccccccccccccccccccccccccccccccc

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'
+    - '16777216'
     gasPrice: '10'
     nonce: '0'
     to: cccccccccccccccccccccccccccccccccccccccc

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'
+    - '16777216'
     gasPrice: '10'
     nonce: '0'
     to: cccccccccccccccccccccccccccccccccccccccc

tests/static/state_tests/VMTests/vmArithmeticTest/twoOpsFiller.yml

@@ -1189,7 +1189,7 @@ twoOps:
     data: 
     - :raw 0x00
     gasLimit:
-    - '80000000'
+    - '16777216'
     gasPrice: '10'
     nonce: '0'
     to: <contract:target:0xcccccccccccccccccccccccccccccccccccccccc>

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'
+    - '16777216'
     gasPrice: '10'
     nonce: '0'
     to: cccccccccccccccccccccccccccccccccccccccc

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'
+    - '16777216'
     gasPrice: '10'
     nonce: '0'
     to: cccccccccccccccccccccccccccccccccccccccc

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'
+    - '16777216'
     gasPrice: '10'
     nonce: '0'
     to: cccccccccccccccccccccccccccccccccccccccc

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'
+    - '16777216'
     gasPrice: '10'
     nonce: '0'
     to: cccccccccccccccccccccccccccccccccccccccc

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'
+    - '16777216'
     gasPrice: '10'
     nonce: '0'
     to: cccccccccccccccccccccccccccccccccccccccc

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'
+    - '16777216'
     gasPrice: '10'
     nonce: '0'
     to: cccccccccccccccccccccccccccccccccccccccc

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'
+    - '16777216'
     gasPrice: '10'
     nonce: '0'
     to: cccccccccccccccccccccccccccccccccccccccc

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'
+    - '16777216'
     gasPrice: '10'
     nonce: '0'
     to: cccccccccccccccccccccccccccccccccccccccc

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'
+    - '16777216'
     gasPrice: '10'
     nonce: '0'
     to: cccccccccccccccccccccccccccccccccccccccc

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'
+    - '16777216'
     gasPrice: '10'
     nonce: '0'
     to: cccccccccccccccccccccccccccccccccccccccc

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'
+    - '16777216'
     gasPrice: '10'
     nonce: '0'
     to: cccccccccccccccccccccccccccccccccccccccc

tests/static/state_tests/VMTests/vmIOandFlowOperations/codecopyFiller.yml

@@ -145,7 +145,7 @@ codecopy:
 
 
     gasLimit:
-    - '80000000'
+    - '16777216'
     gasPrice: '10'
     nonce: '0'
     to: cccccccccccccccccccccccccccccccccccccccc

tests/static/state_tests/VMTests/vmIOandFlowOperations/jumpFiller.yml

@@ -352,7 +352,7 @@ jump:
 
 
     gasLimit:
-    - '80000000'
+    - '16777216'
     gasPrice: '10'
     nonce: '0'
     to: cccccccccccccccccccccccccccccccccccccccc

tests/static/state_tests/VMTests/vmIOandFlowOperations/jumpToPushFiller.yml

@@ -1834,7 +1834,7 @@ jumpToPush:
     - :label jump-fail    :abi f(uint) 0x20C
 
     gasLimit:
-    - '80000000'
+    - '16777216'
     gasPrice: '10'
     nonce: '0'
     to: cccccccccccccccccccccccccccccccccccccccc

tests/static/state_tests/VMTests/vmIOandFlowOperations/jumpiFiller.yml

@@ -533,7 +533,7 @@ jumpi:
 
 
     gasLimit:
-    - '80000000'
+    - '16777216'
     gasPrice: '10'
     nonce: '0'
     to: cccccccccccccccccccccccccccccccccccccccc

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'
+    - '16777216'
     gasPrice: '10'
     nonce: '0'
     to: <contract:target:0xcccccccccccccccccccccccccccccccccccccccc>

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'
+    - '16777216'
     gasPrice: '10'
     nonce: '0'
     to: cccccccccccccccccccccccccccccccccccccccc

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'
+    - '16777216'
     gasPrice: '10'
     nonce: '0'
     to: cccccccccccccccccccccccccccccccccccccccc

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'
+    - '16777216'
     gasPrice: '10'
     nonce: '0'
     to: cccccccccccccccccccccccccccccccccccccccc