@arkade-os/sdk 0.4.0-next.6 → 0.4.0-next.7

package/dist/cjs/wallet/wallet.js

@@ -273,21 +273,6 @@ class ReadonlyWallet {
         await this.walletRepository.saveVtxos(address, allExtended);
         return allExtended;
     }
-    async getVirtualCoins(filter = { withRecoverable: true, withUnrolled: false }) {
-        const scripts = [base_1.hex.encode(this.offchainTapscript.pkScript)];
-        const response = await this.indexerProvider.getVtxos({ scripts });
-        const allVtxos = response.vtxos;
-        let vtxos = allVtxos.filter(_1.isSpendable);
-        // all recoverable vtxos are spendable by definition
-        if (!filter.withRecoverable) {
-            vtxos = vtxos.filter((vtxo) => !(0, _1.isRecoverable)(vtxo) && !(0, _1.isExpired)(vtxo));
-        }
-        if (filter.withUnrolled) {
-            const spentVtxos = allVtxos.filter((vtxo) => !(0, _1.isSpendable)(vtxo));
-            vtxos.push(...spentVtxos.filter((vtxo) => vtxo.isUnrolled));
-        }
-        return vtxos;
-    }
     async getTransactionHistory() {
         const scripts = await this.getWalletScripts();
         const response = await this.indexerProvider.getVtxos({ scripts });
@@ -738,6 +723,10 @@ class Wallet extends ReadonlyWallet {
     async getDelegatorManager() {
         return this._delegatorManager;
     }
+    /**
+     * @deprecated Use `send`
+     * @param params
+     */
     async sendBitcoin(params) {
         if (params.amount <= 0) {
             throw new Error("Amount must be positive");
@@ -971,7 +960,7 @@ class Wallet extends ReadonlyWallet {
     async handleSettlementFinalizationEvent(event, inputs, forfeitOutputScript, connectorsGraph) {
         // the signed forfeits transactions to submit
         const signedForfeits = [];
-        const vtxos = await this.getVirtualCoins();
+        const vtxos = await this.getVtxos();
         let settlementPsbt = btc_signer_1.Transaction.fromPSBT(base_1.base64.decode(event.commitmentTx));
         let hasBoardingUtxos = false;
         let connectorIndex = 0;
@@ -1290,7 +1279,7 @@ class Wallet extends ReadonlyWallet {
         const recipients = (0, utils_1.validateRecipients)(args, Number(this.dustAmount));
         const address = await this.getAddress();
         const outputAddress = address_1.ArkAddress.decode(address);
-        const virtualCoins = await this.getVirtualCoins({
+        const virtualCoins = await this.getVtxos({
             withRecoverable: false,
         });
         // keep track of asset changes
@@ -1425,16 +1414,12 @@ class Wallet extends ReadonlyWallet {
      * @returns The ark transaction id and server-signed checkpoint PSBTs (for bookkeeping)
      */
     async buildAndSubmitOffchainTx(inputs, outputs) {
-        const tapLeafScript = this.offchainTapscript.forfeit();
-        if (!tapLeafScript) {
-            throw new Error("Selected leaf not found");
-        }
-        const tapTree = this.offchainTapscript.encode();
-        const offchainTx = (0, arkTransaction_1.buildOffchainTx)(inputs.map((input) => ({
-            ...input,
-            tapLeafScript,
-            tapTree,
-        })), outputs, this.serverUnrollScript);
+        const offchainTx = (0, arkTransaction_1.buildOffchainTx)(inputs.map((input) => {
+            return {
+                ...input,
+                tapLeafScript: input.forfeitTapLeafScript,
+            };
+        }), outputs, this.serverUnrollScript);
         const signedVirtualTx = await this.identity.sign(offchainTx.arkTx);
         const { arkTxid, signedCheckpointTxs } = await this.arkProvider.submitTx(base_1.base64.encode(signedVirtualTx.toPSBT()), offchainTx.checkpoints.map((c) => base_1.base64.encode(c.toPSBT())));
         const finalCheckpoints = await Promise.all(signedCheckpointTxs.map(async (c) => {

package/dist/esm/wallet/wallet.js

@@ -268,21 +268,6 @@ export class ReadonlyWallet {
         await this.walletRepository.saveVtxos(address, allExtended);
         return allExtended;
     }
-    async getVirtualCoins(filter = { withRecoverable: true, withUnrolled: false }) {
-        const scripts = [hex.encode(this.offchainTapscript.pkScript)];
-        const response = await this.indexerProvider.getVtxos({ scripts });
-        const allVtxos = response.vtxos;
-        let vtxos = allVtxos.filter(isSpendable);
-        // all recoverable vtxos are spendable by definition
-        if (!filter.withRecoverable) {
-            vtxos = vtxos.filter((vtxo) => !isRecoverable(vtxo) && !isExpired(vtxo));
-        }
-        if (filter.withUnrolled) {
-            const spentVtxos = allVtxos.filter((vtxo) => !isSpendable(vtxo));
-            vtxos.push(...spentVtxos.filter((vtxo) => vtxo.isUnrolled));
-        }
-        return vtxos;
-    }
     async getTransactionHistory() {
         const scripts = await this.getWalletScripts();
         const response = await this.indexerProvider.getVtxos({ scripts });
@@ -732,6 +717,10 @@ export class Wallet extends ReadonlyWallet {
     async getDelegatorManager() {
         return this._delegatorManager;
     }
+    /**
+     * @deprecated Use `send`
+     * @param params
+     */
     async sendBitcoin(params) {
         if (params.amount <= 0) {
             throw new Error("Amount must be positive");
@@ -965,7 +954,7 @@ export class Wallet extends ReadonlyWallet {
     async handleSettlementFinalizationEvent(event, inputs, forfeitOutputScript, connectorsGraph) {
         // the signed forfeits transactions to submit
         const signedForfeits = [];
-        const vtxos = await this.getVirtualCoins();
+        const vtxos = await this.getVtxos();
         let settlementPsbt = Transaction.fromPSBT(base64.decode(event.commitmentTx));
         let hasBoardingUtxos = false;
         let connectorIndex = 0;
@@ -1284,7 +1273,7 @@ export class Wallet extends ReadonlyWallet {
         const recipients = validateRecipients(args, Number(this.dustAmount));
         const address = await this.getAddress();
         const outputAddress = ArkAddress.decode(address);
-        const virtualCoins = await this.getVirtualCoins({
+        const virtualCoins = await this.getVtxos({
             withRecoverable: false,
         });
         // keep track of asset changes
@@ -1419,16 +1408,12 @@ export class Wallet extends ReadonlyWallet {
      * @returns The ark transaction id and server-signed checkpoint PSBTs (for bookkeeping)
      */
     async buildAndSubmitOffchainTx(inputs, outputs) {
-        const tapLeafScript = this.offchainTapscript.forfeit();
-        if (!tapLeafScript) {
-            throw new Error("Selected leaf not found");
-        }
-        const tapTree = this.offchainTapscript.encode();
-        const offchainTx = buildOffchainTx(inputs.map((input) => ({
-            ...input,
-            tapLeafScript,
-            tapTree,
-        })), outputs, this.serverUnrollScript);
+        const offchainTx = buildOffchainTx(inputs.map((input) => {
+            return {
+                ...input,
+                tapLeafScript: input.forfeitTapLeafScript,
+            };
+        }), outputs, this.serverUnrollScript);
         const signedVirtualTx = await this.identity.sign(offchainTx.arkTx);
         const { arkTxid, signedCheckpointTxs } = await this.arkProvider.submitTx(base64.encode(signedVirtualTx.toPSBT()), offchainTx.checkpoints.map((c) => base64.encode(c.toPSBT())));
         const finalCheckpoints = await Promise.all(signedCheckpointTxs.map(async (c) => {

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

@@ -1,5 +1,5 @@
 import { Packet } from "../extension/asset";
-import { Asset, Recipient, VirtualCoin } from "./index";
+import { Asset, ExtendedVirtualCoin, Recipient, VirtualCoin } from "./index";
 /**
  * Creates an asset packet from asset inputs and receivers.
  * Groups inputs and outputs by asset ID and creates the Packet object
@@ -13,8 +13,8 @@ export declare function createAssetPacket(assetInputs: Map<number, Asset[]>, rec
  * Selects coins that contain a specific asset.
  * Returns coins sorted by amount (smallest first for better coin selection).
  */
-export declare function selectCoinsWithAsset(coins: VirtualCoin[], assetId: string, requiredAmount: bigint): {
-    selected: VirtualCoin[];
+export declare function selectCoinsWithAsset(coins: ExtendedVirtualCoin[], assetId: string, requiredAmount: bigint): {
+    selected: ExtendedVirtualCoin[];
     totalAssetAmount: bigint;
 };
 export declare function computeAssetChange(inputAssets: Map<string, bigint>, outputAssets: Map<string, bigint>): Map<string, bigint>;

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

@@ -140,7 +140,7 @@ export interface SendBitcoinParams {
     amount: number;
     feeRate?: number;
     memo?: string;
-    selectedVtxos?: VirtualCoin[];
+    selectedVtxos?: ExtendedVirtualCoin[];
 }
 export interface Asset {
     assetId: string;

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

@@ -7,7 +7,7 @@ import { OnchainProvider } from "../providers/onchain";
 import { ArkProvider, SettlementEvent, SignedIntent } from "../providers/ark";
 import { SignerSession } from "../tree/signingSession";
 import { Identity, ReadonlyIdentity } from "../identity";
-import { ArkTransaction, Recipient, Coin, ExtendedCoin, ExtendedVirtualCoin, GetVtxosFilter, IReadonlyWallet, IWallet, ReadonlyWalletConfig, SendBitcoinParams, SettleParams, VirtualCoin, WalletBalance, WalletConfig, IAssetManager, IReadonlyAssetManager } from ".";
+import { ArkTransaction, Recipient, Coin, ExtendedCoin, ExtendedVirtualCoin, GetVtxosFilter, IReadonlyWallet, IWallet, ReadonlyWalletConfig, SendBitcoinParams, SettleParams, WalletBalance, WalletConfig, IAssetManager, IReadonlyAssetManager } from ".";
 import { CSVMultisigTapscript } from "../script/tapscript";
 import { Intent } from "../intent";
 import { IndexerProvider } from "../providers/indexer";
@@ -74,7 +74,6 @@ export declare class ReadonlyWallet implements IReadonlyWallet {
     getBoardingAddress(): Promise<string>;
     getBalance(): Promise<WalletBalance>;
     getVtxos(filter?: GetVtxosFilter): Promise<ExtendedVirtualCoin[]>;
-    protected getVirtualCoins(filter?: GetVtxosFilter): Promise<VirtualCoin[]>;
     getTransactionHistory(): Promise<ArkTransaction[]>;
     getBoardingTxs(): Promise<{
         boardingTxs: ArkTransaction[];
@@ -193,6 +192,10 @@ export declare class Wallet extends ReadonlyWallet implements IWallet {
      */
     toReadonly(): Promise<ReadonlyWallet>;
     getDelegatorManager(): Promise<IDelegatorManager | undefined>;
+    /**
+     * @deprecated Use `send`
+     * @param params
+     */
     sendBitcoin(params: SendBitcoinParams): Promise<string>;
     settle(params?: SettleParams, eventCallback?: (event: SettlementEvent) => void): Promise<string>;
     private handleSettlementFinalizationEvent;
@@ -238,7 +241,7 @@ export declare class Wallet extends ReadonlyWallet implements IWallet {
      * sign it, submit to the ark provider, and finalize.
      * @returns The ark transaction id and server-signed checkpoint PSBTs (for bookkeeping)
      */
-    buildAndSubmitOffchainTx(inputs: VirtualCoin[], outputs: TransactionOutput[]): Promise<{
+    buildAndSubmitOffchainTx(inputs: ExtendedVirtualCoin[], outputs: TransactionOutput[]): Promise<{
         arkTxid: string;
         signedCheckpointTxs: string[];
     }>;
@@ -251,8 +254,8 @@ export declare class Wallet extends ReadonlyWallet implements IWallet {
  * @param targetAmount Target amount to reach in satoshis
  * @returns Selected coins and change amount
  */
-export declare function selectVirtualCoins(coins: VirtualCoin[], targetAmount: number): {
-    inputs: VirtualCoin[];
+export declare function selectVirtualCoins(coins: ExtendedVirtualCoin[], targetAmount: number): {
+    inputs: ExtendedVirtualCoin[];
     changeAmount: bigint;
 };
 /**

package/package.json

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