Merge winsvega pull request #1 from winsvega/gaslimit-fixes-new

Author: felix314159

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

tests/static/state_tests/VMTests/vmIOandFlowOperations/msizeFiller.yml renamed to 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:

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 [email protected]
+
+  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

tests/static/state_tests/stEIP1559/baseFeeDiffPlacesFiller.yml renamed to 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: