Add more interpreter tests and refactor

Author: vostrnad

src/lib/utils/bitcoin/script/interpreter.ts

@@ -16,7 +16,6 @@ import {
   isXOnlyKey,
 } from '$lib/utils/bitcoin/pubkey'
 import {
-  OP_0,
   OP_0NOTEQUAL,
   OP_1,
   OP_10,
@@ -383,8 +382,8 @@ export const evalScript = (
       if (pubkey.length > 0 && !isXOnlyKey(pubkey)) {
         warnings.add(`${bytesToHex(pubkey)} is not a valid x-only public key`)
       }
-      return
     }
+
     if (tapscript === false) {
       if (sig.length > 0 && !isValidDERSignature(sig)) {
         warnings.add(`${bytesToHex(sig)} is not a valid DER signature`)
@@ -396,14 +395,20 @@ export const evalScript = (
       }
       return
     }
-    if (sig.length > 0 && !isAnyKnownSignature(sig)) {
-      warnings.add(`${bytesToHex(sig)} is not a valid signature`)
-    }
-    if (pubkey.length > 0 && !isAnyKnownPublicKey(pubkey)) {
-      warnings.add(`${bytesToHex(pubkey)} is not a valid public key`)
+
+    if (tapscript === undefined) {
+      if (sig.length > 0 && !isAnyKnownSignature(sig)) {
+        warnings.add(`${bytesToHex(sig)} is not a valid signature`)
+      }
+      if (pubkey.length > 0 && !isAnyKnownPublicKey(pubkey)) {
+        warnings.add(`${bytesToHex(pubkey)} is not a valid public key`)
+      }
     }
-    if (isHybridKey(pubkey)) {
-      warnings.add('hybrid public keys are non-standard')
+
+    if (tapscript !== true) {
+      if (isHybridKey(pubkey)) {
+        warnings.add('hybrid public keys are non-standard')
+      }
     }
   }
 
@@ -443,7 +448,7 @@ export const evalScript = (
       warnings.add(ScriptWarning.cat)
     }
 
-    if (opcode >= 1 && opcode <= OP_PUSHDATA4) {
+    if (opcode <= OP_PUSHDATA4) {
       let pushBytes: number
 
       if (opcode <= 75) {
@@ -488,11 +493,6 @@ export const evalScript = (
     }
 
     switch (opcode) {
-      case OP_0:
-        stack.push(new Uint8Array())
-        loopHighlight = { count: 1, color: 'stack' }
-        break
-
       case OP_1NEGATE:
       case OP_1:
       case OP_2:
@@ -618,6 +618,9 @@ export const evalScript = (
       case OP_RETURN:
         return setError(SCRIPT_ERR_OP_RETURN)
 
+      //
+      // Stack ops
+      //
       case OP_TOALTSTACK:
         if (stack.length === 0) {
           return setStackSizeError(1)
@@ -931,7 +934,7 @@ export const evalScript = (
               bn = -bn
               break
             case OP_ABS:
-              if (bn < 0) bn = -bn
+              bn = Math.max(bn, -bn)
               break
             case OP_NOT:
               bn = Number(bn === 0)
@@ -990,8 +993,6 @@ export const evalScript = (
               bn = bn1 !== 0 || bn2 !== 0
               break
             case OP_NUMEQUAL:
-              bn = bn1 === bn2
-              break
             case OP_NUMEQUALVERIFY:
               bn = bn1 === bn2
               break
@@ -1011,10 +1012,10 @@ export const evalScript = (
               bn = bn1 >= bn2
               break
             case OP_MIN:
-              bn = bn1 < bn2 ? bn1 : bn2
+              bn = Math.min(bn1, bn2)
               break
             case OP_MAX:
-              bn = bn1 > bn2 ? bn1 : bn2
+              bn = Math.max(bn1, bn2)
               break
           }
           if (opcode === OP_NUMEQUALVERIFY && !bn) {
@@ -1170,10 +1171,10 @@ export const evalScript = (
                 : `number of public keys cannot be higher than ${MAX_PUBKEYS_PER_MULTISIG}`
             return setError(SCRIPT_ERR_PUBKEY_COUNT, message)
           }
-          let ikey = ++i
+          const ikey = ++i
           // ikey2 is the position of last non-signature item in the stack. Top stack item = 1.
           // With SCRIPT_VERIFY_NULLFAIL, this is used for cleanup if operation fails.
-          let ikey2 = nKeysCount + 2
+          const ikey2 = nKeysCount + 2
           i += nKeysCount
           if (stack.length < i) {
             return setStackSizeError(i)
@@ -1188,7 +1189,7 @@ export const evalScript = (
                 : `number of signatures cannot be higher than number of public keys`
             return setError(SCRIPT_ERR_SIG_COUNT, message)
           }
-          let isig = ++i
+          const isig = ++i
           i += nSigsCount
           if (stack.length < i) {
             return setStackSizeError(i)
@@ -1204,10 +1205,8 @@ export const evalScript = (
             checkSignaturePubkeyWarnings(vchSig, vchPubKey, false)
 
             if (fOk) {
-              isig++
               nSigsCount--
             }
-            ikey++
             nKeysCount--
 
             // If there are more signatures left than keys left,
@@ -1223,7 +1222,6 @@ export const evalScript = (
 
           // Clean up stack of actual arguments
           while (i-- > 1) {
-            if (ikey2 > 0) ikey2--
             popstack()
           }
 
@@ -1233,12 +1231,6 @@ export const evalScript = (
           // Unfortunately this is a potential source of mutability,
           // so optionally verify it is exactly equal to zero prior
           // to removing it from the stack.
-          if (stack.length === 0) {
-            return setError(
-              SCRIPT_ERR_INVALID_STACK_OPERATION,
-              'OP_CHECKMULTISIG requires a dummy stack item',
-            )
-          }
           if (stacktop(-1)!.length > 0) {
             loopHighlight = { count: 1, color: 'error' }
             return setError(SCRIPT_ERR_SIG_NULLDUMMY)