From 7903da64e0f926ac26121b3a58924e4afc96b879 Mon Sep 17 00:00:00 2001 From: Andrei Maiboroda Date: Wed, 28 Dec 2022 18:50:11 +0100 Subject: [PATCH] Update EOF1_RJUMP_RJUMPI_Execution tests --- .../EOF1_RJUMP_RJUMPI_ExecutionFiller.yml | 82 ++----------------- 1 file changed, 9 insertions(+), 73 deletions(-) diff --git a/src/GeneralStateTestsFiller/EIPTests/stEOF/stEIP4200/EOF1_RJUMP_RJUMPI_ExecutionFiller.yml b/src/GeneralStateTestsFiller/EIPTests/stEOF/stEIP4200/EOF1_RJUMP_RJUMPI_ExecutionFiller.yml index 7f656128ec5..e51366d66db 100644 --- a/src/GeneralStateTestsFiller/EIPTests/stEOF/stEIP4200/EOF1_RJUMP_RJUMPI_ExecutionFiller.yml +++ b/src/GeneralStateTestsFiller/EIPTests/stEOF/stEIP4200/EOF1_RJUMP_RJUMPI_ExecutionFiller.yml @@ -22,50 +22,38 @@ EOF1_RJUMP_RJUMPI_Execution: storage: {} 1000000000000000000000000000000000000001: balance: 0 - # RJUMP(1) INVALID PUSH1(1) PUSH1(0) MSTORE8 PUSH1(1) PUSH1(0) RETURN - code: ':raw 0xef000101000e005c0001fe600160005360016000f3' + # RJUMP(1) RETURN PUSH1(1) PUSH1(0) MSTORE8 PUSH1(1) PUSH1(0) RJUMP(-13) + code: ':raw 0xef0001010004020001001003000000000000025c0001f36001600053600160005cfff3' nonce: 0 storage: {} 1000000000000000000000000000000000000002: balance: 0 - # RJUMP(1) INVALID PUSH1(1) PUSH1(0) MSTORE8 PUSH1(1) PUSH1(0) RETURN - code: ':raw 0xef000101000e020004005c0001fe600160005360016000f3deadbeef' - nonce: 0 - storage: {} - 1000000000000000000000000000000000000003: - balance: 0 - # RJUMP(11) INVALID PUSH1(1) PUSH1(0) MSTORE8 PUSH1(1) PUSH1(0) RETURN RJUMP(-13) STOP - code: ':raw 0xef0001010012005c000bfe600160005360016000f35cfff300' - nonce: 0 - storage: {} - 1000000000000000000000000000000000000004: - balance: 0 - # RJUMP(-11) INVALID PUSH1(1) PUSH1(0) MSTORE8 PUSH1(1) PUSH1(0) RETURN RJUMP(-11) STOP - code: ':raw 0xef0001010012020004005c000bfe600160005360016000f35cfff300deadbeef' + # RJUMP(1) RETURN PUSH1(1) PUSH1(0) MSTORE8 PUSH1(1) PUSH1(0) RJUMP(-13) + code: ':raw 0xef0001010004020001001003000400000000025c0001f36001600053600160005cfff3deadbeef' nonce: 0 storage: {} 1000000000000000000000000000000000000005: balance: 0 # RJUMP(0) PUSH1(1) PUSH1(0) MSTORE8 PUSH1(1) PUSH1(0) RETURN - code: ':raw 0xef000101000d005c0000600160005360016000f3' + code: ':raw 0xef0001010004020001000d03000000000000025c0000600160005360016000f3' nonce: 0 storage: {} 1000000000000000000000000000000000000006: balance: 0 # PUSH1(0) CALLDATALOAD RJUMPI(10) PUSH1(2) PUSH1(0) MSTORE8 PUSH1(1) PUSH1(0) RETURN PUSH1(1) PUSH1(0) MSTORE8 PUSH1(1) PUSH1(0) RETURN - code: ':raw 0xef000101001a006000355d000a600260005360016000f3600160005360016000f3' + code: ':raw 0xef0001010004020001001a03000000000000026000355d000a600260005360016000f3600160005360016000f3' nonce: 0 storage: {} 1000000000000000000000000000000000000007: balance: 0 - # RJUMP(11) INVALID PUSH1(1) PUSH1(0) MSTORE8 PUSH1(1) PUSH1(0) RETURN PUSH1(0) CALLDATALOAD RJUMPI(-16) PUSH1(2) PUSH1(0) MSTORE8 PUSH1(1) PUSH1(0) RETURN - code: ':raw 0xef000101001e005c000bfe600160005360016000f36000355dfff0600260005360016000f3' + # RJUMP(10) PUSH1(1) PUSH1(0) MSTORE8 PUSH1(1) PUSH1(0) RETURN PUSH1(0) CALLDATALOAD RJUMPI(-16) PUSH1(2) PUSH1(0) MSTORE8 PUSH1(1) PUSH1(0) RETURN + code: ':raw 0xef0001010004020001001d03000000000000025c000a600160005360016000f36000355dfff0600260005360016000f3' nonce: 0 storage: {} 1000000000000000000000000000000000000008: balance: 0 # PUSH1(0) CALLDATALOAD RJUMPI(0) PUSH1(1) PUSH1(0) MSTORE8 PUSH1(1) PUSH1(0) RETURN - code: ':raw 0xef0001010010006000355d0000600160005360016000f3' + code: ':raw 0xef0001010004020001001003000000000000026000355d0000600160005360016000f3' nonce: 0 storage: {} @@ -73,8 +61,6 @@ EOF1_RJUMP_RJUMPI_Execution: data: - ':label rjump :raw 0x1000000000000000000000000000000000000001' - ':label rjump_with_data :raw 0x1000000000000000000000000000000000000002' - - ':label rjump_backward :raw 0x1000000000000000000000000000000000000003' - - ':label rjump_backward_with_data :raw 0x1000000000000000000000000000000000000004' - ':label rjump_zero_offset :raw 0x1000000000000000000000000000000000000005' - ':label rjumpi_condition_true :raw 0x100000000000000000000000000000000000000601' - ':label rjumpi_condition_false :raw 0x100000000000000000000000000000000000000600' @@ -142,56 +128,6 @@ EOF1_RJUMP_RJUMPI_Execution: 1000000000000000000000000000000000000001: storage: {} - - indexes: - data: ':label rjump_backward' - network: - - 'Merge' - result: - a94f5374fce5edbc8e2a8697c15331677e6ebf0b: - nonce: 1 - b94f5374fce5edbc8e2a8697c15331677e6ebf0b: - storage: {} - 1000000000000000000000000000000000000001: - storage: {} - - indexes: - data: ':label rjump_backward' - network: - - 'Merge+3540+3670+4200' - result: - a94f5374fce5edbc8e2a8697c15331677e6ebf0b: - nonce: 1 - b94f5374fce5edbc8e2a8697c15331677e6ebf0b: - storage: - '0': '1' - '1': '1' - 1000000000000000000000000000000000000001: - storage: {} - - - indexes: - data: ':label rjump_backward_with_data' - network: - - 'Merge' - result: - a94f5374fce5edbc8e2a8697c15331677e6ebf0b: - nonce: 1 - b94f5374fce5edbc8e2a8697c15331677e6ebf0b: - storage: {} - 1000000000000000000000000000000000000001: - storage: {} - - indexes: - data: ':label rjump_backward_with_data' - network: - - 'Merge+3540+3670+4200' - result: - a94f5374fce5edbc8e2a8697c15331677e6ebf0b: - nonce: 1 - b94f5374fce5edbc8e2a8697c15331677e6ebf0b: - storage: - '0': '1' - '1': '1' - 1000000000000000000000000000000000000001: - storage: {} - - indexes: data: ':label rjump_zero_offset' network: