@buildonspark/spark-sdk 0.1.44 → 0.1.45

package/dist/{chunk-A2ZLMH6I.js → chunk-J2IE4Z7Y.js}

@@ -1,12 +1,9 @@
-import {
-  ConnectionManager
-} from "./chunk-WPTRVD2V.js";
 import {
   Lrc20ConnectionManager
-} from "./chunk-NBCNYDWJ.js";
+} from "./chunk-GZ5IPPJ2.js";
 import {
   TokenTransactionService
-} from "./chunk-CIZNCBKE.js";
+} from "./chunk-C2S227QR.js";
 import {
   DEFAULT_FEE_SATS,
   computeTaprootKeyNoScript,
@@ -23,14 +20,14 @@ import {
   getTxFromRawTxHex,
   getTxId,
   proofOfPossessionMessageHashForDepositAddress
-} from "./chunk-XX4RRWOX.js";
+} from "./chunk-5FUB65LX.js";
 import {
   calculateAvailableTokenAmount
-} from "./chunk-6AFUC5M2.js";
+} from "./chunk-HWJWKEIU.js";
 import {
   mapTransferToWalletTransfer,
   mapTreeNodeToWalletLeaf
-} from "./chunk-K4BJARWM.js";
+} from "./chunk-OBFKIEMP.js";
 import {
   ClaimStaticDepositRequestType_default,
   CoopExitFeeQuoteFromJson,
@@ -52,10 +49,10 @@ import {
   decodeSparkAddress,
   encodeSparkAddress,
   isValidPublicKey
-} from "./chunk-KEKGSH7B.js";
+} from "./chunk-KMUMFYFX.js";
 import {
   WalletConfigService
-} from "./chunk-DAXGVPVM.js";
+} from "./chunk-6264CGDM.js";
 import {
   LRC_WALLET_NETWORK,
   LRC_WALLET_NETWORK_TYPE,
@@ -65,17 +62,7 @@ import {
 } from "./chunk-Z5HIAYFT.js";
 import {
   ELECTRS_CREDENTIALS
-} from "./chunk-EKFD62HN.js";
-import {
-  BitcoinNetwork_default
-} from "./chunk-HMLOC6TE.js";
-import {
-  SendLeafKeyTweaks,
-  networkToJSON
-} from "./chunk-4Q2ZDYYU.js";
-import {
-  isReactNative
-} from "./chunk-UBT6EDVJ.js";
+} from "./chunk-R5PXJZQS.js";
 import {
   addPublicKeys,
   applyAdaptorToSignature,
@@ -86,6 +73,15 @@ import {
 import {
   getCrypto
 } from "./chunk-QNNSEJ4P.js";
+import {
+  BitcoinNetwork_default
+} from "./chunk-HMLOC6TE.js";
+import {
+  ConnectionManager
+} from "./chunk-PQN3C2MF.js";
+import {
+  isReactNative
+} from "./chunk-7V6N75CC.js";
 import {
   AuthenticationError,
   ConfigurationError,
@@ -93,6 +89,10 @@ import {
   RPCError,
   ValidationError
 } from "./chunk-GSI4OLXZ.js";
+import {
+  SendLeafKeyTweaks,
+  networkToJSON
+} from "./chunk-BGGEVUJK.js";
 import {
   Buffer
 } from "./chunk-MVRQ5US7.js";
@@ -106,7 +106,7 @@ import {
   hexToBytes as hexToBytes7,
   numberToVarBytesBE
 } from "@noble/curves/abstract/utils";
-import { secp256k1 as secp256k16 } from "@noble/curves/secp256k1";
+import { secp256k1 as secp256k15 } from "@noble/curves/secp256k1";
 import { validateMnemonic } from "@scure/bip39";
 import { wordlist } from "@scure/bip39/wordlists/english";
 import { Address as Address4, OutScript as OutScript4, Transaction as Transaction6 } from "@scure/btc-signer";
@@ -1316,7 +1316,10 @@ var BaseTransferService = class {
     const transferPackage = {
       leavesToSend: leafSigningJobs,
       keyTweakPackage: encryptedKeyTweaks,
-      userSignature: new Uint8Array()
+      userSignature: new Uint8Array(),
+      // TODO: Add direct refund signature
+      directLeavesToSend: [],
+      directFromCpfpLeavesToSend: []
     };
     const transferPackageSigningPayload = getTransferPackageSigningPayload(
       transferID,
@@ -1415,7 +1418,11 @@ var BaseTransferService = class {
       nodeSignatures.push({
         nodeId: operatorSigningResult.leafId,
         refundTxSignature: refundAggregate,
-        nodeTxSignature: new Uint8Array()
+        nodeTxSignature: new Uint8Array(),
+        // TODO: Add direct refund signature
+        directNodeTxSignature: new Uint8Array(),
+        directRefundTxSignature: new Uint8Array(),
+        directFromCpfpRefundTxSignature: new Uint8Array()
       });
     }
     return nodeSignatures;
@@ -1497,7 +1504,10 @@ var BaseTransferService = class {
         pubkeySharesTweak: Object.fromEntries(pubkeySharesTweak),
         secretCipher,
         signature,
-        refundSignature: refundSignature ?? new Uint8Array()
+        refundSignature: refundSignature ?? new Uint8Array(),
+        // TODO: Add direct refund signature
+        directRefundSignature: new Uint8Array(),
+        directFromCpfpRefundSignature: new Uint8Array()
       });
     }
     return leafTweaksMap;
@@ -1779,7 +1789,11 @@ var TransferService = class extends BaseTransferService {
           signingPublicKey: refundSigningData.signingPubKey,
           rawTx: refundTx.toBytes(),
           signingNonceCommitment: refundNonceCommitmentProto
-        }
+        },
+        // TODO: Add direct refund signature
+        directRefundTxSigningJob: void 0,
+        // TODO: Add direct refund signature
+        directFromCpfpRefundTxSigningJob: void 0
       });
     }
     return signingJobs;
@@ -2146,7 +2160,11 @@ var TransferService = class extends BaseTransferService {
         nodeSignatures.push({
           nodeId,
           nodeTxSignature: signature,
-          refundTxSignature: new Uint8Array()
+          refundTxSignature: new Uint8Array(),
+          // TODO: Add direct refund signature
+          directNodeTxSignature: new Uint8Array(),
+          directRefundTxSignature: new Uint8Array(),
+          directFromCpfpRefundTxSignature: new Uint8Array()
         });
       } else if (i === nodes.length) {
         refundSignature = signature;
@@ -2161,7 +2179,11 @@ var TransferService = class extends BaseTransferService {
     nodeSignatures.push({
       nodeId: leafNodeId,
       nodeTxSignature: leafSignature,
-      refundTxSignature: refundSignature
+      refundTxSignature: refundSignature,
+      // TODO: Add direct refund signature
+      directNodeTxSignature: new Uint8Array(),
+      directRefundTxSignature: new Uint8Array(),
+      directFromCpfpRefundTxSignature: new Uint8Array()
     });
     const result = await sparkClient.finalize_node_signatures({
       intent: 3 /* REFRESH */,
@@ -2478,7 +2500,10 @@ var CoopExitService = class extends BaseTransferService {
           signingPublicKey: leaf.signingPubKey,
           rawTx: refundTx.toBytes(),
           signingNonceCommitment
-        }
+        },
+        // TODO: Add direct refund signature
+        directRefundTxSigningJob: void 0,
+        directFromCpfpRefundTxSigningJob: void 0
       };
       signingJobs.push(signingJob);
       const tx = getTxFromRawTxBytes(leaf.leaf.nodeTx);
@@ -2851,98 +2876,58 @@ import {
   hexToBytes as hexToBytes3,
   numberToBytesBE as numberToBytesBE2
 } from "@noble/curves/abstract/utils";
-import { secp256k1 as secp256k14 } from "@noble/curves/secp256k1";
-import { sha256 as sha2565 } from "@noble/hashes/sha2";
+import { secp256k1 as secp256k13 } from "@noble/curves/secp256k1";
+import { sha256 as sha2564 } from "@noble/hashes/sha2";
 import { uuidv7 as uuidv73 } from "uuidv7";
 
 // src/services/bolt11-spark.ts
-import { bech32 } from "@scure/base";
-import { sha256 as sha2564 } from "@noble/hashes/sha2";
-import { secp256k1 as secp256k13 } from "@noble/curves/secp256k1";
+import { decode } from "light-bolt11-decoder";
+var RECEIVER_IDENTITY_PUBLIC_KEY_SHORT_CHANNEL_ID = "f42400f424000001";
+var PAYMENT_HASH_NAME = "payment_hash";
+var AMOUNT_MSATS_NAME = "amount";
+var PAYMENT_SECRET_NAME = "payment_secret";
 function decodeInvoice(invoice) {
-  const { words, prefix } = bech32.decode(
-    invoice,
-    1e3
-  );
-  verifySignature(words, prefix);
-  const amountMSats = extractMillisatoshiAmountFromInvoice(invoice);
-  let fallbackAddress = void 0;
-  let paymentHash = void 0;
-  let paymentSecret = void 0;
-  let i = 7;
-  const tlvEnd = words.length - 105;
-  while (i + 2 < tlvEnd) {
-    const tag = words[i];
-    const len1 = words[i + 1];
-    const len2 = words[i + 2];
-    if (len1 === void 0 || len2 === void 0) {
-      console.log("No length word");
-      break;
-    }
-    const len = (len1 << 5) + len2;
-    const start = i + 3;
-    const end = start + len;
-    if (tag === 1) {
-      const hashWords = words.slice(start, end);
-      const hashBytes = bech32WordsToBytes(hashWords);
-      if (hashBytes.length === 32) {
-        paymentHash = Buffer.from(hashBytes).toString("hex");
-      }
-    } else if (tag === 9) {
-      const verWord = words[start];
-      if (verWord !== 31) {
-        console.warn("Not our custom version-31");
-        i = end;
-        continue;
-      }
-      const payloadWords = words.slice(start + 1, end);
-      const payloadBytes = bech32WordsToBytes(payloadWords);
-      fallbackAddress = Buffer.from(payloadBytes).toString("hex");
-    } else if (tag === 16) {
-      if (len !== 52) {
-        throw new ValidationError("Invalid payment secret length", {
-          field: "paymentSecret",
-          value: len,
-          expected: "52 words (32 bytes for 256-bit secret)"
-        });
-      }
-      const secretWords = words.slice(start, end);
-      const secretBytes = bech32WordsToBytes(secretWords);
-      if (secretBytes.length !== 32) {
-        throw new ValidationError("Invalid payment secret size", {
-          field: "paymentSecret",
-          value: secretBytes.length,
-          expected: "32 bytes (256 bits)"
-        });
+  const decodedInvoice = decode(invoice);
+  const network = getNetworkFromInvoice(invoice);
+  if (network === null) {
+    throw new ValidationError("Invalid network found in invoice: " + invoice);
+  }
+  let paymentSection;
+  let routeHints = [];
+  let amountSection;
+  let paymentSecretSection;
+  let fallbackAddress;
+  for (const section of decodedInvoice.sections) {
+    if (section.name === PAYMENT_HASH_NAME) {
+      paymentSection = section;
+    }
+    if (section.name === AMOUNT_MSATS_NAME) {
+      amountSection = section;
+    }
+    if (section.name === PAYMENT_SECRET_NAME) {
+      paymentSecretSection = section;
+    }
+  }
+  routeHints = decodedInvoice.route_hints;
+  const amountMSats = amountSection?.value ? BigInt(amountSection.value) : null;
+  const paymentHash = paymentSection?.value;
+  for (const routeHintArray of routeHints) {
+    for (const routeHint of routeHintArray) {
+      if (routeHint.short_channel_id === RECEIVER_IDENTITY_PUBLIC_KEY_SHORT_CHANNEL_ID) {
+        fallbackAddress = routeHint.pubkey;
       }
-      paymentSecret = Buffer.from(secretBytes).toString("hex");
     }
-    i = end;
   }
   if (paymentHash === void 0) {
     throw new ValidationError("No payment hash found in invoice: " + invoice);
   }
-  if (paymentSecret === void 0) {
+  if (paymentSecretSection?.value === void 0) {
     throw new ValidationError(
       "Invalid payment secret found in invoice: " + invoice
     );
   }
   return { amountMSats, fallbackAddress, paymentHash };
 }
-function bech32WordsToBytes(words) {
-  let acc = 0, bits = 0;
-  const out = [];
-  for (const w of words) {
-    if (w < 0 || w > 31) throw new Error(`bad word ${w}`);
-    acc = acc << 5 | w;
-    bits += 5;
-    while (bits >= 8) {
-      bits -= 8;
-      out.push(acc >> bits & 255);
-    }
-  }
-  return new Uint8Array(out);
-}
 function getNetworkFromInvoice(invoice) {
   if (invoice.startsWith("lnbcrt")) return 3 /* REGTEST */;
   if (invoice.startsWith("lnbc")) return 0 /* MAINNET */;
@@ -2950,85 +2935,11 @@ function getNetworkFromInvoice(invoice) {
   if (invoice.startsWith("lnsb")) return 2 /* SIGNET */;
   return null;
 }
-function extractMillisatoshiAmountFromInvoice(invoice) {
-  const match = invoice.match(/^ln[a-z]+(\d+)([a-z]?)1/);
-  if (!match) return null;
-  const [, amount, multiplier] = match;
-  if (!amount) return null;
-  const value = BigInt(amount);
-  const MILLISATS_PER_BTC = 100000000000n;
-  const divisors = {
-    m: 1000n,
-    u: 1000000n,
-    n: 1000000000n,
-    p: 10000000000000n
-  };
-  if (multiplier) {
-    if (!(multiplier in divisors)) {
-      throw new ValidationError(`Invalid multiplier: ${multiplier}`, {
-        field: "multiplier",
-        value: multiplier,
-        expected: "valid bolt11 multiplier: m, u, n, p"
-      });
-    }
-    const divisor = divisors[multiplier];
-    if (value * MILLISATS_PER_BTC % divisor !== 0n) {
-      throw new ValidationError("Invalid submillisatoshi precision", {
-        field: "amount",
-        value: `${amount}${multiplier}`,
-        expected: "amount must result in whole millisatoshis"
-      });
-    }
-    return value * MILLISATS_PER_BTC / divisor;
-  } else {
-    return value * MILLISATS_PER_BTC;
-  }
-}
-function hasSparkHeader(bytes) {
-  if (bytes.length < 3) {
-    return false;
-  }
-  return bytes[0] === 83 && // 'S'
-  bytes[1] === 80 && // 'P'
-  bytes[2] === 75;
-}
 function isValidSparkFallback(bytes) {
-  if (bytes.length !== 36) {
+  if (bytes.length !== 33) {
     return false;
   }
-  return hasSparkHeader(bytes);
-}
-function verifySignature(words, prefix) {
-  if (words.length < 104) {
-    throw new ValidationError("Invoice too short for signature");
-  }
-  const signatureStart = words.length - 104;
-  const signatureEnd = words.length - 1;
-  const hrp = prefix;
-  const hrpBytes = new TextEncoder().encode(hrp);
-  const dataWords = words.slice(0, signatureStart);
-  const dataBytes = bech32WordsToBytes(dataWords);
-  const sigWords = words.slice(signatureStart, signatureEnd);
-  const sigBytes = bech32WordsToBytes(sigWords);
-  if (sigBytes.length !== 64) {
-    throw new ValidationError("Invalid signature length");
-  }
-  const recoveryId = words[words.length - 1];
-  if (recoveryId === void 0) {
-    throw new ValidationError("Missing recovery ID in signature");
-  }
-  const messageBytes = new Uint8Array(hrpBytes.length + dataBytes.length);
-  messageBytes.set(hrpBytes, 0);
-  messageBytes.set(dataBytes, hrpBytes.length);
-  const messageHash = sha2564(messageBytes);
-  try {
-    const signature = secp256k13.Signature.fromCompact(sigBytes).addRecoveryBit(recoveryId);
-    signature.recoverPublicKey(messageHash);
-  } catch (error) {
-    throw new ValidationError(
-      `Invalid BOLT11 signature: ${error.message}`
-    );
-  }
+  return true;
 }
 
 // src/services/lightning.ts
@@ -3051,7 +2962,7 @@ var LightningService = class {
   }) {
     const randBytes = crypto.getRandomValues(new Uint8Array(32));
     const preimage = numberToBytesBE2(
-      bytesToNumberBE(randBytes) % secp256k14.CURVE.n,
+      bytesToNumberBE(randBytes) % secp256k13.CURVE.n,
       32
     );
     return await this.createLightningInvoiceWithPreImage({
@@ -3071,7 +2982,7 @@ var LightningService = class {
     receiverIdentityPubkey,
     descriptionHash
   }) {
-    const paymentHash = sha2565(preimage);
+    const paymentHash = sha2564(preimage);
     const invoice = await invoiceCreator(
       amountSats,
       paymentHash,
@@ -3088,7 +2999,7 @@ var LightningService = class {
     }
     const shares = await this.config.signer.splitSecretWithProofs({
       secret: preimage,
-      curveOrder: secp256k14.CURVE.n,
+      curveOrder: secp256k13.CURVE.n,
       threshold: this.config.getThreshold(),
       numShares: Object.keys(this.config.getSigningOperators()).length
     });
@@ -3268,7 +3179,7 @@ var LightningService = class {
     const sparkClient = await this.connectionManager.createSparkClient(
       this.config.getCoordinatorAddress()
     );
-    const paymentHash = sha2565(preimage);
+    const paymentHash = sha2564(preimage);
     let response;
     try {
       response = await sparkClient.provide_preimage({
@@ -3300,7 +3211,7 @@ var LightningService = class {
 
 // src/services/tree-creation.ts
 import { hexToBytes as hexToBytes4 } from "@noble/curves/abstract/utils";
-import { sha256 as sha2566 } from "@noble/hashes/sha2";
+import { sha256 as sha2565 } from "@noble/hashes/sha2";
 import { Address as Address2, OutScript as OutScript2, Transaction as Transaction4 } from "@scure/btc-signer";
 var INITIAL_TIME_LOCK3 = 2e3;
 function maybeApplyFee(amount) {
@@ -3456,7 +3367,7 @@ var TreeCreationService = class {
     return finalizeResp;
   }
   async createDepositAddressTree(targetSigningPublicKey, nodeId) {
-    const leftKey = await this.config.signer.generatePublicKey(sha2566(nodeId));
+    const leftKey = await this.config.signer.generatePublicKey(sha2565(nodeId));
     const leftNode = {
       signingPublicKey: leftKey,
       children: []
@@ -3505,7 +3416,10 @@ var TreeCreationService = class {
     const internalCreationNode = {
       nodeTxSigningJob: void 0,
       refundTxSigningJob: void 0,
-      children: []
+      children: [],
+      directNodeTxSigningJob: void 0,
+      directRefundTxSigningJob: void 0,
+      directFromCpfpRefundTxSigningJob: void 0
     };
     const tx = new Transaction4({ version: 3 });
     tx.addInput({
@@ -3534,7 +3448,10 @@ var TreeCreationService = class {
     const childCreationNode = {
       nodeTxSigningJob: void 0,
       refundTxSigningJob: void 0,
-      children: []
+      children: [],
+      directNodeTxSigningJob: void 0,
+      directRefundTxSigningJob: void 0,
+      directFromCpfpRefundTxSigningJob: void 0
     };
     const childTx = new Transaction4({ version: 3 });
     childTx.addInput({
@@ -3619,7 +3536,10 @@ var TreeCreationService = class {
     const rootCreationNode = {
       nodeTxSigningJob: rootNodeSigningJob,
       refundTxSigningJob: void 0,
-      children: []
+      children: [],
+      directNodeTxSigningJob: void 0,
+      directRefundTxSigningJob: void 0,
+      directFromCpfpRefundTxSigningJob: void 0
     };
     rootCreationNode.nodeTxSigningCommitment = rootNodeSigningCommitment;
     const leftChild = root.children[0];
@@ -3709,7 +3629,11 @@ var TreeCreationService = class {
       signature: {
         nodeId: creationResponseNode.nodeId,
         nodeTxSignature,
-        refundTxSignature
+        refundTxSignature,
+        // TODO: Add direct refund signature
+        directNodeTxSignature: new Uint8Array(),
+        directRefundTxSignature: new Uint8Array(),
+        directFromCpfpRefundTxSignature: new Uint8Array()
       }
     };
   }
@@ -3761,7 +3685,7 @@ var TreeCreationService = class {
 
 // src/spark-wallet/spark-wallet.ts
 import { LRCWallet } from "@buildonspark/lrc20-sdk";
-import { sha256 as sha2567 } from "@noble/hashes/sha2";
+import { sha256 as sha2566 } from "@noble/hashes/sha2";
 import { EventEmitter } from "eventemitter3";
 
 // src/services/signing.ts
@@ -3842,7 +3766,7 @@ var SigningService = class {
 
 // src/tests/utils/test-faucet.ts
 import { bytesToHex as bytesToHex3, hexToBytes as hexToBytes6 } from "@noble/curves/abstract/utils";
-import { schnorr as schnorr2, secp256k1 as secp256k15 } from "@noble/curves/secp256k1";
+import { schnorr as schnorr2, secp256k1 as secp256k14 } from "@noble/curves/secp256k1";
 import * as btc2 from "@scure/btc-signer";
 import { Address as Address3, OutScript as OutScript3, SigHash, Transaction as Transaction5 } from "@scure/btc-signer";
 import { taprootTweakPrivKey } from "@scure/btc-signer/utils";
@@ -3862,7 +3786,7 @@ var BitcoinFaucet = class _BitcoinFaucet {
     this.username = username;
     this.password = password;
     this.miningAddress = getP2TRAddressFromPublicKey(
-      secp256k15.getPublicKey(STATIC_MINING_KEY),
+      secp256k14.getPublicKey(STATIC_MINING_KEY),
       4 /* LOCAL */
     );
   }
@@ -3901,7 +3825,7 @@ var BitcoinFaucet = class _BitcoinFaucet {
     });
   }
   async refill() {
-    const minerPubKey = secp256k15.getPublicKey(STATIC_MINING_KEY);
+    const minerPubKey = secp256k14.getPublicKey(STATIC_MINING_KEY);
     const address = getP2TRAddressFromPublicKey(minerPubKey, 4 /* LOCAL */);
     const scanResult = await this.call("scantxoutset", [
       "start",
@@ -3950,7 +3874,7 @@ var BitcoinFaucet = class _BitcoinFaucet {
       txid: selectedUtxo.txid,
       index: selectedUtxo.vout
     });
-    const faucetPubKey = secp256k15.getPublicKey(STATIC_FAUCET_KEY);
+    const faucetPubKey = secp256k14.getPublicKey(STATIC_FAUCET_KEY);
     const script = getP2TRScriptFromPublicKey(faucetPubKey, 4 /* LOCAL */);
     for (let i = 0; i < numCoinsToCreate; i++) {
       splitTx.addOutput({
@@ -4011,7 +3935,7 @@ var BitcoinFaucet = class _BitcoinFaucet {
     await this.broadcastTx(bytesToHex3(signedTx.extract()));
   }
   async signFaucetCoin(unsignedTx, fundingTxOut, key) {
-    const pubKey = secp256k15.getPublicKey(key);
+    const pubKey = secp256k14.getPublicKey(key);
     const internalKey = pubKey.slice(1);
     const script = getP2TRScriptFromPublicKey(pubKey, 4 /* LOCAL */);
     unsignedTx.updateInput(0, {
@@ -4093,8 +4017,8 @@ var BitcoinFaucet = class _BitcoinFaucet {
     return response;
   }
   async getNewAddress() {
-    const key = secp256k15.utils.randomPrivateKey();
-    const pubKey = secp256k15.getPublicKey(key);
+    const key = secp256k14.utils.randomPrivateKey();
+    const pubKey = secp256k14.getPublicKey(key);
     return getP2TRAddressFromPublicKey(pubKey, 4 /* LOCAL */);
   }
   async sendToAddress(address, amount) {
@@ -4115,8 +4039,8 @@ var BitcoinFaucet = class _BitcoinFaucet {
     });
     const changeAmount = availableAmount - amount;
     if (changeAmount > 0) {
-      const changeKey = secp256k15.utils.randomPrivateKey();
-      const changePubKey = secp256k15.getPublicKey(changeKey);
+      const changeKey = secp256k14.utils.randomPrivateKey();
+      const changePubKey = secp256k14.getPublicKey(changeKey);
       const changeScript = getP2TRScriptFromPublicKey(
         changePubKey,
         4 /* LOCAL */
@@ -4129,8 +4053,8 @@ var BitcoinFaucet = class _BitcoinFaucet {
     const signedTx = await this.signFaucetCoin(tx, coin.txout, coin.key);
     const txHex = bytesToHex3(signedTx.extract());
     await this.broadcastTx(txHex);
-    const randomKey = secp256k15.utils.randomPrivateKey();
-    const randomPubKey = secp256k15.getPublicKey(randomKey);
+    const randomKey = secp256k14.utils.randomPrivateKey();
+    const randomPubKey = secp256k14.getPublicKey(randomKey);
     const randomAddress = getP2TRAddressFromPublicKey(
       randomPubKey,
       4 /* LOCAL */
@@ -4152,6 +4076,35 @@ function chunkArray(arr, size) {
   return chunks;
 }
 
+// src/utils/token-identifier.ts
+import { bech32m } from "@scure/base";
+var HumanReadableTokenIdentifierNetworkPrefix = {
+  MAINNET: "btk",
+  REGTEST: "btkrt",
+  TESTNET: "btkt",
+  SIGNET: "btks",
+  LOCAL: "btkl"
+};
+function encodeHumanReadableTokenIdentifier(payload) {
+  try {
+    const words = bech32m.toWords(payload.tokenIdentifier);
+    return bech32m.encode(
+      HumanReadableTokenIdentifierNetworkPrefix[payload.network],
+      words,
+      500
+    );
+  } catch (error) {
+    throw new ValidationError(
+      "Failed to encode human readable token identifier",
+      {
+        field: "tokenIdentifier",
+        value: payload.tokenIdentifier
+      },
+      error
+    );
+  }
+}
+
 // src/spark-wallet/spark-wallet.ts
 var SparkWallet = class _SparkWallet extends EventEmitter {
   config;
@@ -4262,7 +4215,7 @@ var SparkWallet = class _SparkWallet extends EventEmitter {
       } else if (event?.$case === "deposit" && event.deposit.deposit) {
         const deposit = event.deposit.deposit;
         const signingKey = await this.config.signer.generatePublicKey(
-          sha2567(deposit.id)
+          sha2566(deposit.id)
         );
         const newLeaf = await this.transferService.extendTimelock(
           deposit,
@@ -4417,7 +4370,7 @@ var SparkWallet = class _SparkWallet extends EventEmitter {
             if (leaf.status !== operatorLeaf.status || !leaf.signingKeyshare || !operatorLeaf.signingKeyshare || !equalBytes3(
               leaf.signingKeyshare.publicKey,
               operatorLeaf.signingKeyshare.publicKey
-            ) || !equalBytes3(leaf.nodeTx, operatorLeaf.nodeTx) || !equalBytes3(leaf.refundTx, operatorLeaf.refundTx)) {
+            ) || !equalBytes3(leaf.nodeTx, operatorLeaf.nodeTx)) {
               leavesToIgnore.add(nodeId);
             }
           }
@@ -4429,7 +4382,7 @@ var SparkWallet = class _SparkWallet extends EventEmitter {
     };
     for (const [id, leaf] of Object.entries(leaves.nodes)) {
       if (!verifyKey(
-        await this.config.signer.generatePublicKey(sha2567(leaf.id)),
+        await this.config.signer.generatePublicKey(sha2566(leaf.id)),
         leaf.signingKeyshare?.publicKey ?? new Uint8Array(),
         leaf.verifyingPublicKey
       )) {
@@ -4810,7 +4763,7 @@ var SparkWallet = class _SparkWallet extends EventEmitter {
       leavesBatch.map(async (leaf) => ({
         leaf,
         signingPubKey: await this.config.signer.generatePublicKey(
-          sha2567(leaf.id)
+          sha2566(leaf.id)
         ),
         newSigningPubKey: await this.config.signer.generatePublicKey()
       }))
@@ -4863,7 +4816,7 @@ var SparkWallet = class _SparkWallet extends EventEmitter {
       }
       const sspClient = this.getSspClient();
       const adaptorPubkey = bytesToHex4(
-        secp256k16.getPublicKey(adaptorPrivateKey)
+        secp256k15.getPublicKey(adaptorPrivateKey)
       );
       let request = null;
       request = await sspClient.requestLeaveSwap({
@@ -4969,27 +4922,6 @@ var SparkWallet = class _SparkWallet extends EventEmitter {
       offset: transfers.offset
     };
   }
-  /**
-   * Gets the held token info for the wallet.
-   *
-   * @deprecated The information is returned in getBalance
-   */
-  async getTokenInfo() {
-    console.warn("getTokenInfo is deprecated. Use getBalance instead.");
-    await this.syncTokenOutputs();
-    const lrc20Client = await this.lrc20ConnectionManager.createLrc20Client();
-    const { balance, tokenBalances } = await this.getBalance();
-    const tokenInfo = await lrc20Client.getTokenPubkeyInfo({
-      publicKeys: Array.from(tokenBalances.keys()).map(hexToBytes7)
-    });
-    return tokenInfo.tokenPubkeyInfos.map((info) => ({
-      tokenPublicKey: bytesToHex4(info.announcement.publicKey.publicKey),
-      tokenName: info.announcement.name,
-      tokenSymbol: info.announcement.symbol,
-      tokenDecimals: Number(bytesToNumberBE2(info.announcement.decimal)),
-      maxSupply: bytesToNumberBE2(info.announcement.maxSupply)
-    }));
-  }
   /**
    * Gets the current balance of the wallet.
    * You can use the forceRefetch option to synchronize your wallet and claim any
@@ -4997,7 +4929,7 @@ var SparkWallet = class _SparkWallet extends EventEmitter {
    *
    * @returns {Promise<Object>} Object containing:
    *   - balance: The wallet's current balance in satoshis
-   *   - tokenBalances: Map of token public keys to token balances and token info
+   *   - tokenBalances: Map of the human readable token identifier to token balances and token info
    */
   async getBalance() {
     const leaves = await this.getLeaves(true);
@@ -5014,24 +4946,29 @@ var SparkWallet = class _SparkWallet extends EventEmitter {
     };
   }
   async getTokenBalance() {
-    const lrc20Client = await this.lrc20ConnectionManager.createLrc20Client();
-    const tokenInfo = await lrc20Client.getTokenPubkeyInfo({
-      publicKeys: Array.from(this.tokenOutputs.keys()).map(hexToBytes7)
+    const sparkTokenClient = await this.connectionManager.createSparkTokenClient(
+      this.config.getCoordinatorAddress()
+    );
+    const tokenMetadata = await sparkTokenClient.query_token_metadata({
+      issuerPublicKeys: Array.from(this.tokenOutputs.keys()).map(hexToBytes7)
     });
     const result = /* @__PURE__ */ new Map();
-    for (const info of tokenInfo.tokenPubkeyInfos) {
-      const tokenPublicKey = bytesToHex4(
-        info.announcement.publicKey.publicKey
-      );
+    for (const metadata of tokenMetadata.tokenMetadata) {
+      const tokenPublicKey = bytesToHex4(metadata.issuerPublicKey);
       const leaves = this.tokenOutputs.get(tokenPublicKey);
-      result.set(tokenPublicKey, {
+      const humanReadableTokenIdentifier = encodeHumanReadableTokenIdentifier({
+        tokenIdentifier: metadata.tokenIdentifier,
+        network: this.config.getNetworkType()
+      });
+      result.set(humanReadableTokenIdentifier, {
         balance: leaves ? calculateAvailableTokenAmount(leaves) : BigInt(0),
-        tokenInfo: {
+        tokenMetadata: {
           tokenPublicKey,
-          tokenName: info.announcement.name,
-          tokenSymbol: info.announcement.symbol,
-          tokenDecimals: Number(bytesToNumberBE2(info.announcement.decimal)),
-          maxSupply: bytesToNumberBE2(info.announcement.maxSupply)
+          rawTokenIdentifier: metadata.tokenIdentifier,
+          tokenName: metadata.tokenName,
+          tokenTicker: metadata.tokenTicker,
+          decimals: metadata.decimals,
+          maxSupply: bytesToNumberBE2(metadata.maxSupply)
         }
       });
     }
@@ -5089,7 +5026,7 @@ var SparkWallet = class _SparkWallet extends EventEmitter {
       signingPubkey = await this.config.signer.generateStaticDepositKey(0);
     } else {
       signingPubkey = await this.config.signer.generatePublicKey(
-        sha2567(leafId)
+        sha2566(leafId)
       );
     }
     const address = await this.depositService.generateDepositAddress({
@@ -5176,7 +5113,7 @@ var SparkWallet = class _SparkWallet extends EventEmitter {
       creditAmountSats,
       sspSignature
     );
-    const hashBuffer = sha2567(message);
+    const hashBuffer = sha2566(message);
     const signatureBytes = await this.config.signer.signMessageWithIdentityKey(hashBuffer);
     const signature = bytesToHex4(signatureBytes);
     const response = await this.sspClient.claimStaticDeposit({
@@ -5265,7 +5202,7 @@ var SparkWallet = class _SparkWallet extends EventEmitter {
       creditAmountSats,
       bytesToHex4(spendTxSighash)
     );
-    const hashBuffer = sha2567(message);
+    const hashBuffer = sha2566(message);
     const swapResponseUserSignature = await this.config.signer.signMessageWithIdentityKey(hashBuffer);
     const sparkClient = await this.connectionManager.createSparkClient(
       this.config.getCoordinatorAddress()
@@ -5599,7 +5536,7 @@ var SparkWallet = class _SparkWallet extends EventEmitter {
         signingPubKey = depositAddress.userSigningPublicKey;
       } else {
         signingPubKey = await this.config.signer.generatePublicKey(
-          sha2567(depositAddress.leafId)
+          sha2566(depositAddress.leafId)
         );
       }
       const nodes2 = await this.finalizeDeposit({
@@ -5740,7 +5677,7 @@ var SparkWallet = class _SparkWallet extends EventEmitter {
         leavesToSend.map(async (leaf) => ({
           leaf,
           signingPubKey: await this.config.signer.generatePublicKey(
-            sha2567(leaf.id)
+            sha2566(leaf.id)
           ),
           newSigningPubKey: await this.config.signer.generatePublicKey()
         }))
@@ -5789,7 +5726,7 @@ var SparkWallet = class _SparkWallet extends EventEmitter {
     const nodesToAdd = [];
     for (const node of nodesToExtend) {
       const signingPubKey = await this.config.signer.generatePublicKey(
-        sha2567(node.id)
+        sha2566(node.id)
       );
       const { nodes: nodes2 } = await this.transferService.extendTimelock(
         node,
@@ -5856,7 +5793,7 @@ var SparkWallet = class _SparkWallet extends EventEmitter {
       const { nodes: nodes2 } = await this.transferService.refreshTimelockNodes(
         [node],
         parentNode,
-        await this.config.signer.generatePublicKey(sha2567(node.id))
+        await this.config.signer.generatePublicKey(sha2566(node.id))
       );
       if (nodes2.length !== 1) {
         throw new Error(`expected 1 node, got ${nodes2.length}`);
@@ -5908,7 +5845,7 @@ var SparkWallet = class _SparkWallet extends EventEmitter {
                 },
                 signingPubKey: leafPubKey,
                 newSigningPubKey: await this.config.signer.generatePublicKey(
-                  sha2567(leaf.leaf.id)
+                  sha2566(leaf.leaf.id)
                 )
               });
             }
@@ -6101,22 +6038,9 @@ var SparkWallet = class _SparkWallet extends EventEmitter {
         const sparkFallbackAddress = decodeInvoice(
           invoice2.invoice.encodedInvoice
         ).fallbackAddress;
-        if (sparkFallbackAddress && isValidSparkFallback(hexToBytes7(sparkFallbackAddress))) {
-          const invoiceIdentityPubkey = sparkFallbackAddress.slice(6);
-          const expectedIdentityPubkey = receiverIdentityPubkey2 ?? await this.getIdentityPublicKey();
-          if (invoiceIdentityPubkey !== expectedIdentityPubkey) {
-            throw new ValidationError(
-              "Mismatch between spark identity embedded in lightning invoice and designated recipient spark identity",
-              {
-                field: "sparkFallbackAddress",
-                value: invoiceIdentityPubkey,
-                expected: expectedIdentityPubkey
-              }
-            );
-          }
-        } else {
+        if (!sparkFallbackAddress) {
           throw new ValidationError(
-            "No valid spark fallback address found in lightning invoice",
+            "No spark fallback address found in lightning invoice",
             {
               field: "sparkFallbackAddress",
               value: sparkFallbackAddress,
@@ -6124,6 +6048,17 @@ var SparkWallet = class _SparkWallet extends EventEmitter {
             }
           );
         }
+        const expectedIdentityPubkey = receiverIdentityPubkey2 ?? await this.getIdentityPublicKey();
+        if (sparkFallbackAddress !== expectedIdentityPubkey) {
+          throw new ValidationError(
+            "Mismatch between spark identity embedded in lightning invoice and designated recipient spark identity",
+            {
+              field: "sparkFallbackAddress",
+              value: sparkFallbackAddress,
+              expected: expectedIdentityPubkey
+            }
+          );
+        }
       }
       return invoice2;
     };
@@ -6202,9 +6137,8 @@ var SparkWallet = class _SparkWallet extends EventEmitter {
           "No valid spark address found in invoice. Defaulting to lightning."
         );
       } else {
-        const identityPublicKey = sparkFallbackAddress.slice(6);
         const receiverSparkAddress = encodeSparkAddress({
-          identityPublicKey,
+          identityPublicKey: sparkFallbackAddress,
           network: Network[invoiceNetwork]
         });
         return await this.transfer({
@@ -6242,7 +6176,7 @@ var SparkWallet = class _SparkWallet extends EventEmitter {
         leaves.map(async (leaf) => ({
           leaf,
           signingPubKey: await this.config.signer.generatePublicKey(
-            sha2567(leaf.id)
+            sha2566(leaf.id)
           ),
           newSigningPubKey: await this.config.signer.generatePublicKey()
         }))
@@ -6454,7 +6388,7 @@ var SparkWallet = class _SparkWallet extends EventEmitter {
       [...leavesToSendToSE, ...leavesToSendToSsp].map(async (leaf) => ({
         leaf,
         signingPubKey: await this.config.signer.generatePublicKey(
-          sha2567(leaf.id)
+          sha2566(leaf.id)
         ),
         newSigningPubKey: await this.config.signer.generatePublicKey()
       }))
@@ -6555,7 +6489,14 @@ var SparkWallet = class _SparkWallet extends EventEmitter {
    * @returns {Promise<Transfer | undefined>} The transfer
    */
   async getTransfer(id) {
-    return await this.transferService.queryTransfer(id);
+    const transfer = await this.transferService.queryTransfer(id);
+    if (!transfer) {
+      return void 0;
+    }
+    return mapTransferToWalletTransfer(
+      transfer,
+      bytesToHex4(await this.config.signer.getIdentityPublicKey())
+    );
   }
   // ***** Token Flow *****
   /**
@@ -6566,10 +6507,9 @@ var SparkWallet = class _SparkWallet extends EventEmitter {
    */
   async syncTokenOutputs() {
     this.tokenOutputs.clear();
-    const unsortedTokenOutputs = await this.tokenTransactionService.fetchOwnedTokenOutputs(
-      [await this.config.signer.getIdentityPublicKey()],
-      []
-    );
+    const unsortedTokenOutputs = await this.tokenTransactionService.fetchOwnedTokenOutputs({
+      ownerPublicKeys: [await this.config.signer.getIdentityPublicKey()]
+    });
     const filteredTokenOutputs = unsortedTokenOutputs.filter(
       (output) => !this.pendingWithdrawnOutputIds.includes(output.output?.id || "")
     );
@@ -6668,29 +6608,21 @@ var SparkWallet = class _SparkWallet extends EventEmitter {
    * Retrieves token transaction history for specified tokens owned by the wallet.
    * Can optionally filter by specific transaction hashes.
    *
-   * @param tokenPublicKeys - Array of token public keys to query transactions for
+   * @param ownerPublicKeys - Optional array of owner public keys to query transactions for
+   * @param issuerPublicKeys - Optional array of issuer public keys to query transactions for
    * @param tokenTransactionHashes - Optional array of specific transaction hashes to filter by
+   * @param tokenIdentifiers - Optional array of token identifiers to filter by
+   * @param outputIds - Optional array of output IDs to filter by
    * @returns Promise resolving to array of token transactions with their current status
    */
-  async queryTokenTransactions(tokenPublicKeys, tokenTransactionHashes) {
-    const sparkClient = await this.connectionManager.createSparkClient(
-      this.config.getCoordinatorAddress()
-    );
-    let queryParams;
-    if (tokenTransactionHashes?.length) {
-      queryParams = {
-        tokenPublicKeys: tokenPublicKeys?.map(hexToBytes7),
-        ownerPublicKeys: [hexToBytes7(await this.getIdentityPublicKey())],
-        tokenTransactionHashes: tokenTransactionHashes.map(hexToBytes7)
-      };
-    } else {
-      queryParams = {
-        tokenPublicKeys: tokenPublicKeys?.map(hexToBytes7),
-        ownerPublicKeys: [hexToBytes7(await this.getIdentityPublicKey())]
-      };
-    }
-    const response = await sparkClient.query_token_transactions(queryParams);
-    return response.tokenTransactionsWithStatus;
+  async queryTokenTransactions(ownerPublicKeys, issuerPublicKeys, tokenTransactionHashes, tokenIdentifiers, outputIds) {
+    return this.tokenTransactionService.queryTokenTransactions({
+      ownerPublicKeys,
+      issuerPublicKeys,
+      tokenTransactionHashes,
+      tokenIdentifiers,
+      outputIds
+    });
   }
   async getTokenL1Address() {
     return getP2WPKHAddressFromPublicKey(
@@ -6706,7 +6638,7 @@ var SparkWallet = class _SparkWallet extends EventEmitter {
    * @returns {Promise<string>} The signed message
    */
   async signMessageWithIdentityKey(message, compact) {
-    const hash = sha2567(message);
+    const hash = sha2566(message);
     const signature = await this.config.signer.signMessageWithIdentityKey(
       hash,
       compact
@@ -6721,7 +6653,7 @@ var SparkWallet = class _SparkWallet extends EventEmitter {
    * @returns {Promise<boolean>} Whether the message is valid
    */
   async validateMessageWithIdentityKey(message, signature) {
-    const hash = sha2567(message);
+    const hash = sha2566(message);
     if (typeof signature === "string") {
       signature = hexToBytes7(signature);
     }
@@ -7028,7 +6960,7 @@ var SparkWallet = class _SparkWallet extends EventEmitter {
         });
       }
       const signingPubKey = await this.config.signer.generatePublicKey(
-        sha2567(node.id)
+        sha2566(node.id)
       );
       const result = await this.transferService.refreshTimelockNodes(
         [node],
@@ -7080,7 +7012,7 @@ var SparkWallet = class _SparkWallet extends EventEmitter {
         });
       }
       const signingPubKey = await this.config.signer.generatePublicKey(
-        sha2567(node.id)
+        sha2566(node.id)
       );
       const result = await this.transferService.refreshTimelockRefundTx(
         node,