Update zetaclient/chains/bitcoin/tx_script.go

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
zeta-chain · Jul 24, 2024 · 4467e13 · 4467e13
1 parent 46ceef9
commit 4467e13
Showing 1 changed file with 3 additions and 6 deletions.
diff --git a/zetaclient/chains/bitcoin/tx_script.go b/zetaclient/chains/bitcoin/tx_script.go
@@ -277,21 +277,18 @@ func DecodeTSSVout(vout btcjson.Vout, receiverExpected string, chain chains.Chai
 }
 
 func decodeInscriptionPayload(t *scriptTokenizer) ([]byte, error) {
-	if !t.Next() || t.Opcode() != txscript.OP_FALSE {
+	if (!t.Next() || t.Opcode() != txscript.OP_FALSE) {
 		return nil, fmt.Errorf("OP_FALSE not found")
 	}
 
-	if !t.Next() || t.Opcode() != txscript.OP_IF {
+	if (!t.Next() || t.Opcode() != txscript.OP_IF) {
 		return nil, fmt.Errorf("OP_IF not found")
 	}
 
 	memo := make([]byte, 0)
 	var next byte
-	for t.Next() {
+	for t.Next() && t.Opcode() != txscript.OP_ENDIF {
 		next = t.Opcode()
-		if next == txscript.OP_ENDIF {
-			return memo, nil
-		}
 		if next < txscript.OP_DATA_1 || next > txscript.OP_PUSHDATA4 {
 			return nil, fmt.Errorf("expecting data push, found %d", next)
 		}