cashscript 0.10.0-next.1 → 0.10.0-next.3

package/dist/LibauthTemplate.d.ts

@@ -1,12 +1,12 @@
 import { Artifact } from '@cashscript/utils';
-import { AuthenticationTemplate, AuthenticationProgramStateBCHCHIPs } from '@bitauth/libauth';
+import { WalletTemplate, AuthenticationProgramStateBCHCHIPs } from '@bitauth/libauth';
 import { Transaction } from './Transaction.js';
 export declare const stringify: (any: any, spaces?: number | undefined) => string;
 export declare const buildTemplate: ({ transaction, transactionHex, }: {
     transaction: Transaction;
     transactionHex?: string | undefined;
-}) => Promise<AuthenticationTemplate>;
-export declare const getBitauthUri: (template: AuthenticationTemplate) => string;
-export declare const evaluateTemplate: (template: AuthenticationTemplate) => boolean;
+}) => Promise<WalletTemplate>;
+export declare const getBitauthUri: (template: WalletTemplate) => string;
+export declare const evaluateTemplate: (template: WalletTemplate) => boolean;
 export declare type DebugResult = AuthenticationProgramStateBCHCHIPs[];
-export declare const debugTemplate: (template: AuthenticationTemplate, artifact: Artifact) => DebugResult;
+export declare const debugTemplate: (template: WalletTemplate, artifact: Artifact) => DebugResult;

package/dist/LibauthTemplate.js

@@ -1,7 +1,7 @@
 import { Op, PrimitiveType, bytecodeToScript, decodeBool, decodeInt, decodeString, formatBitAuthScript, } from '@cashscript/utils';
-import { hash160, hexToBin, decodeTransaction, binToHex, authenticationTemplateToCompilerConfiguration, createCompiler, createVirtualMachineBCHCHIPs, binToBase64, utf8ToBin, isHex, AuthenticationErrorCommon, } from '@bitauth/libauth';
+import { hash160, hexToBin, decodeTransaction, binToHex, walletTemplateToCompilerConfiguration, createCompiler, createVirtualMachineBCHCHIPs, binToBase64, utf8ToBin, isHex, AuthenticationErrorCommon, } from '@bitauth/libauth';
 import { deflate } from 'pako';
-import { isUtxoP2PKH, } from '../src/interfaces.js';
+import { isUtxoP2PKH, } from './interfaces.js';
 import { encodeArgument as csEncodeArgument } from './Argument.js';
 import { toRegExp } from './utils.js';
 // all bitauth variables must be in snake case
@@ -105,7 +105,14 @@ const createScenarioTransaction = (libauthTransaction, csTransaction) => {
             lockingBytecode: lockingBytecode instanceof Uint8Array
                 ? binToHex(lockingBytecode)
                 : lockingBytecode,
-            token: output.token,
+            token: output.token ? {
+                amount: output.token.amount.toString(),
+                category: binToHex(output.token.category),
+                nft: output.token.nft ? {
+                    capability: output.token.nft.capability,
+                    commitment: binToHex(output.token.nft.commitment),
+                } : undefined,
+            } : undefined,
             valueSatoshis: Number(output.valueSatoshis),
         };
     });
@@ -357,7 +364,7 @@ export const getBitauthUri = (template) => {
 };
 // internal util. instantiates the virtual machine and compiles the template into a program
 const createProgram = (template) => {
-    const configuration = authenticationTemplateToCompilerConfiguration(template);
+    const configuration = walletTemplateToCompilerConfiguration(template);
     const vm = createVirtualMachineBCHCHIPs();
     const compiler = createCompiler(configuration);
     const scenarioGeneration = compiler.generateScenario({

package/dist/Transaction.d.ts

@@ -1,3 +1,4 @@
+import { WalletTemplate } from '@bitauth/libauth';
 import { AbiFunction } from '@cashscript/utils';
 import { Utxo, Output, Recipient, TokenDetails, TransactionDetails, Unlocker } from './interfaces.js';
 import SignatureTemplate from './SignatureTemplate.js';
@@ -37,6 +38,7 @@ export declare class Transaction {
     send(raw: true): Promise<string>;
     debug(): Promise<DebugResult>;
     bitauthUri(): Promise<string>;
+    getLibauthTemplate(): Promise<WalletTemplate>;
     private getTxDetails;
     private setInputsAndOutputs;
 }

package/dist/Transaction.js

@@ -139,17 +139,16 @@ export class Transaction {
     }
     // method to debug the transaction with libauth VM, throws upon evaluation error
     async debug() {
-        const template = await buildTemplate({
-            transaction: this,
-        });
+        const template = await this.getLibauthTemplate();
         return debugTemplate(template, this.contract.artifact);
     }
     async bitauthUri() {
-        const template = await buildTemplate({
-            transaction: this,
-        });
+        const template = await this.getLibauthTemplate();
         return getBitauthUri(template);
     }
+    async getLibauthTemplate() {
+        return buildTemplate({ transaction: this });
+    }
     async getTxDetails(txid, raw) {
         for (let retries = 0; retries < 1200; retries += 1) {
             await delay(500);

package/dist/network/MockNetworkProvider.js

@@ -18,7 +18,7 @@ export default class MockNetworkProvider {
         }
     }
     async getUtxos(address) {
-        return this.utxoMap[address];
+        return this.utxoMap[address] ?? [];
     }
     async getBlockHeight() {
         return 133700;

package/dist/test/JestExtensions.js

@@ -19,6 +19,8 @@ Received: ${printReceived(received)}`;
         catch (error) {
             message = error;
         }
+        // TODO: If no console.log was called, then spyOnLoggerError.mock.calls[0] is undefined.
+        // We should handle that case properly.
         const received = spyOnLoggerError.mock.calls[0][0];
         spyOnLoggerError.mockClear();
         return {

package/dist/utils.js

@@ -1,4 +1,4 @@
-import { cashAddressToLockingBytecode, decodeCashAddress, addressContentsToLockingBytecode, lockingBytecodeToCashAddress, binToHex, generateSigningSerializationBCH, utf8ToBin, hexToBin, flattenBinArray, LockingBytecodeType, encodeTransactionOutput, isHex, bigIntToCompactSize, AuthenticationErrorCommon, NonFungibleTokenCapability, bigIntToVmNumber, } from '@bitauth/libauth';
+import { cashAddressToLockingBytecode, decodeCashAddress, addressContentsToLockingBytecode, lockingBytecodeToCashAddress, binToHex, generateSigningSerializationBCH, utf8ToBin, hexToBin, flattenBinArray, LockingBytecodeType, encodeTransactionOutput, isHex, bigIntToCompactUint, AuthenticationErrorCommon, NonFungibleTokenCapability, bigIntToVmNumber, } from '@bitauth/libauth';
 import { encodeInt, hash160, hash256, sha256, Op, scriptToBytecode, } from '@cashscript/utils';
 import { Network, } from './interfaces.js';
 import { VERSION_SIZE, LOCKTIME_SIZE } from './constants.js';
@@ -102,7 +102,7 @@ export function getTxSizeWithoutInputs(outputs) {
     let size = VERSION_SIZE + LOCKTIME_SIZE;
     size += outputs.reduce((acc, output) => acc + getOutputSize(output), 0);
     // Add tx-out count (accounting for a potential change output)
-    size += bigIntToCompactSize(BigInt(outputs.length + 1)).byteLength;
+    size += bigIntToCompactUint(BigInt(outputs.length + 1)).byteLength;
     return size;
 }
 // ////////// BUILD OBJECTS ///////////////////////////////////////////////////
@@ -254,14 +254,14 @@ export const randomUtxo = (defaults) => ({
     ...{
         txid: binToHex(sha256(bigIntToVmNumber(randomInt()))),
         vout: Math.floor(Math.random() * 10),
-        satoshis: 20000n + randomInt(),
+        satoshis: 100000n + randomInt(),
     },
     ...defaults,
 });
 export const randomToken = (defaults) => ({
     ...{
         category: binToHex(sha256(bigIntToVmNumber(randomInt()))),
-        amount: 10000n + randomInt(),
+        amount: 100000n + randomInt(),
     },
     ...defaults,
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cashscript",
-  "version": "0.10.0-next.1",
+  "version": "0.10.0-next.3",
   "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": "^2.0.0-alpha.8",
-    "@cashscript/utils": "^0.10.0-next.1",
+    "@bitauth/libauth": "^2.0.0",
+    "@cashscript/utils": "^0.10.0-next.3",
     "bip68": "^1.0.4",
     "bitcoin-rpc-promise-retry": "^1.3.0",
     "delay": "^5.0.0",
@@ -61,5 +61,5 @@
     "jest": "^29.4.1",
     "typescript": "^4.1.5"
   },
-  "gitHead": "1370c6b1b1489b96964b6df4a860709cd73a06cc"
+  "gitHead": "1b66bdb92f972d311d968667290e96085d7fcdc7"
 }