fix precompiles codehash test, refill using latest aleth/testeth

1 files changed, 125 insertions, 120 deletions

diff --git a/src/GeneralStateTestsFiller/stExtCodeHash/extCodeHashPrecompilesFiller.yml b/src/GeneralStateTestsFiller/stExtCodeHash/extCodeHashPrecompilesFiller.yml
index ae8099d54..8bb915043 100644
--- a/src/GeneralStateTestsFiller/stExtCodeHash/extCodeHashPrecompilesFiller.yml
+++ b/src/GeneralStateTestsFiller/stExtCodeHash/extCodeHashPrecompilesFiller.yml
@@ -13,123 +13,126 @@ extCodeHashPrecompiles:
       balance: '1000000000000000000'
       code: |
         {
-          (CALL 150000 0xaaaaaaaa00000000000000000000000000000001 0 0 0 0 32)
-          (RETURNDATACOPY 0 0 32)
-          [[0]] (MLOAD 0)
-          (CALL 150000 0xaaaaaaaa00000000000000000000000000000002 0 0 0 0 32)
-          (RETURNDATACOPY 0 0 32)
-          [[1]] (MLOAD 0)
-          (CALL 150000 0xaaaaaaaa00000000000000000000000000000003 0 0 0 0 32)
-          (RETURNDATACOPY 0 0 32)
-          [[2]] (MLOAD 0)
-          (CALL 150000 0xaaaaaaaa00000000000000000000000000000004 0 0 0 0 32)
-          (RETURNDATACOPY 0 0 32)
-          [[3]] (MLOAD 0)
-          (CALL 150000 0xaaaaaaaa00000000000000000000000000000005 0 0 0 0 32)
-          (RETURNDATACOPY 0 0 32)
-          [[4]] (MLOAD 0)
-          (CALL 150000 0xaaaaaaaa00000000000000000000000000000006 0 0 0 0 32)
-          (RETURNDATACOPY 0 0 32)
-          [[5]] (MLOAD 0)
-          (CALL 150000 0xaaaaaaaa00000000000000000000000000000007 0 0 0 0 32)
-          (RETURNDATACOPY 0 0 32)
-          [[6]] (MLOAD 0)
-          (CALL 150000 0xaaaaaaaa00000000000000000000000000000008 0 0 0 0 32)
-          (RETURNDATACOPY 0 0 32)
-          [[7]] (MLOAD 0)
+          (CALLDATACOPY 12 0 20)
+          [[0]] (EXTCODEHASH (MLOAD 0))
+          [[1]] (EXTCODESIZE (MLOAD 0))
         }
       nonce: '0'
-      storage: { # initialize storage values to 0x01
-        0: "0x01",
-        1: "0x01",
-        2: "0x01",
-        3: "0x01",
-        4: "0x01",
-        5: "0x01",
-        6: "0x01",
-        7: "0x01"
-        }
-    aaaaaaaa00000000000000000000000000000001:
-      balance: '1000000000000000000'
-      code: |
-        {
-          (MSTORE 0 (EXTCODEHASH 0x0000000000000000000000000000000000000001))
-          (RETURN 0 32)
-        }
-      nonce: '0'
-      storage: {}
-    aaaaaaaa00000000000000000000000000000002:
-      balance: '1000000000000000000'
-      code: |
-        {
-          (MSTORE 0 (EXTCODESIZE 0x0000000000000000000000000000000000000002))
-          (RETURN 0 32)
-        }
-      nonce: '0'
-      storage: {}
-    # account with random bytecode with code size = MAXCODESIZE - 1 = 24575
-    aaaaaaaa00000000000000000000000000000003:
-      balance: '1000000000000000000'
-      code: |
-        {
-          (MSTORE 0 (EXTCODESIZE 0x0000000000000000000000000000000000000003))
-          (RETURN 0 32)
-        }
-      nonce: '0'
-      storage: {}
-    aaaaaaaa00000000000000000000000000000004:
-      balance: '1000000000000000000'
-      code: |
-        {
-          (MSTORE 0 (EXTCODESIZE 0x0000000000000000000000000000000000000004))
-          (RETURN 0 32)
-        }
-      nonce: '0'
-      storage: {}
-    aaaaaaaa00000000000000000000000000000005:
-      balance: '1000000000000000000'
-      code: |
-        {
-          (MSTORE 0 (EXTCODESIZE 0x0000000000000000000000000000000000000005))
-          (RETURN 0 32)
-        }
-      nonce: '0'
-      storage: {}
-    aaaaaaaa00000000000000000000000000000006:
-      balance: '1000000000000000000'
-      code: |
-        {
-          (MSTORE 0 (EXTCODESIZE 0x0000000000000000000000000000000000000006))
-          (RETURN 0 32)
-        }
-      nonce: '0'
-      storage: {}
-    aaaaaaaa00000000000000000000000000000007:
-      balance: '1000000000000000000'
-      code: |
-        {
-          (MSTORE 0 (EXTCODESIZE 0x0000000000000000000000000000000000000007))
-          (RETURN 0 32)
-        }
-      nonce: '0'
-      storage: {}
-    aaaaaaaa00000000000000000000000000000008:
-      balance: '1000000000000000000'
-      code: |
-        {
-          (MSTORE 0 (EXTCODESIZE 0x0000000000000000000000000000000000000008))
-          (RETURN 0 32)
-        }
-      nonce: '0'
-      storage: {}
+      storage: { # set initial values to be overwritten
+        0: '0xab',
+        0: '0xab'}
     a94f5374fce5edbc8e2a8697c15331677e6ebf0b:
       balance: '1000000000000000000'
-      code: '0x00'
+      code: '0x'
       nonce: '0'
       storage: {}
   expect:
     - indexes:
-        data: !!int -1
+        data: !!int 0
+        gas:  !!int -1
+        value: !!int -1
+      network:
+        - '>Byzantium'
+      result:
+        095e7baea6a6c7c4c2dfeb977efac326af552d87:
+          balance: '1000000000000000001'
+          storage: {
+            0: '0xd7f7ece59a0c71c5d0e6fd4f298dea11bfbc05b6d5701c7ae9bd2a444d897c27',
+            1: '0x15'
+            }
+    - indexes:
+        data: !!int 1
+        gas:  !!int -1
+        value: !!int -1
+      network:
+        - '>Byzantium'
+      result:
+        095e7baea6a6c7c4c2dfeb977efac326af552d87:
+          balance: '1000000000000000001'
+          storage: {
+            0: '0x',
+            1: '0x'
+            }
+    - indexes:
+        data: !!int 2
+        gas:  !!int -1
+        value: !!int -1
+      network:
+        - '>Byzantium'
+      result:
+        095e7baea6a6c7c4c2dfeb977efac326af552d87:
+          balance: '1000000000000000001'
+          storage: {
+            0: '0x',
+            1: '0x'
+            }
+    - indexes:
+        data: !!int 3
+        gas:  !!int -1
+        value: !!int -1
+      network:
+        - '>Byzantium'
+      result:
+        095e7baea6a6c7c4c2dfeb977efac326af552d87:
+          balance: '1000000000000000001'
+          storage: {
+            0: '0x',
+            1: '0x'
+            }
+    - indexes:
+        data: !!int 4
+        gas:  !!int -1
+        value: !!int -1
+      network:
+        - '>Byzantium'
+      result:
+        095e7baea6a6c7c4c2dfeb977efac326af552d87:
+          balance: '1000000000000000001'
+          storage: {
+            0: '0x',
+            1: '0x'
+            }
+    - indexes:
+        data: !!int 5
+        gas:  !!int -1
+        value: !!int -1
+      network:
+        - '>Byzantium'
+      result:
+        095e7baea6a6c7c4c2dfeb977efac326af552d87:
+          balance: '1000000000000000001'
+          storage: {
+            0: '0x',
+            1: '0x'
+            }
+    - indexes:
+        data: !!int 6
+        gas:  !!int -1
+        value: !!int -1
+      network:
+        - '>Byzantium'
+      result:
+        095e7baea6a6c7c4c2dfeb977efac326af552d87:
+          balance: '1000000000000000001'
+          storage: {
+            0: '0x',
+            1: '0x'
+            }
+    - indexes:
+        data: !!int 7
+        gas:  !!int -1
+        value: !!int -1
+      network:
+        - '>Byzantium'
+      result:
+        095e7baea6a6c7c4c2dfeb977efac326af552d87:
+          balance: '1000000000000000001'
+          storage: {
+            0: '0x',
+            1: '0x'
+            }
+    - indexes:
+        data: !!int 8
         gas:  !!int -1
         value: !!int -1
       network:
@@ -137,19 +140,21 @@ extCodeHashPrecompiles:
       result:
         095e7baea6a6c7c4c2dfeb977efac326af552d87:
           balance: '1000000000000000001'
-          storage: { # codehash of precompiles must be 0
-            0: '0',
-            1: '0',
-            2: '0',
-            3: '0',
-            4: '0',
-            5: '0',
-            6: '0',
-            7: '0'
-          }
+          storage: {
+            0: '0x',
+            1: '0x'
+            }
   transaction:
     data:
-    - ''
+    - '0x095e7baea6a6c7c4c2dfeb977efac326af552d87'
+    - '0x0000000000000000000000000000000000000001'
+    - '0x0000000000000000000000000000000000000002'
+    - '0x0000000000000000000000000000000000000003'
+    - '0x0000000000000000000000000000000000000004'
+    - '0x0000000000000000000000000000000000000005'
+    - '0x0000000000000000000000000000000000000006'
+    - '0x0000000000000000000000000000000000000007'
+    - '0x0000000000000000000000000000000000000008'
     gasLimit:
     - '400000'
     gasPrice: '1'