upgrade eip158 to general tests

1 files changed, 33 insertions, 8 deletions

diff --git a/src/GeneralStateTestsFiller/stRefundTest/refundSuicide50procentCapFiller.json b/src/GeneralStateTestsFiller/stRefundTest/refundSuicide50procentCapFiller.json
index 18fc63137..2b927475e 100644
--- a/src/GeneralStateTestsFiller/stRefundTest/refundSuicide50procentCapFiller.json
+++ b/src/GeneralStateTestsFiller/stRefundTest/refundSuicide50procentCapFiller.json
@@ -11,7 +11,7 @@
         "expect" : [
             {
                 "indexes" : {
-                    "data" : -1,
+                    "data" : 0,
                     "gas" : -1,
                     "value" : -1
                 },
@@ -21,15 +21,40 @@
                         "storage" : {
                             "0x0a" : "0x01",
                             "0x0b" : "0x01",
-                            "0x16" : "0x984476",
-                            "0x17" : "0x96bd58"
+                            "0x16" : "0x984376",
+                            "0x17" : "0x96bc55"
                         }
                     },
                     "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                        "balance" : "70566"
+                        "balance" : "70695"
                     },
                     "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                        "balance" : "9929434",
+                        "balance" : "9929305",
+                        "nonce" : "1"
+                    }
+                }
+            },
+	    {
+                "indexes" : {
+                    "data" : 1,
+                    "gas" : -1,
+                    "value" : -1
+                },
+                "network" : ["EIP158"],
+                "result" : {
+                    "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "storage" : {
+                            "0x0a" : "0x01",
+                            "0x0b" : "0x01",
+                            "0x16" : "0x9843b6",
+                            "0x17" : "0x96a679"
+                        }
+                    },
+                    "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                        "balance" : "73493"
+                    },
+                    "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "balance" : "9926507",
                         "nonce" : "1"
                     }
                 }
@@ -38,7 +63,7 @@
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000000000",
-                "code" : "{ [[ 22 ]] (GAS) [[ 10 ]] 1 [[ 11 ]] (CALL 500 0xaaae7baea6a6c7c4c2dfeb977efac326af552aaa 0 0 0 0 0 ) [[ 1 ]] 0 [[ 2 ]] 0 [[ 3 ]] 0 [[ 4 ]] 0 [[ 5 ]] 0 [[ 6 ]] 0 [[ 7 ]] 0 [[ 8 ]] 0 [[ 23 ]] (GAS) }",
+                "code" : "{ [[ 22 ]] (GAS) [[ 10 ]] 1 [[ 11 ]] (CALL (CALLDATALOAD 0) 0xaaae7baea6a6c7c4c2dfeb977efac326af552aaa 0 0 0 0 0 ) [[ 1 ]] 0 [[ 2 ]] 0 [[ 3 ]] 0 [[ 4 ]] 0 [[ 5 ]] 0 [[ 6 ]] 0 [[ 7 ]] 0 [[ 8 ]] 0 [[ 23 ]] (GAS) }",
                 "nonce" : "0",
                 "storage" : {
                     "0x01" : "0x01",
@@ -68,7 +93,7 @@
         },
         "transaction" : {
             "data" : [
-                ""
+                "0x00000000000000000000000000000000000000000000000000000000000001f4", "0x0000000000000000000000000000000000000000000000000000000000010000"
             ],
             "gasLimit" : [
                 "10000000"
@@ -82,4 +107,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}