From cf002a461167847647e91f0be0c6c0df6867a937 Mon Sep 17 00:00:00 2001
From: CJentzsch <jentzsch.software@gmail.com>
Date: Tue, 10 Feb 2015 11:22:50 +0100
Subject: undo changed due to memory gas cost rule
---
StateTests/stPreCompiledContracts.json | 8 +-
VMTests/vmSha3Test.json | 362 +--------------------------------
2 files changed, 5 insertions(+), 365 deletions(-)
diff --git a/StateTests/stPreCompiledContracts.json b/StateTests/stPreCompiledContracts.json
index 8cca6f7a4..0f1db1275 100644
--- a/StateTests/stPreCompiledContracts.json
+++ b/StateTests/stPreCompiledContracts.json
@@ -1074,14 +1074,14 @@
}
},
"2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
- "balance" : "986358",
+ "balance" : "32684",
"code" : "0x",
"nonce" : "0",
"storage" : {
}
},
"a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "999999999998913642",
+ "balance" : "999999999999867316",
"code" : "0x",
"nonce" : "1",
"storage" : {
@@ -1631,14 +1631,14 @@
}
},
"2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
- "balance" : "986358",
+ "balance" : "32684",
"code" : "0x",
"nonce" : "0",
"storage" : {
}
},
"a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "999999999998913642",
+ "balance" : "999999999999867316",
"code" : "0x",
"nonce" : "1",
"storage" : {
diff --git a/VMTests/vmSha3Test.json b/VMTests/vmSha3Test.json
index 7a054cf89..2004536a1 100644
--- a/VMTests/vmSha3Test.json
+++ b/VMTests/vmSha3Test.json
@@ -300,7 +300,7 @@
"origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
"value" : "115792089237316195423570985008687907853269984665640564039457584007913129639935"
},
- "gas" : "4026006204",
+ "gas" : "4294442684",
"logs" : [
],
"out" : "0x",
@@ -352,365 +352,5 @@
}
}
}
- },
- "sha3_memSizeNoQuadraticCost31" : {
- "callcreates" : [
- ],
- "env" : {
- "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
- "currentDifficulty" : "256",
- "currentGasLimit" : "1000000",
- "currentNumber" : "0",
- "currentTimestamp" : "1",
- "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
- },
- "exec" : {
- "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
- "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
- "code" : "0x60016103c020600055",
- "data" : "0x",
- "gas" : "4294967296",
- "gasPrice" : "1",
- "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
- "value" : "115792089237316195423570985008687907853269984665640564039457584007913129639935"
- },
- "gas" : "4294966942",
- "logs" : [
- ],
- "out" : "0x",
- "post" : {
- "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
- "balance" : "115792089237316195423570985008687907853269984665640564039457584007913129639935",
- "code" : "0x60016103c020600055",
- "nonce" : "0",
- "storage" : {
- "0x" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
- }
- }
- },
- "pre" : {
- "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
- "balance" : "115792089237316195423570985008687907853269984665640564039457584007913129639935",
- "code" : "0x60016103c020600055",
- "nonce" : "0",
- "storage" : {
- }
- }
- }
- },
- "sha3_memSizeQuadraticCost32" : {
- "callcreates" : [
- ],
- "env" : {
- "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
- "currentDifficulty" : "256",
- "currentGasLimit" : "1000000",
- "currentNumber" : "0",
- "currentTimestamp" : "1",
- "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
- },
- "exec" : {
- "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
- "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
- "code" : "0x60016103e020600055",
- "data" : "0x",
- "gas" : "4294967296",
- "gasPrice" : "1",
- "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
- "value" : "115792089237316195423570985008687907853269984665640564039457584007913129639935"
- },
- "gas" : "4294966940",
- "logs" : [
- ],
- "out" : "0x",
- "post" : {
- "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
- "balance" : "115792089237316195423570985008687907853269984665640564039457584007913129639935",
- "code" : "0x60016103e020600055",
- "nonce" : "0",
- "storage" : {
- "0x" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
- }
- }
- },
- "pre" : {
- "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
- "balance" : "115792089237316195423570985008687907853269984665640564039457584007913129639935",
- "code" : "0x60016103e020600055",
- "nonce" : "0",
- "storage" : {
- }
- }
- }
- },
- "sha3_memSizeQuadraticCost32_zeroSize" : {
- "callcreates" : [
- ],
- "env" : {
- "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
- "currentDifficulty" : "256",
- "currentGasLimit" : "1000000",
- "currentNumber" : "0",
- "currentTimestamp" : "1",
- "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
- },
- "exec" : {
- "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
- "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
- "code" : "0x600061040020600055",
- "data" : "0x",
- "gas" : "4294967296",
- "gasPrice" : "1",
- "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
- "value" : "115792089237316195423570985008687907853269984665640564039457584007913129639935"
- },
- "gas" : "4294966983",
- "logs" : [
- ],
- "out" : "0x",
- "post" : {
- "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
- "balance" : "115792089237316195423570985008687907853269984665640564039457584007913129639935",
- "code" : "0x600061040020600055",
- "nonce" : "0",
- "storage" : {
- "0x" : "0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470"
- }
- }
- },
- "pre" : {
- "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
- "balance" : "115792089237316195423570985008687907853269984665640564039457584007913129639935",
- "code" : "0x600061040020600055",
- "nonce" : "0",
- "storage" : {
- }
- }
- }
- },
- "sha3_memSizeQuadraticCost33" : {
- "callcreates" : [
- ],
- "env" : {
- "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
- "currentDifficulty" : "256",
- "currentGasLimit" : "1000000",
- "currentNumber" : "0",
- "currentTimestamp" : "1",
- "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
- },
- "exec" : {
- "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
- "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
- "code" : "0x600161040020600055",
- "data" : "0x",
- "gas" : "4294967296",
- "gasPrice" : "1",
- "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
- "value" : "115792089237316195423570985008687907853269984665640564039457584007913129639935"
- },
- "gas" : "4294966939",
- "logs" : [
- ],
- "out" : "0x",
- "post" : {
- "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
- "balance" : "115792089237316195423570985008687907853269984665640564039457584007913129639935",
- "code" : "0x600161040020600055",
- "nonce" : "0",
- "storage" : {
- "0x" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
- }
- }
- },
- "pre" : {
- "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
- "balance" : "115792089237316195423570985008687907853269984665640564039457584007913129639935",
- "code" : "0x600161040020600055",
- "nonce" : "0",
- "storage" : {
- }
- }
- }
- },
- "sha3_memSizeQuadraticCost63" : {
- "callcreates" : [
- ],
- "env" : {
- "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
- "currentDifficulty" : "256",
- "currentGasLimit" : "1000000",
- "currentNumber" : "0",
- "currentTimestamp" : "1",
- "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
- },
- "exec" : {
- "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
- "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
- "code" : "0x60016107c020600055",
- "data" : "0x",
- "gas" : "4294967296",
- "gasPrice" : "1",
- "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
- "value" : "115792089237316195423570985008687907853269984665640564039457584007913129639935"
- },
- "gas" : "4294966907",
- "logs" : [
- ],
- "out" : "0x",
- "post" : {
- "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
- "balance" : "115792089237316195423570985008687907853269984665640564039457584007913129639935",
- "code" : "0x60016107c020600055",
- "nonce" : "0",
- "storage" : {
- "0x" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
- }
- }
- },
- "pre" : {
- "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
- "balance" : "115792089237316195423570985008687907853269984665640564039457584007913129639935",
- "code" : "0x60016107c020600055",
- "nonce" : "0",
- "storage" : {
- }
- }
- }
- },
- "sha3_memSizeQuadraticCost64" : {
- "callcreates" : [
- ],
- "env" : {
- "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
- "currentDifficulty" : "256",
- "currentGasLimit" : "1000000",
- "currentNumber" : "0",
- "currentTimestamp" : "1",
- "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
- },
- "exec" : {
- "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
- "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
- "code" : "0x60016107e020600055",
- "data" : "0x",
- "gas" : "4294967296",
- "gasPrice" : "1",
- "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
- "value" : "115792089237316195423570985008687907853269984665640564039457584007913129639935"
- },
- "gas" : "4294966905",
- "logs" : [
- ],
- "out" : "0x",
- "post" : {
- "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
- "balance" : "115792089237316195423570985008687907853269984665640564039457584007913129639935",
- "code" : "0x60016107e020600055",
- "nonce" : "0",
- "storage" : {
- "0x" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
- }
- }
- },
- "pre" : {
- "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
- "balance" : "115792089237316195423570985008687907853269984665640564039457584007913129639935",
- "code" : "0x60016107e020600055",
- "nonce" : "0",
- "storage" : {
- }
- }
- }
- },
- "sha3_memSizeQuadraticCost64_2" : {
- "callcreates" : [
- ],
- "env" : {
- "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
- "currentDifficulty" : "256",
- "currentGasLimit" : "1000000",
- "currentNumber" : "0",
- "currentTimestamp" : "1",
- "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
- },
- "exec" : {
- "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
- "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
- "code" : "0x60206107e020600055",
- "data" : "0x",
- "gas" : "4294967296",
- "gasPrice" : "1",
- "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
- "value" : "115792089237316195423570985008687907853269984665640564039457584007913129639935"
- },
- "gas" : "4294966905",
- "logs" : [
- ],
- "out" : "0x",
- "post" : {
- "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
- "balance" : "115792089237316195423570985008687907853269984665640564039457584007913129639935",
- "code" : "0x60206107e020600055",
- "nonce" : "0",
- "storage" : {
- "0x" : "0x290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e563"
- }
- }
- },
- "pre" : {
- "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
- "balance" : "115792089237316195423570985008687907853269984665640564039457584007913129639935",
- "code" : "0x60206107e020600055",
- "nonce" : "0",
- "storage" : {
- }
- }
- }
- },
- "sha3_memSizeQuadraticCost65" : {
- "callcreates" : [
- ],
- "env" : {
- "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
- "currentDifficulty" : "256",
- "currentGasLimit" : "1000000",
- "currentNumber" : "0",
- "currentTimestamp" : "1",
- "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
- },
- "exec" : {
- "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
- "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
- "code" : "0x600161080020600055",
- "data" : "0x",
- "gas" : "4294967296",
- "gasPrice" : "1",
- "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
- "value" : "115792089237316195423570985008687907853269984665640564039457584007913129639935"
- },
- "gas" : "4294966904",
- "logs" : [
- ],
- "out" : "0x",
- "post" : {
- "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
- "balance" : "115792089237316195423570985008687907853269984665640564039457584007913129639935",
- "code" : "0x600161080020600055",
- "nonce" : "0",
- "storage" : {
- "0x" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
- }
- }
- },
- "pre" : {
- "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
- "balance" : "115792089237316195423570985008687907853269984665640564039457584007913129639935",
- "code" : "0x600161080020600055",
- "nonce" : "0",
- "storage" : {
- }
- }
- }
}
}
\ No newline at end of file
--
cgit v1.2.3