diff options
13 files changed, 13 insertions, 272 deletions
diff --git a/src/GeneralStateTestsFiller/stEIP150Specific/CallAndCallcodeConsumeMoreGasThenTransactionHasFiller.json b/src/GeneralStateTestsFiller/stEIP150Specific/CallAndCallcodeConsumeMoreGasThenTransactionHasFiller.json index fdd05efb2..f1ef2f585 100644 --- a/src/GeneralStateTestsFiller/stEIP150Specific/CallAndCallcodeConsumeMoreGasThenTransactionHasFiller.json +++ b/src/GeneralStateTestsFiller/stEIP150Specific/CallAndCallcodeConsumeMoreGasThenTransactionHasFiller.json @@ -15,7 +15,7 @@ "gas" : -1, "value" : -1 }, - "network" : ["EIP150", "EIP158"], + "network" : ["EIP150", ">=Byzantium"], "result" : { "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "storage" : { @@ -26,24 +26,6 @@ } } } - }, - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : ["Frontier", "Homestead"], - "result" : { - "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "storage" : { - "0x00" : "0x00", - "0x08" : "0x00", - "0x09" : "0x00", - "0x0a" : "0x00" - } - } - } } ], "pre" : diff --git a/src/GeneralStateTestsFiller/stEIP150Specific/CallAskMoreGasOnDepth2ThenTransactionHasFiller.json b/src/GeneralStateTestsFiller/stEIP150Specific/CallAskMoreGasOnDepth2ThenTransactionHasFiller.json index 75fadaa89..0f83f4a00 100644 --- a/src/GeneralStateTestsFiller/stEIP150Specific/CallAskMoreGasOnDepth2ThenTransactionHasFiller.json +++ b/src/GeneralStateTestsFiller/stEIP150Specific/CallAskMoreGasOnDepth2ThenTransactionHasFiller.json @@ -15,7 +15,7 @@ "gas" : -1, "value" : -1 }, - "network" : ["EIP150", "EIP158"], + "network" : ["EIP150", ">=Byzantium"], "result" : { "1000000000000000000000000000000000000107" : { "storage" : { @@ -29,27 +29,6 @@ } } } - }, - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : ["Frontier", "Homestead"], - "result" : { - "1000000000000000000000000000000000000107" : { - "storage" : { - "0x08" : "0x00", - "0x09" : "0x00" - } - }, - "1000000000000000000000000000000000000108" : { - "storage" : { - "0x08" : "0x00" - } - } - } } ], "pre" : diff --git a/src/GeneralStateTestsFiller/stEIP150Specific/CallGoesOOGOnSecondLevel2Filler.json b/src/GeneralStateTestsFiller/stEIP150Specific/CallGoesOOGOnSecondLevel2Filler.json index 02a24c15e..628daa728 100644 --- a/src/GeneralStateTestsFiller/stEIP150Specific/CallGoesOOGOnSecondLevel2Filler.json +++ b/src/GeneralStateTestsFiller/stEIP150Specific/CallGoesOOGOnSecondLevel2Filler.json @@ -15,29 +15,7 @@ "gas" : -1, "value" : -1 }, - "network" : ["EIP150", "EIP158"], - "result" : { - "1000000000000000000000000000000000000113" : { - "storage" : { - } - }, - "1000000000000000000000000000000000000114" : { - "storage" : { - } - }, - "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "storage" : { - } - } - } - }, - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : ["Frontier", "Homestead"], + "network" : ["EIP150", ">=Byzantium"], "result" : { "1000000000000000000000000000000000000113" : { "storage" : { diff --git a/src/GeneralStateTestsFiller/stEIP150Specific/CallGoesOOGOnSecondLevelFiller.json b/src/GeneralStateTestsFiller/stEIP150Specific/CallGoesOOGOnSecondLevelFiller.json index 4816793aa..2998e4c58 100644 --- a/src/GeneralStateTestsFiller/stEIP150Specific/CallGoesOOGOnSecondLevelFiller.json +++ b/src/GeneralStateTestsFiller/stEIP150Specific/CallGoesOOGOnSecondLevelFiller.json @@ -15,29 +15,7 @@ "gas" : -1, "value" : -1 }, - "network" : ["EIP150", "EIP158"], - "result" : { - "1000000000000000000000000000000000000110" : { - "storage" : { - } - }, - "1000000000000000000000000000000000000111" : { - "storage" : { - } - }, - "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "storage" : { - } - } - } - }, - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : ["Frontier", "Homestead"], + "network" : ["EIP150", ">=Byzantium"], "result" : { "1000000000000000000000000000000000000110" : { "storage" : { diff --git a/src/GeneralStateTestsFiller/stEIP150Specific/CreateAndGasInsideCreateFiller.json b/src/GeneralStateTestsFiller/stEIP150Specific/CreateAndGasInsideCreateFiller.json index 9f40ac0b1..c2db12a53 100644 --- a/src/GeneralStateTestsFiller/stEIP150Specific/CreateAndGasInsideCreateFiller.json +++ b/src/GeneralStateTestsFiller/stEIP150Specific/CreateAndGasInsideCreateFiller.json @@ -15,7 +15,7 @@ "gas" : -1, "value" : -1 }, - "network" : ["EIP150", "EIP158"], + "network" : ["EIP150", ">=Byzantium"], "result" : { "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "storage" : { @@ -30,28 +30,6 @@ } } } - }, - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : ["Frontier", "Homestead"], - "result" : { - "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "storage" : { - "0x09" : "0x076e34", - "0x0a" : "0x08d5b6", - "0x0b" : "0xf1ecf98489fa9ed60a664fc4998db699cfa39d40" - } - }, - "f1ecf98489fa9ed60a664fc4998db699cfa39d40" : { - "storage" : { - "0xfd" : "0x080a7c" - } - } - } } ], "pre" : diff --git a/src/GeneralStateTestsFiller/stEIP150Specific/DelegateCallOnEIPFiller.json b/src/GeneralStateTestsFiller/stEIP150Specific/DelegateCallOnEIPFiller.json index a4aa66d93..1491e00db 100644 --- a/src/GeneralStateTestsFiller/stEIP150Specific/DelegateCallOnEIPFiller.json +++ b/src/GeneralStateTestsFiller/stEIP150Specific/DelegateCallOnEIPFiller.json @@ -15,7 +15,7 @@ "gas" : -1, "value" : -1 }, - "network" : ["EIP150", "EIP158"], + "network" : ["EIP150", ">=Byzantium"], "result" : { "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "storage" : { @@ -25,23 +25,6 @@ } } } - }, - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : ["Frontier", "Homestead"], - "result" : { - "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "storage" : { - "0x00" : "0x00", - "0x08" : "0x00", - "0x09" : "0x00" - } - } - } } ], "pre" : diff --git a/src/GeneralStateTestsFiller/stEIP150Specific/ExecuteCallThatAskForeGasThenTrabsactionHasFiller.json b/src/GeneralStateTestsFiller/stEIP150Specific/ExecuteCallThatAskForeGasThenTrabsactionHasFiller.json index f39169db6..c2fdb8063 100644 --- a/src/GeneralStateTestsFiller/stEIP150Specific/ExecuteCallThatAskForeGasThenTrabsactionHasFiller.json +++ b/src/GeneralStateTestsFiller/stEIP150Specific/ExecuteCallThatAskForeGasThenTrabsactionHasFiller.json @@ -15,7 +15,7 @@ "gas" : -1, "value" : -1 }, - "network" : ["EIP150", "EIP158"], + "network" : ["EIP150", ">=Byzantium"], "result" : { "1000000000000000000000000000000000000001" : { "storage" : { @@ -23,21 +23,6 @@ } } } - }, - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : ["Frontier", "Homestead"], - "result" : { - "1000000000000000000000000000000000000001" : { - "storage" : { - "0x01" : "0x00" - } - } - } } ], "pre" : diff --git a/src/GeneralStateTestsFiller/stEIP150Specific/NewGasPriceForCodesFiller.json b/src/GeneralStateTestsFiller/stEIP150Specific/NewGasPriceForCodesFiller.json index 091f46456..27ed057d6 100644 --- a/src/GeneralStateTestsFiller/stEIP150Specific/NewGasPriceForCodesFiller.json +++ b/src/GeneralStateTestsFiller/stEIP150Specific/NewGasPriceForCodesFiller.json @@ -38,7 +38,7 @@ "gas" : -1, "value" : -1 }, - "network" : ["EIP158"], + "network" : [">=Byzantium"], "result" : { "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "storage" : { @@ -61,29 +61,6 @@ "gas" : -1, "value" : -1 }, - "network" : ["Frontier"], - "result" : { - "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "storage" : { - "0x00" : "0x12", - "0x01" : "0x00", - "0x02" : "0x00", - "0x03" : "0x00", - "0x04" : "0x00", - "0x07" : "0x00", - "0x08" : "0x00", - "0x0a" : "0x00", - "0x64" : "0x00" - } - } - } - }, - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, "network" : ["Homestead"], "result" : { "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { diff --git a/src/GeneralStateTestsFiller/stEIP150Specific/SuicideToExistingContractFiller.json b/src/GeneralStateTestsFiller/stEIP150Specific/SuicideToExistingContractFiller.json index ca07be06d..a59e614a6 100644 --- a/src/GeneralStateTestsFiller/stEIP150Specific/SuicideToExistingContractFiller.json +++ b/src/GeneralStateTestsFiller/stEIP150Specific/SuicideToExistingContractFiller.json @@ -15,7 +15,7 @@ "gas" : -1, "value" : -1 }, - "network" : ["EIP150", "EIP158"], + "network" : ["EIP150", ">=Byzantium"], "result" : { "1000000000000000000000000000000000000118" : { "shouldnotexist" : "1" @@ -26,24 +26,6 @@ } } } - }, - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : ["Frontier", "Homestead"], - "result" : { - "1000000000000000000000000000000000000118" : { - "shouldnotexist" : "1" - }, - "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "storage" : { - "0x01" : "0x08d574" - } - } - } } ], "pre" : diff --git a/src/GeneralStateTestsFiller/stEIP150Specific/SuicideToNotExistingContractFiller.json b/src/GeneralStateTestsFiller/stEIP150Specific/SuicideToNotExistingContractFiller.json index ed8f8b575..e40220009 100644 --- a/src/GeneralStateTestsFiller/stEIP150Specific/SuicideToNotExistingContractFiller.json +++ b/src/GeneralStateTestsFiller/stEIP150Specific/SuicideToNotExistingContractFiller.json @@ -33,7 +33,7 @@ "gas" : -1, "value" : -1 }, - "network" : ["EIP158"], + "network" : [">=Byzantium"], "result" : { "1000000000000000000000000000000000000116" : { "shouldnotexist" : "1" @@ -44,24 +44,6 @@ } } } - }, - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : ["Frontier", "Homestead"], - "result" : { - "1000000000000000000000000000000000000116" : { - "shouldnotexist" : "1" - }, - "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "storage" : { - "0x01" : "0x08d574" - } - } - } } ], "pre" : diff --git a/src/GeneralStateTestsFiller/stEIP150Specific/Transaction64Rule_d64e0Filler.json b/src/GeneralStateTestsFiller/stEIP150Specific/Transaction64Rule_d64e0Filler.json index f05d4630b..3bad742c7 100644 --- a/src/GeneralStateTestsFiller/stEIP150Specific/Transaction64Rule_d64e0Filler.json +++ b/src/GeneralStateTestsFiller/stEIP150Specific/Transaction64Rule_d64e0Filler.json @@ -15,7 +15,7 @@ "gas" : -1, "value" : -1 }, - "network" : ["EIP150", "EIP158"], + "network" : ["EIP150", ">=Byzantium"], "result" : { "1000000000000000000000000000000000000118" : { "storage" : { @@ -29,27 +29,6 @@ } } } - }, - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : ["Frontier", "Homestead"], - "result" : { - "1000000000000000000000000000000000000118" : { - "storage" : { - "0x01" : "0x00" - } - }, - "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "storage" : { - "0x00" : "0x00", - "0x02" : "0x00" - } - } - } } ], "pre" : diff --git a/src/GeneralStateTestsFiller/stEIP150Specific/Transaction64Rule_d64m1Filler.json b/src/GeneralStateTestsFiller/stEIP150Specific/Transaction64Rule_d64m1Filler.json index 86f9683e8..150c282bd 100644 --- a/src/GeneralStateTestsFiller/stEIP150Specific/Transaction64Rule_d64m1Filler.json +++ b/src/GeneralStateTestsFiller/stEIP150Specific/Transaction64Rule_d64m1Filler.json @@ -15,7 +15,7 @@ "gas" : -1, "value" : -1 }, - "network" : ["EIP150", "EIP158"], + "network" : ["EIP150", ">=Byzantium"], "result" : { "1000000000000000000000000000000000000118" : { "storage" : { @@ -29,27 +29,6 @@ } } } - }, - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : ["Frontier", "Homestead"], - "result" : { - "1000000000000000000000000000000000000118" : { - "storage" : { - "0x01" : "0x00" - } - }, - "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "storage" : { - "0x00" : "0x00", - "0x02" : "0x00" - } - } - } } ], "pre" : diff --git a/src/GeneralStateTestsFiller/stEIP150Specific/Transaction64Rule_d64p1Filler.json b/src/GeneralStateTestsFiller/stEIP150Specific/Transaction64Rule_d64p1Filler.json index 06b38a70f..e8cb411d6 100644 --- a/src/GeneralStateTestsFiller/stEIP150Specific/Transaction64Rule_d64p1Filler.json +++ b/src/GeneralStateTestsFiller/stEIP150Specific/Transaction64Rule_d64p1Filler.json @@ -15,7 +15,7 @@ "gas" : -1, "value" : -1 }, - "network" : ["EIP150", "EIP158"], + "network" : ["EIP150", ">=Byzantium"], "result" : { "1000000000000000000000000000000000000118" : { "storage" : { @@ -29,27 +29,6 @@ } } } - }, - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : ["Frontier", "Homestead"], - "result" : { - "1000000000000000000000000000000000000118" : { - "storage" : { - "0x01" : "0x00" - } - }, - "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "storage" : { - "0x00" : "0x00", - "0x02" : "0x00" - } - } - } } ], "pre" : |