@xchainjs/xchain-dash 2.1.0 → 2.2.0

package/lib/client.d.ts

@@ -85,22 +85,24 @@ declare abstract class Client extends UTXOClient {
      * Prepare transaction with enhanced UTXO selection.
      * Uses base class UTXO selection logic with dashcore-lib transaction building.
      */
-    prepareTxEnhanced({ sender, memo, amount, recipient, feeRate, spendPendingUTXO, utxoSelectionPreferences, }: TxParams & {
+    prepareTxEnhanced({ sender, memo, amount, recipient, feeRate, spendPendingUTXO, utxoSelectionPreferences, selectedUtxos, }: TxParams & {
         sender: Address;
         feeRate: FeeRate;
         spendPendingUTXO?: boolean;
         utxoSelectionPreferences?: UtxoSelectionPreferences;
+        selectedUtxos?: UTXO[];
     }): Promise<PreparedTx>;
     /**
      * Prepare max send transaction
      */
-    prepareMaxTx({ sender, recipient, memo, feeRate, spendPendingUTXO, utxoSelectionPreferences, }: {
+    prepareMaxTx({ sender, recipient, memo, feeRate, spendPendingUTXO, utxoSelectionPreferences, selectedUtxos, }: {
         sender: Address;
         recipient: Address;
         memo?: string;
         feeRate: FeeRate;
         spendPendingUTXO?: boolean;
         utxoSelectionPreferences?: UtxoSelectionPreferences;
+        selectedUtxos?: UTXO[];
     }): Promise<PreparedTx & {
         maxAmount: number;
         fee: number;

package/lib/clientKeystore.d.ts

@@ -1,6 +1,6 @@
 import { FeeRate, TxHash } from '@xchainjs/xchain-client';
 import { Address } from '@xchainjs/xchain-util';
-import { TxParams, UtxoSelectionPreferences } from '@xchainjs/xchain-utxo';
+import { TxParams, UTXO, UtxoSelectionPreferences } from '@xchainjs/xchain-utxo';
 import { ECPairInterface } from 'ecpair';
 import { Client } from './client';
 export declare class ClientKeystore extends Client {
@@ -36,6 +36,7 @@ export declare class ClientKeystore extends Client {
     transfer(params: TxParams & {
         feeRate?: FeeRate;
         utxoSelectionPreferences?: UtxoSelectionPreferences;
+        selectedUtxos?: UTXO[];
     }): Promise<TxHash>;
     /**
      * Transfer the maximum amount of DASH (sweep).
@@ -55,6 +56,7 @@ export declare class ClientKeystore extends Client {
         feeRate?: FeeRate;
         walletIndex?: number;
         utxoSelectionPreferences?: UtxoSelectionPreferences;
+        selectedUtxos?: UTXO[];
     }): Promise<{
         hash: TxHash;
         maxAmount: number;

package/lib/clientLedger.d.ts

@@ -1,7 +1,7 @@
 import AppBtc from '@ledgerhq/hw-app-btc';
 import { FeeRate, TxHash } from '@xchainjs/xchain-client';
 import { Address } from '@xchainjs/xchain-util';
-import { TxParams, UtxoClientParams } from '@xchainjs/xchain-utxo';
+import { TxParams, UTXO, UtxoClientParams, UtxoSelectionPreferences } from '@xchainjs/xchain-utxo';
 import { Client } from './client';
 import { NodeAuth, NodeUrls } from './types';
 /**
@@ -21,5 +21,17 @@ declare class ClientLedger extends Client {
     transfer(params: TxParams & {
         feeRate?: FeeRate;
     }): Promise<TxHash>;
+    transferMax(params: {
+        recipient: Address;
+        memo?: string;
+        feeRate?: FeeRate;
+        walletIndex?: number;
+        utxoSelectionPreferences?: UtxoSelectionPreferences;
+        selectedUtxos?: UTXO[];
+    }): Promise<{
+        hash: TxHash;
+        maxAmount: number;
+        fee: number;
+    }>;
 }
 export { ClientLedger };

package/lib/index.esm.js

@@ -2,7 +2,7 @@ import { ExplorerProvider, Network, TxType, FeeOption, checkFeeBounds } from '@x
 import { AssetType, baseAmount, assetToBase, assetAmount } from '@xchainjs/xchain-util';
 import { BlockcypherProvider, BlockcypherNetwork, BitgoProvider } from '@xchainjs/xchain-utxo-providers';
 import dashcore from '@dashevo/dashcore-lib';
-import { toBitcoinJS, Client as Client$1, UtxoError } from '@xchainjs/xchain-utxo';
+import { toBitcoinJS, Client as Client$1, UtxoTransactionValidator, UtxoError } from '@xchainjs/xchain-utxo';
 import * as Dash from 'bitcoinjs-lib';
 import accumulative from 'coinselect/accumulative.js';
 import * as ecc from '@bitcoin-js/tiny-secp256k1-asmjs';
@@ -4522,7 +4522,7 @@ class Client extends Client$1 {
      * Uses base class UTXO selection logic with dashcore-lib transaction building.
      */
     prepareTxEnhanced(_a) {
-        return __awaiter(this, arguments, void 0, function* ({ sender, memo, amount, recipient, feeRate, spendPendingUTXO = true, utxoSelectionPreferences, }) {
+        return __awaiter(this, arguments, void 0, function* ({ sender, memo, amount, recipient, feeRate, spendPendingUTXO = true, utxoSelectionPreferences, selectedUtxos, }) {
             try {
                 // Validate inputs using base class method
                 this.validateTransactionInputs({
@@ -4532,9 +4532,16 @@ class Client extends Client$1 {
                     sender,
                     feeRate,
                 });
-                // Get validated UTXOs using base class method
-                const confirmedOnly = !spendPendingUTXO;
-                const utxos = yield this.getValidatedUtxos(sender, confirmedOnly);
+                // Use provided UTXOs (coin control) or fetch from chain
+                let utxos;
+                if (selectedUtxos && selectedUtxos.length > 0) {
+                    UtxoTransactionValidator.validateUtxoSet(selectedUtxos);
+                    utxos = selectedUtxos;
+                }
+                else {
+                    const confirmedOnly = !spendPendingUTXO;
+                    utxos = yield this.getValidatedUtxos(sender, confirmedOnly);
+                }
                 const compiledMemo = memo ? this.compileMemo(memo) : null;
                 const targetValue = amount.amount().toNumber();
                 const extraOutputs = 1 + (compiledMemo ? 1 : 0);
@@ -4580,7 +4587,7 @@ class Client extends Client$1 {
      * Prepare max send transaction
      */
     prepareMaxTx(_a) {
-        return __awaiter(this, arguments, void 0, function* ({ sender, recipient, memo, feeRate, spendPendingUTXO = true, utxoSelectionPreferences, }) {
+        return __awaiter(this, arguments, void 0, function* ({ sender, recipient, memo, feeRate, spendPendingUTXO = true, utxoSelectionPreferences, selectedUtxos, }) {
             try {
                 // Validate addresses
                 if (!this.validateAddress(recipient)) {
@@ -4589,9 +4596,16 @@ class Client extends Client$1 {
                 if (!this.validateAddress(sender)) {
                     throw UtxoError.invalidAddress(sender, this.network);
                 }
-                // Get validated UTXOs
-                const confirmedOnly = !spendPendingUTXO;
-                const utxos = yield this.getValidatedUtxos(sender, confirmedOnly);
+                // Use provided UTXOs (coin control) or fetch from chain
+                let utxos;
+                if (selectedUtxos && selectedUtxos.length > 0) {
+                    UtxoTransactionValidator.validateUtxoSet(selectedUtxos);
+                    utxos = selectedUtxos;
+                }
+                else {
+                    const confirmedOnly = !spendPendingUTXO;
+                    utxos = yield this.getValidatedUtxos(sender, confirmedOnly);
+                }
                 // Calculate max using base class method
                 const maxCalc = this.calculateMaxSendableAmount(utxos, Math.ceil(feeRate), !!memo, utxoSelectionPreferences);
                 // Build transaction using dashcore-lib
@@ -4734,7 +4748,7 @@ class ClientKeystore extends Client {
             const fromAddressIndex = params.walletIndex || 0;
             // Merge default preferences
             const mergedPreferences = Object.assign({ minimizeFee: true, avoidDust: true, minimizeInputs: false }, params.utxoSelectionPreferences);
-            const { rawUnsignedTx, utxos } = yield this.prepareTxEnhanced(Object.assign(Object.assign({}, params), { feeRate, sender: yield this.getAddressAsync(fromAddressIndex), utxoSelectionPreferences: mergedPreferences }));
+            const { rawUnsignedTx, utxos } = yield this.prepareTxEnhanced(Object.assign(Object.assign({}, params), { feeRate, sender: yield this.getAddressAsync(fromAddressIndex), utxoSelectionPreferences: mergedPreferences, selectedUtxos: params.selectedUtxos }));
             const tx = new dashcore.Transaction(rawUnsignedTx);
             // eslint-disable-next-line @typescript-eslint/no-explicit-any
             tx.inputs.forEach((input, index) => {
@@ -4791,6 +4805,7 @@ class ClientKeystore extends Client {
                 memo: params.memo,
                 feeRate,
                 utxoSelectionPreferences: params.utxoSelectionPreferences,
+                selectedUtxos: params.selectedUtxos,
             });
             const tx = new dashcore.Transaction(rawUnsignedTx);
             // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -4916,6 +4931,58 @@ class ClientLedger extends Client {
             return txHash;
         });
     }
+    // Transfer max DASH from Ledger (sweep transaction)
+    transferMax(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const app = yield this.getApp();
+            const fromAddressIndex = (params === null || params === void 0 ? void 0 : params.walletIndex) || 0;
+            const feeRate = params.feeRate || (yield this.getFeeRates())[FeeOption.Fast];
+            checkFeeBounds(this.feeBounds, feeRate);
+            const sender = yield this.getAddressAsync(fromAddressIndex);
+            const { rawUnsignedTx, inputs, maxAmount, fee } = yield this.prepareMaxTx({
+                sender,
+                recipient: params.recipient,
+                memo: params.memo,
+                feeRate,
+                utxoSelectionPreferences: params.utxoSelectionPreferences,
+                selectedUtxos: params.selectedUtxos,
+            });
+            const tx = new dashcore.Transaction(rawUnsignedTx);
+            const ledgerInputs = [];
+            for (const input of tx.inputs) {
+                const insightUtxo = inputs.find((utxo) => {
+                    return utxo.hash === input.prevTxId.toString('hex') && utxo.index == input.outputIndex;
+                });
+                if (!insightUtxo) {
+                    throw new Error('Unable to match accumulative inputs with insight utxos');
+                }
+                const txHex = yield getRawTx({ txid: insightUtxo.hash, network: this.network });
+                const utxoTx = new dashcore.Transaction(txHex);
+                const splittedTx = app.splitTransaction(utxoTx.toString());
+                ledgerInputs.push([splittedTx, input.outputIndex, null, null]);
+            }
+            const associatedKeysets = tx.inputs.map(() => this.getFullDerivationPath(fromAddressIndex));
+            const newTx = app.splitTransaction(tx.toString(), true);
+            const outputScriptHex = app.serializeTransactionOutputs(newTx).toString('hex');
+            const txHex = yield app.createPaymentTransaction({
+                inputs: ledgerInputs,
+                associatedKeysets,
+                outputScriptHex,
+                segwit: false,
+                useTrustedInputForSegwit: false,
+                additionals: [],
+            });
+            const hash = yield broadcastTx({
+                txHex,
+                nodeUrl: this.nodeUrls[this.network],
+                auth: this.nodeAuth,
+            });
+            if (!hash) {
+                throw Error('No Tx hash');
+            }
+            return { hash, maxAmount, fee };
+        });
+    }
 }
 
 export { AssetDASH, BitgoProviders, BlockcypherDataProviders, ClientKeystore as Client, ClientKeystore, ClientLedger, DASHChain, DASH_DECIMAL, DASH_SYMBOL, DEFAULT_FEE_RATE, LOWER_FEE_BOUND, MIN_TX_FEE, UPPER_FEE_BOUND, buildTx, defaultDashParams, explorerProviders, getPrefix, validateAddress };

package/lib/index.js

@@ -4550,7 +4550,7 @@ class Client extends xchainUtxo.Client {
      * Uses base class UTXO selection logic with dashcore-lib transaction building.
      */
     prepareTxEnhanced(_a) {
-        return __awaiter(this, arguments, void 0, function* ({ sender, memo, amount, recipient, feeRate, spendPendingUTXO = true, utxoSelectionPreferences, }) {
+        return __awaiter(this, arguments, void 0, function* ({ sender, memo, amount, recipient, feeRate, spendPendingUTXO = true, utxoSelectionPreferences, selectedUtxos, }) {
             try {
                 // Validate inputs using base class method
                 this.validateTransactionInputs({
@@ -4560,9 +4560,16 @@ class Client extends xchainUtxo.Client {
                     sender,
                     feeRate,
                 });
-                // Get validated UTXOs using base class method
-                const confirmedOnly = !spendPendingUTXO;
-                const utxos = yield this.getValidatedUtxos(sender, confirmedOnly);
+                // Use provided UTXOs (coin control) or fetch from chain
+                let utxos;
+                if (selectedUtxos && selectedUtxos.length > 0) {
+                    xchainUtxo.UtxoTransactionValidator.validateUtxoSet(selectedUtxos);
+                    utxos = selectedUtxos;
+                }
+                else {
+                    const confirmedOnly = !spendPendingUTXO;
+                    utxos = yield this.getValidatedUtxos(sender, confirmedOnly);
+                }
                 const compiledMemo = memo ? this.compileMemo(memo) : null;
                 const targetValue = amount.amount().toNumber();
                 const extraOutputs = 1 + (compiledMemo ? 1 : 0);
@@ -4608,7 +4615,7 @@ class Client extends xchainUtxo.Client {
      * Prepare max send transaction
      */
     prepareMaxTx(_a) {
-        return __awaiter(this, arguments, void 0, function* ({ sender, recipient, memo, feeRate, spendPendingUTXO = true, utxoSelectionPreferences, }) {
+        return __awaiter(this, arguments, void 0, function* ({ sender, recipient, memo, feeRate, spendPendingUTXO = true, utxoSelectionPreferences, selectedUtxos, }) {
             try {
                 // Validate addresses
                 if (!this.validateAddress(recipient)) {
@@ -4617,9 +4624,16 @@ class Client extends xchainUtxo.Client {
                 if (!this.validateAddress(sender)) {
                     throw xchainUtxo.UtxoError.invalidAddress(sender, this.network);
                 }
-                // Get validated UTXOs
-                const confirmedOnly = !spendPendingUTXO;
-                const utxos = yield this.getValidatedUtxos(sender, confirmedOnly);
+                // Use provided UTXOs (coin control) or fetch from chain
+                let utxos;
+                if (selectedUtxos && selectedUtxos.length > 0) {
+                    xchainUtxo.UtxoTransactionValidator.validateUtxoSet(selectedUtxos);
+                    utxos = selectedUtxos;
+                }
+                else {
+                    const confirmedOnly = !spendPendingUTXO;
+                    utxos = yield this.getValidatedUtxos(sender, confirmedOnly);
+                }
                 // Calculate max using base class method
                 const maxCalc = this.calculateMaxSendableAmount(utxos, Math.ceil(feeRate), !!memo, utxoSelectionPreferences);
                 // Build transaction using dashcore-lib
@@ -4762,7 +4776,7 @@ class ClientKeystore extends Client {
             const fromAddressIndex = params.walletIndex || 0;
             // Merge default preferences
             const mergedPreferences = Object.assign({ minimizeFee: true, avoidDust: true, minimizeInputs: false }, params.utxoSelectionPreferences);
-            const { rawUnsignedTx, utxos } = yield this.prepareTxEnhanced(Object.assign(Object.assign({}, params), { feeRate, sender: yield this.getAddressAsync(fromAddressIndex), utxoSelectionPreferences: mergedPreferences }));
+            const { rawUnsignedTx, utxos } = yield this.prepareTxEnhanced(Object.assign(Object.assign({}, params), { feeRate, sender: yield this.getAddressAsync(fromAddressIndex), utxoSelectionPreferences: mergedPreferences, selectedUtxos: params.selectedUtxos }));
             const tx = new dashcore__default.default.Transaction(rawUnsignedTx);
             // eslint-disable-next-line @typescript-eslint/no-explicit-any
             tx.inputs.forEach((input, index) => {
@@ -4819,6 +4833,7 @@ class ClientKeystore extends Client {
                 memo: params.memo,
                 feeRate,
                 utxoSelectionPreferences: params.utxoSelectionPreferences,
+                selectedUtxos: params.selectedUtxos,
             });
             const tx = new dashcore__default.default.Transaction(rawUnsignedTx);
             // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -4944,6 +4959,58 @@ class ClientLedger extends Client {
             return txHash;
         });
     }
+    // Transfer max DASH from Ledger (sweep transaction)
+    transferMax(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const app = yield this.getApp();
+            const fromAddressIndex = (params === null || params === void 0 ? void 0 : params.walletIndex) || 0;
+            const feeRate = params.feeRate || (yield this.getFeeRates())[xchainClient.FeeOption.Fast];
+            xchainClient.checkFeeBounds(this.feeBounds, feeRate);
+            const sender = yield this.getAddressAsync(fromAddressIndex);
+            const { rawUnsignedTx, inputs, maxAmount, fee } = yield this.prepareMaxTx({
+                sender,
+                recipient: params.recipient,
+                memo: params.memo,
+                feeRate,
+                utxoSelectionPreferences: params.utxoSelectionPreferences,
+                selectedUtxos: params.selectedUtxos,
+            });
+            const tx = new dashcore__default.default.Transaction(rawUnsignedTx);
+            const ledgerInputs = [];
+            for (const input of tx.inputs) {
+                const insightUtxo = inputs.find((utxo) => {
+                    return utxo.hash === input.prevTxId.toString('hex') && utxo.index == input.outputIndex;
+                });
+                if (!insightUtxo) {
+                    throw new Error('Unable to match accumulative inputs with insight utxos');
+                }
+                const txHex = yield getRawTx({ txid: insightUtxo.hash, network: this.network });
+                const utxoTx = new dashcore__default.default.Transaction(txHex);
+                const splittedTx = app.splitTransaction(utxoTx.toString());
+                ledgerInputs.push([splittedTx, input.outputIndex, null, null]);
+            }
+            const associatedKeysets = tx.inputs.map(() => this.getFullDerivationPath(fromAddressIndex));
+            const newTx = app.splitTransaction(tx.toString(), true);
+            const outputScriptHex = app.serializeTransactionOutputs(newTx).toString('hex');
+            const txHex = yield app.createPaymentTransaction({
+                inputs: ledgerInputs,
+                associatedKeysets,
+                outputScriptHex,
+                segwit: false,
+                useTrustedInputForSegwit: false,
+                additionals: [],
+            });
+            const hash = yield broadcastTx({
+                txHex,
+                nodeUrl: this.nodeUrls[this.network],
+                auth: this.nodeAuth,
+            });
+            if (!hash) {
+                throw Error('No Tx hash');
+            }
+            return { hash, maxAmount, fee };
+        });
+    }
 }
 
 exports.AssetDASH = AssetDASH;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xchainjs/xchain-dash",
-  "version": "2.1.0",
+  "version": "2.2.0",
   "description": "Custom Dash client and utilities used by XChainJS clients",
   "keywords": [
     "XChain",
@@ -40,7 +40,7 @@
     "@xchainjs/xchain-client": "2.0.10",
     "@xchainjs/xchain-crypto": "1.0.6",
     "@xchainjs/xchain-util": "2.0.5",
-    "@xchainjs/xchain-utxo": "2.1.0",
+    "@xchainjs/xchain-utxo": "2.2.0",
     "@xchainjs/xchain-utxo-providers": "2.0.10",
     "bitcoinjs-lib": "^6.1.7",
     "coinselect": "3.1.12",