aboutsummaryrefslogtreecommitdiffstats
path: root/GeneralStateTests/stMemoryStressTest
diff options
context:
space:
mode:
authorDimitry <winsvega@mail.ru>2017-04-25 18:22:56 +0800
committerDimitry <winsvega@mail.ru>2017-04-25 18:22:56 +0800
commit1fcfae9885b4b63740f48acecc6524b400e22a23 (patch)
tree85762531a139c22e5d06c60238b6ce6f7a076232 /GeneralStateTests/stMemoryStressTest
parent64134b33047939344b7872344318d7aed31cdb02 (diff)
downloadtangerine-tests-1fcfae9885b4b63740f48acecc6524b400e22a23.tar
tangerine-tests-1fcfae9885b4b63740f48acecc6524b400e22a23.tar.gz
tangerine-tests-1fcfae9885b4b63740f48acecc6524b400e22a23.tar.bz2
tangerine-tests-1fcfae9885b4b63740f48acecc6524b400e22a23.tar.lz
tangerine-tests-1fcfae9885b4b63740f48acecc6524b400e22a23.tar.xz
tangerine-tests-1fcfae9885b4b63740f48acecc6524b400e22a23.tar.zst
tangerine-tests-1fcfae9885b4b63740f48acecc6524b400e22a23.zip
refill memory stress tests
Diffstat (limited to 'GeneralStateTests/stMemoryStressTest')
-rw-r--r--GeneralStateTests/stMemoryStressTest/CALLCODE_Bounds.json36
-rw-r--r--GeneralStateTests/stMemoryStressTest/CALLCODE_Bounds2.json36
-rw-r--r--GeneralStateTests/stMemoryStressTest/CALLCODE_Bounds3.json36
-rw-r--r--GeneralStateTests/stMemoryStressTest/CALL_Bounds.json36
-rw-r--r--GeneralStateTests/stMemoryStressTest/CALL_Bounds2.json36
-rw-r--r--GeneralStateTests/stMemoryStressTest/CALL_Bounds2a.json36
-rw-r--r--GeneralStateTests/stMemoryStressTest/CREATE_Bounds.json34
-rw-r--r--GeneralStateTests/stMemoryStressTest/CREATE_Bounds2.json34
-rw-r--r--GeneralStateTests/stMemoryStressTest/DELEGATECALL_Bounds.json36
-rw-r--r--GeneralStateTests/stMemoryStressTest/DELEGATECALL_Bounds2.json36
-rw-r--r--GeneralStateTests/stMemoryStressTest/FillStack.json38
-rw-r--r--GeneralStateTests/stMemoryStressTest/MLOAD_Bounds3.json36
-rw-r--r--GeneralStateTests/stMemoryStressTest/MSTORE_Bounds2a.json36
-rw-r--r--GeneralStateTests/stMemoryStressTest/mload32bitBound.json36
-rw-r--r--GeneralStateTests/stMemoryStressTest/mload32bitBound2.json36
-rw-r--r--GeneralStateTests/stMemoryStressTest/mload32bitBound_Msize.json36
-rw-r--r--GeneralStateTests/stMemoryStressTest/mload32bitBound_return.json36
-rw-r--r--GeneralStateTests/stMemoryStressTest/mload32bitBound_return2.json36
18 files changed, 413 insertions, 233 deletions
diff --git a/GeneralStateTests/stMemoryStressTest/CALLCODE_Bounds.json b/GeneralStateTests/stMemoryStressTest/CALLCODE_Bounds.json
index 6bce737d5..9c0498af6 100644
--- a/GeneralStateTests/stMemoryStressTest/CALLCODE_Bounds.json
+++ b/GeneralStateTests/stMemoryStressTest/CALLCODE_Bounds.json
@@ -1,17 +1,17 @@
{
"CALLCODE_Bounds" : {
"env" : {
- "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x020000",
"currentGasLimit" : "0x7fffffffffffffff",
"currentNumber" : "0x01",
"currentTimestamp" : "0x03e8",
- "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
"post" : {
"EIP150" : [
{
- "hash" : "91c7cba9b6ef6c70ea4d88854b5be743c8dc2154f0dba37feb09b3b138567efa",
+ "hash" : "0x91c7cba9b6ef6c70ea4d88854b5be743c8dc2154f0dba37feb09b3b138567efa",
"indexes" : {
"data" : 0,
"gas" : 0,
@@ -21,7 +21,7 @@
],
"EIP158" : [
{
- "hash" : "91c7cba9b6ef6c70ea4d88854b5be743c8dc2154f0dba37feb09b3b138567efa",
+ "hash" : "0x91c7cba9b6ef6c70ea4d88854b5be743c8dc2154f0dba37feb09b3b138567efa",
"indexes" : {
"data" : 0,
"gas" : 0,
@@ -31,7 +31,7 @@
],
"Frontier" : [
{
- "hash" : "c5c4d16f75276c9631402fbca3eb565ea19e42f98c80c2f562e92e5fc0175136",
+ "hash" : "0xc5c4d16f75276c9631402fbca3eb565ea19e42f98c80c2f562e92e5fc0175136",
"indexes" : {
"data" : 0,
"gas" : 0,
@@ -41,7 +41,17 @@
],
"Homestead" : [
{
- "hash" : "c5c4d16f75276c9631402fbca3eb565ea19e42f98c80c2f562e92e5fc0175136",
+ "hash" : "0xc5c4d16f75276c9631402fbca3eb565ea19e42f98c80c2f562e92e5fc0175136",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ }
+ }
+ ],
+ "Metropolis" : [
+ {
+ "hash" : "0x91c7cba9b6ef6c70ea4d88854b5be743c8dc2154f0dba37feb09b3b138567efa",
"indexes" : {
"data" : 0,
"gas" : 0,
@@ -51,23 +61,23 @@
]
},
"pre" : {
- "1000000000000000000000000000000000000000" : {
+ "0x1000000000000000000000000000000000000000" : {
"balance" : "0x00",
"code" : "0x600060006000600060007310000000000000000000000000000000000000016707fffffffffffffff250630fffffff6000630fffffff600060007310000000000000000000000000000000000000016707fffffffffffffff25063ffffffff600063ffffffff600060007310000000000000000000000000000000000000016707fffffffffffffff2506000630fffffff6000630fffffff60007310000000000000000000000000000000000000016707fffffffffffffff250600063ffffffff600063ffffffff60007310000000000000000000000000000000000000016707fffffffffffffff250600067ffffffffffffffff600067ffffffffffffffff60007310000000000000000000000000000000000000016707fffffffffffffff25060006fffffffffffffffffffffffffffffffff60006fffffffffffffffffffffffffffffffff60007310000000000000000000000000000000000000016707fffffffffffffff25060007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60007310000000000000000000000000000000000000016707fffffffffffffff2",
"nonce" : "0x00",
"storage" : {
}
},
- "1000000000000000000000000000000000000001" : {
+ "0x1000000000000000000000000000000000000001" : {
"balance" : "0x00",
"code" : "0x600054600101600055",
"nonce" : "0x00",
"storage" : {
}
},
- "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
"balance" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
- "code" : "0x",
+ "code" : "",
"nonce" : "0x00",
"storage" : {
}
@@ -82,10 +92,10 @@
],
"gasPrice" : "0x01",
"nonce" : "0x00",
- "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "1000000000000000000000000000000000000000",
+ "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "0x1000000000000000000000000000000000000000",
"value" : [
- "1"
+ "0x01"
]
}
}
diff --git a/GeneralStateTests/stMemoryStressTest/CALLCODE_Bounds2.json b/GeneralStateTests/stMemoryStressTest/CALLCODE_Bounds2.json
index 18517e1ec..dabf16909 100644
--- a/GeneralStateTests/stMemoryStressTest/CALLCODE_Bounds2.json
+++ b/GeneralStateTests/stMemoryStressTest/CALLCODE_Bounds2.json
@@ -1,17 +1,17 @@
{
"CALLCODE_Bounds2" : {
"env" : {
- "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x020000",
"currentGasLimit" : "0x7fffffffffffffff",
"currentNumber" : "0x01",
"currentTimestamp" : "0x03e8",
- "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
"post" : {
"EIP150" : [
{
- "hash" : "cef6866a7d48dd589dc46beecf8bdbfa6c4d2454ea479fcf8cdd529fe22f8e1f",
+ "hash" : "0xcef6866a7d48dd589dc46beecf8bdbfa6c4d2454ea479fcf8cdd529fe22f8e1f",
"indexes" : {
"data" : 0,
"gas" : 0,
@@ -21,7 +21,7 @@
],
"EIP158" : [
{
- "hash" : "cef6866a7d48dd589dc46beecf8bdbfa6c4d2454ea479fcf8cdd529fe22f8e1f",
+ "hash" : "0xcef6866a7d48dd589dc46beecf8bdbfa6c4d2454ea479fcf8cdd529fe22f8e1f",
"indexes" : {
"data" : 0,
"gas" : 0,
@@ -31,7 +31,7 @@
],
"Frontier" : [
{
- "hash" : "1c3754297e406ca0ea0d90609129d0ad24c32462cacdef7fccd4971e0c814aa5",
+ "hash" : "0x1c3754297e406ca0ea0d90609129d0ad24c32462cacdef7fccd4971e0c814aa5",
"indexes" : {
"data" : 0,
"gas" : 0,
@@ -41,7 +41,17 @@
],
"Homestead" : [
{
- "hash" : "1c3754297e406ca0ea0d90609129d0ad24c32462cacdef7fccd4971e0c814aa5",
+ "hash" : "0x1c3754297e406ca0ea0d90609129d0ad24c32462cacdef7fccd4971e0c814aa5",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ }
+ }
+ ],
+ "Metropolis" : [
+ {
+ "hash" : "0xcef6866a7d48dd589dc46beecf8bdbfa6c4d2454ea479fcf8cdd529fe22f8e1f",
"indexes" : {
"data" : 0,
"gas" : 0,
@@ -51,23 +61,23 @@
]
},
"pre" : {
- "1000000000000000000000000000000000000000" : {
+ "0x1000000000000000000000000000000000000000" : {
"balance" : "0x00",
"code" : "0x630fffffff630fffffff630fffffff630fffffff60007310000000000000000000000000000000000000016707fffffffffffffff2",
"nonce" : "0x00",
"storage" : {
}
},
- "1000000000000000000000000000000000000001" : {
+ "0x1000000000000000000000000000000000000001" : {
"balance" : "0x00",
"code" : "0x600054600101600055",
"nonce" : "0x00",
"storage" : {
}
},
- "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
"balance" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
- "code" : "0x",
+ "code" : "",
"nonce" : "0x00",
"storage" : {
}
@@ -82,10 +92,10 @@
],
"gasPrice" : "0x01",
"nonce" : "0x00",
- "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "1000000000000000000000000000000000000000",
+ "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "0x1000000000000000000000000000000000000000",
"value" : [
- "1"
+ "0x01"
]
}
}
diff --git a/GeneralStateTests/stMemoryStressTest/CALLCODE_Bounds3.json b/GeneralStateTests/stMemoryStressTest/CALLCODE_Bounds3.json
index 18833ddd7..6f9b3187a 100644
--- a/GeneralStateTests/stMemoryStressTest/CALLCODE_Bounds3.json
+++ b/GeneralStateTests/stMemoryStressTest/CALLCODE_Bounds3.json
@@ -1,17 +1,17 @@
{
"CALLCODE_Bounds3" : {
"env" : {
- "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x020000",
"currentGasLimit" : "0x7fffffffffffffff",
"currentNumber" : "0x01",
"currentTimestamp" : "0x03e8",
- "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
"post" : {
"EIP150" : [
{
- "hash" : "a7f388c72262eb932401ccd8607765ecf264e476ff79b4f0432a0c7f99f7a21d",
+ "hash" : "0xa7f388c72262eb932401ccd8607765ecf264e476ff79b4f0432a0c7f99f7a21d",
"indexes" : {
"data" : 0,
"gas" : 0,
@@ -21,7 +21,7 @@
],
"EIP158" : [
{
- "hash" : "a7f388c72262eb932401ccd8607765ecf264e476ff79b4f0432a0c7f99f7a21d",
+ "hash" : "0xa7f388c72262eb932401ccd8607765ecf264e476ff79b4f0432a0c7f99f7a21d",
"indexes" : {
"data" : 0,
"gas" : 0,
@@ -31,7 +31,7 @@
],
"Frontier" : [
{
- "hash" : "146bb423c76925615b83f08fbc08bf2c64714431a53a24aa91290fb67e9f4125",
+ "hash" : "0x146bb423c76925615b83f08fbc08bf2c64714431a53a24aa91290fb67e9f4125",
"indexes" : {
"data" : 0,
"gas" : 0,
@@ -41,7 +41,17 @@
],
"Homestead" : [
{
- "hash" : "146bb423c76925615b83f08fbc08bf2c64714431a53a24aa91290fb67e9f4125",
+ "hash" : "0x146bb423c76925615b83f08fbc08bf2c64714431a53a24aa91290fb67e9f4125",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ }
+ }
+ ],
+ "Metropolis" : [
+ {
+ "hash" : "0xa7f388c72262eb932401ccd8607765ecf264e476ff79b4f0432a0c7f99f7a21d",
"indexes" : {
"data" : 0,
"gas" : 0,
@@ -51,23 +61,23 @@
]
},
"pre" : {
- "1000000000000000000000000000000000000000" : {
+ "0x1000000000000000000000000000000000000000" : {
"balance" : "0x00",
"code" : "0x63ffffffff63ffffffff63ffffffff63ffffffff60007310000000000000000000000000000000000000016707fffffffffffffff2",
"nonce" : "0x00",
"storage" : {
}
},
- "1000000000000000000000000000000000000001" : {
+ "0x1000000000000000000000000000000000000001" : {
"balance" : "0x00",
"code" : "0x600054600101600055",
"nonce" : "0x00",
"storage" : {
}
},
- "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
"balance" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
- "code" : "0x",
+ "code" : "",
"nonce" : "0x00",
"storage" : {
}
@@ -82,10 +92,10 @@
],
"gasPrice" : "0x01",
"nonce" : "0x00",
- "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "1000000000000000000000000000000000000000",
+ "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "0x1000000000000000000000000000000000000000",
"value" : [
- "1"
+ "0x01"
]
}
}
diff --git a/GeneralStateTests/stMemoryStressTest/CALL_Bounds.json b/GeneralStateTests/stMemoryStressTest/CALL_Bounds.json
index 3d829d9c5..242ac2866 100644
--- a/GeneralStateTests/stMemoryStressTest/CALL_Bounds.json
+++ b/GeneralStateTests/stMemoryStressTest/CALL_Bounds.json
@@ -1,17 +1,17 @@
{
"CALL_Bounds" : {
"env" : {
- "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x020000",
"currentGasLimit" : "0x7fffffffffffffff",
"currentNumber" : "0x01",
"currentTimestamp" : "0x03e8",
- "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
"post" : {
"EIP150" : [
{
- "hash" : "024f3fb658bfb11c73f32c38723fc2f9341bb844fd4397a179af15594483c696",
+ "hash" : "0x024f3fb658bfb11c73f32c38723fc2f9341bb844fd4397a179af15594483c696",
"indexes" : {
"data" : 0,
"gas" : 0,
@@ -21,7 +21,7 @@
],
"EIP158" : [
{
- "hash" : "024f3fb658bfb11c73f32c38723fc2f9341bb844fd4397a179af15594483c696",
+ "hash" : "0x024f3fb658bfb11c73f32c38723fc2f9341bb844fd4397a179af15594483c696",
"indexes" : {
"data" : 0,
"gas" : 0,
@@ -31,7 +31,7 @@
],
"Frontier" : [
{
- "hash" : "af616dfe953f53f5a7c81717aecdc5f781c4b743a075e2a2792c4e11f41212b7",
+ "hash" : "0xaf616dfe953f53f5a7c81717aecdc5f781c4b743a075e2a2792c4e11f41212b7",
"indexes" : {
"data" : 0,
"gas" : 0,
@@ -41,7 +41,17 @@
],
"Homestead" : [
{
- "hash" : "af616dfe953f53f5a7c81717aecdc5f781c4b743a075e2a2792c4e11f41212b7",
+ "hash" : "0xaf616dfe953f53f5a7c81717aecdc5f781c4b743a075e2a2792c4e11f41212b7",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ }
+ }
+ ],
+ "Metropolis" : [
+ {
+ "hash" : "0x024f3fb658bfb11c73f32c38723fc2f9341bb844fd4397a179af15594483c696",
"indexes" : {
"data" : 0,
"gas" : 0,
@@ -51,23 +61,23 @@
]
},
"pre" : {
- "1000000000000000000000000000000000000000" : {
+ "0x1000000000000000000000000000000000000000" : {
"balance" : "0x00",
"code" : "0x600060006000600060007310000000000000000000000000000000000000016707fffffffffffffff150630fffffff6000630fffffff600060007310000000000000000000000000000000000000016707fffffffffffffff15063ffffffff600063ffffffff600060007310000000000000000000000000000000000000016707fffffffffffffff1506000630fffffff6000630fffffff60007310000000000000000000000000000000000000016707fffffffffffffff150600063ffffffff600063ffffffff60007310000000000000000000000000000000000000016707fffffffffffffff150600067ffffffffffffffff600067ffffffffffffffff60007310000000000000000000000000000000000000016707fffffffffffffff15060006fffffffffffffffffffffffffffffffff60006fffffffffffffffffffffffffffffffff60007310000000000000000000000000000000000000016707fffffffffffffff15060007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60007310000000000000000000000000000000000000016707fffffffffffffff1",
"nonce" : "0x00",
"storage" : {
}
},
- "1000000000000000000000000000000000000001" : {
+ "0x1000000000000000000000000000000000000001" : {
"balance" : "0x00",
"code" : "0x600054600101600055",
"nonce" : "0x00",
"storage" : {
}
},
- "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
"balance" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffff",
- "code" : "0x",
+ "code" : "",
"nonce" : "0x00",
"storage" : {
}
@@ -82,10 +92,10 @@
],
"gasPrice" : "0x01",
"nonce" : "0x00",
- "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "1000000000000000000000000000000000000000",
+ "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "0x1000000000000000000000000000000000000000",
"value" : [
- "1"
+ "0x01"
]
}
}
diff --git a/GeneralStateTests/stMemoryStressTest/CALL_Bounds2.json b/GeneralStateTests/stMemoryStressTest/CALL_Bounds2.json
index c89ca5df7..c8eb2e81f 100644
--- a/GeneralStateTests/stMemoryStressTest/CALL_Bounds2.json
+++ b/GeneralStateTests/stMemoryStressTest/CALL_Bounds2.json
@@ -1,17 +1,17 @@
{
"CALL_Bounds2" : {
"env" : {
- "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x020000",
"currentGasLimit" : "0x7fffffffffffffff",
"currentNumber" : "0x01",
"currentTimestamp" : "0x03e8",
- "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
"post" : {
"EIP150" : [
{
- "hash" : "75e1811557019f366b542f2e0d5104c12804504e92a7f7b46cc94ba7f9c678ba",
+ "hash" : "0x75e1811557019f366b542f2e0d5104c12804504e92a7f7b46cc94ba7f9c678ba",
"indexes" : {
"data" : 0,
"gas" : 0,
@@ -21,7 +21,7 @@
],
"EIP158" : [
{
- "hash" : "75e1811557019f366b542f2e0d5104c12804504e92a7f7b46cc94ba7f9c678ba",
+ "hash" : "0x75e1811557019f366b542f2e0d5104c12804504e92a7f7b46cc94ba7f9c678ba",
"indexes" : {
"data" : 0,
"gas" : 0,
@@ -31,7 +31,7 @@
],
"Frontier" : [
{
- "hash" : "17383ca8818ef550666e1c6ac30fa91a236a5641d28c817def2a4dabc19a7a99",
+ "hash" : "0x17383ca8818ef550666e1c6ac30fa91a236a5641d28c817def2a4dabc19a7a99",
"indexes" : {
"data" : 0,
"gas" : 0,
@@ -41,7 +41,17 @@
],
"Homestead" : [
{
- "hash" : "17383ca8818ef550666e1c6ac30fa91a236a5641d28c817def2a4dabc19a7a99",
+ "hash" : "0x17383ca8818ef550666e1c6ac30fa91a236a5641d28c817def2a4dabc19a7a99",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ }
+ }
+ ],
+ "Metropolis" : [
+ {
+ "hash" : "0x75e1811557019f366b542f2e0d5104c12804504e92a7f7b46cc94ba7f9c678ba",
"indexes" : {
"data" : 0,
"gas" : 0,
@@ -51,23 +61,23 @@
]
},
"pre" : {
- "1000000000000000000000000000000000000000" : {
+ "0x1000000000000000000000000000000000000000" : {
"balance" : "0x00",
"code" : "0x630fffffff630fffffff630fffffff630fffffff60007310000000000000000000000000000000000000016707fffffffffffffff1",
"nonce" : "0x00",
"storage" : {
}
},
- "1000000000000000000000000000000000000001" : {
+ "0x1000000000000000000000000000000000000001" : {
"balance" : "0x00",
"code" : "0x600054600101600055",
"nonce" : "0x00",
"storage" : {
}
},
- "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
"balance" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffff",
- "code" : "0x",
+ "code" : "",
"nonce" : "0x00",
"storage" : {
}
@@ -82,10 +92,10 @@
],
"gasPrice" : "0x01",
"nonce" : "0x00",
- "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "1000000000000000000000000000000000000000",
+ "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "0x1000000000000000000000000000000000000000",
"value" : [
- "1"
+ "0x01"
]
}
}
diff --git a/GeneralStateTests/stMemoryStressTest/CALL_Bounds2a.json b/GeneralStateTests/stMemoryStressTest/CALL_Bounds2a.json
index 079edc9b8..096a5c440 100644
--- a/GeneralStateTests/stMemoryStressTest/CALL_Bounds2a.json
+++ b/GeneralStateTests/stMemoryStressTest/CALL_Bounds2a.json
@@ -1,17 +1,17 @@
{
"CALL_Bounds2a" : {
"env" : {
- "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x020000",
"currentGasLimit" : "0x7fffffffffffffff",
"currentNumber" : "0x01",
"currentTimestamp" : "0x03e8",
- "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
"post" : {
"EIP150" : [
{
- "hash" : "5b8007df690d77b0099ba5aeb3c6187eab1e4d134c8598824f4b2383e7d893f2",
+ "hash" : "0x5b8007df690d77b0099ba5aeb3c6187eab1e4d134c8598824f4b2383e7d893f2",
"indexes" : {
"data" : 0,
"gas" : 0,
@@ -21,7 +21,7 @@
],
"EIP158" : [
{
- "hash" : "5b8007df690d77b0099ba5aeb3c6187eab1e4d134c8598824f4b2383e7d893f2",
+ "hash" : "0x5b8007df690d77b0099ba5aeb3c6187eab1e4d134c8598824f4b2383e7d893f2",
"indexes" : {
"data" : 0,
"gas" : 0,
@@ -31,7 +31,7 @@
],
"Frontier" : [
{
- "hash" : "33297ccbab39a39e682df6f3bc5921c750fe51ac622c54f8b32765c5acbd506d",
+ "hash" : "0x33297ccbab39a39e682df6f3bc5921c750fe51ac622c54f8b32765c5acbd506d",
"indexes" : {
"data" : 0,
"gas" : 0,
@@ -41,7 +41,17 @@
],
"Homestead" : [
{
- "hash" : "33297ccbab39a39e682df6f3bc5921c750fe51ac622c54f8b32765c5acbd506d",
+ "hash" : "0x33297ccbab39a39e682df6f3bc5921c750fe51ac622c54f8b32765c5acbd506d",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ }
+ }
+ ],
+ "Metropolis" : [
+ {
+ "hash" : "0x5b8007df690d77b0099ba5aeb3c6187eab1e4d134c8598824f4b2383e7d893f2",
"indexes" : {
"data" : 0,
"gas" : 0,
@@ -51,23 +61,23 @@
]
},
"pre" : {
- "1000000000000000000000000000000000000000" : {
+ "0x1000000000000000000000000000000000000000" : {
"balance" : "0x00",
"code" : "0x63ffffffff63ffffffff63ffffffff63ffffffff60007310000000000000000000000000000000000000016707fffffffffffffff1",
"nonce" : "0x00",
"storage" : {
}
},
- "1000000000000000000000000000000000000001" : {
+ "0x1000000000000000000000000000000000000001" : {
"balance" : "0x00",
"code" : "0x600054600101600055",
"nonce" : "0x00",
"storage" : {
}
},
- "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
"balance" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffff",
- "code" : "0x",
+ "code" : "",
"nonce" : "0x00",
"storage" : {
}
@@ -82,10 +92,10 @@
],
"gasPrice" : "0x01",
"nonce" : "0x00",
- "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "1000000000000000000000000000000000000000",
+ "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "0x1000000000000000000000000000000000000000",
"value" : [
- "1"
+ "0x01"
]
}
}
diff --git a/GeneralStateTests/stMemoryStressTest/CREATE_Bounds.json b/GeneralStateTests/stMemoryStressTest/CREATE_Bounds.json
index e89bc0096..85ce8c9a4 100644
--- a/GeneralStateTests/stMemoryStressTest/CREATE_Bounds.json
+++ b/GeneralStateTests/stMemoryStressTest/CREATE_Bounds.json
@@ -1,17 +1,17 @@
{
"CREATE_Bounds" : {
"env" : {
- "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x020000",
"currentGasLimit" : "0x7fffffffffffffff",
"currentNumber" : "0x01",
"currentTimestamp" : "0x03e8",
- "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
"post" : {
"EIP150" : [
{
- "hash" : "d72493f4d273a2c674696cd4fe698475a7e6dfc3bc7eee8c4a061136a477cb3e",
+ "hash" : "0xd72493f4d273a2c674696cd4fe698475a7e6dfc3bc7eee8c4a061136a477cb3e",
"indexes" : {
"data" : 0,
"gas" : 0,
@@ -21,7 +21,7 @@
],
"EIP158" : [
{
- "hash" : "bb8dbc7b5a14dd38bdde511938c01e1076c18809b267d5ed71903a7f497e9044",
+ "hash" : "0xbb8dbc7b5a14dd38bdde511938c01e1076c18809b267d5ed71903a7f497e9044",
"indexes" : {
"data" : 0,
"gas" : 0,
@@ -31,7 +31,7 @@
],
"Frontier" : [
{
- "hash" : "d72493f4d273a2c674696cd4fe698475a7e6dfc3bc7eee8c4a061136a477cb3e",
+ "hash" : "0xd72493f4d273a2c674696cd4fe698475a7e6dfc3bc7eee8c4a061136a477cb3e",
"indexes" : {
"data" : 0,
"gas" : 0,
@@ -41,7 +41,17 @@
],
"Homestead" : [
{
- "hash" : "d72493f4d273a2c674696cd4fe698475a7e6dfc3bc7eee8c4a061136a477cb3e",
+ "hash" : "0xd72493f4d273a2c674696cd4fe698475a7e6dfc3bc7eee8c4a061136a477cb3e",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ }
+ }
+ ],
+ "Metropolis" : [
+ {
+ "hash" : "0xbb8dbc7b5a14dd38bdde511938c01e1076c18809b267d5ed71903a7f497e9044",
"indexes" : {
"data" : 0,
"gas" : 0,
@@ -51,16 +61,16 @@
]
},
"pre" : {
- "1000000000000000000000000000000000000000" : {
+ "0x1000000000000000000000000000000000000000" : {
"balance" : "0x64",
"code" : "0x7f6001600155601080600c6000396000f3006000355415600957005b602035600060005260356020536055602153600060006001f050630fffffff60006001f0",
"nonce" : "0x00",
"storage" : {
}
},
- "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
"balance" : "0x0fffffffffffffffffffffffffffffffffffffffffffffffff",
- "code" : "0x",
+ "code" : "",
"nonce" : "0x00",
"storage" : {
}
@@ -75,10 +85,10 @@
],
"gasPrice" : "0x01",
"nonce" : "0x00",
- "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "1000000000000000000000000000000000000000",
+ "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "0x1000000000000000000000000000000000000000",
"value" : [
- "0"
+ "0x00"
]
}
}
diff --git a/GeneralStateTests/stMemoryStressTest/CREATE_Bounds2.json b/GeneralStateTests/stMemoryStressTest/CREATE_Bounds2.json
index d6d446f2c..012a57af4 100644
--- a/GeneralStateTests/stMemoryStressTest/CREATE_Bounds2.json
+++ b/GeneralStateTests/stMemoryStressTest/CREATE_Bounds2.json
@@ -1,17 +1,17 @@
{
"CREATE_Bounds2" : {
"env" : {
- "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x020000",
"currentGasLimit" : "0x7fffffffffffffff",
"currentNumber" : "0x01",
"currentTimestamp" : "0x03e8",
- "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
"post" : {
"EIP150" : [
{
- "hash" : "0a948b9b44b4e1a31aded81a52c6b757217e97432e1783e354d2fd1d1ab6505f",
+ "hash" : "0x0a948b9b44b4e1a31aded81a52c6b757217e97432e1783e354d2fd1d1ab6505f",
"indexes" : {
"data" : 0,
"gas" : 0,
@@ -21,7 +21,7 @@
],
"EIP158" : [
{
- "hash" : "ab49986d0c4fd65ff4a55095296a6e6bff4b02945755eb0df612ceddc861ba2d",
+ "hash" : "0xab49986d0c4fd65ff4a55095296a6e6bff4b02945755eb0df612ceddc861ba2d",
"indexes" : {
"data" : 0,
"gas" : 0,
@@ -31,7 +31,7 @@
],
"Frontier" : [
{
- "hash" : "0a948b9b44b4e1a31aded81a52c6b757217e97432e1783e354d2fd1d1ab6505f",
+ "hash" : "0x0a948b9b44b4e1a31aded81a52c6b757217e97432e1783e354d2fd1d1ab6505f",
"indexes" : {
"data" : 0,
"gas" : 0,
@@ -41,7 +41,17 @@
],
"Homestead" : [
{
- "hash" : "0a948b9b44b4e1a31aded81a52c6b757217e97432e1783e354d2fd1d1ab6505f",
+ "hash" : "0x0a948b9b44b4e1a31aded81a52c6b757217e97432e1783e354d2fd1d1ab6505f",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ }
+ }
+ ],
+ "Metropolis" : [
+ {
+ "hash" : "0xab49986d0c4fd65ff4a55095296a6e6bff4b02945755eb0df612ceddc861ba2d",
"indexes" : {
"data" : 0,
"gas" : 0,
@@ -51,16 +61,16 @@
]
},
"pre" : {
- "1000000000000000000000000000000000000000" : {
+ "0x1000000000000000000000000000000000000000" : {
"balance" : "0x64",
"code" : "0x7f6001600155601080600c6000396000f3006000355415600957005b60203560006000526035602053605560215363ffffffff60006001f0",
"nonce" : "0x00",
"storage" : {
}
},
- "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
"balance" : "0x0fffffffffffffffffffffffffffffffffffffffffffffffff",
- "code" : "0x",
+ "code" : "",
"nonce" : "0x00",
"storage" : {
}
@@ -75,10 +85,10 @@
],
"gasPrice" : "0x01",
"nonce" : "0x00",
- "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "1000000000000000000000000000000000000000",
+ "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "0x1000000000000000000000000000000000000000",
"value" : [
- "0"
+ "0x00"
]
}
}
diff --git a/GeneralStateTests/stMemoryStressTest/DELEGATECALL_Bounds.json b/GeneralStateTests/stMemoryStressTest/DELEGATECALL_Bounds.json
index 1938b26a7..1f6edd0d6 100644
--- a/GeneralStateTests/stMemoryStressTest/DELEGATECALL_Bounds.json
+++ b/GeneralStateTests/stMemoryStressTest/DELEGATECALL_Bounds.json
@@ -1,17 +1,17 @@
{
"DELEGATECALL_Bounds" : {
"env" : {
- "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x020000",
"currentGasLimit" : "0x7fffffffffffffff",
"currentNumber" : "0x01",
"currentTimestamp" : "0x03e8",
- "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
"post" : {
"EIP150" : [
{
- "hash" : "b27c28b174dbee4e5255d5ecc88a2d1bd90ecab472cb468c91264c1114ae81e1",
+ "hash" : "0xb27c28b174dbee4e5255d5ecc88a2d1bd90ecab472cb468c91264c1114ae81e1",
"indexes" : {
"data" : 0,
"gas" : 0,
@@ -21,7 +21,7 @@
],
"EIP158" : [
{
- "hash" : "b27c28b174dbee4e5255d5ecc88a2d1bd90ecab472cb468c91264c1114ae81e1",
+ "hash" : "0xb27c28b174dbee4e5255d5ecc88a2d1bd90ecab472cb468c91264c1114ae81e1",
"indexes" : {
"data" : 0,
"gas" : 0,
@@ -31,7 +31,7 @@
],
"Frontier" : [
{
- "hash" : "c31d7b8e69bc7a59de1ce8ec1ddc129779be72e51517eb3412deb4e6ddf30037",
+ "hash" : "0xc31d7b8e69bc7a59de1ce8ec1ddc129779be72e51517eb3412deb4e6ddf30037",
"indexes" : {
"data" : 0,
"gas" : 0,
@@ -41,7 +41,17 @@
],
"Homestead" : [
{
- "hash" : "e17391fbf96bebaf6bfce64c9362f701a6430c5ef2c8992a56acd4bfbbec16f1",
+ "hash" : "0xe17391fbf96bebaf6bfce64c9362f701a6430c5ef2c8992a56acd4bfbbec16f1",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ }
+ }
+ ],
+ "Metropolis" : [
+ {
+ "hash" : "0xb27c28b174dbee4e5255d5ecc88a2d1bd90ecab472cb468c91264c1114ae81e1",
"indexes" : {
"data" : 0,
"gas" : 0,
@@ -51,23 +61,23 @@
]
},
"pre" : {
- "1000000000000000000000000000000000000000" : {
+ "0x1000000000000000000000000000000000000000" : {
"balance" : "0x00",
"code" : "0x60006000600060007310000000000000000000000000000000000000016707fffffffffffffff450630fffffff6000630fffffff60007310000000000000000000000000000000000000016707fffffffffffffff45063ffffffff600063ffffffff60007310000000000000000000000000000000000000016707fffffffffffffff4506000630fffffff6000630fffffff7310000000000000000000000000000000000000016707fffffffffffffff450600063ffffffff600063ffffffff7310000000000000000000000000000000000000016707fffffffffffffff450600067ffffffffffffffff600067ffffffffffffffff7310000000000000000000000000000000000000016707fffffffffffffff45060006fffffffffffffffffffffffffffffffff60006fffffffffffffffffffffffffffffffff7310000000000000000000000000000000000000016707fffffffffffffff45060007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7310000000000000000000000000000000000000016707fffffffffffffff450630fffffff630fffffff630fffffff630fffffff7310000000000000000000000000000000000000016707fffffffffffffff4",
"nonce" : "0x00",
"storage" : {
}
},
- "1000000000000000000000000000000000000001" : {
+ "0x1000000000000000000000000000000000000001" : {
"balance" : "0x00",
"code" : "0x600054600101600055",
"nonce" : "0x00",
"storage" : {
}
},
- "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
"balance" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
- "code" : "0x",
+ "code" : "",
"nonce" : "0x00",
"storage" : {
}
@@ -82,10 +92,10 @@
],
"gasPrice" : "0x01",
"nonce" : "0x00",
- "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "1000000000000000000000000000000000000000",
+ "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "0x1000000000000000000000000000000000000000",
"value" : [
- "1"
+ "0x01"
]
}
}
diff --git a/GeneralStateTests/stMemoryStressTest/DELEGATECALL_Bounds2.json b/GeneralStateTests/stMemoryStressTest/DELEGATECALL_Bounds2.json
index 9adccf46f..ef7919830 100644
--- a/GeneralStateTests/stMemoryStressTest/DELEGATECALL_Bounds2.json
+++ b/GeneralStateTests/stMemoryStressTest/DELEGATECALL_Bounds2.json
@@ -1,17 +1,17 @@
{
"DELEGATECALL_Bounds2" : {
"env" : {
- "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x020000",
"currentGasLimit" : "0x7fffffffffffffff",
"currentNumber" : "0x01",
"currentTimestamp" : "0x03e8",
- "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
"post" : {
"EIP150" : [
{
- "hash" : "c8cdce6d6ed921c683ce88a540219959daa33b09262a55c34eccc870329118bc",
+ "hash" : "0xc8cdce6d6ed921c683ce88a540219959daa33b09262a55c34eccc870329118bc",
"indexes" : {
"data" : 0,
"gas" : 0,
@@ -21,7 +21,7 @@
],
"EIP158" : [
{
- "hash" : "c8cdce6d6ed921c683ce88a540219959daa33b09262a55c34eccc870329118bc",
+ "hash" : "0xc8cdce6d6ed921c683ce88a540219959daa33b09262a55c34eccc870329118bc",
"indexes" : {
"data" : 0,
"gas" : 0,
@@ -31,7 +31,7 @@
],
"Frontier" : [
{
- "hash" : "89dea78cbff2959e3183e6ecdb2a60f2b50c6d4fbf8741f7a7743ce8c0773b50",
+ "hash" : "0x89dea78cbff2959e3183e6ecdb2a60f2b50c6d4fbf8741f7a7743ce8c0773b50",
"indexes" : {
"data" : 0,
"gas" : 0,
@@ -41,7 +41,17 @@
],
"Homestead" : [
{
- "hash" : "1be4a45146427adeb16c4ef9f44ce79f62a462fb4224e97d38ba373244f2751d",
+ "hash" : "0x1be4a45146427adeb16c4ef9f44ce79f62a462fb4224e97d38ba373244f2751d",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ }
+ }
+ ],
+ "Metropolis" : [
+ {
+ "hash" : "0xc8cdce6d6ed921c683ce88a540219959daa33b09262a55c34eccc870329118bc",
"indexes" : {
"data" : 0,
"gas" : 0,
@@ -51,23 +61,23 @@
]
},
"pre" : {
- "1000000000000000000000000000000000000000" : {
+ "0x1000000000000000000000000000000000000000" : {
"balance" : "0x00",
"code" : "0x63ffffffff63ffffffff63ffffffff63ffffffff7310000000000000000000000000000000000000016707fffffffffffffff4",
"nonce" : "0x00",
"storage" : {
}
},
- "1000000000000000000000000000000000000001" : {
+ "0x1000000000000000000000000000000000000001" : {
"balance" : "0x00",
"code" : "0x600054600101600055",
"nonce" : "0x00",
"storage" : {
}
},
- "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
"balance" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
- "code" : "0x",
+ "code" : "",
"nonce" : "0x00",
"storage" : {
}
@@ -82,10 +92,10 @@
],
"gasPrice" : "0x01",
"nonce" : "0x00",
- "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "1000000000000000000000000000000000000000",
+ "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "0x1000000000000000000000000000000000000000",
"value" : [
- "1"
+ "0x01"
]
}
}
diff --git a/GeneralStateTests/stMemoryStressTest/FillStack.json b/GeneralStateTests/stMemoryStressTest/FillStack.json
index bf19ac2da..146eba523 100644
--- a/GeneralStateTests/stMemoryStressTest/FillStack.json
+++ b/GeneralStateTests/stMemoryStressTest/FillStack.json
@@ -1,17 +1,17 @@
{
"FillStack " : {
"env" : {
- "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
+ "currentCoinbase" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
"currentDifficulty" : "0x20000",
"currentGasLimit" : "0x7fffffffffffffff",
"currentNumber" : "0x01",
"currentTimestamp" : "0x03e8",
- "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
"post" : {
"EIP150" : [
{
- "hash" : "fce3d23dbb978bf49908221f831b52381c8a13cc354cf20130f659c481515e83",
+ "hash" : "0xfce3d23dbb978bf49908221f831b52381c8a13cc354cf20130f659c481515e83",
"indexes" : {
"data" : 0,
"gas" : 0,
@@ -21,7 +21,7 @@
],
"EIP158" : [
{
- "hash" : "fce3d23dbb978bf49908221f831b52381c8a13cc354cf20130f659c481515e83",
+ "hash" : "0xfce3d23dbb978bf49908221f831b52381c8a13cc354cf20130f659c481515e83",
"indexes" : {
"data" : 0,
"gas" : 0,
@@ -31,7 +31,7 @@
],
"Frontier" : [
{
- "hash" : "fce3d23dbb978bf49908221f831b52381c8a13cc354cf20130f659c481515e83",
+ "hash" : "0xfce3d23dbb978bf49908221f831b52381c8a13cc354cf20130f659c481515e83",
"indexes" : {
"data" : 0,
"gas" : 0,
@@ -41,7 +41,17 @@
],
"Homestead" : [
{
- "hash" : "fce3d23dbb978bf49908221f831b52381c8a13cc354cf20130f659c481515e83",
+ "hash" : "0xfce3d23dbb978bf49908221f831b52381c8a13cc354cf20130f659c481515e83",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ }
+ }
+ ],
+ "Metropolis" : [
+ {
+ "hash" : "0xfce3d23dbb978bf49908221f831b52381c8a13cc354cf20130f659c481515e83",
"indexes" : {
"data" : 0,
"gas" : 0,
@@ -51,23 +61,23 @@
]
},
"pre" : {
- "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
"balance" : "0x00",
"code" : "0x5b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe457f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3504357155320803a975560005155",
"nonce" : "0x00",
"storage" : {
}
},
- "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+ "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
"balance" : "0x2e",
"code" : "0x6000355415600957005b60203560003555",
"nonce" : "0x00",
"storage" : {
}
},
- "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
"balance" : "0x0de0b6b3a7640000",
- "code" : "0x",
+ "code" : "",
"nonce" : "0x00",
"storage" : {
}
@@ -78,14 +88,14 @@
"0x5b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe457f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3504357155320803a97"
],
"gasLimit" : [
- "3141592"
+ "0x2fefd8"
],
"gasPrice" : "0x01",
"nonce" : "0x00",
- "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+ "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
"value" : [
- "264050067"
+ "0x0fbd1593"
]
}
}
diff --git a/GeneralStateTests/stMemoryStressTest/MLOAD_Bounds3.json b/GeneralStateTests/stMemoryStressTest/MLOAD_Bounds3.json
index 686f0c104..bf0573cb0 100644
--- a/GeneralStateTests/stMemoryStressTest/MLOAD_Bounds3.json
+++ b/GeneralStateTests/stMemoryStressTest/MLOAD_Bounds3.json
@@ -1,17 +1,17 @@
{
"MLOAD_Bounds3" : {
"env" : {
- "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x020000",
"currentGasLimit" : "0x7fffffffffffffff",
"currentNumber" : "0x01",
"currentTimestamp" : "0x03e8",
- "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
"post" : {
"EIP150" : [
{
- "hash" : "db86cc22a252fa3353441234daa0324f13bfc4bfd0248a855bf04e9f46618261",
+ "hash" : "0xdb86cc22a252fa3353441234daa0324f13bfc4bfd0248a855bf04e9f46618261",
"indexes" : {
"data" : 0,
"gas" : 0,
@@ -21,7 +21,7 @@
],
"EIP158" : [
{
- "hash" : "db86cc22a252fa3353441234daa0324f13bfc4bfd0248a855bf04e9f46618261",
+ "hash" : "0xdb86cc22a252fa3353441234daa0324f13bfc4bfd0248a855bf04e9f46618261",
"indexes" : {
"data" : 0,
"gas" : 0,
@@ -31,7 +31,7 @@
],
"Frontier" : [
{
- "hash" : "db86cc22a252fa3353441234daa0324f13bfc4bfd0248a855bf04e9f46618261",
+ "hash" : "0xdb86cc22a252fa3353441234daa0324f13bfc4bfd0248a855bf04e9f46618261",
"indexes" : {
"data" : 0,
"gas" : 0,
@@ -41,7 +41,17 @@
],
"Homestead" : [
{
- "hash" : "db86cc22a252fa3353441234daa0324f13bfc4bfd0248a855bf04e9f46618261",
+ "hash" : "0xdb86cc22a252fa3353441234daa0324f13bfc4bfd0248a855bf04e9f46618261",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ }
+ }
+ ],
+ "Metropolis" : [
+ {
+ "hash" : "0xdb86cc22a252fa3353441234daa0324f13bfc4bfd0248a855bf04e9f46618261",
"indexes" : {
"data" : 0,
"gas" : 0,
@@ -51,16 +61,16 @@
]
},
"pre" : {
- "1000000000000000000000000000000000000000" : {
+ "0x1000000000000000000000000000000000000000" : {
"balance" : "0x00",
"code" : "0x6240000051",
"nonce" : "0x00",
"storage" : {
}
},
- "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
"balance" : "0x07ffffffffffffffffff",
- "code" : "0x",
+ "code" : "",
"nonce" : "0x00",
"storage" : {
}
@@ -71,14 +81,14 @@
""
],
"gasLimit" : [
- "35000000"
+ "0x02160ec0"
],
"gasPrice" : "0x01",
"nonce" : "0x00",
- "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "1000000000000000000000000000000000000000",
+ "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "0x1000000000000000000000000000000000000000",
"value" : [
- "1"
+ "0x01"
]
}
}
diff --git a/GeneralStateTests/stMemoryStressTest/MSTORE_Bounds2a.json b/GeneralStateTests/stMemoryStressTest/MSTORE_Bounds2a.json
index 1f82d7f29..ff9d5a52c 100644
--- a/GeneralStateTests/stMemoryStressTest/MSTORE_Bounds2a.json
+++ b/GeneralStateTests/stMemoryStressTest/MSTORE_Bounds2a.json
@@ -1,17 +1,17 @@
{
"MSTORE_Bounds2a" : {
"env" : {
- "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x020000",
"currentGasLimit" : "0x7fffffffffffffff",
"currentNumber" : "0x01",
"currentTimestamp" : "0x03e8",
- "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
"post" : {
"EIP150" : [
{
- "hash" : "96000f218ecd16570c217a01ff0261ba7d1533cbfc6e65a8a2715582390db7b5",
+ "hash" : "0x96000f218ecd16570c217a01ff0261ba7d1533cbfc6e65a8a2715582390db7b5",
"indexes" : {
"data" : 0,
"gas" : 0,
@@ -21,7 +21,7 @@
],
"EIP158" : [
{
- "hash" : "96000f218ecd16570c217a01ff0261ba7d1533cbfc6e65a8a2715582390db7b5",
+ "hash" : "0x96000f218ecd16570c217a01ff0261ba7d1533cbfc6e65a8a2715582390db7b5",
"indexes" : {
"data" : 0,
"gas" : 0,
@@ -31,7 +31,7 @@
],
"Frontier" : [
{
- "hash" : "96000f218ecd16570c217a01ff0261ba7d1533cbfc6e65a8a2715582390db7b5",
+ "hash" : "0x96000f218ecd16570c217a01ff0261ba7d1533cbfc6e65a8a2715582390db7b5",
"indexes" : {
"data" : 0,
"gas" : 0,
@@ -41,7 +41,17 @@
],
"Homestead" : [
{
- "hash" : "96000f218ecd16570c217a01ff0261ba7d1533cbfc6e65a8a2715582390db7b5",
+ "hash" : "0x96000f218ecd16570c217a01ff0261ba7d1533cbfc6e65a8a2715582390db7b5",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ }
+ }
+ ],
+ "Metropolis" : [
+ {
+ "hash" : "0x96000f218ecd16570c217a01ff0261ba7d1533cbfc6e65a8a2715582390db7b5",
"indexes" : {
"data" : 0,
"gas" : 0,
@@ -51,16 +61,16 @@
]
},
"pre" : {
- "1000000000000000000000000000000000000000" : {
+ "0x1000000000000000000000000000000000000000" : {
"balance" : "0x00",
"code" : "0x6001623fffff52",
"nonce" : "0x00",
"storage" : {
}
},
- "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
"balance" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
- "code" : "0x",
+ "code" : "",
"nonce" : "0x00",
"storage" : {
}
@@ -71,14 +81,14 @@
""
],
"gasLimit" : [
- "34000000"
+ "0x0206cc80"
],
"gasPrice" : "0x01",
"nonce" : "0x00",
- "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "1000000000000000000000000000000000000000",
+ "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "0x1000000000000000000000000000000000000000",
"value" : [
- "1"
+ "0x01"
]
}
}
diff --git a/GeneralStateTests/stMemoryStressTest/mload32bitBound.json b/GeneralStateTests/stMemoryStressTest/mload32bitBound.json
index 449013e9d..cc5df34ee 100644
--- a/GeneralStateTests/stMemoryStressTest/mload32bitBound.json
+++ b/GeneralStateTests/stMemoryStressTest/mload32bitBound.json
@@ -1,17 +1,17 @@
{
"mload32bitBound " : {
"env" : {
- "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x20000",
"currentGasLimit" : "0x10000804025c",
"currentNumber" : "0x01",
"currentTimestamp" : "0x03e8",
- "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
"post" : {
"EIP150" : [
{
- "hash" : "8a47d8a8689889820bd4273dd667ece01f288b091ce244c671a6394dc4109f1f",
+ "hash" : "0x8a47d8a8689889820bd4273dd667ece01f288b091ce244c671a6394dc4109f1f",
"indexes" : {
"data" : 0,
"gas" : 0,
@@ -21,7 +21,7 @@
],
"EIP158" : [
{
- "hash" : "8a47d8a8689889820bd4273dd667ece01f288b091ce244c671a6394dc4109f1f",
+ "hash" : "0x8a47d8a8689889820bd4273dd667ece01f288b091ce244c671a6394dc4109f1f",
"indexes" : {
"data" : 0,
"gas" : 0,
@@ -31,7 +31,7 @@
],
"Frontier" : [
{
- "hash" : "8a47d8a8689889820bd4273dd667ece01f288b091ce244c671a6394dc4109f1f",
+ "hash" : "0x8a47d8a8689889820bd4273dd667ece01f288b091ce244c671a6394dc4109f1f",
"indexes" : {
"data" : 0,
"gas" : 0,
@@ -41,7 +41,17 @@
],
"Homestead" : [
{
- "hash" : "8a47d8a8689889820bd4273dd667ece01f288b091ce244c671a6394dc4109f1f",
+ "hash" : "0x8a47d8a8689889820bd4273dd667ece01f288b091ce244c671a6394dc4109f1f",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ }
+ }
+ ],
+ "Metropolis" : [
+ {
+ "hash" : "0x8a47d8a8689889820bd4273dd667ece01f288b091ce244c671a6394dc4109f1f",
"indexes" : {
"data" : 0,
"gas" : 0,
@@ -51,16 +61,16 @@
]
},
"pre" : {
- "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
"balance" : "0x0de0b6b3a7640000",
"code" : "0x64010000000051600155",
"nonce" : "0x00",
"storage" : {
}
},
- "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
"balance" : "0xa00050281798",
- "code" : "0x",
+ "code" : "",
"nonce" : "0x00",
"storage" : {
}
@@ -71,14 +81,14 @@
""
],
"gasLimit" : [
- "17592320524892"
+ "0x10000804025c"
],
"gasPrice" : "0x01",
"nonce" : "0x00",
- "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+ "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"value" : [
- "10"
+ "0x0a"
]
}
}
diff --git a/GeneralStateTests/stMemoryStressTest/mload32bitBound2.json b/GeneralStateTests/stMemoryStressTest/mload32bitBound2.json
index 5d52afdb5..6ca541147 100644
--- a/GeneralStateTests/stMemoryStressTest/mload32bitBound2.json
+++ b/GeneralStateTests/stMemoryStressTest/mload32bitBound2.json
@@ -1,17 +1,17 @@
{
"mload32bitBound2 " : {
"env" : {
- "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x20000",
"currentGasLimit" : "0x225eebec75ab",
"currentNumber" : "0x01",
"currentTimestamp" : "0x03e8",
- "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
"post" : {
"EIP150" : [
{
- "hash" : "6965350d67785b430326cd01f5c523976fa9361740a6f09f2f8b1f1f7940b6ec",
+ "hash" : "0x6965350d67785b430326cd01f5c523976fa9361740a6f09f2f8b1f1f7940b6ec",
"indexes" : {
"data" : 0,
"gas" : 0,
@@ -21,7 +21,7 @@
],
"EIP158" : [
{
- "hash" : "6965350d67785b430326cd01f5c523976fa9361740a6f09f2f8b1f1f7940b6ec",
+ "hash" : "0x6965350d67785b430326cd01f5c523976fa9361740a6f09f2f8b1f1f7940b6ec",
"indexes" : {
"data" : 0,
"gas" : 0,
@@ -31,7 +31,7 @@
],
"Frontier" : [
{
- "hash" : "6965350d67785b430326cd01f5c523976fa9361740a6f09f2f8b1f1f7940b6ec",
+ "hash" : "0x6965350d67785b430326cd01f5c523976fa9361740a6f09f2f8b1f1f7940b6ec",
"indexes" : {
"data" : 0,
"gas" : 0,
@@ -41,7 +41,17 @@
],
"Homestead" : [
{
- "hash" : "6965350d67785b430326cd01f5c523976fa9361740a6f09f2f8b1f1f7940b6ec",
+ "hash" : "0x6965350d67785b430326cd01f5c523976fa9361740a6f09f2f8b1f1f7940b6ec",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ }
+ }
+ ],
+ "Metropolis" : [
+ {
+ "hash" : "0x6965350d67785b430326cd01f5c523976fa9361740a6f09f2f8b1f1f7940b6ec",
"indexes" : {
"data" : 0,
"gas" : 0,
@@ -51,16 +61,16 @@
]
},
"pre" : {
- "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
"balance" : "0x0de0b6b3a7640000",
"code" : "0x64017735940051600155",
"nonce" : "0x00",
"storage" : {
}
},
- "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
"balance" : "0x0157b5373e07ca",
- "code" : "0x",
+ "code" : "",
"nonce" : "0x00",
"storage" : {
}
@@ -71,14 +81,14 @@
""
],
"gasLimit" : [
- "37791080412587"
+ "0x225eebec75ab"
],
"gasPrice" : "0x01",
"nonce" : "0x00",
- "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+ "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"value" : [
- "10"
+ "0x0a"
]
}
}
diff --git a/GeneralStateTests/stMemoryStressTest/mload32bitBound_Msize.json b/GeneralStateTests/stMemoryStressTest/mload32bitBound_Msize.json
index 3749b11a4..e02896390 100644
--- a/GeneralStateTests/stMemoryStressTest/mload32bitBound_Msize.json
+++ b/GeneralStateTests/stMemoryStressTest/mload32bitBound_Msize.json
@@ -1,17 +1,17 @@
{
"mload32bitBound_Msize " : {
"env" : {
- "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x20000",
"currentGasLimit" : "0x027101391c9c29c0",
"currentNumber" : "0x01",
"currentTimestamp" : "0x03e8",
- "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
"post" : {
"EIP150" : [
{
- "hash" : "f5cba7b1b92529ff627b7c99277dce9461d3b4cf23b030d82a3c67411d22315d",
+ "hash" : "0xf5cba7b1b92529ff627b7c99277dce9461d3b4cf23b030d82a3c67411d22315d",
"indexes" : {
"data" : 0,
"gas" : 0,
@@ -21,7 +21,7 @@
],
"EIP158" : [
{
- "hash" : "f5cba7b1b92529ff627b7c99277dce9461d3b4cf23b030d82a3c67411d22315d",
+ "hash" : "0xf5cba7b1b92529ff627b7c99277dce9461d3b4cf23b030d82a3c67411d22315d",
"indexes" : {
"data" : 0,
"gas" : 0,
@@ -31,7 +31,7 @@
],
"Frontier" : [
{
- "hash" : "f5cba7b1b92529ff627b7c99277dce9461d3b4cf23b030d82a3c67411d22315d",
+ "hash" : "0xf5cba7b1b92529ff627b7c99277dce9461d3b4cf23b030d82a3c67411d22315d",
"indexes" : {
"data" : 0,
"gas" : 0,
@@ -41,7 +41,17 @@
],
"Homestead" : [
{
- "hash" : "f5cba7b1b92529ff627b7c99277dce9461d3b4cf23b030d82a3c67411d22315d",
+ "hash" : "0xf5cba7b1b92529ff627b7c99277dce9461d3b4cf23b030d82a3c67411d22315d",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ }
+ }
+ ],
+ "Metropolis" : [
+ {
+ "hash" : "0xf5cba7b1b92529ff627b7c99277dce9461d3b4cf23b030d82a3c67411d22315d",
"indexes" : {
"data" : 0,
"gas" : 0,
@@ -51,16 +61,16 @@
]
},
"pre" : {
- "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
"balance" : "0x0de0b6b3a7640000",
"code" : "0x600163ffffffff5259600055",
"nonce" : "0x00",
"storage" : {
}
},
- "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
"balance" : "0x186a0c3b1e19a180",
- "code" : "0x",
+ "code" : "",
"nonce" : "0x00",
"storage" : {
}
@@ -71,14 +81,14 @@
""
],
"gasLimit" : [
- "175923205248920000"
+ "0x027101391c9c29c0"
],
"gasPrice" : "0x01",
"nonce" : "0x00",
- "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+ "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"value" : [
- "0"
+ "0x00"
]
}
}
diff --git a/GeneralStateTests/stMemoryStressTest/mload32bitBound_return.json b/GeneralStateTests/stMemoryStressTest/mload32bitBound_return.json
index 87da38baa..2fef6099f 100644
--- a/GeneralStateTests/stMemoryStressTest/mload32bitBound_return.json
+++ b/GeneralStateTests/stMemoryStressTest/mload32bitBound_return.json
@@ -1,17 +1,17 @@
{
"mload32bitBound_return" : {
"env" : {
- "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x20000",
"currentGasLimit" : "0x10000804025c",
"currentNumber" : "0x01",
"currentTimestamp" : "0x03e8",
- "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
"post" : {
"EIP150" : [
{
- "hash" : "ad76a30bcf84e4ae9c515dfd9d5530b062b8fa4fe5b442d683ccb90d6ff9d6ab",
+ "hash" : "0xad76a30bcf84e4ae9c515dfd9d5530b062b8fa4fe5b442d683ccb90d6ff9d6ab",
"indexes" : {
"data" : 0,
"gas" : 0,
@@ -21,7 +21,7 @@
],
"EIP158" : [
{
- "hash" : "ad76a30bcf84e4ae9c515dfd9d5530b062b8fa4fe5b442d683ccb90d6ff9d6ab",
+ "hash" : "0xad76a30bcf84e4ae9c515dfd9d5530b062b8fa4fe5b442d683ccb90d6ff9d6ab",
"indexes" : {
"data" : 0,
"gas" : 0,
@@ -31,7 +31,7 @@
],
"Frontier" : [
{
- "hash" : "ad76a30bcf84e4ae9c515dfd9d5530b062b8fa4fe5b442d683ccb90d6ff9d6ab",
+ "hash" : "0xad76a30bcf84e4ae9c515dfd9d5530b062b8fa4fe5b442d683ccb90d6ff9d6ab",
"indexes" : {
"data" : 0,
"gas" : 0,
@@ -41,7 +41,17 @@
],
"Homestead" : [
{
- "hash" : "ad76a30bcf84e4ae9c515dfd9d5530b062b8fa4fe5b442d683ccb90d6ff9d6ab",
+ "hash" : "0xad76a30bcf84e4ae9c515dfd9d5530b062b8fa4fe5b442d683ccb90d6ff9d6ab",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ }
+ }
+ ],
+ "Metropolis" : [
+ {
+ "hash" : "0xad76a30bcf84e4ae9c515dfd9d5530b062b8fa4fe5b442d683ccb90d6ff9d6ab",
"indexes" : {
"data" : 0,
"gas" : 0,
@@ -51,16 +61,16 @@
]
},
"pre" : {
- "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
"balance" : "0x0de0b6b3a7640000",
"code" : "0x63ffffffff6000f3",
"nonce" : "0x00",
"storage" : {
}
},
- "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
"balance" : "0x186a0c3b1e19a180",
- "code" : "0x",
+ "code" : "",
"nonce" : "0x00",
"storage" : {
}
@@ -71,14 +81,14 @@
""
],
"gasLimit" : [
- "175923205248920000"
+ "0x027101391c9c29c0"
],
"gasPrice" : "0x01",
"nonce" : "0x00",
- "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+ "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"value" : [
- "0"
+ "0x00"
]
}
}
diff --git a/GeneralStateTests/stMemoryStressTest/mload32bitBound_return2.json b/GeneralStateTests/stMemoryStressTest/mload32bitBound_return2.json
index f058935d4..fea83db11 100644
--- a/GeneralStateTests/stMemoryStressTest/mload32bitBound_return2.json
+++ b/GeneralStateTests/stMemoryStressTest/mload32bitBound_return2.json
@@ -1,17 +1,17 @@
{
"mload32bitBound_return2" : {
"env" : {
- "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x20000",
"currentGasLimit" : "0x027101391c9c29c0",
"currentNumber" : "0x01",
"currentTimestamp" : "0x03e8",
- "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
"post" : {
"EIP150" : [
{
- "hash" : "b95676d3103fc4a6bdcfb1c201a6ed49e0fa7a239520a4b8ac034ce3b6c697eb",
+ "hash" : "0xb95676d3103fc4a6bdcfb1c201a6ed49e0fa7a239520a4b8ac034ce3b6c697eb",
"indexes" : {
"data" : 0,
"gas" : 0,
@@ -21,7 +21,7 @@
],
"EIP158" : [
{
- "hash" : "b95676d3103fc4a6bdcfb1c201a6ed49e0fa7a239520a4b8ac034ce3b6c697eb",
+ "hash" : "0xb95676d3103fc4a6bdcfb1c201a6ed49e0fa7a239520a4b8ac034ce3b6c697eb",
"indexes" : {
"data" : 0,
"gas" : 0,
@@ -31,7 +31,7 @@
],
"Frontier" : [
{
- "hash" : "b95676d3103fc4a6bdcfb1c201a6ed49e0fa7a239520a4b8ac034ce3b6c697eb",
+ "hash" : "0xb95676d3103fc4a6bdcfb1c201a6ed49e0fa7a239520a4b8ac034ce3b6c697eb",
"indexes" : {
"data" : 0,
"gas" : 0,
@@ -41,7 +41,17 @@
],
"Homestead" : [
{
- "hash" : "b95676d3103fc4a6bdcfb1c201a6ed49e0fa7a239520a4b8ac034ce3b6c697eb",
+ "hash" : "0xb95676d3103fc4a6bdcfb1c201a6ed49e0fa7a239520a4b8ac034ce3b6c697eb",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ }
+ }
+ ],
+ "Metropolis" : [
+ {
+ "hash" : "0xb95676d3103fc4a6bdcfb1c201a6ed49e0fa7a239520a4b8ac034ce3b6c697eb",
"indexes" : {
"data" : 0,
"gas" : 0,
@@ -51,16 +61,16 @@
]
},
"pre" : {
- "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+ "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
"balance" : "0x0de0b6b3a7640000",
"code" : "0x600160005263ffffffff6000f3",
"nonce" : "0x00",
"storage" : {
}
},
- "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
"balance" : "0x186a0c3b1e19a180",
- "code" : "0x",
+ "code" : "",
"nonce" : "0x00",
"storage" : {
}
@@ -71,14 +81,14 @@
""
],
"gasLimit" : [
- "175923205248920000"
+ "0x027101391c9c29c0"
],
"gasPrice" : "0x01",
"nonce" : "0x00",
- "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+ "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
"value" : [
- "0"
+ "0x00"
]
}
}