extcodehash for deleted account in state, extcodehash for deleted account created in same transaction

5 files changed, 421 insertions, 3 deletions

diff --git a/src/GeneralStateTestsFiller/stExtCodeHash/extCodeHashDeletedAccount1Filler.yml b/src/GeneralStateTestsFiller/stExtCodeHash/extCodeHashDeletedAccount1Filler.yml
new file mode 100644
index 000000000..61cec84fd
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stExtCodeHash/extCodeHashDeletedAccount1Filler.yml
@@ -0,0 +1,91 @@
+# EXTCODEHASH to a deleted account
+---
+extCodeHashDeletedAccount1:
+  _info:
+    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
+      - Run selfdestruct on A
+      - stores Account A hash to 2.
+  env:
+    currentCoinbase: 2adc25665018aa1fe0e6bc666dac8fc2697ff9ba
+    currentDifficulty: '0x20000'
+    currentGasLimit: "1000000"
+    currentNumber: "1"
+    currentTimestamp: "1000"
+    previousHash: 5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6
+  pre:
+    095e7baea6a6c7c4c2dfeb977efac326af552d87:
+      balance: '1000000000000000000'
+      code: |
+        {
+          (CALL 150000 0xbbbbbbbb00000000000000000000000000000000 0 0 0 0 32)
+        }
+      nonce: '0'
+      storage: {}
+    # Account A: already exists in the state
+    # contains selfdestruct code
+    aaaaaaaa00000000000000000000000000000000:
+      balance: '1000000000000000000'
+      code: |
+        {
+          (SELFDESTRUCT (BALANCE 0xdeadbeef00000000000000000000000000000000))
+        }
+      nonce: '0'
+      storage: {}
+    # Account B
+    # Stores Account A hash to [1]
+    # Run selfdestruct on A
+    # Stores Account A hash to [2]
+    bbbbbbbb00000000000000000000000000000000:
+      balance: '1000000000000000000'
+      code: |
+        {
+          (MSTORE 0 (EXTCODEHASH 0xaaaaaaaa00000000000000000000000000000000))
+          [[1]] (MLOAD 0)
+          
+          (CALL 150000 0xaaaaaaaa00000000000000000000000000000000 0 0 0 0 32)
+
+          (MSTORE 32 (EXTCODEHASH 0xaaaaaaaa00000000000000000000000000000000))
+          [[2]] (MLOAD 32)
+        }
+      nonce: '0'
+      storage: {}
+    a94f5374fce5edbc8e2a8697c15331677e6ebf0b:
+      balance: '1000000000000000000'
+      code: '0x00'
+      nonce: '0'
+      storage: {}
+  expect:
+    - indexes:
+        data: !!int -1
+        gas:  !!int -1
+        value: !!int -1
+      network:
+        - '>=Constantinople'
+      result:
+        095e7baea6a6c7c4c2dfeb977efac326af552d87:
+          balance: '1000000000000000001'
+          storage: {
+         
+          }
+        aaaaaaaa00000000000000000000000000000000:
+          shouldnotexist: '1'
+        bbbbbbbb00000000000000000000000000000000:
+          balance: '1000000000000000000'
+          storage: {
+            1: '0x9dff858fbcae72e5644a465fa893f46deb3e03b9cd5a8b531109cd577f7fb293',
+            2: '0x9dff858fbcae72e5644a465fa893f46deb3e03b9cd5a8b531109cd577f7fb293'
+          }
+  transaction:
+    data:
+    - ''
+    gasLimit:
+    - '400000'
+    gasPrice: '1'
+    nonce: '0'
+    secretKey: 45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8
+    to: 095e7baea6a6c7c4c2dfeb977efac326af552d87
+    value:
+    - '1'
diff --git a/src/GeneralStateTestsFiller/stExtCodeHash/extCodeHashDeletedAccount2Filler.yml b/src/GeneralStateTestsFiller/stExtCodeHash/extCodeHashDeletedAccount2Filler.yml
new file mode 100644
index 000000000..35b102551
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stExtCodeHash/extCodeHashDeletedAccount2Filler.yml
@@ -0,0 +1,88 @@
+# EXTCODEHASH to a deleted account
+---
+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 C runs self destruct on A
+      Call to Account B stores Account A hash to 2
+  env:
+    currentCoinbase: 2adc25665018aa1fe0e6bc666dac8fc2697ff9ba
+    currentDifficulty: '0x20000'
+    currentGasLimit: "1000000"
+    currentNumber: "1"
+    currentTimestamp: "1000"
+    previousHash: 5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6
+  pre:
+    095e7baea6a6c7c4c2dfeb977efac326af552d87:
+      balance: '1000000000000000000'
+      code: |
+        {
+          (MSTORE 0 0x01)
+          (CALL 150000 0xbbbbbbbb00000000000000000000000000000000 0 0 32 0 32)
+          
+          (CALL 150000 0xaaaaaaaa00000000000000000000000000000000 0 0 0  0 32)
+          
+          (MSTORE 32 0x02)
+          (CALL 150000 0xbbbbbbbb00000000000000000000000000000000 0 32 32 0 32)
+        }
+      nonce: '0'
+      storage: {}
+    # Acount A: already exists in the state
+    # contains selfdestruct code
+    aaaaaaaa00000000000000000000000000000000:
+      balance: '1000000000000000000'
+      code: |
+        {
+          (SELFDESTRUCT (BALANCE 0xdeadbeef00000000000000000000000000000000))
+        }
+      nonce: '0'
+      storage: {}
+    # Account B
+    # Receives storage key as call data
+    bbbbbbbb00000000000000000000000000000000:
+      balance: '1000000000000000000'
+      code: |
+        {
+          (CALLDATACOPY 0 0 32)
+          (SSTORE (MLOAD 0) (EXTCODEHASH 0xaaaaaaaa00000000000000000000000000000000))
+        }
+      nonce: '0'
+      storage: {}
+    a94f5374fce5edbc8e2a8697c15331677e6ebf0b:
+      balance: '1000000000000000000'
+      code: '0x00'
+      nonce: '0'
+      storage: {}
+  expect:
+    - indexes:
+        data: !!int -1
+        gas:  !!int -1
+        value: !!int -1
+      network:
+        - '>=Constantinople'
+      result:
+        095e7baea6a6c7c4c2dfeb977efac326af552d87:
+          balance: '1000000000000000001'
+          storage: {}
+        aaaaaaaa00000000000000000000000000000000:
+          shouldnotexist: '1'
+        bbbbbbbb00000000000000000000000000000000:
+          balance: '1000000000000000000'
+          storage: {
+            1: '0x9dff858fbcae72e5644a465fa893f46deb3e03b9cd5a8b531109cd577f7fb293',
+            2: '0x9dff858fbcae72e5644a465fa893f46deb3e03b9cd5a8b531109cd577f7fb293'
+          }
+  transaction:
+    data:
+    - ''
+    gasLimit:
+    - '400000'
+    gasPrice: '1'
+    nonce: '0'
+    secretKey: 45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8
+    to: 095e7baea6a6c7c4c2dfeb977efac326af552d87
+    value:
+    - '1'
+
diff --git a/src/GeneralStateTestsFiller/stExtCodeHash/extCodeHashDeletedAccount3Filler.yml b/src/GeneralStateTestsFiller/stExtCodeHash/extCodeHashDeletedAccount3Filler.yml
new file mode 100644
index 000000000..13c16efcb
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stExtCodeHash/extCodeHashDeletedAccount3Filler.yml
@@ -0,0 +1,107 @@
+# EXTCODEHASH to a deleted account
+---
+extCodeHashDeletedAccount3:
+  _info:
+    comment: |
+      3) Call creates Account A (0x95ab1c33798981918da6d27056f70376674878d2)
+      Call to Account B do the following:
+      - stores Account A hash to 1
+      - Run selfdestruct on A
+      - stores Account A hash to 2
+  env:
+    currentCoinbase: 2adc25665018aa1fe0e6bc666dac8fc2697ff9ba
+    currentDifficulty: '0x20000'
+    currentGasLimit: "1000000"
+    currentNumber: "1"
+    currentTimestamp: "1000"
+    previousHash: 5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6
+  pre:
+    095e7baea6a6c7c4c2dfeb977efac326af552d87:
+      balance: '1000000000000000000'
+      code: |
+        {
+          ;; Creates Account A using code in existing account C
+          (MSTORE 0
+            (CREATE2 0 0
+              (lll
+              {
+                (MSTORE 0 (EXTCODESIZE 0xcccccccc00000000000000000000000000000000))
+                (EXTCODECOPY 0xcccccccc00000000000000000000000000000000
+                             32
+                             0
+                             (MLOAD 0))
+                (RETURN 32 (MLOAD 0))
+              }
+              0)
+            0))
+
+          ;; Stores new Account A address
+          [[0]] (MLOAD 0)
+
+          ;; Call Account B:
+          (CALL 150000 0xbbbbbbbb00000000000000000000000000000000 0 0 0 0 32)
+          (STOP)
+        }
+      nonce: '0'
+      storage: {}
+    bbbbbbbb00000000000000000000000000000000:
+      balance: '1000000000000000000'
+      code: |
+        {
+          ;; Stores Account A hash to 1
+          [[1]] (EXTCODEHASH 0x95ab1c33798981918da6d27056f70376674878d2)
+
+          ;; Run self destruct on Account A
+          (CALL 150000 0x95ab1c33798981918da6d27056f70376674878d2 0 0  0  0 32)
+
+          ;; Stores Account A hash to 2
+          [[2]] (EXTCODEHASH 0x95ab1c33798981918da6d27056f70376674878d2)
+        }
+      nonce: '0'
+      storage: {}
+    cccccccc00000000000000000000000000000000:
+      balance: '0'
+      code: |
+        {
+          (SELFDESTRUCT 0xbbbbbbbb00000000000000000000000000000000)
+        }
+      nonce: '0'
+      storage: {}
+    a94f5374fce5edbc8e2a8697c15331677e6ebf0b:
+      balance: '1000000000000000000'
+      code: '0x00'
+      nonce: '0'
+      storage: {}
+  expect:
+    - indexes:
+        data: !!int -1
+        gas:  !!int -1
+        value: !!int -1
+      network:
+        - '>=Constantinople'
+      result:
+        095e7baea6a6c7c4c2dfeb977efac326af552d87:
+          balance: '1000000000000000001'
+          storage: {
+            0: '0x95ab1c33798981918da6d27056f70376674878d2'
+            }
+        bbbbbbbb00000000000000000000000000000000:
+          balance: '1000000000000000000'
+          storage: {
+            1: '0xb05d47e0911e4f67786f4cdc582608ee5f731e845a1e95ddc99759e2b3da81bf',
+            2: '0xb05d47e0911e4f67786f4cdc582608ee5f731e845a1e95ddc99759e2b3da81bf'
+          }
+        95ab1c33798981918da6d27056f70376674878d2:
+          shouldnotexist: '1'
+  transaction:
+    data:
+    - ''
+    gasLimit:
+    - '400000'
+    gasPrice: '1'
+    nonce: '0'
+    secretKey: 45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8
+    to: 095e7baea6a6c7c4c2dfeb977efac326af552d87
+    value:
+    - '1'
+    
diff --git a/src/GeneralStateTestsFiller/stExtCodeHash/extCodeHashDeletedAccount4Filler.yml b/src/GeneralStateTestsFiller/stExtCodeHash/extCodeHashDeletedAccount4Filler.yml
new file mode 100644
index 000000000..c9d420289
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stExtCodeHash/extCodeHashDeletedAccount4Filler.yml
@@ -0,0 +1,125 @@
+# EXTCODEHASH to a deleted account
+---
+extCodeHashDeletedAccount4:
+  _info:
+    comment: |
+      4) Call creates Account A
+      Call to Account B stores Account A hash to 1
+      Call to Account C runs self destruct on A
+      Call to Account B stores Account a hash to 2
+  env:
+    currentCoinbase: 2adc25665018aa1fe0e6bc666dac8fc2697ff9ba
+    currentDifficulty: '0x20000'
+    currentGasLimit: "1000000"
+    currentNumber: "1"
+    currentTimestamp: "1000"
+    previousHash: 5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6
+  pre:
+    095e7baea6a6c7c4c2dfeb977efac326af552d87:
+      balance: '1000000000000000000'
+      code: |
+        {
+          ;; Creates Account A using code in existing account D
+          (MSTORE 0
+            (CREATE2 0 0
+              (lll
+              {
+                (MSTORE 0 (EXTCODESIZE 0xdddddddd00000000000000000000000000000000))
+                (EXTCODECOPY 0xdddddddd00000000000000000000000000000000
+                             32
+                             0
+                             (MLOAD 0))
+                (RETURN 32 (MLOAD 0))
+              }
+              0)
+            0))
+
+          ;; Stores new Account A address
+          [[0]] (MLOAD 0)
+
+          ;; Call Account B:
+          ;; Stores Account A hash to 1            
+          (MSTORE 32 0x01)
+          (CALL 150000 0xbbbbbbbb00000000000000000000000000000000 0 32 32 0 32)
+
+          ;; Call Account C:
+          ;; Runs self Destructs on Account A
+          (CALL 150000 0xcccccccc00000000000000000000000000000000 0 0  0  0 32)
+
+          ;; Call Account B:
+          ;; Stores Account B hash to 2
+          (MSTORE 64 0x02)
+          (CALL 150000 0xbbbbbbbb00000000000000000000000000000000 0 64 32 0 32)
+          
+          (STOP)
+        }
+      nonce: '0'
+      storage: {}
+    bbbbbbbb00000000000000000000000000000000:
+      balance: '1000000000000000000'
+      code: |
+        {
+          ;; get key from call data
+          (CALLDATACOPY 0 0 32)
+          
+          ;; store Account A code hash
+          [[(MLOAD 0)]] (EXTCODEHASH 0xe713449c212d891357cc2966816b1d528cfb59e0)
+
+        }
+      nonce: '0'
+      storage: {}
+    cccccccc00000000000000000000000000000000:
+      balance: '0'
+      code: |
+        {
+          ;; Run self destruct on Account A
+          (CALL 150000 0xe713449c212d891357cc2966816b1d528cfb59e0 0 0  0  0 32)
+        }
+      nonce: '0'
+      storage: {}
+    dddddddd00000000000000000000000000000000:
+      balance: '0'
+      code: |
+        {
+          (SELFDESTRUCT 0xbbbbbbbb00000000000000000000000000000000)
+        }
+      nonce: '0'
+      storage: {}
+    a94f5374fce5edbc8e2a8697c15331677e6ebf0b:
+      balance: '1000000000000000000'
+      code: ''
+      nonce: '0'
+      storage: {}
+  expect:
+    - indexes:
+        data: !!int -1
+        gas:  !!int -1
+        value: !!int -1
+      network:
+        - '>=Constantinople'
+      result:
+        095e7baea6a6c7c4c2dfeb977efac326af552d87:
+          balance: '1000000000000000001'
+          storage: {
+            0: '0xe713449c212d891357cc2966816b1d528cfb59e0'
+            }
+        bbbbbbbb00000000000000000000000000000000:
+          balance: '1000000000000000000'
+          storage: {
+            1: '0xb05d47e0911e4f67786f4cdc582608ee5f731e845a1e95ddc99759e2b3da81bf',
+            2: '0xb05d47e0911e4f67786f4cdc582608ee5f731e845a1e95ddc99759e2b3da81bf'
+          }
+        e713449c212d891357cc2966816b1d528cfb59e0:
+          shouldnotexist: '1'
+  transaction:
+    data:
+    - ''
+    gasLimit:
+    - '400000'
+    gasPrice: '1'
+    nonce: '0'
+    secretKey: 45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8
+    to: 095e7baea6a6c7c4c2dfeb977efac326af552d87
+    value:
+    - '1'
+    
diff --git a/src/GeneralStateTestsFiller/stExtCodeHash/extCodeHashDeletedAccountFiller.yml b/src/GeneralStateTestsFiller/stExtCodeHash/extCodeHashDeletedAccountFiller.yml
index 2e63f88bd..cd13cbb39 100644
--- a/src/GeneralStateTestsFiller/stExtCodeHash/extCodeHashDeletedAccountFiller.yml
+++ b/src/GeneralStateTestsFiller/stExtCodeHash/extCodeHashDeletedAccountFiller.yml
@@ -1,6 +1,13 @@
-# EXTCODEHASH to a deleted account
+# EXTCODEHASH to a deleted account same transaction
 ---
 extCodeHashDeletedAccount:
+  _info:
+    comment: |
+      Get account A (deadbeef00000000000000000000000000000000) code hash
+      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
+      at the end of transaction during state finalization stage.
   env:
     currentCoinbase: 2adc25665018aa1fe0e6bc666dac8fc2697ff9ba
     currentDifficulty: '0x20000'
@@ -54,13 +61,13 @@ extCodeHashDeletedAccount:
         gas:  !!int -1
         value: !!int -1
       network:
-        - '>Byzantium'
+        - '>=Constantinople'
       result:
         095e7baea6a6c7c4c2dfeb977efac326af552d87:
           balance: '1000000000000000001'
           storage: {
             0: '0x9dff858fbcae72e5644a465fa893f46deb3e03b9cd5a8b531109cd577f7fb293',
-            1: '0'
+            1: '0x9dff858fbcae72e5644a465fa893f46deb3e03b9cd5a8b531109cd577f7fb293'
           }
         deadbeef00000000000000000000000000000000:
           shouldnotexist: '1'