Merge commit '41c9dc973d2dc8614db6c1e3dbb2ec5564935368' into poc-9

9 files changed, 150 insertions, 150 deletions

diff --git a/tests/files/VMTests/vmArithmeticTest.json b/tests/files/VMTests/vmArithmeticTest.json
index 9a171a280..72859078a 100644
--- a/tests/files/VMTests/vmArithmeticTest.json
+++ b/tests/files/VMTests/vmArithmeticTest.json
@@ -78,7 +78,7 @@
             "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "9998",
+        "gas" : "10000",
         "logs" : [
         ],
         "out" : "0x",
@@ -122,7 +122,7 @@
             "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "4976",
+        "gas" : "4988",
         "logs" : [
         ],
         "out" : "0x",
@@ -166,7 +166,7 @@
             "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "4976",
+        "gas" : "4988",
         "logs" : [
         ],
         "out" : "0x",
@@ -297,7 +297,7 @@
             "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "4924",
+        "gas" : "4954",
         "logs" : [
         ],
         "out" : "0x",
@@ -399,7 +399,7 @@
             "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "4946",
+        "gas" : "4968",
         "logs" : [
         ],
         "out" : "0x",
@@ -443,7 +443,7 @@
             "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "4966",
+        "gas" : "4980",
         "logs" : [
         ],
         "out" : "0x",
@@ -487,7 +487,7 @@
             "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "4966",
+        "gas" : "4980",
         "logs" : [
         ],
         "out" : "0x",
@@ -531,7 +531,7 @@
             "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "9803",
+        "gas" : "9871",
         "logs" : [
         ],
         "out" : "0x0000000000000000",
@@ -575,7 +575,7 @@
             "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "9958",
+        "gas" : "9974",
         "logs" : [
         ],
         "out" : "0x7f6e5d4c3b2a19087f6e5d4c3b2a19087f6e5d4c3b2a19087f6e5d4c3b2a1908",
@@ -648,7 +648,7 @@
             "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "4974",
+        "gas" : "4986",
         "logs" : [
         ],
         "out" : "0x",
@@ -692,7 +692,7 @@
             "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "4974",
+        "gas" : "4986",
         "logs" : [
         ],
         "out" : "0x",
@@ -765,7 +765,7 @@
             "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "4974",
+        "gas" : "4986",
         "logs" : [
         ],
         "out" : "0x",
@@ -896,7 +896,7 @@
             "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "4929",
+        "gas" : "4941",
         "logs" : [
         ],
         "out" : "0x",
@@ -1027,7 +1027,7 @@
             "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "4949",
+        "gas" : "4961",
         "logs" : [
         ],
         "out" : "0x",
@@ -3246,7 +3246,7 @@
             "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "9710",
+        "gas" : "9826",
         "logs" : [
         ],
         "out" : "0x0000000000000000000000000000000000000000000000000000000000001055",
@@ -3348,7 +3348,7 @@
             "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "4974",
+        "gas" : "4986",
         "logs" : [
         ],
         "out" : "0x",
@@ -3392,7 +3392,7 @@
             "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "4974",
+        "gas" : "4986",
         "logs" : [
         ],
         "out" : "0x",
@@ -3523,7 +3523,7 @@
             "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "4974",
+        "gas" : "4986",
         "logs" : [
         ],
         "out" : "0x",
@@ -3625,7 +3625,7 @@
             "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "4974",
+        "gas" : "4986",
         "logs" : [
         ],
         "out" : "0x",
@@ -3698,7 +3698,7 @@
             "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "9946",
+        "gas" : "9966",
         "logs" : [
         ],
         "out" : "0x47d0817e4167b1eb4f9fc722b133ef9d7d9a6fb4c2c1c442d000107a5e419561",
@@ -3742,7 +3742,7 @@
             "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "4966",
+        "gas" : "4980",
         "logs" : [
         ],
         "out" : "0x",
@@ -3786,7 +3786,7 @@
             "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "4946",
+        "gas" : "4968",
         "logs" : [
         ],
         "out" : "0x",
@@ -3859,7 +3859,7 @@
             "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "4924",
+        "gas" : "4954",
         "logs" : [
         ],
         "out" : "0x",
@@ -3961,7 +3961,7 @@
             "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "4946",
+        "gas" : "4968",
         "logs" : [
         ],
         "out" : "0x",
@@ -4005,7 +4005,7 @@
             "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "9950",
+        "gas" : "9968",
         "logs" : [
         ],
         "out" : "0x",
@@ -4049,7 +4049,7 @@
             "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "4966",
+        "gas" : "4980",
         "logs" : [
         ],
         "out" : "0x",
@@ -4093,7 +4093,7 @@
             "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "4966",
+        "gas" : "4980",
         "logs" : [
         ],
         "out" : "0x",
@@ -4137,7 +4137,7 @@
             "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "4966",
+        "gas" : "4980",
         "logs" : [
         ],
         "out" : "0x",
@@ -4181,7 +4181,7 @@
             "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "9945",
+        "gas" : "9967",
         "logs" : [
         ],
         "out" : "0x0000000000000000000000000000000000000000000000000000000000000000",
@@ -4283,7 +4283,7 @@
             "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "4954",
+        "gas" : "4974",
         "logs" : [
         ],
         "out" : "0x",
@@ -4414,7 +4414,7 @@
             "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "4954",
+        "gas" : "4974",
         "logs" : [
         ],
         "out" : "0x",
@@ -4458,7 +4458,7 @@
             "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "4964",
+        "gas" : "4980",
         "logs" : [
         ],
         "out" : "0x",
@@ -4531,7 +4531,7 @@
             "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "4974",
+        "gas" : "4986",
         "logs" : [
         ],
         "out" : "0x",
@@ -4691,7 +4691,7 @@
             "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "4974",
+        "gas" : "4986",
         "logs" : [
         ],
         "out" : "0x",
@@ -4967,7 +4967,7 @@
             "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "4964",
+        "gas" : "4980",
         "logs" : [
         ],
         "out" : "0x",
@@ -5011,7 +5011,7 @@
             "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "4964",
+        "gas" : "4980",
         "logs" : [
         ],
         "out" : "0x",
@@ -5055,7 +5055,7 @@
             "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "9998",
+        "gas" : "10000",
         "logs" : [
         ],
         "out" : "0x",
diff --git a/tests/files/VMTests/vmBitwiseLogicOperationTest.json b/tests/files/VMTests/vmBitwiseLogicOperationTest.json
index c9ea42b97..7177355d6 100644
--- a/tests/files/VMTests/vmBitwiseLogicOperationTest.json
+++ b/tests/files/VMTests/vmBitwiseLogicOperationTest.json
@@ -49,7 +49,7 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "4976",
+        "gas" : "4988",
         "logs" : [
         ],
         "out" : "0x",
@@ -267,7 +267,7 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "4976",
+        "gas" : "4988",
         "logs" : [
         ],
         "out" : "0x",
@@ -311,7 +311,7 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "4976",
+        "gas" : "4988",
         "logs" : [
         ],
         "out" : "0x",
@@ -529,7 +529,7 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "4966",
+        "gas" : "4982",
         "logs" : [
         ],
         "out" : "0x",
@@ -573,7 +573,7 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "4964",
+        "gas" : "4980",
         "logs" : [
         ],
         "out" : "0x",
@@ -617,7 +617,7 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "4956",
+        "gas" : "4976",
         "logs" : [
         ],
         "out" : "0x",
@@ -748,7 +748,7 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "4966",
+        "gas" : "4982",
         "logs" : [
         ],
         "out" : "0x",
@@ -821,7 +821,7 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "4976",
+        "gas" : "4988",
         "logs" : [
         ],
         "out" : "0x",
@@ -952,7 +952,7 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "4966",
+        "gas" : "4982",
         "logs" : [
         ],
         "out" : "0x",
@@ -1025,7 +1025,7 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "4976",
+        "gas" : "4988",
         "logs" : [
         ],
         "out" : "0x",
@@ -1127,7 +1127,7 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "4981",
+        "gas" : "4991",
         "logs" : [
         ],
         "out" : "0x",
@@ -1171,7 +1171,7 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "4981",
+        "gas" : "4991",
         "logs" : [
         ],
         "out" : "0x",
@@ -1215,7 +1215,7 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "4971",
+        "gas" : "4985",
         "logs" : [
         ],
         "out" : "0x",
@@ -1259,7 +1259,7 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "4971",
+        "gas" : "4985",
         "logs" : [
         ],
         "out" : "0x",
@@ -1506,7 +1506,7 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "4966",
+        "gas" : "4982",
         "logs" : [
         ],
         "out" : "0x",
@@ -1579,7 +1579,7 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "4976",
+        "gas" : "4988",
         "logs" : [
         ],
         "out" : "0x",
@@ -1652,7 +1652,7 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "4956",
+        "gas" : "4976",
         "logs" : [
         ],
         "out" : "0x",
@@ -1725,7 +1725,7 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "4966",
+        "gas" : "4982",
         "logs" : [
         ],
         "out" : "0x",
@@ -1798,7 +1798,7 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "4976",
+        "gas" : "4988",
         "logs" : [
         ],
         "out" : "0x",
@@ -1871,7 +1871,7 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "4976",
+        "gas" : "4988",
         "logs" : [
         ],
         "out" : "0x",
diff --git a/tests/files/VMTests/vmBlockInfoTest.json b/tests/files/VMTests/vmBlockInfoTest.json
index 1ee04ddf2..1cf4d1450 100644
--- a/tests/files/VMTests/vmBlockInfoTest.json
+++ b/tests/files/VMTests/vmBlockInfoTest.json
@@ -20,7 +20,7 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "4964",
+        "gas" : "4974",
         "logs" : [
         ],
         "out" : "0x",
@@ -64,7 +64,7 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "4964",
+        "gas" : "4974",
         "logs" : [
         ],
         "out" : "0x",
@@ -137,7 +137,7 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "4964",
+        "gas" : "4974",
         "logs" : [
         ],
         "out" : "0x",
@@ -181,7 +181,7 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "4964",
+        "gas" : "4974",
         "logs" : [
         ],
         "out" : "0x",
@@ -341,7 +341,7 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "4987",
+        "gas" : "4995",
         "logs" : [
         ],
         "out" : "0x",
diff --git a/tests/files/VMTests/vmEnvironmentalInfoTest.json b/tests/files/VMTests/vmEnvironmentalInfoTest.json
index 08ad98a61..5469678d9 100644
--- a/tests/files/VMTests/vmEnvironmentalInfoTest.json
+++ b/tests/files/VMTests/vmEnvironmentalInfoTest.json
@@ -20,7 +20,7 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "99999979964",
+        "gas" : "99999979974",
         "logs" : [
         ],
         "out" : "0x",
@@ -65,7 +65,7 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "99999994964",
+        "gas" : "99999994974",
         "logs" : [
         ],
         "out" : "0x",
@@ -116,7 +116,7 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "99999979987",
+        "gas" : "99999979995",
         "logs" : [
         ],
         "out" : "0x",
@@ -161,7 +161,7 @@
             "origin" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "value" : "1000000000000000000"
         },
-        "gas" : "99999979987",
+        "gas" : "99999979995",
         "logs" : [
         ],
         "out" : "0x",
@@ -206,7 +206,7 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "99999994964",
+        "gas" : "99999994974",
         "logs" : [
         ],
         "out" : "0x",
@@ -257,7 +257,7 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "99999979964",
+        "gas" : "99999979974",
         "logs" : [
         ],
         "out" : "0x",
@@ -302,7 +302,7 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "99999979933",
+        "gas" : "99999979949",
         "logs" : [
         ],
         "out" : "0x",
@@ -347,7 +347,7 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "99999994964",
+        "gas" : "99999994974",
         "logs" : [
         ],
         "out" : "0x",
@@ -398,7 +398,7 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "99999979964",
+        "gas" : "99999979974",
         "logs" : [
         ],
         "out" : "0x",
@@ -443,7 +443,7 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "99999994964",
+        "gas" : "99999994974",
         "logs" : [
         ],
         "out" : "0x",
@@ -494,7 +494,7 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "99999979933",
+        "gas" : "99999979949",
         "logs" : [
         ],
         "out" : "0x",
@@ -546,7 +546,7 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "99999979957",
+        "gas" : "99999979973",
         "logs" : [
         ],
         "out" : "0x",
@@ -591,7 +591,7 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "99999979957",
+        "gas" : "99999979973",
         "logs" : [
         ],
         "out" : "0x",
@@ -636,7 +636,7 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "99999994958",
+        "gas" : "99999994976",
         "logs" : [
         ],
         "out" : "0x",
@@ -680,7 +680,7 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "99999994958",
+        "gas" : "99999994976",
         "logs" : [
         ],
         "out" : "0x",
@@ -724,7 +724,7 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "99999994913",
+        "gas" : "99999994931",
         "logs" : [
         ],
         "out" : "0x",
@@ -768,7 +768,7 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "99999994957",
+        "gas" : "99999994973",
         "logs" : [
         ],
         "out" : "0x",
@@ -812,7 +812,7 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "99999979981",
+        "gas" : "99999979991",
         "logs" : [
         ],
         "out" : "0x",
@@ -857,7 +857,7 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "99999979981",
+        "gas" : "99999979991",
         "logs" : [
         ],
         "out" : "0x",
@@ -902,7 +902,7 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "99999979981",
+        "gas" : "99999979991",
         "logs" : [
         ],
         "out" : "0x",
@@ -947,7 +947,7 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "99999994981",
+        "gas" : "99999994991",
         "logs" : [
         ],
         "out" : "0x",
@@ -991,7 +991,7 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "99999979987",
+        "gas" : "99999979995",
         "logs" : [
         ],
         "out" : "0x",
@@ -1036,7 +1036,7 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "99999979987",
+        "gas" : "99999979995",
         "logs" : [
         ],
         "out" : "0x",
@@ -1081,7 +1081,7 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "99999979987",
+        "gas" : "99999979995",
         "logs" : [
         ],
         "out" : "0x",
@@ -1126,7 +1126,7 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "99999979987",
+        "gas" : "99999979995",
         "logs" : [
         ],
         "out" : "0x",
@@ -1171,7 +1171,7 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "99999979987",
+        "gas" : "99999979995",
         "logs" : [
         ],
         "out" : "0x",
@@ -1216,7 +1216,7 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "99999979957",
+        "gas" : "99999979973",
         "logs" : [
         ],
         "out" : "0x",
@@ -1261,7 +1261,7 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "99999994958",
+        "gas" : "99999994976",
         "logs" : [
         ],
         "out" : "0x",
@@ -1305,7 +1305,7 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "99999994957",
+        "gas" : "99999994973",
         "logs" : [
         ],
         "out" : "0x",
@@ -1349,7 +1349,7 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "99999979987",
+        "gas" : "99999979995",
         "logs" : [
         ],
         "out" : "0x",
@@ -1378,7 +1378,7 @@
             {
                 "data" : "0x1111222233334444555566667777888899990000aaaabbbbccccddddeeeeffff",
                 "destination" : "",
-                "gasLimit" : "99999967849",
+                "gasLimit" : "99999967909",
                 "value" : "0"
             },
             {
@@ -1406,7 +1406,7 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "10000000001111111"
         },
-        "gas" : "99999872263",
+        "gas" : "99999872361",
         "logs" : [
         ],
         "out" : "0x",
@@ -1443,7 +1443,7 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "99999979915",
+        "gas" : "99999979935",
         "logs" : [
         ],
         "out" : "0x",
@@ -1502,7 +1502,7 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "99999979914",
+        "gas" : "99999979934",
         "logs" : [
         ],
         "out" : "0x",
@@ -1561,7 +1561,7 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "99999994914",
+        "gas" : "99999994934",
         "logs" : [
         ],
         "out" : "0x",
@@ -1626,7 +1626,7 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "99999999998",
+        "gas" : "100000000000",
         "logs" : [
         ],
         "out" : "0x",
@@ -1684,7 +1684,7 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "99999994936",
+        "gas" : "99999994954",
         "logs" : [
         ],
         "out" : "0x",
@@ -1728,7 +1728,7 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "99999979956",
+        "gas" : "99999979970",
         "logs" : [
         ],
         "out" : "0x",
@@ -1787,7 +1787,7 @@
             "origin" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "value" : "1000000000000000000"
         },
-        "gas" : "99999979965",
+        "gas" : "99999979975",
         "logs" : [
         ],
         "out" : "0x",
@@ -1846,7 +1846,7 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "99999979987",
+        "gas" : "99999979995",
         "logs" : [
         ],
         "out" : "0x",
@@ -1891,7 +1891,7 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "99999979987",
+        "gas" : "99999979995",
         "logs" : [
         ],
         "out" : "0x",
diff --git a/tests/files/VMTests/vmIOandFlowOperationsTest.json b/tests/files/VMTests/vmIOandFlowOperationsTest.json
index f4e8681bf..3efa438b3 100644
--- a/tests/files/VMTests/vmIOandFlowOperationsTest.json
+++ b/tests/files/VMTests/vmIOandFlowOperationsTest.json
@@ -1748,7 +1748,7 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "4476",
+        "gas" : "4688",
         "logs" : [
         ],
         "out" : "0x",
@@ -2024,7 +2024,7 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "9948",
+        "gas" : "9966",
         "logs" : [
         ],
         "out" : "0x",
@@ -2735,7 +2735,7 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "9917",
+        "gas" : "9949",
         "logs" : [
         ],
         "out" : "0x02030503000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
@@ -2779,7 +2779,7 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "4978",
+        "gas" : "4988",
         "logs" : [
         ],
         "out" : "0x",
@@ -2823,7 +2823,7 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "4960",
+        "gas" : "4976",
         "logs" : [
         ],
         "out" : "0x",
@@ -3070,7 +3070,7 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "9998",
+        "gas" : "10000",
         "logs" : [
         ],
         "out" : "0x",
@@ -3172,7 +3172,7 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "9998",
+        "gas" : "10000",
         "logs" : [
         ],
         "out" : "0x",
@@ -3245,7 +3245,7 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "4987",
+        "gas" : "4995",
         "logs" : [
         ],
         "out" : "0x",
@@ -3521,7 +3521,7 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "9491",
+        "gas" : "9679",
         "logs" : [
         ],
         "out" : "0x0001020304050607080900000000000000000000000000000000000000000000",
@@ -3565,7 +3565,7 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "9902",
+        "gas" : "9940",
         "logs" : [
         ],
         "out" : "0x0000000000000000000000000000000000000000000000000000000000000000",
diff --git a/tests/files/VMTests/vmLogTest.json b/tests/files/VMTests/vmLogTest.json
index a31d6b133..b9826b02d 100644
--- a/tests/files/VMTests/vmLogTest.json
+++ b/tests/files/VMTests/vmLogTest.json
@@ -20,7 +20,7 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "7986",
+        "gas" : "7994",
         "logs" : [
             {
                 "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
@@ -129,7 +129,7 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "7968",
+        "gas" : "7982",
         "logs" : [
             {
                 "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
@@ -180,7 +180,7 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "7712",
+        "gas" : "7726",
         "logs" : [
             {
                 "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
@@ -231,7 +231,7 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "7960",
+        "gas" : "7974",
         "logs" : [
             {
                 "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
@@ -282,7 +282,7 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "7960",
+        "gas" : "7974",
         "logs" : [
             {
                 "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
@@ -333,7 +333,7 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "5708",
+        "gas" : "5724",
         "logs" : [
             {
                 "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
@@ -385,7 +385,7 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "5707",
+        "gas" : "5723",
         "logs" : [
             {
                 "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
@@ -437,7 +437,7 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "5981",
+        "gas" : "5991",
         "logs" : [
             {
                 "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
@@ -547,7 +547,7 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "5963",
+        "gas" : "5979",
         "logs" : [
             {
                 "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
@@ -599,7 +599,7 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "5707",
+        "gas" : "5723",
         "logs" : [
             {
                 "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
@@ -651,7 +651,7 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "5955",
+        "gas" : "5971",
         "logs" : [
             {
                 "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
@@ -703,7 +703,7 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "5955",
+        "gas" : "5971",
         "logs" : [
             {
                 "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
@@ -755,7 +755,7 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "3703",
+        "gas" : "3721",
         "logs" : [
             {
                 "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
@@ -808,7 +808,7 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "3702",
+        "gas" : "3720",
         "logs" : [
             {
                 "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
@@ -861,7 +861,7 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "3976",
+        "gas" : "3988",
         "logs" : [
             {
                 "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
@@ -972,7 +972,7 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "3958",
+        "gas" : "3976",
         "logs" : [
             {
                 "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
@@ -1025,7 +1025,7 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "3702",
+        "gas" : "3720",
         "logs" : [
             {
                 "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
@@ -1078,7 +1078,7 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "3950",
+        "gas" : "3968",
         "logs" : [
             {
                 "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
@@ -1131,7 +1131,7 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "3950",
+        "gas" : "3968",
         "logs" : [
             {
                 "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
@@ -1184,7 +1184,7 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "1698",
+        "gas" : "1718",
         "logs" : [
             {
                 "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
@@ -1238,7 +1238,7 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "1697",
+        "gas" : "1717",
         "logs" : [
             {
                 "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
@@ -1292,7 +1292,7 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "1700",
+        "gas" : "1720",
         "logs" : [
             {
                 "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
@@ -1346,7 +1346,7 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "1971",
+        "gas" : "1985",
         "logs" : [
             {
                 "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
@@ -1458,7 +1458,7 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "1953",
+        "gas" : "1973",
         "logs" : [
             {
                 "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
@@ -1512,7 +1512,7 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "1697",
+        "gas" : "1717",
         "logs" : [
             {
                 "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
@@ -1566,7 +1566,7 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "1945",
+        "gas" : "1965",
         "logs" : [
             {
                 "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
@@ -1620,7 +1620,7 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "1945",
+        "gas" : "1965",
         "logs" : [
             {
                 "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
@@ -1674,7 +1674,7 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "9998",
+        "gas" : "10000",
         "logs" : [
         ],
         "out" : "0x",
@@ -1747,7 +1747,7 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "9998",
+        "gas" : "10000",
         "logs" : [
         ],
         "out" : "0x",
@@ -1994,7 +1994,7 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "5572",
+        "gas" : "5592",
         "logs" : [
             {
                 "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
diff --git a/tests/files/VMTests/vmPushDupSwapTest.json b/tests/files/VMTests/vmPushDupSwapTest.json
index 89b3a10c9..7e935745d 100644
--- a/tests/files/VMTests/vmPushDupSwapTest.json
+++ b/tests/files/VMTests/vmPushDupSwapTest.json
@@ -832,7 +832,7 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "9993",
+        "gas" : "9997",
         "logs" : [
         ],
         "out" : "0x",
@@ -1311,7 +1311,7 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "9993",
+        "gas" : "9997",
         "logs" : [
         ],
         "out" : "0x",
@@ -1355,7 +1355,7 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "9993",
+        "gas" : "9997",
         "logs" : [
         ],
         "out" : "0x",
@@ -2095,7 +2095,7 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "9907",
+        "gas" : "9941",
         "logs" : [
         ],
         "out" : "0x03",
diff --git a/tests/files/VMTests/vmSha3Test.json b/tests/files/VMTests/vmSha3Test.json
index 0b404f131..d104eb9d2 100644
--- a/tests/files/VMTests/vmSha3Test.json
+++ b/tests/files/VMTests/vmSha3Test.json
@@ -20,7 +20,7 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "99999979949",
+        "gas" : "99999979961",
         "logs" : [
         ],
         "out" : "0x",
@@ -268,7 +268,7 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "115792089237316195423570985008687907853269984665640564039457584007913129639935"
         },
-        "gas" : "3756501412",
+        "gas" : "3756501424",
         "logs" : [
         ],
         "out" : "0x",
diff --git a/tests/files/VMTests/vmtests.json b/tests/files/VMTests/vmtests.json
index bacc7109c..deee07558 100644
--- a/tests/files/VMTests/vmtests.json
+++ b/tests/files/VMTests/vmtests.json
@@ -107,7 +107,7 @@
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "9994",
+        "gas" : "9998",
         "logs" : [
         ],
         "out" : "0x",