@buildonspark/spark-sdk 0.2.12 → 0.2.13

package/dist/native/index.d.ts

@@ -3330,7 +3330,6 @@ declare class TransferService extends BaseTransferService {
     private prepareClaimLeafKeyTweaks;
     claimTransferSignRefunds(transfer: Transfer$1, leafKeys: LeafKeyTweak[], proofMap?: Map<string, Uint8Array[]>): Promise<NodeSignatures[]>;
     private finalizeNodeSignatures;
-    cancelTransfer(transfer: Transfer$1, operatorAddress: string): Promise<Transfer$1 | undefined>;
     queryPendingTransfersBySender(operatorAddress: string): Promise<QueryTransfersResponse>;
     private refreshTimelockNodesInternal;
     refreshTimelockNodes(node: TreeNode, parentNode: TreeNode): Promise<FinalizeNodeSignaturesResponse>;
@@ -3591,6 +3590,29 @@ declare class SparkWallet extends EventEmitter {
         /** @deprecated use `satsPerVbyteFee` */ fee?: number;
         satsPerVbyteFee?: number;
     }): Promise<string>;
+    /**
+     * Refunds a static deposit and broadcasts the transaction to the network.
+     *
+     * @param {Object} params - The refund parameters
+     * @param {string} params.depositTransactionId - The ID of the transaction
+     * @param {number} [params.outputIndex] - The index of the output
+     * @param {string} params.destinationAddress - The destination address
+     * @param {number} [params.satsPerVbyteFee] - The fee per vbyte to refund
+     * @returns {Promise<string>} The transaction ID
+     */
+    refundAndBroadcastStaticDeposit({ depositTransactionId, outputIndex, destinationAddress, satsPerVbyteFee, }: {
+        depositTransactionId: string;
+        outputIndex?: number;
+        destinationAddress: string;
+        satsPerVbyteFee?: number;
+    }): Promise<string>;
+    /**
+     * Broadcasts a transaction to the network.
+     *
+     * @param {string} txHex - The hex of the transaction
+     * @returns {Promise<string>} The transaction ID
+     */
+    private broadcastTx;
     private getStaticDepositSigningPayload;
     private getDepositTransactionVout;
     private getDepositTransaction;
@@ -3676,13 +3698,6 @@ declare class SparkWallet extends EventEmitter {
      * @private
      */
     private claimTransfers;
-    /**
-     * Cancels all sender-initiated transfers.
-     *
-     * @returns {Promise<void>}
-     * @private
-     */
-    private cancelAllSenderInitiatedTransfers;
     /**
      * Creates a Lightning invoice for receiving payments.
      *

package/dist/native/index.js

@@ -18393,7 +18393,7 @@ import * as ecies from "eciesjs";
 import { isNode, isBare } from "@lightsparkdev/core";
 var isReactNative = typeof navigator !== "undefined" && navigator.product === "ReactNative";
 var isBun = globalThis.Bun !== void 0;
-var packageVersion = true ? "0.2.12" : "unknown";
+var packageVersion = true ? "0.2.13" : "unknown";
 var baseEnvStr = "unknown";
 if (isBun) {
   const bunVersion = "version" in globalThis.Bun ? globalThis.Bun.version : "unknown-version";
@@ -25186,24 +25186,6 @@ var TransferService = class extends BaseTransferService {
       throw new Error(`Error finalizing node signatures in transfer: ${error}`);
     }
   }
-  async cancelTransfer(transfer, operatorAddress) {
-    const sparkClient = await this.connectionManager.createSparkClient(operatorAddress);
-    try {
-      const response = await sparkClient.cancel_transfer({
-        transferId: transfer.id,
-        senderIdentityPublicKey: await this.config.signer.getIdentityPublicKey()
-      });
-      return response.transfer;
-    } catch (error) {
-      throw new NetworkError(
-        "Failed to cancel transfer",
-        {
-          method: "POST"
-        },
-        error
-      );
-    }
-  }
   async queryPendingTransfersBySender(operatorAddress) {
     const sparkClient = await this.connectionManager.createSparkClient(operatorAddress);
     try {
@@ -31642,7 +31624,6 @@ var SparkWallet = class _SparkWallet extends EventEmitter {
         message: e.message,
         stack: e.stack
       });
-      await this.cancelAllSenderInitiatedTransfers();
       throw new Error(`Failed to request leaves swap: ${e}`);
     }
   }
@@ -32105,6 +32086,64 @@ var SparkWallet = class _SparkWallet extends EventEmitter {
     });
     return tx.hex;
   }
+  /**
+   * Refunds a static deposit and broadcasts the transaction to the network.
+   *
+   * @param {Object} params - The refund parameters
+   * @param {string} params.depositTransactionId - The ID of the transaction
+   * @param {number} [params.outputIndex] - The index of the output
+   * @param {string} params.destinationAddress - The destination address
+   * @param {number} [params.satsPerVbyteFee] - The fee per vbyte to refund
+   * @returns {Promise<string>} The transaction ID
+   */
+  async refundAndBroadcastStaticDeposit({
+    depositTransactionId,
+    outputIndex,
+    destinationAddress,
+    satsPerVbyteFee
+  }) {
+    const txHex = await this.refundStaticDeposit({
+      depositTransactionId,
+      outputIndex,
+      destinationAddress,
+      satsPerVbyteFee
+    });
+    return await this.broadcastTx(txHex);
+  }
+  /**
+   * Broadcasts a transaction to the network.
+   *
+   * @param {string} txHex - The hex of the transaction
+   * @returns {Promise<string>} The transaction ID
+   */
+  async broadcastTx(txHex) {
+    if (!txHex) {
+      throw new ValidationError("Transaction hex cannot be empty", {
+        field: "txHex"
+      });
+    }
+    const { fetch, Headers: Headers2 } = getFetch();
+    const baseUrl = this.config.getElectrsUrl();
+    const headers = new Headers2();
+    if (this.config.getNetwork() === 4 /* LOCAL */) {
+      const localFaucet = BitcoinFaucet.getInstance();
+      const response = await localFaucet.broadcastTx(txHex);
+      return response;
+    } else {
+      if (this.config.getNetwork() === 3 /* REGTEST */) {
+        const auth = btoa(
+          `${ELECTRS_CREDENTIALS.username}:${ELECTRS_CREDENTIALS.password}`
+        );
+        headers.set("Authorization", `Basic ${auth}`);
+      }
+      const response = await fetch(`${baseUrl}/tx`, {
+        method: "POST",
+        body: txHex,
+        headers
+      });
+      return response.text();
+    }
+  }
   async getStaticDepositSigningPayload(transactionID, outputIndex, network, requestType, creditAmountSats, sspSignature) {
     const encoder = new TextEncoder();
     const parts = [];
@@ -32843,24 +32882,6 @@ var SparkWallet = class _SparkWallet extends EventEmitter {
       (result) => result.status === "fulfilled" && result.value !== null
     ).map((result) => result.value);
   }
-  /**
-   * Cancels all sender-initiated transfers.
-   *
-   * @returns {Promise<void>}
-   * @private
-   */
-  async cancelAllSenderInitiatedTransfers() {
-    for (const operator of Object.values(this.config.getSigningOperators())) {
-      const transfers = await this.transferService.queryPendingTransfersBySender(
-        operator.address
-      );
-      for (const transfer of transfers.transfers) {
-        if (transfer.status === 0 /* TRANSFER_STATUS_SENDER_INITIATED */) {
-          await this.transferService.cancelTransfer(transfer, operator.address);
-        }
-      }
-    }
-  }
   // ***** Lightning Flow *****
   /**
    * Creates a Lightning invoice for receiving payments.

package/dist/{spark-wallet-DiHSU-pz.d.ts → spark-wallet-D0Df_P_x.d.ts}

@@ -292,7 +292,6 @@ declare class TransferService extends BaseTransferService {
     private prepareClaimLeafKeyTweaks;
     claimTransferSignRefunds(transfer: Transfer, leafKeys: LeafKeyTweak[], proofMap?: Map<string, Uint8Array[]>): Promise<NodeSignatures[]>;
     private finalizeNodeSignatures;
-    cancelTransfer(transfer: Transfer, operatorAddress: string): Promise<Transfer | undefined>;
     queryPendingTransfersBySender(operatorAddress: string): Promise<QueryTransfersResponse>;
     private refreshTimelockNodesInternal;
     refreshTimelockNodes(node: TreeNode, parentNode: TreeNode): Promise<FinalizeNodeSignaturesResponse>;
@@ -692,6 +691,29 @@ declare class SparkWallet extends EventEmitter {
         /** @deprecated use `satsPerVbyteFee` */ fee?: number;
         satsPerVbyteFee?: number;
     }): Promise<string>;
+    /**
+     * Refunds a static deposit and broadcasts the transaction to the network.
+     *
+     * @param {Object} params - The refund parameters
+     * @param {string} params.depositTransactionId - The ID of the transaction
+     * @param {number} [params.outputIndex] - The index of the output
+     * @param {string} params.destinationAddress - The destination address
+     * @param {number} [params.satsPerVbyteFee] - The fee per vbyte to refund
+     * @returns {Promise<string>} The transaction ID
+     */
+    refundAndBroadcastStaticDeposit({ depositTransactionId, outputIndex, destinationAddress, satsPerVbyteFee, }: {
+        depositTransactionId: string;
+        outputIndex?: number;
+        destinationAddress: string;
+        satsPerVbyteFee?: number;
+    }): Promise<string>;
+    /**
+     * Broadcasts a transaction to the network.
+     *
+     * @param {string} txHex - The hex of the transaction
+     * @returns {Promise<string>} The transaction ID
+     */
+    private broadcastTx;
     private getStaticDepositSigningPayload;
     private getDepositTransactionVout;
     private getDepositTransaction;
@@ -777,13 +799,6 @@ declare class SparkWallet extends EventEmitter {
      * @private
      */
     private claimTransfers;
-    /**
-     * Cancels all sender-initiated transfers.
-     *
-     * @returns {Promise<void>}
-     * @private
-     */
-    private cancelAllSenderInitiatedTransfers;
     /**
      * Creates a Lightning invoice for receiving payments.
      *

package/dist/{spark-wallet-Dg5IRQe2.d.cts → spark-wallet-Dvh1BLP6.d.cts}

@@ -292,7 +292,6 @@ declare class TransferService extends BaseTransferService {
     private prepareClaimLeafKeyTweaks;
     claimTransferSignRefunds(transfer: Transfer, leafKeys: LeafKeyTweak[], proofMap?: Map<string, Uint8Array[]>): Promise<NodeSignatures[]>;
     private finalizeNodeSignatures;
-    cancelTransfer(transfer: Transfer, operatorAddress: string): Promise<Transfer | undefined>;
     queryPendingTransfersBySender(operatorAddress: string): Promise<QueryTransfersResponse>;
     private refreshTimelockNodesInternal;
     refreshTimelockNodes(node: TreeNode, parentNode: TreeNode): Promise<FinalizeNodeSignaturesResponse>;
@@ -692,6 +691,29 @@ declare class SparkWallet extends EventEmitter {
         /** @deprecated use `satsPerVbyteFee` */ fee?: number;
         satsPerVbyteFee?: number;
     }): Promise<string>;
+    /**
+     * Refunds a static deposit and broadcasts the transaction to the network.
+     *
+     * @param {Object} params - The refund parameters
+     * @param {string} params.depositTransactionId - The ID of the transaction
+     * @param {number} [params.outputIndex] - The index of the output
+     * @param {string} params.destinationAddress - The destination address
+     * @param {number} [params.satsPerVbyteFee] - The fee per vbyte to refund
+     * @returns {Promise<string>} The transaction ID
+     */
+    refundAndBroadcastStaticDeposit({ depositTransactionId, outputIndex, destinationAddress, satsPerVbyteFee, }: {
+        depositTransactionId: string;
+        outputIndex?: number;
+        destinationAddress: string;
+        satsPerVbyteFee?: number;
+    }): Promise<string>;
+    /**
+     * Broadcasts a transaction to the network.
+     *
+     * @param {string} txHex - The hex of the transaction
+     * @returns {Promise<string>} The transaction ID
+     */
+    private broadcastTx;
     private getStaticDepositSigningPayload;
     private getDepositTransactionVout;
     private getDepositTransaction;
@@ -777,13 +799,6 @@ declare class SparkWallet extends EventEmitter {
      * @private
      */
     private claimTransfers;
-    /**
-     * Cancels all sender-initiated transfers.
-     *
-     * @returns {Promise<void>}
-     * @private
-     */
-    private cancelAllSenderInitiatedTransfers;
     /**
      * Creates a Lightning invoice for receiving payments.
      *

package/dist/{spark-wallet.node-DSWb18zh.d.cts → spark-wallet.node-B3V8_fgw.d.cts}

@@ -1,4 +1,4 @@
-import { H as SparkWallet, F as SparkWalletProps } from './spark-wallet-Dg5IRQe2.cjs';
+import { H as SparkWallet, F as SparkWalletProps } from './spark-wallet-Dvh1BLP6.cjs';
 
 declare class SparkWalletNodeJS extends SparkWallet {
     static initialize({ mnemonicOrSeed, accountNumber, signer, options, }: SparkWalletProps): Promise<{

package/dist/{spark-wallet.node-BZrxwomN.d.ts → spark-wallet.node-bGmy8-T8.d.ts}

@@ -1,4 +1,4 @@
-import { H as SparkWallet, F as SparkWalletProps } from './spark-wallet-DiHSU-pz.js';
+import { H as SparkWallet, F as SparkWalletProps } from './spark-wallet-D0Df_P_x.js';
 
 declare class SparkWalletNodeJS extends SparkWallet {
     static initialize({ mnemonicOrSeed, accountNumber, signer, options, }: SparkWalletProps): Promise<{

package/dist/tests/test-utils.cjs

@@ -16897,7 +16897,7 @@ init_buffer();
 var import_core9 = require("@lightsparkdev/core");
 var isReactNative = typeof navigator !== "undefined" && navigator.product === "ReactNative";
 var isBun = globalThis.Bun !== void 0;
-var packageVersion = true ? "0.2.12" : "unknown";
+var packageVersion = true ? "0.2.13" : "unknown";
 var baseEnvStr = "unknown";
 if (isBun) {
   const bunVersion = "version" in globalThis.Bun ? globalThis.Bun.version : "unknown-version";

package/dist/tests/test-utils.d.cts

@@ -1,7 +1,7 @@
 import { Q as QueryTransfersResponse, a as Transfer, b as TreeNode } from '../spark-C7OG9mGJ.cjs';
-import { b as ConfigOptions, F as SparkWalletProps } from '../spark-wallet-Dg5IRQe2.cjs';
+import { b as ConfigOptions, F as SparkWalletProps } from '../spark-wallet-Dvh1BLP6.cjs';
 import { S as SparkSigner, D as DefaultSparkSigner } from '../client-DVuA5-7M.cjs';
-import { S as SparkWalletNodeJS } from '../spark-wallet.node-DSWb18zh.cjs';
+import { S as SparkWalletNodeJS } from '../spark-wallet.node-B3V8_fgw.cjs';
 import { Transaction } from '@scure/btc-signer';
 import { TransactionInput, TransactionOutput } from '@scure/btc-signer/psbt';
 import '@bufbuild/protobuf/wire';

package/dist/tests/test-utils.d.ts

@@ -1,7 +1,7 @@
 import { Q as QueryTransfersResponse, a as Transfer, b as TreeNode } from '../spark-C7OG9mGJ.js';
-import { b as ConfigOptions, F as SparkWalletProps } from '../spark-wallet-DiHSU-pz.js';
+import { b as ConfigOptions, F as SparkWalletProps } from '../spark-wallet-D0Df_P_x.js';
 import { S as SparkSigner, D as DefaultSparkSigner } from '../client-D7KDa4Ih.js';
-import { S as SparkWalletNodeJS } from '../spark-wallet.node-BZrxwomN.js';
+import { S as SparkWalletNodeJS } from '../spark-wallet.node-bGmy8-T8.js';
 import { Transaction } from '@scure/btc-signer';
 import { TransactionInput, TransactionOutput } from '@scure/btc-signer/psbt';
 import '@bufbuild/protobuf/wire';

package/dist/tests/test-utils.js

@@ -1,4 +1,4 @@
-import "../chunk-NQMQVXR5.js";
+import "../chunk-CKHJFQUA.js";
 import "../chunk-BYXBJQAS.js";
 import {
   BitcoinFaucet,
@@ -11,7 +11,7 @@ import {
   WalletConfigService,
   getNetwork,
   getP2TRAddressFromPublicKey
-} from "../chunk-OEK3R57K.js";
+} from "../chunk-LX45BCZW.js";
 import "../chunk-NX5KPN5F.js";
 import "../chunk-XXTWWW6L.js";
 import "../chunk-TB7DG5CU.js";

package/dist/{token-transactions-B-WqFYpW.d.cts → token-transactions-D1ta-sHH.d.cts}

@@ -1,6 +1,6 @@
 import { O as OutputWithPreviousTransactionData, T as TokenTransaction } from './spark-C7OG9mGJ.cjs';
 import { TokenTransaction as TokenTransaction$1, QueryTokenTransactionsResponse } from './proto/spark_token.cjs';
-import { W as WalletConfigService, C as ConnectionManager, A as TokenOutputsMap, B as Bech32mTokenIdentifier, S as SparkAddressFormat } from './spark-wallet-Dg5IRQe2.cjs';
+import { W as WalletConfigService, C as ConnectionManager, A as TokenOutputsMap, B as Bech32mTokenIdentifier, S as SparkAddressFormat } from './spark-wallet-Dvh1BLP6.cjs';
 
 declare class SparkSDKError extends Error {
     readonly context: Record<string, unknown>;

package/dist/{token-transactions-DovxHIxV.d.ts → token-transactions-DINiKBzd.d.ts}

@@ -1,6 +1,6 @@
 import { O as OutputWithPreviousTransactionData, T as TokenTransaction } from './spark-C7OG9mGJ.js';
 import { TokenTransaction as TokenTransaction$1, QueryTokenTransactionsResponse } from './proto/spark_token.js';
-import { W as WalletConfigService, C as ConnectionManager, A as TokenOutputsMap, B as Bech32mTokenIdentifier, S as SparkAddressFormat } from './spark-wallet-DiHSU-pz.js';
+import { W as WalletConfigService, C as ConnectionManager, A as TokenOutputsMap, B as Bech32mTokenIdentifier, S as SparkAddressFormat } from './spark-wallet-D0Df_P_x.js';
 
 declare class SparkSDKError extends Error {
     readonly context: Record<string, unknown>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@buildonspark/spark-sdk",
-  "version": "0.2.12",
+  "version": "0.2.13",
   "author": "",
   "license": "Apache-2.0",
   "main": "./dist/index.js",
@@ -110,7 +110,7 @@
     "types:watch": "tsc-absolute --watch",
     "types": "tsc",
     "patch-wasm": "node ./wasm/patch-wasm.mjs",
-    "generate:proto": "PATH=\"$PATH:./node_modules/.bin\" protoc --ts_proto_out=./src/proto --ts_proto_opt=outputServices=nice-grpc,useExactTypes=false,outputServices=generic-definitions,oneof=unions,importSuffix=.js --proto_path=../../../../protos spark.proto spark_token.proto mock.proto spark_authn.proto && yarn format:fix"
+    "generate:proto": "./generate-proto.sh"
   },
   "devDependencies": {
     "@arethetypeswrong/cli": "^0.17.4",
@@ -133,7 +133,7 @@
   "dependencies": {
     "@bitcoinerlab/secp256k1": "^1.1.1",
     "@bufbuild/protobuf": "^2.2.5",
-    "@lightsparkdev/core": "^1.4.3",
+    "@lightsparkdev/core": "^1.4.4",
     "@noble/curves": "^1.8.0",
     "@noble/hashes": "^1.7.0",
     "@opentelemetry/api": "^1.9.0",

package/src/services/transfer.ts

@@ -1452,32 +1452,6 @@ export class TransferService extends BaseTransferService {
     }
   }
 
-  async cancelTransfer(
-    transfer: Transfer,
-    operatorAddress: string,
-  ): Promise<Transfer | undefined> {
-    const sparkClient =
-      await this.connectionManager.createSparkClient(operatorAddress);
-
-    try {
-      const response = await sparkClient.cancel_transfer({
-        transferId: transfer.id,
-        senderIdentityPublicKey:
-          await this.config.signer.getIdentityPublicKey(),
-      });
-
-      return response.transfer;
-    } catch (error) {
-      throw new NetworkError(
-        "Failed to cancel transfer",
-        {
-          method: "POST",
-        },
-        error as Error,
-      );
-    }
-  }
-
   async queryPendingTransfersBySender(
     operatorAddress: string,
   ): Promise<QueryTransfersResponse> {