Fix issues reported by mainnet_pat

- Export encodeArgument and isSignableUtxo
- Slightly refactor automatic token selection to make sure it doesn't
  break when including P2PKH inputs

Author: rkalis

packages/cashscript/src/Transaction.ts

@@ -284,14 +284,14 @@ export class Transaction {
 
     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);
 
-    const automaticTokenInputs = selectAllTokenUtxos(allUtxos, this.outputs);
-    const tokenInputs = manualTokenInputs.length > 0 ? manualTokenInputs : automaticTokenInputs;
+    // This throws if the manually selected inputs are not enough to cover the outputs
+    if (this.inputs.length > 0) {
+      selectAllTokenUtxos(this.inputs, this.outputs);
+    }
 
     if (this.tokenChange) {
       const tokenChangeOutputs = createFungibleTokenChangeOutputs(tokenInputs, this.outputs, this.address);
@@ -429,7 +429,7 @@ export class Transaction {
       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(contractInputSize * this.feePerByte);

packages/cashscript/src/index.ts

@@ -3,7 +3,7 @@ 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 {
@@ -12,6 +12,7 @@ export {
   SignatureAlgorithm,
   HashType,
   Network,
+  isSignableUtxo,
 } from './interfaces.js';
 export * from './Errors.js';
 export {

packages/cashscript/test/Contract.test.ts

@@ -88,8 +88,6 @@ describe('Contract', () => {
       const p2sh20Instance = new Contract(p2pkhArtifact, [placeholder(20)], { provider, addressType: 'p2sh20' });
       const p2sh32Instance = new Contract(p2pkhArtifact, [placeholder(20)], { provider, addressType: 'p2sh32' });
 
-      console.log(p2sh20Instance.address, p2sh32Instance.address);
-
       const P2SH20_ADDRESS_SIZE = 42;
       const P2SH32_ADDRESS_SIZE = 61;
       expect(p2sh20Instance.address.split(':')[1]).toHaveLength(P2SH20_ADDRESS_SIZE);

packages/cashscript/test/e2e/P2PKH-tokens.test.ts

@@ -121,7 +121,6 @@ describe('P2PKH-tokens', () => {
         .send();
 
       const contractUtxos = await p2pkhInstance.getUtxos();
-      console.log(contractUtxos);
       const [genesisUtxo] = contractUtxos.filter((utxo) => utxo.vout === 0 && utxo.satoshis > 2000);
 
       if (!genesisUtxo) {
@@ -255,9 +254,6 @@ describe('P2PKH-tokens', () => {
       const nftUtxo = contractUtxos.find(isNftUtxo);
       const nonTokenUtxos = contractUtxos.filter(isNonTokenUtxo);
 
-      console.log(nftUtxo);
-      console.log(contractUtxos);
-
       if (!nftUtxo) {
         throw new Error('No token UTXO found with an NFT');
       }