@arkade-os/sdk 0.4.2 → 0.4.4

package/dist/cjs/wallet/delegator.js

@@ -1,11 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DelegatorManagerImpl = void 0;
+exports.findDestinationOutputIndex = findDestinationOutputIndex;
 const __1 = require("..");
 const base_1 = require("@scure/base");
 const base_2 = require("../script/base");
 const forfeit_1 = require("../forfeit");
 const btc_signer_1 = require("@scure/btc-signer");
+const utils_js_1 = require("@scure/btc-signer/utils.js");
 const networks_1 = require("../networks");
 const asset_1 = require("./asset");
 const extension_1 = require("../extension");
@@ -173,7 +175,7 @@ async function delegate(identity, delegatorProvider, arkInfoProvider, vtxos, des
         script: destinationScript,
         amount: amount,
     });
-    const registerIntent = await makeSignedDelegateIntent(identity, vtxos, outputs, [], [pubkey], delegateAtSeconds);
+    const registerIntent = await makeSignedDelegateIntent(identity, vtxos, outputs, [], [pubkey], delegateAtSeconds, destinationScript);
     const forfeitOutputScript = btc_signer_1.OutScript.encode((0, btc_signer_1.Address)((0, networks_1.getNetwork)(network)).decode(forfeitAddress));
     const forfeits = await Promise.all(vtxos
         .filter((v) => !(0, __1.isRecoverable)(v))
@@ -218,7 +220,7 @@ async function makeDelegateForfeitTx(input, connectorAmount, delegatePubkey, for
     });
     return identity.sign(tx);
 }
-async function makeSignedDelegateIntent(identity, coins, outputs, onchainOutputsIndexes, cosignerPubKeys, validAt) {
+async function makeSignedDelegateIntent(identity, coins, outputs, onchainOutputsIndexes, cosignerPubKeys, validAt, destinationScript) {
     // if some of the inputs hold assets, build the asset packet and append as output
     // in the intent proof tx, there is a "fake" input at index 0
     // so the real coin indices are offset by +1
@@ -232,8 +234,11 @@ async function makeSignedDelegateIntent(identity, coins, outputs, onchainOutputs
         }
     }
     let outputAssets;
-    let assetOutputIndex; // where to send the assets
+    const assetOutputIndex = findDestinationOutputIndex(outputs, destinationScript);
     if (assetInputs.size > 0) {
+        if (assetOutputIndex === -1) {
+            throw new Error("Cannot assign assets: no output matches the destination address");
+        }
         // collect all input assets and assign them to the first offchain output
         const allAssets = new Map();
         for (const [, assets] of assetInputs) {
@@ -246,11 +251,6 @@ async function makeSignedDelegateIntent(identity, coins, outputs, onchainOutputs
         for (const [assetId, amount] of allAssets) {
             outputAssets.push({ assetId, amount: Number(amount) });
         }
-        const firstOffchainIndex = outputs.findIndex((_, i) => !onchainOutputsIndexes.includes(i));
-        if (firstOffchainIndex === -1) {
-            throw new Error("Cannot settle assets without an offchain output");
-        }
-        assetOutputIndex = firstOffchainIndex;
     }
     const recipients = outputs.map((output, i) => ({
         address: "", // not needed for asset packet creation
@@ -275,6 +275,13 @@ async function makeSignedDelegateIntent(identity, coins, outputs, onchainOutputs
         message,
     };
 }
+/**
+ * Finds the index of the output whose script matches the destination script.
+ * Returns -1 if no match is found.
+ */
+function findDestinationOutputIndex(outputs, destinationScript) {
+    return outputs.findIndex((o) => o.script && (0, utils_js_1.equalBytes)(o.script, destinationScript));
+}
 function getDayTimestamp(timestamp) {
     const date = new Date(timestamp);
     date.setUTCHours(0, 0, 0, 0);

package/dist/cjs/wallet/wallet.js

@@ -888,9 +888,13 @@ class Wallet extends ReadonlyWallet {
             }
         }
         let outputAssets;
-        let assetOutputIndex; // where to send the assets
+        const destinationScript = address_1.ArkAddress.decode(await this.getAddress()).pkScript;
+        const assetOutputIndex = (0, delegator_1.findDestinationOutputIndex)(outputs, destinationScript);
         if (assetInputs.size > 0) {
-            // collect all input assets and assign them to the first offchain output
+            if (assetOutputIndex === -1) {
+                throw new Error("Cannot assign assets: no output matches the destination address");
+            }
+            // collect all input assets and assign them to the destination output
             const allAssets = new Map();
             for (const [, assets] of assetInputs) {
                 for (const asset of assets) {
@@ -902,11 +906,6 @@ class Wallet extends ReadonlyWallet {
             for (const [assetId, amount] of allAssets) {
                 outputAssets.push({ assetId, amount: Number(amount) });
             }
-            const firstOffchainIndex = params.outputs.findIndex((_, i) => !onchainOutputIndexes.includes(i));
-            if (firstOffchainIndex === -1) {
-                throw new Error("Cannot settle assets without an offchain output");
-            }
-            assetOutputIndex = firstOffchainIndex;
         }
         const recipients = params.outputs.map((output, i) => ({
             address: output.address,

package/dist/esm/wallet/delegator.js

@@ -3,6 +3,7 @@ import { base64, hex } from "@scure/base";
 import { scriptFromTapLeafScript } from '../script/base.js';
 import { buildForfeitTxWithOutput } from '../forfeit.js';
 import { Address, OutScript, SigHash } from "@scure/btc-signer";
+import { equalBytes } from "@scure/btc-signer/utils.js";
 import { getNetwork } from '../networks.js';
 import { createAssetPacket } from './asset.js';
 import { Extension } from '../extension/index.js';
@@ -169,7 +170,7 @@ async function delegate(identity, delegatorProvider, arkInfoProvider, vtxos, des
         script: destinationScript,
         amount: amount,
     });
-    const registerIntent = await makeSignedDelegateIntent(identity, vtxos, outputs, [], [pubkey], delegateAtSeconds);
+    const registerIntent = await makeSignedDelegateIntent(identity, vtxos, outputs, [], [pubkey], delegateAtSeconds, destinationScript);
     const forfeitOutputScript = OutScript.encode(Address(getNetwork(network)).decode(forfeitAddress));
     const forfeits = await Promise.all(vtxos
         .filter((v) => !isRecoverable(v))
@@ -214,7 +215,7 @@ async function makeDelegateForfeitTx(input, connectorAmount, delegatePubkey, for
     });
     return identity.sign(tx);
 }
-async function makeSignedDelegateIntent(identity, coins, outputs, onchainOutputsIndexes, cosignerPubKeys, validAt) {
+async function makeSignedDelegateIntent(identity, coins, outputs, onchainOutputsIndexes, cosignerPubKeys, validAt, destinationScript) {
     // if some of the inputs hold assets, build the asset packet and append as output
     // in the intent proof tx, there is a "fake" input at index 0
     // so the real coin indices are offset by +1
@@ -228,8 +229,11 @@ async function makeSignedDelegateIntent(identity, coins, outputs, onchainOutputs
         }
     }
     let outputAssets;
-    let assetOutputIndex; // where to send the assets
+    const assetOutputIndex = findDestinationOutputIndex(outputs, destinationScript);
     if (assetInputs.size > 0) {
+        if (assetOutputIndex === -1) {
+            throw new Error("Cannot assign assets: no output matches the destination address");
+        }
         // collect all input assets and assign them to the first offchain output
         const allAssets = new Map();
         for (const [, assets] of assetInputs) {
@@ -242,11 +246,6 @@ async function makeSignedDelegateIntent(identity, coins, outputs, onchainOutputs
         for (const [assetId, amount] of allAssets) {
             outputAssets.push({ assetId, amount: Number(amount) });
         }
-        const firstOffchainIndex = outputs.findIndex((_, i) => !onchainOutputsIndexes.includes(i));
-        if (firstOffchainIndex === -1) {
-            throw new Error("Cannot settle assets without an offchain output");
-        }
-        assetOutputIndex = firstOffchainIndex;
     }
     const recipients = outputs.map((output, i) => ({
         address: "", // not needed for asset packet creation
@@ -271,6 +270,13 @@ async function makeSignedDelegateIntent(identity, coins, outputs, onchainOutputs
         message,
     };
 }
+/**
+ * Finds the index of the output whose script matches the destination script.
+ * Returns -1 if no match is found.
+ */
+export function findDestinationOutputIndex(outputs, destinationScript) {
+    return outputs.findIndex((o) => o.script && equalBytes(o.script, destinationScript));
+}
 function getDayTimestamp(timestamp) {
     const date = new Date(timestamp);
     date.setUTCHours(0, 0, 0, 0);

package/dist/esm/wallet/wallet.js

@@ -27,7 +27,7 @@ import { buildTransactionHistory } from '../utils/transactionHistory.js';
 import { AssetManager, ReadonlyAssetManager } from './asset-manager.js';
 import { Extension } from '../extension/index.js';
 import { DelegateVtxo } from '../script/delegate.js';
-import { DelegatorManagerImpl } from './delegator.js';
+import { DelegatorManagerImpl, findDestinationOutputIndex, } from './delegator.js';
 import { IndexedDBContractRepository, IndexedDBWalletRepository, } from '../repositories/index.js';
 import { ContractManager } from '../contracts/contractManager.js';
 import { contractHandlers } from '../contracts/handlers/index.js';
@@ -882,9 +882,13 @@ export class Wallet extends ReadonlyWallet {
             }
         }
         let outputAssets;
-        let assetOutputIndex; // where to send the assets
+        const destinationScript = ArkAddress.decode(await this.getAddress()).pkScript;
+        const assetOutputIndex = findDestinationOutputIndex(outputs, destinationScript);
         if (assetInputs.size > 0) {
-            // collect all input assets and assign them to the first offchain output
+            if (assetOutputIndex === -1) {
+                throw new Error("Cannot assign assets: no output matches the destination address");
+            }
+            // collect all input assets and assign them to the destination output
             const allAssets = new Map();
             for (const [, assets] of assetInputs) {
                 for (const asset of assets) {
@@ -896,11 +900,6 @@ export class Wallet extends ReadonlyWallet {
             for (const [assetId, amount] of allAssets) {
                 outputAssets.push({ assetId, amount: Number(amount) });
             }
-            const firstOffchainIndex = params.outputs.findIndex((_, i) => !onchainOutputIndexes.includes(i));
-            if (firstOffchainIndex === -1) {
-                throw new Error("Cannot settle assets without an offchain output");
-            }
-            assetOutputIndex = firstOffchainIndex;
         }
         const recipients = params.outputs.map((output, i) => ({
             address: output.address,

package/dist/types/wallet/delegator.d.ts

@@ -1,5 +1,7 @@
+import { TransactionOutput } from "@scure/btc-signer/psbt";
 import { ArkProvider, DelegateInfo, ExtendedVirtualCoin, Identity, Outpoint } from "..";
 import { DelegatorProvider } from "../providers/delegator";
+import { Bytes } from "@scure/btc-signer/utils";
 export interface IDelegatorManager {
     delegate(vtxos: ExtendedVirtualCoin[], destination: string, delegateAt?: Date): Promise<{
         delegated: Outpoint[];
@@ -24,3 +26,8 @@ export declare class DelegatorManagerImpl implements IDelegatorManager {
         }[];
     }>;
 }
+/**
+ * Finds the index of the output whose script matches the destination script.
+ * Returns -1 if no match is found.
+ */
+export declare function findDestinationOutputIndex(outputs: TransactionOutput[], destinationScript: Bytes): number;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arkade-os/sdk",
-  "version": "0.4.2",
+  "version": "0.4.4",
   "description": "Bitcoin wallet SDK with Taproot and Ark integration",
   "type": "module",
   "main": "./dist/cjs/index.js",