upgrade eip158 to general tests

1 files changed, 74 insertions, 4 deletions

diff --git a/src/GeneralStateTestsFiller/stSolidityTest/RecursiveCreateContractsFiller.json b/src/GeneralStateTestsFiller/stSolidityTest/RecursiveCreateContractsFiller.json
index 908503135..f18d74f61 100644
--- a/src/GeneralStateTestsFiller/stSolidityTest/RecursiveCreateContractsFiller.json
+++ b/src/GeneralStateTestsFiller/stSolidityTest/RecursiveCreateContractsFiller.json
@@ -15,18 +15,88 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : "Frontier",
+                "network" : ["Frontier", "Homestead"],
                 "result" : {
                     "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                         "balance" : "300000"
                     }
                 }
+            },
+	    {
+                "indexes" : {
+                    "data" : -1,
+                    "gas" : -1,
+                    "value" : -1
+                },
+                "network" : ["EIP158"],
+                "result" : {
+                    "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                            "balance" : "0x314dc6448d9338c15b0a00000001",
+                            "nonce" : "0x01",
+                            "storage" : {
+                                "0x00" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                                "0x01" : "0x0304"
+                            }
+                        },
+                        "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                            "balance" : "0x047c5d"
+                        },
+                        "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                            "nonce" : "0x01"
+                        },
+                        "d2571607e241ecf590ed94b12d87c94babe36db6" : {
+                            "nonce" : "0x01",
+                            "storage" : {
+                                "0x00" : "0x0303"
+                            }
+                        }
+                }
             }
         ],
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "//" : "}",
                 "balance" : "1000000000000000000000000000000000",
+		"//" : "contract recursiveCreate1							",
+		"//" : "{										",
+		"//" : "    uint depp;									",
+		"//" : "    function recursiveCreate1(address a, uint depth)				",
+		"//" : "    {										",
+		"//" : "        depth = depth - 1;							",
+		"//" : "	depp = depth;								",
+		"//" : "        if(depth > 0)								",
+		"//" : "            main(a).create2(depth);						",
+		"//" : "    }										",
+		"//" : "}										",
+		"//" : "										",
+		"//" : "contract recursiveCreate2							",
+		"//" : "{										",
+		"//" : "    uint depp;									",
+		"//" : "    function recursiveCreate2(address a, uint depth)				",
+		"//" : "    {										",
+		"//" : "        depth = depth - 1;							",
+		"//" : "	depp = depth;								",
+		"//" : "        if(depth > 0)								",
+		"//" : "            recursiveCreate1 rec1 = new recursiveCreate1(a, depth);		",
+    		"//" : "    }										",
+		"//" : "}										",
+		"//" : "										",
+		"//" : "contract main									",
+		"//" : "{										",
+		"//" : "    address maincontract;							",
+		"//" : "    uint depp;									",
+		"//" : "    function run(uint depth)							",
+		"//" : "    {										",
+		"//" : "        maincontract = 0x095e7baea6a6c7c4c2dfeb977efac326af552d87;		",
+		"//" : "        depp = depth;								",
+		"//" : "        recursiveCreate1 rec1 = new recursiveCreate1(maincontract, depth);	",
+		"//" : "    }										",
+		"//" : "    										",
+		"//" : "    function create2(uint depth)						",
+		"//" : "    {										",
+		"//" : "        recursiveCreate2 rec2 = new recursiveCreate2(maincontract, depth);	",
+		"//" : "        address(rec2).send(2);							",
+		"//" : "    }										",
+		"//" : "}",
                 "code" : "0x60003560e060020a90048063820b13f614610021578063a444f5e91461003257005b61002c600435610093565b60006000f35b61003d600435610043565b60006000f35b600073095e7baea6a6c7c4c2dfeb977efac326af552d8760008190555081600181905550606b6101ad600039606b600054600160a060020a0316815260200182815260200160006000f090505050565b600060c86100e560003960c8600054600160a060020a0316815260200182815260200160006000f0905080600160a060020a0316600060026000600060006000848787f16100dd57005b50505050505600604060c860043960045160245160006001820391508160008190555060008211602657604c565b606b605d600039606b83600160a060020a0316815260200182815260200160006000f090505b505050600180605c6000396000f300006040606b6004396004516024516001810390508060008190555060008111602457605b565b81600160a060020a031663820b13f6600060008260e060020a026000526004858152602001600060008660325a03f1605857005b50505b5050600180606a6000396000f300006040606b6004396004516024516001810390508060008190555060008111602457605b565b81600160a060020a031663820b13f6600060008260e060020a026000526004858152602001600060008660325a03f1605857005b50505b5050600180606a6000396000f30000",
                 "nonce" : "0",
                 "storage" : {
@@ -42,7 +112,7 @@
         },
         "transaction" : {
             "data" : [
-                "0xa444f5e90000000000000000000000000000000000000000000000000000000000000204"
+                "0xa444f5e90000000000000000000000000000000000000000000000000000000000000304"
             ],
             "gasLimit" : [
                 "300000"
@@ -56,4 +126,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}