EIP150 to GeneralTests Convertion

1 files changed, 30 insertions, 4 deletions

diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcodeDynamicCodeFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcodeDynamicCodeFiller.json
index b32a42db6..a53ba3b46 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcodeDynamicCodeFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcodeDynamicCodeFiller.json
@@ -15,9 +15,9 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : "Frontier",
+                "network" : ["Frontier", "Homestead", "EIP150", "EIP150"],
                 "result" : {
-                    "0xffe4ebd2a68c02d9dcb0a17283d13346beb2d8b6" : {
+                    "ffe4ebd2a68c02d9dcb0a17283d13346beb2d8b6" : {
                         "balance" : "0x01"
                     },
                     "13136008b64ff592819b2fa6d43f2835c452020e" : {
@@ -30,12 +30,38 @@
                         }
                     }
                 }
+            },
+	    {
+                "indexes" : {
+                    "data" : -1,
+                    "gas" : -1,
+                    "value" : -1
+                },
+                "network" : "EIP158",
+                "result" : {
+                    "568a95f77b047bece6aa68843d2019332c46a585" : {
+                        "balance" : "0x01"
+                    },
+                    "13136008b64ff592819b2fa6d43f2835c452020e" : {
+                        "balance" : "0x00",
+                        "storage" : {
+                            "0x00" : "0",
+                            "0x0a" : "0x568a95f77b047bece6aa68843d2019332c46a585",
+                            "0x0b" : "0x01",
+                            "0x14" : "0"
+                        }
+                    }
+                }
             }
         ],
         "pre" : {
             "1000000000000000000000000000000000000000" : {
                 "balance" : "10000",
-                "code" : "{ (MSTORE 0 0x716860016000553360145560005260096017f36000526012600e6001f0600a55) (MSTORE 32 0x6040600060406000600073ffe4ebd2a68c02d9dcb0a17283d13346beb2d8b662) \t\t\t\t    (MSTORE 64 0x0186a0f2600b5500000000000000000000000000000000000000000000000000) (CREATE 1 0 96) }",
+		"code" : "{ (MSTORE 0 0x600160005533601455) (RETURN 23 9) }",
+                "code" : "{ (MSTORE 0 0x6860016000553360145560005260096017f3) [[ 10 ]] (CREATE 1 14 18) [[ 11 ]] (CALLCODE 100000 0xffe4ebd2a68c02d9dcb0a17283d13346beb2d8b6 0 0 64 0 64 ) }",	
+		"code" : "0x716860016000553360145560005260096017f36000526012600e6001f0600a55604060006040600060007313136008b64ff592819b2fa6d43f2835c452020e620186a0f2600b55",
+		"code" : "            0x0102030405060708091011121314151617181920212223242526272829303132             0x0102030405060708091011121314151617181920212223242526272829303132",
+		"code" : "{ (MSTORE 0 0x716860016000553360145560005260096017f36000526012600e6001f0600a55) (MSTORE 32 0x6040600060406000600073ffe4ebd2a68c02d9dcb0a17283d13346beb2d8b662) 				    (MSTORE 64 0x0186a0f2600b5500000000000000000000000000000000000000000000000000) (CREATE 1 0 96) }",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -71,4 +97,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}