cashscript 0.8.0-next.3 → 0.8.0

package/dist/Transaction.js

@@ -4,6 +4,7 @@ import { hash256, placeholder, scriptToBytecode, } from '@cashscript/utils';
 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';
+import { P2PKH_INPUT_SIZE } from './constants.js';
 const bip68 = await import('bip68');
 export class Transaction {
     constructor(address, provider, redeemScript, abiFunction, args, selector) {
@@ -178,15 +179,15 @@ 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 = createTokenChangeOutputs(tokenInputs, this.outputs, this.address);
+            const tokenChangeOutputs = createFungibleTokenChangeOutputs(tokenInputs, this.outputs, this.address);
             this.outputs.push(...tokenChangeOutputs);
         }
         // Construct list with all nfts in inputs
@@ -281,7 +282,7 @@ export class Transaction {
         // arguments and correctly sized placeholder preimage
         const placeholderScript = createInputScript(this.redeemScript, placeholderArgs, this.selector, placeholderPreimage);
         // Add one extra byte per input to over-estimate tx-in count
-        const inputSize = getInputSize(placeholderScript) + 1;
+        const contractInputSize = getInputSize(placeholderScript) + 1;
         // Note that we use the addPrecision function to add "decimal points" to BigInt numbers
         // Calculate amount to send and base fee (excluding additional fees per UTXO)
         let amount = addPrecision(this.outputs.reduce((acc, output) => acc + output.amount, 0n));
@@ -290,8 +291,10 @@ export class Transaction {
         let satsAvailable = 0n;
         if (this.inputs.length > 0) {
             // If inputs are already defined, the user provided the UTXOs and we perform no further UTXO selection
-            if (!this.hardcodedFee)
-                fee += addPrecision(this.inputs.length * inputSize * this.feePerByte);
+            if (!this.hardcodedFee) {
+                const totalInputSize = this.inputs.reduce((acc, input) => acc + (isSignableUtxo(input) ? P2PKH_INPUT_SIZE : contractInputSize), 0);
+                fee += addPrecision(totalInputSize * this.feePerByte);
+            }
             satsAvailable = addPrecision(this.inputs.reduce((acc, input) => acc + input.satoshis, 0n));
         }
         else {
@@ -301,11 +304,11 @@ 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)
-                    fee += addPrecision(inputSize * this.feePerByte);
+                    fee += addPrecision(contractInputSize * this.feePerByte);
             }
             for (const utxo of bchUtxos) {
                 if (satsAvailable > amount + fee)
@@ -313,7 +316,7 @@ export class Transaction {
                 this.inputs.push(utxo);
                 satsAvailable += addPrecision(utxo.satoshis);
                 if (!this.hardcodedFee)
-                    fee += addPrecision(inputSize * this.feePerByte);
+                    fee += addPrecision(contractInputSize * this.feePerByte);
             }
         }
         // Remove "decimal points" from BigInt numbers (rounding up for fee, down for others)
@@ -349,10 +352,9 @@ const calculateTotalTokenAmount = (outputs, tokenCategory) => (outputs
     .reduce((acc, output) => acc + output.token.amount, 0n));
 const selectTokenUtxos = (utxos, amountNeeded, tokenCategory) => {
     const genesisUtxo = getTokenGenesisUtxo(utxos, tokenCategory);
-    if (genesisUtxo) {
+    if (genesisUtxo)
         return [genesisUtxo];
-    }
-    const tokenUtxos = utxos.filter((utxo) => utxo.token?.category === tokenCategory);
+    const tokenUtxos = utxos.filter((utxo) => utxo.token?.category === tokenCategory && utxo.token?.amount > 0n);
     // We sort the UTXOs mainly so there is consistent behaviour between network providers
     // even if they report UTXOs in a different order
     tokenUtxos.sort(utxoTokenComparator).reverse();
@@ -360,10 +362,10 @@ const selectTokenUtxos = (utxos, amountNeeded, tokenCategory) => {
     const selectedUtxos = [];
     // Add token UTXOs until we have enough to cover the amount needed (no fee calculation because it's a token)
     for (const utxo of tokenUtxos) {
-        selectedUtxos.push(utxo);
-        amountAvailable += utxo.token.amount;
         if (amountAvailable >= amountNeeded)
             break;
+        selectedUtxos.push(utxo);
+        amountAvailable += utxo.token.amount;
     }
     if (amountAvailable < amountNeeded) {
         throw new Error(`Insufficient funds for token ${tokenCategory}: available (${amountAvailable}) < needed (${amountNeeded}).`);
@@ -374,14 +376,17 @@ const selectAllTokenUtxos = (utxos, outputs) => {
     const tokenCategories = getTokenCategories(outputs);
     return tokenCategories.flatMap((tokenCategory) => selectTokenUtxos(utxos, calculateTotalTokenAmount(outputs, tokenCategory), tokenCategory));
 };
-const createTokenChangeOutputs = (utxos, outputs, address) => {
+const createFungibleTokenChangeOutputs = (utxos, outputs, address) => {
     const tokenCategories = getTokenCategories(utxos);
-    return tokenCategories.map((tokenCategory) => {
+    const changeOutputs = tokenCategories.map((tokenCategory) => {
         const required = calculateTotalTokenAmount(outputs, tokenCategory);
         const available = calculateTotalTokenAmount(utxos, tokenCategory);
         const change = available - required;
+        if (change === 0n)
+            return undefined;
         return { to: address, amount: BigInt(1000), token: { category: tokenCategory, amount: change } };
     });
+    return changeOutputs.filter((output) => output !== undefined);
 };
 // Note: the below is a very simple implementation of a "decimal point" system for BigInt numbers
 // It is safe to use for UTXO fee calculations due to its low numbers, but should not be used for other purposes

package/dist/constants.d.ts

@@ -1,2 +1,3 @@
 export declare const VERSION_SIZE = 4;
 export declare const LOCKTIME_SIZE = 4;
+export declare const P2PKH_INPUT_SIZE: number;

package/dist/constants.js

@@ -1,3 +1,4 @@
 export const VERSION_SIZE = 4;
 export const LOCKTIME_SIZE = 4;
+export const P2PKH_INPUT_SIZE = 32 + 4 + 1 + 1 + 65 + 1 + 33 + 4;
 //# sourceMappingURL=constants.js.map

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.3",
+  "version": "0.8.0",
   "description": "Easily write and interact with Bitcoin Cash contracts",
   "keywords": [
     "bitcoin cash",
@@ -44,7 +44,7 @@
   },
   "dependencies": {
     "@bitauth/libauth": "^2.0.0-alpha.8",
-    "@cashscript/utils": "^0.8.0-next.3",
+    "@cashscript/utils": "^0.8.0",
     "bip68": "^1.0.4",
     "bitcoin-rpc-promise-retry": "^1.3.0",
     "delay": "^5.0.0",
@@ -58,5 +58,5 @@
     "jest": "^29.4.1",
     "typescript": "^4.1.5"
   },
-  "gitHead": "398ff2afab6d731f077002e6be021ed2f1996b4a"
+  "gitHead": "9864e23e5b7eb024cf4712a785a5a3fe09d6eee5"
 }