@buildonspark/spark-sdk 0.2.11 → 0.2.12

package/dist/{chunk-QNYJGFPD.js → chunk-OEK3R57K.js}

@@ -4,11 +4,11 @@ import {
 } from "./chunk-NX5KPN5F.js";
 import {
   SparkTokenServiceDefinition
-} from "./chunk-6CMNEDBK.js";
+} from "./chunk-XXTWWW6L.js";
 import {
   mapTransferToWalletTransfer,
   mapTreeNodeToWalletLeaf
-} from "./chunk-76SYPHOC.js";
+} from "./chunk-TB7DG5CU.js";
 import {
   Empty,
   SatsPayment,
@@ -19,7 +19,7 @@ import {
   TokensPayment,
   TreeNode,
   networkToJSON
-} from "./chunk-A5M55UR3.js";
+} from "./chunk-5VWGOHED.js";
 import {
   BitcoinNetwork_default,
   ClaimStaticDepositFromJson,
@@ -152,8 +152,8 @@ var NotImplementedError = class extends SparkSDKError {
 };
 
 // src/utils/keys.ts
-import { numberToBytesBE } from "@noble/curves/abstract/utils";
 import { secp256k1 } from "@noble/curves/secp256k1";
+import { numberToBytesBE } from "@noble/curves/utils";
 function addPublicKeys(a, b) {
   if (a.length !== 33 || b.length !== 33) {
     throw new ValidationError("Public keys must be 33 bytes", {
@@ -264,8 +264,8 @@ var setCrypto = (cryptoImplParam) => {
 };
 
 // src/utils/secret-sharing.ts
-import { bytesToHex as bytesToHex2, equalBytes } from "@noble/curves/abstract/utils";
 import { secp256k1 as secp256k12 } from "@noble/curves/secp256k1";
+import { bytesToHex as bytesToHex2, equalBytes } from "@noble/curves/utils";
 function getRandomBigInt(max) {
   const byteLength = max.toString(2).length + 7 >> 3;
   const maxBigInt = max;
@@ -561,13 +561,13 @@ var KeyDerivationType = /* @__PURE__ */ ((KeyDerivationType2) => {
 
 // src/signer/signer.ts
 import { privateNegate } from "@bitcoinerlab/secp256k1";
+import { schnorr, secp256k1 as secp256k14 } from "@noble/curves/secp256k1";
 import {
   bytesToHex as bytesToHex3,
   bytesToNumberBE,
   equalBytes as equalBytes2,
   hexToBytes
-} from "@noble/curves/abstract/utils";
-import { schnorr, secp256k1 as secp256k14 } from "@noble/curves/secp256k1";
+} from "@noble/curves/utils";
 import { sha256 } from "@noble/hashes/sha2";
 import { HDKey } from "@scure/bip32";
 import { generateMnemonic, mnemonicToSeed } from "@scure/bip39";
@@ -579,7 +579,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.11" : "unknown";
+var packageVersion = true ? "0.2.12" : "unknown";
 var baseEnvStr = "unknown";
 if (isBun) {
   const bunVersion = "version" in globalThis.Bun ? globalThis.Bun.version : "unknown-version";
@@ -2808,12 +2808,8 @@ var ConnectionManager = class {
 };
 
 // src/utils/bitcoin.ts
-import {
-  bytesToHex as bytesToHex4,
-  bytesToNumberBE as bytesToNumberBE2,
-  hexToBytes as hexToBytes2
-} from "@noble/curves/abstract/utils";
 import { schnorr as schnorr2, secp256k1 as secp256k15 } from "@noble/curves/secp256k1";
+import { bytesToHex as bytesToHex4, bytesToNumberBE as bytesToNumberBE2, hexToBytes as hexToBytes2 } from "@noble/curves/utils";
 import { sha256 as sha2563 } from "@noble/hashes/sha2";
 import * as btc2 from "@scure/btc-signer";
 function computeTaprootKeyNoScript(pubkey) {
@@ -3299,7 +3295,7 @@ function getEphemeralAnchorOutput() {
 }
 
 // src/utils/transfer_package.ts
-import { hexToBytes as hexToBytes3 } from "@noble/curves/abstract/utils";
+import { hexToBytes as hexToBytes3 } from "@noble/curves/utils";
 import { sha256 as sha2564 } from "@noble/hashes/sha2";
 function getTransferPackageSigningPayload(transferID, transferPackage) {
   const encryptedPayload = transferPackage.keyTweakPackage;
@@ -3350,7 +3346,8 @@ var DepositService = class {
   }
   async validateDepositAddress({
     address: address2,
-    userPubkey
+    userPubkey,
+    verifyCoordinatorProof = false
   }) {
     if (!address2.depositAddressProof || !address2.depositAddressProof.proofOfPossessionSignature || !address2.depositAddressProof.addressSignatures) {
       throw new ValidationError(
@@ -3388,7 +3385,7 @@ var DepositService = class {
     }
     const addrHash = sha2566(address2.address);
     for (const operator of Object.values(this.config.getSigningOperators())) {
-      if (operator.identifier === this.config.getCoordinatorIdentifier()) {
+      if (operator.identifier === this.config.getCoordinatorIdentifier() && !verifyCoordinatorProof) {
         continue;
       }
       const operatorPubkey2 = hexToBytes4(operator.identityPublicKey);
@@ -3413,6 +3410,46 @@ var DepositService = class {
       }
     }
   }
+  async generateStaticDepositAddress({
+    signingPubkey
+  }) {
+    const sparkClient = await this.connectionManager.createSparkClient(
+      this.config.getCoordinatorAddress()
+    );
+    let depositResp;
+    try {
+      depositResp = await sparkClient.generate_static_deposit_address({
+        signingPublicKey: signingPubkey,
+        identityPublicKey: await this.config.signer.getIdentityPublicKey(),
+        network: this.config.getNetworkProto()
+      });
+    } catch (error) {
+      throw new NetworkError(
+        "Failed to generate static deposit address",
+        {
+          operation: "generate_static_deposit_address",
+          errorCount: 1,
+          errors: error instanceof Error ? error.message : String(error)
+        },
+        error
+      );
+    }
+    if (!depositResp.depositAddress) {
+      throw new ValidationError(
+        "No static deposit address response from coordinator",
+        {
+          field: "depositAddress",
+          value: depositResp
+        }
+      );
+    }
+    await this.validateDepositAddress({
+      address: depositResp.depositAddress,
+      userPubkey: signingPubkey,
+      verifyCoordinatorProof: true
+    });
+    return depositResp;
+  }
   async generateDepositAddress({
     signingPubkey,
     leafId,
@@ -3953,8 +3990,8 @@ var DepositService = class {
 
 // src/utils/address.ts
 import { BinaryWriter as BinaryWriter3 } from "@bufbuild/protobuf/wire";
-import { bytesToNumberBE as bytesToNumberBE3 } from "@noble/curves/abstract/utils";
 import { schnorr as schnorr4, secp256k1 as secp256k17 } from "@noble/curves/secp256k1";
+import { bytesToNumberBE as bytesToNumberBE3 } from "@noble/curves/utils";
 import { bytesToHex as bytesToHex5, hexToBytes as hexToBytes5 } from "@noble/hashes/utils";
 import { bech32m } from "@scure/base";
 import { UUID } from "uuidv7";
@@ -4601,8 +4638,7 @@ function getNetworkFromBech32mTokenIdentifier(bech32mTokenIdentifier) {
 }
 
 // src/utils/token-transactions.ts
-import { bytesToNumberBE as bytesToNumberBE4 } from "@noble/curves/abstract/utils";
-import { equalBytes as equalBytes4 } from "@scure/btc-signer/utils";
+import { bytesToNumberBE as bytesToNumberBE4, equalBytes as equalBytes4 } from "@noble/curves/utils";
 function sumAvailableTokens(outputs) {
   try {
     return outputs.reduce(
@@ -4650,12 +4686,12 @@ function filterTokenBalanceForTokenIdentifier(tokenBalances, tokenIdentifier) {
 }
 
 // src/services/token-transactions.ts
+import { secp256k1 as secp256k19 } from "@noble/curves/secp256k1";
 import {
-  bytesToHex as bytesToHex7,
+  bytesToHex as bytesToHex6,
   bytesToNumberBE as bytesToNumberBE5,
   numberToBytesBE as numberToBytesBE2
-} from "@noble/curves/abstract/utils";
-import { secp256k1 as secp256k19 } from "@noble/curves/secp256k1";
+} from "@noble/curves/utils";
 import { hexToBytes as hexToBytes6 } from "@noble/hashes/utils";
 
 // src/utils/token-hashing.ts
@@ -6792,7 +6828,7 @@ var TokenTransactionService = class {
               {
                 field: "revocationCommitment",
                 value: derivedRevocationCommitment,
-                expected: bytesToHex7(outputsToSpendCommitments[outputIndex]),
+                expected: bytesToHex6(outputsToSpendCommitments[outputIndex]),
                 outputIndex
               }
             )
@@ -6818,7 +6854,7 @@ var TokenTransactionService = class {
         threshold
       );
     }
-    return bytesToHex7(finalTokenTransactionHash);
+    return bytesToHex6(finalTokenTransactionHash);
   }
   async broadcastTokenTransactionV1(tokenTransaction, signingOperators, outputsToSpendSigningPublicKeys, outputsToSpendCommitments) {
     const { finalTokenTransaction, finalTokenTransactionHash, threshold } = await this.startTokenTransaction(
@@ -6832,7 +6868,7 @@ var TokenTransactionService = class {
       finalTokenTransactionHash,
       signingOperators
     );
-    return bytesToHex7(finalTokenTransactionHash);
+    return bytesToHex6(finalTokenTransactionHash);
   }
   async startTokenTransactionV0(tokenTransaction, signingOperators, outputsToSpendSigningPublicKeys, outputsToSpendCommitments) {
     const sparkClient = await this.connectionManager.createSparkClient(
@@ -7424,7 +7460,7 @@ var TokenTransactionService = class {
   // Helper function for deciding if the signer public key is the identity public key
   async signMessageWithKey(message, publicKey) {
     const tokenSignatures = this.config.getTokenSignatures();
-    if (bytesToHex7(publicKey) === bytesToHex7(await this.config.signer.getIdentityPublicKey())) {
+    if (bytesToHex6(publicKey) === bytesToHex6(await this.config.signer.getIdentityPublicKey())) {
       if (tokenSignatures === "SCHNORR") {
         return await this.config.signer.signSchnorrWithIdentityKey(message);
       } else {
@@ -7433,8 +7469,8 @@ var TokenTransactionService = class {
     } else {
       throw new ValidationError("Invalid public key", {
         field: "publicKey",
-        value: bytesToHex7(publicKey),
-        expected: bytesToHex7(await this.config.signer.getIdentityPublicKey())
+        value: bytesToHex6(publicKey),
+        expected: bytesToHex6(await this.config.signer.getIdentityPublicKey())
       });
     }
   }
@@ -7564,8 +7600,8 @@ function isTokenTransaction(tokenTransaction) {
 
 // src/utils/adaptor-signature.ts
 import { mod } from "@noble/curves/abstract/modular";
-import { bytesToNumberBE as bytesToNumberBE6, numberToBytesBE as numberToBytesBE3 } from "@noble/curves/abstract/utils";
 import { schnorr as schnorr5, secp256k1 as secp256k110 } from "@noble/curves/secp256k1";
+import { bytesToNumberBE as bytesToNumberBE6, numberToBytesBE as numberToBytesBE3 } from "@noble/curves/utils";
 function generateSignatureFromExistingAdaptor(signature, adaptorPrivateKeyBytes) {
   const { r, s } = parseSignature(signature);
   const sBigInt = bytesToNumberBE6(s);
@@ -7693,8 +7729,8 @@ function parseSignature(signature) {
 }
 
 // src/tests/utils/test-faucet.ts
-import { bytesToHex as bytesToHex8, hexToBytes as hexToBytes7 } from "@noble/curves/abstract/utils";
 import { schnorr as schnorr6, secp256k1 as secp256k111 } from "@noble/curves/secp256k1";
+import { bytesToHex as bytesToHex7, hexToBytes as hexToBytes7 } from "@noble/curves/utils";
 import * as btc3 from "@scure/btc-signer";
 import { Address as Address2, OutScript as OutScript2, SigHash as SigHash2, Transaction as Transaction4 } from "@scure/btc-signer";
 import { taprootTweakPrivKey as taprootTweakPrivKey2 } from "@scure/btc-signer/utils";
@@ -7849,7 +7885,7 @@ var BitcoinFaucet = class _BitcoinFaucet {
       },
       STATIC_MINING_KEY
     );
-    await this.broadcastTx(bytesToHex8(signedSplitTx.extract()));
+    await this.broadcastTx(bytesToHex7(signedSplitTx.extract()));
     const splitTxId = signedSplitTx.id;
     for (let i = 0; i < numCoinsToCreate; i++) {
       this.coins.push({
@@ -7883,7 +7919,7 @@ var BitcoinFaucet = class _BitcoinFaucet {
       coinToSend.txout,
       coinToSend.key
     );
-    await this.broadcastTx(bytesToHex8(signedTx.extract()));
+    await this.broadcastTx(bytesToHex7(signedTx.extract()));
   }
   async signFaucetCoin(unsignedTx, fundingTxOut, key) {
     const pubKey = secp256k111.getPublicKey(key);
@@ -8003,7 +8039,7 @@ var BitcoinFaucet = class _BitcoinFaucet {
       });
     }
     const signedTx = await this.signFaucetCoin(tx, coin.txout, coin.key);
-    const txHex = bytesToHex8(signedTx.extract());
+    const txHex = bytesToHex7(signedTx.extract());
     await this.broadcastTx(txHex);
     const randomKey = secp256k111.utils.randomPrivateKey();
     const randomPubKey = secp256k111.getPublicKey(randomKey);
@@ -8021,14 +8057,14 @@ var BitcoinFaucet = class _BitcoinFaucet {
 
 // src/spark-wallet/spark-wallet.ts
 import { isNode as isNode3, isObject as isObject2, mapCurrencyAmount } from "@lightsparkdev/core";
+import { secp256k1 as secp256k114 } from "@noble/curves/secp256k1";
 import {
-  bytesToHex as bytesToHex11,
+  bytesToHex as bytesToHex10,
   bytesToNumberBE as bytesToNumberBE8,
   equalBytes as equalBytes6,
   hexToBytes as hexToBytes11,
   numberToVarBytesBE
-} from "@noble/curves/abstract/utils";
-import { secp256k1 as secp256k114 } from "@noble/curves/secp256k1";
+} from "@noble/curves/utils";
 import { validateMnemonic } from "@scure/bip39";
 import { wordlist as wordlist2 } from "@scure/bip39/wordlists/english";
 import { Address as Address3, OutScript as OutScript3, Transaction as Transaction7 } from "@scure/btc-signer";
@@ -8037,7 +8073,7 @@ import { uuidv7 as uuidv74, uuidv7obj } from "uuidv7";
 
 // src/graphql/client.ts
 import {
-  bytesToHex as bytesToHex9,
+  bytesToHex as bytesToHex8,
   DefaultCrypto,
   NodeKeyCache,
   Requester,
@@ -9023,7 +9059,7 @@ var SspClient = class {
       {
         queryPayload: GetChallenge,
         variables: {
-          public_key: bytesToHex9(await this.signer.getIdentityPublicKey())
+          public_key: bytesToHex8(await this.signer.getIdentityPublicKey())
         },
         constructObject: (response) => {
           return GetChallengeOutputFromJson(response.get_challenge);
@@ -9039,7 +9075,7 @@ var SspClient = class {
         variables: {
           protected_challenge: protectedChallenge,
           signature,
-          identity_public_key: bytesToHex9(
+          identity_public_key: bytesToHex8(
             await this.signer.getIdentityPublicKey()
           )
         },
@@ -9156,13 +9192,13 @@ import { Transaction as Transaction6 } from "@scure/btc-signer";
 import { uuidv7 as uuidv72 } from "uuidv7";
 
 // src/services/transfer.ts
+import { secp256k1 as secp256k112 } from "@noble/curves/secp256k1";
 import {
-  bytesToHex as bytesToHex10,
+  bytesToHex as bytesToHex9,
   equalBytes as equalBytes5,
   hexToBytes as hexToBytes8,
   numberToBytesBE as numberToBytesBE4
-} from "@noble/curves/abstract/utils";
-import { secp256k1 as secp256k112 } from "@noble/curves/secp256k1";
+} from "@noble/curves/utils";
 import { sha256 as sha25610 } from "@noble/hashes/sha2";
 import { Transaction as Transaction5 } from "@scure/btc-signer";
 import * as ecies2 from "eciesjs";
@@ -9532,7 +9568,7 @@ var BaseTransferService = class {
   }
   async prepareSendTransferKeyTweaks(transferID, receiverIdentityPubkey, leaves, cpfpRefundSignatureMap, directRefundSignatureMap, directFromCpfpRefundSignatureMap) {
     const receiverEciesPubKey = ecies2.PublicKey.fromHex(
-      bytesToHex10(receiverIdentityPubkey)
+      bytesToHex9(receiverIdentityPubkey)
     );
     const leavesTweaksMap = /* @__PURE__ */ new Map();
     for (const leaf of leaves) {
@@ -11051,12 +11087,12 @@ var CoopExitService = class extends BaseTransferService {
 };
 
 // src/services/lightning.ts
+import { secp256k1 as secp256k113 } from "@noble/curves/secp256k1";
 import {
   bytesToNumberBE as bytesToNumberBE7,
   hexToBytes as hexToBytes9,
   numberToBytesBE as numberToBytesBE5
-} from "@noble/curves/abstract/utils";
-import { secp256k1 as secp256k113 } from "@noble/curves/secp256k1";
+} from "@noble/curves/utils";
 import { sha256 as sha25611 } from "@noble/hashes/sha2";
 import { uuidv7 as uuidv73 } from "uuidv7";
 
@@ -11412,7 +11448,7 @@ import { EventEmitter } from "eventemitter3";
 import { ClientError, Status } from "nice-grpc-common";
 
 // src/services/signing.ts
-import { hexToBytes as hexToBytes10 } from "@noble/curves/abstract/utils";
+import { hexToBytes as hexToBytes10 } from "@noble/curves/utils";
 var SigningService = class {
   config;
   constructor(config) {
@@ -12126,7 +12162,7 @@ var SparkWallet = class _SparkWallet extends EventEmitter {
    * @returns {Promise<string>} The identity public key as a hex string.
    */
   async getIdentityPublicKey() {
-    return bytesToHex11(await this.config.signer.getIdentityPublicKey());
+    return bytesToHex10(await this.config.signer.getIdentityPublicKey());
   }
   /**
    * Gets the Spark address of the wallet.
@@ -12136,7 +12172,7 @@ var SparkWallet = class _SparkWallet extends EventEmitter {
   async getSparkAddress() {
     if (!this.sparkAddress) {
       this.sparkAddress = encodeSparkAddress({
-        identityPublicKey: bytesToHex11(
+        identityPublicKey: bytesToHex10(
           await this.config.signer.getIdentityPublicKey()
         ),
         network: this.config.getNetworkType()
@@ -12220,7 +12256,7 @@ var SparkWallet = class _SparkWallet extends EventEmitter {
     const signature = await this.config.signer.signSchnorrWithIdentityKey(hash);
     return encodeSparkAddressWithSignature(
       {
-        identityPublicKey: bytesToHex11(identityPublicKey),
+        identityPublicKey: bytesToHex10(identityPublicKey),
         network: this.config.getNetworkType(),
         sparkInvoiceFields: invoiceFields
       },
@@ -12288,7 +12324,7 @@ var SparkWallet = class _SparkWallet extends EventEmitter {
       });
     }
     this.sparkAddress = encodeSparkAddress({
-      identityPublicKey: bytesToHex11(identityPublicKey),
+      identityPublicKey: bytesToHex10(identityPublicKey),
       network: this.config.getNetworkType()
     });
     return this.sparkAddress;
@@ -12468,18 +12504,18 @@ var SparkWallet = class _SparkWallet extends EventEmitter {
       const userLeaves = [];
       userLeaves.push({
         leaf_id: transfer.leaves[0].leaf.id,
-        raw_unsigned_refund_transaction: bytesToHex11(
+        raw_unsigned_refund_transaction: bytesToHex10(
           transfer.leaves[0].intermediateRefundTx
         ),
-        direct_raw_unsigned_refund_transaction: bytesToHex11(
+        direct_raw_unsigned_refund_transaction: bytesToHex10(
           transfer.leaves[0].intermediateDirectRefundTx
         ),
-        direct_from_cpfp_raw_unsigned_refund_transaction: bytesToHex11(
+        direct_from_cpfp_raw_unsigned_refund_transaction: bytesToHex10(
           transfer.leaves[0].intermediateDirectFromCpfpRefundTx
         ),
-        adaptor_added_signature: bytesToHex11(cpfpAdaptorSignature),
-        direct_adaptor_added_signature: bytesToHex11(directAdaptorSignature),
-        direct_from_cpfp_adaptor_added_signature: bytesToHex11(
+        adaptor_added_signature: bytesToHex10(cpfpAdaptorSignature),
+        direct_adaptor_added_signature: bytesToHex10(directAdaptorSignature),
+        direct_from_cpfp_adaptor_added_signature: bytesToHex10(
           directFromCpfpAdaptorSignature
         )
       });
@@ -12532,24 +12568,24 @@ var SparkWallet = class _SparkWallet extends EventEmitter {
         }
         userLeaves.push({
           leaf_id: leaf.leaf.id,
-          raw_unsigned_refund_transaction: bytesToHex11(
+          raw_unsigned_refund_transaction: bytesToHex10(
             leaf.intermediateRefundTx
           ),
-          direct_raw_unsigned_refund_transaction: bytesToHex11(
+          direct_raw_unsigned_refund_transaction: bytesToHex10(
             leaf.intermediateDirectRefundTx
           ),
-          direct_from_cpfp_raw_unsigned_refund_transaction: bytesToHex11(
+          direct_from_cpfp_raw_unsigned_refund_transaction: bytesToHex10(
             leaf.intermediateDirectFromCpfpRefundTx
           ),
-          adaptor_added_signature: bytesToHex11(cpfpSignature),
-          direct_adaptor_added_signature: bytesToHex11(directSignature),
-          direct_from_cpfp_adaptor_added_signature: bytesToHex11(
+          adaptor_added_signature: bytesToHex10(cpfpSignature),
+          direct_adaptor_added_signature: bytesToHex10(directSignature),
+          direct_from_cpfp_adaptor_added_signature: bytesToHex10(
             directFromCpfpSignature
           )
         });
       }
       const sspClient = this.getSspClient();
-      const cpfpAdaptorPubkey = bytesToHex11(
+      const cpfpAdaptorPubkey = bytesToHex10(
         secp256k114.getPublicKey(cpfpAdaptorPrivateKey)
       );
       if (!cpfpAdaptorPubkey) {
@@ -12557,13 +12593,13 @@ var SparkWallet = class _SparkWallet extends EventEmitter {
       }
       let directAdaptorPubkey;
       if (directAdaptorPrivateKey.length > 0) {
-        directAdaptorPubkey = bytesToHex11(
+        directAdaptorPubkey = bytesToHex10(
           secp256k114.getPublicKey(directAdaptorPrivateKey)
         );
       }
       let directFromCpfpAdaptorPubkey;
       if (directFromCpfpAdaptorPrivateKey.length > 0) {
-        directFromCpfpAdaptorPubkey = bytesToHex11(
+        directFromCpfpAdaptorPubkey = bytesToHex10(
           secp256k114.getPublicKey(directFromCpfpAdaptorPrivateKey)
         );
       }
@@ -12703,9 +12739,9 @@ var SparkWallet = class _SparkWallet extends EventEmitter {
         directFromCpfpSignatureMap
       );
       const completeResponse = await sspClient.completeLeaveSwap({
-        adaptorSecretKey: bytesToHex11(cpfpAdaptorPrivateKey),
-        directAdaptorSecretKey: bytesToHex11(directAdaptorPrivateKey),
-        directFromCpfpAdaptorSecretKey: bytesToHex11(
+        adaptorSecretKey: bytesToHex10(cpfpAdaptorPrivateKey),
+        directAdaptorSecretKey: bytesToHex10(directAdaptorPrivateKey),
+        directFromCpfpAdaptorSecretKey: bytesToHex10(
           directFromCpfpAdaptorPrivateKey
         ),
         userOutboundTransferExternalId: transfer.id,
@@ -12800,7 +12836,7 @@ var SparkWallet = class _SparkWallet extends EventEmitter {
     let tokenMetadataMap = /* @__PURE__ */ new Map();
     for (const [tokenIdentifier, metadata] of this.tokenMetadata) {
       tokenMetadataMap.set(tokenIdentifier, {
-        tokenPublicKey: bytesToHex11(metadata.issuerPublicKey),
+        tokenPublicKey: bytesToHex10(metadata.issuerPublicKey),
         rawTokenIdentifier: metadata.tokenIdentifier,
         tokenName: metadata.tokenName,
         tokenTicker: metadata.tokenTicker,
@@ -12840,7 +12876,7 @@ var SparkWallet = class _SparkWallet extends EventEmitter {
    * @returns {Promise<string>} A Bitcoin address for depositing funds
    */
   async getSingleUseDepositAddress() {
-    return await this.generateDepositAddress(false);
+    return await this.generateDepositAddress();
   }
   /**
    * Generates a new static deposit address for receiving bitcoin funds.
@@ -12849,43 +12885,32 @@ var SparkWallet = class _SparkWallet extends EventEmitter {
    * @returns {Promise<string>} A Bitcoin address for depositing funds
    */
   async getStaticDepositAddress() {
-    try {
-      return await this.generateDepositAddress(true);
-    } catch (error) {
-      if (error.message?.includes("static deposit address already exists")) {
-        const existingAddresses = await this.queryStaticDepositAddresses();
-        if (existingAddresses.length > 0 && existingAddresses[0]) {
-          return existingAddresses[0];
-        } else {
-          throw error;
-        }
-      } else {
-        throw error;
-      }
+    const signingPubkey = await this.config.signer.getStaticDepositSigningKey(0);
+    const address2 = await this.depositService.generateStaticDepositAddress({
+      signingPubkey
+    });
+    if (!address2.depositAddress) {
+      throw new RPCError("Failed to generate static deposit address", {
+        method: "generateStaticDepositAddress",
+        params: { signingPubkey }
+      });
     }
+    return address2.depositAddress.address;
   }
   /**
    * Generates a deposit address for receiving funds.
-   *
-   * @param {boolean} static - Whether the address is static or single use
    * @returns {Promise<string>} A deposit address
    * @private
    */
-  async generateDepositAddress(isStatic) {
+  async generateDepositAddress() {
     const leafId = uuidv74();
-    let signingPubkey;
-    if (isStatic) {
-      signingPubkey = await this.config.signer.getStaticDepositSigningKey(0);
-    } else {
-      signingPubkey = await this.config.signer.getPublicKeyFromDerivation({
-        type: "leaf" /* LEAF */,
-        path: leafId
-      });
-    }
+    const signingPubkey = await this.config.signer.getPublicKeyFromDerivation({
+      type: "leaf" /* LEAF */,
+      path: leafId
+    });
     const address2 = await this.depositService.generateDepositAddress({
       signingPubkey,
-      leafId,
-      isStatic
+      leafId
     });
     if (!address2.depositAddress) {
       throw new RPCError("Failed to generate deposit address", {
@@ -12912,7 +12937,7 @@ var SparkWallet = class _SparkWallet extends EventEmitter {
    * @param offset - Pagination offset (default 0).
    * @returns {Promise<{ txid: string, vout: number }[]>} List of confirmed UTXOs.
    */
-  async getUtxosForDepositAddress(depositAddress, limit = 100, offset = 0) {
+  async getUtxosForDepositAddress(depositAddress, limit = 100, offset = 0, excludeClaimed = false) {
     if (!depositAddress) {
       throw new ValidationError("Deposit address cannot be empty", {
         field: "depositAddress"
@@ -12926,10 +12951,11 @@ var SparkWallet = class _SparkWallet extends EventEmitter {
         address: depositAddress,
         network: NetworkToProto[this.config.getNetwork()],
         limit,
-        offset
+        offset,
+        excludeClaimed
       });
       return response.utxos.map((utxo) => ({
-        txid: bytesToHex11(utxo.txid),
+        txid: bytesToHex10(utxo.txid),
         vout: utxo.vout
       })) ?? [];
     } catch (error) {
@@ -12999,7 +13025,7 @@ var SparkWallet = class _SparkWallet extends EventEmitter {
     if (network === BitcoinNetwork_default.FUTURE_VALUE) {
       network = BitcoinNetwork_default.REGTEST;
     }
-    const depositSecretKey = bytesToHex11(
+    const depositSecretKey = bytesToHex10(
       await this.config.signer.getStaticDepositSecretKey(0)
     );
     const message = await this.getStaticDepositSigningPayload(
@@ -13012,7 +13038,7 @@ var SparkWallet = class _SparkWallet extends EventEmitter {
     );
     const hashBuffer = sha25612(message);
     const signatureBytes = await this.config.signer.signMessageWithIdentityKey(hashBuffer);
-    const signature = bytesToHex11(signatureBytes);
+    const signature = bytesToHex10(signatureBytes);
     const response = await this.sspClient.claimStaticDeposit({
       transactionId,
       outputIndex,
@@ -13164,7 +13190,7 @@ var SparkWallet = class _SparkWallet extends EventEmitter {
       networkJSON.toLowerCase(),
       2 /* Refund */,
       creditAmountSats,
-      bytesToHex11(spendTxSighash)
+      bytesToHex10(spendTxSighash)
     );
     const hashBuffer = sha25612(message);
     const swapResponseUserSignature = await this.config.signer.signMessageWithIdentityKey(hashBuffer);
@@ -13687,7 +13713,7 @@ var SparkWallet = class _SparkWallet extends EventEmitter {
       }
       return mapTransferToWalletTransfer(
         transfer,
-        bytesToHex11(await this.config.signer.getIdentityPublicKey())
+        bytesToHex10(await this.config.signer.getIdentityPublicKey())
       );
     });
   }
@@ -14043,7 +14069,7 @@ var SparkWallet = class _SparkWallet extends EventEmitter {
       const invoice2 = await sspClient.requestLightningReceive({
         amountSats: amountSats2,
         network: bitcoinNetwork,
-        paymentHash: bytesToHex11(paymentHash),
+        paymentHash: bytesToHex10(paymentHash),
         expirySecs: expirySeconds,
         memo: memo2,
         includeSparkAddress,
@@ -14573,7 +14599,7 @@ var SparkWallet = class _SparkWallet extends EventEmitter {
     return transfers?.[0];
   }
   async constructTransfersWithUserRequest(transfers) {
-    const identityPublicKey = bytesToHex11(
+    const identityPublicKey = bytesToHex10(
       await this.config.signer.getIdentityPublicKey()
     );
     const userRequests = await this.sspClient?.getTransfers(
@@ -14817,7 +14843,7 @@ var SparkWallet = class _SparkWallet extends EventEmitter {
       hash,
       compact
     );
-    return bytesToHex11(signature);
+    return bytesToHex10(signature);
   }
   /**
    * Validates a message with the identity key.
@@ -14875,7 +14901,7 @@ var SparkWallet = class _SparkWallet extends EventEmitter {
           publicKey,
           this.config.getNetwork()
         );
-        if (bytesToHex11(script) === bytesToHex11(identityScript)) {
+        if (bytesToHex10(script) === bytesToHex10(identityScript)) {
           try {
             this.config.signer.signTransactionIndex(tx, i, publicKey);
             inputsSigned++;
@@ -14919,13 +14945,13 @@ var SparkWallet = class _SparkWallet extends EventEmitter {
             depositPubKey,
             this.config.getNetwork()
           );
-          if (bytesToHex11(script) === bytesToHex11(identityScript)) {
+          if (bytesToHex10(script) === bytesToHex10(identityScript)) {
             return {
               publicKey: identityPubKey,
               keyType: "identity"
             };
           }
-          if (bytesToHex11(script) === bytesToHex11(depositScript)) {
+          if (bytesToHex10(script) === bytesToHex10(depositScript)) {
             return {
               publicKey: depositPubKey,
               keyType: "deposit"
@@ -15385,7 +15411,7 @@ async function isTxBroadcast(txid, baseUrl, network) {
 }
 
 // src/utils/unilateral-exit.ts
-import { bytesToHex as bytesToHex12, hexToBytes as hexToBytes12 } from "@noble/curves/abstract/utils";
+import { bytesToHex as bytesToHex11, hexToBytes as hexToBytes12 } from "@noble/curves/utils";
 import { ripemd160 } from "@noble/hashes/legacy";
 import { sha256 as sha25613 } from "@noble/hashes/sha2";
 import * as btc4 from "@scure/btc-signer";
@@ -15456,10 +15482,10 @@ async function constructUnilateralExitTxs(nodeHexStrings, sparkClient, network)
       }
     }
     for (const chainNode of chain) {
-      const nodeTx = bytesToHex12(chainNode.nodeTx);
+      const nodeTx = bytesToHex11(chainNode.nodeTx);
       transactions.push(nodeTx);
       if (chainNode.id === node.id) {
-        const refundTx = bytesToHex12(chainNode.refundTx);
+        const refundTx = bytesToHex11(chainNode.refundTx);
         transactions.push(refundTx);
       }
     }
@@ -15565,7 +15591,7 @@ async function constructUnilateralExitFeeBumpPackages(nodeHexStrings, utxos, fee
       }
     }
     for (const chainNode of chain) {
-      let nodeTxHex = bytesToHex12(chainNode.nodeTx);
+      let nodeTxHex = bytesToHex11(chainNode.nodeTx);
       try {
         const txObj = getTxFromRawTxHex(nodeTxHex);
         const txid = getTxId(txObj);
@@ -15582,7 +15608,7 @@ async function constructUnilateralExitFeeBumpPackages(nodeHexStrings, utxos, fee
         for (let i = txObj.outputsLength - 1; i >= 0; i--) {
           const output = txObj.getOutput(i);
           if (output?.amount === 0n && output.script) {
-            anchorOutputScriptHex = bytesToHex12(output.script);
+            anchorOutputScriptHex = bytesToHex11(output.script);
             break;
           }
         }
@@ -15607,7 +15633,7 @@ async function constructUnilateralExitFeeBumpPackages(nodeHexStrings, utxos, fee
       var feeBumpOut = feeBumpTx.outputsLength === 1 ? feeBumpTx.getOutput(0) : null;
       var feeBumpOutPubKey = null;
       for (const usedUtxo of usedUtxos) {
-        if (feeBumpOut && bytesToHex12(feeBumpOut.script) == usedUtxo.script) {
+        if (feeBumpOut && bytesToHex11(feeBumpOut.script) == usedUtxo.script) {
           feeBumpOutPubKey = usedUtxo.publicKey;
         }
         const index = availableUtxos.findIndex(
@@ -15622,20 +15648,20 @@ async function constructUnilateralExitFeeBumpPackages(nodeHexStrings, utxos, fee
           txid: getTxId(feeBumpTx),
           vout: 0,
           value: feeBumpOut.amount,
-          script: bytesToHex12(feeBumpOut.script),
+          script: bytesToHex11(feeBumpOut.script),
           publicKey: feeBumpOutPubKey
         });
       const finalNodeTx = correctedParentTx || nodeTxHex;
       txPackages.push({ tx: finalNodeTx, feeBumpPsbt: nodeFeeBumpPsbt });
       if (chainNode.id === node.id) {
-        let refundTxHex = bytesToHex12(chainNode.refundTx);
+        let refundTxHex = bytesToHex11(chainNode.refundTx);
         try {
           const txObj = getTxFromRawTxHex(refundTxHex);
           let anchorOutputScriptHex;
           for (let i = txObj.outputsLength - 1; i >= 0; i--) {
             const output = txObj.getOutput(i);
             if (output?.amount === 0n && output.script) {
-              anchorOutputScriptHex = bytesToHex12(output.script);
+              anchorOutputScriptHex = bytesToHex11(output.script);
               break;
             }
           }
@@ -15663,7 +15689,7 @@ async function constructUnilateralExitFeeBumpPackages(nodeHexStrings, utxos, fee
         var feeBumpOut = feeBumpTx2.outputsLength === 1 ? feeBumpTx2.getOutput(0) : null;
         var feeBumpOutPubKey = null;
         for (const usedUtxo of usedUtxos) {
-          if (feeBumpOut && bytesToHex12(feeBumpOut.script) == usedUtxo.script) {
+          if (feeBumpOut && bytesToHex11(feeBumpOut.script) == usedUtxo.script) {
             feeBumpOutPubKey = usedUtxo.publicKey;
           }
           const index = availableUtxos.findIndex(
@@ -15678,7 +15704,7 @@ async function constructUnilateralExitFeeBumpPackages(nodeHexStrings, utxos, fee
             txid: getTxId(feeBumpTx2),
             vout: 0,
             value: feeBumpOut.amount,
-            script: bytesToHex12(feeBumpOut.script),
+            script: bytesToHex11(feeBumpOut.script),
             publicKey: feeBumpOutPubKey
           });
         txPackages.push({
@@ -15776,7 +15802,7 @@ function constructFeeBumpTx(txHex, utxos, feeRate, previousFeeBumpTx) {
     const pubKeyHash = hash160(hexToBytes12(fundingUtxo.publicKey));
     const scriptToUse = new Uint8Array([0, 20, ...pubKeyHash]);
     const providedScript = hexToBytes12(fundingUtxo.script);
-    if (bytesToHex12(scriptToUse) !== bytesToHex12(providedScript)) {
+    if (bytesToHex11(scriptToUse) !== bytesToHex11(providedScript)) {
       throw new Error(
         `\u274C  Derived script doesn't match provided script for UTXO ${i + 1}.`
       );
@@ -15841,7 +15867,7 @@ function constructFeeBumpTx(txHex, utxos, feeRate, previousFeeBumpTx) {
   }
   let psbtHex;
   try {
-    psbtHex = bytesToHex12(builder.toPSBT());
+    psbtHex = bytesToHex11(builder.toPSBT());
   } catch (error) {
     throw new Error(`Failed to extract transaction: ${error}`);
   }