@buildonspark/spark-sdk 0.1.41 → 0.1.43

package/dist/native/index.js

@@ -4,6 +4,7 @@ import {
 } from "./chunk-C3WN3D4O.js";
 
 // src/errors/base.ts
+import { bytesToHex } from "@noble/hashes/utils";
 var SparkSDKError = class extends Error {
   context;
   originalError;
@@ -35,12 +36,42 @@ var SparkSDKError = class extends Error {
   }
 };
 function getMessage(message, context = {}, originalError) {
-  const contextStr = Object.entries(context).map(([key, value]) => `${key}: ${JSON.stringify(value)}`).join(", ");
+  const contextStr = Object.entries(context).map(([key, value]) => `${key}: ${safeStringify(value)}`).join(", ");
   const originalErrorStr = originalError ? `
 Original Error: ${originalError.message}` : "";
   return `SparkSDKError: ${message}${contextStr ? `
 Context: ${contextStr}` : ""}${originalErrorStr}`;
 }
+function safeStringify(value) {
+  const replacer = (_, v) => {
+    if (typeof v === "bigint") {
+      return v.toString();
+    }
+    if (v instanceof Uint8Array) {
+      return formatUint8Array(v);
+    }
+    return v;
+  };
+  if (typeof value === "bigint") {
+    return `"${value.toString()}"`;
+  }
+  if (value instanceof Uint8Array) {
+    return `"${formatUint8Array(value)}"`;
+  }
+  try {
+    const result = JSON.stringify(value, replacer);
+    return result === void 0 ? String(value) : result;
+  } catch {
+    try {
+      return String(value);
+    } catch {
+      return "[Unserializable]";
+    }
+  }
+}
+function formatUint8Array(arr) {
+  return `Uint8Array(0x${bytesToHex(arr)})`;
+}
 
 // src/errors/types.ts
 var NetworkError = class extends SparkSDKError {
@@ -80,7 +111,7 @@ var NotImplementedError = class extends SparkSDKError {
 };
 
 // src/signer/signer.react-native.ts
-import { bytesToHex as bytesToHex3, hexToBytes as hexToBytes2 } from "@noble/hashes/utils";
+import { bytesToHex as bytesToHex4, hexToBytes as hexToBytes2 } from "@noble/hashes/utils";
 
 // src/spark_bindings/native/index.ts
 import { NativeModules } from "react-native";
@@ -206,10 +237,13 @@ var NativeSparkFrost = class {
     return toUint8Array(result);
   }
 };
+async function createDummyTx(address2, amountSats) {
+  return NativeSparkFrost.createDummyTx(address2, amountSats);
+}
 
 // src/signer/signer.ts
 import {
-  bytesToHex as bytesToHex2,
+  bytesToHex as bytesToHex3,
   bytesToNumberBE as bytesToNumberBE2,
   equalBytes as equalBytes2,
   hexToBytes
@@ -221,8 +255,20 @@ import { wordlist } from "@scure/bip39/wordlists/english";
 import * as ecies from "eciesjs";
 
 // src/constants.ts
+import { isNode } from "@lightsparkdev/core";
 var isReactNative = typeof navigator !== "undefined" && navigator.product === "ReactNative";
 var isBun = globalThis.Bun !== void 0;
+var packageVersion = true ? "0.1.43" : "unknown";
+var baseEnvStr = "unknown";
+if (isNode) {
+  baseEnvStr = `node/${process.version}`;
+} else if (isReactNative) {
+  baseEnvStr = "react-native";
+} else {
+  const userAgent = typeof navigator !== "undefined" && navigator.userAgent || "unknown-user-agent";
+  baseEnvStr = `browser/${userAgent}`;
+}
+var clientEnv = `js-spark-sdk/${packageVersion} ${baseEnvStr}`;
 
 // src/utils/adaptor-signature.ts
 import { mod } from "@noble/curves/abstract/modular";
@@ -444,7 +490,7 @@ function lastKeyWithTarget(target, keys) {
 }
 
 // src/utils/secret-sharing.ts
-import { bytesToHex, equalBytes } from "@noble/curves/abstract/utils";
+import { bytesToHex as bytesToHex2, equalBytes } from "@noble/curves/abstract/utils";
 import { secp256k1 as secp256k13 } from "@noble/curves/secp256k1";
 
 // src/utils/crypto.ts
@@ -462,7 +508,7 @@ function getRandomBigInt(max) {
   const mask = (1n << BigInt(max.toString(2).length)) - 1n;
   while (true) {
     const randBytes = crypto.getRandomValues(new Uint8Array(byteLength + 1));
-    const randValue = BigInt("0x" + bytesToHex(randBytes)) & mask;
+    const randValue = BigInt("0x" + bytesToHex2(randBytes)) & mask;
     if (randValue < maxBigInt) {
       return randValue;
     }
@@ -747,6 +793,8 @@ import {
 } from "@buildonspark/lrc20-sdk";
 import { sha256 } from "@noble/hashes/sha2";
 import { taprootTweakPrivKey } from "@scure/btc-signer/utils";
+import { Receipt as Receipt2, PARITY as PARITY2, fromPrivateKey as fromPrivateKey2 } from "@buildonspark/lrc20-sdk";
+import { MultisigReceiptInput } from "@buildonspark/lrc20-sdk/lrc/types";
 var sparkFrostModule = void 0;
 var getSparkFrostModule = async () => {
   if (isReactNative) {
@@ -845,13 +893,13 @@ var DefaultSparkSigner = class {
       const privateKey = this.deriveSigningKey(hash);
       const publicKey = secp256k15.getPublicKey(privateKey);
       this.publicKeyToPrivateKeyMap.set(
-        bytesToHex2(publicKey),
-        bytesToHex2(privateKey)
+        bytesToHex3(publicKey),
+        bytesToHex3(privateKey)
       );
     }
   }
   async getSchnorrPublicKey(publicKey) {
-    const privateKey = this.publicKeyToPrivateKeyMap.get(bytesToHex2(publicKey));
+    const privateKey = this.publicKeyToPrivateKeyMap.get(bytesToHex3(publicKey));
     if (!privateKey) {
       throw new ValidationError("Private key is not set", {
         field: "privateKey"
@@ -860,7 +908,7 @@ var DefaultSparkSigner = class {
     return schnorr2.getPublicKey(hexToBytes(privateKey));
   }
   async signSchnorr(message, publicKey) {
-    const privateKey = this.publicKeyToPrivateKeyMap.get(bytesToHex2(publicKey));
+    const privateKey = this.publicKeyToPrivateKeyMap.get(bytesToHex3(publicKey));
     if (!privateKey) {
       throw new ValidationError("Private key is not set", {
         field: "privateKey"
@@ -908,8 +956,8 @@ var DefaultSparkSigner = class {
     );
     this.staticDepositKeyMap.set(idx, staticDepositKey);
     this.publicKeyToPrivateKeyMap.set(
-      bytesToHex2(staticDepositKey.publicKey),
-      bytesToHex2(staticDepositKey.privateKey)
+      bytesToHex3(staticDepositKey.publicKey),
+      bytesToHex3(staticDepositKey.privateKey)
     );
     return staticDepositKey.publicKey;
   }
@@ -974,17 +1022,17 @@ var DefaultSparkSigner = class {
       });
     }
     const publicKey = secp256k15.getPublicKey(newPrivateKey);
-    const pubKeyHex = bytesToHex2(publicKey);
-    const privKeyHex = bytesToHex2(newPrivateKey);
+    const pubKeyHex = bytesToHex3(publicKey);
+    const privKeyHex = bytesToHex3(newPrivateKey);
     this.publicKeyToPrivateKeyMap.set(pubKeyHex, privKeyHex);
     return publicKey;
   }
   async removePublicKey(publicKey) {
-    this.publicKeyToPrivateKeyMap.delete(bytesToHex2(publicKey));
+    this.publicKeyToPrivateKeyMap.delete(bytesToHex3(publicKey));
   }
   async subtractPrivateKeysGivenPublicKeys(first, second) {
-    const firstPubKeyHex = bytesToHex2(first);
-    const secondPubKeyHex = bytesToHex2(second);
+    const firstPubKeyHex = bytesToHex3(first);
+    const secondPubKeyHex = bytesToHex3(second);
     const firstPrivateKeyHex = this.publicKeyToPrivateKeyMap.get(firstPubKeyHex);
     const secondPrivateKeyHex = this.publicKeyToPrivateKeyMap.get(secondPubKeyHex);
     if (!firstPrivateKeyHex || !secondPrivateKeyHex) {
@@ -997,8 +1045,8 @@ var DefaultSparkSigner = class {
       secondPrivateKey
     );
     const resultPubKey = secp256k15.getPublicKey(resultPrivKey);
-    const resultPrivKeyHex = bytesToHex2(resultPrivKey);
-    const resultPubKeyHex = bytesToHex2(resultPubKey);
+    const resultPrivKeyHex = bytesToHex3(resultPrivKey);
+    const resultPubKeyHex = bytesToHex3(resultPubKey);
     this.publicKeyToPrivateKeyMap.set(resultPubKeyHex, resultPrivKeyHex);
     return resultPubKey;
   }
@@ -1010,7 +1058,7 @@ var DefaultSparkSigner = class {
     isSecretPubkey = false
   }) {
     if (isSecretPubkey) {
-      const pubKeyHex = bytesToHex2(secret);
+      const pubKeyHex = bytesToHex3(secret);
       const privateKey = this.publicKeyToPrivateKeyMap.get(pubKeyHex);
       if (!privateKey) {
         throw new Error("Private key is not set");
@@ -1035,7 +1083,7 @@ var DefaultSparkSigner = class {
         field: "SparkFrost"
       });
     }
-    const privateAsPubKeyHex = bytesToHex2(privateAsPubKey);
+    const privateAsPubKeyHex = bytesToHex3(privateAsPubKey);
     const signingPrivateKey = this.publicKeyToPrivateKeyMap.get(privateAsPubKeyHex);
     if (!signingPrivateKey) {
       throw new ValidationError("Private key not found for public key", {
@@ -1108,25 +1156,25 @@ var DefaultSparkSigner = class {
     this.signingKey = signingKey.hdKey;
     this.staticDepositKey = staticDepositKey.hdKey;
     this.publicKeyToPrivateKeyMap.set(
-      bytesToHex2(identityKey.publicKey),
-      bytesToHex2(identityKey.privateKey)
+      bytesToHex3(identityKey.publicKey),
+      bytesToHex3(identityKey.privateKey)
     );
     this.publicKeyToPrivateKeyMap.set(
-      bytesToHex2(depositKey.publicKey),
-      bytesToHex2(depositKey.privateKey)
+      bytesToHex3(depositKey.publicKey),
+      bytesToHex3(depositKey.privateKey)
     );
     this.publicKeyToPrivateKeyMap.set(
-      bytesToHex2(staticDepositKey.publicKey),
-      bytesToHex2(staticDepositKey.privateKey)
+      bytesToHex3(staticDepositKey.publicKey),
+      bytesToHex3(staticDepositKey.privateKey)
     );
-    return bytesToHex2(identityKey.publicKey);
+    return bytesToHex3(identityKey.publicKey);
   }
   async signMessageWithPublicKey(message, publicKey, compact) {
-    const privateKey = this.publicKeyToPrivateKeyMap.get(bytesToHex2(publicKey));
+    const privateKey = this.publicKeyToPrivateKeyMap.get(bytesToHex3(publicKey));
     if (!privateKey) {
       throw new ValidationError("Private key not found for public key", {
         field: "privateKey",
-        value: bytesToHex2(publicKey)
+        value: bytesToHex3(publicKey)
       });
     }
     const signature = secp256k15.sign(message, hexToBytes(privateKey));
@@ -1148,7 +1196,7 @@ var DefaultSparkSigner = class {
     return signature.toDERRawBytes();
   }
   async encryptLeafPrivateKeyEcies(receiverPublicKey, publicKey) {
-    const publicKeyHex = bytesToHex2(publicKey);
+    const publicKeyHex = bytesToHex3(publicKey);
     const privateKey = this.publicKeyToPrivateKeyMap.get(publicKeyHex);
     if (!privateKey) {
       throw new Error("Private key is not set");
@@ -1162,12 +1210,12 @@ var DefaultSparkSigner = class {
       });
     }
     const receiverEciesPrivKey = ecies.PrivateKey.fromHex(
-      bytesToHex2(this.identityKey.privateKey)
+      bytesToHex3(this.identityKey.privateKey)
     );
     const privateKey = ecies.decrypt(receiverEciesPrivKey.toHex(), ciphertext);
     const publicKey = secp256k15.getPublicKey(privateKey);
-    const publicKeyHex = bytesToHex2(publicKey);
-    const privateKeyHex = bytesToHex2(privateKey);
+    const publicKeyHex = bytesToHex3(publicKey);
+    const privateKeyHex = bytesToHex3(privateKey);
     this.publicKeyToPrivateKeyMap.set(publicKeyHex, privateKeyHex);
     return publicKey;
   }
@@ -1184,8 +1232,8 @@ var DefaultSparkSigner = class {
     const adaptor = generateAdaptorFromSignature(signature);
     const adaptorPublicKey = secp256k15.getPublicKey(adaptor.adaptorPrivateKey);
     this.publicKeyToPrivateKeyMap.set(
-      bytesToHex2(adaptorPublicKey),
-      bytesToHex2(adaptor.adaptorPrivateKey)
+      bytesToHex3(adaptorPublicKey),
+      bytesToHex3(adaptor.adaptorPrivateKey)
     );
     return {
       adaptorSignature: signature,
@@ -1242,13 +1290,13 @@ var DefaultSparkSigner = class {
       privateKey = this.depositKey?.privateKey;
     } else {
       privateKey = hexToBytes(
-        this.publicKeyToPrivateKeyMap.get(bytesToHex2(publicKey)) ?? ""
+        this.publicKeyToPrivateKeyMap.get(bytesToHex3(publicKey)) ?? ""
       );
     }
     if (!privateKey) {
       throw new ValidationError("Private key not found for public key", {
         field: "privateKey",
-        value: bytesToHex2(publicKey)
+        value: bytesToHex3(publicKey)
       });
     }
     tx.signIdx(privateKey, index);
@@ -1266,7 +1314,7 @@ var ReactNativeSparkSigner = class extends DefaultSparkSigner {
     statechainCommitments,
     adaptorPubKey
   }) {
-    const privateAsPubKeyHex = bytesToHex3(privateAsPubKey);
+    const privateAsPubKeyHex = bytesToHex4(privateAsPubKey);
     const signingPrivateKey = this.publicKeyToPrivateKeyMap.get(privateAsPubKeyHex);
     if (!signingPrivateKey) {
       throw new ValidationError("Private key not found for public key", {
@@ -1319,9 +1367,9 @@ var ReactNativeSparkSigner = class extends DefaultSparkSigner {
 };
 
 // src/spark-wallet/spark-wallet.ts
-import { isNode as isNode4, mapCurrencyAmount } from "@lightsparkdev/core";
+import { isNode as isNode5, mapCurrencyAmount } from "@lightsparkdev/core";
 import {
-  bytesToHex as bytesToHex12,
+  bytesToHex as bytesToHex13,
   bytesToNumberBE as bytesToNumberBE8,
   equalBytes as equalBytes5,
   hexToBytes as hexToBytes13,
@@ -1336,7 +1384,7 @@ import { uuidv7 as uuidv75, uuidv7obj } from "uuidv7";
 
 // src/graphql/client.ts
 import {
-  bytesToHex as bytesToHex4,
+  bytesToHex as bytesToHex5,
   DefaultCrypto,
   NodeKeyCache,
   Requester
@@ -1436,10 +1484,21 @@ var CurrencyAmountToJson = (obj) => {
   };
 };
 
+// src/graphql/objects/ExitSpeed.ts
+var ExitSpeed = /* @__PURE__ */ ((ExitSpeed2) => {
+  ExitSpeed2["FUTURE_VALUE"] = "FUTURE_VALUE";
+  ExitSpeed2["FAST"] = "FAST";
+  ExitSpeed2["MEDIUM"] = "MEDIUM";
+  ExitSpeed2["SLOW"] = "SLOW";
+  return ExitSpeed2;
+})(ExitSpeed || {});
+var ExitSpeed_default = ExitSpeed;
+
 // src/graphql/objects/SparkCoopExitRequestStatus.ts
 var SparkCoopExitRequestStatus = /* @__PURE__ */ ((SparkCoopExitRequestStatus2) => {
   SparkCoopExitRequestStatus2["FUTURE_VALUE"] = "FUTURE_VALUE";
   SparkCoopExitRequestStatus2["INITIATED"] = "INITIATED";
+  SparkCoopExitRequestStatus2["INBOUND_TRANSFER_CHECKED"] = "INBOUND_TRANSFER_CHECKED";
   SparkCoopExitRequestStatus2["TX_SIGNED"] = "TX_SIGNED";
   SparkCoopExitRequestStatus2["TX_BROADCASTED"] = "TX_BROADCASTED";
   SparkCoopExitRequestStatus2["WAITING_ON_TX_CONFIRMATIONS"] = "WAITING_ON_TX_CONFIRMATIONS";
@@ -1615,6 +1674,8 @@ var CoopExitRequestFromJson = (obj) => {
     rawCoopExitTransaction: obj["coop_exit_request_raw_coop_exit_transaction"],
     coopExitTxid: obj["coop_exit_request_coop_exit_txid"],
     typename: "CoopExitRequest",
+    feeQuoteId: obj["coop_exit_request_fee_quote"]?.id ?? void 0,
+    exitSpeed: !!obj["coop_exit_request_exit_speed"] ? ExitSpeed_default[obj["coop_exit_request_exit_speed"]] ?? ExitSpeed_default.FUTURE_VALUE : null,
     transfer: !!obj["coop_exit_request_transfer"] ? TransferFromJson(obj["coop_exit_request_transfer"]) : void 0
   };
 };
@@ -1641,6 +1702,10 @@ fragment CoopExitRequestFragment on CoopExitRequest {
         currency_amount_preferred_currency_value_rounded: preferred_currency_value_rounded
         currency_amount_preferred_currency_value_approx: preferred_currency_value_approx
     }
+    coop_exit_request_fee_quote: fee_quote {
+        id
+    }
+    coop_exit_request_exit_speed: exit_speed
     coop_exit_request_status: status
     coop_exit_request_expires_at: expires_at
     coop_exit_request_raw_connector_transaction: raw_connector_transaction
@@ -1657,6 +1722,9 @@ fragment CoopExitRequestFragment on CoopExitRequest {
             currency_amount_preferred_currency_value_approx: preferred_currency_value_approx
         }
         transfer_spark_id: spark_id
+        transfer_user_request: user_request {
+            id
+        }
     }
 }`;
 
@@ -1775,6 +1843,9 @@ fragment LeavesSwapRequestFragment on LeavesSwapRequest {
             currency_amount_preferred_currency_value_approx: preferred_currency_value_approx
         }
         transfer_spark_id: spark_id
+        transfer_user_request: user_request {
+            id
+        }
     }
     leaves_swap_request_outbound_transfer: outbound_transfer {
         __typename
@@ -1787,6 +1858,9 @@ fragment LeavesSwapRequestFragment on LeavesSwapRequest {
             currency_amount_preferred_currency_value_approx: preferred_currency_value_approx
         }
         transfer_spark_id: spark_id
+        transfer_user_request: user_request {
+            id
+        }
     }
     leaves_swap_request_expires_at: expires_at
     leaves_swap_request_swap_leaves: swap_leaves {
@@ -1909,7 +1983,8 @@ var LightningReceiveRequestFromJson = (obj) => {
     status: LightningReceiveRequestStatus_default[obj["lightning_receive_request_status"]] ?? LightningReceiveRequestStatus_default.FUTURE_VALUE,
     typename: "LightningReceiveRequest",
     transfer: !!obj["lightning_receive_request_transfer"] ? TransferFromJson(obj["lightning_receive_request_transfer"]) : void 0,
-    paymentPreimage: obj["lightning_receive_request_payment_preimage"]
+    paymentPreimage: obj["lightning_receive_request_payment_preimage"],
+    receiverIdentityPublicKey: obj["lightning_receive_request_receiver_identity_public_key"]
   };
 };
 var FRAGMENT6 = `
@@ -1948,8 +2023,12 @@ fragment LightningReceiveRequestFragment on LightningReceiveRequest {
             currency_amount_preferred_currency_value_approx: preferred_currency_value_approx
         }
         transfer_spark_id: spark_id
+        transfer_user_request: user_request {
+            id
+        }
     }
     lightning_receive_request_payment_preimage: payment_preimage
+    lightning_receive_request_receiver_identity_public_key: receiver_identity_public_key
 }`;
 
 // src/graphql/mutations/RequestLightningReceive.ts
@@ -2046,6 +2125,9 @@ fragment LightningSendRequestFragment on LightningSendRequest {
             currency_amount_preferred_currency_value_approx: preferred_currency_value_approx
         }
         transfer_spark_id: spark_id
+        transfer_user_request: user_request {
+            id
+        }
     }
     lightning_send_request_payment_preimage: payment_preimage
 }`;
@@ -2055,10 +2137,12 @@ var RequestLightningSend = `
   mutation RequestLightningSend(
     $encoded_invoice: String!
     $idempotency_key: String!
+    $amount_sats: Long
   ) {
     request_lightning_send(input: {
       encoded_invoice: $encoded_invoice
       idempotency_key: $idempotency_key
+      amount_sats: $amount_sats
     }) {
       request {
         ...LightningSendRequestFragment
@@ -2332,10 +2416,12 @@ var LeavesSwapFeeEstimate = `
 var LightningSendFeeEstimate = `
   query LightningSendFeeEstimate(
     $encoded_invoice: String!
+    $amount_sats: Long
   ) {
     lightning_send_fee_estimate(
       input: {
         encoded_invoice: $encoded_invoice
+        amount_sats: $amount_sats
       }
     ) {
       ...LightningSendFeeEstimateOutputFragment
@@ -2409,6 +2495,10 @@ fragment UserRequestFragment on UserRequest {
             currency_amount_preferred_currency_value_rounded: preferred_currency_value_rounded
             currency_amount_preferred_currency_value_approx: preferred_currency_value_approx
         }
+        coop_exit_request_fee_quote: fee_quote {
+            id
+        }
+        coop_exit_request_exit_speed: exit_speed
         coop_exit_request_status: status
         coop_exit_request_expires_at: expires_at
         coop_exit_request_raw_connector_transaction: raw_connector_transaction
@@ -2425,6 +2515,9 @@ fragment UserRequestFragment on UserRequest {
                 currency_amount_preferred_currency_value_approx: preferred_currency_value_approx
             }
             transfer_spark_id: spark_id
+            transfer_user_request: user_request {
+                id
+            }
         }
     }
     ... on LeavesSwapRequest {
@@ -2469,6 +2562,9 @@ fragment UserRequestFragment on UserRequest {
                 currency_amount_preferred_currency_value_approx: preferred_currency_value_approx
             }
             transfer_spark_id: spark_id
+            transfer_user_request: user_request {
+                id
+            }
         }
         leaves_swap_request_outbound_transfer: outbound_transfer {
             __typename
@@ -2481,6 +2577,9 @@ fragment UserRequestFragment on UserRequest {
                 currency_amount_preferred_currency_value_approx: preferred_currency_value_approx
             }
             transfer_spark_id: spark_id
+            transfer_user_request: user_request {
+                id
+            }
         }
         leaves_swap_request_expires_at: expires_at
         leaves_swap_request_swap_leaves: swap_leaves {
@@ -2525,8 +2624,12 @@ fragment UserRequestFragment on UserRequest {
                 currency_amount_preferred_currency_value_approx: preferred_currency_value_approx
             }
             transfer_spark_id: spark_id
+            transfer_user_request: user_request {
+                id
+            }
         }
         lightning_receive_request_payment_preimage: payment_preimage
+        lightning_receive_request_receiver_identity_public_key: receiver_identity_public_key
     }
     ... on LightningSendRequest {
         __typename
@@ -2556,6 +2659,9 @@ fragment UserRequestFragment on UserRequest {
                 currency_amount_preferred_currency_value_approx: preferred_currency_value_approx
             }
             transfer_spark_id: spark_id
+            transfer_user_request: user_request {
+                id
+            }
         }
         lightning_send_request_payment_preimage: payment_preimage
     }
@@ -2636,11 +2742,12 @@ var SspClient = class {
       }
     });
   }
-  async getLightningSendFeeEstimate(encodedInvoice) {
+  async getLightningSendFeeEstimate(encodedInvoice, amountSats) {
     return await this.executeRawQuery({
       queryPayload: LightningSendFeeEstimate,
       variables: {
-        encoded_invoice: encodedInvoice
+        encoded_invoice: encodedInvoice,
+        amount_sats: amountSats
       },
       constructObject: (response) => {
         return LightningSendFeeEstimateOutputFromJson(
@@ -2736,13 +2843,15 @@ var SspClient = class {
   }
   async requestLightningSend({
     encodedInvoice,
-    idempotencyKey
+    idempotencyKey,
+    amountSats
   }) {
     return await this.executeRawQuery({
       queryPayload: RequestLightningSend,
       variables: {
         encoded_invoice: encodedInvoice,
-        idempotency_key: idempotencyKey
+        idempotency_key: idempotencyKey,
+        amount_sats: amountSats
       },
       constructObject: (response) => {
         return LightningSendRequestFromJson(
@@ -2910,7 +3019,7 @@ var SspClient = class {
       {
         queryPayload: GetChallenge,
         variables: {
-          public_key: bytesToHex4(await this.signer.getIdentityPublicKey())
+          public_key: bytesToHex5(await this.signer.getIdentityPublicKey())
         },
         constructObject: (response) => {
           return GetChallengeOutputFromJson(response.get_challenge);
@@ -2926,7 +3035,7 @@ var SspClient = class {
         variables: {
           protected_challenge: protectedChallenge,
           signature,
-          identity_public_key: bytesToHex4(
+          identity_public_key: bytesToHex5(
             await this.signer.getIdentityPublicKey()
           )
         },
@@ -2998,18 +3107,11 @@ var SparkAuthProvider = class {
 // src/graphql/objects/ClaimStaticDeposit.ts
 import { isObject as isObject6 } from "@lightsparkdev/core";
 
-// src/graphql/objects/ExitSpeed.ts
-var ExitSpeed = /* @__PURE__ */ ((ExitSpeed2) => {
-  ExitSpeed2["FUTURE_VALUE"] = "FUTURE_VALUE";
-  ExitSpeed2["FAST"] = "FAST";
-  ExitSpeed2["MEDIUM"] = "MEDIUM";
-  ExitSpeed2["SLOW"] = "SLOW";
-  return ExitSpeed2;
-})(ExitSpeed || {});
-var ExitSpeed_default = ExitSpeed;
+// src/graphql/objects/CoopExitFeeQuote.ts
+import { isObject as isObject7 } from "@lightsparkdev/core";
 
 // src/graphql/objects/SparkWalletUser.ts
-import { isObject as isObject7 } from "@lightsparkdev/core";
+import { isObject as isObject8 } from "@lightsparkdev/core";
 
 // src/proto/spark.ts
 import { BinaryReader as BinaryReader4, BinaryWriter as BinaryWriter4 } from "@bufbuild/protobuf/wire";
@@ -3907,7 +4009,7 @@ var DepositAddressProof = {
   },
   fromJSON(object) {
     return {
-      addressSignatures: isObject8(object.addressSignatures) ? Object.entries(object.addressSignatures).reduce((acc, [key, value]) => {
+      addressSignatures: isObject9(object.addressSignatures) ? Object.entries(object.addressSignatures).reduce((acc, [key, value]) => {
         acc[key] = bytesFromBase642(value);
         return acc;
       }, {}) : {},
@@ -4689,18 +4791,18 @@ var SigningResult = {
   },
   fromJSON(object) {
     return {
-      publicKeys: isObject8(object.publicKeys) ? Object.entries(object.publicKeys).reduce((acc, [key, value]) => {
+      publicKeys: isObject9(object.publicKeys) ? Object.entries(object.publicKeys).reduce((acc, [key, value]) => {
         acc[key] = bytesFromBase642(value);
         return acc;
       }, {}) : {},
-      signingNonceCommitments: isObject8(object.signingNonceCommitments) ? Object.entries(object.signingNonceCommitments).reduce(
+      signingNonceCommitments: isObject9(object.signingNonceCommitments) ? Object.entries(object.signingNonceCommitments).reduce(
         (acc, [key, value]) => {
           acc[key] = SigningCommitment.fromJSON(value);
           return acc;
         },
         {}
       ) : {},
-      signatureShares: isObject8(object.signatureShares) ? Object.entries(object.signatureShares).reduce((acc, [key, value]) => {
+      signatureShares: isObject9(object.signatureShares) ? Object.entries(object.signatureShares).reduce((acc, [key, value]) => {
         acc[key] = bytesFromBase642(value);
         return acc;
       }, {}) : {},
@@ -8728,7 +8830,7 @@ var TransferPackage = {
   fromJSON(object) {
     return {
       leavesToSend: globalThis.Array.isArray(object?.leavesToSend) ? object.leavesToSend.map((e) => UserSignedTxSigningJob.fromJSON(e)) : [],
-      keyTweakPackage: isObject8(object.keyTweakPackage) ? Object.entries(object.keyTweakPackage).reduce((acc, [key, value]) => {
+      keyTweakPackage: isObject9(object.keyTweakPackage) ? Object.entries(object.keyTweakPackage).reduce((acc, [key, value]) => {
         acc[key] = bytesFromBase642(value);
         return acc;
       }, {}) : {},
@@ -8990,7 +9092,7 @@ var SendLeafKeyTweak = {
     return {
       leafId: isSet3(object.leafId) ? globalThis.String(object.leafId) : "",
       secretShareTweak: isSet3(object.secretShareTweak) ? SecretShare.fromJSON(object.secretShareTweak) : void 0,
-      pubkeySharesTweak: isObject8(object.pubkeySharesTweak) ? Object.entries(object.pubkeySharesTweak).reduce((acc, [key, value]) => {
+      pubkeySharesTweak: isObject9(object.pubkeySharesTweak) ? Object.entries(object.pubkeySharesTweak).reduce((acc, [key, value]) => {
         acc[key] = bytesFromBase642(value);
         return acc;
       }, {}) : {},
@@ -9963,7 +10065,7 @@ var ClaimLeafKeyTweak = {
     return {
       leafId: isSet3(object.leafId) ? globalThis.String(object.leafId) : "",
       secretShareTweak: isSet3(object.secretShareTweak) ? SecretShare.fromJSON(object.secretShareTweak) : void 0,
-      pubkeySharesTweak: isObject8(object.pubkeySharesTweak) ? Object.entries(object.pubkeySharesTweak).reduce((acc, [key, value]) => {
+      pubkeySharesTweak: isObject9(object.pubkeySharesTweak) ? Object.entries(object.pubkeySharesTweak).reduce((acc, [key, value]) => {
         acc[key] = bytesFromBase642(value);
         return acc;
       }, {}) : {}
@@ -10639,7 +10741,7 @@ var RequestedSigningCommitments = {
   },
   fromJSON(object) {
     return {
-      signingNonceCommitments: isObject8(object.signingNonceCommitments) ? Object.entries(object.signingNonceCommitments).reduce(
+      signingNonceCommitments: isObject9(object.signingNonceCommitments) ? Object.entries(object.signingNonceCommitments).reduce(
         (acc, [key, value]) => {
           acc[key] = SigningCommitment.fromJSON(value);
           return acc;
@@ -10886,7 +10988,7 @@ var SigningCommitments = {
   },
   fromJSON(object) {
     return {
-      signingCommitments: isObject8(object.signingCommitments) ? Object.entries(object.signingCommitments).reduce(
+      signingCommitments: isObject9(object.signingCommitments) ? Object.entries(object.signingCommitments).reduce(
         (acc, [key, value]) => {
           acc[key] = SigningCommitment.fromJSON(value);
           return acc;
@@ -12987,7 +13089,7 @@ var GetSigningOperatorListResponse = {
   },
   fromJSON(object) {
     return {
-      signingOperators: isObject8(object.signingOperators) ? Object.entries(object.signingOperators).reduce(
+      signingOperators: isObject9(object.signingOperators) ? Object.entries(object.signingOperators).reduce(
         (acc, [key, value]) => {
           acc[key] = SigningOperatorInfo.fromJSON(value);
           return acc;
@@ -13654,7 +13756,7 @@ var QueryNodesResponse = {
   },
   fromJSON(object) {
     return {
-      nodes: isObject8(object.nodes) ? Object.entries(object.nodes).reduce((acc, [key, value]) => {
+      nodes: isObject9(object.nodes) ? Object.entries(object.nodes).reduce((acc, [key, value]) => {
         acc[key] = TreeNode.fromJSON(value);
         return acc;
       }, {}) : {},
@@ -14370,7 +14472,7 @@ var QueryBalanceResponse = {
   fromJSON(object) {
     return {
       balance: isSet3(object.balance) ? globalThis.Number(object.balance) : 0,
-      nodeBalances: isObject8(object.nodeBalances) ? Object.entries(object.nodeBalances).reduce((acc, [key, value]) => {
+      nodeBalances: isObject9(object.nodeBalances) ? Object.entries(object.nodeBalances).reduce((acc, [key, value]) => {
         acc[key] = Number(value);
         return acc;
       }, {}) : {}
@@ -15380,7 +15482,7 @@ var QueryNodesDistributionResponse = {
   },
   fromJSON(object) {
     return {
-      nodeDistribution: isObject8(object.nodeDistribution) ? Object.entries(object.nodeDistribution).reduce((acc, [key, value]) => {
+      nodeDistribution: isObject9(object.nodeDistribution) ? Object.entries(object.nodeDistribution).reduce((acc, [key, value]) => {
         acc[globalThis.Number(key)] = Number(value);
         return acc;
       }, {}) : {}
@@ -15629,7 +15731,7 @@ var QueryNodesByValueResponse = {
   },
   fromJSON(object) {
     return {
-      nodes: isObject8(object.nodes) ? Object.entries(object.nodes).reduce((acc, [key, value]) => {
+      nodes: isObject9(object.nodes) ? Object.entries(object.nodes).reduce((acc, [key, value]) => {
         acc[key] = TreeNode.fromJSON(value);
         return acc;
       }, {}) : {},
@@ -16157,7 +16259,7 @@ function longToNumber2(int64) {
   }
   return num;
 }
-function isObject8(value) {
+function isObject9(value) {
   return typeof value === "object" && value !== null;
 }
 function isSet3(value) {
@@ -16236,10 +16338,10 @@ function getNetworkFromString(network) {
 }
 
 // src/tests/isHermeticTest.ts
-import { isNode } from "@lightsparkdev/core";
+import { isNode as isNode2 } from "@lightsparkdev/core";
 import fs from "fs";
 function isHermeticTest() {
-  if (isNode) {
+  if (isNode2) {
     return (fs?.existsSync?.("/tmp/spark_hermetic") ?? false) || process.env.HERMETIC_TEST === "true";
   }
   return typeof process !== "undefined" && process.env?.HERMETIC_TEST === "true" || false;
@@ -16367,6 +16469,7 @@ var BASE_CONFIG = {
   signingOperators: getLocalSigningOperators(),
   tokenSignatures: "SCHNORR",
   tokenTransactionVersion: "V0",
+  tokenValidityDurationSeconds: 180,
   electrsUrl: getElectrsUrl("LOCAL"),
   expectedWithdrawBondSats: 1e4,
   expectedWithdrawRelativeBlockLocktime: 1e3,
@@ -16577,6 +16680,9 @@ var WalletConfigService = class {
   getTokenTransactionVersion() {
     return this.config.tokenTransactionVersion;
   }
+  getTokenValidityDurationSeconds() {
+    return this.config.tokenValidityDurationSeconds;
+  }
   getElectrsUrl() {
     return this.config.electrsUrl;
   }
@@ -16586,7 +16692,7 @@ var WalletConfigService = class {
 };
 
 // src/services/connection.ts
-import { isNode as isNode2 } from "@lightsparkdev/core";
+import { isNode as isNode3 } from "@lightsparkdev/core";
 import { sha256 as sha2563 } from "@noble/hashes/sha2";
 import { retryMiddleware } from "nice-grpc-client-middleware-retry";
 import { Metadata } from "nice-grpc-common";
@@ -18432,7 +18538,7 @@ var ConnectionManager = class {
   async createMockClient(address2) {
     const channel = await this.createChannelWithTLS(address2);
     const isNodeChannel = "close" in channel;
-    if (isNode2 && isNodeChannel && !isBun) {
+    if (isNode3 && isNodeChannel && !isBun) {
       const grpcModule = await import("nice-grpc");
       const { createClient } = "default" in grpcModule ? grpcModule.default : grpcModule;
       const client = createClient(MockServiceDefinition, channel);
@@ -18449,7 +18555,7 @@ var ConnectionManager = class {
   }
   async createChannelWithTLS(address2, certPath) {
     try {
-      if (isNode2 && !isBun) {
+      if (isNode3 && !isBun) {
         const grpcModule = await import("nice-grpc");
         const { ChannelCredentials, createChannel } = "default" in grpcModule ? grpcModule.default : grpcModule;
         if (certPath) {
@@ -18590,14 +18696,38 @@ var ConnectionManager = class {
   }
   async createSparkAuthnGrpcConnection(address2, certPath) {
     const channel = await this.createChannelWithTLS(address2, certPath);
+    const authnMiddleware = this.createAuthnMiddleware();
     return this.createGrpcClient(
       SparkAuthnServiceDefinition,
       channel,
-      false
+      false,
+      authnMiddleware
     );
   }
+  createAuthnMiddleware() {
+    if (isNode3) {
+      return async function* (call, options) {
+        const metadata = Metadata(options.metadata).set(
+          "X-Client-Env",
+          clientEnv
+        );
+        return yield* call.next(call.request, {
+          ...options,
+          metadata
+        });
+      }.bind(this);
+    } else {
+      return async function* (call, options) {
+        const metadata = Metadata(options.metadata).set("X-Requested-With", "XMLHttpRequest").set("X-Grpc-Web", "1").set("X-Client-Env", clientEnv).set("Content-Type", "application/grpc-web+proto");
+        return yield* call.next(call.request, {
+          ...options,
+          metadata
+        });
+      }.bind(this);
+    }
+  }
   createMiddleware(address2, authToken) {
-    if (isNode2) {
+    if (isNode3) {
       return this.createNodeMiddleware(address2, authToken);
     } else {
       return this.createBrowserMiddleware(address2, authToken);
@@ -18605,21 +18735,29 @@ var ConnectionManager = class {
   }
   createNodeMiddleware(address2, initialAuthToken) {
     return async function* (call, options) {
+      const metadata = Metadata(options.metadata).set(
+        "X-Client-Env",
+        clientEnv
+      );
       try {
         return yield* call.next(call.request, {
           ...options,
-          metadata: Metadata(options.metadata).set(
+          metadata: metadata.set(
             "Authorization",
             `Bearer ${this.clients.get(address2)?.authToken || initialAuthToken}`
-          ).set("User-Agent", "spark-js-sdk")
+          )
         });
       } catch (error) {
         if (error.message?.includes("token has expired")) {
           const newAuthToken = await this.authenticate(address2);
-          this.clients.get(address2).authToken = newAuthToken;
+          const clientData = this.clients.get(address2);
+          if (!clientData) {
+            throw new Error(`No client found for address: ${address2}`);
+          }
+          clientData.authToken = newAuthToken;
           return yield* call.next(call.request, {
             ...options,
-            metadata: Metadata(options.metadata).set("Authorization", `Bearer ${newAuthToken}`).set("User-Agent", "spark-js-sdk")
+            metadata: metadata.set("Authorization", `Bearer ${newAuthToken}`)
           });
         }
         throw error;
@@ -18628,21 +18766,26 @@ var ConnectionManager = class {
   }
   createBrowserMiddleware(address2, initialAuthToken) {
     return async function* (call, options) {
+      const metadata = Metadata(options.metadata).set("X-Requested-With", "XMLHttpRequest").set("X-Grpc-Web", "1").set("X-Client-Env", clientEnv).set("Content-Type", "application/grpc-web+proto");
       try {
         return yield* call.next(call.request, {
           ...options,
-          metadata: Metadata(options.metadata).set(
+          metadata: metadata.set(
             "Authorization",
             `Bearer ${this.clients.get(address2)?.authToken || initialAuthToken}`
-          ).set("X-Requested-With", "XMLHttpRequest").set("X-Grpc-Web", "1").set("Content-Type", "application/grpc-web+proto").set("User-Agent", "spark-js-sdk")
+          )
         });
       } catch (error) {
         if (error.message?.includes("token has expired")) {
           const newAuthToken = await this.authenticate(address2);
-          this.clients.get(address2).authToken = newAuthToken;
+          const clientData = this.clients.get(address2);
+          if (!clientData) {
+            throw new Error(`No client found for address: ${address2}`);
+          }
+          clientData.authToken = newAuthToken;
           return yield* call.next(call.request, {
             ...options,
-            metadata: Metadata(options.metadata).set("Authorization", `Bearer ${newAuthToken}`).set("X-Requested-With", "XMLHttpRequest").set("X-Grpc-Web", "1").set("Content-Type", "application/grpc-web+proto").set("User-Agent", "spark-js-sdk")
+            metadata: metadata.set("Authorization", `Bearer ${newAuthToken}`)
           });
         }
         throw error;
@@ -18657,7 +18800,7 @@ var ConnectionManager = class {
     };
     let options = {};
     const isNodeChannel = "close" in channel;
-    if (isNode2 && isNodeChannel && !isBun) {
+    if (isNode3 && isNodeChannel && !isBun) {
       const grpcModule = await import("nice-grpc");
       const { openTelemetryClientMiddleware } = await import("nice-grpc-opentelemetry");
       const { createClientFactory } = "default" in grpcModule ? grpcModule.default : grpcModule;
@@ -18706,7 +18849,7 @@ import { uuidv7 as uuidv72 } from "uuidv7";
 
 // src/utils/bitcoin.ts
 import {
-  bytesToHex as bytesToHex5,
+  bytesToHex as bytesToHex6,
   bytesToNumberBE as bytesToNumberBE3,
   hexToBytes as hexToBytes3
 } from "@noble/curves/abstract/utils";
@@ -18775,7 +18918,7 @@ function getP2TRAddressFromPkScript(pkScript, network) {
   if (pkScript.length !== 34 || pkScript[0] !== 81 || pkScript[1] !== 32) {
     throw new ValidationError("Invalid pkscript", {
       field: "pkScript",
-      value: bytesToHex5(pkScript),
+      value: bytesToHex6(pkScript),
       expected: "34 bytes starting with 0x51 0x20"
     });
   }
@@ -18847,10 +18990,10 @@ function getSigHashFromTx(tx, inputIndex, prevOutput) {
   );
 }
 function getTxId(tx) {
-  return bytesToHex5(sha2564(sha2564(tx.toBytes(true))).reverse());
+  return bytesToHex6(sha2564(sha2564(tx.toBytes(true))).reverse());
 }
 function getTxIdNoReverse(tx) {
-  return bytesToHex5(sha2564(sha2564(tx.toBytes(true))));
+  return bytesToHex6(sha2564(sha2564(tx.toBytes(true))));
 }
 
 // src/utils/transaction.ts
@@ -18937,7 +19080,7 @@ function getEphemeralAnchorOutput() {
 
 // src/services/transfer.ts
 import {
-  bytesToHex as bytesToHex6,
+  bytesToHex as bytesToHex7,
   equalBytes as equalBytes3,
   hexToBytes as hexToBytes5,
   numberToBytesBE as numberToBytesBE3
@@ -19237,7 +19380,7 @@ var BaseTransferService = class {
   }
   async prepareSendTransferKeyTweaks(transferID, receiverIdentityPubkey, leaves, refundSignatureMap) {
     const receiverEciesPubKey = ecies2.PublicKey.fromHex(
-      bytesToHex6(receiverIdentityPubkey)
+      bytesToHex7(receiverIdentityPubkey)
     );
     const leavesTweaksMap = /* @__PURE__ */ new Map();
     for (const leaf of leaves) {
@@ -20210,7 +20353,7 @@ var CoopExitService = class extends BaseTransferService {
       connectorOutputs,
       receiverPubKey
     );
-    const transferTweak = await this.sendTransferTweakKey(
+    const transferTweak = await this.deliverTransferPackage(
       transfer,
       leaves,
       signaturesMap
@@ -20973,7 +21116,8 @@ var LightningService = class {
     paymentHash,
     invoiceString,
     isInboundPayment,
-    feeSats = 0
+    feeSats = 0,
+    amountSatsToSend
   }) {
     const sparkClient = await this.connectionManager.createSparkClient(
       this.config.getCoordinatorAddress()
@@ -21010,7 +21154,25 @@ var LightningService = class {
       } catch (error) {
         console.error("Error decoding invoice", error);
       }
-      amountSats = amountMsats / 1e3;
+      const isZeroAmountInvoice = !amountMsats;
+      if (isZeroAmountInvoice && amountSatsToSend === void 0) {
+        throw new ValidationError(
+          "Invalid amount. User must specify amountSatsToSend for 0 amount lightning invoice",
+          {
+            field: "amountSatsToSend",
+            value: amountSatsToSend,
+            expected: "positive number"
+          }
+        );
+      }
+      amountSats = isZeroAmountInvoice ? amountSatsToSend : amountMsats / 1e3;
+      if (isNaN(amountSats) || amountSats <= 0) {
+        throw new ValidationError("Invalid amount", {
+          field: "amountSats",
+          value: amountSats,
+          expected: "greater than 0"
+        });
+      }
       bolt11String = invoiceString;
     }
     const reason = isInboundPayment ? 1 /* REASON_RECEIVE */ : 0 /* REASON_SEND */;
@@ -21110,7 +21272,7 @@ var LightningService = class {
 };
 
 // src/services/lrc-connection.ts
-import { isNode as isNode3 } from "@lightsparkdev/core";
+import { isNode as isNode4 } from "@lightsparkdev/core";
 import { retryMiddleware as retryMiddleware2 } from "nice-grpc-client-middleware-retry";
 import { Metadata as Metadata2 } from "nice-grpc-common";
 
@@ -24182,7 +24344,7 @@ var Lrc20ConnectionManager = class {
   }
   async createChannelWithTLS(address2, certPath) {
     try {
-      if (isNode3 && !isBun) {
+      if (isNode4 && !isBun) {
         const grpcModule = await import("nice-grpc");
         const { ChannelCredentials, createChannel } = "default" in grpcModule ? grpcModule.default : grpcModule;
         if (certPath) {
@@ -24249,7 +24411,7 @@ var Lrc20ConnectionManager = class {
     return client;
   }
   createMiddleware() {
-    if (isNode3) {
+    if (isNode4) {
       return this.createNodeMiddleware();
     } else {
       return this.createBrowserMiddleware();
@@ -24259,7 +24421,7 @@ var Lrc20ConnectionManager = class {
     return async function* (call, options) {
       return yield* call.next(call.request, {
         ...options,
-        metadata: Metadata2(options.metadata).set("User-Agent", "spark-js-sdk")
+        metadata: Metadata2(options.metadata).set("X-Client-Env", clientEnv)
       });
     }.bind(this);
   }
@@ -24267,7 +24429,7 @@ var Lrc20ConnectionManager = class {
     return async function* (call, options) {
       return yield* call.next(call.request, {
         ...options,
-        metadata: Metadata2(options.metadata).set("X-Requested-With", "XMLHttpRequest").set("X-Grpc-Web", "1").set("Content-Type", "application/grpc-web+proto").set("User-Agent", "spark-js-sdk")
+        metadata: Metadata2(options.metadata).set("X-Requested-With", "XMLHttpRequest").set("X-Grpc-Web", "1").set("Content-Type", "application/grpc-web+proto").set("X-Client-Env", clientEnv)
       });
     }.bind(this);
   }
@@ -24279,7 +24441,7 @@ var Lrc20ConnectionManager = class {
     };
     let options = {};
     const isNodeChannel = "close" in channel;
-    if (isNode3 && isNodeChannel && !isBun) {
+    if (isNode4 && isNodeChannel && !isBun) {
       const grpcModule = await import("nice-grpc");
       const { openTelemetryClientMiddleware } = await import("nice-grpc-opentelemetry");
       const { createClientFactory } = "default" in grpcModule ? grpcModule.default : grpcModule;
@@ -24324,7 +24486,7 @@ var Lrc20ConnectionManager = class {
 
 // src/services/token-transactions.ts
 import {
-  bytesToHex as bytesToHex9,
+  bytesToHex as bytesToHex10,
   bytesToNumberBE as bytesToNumberBE7,
   numberToBytesBE as numberToBytesBE5
 } from "@noble/curves/abstract/utils";
@@ -24333,6 +24495,19 @@ import { secp256k1 as secp256k113 } from "@noble/curves/secp256k1";
 // src/utils/token-hashing.ts
 import { sha256 as sha25611 } from "@noble/hashes/sha2";
 function hashTokenTransaction(tokenTransaction, partialHash = false) {
+  switch (tokenTransaction.version) {
+    case 0:
+      return hashTokenTransactionV0(tokenTransaction, partialHash);
+    case 1:
+      return hashTokenTransactionV1(tokenTransaction, partialHash);
+    default:
+      throw new ValidationError("invalid token transaction version", {
+        field: "tokenTransaction.version",
+        value: tokenTransaction.version
+      });
+  }
+}
+function hashTokenTransactionV0(tokenTransaction, partialHash = false) {
   if (!tokenTransaction) {
     throw new ValidationError("token transaction cannot be nil", {
       field: "tokenTransaction"
@@ -24580,6 +24755,275 @@ function hashTokenTransaction(tokenTransaction, partialHash = false) {
   finalHashObj.update(concatenatedHashes);
   return finalHashObj.digest();
 }
+function hashTokenTransactionV1(tokenTransaction, partialHash = false) {
+  if (!tokenTransaction) {
+    throw new ValidationError("token transaction cannot be nil", {
+      field: "tokenTransaction"
+    });
+  }
+  let allHashes = [];
+  const versionHashObj = sha25611.create();
+  const versionBytes = new Uint8Array(4);
+  new DataView(versionBytes.buffer).setUint32(
+    0,
+    tokenTransaction.version,
+    false
+    // false for big-endian
+  );
+  versionHashObj.update(versionBytes);
+  allHashes.push(versionHashObj.digest());
+  if (tokenTransaction.tokenInputs?.$case === "transferInput") {
+    if (!tokenTransaction.tokenInputs.transferInput.outputsToSpend) {
+      throw new ValidationError("outputs to spend cannot be null", {
+        field: "tokenInputs.transferInput.outputsToSpend"
+      });
+    }
+    if (tokenTransaction.tokenInputs.transferInput.outputsToSpend.length === 0) {
+      throw new ValidationError("outputs to spend cannot be empty", {
+        field: "tokenInputs.transferInput.outputsToSpend"
+      });
+    }
+    for (const [
+      i,
+      output
+    ] of tokenTransaction.tokenInputs.transferInput.outputsToSpend.entries()) {
+      if (!output) {
+        throw new ValidationError(`output cannot be null at index ${i}`, {
+          field: `tokenInputs.transferInput.outputsToSpend[${i}]`,
+          index: i
+        });
+      }
+      const hashObj2 = sha25611.create();
+      if (output.prevTokenTransactionHash) {
+        const prevHash = output.prevTokenTransactionHash;
+        if (output.prevTokenTransactionHash.length !== 32) {
+          throw new ValidationError(
+            `invalid previous transaction hash length at index ${i}`,
+            {
+              field: `tokenInputs.transferInput.outputsToSpend[${i}].prevTokenTransactionHash`,
+              value: prevHash,
+              expectedLength: 32,
+              actualLength: prevHash.length,
+              index: i
+            }
+          );
+        }
+        hashObj2.update(output.prevTokenTransactionHash);
+      }
+      const voutBytes = new Uint8Array(4);
+      new DataView(voutBytes.buffer).setUint32(
+        0,
+        output.prevTokenTransactionVout,
+        false
+      );
+      hashObj2.update(voutBytes);
+      allHashes.push(hashObj2.digest());
+    }
+  }
+  if (tokenTransaction.tokenInputs?.$case === "mintInput") {
+    const hashObj2 = sha25611.create();
+    if (tokenTransaction.tokenInputs.mintInput.issuerPublicKey) {
+      const issuerPubKey = tokenTransaction.tokenInputs.mintInput.issuerPublicKey;
+      if (issuerPubKey.length === 0) {
+        throw new ValidationError("issuer public key cannot be empty", {
+          field: "tokenInputs.mintInput.issuerPublicKey",
+          value: issuerPubKey,
+          expectedLength: 1,
+          actualLength: 0
+        });
+      }
+      hashObj2.update(issuerPubKey);
+      if (tokenTransaction.tokenInputs.mintInput.issuerProvidedTimestamp != 0) {
+        const timestampBytes = new Uint8Array(8);
+        new DataView(timestampBytes.buffer).setBigUint64(
+          0,
+          BigInt(
+            tokenTransaction.tokenInputs.mintInput.issuerProvidedTimestamp
+          ),
+          true
+          // true for little-endian to match Go implementation
+        );
+        hashObj2.update(timestampBytes);
+      }
+      allHashes.push(hashObj2.digest());
+    }
+  }
+  if (!tokenTransaction.tokenOutputs) {
+    throw new ValidationError("token outputs cannot be null", {
+      field: "tokenOutputs"
+    });
+  }
+  if (tokenTransaction.tokenOutputs.length === 0) {
+    throw new ValidationError("token outputs cannot be empty", {
+      field: "tokenOutputs"
+    });
+  }
+  for (const [i, output] of tokenTransaction.tokenOutputs.entries()) {
+    if (!output) {
+      throw new ValidationError(`output cannot be null at index ${i}`, {
+        field: `tokenOutputs[${i}]`,
+        index: i
+      });
+    }
+    const hashObj2 = sha25611.create();
+    if (output.id && !partialHash) {
+      if (output.id.length === 0) {
+        throw new ValidationError(`output ID at index ${i} cannot be empty`, {
+          field: `tokenOutputs[${i}].id`,
+          index: i
+        });
+      }
+      hashObj2.update(new TextEncoder().encode(output.id));
+    }
+    if (output.ownerPublicKey) {
+      if (output.ownerPublicKey.length === 0) {
+        throw new ValidationError(
+          `owner public key at index ${i} cannot be empty`,
+          {
+            field: `tokenOutputs[${i}].ownerPublicKey`,
+            index: i
+          }
+        );
+      }
+      hashObj2.update(output.ownerPublicKey);
+    }
+    if (!partialHash) {
+      const revPubKey = output.revocationCommitment;
+      if (revPubKey) {
+        if (revPubKey.length === 0) {
+          throw new ValidationError(
+            `revocation commitment at index ${i} cannot be empty`,
+            {
+              field: `tokenOutputs[${i}].revocationCommitment`,
+              index: i
+            }
+          );
+        }
+        hashObj2.update(revPubKey);
+      }
+      const bondBytes = new Uint8Array(8);
+      new DataView(bondBytes.buffer).setBigUint64(
+        0,
+        BigInt(output.withdrawBondSats),
+        false
+      );
+      hashObj2.update(bondBytes);
+      const locktimeBytes = new Uint8Array(8);
+      new DataView(locktimeBytes.buffer).setBigUint64(
+        0,
+        BigInt(output.withdrawRelativeBlockLocktime),
+        false
+      );
+      hashObj2.update(locktimeBytes);
+    }
+    if (output.tokenPublicKey) {
+      if (output.tokenPublicKey.length === 0) {
+        throw new ValidationError(
+          `token public key at index ${i} cannot be empty`,
+          {
+            field: `tokenOutputs[${i}].tokenPublicKey`,
+            index: i
+          }
+        );
+      }
+      hashObj2.update(output.tokenPublicKey);
+    }
+    if (output.tokenAmount) {
+      if (output.tokenAmount.length === 0) {
+        throw new ValidationError(
+          `token amount at index ${i} cannot be empty`,
+          {
+            field: `tokenOutputs[${i}].tokenAmount`,
+            index: i
+          }
+        );
+      }
+      if (output.tokenAmount.length > 16) {
+        throw new ValidationError(
+          `token amount at index ${i} exceeds maximum length`,
+          {
+            field: `tokenOutputs[${i}].tokenAmount`,
+            value: output.tokenAmount,
+            expectedLength: 16,
+            actualLength: output.tokenAmount.length,
+            index: i
+          }
+        );
+      }
+      hashObj2.update(output.tokenAmount);
+    }
+    allHashes.push(hashObj2.digest());
+  }
+  if (!tokenTransaction.sparkOperatorIdentityPublicKeys) {
+    throw new ValidationError(
+      "spark operator identity public keys cannot be null",
+      {}
+    );
+  }
+  const sortedPubKeys = [
+    ...tokenTransaction.sparkOperatorIdentityPublicKeys || []
+  ].sort((a, b) => {
+    for (let i = 0; i < a.length && i < b.length; i++) {
+      if (a[i] !== b[i]) return a[i] - b[i];
+    }
+    return a.length - b.length;
+  });
+  for (const [i, pubKey] of sortedPubKeys.entries()) {
+    if (!pubKey) {
+      throw new ValidationError(
+        `operator public key at index ${i} cannot be null`,
+        {
+          field: `sparkOperatorIdentityPublicKeys[${i}]`,
+          index: i
+        }
+      );
+    }
+    if (pubKey.length === 0) {
+      throw new ValidationError(
+        `operator public key at index ${i} cannot be empty`,
+        {
+          field: `sparkOperatorIdentityPublicKeys[${i}]`,
+          index: i
+        }
+      );
+    }
+    const hashObj2 = sha25611.create();
+    hashObj2.update(pubKey);
+    allHashes.push(hashObj2.digest());
+  }
+  const hashObj = sha25611.create();
+  let networkBytes = new Uint8Array(4);
+  new DataView(networkBytes.buffer).setUint32(
+    0,
+    tokenTransaction.network.valueOf(),
+    false
+    // false for big-endian
+  );
+  hashObj.update(networkBytes);
+  allHashes.push(hashObj.digest());
+  const expiryHashObj = sha25611.create();
+  const validityDurationBytes = new Uint8Array(8);
+  const expiryUnixTime = tokenTransaction.expiryTime ? Math.floor(tokenTransaction.expiryTime.getTime() / 1e3) : 0;
+  new DataView(validityDurationBytes.buffer).setBigUint64(
+    0,
+    BigInt(expiryUnixTime),
+    false
+    // false for big-endian
+  );
+  expiryHashObj.update(validityDurationBytes);
+  allHashes.push(expiryHashObj.digest());
+  const finalHashObj = sha25611.create();
+  const concatenatedHashes = new Uint8Array(
+    allHashes.reduce((sum, hash) => sum + hash.length, 0)
+  );
+  let offset = 0;
+  for (const hash of allHashes) {
+    concatenatedHashes.set(hash, offset);
+    offset += hash.length;
+  }
+  finalHashObj.update(concatenatedHashes);
+  return finalHashObj.digest();
+}
 function hashOperatorSpecificTokenTransactionSignablePayload(payload) {
   if (!payload) {
     throw new ValidationError(
@@ -24630,7 +25074,7 @@ function hashOperatorSpecificTokenTransactionSignablePayload(payload) {
 }
 
 // src/utils/token-transactions.ts
-import { bytesToHex as bytesToHex7, bytesToNumberBE as bytesToNumberBE5 } from "@noble/curves/abstract/utils";
+import { bytesToHex as bytesToHex8, bytesToNumberBE as bytesToNumberBE5 } from "@noble/curves/abstract/utils";
 function calculateAvailableTokenAmount(outputLeaves) {
   return outputLeaves.reduce(
     (sum, output) => sum + BigInt(bytesToNumberBE5(output.output.tokenAmount)),
@@ -24638,7 +25082,7 @@ function calculateAvailableTokenAmount(outputLeaves) {
   );
 }
 function checkIfSelectedOutputsAreAvailable(selectedOutputs, tokenOutputs, tokenPublicKey) {
-  const tokenPubKeyHex = bytesToHex7(tokenPublicKey);
+  const tokenPubKeyHex = bytesToHex8(tokenPublicKey);
   const tokenOutputsAvailable = tokenOutputs.get(tokenPubKeyHex);
   if (!tokenOutputsAvailable) {
     return false;
@@ -24927,7 +25371,7 @@ import { hexToBytes as hexToBytes9 } from "@noble/hashes/utils";
 
 // src/address/address.ts
 import { secp256k1 as secp256k111 } from "@noble/curves/secp256k1";
-import { bytesToHex as bytesToHex8, hexToBytes as hexToBytes8 } from "@noble/hashes/utils";
+import { bytesToHex as bytesToHex9, hexToBytes as hexToBytes8 } from "@noble/hashes/utils";
 import { bech32m } from "@scure/base";
 import { UUID } from "uuidv7";
 import { bytesToNumberBE as bytesToNumberBE6 } from "@noble/curves/abstract/utils";
@@ -24978,7 +25422,7 @@ function decodeSparkAddress(address2, network) {
       });
     }
     const payload = SparkAddress.decode(bech32m.fromWords(decoded.words));
-    const publicKey = bytesToHex8(payload.identityPublicKey);
+    const publicKey = bytesToHex9(payload.identityPublicKey);
     isValidPublicKey(publicKey);
     const paymentIntentFields = payload.paymentIntentFields;
     return {
@@ -24986,7 +25430,7 @@ function decodeSparkAddress(address2, network) {
       network,
       paymentIntentFields: paymentIntentFields && {
         id: UUID.ofInner(paymentIntentFields.id).toString(),
-        assetIdentifier: paymentIntentFields.assetIdentifier ? bytesToHex8(paymentIntentFields.assetIdentifier) : void 0,
+        assetIdentifier: paymentIntentFields.assetIdentifier ? bytesToHex9(paymentIntentFields.assetIdentifier) : void 0,
         assetAmount: bytesToNumberBE6(paymentIntentFields.assetAmount),
         memo: paymentIntentFields.memo
       }
@@ -25312,7 +25756,7 @@ var TokenTransactionService = class {
               {
                 field: "revocationCommitment",
                 value: derivedRevocationCommitment,
-                expected: bytesToHex9(outputsToSpendCommitments[outputIndex]),
+                expected: bytesToHex10(outputsToSpendCommitments[outputIndex]),
                 outputIndex
               }
             )
@@ -25338,7 +25782,7 @@ var TokenTransactionService = class {
         threshold
       );
     }
-    return bytesToHex9(finalTokenTransactionHash);
+    return bytesToHex10(finalTokenTransactionHash);
   }
   async broadcastTokenTransactionV1(tokenTransaction, signingOperators, outputsToSpendSigningPublicKeys, outputsToSpendCommitments) {
     const { finalTokenTransaction, finalTokenTransactionHash, threshold } = await this.startTokenTransaction(
@@ -25352,13 +25796,13 @@ var TokenTransactionService = class {
       finalTokenTransactionHash,
       signingOperators
     );
-    return bytesToHex9(finalTokenTransactionHash);
+    return bytesToHex10(finalTokenTransactionHash);
   }
   async startTokenTransactionV0(tokenTransaction, signingOperators, outputsToSpendSigningPublicKeys, outputsToSpendCommitments) {
     const sparkClient = await this.connectionManager.createSparkClient(
       this.config.getCoordinatorAddress()
     );
-    const partialTokenTransactionHash = hashTokenTransaction(
+    const partialTokenTransactionHash = hashTokenTransactionV0(
       tokenTransaction,
       true
     );
@@ -25439,7 +25883,7 @@ var TokenTransactionService = class {
       this.config.getThreshold()
     );
     const finalTokenTransaction = startResponse.finalTokenTransaction;
-    const finalTokenTransactionHash = hashTokenTransaction(
+    const finalTokenTransactionHash = hashTokenTransactionV0(
       finalTokenTransaction,
       false
     );
@@ -25507,7 +25951,9 @@ var TokenTransactionService = class {
     const startResponse = await sparkClient.start_transaction(
       {
         identityPublicKey: await this.config.signer.getIdentityPublicKey(),
-        partialTokenTransaction: tokenTransaction
+        partialTokenTransaction: tokenTransaction,
+        validityDurationSeconds: await this.config.getTokenValidityDurationSeconds(),
+        partialTokenTransactionOwnerSignatures: ownerSignaturesWithIndex
       },
       {
         retry: true,
@@ -25706,7 +26152,7 @@ var TokenTransactionService = class {
       []
     );
     unsortedTokenOutputs.forEach((output) => {
-      const tokenKey = bytesToHex9(output.output.tokenPublicKey);
+      const tokenKey = bytesToHex10(output.output.tokenPublicKey);
       const index = output.previousTransactionVout;
       tokenOutputs.set(tokenKey, [
         { ...output, previousTransactionVout: index }
@@ -25763,7 +26209,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 (bytesToHex9(publicKey) === bytesToHex9(await this.config.signer.getIdentityPublicKey())) {
+    if (bytesToHex10(publicKey) === bytesToHex10(await this.config.signer.getIdentityPublicKey())) {
       if (tokenSignatures === "SCHNORR") {
         return await this.config.signer.signSchnorrWithIdentityKey(message);
       } else {
@@ -26425,7 +26871,7 @@ var SigningService = class {
 };
 
 // src/tests/utils/test-faucet.ts
-import { bytesToHex as bytesToHex10, hexToBytes as hexToBytes12 } from "@noble/curves/abstract/utils";
+import { bytesToHex as bytesToHex11, hexToBytes as hexToBytes12 } from "@noble/curves/abstract/utils";
 import { schnorr as schnorr5, secp256k1 as secp256k114 } from "@noble/curves/secp256k1";
 import * as btc4 from "@scure/btc-signer";
 import { Address as Address5, OutScript as OutScript4, SigHash as SigHash2, Transaction as Transaction8 } from "@scure/btc-signer";
@@ -26558,7 +27004,7 @@ var BitcoinFaucet = class _BitcoinFaucet {
       },
       STATIC_MINING_KEY
     );
-    await this.broadcastTx(bytesToHex10(signedSplitTx.extract()));
+    await this.broadcastTx(bytesToHex11(signedSplitTx.extract()));
     const splitTxId = signedSplitTx.id;
     for (let i = 0; i < numCoinsToCreate; i++) {
       this.coins.push({
@@ -26592,7 +27038,7 @@ var BitcoinFaucet = class _BitcoinFaucet {
       coinToSend.txout,
       coinToSend.key
     );
-    await this.broadcastTx(bytesToHex10(signedTx.extract()));
+    await this.broadcastTx(bytesToHex11(signedTx.extract()));
   }
   async signFaucetCoin(unsignedTx, fundingTxOut, key) {
     const pubKey = secp256k114.getPublicKey(key);
@@ -26711,7 +27157,7 @@ var BitcoinFaucet = class _BitcoinFaucet {
       });
     }
     const signedTx = await this.signFaucetCoin(tx, coin.txout, coin.key);
-    const txHex = bytesToHex10(signedTx.extract());
+    const txHex = bytesToHex11(signedTx.extract());
     await this.broadcastTx(txHex);
     const randomKey = secp256k114.utils.randomPrivateKey();
     const randomPubKey = secp256k114.getPublicKey(randomKey);
@@ -26728,18 +27174,18 @@ var BitcoinFaucet = class _BitcoinFaucet {
 };
 
 // src/types/sdk-types.ts
-import { bytesToHex as bytesToHex11 } from "@noble/curves/abstract/utils";
+import { bytesToHex as bytesToHex12 } from "@noble/curves/abstract/utils";
 function mapTreeNodeToWalletLeaf(proto) {
   return {
     id: proto.id,
     treeId: proto.treeId,
     value: proto.value,
     parentNodeId: proto.parentNodeId,
-    nodeTx: bytesToHex11(proto.nodeTx),
-    refundTx: bytesToHex11(proto.refundTx),
+    nodeTx: bytesToHex12(proto.nodeTx),
+    refundTx: bytesToHex12(proto.refundTx),
     vout: proto.vout,
-    verifyingPublicKey: bytesToHex11(proto.verifyingPublicKey),
-    ownerIdentityPublicKey: bytesToHex11(proto.ownerIdentityPublicKey),
+    verifyingPublicKey: bytesToHex12(proto.verifyingPublicKey),
+    ownerIdentityPublicKey: bytesToHex12(proto.ownerIdentityPublicKey),
     signingKeyshare: proto.signingKeyshare,
     status: proto.status,
     network: Network[proto.network]
@@ -26748,14 +27194,14 @@ function mapTreeNodeToWalletLeaf(proto) {
 function mapTransferLeafToWalletTransferLeaf(proto) {
   return {
     leaf: proto.leaf ? mapTreeNodeToWalletLeaf(proto.leaf) : void 0,
-    secretCipher: bytesToHex11(proto.secretCipher),
-    signature: bytesToHex11(proto.signature),
-    intermediateRefundTx: bytesToHex11(proto.intermediateRefundTx)
+    secretCipher: bytesToHex12(proto.secretCipher),
+    signature: bytesToHex12(proto.signature),
+    intermediateRefundTx: bytesToHex12(proto.intermediateRefundTx)
   };
 }
 function mapTransferToWalletTransfer(proto, identityPublicKey) {
-  const receiverIdentityPublicKey = bytesToHex11(proto.receiverIdentityPublicKey);
-  const senderIdentityPublicKey = bytesToHex11(proto.senderIdentityPublicKey);
+  const receiverIdentityPublicKey = bytesToHex12(proto.receiverIdentityPublicKey);
+  const senderIdentityPublicKey = bytesToHex12(proto.senderIdentityPublicKey);
   return {
     id: proto.id,
     senderIdentityPublicKey,
@@ -26952,7 +27398,7 @@ var SparkWallet = class _SparkWallet extends EventEmitter {
             setTimeout(maybeUnref, 100);
           }
         };
-        if (isNode4) {
+        if (isNode5) {
           maybeUnref();
         }
         const claimedTransfersIds = await this.claimTransfers();
@@ -27187,7 +27633,7 @@ var SparkWallet = class _SparkWallet extends EventEmitter {
    * @returns {Promise<string>} The identity public key as a hex string.
    */
   async getIdentityPublicKey() {
-    return bytesToHex12(await this.config.signer.getIdentityPublicKey());
+    return bytesToHex13(await this.config.signer.getIdentityPublicKey());
   }
   /**
    * Gets the Spark address of the wallet.
@@ -27197,7 +27643,7 @@ var SparkWallet = class _SparkWallet extends EventEmitter {
   async getSparkAddress() {
     if (!this.sparkAddress) {
       this.sparkAddress = encodeSparkAddress({
-        identityPublicKey: bytesToHex12(
+        identityPublicKey: bytesToHex13(
           await this.config.signer.getIdentityPublicKey()
         ),
         network: this.config.getNetworkType()
@@ -27234,7 +27680,7 @@ var SparkWallet = class _SparkWallet extends EventEmitter {
       isValidPublicKey(assetIdentifier);
     }
     const paymentRequest = encodeSparkAddress({
-      identityPublicKey: bytesToHex12(
+      identityPublicKey: bytesToHex13(
         await this.config.signer.getIdentityPublicKey()
       ),
       network: this.config.getNetworkType(),
@@ -27409,10 +27855,10 @@ var SparkWallet = class _SparkWallet extends EventEmitter {
       const userLeaves = [];
       userLeaves.push({
         leaf_id: transfer.leaves[0].leaf.id,
-        raw_unsigned_refund_transaction: bytesToHex12(
+        raw_unsigned_refund_transaction: bytesToHex13(
           transfer.leaves[0].intermediateRefundTx
         ),
-        adaptor_added_signature: bytesToHex12(adaptorSignature)
+        adaptor_added_signature: bytesToHex13(adaptorSignature)
       });
       for (let i = 1; i < transfer.leaves.length; i++) {
         const leaf = transfer.leaves[i];
@@ -27429,14 +27875,14 @@ var SparkWallet = class _SparkWallet extends EventEmitter {
         );
         userLeaves.push({
           leaf_id: leaf.leaf.id,
-          raw_unsigned_refund_transaction: bytesToHex12(
+          raw_unsigned_refund_transaction: bytesToHex13(
             leaf.intermediateRefundTx
           ),
-          adaptor_added_signature: bytesToHex12(signature)
+          adaptor_added_signature: bytesToHex13(signature)
         });
       }
       const sspClient = this.getSspClient();
-      const adaptorPubkey = bytesToHex12(
+      const adaptorPubkey = bytesToHex13(
         secp256k115.getPublicKey(adaptorPrivateKey)
       );
       let request = null;
@@ -27496,7 +27942,7 @@ var SparkWallet = class _SparkWallet extends EventEmitter {
         signatureMap
       );
       const completeResponse = await sspClient.completeLeaveSwap({
-        adaptorSecretKey: bytesToHex12(adaptorPrivateKey),
+        adaptorSecretKey: bytesToHex13(adaptorPrivateKey),
         userOutboundTransferExternalId: transfer.id,
         leavesSwapRequestId: request.id
       });
@@ -27522,7 +27968,7 @@ var SparkWallet = class _SparkWallet extends EventEmitter {
       limit,
       offset
     );
-    const identityPublicKey = bytesToHex12(
+    const identityPublicKey = bytesToHex13(
       await this.config.signer.getIdentityPublicKey()
     );
     return {
@@ -27546,7 +27992,7 @@ var SparkWallet = class _SparkWallet extends EventEmitter {
       publicKeys: Array.from(tokenBalances.keys()).map(hexToBytes13)
     });
     return tokenInfo.tokenPubkeyInfos.map((info) => ({
-      tokenPublicKey: bytesToHex12(info.announcement.publicKey.publicKey),
+      tokenPublicKey: bytesToHex13(info.announcement.publicKey.publicKey),
       tokenName: info.announcement.name,
       tokenSymbol: info.announcement.symbol,
       tokenDecimals: Number(bytesToNumberBE8(info.announcement.decimal)),
@@ -27583,7 +28029,7 @@ var SparkWallet = class _SparkWallet extends EventEmitter {
     });
     const result = /* @__PURE__ */ new Map();
     for (const info of tokenInfo.tokenPubkeyInfos) {
-      const tokenPublicKey = bytesToHex12(
+      const tokenPublicKey = bytesToHex13(
         info.announcement.publicKey.publicKey
       );
       const leaves = this.tokenOutputs.get(tokenPublicKey);
@@ -27728,7 +28174,7 @@ var SparkWallet = class _SparkWallet extends EventEmitter {
     if (network === BitcoinNetwork_default.FUTURE_VALUE) {
       network = BitcoinNetwork_default.REGTEST;
     }
-    const depositSecretKey = bytesToHex12(
+    const depositSecretKey = bytesToHex13(
       await this.config.signer.getStaticDepositSecretKey(0)
     );
     const message = await this.getStaticDepositSigningPayload(
@@ -27741,7 +28187,7 @@ var SparkWallet = class _SparkWallet extends EventEmitter {
     );
     const hashBuffer = sha25613(message);
     const signatureBytes = await this.config.signer.signMessageWithIdentityKey(hashBuffer);
-    const signature = bytesToHex12(signatureBytes);
+    const signature = bytesToHex13(signatureBytes);
     const response = await this.sspClient.claimStaticDeposit({
       transactionId,
       outputIndex,
@@ -27826,7 +28272,7 @@ var SparkWallet = class _SparkWallet extends EventEmitter {
       networkJSON.toLowerCase(),
       2 /* Refund */,
       creditAmountSats,
-      bytesToHex12(spendTxSighash)
+      bytesToHex13(spendTxSighash)
     );
     const hashBuffer = sha25613(message);
     const swapResponseUserSignature = await this.config.signer.signMessageWithIdentityKey(hashBuffer);
@@ -28298,7 +28744,7 @@ var SparkWallet = class _SparkWallet extends EventEmitter {
       }
       return mapTransferToWalletTransfer(
         transfer,
-        bytesToHex12(await this.config.signer.getIdentityPublicKey())
+        bytesToHex13(await this.config.signer.getIdentityPublicKey())
       );
     });
   }
@@ -28622,7 +29068,7 @@ var SparkWallet = class _SparkWallet extends EventEmitter {
       const invoice2 = await sspClient.requestLightningReceive({
         amountSats: amountSats2,
         network: bitcoinNetwork,
-        paymentHash: bytesToHex12(paymentHash),
+        paymentHash: bytesToHex13(paymentHash),
         expirySecs: expirySeconds,
         memo: memo2,
         includeSparkAddress,
@@ -28677,12 +29123,14 @@ var SparkWallet = class _SparkWallet extends EventEmitter {
    * @param {Object} params - Parameters for paying the invoice
    * @param {string} params.invoice - The BOLT11-encoded Lightning invoice to pay
    * @param {boolean} [params.preferSpark] - Whether to prefer a spark transfer over lightning for the payment
+   * @param {number} [params.amountSatsToSend] - The amount in sats to send. This is only valid for 0 amount lightning invoices.
    * @returns {Promise<LightningSendRequest>} The Lightning payment request details
    */
   async payLightningInvoice({
     invoice,
     maxFeeSats,
-    preferSpark = false
+    preferSpark = false,
+    amountSatsToSend
   }) {
     const invoiceNetwork = getNetworkFromInvoice(invoice);
     const walletNetwork = this.config.getNetwork();
@@ -28697,7 +29145,36 @@ var SparkWallet = class _SparkWallet extends EventEmitter {
       );
     }
     const decodedInvoice = decodeInvoice(invoice);
-    const amountSats = decodedInvoice.amountMSats !== null ? Number(decodedInvoice.amountMSats / 1000n) : 0;
+    const amountMSats = decodedInvoice.amountMSats;
+    const isZeroAmountInvoice = !amountMSats;
+    if (!isZeroAmountInvoice && amountSatsToSend !== void 0) {
+      throw new ValidationError(
+        "Invalid amount. User can only specify amountSatsToSend for 0 amount lightning invoice",
+        {
+          field: "amountMSats",
+          value: Number(amountMSats),
+          expected: "0"
+        }
+      );
+    }
+    if (isZeroAmountInvoice && amountSatsToSend === void 0) {
+      throw new ValidationError(
+        "Invalid amount. User must specify amountSatsToSend for 0 amount lightning invoice",
+        {
+          field: "amountMSats",
+          value: Number(amountMSats),
+          expected: "0"
+        }
+      );
+    }
+    const amountSats = isZeroAmountInvoice ? amountSatsToSend : Number(amountMSats / 1000n);
+    if (isNaN(amountSats) || amountSats <= 0) {
+      throw new ValidationError("Invalid amount", {
+        field: "amountSats",
+        value: amountSats,
+        expected: "greater than 0"
+      });
+    }
     const sparkFallbackAddress = decodedInvoice.fallbackAddress;
     const paymentHash = decodedInvoice.paymentHash;
     if (preferSpark) {
@@ -28719,15 +29196,9 @@ var SparkWallet = class _SparkWallet extends EventEmitter {
     }
     return await this.withLeaves(async () => {
       const sspClient = this.getSspClient();
-      if (isNaN(amountSats) || amountSats <= 0) {
-        throw new ValidationError("Invalid amount", {
-          field: "amountSats",
-          value: amountSats,
-          expected: "positive number"
-        });
-      }
       const feeEstimate = await this.getLightningSendFeeEstimate({
-        encodedInvoice: invoice
+        encodedInvoice: invoice,
+        amountSats: isZeroAmountInvoice ? amountSatsToSend : void 0
       });
       if (maxFeeSats < feeEstimate) {
         throw new ValidationError("maxFeeSats does not cover fee estimate", {
@@ -28765,19 +29236,21 @@ var SparkWallet = class _SparkWallet extends EventEmitter {
         paymentHash: hexToBytes13(paymentHash),
         isInboundPayment: false,
         invoiceString: invoice,
-        feeSats: feeEstimate
+        feeSats: feeEstimate,
+        amountSatsToSend
       });
       if (!swapResponse.transfer) {
         throw new Error("Failed to swap nodes for preimage");
       }
-      const transfer = await this.transferService.sendTransferTweakKey(
+      await this.transferService.deliverTransferPackage(
         swapResponse.transfer,
         leavesToSend,
         /* @__PURE__ */ new Map()
       );
       const sspResponse = await sspClient.requestLightningSend({
         encodedInvoice: invoice,
-        idempotencyKey: paymentHash
+        idempotencyKey: paymentHash,
+        amountSats: isZeroAmountInvoice ? amountSatsToSend : void 0
       });
       if (!sspResponse) {
         throw new Error("Failed to contact SSP");
@@ -28794,10 +29267,14 @@ var SparkWallet = class _SparkWallet extends EventEmitter {
    * @returns {Promise<number>} Fee estimate for sending Lightning payments
    */
   async getLightningSendFeeEstimate({
-    encodedInvoice
+    encodedInvoice,
+    amountSats
   }) {
     const sspClient = this.getSspClient();
-    const feeEstimate = await sspClient.getLightningSendFeeEstimate(encodedInvoice);
+    const feeEstimate = await sspClient.getLightningSendFeeEstimate(
+      encodedInvoice,
+      amountSats
+    );
     if (!feeEstimate) {
       throw new Error("Failed to get lightning send fee estimate");
     }
@@ -29050,7 +29527,7 @@ var SparkWallet = class _SparkWallet extends EventEmitter {
     );
     const groupedOutputs = /* @__PURE__ */ new Map();
     filteredTokenOutputs.forEach((output) => {
-      const tokenKey = bytesToHex12(output.output.tokenPublicKey);
+      const tokenKey = bytesToHex13(output.output.tokenPublicKey);
       const index = output.previousTransactionVout;
       if (!groupedOutputs.has(tokenKey)) {
         groupedOutputs.set(tokenKey, []);
@@ -29180,7 +29657,7 @@ var SparkWallet = class _SparkWallet extends EventEmitter {
       hash,
       compact
     );
-    return bytesToHex12(signature);
+    return bytesToHex13(signature);
   }
   /**
    * Validates a message with the identity key.
@@ -29238,7 +29715,7 @@ var SparkWallet = class _SparkWallet extends EventEmitter {
           publicKey,
           this.config.getNetwork()
         );
-        if (bytesToHex12(script) === bytesToHex12(identityScript)) {
+        if (bytesToHex13(script) === bytesToHex13(identityScript)) {
           try {
             this.config.signer.signTransactionIndex(tx, i, publicKey);
             inputsSigned++;
@@ -29282,13 +29759,13 @@ var SparkWallet = class _SparkWallet extends EventEmitter {
             depositPubKey,
             this.config.getNetwork()
           );
-          if (bytesToHex12(script) === bytesToHex12(identityScript)) {
+          if (bytesToHex13(script) === bytesToHex13(identityScript)) {
             return {
               publicKey: identityPubKey,
               keyType: "identity"
             };
           }
-          if (bytesToHex12(script) === bytesToHex12(depositScript)) {
+          if (bytesToHex13(script) === bytesToHex13(depositScript)) {
             return {
               publicKey: depositPubKey,
               keyType: "deposit"
@@ -29673,7 +30150,7 @@ async function isTxBroadcast(txid, baseUrl, network) {
 }
 
 // src/utils/unilateral-exit.ts
-import { bytesToHex as bytesToHex13, hexToBytes as hexToBytes14 } from "@noble/curves/abstract/utils";
+import { bytesToHex as bytesToHex14, hexToBytes as hexToBytes14 } from "@noble/curves/abstract/utils";
 import { ripemd160 } from "@noble/hashes/legacy";
 import { sha256 as sha25614 } from "@noble/hashes/sha2";
 import * as btc5 from "@scure/btc-signer";
@@ -29744,10 +30221,10 @@ async function constructUnilateralExitTxs(nodeHexStrings, sparkClient, network)
       }
     }
     for (const chainNode of chain) {
-      const nodeTx = bytesToHex13(chainNode.nodeTx);
+      const nodeTx = bytesToHex14(chainNode.nodeTx);
       transactions.push(nodeTx);
       if (chainNode.id === node.id) {
-        const refundTx = bytesToHex13(chainNode.refundTx);
+        const refundTx = bytesToHex14(chainNode.refundTx);
         transactions.push(refundTx);
       }
     }
@@ -29853,7 +30330,7 @@ async function constructUnilateralExitFeeBumpPackages(nodeHexStrings, utxos, fee
       }
     }
     for (const chainNode of chain) {
-      let nodeTxHex = bytesToHex13(chainNode.nodeTx);
+      let nodeTxHex = bytesToHex14(chainNode.nodeTx);
       try {
         const txObj = getTxFromRawTxHex(nodeTxHex);
         const txid = getTxId(txObj);
@@ -29870,7 +30347,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 = bytesToHex13(output.script);
+            anchorOutputScriptHex = bytesToHex14(output.script);
             break;
           }
         }
@@ -29895,7 +30372,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 && bytesToHex13(feeBumpOut.script) == usedUtxo.script) {
+        if (feeBumpOut && bytesToHex14(feeBumpOut.script) == usedUtxo.script) {
           feeBumpOutPubKey = usedUtxo.publicKey;
         }
         const index = availableUtxos.findIndex(
@@ -29910,20 +30387,20 @@ async function constructUnilateralExitFeeBumpPackages(nodeHexStrings, utxos, fee
           txid: getTxId(feeBumpTx),
           vout: 0,
           value: feeBumpOut.amount,
-          script: bytesToHex13(feeBumpOut.script),
+          script: bytesToHex14(feeBumpOut.script),
           publicKey: feeBumpOutPubKey
         });
       const finalNodeTx = correctedParentTx || nodeTxHex;
       txPackages.push({ tx: finalNodeTx, feeBumpPsbt: nodeFeeBumpPsbt });
       if (chainNode.id === node.id) {
-        let refundTxHex = bytesToHex13(chainNode.refundTx);
+        let refundTxHex = bytesToHex14(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 = bytesToHex13(output.script);
+              anchorOutputScriptHex = bytesToHex14(output.script);
               break;
             }
           }
@@ -30040,7 +30517,7 @@ function constructFeeBumpTx(txHex, utxos, feeRate, previousFeeBumpTx) {
     const pubKeyHash = hash160(hexToBytes14(fundingUtxo.publicKey));
     const scriptToUse = new Uint8Array([0, 20, ...pubKeyHash]);
     const providedScript = hexToBytes14(fundingUtxo.script);
-    if (bytesToHex13(scriptToUse) !== bytesToHex13(providedScript)) {
+    if (bytesToHex14(scriptToUse) !== bytesToHex14(providedScript)) {
       throw new Error(
         `\u274C  Derived script doesn't match provided script for UTXO ${i + 1}.`
       );
@@ -30105,7 +30582,7 @@ function constructFeeBumpTx(txHex, utxos, feeRate, previousFeeBumpTx) {
   }
   let psbtHex;
   try {
-    psbtHex = bytesToHex13(builder.toPSBT());
+    psbtHex = bytesToHex14(builder.toPSBT());
   } catch (error) {
     throw new Error(`Failed to extract transaction: ${error}`);
   }
@@ -30176,6 +30653,7 @@ export {
   constructFeeBumpTx,
   constructUnilateralExitFeeBumpPackages,
   constructUnilateralExitTxs,
+  createDummyTx,
   createRefundTx,
   createSigningCommitment,
   createSigningNonce,