update to new quadratic memory cost rule

1 files changed, 78 insertions, 78 deletions

diff --git a/StateTests/stMemoryTest.json b/StateTests/stMemoryTest.json
index 175d4df97..5abceda55 100644
--- a/StateTests/stMemoryTest.json
+++ b/StateTests/stMemoryTest.json
@@ -208,14 +208,14 @@
                 }
             },
             "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "2108",
+                "balance" : "3084",
                 "code" : "0x",
                 "nonce" : "0",
                 "storage" : {
                 }
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "429496727482",
+                "balance" : "429496726506",
                 "code" : "0x",
                 "nonce" : "1",
                 "storage" : {
@@ -271,14 +271,14 @@
                 }
             },
             "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "2109",
+                "balance" : "3087",
                 "code" : "0x",
                 "nonce" : "0",
                 "storage" : {
                 }
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "429496727481",
+                "balance" : "429496726503",
                 "code" : "0x",
                 "nonce" : "1",
                 "storage" : {
@@ -334,14 +334,14 @@
                 }
             },
             "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "2109",
+                "balance" : "3087",
                 "code" : "0x",
                 "nonce" : "0",
                 "storage" : {
                 }
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "429496727481",
+                "balance" : "429496726503",
                 "code" : "0x",
                 "nonce" : "1",
                 "storage" : {
@@ -397,14 +397,14 @@
                 }
             },
             "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "2109",
+                "balance" : "3087",
                 "code" : "0x",
                 "nonce" : "0",
                 "storage" : {
                 }
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "429496727481",
+                "balance" : "429496726503",
                 "code" : "0x",
                 "nonce" : "1",
                 "storage" : {
@@ -460,14 +460,14 @@
                 }
             },
             "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "2110",
+                "balance" : "3090",
                 "code" : "0x",
                 "nonce" : "0",
                 "storage" : {
                 }
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "429496727480",
+                "balance" : "429496726500",
                 "code" : "0x",
                 "nonce" : "1",
                 "storage" : {
@@ -523,14 +523,14 @@
                 }
             },
             "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "2108",
+                "balance" : "3084",
                 "code" : "0x",
                 "nonce" : "0",
                 "storage" : {
                 }
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "429496727482",
+                "balance" : "429496726506",
                 "code" : "0x",
                 "nonce" : "1",
                 "storage" : {
@@ -586,14 +586,14 @@
                 }
             },
             "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "2108",
+                "balance" : "3084",
                 "code" : "0x",
                 "nonce" : "0",
                 "storage" : {
                 }
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "429496727482",
+                "balance" : "429496726506",
                 "code" : "0x",
                 "nonce" : "1",
                 "storage" : {
@@ -649,14 +649,14 @@
                 }
             },
             "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "2107",
+                "balance" : "3081",
                 "code" : "0x",
                 "nonce" : "0",
                 "storage" : {
                 }
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "429496727483",
+                "balance" : "429496726509",
                 "code" : "0x",
                 "nonce" : "1",
                 "storage" : {
@@ -712,14 +712,14 @@
                 }
             },
             "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "2107",
+                "balance" : "3081",
                 "code" : "0x",
                 "nonce" : "0",
                 "storage" : {
                 }
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "429496727483",
+                "balance" : "429496726509",
                 "code" : "0x",
                 "nonce" : "1",
                 "storage" : {
@@ -774,14 +774,14 @@
                 }
             },
             "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "1805",
+                "balance" : "2781",
                 "code" : "0x",
                 "nonce" : "0",
                 "storage" : {
                 }
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "429496727785",
+                "balance" : "429496726809",
                 "code" : "0x",
                 "nonce" : "1",
                 "storage" : {
@@ -836,14 +836,14 @@
                 }
             },
             "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "1806",
+                "balance" : "2784",
                 "code" : "0x",
                 "nonce" : "0",
                 "storage" : {
                 }
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "429496727784",
+                "balance" : "429496726806",
                 "code" : "0x",
                 "nonce" : "1",
                 "storage" : {
@@ -898,14 +898,14 @@
                 }
             },
             "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "1806",
+                "balance" : "2784",
                 "code" : "0x",
                 "nonce" : "0",
                 "storage" : {
                 }
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "429496727784",
+                "balance" : "429496726806",
                 "code" : "0x",
                 "nonce" : "1",
                 "storage" : {
@@ -960,14 +960,14 @@
                 }
             },
             "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "1806",
+                "balance" : "2784",
                 "code" : "0x",
                 "nonce" : "0",
                 "storage" : {
                 }
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "429496727784",
+                "balance" : "429496726806",
                 "code" : "0x",
                 "nonce" : "1",
                 "storage" : {
@@ -1022,14 +1022,14 @@
                 }
             },
             "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "1807",
+                "balance" : "2787",
                 "code" : "0x",
                 "nonce" : "0",
                 "storage" : {
                 }
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "429496727783",
+                "balance" : "429496726803",
                 "code" : "0x",
                 "nonce" : "1",
                 "storage" : {
@@ -1084,14 +1084,14 @@
                 }
             },
             "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "1805",
+                "balance" : "2781",
                 "code" : "0x",
                 "nonce" : "0",
                 "storage" : {
                 }
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "429496727785",
+                "balance" : "429496726809",
                 "code" : "0x",
                 "nonce" : "1",
                 "storage" : {
@@ -1146,14 +1146,14 @@
                 }
             },
             "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "1805",
+                "balance" : "2781",
                 "code" : "0x",
                 "nonce" : "0",
                 "storage" : {
                 }
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "429496727785",
+                "balance" : "429496726809",
                 "code" : "0x",
                 "nonce" : "1",
                 "storage" : {
@@ -1208,14 +1208,14 @@
                 }
             },
             "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "1804",
+                "balance" : "2778",
                 "code" : "0x",
                 "nonce" : "0",
                 "storage" : {
                 }
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "429496727786",
+                "balance" : "429496726812",
                 "code" : "0x",
                 "nonce" : "1",
                 "storage" : {
@@ -1270,14 +1270,14 @@
                 }
             },
             "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "1804",
+                "balance" : "2778",
                 "code" : "0x",
                 "nonce" : "0",
                 "storage" : {
                 }
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "429496727786",
+                "balance" : "429496726812",
                 "code" : "0x",
                 "nonce" : "1",
                 "storage" : {
@@ -1395,14 +1395,14 @@
                 }
             },
             "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "3108",
+                "balance" : "7014",
                 "code" : "0x",
                 "nonce" : "0",
                 "storage" : {
                 }
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "429496726482",
+                "balance" : "429496722576",
                 "code" : "0x",
                 "nonce" : "1",
                 "storage" : {
@@ -1458,14 +1458,14 @@
                 }
             },
             "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "3109",
+                "balance" : "7019",
                 "code" : "0x",
                 "nonce" : "0",
                 "storage" : {
                 }
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "429496726481",
+                "balance" : "429496722571",
                 "code" : "0x",
                 "nonce" : "1",
                 "storage" : {
@@ -1521,14 +1521,14 @@
                 }
             },
             "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "3109",
+                "balance" : "7019",
                 "code" : "0x",
                 "nonce" : "0",
                 "storage" : {
                 }
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "429496726481",
+                "balance" : "429496722571",
                 "code" : "0x",
                 "nonce" : "1",
                 "storage" : {
@@ -1584,14 +1584,14 @@
                 }
             },
             "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "3109",
+                "balance" : "7019",
                 "code" : "0x",
                 "nonce" : "0",
                 "storage" : {
                 }
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "429496726481",
+                "balance" : "429496722571",
                 "code" : "0x",
                 "nonce" : "1",
                 "storage" : {
@@ -1647,14 +1647,14 @@
                 }
             },
             "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "3110",
+                "balance" : "7024",
                 "code" : "0x",
                 "nonce" : "0",
                 "storage" : {
                 }
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "429496726480",
+                "balance" : "429496722566",
                 "code" : "0x",
                 "nonce" : "1",
                 "storage" : {
@@ -1710,14 +1710,14 @@
                 }
             },
             "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "3108",
+                "balance" : "7014",
                 "code" : "0x",
                 "nonce" : "0",
                 "storage" : {
                 }
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "429496726482",
+                "balance" : "429496722576",
                 "code" : "0x",
                 "nonce" : "1",
                 "storage" : {
@@ -1773,14 +1773,14 @@
                 }
             },
             "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "3108",
+                "balance" : "7014",
                 "code" : "0x",
                 "nonce" : "0",
                 "storage" : {
                 }
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "429496726482",
+                "balance" : "429496722576",
                 "code" : "0x",
                 "nonce" : "1",
                 "storage" : {
@@ -1836,14 +1836,14 @@
                 }
             },
             "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "3107",
+                "balance" : "7009",
                 "code" : "0x",
                 "nonce" : "0",
                 "storage" : {
                 }
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "429496726483",
+                "balance" : "429496722581",
                 "code" : "0x",
                 "nonce" : "1",
                 "storage" : {
@@ -1899,14 +1899,14 @@
                 }
             },
             "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "3107",
+                "balance" : "7009",
                 "code" : "0x",
                 "nonce" : "0",
                 "storage" : {
                 }
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "429496726483",
+                "balance" : "429496722581",
                 "code" : "0x",
                 "nonce" : "1",
                 "storage" : {
@@ -1961,14 +1961,14 @@
                 }
             },
             "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "2805",
+                "balance" : "6711",
                 "code" : "0x",
                 "nonce" : "0",
                 "storage" : {
                 }
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "429496726785",
+                "balance" : "429496722879",
                 "code" : "0x",
                 "nonce" : "1",
                 "storage" : {
@@ -2023,14 +2023,14 @@
                 }
             },
             "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "2806",
+                "balance" : "6716",
                 "code" : "0x",
                 "nonce" : "0",
                 "storage" : {
                 }
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "429496726784",
+                "balance" : "429496722874",
                 "code" : "0x",
                 "nonce" : "1",
                 "storage" : {
@@ -2085,14 +2085,14 @@
                 }
             },
             "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "2806",
+                "balance" : "6716",
                 "code" : "0x",
                 "nonce" : "0",
                 "storage" : {
                 }
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "429496726784",
+                "balance" : "429496722874",
                 "code" : "0x",
                 "nonce" : "1",
                 "storage" : {
@@ -2147,14 +2147,14 @@
                 }
             },
             "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "2806",
+                "balance" : "6716",
                 "code" : "0x",
                 "nonce" : "0",
                 "storage" : {
                 }
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "429496726784",
+                "balance" : "429496722874",
                 "code" : "0x",
                 "nonce" : "1",
                 "storage" : {
@@ -2209,14 +2209,14 @@
                 }
             },
             "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "2807",
+                "balance" : "6721",
                 "code" : "0x",
                 "nonce" : "0",
                 "storage" : {
                 }
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "429496726783",
+                "balance" : "429496722869",
                 "code" : "0x",
                 "nonce" : "1",
                 "storage" : {
@@ -2271,14 +2271,14 @@
                 }
             },
             "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "2805",
+                "balance" : "6711",
                 "code" : "0x",
                 "nonce" : "0",
                 "storage" : {
                 }
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "429496726785",
+                "balance" : "429496722879",
                 "code" : "0x",
                 "nonce" : "1",
                 "storage" : {
@@ -2333,14 +2333,14 @@
                 }
             },
             "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "2805",
+                "balance" : "6711",
                 "code" : "0x",
                 "nonce" : "0",
                 "storage" : {
                 }
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "429496726785",
+                "balance" : "429496722879",
                 "code" : "0x",
                 "nonce" : "1",
                 "storage" : {
@@ -2395,14 +2395,14 @@
                 }
             },
             "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "2804",
+                "balance" : "6706",
                 "code" : "0x",
                 "nonce" : "0",
                 "storage" : {
                 }
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "429496726786",
+                "balance" : "429496722884",
                 "code" : "0x",
                 "nonce" : "1",
                 "storage" : {
@@ -2457,14 +2457,14 @@
                 }
             },
             "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "2804",
+                "balance" : "6706",
                 "code" : "0x",
                 "nonce" : "0",
                 "storage" : {
                 }
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "429496726786",
+                "balance" : "429496722884",
                 "code" : "0x",
                 "nonce" : "1",
                 "storage" : {
@@ -2518,14 +2518,14 @@
                 }
             },
             "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "2652",
+                "balance" : "6752",
                 "code" : "0x",
                 "nonce" : "0",
                 "storage" : {
                 }
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "429496726938",
+                "balance" : "429496722838",
                 "code" : "0x",
                 "nonce" : "1",
                 "storage" : {
@@ -2579,14 +2579,14 @@
                 }
             },
             "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "134218332",
+                "balance" : "1342183320",
                 "code" : "0x",
                 "nonce" : "0",
                 "storage" : {
                 }
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "429362511258",
+                "balance" : "428154546270",
                 "code" : "0x",
                 "nonce" : "1",
                 "storage" : {
@@ -2640,14 +2640,14 @@
                 }
             },
             "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "196718332",
+                "balance" : "1342183320",
                 "code" : "0x",
                 "nonce" : "0",
                 "storage" : {
                 }
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "429300011258",
+                "balance" : "428154546270",
                 "code" : "0x",
                 "nonce" : "1",
                 "storage" : {