@bsv/sdk 1.4.19 → 1.4.22

package/dist/cjs/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bsv/sdk",
-  "version": "1.4.19",
+  "version": "1.4.22",
   "type": "commonjs",
   "description": "BSV Blockchain Software Development Kit",
   "files": [

package/dist/cjs/src/script/Spend.js

@@ -59,6 +59,7 @@ const requireCleanStack = true;
  * @property {number} inputIndex - The index of this input in the current transaction.
  * @property {UnlockingScript} unlockingScript - The unlocking script that unlocks the UTXO for spending.
  * @property {number} inputSequence - The sequence number of this input.
+ * @property {number} lockTime - The lock time of the transaction.
  */
 class Spend {
     /**
@@ -90,9 +91,11 @@ class Spend {
      *   inputIndex: 0, // inputIndex
      *   unlockingScript: UnlockingScript.fromASM("3045... 02ab..."),
      *   inputSequence: 0xffffffff // inputSequence
+     *   memoryLimit: 100000 // memoryLimit
      * });
      */
     constructor(params) {
+        var _a;
         this.sourceTXID = params.sourceTXID;
         this.sourceOutputIndex = params.sourceOutputIndex;
         this.sourceSatoshis = params.sourceSatoshis;
@@ -104,6 +107,9 @@ class Spend {
         this.unlockingScript = params.unlockingScript;
         this.inputSequence = params.inputSequence;
         this.lockTime = params.lockTime;
+        this.memoryLimit = (_a = params.memoryLimit) !== null && _a !== void 0 ? _a : 100000; // 100 MB is going to be processed by most miners by policy, but the default should protect apps against memory attacks.
+        this.stackMem = 0;
+        this.altStackMem = 0;
         this.reset();
     }
     reset() {
@@ -113,9 +119,25 @@ class Spend {
         this.stack = [];
         this.altStack = [];
         this.ifStack = [];
+        this.stackMem = 0;
+        this.altStackMem = 0;
     }
     step() {
-        var _a, _b, _c, _d, _e, _f;
+        var _a, _b, _c, _d;
+        let poppedValue;
+        // If the stack (or alt stack) is over the memory limit, evaluation has failed.
+        if (this.stackMem > this.memoryLimit) {
+            this.scriptEvaluationError('Stack memory usage has exceeded ' + String(this.memoryLimit) + ' bytes');
+            return false;
+        }
+        if (this.altStackMem > this.memoryLimit) {
+            this.scriptEvaluationError('Alt stack memory usage has exceeded ' + String(this.memoryLimit) + ' bytes');
+            return false;
+        }
+        // Clear popped values after use to free memory
+        const clearPoppedValue = () => {
+            poppedValue = undefined;
+        };
         // If the context is UnlockingScript and we have reached the end,
         // set the context to LockingScript and zero the program counter
         if (this.context === 'UnlockingScript' &&
@@ -245,6 +267,10 @@ class Spend {
                 //  Non-canonical signature: R value type mismatch
                 return false;
             }
+            if (buf[4 - 1] !== nLEnR) {
+                //  Non-canonical signature: R length mismatch
+                return false;
+            }
             if (nLEnR === 0) {
                 //  Non-canonical signature: R length is zero
                 return false;
@@ -262,6 +288,10 @@ class Spend {
                 //  Non-canonical signature: S value type mismatch
                 return false;
             }
+            if (buf[6 + nLEnR - 1] !== nLEnS) {
+                //  Non-canonical signature: S length mismatch
+                return false;
+            }
             if (nLEnS === 0) {
                 //  Non-canonical signature: S length is zero
                 return false;
@@ -355,9 +385,11 @@ class Spend {
             }
             if (!Array.isArray(operation.data)) {
                 this.stack.push([]);
+                this.stackMem += 0;
             }
             else {
                 this.stack.push(operation.data);
+                this.stackMem += operation.data.length;
             }
         }
         else if (isScriptExecuting ||
@@ -383,6 +415,7 @@ class Spend {
                     n = currentOpcode - (OP_js_1.default.OP_1 - 1);
                     buf = new BigNumber_js_1.default(n).toScriptNum();
                     this.stack.push(buf);
+                    this.stackMem += buf.length;
                     break;
                 case OP_js_1.default.OP_NOP:
                 case OP_js_1.default.OP_NOP2:
@@ -472,7 +505,11 @@ class Spend {
                         if (currentOpcode === OP_js_1.default.OP_NOTIF) {
                             fValue = !fValue;
                         }
-                        this.stack.pop();
+                        poppedValue = this.stack.pop();
+                        if (poppedValue != null) {
+                            this.stackMem -= poppedValue.length;
+                        }
+                        clearPoppedValue();
                     }
                     this.ifStack.push(fValue);
                     break;
@@ -495,10 +532,12 @@ class Spend {
                     }
                     buf = this.stacktop(-1);
                     fValue = this.castToBool(buf);
-                    if (fValue) {
-                        this.stack.pop();
+                    poppedValue = this.stack.pop();
+                    if (poppedValue != null) {
+                        this.stackMem -= poppedValue.length;
                     }
-                    else {
+                    clearPoppedValue();
+                    if (!fValue) {
                         this.scriptEvaluationError('OP_VERIFY requires the top stack value to be truthy.');
                     }
                     break;
@@ -515,20 +554,40 @@ class Spend {
                     if (this.stack.length < 1) {
                         this.scriptEvaluationError('OP_TOALTSTACK requires at oeast one item to be on the stack.');
                     }
-                    this.altStack.push((_a = this.stack.pop()) !== null && _a !== void 0 ? _a : []);
+                    poppedValue = this.stack.pop();
+                    if (poppedValue != null) {
+                        this.altStack.push(poppedValue);
+                        this.altStackMem += poppedValue.length;
+                        this.stackMem -= poppedValue.length;
+                    }
+                    clearPoppedValue();
                     break;
                 case OP_js_1.default.OP_FROMALTSTACK:
                     if (this.altStack.length < 1) {
                         this.scriptEvaluationError('OP_FROMALTSTACK requires at least one item to be on the stack.');
                     }
-                    this.stack.push((_b = this.altStack.pop()) !== null && _b !== void 0 ? _b : []);
+                    poppedValue = this.altStack.pop();
+                    if (poppedValue != null) {
+                        this.stack.push(poppedValue);
+                        this.stackMem += poppedValue.length;
+                        this.altStackMem -= poppedValue.length;
+                    }
+                    clearPoppedValue();
                     break;
                 case OP_js_1.default.OP_2DROP:
                     if (this.stack.length < 2) {
                         this.scriptEvaluationError('OP_2DROP requires at least two items to be on the stack.');
                     }
-                    this.stack.pop();
-                    this.stack.pop();
+                    poppedValue = this.stack.pop();
+                    if (poppedValue != null) {
+                        this.stackMem -= poppedValue.length;
+                    }
+                    clearPoppedValue();
+                    poppedValue = this.stack.pop();
+                    if (poppedValue != null) {
+                        this.stackMem -= poppedValue.length;
+                    }
+                    clearPoppedValue();
                     break;
                 case OP_js_1.default.OP_2DUP:
                     if (this.stack.length < 2) {
@@ -537,7 +596,9 @@ class Spend {
                     buf1 = this.stacktop(-2);
                     buf2 = this.stacktop(-1);
                     this.stack.push([...buf1]);
+                    this.stackMem += buf1.length;
                     this.stack.push([...buf2]);
+                    this.stackMem += buf2.length;
                     break;
                 case OP_js_1.default.OP_3DUP:
                     if (this.stack.length < 3) {
@@ -547,8 +608,11 @@ class Spend {
                     buf2 = this.stacktop(-2);
                     buf3 = this.stacktop(-1);
                     this.stack.push([...buf1]);
+                    this.stackMem += buf1.length;
                     this.stack.push([...buf2]);
+                    this.stackMem += buf2.length;
                     this.stack.push([...buf3]);
+                    this.stackMem += buf3.length;
                     break;
                 case OP_js_1.default.OP_2OVER:
                     if (this.stack.length < 4) {
@@ -557,7 +621,9 @@ class Spend {
                     buf1 = this.stacktop(-4);
                     buf2 = this.stacktop(-3);
                     this.stack.push([...buf1]);
+                    this.stackMem += buf1.length;
                     this.stack.push([...buf2]);
+                    this.stackMem += buf2.length;
                     break;
                 case OP_js_1.default.OP_2ROT:
                     if (this.stack.length < 6) {
@@ -565,7 +631,9 @@ class Spend {
                     }
                     spliced = this.stack.splice(this.stack.length - 6, 2);
                     this.stack.push(spliced[0]);
+                    this.stackMem += spliced[0].length;
                     this.stack.push(spliced[1]);
+                    this.stackMem += spliced[1].length;
                     break;
                 case OP_js_1.default.OP_2SWAP:
                     if (this.stack.length < 4) {
@@ -573,7 +641,9 @@ class Spend {
                     }
                     spliced = this.stack.splice(this.stack.length - 4, 2);
                     this.stack.push(spliced[0]);
+                    this.stackMem += spliced[0].length;
                     this.stack.push(spliced[1]);
+                    this.stackMem += spliced[1].length;
                     break;
                 case OP_js_1.default.OP_IFDUP:
                     if (this.stack.length < 1) {
@@ -583,35 +653,44 @@ class Spend {
                     fValue = this.castToBool(buf);
                     if (fValue) {
                         this.stack.push([...buf]);
+                        this.stackMem += buf.length;
                     }
                     break;
                 case OP_js_1.default.OP_DEPTH:
                     buf = new BigNumber_js_1.default(this.stack.length).toScriptNum();
                     this.stack.push(buf);
+                    this.stackMem += buf.length;
                     break;
                 case OP_js_1.default.OP_DROP:
                     if (this.stack.length < 1) {
                         this.scriptEvaluationError('OP_DROP requires at least one item to be on the stack.');
                     }
-                    this.stack.pop();
+                    poppedValue = this.stack.pop();
+                    if (poppedValue != null) {
+                        this.stackMem -= poppedValue.length;
+                    }
+                    clearPoppedValue();
                     break;
                 case OP_js_1.default.OP_DUP:
                     if (this.stack.length < 1) {
                         this.scriptEvaluationError('OP_DUP requires at least one item to be on the stack.');
                     }
                     this.stack.push([...this.stacktop(-1)]);
+                    this.stackMem += this.stacktop(-1).length;
                     break;
                 case OP_js_1.default.OP_NIP:
                     if (this.stack.length < 2) {
                         this.scriptEvaluationError('OP_NIP requires at least two items to be on the stack.');
                     }
                     this.stack.splice(this.stack.length - 2, 1);
+                    this.stackMem -= this.stacktop(-1).length;
                     break;
                 case OP_js_1.default.OP_OVER:
                     if (this.stack.length < 2) {
                         this.scriptEvaluationError('OP_OVER requires at least two items to be on the stack.');
                     }
                     this.stack.push([...this.stacktop(-2)]);
+                    this.stackMem += this.stacktop(-2).length;
                     break;
                 case OP_js_1.default.OP_PICK:
                 case OP_js_1.default.OP_ROLL:
@@ -621,15 +700,21 @@ class Spend {
                     buf = this.stacktop(-1);
                     bn = BigNumber_js_1.default.fromScriptNum(buf, requireMinimalPush);
                     n = bn.toNumber();
-                    this.stack.pop();
+                    poppedValue = this.stack.pop();
+                    if (poppedValue != null) {
+                        this.stackMem -= poppedValue.length;
+                    }
+                    clearPoppedValue();
                     if (n < 0 || n >= this.stack.length) {
                         this.scriptEvaluationError(`${OP_js_1.default[currentOpcode]} requires the top stack element to be 0 or a positive number less than the current size of the stack.`);
                     }
                     buf = this.stacktop(-n - 1);
                     if (currentOpcode === OP_js_1.default.OP_ROLL) {
                         this.stack.splice(this.stack.length - n - 1, 1);
+                        this.stackMem -= buf.length;
                     }
                     this.stack.push([...buf]);
+                    this.stackMem += buf.length;
                     break;
                 case OP_js_1.default.OP_ROT:
                     if (this.stack.length < 3) {
@@ -656,6 +741,7 @@ class Spend {
                         this.scriptEvaluationError('OP_TUCK requires at least two items to be on the stack.');
                     }
                     this.stack.splice(this.stack.length - 2, 0, [...this.stacktop(-1)]);
+                    this.stackMem += this.stacktop(-1).length;
                     break;
                 case OP_js_1.default.OP_SIZE:
                     if (this.stack.length < 1) {
@@ -663,6 +749,7 @@ class Spend {
                     }
                     bn = new BigNumber_js_1.default(this.stacktop(-1).length);
                     this.stack.push(bn.toScriptNum());
+                    this.stackMem += bn.toScriptNum().length;
                     break;
                 case OP_js_1.default.OP_AND:
                 case OP_js_1.default.OP_OR:
@@ -693,7 +780,11 @@ class Spend {
                             break;
                     }
                     // And pop vch2.
-                    this.stack.pop();
+                    poppedValue = this.stack.pop();
+                    if (poppedValue != null) {
+                        this.stackMem -= poppedValue.length;
+                    }
+                    clearPoppedValue();
                     break;
                 case OP_js_1.default.OP_INVERT:
                     if (this.stack.length < 1) {
@@ -711,7 +802,11 @@ class Spend {
                     }
                     buf1 = this.stacktop(-2);
                     if (buf1.length === 0) {
-                        this.stack.pop();
+                        poppedValue = this.stack.pop();
+                        if (poppedValue != null) {
+                            this.stackMem -= poppedValue.length;
+                        }
+                        clearPoppedValue();
                     }
                     else {
                         bn1 = new BigNumber_js_1.default(buf1);
@@ -720,8 +815,16 @@ class Spend {
                         if (n < 0) {
                             this.scriptEvaluationError(`${OP_js_1.default[currentOpcode]} requires the top item on the stack not to be negative.`);
                         }
-                        this.stack.pop();
-                        this.stack.pop();
+                        poppedValue = this.stack.pop();
+                        if (poppedValue != null) {
+                            this.stackMem -= poppedValue.length;
+                        }
+                        clearPoppedValue();
+                        poppedValue = this.stack.pop();
+                        if (poppedValue != null) {
+                            this.stackMem -= poppedValue.length;
+                        }
+                        clearPoppedValue();
                         let shifted;
                         if (currentOpcode === OP_js_1.default.OP_LSHIFT) {
                             shifted = bn1.ushln(n);
@@ -731,6 +834,7 @@ class Spend {
                         }
                         const bufShifted = padDataToSize(shifted.toArray().slice(buf1.length * -1), buf1.length);
                         this.stack.push(bufShifted);
+                        this.stackMem += bufShifted.length;
                     }
                     break;
                 case OP_js_1.default.OP_EQUAL:
@@ -741,12 +845,25 @@ class Spend {
                     buf1 = this.stacktop(-2);
                     buf2 = this.stacktop(-1);
                     fEqual = (0, utils_js_1.toHex)(buf1) === (0, utils_js_1.toHex)(buf2);
-                    this.stack.pop();
-                    this.stack.pop();
+                    poppedValue = this.stack.pop();
+                    if (poppedValue != null) {
+                        this.stackMem -= poppedValue.length;
+                    }
+                    clearPoppedValue();
+                    poppedValue = this.stack.pop();
+                    if (poppedValue != null) {
+                        this.stackMem -= poppedValue.length;
+                    }
+                    clearPoppedValue();
                     this.stack.push(fEqual ? [1] : []);
+                    this.stackMem += (fEqual ? 1 : 0);
                     if (currentOpcode === OP_js_1.default.OP_EQUALVERIFY) {
-                        if (fEqual) {
-                            this.stack.pop();
+                        if (this.castToBool(this.stacktop(-1))) {
+                            poppedValue = this.stack.pop();
+                            if (poppedValue != null) {
+                                this.stackMem -= poppedValue.length;
+                            }
+                            clearPoppedValue();
                         }
                         else {
                             this.scriptEvaluationError('OP_EQUALVERIFY requires the top two stack items to be equal.');
@@ -786,8 +903,13 @@ class Spend {
                             bn = new BigNumber_js_1.default(bn.cmpn(0) !== 0 ? 1 : 0 + 0);
                             break;
                     }
-                    this.stack.pop();
+                    poppedValue = this.stack.pop();
+                    if (poppedValue != null) {
+                        this.stackMem -= poppedValue.length;
+                    }
+                    clearPoppedValue();
                     this.stack.push(bn.toScriptNum());
+                    this.stackMem += bn.toScriptNum().length;
                     break;
                 case OP_js_1.default.OP_ADD:
                 case OP_js_1.default.OP_SUB:
@@ -867,12 +989,25 @@ class Spend {
                             bn = bn1.cmp(bn2) > 0 ? bn1 : bn2;
                             break;
                     }
-                    this.stack.pop();
-                    this.stack.pop();
+                    poppedValue = this.stack.pop();
+                    if (poppedValue != null) {
+                        this.stackMem -= poppedValue.length;
+                    }
+                    clearPoppedValue();
+                    poppedValue = this.stack.pop();
+                    if (poppedValue != null) {
+                        this.stackMem -= poppedValue.length;
+                    }
+                    clearPoppedValue();
                     this.stack.push(bn.toScriptNum());
+                    this.stackMem += bn.toScriptNum().length;
                     if (currentOpcode === OP_js_1.default.OP_NUMEQUALVERIFY) {
                         if (this.castToBool(this.stacktop(-1))) {
-                            this.stack.pop();
+                            poppedValue = this.stack.pop();
+                            if (poppedValue != null) {
+                                this.stackMem -= poppedValue.length;
+                            }
+                            clearPoppedValue();
                         }
                         else {
                             this.scriptEvaluationError('OP_NUMEQUALVERIFY requires the top stack item to be truthy.');
@@ -887,10 +1022,23 @@ class Spend {
                     bn2 = BigNumber_js_1.default.fromScriptNum(this.stacktop(-2), requireMinimalPush);
                     bn3 = BigNumber_js_1.default.fromScriptNum(this.stacktop(-1), requireMinimalPush);
                     fValue = bn2.cmp(bn1) <= 0 && bn1.cmp(bn3) < 0;
-                    this.stack.pop();
-                    this.stack.pop();
-                    this.stack.pop();
+                    poppedValue = this.stack.pop();
+                    if (poppedValue != null) {
+                        this.stackMem -= poppedValue.length;
+                    }
+                    clearPoppedValue();
+                    poppedValue = this.stack.pop();
+                    if (poppedValue != null) {
+                        this.stackMem -= poppedValue.length;
+                    }
+                    clearPoppedValue();
+                    poppedValue = this.stack.pop();
+                    if (poppedValue != null) {
+                        this.stackMem -= poppedValue.length;
+                    }
+                    clearPoppedValue();
                     this.stack.push(fValue ? [1] : []);
+                    this.stackMem += (fValue ? 1 : 0);
                     break;
                 case OP_js_1.default.OP_RIPEMD160:
                 case OP_js_1.default.OP_SHA1:
@@ -900,7 +1048,7 @@ class Spend {
                     if (this.stack.length < 1) {
                         this.scriptEvaluationError(`${OP_js_1.default[currentOpcode]} requires at least one item to be on the stack.`);
                     }
-                    let bufHash = []; // ✅ Initialize bufHash to an empty array
+                    let bufHash = []; // Initialize bufHash to an empty array
                     buf = this.stacktop(-1);
                     if (currentOpcode === OP_js_1.default.OP_RIPEMD160) {
                         bufHash = Hash.ripemd160(buf);
@@ -917,8 +1065,13 @@ class Spend {
                     else if (currentOpcode === OP_js_1.default.OP_HASH256) {
                         bufHash = Hash.hash256(buf);
                     }
-                    this.stack.pop();
+                    poppedValue = this.stack.pop();
+                    if (poppedValue != null) {
+                        this.stackMem -= poppedValue.length;
+                    }
+                    clearPoppedValue();
                     this.stack.push(bufHash);
+                    this.stackMem += bufHash.length;
                     break;
                 }
                 case OP_js_1.default.OP_CODESEPARATOR:
@@ -938,10 +1091,10 @@ class Spend {
                     // Subset of script starting at the most recent codeseparator
                     // CScript scriptCode(pbegincodehash, pend);
                     if (this.context === 'UnlockingScript') {
-                        subscript = new Script_js_1.default(this.unlockingScript.chunks.slice((_c = this.lastCodeSeparator) !== null && _c !== void 0 ? _c : 0));
+                        subscript = new Script_js_1.default(this.unlockingScript.chunks.slice((_a = this.lastCodeSeparator) !== null && _a !== void 0 ? _a : 0));
                     }
                     else {
-                        subscript = new Script_js_1.default(this.lockingScript.chunks.slice((_d = this.lastCodeSeparator) !== null && _d !== void 0 ? _d : 0));
+                        subscript = new Script_js_1.default(this.lockingScript.chunks.slice((_b = this.lastCodeSeparator) !== null && _b !== void 0 ? _b : 0));
                     }
                     // Drop the signature, since there's no way for a signature to sign itself
                     subscript.findAndDelete(new Script_js_1.default().writeBin(bufSig));
@@ -957,13 +1110,26 @@ class Spend {
                     if (!fSuccess && bufSig.length > 0) {
                         this.scriptEvaluationError(`${OP_js_1.default[currentOpcode]} failed to verify the signature, and requires an empty signature when verification fails.`);
                     }
-                    this.stack.pop();
-                    this.stack.pop();
+                    poppedValue = this.stack.pop();
+                    if (poppedValue != null) {
+                        this.stackMem -= poppedValue.length;
+                    }
+                    clearPoppedValue();
+                    poppedValue = this.stack.pop();
+                    if (poppedValue != null) {
+                        this.stackMem -= poppedValue.length;
+                    }
+                    clearPoppedValue();
                     // stack.push_back(fSuccess ? vchTrue : vchFalse);
                     this.stack.push(fSuccess ? [1] : []);
+                    this.stackMem += (fSuccess ? 1 : 0);
                     if (currentOpcode === OP_js_1.default.OP_CHECKSIGVERIFY) {
                         if (fSuccess) {
-                            this.stack.pop();
+                            poppedValue = this.stack.pop();
+                            if (poppedValue != null) {
+                                this.stackMem -= poppedValue.length;
+                            }
+                            clearPoppedValue();
                         }
                         else {
                             this.scriptEvaluationError('OP_CHECKSIGVERIFY requires that a valid signature is provided.');
@@ -1002,10 +1168,10 @@ class Spend {
                     }
                     // Subset of script starting at the most recent codeseparator
                     if (this.context === 'UnlockingScript') {
-                        subscript = new Script_js_1.default(this.unlockingScript.chunks.slice((_e = this.lastCodeSeparator) !== null && _e !== void 0 ? _e : 0));
+                        subscript = new Script_js_1.default(this.unlockingScript.chunks.slice((_c = this.lastCodeSeparator) !== null && _c !== void 0 ? _c : 0));
                     }
                     else {
-                        subscript = new Script_js_1.default(this.lockingScript.chunks.slice((_f = this.lastCodeSeparator) !== null && _f !== void 0 ? _f : 0));
+                        subscript = new Script_js_1.default(this.lockingScript.chunks.slice((_d = this.lastCodeSeparator) !== null && _d !== void 0 ? _d : 0));
                     }
                     // Drop the signatures, since there's no way for a signature to sign itself
                     for (let k = 0; k < nSigsCount; k++) {
@@ -1051,7 +1217,11 @@ class Spend {
                         if (ikey2 > 0) {
                             ikey2--;
                         }
-                        this.stack.pop();
+                        poppedValue = this.stack.pop();
+                        if (poppedValue != null) {
+                            this.stackMem -= poppedValue.length;
+                        }
+                        clearPoppedValue();
                     }
                     // A bug causes CHECKMULTISIG to consume one extra argument
                     // whose contents were not checked in any way.
@@ -1066,11 +1236,20 @@ class Spend {
                         // NOTE: Is this necessary? We don't care about malleability.
                         this.scriptEvaluationError(`${OP_js_1.default[currentOpcode]} requires the extra stack item to be empty.`);
                     }
-                    this.stack.pop();
+                    poppedValue = this.stack.pop();
+                    if (poppedValue != null) {
+                        this.stackMem -= poppedValue.length;
+                    }
+                    clearPoppedValue();
                     this.stack.push(fSuccess ? [1] : []);
+                    this.stackMem += (fSuccess ? 1 : 0);
                     if (currentOpcode === OP_js_1.default.OP_CHECKMULTISIGVERIFY) {
                         if (fSuccess) {
-                            this.stack.pop();
+                            poppedValue = this.stack.pop();
+                            if (poppedValue != null) {
+                                this.stackMem -= poppedValue.length;
+                            }
+                            clearPoppedValue();
                         }
                         else {
                             this.scriptEvaluationError('OP_CHECKMULTISIGVERIFY requires that a sufficient number of valid signatures are provided.');
@@ -1087,7 +1266,14 @@ class Spend {
                         this.scriptEvaluationError(`It's not currently possible to push data larger than ${maxScriptElementSize} bytes.`);
                     }
                     this.stack[this.stack.length - 2] = [...buf1, ...buf2];
-                    this.stack.pop();
+                    this.stackMem -= buf1.length;
+                    this.stackMem -= buf2.length;
+                    this.stackMem += buf1.length + buf2.length;
+                    poppedValue = this.stack.pop();
+                    if (poppedValue != null) {
+                        this.stackMem -= poppedValue.length;
+                    }
+                    clearPoppedValue();
                     break;
                 case OP_js_1.default.OP_SPLIT:
                     if (this.stack.length < 2) {
@@ -1105,7 +1291,10 @@ class Spend {
                     buf2 = [...buf1];
                     // Replace existing stack values by the new values.
                     this.stack[this.stack.length - 2] = buf2.slice(0, n);
+                    this.stackMem -= buf1.length;
+                    this.stackMem += n;
                     this.stack[this.stack.length - 1] = buf2.slice(n);
+                    this.stackMem += buf1.length - n;
                     break;
                 case OP_js_1.default.OP_NUM2BIN:
                     if (this.stack.length < 2) {
@@ -1115,7 +1304,11 @@ class Spend {
                     if (size > maxScriptElementSize) {
                         this.scriptEvaluationError(`It's not currently possible to push data larger than ${maxScriptElementSize} bytes.`);
                     }
-                    this.stack.pop();
+                    poppedValue = this.stack.pop();
+                    if (poppedValue != null) {
+                        this.stackMem -= poppedValue.length;
+                    }
+                    clearPoppedValue();
                     rawnum = this.stacktop(-1);
                     // Try to see if we can fit that number in the number of
                     // byte requested.
@@ -1145,6 +1338,8 @@ class Spend {
                     }
                     num[n] = signbit;
                     this.stack[this.stack.length - 1] = num;
+                    this.stackMem -= rawnum.length;
+                    this.stackMem += size;
                     break;
                 case OP_js_1.default.OP_BIN2NUM:
                     if (this.stack.length < 1) {
@@ -1153,6 +1348,8 @@ class Spend {
                     buf1 = this.stacktop(-1);
                     buf2 = (0, utils_js_1.minimallyEncode)(buf1);
                     this.stack[this.stack.length - 1] = buf2;
+                    this.stackMem -= buf1.length;
+                    this.stackMem += buf2.length;
                     // The resulting number must be a valid number.
                     if (!isMinimallyEncoded(buf2)) {
                         this.scriptEvaluationError('OP_BIN2NUM requires that the resulting number is valid.');
@@ -1164,6 +1361,7 @@ class Spend {
         }
         // Finally, increment the program counter
         this.programCounter++;
+        return true;
     }
     /**
      * @method validate
@@ -1180,8 +1378,7 @@ class Spend {
         if (requirePushOnlyUnlockingScripts && !this.unlockingScript.isPushOnly()) {
             this.scriptEvaluationError('Unlocking scripts can only contain push operations, and no other opcodes.');
         }
-        while (true) {
-            this.step();
+        while (this.step()) {
             if (this.context === 'LockingScript' &&
                 this.programCounter >= this.lockingScript.chunks.length) {
                 break;