From f71c2688e1a839f8429f7e94ec5e56bb182d82cf Mon Sep 17 00:00:00 2001
From: Dimitry <winsvega@mail.ru>
Date: Tue, 1 Aug 2017 09:11:00 +0300
Subject: regenerate hive tests
---
.../stMemoryStressTest/DELEGATECALL_Bounds3.json | 192 +++++----------------
1 file changed, 40 insertions(+), 152 deletions(-)
(limited to 'GeneralStateTests/stMemoryStressTest/DELEGATECALL_Bounds3.json')
diff --git a/GeneralStateTests/stMemoryStressTest/DELEGATECALL_Bounds3.json b/GeneralStateTests/stMemoryStressTest/DELEGATECALL_Bounds3.json
index af686c723..8a769d248 100644
--- a/GeneralStateTests/stMemoryStressTest/DELEGATECALL_Bounds3.json
+++ b/GeneralStateTests/stMemoryStressTest/DELEGATECALL_Bounds3.json
@@ -2,168 +2,56 @@
"DELEGATECALL_Bounds3" : {
"_info" : {
"comment" : "",
- "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++",
+ "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
"source" : "/src/GeneralStateTestsFiller/stMemoryStressTest/DELEGATECALL_Bounds3Filler.json"
},
"env" : {
- "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x020000",
"currentGasLimit" : "0x7fffffffffffffff",
- "currentNumber" : "0x01",
- "currentTimestamp" : "0x03e8",
- "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentNumber" : "1",
+ "currentTimestamp" : "1000",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "post" : {
- "EIP150" : [
- {
- "hash" : "0xf793b64000efb8c77680f6f8027b23cc505dfeaff9c606c1cca06f1720590ee0",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- },
- {
- "hash" : "0x33d6d4cda8d3f3eeb843eecc1b8906df7ccdc98c30d87b44b06a1967982f738e",
- "indexes" : {
- "data" : 0,
- "gas" : 1,
- "value" : 0
- }
- },
- {
- "hash" : "0x4696c13fb38be20d2c995108de8a4fe0f87a5a8dd0af47bb84d948c29f28c871",
- "indexes" : {
- "data" : 0,
- "gas" : 2,
- "value" : 0
- }
- }
- ],
- "EIP158" : [
- {
- "hash" : "0xf793b64000efb8c77680f6f8027b23cc505dfeaff9c606c1cca06f1720590ee0",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- },
- {
- "hash" : "0x33d6d4cda8d3f3eeb843eecc1b8906df7ccdc98c30d87b44b06a1967982f738e",
- "indexes" : {
- "data" : 0,
- "gas" : 1,
- "value" : 0
- }
- },
- {
- "hash" : "0x4696c13fb38be20d2c995108de8a4fe0f87a5a8dd0af47bb84d948c29f28c871",
- "indexes" : {
- "data" : 0,
- "gas" : 2,
- "value" : 0
- }
- }
- ],
- "Frontier" : [
- {
- "hash" : "0xf793b64000efb8c77680f6f8027b23cc505dfeaff9c606c1cca06f1720590ee0",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- },
- {
- "hash" : "0x33d6d4cda8d3f3eeb843eecc1b8906df7ccdc98c30d87b44b06a1967982f738e",
- "indexes" : {
- "data" : 0,
- "gas" : 1,
- "value" : 0
- }
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
},
- {
- "hash" : "0x4696c13fb38be20d2c995108de8a4fe0f87a5a8dd0af47bb84d948c29f28c871",
- "indexes" : {
- "data" : 0,
- "gas" : 2,
- "value" : 0
+ "network" : [
+ "ALL"
+ ],
+ "result" : {
+ "1000000000000000000000000000000000000000" : {
+ "balance" : "0",
+ "storage" : {
+ "0x00" : "0x00"
+ }
}
}
- ],
- "Homestead" : [
- {
- "hash" : "0xf793b64000efb8c77680f6f8027b23cc505dfeaff9c606c1cca06f1720590ee0",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- },
- {
- "hash" : "0x33d6d4cda8d3f3eeb843eecc1b8906df7ccdc98c30d87b44b06a1967982f738e",
- "indexes" : {
- "data" : 0,
- "gas" : 1,
- "value" : 0
- }
- },
- {
- "hash" : "0x4696c13fb38be20d2c995108de8a4fe0f87a5a8dd0af47bb84d948c29f28c871",
- "indexes" : {
- "data" : 0,
- "gas" : 2,
- "value" : 0
- }
- }
- ],
- "Metropolis" : [
- {
- "hash" : "0xf793b64000efb8c77680f6f8027b23cc505dfeaff9c606c1cca06f1720590ee0",
- "indexes" : {
- "data" : 0,
- "gas" : 0,
- "value" : 0
- }
- },
- {
- "hash" : "0x33d6d4cda8d3f3eeb843eecc1b8906df7ccdc98c30d87b44b06a1967982f738e",
- "indexes" : {
- "data" : 0,
- "gas" : 1,
- "value" : 0
- }
- },
- {
- "hash" : "0x4696c13fb38be20d2c995108de8a4fe0f87a5a8dd0af47bb84d948c29f28c871",
- "indexes" : {
- "data" : 0,
- "gas" : 2,
- "value" : 0
- }
- }
- ]
- },
+ }
+ ],
"pre" : {
- "0x1000000000000000000000000000000000000000" : {
- "balance" : "0x00",
- "code" : "0x67ffffffffffffffff600067ffffffffffffffff60007310000000000000000000000000000000000000016707fffffffffffffff4506fffffffffffffffffffffffffffffffff60006fffffffffffffffffffffffffffffffff60007310000000000000000000000000000000000000016707fffffffffffffff4507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60007310000000000000000000000000000000000000016707fffffffffffffff45067ffffffffffffffff67ffffffffffffffff67ffffffffffffffff67ffffffffffffffff7310000000000000000000000000000000000000016707fffffffffffffff4506fffffffffffffffffffffffffffffffff6fffffffffffffffffffffffffffffffff6fffffffffffffffffffffffffffffffff6fffffffffffffffffffffffffffffffff7310000000000000000000000000000000000000016707fffffffffffffff4507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffff",
- "nonce" : "0x00",
+ "1000000000000000000000000000000000000000" : {
+ "balance" : "0",
+ "code" : "{ (DELEGATECALL 0x7ffffffffffffff 0x1000000000000000000000000000000000000001 0 0xffffffffffffffff 0 0xffffffffffffffff) (DELEGATECALL 0x7ffffffffffffff 0x1000000000000000000000000000000000000001 0 0xffffffffffffffffffffffffffffffff 0 0xffffffffffffffffffffffffffffffff) (DELEGATECALL 0x7ffffffffffffff 0x1000000000000000000000000000000000000001 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (DELEGATECALL 0x7ffffffffffffff 0x1000000000000000000000000000000000000001 0xffffffffffffffff 0xffffffffffffffff 0xffffffffffffffff 0xffffffffffffffff) (DELEGATECALL 0x7ffffffffffffff 0x1000000000000000000000000000000000000001 0xffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffff) (DELEGATECALL 0x7ffffffffffffff 0x1000000000000000000000000000000000000001 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) }",
+ "nonce" : "0",
"storage" : {
}
},
- "0x1000000000000000000000000000000000000001" : {
- "balance" : "0x00",
- "code" : "0x600054600101600055",
- "nonce" : "0x00",
+ "1000000000000000000000000000000000000001" : {
+ "balance" : "0",
+ "code" : "{ (SSTORE 0 (ADD 1 (SLOAD 0))) }",
+ "nonce" : "0",
"storage" : {
}
},
- "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
"balance" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
"code" : "",
- "nonce" : "0x00",
+ "nonce" : "0",
"storage" : {
}
}
@@ -173,16 +61,16 @@
""
],
"gasLimit" : [
- "0x0249f0",
- "0x0f4240",
- "0x0ee6b280"
+ "150000",
+ "1000000",
+ "250000000"
],
- "gasPrice" : "0x01",
- "nonce" : "0x00",
- "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "0x1000000000000000000000000000000000000000",
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "1000000000000000000000000000000000000000",
"value" : [
- "0x01"
+ "1"
]
}
}
--
cgit v1.2.3
From 78c52764c6c26f0a3c2dca25fcd2e1b932ee2c43 Mon Sep 17 00:00:00 2001
From: Dimitry <winsvega@mail.ru>
Date: Tue, 1 Aug 2017 11:04:30 +0300
Subject: update general tests
---
.../stMemoryStressTest/DELEGATECALL_Bounds3.json | 222 +++++++++++++++++----
1 file changed, 182 insertions(+), 40 deletions(-)
(limited to 'GeneralStateTests/stMemoryStressTest/DELEGATECALL_Bounds3.json')
diff --git a/GeneralStateTests/stMemoryStressTest/DELEGATECALL_Bounds3.json b/GeneralStateTests/stMemoryStressTest/DELEGATECALL_Bounds3.json
index 8a769d248..17659ea69 100644
--- a/GeneralStateTests/stMemoryStressTest/DELEGATECALL_Bounds3.json
+++ b/GeneralStateTests/stMemoryStressTest/DELEGATECALL_Bounds3.json
@@ -6,52 +6,194 @@
"source" : "/src/GeneralStateTestsFiller/stMemoryStressTest/DELEGATECALL_Bounds3Filler.json"
},
"env" : {
- "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "0x020000",
"currentGasLimit" : "0x7fffffffffffffff",
- "currentNumber" : "1",
- "currentTimestamp" : "1000",
- "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ "currentNumber" : "0x01",
+ "currentTimestamp" : "0x03e8",
+ "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
},
- "expect" : [
- {
- "indexes" : {
- "data" : -1,
- "gas" : -1,
- "value" : -1
+ "post" : {
+ "EIP150" : [
+ {
+ "hash" : "0xf793b64000efb8c77680f6f8027b23cc505dfeaff9c606c1cca06f1720590ee0",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
},
- "network" : [
- "ALL"
- ],
- "result" : {
- "1000000000000000000000000000000000000000" : {
- "balance" : "0",
- "storage" : {
- "0x00" : "0x00"
- }
- }
+ {
+ "hash" : "0x33d6d4cda8d3f3eeb843eecc1b8906df7ccdc98c30d87b44b06a1967982f738e",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0x4696c13fb38be20d2c995108de8a4fe0f87a5a8dd0af47bb84d948c29f28c871",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 2,
+ "value" : 0
+ },
+ "logs" : [
+ ]
}
- }
- ],
+ ],
+ "EIP158" : [
+ {
+ "hash" : "0xf793b64000efb8c77680f6f8027b23cc505dfeaff9c606c1cca06f1720590ee0",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0x33d6d4cda8d3f3eeb843eecc1b8906df7ccdc98c30d87b44b06a1967982f738e",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0x4696c13fb38be20d2c995108de8a4fe0f87a5a8dd0af47bb84d948c29f28c871",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 2,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ],
+ "Frontier" : [
+ {
+ "hash" : "0xf793b64000efb8c77680f6f8027b23cc505dfeaff9c606c1cca06f1720590ee0",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0x33d6d4cda8d3f3eeb843eecc1b8906df7ccdc98c30d87b44b06a1967982f738e",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0x4696c13fb38be20d2c995108de8a4fe0f87a5a8dd0af47bb84d948c29f28c871",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 2,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ],
+ "Homestead" : [
+ {
+ "hash" : "0xf793b64000efb8c77680f6f8027b23cc505dfeaff9c606c1cca06f1720590ee0",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0x33d6d4cda8d3f3eeb843eecc1b8906df7ccdc98c30d87b44b06a1967982f738e",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0x4696c13fb38be20d2c995108de8a4fe0f87a5a8dd0af47bb84d948c29f28c871",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 2,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ],
+ "Metropolis" : [
+ {
+ "hash" : "0xf793b64000efb8c77680f6f8027b23cc505dfeaff9c606c1cca06f1720590ee0",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0x33d6d4cda8d3f3eeb843eecc1b8906df7ccdc98c30d87b44b06a1967982f738e",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ },
+ {
+ "hash" : "0x4696c13fb38be20d2c995108de8a4fe0f87a5a8dd0af47bb84d948c29f28c871",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 2,
+ "value" : 0
+ },
+ "logs" : [
+ ]
+ }
+ ]
+ },
"pre" : {
- "1000000000000000000000000000000000000000" : {
- "balance" : "0",
- "code" : "{ (DELEGATECALL 0x7ffffffffffffff 0x1000000000000000000000000000000000000001 0 0xffffffffffffffff 0 0xffffffffffffffff) (DELEGATECALL 0x7ffffffffffffff 0x1000000000000000000000000000000000000001 0 0xffffffffffffffffffffffffffffffff 0 0xffffffffffffffffffffffffffffffff) (DELEGATECALL 0x7ffffffffffffff 0x1000000000000000000000000000000000000001 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (DELEGATECALL 0x7ffffffffffffff 0x1000000000000000000000000000000000000001 0xffffffffffffffff 0xffffffffffffffff 0xffffffffffffffff 0xffffffffffffffff) (DELEGATECALL 0x7ffffffffffffff 0x1000000000000000000000000000000000000001 0xffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffff) (DELEGATECALL 0x7ffffffffffffff 0x1000000000000000000000000000000000000001 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) }",
- "nonce" : "0",
+ "0x1000000000000000000000000000000000000000" : {
+ "balance" : "0x00",
+ "code" : "0x67ffffffffffffffff600067ffffffffffffffff60007310000000000000000000000000000000000000016707fffffffffffffff4506fffffffffffffffffffffffffffffffff60006fffffffffffffffffffffffffffffffff60007310000000000000000000000000000000000000016707fffffffffffffff4507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60007310000000000000000000000000000000000000016707fffffffffffffff45067ffffffffffffffff67ffffffffffffffff67ffffffffffffffff67ffffffffffffffff7310000000000000000000000000000000000000016707fffffffffffffff4506fffffffffffffffffffffffffffffffff6fffffffffffffffffffffffffffffffff6fffffffffffffffffffffffffffffffff6fffffffffffffffffffffffffffffffff7310000000000000000000000000000000000000016707fffffffffffffff4507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffff",
+ "nonce" : "0x00",
"storage" : {
}
},
- "1000000000000000000000000000000000000001" : {
- "balance" : "0",
- "code" : "{ (SSTORE 0 (ADD 1 (SLOAD 0))) }",
- "nonce" : "0",
+ "0x1000000000000000000000000000000000000001" : {
+ "balance" : "0x00",
+ "code" : "0x600054600101600055",
+ "nonce" : "0x00",
"storage" : {
}
},
- "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
"balance" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
"code" : "",
- "nonce" : "0",
+ "nonce" : "0x00",
"storage" : {
}
}
@@ -61,16 +203,16 @@
""
],
"gasLimit" : [
- "150000",
- "1000000",
- "250000000"
+ "0x0249f0",
+ "0x0f4240",
+ "0x0ee6b280"
],
- "gasPrice" : "1",
- "nonce" : "0",
- "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
- "to" : "1000000000000000000000000000000000000000",
+ "gasPrice" : "0x01",
+ "nonce" : "0x00",
+ "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "0x1000000000000000000000000000000000000000",
"value" : [
- "1"
+ "0x01"
]
}
}
--
cgit v1.2.3