cashscript 0.11.4 → 0.11.5

package/dist/Transaction.js

@@ -1,9 +1,8 @@
 import { hexToBin, decodeTransaction, } from '@bitauth/libauth';
-import delay from 'delay';
 import { encodeBip68, placeholder, } from '@cashscript/utils';
 import deepEqual from 'fast-deep-equal';
 import { isUtxoP2PKH, SignatureAlgorithm, } from './interfaces.js';
-import { createInputScript, getInputSize, createOpReturnOutput, getTxSizeWithoutInputs, validateOutput, utxoComparator, calculateDust, getOutputSize, utxoTokenComparator, } from './utils.js';
+import { createInputScript, getInputSize, createOpReturnOutput, getTxSizeWithoutInputs, validateOutput, utxoComparator, calculateDust, getOutputSize, utxoTokenComparator, delay, } from './utils.js';
 import SignatureTemplate from './SignatureTemplate.js';
 import { P2PKH_INPUT_SIZE } from './constants.js';
 import { TransactionBuilder } from './TransactionBuilder.js';

package/dist/TransactionBuilder.js

@@ -1,7 +1,6 @@
 import { binToHex, decodeTransaction, decodeTransactionUnsafe, encodeTransaction, hexToBin, } from '@bitauth/libauth';
-import delay from 'delay';
 import { isUnlockableUtxo, isStandardUnlockableUtxo, isP2PKHUnlocker, } from './interfaces.js';
-import { cashScriptOutputToLibauthOutput, createOpReturnOutput, generateLibauthSourceOutputs, validateInput, validateOutput, } from './utils.js';
+import { cashScriptOutputToLibauthOutput, createOpReturnOutput, delay, generateLibauthSourceOutputs, validateInput, validateOutput, } from './utils.js';
 import { FailedTransactionError } from './Errors.js';
 import { getBitauthUri } from './LibauthTemplate.js';
 import { debugLibauthTemplate, getLibauthTemplates } from './advanced/LibauthTemplate.js';

package/dist/debugging.js

@@ -41,7 +41,8 @@ const debugSingleScenario = (template, artifact, unlockingScriptId, scenarioId)
     const executedLogs = (artifact.debug?.logs ?? [])
         .filter((log) => executedDebugSteps.some((debugStep) => log.ip === debugStep.ip));
     for (const log of executedLogs) {
-        logConsoleLogStatement(log, executedDebugSteps, artifact);
+        const inputIndex = extractInputIndexFromScenario(scenarioId);
+        logConsoleLogStatement(log, executedDebugSteps, artifact, inputIndex);
     }
     const lastExecutedDebugStep = executedDebugSteps[executedDebugSteps.length - 1];
     // If an error is present in the last step, that means a require statement in the middle of the function failed
@@ -91,6 +92,13 @@ const debugSingleScenario = (template, artifact, unlockingScriptId, scenarioId)
     }
     return fullDebugSteps;
 };
+// Note: this relies on the naming convention that the scenario ID is of the form <name>_input<index>_evaluate
+const extractInputIndexFromScenario = (scenarioId) => {
+    const match = scenarioId.match(/_input(\d+)_/);
+    if (!match)
+        throw new Error(`Invalid scenario ID: ${scenarioId}`);
+    return parseInt(match[1]);
+};
 // internal util. instantiates the virtual machine and compiles the template into a program
 const createProgram = (template, unlockingScriptId, scenarioId) => {
     const configuration = walletTemplateToCompilerConfiguration(template);
@@ -115,7 +123,7 @@ const createProgram = (template, unlockingScriptId, scenarioId) => {
     }
     return { vm, program: scenarioGeneration.scenario.program };
 };
-const logConsoleLogStatement = (log, debugSteps, artifact) => {
+const logConsoleLogStatement = (log, debugSteps, artifact, inputIndex) => {
     let line = `${artifact.contractName}.cash:${log.line}`;
     const decodedData = log.data.map((element) => {
         if (typeof element === 'string')
@@ -124,7 +132,7 @@ const logConsoleLogStatement = (log, debugSteps, artifact) => {
         const transformedDebugStep = applyStackItemTransformations(element, debugStep);
         return decodeStackItem(element, transformedDebugStep.stack);
     });
-    console.log(`${line} ${decodedData.join(' ')}`);
+    console.log(`[Input #${inputIndex}] ${line} ${decodedData.join(' ')}`);
 };
 const applyStackItemTransformations = (element, debugStep) => {
     if (!element.transformations)

package/dist/types/type-inference.d.ts

@@ -1,15 +1,17 @@
 import type SignatureTemplate from '../SignatureTemplate.js';
+type BytesType = Uint8Array | string;
+type SignatureType = SignatureTemplate | BytesType;
 type TypeMap = {
-    [k: `bytes${number}`]: Uint8Array | string;
+    [k: `bytes${number}`]: BytesType;
 } & {
-    byte: Uint8Array | string;
-    bytes: Uint8Array | string;
+    byte: BytesType;
+    bytes: BytesType;
     bool: boolean;
     int: bigint;
     string: string;
-    pubkey: Uint8Array | string;
-    sig: SignatureTemplate | Uint8Array | string;
-    datasig: Uint8Array | string;
+    pubkey: BytesType;
+    sig: SignatureType;
+    datasig: BytesType;
 };
 type ProcessParam<Param> = Param extends {
     type: infer Type;

package/dist/utils.d.ts

@@ -38,3 +38,4 @@ export declare const extendedStringify: (obj: any, spaces?: number) => string;
 export declare const zip: <T, U>(a: readonly T[], b: readonly U[]) => [T, U][];
 export declare const isFungibleTokenUtxo: (utxo: Utxo) => boolean;
 export declare const isNonTokenUtxo: (utxo: Utxo) => boolean;
+export declare const delay: (ms: number) => Promise<void>;

package/dist/utils.js

@@ -1,5 +1,5 @@
-import { cashAddressToLockingBytecode, decodeCashAddress, addressContentsToLockingBytecode, lockingBytecodeToCashAddress, binToHex, generateSigningSerializationBch, utf8ToBin, hexToBin, flattenBinArray, LockingBytecodeType, encodeTransactionOutput, isHex, bigIntToCompactUint, NonFungibleTokenCapability, bigIntToVmNumber, } from '@bitauth/libauth';
-import { encodeInt, hash160, hash256, sha256, Op, scriptToBytecode, } from '@cashscript/utils';
+import { cashAddressToLockingBytecode, decodeCashAddress, addressContentsToLockingBytecode, lockingBytecodeToCashAddress, binToHex, generateSigningSerializationBch, utf8ToBin, hexToBin, LockingBytecodeType, encodeTransactionOutput, isHex, bigIntToCompactUint, NonFungibleTokenCapability, bigIntToVmNumber, } from '@bitauth/libauth';
+import { encodeInt, hash160, hash256, sha256, Op, scriptToBytecode, encodeNullDataScript, } from '@cashscript/utils';
 import { Network, } from './interfaces.js';
 import { VERSION_SIZE, LOCKTIME_SIZE } from './constants.js';
 import { OutputSatoshisTooSmallError, OutputTokenAmountTooSmallError, TokensToNonTokenAddressError, UndefinedInputError, } from './Errors.js';
@@ -220,27 +220,6 @@ export function getNetworkPrefix(network) {
             return 'bitcoincash';
     }
 }
-// ////////////////////////////////////////////////////////////////////////////
-// For encoding OP_RETURN data (doesn't require BIP62.3 / MINIMALDATA)
-function encodeNullDataScript(chunks) {
-    return flattenBinArray(chunks.map((chunk) => {
-        if (typeof chunk === 'number') {
-            return new Uint8Array([chunk]);
-        }
-        const pushdataOpcode = getPushDataOpcode(chunk);
-        return new Uint8Array([...pushdataOpcode, ...chunk]);
-    }));
-}
-function getPushDataOpcode(data) {
-    const { byteLength } = data;
-    if (byteLength === 0)
-        return Uint8Array.from([0x4c, 0x00]);
-    if (byteLength < 76)
-        return Uint8Array.from([byteLength]);
-    if (byteLength < 256)
-        return Uint8Array.from([0x4c, byteLength]);
-    throw new Error('Pushdata too large');
-}
 const randomInt = () => BigInt(Math.floor(Math.random() * 10000));
 export const randomUtxo = (defaults) => ({
     ...{
@@ -290,4 +269,5 @@ export const extendedStringify = (obj, spaces) => JSON.stringify(obj, (_, v) =>
 export const zip = (a, b) => (Array.from(Array(Math.max(b.length, a.length)), (_, i) => [a[i], b[i]]));
 export const isFungibleTokenUtxo = (utxo) => (utxo.token !== undefined && utxo.token.amount > 0n && utxo.token.nft === undefined);
 export const isNonTokenUtxo = (utxo) => utxo.token === undefined;
+export const delay = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
 //# sourceMappingURL=utils.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cashscript",
-  "version": "0.11.4",
+  "version": "0.11.5",
   "description": "Easily write and interact with Bitcoin Cash contracts",
   "keywords": [
     "bitcoin cash",
@@ -46,11 +46,9 @@
   },
   "dependencies": {
     "@bitauth/libauth": "^3.1.0-next.2",
-    "@cashscript/utils": "^0.11.4",
+    "@cashscript/utils": "^0.11.5",
     "@electrum-cash/network": "^4.1.3",
     "@mr-zwets/bchn-api-wrapper": "^1.0.1",
-    "@types/node": "^22.17.0",
-    "delay": "^6.0.0",
     "fast-deep-equal": "^3.1.3",
     "pako": "^2.1.0",
     "semver": "^7.7.2"
@@ -64,5 +62,5 @@
     "jest": "^29.7.0",
     "typescript": "^5.9.2"
   },
-  "gitHead": "d878d068b91ddc5a4ca1807376520ae451e4a0ed"
+  "gitHead": "0ccda722dde4c0825285f3a6aa05898a8f62c160"
 }