diff options
4 files changed, 265 insertions, 12 deletions
diff --git a/GeneralStateTests/stStaticCall/static_contractCreationMakeCallThatAskMoreGasThenTransactionProvided.json b/GeneralStateTests/stStaticCall/static_contractCreationMakeCallThatAskMoreGasThenTransactionProvided.json index 633d04d1f..338d51246 100644 --- a/GeneralStateTests/stStaticCall/static_contractCreationMakeCallThatAskMoreGasThenTransactionProvided.json +++ b/GeneralStateTests/stStaticCall/static_contractCreationMakeCallThatAskMoreGasThenTransactionProvided.json @@ -1,5 +1,10 @@ { "static_contractCreationMakeCallThatAskMoreGasThenTransactionProvided" : { + "_info" : { + "comment" : "", + "filledwith" : "cpp-1.3.0+commit.9732e0ef.Linux.g++", + "source" : "/src/GeneralStateTestsFiller/stStaticCall/static_contractCreationMakeCallThatAskMoreGasThenTransactionProvidedFiller.json" + }, "env" : { "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x020000", @@ -147,7 +152,7 @@ ], "Metropolis" : [ { - "hash" : "0x510b6a93c8820120b2a8e8bdf3ae473c41900cf4f722e6f6125d1c6674cd4413", + "hash" : "0x4c8dd1cbaeb30d44e5ca92bfceb122fc1a2002327ddcc3dfd3529d6689b91afd", "indexes" : { "data" : 0, "gas" : 0, @@ -155,7 +160,7 @@ } }, { - "hash" : "0xdf8d9c168f81a12818f05f337061ae5b03a17c996d3b6b251f118c7cb8e18d3f", + "hash" : "0xd62beb2cffef75e46812ca0fcf003f91beccb760b5aeac639e78d3f0d37fb82d", "indexes" : { "data" : 1, "gas" : 0, @@ -163,7 +168,7 @@ } }, { - "hash" : "0x510b6a93c8820120b2a8e8bdf3ae473c41900cf4f722e6f6125d1c6674cd4413", + "hash" : "0x930bd4e4ebae75cd39924b13ecd0ebd3aef23769c81faada822995e2b431dea4", "indexes" : { "data" : 2, "gas" : 0, @@ -171,7 +176,7 @@ } }, { - "hash" : "0xaa09c6f8acf05b087bf49197368fb2edd90377dc93b608bfde9f4407bca116d4", + "hash" : "0x236c781d204d72b6c0907f1f3889c4cd70e9cadefc4f07057905c35bebe38292", "indexes" : { "data" : 3, "gas" : 0, diff --git a/GeneralStateTests/stStaticCall/static_contractCreationOOGdontLeaveEmptyContractViaTransaction.json b/GeneralStateTests/stStaticCall/static_contractCreationOOGdontLeaveEmptyContractViaTransaction.json index e57946739..0d85e9892 100644 --- a/GeneralStateTests/stStaticCall/static_contractCreationOOGdontLeaveEmptyContractViaTransaction.json +++ b/GeneralStateTests/stStaticCall/static_contractCreationOOGdontLeaveEmptyContractViaTransaction.json @@ -1,5 +1,10 @@ { "static_contractCreationOOGdontLeaveEmptyContractViaTransaction" : { + "_info" : { + "comment" : "", + "filledwith" : "cpp-1.3.0+commit.9732e0ef.Linux.g++", + "source" : "/src/GeneralStateTestsFiller/stStaticCall/static_contractCreationOOGdontLeaveEmptyContractViaTransactionFiller.json" + }, "env" : { "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x020000", @@ -16,6 +21,43 @@ "data" : 0, "gas" : 0, "value" : 0 + }, + "stateDiff" : { + "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { + "balance" : [ + [ + "0x00", + "+=", + "0x017700" + ], + [ + "0x00", + "->", + "0x017700" + ] + ], + "newlyCreated" : "true" + }, + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : [ + [ + "0x10c8e0", + "+=", + "0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe8900" + ], + [ + "0x10c8e0", + "->", + "0x0f51e0" + ] + ], + "newlyCreated" : "true", + "nonce" : [ + "0x00", + "->", + "0x01" + ] + } } } ], @@ -26,6 +68,43 @@ "data" : 0, "gas" : 0, "value" : 0 + }, + "stateDiff" : { + "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { + "balance" : [ + [ + "0x00", + "+=", + "0x017700" + ], + [ + "0x00", + "->", + "0x017700" + ] + ], + "newlyCreated" : "true" + }, + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : [ + [ + "0x10c8e0", + "+=", + "0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe8900" + ], + [ + "0x10c8e0", + "->", + "0x0f51e0" + ] + ], + "newlyCreated" : "true", + "nonce" : [ + "0x00", + "->", + "0x01" + ] + } } } ], @@ -36,6 +115,43 @@ "data" : 0, "gas" : 0, "value" : 0 + }, + "stateDiff" : { + "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { + "balance" : [ + [ + "0x00", + "+=", + "0x017700" + ], + [ + "0x00", + "->", + "0x017700" + ] + ], + "newlyCreated" : "true" + }, + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : [ + [ + "0x10c8e0", + "+=", + "0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe8900" + ], + [ + "0x10c8e0", + "->", + "0x0f51e0" + ] + ], + "newlyCreated" : "true", + "nonce" : [ + "0x00", + "->", + "0x01" + ] + } } } ], @@ -46,16 +162,125 @@ "data" : 0, "gas" : 0, "value" : 0 + }, + "stateDiff" : { + "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { + "balance" : [ + [ + "0x00", + "+=", + "0x017700" + ], + [ + "0x00", + "->", + "0x017700" + ] + ], + "newlyCreated" : "true" + }, + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : [ + [ + "0x10c8e0", + "+=", + "0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe8900" + ], + [ + "0x10c8e0", + "->", + "0x0f51e0" + ] + ], + "newlyCreated" : "true", + "nonce" : [ + "0x00", + "->", + "0x01" + ] + } } } ], "Metropolis" : [ { - "hash" : "0x540e7a4767620ecc87c8117b06a9a73584a643aa065df3ccf7838d579efe1028", + "hash" : "0x0058492564cd8c20040e96d4753ebe1e23561beaf7c4fbc3013875f39302e12f", "indexes" : { "data" : 0, "gas" : 0, "value" : 0 + }, + "stateDiff" : { + "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { + "balance" : [ + [ + "0x00", + "+=", + "0x01747b" + ], + [ + "0x00", + "->", + "0x01747b" + ] + ], + "newlyCreated" : "true" + }, + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : [ + [ + "0x10c8e0", + "+=", + "0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe8900" + ], + [ + "0x0f51e0", + "+=", + "0x0285" + ], + [ + "0x10c8e0", + "->", + "0x0f5465" + ] + ], + "newlyCreated" : "true", + "nonce" : [ + "0x00", + "->", + "0x01" + ] + }, + "0xe005e77ffd2953dd93c80b805101c03dac64291b" : { + "balance" : [ + [ + "0x10c8e0", + "+=", + "0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe8900" + ], + [ + "0x0f51e0", + "+=", + "0x0285" + ], + [ + "0x10c8e0", + "->", + "0x0f5465" + ] + ], + "code" : [ + "0x", + "->", + "0x" + ], + "newlyCreated" : "true", + "nonce" : [ + "0x00", + "->", + "0x01" + ] + } } } ] diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_contractCreationMakeCallThatAskMoreGasThenTransactionProvidedFiller.json b/src/GeneralStateTestsFiller/stStaticCall/static_contractCreationMakeCallThatAskMoreGasThenTransactionProvidedFiller.json index cafcddedd..69c3a17f0 100644 --- a/src/GeneralStateTestsFiller/stStaticCall/static_contractCreationMakeCallThatAskMoreGasThenTransactionProvidedFiller.json +++ b/src/GeneralStateTestsFiller/stStaticCall/static_contractCreationMakeCallThatAskMoreGasThenTransactionProvidedFiller.json @@ -10,14 +10,37 @@ }, "expect" : [ { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, + "indexes" : { "data" : 0, "gas" : -1, "value" : -1 }, "network" : ["Metropolis"], "result" : { - "6295ee1b4f6dd65047762f924ecd367c17eabf8f": { + "3eb343d99f94205712c88c1cc7817bd428f8d3ef": { + "nonce" : "1" + } + } + }, + { + "indexes" : { "data" : 1, "gas" : -1, "value" : -1 }, + "network" : ["Metropolis"], + "result" : { + "e005e77ffd2953dd93c80b805101c03dac64291b": { + "nonce" : "1" + } + } + }, + { + "indexes" : { "data" : 2, "gas" : -1, "value" : -1 }, + "network" : ["Metropolis"], + "result" : { + "a3383b59156e2e9a7ba1b632d8111c10fe9c7078": { + "nonce" : "1" + } + } + }, + { + "indexes" : { "data" : 3, "gas" : -1, "value" : -1 }, + "network" : ["Metropolis"], + "result" : { + "df0f13f932cd2b119699443b14ffa29b6934b47f": { "nonce" : "1" } } diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_contractCreationOOGdontLeaveEmptyContractViaTransactionFiller.json b/src/GeneralStateTestsFiller/stStaticCall/static_contractCreationOOGdontLeaveEmptyContractViaTransactionFiller.json index 96b506f51..6120d465a 100644 --- a/src/GeneralStateTestsFiller/stStaticCall/static_contractCreationOOGdontLeaveEmptyContractViaTransactionFiller.json +++ b/src/GeneralStateTestsFiller/stStaticCall/static_contractCreationOOGdontLeaveEmptyContractViaTransactionFiller.json @@ -13,7 +13,7 @@ "indexes" : { "data" : -1, "gas" : -1, "value" : -1}, "network" : ["Metropolis"], "result" : { - "6295ee1b4f6dd65047762f924ecd367c17eabf8f": { + "e005e77ffd2953dd93c80b805101c03dac64291b": { "nonce" : "1" } } |