mainnet-js 1.1.8 → 1.1.10

package/src/wallet/Wif.ts

@@ -61,7 +61,11 @@ import {
   BalanceResponse,
 } from "../util/balanceObjectFromSatoshi.js";
 import { checkWifNetwork } from "../util/checkWifNetwork.js";
-import { deriveCashaddr, deriveTokenaddr } from "../util/deriveCashaddr.js";
+import {
+  deriveCashaddr,
+  deriveTokenaddr,
+  toTokenaddr,
+} from "../util/deriveCashaddr.js";
 import {
   derivePrefix,
   derivePublicKeyHash,
@@ -1165,21 +1169,49 @@ export class Wallet extends BaseWallet {
           (prev, cur) => prev + cur.amount,
           0
         );
-        const change = inputAmountSum - outputAmountSum;
-        if (change < 0) {
+
+        const diff = inputAmountSum - outputAmountSum;
+        if (diff < 0) {
           throw new Error("Not enough token amount to send");
         }
-        if (change > 0) {
-          outputs.push(
-            new TokenSendRequest({
-              cashaddr: changeAddress || this.tokenaddr!,
-              amount: change,
-              tokenId: tokenId,
-              commitment: tokenOutputs[0].commitment,
-              capability: tokenOutputs[0].capability,
-              value: tokenOutputs[0].value,
-            })
-          );
+        if (diff > 0) {
+          let available = 0;
+          let change = 0;
+          const ensureUtxos: UtxoI[] = [];
+          for (const token of tokenInputs.filter((val) => val.token?.amount)) {
+            ensureUtxos.push(token);
+            available += token.token?.amount!;
+            if (available >= outputAmountSum) {
+              change = available - outputAmountSum;
+              break;
+            }
+          }
+          if (ensureUtxos.length) {
+            if (!options) {
+              options = {};
+            }
+            options!.ensureUtxos = [
+              ...(options.ensureUtxos ?? []),
+              ...ensureUtxos,
+            ].filter(
+              (val, index, array) =>
+                array.findIndex(
+                  (other) => other.txid === val.txid && other.vout === val.vout
+                ) === index
+            );
+          }
+          if (change > 0) {
+            outputs.push(
+              new TokenSendRequest({
+                cashaddr: toTokenaddr(changeAddress) || this.tokenaddr!,
+                amount: change,
+                tokenId: tokenId,
+                commitment: tokenOutputs[0].commitment,
+                capability: tokenOutputs[0].capability,
+                value: tokenOutputs[0].value,
+              })
+            );
+          }
         }
       }
     };
@@ -1196,6 +1228,7 @@ export class Wallet extends BaseWallet {
     }
 
     const relayFeePerByteInSatoshi = await getRelayFeeCache(this.provider!);
+    // console.trace(utxos.slice().filter(val => val.token).reverse().slice(0, 10))
     const feeEstimate = await getFeeAmount({
       utxos: utxos,
       sendRequests: sendRequests,
@@ -1206,6 +1239,7 @@ export class Wallet extends BaseWallet {
       feePaidBy: feePaidBy,
     });
 
+    // console.warn(utxos.slice().filter(val => val.token).reverse().slice(0, 10))
     const fundingUtxos = await getSuitableUtxos(
       utxos,
       BigInt(spendAmount) + BigInt(feeEstimate),
@@ -1215,6 +1249,7 @@ export class Wallet extends BaseWallet {
       options?.ensureUtxos || [],
       options?.tokenOperation
     );
+    // console.log(fundingUtxos.slice().filter(val => val.token).reverse().slice(0, 10))
     if (fundingUtxos.length === 0) {
       throw Error(
         "The available inputs couldn't satisfy the request with fees"

package/src/wallet/bcmr-v2.schema.ts

@@ -258,16 +258,16 @@ export type NftCategoryField = {
     encoding:
       | {
           type:
-            | 'binary'
-            | 'boolean'
-            | 'hex'
-            | 'https-url'
-            | 'ipfs-cid'
-            | 'utf8'
+            | "binary"
+            | "boolean"
+            | "hex"
+            | "https-url"
+            | "ipfs-cid"
+            | "utf8"
             | `locktime`;
         }
       | {
-          type: 'number';
+          type: "number";
 
           /**
            * The `aggregate` property indicates that aggregating this
@@ -284,7 +284,7 @@ export type NftCategoryField = {
            * bitwise AND, bitwise OR, and bitwise XOR, etc. – only `add`
            * is currently supported.
            */
-          aggregate?: 'add';
+          aggregate?: "add";
 
           /**
            * An integer between `0` and `18` (inclusive) indicating the
@@ -533,7 +533,7 @@ export type IdentitySnapshot = {
    * if the burned identity represented a token type – consider burning any
    * remaining tokens of that category to reclaim funds from those outputs.
    */
-  status?: 'active' | 'burned' | 'inactive';
+  status?: "active" | "burned" | "inactive";
 
   /**
    * The split ID of this identity's chain of record.
@@ -594,7 +594,7 @@ export type IdentitySnapshot = {
  * native currency unit (name, description, symbol, icon, etc.) as can be
  * provided for other registered tokens.
  */
-export type ChainSnapshot = Omit<IdentitySnapshot, 'migrated' | 'token'> & {
+export type ChainSnapshot = Omit<IdentitySnapshot, "migrated" | "token"> & {
   /**
    * A data structure indicating how the chain's native currency units should be
    * displayed in user interfaces.
@@ -694,7 +694,7 @@ export type IdentityHistory = RegistryTimestampKeyedValues<IdentitySnapshot>;
 
 export type OffChainRegistryIdentity = Pick<
   IdentitySnapshot,
-  'name' | 'description' | 'uris' | 'tags' | 'extensions'
+  "name" | "description" | "uris" | "tags" | "extensions"
 >;
 
 /**
@@ -890,4 +890,4 @@ export type Registry = {
    * https://github.com/bitjson/chip-bcmr#locales-extension for details.
    */
   extensions?: Extensions;
-};
+};