cashscript 0.8.0-next.4 → 0.8.1

package/dist/Transaction.js

@@ -1,6 +1,7 @@
 import { hexToBin, binToHex, encodeTransaction, decodeTransaction, } from '@bitauth/libauth';
 import delay from 'delay';
 import { hash256, placeholder, scriptToBytecode, } from '@cashscript/utils';
+import deepEqual from 'fast-deep-equal';
 import { isSignableUtxo, } from './interfaces.js';
 import { meep, createInputScript, getInputSize, createOpReturnOutput, getTxSizeWithoutInputs, getPreimageSize, buildError, createSighashPreimage, validateRecipient, utxoComparator, cashScriptOutputToLibauthOutput, calculateDust, getOutputSize, addressToLockScript, publicKeyToP2PKHLockingBytecode, utxoTokenComparator, } from './utils.js';
 import SignatureTemplate from './SignatureTemplate.js';
@@ -179,13 +180,13 @@ export class Transaction {
             throw Error('Attempted to build a transaction without outputs');
         }
         const allUtxos = await this.provider.getUtxos(this.address);
-        const manualTokenInputs = this.inputs.filter((input) => input.token);
-        // This will throw if the amount is not enough
-        if (manualTokenInputs.length > 0) {
-            selectAllTokenUtxos(manualTokenInputs, this.outputs);
+        const tokenInputs = this.inputs.length > 0
+            ? this.inputs.filter((input) => input.token)
+            : selectAllTokenUtxos(allUtxos, this.outputs);
+        // This throws if the manually selected inputs are not enough to cover the outputs
+        if (this.inputs.length > 0) {
+            selectAllTokenUtxos(this.inputs, this.outputs);
         }
-        const automaticTokenInputs = selectAllTokenUtxos(allUtxos, this.outputs);
-        const tokenInputs = manualTokenInputs.length > 0 ? manualTokenInputs : automaticTokenInputs;
         if (this.tokenChange) {
             const tokenChangeOutputs = createFungibleTokenChangeOutputs(tokenInputs, this.outputs, this.address);
             this.outputs.push(...tokenChangeOutputs);
@@ -221,9 +222,9 @@ export class Transaction {
                 if (nftInput.capability === 'none') {
                     for (let i = 0; i < listNftsOutputs.length; i += 1) {
                         // Deep equality check token objects
-                        if (JSON.stringify(listNftsOutputs[i]) === JSON.stringify(nftInput)) {
+                        if (deepEqual(listNftsOutputs[i], nftInput)) {
                             listNftsOutputs.splice(i, 1);
-                            unusedNfts = unusedNfts.filter((nft) => nft !== nftInput);
+                            unusedNfts = unusedNfts.filter((nft) => !deepEqual(nft, nftInput));
                             break;
                         }
                     }
@@ -234,7 +235,7 @@ export class Transaction {
                     // eslint-disable-next-line max-len
                     const newListNftsOutputs = listNftsOutputs.filter((nftOutput) => nftOutput.category !== nftInput.category);
                     if (newListNftsOutputs !== listNftsOutputs) {
-                        unusedNfts = unusedNfts.filter((nft) => nft !== nftInput);
+                        unusedNfts = unusedNfts.filter((nft) => !deepEqual(nft, nftInput));
                         listNftsOutputs = newListNftsOutputs;
                     }
                 }
@@ -242,7 +243,7 @@ export class Transaction {
                     for (let i = 0; i < listNftsOutputs.length; i += 1) {
                         if (listNftsOutputs[i].category === nftInput.category) {
                             listNftsOutputs.splice(i, 1);
-                            unusedNfts = unusedNfts.filter((nft) => nft !== nftInput);
+                            unusedNfts = unusedNfts.filter((nft) => !deepEqual(nft, nftInput));
                             break;
                         }
                     }
@@ -251,7 +252,7 @@ export class Transaction {
             for (const nftOutput of listNftsOutputs) {
                 const genesisUtxo = getTokenGenesisUtxo(this.inputs, nftOutput.category);
                 if (genesisUtxo) {
-                    listNftsOutputs = listNftsOutputs.filter((nft) => nft !== nftOutput);
+                    listNftsOutputs = listNftsOutputs.filter((nft) => !deepEqual(nft, nftOutput));
                 }
             }
             if (listNftsOutputs.length !== 0) {
@@ -304,7 +305,7 @@ export class Transaction {
             // even if they report UTXOs in a different order
             bchUtxos.sort(utxoComparator).reverse();
             // Add all automatically added token inputs to the transaction
-            for (const utxo of automaticTokenInputs) {
+            for (const utxo of tokenInputs) {
                 this.inputs.push(utxo);
                 satsAvailable += addPrecision(utxo.satoshis);
                 if (!this.hardcodedFee)

package/dist/index.d.ts

@@ -2,9 +2,9 @@ import SignatureTemplate from './SignatureTemplate.js';
 export { SignatureTemplate };
 export { Contract, ContractFunction } from './Contract.js';
 export { Transaction } from './Transaction.js';
-export { Argument } from './Argument.js';
+export { Argument, encodeArgument } from './Argument.js';
 export { Artifact, AbiFunction, AbiInput } from '@cashscript/utils';
 export * as utils from '@cashscript/utils';
-export { Utxo, Recipient, SignatureAlgorithm, HashType, Network, } from './interfaces.js';
+export { Utxo, Recipient, SignatureAlgorithm, HashType, Network, isSignableUtxo, } from './interfaces.js';
 export * from './Errors.js';
 export { NetworkProvider, BitcoinRpcNetworkProvider, ElectrumNetworkProvider, FullStackNetworkProvider, } from './network/index.js';

package/dist/index.js

@@ -2,8 +2,9 @@ import SignatureTemplate from './SignatureTemplate.js';
 export { SignatureTemplate };
 export { Contract } from './Contract.js';
 export { Transaction } from './Transaction.js';
+export { encodeArgument } from './Argument.js';
 export * as utils from '@cashscript/utils';
-export { SignatureAlgorithm, HashType, Network, } from './interfaces.js';
+export { SignatureAlgorithm, HashType, Network, isSignableUtxo, } from './interfaces.js';
 export * from './Errors.js';
 export { BitcoinRpcNetworkProvider, ElectrumNetworkProvider, FullStackNetworkProvider, } from './network/index.js';
 //# sourceMappingURL=index.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cashscript",
-  "version": "0.8.0-next.4",
+  "version": "0.8.1",
   "description": "Easily write and interact with Bitcoin Cash contracts",
   "keywords": [
     "bitcoin cash",
@@ -44,11 +44,12 @@
   },
   "dependencies": {
     "@bitauth/libauth": "^2.0.0-alpha.8",
-    "@cashscript/utils": "^0.8.0-next.4",
+    "@cashscript/utils": "^0.8.1",
     "bip68": "^1.0.4",
     "bitcoin-rpc-promise-retry": "^1.3.0",
     "delay": "^5.0.0",
-    "electrum-cash": "^2.0.10"
+    "electrum-cash": "^2.0.10",
+    "fast-deep-equal": "^3.1.3"
   },
   "devDependencies": {
     "@jest/globals": "^29.4.1",
@@ -58,5 +59,5 @@
     "jest": "^29.4.1",
     "typescript": "^4.1.5"
   },
-  "gitHead": "f4c3f9c21cca98465e5cad919e64b4c6292e9a1f"
+  "gitHead": "a70a5a57a938bc81fdf4180b1451cfcc0ff0214b"
 }