cashscript 0.10.2 → 0.11.0-next.0

package/dist/debugging.js

@@ -1,4 +1,4 @@
-import { AuthenticationErrorCommon, binToHex, createCompiler, createVirtualMachineBCH2023, encodeAuthenticationInstruction, walletTemplateToCompilerConfiguration } from '@bitauth/libauth';
+import { AuthenticationErrorCommon, binToHex, createCompiler, createVirtualMachineBch2025, encodeAuthenticationInstruction, walletTemplateToCompilerConfiguration } from '@bitauth/libauth';
 import { Op, PrimitiveType, bytecodeToAsm, decodeBool, decodeInt, decodeString } from '@cashscript/utils';
 import { findLastIndex, toRegExp } from './utils.js';
 import { FailedRequireError, FailedTransactionError, FailedTransactionEvaluationError } from './Errors.js';
@@ -39,7 +39,7 @@ export const debugTemplate = (template, artifact) => {
         // preceding OP_CHECKSIG opcode. The error message is registered in the next instruction, so we need to increment
         // the instruction pointer to get the correct error message from the require messages in the artifact.
         // Note that we do NOT use this adjusted IP when passing the failing IP into the FailedRequireError
-        const isNullFail = lastExecutedDebugStep.error === AuthenticationErrorCommon.nonNullSignatureFailure;
+        const isNullFail = lastExecutedDebugStep.error.includes(AuthenticationErrorCommon.nonNullSignatureFailure);
         const requireStatementIp = failingIp + (isNullFail ? 1 : 0);
         const requireStatement = (artifact.debug?.requires ?? [])
             .find((statement) => statement.ip === requireStatementIp);
@@ -74,7 +74,7 @@ export const debugTemplate = (template, artifact) => {
 // internal util. instantiates the virtual machine and compiles the template into a program
 const createProgram = (template) => {
     const configuration = walletTemplateToCompilerConfiguration(template);
-    const vm = createVirtualMachineBCH2023();
+    const vm = createVirtualMachineBch2025();
     const compiler = createCompiler(configuration);
     const scenarioGeneration = compiler.generateScenario({
         debug: true,
@@ -121,8 +121,9 @@ const failedFinalVerify = (evaluationResult) => {
     // If any of the following errors occurred, then the final verify failed - any other messages
     // indicate other kinds of failures
     return toRegExp([
-        AuthenticationErrorCommon.requiresCleanStack,
-        AuthenticationErrorCommon.nonEmptyControlStack,
+        // TODO: Ask Jason to put these back into an enum and replace with the enum value
+        'The CashAssembly internal evaluation completed with an unexpected number of items on the stack (must be exactly 1).', // AuthenticationErrorCommon.requiresCleanStack,
+        'The CashAssembly internal evaluation completed with a non-empty control stack.', // AuthenticationErrorCommon.nonEmptyControlStack,
         AuthenticationErrorCommon.unsuccessfulEvaluation,
     ]).test(evaluationResult);
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cashscript",
-  "version": "0.10.2",
+  "version": "0.11.0-next.0",
   "description": "Easily write and interact with Bitcoin Cash contracts",
   "keywords": [
     "bitcoin cash",
@@ -43,8 +43,8 @@
     "test": "NODE_OPTIONS='--experimental-vm-modules --no-warnings' jest"
   },
   "dependencies": {
-    "@bitauth/libauth": "^3.0.0",
-    "@cashscript/utils": "^0.10.2",
+    "@bitauth/libauth": "^3.1.0-next.2",
+    "@cashscript/utils": "^0.11.0-next.0",
     "@mr-zwets/bchn-api-wrapper": "^1.0.1",
     "delay": "^5.0.0",
     "electrum-cash": "^2.0.10",
@@ -59,5 +59,5 @@
     "jest": "^29.4.1",
     "typescript": "^5.5.4"
   },
-  "gitHead": "a7c4f652462ddfccd54fc929f06cb16022769df9"
+  "gitHead": "18df35aa3276e64fa64e92386106374d1d35b28d"
 }