Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

OP_INVERT was modifying bytes in place, now they are popped, modified, and pushed back onto the stack #169

Merged
merged 2 commits into from
Aug 16, 2023
Merged

OP_INVERT was modifying bytes in place, now they are popped, modified, and pushed back onto the stack #169

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
92ca578
OP_INVERT
sirdeggen Aug 15, 2023
07c2ab9
Table based unit test for Execute function
boecklim Aug 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
61 changes: 45 additions & 16 deletions bscript/interpreter/engine_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -933,27 +933,56 @@ func TestEngine_WithState(t *testing.T) {
const (
txHex1 = `0100000001abdbd5873fbda1b08c19d899993301fd44c0aa735064ebb2248260b7adadf795000000006b483045022100e7813394c7a55941c1acf3c7032046c2aa5bf3a506b4ee09e4cb5761c1850f960220154769af29eef81d56d69eba1d7a5ab37eed15beb9eadcd2cb608ff2e09b3147c321035941a219bcd9688318028afeef55183634f010a933de9d8469ff6e702d96c238ffffffff010271000000000000220687623971234575ab76a914fbcf31b659334eeb086693fc3b4005ce29e1c21788ac00000000`

txHex2 = `01000000014cc6b457cc6a235b966cec69bc4e4ea1813b71bddb2adf800848e4430e622b3d000000006a47304402201c1b7c535ff8bbee0960e0dad34e0a07857eaae5abc5a556427f4cc95e36cea50220676e3fd4eb69e98d8f9659c3bfceb0cdb34a6926ff644a6d79666e2c8266cc78c321035941a219bcd9688318028afeef55183634f010a933de9d8469ff6e702d96c238ffffffff011671000000000000220687623971234575ab76a914fbcf31b659334eeb086693fc3b4005ce29e1c21788ac00000000`
prevTxHex1 = `01000000014cc6b457cc6a235b966cec69bc4e4ea1813b71bddb2adf800848e4430e622b3d000000006a47304402201c1b7c535ff8bbee0960e0dad34e0a07857eaae5abc5a556427f4cc95e36cea50220676e3fd4eb69e98d8f9659c3bfceb0cdb34a6926ff644a6d79666e2c8266cc78c321035941a219bcd9688318028afeef55183634f010a933de9d8469ff6e702d96c238ffffffff011671000000000000220687623971234575ab76a914fbcf31b659334eeb086693fc3b4005ce29e1c21788ac00000000`

txHex2 = `01000000034b8fcb7a23da7016355f50c5d1c8c7136f014ee9ace434350cdbd8c301881e4400000000fd5b044db7027b0a20202273657373696f6e4964223a202233636630346432322d636137342d343730392d383637322d323233313764316430646261222c0a2020226275796572223a207b0a20202020227075626c69634b6579223a2022303261376238633535363632656538646331623533346363333861626332383738643162383261643865396238363063656238353461386465383339336261663933222c0a2020202022637573746f6469616e223a2022544f4b454e4f56415445220a20207d2c0a20202273656c6c6572223a207b0a20202020227075626c69634b6579223a2022303231666438326631366431623636393639636237616131666435616362363964333963326635623933336266353464613836316531313637623735303062643534222c0a2020202022637573746f6469616e223a2022544f4b454e4f56415445220a20207d2c0a202022657865637574696f6e4964223a2022313438393030303030303030303030313538222c0a20202273796d626f6c223a20224b5341412d53504f54222c0a2020227175616e74697479223a2022312e30222c0a2020227072696365223a202238302e30222c0a2020227472616e73616374696f6e54696d65223a2022323032332d30352d32335431393a30303a30342e3833385a222c0a2020226d73674f726967696e223a2022474d4558222c0a2020226d7367554944223a202234616430383338372d323037332d346136342d383735342d613132383464623237393330222c0a2020226d736754797065223a20225452414445222c0a2020226d736754696d657374616d70223a20313638343836383430363433302c0a20202263617074757265644174223a20313638343836383430373636362c0a2020226576656e744964223a202263346263613235612d396263632d343364352d396539352d323538666666363534623137220a7d2412242242150a2742150a1912100912030f041918130410241105150d120d1024000000004ca001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004b8fcb7a23da7016355f50c5d1c8c7136f014ee9ace434350cdbd8c301881e440000000003adadac0100000000000000000000006c960ca3c7d91e65a2272a7b4059200a09d0b3cc4eef615ed9948f0e6b59aaa500000000c3000000483045022100fa0cea230d94a5f61a2e8b0b83d25bd28d33dca80c4b0c592ed2bfd135cf571302203e124f85b393cd7a09e2ba92189e3f0d5f3eee177f6a5b1c8b2cce841f06e1dec3473044022068209ef4ab5b548585217f12b5796042e19d8c9cabd9221d481a7c68be28bacf022074c0f2a2cf8a75e8fc4673e99fc7fe0abba05300aaa818f74328dc82e5698003c3483045022100d8f1ac46c4b0fb3bd6de7eb71ff6aed0fa42d9a9ac9372618dc2127301a6a1ec0220318f49dd87b54bdfc5b632ab9279a809a50c8087f54536e8e1f5adb8849de31dc3000000004e76c1ab14c5e89c3539587e126249658a5f5972b18790621bf33bfe910c51eb0a0000001514378e9efb1f8330a321df32bc0dbfdee93cf5bcc8ffffffff4e76c1ab14c5e89c3539587e126249658a5f5972b18790621bf33bfe910c51eb0b0000001514d1e0da74dfcc481916df4a0d0e92008a0924326bffffffff010000000000000000fd3c02006a4d3702546f6b656e6f76617465206861766520637265617465642061206e6577205452414445206576656e74206265747765656e3a0a42757965723a203032613762386335353636326565386463316235333463633338616263323837386431623832616438653962383630636562383534613864653833393362616639330a427579657220637573746f6469616e3a20544f4b454e4f564154450a616e640a53656c6c65723a203032316664383266313664316236363936396362376161316664356163623639643339633266356239333362663534646138363165313136376237353030626435340a53656c6c657220637573746f6469616e3a20544f4b454e4f564154450a0a666f7220312e3020756e697473204b5341412d53504f542061742061207072696365206f66202438302e302055534420656163682e0a0a5468652074726164652076656e756520697320474d45580a0a546869732074726164652077617320636f6d706c6574656420617420323032332d30352d32335431393a30303a30342e3833385a0a0a466f72206d6f726520696e666f726d6174696f6e207365653a2068747470733a2f2f726563656970747669657765722e746f6b656e6f766174652e636f6d2f74726164652f3134383930303030303030303030303135380a4b5341412d53706f742074726164652056657273696f6e3a20302e320a54686973207472616465206973207265636f72646564206f6e2074686520546f6b656e6f76617465207472616465206c65646765722e00000000`

prevTxHex2 = `01000000034e76c1ab14c5e89c3539587e126249658a5f5972b18790621bf33bfe910c51eb000000001514c20e5ee14158447c755d84770ed78c15a28ea835ffffffff4e76c1ab14c5e89c3539587e126249658a5f5972b18790621bf33bfe910c51eb010000001514a6ee8da20f9e18f09f41f090fd4c39a425fe4fe9ffffffff4e76c1ab14c5e89c3539587e126249658a5f5972b18790621bf33bfe910c51eb020000001514299f25978f6e8c46e7bd251cad128ffd48e90f67ffffffff010100000000000000fdfc16280a0a5543522d3136372076302e3161736d0a7777772e746f6b656e6f766174652e636f6d0a0a0a0a7576a91439900cd4a915bccd7efb137348fd3b0e5c1e3c978763ac6a6821026d25662a8c4d6d7822753f7ef95f964cd26f52d3d4be923ee858cb1e9830acedad547a547a517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f75816b816b816b816b816b816b816b816b816b816b816b816b816b816b816b816b816b816b816b816b816b816b816b816b816b816b816b816b816b816b816b816b816b816b816b817f6c7f6c7f6c7f6c7f6c7f6c7f6c7f6c7f6c7f6c7f6c7f6c7f6c7f6c7f6c7f6c7f6c7f6c7f6c7f6c7f6c7f6c7f6c7f6c7f6c7f6c7f6c7f6c7f6c7f6c7f6c7f6c7f6c7f6c7f6c7f7c6b7e7c6b7e7c6b7e7c6b7e7c6b7e7c6b7e7c6b7e7c6b7e7c6b7e7c6b7e7c6b7e7c6b7e7c6b7e7c6b7e7c6b7e7c6b7e7c6b7e7c6b7ea820d5c10a6bcb6f1122b49474822d75b6e27a704fd8525a96aec73b0a9c17adfb2a886c756c766c6c7b7b52796c6c6c76094b5341412d53504f548778094b5341412d53504f54879b696c6c6c6c7604474d4558886c756c76055452414445886c756c756c755f7901687f77517f7c7f7c03adadac88587f7c8151881e546f6b656e6f76617465206861766520637265617465642061206e6577207b7e17206576656e74206265747765656e3a0a42757965723a207e5b7a7e120a427579657220637573746f6469616e3a207e5a7a7e0d0a616e640a53656c6c65723a207e597a7e130a53656c6c657220637573746f6469616e3a207e587a7e060a0a666f72207e557a7e0720756e697473207e557a7e102061742061207072696365206f6620247e547a7e1f2055534420656163682e0a0a5468652074726164652076656e7565206973207e7b7e1e0a0a546869732074726164652077617320636f6d706c65746564206174207e7b7e470a0a466f72206d6f726520696e666f726d6174696f6e207365653a2068747470733a2f2f726563656970747669657765722e746f6b656e6f766174652e636f6d2f74726164652f7e7b7e4c540a4b5341412d53706f742074726164652056657273696f6e3a20302e320a54686973207472616465206973207265636f72646564206f6e2074686520546f6b656e6f76617465207472616465206c65646765722e7e827c7e03006a4d7c7e82090000000000000000fd7c7e7c7eaa7c547f7c836901207f7588517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f00012180607e007b760130013aa5630130677601610167a56901576894817b5498817d957b937b760130013aa5630130677601610167a56901576894817b5498817d957b937b760130013aa5630130677601610167a56901576894817b5498817d957b937b760130013aa5630130677601610167a56901576894817b5498817d957b937b760130013aa5630130677601610167a56901576894817b5498817d957b937b760130013aa5630130677601610167a56901576894817b5498817d957b937b760130013aa5630130677601610167a56901576894817b5498817d957b937b760130013aa5630130677601610167a56901576894817b5498817d957b937b760130013aa5630130677601610167a56901576894817b5498817d957b937b760130013aa5630130677601610167a56901576894817b5498817d957b937b760130013aa5630130677601610167a56901576894817b5498817d957b937b760130013aa5630130677601610167a56901576894817b5498817d957b937b760130013aa5630130677601610167a56901576894817b5498817d957b937b760130013aa5630130677601610167a56901576894817b5498817d957b937b760130013aa5630130677601610167a56901576894817b5498817d957b937b760130013aa5630130677601610167a56901576894817b5498817d957b937b760130013aa5630130677601610167a56901576894817b5498817d957b937b760130013aa5630130677601610167a56901576894817b5498817d957b937b760130013aa5630130677601610167a56901576894817b5498817d957b937b760130013aa5630130677601610167a56901576894817b5498817d957b937b760130013aa5630130677601610167a56901576894817b5498817d957b937b760130013aa5630130677601610167a56901576894817b5498817d957b937b760130013aa5630130677601610167a56901576894817b5498817d957b937b760130013aa5630130677601610167a56901576894817b5498817d957b937b760130013aa5630130677601610167a56901576894817b5498817d957b937b760130013aa5630130677601610167a56901576894817b5498817d957b937b760130013aa5630130677601610167a56901576894817b5498817d957b937b760130013aa5630130677601610167a56901576894817b5498817d957b937b760130013aa5630130677601610167a56901576894817b5498817d957b937b760130013aa5630130677601610167a56901576894817b5498817d957b937b760130013aa5630130677601610167a56901576894817b5498817d957b937b760130013aa5630130677601610167a56901576894817b5498817d957b937b760130013aa5630130677601610167a56901576894817b5498817d957b937b760130013aa5630130677601610167a56901576894817b5498817d957b937b760130013aa5630130677601610167a56901576894817b5498817d957b937b760130013aa5630130677601610167a56901576894817b5498817d957b937b760130013aa5630130677601610167a56901576894817b5498817d957b937b760130013aa5630130677601610167a56901576894817b5498817d957b937b760130013aa5630130677601610167a56901576894817b5498817d957b937b760130013aa5630130677601610167a56901576894817b5498817d957b937b760130013aa5630130677601610167a56901576894817b5498817d957b937b760130013aa5630130677601610167a56901576894817b5498817d957b937b760130013aa5630130677601610167a56901576894817b5498817d957b937b760130013aa5630130677601610167a56901576894817b5498817d957b937b760130013aa5630130677601610167a56901576894817b5498817d957b937b760130013aa5630130677601610167a56901576894817b5498817d957b937b760130013aa5630130677601610167a56901576894817b5498817d957b937b760130013aa5630130677601610167a56901576894817b5498817d957b937b760130013aa5630130677601610167a56901576894817b5498817d957b937b760130013aa5630130677601610167a56901576894817b5498817d957b937b760130013aa5630130677601610167a56901576894817b5498817d957b937b760130013aa5630130677601610167a56901576894817b5498817d957b937b760130013aa5630130677601610167a56901576894817b5498817d957b937b760130013aa5630130677601610167a56901576894817b5498817d957b937b760130013aa5630130677601610167a56901576894817b5498817d957b937b760130013aa5630130677601610167a56901576894817b5498817d957b937b760130013aa5630130677601610167a56901576894817b5498817d957b937b760130013aa5630130677601610167a56901576894817b5498817d957b937b760130013aa5630130677601610167a56901576894817b5498817d957b937b760130013aa5630130677601610167a56901576894817b5498817d957b937b760130013aa5630130677601610167a56901576894817b5498817d957b937b760130013aa5630130677601610167a56901576894817b5498817d957b937b760130013aa5630130677601610167a56901576894817b5498817d957b937b760130013aa5630130677601610167a56901576894817b5498817d957b937b760130013aa5630130677601610167a56901576894817b5498817d957b937b760130013aa5630130677601610167a56901576894817b5498817d957b93770800000000000000007e01217f757c517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f00012180607e007b760130013aa5630130677601610167a56901576894817b5498817d957b937b760130013aa5630130677601610167a56901576894817b5498817d957b937b760130013aa5630130677601610167a56901576894817b5498817d957b937b760130013aa5630130677601610167a56901576894817b5498817d957b937b760130013aa5630130677601610167a56901576894817b5498817d957b937b760130013aa5630130677601610167a56901576894817b5498817d957b937b760130013aa5630130677601610167a56901576894817b5498817d957b937b760130013aa5630130677601610167a56901576894817b5498817d957b937b760130013aa5630130677601610167a56901576894817b5498817d957b937b760130013aa5630130677601610167a56901576894817b5498817d957b937b760130013aa5630130677601610167a56901576894817b5498817d957b937b760130013aa5630130677601610167a56901576894817b5498817d957b937b760130013aa5630130677601610167a56901576894817b5498817d957b937b760130013aa5630130677601610167a56901576894817b5498817d957b937b760130013aa5630130677601610167a56901576894817b5498817d957b937b760130013aa5630130677601610167a56901576894817b5498817d957b937b760130013aa5630130677601610167a56901576894817b5498817d957b937b760130013aa5630130677601610167a56901576894817b5498817d957b937b760130013aa5630130677601610167a56901576894817b5498817d957b937b760130013aa5630130677601610167a56901576894817b5498817d957b937b760130013aa5630130677601610167a56901576894817b5498817d957b937b760130013aa5630130677601610167a56901576894817b5498817d957b937b760130013aa5630130677601610167a56901576894817b5498817d957b937b760130013aa5630130677601610167a56901576894817b5498817d957b937b760130013aa5630130677601610167a56901576894817b5498817d957b937b760130013aa5630130677601610167a56901576894817b5498817d957b937b760130013aa5630130677601610167a56901576894817b5498817d957b937b760130013aa5630130677601610167a56901576894817b5498817d957b937b760130013aa5630130677601610167a56901576894817b5498817d957b937b760130013aa5630130677601610167a56901576894817b5498817d957b937b760130013aa5630130677601610167a56901576894817b5498817d957b937b760130013aa5630130677601610167a56901576894817b5498817d957b937b760130013aa5630130677601610167a56901576894817b5498817d957b937b760130013aa5630130677601610167a56901576894817b5498817d957b937b760130013aa5630130677601610167a56901576894817b5498817d957b937b760130013aa5630130677601610167a56901576894817b5498817d957b937b760130013aa5630130677601610167a56901576894817b5498817d957b937b760130013aa5630130677601610167a56901576894817b5498817d957b937b760130013aa5630130677601610167a56901576894817b5498817d957b937b760130013aa5630130677601610167a56901576894817b5498817d957b937b760130013aa5630130677601610167a56901576894817b5498817d957b937b760130013aa5630130677601610167a56901576894817b5498817d957b937b760130013aa5630130677601610167a56901576894817b5498817d957b937b760130013aa5630130677601610167a56901576894817b5498817d957b937b760130013aa5630130677601610167a56901576894817b5498817d957b937b760130013aa5630130677601610167a56901576894817b5498817d957b937b760130013aa5630130677601610167a56901576894817b5498817d957b937b760130013aa5630130677601610167a56901576894817b5498817d957b937b760130013aa5630130677601610167a56901576894817b5498817d957b937b760130013aa5630130677601610167a56901576894817b5498817d957b937b760130013aa5630130677601610167a56901576894817b5498817d957b937b760130013aa5630130677601610167a56901576894817b5498817d957b937b760130013aa5630130677601610167a56901576894817b5498817d957b937b760130013aa5630130677601610167a56901576894817b5498817d957b937b760130013aa5630130677601610167a56901576894817b5498817d957b937b760130013aa5630130677601610167a56901576894817b5498817d957b937b760130013aa5630130677601610167a56901576894817b5498817d957b937b760130013aa5630130677601610167a56901576894817b5498817d957b937b760130013aa5630130677601610167a56901576894817b5498817d957b937b760130013aa5630130677601610167a56901576894817b5498817d957b937b760130013aa5630130677601610167a56901576894817b5498817d957b937b760130013aa5630130677601610167a56901576894817b5498817d957b937b760130013aa5630130677601610167a56901576894817b5498817d957b937b760130013aa5630130677601610167a56901576894817b5498817d957b937b760130013aa5630130677601610167a56901576894817b5498817d957b937b760130013aa5630130677601610167a56901576894817b5498817d957b93770800000000000000007e01217f757b7c547aaa517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e01007e011f7f817e00011f80517e9321414136d08c5ed2bf3ba048afe6dcaebafeffffffffffffffffffffffffffffff007d5296789f637897785296789f639467776867776876927f76927f76927f76927f76927f76927f76927f76927f76927f76927f76927f76927f76927f76927f76927f76927f76927f76927f76927f76927f76927f76927f76927f76927f76927f76927f76927f76927f76927f76927f76927f7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e827c7e23022079be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798027c7e827c7e01307c7e01c37e2102b405d7f0322a89d0f9f3a98e6f938fdc1c969a8d1382a2bf66a71ae74a1e83b020b204c9123d063d0863b3422c5345cc7f73f564e66040c74c0f687b90366ed81520260e588c8eed91df4813e5dd18388c91878b888df5a7a908bf7ce0aa76243c442463f72ad3f50dc949c895babb7d704b86df66210395ec3440cf2a7fdb1e89df7302000000756dabadadac00000000`
)

func TestExecute(t *testing.T) {
t.Run("OP_CODESEPARATOR parsing", func(t *testing.T) {
tt := []struct {
name string
txHex string
prevTxHex string
}{
{
name: "OP_CODESEPARATOR parsing",
txHex: txHex1,
prevTxHex: prevTxHex1,
},
{
name: "OP_INVERT shouldn't modify items other than the top value of the stack",
txHex: txHex2,
prevTxHex: prevTxHex2,
},
}

tx, err := bt.NewTxFromString(txHex1)
require.NoError(t, err)
for _, tc := range tt {
t.Run(tc.name, func(t *testing.T) {
tx, err := bt.NewTxFromString(tc.txHex)
require.NoError(t, err)

prevTx, err := bt.NewTxFromString(txHex2)
require.NoError(t, err)
beforeScript, _ := tx.Inputs[0].UnlockingScript.ToASM()

inputIdx := 0
input := tx.InputIdx(inputIdx)
prevOutput := prevTx.OutputIdx(int(input.PreviousTxOutIndex))
prevTx, err := bt.NewTxFromString(tc.prevTxHex)
require.NoError(t, err)

err = NewEngine().Execute(
WithTx(tx, inputIdx, prevOutput),
WithForkID(),
WithAfterGenesis(),
)
require.NoError(t, err)
})
inputIdx := 0
input := tx.InputIdx(inputIdx)
prevOutput := prevTx.OutputIdx(int(input.PreviousTxOutIndex))

err = NewEngine().Execute(
WithTx(tx, inputIdx, prevOutput),
WithForkID(),
WithAfterGenesis(),
)

afterScript, _ := tx.Inputs[0].UnlockingScript.ToASM()

require.Equal(t, beforeScript, afterScript)

require.NoError(t, err)
})
}
}
9 changes: 7 additions & 2 deletions bscript/interpreter/operations.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1090,15 +1090,20 @@ func opcodeSize(op *ParsedOpcode, t *thread) error {
//
// Stack transformation: a -> ~a
func opcodeInvert(op *ParsedOpcode, t *thread) error {
ba, err := t.dstack.PeekByteArray(0)
ba, err := t.dstack.PopByteArray()
if err != nil {
return err
}

// We need to invert without modifying the bytes in place.
// If we modify in place then these changes are reflected elsewhere in the stack.
baInverted := make([]byte, len(ba))
for i := range ba {
ba[i] = ba[i] ^ 0xFF
baInverted[i] = ba[i] ^ 0xFF
}

t.dstack.PushByteArray(baInverted)

return nil
}

Expand Down
Loading