@buildonspark/spark-sdk 0.1.34 → 0.1.36

package/dist/{chunk-SZ4JXAKG.js → chunk-MKE4KA4V.js}

@@ -1,6 +1,3 @@
-import {
-  Lrc20ConnectionManager
-} from "./chunk-B2CHXWG6.js";
 import {
   computeTaprootKeyNoScript,
   createRefundTx,
@@ -16,51 +13,28 @@ import {
   getTxFromRawTxHex,
   getTxId,
   proofOfPossessionMessageHashForDepositAddress
-} from "./chunk-64L3NWQY.js";
+} from "./chunk-E5SL7XTO.js";
 import {
   mapTransferToWalletTransfer,
   mapTreeNodeToWalletLeaf
 } from "./chunk-YQBZR7YC.js";
 import {
-  ClaimStaticDepositOutputFromJson,
   ClaimStaticDepositRequestType_default,
-  CoopExitFeeEstimatesOutputFromJson,
   CoopExitRequestFromJson,
+  CurrencyAmountFromJson,
   ExitSpeed_default,
   FRAGMENT,
-  FRAGMENT10,
-  FRAGMENT11,
-  FRAGMENT12,
   FRAGMENT2,
   FRAGMENT3,
   FRAGMENT4,
   FRAGMENT5,
-  FRAGMENT6,
-  FRAGMENT7,
-  FRAGMENT8,
-  FRAGMENT9,
-  GetChallengeOutputFromJson,
-  LeavesSwapFeeEstimateOutputFromJson,
   LeavesSwapRequestFromJson,
   LightningReceiveRequestFromJson,
-  LightningSendFeeEstimateOutputFromJson,
-  LightningSendRequestFromJson,
-  StaticDepositQuoteOutputFromJson,
-  VerifyChallengeOutputFromJson
-} from "./chunk-HWEIFSOZ.js";
-import {
-  TokenTransactionService
-} from "./chunk-C43T4EOG.js";
-import {
-  calculateAvailableTokenAmount
-} from "./chunk-57XLH3ZR.js";
-import {
-  decodeSparkAddress,
-  encodeSparkAddress
-} from "./chunk-5IXRSN47.js";
+  LightningSendRequestFromJson
+} from "./chunk-S7KD6DDL.js";
 import {
   WalletConfigService
-} from "./chunk-R6CHT54Z.js";
+} from "./chunk-IFDMKTXP.js";
 import {
   LRC_WALLET_NETWORK,
   LRC_WALLET_NETWORK_TYPE,
@@ -70,7 +44,7 @@ import {
 } from "./chunk-VJTDG4BQ.js";
 import {
   ELECTRS_CREDENTIALS
-} from "./chunk-3PRCVHIV.js";
+} from "./chunk-ZUVYYR5T.js";
 import {
   addPublicKeys,
   applyAdaptorToSignature,
@@ -78,18 +52,31 @@ import {
   generateSignatureFromExistingAdaptor,
   subtractPublicKeys
 } from "./chunk-7VMYMQLF.js";
-import {
-  getCrypto
-} from "./chunk-MGPRLH6Q.js";
 import {
   BitcoinNetwork_default
 } from "./chunk-HMLOC6TE.js";
 import {
   ConnectionManager
 } from "./chunk-EVTP3LXL.js";
+import {
+  Lrc20ConnectionManager
+} from "./chunk-B2CHXWG6.js";
 import {
   isReactNative
 } from "./chunk-HKAKEKCE.js";
+import {
+  TokenTransactionService
+} from "./chunk-7TM6XZIQ.js";
+import {
+  calculateAvailableTokenAmount
+} from "./chunk-57XLH3ZR.js";
+import {
+  decodeSparkAddress,
+  encodeSparkAddress
+} from "./chunk-5IXRSN47.js";
+import {
+  getCrypto
+} from "./chunk-MGPRLH6Q.js";
 import {
   AuthenticationError,
   ConfigurationError,
@@ -98,7 +85,8 @@ import {
   ValidationError
 } from "./chunk-TWF35O6M.js";
 import {
-  SendLeafKeyTweaks
+  SendLeafKeyTweaks,
+  networkToJSON
 } from "./chunk-PZRENZXV.js";
 import {
   Buffer
@@ -115,7 +103,7 @@ import {
 import { secp256k1 as secp256k16 } from "@noble/curves/secp256k1";
 import { validateMnemonic } from "@scure/bip39";
 import { wordlist } from "@scure/bip39/wordlists/english";
-import { Address as Address4, OutScript as OutScript4 } from "@scure/btc-signer";
+import { Address as Address4, OutScript as OutScript4, Transaction as Transaction6 } from "@scure/btc-signer";
 import { Mutex } from "async-mutex";
 import { uuidv7 as uuidv74 } from "uuidv7";
 
@@ -128,6 +116,18 @@ import {
 } from "@lightsparkdev/core";
 import { sha256 } from "@noble/hashes/sha2";
 
+// src/graphql/objects/ClaimStaticDepositOutput.ts
+var ClaimStaticDepositOutputFromJson = (obj) => {
+  return {
+    transferId: obj["claim_static_deposit_output_transfer_id"]
+  };
+};
+var FRAGMENT6 = `
+fragment ClaimStaticDepositOutputFragment on ClaimStaticDepositOutput {
+    __typename
+    claim_static_deposit_output_transfer_id: transfer_id
+}`;
+
 // src/graphql/mutations/ClaimStaticDeposit.ts
 var ClaimStaticDeposit = `
   mutation ClaimStaticDeposit(
@@ -155,7 +155,7 @@ var ClaimStaticDeposit = `
     }
   }
     
-  ${FRAGMENT}
+  ${FRAGMENT6}
 `;
 
 // src/graphql/mutations/CompleteCoopExit.ts
@@ -174,7 +174,7 @@ var CompleteCoopExit = `
     }
   }
     
-  ${FRAGMENT2}
+  ${FRAGMENT}
 `;
 
 // src/graphql/mutations/CompleteLeavesSwap.ts
@@ -191,9 +191,21 @@ var CompleteLeavesSwap = `
     }
   }
 
-  ${FRAGMENT3}
+  ${FRAGMENT2}
 `;
 
+// src/graphql/objects/GetChallengeOutput.ts
+var GetChallengeOutputFromJson = (obj) => {
+  return {
+    protectedChallenge: obj["get_challenge_output_protected_challenge"]
+  };
+};
+var FRAGMENT7 = `
+fragment GetChallengeOutputFragment on GetChallengeOutput {
+    __typename
+    get_challenge_output_protected_challenge: protected_challenge
+}`;
+
 // src/graphql/mutations/GetChallenge.ts
 var GetChallenge = `
   mutation GetChallenge(
@@ -206,7 +218,7 @@ var GetChallenge = `
     }
   }
     
-    ${FRAGMENT4}
+    ${FRAGMENT7}
 `;
 
 // src/graphql/mutations/RequestCoopExit.ts
@@ -230,7 +242,7 @@ var RequestCoopExit = `
       }
     }
   }
-  ${FRAGMENT2}
+  ${FRAGMENT}
 `;
 
 // src/graphql/mutations/RequestLightningReceive.ts
@@ -243,6 +255,7 @@ var RequestLightningReceive = `
     $memo: String
     $include_spark_address: Boolean
     $receiver_identity_pubkey: PublicKey
+    $description_hash: Hash32
   ) {
     request_lightning_receive(
       input: {
@@ -253,6 +266,7 @@ var RequestLightningReceive = `
         memo: $memo
         include_spark_address: $include_spark_address
         receiver_identity_pubkey: $receiver_identity_pubkey
+        description_hash: $description_hash
       }
     ) {
       request {
@@ -260,7 +274,7 @@ var RequestLightningReceive = `
       }
     }
   }
-  ${FRAGMENT5}
+  ${FRAGMENT3}
 `;
 
 // src/graphql/mutations/RequestLightningSend.ts
@@ -278,7 +292,7 @@ var RequestLightningSend = `
       }
     }
   }
-  ${FRAGMENT6}
+  ${FRAGMENT4}
 `;
 
 // src/graphql/mutations/RequestSwapLeaves.ts
@@ -304,9 +318,23 @@ var RequestSwapLeaves = `
       }
     }
   }
-  ${FRAGMENT3}
+  ${FRAGMENT2}
 `;
 
+// src/graphql/objects/VerifyChallengeOutput.ts
+var VerifyChallengeOutputFromJson = (obj) => {
+  return {
+    validUntil: obj["verify_challenge_output_valid_until"],
+    sessionToken: obj["verify_challenge_output_session_token"]
+  };
+};
+var FRAGMENT8 = `
+fragment VerifyChallengeOutputFragment on VerifyChallengeOutput {
+    __typename
+    verify_challenge_output_valid_until: valid_until
+    verify_challenge_output_session_token: session_token
+}`;
+
 // src/graphql/mutations/VerifyChallenge.ts
 var VerifyChallenge = `
   mutation VerifyChallenge(
@@ -325,11 +353,147 @@ var VerifyChallenge = `
     }
   }
     
-    ${FRAGMENT7}
+    ${FRAGMENT8}
 `;
 
+// src/graphql/objects/CoopExitFeeEstimate.ts
+var CoopExitFeeEstimateFromJson = (obj) => {
+  return {
+    userFee: CurrencyAmountFromJson(obj["coop_exit_fee_estimate_user_fee"]),
+    l1BroadcastFee: CurrencyAmountFromJson(obj["coop_exit_fee_estimate_l1_broadcast_fee"])
+  };
+};
+
+// src/graphql/objects/CoopExitFeeEstimatesOutput.ts
+var CoopExitFeeEstimatesOutputFromJson = (obj) => {
+  return {
+    speedFast: !!obj["coop_exit_fee_estimates_output_speed_fast"] ? CoopExitFeeEstimateFromJson(obj["coop_exit_fee_estimates_output_speed_fast"]) : void 0,
+    speedMedium: !!obj["coop_exit_fee_estimates_output_speed_medium"] ? CoopExitFeeEstimateFromJson(obj["coop_exit_fee_estimates_output_speed_medium"]) : void 0,
+    speedSlow: !!obj["coop_exit_fee_estimates_output_speed_slow"] ? CoopExitFeeEstimateFromJson(obj["coop_exit_fee_estimates_output_speed_slow"]) : void 0
+  };
+};
+var FRAGMENT9 = `
+fragment CoopExitFeeEstimatesOutputFragment on CoopExitFeeEstimatesOutput {
+    __typename
+    coop_exit_fee_estimates_output_speed_fast: speed_fast {
+        __typename
+        coop_exit_fee_estimate_user_fee: user_fee {
+            __typename
+            currency_amount_original_value: original_value
+            currency_amount_original_unit: original_unit
+            currency_amount_preferred_currency_unit: preferred_currency_unit
+            currency_amount_preferred_currency_value_rounded: preferred_currency_value_rounded
+            currency_amount_preferred_currency_value_approx: preferred_currency_value_approx
+        }
+        coop_exit_fee_estimate_l1_broadcast_fee: l1_broadcast_fee {
+            __typename
+            currency_amount_original_value: original_value
+            currency_amount_original_unit: original_unit
+            currency_amount_preferred_currency_unit: preferred_currency_unit
+            currency_amount_preferred_currency_value_rounded: preferred_currency_value_rounded
+            currency_amount_preferred_currency_value_approx: preferred_currency_value_approx
+        }
+    }
+    coop_exit_fee_estimates_output_speed_medium: speed_medium {
+        __typename
+        coop_exit_fee_estimate_user_fee: user_fee {
+            __typename
+            currency_amount_original_value: original_value
+            currency_amount_original_unit: original_unit
+            currency_amount_preferred_currency_unit: preferred_currency_unit
+            currency_amount_preferred_currency_value_rounded: preferred_currency_value_rounded
+            currency_amount_preferred_currency_value_approx: preferred_currency_value_approx
+        }
+        coop_exit_fee_estimate_l1_broadcast_fee: l1_broadcast_fee {
+            __typename
+            currency_amount_original_value: original_value
+            currency_amount_original_unit: original_unit
+            currency_amount_preferred_currency_unit: preferred_currency_unit
+            currency_amount_preferred_currency_value_rounded: preferred_currency_value_rounded
+            currency_amount_preferred_currency_value_approx: preferred_currency_value_approx
+        }
+    }
+    coop_exit_fee_estimates_output_speed_slow: speed_slow {
+        __typename
+        coop_exit_fee_estimate_user_fee: user_fee {
+            __typename
+            currency_amount_original_value: original_value
+            currency_amount_original_unit: original_unit
+            currency_amount_preferred_currency_unit: preferred_currency_unit
+            currency_amount_preferred_currency_value_rounded: preferred_currency_value_rounded
+            currency_amount_preferred_currency_value_approx: preferred_currency_value_approx
+        }
+        coop_exit_fee_estimate_l1_broadcast_fee: l1_broadcast_fee {
+            __typename
+            currency_amount_original_value: original_value
+            currency_amount_original_unit: original_unit
+            currency_amount_preferred_currency_unit: preferred_currency_unit
+            currency_amount_preferred_currency_value_rounded: preferred_currency_value_rounded
+            currency_amount_preferred_currency_value_approx: preferred_currency_value_approx
+        }
+    }
+}`;
+
+// src/graphql/objects/LeavesSwapFeeEstimateOutput.ts
+var LeavesSwapFeeEstimateOutputFromJson = (obj) => {
+  return {
+    feeEstimate: CurrencyAmountFromJson(obj["leaves_swap_fee_estimate_output_fee_estimate"])
+  };
+};
+var FRAGMENT10 = `
+fragment LeavesSwapFeeEstimateOutputFragment on LeavesSwapFeeEstimateOutput {
+    __typename
+    leaves_swap_fee_estimate_output_fee_estimate: fee_estimate {
+        __typename
+        currency_amount_original_value: original_value
+        currency_amount_original_unit: original_unit
+        currency_amount_preferred_currency_unit: preferred_currency_unit
+        currency_amount_preferred_currency_value_rounded: preferred_currency_value_rounded
+        currency_amount_preferred_currency_value_approx: preferred_currency_value_approx
+    }
+}`;
+
+// src/graphql/objects/LightningSendFeeEstimateOutput.ts
+var LightningSendFeeEstimateOutputFromJson = (obj) => {
+  return {
+    feeEstimate: CurrencyAmountFromJson(obj["lightning_send_fee_estimate_output_fee_estimate"])
+  };
+};
+var FRAGMENT11 = `
+fragment LightningSendFeeEstimateOutputFragment on LightningSendFeeEstimateOutput {
+    __typename
+    lightning_send_fee_estimate_output_fee_estimate: fee_estimate {
+        __typename
+        currency_amount_original_value: original_value
+        currency_amount_original_unit: original_unit
+        currency_amount_preferred_currency_unit: preferred_currency_unit
+        currency_amount_preferred_currency_value_rounded: preferred_currency_value_rounded
+        currency_amount_preferred_currency_value_approx: preferred_currency_value_approx
+    }
+}`;
+
+// src/graphql/objects/StaticDepositQuoteOutput.ts
+var StaticDepositQuoteOutputFromJson = (obj) => {
+  return {
+    transactionId: obj["static_deposit_quote_output_transaction_id"],
+    outputIndex: obj["static_deposit_quote_output_output_index"],
+    network: BitcoinNetwork_default[obj["static_deposit_quote_output_network"]] ?? BitcoinNetwork_default.FUTURE_VALUE,
+    creditAmountSats: obj["static_deposit_quote_output_credit_amount_sats"],
+    signature: obj["static_deposit_quote_output_signature"]
+  };
+};
+var FRAGMENT12 = `
+fragment StaticDepositQuoteOutputFragment on StaticDepositQuoteOutput {
+    __typename
+    static_deposit_quote_output_transaction_id: transaction_id
+    static_deposit_quote_output_output_index: output_index
+    static_deposit_quote_output_network: network
+    static_deposit_quote_output_credit_amount_sats: credit_amount_sats
+    static_deposit_quote_output_signature: signature
+}`;
+
 // src/graphql/queries/CoopExitFeeEstimate.ts
-var CoopExitFeeEstimate = `
+var CoopExitFeeEstimate2 = `
   query CoopExitFeeEstimate(
     $leaf_external_ids: [UUID!]!
     $withdrawal_address: String!
@@ -343,7 +507,7 @@ var CoopExitFeeEstimate = `
       ...CoopExitFeeEstimatesOutputFragment
     }
   }
-  ${FRAGMENT8}
+  ${FRAGMENT9}
 `;
 
 // src/graphql/queries/GetClaimDepositQuote.ts
@@ -363,7 +527,7 @@ var GetClaimDepositQuote = `
       ...StaticDepositQuoteOutputFragment
     }
   }
-  ${FRAGMENT11}
+  ${FRAGMENT12}
 `;
 
 // src/graphql/queries/LeavesSwapFeeEstimate.ts
@@ -379,7 +543,7 @@ var LeavesSwapFeeEstimate = `
       ...LeavesSwapFeeEstimateOutputFragment
     }
   }
-  ${FRAGMENT9}
+  ${FRAGMENT10}
 `;
 
 // src/graphql/queries/LightningSendFeeEstimate.ts
@@ -395,7 +559,7 @@ var LightningSendFeeEstimate = `
       ...LightningSendFeeEstimateOutputFragment
     }
   }
-  ${FRAGMENT10}
+  ${FRAGMENT11}
 `;
 
 // src/graphql/queries/UserRequest.ts
@@ -405,7 +569,7 @@ var UserRequest = `
       ...UserRequestFragment
     }
   }
-  ${FRAGMENT12}
+  ${FRAGMENT5}
 `;
 
 // src/graphql/client.ts
@@ -491,7 +655,7 @@ var SspClient = class {
     withdrawalAddress
   }) {
     return await this.executeRawQuery({
-      queryPayload: CoopExitFeeEstimate,
+      queryPayload: CoopExitFeeEstimate2,
       variables: {
         leaf_external_ids: leafExternalIds,
         withdrawal_address: withdrawalAddress
@@ -549,7 +713,8 @@ var SspClient = class {
     expirySecs,
     memo,
     includeSparkAddress,
-    receiverIdentityPubkey
+    receiverIdentityPubkey,
+    descriptionHash
   }) {
     return await this.executeRawQuery({
       queryPayload: RequestLightningReceive,
@@ -560,7 +725,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(
@@ -2563,7 +2729,8 @@ var LightningService = class {
     invoiceCreator,
     amountSats,
     memo,
-    receiverIdentityPubkey
+    receiverIdentityPubkey,
+    descriptionHash
   }) {
     const randBytes = crypto.getRandomValues(new Uint8Array(32));
     const preimage = numberToBytesBE2(
@@ -2575,7 +2742,8 @@ var LightningService = class {
       amountSats,
       memo,
       preimage,
-      receiverIdentityPubkey
+      receiverIdentityPubkey,
+      descriptionHash
     });
   }
   async createLightningInvoiceWithPreImage({
@@ -2583,14 +2751,16 @@ var LightningService = class {
     amountSats,
     memo,
     preimage,
-    receiverIdentityPubkey
+    receiverIdentityPubkey,
+    descriptionHash
   }) {
     const paymentHash = sha2565(preimage);
     const invoice = await invoiceCreator(
       amountSats,
       paymentHash,
       memo,
-      receiverIdentityPubkey
+      receiverIdentityPubkey,
+      descriptionHash
     );
     if (!invoice) {
       throw new ValidationError("Failed to create lightning invoice", {
@@ -4543,6 +4713,7 @@ var SparkWallet = class _SparkWallet extends EventEmitter {
       transactionId,
       outputIndex,
       network.toLowerCase(),
+      0 /* Fixed */,
       creditAmountSats,
       sspSignature
     );
@@ -4563,7 +4734,131 @@ var SparkWallet = class _SparkWallet extends 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 Transaction6();
+    tx.addInput({
+      txid: depositTransactionId,
+      index: outputIndex,
+      witnessScript: new Uint8Array()
+    });
+    const addressDecoded = Address4(getNetwork(network)).decode(
+      destinationAddress
+    );
+    const outputScript = OutScript4.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,
+      bytesToHex4(spendTxSighash)
+    );
+    const hashBuffer = sha2567(message);
+    const swapResponseUserSignature = await this.config.signer.signMessageWithIdentityKey(hashBuffer);
+    const sparkClient = await this.connectionManager.createSparkClient(
+      this.config.getCoordinatorAddress()
+    );
+    const transferId = uuidv74();
+    const swapResponse = await sparkClient.initiate_utxo_swap({
+      onChainUtxo: {
+        txid: hexToBytes7(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"));
@@ -4572,8 +4867,22 @@ var SparkWallet = class _SparkWallet extends 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);
@@ -4593,6 +4902,31 @@ var SparkWallet = class _SparkWallet extends 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 = OutScript4.decode(output.script);
+      const address = Address4(getNetwork(this.config.getNetwork())).encode(
+        parsedScript
+      );
+      if (staticDepositAddresses.has(address)) {
+        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"
@@ -4627,28 +4961,7 @@ var SparkWallet = class _SparkWallet extends 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 = OutScript4.decode(output.script);
-      const address = Address4(getNetwork(this.config.getNetwork())).encode(
-        parsedScript
-      );
-      if (staticDepositAddresses.has(address)) {
-        vout = i;
-        break;
-      }
-    }
-    if (vout === -1) {
-      throw new Error("No static deposit address found");
-    }
-    return vout;
+    return depositTx;
   }
   /**
    * Finalizes a deposit to the wallet.
@@ -5085,7 +5398,10 @@ var SparkWallet = class _SparkWallet extends 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(
                   sha2567(leaf.leaf.id)
@@ -5185,10 +5501,11 @@ var SparkWallet = class _SparkWallet extends 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({
@@ -5196,7 +5513,8 @@ var SparkWallet = class _SparkWallet extends EventEmitter {
     memo,
     expirySeconds = 60 * 60 * 24 * 30,
     includeSparkAddress = false,
-    receiverIdentityPubkey
+    receiverIdentityPubkey,
+    descriptionHash
   }) {
     const sspClient = this.getSspClient();
     if (isNaN(amountSats) || amountSats < 0) {
@@ -5234,7 +5552,17 @@ var SparkWallet = class _SparkWallet extends 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 */) {
@@ -5249,7 +5577,8 @@ var SparkWallet = class _SparkWallet extends EventEmitter {
         expirySecs: expirySeconds,
         memo: memo2,
         includeSparkAddress,
-        receiverIdentityPubkey: receiverIdentityPubkey2
+        receiverIdentityPubkey: receiverIdentityPubkey2,
+        descriptionHash: descriptionHash2
       });
       if (!invoice2) {
         throw new Error("Failed to create lightning invoice");
@@ -5288,7 +5617,8 @@ var SparkWallet = class _SparkWallet extends EventEmitter {
       amountSats,
       memo,
       invoiceCreator: requestLightningInvoice,
-      receiverIdentityPubkey
+      receiverIdentityPubkey,
+      descriptionHash
     });
     return invoice;
   }