@buildonspark/spark-sdk 0.1.34 → 0.1.36

package/dist/index.node.cjs

@@ -1440,7 +1440,7 @@ init_buffer();
 
 // src/spark-wallet/spark-wallet.ts
 init_buffer();
-var import_core13 = require("@lightsparkdev/core");
+var import_core12 = require("@lightsparkdev/core");
 var import_utils20 = require("@noble/curves/abstract/utils");
 var import_secp256k116 = require("@noble/curves/secp256k1");
 var import_bip392 = require("@scure/bip39");
@@ -2094,6 +2094,7 @@ var RequestLightningReceive = `
     $memo: String
     $include_spark_address: Boolean
     $receiver_identity_pubkey: PublicKey
+    $description_hash: Hash32
   ) {
     request_lightning_receive(
       input: {
@@ -2104,6 +2105,7 @@ var RequestLightningReceive = `
         memo: $memo
         include_spark_address: $include_spark_address
         receiver_identity_pubkey: $receiver_identity_pubkey
+        description_hash: $description_hash
       }
     ) {
       request {
@@ -2863,7 +2865,8 @@ var SspClient = class {
     expirySecs,
     memo,
     includeSparkAddress,
-    receiverIdentityPubkey
+    receiverIdentityPubkey,
+    descriptionHash
   }) {
     return await this.executeRawQuery({
       queryPayload: RequestLightningReceive,
@@ -2874,7 +2877,8 @@ var SspClient = class {
         expiry_secs: expirySecs,
         memo,
         include_spark_address: includeSparkAddress,
-        receiver_identity_pubkey: receiverIdentityPubkey
+        receiver_identity_pubkey: receiverIdentityPubkey,
+        description_hash: descriptionHash
       },
       constructObject: (response) => {
         return LightningReceiveRequestFromJson(
@@ -3140,37 +3144,6 @@ init_buffer();
 init_buffer();
 var import_core7 = require("@lightsparkdev/core");
 
-// src/graphql/objects/ClaimStaticDepositInput.ts
-init_buffer();
-
-// src/graphql/objects/CompleteCoopExitInput.ts
-init_buffer();
-
-// src/graphql/objects/CompleteCoopExitOutput.ts
-init_buffer();
-
-// src/graphql/objects/CompleteLeavesSwapInput.ts
-init_buffer();
-
-// src/graphql/objects/CompleteLeavesSwapOutput.ts
-init_buffer();
-
-// src/graphql/objects/CompleteSeedReleaseInput.ts
-init_buffer();
-
-// src/graphql/objects/CompleteSeedReleaseOutput.ts
-init_buffer();
-
-// src/graphql/objects/Connection.ts
-init_buffer();
-var import_core8 = require("@lightsparkdev/core");
-
-// src/graphql/objects/CoopExitFeeEstimatesInput.ts
-init_buffer();
-
-// src/graphql/objects/Entity.ts
-init_buffer();
-
 // src/graphql/objects/ExitSpeed.ts
 init_buffer();
 var ExitSpeed = /* @__PURE__ */ ((ExitSpeed2) => {
@@ -3182,48 +3155,6 @@ var ExitSpeed = /* @__PURE__ */ ((ExitSpeed2) => {
 })(ExitSpeed || {});
 var ExitSpeed_default = ExitSpeed;
 
-// src/graphql/objects/GetChallengeInput.ts
-init_buffer();
-
-// src/graphql/objects/LeavesSwapFeeEstimateInput.ts
-init_buffer();
-
-// src/graphql/objects/LightningSendFeeEstimateInput.ts
-init_buffer();
-
-// src/graphql/objects/NotifyReceiverTransferInput.ts
-init_buffer();
-
-// src/graphql/objects/Provider.ts
-init_buffer();
-
-// src/graphql/objects/RequestCoopExitInput.ts
-init_buffer();
-
-// src/graphql/objects/RequestCoopExitOutput.ts
-init_buffer();
-
-// src/graphql/objects/RequestLeavesSwapInput.ts
-init_buffer();
-
-// src/graphql/objects/UserLeafInput.ts
-init_buffer();
-
-// src/graphql/objects/RequestLeavesSwapOutput.ts
-init_buffer();
-
-// src/graphql/objects/RequestLightningReceiveInput.ts
-init_buffer();
-
-// src/graphql/objects/RequestLightningReceiveOutput.ts
-init_buffer();
-
-// src/graphql/objects/RequestLightningSendInput.ts
-init_buffer();
-
-// src/graphql/objects/RequestLightningSendOutput.ts
-init_buffer();
-
 // src/graphql/objects/SparkUserRequestStatus.ts
 init_buffer();
 
@@ -3232,26 +3163,11 @@ init_buffer();
 
 // src/graphql/objects/SparkWalletUser.ts
 init_buffer();
-var import_core9 = require("@lightsparkdev/core");
+var import_core8 = require("@lightsparkdev/core");
 
 // src/graphql/objects/SparkWalletUserToUserRequestsConnection.ts
 init_buffer();
 
-// src/graphql/objects/StartSeedReleaseInput.ts
-init_buffer();
-
-// src/graphql/objects/StaticDepositQuoteInput.ts
-init_buffer();
-
-// src/graphql/objects/VerifyChallengeInput.ts
-init_buffer();
-
-// src/graphql/objects/WalletUserIdentityPublicKeyInput.ts
-init_buffer();
-
-// src/graphql/objects/WalletUserIdentityPublicKeyOutput.ts
-init_buffer();
-
 // src/proto/spark.ts
 init_buffer();
 var import_wire4 = require("@bufbuild/protobuf/wire");
@@ -16364,7 +16280,6 @@ init_buffer();
 init_buffer();
 var import_utils4 = require("@noble/curves/abstract/utils");
 var import_secp256k15 = require("@noble/curves/secp256k1");
-var import_sha22 = require("@noble/hashes/sha2");
 var import_bip32 = require("@scure/bip32");
 var import_bip39 = require("@scure/bip39");
 var import_english = require("@scure/bip39/wordlists/english");
@@ -16898,7 +16813,7 @@ function decodeBytesToSigningCommitment(bytes2) {
 var import_lrc20_sdk = require("@buildonspark/lrc20-sdk");
 var import_lrc20_sdk2 = require("@buildonspark/lrc20-sdk");
 var import_secp256k16 = require("@bitcoinerlab/secp256k1");
-var bitcoin = __toESM(require("bitcoinjs-lib"), 1);
+var import_sha22 = require("@noble/hashes/sha2");
 var import_lrc20_sdk3 = require("@buildonspark/lrc20-sdk");
 var sparkFrostModule = void 0;
 var getSparkFrostModule = async () => {
@@ -17064,6 +16979,10 @@ var DefaultSparkSigner = class {
       HARDENED_OFFSET + idx
     );
     this.staticDepositKeyMap.set(idx, staticDepositKey);
+    this.publicKeyToPrivateKeyMap.set(
+      (0, import_utils4.bytesToHex)(staticDepositKey.publicKey),
+      (0, import_utils4.bytesToHex)(staticDepositKey.privateKey)
+    );
     return staticDepositKey.publicKey;
   }
   async getStaticDepositSigningKey(idx) {
@@ -17361,15 +17280,11 @@ var DefaultSparkSigner = class {
     }
     if (receipt) {
       const receiptPrivateKey = this.getReceiptPrivateKey(receipt);
-      const tweakedKeyPair = import_lrc20_sdk3.ECPair.fromPrivateKey(
-        import_buffer.Buffer.from(receiptPrivateKey)
-      );
+      const tweakedKeyPair = (0, import_lrc20_sdk3.fromPrivateKey)(import_buffer.Buffer.from(receiptPrivateKey));
       psbt.signInput(input, tweakedKeyPair, sighashTypes);
       return psbt;
     }
-    const keypair = import_lrc20_sdk3.ECPair.fromPrivateKey(
-      import_buffer.Buffer.from(this.identityKey.privateKey)
-    );
+    const keypair = (0, import_lrc20_sdk3.fromPrivateKey)(import_buffer.Buffer.from(this.identityKey.privateKey));
     psbt.signInput(input, keypair, sighashTypes);
     return psbt;
   }
@@ -17381,7 +17296,7 @@ var DefaultSparkSigner = class {
       innerKey = import_buffer.Buffer.concat([import_lrc20_sdk.PARITY, innerKey.slice(1)]);
       privateKey = import_buffer.Buffer.from((0, import_secp256k16.privateNegate)(privateKey));
     }
-    const pxhPubkey = bitcoin.crypto.sha256(import_buffer.Buffer.concat([pxh, innerKey]));
+    const pxhPubkey = (0, import_sha22.sha256)(import_buffer.Buffer.concat([pxh, innerKey]));
     const receiptProof = (0, import_secp256k16.privateAdd)(privateKey, pxhPubkey);
     return import_buffer.Buffer.from(receiptProof);
   }
@@ -17391,7 +17306,7 @@ var DefaultSparkSigner = class {
 init_buffer();
 var import_lrc20_sdk4 = require("@buildonspark/lrc20-sdk");
 var btc = __toESM(require("@scure/btc-signer"), 1);
-var bitcoin2 = __toESM(require("bitcoinjs-lib"), 1);
+var bitcoin = __toESM(require("bitcoinjs-lib"), 1);
 var Network2 = /* @__PURE__ */ ((Network5) => {
   Network5[Network5["MAINNET"] = 0] = "MAINNET";
   Network5[Network5["TESTNET"] = 1] = "TESTNET";
@@ -17416,11 +17331,11 @@ var NetworkConfig = {
 };
 var getNetwork = (network) => NetworkConfig[network];
 var LRC_WALLET_NETWORK = Object.freeze({
-  [0 /* MAINNET */]: bitcoin2.networks.bitcoin,
-  [1 /* TESTNET */]: bitcoin2.networks.testnet,
-  [2 /* SIGNET */]: bitcoin2.networks.testnet,
-  [3 /* REGTEST */]: bitcoin2.networks.regtest,
-  [4 /* LOCAL */]: bitcoin2.networks.regtest
+  [0 /* MAINNET */]: bitcoin.networks.bitcoin,
+  [1 /* TESTNET */]: bitcoin.networks.testnet,
+  [2 /* SIGNET */]: bitcoin.networks.testnet,
+  [3 /* REGTEST */]: bitcoin.networks.regtest,
+  [4 /* LOCAL */]: bitcoin.networks.regtest
 });
 var LRC_WALLET_NETWORK_TYPE = Object.freeze({
   [0 /* MAINNET */]: import_lrc20_sdk4.NetworkType.MAINNET,
@@ -17431,7 +17346,7 @@ var LRC_WALLET_NETWORK_TYPE = Object.freeze({
 });
 function getNetworkFromAddress(address2) {
   try {
-    const decoded = bitcoin2.address.fromBech32(address2);
+    const decoded = bitcoin.address.fromBech32(address2);
     if (decoded.prefix === "bc") {
       return "MAINNET" /* MAINNET */;
     } else if (decoded.prefix === "bcrt") {
@@ -17456,10 +17371,10 @@ init_buffer();
 
 // src/tests/isHermeticTest.ts
 init_buffer();
-var import_core10 = require("@lightsparkdev/core");
+var import_core9 = require("@lightsparkdev/core");
 var import_fs = __toESM(require("fs"), 1);
 function isHermeticTest() {
-  if (import_core10.isNode) {
+  if (import_core9.isNode) {
     return (import_fs.default?.existsSync?.("/tmp/spark_hermetic") ?? false) || process.env.HERMETIC_TEST === "true";
   }
   return typeof process !== "undefined" && process.env?.HERMETIC_TEST === "true" || false;
@@ -17585,7 +17500,7 @@ var BASE_CONFIG = {
   frostSignerAddress: getLocalFrostSignerAddress(),
   threshold: 2,
   signingOperators: getLocalSigningOperators(),
-  useTokenTransactionSchnorrSignatures: true,
+  tokenSignatures: "SCHNORR",
   electrsUrl: getElectrsUrl("LOCAL"),
   expectedWithdrawBondSats: 1e4,
   expectedWithdrawRelativeBlockLocktime: 1e3,
@@ -17610,7 +17525,7 @@ var LOCAL_WALLET_CONFIG_SCHNORR = {
 };
 var LOCAL_WALLET_CONFIG_ECDSA = {
   ...LOCAL_WALLET_CONFIG,
-  useTokenTransactionSchnorrSignatures: false,
+  tokenSignatures: "ECDSA",
   threshold: 3
   // 3 for issuance tests.
 };
@@ -17790,8 +17705,8 @@ var WalletConfigService = class {
   getNetworkProto() {
     return NetworkToProto[Network2[this.config.network]];
   }
-  shouldSignTokenTransactionsWithSchnorr() {
-    return this.config.useTokenTransactionSchnorrSignatures;
+  getTokenSignatures() {
+    return this.config.tokenSignatures;
   }
   getElectrsUrl() {
     return this.config.electrsUrl;
@@ -17803,7 +17718,7 @@ var WalletConfigService = class {
 
 // src/services/connection.ts
 init_buffer();
-var import_core11 = require("@lightsparkdev/core");
+var import_core10 = require("@lightsparkdev/core");
 var import_sha23 = require("@noble/hashes/sha2");
 var import_nice_grpc_client_middleware_retry = require("nice-grpc-client-middleware-retry");
 var import_nice_grpc_common2 = require("nice-grpc-common");
@@ -18600,7 +18515,7 @@ var ConnectionManager = class {
   async createMockClient(address2) {
     const channel = await this.createChannelWithTLS(address2);
     const isNodeChannel = "close" in channel;
-    if (import_core11.isNode && isNodeChannel && !isBun) {
+    if (import_core10.isNode && isNodeChannel && !isBun) {
       const grpcModule = await import("nice-grpc");
       const { createClient } = "default" in grpcModule ? grpcModule.default : grpcModule;
       const client = createClient(MockServiceDefinition, channel);
@@ -18617,7 +18532,7 @@ var ConnectionManager = class {
   }
   async createChannelWithTLS(address2, certPath) {
     try {
-      if (import_core11.isNode && !isBun) {
+      if (import_core10.isNode && !isBun) {
         const grpcModule = await import("nice-grpc");
         const { ChannelCredentials, createChannel } = "default" in grpcModule ? grpcModule.default : grpcModule;
         if (certPath) {
@@ -18749,7 +18664,7 @@ var ConnectionManager = class {
     );
   }
   createMiddleware(address2, authToken) {
-    if (import_core11.isNode) {
+    if (import_core10.isNode) {
       return this.createNodeMiddleware(address2, authToken);
     } else {
       return this.createBrowserMiddleware(address2, authToken);
@@ -18809,7 +18724,7 @@ var ConnectionManager = class {
     };
     let options = {};
     const isNodeChannel = "close" in channel;
-    if (import_core11.isNode && isNodeChannel && !isBun) {
+    if (import_core10.isNode && isNodeChannel && !isBun) {
       const grpcModule = await import("nice-grpc");
       const { openTelemetryClientMiddleware } = await import("nice-grpc-opentelemetry");
       const { createClientFactory } = "default" in grpcModule ? grpcModule.default : grpcModule;
@@ -20820,7 +20735,7 @@ function verifySignature(words, prefix) {
 }
 
 // src/services/lightning.ts
-var crypto3 = getCrypto();
+var crypto2 = getCrypto();
 var LightningService = class {
   config;
   connectionManager;
@@ -20834,9 +20749,10 @@ var LightningService = class {
     invoiceCreator,
     amountSats,
     memo,
-    receiverIdentityPubkey
+    receiverIdentityPubkey,
+    descriptionHash
   }) {
-    const randBytes = crypto3.getRandomValues(new Uint8Array(32));
+    const randBytes = crypto2.getRandomValues(new Uint8Array(32));
     const preimage = (0, import_utils10.numberToBytesBE)(
       (0, import_utils10.bytesToNumberBE)(randBytes) % import_secp256k111.secp256k1.CURVE.n,
       32
@@ -20846,7 +20762,8 @@ var LightningService = class {
       amountSats,
       memo,
       preimage,
-      receiverIdentityPubkey
+      receiverIdentityPubkey,
+      descriptionHash
     });
   }
   async createLightningInvoiceWithPreImage({
@@ -20854,14 +20771,16 @@ var LightningService = class {
     amountSats,
     memo,
     preimage,
-    receiverIdentityPubkey
+    receiverIdentityPubkey,
+    descriptionHash
   }) {
     const paymentHash = (0, import_sha210.sha256)(preimage);
     const invoice = await invoiceCreator(
       amountSats,
       paymentHash,
       memo,
-      receiverIdentityPubkey
+      receiverIdentityPubkey,
+      descriptionHash
     );
     if (!invoice) {
       throw new ValidationError("Failed to create lightning invoice", {
@@ -21065,7 +20984,7 @@ var LightningService = class {
 
 // src/services/lrc-connection.ts
 init_buffer();
-var import_core12 = require("@lightsparkdev/core");
+var import_core11 = require("@lightsparkdev/core");
 var import_nice_grpc_client_middleware_retry2 = require("nice-grpc-client-middleware-retry");
 var import_nice_grpc_common3 = require("nice-grpc-common");
 
@@ -24138,7 +24057,7 @@ var Lrc20ConnectionManager = class {
   }
   async createChannelWithTLS(address2, certPath) {
     try {
-      if (import_core12.isNode && !isBun) {
+      if (import_core11.isNode && !isBun) {
         const grpcModule = await import("nice-grpc");
         const { ChannelCredentials, createChannel } = "default" in grpcModule ? grpcModule.default : grpcModule;
         if (certPath) {
@@ -24205,7 +24124,7 @@ var Lrc20ConnectionManager = class {
     return client;
   }
   createMiddleware() {
-    if (import_core12.isNode) {
+    if (import_core11.isNode) {
       return this.createNodeMiddleware();
     } else {
       return this.createBrowserMiddleware();
@@ -24235,7 +24154,7 @@ var Lrc20ConnectionManager = class {
     };
     let options = {};
     const isNodeChannel = "close" in channel;
-    if (import_core12.isNode && isNodeChannel && !isBun) {
+    if (import_core11.isNode && isNodeChannel && !isBun) {
       const grpcModule = await import("nice-grpc");
       const { openTelemetryClientMiddleware } = await import("nice-grpc-opentelemetry");
       const { createClientFactory } = "default" in grpcModule ? grpcModule.default : grpcModule;
@@ -25355,7 +25274,7 @@ var TokenTransactionService = class {
             const transferInput = finalTokenTransaction.tokenInputs.transferInput;
             for (let i = 0; i < transferInput.outputsToSpend.length; i++) {
               let ownerSignature;
-              if (this.config.shouldSignTokenTransactionsWithSchnorr()) {
+              if (this.config.getTokenSignatures() === "SCHNORR") {
                 ownerSignature = await this.config.signer.signSchnorrWithIdentityKey(
                   payloadHash
                 );
@@ -25544,15 +25463,15 @@ var TokenTransactionService = class {
   }
   // Helper function for deciding if the signer public key is the identity public key
   async signMessageWithKey(message, publicKey) {
-    const signWithSchnorr = this.config.shouldSignTokenTransactionsWithSchnorr();
+    const tokenSignatures = this.config.getTokenSignatures();
     if ((0, import_utils13.bytesToHex)(publicKey) === (0, import_utils13.bytesToHex)(await this.config.signer.getIdentityPublicKey())) {
-      if (signWithSchnorr) {
+      if (tokenSignatures === "SCHNORR") {
         return await this.config.signer.signSchnorrWithIdentityKey(message);
       } else {
         return await this.config.signer.signMessageWithIdentityKey(message);
       }
     } else {
-      if (signWithSchnorr) {
+      if (tokenSignatures === "SCHNORR") {
         return await this.config.signer.signSchnorr(message, publicKey);
       } else {
         return await this.config.signer.signMessageWithPublicKey(
@@ -26626,7 +26545,7 @@ var SparkWallet = class _SparkWallet extends import_eventemitter3.EventEmitter {
             setTimeout(maybeUnref, 100);
           }
         };
-        if (import_core13.isNode) {
+        if (import_core12.isNode) {
           maybeUnref();
         }
         const claimedTransfersIds = await this.claimTransfers();
@@ -27364,6 +27283,7 @@ var SparkWallet = class _SparkWallet extends import_eventemitter3.EventEmitter {
       transactionId,
       outputIndex,
       network.toLowerCase(),
+      0 /* Fixed */,
       creditAmountSats,
       sspSignature
     );
@@ -27384,7 +27304,131 @@ var SparkWallet = class _SparkWallet extends import_eventemitter3.EventEmitter {
     }
     return response;
   }
-  async getStaticDepositSigningPayload(transactionID, outputIndex, network, creditAmountSats, sspSignature) {
+  /**
+   * Refunds a static deposit to a destination address.
+   *
+   * @param {string} depositTransactionId - The ID of the transaction
+   * @param {number} [outputIndex] - The index of the output
+   * @param {string} destinationAddress - The destination address
+   * @param {number} fee - The fee to refund
+   * @returns {Promise<string>} The hex of the refund transaction
+   */
+  async refundStaticDeposit({
+    depositTransactionId,
+    outputIndex,
+    destinationAddress,
+    fee
+  }) {
+    if (fee <= 300) {
+      throw new ValidationError("Fee must be greater than 300", {
+        field: "fee",
+        value: fee
+      });
+    }
+    let network = this.config.getNetwork();
+    let networkType = this.config.getNetworkProto();
+    const networkJSON = networkToJSON(networkType);
+    const depositTx = await this.getDepositTransaction(depositTransactionId);
+    if (outputIndex === void 0) {
+      outputIndex = await this.getDepositTransactionVout(depositTransactionId);
+    }
+    const totalAmount = depositTx.getOutput(outputIndex).amount;
+    const creditAmountSats = Number(totalAmount) - fee;
+    if (creditAmountSats <= 0) {
+      throw new ValidationError(
+        "Fee too large. Credit amount must be greater than 0",
+        {
+          field: "creditAmountSats",
+          value: creditAmountSats
+        }
+      );
+    }
+    const tx = new import_btc_signer7.Transaction();
+    tx.addInput({
+      txid: depositTransactionId,
+      index: outputIndex,
+      witnessScript: new Uint8Array()
+    });
+    const addressDecoded = (0, import_btc_signer7.Address)(getNetwork(network)).decode(
+      destinationAddress
+    );
+    const outputScript = import_btc_signer7.OutScript.encode(addressDecoded);
+    tx.addOutput({
+      script: outputScript,
+      amount: BigInt(creditAmountSats)
+    });
+    const spendTxSighash = getSigHashFromTx(
+      tx,
+      0,
+      depositTx.getOutput(outputIndex)
+    );
+    const signingNonceCommitment = await this.config.signer.getRandomSigningCommitment();
+    const signingJob = {
+      rawTx: tx.toBytes(),
+      signingPublicKey: await this.config.signer.getStaticDepositSigningKey(0),
+      signingNonceCommitment
+    };
+    const message = await this.getStaticDepositSigningPayload(
+      depositTransactionId,
+      outputIndex,
+      networkJSON.toLowerCase(),
+      2 /* Refund */,
+      creditAmountSats,
+      (0, import_utils20.bytesToHex)(spendTxSighash)
+    );
+    const hashBuffer = (0, import_sha213.sha256)(message);
+    const swapResponseUserSignature = await this.config.signer.signMessageWithIdentityKey(hashBuffer);
+    const sparkClient = await this.connectionManager.createSparkClient(
+      this.config.getCoordinatorAddress()
+    );
+    const transferId = (0, import_uuidv74.uuidv7)();
+    const swapResponse = await sparkClient.initiate_utxo_swap({
+      onChainUtxo: {
+        txid: (0, import_utils20.hexToBytes)(depositTransactionId),
+        vout: outputIndex,
+        network: networkType
+      },
+      requestType: 2 /* Refund */,
+      amount: {
+        creditAmountSats: 0,
+        $case: "creditAmountSats"
+      },
+      userSignature: swapResponseUserSignature,
+      sspSignature: new Uint8Array(),
+      transfer: {
+        transferId,
+        ownerIdentityPublicKey: await this.config.signer.getIdentityPublicKey(),
+        receiverIdentityPublicKey: await this.config.signer.getIdentityPublicKey()
+      },
+      spendTxSigningJob: signingJob
+    });
+    if (!swapResponse) {
+      throw new Error("Failed to initiate utxo swap");
+    }
+    const userSignature = await this.config.signer.signFrost({
+      message: spendTxSighash,
+      publicKey: swapResponse.depositAddress.verifyingPublicKey,
+      privateAsPubKey: await this.config.signer.getStaticDepositSigningKey(0),
+      selfCommitment: signingNonceCommitment,
+      statechainCommitments: swapResponse.spendTxSigningResult.signingNonceCommitments,
+      verifyingKey: swapResponse.depositAddress.verifyingPublicKey
+    });
+    const signatureResult = await this.config.signer.aggregateFrost({
+      message: spendTxSighash,
+      statechainSignatures: swapResponse.spendTxSigningResult.signatureShares,
+      statechainPublicKeys: swapResponse.spendTxSigningResult.publicKeys,
+      verifyingKey: swapResponse.depositAddress.verifyingPublicKey,
+      statechainCommitments: swapResponse.spendTxSigningResult.signingNonceCommitments,
+      selfCommitment: signingNonceCommitment,
+      publicKey: await this.config.signer.getStaticDepositSigningKey(0),
+      selfSignature: userSignature
+    });
+    tx.updateInput(0, {
+      finalScriptWitness: [signatureResult]
+    });
+    return tx.hex;
+  }
+  async getStaticDepositSigningPayload(transactionID, outputIndex, network, requestType, creditAmountSats, sspSignature) {
     const encoder = new TextEncoder();
     const parts = [];
     parts.push(encoder.encode("claim_static_deposit"));
@@ -27393,8 +27437,22 @@ var SparkWallet = class _SparkWallet extends import_eventemitter3.EventEmitter {
     const outputIndexBuffer = new ArrayBuffer(4);
     new DataView(outputIndexBuffer).setUint32(0, outputIndex, true);
     parts.push(new Uint8Array(outputIndexBuffer));
+    let requestTypeInt;
+    switch (requestType) {
+      case 0 /* Fixed */:
+        requestTypeInt = 0;
+        break;
+      case 1 /* MaxFee */:
+        requestTypeInt = 1;
+        break;
+      case 2 /* Refund */:
+        requestTypeInt = 2;
+        break;
+      default:
+        requestTypeInt = 0;
+    }
     const requestTypeBuffer = new ArrayBuffer(1);
-    new DataView(requestTypeBuffer).setUint8(0, 0);
+    new DataView(requestTypeBuffer).setUint8(0, requestTypeInt);
     parts.push(new Uint8Array(requestTypeBuffer));
     const creditAmountBuffer = new ArrayBuffer(8);
     const creditAmountView = new DataView(creditAmountBuffer);
@@ -27414,6 +27472,31 @@ var SparkWallet = class _SparkWallet extends import_eventemitter3.EventEmitter {
     return payload;
   }
   async getDepositTransactionVout(txid) {
+    const depositTx = await this.getDepositTransaction(txid);
+    const staticDepositAddresses = new Set(
+      await this.queryStaticDepositAddresses()
+    );
+    let vout = -1;
+    for (let i = 0; i < depositTx.outputsLength; i++) {
+      const output = depositTx.getOutput(i);
+      if (!output) {
+        continue;
+      }
+      const parsedScript = import_btc_signer7.OutScript.decode(output.script);
+      const address2 = (0, import_btc_signer7.Address)(getNetwork(this.config.getNetwork())).encode(
+        parsedScript
+      );
+      if (staticDepositAddresses.has(address2)) {
+        vout = i;
+        break;
+      }
+    }
+    if (vout === -1) {
+      throw new Error("No static deposit address found");
+    }
+    return vout;
+  }
+  async getDepositTransaction(txid) {
     if (!txid) {
       throw new ValidationError("Transaction ID cannot be empty", {
         field: "txid"
@@ -27448,28 +27531,7 @@ var SparkWallet = class _SparkWallet extends import_eventemitter3.EventEmitter {
       });
     }
     const depositTx = getTxFromRawTxHex(txHex);
-    const staticDepositAddresses = new Set(
-      await this.queryStaticDepositAddresses()
-    );
-    let vout = -1;
-    for (let i = 0; i < depositTx.outputsLength; i++) {
-      const output = depositTx.getOutput(i);
-      if (!output) {
-        continue;
-      }
-      const parsedScript = import_btc_signer7.OutScript.decode(output.script);
-      const address2 = (0, import_btc_signer7.Address)(getNetwork(this.config.getNetwork())).encode(
-        parsedScript
-      );
-      if (staticDepositAddresses.has(address2)) {
-        vout = i;
-        break;
-      }
-    }
-    if (vout === -1) {
-      throw new Error("No static deposit address found");
-    }
-    return vout;
+    return depositTx;
   }
   /**
    * Finalizes a deposit to the wallet.
@@ -27906,7 +27968,10 @@ var SparkWallet = class _SparkWallet extends import_eventemitter3.EventEmitter {
             const leafPubKey = leafPubKeyMap.get(leaf.leaf.id);
             if (leafPubKey) {
               leavesToClaim.push({
-                leaf: leaf.leaf,
+                leaf: {
+                  ...leaf.leaf,
+                  refundTx: leaf.intermediateRefundTx
+                },
                 signingPubKey: leafPubKey,
                 newSigningPubKey: await this.config.signer.generatePublicKey(
                   (0, import_sha213.sha256)(leaf.leaf.id)
@@ -28006,10 +28071,11 @@ var SparkWallet = class _SparkWallet extends import_eventemitter3.EventEmitter {
    *
    * @param {Object} params - Parameters for the lightning invoice
    * @param {number} params.amountSats - Amount in satoshis
-   * @param {string} params.memo - Description for the invoice
+   * @param {string} [params.memo] - Description for the invoice. Should not be provided if the descriptionHash is provided.
    * @param {number} [params.expirySeconds] - Optional expiry time in seconds
    * @param {boolean} [params.includeSparkAddress] - Optional boolean signalling whether or not to include the spark address in the invoice
    * @param {string} [params.receiverIdentityPubkey] - Optional public key of the wallet receiving the lightning invoice. If not present, the receiver will be the creator of this request.
+   * @param {string} [params.descriptionHash] - Optional h tag of the invoice. This is the hash of a longer description to include in the lightning invoice. It is used in LNURL and UMA as the hash of the metadata. This field is mutually exclusive with the memo field. Only one or the other should be provided.
    * @returns {Promise<LightningReceiveRequest>} BOLT11 encoded invoice
    */
   async createLightningInvoice({
@@ -28017,7 +28083,8 @@ var SparkWallet = class _SparkWallet extends import_eventemitter3.EventEmitter {
     memo,
     expirySeconds = 60 * 60 * 24 * 30,
     includeSparkAddress = false,
-    receiverIdentityPubkey
+    receiverIdentityPubkey,
+    descriptionHash
   }) {
     const sspClient = this.getSspClient();
     if (isNaN(amountSats) || amountSats < 0) {
@@ -28055,7 +28122,17 @@ var SparkWallet = class _SparkWallet extends import_eventemitter3.EventEmitter {
         expected: "Memo size within limits"
       });
     }
-    const requestLightningInvoice = async (amountSats2, paymentHash, memo2, receiverIdentityPubkey2) => {
+    if (memo && descriptionHash) {
+      throw new ValidationError(
+        "Memo and descriptionHash cannot be provided together. Please provide only one.",
+        {
+          field: "memo",
+          value: memo,
+          expected: "Memo or descriptionHash"
+        }
+      );
+    }
+    const requestLightningInvoice = async (amountSats2, paymentHash, memo2, receiverIdentityPubkey2, descriptionHash2) => {
       const network = this.config.getNetwork();
       let bitcoinNetwork = BitcoinNetwork_default.REGTEST;
       if (network === 0 /* MAINNET */) {
@@ -28070,7 +28147,8 @@ var SparkWallet = class _SparkWallet extends import_eventemitter3.EventEmitter {
         expirySecs: expirySeconds,
         memo: memo2,
         includeSparkAddress,
-        receiverIdentityPubkey: receiverIdentityPubkey2
+        receiverIdentityPubkey: receiverIdentityPubkey2,
+        descriptionHash: descriptionHash2
       });
       if (!invoice2) {
         throw new Error("Failed to create lightning invoice");
@@ -28109,7 +28187,8 @@ var SparkWallet = class _SparkWallet extends import_eventemitter3.EventEmitter {
       amountSats,
       memo,
       invoiceCreator: requestLightningInvoice,
-      receiverIdentityPubkey
+      receiverIdentityPubkey,
+      descriptionHash
     });
     return invoice;
   }
@@ -28243,7 +28322,7 @@ var SparkWallet = class _SparkWallet extends import_eventemitter3.EventEmitter {
     if (!feeEstimate) {
       throw new Error("Failed to get lightning send fee estimate");
     }
-    const satsFeeEstimate = (0, import_core13.mapCurrencyAmount)(feeEstimate.feeEstimate);
+    const satsFeeEstimate = (0, import_core12.mapCurrencyAmount)(feeEstimate.feeEstimate);
     return Math.ceil(satsFeeEstimate.sats);
   }
   // ***** Tree Creation Flow *****