add checks for extcodecopy and extcodesize

5 files changed, 143 insertions, 36 deletions

diff --git a/src/GeneralStateTestsFiller/stExtCodeHash/extCodeHashDeletedAccount1Filler.yml b/src/GeneralStateTestsFiller/stExtCodeHash/extCodeHashDeletedAccount1Filler.yml
index 61cec84fd..f506d8362 100644
--- a/src/GeneralStateTestsFiller/stExtCodeHash/extCodeHashDeletedAccount1Filler.yml
+++ b/src/GeneralStateTestsFiller/stExtCodeHash/extCodeHashDeletedAccount1Filler.yml
@@ -5,9 +5,13 @@ extCodeHashDeletedAccount1:
     comment: |
       1) Account A already exists in the state and contains code
       Call to Account B do the following:
-      - stores Account A hash to 1
+      - stores Account A code hash to 1
+      - stores Account A code size to 2
+      - stores Account A code to 3
       - Run selfdestruct on A
-      - stores Account A hash to 2.
+      - stores Account A code hash to 4
+      - stores Account A code size to 5
+      - stores Account A code to 6
   env:
     currentCoinbase: 2adc25665018aa1fe0e6bc666dac8fc2697ff9ba
     currentDifficulty: '0x20000'
@@ -35,20 +39,24 @@ extCodeHashDeletedAccount1:
       nonce: '0'
       storage: {}
     # Account B
-    # Stores Account A hash to [1]
+    # Stores Account A code hash to 1, code size to 2, code to 3
     # Run selfdestruct on A
-    # Stores Account A hash to [2]
+    # Stores Account A code hash to 4, code size to 5, code to 6
     bbbbbbbb00000000000000000000000000000000:
       balance: '1000000000000000000'
       code: |
         {
-          (MSTORE 0 (EXTCODEHASH 0xaaaaaaaa00000000000000000000000000000000))
-          [[1]] (MLOAD 0)
+          [[1]] (EXTCODEHASH 0xaaaaaaaa00000000000000000000000000000000)
+          [[2]] (EXTCODESIZE 0xaaaaaaaa00000000000000000000000000000000)
+          (EXTCODECOPY 0xaaaaaaaa00000000000000000000000000000000 0 0 (SLOAD 2))
+          [[3]] (MLOAD 0)
           
           (CALL 150000 0xaaaaaaaa00000000000000000000000000000000 0 0 0 0 32)
 
-          (MSTORE 32 (EXTCODEHASH 0xaaaaaaaa00000000000000000000000000000000))
-          [[2]] (MLOAD 32)
+          [[4]] (EXTCODEHASH 0xaaaaaaaa00000000000000000000000000000000)
+          [[5]] (EXTCODESIZE 0xaaaaaaaa00000000000000000000000000000000)
+          (EXTCODECOPY 0xaaaaaaaa00000000000000000000000000000000 32 0 (SLOAD 5))
+          ;;[[6]] (MLOAD 32)  ;; <--- This is failing
         }
       nonce: '0'
       storage: {}
@@ -76,7 +84,10 @@ extCodeHashDeletedAccount1:
           balance: '1000000000000000000'
           storage: {
             1: '0x9dff858fbcae72e5644a465fa893f46deb3e03b9cd5a8b531109cd577f7fb293',
-            2: '0x9dff858fbcae72e5644a465fa893f46deb3e03b9cd5a8b531109cd577f7fb293'
+            2: '0x17',
+            3: '0x73deadbeef0000000000000000000000000000000031ff000000000000000000',
+            4: '0x9dff858fbcae72e5644a465fa893f46deb3e03b9cd5a8b531109cd577f7fb293',
+            5: '0X17',
           }
   transaction:
     data:
diff --git a/src/GeneralStateTestsFiller/stExtCodeHash/extCodeHashDeletedAccount2Filler.yml b/src/GeneralStateTestsFiller/stExtCodeHash/extCodeHashDeletedAccount2Filler.yml
index 35b102551..aa2a0d0a6 100644
--- a/src/GeneralStateTestsFiller/stExtCodeHash/extCodeHashDeletedAccount2Filler.yml
+++ b/src/GeneralStateTestsFiller/stExtCodeHash/extCodeHashDeletedAccount2Filler.yml
@@ -4,9 +4,9 @@ extCodeHashDeletedAccount2:
   _info:
     comment: |
       2) Account A already exists in the state and contains code
-      Call to Account B stores Account A hash to 1
+      Call to Account B stores Account A code hash to 1, code size to 2, code to 3
       Call to Account C runs self destruct on A
-      Call to Account B stores Account A hash to 2
+      Call to Account B stores Account A code hash to 4, code size to 5, code to 6
   env:
     currentCoinbase: 2adc25665018aa1fe0e6bc666dac8fc2697ff9ba
     currentDifficulty: '0x20000'
@@ -24,7 +24,7 @@ extCodeHashDeletedAccount2:
           
           (CALL 150000 0xaaaaaaaa00000000000000000000000000000000 0 0 0  0 32)
           
-          (MSTORE 32 0x02)
+          (MSTORE 32 0x04)
           (CALL 150000 0xbbbbbbbb00000000000000000000000000000000 0 32 32 0 32)
         }
       nonce: '0'
@@ -47,6 +47,15 @@ extCodeHashDeletedAccount2:
         {
           (CALLDATACOPY 0 0 32)
           (SSTORE (MLOAD 0) (EXTCODEHASH 0xaaaaaaaa00000000000000000000000000000000))
+
+          (MSTORE 32 (EXTCODESIZE 0xaaaaaaaa00000000000000000000000000000000))
+          
+          (MSTORE 0 (ADD (MLOAD 0) 1))
+          (SSTORE (MLOAD 0) (MLOAD 32))
+
+          (MSTORE 0 (ADD (MLOAD 0) 1))
+          (EXTCODECOPY 0xaaaaaaaa00000000000000000000000000000000 64 0 (MLOAD 32))
+          (SSTORE (MLOAD 0) (MLOAD 64))
         }
       nonce: '0'
       storage: {}
@@ -72,7 +81,11 @@ extCodeHashDeletedAccount2:
           balance: '1000000000000000000'
           storage: {
             1: '0x9dff858fbcae72e5644a465fa893f46deb3e03b9cd5a8b531109cd577f7fb293',
-            2: '0x9dff858fbcae72e5644a465fa893f46deb3e03b9cd5a8b531109cd577f7fb293'
+            2: '0x17',
+            3: '0x73deadbeef0000000000000000000000000000000031ff000000000000000000',
+            4: '0x9dff858fbcae72e5644a465fa893f46deb3e03b9cd5a8b531109cd577f7fb293',
+            5: '0x17',
+            6: '0x73deadbeef0000000000000000000000000000000031ff000000000000000000'
           }
   transaction:
     data:
diff --git a/src/GeneralStateTestsFiller/stExtCodeHash/extCodeHashDeletedAccount3Filler.yml b/src/GeneralStateTestsFiller/stExtCodeHash/extCodeHashDeletedAccount3Filler.yml
index 13c16efcb..2e1480d12 100644
--- a/src/GeneralStateTestsFiller/stExtCodeHash/extCodeHashDeletedAccount3Filler.yml
+++ b/src/GeneralStateTestsFiller/stExtCodeHash/extCodeHashDeletedAccount3Filler.yml
@@ -5,9 +5,13 @@ extCodeHashDeletedAccount3:
     comment: |
       3) Call creates Account A (0x95ab1c33798981918da6d27056f70376674878d2)
       Call to Account B do the following:
-      - stores Account A hash to 1
+      - stores Account A code hash to 1
+      - stores Account A code size to 2
+      - stores Account A code to 3
       - Run selfdestruct on A
-      - stores Account A hash to 2
+      - stores Account A code hash to 4
+      - stores Account A code size to 5
+      - stores Account A code to 6
   env:
     currentCoinbase: 2adc25665018aa1fe0e6bc666dac8fc2697ff9ba
     currentDifficulty: '0x20000'
@@ -50,12 +54,18 @@ extCodeHashDeletedAccount3:
         {
           ;; Stores Account A hash to 1
           [[1]] (EXTCODEHASH 0x95ab1c33798981918da6d27056f70376674878d2)
-
+          [[2]] (EXTCODESIZE 0x95ab1c33798981918da6d27056f70376674878d2)
+          
+          (EXTCODECOPY 0x95ab1c33798981918da6d27056f70376674878d2 0 0 (SLOAD 2))
+          [[3]] (MLOAD 0)
           ;; Run self destruct on Account A
           (CALL 150000 0x95ab1c33798981918da6d27056f70376674878d2 0 0  0  0 32)
 
           ;; Stores Account A hash to 2
-          [[2]] (EXTCODEHASH 0x95ab1c33798981918da6d27056f70376674878d2)
+          [[4]] (EXTCODEHASH 0x95ab1c33798981918da6d27056f70376674878d2)
+          [[5]] (EXTCODESIZE 0x95ab1c33798981918da6d27056f70376674878d2)
+          (EXTCODECOPY 0x95ab1c33798981918da6d27056f70376674878d2 32 0 (SLOAD 5))
+          [[6]] (MLOAD 32)
         }
       nonce: '0'
       storage: {}
@@ -89,7 +99,11 @@ extCodeHashDeletedAccount3:
           balance: '1000000000000000000'
           storage: {
             1: '0xb05d47e0911e4f67786f4cdc582608ee5f731e845a1e95ddc99759e2b3da81bf',
-            2: '0xb05d47e0911e4f67786f4cdc582608ee5f731e845a1e95ddc99759e2b3da81bf'
+            2: '0x16',
+            3: '0x73bbbbbbbb00000000000000000000000000000000ff00000000000000000000',
+            4: '0xb05d47e0911e4f67786f4cdc582608ee5f731e845a1e95ddc99759e2b3da81bf',
+            5: '0X16',
+            6: '0x73bbbbbbbb00000000000000000000000000000000ff00000000000000000000',
           }
         95ab1c33798981918da6d27056f70376674878d2:
           shouldnotexist: '1'
diff --git a/src/GeneralStateTestsFiller/stExtCodeHash/extCodeHashDeletedAccount4Filler.yml b/src/GeneralStateTestsFiller/stExtCodeHash/extCodeHashDeletedAccount4Filler.yml
index c9d420289..2ded64eef 100644
--- a/src/GeneralStateTestsFiller/stExtCodeHash/extCodeHashDeletedAccount4Filler.yml
+++ b/src/GeneralStateTestsFiller/stExtCodeHash/extCodeHashDeletedAccount4Filler.yml
@@ -38,7 +38,7 @@ extCodeHashDeletedAccount4:
           [[0]] (MLOAD 0)
 
           ;; Call Account B:
-          ;; Stores Account A hash to 1            
+          ;; Stores Account A code hash to 1, code size to 2, code to 3
           (MSTORE 32 0x01)
           (CALL 150000 0xbbbbbbbb00000000000000000000000000000000 0 32 32 0 32)
 
@@ -47,8 +47,8 @@ extCodeHashDeletedAccount4:
           (CALL 150000 0xcccccccc00000000000000000000000000000000 0 0  0  0 32)
 
           ;; Call Account B:
-          ;; Stores Account B hash to 2
-          (MSTORE 64 0x02)
+          ;; Stores Account B code hash to 4, code size to 5, code to 6
+          (MSTORE 64 0x04)
           (CALL 150000 0xbbbbbbbb00000000000000000000000000000000 0 64 32 0 32)
           
           (STOP)
@@ -64,7 +64,13 @@ extCodeHashDeletedAccount4:
           
           ;; store Account A code hash
           [[(MLOAD 0)]] (EXTCODEHASH 0xe713449c212d891357cc2966816b1d528cfb59e0)
+          
+          (MSTORE 0 (ADD (MLOAD 0) 1))  ;; increments storage key
+          [[(MLOAD 0)]] (EXTCODESIZE 0xe713449c212d891357cc2966816b1d528cfb59e0)
 
+          (EXTCODECOPY 0xe713449c212d891357cc2966816b1d528cfb59e0 32 0 (SLOAD (MLOAD 0)))
+          (MSTORE 0 (ADD (MLOAD 0) 1))  ;; increments storage key
+          [[(MLOAD 0)]] (MLOAD 32)
         }
       nonce: '0'
       storage: {}
@@ -107,7 +113,11 @@ extCodeHashDeletedAccount4:
           balance: '1000000000000000000'
           storage: {
             1: '0xb05d47e0911e4f67786f4cdc582608ee5f731e845a1e95ddc99759e2b3da81bf',
-            2: '0xb05d47e0911e4f67786f4cdc582608ee5f731e845a1e95ddc99759e2b3da81bf'
+            2: '0x16',
+            3: '0x73bbbbbbbb00000000000000000000000000000000ff00000000000000000000',
+            4: '0xb05d47e0911e4f67786f4cdc582608ee5f731e845a1e95ddc99759e2b3da81bf',
+            5: '0x16',
+            6: '0x73bbbbbbbb00000000000000000000000000000000ff00000000000000000000'
           }
         e713449c212d891357cc2966816b1d528cfb59e0:
           shouldnotexist: '1'
diff --git a/src/GeneralStateTestsFiller/stExtCodeHash/extCodeHashDeletedAccountFiller.yml b/src/GeneralStateTestsFiller/stExtCodeHash/extCodeHashDeletedAccountFiller.yml
index cd13cbb39..74e6f0f8e 100644
--- a/src/GeneralStateTestsFiller/stExtCodeHash/extCodeHashDeletedAccountFiller.yml
+++ b/src/GeneralStateTestsFiller/stExtCodeHash/extCodeHashDeletedAccountFiller.yml
@@ -3,10 +3,10 @@
 extCodeHashDeletedAccount:
   _info:
     comment: |
-      Get account A (deadbeef00000000000000000000000000000000) code hash
+      Get account A (aaaaaaaa00000000000000000000000000000000) code hash, code size, and code
       Calls Account A's code which causes self destruction of A
-      Get account A codehash
-      It is still getting the same codehash because selfdestruct is performed
+      Get account A codehash, code size and code
+      It is still getting the same values because selfdestruct is performed
       at the end of transaction during state finalization stage.
   env:
     currentCoinbase: 2adc25665018aa1fe0e6bc666dac8fc2697ff9ba
@@ -21,31 +21,84 @@ extCodeHashDeletedAccount:
       balance: '1000000000000000000'
       code: |   
         {
-          (CALL 150000 0xaaaaaaaa00000000000000000000000000000000 0 0 0 0 32)
+          ;; Gets external code hash, stores it in [[0]]
+          (CALL 150000 0xdeadbeef00000000000000000000000000000000 0 0 0 0 32)
           (RETURNDATACOPY 0 0 32)
           [[0]] (MLOAD 0)
-          
-          (CALL 150000 0xdeadbeef00000000000000000000000000000000 0 0 0 0 32)
-          
-          (CALL 150000 0xaaaaaaaa00000000000000000000000000000000 0 0 0 0 32)
+
+          ;; Gets external code size, stores it in [[1]]
+          (CALL 150000 0xdeadbeef00000000000000000000000000000001 0 0 0 0 32)
           (RETURNDATACOPY 0 0 32)
           [[1]] (MLOAD 0)
+
+          ;; Gets external code, stores it in [[2]]
+          (CALL 150000 0xdeadbeef00000000000000000000000000000002 0 0 0 0 32)
+          (RETURNDATACOPY 0 0 32)
+          [[2]] (MLOAD 0)
+
+
+          ;; Call Account A (self destructs)
+          (CALL 150000 0xaaaaaaaa00000000000000000000000000000000 0 0 0 0 32)
+
+
+          ;; Gets external code hash, stores it in [[3]]
+          (CALL 150000 0xdeadbeef00000000000000000000000000000000 0 0 0 0 32)
+          (RETURNDATACOPY 0 0 32)
+          [[3]] (MLOAD 0)
+
+          ;; Gets external code size, stores it in [[4]]
+          (CALL 150000 0xdeadbeef00000000000000000000000000000001 0 0 0 0 32)
+          (RETURNDATACOPY 0 0 32)
+          [[4]] (MLOAD 0)
+
+          ;; Gets external code, stores it in [[5]]
+          (CALL 150000 0xdeadbeef00000000000000000000000000000002 0 0 0 0 32)
+          (RETURNDATACOPY 0 0 32)
+          [[5]] (MLOAD 0)
+
+        }
+      nonce: '0'
+      storage: {}
+    aaaaaaaa00000000000000000000000000000000:
+      balance: '1000000000000000000'
+      code: |
+        {
+          (SELFDESTRUCT 0xdeadbeef00000000000000000000000000000000)
         }
       nonce: '0'
       storage: {}
+    # Returns External Code Hash
     deadbeef00000000000000000000000000000000:
       balance: '1000000000000000000'
       code: |
         {
-          (SELFDESTRUCT (BALANCE 0xdeadbeef00000000000000000000000000000000))
+          (MSTORE 0 (EXTCODEHASH 0xaaaaaaaa00000000000000000000000000000000))
+          (RETURN 0 32)
         }
       nonce: '0'
       storage: {}
-    aaaaaaaa00000000000000000000000000000000:
+    # Returns External Code Size
+    deadbeef00000000000000000000000000000001:
+      balance: '1000000000000000000'
+      code: |
+        {
+          (MSTORE 0 (EXTCODESIZE 0xaaaaaaaa00000000000000000000000000000000))
+          (RETURN 0 32)
+        }
+      nonce: '0'
+      storage: {}
+    # Returns the first 32 bytes of the External Code
+    deadbeef00000000000000000000000000000002:
       balance: '1000000000000000000'
       code: |
         {
-          (MSTORE 0 (EXTCODEHASH 0xdeadbeef00000000000000000000000000000000))
+          ;;(MSTORE 0 (EXTCODESIZE 0xaaaaaaaa00000000000000000000000000000000))
+          ;;(EXTCODECOPY 0xaaaaaaaa00000000000000000000000000000000
+            
+          (EXTCODECOPY 0xaaaaaaaa00000000000000000000000000000000
+                       0
+                       0
+                      (EXTCODESIZE 0xaaaaaaaa00000000000000000000000000000000))
           (RETURN 0 32)
         }
       nonce: '0'
@@ -66,11 +119,17 @@ extCodeHashDeletedAccount:
         095e7baea6a6c7c4c2dfeb977efac326af552d87:
           balance: '1000000000000000001'
           storage: {
-            0: '0x9dff858fbcae72e5644a465fa893f46deb3e03b9cd5a8b531109cd577f7fb293',
-            1: '0x9dff858fbcae72e5644a465fa893f46deb3e03b9cd5a8b531109cd577f7fb293'
+            0: '0x4f8f2f49aec2d92b196659c9d1dc920d271503707a57472bd99eca81b9187f0f',
+            1: '0x16',
+            2: '0x73deadbeef00000000000000000000000000000000ff00000000000000000000',
+            3: '0x4f8f2f49aec2d92b196659c9d1dc920d271503707a57472bd99eca81b9187f0f',
+            4: '0x16',
+            5: '0x73deadbeef00000000000000000000000000000000ff00000000000000000000'
           }
-        deadbeef00000000000000000000000000000000:
+        aaaaaaaa00000000000000000000000000000000:
           shouldnotexist: '1'
+        deadbeef00000000000000000000000000000000:
+          balance: '2000000000000000000'
   transaction:
     data:
     - ''