From 55125b1fdd58942077e8a78c81dee9d58a43a334 Mon Sep 17 00:00:00 2001 From: Dimitry Date: Tue, 20 Dec 2016 19:08:11 +0400 Subject: finish eip150 tests to GeneralStateTests --- .../stRefundTest/refund50_1Filler.json | 2 +- .../stRefundTest/refund50_2Filler.json | 2 +- .../stRefundTest/refund50percentCapFiller.json | 22 ++++++++++++++++++++++ .../stRefundTest/refund600Filler.json | 21 +++++++++++++++++++++ .../refundSuicide50procentCapFiller.json | 2 +- .../stRefundTest/refund_CallAFiller.json | 2 +- .../stRefundTest/refund_CallA_OOGFiller.json | 2 +- .../refund_CallA_notEnoughGasInCallFiller.json | 2 +- .../refund_CallToSuicideNoStorageFiller.json | 2 +- .../refund_CallToSuicideStorageFiller.json | 2 +- .../refund_CallToSuicideTwiceFiller.json | 2 +- .../stRefundTest/refund_NoOOG_1Filler.json | 2 +- .../stRefundTest/refund_OOGFiller.json | 2 +- .../stRefundTest/refund_TxToSuicideFiller.json | 2 +- .../stRefundTest/refund_TxToSuicideOOGFiller.json | 2 +- .../refund_changeNonZeroStorageFiller.json | 2 +- .../stRefundTest/refund_getEtherBackFiller.json | 2 +- .../refund_multimpleSuicideFiller.json | 20 ++++++++++++++++++++ .../stRefundTest/refund_singleSuicideFiller.json | 20 ++++++++++++++++++++ 19 files changed, 98 insertions(+), 15 deletions(-) (limited to 'src/GeneralStateTestsFiller/stRefundTest') diff --git a/src/GeneralStateTestsFiller/stRefundTest/refund50_1Filler.json b/src/GeneralStateTestsFiller/stRefundTest/refund50_1Filler.json index d3ede101d..94eb7cf62 100644 --- a/src/GeneralStateTestsFiller/stRefundTest/refund50_1Filler.json +++ b/src/GeneralStateTestsFiller/stRefundTest/refund50_1Filler.json @@ -15,7 +15,7 @@ "gas" : -1, "value" : -1 }, - "network" : ["Frontier", "Homestead", "EIP158"], + "network" : ["Frontier", "Homestead", "EIP150", "EIP158"], "result" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "storage" : { diff --git a/src/GeneralStateTestsFiller/stRefundTest/refund50_2Filler.json b/src/GeneralStateTestsFiller/stRefundTest/refund50_2Filler.json index 36fcd908c..3d1717275 100644 --- a/src/GeneralStateTestsFiller/stRefundTest/refund50_2Filler.json +++ b/src/GeneralStateTestsFiller/stRefundTest/refund50_2Filler.json @@ -15,7 +15,7 @@ "gas" : -1, "value" : -1 }, - "network" : ["Frontier", "Homestead", "EIP158"], + "network" : ["Frontier", "Homestead", "EIP150", "EIP158"], "result" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "storage" : { diff --git a/src/GeneralStateTestsFiller/stRefundTest/refund50percentCapFiller.json b/src/GeneralStateTestsFiller/stRefundTest/refund50percentCapFiller.json index c1e8a243d..c97edfda3 100644 --- a/src/GeneralStateTestsFiller/stRefundTest/refund50percentCapFiller.json +++ b/src/GeneralStateTestsFiller/stRefundTest/refund50percentCapFiller.json @@ -31,6 +31,28 @@ } } }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : ["EIP150"], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "storage" : { + "0x0a" : "0x8000000000000000000000000000000000000000000000000000000000000000", + "0x0b" : "0x0de0b6b3a7640000" + } + }, + "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { + "balance" : "45940" + }, + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "54060" + } + } + }, { "indexes" : { "data" : -1, diff --git a/src/GeneralStateTestsFiller/stRefundTest/refund600Filler.json b/src/GeneralStateTestsFiller/stRefundTest/refund600Filler.json index fe7de2241..11b50f839 100644 --- a/src/GeneralStateTestsFiller/stRefundTest/refund600Filler.json +++ b/src/GeneralStateTestsFiller/stRefundTest/refund600Filler.json @@ -30,6 +30,27 @@ } } }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : ["EIP150"], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "storage" : { + "0x0b" : "0x0de0b6b3a7640000" + } + }, + "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { + "balance" : "38445" + }, + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "61555" + } + } + }, { "indexes" : { "data" : -1, diff --git a/src/GeneralStateTestsFiller/stRefundTest/refundSuicide50procentCapFiller.json b/src/GeneralStateTestsFiller/stRefundTest/refundSuicide50procentCapFiller.json index 2b927475e..7a7b26e87 100644 --- a/src/GeneralStateTestsFiller/stRefundTest/refundSuicide50procentCapFiller.json +++ b/src/GeneralStateTestsFiller/stRefundTest/refundSuicide50procentCapFiller.json @@ -40,7 +40,7 @@ "gas" : -1, "value" : -1 }, - "network" : ["EIP158"], + "network" : ["EIP150", "EIP158"], "result" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "storage" : { diff --git a/src/GeneralStateTestsFiller/stRefundTest/refund_CallAFiller.json b/src/GeneralStateTestsFiller/stRefundTest/refund_CallAFiller.json index 73c5e34f0..4a6da880b 100644 --- a/src/GeneralStateTestsFiller/stRefundTest/refund_CallAFiller.json +++ b/src/GeneralStateTestsFiller/stRefundTest/refund_CallAFiller.json @@ -43,7 +43,7 @@ "gas" : -1, "value" : -1 }, - "network" : ["EIP158"], + "network" : ["EIP150", "EIP158"], "result" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "1000000000000000010", diff --git a/src/GeneralStateTestsFiller/stRefundTest/refund_CallA_OOGFiller.json b/src/GeneralStateTestsFiller/stRefundTest/refund_CallA_OOGFiller.json index c0d173e26..e58d9c02f 100644 --- a/src/GeneralStateTestsFiller/stRefundTest/refund_CallA_OOGFiller.json +++ b/src/GeneralStateTestsFiller/stRefundTest/refund_CallA_OOGFiller.json @@ -15,7 +15,7 @@ "gas" : -1, "value" : -1 }, - "network" : ["Frontier", "Homestead", "EIP158"], + "network" : ["Frontier", "Homestead", "EIP150", "EIP158"], "result" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "1000000000000000000", diff --git a/src/GeneralStateTestsFiller/stRefundTest/refund_CallA_notEnoughGasInCallFiller.json b/src/GeneralStateTestsFiller/stRefundTest/refund_CallA_notEnoughGasInCallFiller.json index f263eb187..d199e74f3 100644 --- a/src/GeneralStateTestsFiller/stRefundTest/refund_CallA_notEnoughGasInCallFiller.json +++ b/src/GeneralStateTestsFiller/stRefundTest/refund_CallA_notEnoughGasInCallFiller.json @@ -43,7 +43,7 @@ "gas" : -1, "value" : -1 }, - "network" : ["EIP158"], + "network" : ["EIP150", "EIP158"], "result" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "1000000000000000010", diff --git a/src/GeneralStateTestsFiller/stRefundTest/refund_CallToSuicideNoStorageFiller.json b/src/GeneralStateTestsFiller/stRefundTest/refund_CallToSuicideNoStorageFiller.json index fb4495fdb..388e6c221 100644 --- a/src/GeneralStateTestsFiller/stRefundTest/refund_CallToSuicideNoStorageFiller.json +++ b/src/GeneralStateTestsFiller/stRefundTest/refund_CallToSuicideNoStorageFiller.json @@ -39,7 +39,7 @@ "gas" : -1, "value" : -1 }, - "network" : ["EIP158"], + "network" : ["EIP150", "EIP158"], "result" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "2000000000000000010", diff --git a/src/GeneralStateTestsFiller/stRefundTest/refund_CallToSuicideStorageFiller.json b/src/GeneralStateTestsFiller/stRefundTest/refund_CallToSuicideStorageFiller.json index be74a6859..0cda858fa 100644 --- a/src/GeneralStateTestsFiller/stRefundTest/refund_CallToSuicideStorageFiller.json +++ b/src/GeneralStateTestsFiller/stRefundTest/refund_CallToSuicideStorageFiller.json @@ -39,7 +39,7 @@ "gas" : -1, "value" : -1 }, - "network" : ["EIP158"], + "network" : ["EIP150", "EIP158"], "result" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "2000000000000000010", diff --git a/src/GeneralStateTestsFiller/stRefundTest/refund_CallToSuicideTwiceFiller.json b/src/GeneralStateTestsFiller/stRefundTest/refund_CallToSuicideTwiceFiller.json index f2b0359bb..8dfc5bcea 100644 --- a/src/GeneralStateTestsFiller/stRefundTest/refund_CallToSuicideTwiceFiller.json +++ b/src/GeneralStateTestsFiller/stRefundTest/refund_CallToSuicideTwiceFiller.json @@ -42,7 +42,7 @@ "gas" : -1, "value" : -1 }, - "network" : ["EIP158"], + "network" : ["EIP150", "EIP158"], "result" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "2000000000000000010", diff --git a/src/GeneralStateTestsFiller/stRefundTest/refund_NoOOG_1Filler.json b/src/GeneralStateTestsFiller/stRefundTest/refund_NoOOG_1Filler.json index 3714e81be..243ee8ee1 100644 --- a/src/GeneralStateTestsFiller/stRefundTest/refund_NoOOG_1Filler.json +++ b/src/GeneralStateTestsFiller/stRefundTest/refund_NoOOG_1Filler.json @@ -15,7 +15,7 @@ "gas" : -1, "value" : -1 }, - "network" : ["Frontier", "Homestead", "EIP158"], + "network" : ["Frontier", "Homestead", "EIP150", "EIP158"], "result" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "storage" : { diff --git a/src/GeneralStateTestsFiller/stRefundTest/refund_OOGFiller.json b/src/GeneralStateTestsFiller/stRefundTest/refund_OOGFiller.json index 85d97a0fe..36126a8fe 100644 --- a/src/GeneralStateTestsFiller/stRefundTest/refund_OOGFiller.json +++ b/src/GeneralStateTestsFiller/stRefundTest/refund_OOGFiller.json @@ -15,7 +15,7 @@ "gas" : -1, "value" : -1 }, - "network" : ["Frontier", "Homestead", "EIP158"], + "network" : ["Frontier", "Homestead", "EIP150", "EIP158"], "result" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "1000000000000000000", diff --git a/src/GeneralStateTestsFiller/stRefundTest/refund_TxToSuicideFiller.json b/src/GeneralStateTestsFiller/stRefundTest/refund_TxToSuicideFiller.json index 6a2dde5ed..e3047fd8e 100644 --- a/src/GeneralStateTestsFiller/stRefundTest/refund_TxToSuicideFiller.json +++ b/src/GeneralStateTestsFiller/stRefundTest/refund_TxToSuicideFiller.json @@ -40,7 +40,7 @@ "gas" : 1, "value" : -1 }, - "network" : ["EIP158"], + "network" : ["EIP150", "EIP158"], "result" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "1000000000000000010", diff --git a/src/GeneralStateTestsFiller/stRefundTest/refund_TxToSuicideOOGFiller.json b/src/GeneralStateTestsFiller/stRefundTest/refund_TxToSuicideOOGFiller.json index 237e22d86..5b085fe4b 100644 --- a/src/GeneralStateTestsFiller/stRefundTest/refund_TxToSuicideOOGFiller.json +++ b/src/GeneralStateTestsFiller/stRefundTest/refund_TxToSuicideOOGFiller.json @@ -15,7 +15,7 @@ "gas" : -1, "value" : -1 }, - "network" : ["Frontier", "Homestead", "EIP158"], + "network" : ["Frontier", "Homestead", "EIP150", "EIP158"], "result" : { "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { "balance" : "21002" diff --git a/src/GeneralStateTestsFiller/stRefundTest/refund_changeNonZeroStorageFiller.json b/src/GeneralStateTestsFiller/stRefundTest/refund_changeNonZeroStorageFiller.json index 90d257edc..fa78935d8 100644 --- a/src/GeneralStateTestsFiller/stRefundTest/refund_changeNonZeroStorageFiller.json +++ b/src/GeneralStateTestsFiller/stRefundTest/refund_changeNonZeroStorageFiller.json @@ -15,7 +15,7 @@ "gas" : -1, "value" : -1 }, - "network" : ["Frontier", "Homestead", "EIP158"], + "network" : ["Frontier", "Homestead", "EIP150", "EIP158"], "result" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "1000000000000000010", diff --git a/src/GeneralStateTestsFiller/stRefundTest/refund_getEtherBackFiller.json b/src/GeneralStateTestsFiller/stRefundTest/refund_getEtherBackFiller.json index c2cc465e2..eafa080d4 100644 --- a/src/GeneralStateTestsFiller/stRefundTest/refund_getEtherBackFiller.json +++ b/src/GeneralStateTestsFiller/stRefundTest/refund_getEtherBackFiller.json @@ -15,7 +15,7 @@ "gas" : -1, "value" : -1 }, - "network" : ["Frontier", "Homestead", "EIP158"], + "network" : ["Frontier", "Homestead", "EIP150", "EIP158"], "result" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "1000000000000000010", diff --git a/src/GeneralStateTestsFiller/stRefundTest/refund_multimpleSuicideFiller.json b/src/GeneralStateTestsFiller/stRefundTest/refund_multimpleSuicideFiller.json index 9c8587761..1ac4d1ce0 100644 --- a/src/GeneralStateTestsFiller/stRefundTest/refund_multimpleSuicideFiller.json +++ b/src/GeneralStateTestsFiller/stRefundTest/refund_multimpleSuicideFiller.json @@ -29,6 +29,26 @@ } } }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : ["EIP150"], + "result" : { + "1000000000000000000000000000000000000001" : { + "shouldnotexist" : "1" + }, + "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { + "balance" : "16644" + }, + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "283356", + "nonce" : "1" + } + } + }, { "indexes" : { "data" : -1, diff --git a/src/GeneralStateTestsFiller/stRefundTest/refund_singleSuicideFiller.json b/src/GeneralStateTestsFiller/stRefundTest/refund_singleSuicideFiller.json index b6f2c0282..7052b9ff7 100644 --- a/src/GeneralStateTestsFiller/stRefundTest/refund_singleSuicideFiller.json +++ b/src/GeneralStateTestsFiller/stRefundTest/refund_singleSuicideFiller.json @@ -29,6 +29,26 @@ } } }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : ["EIP150"], + "result" : { + "1000000000000000000000000000000000000001" : { + "shouldnotexist" : "1" + }, + "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { + "balance" : "13711" + }, + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "286289", + "nonce" : "1" + } + } + }, { "indexes" : { "data" : -1, -- cgit