fix wrong solidity in tests (not hf related)

4 files changed, 93 insertions, 24 deletions

diff --git a/VMTests/vmEnvironmentalInfoTest.json b/VMTests/vmEnvironmentalInfoTest.json
index 855b069fa..d117778d7 100644
--- a/VMTests/vmEnvironmentalInfoTest.json
+++ b/VMTests/vmEnvironmentalInfoTest.json
@@ -1845,7 +1845,7 @@
             {
                 "data" : "0x1111222233334444555566667777888899990000aaaabbbbccccddddeeeeffff",
                 "destination" : "",
-                "gasLimit" : "0x1748766aa5",
+                "gasLimit" : "0x1748766a8c",
                 "value" : "0x00"
             },
             {
@@ -1865,14 +1865,14 @@
         "exec" : {
             "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "code" : "0x583031333234363a608041424344455836600035602635601335387f1111222233334444555566667777888899990000aaaabbbbccccddddeeeeffff600052602060006000f06020600060206000600030610bb8f1600051611000525960200260002030ff60016002f3",
+            "code" : "0x583031333234363a600143034041424344455836600035602635601335387f1111222233334444555566667777888899990000aaaabbbbccccddddeeeeffff600052602060006000f06020600060206000600030610bb8f1600051611000525960200260002030ff60016002f3",
             "data" : "0xdeadbeef",
             "gas" : "0x174876e801",
             "gasPrice" : "0x07df",
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "0x2386f26fd1f447"
         },
-        "gas" : "0x1748755711",
+        "gas" : "0x17487556f8",
         "logs" : [
         ],
         "out" : "0x",
@@ -1881,7 +1881,7 @@
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x8ac7230489e880e8",
-                "code" : "0x583031333234363a608041424344455836600035602635601335387f1111222233334444555566667777888899990000aaaabbbbccccddddeeeeffff600052602060006000f06020600060206000600030610bb8f1600051611000525960200260002030ff60016002f3",
+                "code" : "0x583031333234363a600143034041424344455836600035602635601335387f1111222233334444555566667777888899990000aaaabbbbccccddddeeeeffff600052602060006000f06020600060206000600030610bb8f1600051611000525960200260002030ff60016002f3",
                 "nonce" : "0x58",
                 "storage" : {
                 }
diff --git a/VMTests/vmIOandFlowOperationsTest.json b/VMTests/vmIOandFlowOperationsTest.json
index 5a9b46e06..4f46a5410 100644
--- a/VMTests/vmIOandFlowOperationsTest.json
+++ b/VMTests/vmIOandFlowOperationsTest.json
@@ -2484,7 +2484,7 @@
         "exec" : {
             "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "code" : "0x6060035b60600160800380606002576868010000000000000016565b6363badf000d6060115500",
+            "code" : "0x6060035b606001900380606002576868010000000000000016565b6363badf000d6060115500",
             "data" : "0x",
             "gas" : "0x0186a0",
             "gasPrice" : "0x5af3107a4000",
@@ -2494,7 +2494,7 @@
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x152d02c7e14af6800000",
-                "code" : "0x6060035b60600160800380606002576868010000000000000016565b6363badf000d6060115500",
+                "code" : "0x6060035b606001900380606002576868010000000000000016565b6363badf000d6060115500",
                 "nonce" : "0x00",
                 "storage" : {
                 }
diff --git a/VMTests/vmPushDupSwapTest.json b/VMTests/vmPushDupSwapTest.json
index b522ed3e6..6ecc32c07 100644
--- a/VMTests/vmPushDupSwapTest.json
+++ b/VMTests/vmPushDupSwapTest.json
@@ -2091,6 +2091,49 @@
             }
         }
     },
+    "push32Undefined3" : {
+        "callcreates" : [
+        ],
+        "env" : {
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty" : "0x0100",
+            "currentGasLimit" : "0x0f4240",
+            "currentNumber" : "0x00",
+            "currentTimestamp" : "0x01"
+        },
+        "exec" : {
+            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "code" : "0x7f",
+            "data" : "0x",
+            "gas" : "0x0186a0",
+            "gasPrice" : "0x5af3107a4000",
+            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value" : "0x0de0b6b3a7640000"
+        },
+        "gas" : "0x01869d",
+        "logs" : [
+        ],
+        "out" : "0x",
+        "post" : {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0x152d02c7e14af6800000",
+                "code" : "0x7f",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0x152d02c7e14af6800000",
+                "code" : "0x7f",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
     "push33" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
diff --git a/VMTests/vmSystemOperationsTest.json b/VMTests/vmSystemOperationsTest.json
index 975f869a0..977b87248 100644
--- a/VMTests/vmSystemOperationsTest.json
+++ b/VMTests/vmSystemOperationsTest.json
@@ -894,6 +894,12 @@
     },
     "PostToNameRegistrator0" : {
         "callcreates" : [
+            {
+                "data" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa",
+                "destination" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+                "gasLimit" : "0x0f4b3c",
+                "value" : "0x17"
+            }
         ],
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
@@ -905,23 +911,24 @@
         "exec" : {
             "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000527faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa6020526080",
+            "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000527faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa6020526040600060406000601773945304eb96065b2a98b57a48a06ae28d285a71b5620f4240f1600055",
             "data" : "0x",
             "gas" : "0x09184e72a000",
             "gasPrice" : "0x5af3107a4000",
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "0x0186a0"
         },
-        "gas" : "0x09184e729fe5",
+        "gas" : "0x09184e72375c",
         "logs" : [
         ],
         "out" : "0x",
         "post" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x152d02c7e14af6800000",
-                "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000527faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa6020526080",
+                "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000527faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa6020526040600060406000601773945304eb96065b2a98b57a48a06ae28d285a71b5620f4240f1600055",
                 "nonce" : "0x00",
                 "storage" : {
+                    "0x00" : "0x01"
                 }
             },
             "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
@@ -935,7 +942,7 @@
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x152d02c7e14af6800000",
-                "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000527faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa6020526080",
+                "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000527faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa6020526040600060406000601773945304eb96065b2a98b57a48a06ae28d285a71b5620f4240f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -951,6 +958,12 @@
     },
     "PostToReturn1" : {
         "callcreates" : [
+            {
+                "data" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa",
+                "destination" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+                "gasLimit" : "0x0f4b3c",
+                "value" : "0x17"
+            }
         ],
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
@@ -962,23 +975,24 @@
         "exec" : {
             "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000527faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa6020526080",
+            "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000527faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa6020526040600060406000601773945304eb96065b2a98b57a48a06ae28d285a71b5620f4240f1600055",
             "data" : "0x",
             "gas" : "0x09184e72a000",
             "gasPrice" : "0x5af3107a4000",
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "0x0186a0"
         },
-        "gas" : "0x09184e729fe5",
+        "gas" : "0x09184e72375c",
         "logs" : [
         ],
         "out" : "0x",
         "post" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x152d02c7e14af6800000",
-                "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000527faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa6020526080",
+                "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000527faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa6020526040600060406000601773945304eb96065b2a98b57a48a06ae28d285a71b5620f4240f1600055",
                 "nonce" : "0x00",
                 "storage" : {
+                    "0x00" : "0x01"
                 }
             },
             "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
@@ -992,7 +1006,7 @@
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x152d02c7e14af6800000",
-                "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000527faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa6020526080",
+                "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000527faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa6020526040600060406000601773945304eb96065b2a98b57a48a06ae28d285a71b5620f4240f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -1180,6 +1194,12 @@
     },
     "callstatelessToNameRegistrator0" : {
         "callcreates" : [
+            {
+                "data" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa",
+                "destination" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+                "gasLimit" : "0x0f4b3c",
+                "value" : "0x17"
+            }
         ],
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
@@ -1191,24 +1211,24 @@
         "exec" : {
             "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000527faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa6020526080600055",
+            "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000527faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa6020526000604060406000601773945304eb96065b2a98b57a48a06ae28d285a71b5620f4240f1600055",
             "data" : "0x",
             "gas" : "0x09184e72a000",
             "gasPrice" : "0x5af3107a4000",
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "0x0186a0"
         },
-        "gas" : "0x09184e7251c2",
+        "gas" : "0x09184e72375c",
         "logs" : [
         ],
         "out" : "0x",
         "post" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x152d02c7e14af6800000",
-                "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000527faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa6020526080600055",
+                "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000527faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa6020526000604060406000601773945304eb96065b2a98b57a48a06ae28d285a71b5620f4240f1600055",
                 "nonce" : "0x00",
                 "storage" : {
-                    "0x00" : "0x80"
+                    "0x00" : "0x01"
                 }
             },
             "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
@@ -1222,7 +1242,7 @@
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x152d02c7e14af6800000",
-                "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000527faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa6020526080600055",
+                "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000527faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa6020526000604060406000601773945304eb96065b2a98b57a48a06ae28d285a71b5620f4240f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -1238,6 +1258,12 @@
     },
     "callstatelessToReturn1" : {
         "callcreates" : [
+            {
+                "data" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa",
+                "destination" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+                "gasLimit" : "0x1c84",
+                "value" : "0x17"
+            }
         ],
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
@@ -1249,24 +1275,24 @@
         "exec" : {
             "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000527faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa6020526080600055",
+            "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000527faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa6020526002600060406000601773945304eb96065b2a98b57a48a06ae28d285a71b5611388f1600055",
             "data" : "0x",
             "gas" : "0x09184e72a000",
             "gasPrice" : "0x5af3107a4000",
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "0x0186a0"
         },
-        "gas" : "0x09184e7251c2",
+        "gas" : "0x09184e72375c",
         "logs" : [
         ],
         "out" : "0x",
         "post" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x152d02c7e14af6800000",
-                "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000527faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa6020526080600055",
+                "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000527faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa6020526002600060406000601773945304eb96065b2a98b57a48a06ae28d285a71b5611388f1600055",
                 "nonce" : "0x00",
                 "storage" : {
-                    "0x00" : "0x80"
+                    "0x00" : "0x01"
                 }
             },
             "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
@@ -1280,7 +1306,7 @@
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x152d02c7e14af6800000",
-                "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000527faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa6020526080600055",
+                "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000527faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa6020526002600060406000601773945304eb96065b2a98b57a48a06ae28d285a71b5611388f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }