Merge commit 'c1cafb56d5da57a44f1d766c5299f11664b93921' into poc-9

4 files changed, 189 insertions, 50 deletions

diff --git a/tests/files/StateTests/stInitCodeTest.json b/tests/files/StateTests/stInitCodeTest.json
index 18e42b86c..83a13f4fc 100644
--- a/tests/files/StateTests/stInitCodeTest.json
+++ b/tests/files/StateTests/stInitCodeTest.json
@@ -934,21 +934,21 @@
                 }
             },
             "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "22396",
+                "balance" : "11198",
                 "code" : "0x",
                 "nonce" : "0",
                 "storage" : {
                 }
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "77603",
+                "balance" : "88801",
                 "code" : "0x",
                 "nonce" : "1",
                 "storage" : {
                 }
             }
         },
-        "postStateRoot" : "fad7c0ef276d9250dcd9f2b3bda060f202617546e28b6360c7c2026b7107ad4e",
+        "postStateRoot" : "281c38b9ee70d3f690adb447443791a390715dc7b83cb563c7cf756d0a065988",
         "pre" : {
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "100000",
diff --git a/tests/files/StateTests/stRefundTest.json b/tests/files/StateTests/stRefundTest.json
index abea35d98..52c33ecec 100644
--- a/tests/files/StateTests/stRefundTest.json
+++ b/tests/files/StateTests/stRefundTest.json
@@ -493,6 +493,152 @@
             "value" : "10"
         }
     },
+    "refund_CallToSuicide" : {
+        "env" : {
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty" : "256",
+            "currentGasLimit" : "10000000",
+            "currentNumber" : "0",
+            "currentTimestamp" : 1,
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "logs" : [
+        ],
+        "out" : "0x",
+        "post" : {
+            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "2000000000000000010",
+                "code" : "0x6000600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552aaa6101f4f1600055",
+                "nonce" : "0",
+                "storage" : {
+                    "0x" : "0x01",
+                    "0x01" : "0x01"
+                }
+            },
+            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "20534",
+                "code" : "0x",
+                "nonce" : "0",
+                "storage" : {
+                }
+            },
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "99979456",
+                "code" : "0x",
+                "nonce" : "1",
+                "storage" : {
+                }
+            }
+        },
+        "postStateRoot" : "dc5f1097912d0bdfe23391f2a099cc95db9d58cbea4549b6ff2018379d8b4fac",
+        "pre" : {
+            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "1000000000000000000",
+                "code" : "0x6000600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552aaa6101f4f1600055",
+                "nonce" : "0",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "100000000",
+                "code" : "0x",
+                "nonce" : "0",
+                "storage" : {
+                }
+            },
+            "aaae7baea6a6c7c4c2dfeb977efac326af552aaa" : {
+                "balance" : "1000000000000000000",
+                "code" : "0x73095e7baea6a6c7c4c2dfeb977efac326af552d87ff",
+                "nonce" : "0",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            }
+        },
+        "transaction" : {
+            "data" : "",
+            "gasLimit" : "10000000",
+            "gasPrice" : "1",
+            "nonce" : "0",
+            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "value" : "10"
+        }
+    },
+    "refund_CallToSuicideTwice" : {
+        "env" : {
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty" : "256",
+            "currentGasLimit" : "10000000",
+            "currentNumber" : "0",
+            "currentTimestamp" : 1,
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "logs" : [
+        ],
+        "out" : "0x",
+        "post" : {
+            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "2000000000000000010",
+                "code" : "0x6000600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552aaa6101f4f16000556000600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552aaa6101f4f1",
+                "nonce" : "0",
+                "storage" : {
+                    "0x" : "0x01",
+                    "0x01" : "0x01"
+                }
+            },
+            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "20566",
+                "code" : "0x",
+                "nonce" : "0",
+                "storage" : {
+                }
+            },
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "99979424",
+                "code" : "0x",
+                "nonce" : "1",
+                "storage" : {
+                }
+            }
+        },
+        "postStateRoot" : "08978bb9dd49f1c4c46d35c11266a5b04795ea9d916a482be220d14257118762",
+        "pre" : {
+            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "1000000000000000000",
+                "code" : "0x6000600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552aaa6101f4f16000556000600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552aaa6101f4f1",
+                "nonce" : "0",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "100000000",
+                "code" : "0x",
+                "nonce" : "0",
+                "storage" : {
+                }
+            },
+            "aaae7baea6a6c7c4c2dfeb977efac326af552aaa" : {
+                "balance" : "1000000000000000000",
+                "code" : "0x73095e7baea6a6c7c4c2dfeb977efac326af552d87ff",
+                "nonce" : "0",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            }
+        },
+        "transaction" : {
+            "data" : "",
+            "gasLimit" : "10000000",
+            "gasPrice" : "1",
+            "nonce" : "0",
+            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "value" : "10"
+        }
+    },
     "refund_NoOOG_1" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
diff --git a/tests/files/StateTests/stSystemOperationsTest.json b/tests/files/StateTests/stSystemOperationsTest.json
index 067a90583..8e42e23ad 100644
--- a/tests/files/StateTests/stSystemOperationsTest.json
+++ b/tests/files/StateTests/stSystemOperationsTest.json
@@ -317,7 +317,7 @@
         "out" : "0x",
         "post" : {
             "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "36066",
+                "balance" : "18033",
                 "code" : "0x",
                 "nonce" : "0",
                 "storage" : {
@@ -331,14 +331,14 @@
                 }
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "999999999999863934",
+                "balance" : "999999999999881967",
                 "code" : "0x",
                 "nonce" : "1",
                 "storage" : {
                 }
             }
         },
-        "postStateRoot" : "ab0a561b572ad3a62ae68d47f2d6a79de7d9a889abcd9cb656243f66ef1a3370",
+        "postStateRoot" : "09ffe289c890e45be43400af96540dfcdb251dc85dee0c2a9136e490517725a8",
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000000000",
@@ -3743,21 +3743,21 @@
         "out" : "0x",
         "post" : {
             "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "41007",
+                "balance" : "20504",
                 "code" : "0x",
                 "nonce" : "0",
                 "storage" : {
                 }
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "999999999999858993",
+                "balance" : "999999999999879496",
                 "code" : "0x",
                 "nonce" : "1",
                 "storage" : {
                 }
             }
         },
-        "postStateRoot" : "dad4670b249dc5ba1ce66ad56205b8c6e1f05b66b3fe7689e112c508b67b6e40",
+        "postStateRoot" : "0db310830a928b7de2a28ec1946219efb4ff64af40820004f8abacf1228b4234",
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000000000",
@@ -3798,21 +3798,21 @@
         "out" : "0x",
         "post" : {
             "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "41007",
+                "balance" : "20504",
                 "code" : "0x",
                 "nonce" : "0",
                 "storage" : {
                 }
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "1999999999999958993",
+                "balance" : "1999999999999979496",
                 "code" : "0x",
                 "nonce" : "1",
                 "storage" : {
                 }
             }
         },
-        "postStateRoot" : "2a661cc99b5c933a346d88c027d849f3d2b997c965ac4f2908e48e0d71c82523",
+        "postStateRoot" : "df4f742ceccd065ac87e1f9628aefe26e48df34162c43ca000153edf036eb72c",
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000000000",
@@ -3853,21 +3853,21 @@
         "out" : "0x",
         "post" : {
             "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "41008",
+                "balance" : "20504",
                 "code" : "0x",
                 "nonce" : "0",
                 "storage" : {
                 }
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "1999999999999958992",
+                "balance" : "1999999999999979496",
                 "code" : "0x",
                 "nonce" : "1",
                 "storage" : {
                 }
             }
         },
-        "postStateRoot" : "ef620cee663cab5c62b43fbebf7349762fe057c6ebebf9c454e4208230a9afe4",
+        "postStateRoot" : "df4f742ceccd065ac87e1f9628aefe26e48df34162c43ca000153edf036eb72c",
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000000000",
@@ -3908,7 +3908,7 @@
         "out" : "0x",
         "post" : {
             "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "41008",
+                "balance" : "20504",
                 "code" : "0x",
                 "nonce" : "0",
                 "storage" : {
@@ -3922,14 +3922,14 @@
                 }
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "999999999999858992",
+                "balance" : "999999999999879496",
                 "code" : "0x",
                 "nonce" : "1",
                 "storage" : {
                 }
             }
         },
-        "postStateRoot" : "2f93286cd831843f9aad4669d0b0aa2d7d4eba6c1d972db5958993e43b66e60d",
+        "postStateRoot" : "95b1e818532526bdad03840e613d548f511f71b773bcc151be7c1df5aec55bb0",
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000000000",
@@ -3970,14 +3970,14 @@
         "out" : "0x",
         "post" : {
             "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "21003",
+                "balance" : "10502",
                 "code" : "0x",
                 "nonce" : "0",
                 "storage" : {
                 }
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "999999999999878997",
+                "balance" : "999999999999889498",
                 "code" : "0x",
                 "nonce" : "1",
                 "storage" : {
@@ -3991,7 +3991,7 @@
                 }
             }
         },
-        "postStateRoot" : "4f96e28a4565aee3add879c7d5bb1f3e7ce38214520ecfa074f8ddbc83d94709",
+        "postStateRoot" : "c98d1cc9c8cac043798aba14849c7a9bdff792fd178a331004cf8ac6b4eeaee6",
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000000000",
@@ -4032,21 +4032,21 @@
         "out" : "0x",
         "post" : {
             "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "41007",
+                "balance" : "20504",
                 "code" : "0x",
                 "nonce" : "0",
                 "storage" : {
                 }
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "1999999999999958993",
+                "balance" : "1999999999999979496",
                 "code" : "0x",
                 "nonce" : "1",
                 "storage" : {
                 }
             }
         },
-        "postStateRoot" : "2a661cc99b5c933a346d88c027d849f3d2b997c965ac4f2908e48e0d71c82523",
+        "postStateRoot" : "df4f742ceccd065ac87e1f9628aefe26e48df34162c43ca000153edf036eb72c",
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000000000",
@@ -4087,21 +4087,21 @@
         "out" : "0x",
         "post" : {
             "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "21002",
+                "balance" : "10501",
                 "code" : "0x",
                 "nonce" : "0",
                 "storage" : {
                 }
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "999999999999878998",
+                "balance" : "999999999999889499",
                 "code" : "0x",
                 "nonce" : "1",
                 "storage" : {
                 }
             }
         },
-        "postStateRoot" : "620ca8476f12360ca3b21096614f6a8a0dc27bfbd8a974ba24db4b7a491fbfcc",
+        "postStateRoot" : "9eb527b54a972a8566c46d406fa86b6d8d4efeeb7ba102713b58fec7f0e34f45",
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000000000",
diff --git a/tests/files/StateTests/stTransactionTest.json b/tests/files/StateTests/stTransactionTest.json
index feb8fb50b..d7af60709 100644
--- a/tests/files/StateTests/stTransactionTest.json
+++ b/tests/files/StateTests/stTransactionTest.json
@@ -794,36 +794,29 @@
         ],
         "out" : "0x",
         "post" : {
-            "0000000000000000000000000000000000000000" : {
-                "balance" : "0",
-                "code" : "0x6001ff",
+            "0000000000000000000000000000000000000001" : {
+                "balance" : "1",
+                "code" : "0x",
                 "nonce" : "0",
                 "storage" : {
                 }
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "49990",
+                "balance" : "166105",
                 "code" : "0x",
                 "nonce" : "1",
                 "storage" : {
                 }
             },
             "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "50000",
+                "balance" : "13885",
                 "code" : "0x",
                 "nonce" : "0",
                 "storage" : {
                 }
-            },
-            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "1010",
-                "code" : "0x6000600060006000600160006155f0f1506000ff",
-                "nonce" : "0",
-                "storage" : {
-                }
             }
         },
-        "postStateRoot" : "1495df97dede8467662d4167bef3e8504e88d3e7fde3db2696bae6abcfe23156",
+        "postStateRoot" : "15e7cb19df513ea5c978fb4930bdf7d48af5b87e67243e7d753627bb4e6b95b4",
         "pre" : {
             "0000000000000000000000000000000000000000" : {
                 "balance" : "0",
@@ -833,7 +826,7 @@
                 }
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "100000",
+                "balance" : "180000",
                 "code" : "0x",
                 "nonce" : "0",
                 "storage" : {
@@ -849,7 +842,7 @@
         },
         "transaction" : {
             "data" : "",
-            "gasLimit" : "50000",
+            "gasLimit" : "150000",
             "gasPrice" : "1",
             "nonce" : "",
             "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
@@ -947,21 +940,21 @@
         "out" : "0x",
         "post" : {
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "100987",
+                "balance" : "111488",
                 "code" : "0x",
                 "nonce" : "1",
                 "storage" : {
                 }
             },
             "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "21003",
+                "balance" : "10502",
                 "code" : "0x",
                 "nonce" : "0",
                 "storage" : {
                 }
             }
         },
-        "postStateRoot" : "8a779af715888c47fac2bc1bc62af5ddf4ae4f658d20f0eb5208258d05fc9506",
+        "postStateRoot" : "6dd22dec58b209e1234c1fbfab5251329a95e1a708723ea9a5aad999967be8cd",
         "pre" : {
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "122000",
@@ -1002,7 +995,7 @@
         "out" : "0x",
         "post" : {
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "987",
+                "balance" : "11488",
                 "code" : "0x",
                 "nonce" : "1",
                 "storage" : {
@@ -1016,7 +1009,7 @@
                 }
             }
         },
-        "postStateRoot" : "92f31f0ec86798c2d00af8ad0fac2a75628c72343d054b45412dabf70742192a",
+        "postStateRoot" : "f351e25d15fe2b6344de1944c6980b6f60f2820b103d569210419c60c7e56646",
         "pre" : {
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "22000",
@@ -1064,21 +1057,21 @@
                 }
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "100987",
+                "balance" : "111488",
                 "code" : "0x",
                 "nonce" : "1",
                 "storage" : {
                 }
             },
             "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "21003",
+                "balance" : "10502",
                 "code" : "0x",
                 "nonce" : "0",
                 "storage" : {
                 }
             }
         },
-        "postStateRoot" : "81e198cfc22e92b3af9db2c808c551c266522d0f764c1c5619c7e3e5546df9ca",
+        "postStateRoot" : "dc9bf412e9770d2c1500b0be40f27b91d966320ea211c96f34faba0d4d7fb2c0",
         "pre" : {
             "0000000000000000000000000000000000000000" : {
                 "balance" : "1110",