@buildonspark/spark-sdk 0.3.5 → 0.3.7

package/dist/index.cjs

@@ -235,14 +235,14 @@ function passArrayJsValueToWasm0(array, malloc) {
   WASM_VECTOR_LEN = array.length;
   return ptr;
 }
-var imports, wasm, TextEncoder2, TextDecoder2, WASM_VECTOR_LEN, cachedUint8ArrayMemory0, cachedTextEncoder, encodeString, cachedDataViewMemory0, cachedTextDecoder, frost_nonce, wasm_sign_frost, wasm_aggregate_frost, construct_node_tx, construct_refund_tx, construct_split_tx, construct_direct_refund_tx, create_dummy_tx, encrypt_ecies, decrypt_ecies, get_taproot_pubkey, DummyTxFinalization, DummyTxSrc, DummyTx, KeyPackageFinalization, KeyPackageSrc, KeyPackage, NonceResultFinalization, NonceResultSrc, NonceResult, SigningCommitmentFinalization, SigningCommitmentSrc, SigningCommitment2, SigningNonceFinalization, SigningNonceSrc, SigningNonce, TransactionResultFinalization, TransactionResultSrc, TransactionResult, __wbg_String_8f0eb39a4a4c2f66, __wbg_buffer_609cc3eee51ed158, __wbg_call_672a4d21634d4a24, __wbg_call_7cccdd69e0791ae2, __wbg_crypto_dd1b8f71596b161a, __wbg_done_769e5ede4b31c67b, __wbg_entries_3265d4158b33e5dc, __wbg_getRandomValues_760c8e927227643e, __wbg_get_67b2ba62fc30de12, __wbg_get_b9b93047fe3cf45b, __wbg_getwithrefkey_1dc361bd10053bfe, __wbg_instanceof_ArrayBuffer_e14585432e3737fc, __wbg_instanceof_Uint8Array_17156bcf118086a9, __wbg_isArray_a1eab7e0d067391b, __wbg_isSafeInteger_343e2beeeece1bb0, __wbg_iterator_9a24c88df860dc65, __wbg_length_a446193dc22c12f8, __wbg_length_e2d2a49132c1b256, __wbg_msCrypto_60a4979188f6b80b, __wbg_new_a12002a7f91c75be, __wbg_newnoargs_105ed471475aaf50, __wbg_newwithbyteoffsetandlength_d97e637ebe145a9a, __wbg_newwithlength_a381634e90c276d4, __wbg_next_25feadfc0913fea9, __wbg_next_6574e1a8a62d1055, __wbg_node_0deadde112ce24bb, __wbg_process_0caa4f154b97e834, __wbg_randomFillSync_82e8b56b81896e30, __wbg_require_1a22b236558b5786, __wbg_set_65595bdd868b3009, __wbg_static_accessor_GLOBAL_88a902d13a557d07, __wbg_static_accessor_GLOBAL_THIS_56578be7e9f832b0, __wbg_static_accessor_SELF_37c5d418e4bf5819, __wbg_static_accessor_WINDOW_5de37043a91a9c40, __wbg_subarray_aa9065fa9dc5df96, __wbg_value_cd1ffa7b1ab794f1, __wbg_versions_134d8f3c6de79566, __wbindgen_as_number, __wbindgen_boolean_get, __wbindgen_debug_string, __wbindgen_error_new, __wbindgen_in, __wbindgen_init_externref_table, __wbindgen_is_function, __wbindgen_is_object, __wbindgen_is_string, __wbindgen_is_undefined, __wbindgen_jsval_loose_eq, __wbindgen_memory, __wbindgen_number_get, __wbindgen_string_get, __wbindgen_string_new, __wbindgen_throw, __toBinary, bytes, wasmModule, wasmInstance, __wasm;
+var imports, wasm, TextEncoder2, TextDecoder, WASM_VECTOR_LEN, cachedUint8ArrayMemory0, cachedTextEncoder, encodeString, cachedDataViewMemory0, cachedTextDecoder, frost_nonce, wasm_sign_frost, wasm_aggregate_frost, construct_node_tx, construct_refund_tx, construct_split_tx, construct_direct_refund_tx, create_dummy_tx, encrypt_ecies, decrypt_ecies, get_taproot_pubkey, DummyTxFinalization, DummyTxSrc, DummyTx, KeyPackageFinalization, KeyPackageSrc, KeyPackage, NonceResultFinalization, NonceResultSrc, NonceResult, SigningCommitmentFinalization, SigningCommitmentSrc, SigningCommitment2, SigningNonceFinalization, SigningNonceSrc, SigningNonce, TransactionResultFinalization, TransactionResultSrc, TransactionResult, __wbg_String_8f0eb39a4a4c2f66, __wbg_buffer_609cc3eee51ed158, __wbg_call_672a4d21634d4a24, __wbg_call_7cccdd69e0791ae2, __wbg_crypto_dd1b8f71596b161a, __wbg_done_769e5ede4b31c67b, __wbg_entries_3265d4158b33e5dc, __wbg_getRandomValues_760c8e927227643e, __wbg_get_67b2ba62fc30de12, __wbg_get_b9b93047fe3cf45b, __wbg_getwithrefkey_1dc361bd10053bfe, __wbg_instanceof_ArrayBuffer_e14585432e3737fc, __wbg_instanceof_Uint8Array_17156bcf118086a9, __wbg_isArray_a1eab7e0d067391b, __wbg_isSafeInteger_343e2beeeece1bb0, __wbg_iterator_9a24c88df860dc65, __wbg_length_a446193dc22c12f8, __wbg_length_e2d2a49132c1b256, __wbg_msCrypto_60a4979188f6b80b, __wbg_new_a12002a7f91c75be, __wbg_newnoargs_105ed471475aaf50, __wbg_newwithbyteoffsetandlength_d97e637ebe145a9a, __wbg_newwithlength_a381634e90c276d4, __wbg_next_25feadfc0913fea9, __wbg_next_6574e1a8a62d1055, __wbg_node_0deadde112ce24bb, __wbg_process_0caa4f154b97e834, __wbg_randomFillSync_82e8b56b81896e30, __wbg_require_1a22b236558b5786, __wbg_set_65595bdd868b3009, __wbg_static_accessor_GLOBAL_88a902d13a557d07, __wbg_static_accessor_GLOBAL_THIS_56578be7e9f832b0, __wbg_static_accessor_SELF_37c5d418e4bf5819, __wbg_static_accessor_WINDOW_5de37043a91a9c40, __wbg_subarray_aa9065fa9dc5df96, __wbg_value_cd1ffa7b1ab794f1, __wbg_versions_134d8f3c6de79566, __wbindgen_as_number, __wbindgen_boolean_get, __wbindgen_debug_string, __wbindgen_error_new, __wbindgen_in, __wbindgen_init_externref_table, __wbindgen_is_function, __wbindgen_is_object, __wbindgen_is_string, __wbindgen_is_undefined, __wbindgen_jsval_loose_eq, __wbindgen_memory, __wbindgen_number_get, __wbindgen_string_get, __wbindgen_string_new, __wbindgen_throw, __toBinary, bytes, wasmModule, wasmInstance, __wasm;
 var init_spark_bindings = __esm({
   "src/wasm/spark_bindings.js"() {
     "use strict";
     init_buffer();
     imports = {};
     imports["__wbindgen_placeholder__"] = imports;
-    ({ TextEncoder: TextEncoder2, TextDecoder: TextDecoder2 } = globalThis);
+    ({ TextEncoder: TextEncoder2, TextDecoder } = globalThis);
     WASM_VECTOR_LEN = 0;
     cachedUint8ArrayMemory0 = null;
     cachedTextEncoder = new TextEncoder2("utf-8");
@@ -257,7 +257,7 @@ var init_spark_bindings = __esm({
       };
     };
     cachedDataViewMemory0 = null;
-    cachedTextDecoder = new TextDecoder2("utf-8", { ignoreBOM: true, fatal: true });
+    cachedTextDecoder = new TextDecoder("utf-8", { ignoreBOM: true, fatal: true });
     cachedTextDecoder.decode();
     frost_nonce = imports.frost_nonce = function(key_package) {
       _assertClass(key_package, KeyPackage);
@@ -308,10 +308,10 @@ var init_spark_bindings = __esm({
       wasm.__wbindgen_free(ret[0], ret[1] * 1, 1);
       return v7;
     };
-    construct_node_tx = imports.construct_node_tx = function(tx, vout, address2, locktime) {
+    construct_node_tx = imports.construct_node_tx = function(tx, vout, address, locktime) {
       const ptr0 = passArray8ToWasm0(tx, wasm.__wbindgen_malloc);
       const len0 = WASM_VECTOR_LEN;
-      const ptr1 = passStringToWasm0(address2, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
+      const ptr1 = passStringToWasm0(address, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
       const len1 = WASM_VECTOR_LEN;
       const ret = wasm.construct_node_tx(ptr0, len0, vout, ptr1, len1, locktime);
       if (ret[2]) {
@@ -356,8 +356,8 @@ var init_spark_bindings = __esm({
       }
       return TransactionResult.__wrap(ret[0]);
     };
-    create_dummy_tx = imports.create_dummy_tx = function(address2, amount_sats) {
-      const ptr0 = passStringToWasm0(address2, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
+    create_dummy_tx = imports.create_dummy_tx = function(address, amount_sats) {
+      const ptr0 = passStringToWasm0(address, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
       const len0 = WASM_VECTOR_LEN;
       const ret = wasm.create_dummy_tx(ptr0, len0, amount_sats);
       if (ret[2]) {
@@ -1213,10 +1213,10 @@ function aggregateFrost({
   return result;
 }
 function createDummyTx({
-  address: address2,
+  address,
   amountSats
 }) {
-  return create_dummy_tx(address2, amountSats);
+  return create_dummy_tx(address, amountSats);
 }
 function encryptEcies({
   msg,
@@ -1241,185 +1241,12 @@ var init_wasm = __esm({
   }
 });
 
-// src/services/xhr-transport.ts
-var xhr_transport_exports = {};
-__export(xhr_transport_exports, {
-  XHRTransport: () => XHRTransport
-});
-async function xhrPost(url, metadata, requestBody, config) {
-  const callData = new GrpcCallData();
-  return new Promise(function(resolve, reject) {
-    const xhr = new XMLHttpRequest();
-    xhr.open("POST", url, true);
-    xhr.withCredentials = config?.credentials ?? true;
-    xhr.responseType = "arraybuffer";
-    for (const [key, values] of metadata) {
-      for (const value of values) {
-        xhr.setRequestHeader(
-          key,
-          typeof value === "string" ? value : import_js_base64.Base64.fromUint8Array(value)
-        );
-      }
-    }
-    xhr.onreadystatechange = function() {
-      if (xhr.readyState === XMLHttpRequest.HEADERS_RECEIVED) {
-        callData.responseHeaders = headersToMetadata(
-          xhr.getAllResponseHeaders()
-        );
-      } else if (xhr.readyState === XMLHttpRequest.DONE) {
-        resolve(callData);
-      }
-    };
-    xhr.onerror = function() {
-      callData.statusMessage = getErrorDetailsFromHttpResponse(
-        xhr.status,
-        xhr.statusText
-      );
-    };
-    xhr.onloadend = function() {
-      callData.responseChunks.push(new Uint8Array(xhr.response));
-      callData.grpcStatus = getStatusFromHttpCode(xhr.status);
-    };
-    xhr.send(requestBody);
-  });
-}
-function concatenateChunks(chunks) {
-  let totalSize = 0;
-  for (const chunk of chunks) {
-    totalSize += chunk.length;
-  }
-  const newData = new Uint8Array(totalSize);
-  let setIndex = 0;
-  for (const chunk of chunks) {
-    newData.set(chunk, setIndex);
-    setIndex += chunk.length;
-  }
-  return newData;
-}
-function XHRTransport(config) {
-  return async function* fetchTransport({
-    url,
-    body,
-    metadata,
-    signal,
-    method
-  }) {
-    let requestBody;
-    if (!method.requestStream) {
-      let bodyBuffer;
-      for await (const chunk of body) {
-        bodyBuffer = chunk;
-        break;
-      }
-      requestBody = bodyBuffer.slice();
-    } else {
-      let iterator;
-      requestBody = new ReadableStream({
-        // @ts-ignore
-        type: "bytes",
-        start() {
-          iterator = body[Symbol.asyncIterator]();
-        },
-        async pull(controller) {
-          const { done, value } = await iterator.next();
-          if (done) {
-            controller.close();
-          } else {
-            controller.enqueue(value.slice());
-          }
-        },
-        async cancel() {
-          await iterator.return?.();
-        }
-      });
-    }
-    const xhrData = await xhrPost(url, metadata, requestBody, config);
-    yield {
-      type: "header",
-      header: xhrData.responseHeaders
-    };
-    if (xhrData.grpcStatus !== import_nice_grpc_common.Status.OK) {
-      const decoder = new TextDecoder();
-      const message = decoder.decode(concatenateChunks(xhrData.responseChunks));
-      console.warn(message, xhrData.statusMessage);
-      throw new import_nice_grpc_common.ClientError(
-        method.path,
-        xhrData.grpcStatus,
-        `status=${xhrData.statusMessage}, message=${message}`
-      );
-    }
-    (0, import_abort_controller_x.throwIfAborted)(signal);
-    try {
-      for (const xhrChunk of xhrData.responseChunks) {
-        if (xhrChunk != null) {
-          yield {
-            type: "data",
-            data: xhrChunk
-          };
-        }
-      }
-    } finally {
-      (0, import_abort_controller_x.throwIfAborted)(signal);
-    }
-  };
-}
-function headersToMetadata(headers) {
-  const metadata = new import_nice_grpc_common.Metadata();
-  const arr = headers.trim().split(/[\r\n]+/);
-  arr.forEach((line) => {
-    const parts = line.split(": ");
-    const header = parts.shift() ?? "";
-    const value = parts.join(": ");
-    metadata.set(header, value);
-  });
-  return metadata;
-}
-function getStatusFromHttpCode(statusCode) {
-  switch (statusCode) {
-    case 200:
-      return import_nice_grpc_common.Status.OK;
-    case 400:
-      return import_nice_grpc_common.Status.INTERNAL;
-    case 401:
-      return import_nice_grpc_common.Status.UNAUTHENTICATED;
-    case 403:
-      return import_nice_grpc_common.Status.PERMISSION_DENIED;
-    case 404:
-      return import_nice_grpc_common.Status.UNIMPLEMENTED;
-    case 429:
-    case 502:
-    case 503:
-    case 504:
-      return import_nice_grpc_common.Status.UNAVAILABLE;
-    default:
-      return import_nice_grpc_common.Status.UNKNOWN;
-  }
-}
-function getErrorDetailsFromHttpResponse(statusCode, responseText) {
-  return `Received HTTP ${statusCode} response: ` + (responseText.length > 1e3 ? responseText.slice(0, 1e3) + "... (truncated)" : responseText);
-}
-var import_abort_controller_x, import_js_base64, import_nice_grpc_common, GrpcCallData;
-var init_xhr_transport = __esm({
-  "src/services/xhr-transport.ts"() {
-    "use strict";
-    init_buffer();
-    import_abort_controller_x = require("abort-controller-x");
-    import_js_base64 = require("js-base64");
-    import_nice_grpc_common = require("nice-grpc-common");
-    GrpcCallData = class {
-      responseHeaders = new import_nice_grpc_common.Metadata();
-      responseChunks = [];
-      grpcStatus = import_nice_grpc_common.Status.UNKNOWN;
-      statusMessage = "";
-    };
-  }
-});
-
 // src/index.ts
 var index_exports = {};
 __export(index_exports, {
   AuthenticationError: () => AuthenticationError,
   ConfigurationError: () => ConfigurationError,
+  ConnectionManager: () => ConnectionManagerBrowser,
   DEFAULT_FEE_SATS: () => DEFAULT_FEE_SATS,
   DIRECT_TIMELOCK_OFFSET: () => DIRECT_TIMELOCK_OFFSET,
   DefaultSparkSigner: () => DefaultSparkSigner,
@@ -1428,7 +1255,6 @@ __export(index_exports, {
   InternalValidationError: () => InternalValidationError,
   KeyDerivationType: () => KeyDerivationType,
   LOGGER_NAMES: () => LOGGER_NAMES,
-  LRC_WALLET_NETWORK: () => LRC_WALLET_NETWORK,
   Network: () => Network2,
   NetworkError: () => NetworkError,
   NetworkToProto: () => NetworkToProto,
@@ -17490,16 +17316,16 @@ function encodeSparkAddressWithSignature(payload, signature) {
     );
   }
 }
-function decodeSparkAddress(address2, network) {
+function decodeSparkAddress(address, network) {
   try {
-    if (network !== getNetworkFromSparkAddress(address2)) {
+    if (network !== getNetworkFromSparkAddress(address)) {
       throw new ValidationError("Invalid Spark address prefix", {
         field: "address",
-        value: address2,
+        value: address,
         expected: `prefix='${AddressNetwork[network]}' or '${LegacyAddressNetwork[network]}'`
       });
     }
-    const decoded = bech32mDecode(address2);
+    const decoded = bech32mDecode(address);
     const payload = SparkAddress.decode(import_base2.bech32m.fromWords(decoded.words));
     const { identityPublicKey, sparkInvoiceFields, signature } = payload;
     const identityPubkeyHex = (0, import_utils3.bytesToHex)(identityPublicKey);
@@ -17537,7 +17363,7 @@ function decodeSparkAddress(address2, network) {
       "Failed to decode Spark address",
       {
         field: "address",
-        value: address2
+        value: address
       },
       error
     );
@@ -17549,30 +17375,30 @@ var PrefixToNetwork = Object.fromEntries(
 var LegacyPrefixToNetwork = Object.fromEntries(
   Object.entries(LegacyAddressNetwork).map(([k, v]) => [v, k])
 );
-function getNetworkFromSparkAddress(address2) {
-  const { prefix } = bech32mDecode(address2);
+function getNetworkFromSparkAddress(address) {
+  const { prefix } = bech32mDecode(address);
   const network = PrefixToNetwork[prefix] ?? LegacyPrefixToNetwork[prefix];
   if (!network) {
     throw new ValidationError("Invalid Spark address prefix", {
       field: "network",
-      value: address2,
+      value: address,
       expected: "prefix='spark1', 'sparkt1', 'sparkrt1', 'sparks1', 'sparkl1' or legacy ('sp1', 'spt1', 'sprt1', 'sps1', 'spl1')"
     });
   }
   return network;
 }
-function isLegacySparkAddress(address2) {
+function isLegacySparkAddress(address) {
   try {
-    const { prefix } = bech32mDecode(address2);
+    const { prefix } = bech32mDecode(address);
     return prefix in LegacyPrefixToNetwork;
   } catch (error) {
     return false;
   }
 }
-function isValidSparkAddress(address2) {
+function isValidSparkAddress(address) {
   try {
-    const network = getNetworkFromSparkAddress(address2);
-    decodeSparkAddress(address2, network);
+    const network = getNetworkFromSparkAddress(address);
+    decodeSparkAddress(address, network);
     return true;
   } catch (error) {
     if (error instanceof ValidationError) {
@@ -17582,7 +17408,7 @@ function isValidSparkAddress(address2) {
       "Invalid Spark address",
       {
         field: "address",
-        value: address2
+        value: address
       },
       error
     );
@@ -17775,9 +17601,9 @@ function assertBech32(s) {
   const i = s.lastIndexOf("1");
   if (i <= 0 || i >= s.length - 1) throw new Error("invalid bech32 string");
 }
-function bech32mDecode(address2) {
-  assertBech32(address2);
-  return import_base2.bech32m.decode(address2, BECH32M_LIMIT);
+function bech32mDecode(address) {
+  assertBech32(address);
+  return import_base2.bech32m.decode(address, BECH32M_LIMIT);
 }
 function bech32mEncode(prefix, words) {
   return import_base2.bech32m.encode(prefix, words, BECH32M_LIMIT);
@@ -17952,7 +17778,7 @@ var btc2 = __toESM(require("@scure/btc-signer"), 1);
 // src/utils/network.ts
 init_buffer();
 var btc = __toESM(require("@scure/btc-signer"), 1);
-var bitcoin = __toESM(require("bitcoinjs-lib"), 1);
+var import_base3 = require("@scure/base");
 
 // src/graphql/objects/BitcoinNetwork.ts
 init_buffer();
@@ -18004,16 +17830,16 @@ var NetworkConfig = {
   [4 /* LOCAL */]: { ...btc.TEST_NETWORK, bech32: "bcrt" }
 };
 var getNetwork = (network) => NetworkConfig[network];
-var LRC_WALLET_NETWORK = Object.freeze({
-  [0 /* MAINNET */]: bitcoin.networks.bitcoin,
-  [1 /* TESTNET */]: bitcoin.networks.testnet,
-  [2 /* SIGNET */]: bitcoin.networks.testnet,
-  [3 /* REGTEST */]: bitcoin.networks.regtest,
-  [4 /* LOCAL */]: bitcoin.networks.regtest
-});
-function getNetworkFromAddress(address2) {
+function getNetworkFromAddress(address) {
   try {
-    const decoded = bitcoin.address.fromBech32(address2);
+    const bechAddress = address;
+    const decoded = (() => {
+      try {
+        return import_base3.bech32.decode(bechAddress);
+      } catch (_) {
+        return import_base3.bech32m.decode(bechAddress);
+      }
+    })();
     if (decoded.prefix === "bc") {
       return "MAINNET" /* MAINNET */;
     } else if (decoded.prefix === "bcrt") {
@@ -18024,7 +17850,7 @@ function getNetworkFromAddress(address2) {
       "Invalid Bitcoin address",
       {
         field: "address",
-        value: address2,
+        value: address,
         expected: "Valid Bech32 address with prefix 'bc' or 'bcrt'"
       },
       err instanceof Error ? err : void 0
@@ -18087,18 +17913,18 @@ function getP2TRAddressFromPublicKey(pubKey, network) {
     });
   }
   const internalKey = import_secp256k13.secp256k1.Point.fromHex(pubKey);
-  const address2 = btc2.p2tr(
+  const address = btc2.p2tr(
     internalKey.toBytes().slice(1, 33),
     void 0,
     getNetwork(network)
   ).address;
-  if (!address2) {
+  if (!address) {
     throw new ValidationError("Failed to get P2TR address", {
       field: "address",
       value: "null"
     });
   }
-  return address2;
+  return address;
 }
 function getP2TRAddressFromPkScript(pkScript, network) {
   if (pkScript.length !== 34 || pkScript[0] !== 81 || pkScript[1] !== 32) {
@@ -18119,14 +17945,14 @@ function getP2WPKHAddressFromPublicKey(pubKey, network) {
       expected: 33
     });
   }
-  const address2 = btc2.p2wpkh(pubKey, getNetwork(network)).address;
-  if (!address2) {
+  const address = btc2.p2wpkh(pubKey, getNetwork(network)).address;
+  if (!address) {
     throw new ValidationError("Failed to get P2WPKH address", {
       field: "address",
       value: "null"
     });
   }
-  return address2;
+  return address;
 }
 function getTxFromRawTxHex(rawTxHex) {
   const txBytes = (0, import_utils5.hexToBytes)(rawTxHex);
@@ -18247,8 +18073,8 @@ function addPrivateKeys(a, b) {
   }
   const privA = import_secp256k14.secp256k1.utils.normPrivateKeyToScalar(a);
   const privB = import_secp256k14.secp256k1.utils.normPrivateKeyToScalar(b);
-  const sum = (privA + privB) % import_secp256k14.secp256k1.CURVE.n;
-  return (0, import_utils6.numberToBytesBE)(sum, 32);
+  const sum2 = (privA + privB) % import_secp256k14.secp256k1.CURVE.n;
+  return (0, import_utils6.numberToBytesBE)(sum2, 32);
 }
 function subtractPrivateKeys(a, b) {
   if (a.length !== 32 || b.length !== 32) {
@@ -18260,11 +18086,11 @@ function subtractPrivateKeys(a, b) {
   }
   const privA = import_secp256k14.secp256k1.utils.normPrivateKeyToScalar(a);
   const privB = import_secp256k14.secp256k1.utils.normPrivateKeyToScalar(b);
-  const sum = (import_secp256k14.secp256k1.CURVE.n - privB + privA) % import_secp256k14.secp256k1.CURVE.n;
-  return (0, import_utils6.numberToBytesBE)(sum, 32);
+  const sum2 = (import_secp256k14.secp256k1.CURVE.n - privB + privA) % import_secp256k14.secp256k1.CURVE.n;
+  return (0, import_utils6.numberToBytesBE)(sum2, 32);
 }
 function sumOfPrivateKeys(keys) {
-  return keys.reduce((sum, key) => {
+  return keys.reduce((sum2, key) => {
     if (key.length !== 32) {
       throw new ValidationError("Private keys must be 32 bytes", {
         field: "privateKey",
@@ -18272,7 +18098,7 @@ function sumOfPrivateKeys(keys) {
         expected: 32
       });
     }
-    return addPrivateKeys(sum, key);
+    return addPrivateKeys(sum2, key);
   });
 }
 function lastKeyWithTarget(target, keys) {
@@ -18283,8 +18109,8 @@ function lastKeyWithTarget(target, keys) {
       expected: 32
     });
   }
-  const sum = sumOfPrivateKeys(keys);
-  return subtractPrivateKeys(target, sum);
+  const sum2 = sumOfPrivateKeys(keys);
+  return subtractPrivateKeys(target, sum2);
 }
 
 // src/utils/mempool.ts
@@ -19514,9 +19340,9 @@ var getFetch = () => {
 };
 
 // src/utils/mempool.ts
-async function getLatestDepositTxId(address2) {
+async function getLatestDepositTxId(address) {
   const { fetch, Headers: Headers2 } = getFetch();
-  const network = getNetworkFromAddress(address2);
+  const network = getNetworkFromAddress(address);
   const baseUrl = network === BitcoinNetwork_default.REGTEST ? getElectrsUrl("REGTEST") : getElectrsUrl("MAINNET");
   const headers = new Headers2();
   if (network === BitcoinNetwork_default.REGTEST) {
@@ -19525,14 +19351,14 @@ async function getLatestDepositTxId(address2) {
     );
     headers.set("Authorization", `Basic ${auth}`);
   }
-  const response = await fetch(`${baseUrl}/address/${address2}/txs`, {
+  const response = await fetch(`${baseUrl}/address/${address}/txs`, {
     headers
   });
   const addressTxs = await response.json();
   if (addressTxs && addressTxs.length > 0) {
     const latestTx = addressTxs[0];
     const outputIndex = latestTx.vout.findIndex(
-      (output) => output.scriptpubkey_address === address2
+      (output) => output.scriptpubkey_address === address
     );
     if (outputIndex === -1) {
       return null;
@@ -19886,7 +19712,7 @@ function decodeBytesToSigningCommitment(bytes2) {
 
 // src/utils/token-identifier.ts
 init_buffer();
-var import_base3 = require("@scure/base");
+var import_base4 = require("@scure/base");
 var Bech32mTokenIdentifierTokenIdentifierNetworkPrefix = {
   MAINNET: "btkn",
   REGTEST: "btknrt",
@@ -19896,7 +19722,7 @@ var Bech32mTokenIdentifierTokenIdentifierNetworkPrefix = {
 };
 function encodeBech32mTokenIdentifier(payload) {
   try {
-    const words = import_base3.bech32m.toWords(payload.tokenIdentifier);
+    const words = import_base4.bech32m.toWords(payload.tokenIdentifier);
     if (!payload.network) {
       throw new ValidationError(
         "Network is required to encode bech32m encoded token identifier",
@@ -19906,7 +19732,7 @@ function encodeBech32mTokenIdentifier(payload) {
         }
       );
     }
-    return import_base3.bech32m.encode(
+    return import_base4.bech32m.encode(
       Bech32mTokenIdentifierTokenIdentifierNetworkPrefix[payload.network],
       words,
       500
@@ -19924,7 +19750,7 @@ function encodeBech32mTokenIdentifier(payload) {
 }
 function decodeBech32mTokenIdentifier(bech32mTokenIdentifier, network) {
   try {
-    const decoded = import_base3.bech32m.decode(
+    const decoded = import_base4.bech32m.decode(
       bech32mTokenIdentifier,
       500
     );
@@ -19938,7 +19764,7 @@ function decodeBech32mTokenIdentifier(bech32mTokenIdentifier, network) {
         }
       );
     }
-    const tokenIdentifier = import_base3.bech32m.fromWords(decoded.words);
+    const tokenIdentifier = import_base4.bech32m.fromWords(decoded.words);
     return {
       tokenIdentifier,
       network: network ?? getNetworkFromBech32mTokenIdentifier(bech32mTokenIdentifier)
@@ -19988,7 +19814,7 @@ var import_utils9 = require("@noble/curves/utils");
 function sumAvailableTokens(outputs) {
   try {
     return outputs.reduce(
-      (sum, output) => sum + BigInt((0, import_utils9.bytesToNumberBE)(output.output.tokenAmount)),
+      (sum2, output) => sum2 + BigInt((0, import_utils9.bytesToNumberBE)(output.output.tokenAmount)),
       BigInt(0)
     );
   } catch (error) {
@@ -20918,7 +20744,7 @@ var isWebExtension = (
   "chrome" in globalThis && globalThis.chrome.runtime?.id
 );
 var userAgent = "navigator" in globalThis ? globalThis.navigator.userAgent || "unknown-user-agent" : void 0;
-var packageVersion = true ? "0.3.5" : "unknown";
+var packageVersion = true ? "0.3.7" : "unknown";
 var baseEnvStr = "unknown";
 if (isBun) {
   const bunVersion = "version" in globalThis.Bun ? globalThis.Bun.version : "unknown-version";
@@ -21591,7 +21417,7 @@ fragment CoopExitRequestFragment on CoopExitRequest {
 var CompleteCoopExit = `
   mutation CompleteCoopExit(
     $user_outbound_transfer_external_id: UUID!
-    $coop_exit_request_id: ID!
+    $coop_exit_request_id: ID
   ) {
     complete_coop_exit(input: {
       user_outbound_transfer_external_id: $user_outbound_transfer_external_id
@@ -21669,11 +21495,12 @@ var RequestCoopExit = `
   mutation RequestCoopExit(
     $leaf_external_ids: [UUID!]!
     $withdrawal_address: String!
-    $idempotency_key: String!
+    $idempotency_key: String
     $exit_speed: ExitSpeed!
     $withdraw_all: Boolean
     $fee_leaf_external_ids: [UUID!]
     $fee_quote_id: ID
+    $user_outbound_transfer_external_id: UUID
   ) {
     request_coop_exit(
       input: {
@@ -21684,6 +21511,7 @@ var RequestCoopExit = `
         withdraw_all: $withdraw_all
         fee_leaf_external_ids: $fee_leaf_external_ids
         fee_quote_id: $fee_quote_id
+        user_outbound_transfer_external_id: $user_outbound_transfer_external_id
       }
     ) {
       request {
@@ -21732,13 +21560,15 @@ init_buffer();
 var RequestLightningSend = `
   mutation RequestLightningSend(
     $encoded_invoice: String!
-    $idempotency_key: String!
+    $idempotency_key: String
     $amount_sats: Long
+    $user_outbound_transfer_external_id: UUID
   ) {
     request_lightning_send(input: {
       encoded_invoice: $encoded_invoice
       idempotency_key: $idempotency_key
       amount_sats: $amount_sats
+      user_outbound_transfer_external_id: $user_outbound_transfer_external_id
     }) {
       request {
         ...LightningSendRequestFragment
@@ -22188,14 +22018,12 @@ var SspClient = class {
     throw new Error("Not implemented");
   }
   async completeCoopExit({
-    userOutboundTransferExternalId,
-    coopExitRequestId
+    userOutboundTransferExternalId
   }) {
     return await this.executeRawQuery({
       queryPayload: CompleteCoopExit,
       variables: {
-        user_outbound_transfer_external_id: userOutboundTransferExternalId,
-        coop_exit_request_id: coopExitRequestId
+        user_outbound_transfer_external_id: userOutboundTransferExternalId
       },
       constructObject: (response) => {
         return CoopExitRequestFromJson(response.complete_coop_exit.request);
@@ -22205,29 +22033,28 @@ var SspClient = class {
   async requestCoopExit({
     leafExternalIds,
     withdrawalAddress,
-    idempotencyKey,
     exitSpeed,
     feeLeafExternalIds,
     feeQuoteId,
-    withdrawAll
+    withdrawAll,
+    userOutboundTransferExternalId
   }) {
     return await this.executeRawQuery({
       queryPayload: RequestCoopExit,
       variables: {
         leaf_external_ids: leafExternalIds,
         withdrawal_address: withdrawalAddress,
-        idempotency_key: idempotencyKey,
         exit_speed: exitSpeed,
         fee_leaf_external_ids: feeLeafExternalIds,
         fee_quote_id: feeQuoteId,
-        withdraw_all: withdrawAll
+        withdraw_all: withdrawAll,
+        user_outbound_transfer_external_id: userOutboundTransferExternalId
       },
       constructObject: (response) => {
         return CoopExitRequestFromJson(response.request_coop_exit.request);
       }
     });
   }
-  // TODO: Lets name this better
   async requestLightningReceive({
     amountSats,
     network,
@@ -22259,15 +22086,15 @@ var SspClient = class {
   }
   async requestLightningSend({
     encodedInvoice,
-    idempotencyKey,
-    amountSats
+    amountSats,
+    userOutboundTransferExternalId
   }) {
     return await this.executeRawQuery({
       queryPayload: RequestLightningSend,
       variables: {
         encoded_invoice: encodedInvoice,
-        idempotency_key: idempotencyKey,
-        amount_sats: amountSats
+        amount_sats: amountSats,
+        user_outbound_transfer_external_id: userOutboundTransferExternalId
       },
       constructObject: (response) => {
         return LightningSendRequestFromJson(
@@ -22612,13 +22439,13 @@ var WalletConfigService = class {
   config;
   signer;
   sspClientOptions;
-  constructor(options, signer) {
+  constructor(options = {}, signer) {
     const network = options?.network ?? "REGTEST";
     this.config = {
       ...this.getDefaultConfig(Network2[network]),
       ...options
     };
-    this.signer = signer ?? new DefaultSparkSigner();
+    this.signer = signer;
     this.sspClientOptions = this.config.sspClientOptions;
   }
   getDefaultConfig(network) {
@@ -22701,450 +22528,19 @@ var WalletConfigService = class {
   }
 };
 
-// src/services/connection.ts
+// src/services/connection/connection.ts
 init_buffer();
 var import_core12 = require("@lightsparkdev/core");
 var import_sha28 = require("@noble/hashes/sha2");
-var import_nice_grpc_client_middleware_retry = require("nice-grpc-client-middleware-retry");
-var import_nice_grpc_common2 = require("nice-grpc-common");
-var import_nice_grpc_web = require("nice-grpc-web");
-
-// src/proto/mock.ts
-init_buffer();
-var import_wire6 = require("@bufbuild/protobuf/wire");
-function interruptTransferRequest_InterruptTransferActionFromJSON(object) {
-  switch (object) {
-    case 0:
-    case "NONE":
-      return 0 /* NONE */;
-    case 1:
-    case "INTERRUPT":
-      return 1 /* INTERRUPT */;
-    case 2:
-    case "RESUME":
-      return 2 /* RESUME */;
-    case -1:
-    case "UNRECOGNIZED":
-    default:
-      return -1 /* UNRECOGNIZED */;
-  }
-}
-function interruptTransferRequest_InterruptTransferActionToJSON(object) {
-  switch (object) {
-    case 0 /* NONE */:
-      return "NONE";
-    case 1 /* INTERRUPT */:
-      return "INTERRUPT";
-    case 2 /* RESUME */:
-      return "RESUME";
-    case -1 /* UNRECOGNIZED */:
-    default:
-      return "UNRECOGNIZED";
-  }
-}
-function interruptCoopExitRequest_InterruptCoopExitActionFromJSON(object) {
-  switch (object) {
-    case 0:
-    case "NONE":
-      return 0 /* NONE */;
-    case 1:
-    case "INTERRUPT":
-      return 1 /* INTERRUPT */;
-    case 2:
-    case "RESUME":
-      return 2 /* RESUME */;
-    case -1:
-    case "UNRECOGNIZED":
-    default:
-      return -1 /* UNRECOGNIZED */;
-  }
-}
-function interruptCoopExitRequest_InterruptCoopExitActionToJSON(object) {
-  switch (object) {
-    case 0 /* NONE */:
-      return "NONE";
-    case 1 /* INTERRUPT */:
-      return "INTERRUPT";
-    case 2 /* RESUME */:
-      return "RESUME";
-    case -1 /* UNRECOGNIZED */:
-    default:
-      return "UNRECOGNIZED";
-  }
-}
-function createBaseCleanUpPreimageShareRequest() {
-  return { paymentHash: new Uint8Array(0) };
-}
-var CleanUpPreimageShareRequest = {
-  encode(message, writer = new import_wire6.BinaryWriter()) {
-    if (message.paymentHash.length !== 0) {
-      writer.uint32(10).bytes(message.paymentHash);
-    }
-    return writer;
-  },
-  decode(input, length) {
-    const reader = input instanceof import_wire6.BinaryReader ? input : new import_wire6.BinaryReader(input);
-    const end = length === void 0 ? reader.len : reader.pos + length;
-    const message = createBaseCleanUpPreimageShareRequest();
-    while (reader.pos < end) {
-      const tag = reader.uint32();
-      switch (tag >>> 3) {
-        case 1: {
-          if (tag !== 10) {
-            break;
-          }
-          message.paymentHash = reader.bytes();
-          continue;
-        }
-      }
-      if ((tag & 7) === 4 || tag === 0) {
-        break;
-      }
-      reader.skip(tag & 7);
-    }
-    return message;
-  },
-  fromJSON(object) {
-    return { paymentHash: isSet4(object.paymentHash) ? bytesFromBase643(object.paymentHash) : new Uint8Array(0) };
-  },
-  toJSON(message) {
-    const obj = {};
-    if (message.paymentHash.length !== 0) {
-      obj.paymentHash = base64FromBytes3(message.paymentHash);
-    }
-    return obj;
-  },
-  create(base) {
-    return CleanUpPreimageShareRequest.fromPartial(base ?? {});
-  },
-  fromPartial(object) {
-    const message = createBaseCleanUpPreimageShareRequest();
-    message.paymentHash = object.paymentHash ?? new Uint8Array(0);
-    return message;
-  }
-};
-function createBaseInterruptTransferRequest() {
-  return { action: 0 };
-}
-var InterruptTransferRequest = {
-  encode(message, writer = new import_wire6.BinaryWriter()) {
-    if (message.action !== 0) {
-      writer.uint32(8).int32(message.action);
-    }
-    return writer;
-  },
-  decode(input, length) {
-    const reader = input instanceof import_wire6.BinaryReader ? input : new import_wire6.BinaryReader(input);
-    const end = length === void 0 ? reader.len : reader.pos + length;
-    const message = createBaseInterruptTransferRequest();
-    while (reader.pos < end) {
-      const tag = reader.uint32();
-      switch (tag >>> 3) {
-        case 1: {
-          if (tag !== 8) {
-            break;
-          }
-          message.action = reader.int32();
-          continue;
-        }
-      }
-      if ((tag & 7) === 4 || tag === 0) {
-        break;
-      }
-      reader.skip(tag & 7);
-    }
-    return message;
-  },
-  fromJSON(object) {
-    return {
-      action: isSet4(object.action) ? interruptTransferRequest_InterruptTransferActionFromJSON(object.action) : 0
-    };
-  },
-  toJSON(message) {
-    const obj = {};
-    if (message.action !== 0) {
-      obj.action = interruptTransferRequest_InterruptTransferActionToJSON(message.action);
-    }
-    return obj;
-  },
-  create(base) {
-    return InterruptTransferRequest.fromPartial(base ?? {});
-  },
-  fromPartial(object) {
-    const message = createBaseInterruptTransferRequest();
-    message.action = object.action ?? 0;
-    return message;
-  }
-};
-function createBaseUpdateNodesStatusRequest() {
-  return { nodeIds: [], status: "" };
-}
-var UpdateNodesStatusRequest = {
-  encode(message, writer = new import_wire6.BinaryWriter()) {
-    for (const v of message.nodeIds) {
-      writer.uint32(10).string(v);
-    }
-    if (message.status !== "") {
-      writer.uint32(18).string(message.status);
-    }
-    return writer;
-  },
-  decode(input, length) {
-    const reader = input instanceof import_wire6.BinaryReader ? input : new import_wire6.BinaryReader(input);
-    const end = length === void 0 ? reader.len : reader.pos + length;
-    const message = createBaseUpdateNodesStatusRequest();
-    while (reader.pos < end) {
-      const tag = reader.uint32();
-      switch (tag >>> 3) {
-        case 1: {
-          if (tag !== 10) {
-            break;
-          }
-          message.nodeIds.push(reader.string());
-          continue;
-        }
-        case 2: {
-          if (tag !== 18) {
-            break;
-          }
-          message.status = reader.string();
-          continue;
-        }
-      }
-      if ((tag & 7) === 4 || tag === 0) {
-        break;
-      }
-      reader.skip(tag & 7);
-    }
-    return message;
-  },
-  fromJSON(object) {
-    return {
-      nodeIds: globalThis.Array.isArray(object?.nodeIds) ? object.nodeIds.map((e) => globalThis.String(e)) : [],
-      status: isSet4(object.status) ? globalThis.String(object.status) : ""
-    };
-  },
-  toJSON(message) {
-    const obj = {};
-    if (message.nodeIds?.length) {
-      obj.nodeIds = message.nodeIds;
-    }
-    if (message.status !== "") {
-      obj.status = message.status;
-    }
-    return obj;
-  },
-  create(base) {
-    return UpdateNodesStatusRequest.fromPartial(base ?? {});
-  },
-  fromPartial(object) {
-    const message = createBaseUpdateNodesStatusRequest();
-    message.nodeIds = object.nodeIds?.map((e) => e) || [];
-    message.status = object.status ?? "";
-    return message;
-  }
-};
-function createBaseTriggerTaskRequest() {
-  return { taskName: "" };
-}
-var TriggerTaskRequest = {
-  encode(message, writer = new import_wire6.BinaryWriter()) {
-    if (message.taskName !== "") {
-      writer.uint32(10).string(message.taskName);
-    }
-    return writer;
-  },
-  decode(input, length) {
-    const reader = input instanceof import_wire6.BinaryReader ? input : new import_wire6.BinaryReader(input);
-    const end = length === void 0 ? reader.len : reader.pos + length;
-    const message = createBaseTriggerTaskRequest();
-    while (reader.pos < end) {
-      const tag = reader.uint32();
-      switch (tag >>> 3) {
-        case 1: {
-          if (tag !== 10) {
-            break;
-          }
-          message.taskName = reader.string();
-          continue;
-        }
-      }
-      if ((tag & 7) === 4 || tag === 0) {
-        break;
-      }
-      reader.skip(tag & 7);
-    }
-    return message;
-  },
-  fromJSON(object) {
-    return { taskName: isSet4(object.taskName) ? globalThis.String(object.taskName) : "" };
-  },
-  toJSON(message) {
-    const obj = {};
-    if (message.taskName !== "") {
-      obj.taskName = message.taskName;
-    }
-    return obj;
-  },
-  create(base) {
-    return TriggerTaskRequest.fromPartial(base ?? {});
-  },
-  fromPartial(object) {
-    const message = createBaseTriggerTaskRequest();
-    message.taskName = object.taskName ?? "";
-    return message;
-  }
-};
-function createBaseInterruptCoopExitRequest() {
-  return { action: 0, targetOperator: "" };
-}
-var InterruptCoopExitRequest = {
-  encode(message, writer = new import_wire6.BinaryWriter()) {
-    if (message.action !== 0) {
-      writer.uint32(8).int32(message.action);
-    }
-    if (message.targetOperator !== "") {
-      writer.uint32(18).string(message.targetOperator);
-    }
-    return writer;
-  },
-  decode(input, length) {
-    const reader = input instanceof import_wire6.BinaryReader ? input : new import_wire6.BinaryReader(input);
-    const end = length === void 0 ? reader.len : reader.pos + length;
-    const message = createBaseInterruptCoopExitRequest();
-    while (reader.pos < end) {
-      const tag = reader.uint32();
-      switch (tag >>> 3) {
-        case 1: {
-          if (tag !== 8) {
-            break;
-          }
-          message.action = reader.int32();
-          continue;
-        }
-        case 2: {
-          if (tag !== 18) {
-            break;
-          }
-          message.targetOperator = reader.string();
-          continue;
-        }
-      }
-      if ((tag & 7) === 4 || tag === 0) {
-        break;
-      }
-      reader.skip(tag & 7);
-    }
-    return message;
-  },
-  fromJSON(object) {
-    return {
-      action: isSet4(object.action) ? interruptCoopExitRequest_InterruptCoopExitActionFromJSON(object.action) : 0,
-      targetOperator: isSet4(object.targetOperator) ? globalThis.String(object.targetOperator) : ""
-    };
-  },
-  toJSON(message) {
-    const obj = {};
-    if (message.action !== 0) {
-      obj.action = interruptCoopExitRequest_InterruptCoopExitActionToJSON(message.action);
-    }
-    if (message.targetOperator !== "") {
-      obj.targetOperator = message.targetOperator;
-    }
-    return obj;
-  },
-  create(base) {
-    return InterruptCoopExitRequest.fromPartial(base ?? {});
-  },
-  fromPartial(object) {
-    const message = createBaseInterruptCoopExitRequest();
-    message.action = object.action ?? 0;
-    message.targetOperator = object.targetOperator ?? "";
-    return message;
-  }
-};
-var MockServiceDefinition = {
-  name: "MockService",
-  fullName: "mock.MockService",
-  methods: {
-    clean_up_preimage_share: {
-      name: "clean_up_preimage_share",
-      requestType: CleanUpPreimageShareRequest,
-      requestStream: false,
-      responseType: Empty,
-      responseStream: false,
-      options: {}
-    },
-    interrupt_transfer: {
-      name: "interrupt_transfer",
-      requestType: InterruptTransferRequest,
-      requestStream: false,
-      responseType: Empty,
-      responseStream: false,
-      options: {}
-    },
-    interrupt_coop_exit: {
-      name: "interrupt_coop_exit",
-      requestType: InterruptCoopExitRequest,
-      requestStream: false,
-      responseType: Empty,
-      responseStream: false,
-      options: {}
-    },
-    update_nodes_status: {
-      name: "update_nodes_status",
-      requestType: UpdateNodesStatusRequest,
-      requestStream: false,
-      responseType: Empty,
-      responseStream: false,
-      options: {}
-    },
-    /** Triggers the execution of a scheduled task immediately by name. Used by hermetic tests */
-    trigger_task: {
-      name: "trigger_task",
-      requestType: TriggerTaskRequest,
-      requestStream: false,
-      responseType: Empty,
-      responseStream: false,
-      options: {}
-    }
-  }
-};
-function bytesFromBase643(b64) {
-  if (globalThis.Buffer) {
-    return Uint8Array.from(globalThis.Buffer.from(b64, "base64"));
-  } else {
-    const bin = globalThis.atob(b64);
-    const arr = new Uint8Array(bin.length);
-    for (let i = 0; i < bin.length; ++i) {
-      arr[i] = bin.charCodeAt(i);
-    }
-    return arr;
-  }
-}
-function base64FromBytes3(arr) {
-  if (globalThis.Buffer) {
-    return globalThis.Buffer.from(arr).toString("base64");
-  } else {
-    const bin = [];
-    arr.forEach((byte) => {
-      bin.push(globalThis.String.fromCharCode(byte));
-    });
-    return globalThis.btoa(bin.join(""));
-  }
-}
-function isSet4(value) {
-  return value !== null && value !== void 0;
-}
 
 // src/proto/spark_authn.ts
 init_buffer();
-var import_wire7 = require("@bufbuild/protobuf/wire");
+var import_wire6 = require("@bufbuild/protobuf/wire");
 function createBaseChallenge() {
   return { version: 0, timestamp: 0, nonce: new Uint8Array(0), publicKey: new Uint8Array(0) };
 }
 var Challenge = {
-  encode(message, writer = new import_wire7.BinaryWriter()) {
+  encode(message, writer = new import_wire6.BinaryWriter()) {
     if (message.version !== 0) {
       writer.uint32(8).int32(message.version);
     }
@@ -23160,7 +22556,7 @@ var Challenge = {
     return writer;
   },
   decode(input, length) {
-    const reader = input instanceof import_wire7.BinaryReader ? input : new import_wire7.BinaryReader(input);
+    const reader = input instanceof import_wire6.BinaryReader ? input : new import_wire6.BinaryReader(input);
     const end = length === void 0 ? reader.len : reader.pos + length;
     const message = createBaseChallenge();
     while (reader.pos < end) {
@@ -23204,10 +22600,10 @@ var Challenge = {
   },
   fromJSON(object) {
     return {
-      version: isSet5(object.version) ? globalThis.Number(object.version) : 0,
-      timestamp: isSet5(object.timestamp) ? globalThis.Number(object.timestamp) : 0,
-      nonce: isSet5(object.nonce) ? bytesFromBase644(object.nonce) : new Uint8Array(0),
-      publicKey: isSet5(object.publicKey) ? bytesFromBase644(object.publicKey) : new Uint8Array(0)
+      version: isSet4(object.version) ? globalThis.Number(object.version) : 0,
+      timestamp: isSet4(object.timestamp) ? globalThis.Number(object.timestamp) : 0,
+      nonce: isSet4(object.nonce) ? bytesFromBase643(object.nonce) : new Uint8Array(0),
+      publicKey: isSet4(object.publicKey) ? bytesFromBase643(object.publicKey) : new Uint8Array(0)
     };
   },
   toJSON(message) {
@@ -23219,10 +22615,10 @@ var Challenge = {
       obj.timestamp = Math.round(message.timestamp);
     }
     if (message.nonce.length !== 0) {
-      obj.nonce = base64FromBytes4(message.nonce);
+      obj.nonce = base64FromBytes3(message.nonce);
     }
     if (message.publicKey.length !== 0) {
-      obj.publicKey = base64FromBytes4(message.publicKey);
+      obj.publicKey = base64FromBytes3(message.publicKey);
     }
     return obj;
   },
@@ -23242,7 +22638,7 @@ function createBaseProtectedChallenge() {
   return { version: 0, challenge: void 0, serverHmac: new Uint8Array(0) };
 }
 var ProtectedChallenge = {
-  encode(message, writer = new import_wire7.BinaryWriter()) {
+  encode(message, writer = new import_wire6.BinaryWriter()) {
     if (message.version !== 0) {
       writer.uint32(8).int32(message.version);
     }
@@ -23255,7 +22651,7 @@ var ProtectedChallenge = {
     return writer;
   },
   decode(input, length) {
-    const reader = input instanceof import_wire7.BinaryReader ? input : new import_wire7.BinaryReader(input);
+    const reader = input instanceof import_wire6.BinaryReader ? input : new import_wire6.BinaryReader(input);
     const end = length === void 0 ? reader.len : reader.pos + length;
     const message = createBaseProtectedChallenge();
     while (reader.pos < end) {
@@ -23292,9 +22688,9 @@ var ProtectedChallenge = {
   },
   fromJSON(object) {
     return {
-      version: isSet5(object.version) ? globalThis.Number(object.version) : 0,
-      challenge: isSet5(object.challenge) ? Challenge.fromJSON(object.challenge) : void 0,
-      serverHmac: isSet5(object.serverHmac) ? bytesFromBase644(object.serverHmac) : new Uint8Array(0)
+      version: isSet4(object.version) ? globalThis.Number(object.version) : 0,
+      challenge: isSet4(object.challenge) ? Challenge.fromJSON(object.challenge) : void 0,
+      serverHmac: isSet4(object.serverHmac) ? bytesFromBase643(object.serverHmac) : new Uint8Array(0)
     };
   },
   toJSON(message) {
@@ -23306,7 +22702,7 @@ var ProtectedChallenge = {
       obj.challenge = Challenge.toJSON(message.challenge);
     }
     if (message.serverHmac.length !== 0) {
-      obj.serverHmac = base64FromBytes4(message.serverHmac);
+      obj.serverHmac = base64FromBytes3(message.serverHmac);
     }
     return obj;
   },
@@ -23325,14 +22721,14 @@ function createBaseGetChallengeRequest() {
   return { publicKey: new Uint8Array(0) };
 }
 var GetChallengeRequest = {
-  encode(message, writer = new import_wire7.BinaryWriter()) {
+  encode(message, writer = new import_wire6.BinaryWriter()) {
     if (message.publicKey.length !== 0) {
       writer.uint32(10).bytes(message.publicKey);
     }
     return writer;
   },
   decode(input, length) {
-    const reader = input instanceof import_wire7.BinaryReader ? input : new import_wire7.BinaryReader(input);
+    const reader = input instanceof import_wire6.BinaryReader ? input : new import_wire6.BinaryReader(input);
     const end = length === void 0 ? reader.len : reader.pos + length;
     const message = createBaseGetChallengeRequest();
     while (reader.pos < end) {
@@ -23354,12 +22750,12 @@ var GetChallengeRequest = {
     return message;
   },
   fromJSON(object) {
-    return { publicKey: isSet5(object.publicKey) ? bytesFromBase644(object.publicKey) : new Uint8Array(0) };
+    return { publicKey: isSet4(object.publicKey) ? bytesFromBase643(object.publicKey) : new Uint8Array(0) };
   },
   toJSON(message) {
     const obj = {};
     if (message.publicKey.length !== 0) {
-      obj.publicKey = base64FromBytes4(message.publicKey);
+      obj.publicKey = base64FromBytes3(message.publicKey);
     }
     return obj;
   },
@@ -23376,14 +22772,14 @@ function createBaseGetChallengeResponse() {
   return { protectedChallenge: void 0 };
 }
 var GetChallengeResponse = {
-  encode(message, writer = new import_wire7.BinaryWriter()) {
+  encode(message, writer = new import_wire6.BinaryWriter()) {
     if (message.protectedChallenge !== void 0) {
       ProtectedChallenge.encode(message.protectedChallenge, writer.uint32(10).fork()).join();
     }
     return writer;
   },
   decode(input, length) {
-    const reader = input instanceof import_wire7.BinaryReader ? input : new import_wire7.BinaryReader(input);
+    const reader = input instanceof import_wire6.BinaryReader ? input : new import_wire6.BinaryReader(input);
     const end = length === void 0 ? reader.len : reader.pos + length;
     const message = createBaseGetChallengeResponse();
     while (reader.pos < end) {
@@ -23406,7 +22802,7 @@ var GetChallengeResponse = {
   },
   fromJSON(object) {
     return {
-      protectedChallenge: isSet5(object.protectedChallenge) ? ProtectedChallenge.fromJSON(object.protectedChallenge) : void 0
+      protectedChallenge: isSet4(object.protectedChallenge) ? ProtectedChallenge.fromJSON(object.protectedChallenge) : void 0
     };
   },
   toJSON(message) {
@@ -23429,7 +22825,7 @@ function createBaseVerifyChallengeRequest() {
   return { protectedChallenge: void 0, signature: new Uint8Array(0), publicKey: new Uint8Array(0) };
 }
 var VerifyChallengeRequest = {
-  encode(message, writer = new import_wire7.BinaryWriter()) {
+  encode(message, writer = new import_wire6.BinaryWriter()) {
     if (message.protectedChallenge !== void 0) {
       ProtectedChallenge.encode(message.protectedChallenge, writer.uint32(10).fork()).join();
     }
@@ -23442,7 +22838,7 @@ var VerifyChallengeRequest = {
     return writer;
   },
   decode(input, length) {
-    const reader = input instanceof import_wire7.BinaryReader ? input : new import_wire7.BinaryReader(input);
+    const reader = input instanceof import_wire6.BinaryReader ? input : new import_wire6.BinaryReader(input);
     const end = length === void 0 ? reader.len : reader.pos + length;
     const message = createBaseVerifyChallengeRequest();
     while (reader.pos < end) {
@@ -23479,9 +22875,9 @@ var VerifyChallengeRequest = {
   },
   fromJSON(object) {
     return {
-      protectedChallenge: isSet5(object.protectedChallenge) ? ProtectedChallenge.fromJSON(object.protectedChallenge) : void 0,
-      signature: isSet5(object.signature) ? bytesFromBase644(object.signature) : new Uint8Array(0),
-      publicKey: isSet5(object.publicKey) ? bytesFromBase644(object.publicKey) : new Uint8Array(0)
+      protectedChallenge: isSet4(object.protectedChallenge) ? ProtectedChallenge.fromJSON(object.protectedChallenge) : void 0,
+      signature: isSet4(object.signature) ? bytesFromBase643(object.signature) : new Uint8Array(0),
+      publicKey: isSet4(object.publicKey) ? bytesFromBase643(object.publicKey) : new Uint8Array(0)
     };
   },
   toJSON(message) {
@@ -23490,10 +22886,10 @@ var VerifyChallengeRequest = {
       obj.protectedChallenge = ProtectedChallenge.toJSON(message.protectedChallenge);
     }
     if (message.signature.length !== 0) {
-      obj.signature = base64FromBytes4(message.signature);
+      obj.signature = base64FromBytes3(message.signature);
     }
     if (message.publicKey.length !== 0) {
-      obj.publicKey = base64FromBytes4(message.publicKey);
+      obj.publicKey = base64FromBytes3(message.publicKey);
     }
     return obj;
   },
@@ -23512,7 +22908,7 @@ function createBaseVerifyChallengeResponse() {
   return { sessionToken: "", expirationTimestamp: 0 };
 }
 var VerifyChallengeResponse = {
-  encode(message, writer = new import_wire7.BinaryWriter()) {
+  encode(message, writer = new import_wire6.BinaryWriter()) {
     if (message.sessionToken !== "") {
       writer.uint32(10).string(message.sessionToken);
     }
@@ -23522,7 +22918,7 @@ var VerifyChallengeResponse = {
     return writer;
   },
   decode(input, length) {
-    const reader = input instanceof import_wire7.BinaryReader ? input : new import_wire7.BinaryReader(input);
+    const reader = input instanceof import_wire6.BinaryReader ? input : new import_wire6.BinaryReader(input);
     const end = length === void 0 ? reader.len : reader.pos + length;
     const message = createBaseVerifyChallengeResponse();
     while (reader.pos < end) {
@@ -23552,8 +22948,8 @@ var VerifyChallengeResponse = {
   },
   fromJSON(object) {
     return {
-      sessionToken: isSet5(object.sessionToken) ? globalThis.String(object.sessionToken) : "",
-      expirationTimestamp: isSet5(object.expirationTimestamp) ? globalThis.Number(object.expirationTimestamp) : 0
+      sessionToken: isSet4(object.sessionToken) ? globalThis.String(object.sessionToken) : "",
+      expirationTimestamp: isSet4(object.expirationTimestamp) ? globalThis.Number(object.expirationTimestamp) : 0
     };
   },
   toJSON(message) {
@@ -23600,7 +22996,7 @@ var SparkAuthnServiceDefinition = {
     }
   }
 };
-function bytesFromBase644(b64) {
+function bytesFromBase643(b64) {
   if (globalThis.Buffer) {
     return Uint8Array.from(globalThis.Buffer.from(b64, "base64"));
   } else {
@@ -23612,7 +23008,7 @@ function bytesFromBase644(b64) {
     return arr;
   }
 }
-function base64FromBytes4(arr) {
+function base64FromBytes3(arr) {
   if (globalThis.Buffer) {
     return globalThis.Buffer.from(arr).toString("base64");
   } else {
@@ -23633,13 +23029,13 @@ function longToNumber3(int64) {
   }
   return num;
 }
-function isSet5(value) {
+function isSet4(value) {
   return value !== null && value !== void 0;
 }
 
 // src/proto/spark_token.ts
 init_buffer();
-var import_wire8 = require("@bufbuild/protobuf/wire");
+var import_wire7 = require("@bufbuild/protobuf/wire");
 function commitStatusFromJSON(object) {
   switch (object) {
     case 0:
@@ -23724,7 +23120,7 @@ function createBaseTokenOutputToSpend2() {
   return { prevTokenTransactionHash: new Uint8Array(0), prevTokenTransactionVout: 0 };
 }
 var TokenOutputToSpend2 = {
-  encode(message, writer = new import_wire8.BinaryWriter()) {
+  encode(message, writer = new import_wire7.BinaryWriter()) {
     if (message.prevTokenTransactionHash.length !== 0) {
       writer.uint32(10).bytes(message.prevTokenTransactionHash);
     }
@@ -23734,7 +23130,7 @@ var TokenOutputToSpend2 = {
     return writer;
   },
   decode(input, length) {
-    const reader = input instanceof import_wire8.BinaryReader ? input : new import_wire8.BinaryReader(input);
+    const reader = input instanceof import_wire7.BinaryReader ? input : new import_wire7.BinaryReader(input);
     const end = length === void 0 ? reader.len : reader.pos + length;
     const message = createBaseTokenOutputToSpend2();
     while (reader.pos < end) {
@@ -23764,14 +23160,14 @@ var TokenOutputToSpend2 = {
   },
   fromJSON(object) {
     return {
-      prevTokenTransactionHash: isSet6(object.prevTokenTransactionHash) ? bytesFromBase645(object.prevTokenTransactionHash) : new Uint8Array(0),
-      prevTokenTransactionVout: isSet6(object.prevTokenTransactionVout) ? globalThis.Number(object.prevTokenTransactionVout) : 0
+      prevTokenTransactionHash: isSet5(object.prevTokenTransactionHash) ? bytesFromBase644(object.prevTokenTransactionHash) : new Uint8Array(0),
+      prevTokenTransactionVout: isSet5(object.prevTokenTransactionVout) ? globalThis.Number(object.prevTokenTransactionVout) : 0
     };
   },
   toJSON(message) {
     const obj = {};
     if (message.prevTokenTransactionHash.length !== 0) {
-      obj.prevTokenTransactionHash = base64FromBytes5(message.prevTokenTransactionHash);
+      obj.prevTokenTransactionHash = base64FromBytes4(message.prevTokenTransactionHash);
     }
     if (message.prevTokenTransactionVout !== 0) {
       obj.prevTokenTransactionVout = Math.round(message.prevTokenTransactionVout);
@@ -23792,14 +23188,14 @@ function createBaseTokenTransferInput2() {
   return { outputsToSpend: [] };
 }
 var TokenTransferInput2 = {
-  encode(message, writer = new import_wire8.BinaryWriter()) {
+  encode(message, writer = new import_wire7.BinaryWriter()) {
     for (const v of message.outputsToSpend) {
       TokenOutputToSpend2.encode(v, writer.uint32(10).fork()).join();
     }
     return writer;
   },
   decode(input, length) {
-    const reader = input instanceof import_wire8.BinaryReader ? input : new import_wire8.BinaryReader(input);
+    const reader = input instanceof import_wire7.BinaryReader ? input : new import_wire7.BinaryReader(input);
     const end = length === void 0 ? reader.len : reader.pos + length;
     const message = createBaseTokenTransferInput2();
     while (reader.pos < end) {
@@ -23845,7 +23241,7 @@ function createBaseTokenMintInput2() {
   return { issuerPublicKey: new Uint8Array(0), tokenIdentifier: void 0 };
 }
 var TokenMintInput2 = {
-  encode(message, writer = new import_wire8.BinaryWriter()) {
+  encode(message, writer = new import_wire7.BinaryWriter()) {
     if (message.issuerPublicKey.length !== 0) {
       writer.uint32(10).bytes(message.issuerPublicKey);
     }
@@ -23855,7 +23251,7 @@ var TokenMintInput2 = {
     return writer;
   },
   decode(input, length) {
-    const reader = input instanceof import_wire8.BinaryReader ? input : new import_wire8.BinaryReader(input);
+    const reader = input instanceof import_wire7.BinaryReader ? input : new import_wire7.BinaryReader(input);
     const end = length === void 0 ? reader.len : reader.pos + length;
     const message = createBaseTokenMintInput2();
     while (reader.pos < end) {
@@ -23885,17 +23281,17 @@ var TokenMintInput2 = {
   },
   fromJSON(object) {
     return {
-      issuerPublicKey: isSet6(object.issuerPublicKey) ? bytesFromBase645(object.issuerPublicKey) : new Uint8Array(0),
-      tokenIdentifier: isSet6(object.tokenIdentifier) ? bytesFromBase645(object.tokenIdentifier) : void 0
+      issuerPublicKey: isSet5(object.issuerPublicKey) ? bytesFromBase644(object.issuerPublicKey) : new Uint8Array(0),
+      tokenIdentifier: isSet5(object.tokenIdentifier) ? bytesFromBase644(object.tokenIdentifier) : void 0
     };
   },
   toJSON(message) {
     const obj = {};
     if (message.issuerPublicKey.length !== 0) {
-      obj.issuerPublicKey = base64FromBytes5(message.issuerPublicKey);
+      obj.issuerPublicKey = base64FromBytes4(message.issuerPublicKey);
     }
     if (message.tokenIdentifier !== void 0) {
-      obj.tokenIdentifier = base64FromBytes5(message.tokenIdentifier);
+      obj.tokenIdentifier = base64FromBytes4(message.tokenIdentifier);
     }
     return obj;
   },
@@ -23921,7 +23317,7 @@ function createBaseTokenCreateInput2() {
   };
 }
 var TokenCreateInput2 = {
-  encode(message, writer = new import_wire8.BinaryWriter()) {
+  encode(message, writer = new import_wire7.BinaryWriter()) {
     if (message.issuerPublicKey.length !== 0) {
       writer.uint32(10).bytes(message.issuerPublicKey);
     }
@@ -23946,7 +23342,7 @@ var TokenCreateInput2 = {
     return writer;
   },
   decode(input, length) {
-    const reader = input instanceof import_wire8.BinaryReader ? input : new import_wire8.BinaryReader(input);
+    const reader = input instanceof import_wire7.BinaryReader ? input : new import_wire7.BinaryReader(input);
     const end = length === void 0 ? reader.len : reader.pos + length;
     const message = createBaseTokenCreateInput2();
     while (reader.pos < end) {
@@ -24011,19 +23407,19 @@ var TokenCreateInput2 = {
   },
   fromJSON(object) {
     return {
-      issuerPublicKey: isSet6(object.issuerPublicKey) ? bytesFromBase645(object.issuerPublicKey) : new Uint8Array(0),
-      tokenName: isSet6(object.tokenName) ? globalThis.String(object.tokenName) : "",
-      tokenTicker: isSet6(object.tokenTicker) ? globalThis.String(object.tokenTicker) : "",
-      decimals: isSet6(object.decimals) ? globalThis.Number(object.decimals) : 0,
-      maxSupply: isSet6(object.maxSupply) ? bytesFromBase645(object.maxSupply) : new Uint8Array(0),
-      isFreezable: isSet6(object.isFreezable) ? globalThis.Boolean(object.isFreezable) : false,
-      creationEntityPublicKey: isSet6(object.creationEntityPublicKey) ? bytesFromBase645(object.creationEntityPublicKey) : void 0
+      issuerPublicKey: isSet5(object.issuerPublicKey) ? bytesFromBase644(object.issuerPublicKey) : new Uint8Array(0),
+      tokenName: isSet5(object.tokenName) ? globalThis.String(object.tokenName) : "",
+      tokenTicker: isSet5(object.tokenTicker) ? globalThis.String(object.tokenTicker) : "",
+      decimals: isSet5(object.decimals) ? globalThis.Number(object.decimals) : 0,
+      maxSupply: isSet5(object.maxSupply) ? bytesFromBase644(object.maxSupply) : new Uint8Array(0),
+      isFreezable: isSet5(object.isFreezable) ? globalThis.Boolean(object.isFreezable) : false,
+      creationEntityPublicKey: isSet5(object.creationEntityPublicKey) ? bytesFromBase644(object.creationEntityPublicKey) : void 0
     };
   },
   toJSON(message) {
     const obj = {};
     if (message.issuerPublicKey.length !== 0) {
-      obj.issuerPublicKey = base64FromBytes5(message.issuerPublicKey);
+      obj.issuerPublicKey = base64FromBytes4(message.issuerPublicKey);
     }
     if (message.tokenName !== "") {
       obj.tokenName = message.tokenName;
@@ -24035,13 +23431,13 @@ var TokenCreateInput2 = {
       obj.decimals = Math.round(message.decimals);
     }
     if (message.maxSupply.length !== 0) {
-      obj.maxSupply = base64FromBytes5(message.maxSupply);
+      obj.maxSupply = base64FromBytes4(message.maxSupply);
     }
     if (message.isFreezable !== false) {
       obj.isFreezable = message.isFreezable;
     }
     if (message.creationEntityPublicKey !== void 0) {
-      obj.creationEntityPublicKey = base64FromBytes5(message.creationEntityPublicKey);
+      obj.creationEntityPublicKey = base64FromBytes4(message.creationEntityPublicKey);
     }
     return obj;
   },
@@ -24073,7 +23469,7 @@ function createBaseTokenOutput2() {
   };
 }
 var TokenOutput2 = {
-  encode(message, writer = new import_wire8.BinaryWriter()) {
+  encode(message, writer = new import_wire7.BinaryWriter()) {
     if (message.id !== void 0) {
       writer.uint32(10).string(message.id);
     }
@@ -24101,7 +23497,7 @@ var TokenOutput2 = {
     return writer;
   },
   decode(input, length) {
-    const reader = input instanceof import_wire8.BinaryReader ? input : new import_wire8.BinaryReader(input);
+    const reader = input instanceof import_wire7.BinaryReader ? input : new import_wire7.BinaryReader(input);
     const end = length === void 0 ? reader.len : reader.pos + length;
     const message = createBaseTokenOutput2();
     while (reader.pos < end) {
@@ -24173,14 +23569,14 @@ var TokenOutput2 = {
   },
   fromJSON(object) {
     return {
-      id: isSet6(object.id) ? globalThis.String(object.id) : void 0,
-      ownerPublicKey: isSet6(object.ownerPublicKey) ? bytesFromBase645(object.ownerPublicKey) : new Uint8Array(0),
-      revocationCommitment: isSet6(object.revocationCommitment) ? bytesFromBase645(object.revocationCommitment) : void 0,
-      withdrawBondSats: isSet6(object.withdrawBondSats) ? globalThis.Number(object.withdrawBondSats) : void 0,
-      withdrawRelativeBlockLocktime: isSet6(object.withdrawRelativeBlockLocktime) ? globalThis.Number(object.withdrawRelativeBlockLocktime) : void 0,
-      tokenPublicKey: isSet6(object.tokenPublicKey) ? bytesFromBase645(object.tokenPublicKey) : void 0,
-      tokenIdentifier: isSet6(object.tokenIdentifier) ? bytesFromBase645(object.tokenIdentifier) : void 0,
-      tokenAmount: isSet6(object.tokenAmount) ? bytesFromBase645(object.tokenAmount) : new Uint8Array(0)
+      id: isSet5(object.id) ? globalThis.String(object.id) : void 0,
+      ownerPublicKey: isSet5(object.ownerPublicKey) ? bytesFromBase644(object.ownerPublicKey) : new Uint8Array(0),
+      revocationCommitment: isSet5(object.revocationCommitment) ? bytesFromBase644(object.revocationCommitment) : void 0,
+      withdrawBondSats: isSet5(object.withdrawBondSats) ? globalThis.Number(object.withdrawBondSats) : void 0,
+      withdrawRelativeBlockLocktime: isSet5(object.withdrawRelativeBlockLocktime) ? globalThis.Number(object.withdrawRelativeBlockLocktime) : void 0,
+      tokenPublicKey: isSet5(object.tokenPublicKey) ? bytesFromBase644(object.tokenPublicKey) : void 0,
+      tokenIdentifier: isSet5(object.tokenIdentifier) ? bytesFromBase644(object.tokenIdentifier) : void 0,
+      tokenAmount: isSet5(object.tokenAmount) ? bytesFromBase644(object.tokenAmount) : new Uint8Array(0)
     };
   },
   toJSON(message) {
@@ -24189,10 +23585,10 @@ var TokenOutput2 = {
       obj.id = message.id;
     }
     if (message.ownerPublicKey.length !== 0) {
-      obj.ownerPublicKey = base64FromBytes5(message.ownerPublicKey);
+      obj.ownerPublicKey = base64FromBytes4(message.ownerPublicKey);
     }
     if (message.revocationCommitment !== void 0) {
-      obj.revocationCommitment = base64FromBytes5(message.revocationCommitment);
+      obj.revocationCommitment = base64FromBytes4(message.revocationCommitment);
     }
     if (message.withdrawBondSats !== void 0) {
       obj.withdrawBondSats = Math.round(message.withdrawBondSats);
@@ -24201,13 +23597,13 @@ var TokenOutput2 = {
       obj.withdrawRelativeBlockLocktime = Math.round(message.withdrawRelativeBlockLocktime);
     }
     if (message.tokenPublicKey !== void 0) {
-      obj.tokenPublicKey = base64FromBytes5(message.tokenPublicKey);
+      obj.tokenPublicKey = base64FromBytes4(message.tokenPublicKey);
     }
     if (message.tokenIdentifier !== void 0) {
-      obj.tokenIdentifier = base64FromBytes5(message.tokenIdentifier);
+      obj.tokenIdentifier = base64FromBytes4(message.tokenIdentifier);
     }
     if (message.tokenAmount.length !== 0) {
-      obj.tokenAmount = base64FromBytes5(message.tokenAmount);
+      obj.tokenAmount = base64FromBytes4(message.tokenAmount);
     }
     return obj;
   },
@@ -24240,7 +23636,7 @@ function createBaseTokenTransaction2() {
   };
 }
 var TokenTransaction2 = {
-  encode(message, writer = new import_wire8.BinaryWriter()) {
+  encode(message, writer = new import_wire7.BinaryWriter()) {
     if (message.version !== 0) {
       writer.uint32(8).uint32(message.version);
     }
@@ -24276,7 +23672,7 @@ var TokenTransaction2 = {
     return writer;
   },
   decode(input, length) {
-    const reader = input instanceof import_wire8.BinaryReader ? input : new import_wire8.BinaryReader(input);
+    const reader = input instanceof import_wire7.BinaryReader ? input : new import_wire7.BinaryReader(input);
     const end = length === void 0 ? reader.len : reader.pos + length;
     const message = createBaseTokenTransaction2();
     while (reader.pos < end) {
@@ -24365,13 +23761,13 @@ var TokenTransaction2 = {
   },
   fromJSON(object) {
     return {
-      version: isSet6(object.version) ? globalThis.Number(object.version) : 0,
-      tokenInputs: isSet6(object.mintInput) ? { $case: "mintInput", mintInput: TokenMintInput2.fromJSON(object.mintInput) } : isSet6(object.transferInput) ? { $case: "transferInput", transferInput: TokenTransferInput2.fromJSON(object.transferInput) } : isSet6(object.createInput) ? { $case: "createInput", createInput: TokenCreateInput2.fromJSON(object.createInput) } : void 0,
+      version: isSet5(object.version) ? globalThis.Number(object.version) : 0,
+      tokenInputs: isSet5(object.mintInput) ? { $case: "mintInput", mintInput: TokenMintInput2.fromJSON(object.mintInput) } : isSet5(object.transferInput) ? { $case: "transferInput", transferInput: TokenTransferInput2.fromJSON(object.transferInput) } : isSet5(object.createInput) ? { $case: "createInput", createInput: TokenCreateInput2.fromJSON(object.createInput) } : void 0,
       tokenOutputs: globalThis.Array.isArray(object?.tokenOutputs) ? object.tokenOutputs.map((e) => TokenOutput2.fromJSON(e)) : [],
-      sparkOperatorIdentityPublicKeys: globalThis.Array.isArray(object?.sparkOperatorIdentityPublicKeys) ? object.sparkOperatorIdentityPublicKeys.map((e) => bytesFromBase645(e)) : [],
-      expiryTime: isSet6(object.expiryTime) ? fromJsonTimestamp2(object.expiryTime) : void 0,
-      network: isSet6(object.network) ? networkFromJSON(object.network) : 0,
-      clientCreatedTimestamp: isSet6(object.clientCreatedTimestamp) ? fromJsonTimestamp2(object.clientCreatedTimestamp) : void 0,
+      sparkOperatorIdentityPublicKeys: globalThis.Array.isArray(object?.sparkOperatorIdentityPublicKeys) ? object.sparkOperatorIdentityPublicKeys.map((e) => bytesFromBase644(e)) : [],
+      expiryTime: isSet5(object.expiryTime) ? fromJsonTimestamp2(object.expiryTime) : void 0,
+      network: isSet5(object.network) ? networkFromJSON(object.network) : 0,
+      clientCreatedTimestamp: isSet5(object.clientCreatedTimestamp) ? fromJsonTimestamp2(object.clientCreatedTimestamp) : void 0,
       invoiceAttachments: globalThis.Array.isArray(object?.invoiceAttachments) ? object.invoiceAttachments.map((e) => InvoiceAttachment.fromJSON(e)) : []
     };
   },
@@ -24391,7 +23787,7 @@ var TokenTransaction2 = {
       obj.tokenOutputs = message.tokenOutputs.map((e) => TokenOutput2.toJSON(e));
     }
     if (message.sparkOperatorIdentityPublicKeys?.length) {
-      obj.sparkOperatorIdentityPublicKeys = message.sparkOperatorIdentityPublicKeys.map((e) => base64FromBytes5(e));
+      obj.sparkOperatorIdentityPublicKeys = message.sparkOperatorIdentityPublicKeys.map((e) => base64FromBytes4(e));
     }
     if (message.expiryTime !== void 0) {
       obj.expiryTime = message.expiryTime.toISOString();
@@ -24455,14 +23851,14 @@ function createBaseInvoiceAttachment() {
   return { sparkInvoice: "" };
 }
 var InvoiceAttachment = {
-  encode(message, writer = new import_wire8.BinaryWriter()) {
+  encode(message, writer = new import_wire7.BinaryWriter()) {
     if (message.sparkInvoice !== "") {
       writer.uint32(10).string(message.sparkInvoice);
     }
     return writer;
   },
   decode(input, length) {
-    const reader = input instanceof import_wire8.BinaryReader ? input : new import_wire8.BinaryReader(input);
+    const reader = input instanceof import_wire7.BinaryReader ? input : new import_wire7.BinaryReader(input);
     const end = length === void 0 ? reader.len : reader.pos + length;
     const message = createBaseInvoiceAttachment();
     while (reader.pos < end) {
@@ -24484,7 +23880,7 @@ var InvoiceAttachment = {
     return message;
   },
   fromJSON(object) {
-    return { sparkInvoice: isSet6(object.sparkInvoice) ? globalThis.String(object.sparkInvoice) : "" };
+    return { sparkInvoice: isSet5(object.sparkInvoice) ? globalThis.String(object.sparkInvoice) : "" };
   },
   toJSON(message) {
     const obj = {};
@@ -24506,7 +23902,7 @@ function createBaseSignatureWithIndex2() {
   return { signature: new Uint8Array(0), inputIndex: 0 };
 }
 var SignatureWithIndex2 = {
-  encode(message, writer = new import_wire8.BinaryWriter()) {
+  encode(message, writer = new import_wire7.BinaryWriter()) {
     if (message.signature.length !== 0) {
       writer.uint32(10).bytes(message.signature);
     }
@@ -24516,7 +23912,7 @@ var SignatureWithIndex2 = {
     return writer;
   },
   decode(input, length) {
-    const reader = input instanceof import_wire8.BinaryReader ? input : new import_wire8.BinaryReader(input);
+    const reader = input instanceof import_wire7.BinaryReader ? input : new import_wire7.BinaryReader(input);
     const end = length === void 0 ? reader.len : reader.pos + length;
     const message = createBaseSignatureWithIndex2();
     while (reader.pos < end) {
@@ -24546,14 +23942,14 @@ var SignatureWithIndex2 = {
   },
   fromJSON(object) {
     return {
-      signature: isSet6(object.signature) ? bytesFromBase645(object.signature) : new Uint8Array(0),
-      inputIndex: isSet6(object.inputIndex) ? globalThis.Number(object.inputIndex) : 0
+      signature: isSet5(object.signature) ? bytesFromBase644(object.signature) : new Uint8Array(0),
+      inputIndex: isSet5(object.inputIndex) ? globalThis.Number(object.inputIndex) : 0
     };
   },
   toJSON(message) {
     const obj = {};
     if (message.signature.length !== 0) {
-      obj.signature = base64FromBytes5(message.signature);
+      obj.signature = base64FromBytes4(message.signature);
     }
     if (message.inputIndex !== 0) {
       obj.inputIndex = Math.round(message.inputIndex);
@@ -24574,7 +23970,7 @@ function createBaseInputTtxoSignaturesPerOperator() {
   return { ttxoSignatures: [], operatorIdentityPublicKey: new Uint8Array(0) };
 }
 var InputTtxoSignaturesPerOperator = {
-  encode(message, writer = new import_wire8.BinaryWriter()) {
+  encode(message, writer = new import_wire7.BinaryWriter()) {
     for (const v of message.ttxoSignatures) {
       SignatureWithIndex2.encode(v, writer.uint32(10).fork()).join();
     }
@@ -24584,7 +23980,7 @@ var InputTtxoSignaturesPerOperator = {
     return writer;
   },
   decode(input, length) {
-    const reader = input instanceof import_wire8.BinaryReader ? input : new import_wire8.BinaryReader(input);
+    const reader = input instanceof import_wire7.BinaryReader ? input : new import_wire7.BinaryReader(input);
     const end = length === void 0 ? reader.len : reader.pos + length;
     const message = createBaseInputTtxoSignaturesPerOperator();
     while (reader.pos < end) {
@@ -24615,7 +24011,7 @@ var InputTtxoSignaturesPerOperator = {
   fromJSON(object) {
     return {
       ttxoSignatures: globalThis.Array.isArray(object?.ttxoSignatures) ? object.ttxoSignatures.map((e) => SignatureWithIndex2.fromJSON(e)) : [],
-      operatorIdentityPublicKey: isSet6(object.operatorIdentityPublicKey) ? bytesFromBase645(object.operatorIdentityPublicKey) : new Uint8Array(0)
+      operatorIdentityPublicKey: isSet5(object.operatorIdentityPublicKey) ? bytesFromBase644(object.operatorIdentityPublicKey) : new Uint8Array(0)
     };
   },
   toJSON(message) {
@@ -24624,7 +24020,7 @@ var InputTtxoSignaturesPerOperator = {
       obj.ttxoSignatures = message.ttxoSignatures.map((e) => SignatureWithIndex2.toJSON(e));
     }
     if (message.operatorIdentityPublicKey.length !== 0) {
-      obj.operatorIdentityPublicKey = base64FromBytes5(message.operatorIdentityPublicKey);
+      obj.operatorIdentityPublicKey = base64FromBytes4(message.operatorIdentityPublicKey);
     }
     return obj;
   },
@@ -24647,7 +24043,7 @@ function createBaseStartTransactionRequest() {
   };
 }
 var StartTransactionRequest = {
-  encode(message, writer = new import_wire8.BinaryWriter()) {
+  encode(message, writer = new import_wire7.BinaryWriter()) {
     if (message.identityPublicKey.length !== 0) {
       writer.uint32(10).bytes(message.identityPublicKey);
     }
@@ -24663,7 +24059,7 @@ var StartTransactionRequest = {
     return writer;
   },
   decode(input, length) {
-    const reader = input instanceof import_wire8.BinaryReader ? input : new import_wire8.BinaryReader(input);
+    const reader = input instanceof import_wire7.BinaryReader ? input : new import_wire7.BinaryReader(input);
     const end = length === void 0 ? reader.len : reader.pos + length;
     const message = createBaseStartTransactionRequest();
     while (reader.pos < end) {
@@ -24707,16 +24103,16 @@ var StartTransactionRequest = {
   },
   fromJSON(object) {
     return {
-      identityPublicKey: isSet6(object.identityPublicKey) ? bytesFromBase645(object.identityPublicKey) : new Uint8Array(0),
-      partialTokenTransaction: isSet6(object.partialTokenTransaction) ? TokenTransaction2.fromJSON(object.partialTokenTransaction) : void 0,
+      identityPublicKey: isSet5(object.identityPublicKey) ? bytesFromBase644(object.identityPublicKey) : new Uint8Array(0),
+      partialTokenTransaction: isSet5(object.partialTokenTransaction) ? TokenTransaction2.fromJSON(object.partialTokenTransaction) : void 0,
       partialTokenTransactionOwnerSignatures: globalThis.Array.isArray(object?.partialTokenTransactionOwnerSignatures) ? object.partialTokenTransactionOwnerSignatures.map((e) => SignatureWithIndex2.fromJSON(e)) : [],
-      validityDurationSeconds: isSet6(object.validityDurationSeconds) ? globalThis.Number(object.validityDurationSeconds) : 0
+      validityDurationSeconds: isSet5(object.validityDurationSeconds) ? globalThis.Number(object.validityDurationSeconds) : 0
     };
   },
   toJSON(message) {
     const obj = {};
     if (message.identityPublicKey.length !== 0) {
-      obj.identityPublicKey = base64FromBytes5(message.identityPublicKey);
+      obj.identityPublicKey = base64FromBytes4(message.identityPublicKey);
     }
     if (message.partialTokenTransaction !== void 0) {
       obj.partialTokenTransaction = TokenTransaction2.toJSON(message.partialTokenTransaction);
@@ -24747,7 +24143,7 @@ function createBaseStartTransactionResponse() {
   return { finalTokenTransaction: void 0, keyshareInfo: void 0 };
 }
 var StartTransactionResponse = {
-  encode(message, writer = new import_wire8.BinaryWriter()) {
+  encode(message, writer = new import_wire7.BinaryWriter()) {
     if (message.finalTokenTransaction !== void 0) {
       TokenTransaction2.encode(message.finalTokenTransaction, writer.uint32(10).fork()).join();
     }
@@ -24757,7 +24153,7 @@ var StartTransactionResponse = {
     return writer;
   },
   decode(input, length) {
-    const reader = input instanceof import_wire8.BinaryReader ? input : new import_wire8.BinaryReader(input);
+    const reader = input instanceof import_wire7.BinaryReader ? input : new import_wire7.BinaryReader(input);
     const end = length === void 0 ? reader.len : reader.pos + length;
     const message = createBaseStartTransactionResponse();
     while (reader.pos < end) {
@@ -24787,8 +24183,8 @@ var StartTransactionResponse = {
   },
   fromJSON(object) {
     return {
-      finalTokenTransaction: isSet6(object.finalTokenTransaction) ? TokenTransaction2.fromJSON(object.finalTokenTransaction) : void 0,
-      keyshareInfo: isSet6(object.keyshareInfo) ? SigningKeyshare.fromJSON(object.keyshareInfo) : void 0
+      finalTokenTransaction: isSet5(object.finalTokenTransaction) ? TokenTransaction2.fromJSON(object.finalTokenTransaction) : void 0,
+      keyshareInfo: isSet5(object.keyshareInfo) ? SigningKeyshare.fromJSON(object.keyshareInfo) : void 0
     };
   },
   toJSON(message) {
@@ -24820,7 +24216,7 @@ function createBaseCommitTransactionRequest() {
   };
 }
 var CommitTransactionRequest = {
-  encode(message, writer = new import_wire8.BinaryWriter()) {
+  encode(message, writer = new import_wire7.BinaryWriter()) {
     if (message.finalTokenTransaction !== void 0) {
       TokenTransaction2.encode(message.finalTokenTransaction, writer.uint32(10).fork()).join();
     }
@@ -24836,7 +24232,7 @@ var CommitTransactionRequest = {
     return writer;
   },
   decode(input, length) {
-    const reader = input instanceof import_wire8.BinaryReader ? input : new import_wire8.BinaryReader(input);
+    const reader = input instanceof import_wire7.BinaryReader ? input : new import_wire7.BinaryReader(input);
     const end = length === void 0 ? reader.len : reader.pos + length;
     const message = createBaseCommitTransactionRequest();
     while (reader.pos < end) {
@@ -24880,10 +24276,10 @@ var CommitTransactionRequest = {
   },
   fromJSON(object) {
     return {
-      finalTokenTransaction: isSet6(object.finalTokenTransaction) ? TokenTransaction2.fromJSON(object.finalTokenTransaction) : void 0,
-      finalTokenTransactionHash: isSet6(object.finalTokenTransactionHash) ? bytesFromBase645(object.finalTokenTransactionHash) : new Uint8Array(0),
+      finalTokenTransaction: isSet5(object.finalTokenTransaction) ? TokenTransaction2.fromJSON(object.finalTokenTransaction) : void 0,
+      finalTokenTransactionHash: isSet5(object.finalTokenTransactionHash) ? bytesFromBase644(object.finalTokenTransactionHash) : new Uint8Array(0),
       inputTtxoSignaturesPerOperator: globalThis.Array.isArray(object?.inputTtxoSignaturesPerOperator) ? object.inputTtxoSignaturesPerOperator.map((e) => InputTtxoSignaturesPerOperator.fromJSON(e)) : [],
-      ownerIdentityPublicKey: isSet6(object.ownerIdentityPublicKey) ? bytesFromBase645(object.ownerIdentityPublicKey) : new Uint8Array(0)
+      ownerIdentityPublicKey: isSet5(object.ownerIdentityPublicKey) ? bytesFromBase644(object.ownerIdentityPublicKey) : new Uint8Array(0)
     };
   },
   toJSON(message) {
@@ -24892,7 +24288,7 @@ var CommitTransactionRequest = {
       obj.finalTokenTransaction = TokenTransaction2.toJSON(message.finalTokenTransaction);
     }
     if (message.finalTokenTransactionHash.length !== 0) {
-      obj.finalTokenTransactionHash = base64FromBytes5(message.finalTokenTransactionHash);
+      obj.finalTokenTransactionHash = base64FromBytes4(message.finalTokenTransactionHash);
     }
     if (message.inputTtxoSignaturesPerOperator?.length) {
       obj.inputTtxoSignaturesPerOperator = message.inputTtxoSignaturesPerOperator.map(
@@ -24900,7 +24296,7 @@ var CommitTransactionRequest = {
       );
     }
     if (message.ownerIdentityPublicKey.length !== 0) {
-      obj.ownerIdentityPublicKey = base64FromBytes5(message.ownerIdentityPublicKey);
+      obj.ownerIdentityPublicKey = base64FromBytes4(message.ownerIdentityPublicKey);
     }
     return obj;
   },
@@ -24920,7 +24316,7 @@ function createBaseCommitProgress() {
   return { committedOperatorPublicKeys: [], uncommittedOperatorPublicKeys: [] };
 }
 var CommitProgress = {
-  encode(message, writer = new import_wire8.BinaryWriter()) {
+  encode(message, writer = new import_wire7.BinaryWriter()) {
     for (const v of message.committedOperatorPublicKeys) {
       writer.uint32(10).bytes(v);
     }
@@ -24930,7 +24326,7 @@ var CommitProgress = {
     return writer;
   },
   decode(input, length) {
-    const reader = input instanceof import_wire8.BinaryReader ? input : new import_wire8.BinaryReader(input);
+    const reader = input instanceof import_wire7.BinaryReader ? input : new import_wire7.BinaryReader(input);
     const end = length === void 0 ? reader.len : reader.pos + length;
     const message = createBaseCommitProgress();
     while (reader.pos < end) {
@@ -24960,17 +24356,17 @@ var CommitProgress = {
   },
   fromJSON(object) {
     return {
-      committedOperatorPublicKeys: globalThis.Array.isArray(object?.committedOperatorPublicKeys) ? object.committedOperatorPublicKeys.map((e) => bytesFromBase645(e)) : [],
-      uncommittedOperatorPublicKeys: globalThis.Array.isArray(object?.uncommittedOperatorPublicKeys) ? object.uncommittedOperatorPublicKeys.map((e) => bytesFromBase645(e)) : []
+      committedOperatorPublicKeys: globalThis.Array.isArray(object?.committedOperatorPublicKeys) ? object.committedOperatorPublicKeys.map((e) => bytesFromBase644(e)) : [],
+      uncommittedOperatorPublicKeys: globalThis.Array.isArray(object?.uncommittedOperatorPublicKeys) ? object.uncommittedOperatorPublicKeys.map((e) => bytesFromBase644(e)) : []
     };
   },
   toJSON(message) {
     const obj = {};
     if (message.committedOperatorPublicKeys?.length) {
-      obj.committedOperatorPublicKeys = message.committedOperatorPublicKeys.map((e) => base64FromBytes5(e));
+      obj.committedOperatorPublicKeys = message.committedOperatorPublicKeys.map((e) => base64FromBytes4(e));
     }
     if (message.uncommittedOperatorPublicKeys?.length) {
-      obj.uncommittedOperatorPublicKeys = message.uncommittedOperatorPublicKeys.map((e) => base64FromBytes5(e));
+      obj.uncommittedOperatorPublicKeys = message.uncommittedOperatorPublicKeys.map((e) => base64FromBytes4(e));
     }
     return obj;
   },
@@ -24988,7 +24384,7 @@ function createBaseCommitTransactionResponse() {
   return { commitStatus: 0, commitProgress: void 0 };
 }
 var CommitTransactionResponse = {
-  encode(message, writer = new import_wire8.BinaryWriter()) {
+  encode(message, writer = new import_wire7.BinaryWriter()) {
     if (message.commitStatus !== 0) {
       writer.uint32(8).int32(message.commitStatus);
     }
@@ -24998,7 +24394,7 @@ var CommitTransactionResponse = {
     return writer;
   },
   decode(input, length) {
-    const reader = input instanceof import_wire8.BinaryReader ? input : new import_wire8.BinaryReader(input);
+    const reader = input instanceof import_wire7.BinaryReader ? input : new import_wire7.BinaryReader(input);
     const end = length === void 0 ? reader.len : reader.pos + length;
     const message = createBaseCommitTransactionResponse();
     while (reader.pos < end) {
@@ -25028,8 +24424,8 @@ var CommitTransactionResponse = {
   },
   fromJSON(object) {
     return {
-      commitStatus: isSet6(object.commitStatus) ? commitStatusFromJSON(object.commitStatus) : 0,
-      commitProgress: isSet6(object.commitProgress) ? CommitProgress.fromJSON(object.commitProgress) : void 0
+      commitStatus: isSet5(object.commitStatus) ? commitStatusFromJSON(object.commitStatus) : 0,
+      commitProgress: isSet5(object.commitProgress) ? CommitProgress.fromJSON(object.commitProgress) : void 0
     };
   },
   toJSON(message) {
@@ -25056,7 +24452,7 @@ function createBaseQueryTokenMetadataRequest() {
   return { tokenIdentifiers: [], issuerPublicKeys: [] };
 }
 var QueryTokenMetadataRequest = {
-  encode(message, writer = new import_wire8.BinaryWriter()) {
+  encode(message, writer = new import_wire7.BinaryWriter()) {
     for (const v of message.tokenIdentifiers) {
       writer.uint32(10).bytes(v);
     }
@@ -25066,7 +24462,7 @@ var QueryTokenMetadataRequest = {
     return writer;
   },
   decode(input, length) {
-    const reader = input instanceof import_wire8.BinaryReader ? input : new import_wire8.BinaryReader(input);
+    const reader = input instanceof import_wire7.BinaryReader ? input : new import_wire7.BinaryReader(input);
     const end = length === void 0 ? reader.len : reader.pos + length;
     const message = createBaseQueryTokenMetadataRequest();
     while (reader.pos < end) {
@@ -25096,17 +24492,17 @@ var QueryTokenMetadataRequest = {
   },
   fromJSON(object) {
     return {
-      tokenIdentifiers: globalThis.Array.isArray(object?.tokenIdentifiers) ? object.tokenIdentifiers.map((e) => bytesFromBase645(e)) : [],
-      issuerPublicKeys: globalThis.Array.isArray(object?.issuerPublicKeys) ? object.issuerPublicKeys.map((e) => bytesFromBase645(e)) : []
+      tokenIdentifiers: globalThis.Array.isArray(object?.tokenIdentifiers) ? object.tokenIdentifiers.map((e) => bytesFromBase644(e)) : [],
+      issuerPublicKeys: globalThis.Array.isArray(object?.issuerPublicKeys) ? object.issuerPublicKeys.map((e) => bytesFromBase644(e)) : []
     };
   },
   toJSON(message) {
     const obj = {};
     if (message.tokenIdentifiers?.length) {
-      obj.tokenIdentifiers = message.tokenIdentifiers.map((e) => base64FromBytes5(e));
+      obj.tokenIdentifiers = message.tokenIdentifiers.map((e) => base64FromBytes4(e));
     }
     if (message.issuerPublicKeys?.length) {
-      obj.issuerPublicKeys = message.issuerPublicKeys.map((e) => base64FromBytes5(e));
+      obj.issuerPublicKeys = message.issuerPublicKeys.map((e) => base64FromBytes4(e));
     }
     return obj;
   },
@@ -25133,7 +24529,7 @@ function createBaseTokenMetadata() {
   };
 }
 var TokenMetadata = {
-  encode(message, writer = new import_wire8.BinaryWriter()) {
+  encode(message, writer = new import_wire7.BinaryWriter()) {
     if (message.issuerPublicKey.length !== 0) {
       writer.uint32(10).bytes(message.issuerPublicKey);
     }
@@ -25161,7 +24557,7 @@ var TokenMetadata = {
     return writer;
   },
   decode(input, length) {
-    const reader = input instanceof import_wire8.BinaryReader ? input : new import_wire8.BinaryReader(input);
+    const reader = input instanceof import_wire7.BinaryReader ? input : new import_wire7.BinaryReader(input);
     const end = length === void 0 ? reader.len : reader.pos + length;
     const message = createBaseTokenMetadata();
     while (reader.pos < end) {
@@ -25233,20 +24629,20 @@ var TokenMetadata = {
   },
   fromJSON(object) {
     return {
-      issuerPublicKey: isSet6(object.issuerPublicKey) ? bytesFromBase645(object.issuerPublicKey) : new Uint8Array(0),
-      tokenName: isSet6(object.tokenName) ? globalThis.String(object.tokenName) : "",
-      tokenTicker: isSet6(object.tokenTicker) ? globalThis.String(object.tokenTicker) : "",
-      decimals: isSet6(object.decimals) ? globalThis.Number(object.decimals) : 0,
-      maxSupply: isSet6(object.maxSupply) ? bytesFromBase645(object.maxSupply) : new Uint8Array(0),
-      isFreezable: isSet6(object.isFreezable) ? globalThis.Boolean(object.isFreezable) : false,
-      creationEntityPublicKey: isSet6(object.creationEntityPublicKey) ? bytesFromBase645(object.creationEntityPublicKey) : void 0,
-      tokenIdentifier: isSet6(object.tokenIdentifier) ? bytesFromBase645(object.tokenIdentifier) : new Uint8Array(0)
+      issuerPublicKey: isSet5(object.issuerPublicKey) ? bytesFromBase644(object.issuerPublicKey) : new Uint8Array(0),
+      tokenName: isSet5(object.tokenName) ? globalThis.String(object.tokenName) : "",
+      tokenTicker: isSet5(object.tokenTicker) ? globalThis.String(object.tokenTicker) : "",
+      decimals: isSet5(object.decimals) ? globalThis.Number(object.decimals) : 0,
+      maxSupply: isSet5(object.maxSupply) ? bytesFromBase644(object.maxSupply) : new Uint8Array(0),
+      isFreezable: isSet5(object.isFreezable) ? globalThis.Boolean(object.isFreezable) : false,
+      creationEntityPublicKey: isSet5(object.creationEntityPublicKey) ? bytesFromBase644(object.creationEntityPublicKey) : void 0,
+      tokenIdentifier: isSet5(object.tokenIdentifier) ? bytesFromBase644(object.tokenIdentifier) : new Uint8Array(0)
     };
   },
   toJSON(message) {
     const obj = {};
     if (message.issuerPublicKey.length !== 0) {
-      obj.issuerPublicKey = base64FromBytes5(message.issuerPublicKey);
+      obj.issuerPublicKey = base64FromBytes4(message.issuerPublicKey);
     }
     if (message.tokenName !== "") {
       obj.tokenName = message.tokenName;
@@ -25258,16 +24654,16 @@ var TokenMetadata = {
       obj.decimals = Math.round(message.decimals);
     }
     if (message.maxSupply.length !== 0) {
-      obj.maxSupply = base64FromBytes5(message.maxSupply);
+      obj.maxSupply = base64FromBytes4(message.maxSupply);
     }
     if (message.isFreezable !== false) {
       obj.isFreezable = message.isFreezable;
     }
     if (message.creationEntityPublicKey !== void 0) {
-      obj.creationEntityPublicKey = base64FromBytes5(message.creationEntityPublicKey);
+      obj.creationEntityPublicKey = base64FromBytes4(message.creationEntityPublicKey);
     }
     if (message.tokenIdentifier.length !== 0) {
-      obj.tokenIdentifier = base64FromBytes5(message.tokenIdentifier);
+      obj.tokenIdentifier = base64FromBytes4(message.tokenIdentifier);
     }
     return obj;
   },
@@ -25291,14 +24687,14 @@ function createBaseQueryTokenMetadataResponse() {
   return { tokenMetadata: [] };
 }
 var QueryTokenMetadataResponse = {
-  encode(message, writer = new import_wire8.BinaryWriter()) {
+  encode(message, writer = new import_wire7.BinaryWriter()) {
     for (const v of message.tokenMetadata) {
       TokenMetadata.encode(v, writer.uint32(10).fork()).join();
     }
     return writer;
   },
   decode(input, length) {
-    const reader = input instanceof import_wire8.BinaryReader ? input : new import_wire8.BinaryReader(input);
+    const reader = input instanceof import_wire7.BinaryReader ? input : new import_wire7.BinaryReader(input);
     const end = length === void 0 ? reader.len : reader.pos + length;
     const message = createBaseQueryTokenMetadataResponse();
     while (reader.pos < end) {
@@ -25344,7 +24740,7 @@ function createBaseQueryTokenOutputsRequest2() {
   return { ownerPublicKeys: [], issuerPublicKeys: [], tokenIdentifiers: [], network: 0, pageRequest: void 0 };
 }
 var QueryTokenOutputsRequest2 = {
-  encode(message, writer = new import_wire8.BinaryWriter()) {
+  encode(message, writer = new import_wire7.BinaryWriter()) {
     for (const v of message.ownerPublicKeys) {
       writer.uint32(10).bytes(v);
     }
@@ -25363,7 +24759,7 @@ var QueryTokenOutputsRequest2 = {
     return writer;
   },
   decode(input, length) {
-    const reader = input instanceof import_wire8.BinaryReader ? input : new import_wire8.BinaryReader(input);
+    const reader = input instanceof import_wire7.BinaryReader ? input : new import_wire7.BinaryReader(input);
     const end = length === void 0 ? reader.len : reader.pos + length;
     const message = createBaseQueryTokenOutputsRequest2();
     while (reader.pos < end) {
@@ -25414,23 +24810,23 @@ var QueryTokenOutputsRequest2 = {
   },
   fromJSON(object) {
     return {
-      ownerPublicKeys: globalThis.Array.isArray(object?.ownerPublicKeys) ? object.ownerPublicKeys.map((e) => bytesFromBase645(e)) : [],
-      issuerPublicKeys: globalThis.Array.isArray(object?.issuerPublicKeys) ? object.issuerPublicKeys.map((e) => bytesFromBase645(e)) : [],
-      tokenIdentifiers: globalThis.Array.isArray(object?.tokenIdentifiers) ? object.tokenIdentifiers.map((e) => bytesFromBase645(e)) : [],
-      network: isSet6(object.network) ? networkFromJSON(object.network) : 0,
-      pageRequest: isSet6(object.pageRequest) ? PageRequest.fromJSON(object.pageRequest) : void 0
+      ownerPublicKeys: globalThis.Array.isArray(object?.ownerPublicKeys) ? object.ownerPublicKeys.map((e) => bytesFromBase644(e)) : [],
+      issuerPublicKeys: globalThis.Array.isArray(object?.issuerPublicKeys) ? object.issuerPublicKeys.map((e) => bytesFromBase644(e)) : [],
+      tokenIdentifiers: globalThis.Array.isArray(object?.tokenIdentifiers) ? object.tokenIdentifiers.map((e) => bytesFromBase644(e)) : [],
+      network: isSet5(object.network) ? networkFromJSON(object.network) : 0,
+      pageRequest: isSet5(object.pageRequest) ? PageRequest.fromJSON(object.pageRequest) : void 0
     };
   },
   toJSON(message) {
     const obj = {};
     if (message.ownerPublicKeys?.length) {
-      obj.ownerPublicKeys = message.ownerPublicKeys.map((e) => base64FromBytes5(e));
+      obj.ownerPublicKeys = message.ownerPublicKeys.map((e) => base64FromBytes4(e));
     }
     if (message.issuerPublicKeys?.length) {
-      obj.issuerPublicKeys = message.issuerPublicKeys.map((e) => base64FromBytes5(e));
+      obj.issuerPublicKeys = message.issuerPublicKeys.map((e) => base64FromBytes4(e));
     }
     if (message.tokenIdentifiers?.length) {
-      obj.tokenIdentifiers = message.tokenIdentifiers.map((e) => base64FromBytes5(e));
+      obj.tokenIdentifiers = message.tokenIdentifiers.map((e) => base64FromBytes4(e));
     }
     if (message.network !== 0) {
       obj.network = networkToJSON(message.network);
@@ -25465,7 +24861,7 @@ function createBaseQueryTokenTransactionsRequest2() {
   };
 }
 var QueryTokenTransactionsRequest2 = {
-  encode(message, writer = new import_wire8.BinaryWriter()) {
+  encode(message, writer = new import_wire7.BinaryWriter()) {
     for (const v of message.outputIds) {
       writer.uint32(10).string(v);
     }
@@ -25490,7 +24886,7 @@ var QueryTokenTransactionsRequest2 = {
     return writer;
   },
   decode(input, length) {
-    const reader = input instanceof import_wire8.BinaryReader ? input : new import_wire8.BinaryReader(input);
+    const reader = input instanceof import_wire7.BinaryReader ? input : new import_wire7.BinaryReader(input);
     const end = length === void 0 ? reader.len : reader.pos + length;
     const message = createBaseQueryTokenTransactionsRequest2();
     while (reader.pos < end) {
@@ -25556,12 +24952,12 @@ var QueryTokenTransactionsRequest2 = {
   fromJSON(object) {
     return {
       outputIds: globalThis.Array.isArray(object?.outputIds) ? object.outputIds.map((e) => globalThis.String(e)) : [],
-      ownerPublicKeys: globalThis.Array.isArray(object?.ownerPublicKeys) ? object.ownerPublicKeys.map((e) => bytesFromBase645(e)) : [],
-      issuerPublicKeys: globalThis.Array.isArray(object?.issuerPublicKeys) ? object.issuerPublicKeys.map((e) => bytesFromBase645(e)) : [],
-      tokenIdentifiers: globalThis.Array.isArray(object?.tokenIdentifiers) ? object.tokenIdentifiers.map((e) => bytesFromBase645(e)) : [],
-      tokenTransactionHashes: globalThis.Array.isArray(object?.tokenTransactionHashes) ? object.tokenTransactionHashes.map((e) => bytesFromBase645(e)) : [],
-      limit: isSet6(object.limit) ? globalThis.Number(object.limit) : 0,
-      offset: isSet6(object.offset) ? globalThis.Number(object.offset) : 0
+      ownerPublicKeys: globalThis.Array.isArray(object?.ownerPublicKeys) ? object.ownerPublicKeys.map((e) => bytesFromBase644(e)) : [],
+      issuerPublicKeys: globalThis.Array.isArray(object?.issuerPublicKeys) ? object.issuerPublicKeys.map((e) => bytesFromBase644(e)) : [],
+      tokenIdentifiers: globalThis.Array.isArray(object?.tokenIdentifiers) ? object.tokenIdentifiers.map((e) => bytesFromBase644(e)) : [],
+      tokenTransactionHashes: globalThis.Array.isArray(object?.tokenTransactionHashes) ? object.tokenTransactionHashes.map((e) => bytesFromBase644(e)) : [],
+      limit: isSet5(object.limit) ? globalThis.Number(object.limit) : 0,
+      offset: isSet5(object.offset) ? globalThis.Number(object.offset) : 0
     };
   },
   toJSON(message) {
@@ -25570,16 +24966,16 @@ var QueryTokenTransactionsRequest2 = {
       obj.outputIds = message.outputIds;
     }
     if (message.ownerPublicKeys?.length) {
-      obj.ownerPublicKeys = message.ownerPublicKeys.map((e) => base64FromBytes5(e));
+      obj.ownerPublicKeys = message.ownerPublicKeys.map((e) => base64FromBytes4(e));
     }
     if (message.issuerPublicKeys?.length) {
-      obj.issuerPublicKeys = message.issuerPublicKeys.map((e) => base64FromBytes5(e));
+      obj.issuerPublicKeys = message.issuerPublicKeys.map((e) => base64FromBytes4(e));
     }
     if (message.tokenIdentifiers?.length) {
-      obj.tokenIdentifiers = message.tokenIdentifiers.map((e) => base64FromBytes5(e));
+      obj.tokenIdentifiers = message.tokenIdentifiers.map((e) => base64FromBytes4(e));
     }
     if (message.tokenTransactionHashes?.length) {
-      obj.tokenTransactionHashes = message.tokenTransactionHashes.map((e) => base64FromBytes5(e));
+      obj.tokenTransactionHashes = message.tokenTransactionHashes.map((e) => base64FromBytes4(e));
     }
     if (message.limit !== 0) {
       obj.limit = Math.round(message.limit);
@@ -25608,7 +25004,7 @@ function createBaseQueryTokenTransactionsResponse2() {
   return { tokenTransactionsWithStatus: [], offset: 0 };
 }
 var QueryTokenTransactionsResponse2 = {
-  encode(message, writer = new import_wire8.BinaryWriter()) {
+  encode(message, writer = new import_wire7.BinaryWriter()) {
     for (const v of message.tokenTransactionsWithStatus) {
       TokenTransactionWithStatus2.encode(v, writer.uint32(10).fork()).join();
     }
@@ -25618,7 +25014,7 @@ var QueryTokenTransactionsResponse2 = {
     return writer;
   },
   decode(input, length) {
-    const reader = input instanceof import_wire8.BinaryReader ? input : new import_wire8.BinaryReader(input);
+    const reader = input instanceof import_wire7.BinaryReader ? input : new import_wire7.BinaryReader(input);
     const end = length === void 0 ? reader.len : reader.pos + length;
     const message = createBaseQueryTokenTransactionsResponse2();
     while (reader.pos < end) {
@@ -25649,7 +25045,7 @@ var QueryTokenTransactionsResponse2 = {
   fromJSON(object) {
     return {
       tokenTransactionsWithStatus: globalThis.Array.isArray(object?.tokenTransactionsWithStatus) ? object.tokenTransactionsWithStatus.map((e) => TokenTransactionWithStatus2.fromJSON(e)) : [],
-      offset: isSet6(object.offset) ? globalThis.Number(object.offset) : 0
+      offset: isSet5(object.offset) ? globalThis.Number(object.offset) : 0
     };
   },
   toJSON(message) {
@@ -25678,7 +25074,7 @@ function createBaseOutputWithPreviousTransactionData2() {
   return { output: void 0, previousTransactionHash: new Uint8Array(0), previousTransactionVout: 0 };
 }
 var OutputWithPreviousTransactionData2 = {
-  encode(message, writer = new import_wire8.BinaryWriter()) {
+  encode(message, writer = new import_wire7.BinaryWriter()) {
     if (message.output !== void 0) {
       TokenOutput2.encode(message.output, writer.uint32(10).fork()).join();
     }
@@ -25691,7 +25087,7 @@ var OutputWithPreviousTransactionData2 = {
     return writer;
   },
   decode(input, length) {
-    const reader = input instanceof import_wire8.BinaryReader ? input : new import_wire8.BinaryReader(input);
+    const reader = input instanceof import_wire7.BinaryReader ? input : new import_wire7.BinaryReader(input);
     const end = length === void 0 ? reader.len : reader.pos + length;
     const message = createBaseOutputWithPreviousTransactionData2();
     while (reader.pos < end) {
@@ -25728,9 +25124,9 @@ var OutputWithPreviousTransactionData2 = {
   },
   fromJSON(object) {
     return {
-      output: isSet6(object.output) ? TokenOutput2.fromJSON(object.output) : void 0,
-      previousTransactionHash: isSet6(object.previousTransactionHash) ? bytesFromBase645(object.previousTransactionHash) : new Uint8Array(0),
-      previousTransactionVout: isSet6(object.previousTransactionVout) ? globalThis.Number(object.previousTransactionVout) : 0
+      output: isSet5(object.output) ? TokenOutput2.fromJSON(object.output) : void 0,
+      previousTransactionHash: isSet5(object.previousTransactionHash) ? bytesFromBase644(object.previousTransactionHash) : new Uint8Array(0),
+      previousTransactionVout: isSet5(object.previousTransactionVout) ? globalThis.Number(object.previousTransactionVout) : 0
     };
   },
   toJSON(message) {
@@ -25739,7 +25135,7 @@ var OutputWithPreviousTransactionData2 = {
       obj.output = TokenOutput2.toJSON(message.output);
     }
     if (message.previousTransactionHash.length !== 0) {
-      obj.previousTransactionHash = base64FromBytes5(message.previousTransactionHash);
+      obj.previousTransactionHash = base64FromBytes4(message.previousTransactionHash);
     }
     if (message.previousTransactionVout !== 0) {
       obj.previousTransactionVout = Math.round(message.previousTransactionVout);
@@ -25761,7 +25157,7 @@ function createBaseQueryTokenOutputsResponse2() {
   return { outputsWithPreviousTransactionData: [], pageResponse: void 0 };
 }
 var QueryTokenOutputsResponse2 = {
-  encode(message, writer = new import_wire8.BinaryWriter()) {
+  encode(message, writer = new import_wire7.BinaryWriter()) {
     for (const v of message.outputsWithPreviousTransactionData) {
       OutputWithPreviousTransactionData2.encode(v, writer.uint32(10).fork()).join();
     }
@@ -25771,7 +25167,7 @@ var QueryTokenOutputsResponse2 = {
     return writer;
   },
   decode(input, length) {
-    const reader = input instanceof import_wire8.BinaryReader ? input : new import_wire8.BinaryReader(input);
+    const reader = input instanceof import_wire7.BinaryReader ? input : new import_wire7.BinaryReader(input);
     const end = length === void 0 ? reader.len : reader.pos + length;
     const message = createBaseQueryTokenOutputsResponse2();
     while (reader.pos < end) {
@@ -25804,7 +25200,7 @@ var QueryTokenOutputsResponse2 = {
   fromJSON(object) {
     return {
       outputsWithPreviousTransactionData: globalThis.Array.isArray(object?.outputsWithPreviousTransactionData) ? object.outputsWithPreviousTransactionData.map((e) => OutputWithPreviousTransactionData2.fromJSON(e)) : [],
-      pageResponse: isSet6(object.pageResponse) ? PageResponse.fromJSON(object.pageResponse) : void 0
+      pageResponse: isSet5(object.pageResponse) ? PageResponse.fromJSON(object.pageResponse) : void 0
     };
   },
   toJSON(message) {
@@ -25833,7 +25229,7 @@ function createBaseSpentTokenOutputMetadata2() {
   return { outputId: "", revocationSecret: new Uint8Array(0) };
 }
 var SpentTokenOutputMetadata2 = {
-  encode(message, writer = new import_wire8.BinaryWriter()) {
+  encode(message, writer = new import_wire7.BinaryWriter()) {
     if (message.outputId !== "") {
       writer.uint32(10).string(message.outputId);
     }
@@ -25843,7 +25239,7 @@ var SpentTokenOutputMetadata2 = {
     return writer;
   },
   decode(input, length) {
-    const reader = input instanceof import_wire8.BinaryReader ? input : new import_wire8.BinaryReader(input);
+    const reader = input instanceof import_wire7.BinaryReader ? input : new import_wire7.BinaryReader(input);
     const end = length === void 0 ? reader.len : reader.pos + length;
     const message = createBaseSpentTokenOutputMetadata2();
     while (reader.pos < end) {
@@ -25873,8 +25269,8 @@ var SpentTokenOutputMetadata2 = {
   },
   fromJSON(object) {
     return {
-      outputId: isSet6(object.outputId) ? globalThis.String(object.outputId) : "",
-      revocationSecret: isSet6(object.revocationSecret) ? bytesFromBase645(object.revocationSecret) : new Uint8Array(0)
+      outputId: isSet5(object.outputId) ? globalThis.String(object.outputId) : "",
+      revocationSecret: isSet5(object.revocationSecret) ? bytesFromBase644(object.revocationSecret) : new Uint8Array(0)
     };
   },
   toJSON(message) {
@@ -25883,7 +25279,7 @@ var SpentTokenOutputMetadata2 = {
       obj.outputId = message.outputId;
     }
     if (message.revocationSecret.length !== 0) {
-      obj.revocationSecret = base64FromBytes5(message.revocationSecret);
+      obj.revocationSecret = base64FromBytes4(message.revocationSecret);
     }
     return obj;
   },
@@ -25901,14 +25297,14 @@ function createBaseTokenTransactionConfirmationMetadata2() {
   return { spentTokenOutputsMetadata: [] };
 }
 var TokenTransactionConfirmationMetadata2 = {
-  encode(message, writer = new import_wire8.BinaryWriter()) {
+  encode(message, writer = new import_wire7.BinaryWriter()) {
     for (const v of message.spentTokenOutputsMetadata) {
       SpentTokenOutputMetadata2.encode(v, writer.uint32(10).fork()).join();
     }
     return writer;
   },
   decode(input, length) {
-    const reader = input instanceof import_wire8.BinaryReader ? input : new import_wire8.BinaryReader(input);
+    const reader = input instanceof import_wire7.BinaryReader ? input : new import_wire7.BinaryReader(input);
     const end = length === void 0 ? reader.len : reader.pos + length;
     const message = createBaseTokenTransactionConfirmationMetadata2();
     while (reader.pos < end) {
@@ -25959,7 +25355,7 @@ function createBaseTokenTransactionWithStatus2() {
   };
 }
 var TokenTransactionWithStatus2 = {
-  encode(message, writer = new import_wire8.BinaryWriter()) {
+  encode(message, writer = new import_wire7.BinaryWriter()) {
     if (message.tokenTransaction !== void 0) {
       TokenTransaction2.encode(message.tokenTransaction, writer.uint32(10).fork()).join();
     }
@@ -25975,7 +25371,7 @@ var TokenTransactionWithStatus2 = {
     return writer;
   },
   decode(input, length) {
-    const reader = input instanceof import_wire8.BinaryReader ? input : new import_wire8.BinaryReader(input);
+    const reader = input instanceof import_wire7.BinaryReader ? input : new import_wire7.BinaryReader(input);
     const end = length === void 0 ? reader.len : reader.pos + length;
     const message = createBaseTokenTransactionWithStatus2();
     while (reader.pos < end) {
@@ -26019,10 +25415,10 @@ var TokenTransactionWithStatus2 = {
   },
   fromJSON(object) {
     return {
-      tokenTransaction: isSet6(object.tokenTransaction) ? TokenTransaction2.fromJSON(object.tokenTransaction) : void 0,
-      status: isSet6(object.status) ? tokenTransactionStatusFromJSON2(object.status) : 0,
-      confirmationMetadata: isSet6(object.confirmationMetadata) ? TokenTransactionConfirmationMetadata2.fromJSON(object.confirmationMetadata) : void 0,
-      tokenTransactionHash: isSet6(object.tokenTransactionHash) ? bytesFromBase645(object.tokenTransactionHash) : new Uint8Array(0)
+      tokenTransaction: isSet5(object.tokenTransaction) ? TokenTransaction2.fromJSON(object.tokenTransaction) : void 0,
+      status: isSet5(object.status) ? tokenTransactionStatusFromJSON2(object.status) : 0,
+      confirmationMetadata: isSet5(object.confirmationMetadata) ? TokenTransactionConfirmationMetadata2.fromJSON(object.confirmationMetadata) : void 0,
+      tokenTransactionHash: isSet5(object.tokenTransactionHash) ? bytesFromBase644(object.tokenTransactionHash) : new Uint8Array(0)
     };
   },
   toJSON(message) {
@@ -26037,7 +25433,7 @@ var TokenTransactionWithStatus2 = {
       obj.confirmationMetadata = TokenTransactionConfirmationMetadata2.toJSON(message.confirmationMetadata);
     }
     if (message.tokenTransactionHash.length !== 0) {
-      obj.tokenTransactionHash = base64FromBytes5(message.tokenTransactionHash);
+      obj.tokenTransactionHash = base64FromBytes4(message.tokenTransactionHash);
     }
     return obj;
   },
@@ -26065,7 +25461,7 @@ function createBaseFreezeTokensPayload2() {
   };
 }
 var FreezeTokensPayload2 = {
-  encode(message, writer = new import_wire8.BinaryWriter()) {
+  encode(message, writer = new import_wire7.BinaryWriter()) {
     if (message.version !== 0) {
       writer.uint32(8).uint32(message.version);
     }
@@ -26090,7 +25486,7 @@ var FreezeTokensPayload2 = {
     return writer;
   },
   decode(input, length) {
-    const reader = input instanceof import_wire8.BinaryReader ? input : new import_wire8.BinaryReader(input);
+    const reader = input instanceof import_wire7.BinaryReader ? input : new import_wire7.BinaryReader(input);
     const end = length === void 0 ? reader.len : reader.pos + length;
     const message = createBaseFreezeTokensPayload2();
     while (reader.pos < end) {
@@ -26155,13 +25551,13 @@ var FreezeTokensPayload2 = {
   },
   fromJSON(object) {
     return {
-      version: isSet6(object.version) ? globalThis.Number(object.version) : 0,
-      ownerPublicKey: isSet6(object.ownerPublicKey) ? bytesFromBase645(object.ownerPublicKey) : new Uint8Array(0),
-      tokenPublicKey: isSet6(object.tokenPublicKey) ? bytesFromBase645(object.tokenPublicKey) : void 0,
-      tokenIdentifier: isSet6(object.tokenIdentifier) ? bytesFromBase645(object.tokenIdentifier) : void 0,
-      issuerProvidedTimestamp: isSet6(object.issuerProvidedTimestamp) ? globalThis.Number(object.issuerProvidedTimestamp) : 0,
-      operatorIdentityPublicKey: isSet6(object.operatorIdentityPublicKey) ? bytesFromBase645(object.operatorIdentityPublicKey) : new Uint8Array(0),
-      shouldUnfreeze: isSet6(object.shouldUnfreeze) ? globalThis.Boolean(object.shouldUnfreeze) : false
+      version: isSet5(object.version) ? globalThis.Number(object.version) : 0,
+      ownerPublicKey: isSet5(object.ownerPublicKey) ? bytesFromBase644(object.ownerPublicKey) : new Uint8Array(0),
+      tokenPublicKey: isSet5(object.tokenPublicKey) ? bytesFromBase644(object.tokenPublicKey) : void 0,
+      tokenIdentifier: isSet5(object.tokenIdentifier) ? bytesFromBase644(object.tokenIdentifier) : void 0,
+      issuerProvidedTimestamp: isSet5(object.issuerProvidedTimestamp) ? globalThis.Number(object.issuerProvidedTimestamp) : 0,
+      operatorIdentityPublicKey: isSet5(object.operatorIdentityPublicKey) ? bytesFromBase644(object.operatorIdentityPublicKey) : new Uint8Array(0),
+      shouldUnfreeze: isSet5(object.shouldUnfreeze) ? globalThis.Boolean(object.shouldUnfreeze) : false
     };
   },
   toJSON(message) {
@@ -26170,19 +25566,19 @@ var FreezeTokensPayload2 = {
       obj.version = Math.round(message.version);
     }
     if (message.ownerPublicKey.length !== 0) {
-      obj.ownerPublicKey = base64FromBytes5(message.ownerPublicKey);
+      obj.ownerPublicKey = base64FromBytes4(message.ownerPublicKey);
     }
     if (message.tokenPublicKey !== void 0) {
-      obj.tokenPublicKey = base64FromBytes5(message.tokenPublicKey);
+      obj.tokenPublicKey = base64FromBytes4(message.tokenPublicKey);
     }
     if (message.tokenIdentifier !== void 0) {
-      obj.tokenIdentifier = base64FromBytes5(message.tokenIdentifier);
+      obj.tokenIdentifier = base64FromBytes4(message.tokenIdentifier);
     }
     if (message.issuerProvidedTimestamp !== 0) {
       obj.issuerProvidedTimestamp = Math.round(message.issuerProvidedTimestamp);
     }
     if (message.operatorIdentityPublicKey.length !== 0) {
-      obj.operatorIdentityPublicKey = base64FromBytes5(message.operatorIdentityPublicKey);
+      obj.operatorIdentityPublicKey = base64FromBytes4(message.operatorIdentityPublicKey);
     }
     if (message.shouldUnfreeze !== false) {
       obj.shouldUnfreeze = message.shouldUnfreeze;
@@ -26208,7 +25604,7 @@ function createBaseFreezeTokensRequest2() {
   return { freezeTokensPayload: void 0, issuerSignature: new Uint8Array(0) };
 }
 var FreezeTokensRequest2 = {
-  encode(message, writer = new import_wire8.BinaryWriter()) {
+  encode(message, writer = new import_wire7.BinaryWriter()) {
     if (message.freezeTokensPayload !== void 0) {
       FreezeTokensPayload2.encode(message.freezeTokensPayload, writer.uint32(10).fork()).join();
     }
@@ -26218,7 +25614,7 @@ var FreezeTokensRequest2 = {
     return writer;
   },
   decode(input, length) {
-    const reader = input instanceof import_wire8.BinaryReader ? input : new import_wire8.BinaryReader(input);
+    const reader = input instanceof import_wire7.BinaryReader ? input : new import_wire7.BinaryReader(input);
     const end = length === void 0 ? reader.len : reader.pos + length;
     const message = createBaseFreezeTokensRequest2();
     while (reader.pos < end) {
@@ -26248,8 +25644,8 @@ var FreezeTokensRequest2 = {
   },
   fromJSON(object) {
     return {
-      freezeTokensPayload: isSet6(object.freezeTokensPayload) ? FreezeTokensPayload2.fromJSON(object.freezeTokensPayload) : void 0,
-      issuerSignature: isSet6(object.issuerSignature) ? bytesFromBase645(object.issuerSignature) : new Uint8Array(0)
+      freezeTokensPayload: isSet5(object.freezeTokensPayload) ? FreezeTokensPayload2.fromJSON(object.freezeTokensPayload) : void 0,
+      issuerSignature: isSet5(object.issuerSignature) ? bytesFromBase644(object.issuerSignature) : new Uint8Array(0)
     };
   },
   toJSON(message) {
@@ -26258,7 +25654,7 @@ var FreezeTokensRequest2 = {
       obj.freezeTokensPayload = FreezeTokensPayload2.toJSON(message.freezeTokensPayload);
     }
     if (message.issuerSignature.length !== 0) {
-      obj.issuerSignature = base64FromBytes5(message.issuerSignature);
+      obj.issuerSignature = base64FromBytes4(message.issuerSignature);
     }
     return obj;
   },
@@ -26276,7 +25672,7 @@ function createBaseFreezeTokensResponse2() {
   return { impactedOutputIds: [], impactedTokenAmount: new Uint8Array(0) };
 }
 var FreezeTokensResponse2 = {
-  encode(message, writer = new import_wire8.BinaryWriter()) {
+  encode(message, writer = new import_wire7.BinaryWriter()) {
     for (const v of message.impactedOutputIds) {
       writer.uint32(10).string(v);
     }
@@ -26286,7 +25682,7 @@ var FreezeTokensResponse2 = {
     return writer;
   },
   decode(input, length) {
-    const reader = input instanceof import_wire8.BinaryReader ? input : new import_wire8.BinaryReader(input);
+    const reader = input instanceof import_wire7.BinaryReader ? input : new import_wire7.BinaryReader(input);
     const end = length === void 0 ? reader.len : reader.pos + length;
     const message = createBaseFreezeTokensResponse2();
     while (reader.pos < end) {
@@ -26317,7 +25713,7 @@ var FreezeTokensResponse2 = {
   fromJSON(object) {
     return {
       impactedOutputIds: globalThis.Array.isArray(object?.impactedOutputIds) ? object.impactedOutputIds.map((e) => globalThis.String(e)) : [],
-      impactedTokenAmount: isSet6(object.impactedTokenAmount) ? bytesFromBase645(object.impactedTokenAmount) : new Uint8Array(0)
+      impactedTokenAmount: isSet5(object.impactedTokenAmount) ? bytesFromBase644(object.impactedTokenAmount) : new Uint8Array(0)
     };
   },
   toJSON(message) {
@@ -26326,7 +25722,7 @@ var FreezeTokensResponse2 = {
       obj.impactedOutputIds = message.impactedOutputIds;
     }
     if (message.impactedTokenAmount.length !== 0) {
-      obj.impactedTokenAmount = base64FromBytes5(message.impactedTokenAmount);
+      obj.impactedTokenAmount = base64FromBytes4(message.impactedTokenAmount);
     }
     return obj;
   },
@@ -26402,7 +25798,7 @@ var SparkTokenServiceDefinition = {
     }
   }
 };
-function bytesFromBase645(b64) {
+function bytesFromBase644(b64) {
   if (globalThis.Buffer) {
     return Uint8Array.from(globalThis.Buffer.from(b64, "base64"));
   } else {
@@ -26414,7 +25810,7 @@ function bytesFromBase645(b64) {
     return arr;
   }
 }
-function base64FromBytes5(arr) {
+function base64FromBytes4(arr) {
   if (globalThis.Buffer) {
     return globalThis.Buffer.from(arr).toString("base64");
   } else {
@@ -26454,11 +25850,11 @@ function longToNumber4(int64) {
   }
   return num;
 }
-function isSet6(value) {
+function isSet5(value) {
   return value !== null && value !== void 0;
 }
 
-// src/services/connection.ts
+// src/services/connection/connection.ts
 var ConnectionManager = class {
   config;
   clients = /* @__PURE__ */ new Map();
@@ -26488,127 +25884,70 @@ var ConnectionManager = class {
     );
     this.clients.clear();
   }
-  async createMockClient(address2) {
-    const channel = await this.createChannelWithTLS(address2);
-    const isNodeChannel = "close" in channel;
-    if (import_core12.isNode && isNodeChannel && !isBun) {
-      const grpcModule = await import("nice-grpc");
-      const { createClient } = "default" in grpcModule ? grpcModule.default : grpcModule;
-      const client = createClient(MockServiceDefinition, channel);
-      return { ...client, close: () => channel.close() };
-    } else if (!isNodeChannel) {
-      const grpcModule = await import("nice-grpc-web");
-      const { createClient } = "default" in grpcModule ? grpcModule.default : grpcModule;
-      const client = createClient(MockServiceDefinition, channel);
-      return { ...client, close: () => {
-      } };
-    } else {
-      throw new Error("Channel does not have close in NodeJS environment");
-    }
-  }
-  async createChannelWithTLS(address2, certPath) {
-    try {
-      if (import_core12.isNode && !isBun) {
-        const grpcModule = await import("nice-grpc");
-        const { ChannelCredentials, createChannel } = "default" in grpcModule ? grpcModule.default : grpcModule;
-        if (certPath) {
-          try {
-            const fs = await import("fs");
-            const cert = fs.readFileSync(certPath);
-            return createChannel(address2, ChannelCredentials.createSsl(cert));
-          } catch (error) {
-            console.error("Error reading certificate:", error);
-            return createChannel(
-              address2,
-              ChannelCredentials.createSsl(null, null, null, {
-                rejectUnauthorized: false
-              })
-            );
-          }
-        } else {
-          return createChannel(
-            address2,
-            ChannelCredentials.createSsl(null, null, null, {
-              rejectUnauthorized: false
-            })
-          );
-        }
-      } else {
-        const grpcModule = await import("nice-grpc-web");
-        const { createChannel, FetchTransport } = "default" in grpcModule ? grpcModule.default : grpcModule;
-        const { XHRTransport: XHRTransport2 } = await Promise.resolve().then(() => (init_xhr_transport(), xhr_transport_exports));
-        return createChannel(
-          address2,
-          import_core12.isBare ? (0, import_nice_grpc_web.NodeHttpTransport)() : isReactNative ? XHRTransport2() : FetchTransport()
-        );
-      }
-    } catch (error) {
-      console.error("Channel creation error:", error);
-      throw new NetworkError(
-        "Failed to create channel",
-        {
-          url: address2,
-          operation: "createChannel",
-          errorCount: 1,
-          errors: error instanceof Error ? error.message : String(error)
-        },
-        error
-      );
-    }
-  }
-  async createSparkStreamClient(address2, certPath) {
-    if (this.streamClients.has(address2)) {
-      return this.streamClients.get(address2).client;
+  createChannelWithTLS(address, certPath) {
+    throw new Error("createChannelWithTLS: Not implemented");
+  }
+  async createSparkStreamClient(address, certPath) {
+    if (this.streamClients.has(address)) {
+      return this.streamClients.get(address).client;
+    }
+    const authToken = await this.authenticate(address);
+    const channel = await this.createChannelWithTLS(address, certPath);
+    if (!channel) {
+      throw new NetworkError("Failed to create channel", {
+        url: address,
+        operation: "createChannel",
+        errorCount: 1,
+        errors: "Channel is undefined"
+      });
     }
-    const authToken = await this.authenticate(address2);
-    const channel = await this.createChannelWithTLS(address2, certPath);
-    const middleware = this.createMiddleware(address2, authToken);
+    const middleware = this.createMiddleware(address, authToken);
     const client = await this.createGrpcClient(
       SparkServiceDefinition,
       channel,
       true,
       middleware
     );
-    this.streamClients.set(address2, { client, authToken, channel });
+    this.streamClients.set(address, { client, authToken, channel });
     return client;
   }
-  async createSparkClient(address2, certPath) {
-    if (this.clients.has(address2)) {
-      return this.clients.get(address2).client;
+  async createSparkClient(address, certPath) {
+    if (this.clients.has(address)) {
+      return this.clients.get(address).client;
     }
-    const authToken = await this.authenticate(address2);
-    const channel = await this.createChannelWithTLS(address2, certPath);
-    const middleware = this.createMiddleware(address2, authToken);
+    const authToken = await this.authenticate(address);
+    const channel = await this.createChannelWithTLS(address, certPath);
+    const middleware = this.createMiddleware(address, authToken);
     const client = await this.createGrpcClient(
       SparkServiceDefinition,
       channel,
       true,
       middleware
     );
-    this.clients.set(address2, { client, authToken });
+    this.clients.set(address, { client, authToken });
     return client;
   }
-  async createSparkTokenClient(address2, certPath) {
-    if (this.tokenClients.has(address2)) {
-      return this.tokenClients.get(address2).client;
+  async createSparkTokenClient(address, certPath) {
+    if (this.tokenClients.has(address)) {
+      return this.tokenClients.get(address).client;
     }
-    const authToken = await this.authenticate(address2);
-    const channel = await this.createChannelWithTLS(address2, certPath);
-    const middleware = this.createMiddleware(address2, authToken);
+    const authToken = await this.authenticate(address);
+    const channel = await this.createChannelWithTLS(address, certPath);
+    const middleware = this.createMiddleware(address, authToken);
     const tokenClient = await this.createGrpcClient(
       SparkTokenServiceDefinition,
       channel,
       true,
       middleware
     );
-    this.tokenClients.set(address2, { client: tokenClient, authToken });
+    this.tokenClients.set(address, { client: tokenClient, authToken });
     return tokenClient;
   }
-  async getStreamChannel(address2) {
-    return this.streamClients.get(address2)?.channel;
+  async getStreamChannel(address) {
+    return this.streamClients.get(address)?.channel;
   }
-  async authenticate(address2, certPath) {
-    const existing = this.authPromises.get(address2);
+  async authenticate(address, certPath) {
+    const existing = this.authPromises.get(address);
     if (existing) {
       return existing;
     }
@@ -26620,7 +25959,7 @@ var ConnectionManager = class {
         try {
           const identityPublicKey = await this.config.signer.getIdentityPublicKey();
           sparkAuthnClient = await this.createSparkAuthnGrpcConnection(
-            address2,
+            address,
             certPath
           );
           const challengeResp = await sparkAuthnClient.get_challenge({
@@ -26654,6 +25993,13 @@ var ConnectionManager = class {
               lastError = error;
               continue;
             }
+            if (error.message.includes("UNAVAILABLE: No connection established.")) {
+              console.warn(
+                `Authentication attempt ${attempt + 1} failed due to unavailable status, retrying...`
+              );
+              lastError = error;
+              continue;
+            }
             throw new AuthenticationError(
               "Authentication failed",
               {
@@ -26678,15 +26024,15 @@ var ConnectionManager = class {
         lastError
       );
     })();
-    this.authPromises.set(address2, authPromise);
+    this.authPromises.set(address, authPromise);
     try {
       return await authPromise;
     } finally {
-      this.authPromises.delete(address2);
+      this.authPromises.delete(address);
     }
   }
-  async createSparkAuthnGrpcConnection(address2, certPath) {
-    const channel = await this.createChannelWithTLS(address2, certPath);
+  async createSparkAuthnGrpcConnection(address, certPath) {
+    const channel = await this.createChannelWithTLS(address, certPath);
     const authnMiddleware = this.createAuthnMiddleware();
     return this.createGrpcClient(
       SparkAuthnServiceDefinition,
@@ -26696,41 +26042,20 @@ var ConnectionManager = class {
     );
   }
   createAuthnMiddleware() {
-    if (import_core12.isNode) {
-      return async function* (call, options) {
-        const metadata = (0, import_nice_grpc_common2.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 = (0, import_nice_grpc_common2.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);
-    }
+    return async function* (call, options) {
+      return yield* call.next(call.request, options);
+    }.bind(this);
   }
-  createMiddleware(address2, authToken) {
-    if (import_core12.isNode) {
-      return this.createNodeMiddleware(address2, authToken);
-    } else {
-      return this.createBrowserMiddleware(address2, authToken);
-    }
+  createMiddleware(address, authToken) {
+    return void 0;
   }
-  async *handleMiddlewareError(error, address2, call, metadata, options) {
+  async *handleMiddlewareError(error, address, call, metadata, options) {
     if ((0, import_core12.isError)(error)) {
       if (error.message.includes("token has expired")) {
-        const newAuthToken = await this.authenticate(address2);
-        const clientData = this.clients.get(address2);
+        const newAuthToken = await this.authenticate(address);
+        const clientData = this.clients.get(address);
         if (!clientData) {
-          throw new Error(`No client found for address: ${address2}`);
+          throw new Error(`No client found for address: ${address}`);
         }
         clientData.authToken = newAuthToken;
         return yield* call.next(call.request, {
@@ -26741,101 +26066,8 @@ var ConnectionManager = class {
     }
     throw error;
   }
-  createNodeMiddleware(address2, initialAuthToken) {
-    return async function* (call, options) {
-      const metadata = (0, import_nice_grpc_common2.Metadata)(options.metadata).set(
-        "X-Client-Env",
-        clientEnv
-      );
-      try {
-        return yield* call.next(call.request, {
-          ...options,
-          metadata: metadata.set(
-            "Authorization",
-            `Bearer ${this.clients.get(address2)?.authToken || initialAuthToken}`
-          )
-        });
-      } catch (error) {
-        return yield* this.handleMiddlewareError(
-          error,
-          address2,
-          call,
-          metadata,
-          options
-        );
-      }
-    }.bind(this);
-  }
-  createBrowserMiddleware(address2, initialAuthToken) {
-    return async function* (call, options) {
-      const metadata = (0, import_nice_grpc_common2.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.set(
-            "Authorization",
-            `Bearer ${this.clients.get(address2)?.authToken || initialAuthToken}`
-          )
-        });
-      } catch (error) {
-        return yield* this.handleMiddlewareError(
-          error,
-          address2,
-          call,
-          metadata,
-          options
-        );
-      }
-    }.bind(this);
-  }
   async createGrpcClient(defintion, channel, withRetries, middleware) {
-    let clientFactory;
-    const retryOptions = {
-      retry: true,
-      retryMaxAttempts: 3
-    };
-    let options = {};
-    const isNodeChannel = "close" in channel;
-    if (import_core12.isNode && isNodeChannel && !isBun) {
-      const grpcModule = await import("nice-grpc");
-      const { openTelemetryClientMiddleware } = await import("nice-grpc-opentelemetry");
-      const { createClientFactory } = "default" in grpcModule ? grpcModule.default : grpcModule;
-      clientFactory = createClientFactory();
-      if (withRetries) {
-        options = retryOptions;
-        clientFactory = clientFactory.use(openTelemetryClientMiddleware()).use(import_nice_grpc_client_middleware_retry.retryMiddleware);
-      }
-      if (middleware) {
-        clientFactory = clientFactory.use(middleware);
-      }
-      const client = clientFactory.create(defintion, channel, {
-        "*": options
-      });
-      return {
-        ...client,
-        close: channel.close.bind(channel)
-      };
-    } else if (!isNodeChannel) {
-      const grpcModule = await import("nice-grpc-web");
-      const { createClientFactory } = "default" in grpcModule ? grpcModule.default : grpcModule;
-      clientFactory = createClientFactory();
-      if (withRetries) {
-        options = retryOptions;
-        clientFactory = clientFactory.use(import_nice_grpc_client_middleware_retry.retryMiddleware);
-      }
-      if (middleware) {
-        clientFactory = clientFactory.use(middleware);
-      }
-      const client = clientFactory.create(defintion, channel, {
-        "*": options
-      });
-      return {
-        ...client,
-        close: void 0
-      };
-    } else {
-      throw new Error("Channel does not have close in NodeJS environment");
-    }
+    throw new Error("createGrpcClient: Not implemented");
   }
 };
 
@@ -28317,7 +27549,8 @@ var CoopExitService = class extends BaseTransferService {
     leaves,
     exitTxId,
     connectorOutputs,
-    receiverPubKey
+    receiverPubKey,
+    transferId
   }) {
     const {
       transfer,
@@ -28328,7 +27561,8 @@ var CoopExitService = class extends BaseTransferService {
       leaves,
       exitTxId,
       connectorOutputs,
-      receiverPubKey
+      receiverPubKey,
+      transferId
     );
     const transferTweak = await this.deliverTransferPackage(
       transfer,
@@ -28409,7 +27643,7 @@ var CoopExitService = class extends BaseTransferService {
       directFromCpfpRefundTx
     };
   }
-  async signCoopExitRefunds(leaves, exitTxId, connectorOutputs, receiverPubKey) {
+  async signCoopExitRefunds(leaves, exitTxId, connectorOutputs, receiverPubKey, transferId) {
     if (leaves.length !== connectorOutputs.length) {
       throw new ValidationError(
         "Mismatch between leaves and connector outputs",
@@ -28513,12 +27747,12 @@ var CoopExitService = class extends BaseTransferService {
     try {
       response = await sparkClient.cooperative_exit_v2({
         transfer: {
-          transferId: (0, import_uuidv73.uuidv7)(),
+          transferId,
           leavesToSend: signingJobs,
           ownerIdentityPublicKey: await this.config.signer.getIdentityPublicKey(),
           receiverIdentityPublicKey: receiverPubKey,
-          expiryTime: this.config.getNetwork() == 0 /* MAINNET */ ? new Date(Date.now() + 2 * 24 * 60 * 60 * 1e3 + 5 * 60 * 1e3) : new Date(Date.now() + 35 * 60 * 1e3)
-          // 48 hours 5 min for mainnet, 35 min otherwise
+          expiryTime: this.config.getNetwork() == 0 /* MAINNET */ ? new Date(Date.now() + 7 * 24 * 60 * 60 * 1e3 + 5 * 60 * 1e3) : new Date(Date.now() + 35 * 60 * 1e3)
+          // 1 week 5 min for mainnet, 35 min otherwise
         },
         exitId: (0, import_uuidv73.uuidv7)(),
         exitTxid: exitTxId
@@ -28582,24 +27816,24 @@ var DepositService = class {
     this.connectionManager = connectionManager;
   }
   async validateDepositAddress({
-    address: address2,
+    address,
     userPubkey,
     verifyCoordinatorProof = false
   }) {
-    if (!address2.depositAddressProof || !address2.depositAddressProof.proofOfPossessionSignature || !address2.depositAddressProof.addressSignatures) {
+    if (!address.depositAddressProof || !address.depositAddressProof.proofOfPossessionSignature || !address.depositAddressProof.addressSignatures) {
       throw new ValidationError(
         "Proof of possession signature or address signatures is null",
         {
           field: "depositAddressProof",
-          value: address2.depositAddressProof
+          value: address.depositAddressProof
         }
       );
     }
-    const operatorPubkey = subtractPublicKeys(address2.verifyingKey, userPubkey);
+    const operatorPubkey = subtractPublicKeys(address.verifyingKey, userPubkey);
     const msg = proofOfPossessionMessageHashForDepositAddress(
       await this.config.signer.getIdentityPublicKey(),
       operatorPubkey,
-      address2.address
+      address.address
     );
     const taprootKey = (0, import_btc_signer4.p2tr)(
       operatorPubkey.slice(1, 33),
@@ -28607,7 +27841,7 @@ var DepositService = class {
       getNetwork(this.config.getNetwork())
     ).tweakedPubkey;
     const isVerified = import_secp256k110.schnorr.verify(
-      address2.depositAddressProof.proofOfPossessionSignature,
+      address.depositAddressProof.proofOfPossessionSignature,
       msg,
       taprootKey
     );
@@ -28616,17 +27850,17 @@ var DepositService = class {
         "Proof of possession signature verification failed",
         {
           field: "proofOfPossessionSignature",
-          value: address2.depositAddressProof.proofOfPossessionSignature
+          value: address.depositAddressProof.proofOfPossessionSignature
         }
       );
     }
-    const addrHash = (0, import_sha210.sha256)(address2.address);
+    const addrHash = (0, import_sha210.sha256)(address.address);
     for (const operator of Object.values(this.config.getSigningOperators())) {
       if (operator.identifier === this.config.getCoordinatorIdentifier() && !verifyCoordinatorProof) {
         continue;
       }
       const operatorPubkey2 = (0, import_utils16.hexToBytes)(operator.identityPublicKey);
-      const operatorSig = address2.depositAddressProof.addressSignatures[operator.identifier];
+      const operatorSig = address.depositAddressProof.addressSignatures[operator.identifier];
       if (!operatorSig) {
         throw new ValidationError("Operator signature not found", {
           field: "addressSignatures",
@@ -29582,7 +28816,7 @@ var import_utils20 = require("@noble/hashes/utils");
 // src/utils/token-hashing.ts
 init_buffer();
 var import_sha212 = require("@noble/hashes/sha2");
-var import_base4 = require("@scure/base");
+var import_base5 = require("@scure/base");
 function hashTokenTransaction(tokenTransaction, partialHash = false) {
   switch (tokenTransaction.version) {
     case 1:
@@ -29993,7 +29227,7 @@ function hashTokenTransactionV1(tokenTransaction, partialHash = false) {
   }
   const finalHashObj = import_sha212.sha256.create();
   const concatenatedHashes = new Uint8Array(
-    allHashes.reduce((sum, hash) => sum + hash.length, 0)
+    allHashes.reduce((sum2, hash) => sum2 + hash.length, 0)
   );
   let offset = 0;
   for (const hash of allHashes) {
@@ -30424,8 +29658,8 @@ function hashTokenTransactionV2(tokenTransaction, partialHash = false) {
       const invoice = attachment.sparkInvoice;
       let idBytes;
       try {
-        const decoded = import_base4.bech32m.decode(invoice, 500);
-        const payload = SparkAddress.decode(import_base4.bech32m.fromWords(decoded.words));
+        const decoded = import_base5.bech32m.decode(invoice, 500);
+        const payload = SparkAddress.decode(import_base5.bech32m.fromWords(decoded.words));
         if (!payload.sparkInvoiceFields || !payload.sparkInvoiceFields.id) {
           throw new Error("missing spark invoice fields or id");
         }
@@ -30466,7 +29700,7 @@ function hashTokenTransactionV2(tokenTransaction, partialHash = false) {
   }
   const finalHashObj = import_sha212.sha256.create();
   const concatenatedHashes = new Uint8Array(
-    allHashes.reduce((sum, hash) => sum + hash.length, 0)
+    allHashes.reduce((sum2, hash) => sum2 + hash.length, 0)
   );
   let offset = 0;
   for (const hash of allHashes) {
@@ -30514,7 +29748,7 @@ function hashOperatorSpecificTokenTransactionSignablePayload(payload) {
   allHashes.push(hashObj.digest());
   const finalHashObj = import_sha212.sha256.create();
   const concatenatedHashes = new Uint8Array(
-    allHashes.reduce((sum, hash) => sum + hash.length, 0)
+    allHashes.reduce((sum2, hash) => sum2 + hash.length, 0)
   );
   let offset = 0;
   for (const hash of allHashes) {
@@ -30841,7 +30075,7 @@ var TokenTransactionService = class {
       });
     }
     const totalTokenAmount = receiverOutputs.reduce(
-      (sum, transfer) => sum + transfer.tokenAmount,
+      (sum2, transfer) => sum2 + transfer.tokenAmount,
       0n
     );
     let outputsToUse;
@@ -30929,7 +30163,7 @@ var TokenTransactionService = class {
     );
     const availableTokenAmount = sumAvailableTokens(selectedOutputs);
     const totalRequestedAmount = tokenOutputData.reduce(
-      (sum, output) => sum + output.tokenAmount,
+      (sum2, output) => sum2 + output.tokenAmount,
       0n
     );
     const tokenOutputs = tokenOutputData.map(
@@ -31305,15 +30539,15 @@ var TokenTransactionService = class {
   sortTokenOutputsByStrategy(tokenOutputs, strategy) {
     if (strategy === "SMALL_FIRST") {
       tokenOutputs.sort((a, b) => {
-        return Number(
-          (0, import_utils19.bytesToNumberBE)(a.output.tokenAmount) - (0, import_utils19.bytesToNumberBE)(b.output.tokenAmount)
-        );
+        const amountA = (0, import_utils19.bytesToNumberBE)(a.output.tokenAmount);
+        const amountB = (0, import_utils19.bytesToNumberBE)(b.output.tokenAmount);
+        return amountA < amountB ? -1 : amountA > amountB ? 1 : 0;
       });
     } else {
       tokenOutputs.sort((a, b) => {
-        return Number(
-          (0, import_utils19.bytesToNumberBE)(b.output.tokenAmount) - (0, import_utils19.bytesToNumberBE)(a.output.tokenAmount)
-        );
+        const amountA = (0, import_utils19.bytesToNumberBE)(a.output.tokenAmount);
+        const amountB = (0, import_utils19.bytesToNumberBE)(b.output.tokenAmount);
+        return amountB < amountA ? -1 : amountB > amountA ? 1 : 0;
       });
     }
   }
@@ -31416,7 +30650,7 @@ var import_sha213 = require("@noble/hashes/sha2");
 var import_api = require("@opentelemetry/api");
 var import_sdk_trace_base = require("@opentelemetry/sdk-trace-base");
 var import_eventemitter3 = require("eventemitter3");
-var import_nice_grpc_common3 = require("nice-grpc-common");
+var import_nice_grpc_common = require("nice-grpc-common");
 
 // src/services/signing.ts
 init_buffer();
@@ -31602,7 +30836,7 @@ var COIN_AMOUNT = 10000000n;
 var FEE_AMOUNT = 1000n;
 var TARGET_NUM_COINS = 20;
 var BitcoinFaucet = class _BitcoinFaucet {
-  constructor(url = "http://127.0.0.1:8332", username = "testutil", password = "testutilpassword") {
+  constructor(url, username, password) {
     this.url = url;
     this.username = username;
     this.password = password;
@@ -31615,8 +30849,11 @@ var BitcoinFaucet = class _BitcoinFaucet {
   static instance = null;
   miningAddress;
   lock = Promise.resolve();
-  static getInstance(url = "http://127.0.0.1:8332", username = "testutil", password = "testutilpassword") {
+  static getInstance() {
     if (!_BitcoinFaucet.instance) {
+      const url = process.env.BITCOIN_RPC_URL || (process.env.MINIKUBE_IP ? `http://${process.env.MINIKUBE_IP}:8332` : "http://127.0.0.1:8332");
+      const username = process.env.BITCOIN_RPC_USER || "testutil";
+      const password = process.env.BITCOIN_RPC_PASSWORD || "testutilpassword";
       _BitcoinFaucet.instance = new _BitcoinFaucet(url, username, password);
     }
     return _BitcoinFaucet.instance;
@@ -31647,15 +30884,15 @@ var BitcoinFaucet = class _BitcoinFaucet {
   }
   async refill() {
     const minerPubKey = import_secp256k112.secp256k1.getPublicKey(STATIC_MINING_KEY);
-    const address2 = getP2TRAddressFromPublicKey(minerPubKey, 4 /* LOCAL */);
+    const address = getP2TRAddressFromPublicKey(minerPubKey, 4 /* LOCAL */);
     const scanResult = await this.call("scantxoutset", [
       "start",
-      [`addr(${address2})`]
+      [`addr(${address})`]
     ]);
     let selectedUtxo;
     let selectedUtxoAmountSats;
     if (!scanResult.success || scanResult.unspents.length === 0) {
-      const blockHash = await this.generateToAddress(1, address2);
+      const blockHash = await this.generateToAddress(1, address);
       const block = await this.getBlock(blockHash[0]);
       const fundingTx = import_btc_signer5.Transaction.fromRaw((0, import_utils22.hexToBytes)(block.tx[0].hex), {
         allowUnknownOutputs: true
@@ -31828,8 +31065,8 @@ var BitcoinFaucet = class _BitcoinFaucet {
       );
     }
   }
-  async generateToAddress(numBlocks, address2) {
-    return await this.call("generatetoaddress", [numBlocks, address2]);
+  async generateToAddress(numBlocks, address) {
+    return await this.call("generatetoaddress", [numBlocks, address]);
   }
   async getBlock(blockHash) {
     return await this.call("getblock", [blockHash, 2]);
@@ -31843,7 +31080,7 @@ var BitcoinFaucet = class _BitcoinFaucet {
     const pubKey = import_secp256k112.secp256k1.getPublicKey(key);
     return getP2TRAddressFromPublicKey(pubKey, 4 /* LOCAL */);
   }
-  async sendToAddress(address2, amount, blocksToGenerate = 1) {
+  async sendToAddress(address, amount, blocksToGenerate = 1) {
     const coin = await this.fund();
     if (!coin) {
       throw new Error("No coins available");
@@ -31852,7 +31089,7 @@ var BitcoinFaucet = class _BitcoinFaucet {
     tx.addInput(coin.outpoint);
     const availableAmount = COIN_AMOUNT - FEE_AMOUNT;
     const destinationAddress = (0, import_btc_signer5.Address)(getNetwork(4 /* LOCAL */)).decode(
-      address2
+      address
     );
     const destinationScript = import_btc_signer5.OutScript.encode(destinationAddress);
     tx.addOutput({
@@ -31899,6 +31136,76 @@ function chunkArray(arr, size) {
   return chunks;
 }
 
+// src/utils/optimize.ts
+init_buffer();
+var DENOMINATIONS = Array.from({ length: 28 }, (_, i) => 2 ** i);
+function assert(condition, message) {
+  if (!condition) {
+    throw new InternalValidationError(message || "Assertion failed");
+  }
+}
+function sum(arr) {
+  return arr.reduce((a, b) => a + b, 0);
+}
+function sorted(arr) {
+  return [...arr].sort((a, b) => a - b);
+}
+function equals(a, b) {
+  return a.length === b.length && a.every((val, index) => val === b[index]);
+}
+function greedyLeaves(amount) {
+  const leaves = [];
+  let remaining = amount;
+  for (let i = DENOMINATIONS.length - 1; i >= 0; i--) {
+    const leaf = DENOMINATIONS[i];
+    if (typeof leaf === "number" && leaf > 0) {
+      while (remaining >= leaf) {
+        remaining -= leaf;
+        leaves.push(leaf);
+      }
+    }
+  }
+  assert(sum(leaves) === amount, "greedy_leaves: sum mismatch");
+  return sorted(leaves);
+}
+var Swap = class {
+  inLeaves;
+  outLeaves;
+  constructor(inLeaves, outLeaves) {
+    this.inLeaves = [...inLeaves];
+    this.outLeaves = [...outLeaves];
+    assert(
+      sum(this.inLeaves) === sum(this.outLeaves),
+      "Swap in/out leaves must sum to same value for swap: " + this.toString()
+    );
+  }
+  toString() {
+    return `Swap(in=${JSON.stringify(this.inLeaves)}, out=${JSON.stringify(this.outLeaves)})`;
+  }
+};
+function maximizeUnilateralExit(inputLeaves, maxLeavesPerSwap = 64) {
+  const swaps = [];
+  let batch = [];
+  let leaves = sorted(inputLeaves);
+  while (leaves.length > 0) {
+    batch.push(leaves.shift());
+    const target = greedyLeaves(sum(batch));
+    if (batch.length >= maxLeavesPerSwap || target.length >= maxLeavesPerSwap) {
+      if (!equals(target, batch)) {
+        swaps.push(new Swap([...batch], target));
+      }
+      batch = [];
+    }
+  }
+  if (batch.length > 0) {
+    const target = greedyLeaves(sum(batch));
+    if (!equals(target, batch)) {
+      swaps.push(new Swap([...batch], target));
+    }
+  }
+  return swaps;
+}
+
 // src/utils/retry.ts
 init_buffer();
 var DEFAULT_RETRY_CONFIG = {
@@ -31978,7 +31285,7 @@ var SparkWalletEvent = {
 };
 
 // src/spark-wallet/spark-wallet.ts
-var SparkWallet = class _SparkWallet extends import_eventemitter3.EventEmitter {
+var SparkWallet = class extends import_eventemitter3.EventEmitter {
   config;
   connectionManager;
   transferService;
@@ -32002,10 +31309,11 @@ var SparkWallet = class _SparkWallet extends import_eventemitter3.EventEmitter {
   // Add this property near the top of the class with other private properties
   claimTransfersInterval = null;
   tracer = null;
-  constructor(options, signer) {
+  constructor(options, signerArg) {
     super();
+    const signer = signerArg || this.buildSigner();
     this.config = new WalletConfigService(options, signer);
-    this.connectionManager = new ConnectionManager(this.config);
+    this.connectionManager = this.buildConnectionManager(this.config);
     this.signingService = new SigningService(this.config);
     this.depositService = new DepositService(
       this.config,
@@ -32032,28 +31340,18 @@ var SparkWallet = class _SparkWallet extends import_eventemitter3.EventEmitter {
     );
     this.tracer = import_api.trace.getTracer(this.tracerId);
     this.wrapSparkWalletMethodsWithTracing();
+    this.initializeTracer(this);
+  }
+  static async initialize({ mnemonicOrSeed, accountNumber, signer, options = {} }) {
+    const wallet = new this(options, signer);
+    const initWalletResponse = await wallet.initWallet(
+      mnemonicOrSeed,
+      accountNumber,
+      options
+    );
+    return initWalletResponse;
   }
-  static async initialize({
-    mnemonicOrSeed,
-    accountNumber,
-    signer,
-    options
-  }) {
-    const wallet = new _SparkWallet(options, signer);
-    wallet.initializeTracer(wallet);
-    if (options && options.signerWithPreExistingKeys) {
-      await wallet.initWalletWithoutSeed();
-      return {
-        wallet
-      };
-    }
-    const initResponse = await wallet.initWallet(mnemonicOrSeed, accountNumber);
-    return {
-      wallet,
-      ...initResponse
-    };
-  }
-  async initializeWallet() {
+  async createClientsAndSyncWallet() {
     this.sspClient = new SspClient(this.config);
     await this.connectionManager.createClients();
     if (isReactNative) {
@@ -32071,6 +31369,12 @@ var SparkWallet = class _SparkWallet extends import_eventemitter3.EventEmitter {
     }
     return this.sspClient;
   }
+  buildSigner() {
+    return new DefaultSparkSigner();
+  }
+  buildConnectionManager(config) {
+    return new ConnectionManager(config);
+  }
   async handleStreamEvent({ event }) {
     try {
       if (event?.$case === "transfer" && event.transfer.transfer && event.transfer.transfer.type !== 40 /* COUNTER_SWAP */) {
@@ -32125,9 +31429,9 @@ var SparkWallet = class _SparkWallet extends import_eventemitter3.EventEmitter {
     let retryCount = 0;
     while (retryCount <= MAX_RETRIES) {
       try {
-        const address2 = this.config.getCoordinatorAddress();
-        const sparkClient = await this.connectionManager.createSparkStreamClient(address2);
-        const channel = await this.connectionManager.getStreamChannel(address2);
+        const address = this.config.getCoordinatorAddress();
+        const sparkClient = await this.connectionManager.createSparkStreamClient(address);
+        const channel = await this.connectionManager.getStreamChannel(address);
         const stream = sparkClient.subscribe_to_events(
           {
             identityPublicKey: await this.config.signer.getIdentityPublicKey()
@@ -32429,8 +31733,34 @@ var SparkWallet = class _SparkWallet extends import_eventemitter3.EventEmitter {
     await this.withLeaves(async () => {
       this.optimizationInProgress = true;
       try {
-        if (this.leaves.length > 0) {
-          await this.requestLeavesSwap({ leaves: this.leaves });
+        this.leaves = await this.getLeaves();
+        const swaps = maximizeUnilateralExit(
+          this.leaves.map((leaf) => leaf.value)
+        );
+        const valueToNodes = /* @__PURE__ */ new Map();
+        this.leaves.forEach((leaf) => {
+          if (!valueToNodes.has(leaf.value)) {
+            valueToNodes.set(leaf.value, []);
+          }
+          valueToNodes.get(leaf.value).push(leaf);
+        });
+        for (const swap of swaps) {
+          const leavesToSend = [];
+          for (const leafValue of swap.inLeaves) {
+            const nodes = valueToNodes.get(leafValue);
+            if (nodes && nodes.length > 0) {
+              const node = nodes.shift();
+              leavesToSend.push(node);
+            } else {
+              throw new InternalValidationError(
+                `No unused leaf with value ${leafValue} found in leaves`
+              );
+            }
+          }
+          await this.requestLeavesSwap({
+            leaves: leavesToSend,
+            targetAmounts: swap.outLeaves
+          });
         }
         this.leaves = await this.getLeaves();
       } finally {
@@ -32533,11 +31863,17 @@ var SparkWallet = class _SparkWallet extends import_eventemitter3.EventEmitter {
    *
    * @returns {Promise<Object>} Object containing:
    *   - mnemonic: The mnemonic if one was generated (undefined for raw seed)
-   *   - balance: The wallet's initial balance in satoshis
-   *   - tokenBalance: Map of token balances
+   *   - wallet: The wallet instance
    * @private
    */
-  async initWallet(mnemonicOrSeed, accountNumber) {
+  async initWallet(mnemonicOrSeed, accountNumber, options = {}) {
+    if (options.signerWithPreExistingKeys) {
+      await this.initWalletWithoutSeed();
+      return {
+        wallet: this,
+        mnemonic: void 0
+      };
+    }
     if (accountNumber === void 0) {
       if (this.config.getNetwork() === 3 /* REGTEST */) {
         accountNumber = 0;
@@ -32563,7 +31899,8 @@ var SparkWallet = class _SparkWallet extends import_eventemitter3.EventEmitter {
     }
     await this.initWalletFromSeed(seed, accountNumber);
     return {
-      mnemonic
+      mnemonic,
+      wallet: this
     };
   }
   /**
@@ -32571,7 +31908,7 @@ var SparkWallet = class _SparkWallet extends import_eventemitter3.EventEmitter {
    * @private
    */
   async initWalletWithoutSeed() {
-    await this.initializeWallet();
+    await this.createClientsAndSyncWallet();
     const identityPublicKey = await this.config.signer.getIdentityPublicKey();
     if (!identityPublicKey || identityPublicKey.length === 0) {
       throw new ValidationError("Identity public key not found in signer", {
@@ -32594,7 +31931,7 @@ var SparkWallet = class _SparkWallet extends import_eventemitter3.EventEmitter {
    */
   async initWalletFromSeed(seed, accountNumber) {
     const identityPublicKey = await this.config.signer.createSparkWalletFromSeed(seed, accountNumber);
-    await this.initializeWallet();
+    await this.createClientsAndSyncWallet();
     this.sparkAddress = encodeSparkAddress({
       identityPublicKey,
       network: this.config.getNetworkType()
@@ -32994,6 +32331,10 @@ var SparkWallet = class _SparkWallet extends import_eventemitter3.EventEmitter {
         directSignatureMap,
         directFromCpfpSignatureMap
       );
+      const leavesToRemove = new Set(leavesBatch.map((leaf) => leaf.id));
+      this.leaves = [
+        ...this.leaves.filter((leaf) => !leavesToRemove.has(leaf.id))
+      ];
       const completeResponse = await sspClient.completeLeaveSwap({
         adaptorSecretKey: (0, import_utils24.bytesToHex)(cpfpAdaptorPrivateKey),
         directAdaptorSecretKey: (0, import_utils24.bytesToHex)(directAdaptorPrivateKey),
@@ -33141,16 +32482,16 @@ var SparkWallet = class _SparkWallet extends import_eventemitter3.EventEmitter {
    */
   async getStaticDepositAddress() {
     const signingPubkey = await this.config.signer.getStaticDepositSigningKey(0);
-    const address2 = await this.depositService.generateStaticDepositAddress({
+    const address = await this.depositService.generateStaticDepositAddress({
       signingPubkey
     });
-    if (!address2.depositAddress) {
+    if (!address.depositAddress) {
       throw new RPCError("Failed to generate static deposit address", {
         method: "generateStaticDepositAddress",
         params: { signingPubkey }
       });
     }
-    return address2.depositAddress.address;
+    return address.depositAddress.address;
   }
   /**
    * Generates a deposit address for receiving funds.
@@ -33163,17 +32504,17 @@ var SparkWallet = class _SparkWallet extends import_eventemitter3.EventEmitter {
       type: "leaf" /* LEAF */,
       path: leafId
     });
-    const address2 = await this.depositService.generateDepositAddress({
+    const address = await this.depositService.generateDepositAddress({
       signingPubkey,
       leafId
     });
-    if (!address2.depositAddress) {
+    if (!address.depositAddress) {
       throw new RPCError("Failed to generate deposit address", {
         method: "generateDepositAddress",
         params: { signingPubkey, leafId }
       });
     }
-    return address2.depositAddress.address;
+    return address.depositAddress.address;
   }
   async queryStaticDepositAddresses() {
     const sparkClient = await this.connectionManager.createSparkClient(
@@ -33582,7 +32923,7 @@ var SparkWallet = class _SparkWallet extends import_eventemitter3.EventEmitter {
     creditAmountView.setUint32(4, upperHalf, true);
     parts.push(new Uint8Array(creditAmountBuffer));
     parts.push((0, import_utils24.hexToBytes)(sspSignature));
-    const totalLength = parts.reduce((sum, part) => sum + part.length, 0);
+    const totalLength = parts.reduce((sum2, part) => sum2 + part.length, 0);
     const payload = new Uint8Array(totalLength);
     let offset = 0;
     for (const part of parts) {
@@ -33608,10 +32949,10 @@ var SparkWallet = class _SparkWallet extends import_eventemitter3.EventEmitter {
         continue;
       }
       const parsedScript = import_btc_signer6.OutScript.decode(output.script);
-      const address2 = (0, import_btc_signer6.Address)(getNetwork(this.config.getNetwork())).encode(
+      const address = (0, import_btc_signer6.Address)(getNetwork(this.config.getNetwork())).encode(
         parsedScript
       );
-      if (staticDepositAddresses.has(address2)) {
+      if (staticDepositAddresses.has(address)) {
         vout = i;
         break;
       }
@@ -33814,12 +33155,12 @@ var SparkWallet = class _SparkWallet extends import_eventemitter3.EventEmitter {
           continue;
         }
         const parsedScript = import_btc_signer6.OutScript.decode(output.script);
-        const address2 = (0, import_btc_signer6.Address)(getNetwork(this.config.getNetwork())).encode(
+        const address = (0, import_btc_signer6.Address)(getNetwork(this.config.getNetwork())).encode(
           parsedScript
         );
-        if (unusedDepositAddresses.has(address2)) {
+        if (unusedDepositAddresses.has(address)) {
           vout = i;
-          depositAddress = unusedDepositAddresses.get(address2);
+          depositAddress = unusedDepositAddresses.get(address);
           break;
         }
       }
@@ -33875,10 +33216,10 @@ var SparkWallet = class _SparkWallet extends import_eventemitter3.EventEmitter {
         continue;
       }
       const parsedScript = import_btc_signer6.OutScript.decode(output.script);
-      const address2 = (0, import_btc_signer6.Address)(getNetwork(this.config.getNetwork())).encode(
+      const address = (0, import_btc_signer6.Address)(getNetwork(this.config.getNetwork())).encode(
         parsedScript
       );
-      const unusedDepositAddress = unusedDepositAddresses.get(address2);
+      const unusedDepositAddress = unusedDepositAddresses.get(address);
       if (unusedDepositAddress) {
         vout = i;
         let keyDerivation;
@@ -34012,7 +33353,7 @@ var SparkWallet = class _SparkWallet extends import_eventemitter3.EventEmitter {
       }
       amountSatsArray.push(amountSats);
     }
-    const transferJobs = await this.withLeaves(async () => {
+    return await this.withLeaves(async () => {
       const selectLeavesToSendMap = await this.selectLeaves(amountSatsArray);
       for (const [amount, selection] of selectLeavesToSendMap) {
         for (let groupIndex = 0; groupIndex < selection.length; groupIndex++) {
@@ -34048,47 +33389,46 @@ var SparkWallet = class _SparkWallet extends import_eventemitter3.EventEmitter {
       if (idsToRemove.size > 0) {
         this.leaves = this.leaves.filter((leaf) => !idsToRemove.has(leaf.id));
       }
-      return jobs;
-    });
-    const signerIdentityPublicKey = await this.config.signer.getIdentityPublicKey();
-    const outcomes = await Promise.all(
-      transferJobs.map(async (job) => {
-        try {
-          const transfer = await this.transferService.sendTransferWithKeyTweaks(
-            job.leafKeyTweaks,
-            job.receiverIdentityPubkey,
-            job.sparkInvoice
-          );
-          const isSelfTransfer = (0, import_utils24.equalBytes)(
-            signerIdentityPublicKey,
-            job.receiverIdentityPubkey
-          );
-          if (isSelfTransfer) {
-            const pending = await this.transferService.queryTransfer(
-              transfer.id
+      const signerIdentityPublicKey = await this.config.signer.getIdentityPublicKey();
+      const outcomes = await Promise.all(
+        jobs.map(async (job) => {
+          try {
+            const transfer = await this.transferService.sendTransferWithKeyTweaks(
+              job.leafKeyTweaks,
+              job.receiverIdentityPubkey,
+              job.sparkInvoice
+            );
+            const isSelfTransfer = (0, import_utils24.equalBytes)(
+              signerIdentityPublicKey,
+              job.receiverIdentityPubkey
             );
-            if (pending) {
-              await this.claimTransfer({ transfer: pending, optimize: true });
+            if (isSelfTransfer) {
+              const pending = await this.transferService.queryTransfer(
+                transfer.id
+              );
+              if (pending) {
+                await this.claimTransfer({ transfer: pending, optimize: true });
+              }
             }
+            return {
+              ok: true,
+              transfer: mapTransferToWalletTransfer(
+                transfer,
+                (0, import_utils24.bytesToHex)(await this.config.signer.getIdentityPublicKey())
+              ),
+              param: job.param
+            };
+          } catch (error) {
+            return {
+              ok: false,
+              error: error instanceof Error ? error : new Error(String(error)),
+              param: job.param
+            };
           }
-          return {
-            ok: true,
-            transfer: mapTransferToWalletTransfer(
-              transfer,
-              (0, import_utils24.bytesToHex)(await this.config.signer.getIdentityPublicKey())
-            ),
-            param: job.param
-          };
-        } catch (error) {
-          return {
-            ok: false,
-            error: error instanceof Error ? error : new Error(String(error)),
-            param: job.param
-          };
-        }
-      })
-    );
-    return outcomes;
+        })
+      );
+      return outcomes;
+    });
   }
   buildTweaksByAmount(selectedByAmount) {
     const tweaksByAmount = /* @__PURE__ */ new Map();
@@ -34293,7 +33633,7 @@ var SparkWallet = class _SparkWallet extends import_eventemitter3.EventEmitter {
   }) {
     const onError = async (context) => {
       const error = context.error;
-      if (error instanceof RPCError && error.originalError instanceof import_nice_grpc_common3.ClientError && error.originalError.code === import_nice_grpc_common3.Status.ALREADY_EXISTS) {
+      if (error instanceof RPCError && error.originalError instanceof import_nice_grpc_common.ClientError && error.originalError.code === import_nice_grpc_common.Status.ALREADY_EXISTS) {
         const transferToUse = context.data || transfer;
         const updatedTransfer = await this.transferService.queryTransfer(
           transferToUse.id
@@ -34679,8 +34019,8 @@ var SparkWallet = class _SparkWallet extends import_eventemitter3.EventEmitter {
       );
       const sspResponse = await sspClient.requestLightningSend({
         encodedInvoice: invoice,
-        idempotencyKey: (0, import_uuidv75.uuidv7)(),
-        amountSats: isZeroAmountInvoice ? amountSatsToSend : void 0
+        amountSats: isZeroAmountInvoice ? amountSatsToSend : void 0,
+        userOutboundTransferExternalId: swapResponse.transfer.id
       });
       if (!sspResponse) {
         throw new Error("Failed to contact SSP");
@@ -34986,12 +34326,13 @@ var SparkWallet = class _SparkWallet extends import_eventemitter3.EventEmitter {
         }
       }))
     );
+    const transferId = (0, import_uuidv75.uuidv7)();
     const requestCoopExitParams = {
       leafExternalIds: leavesToSendToSsp.map((leaf) => leaf.id),
       withdrawalAddress: onchainAddress,
-      idempotencyKey: (0, import_uuidv75.uuidv7)(),
       exitSpeed,
-      withdrawAll: deductFeeFromWithdrawalAmount
+      withdrawAll: deductFeeFromWithdrawalAmount,
+      userOutboundTransferExternalId: transferId
     };
     if (!deductFeeFromWithdrawalAmount) {
       requestCoopExitParams.feeQuoteId = feeEstimate.id;
@@ -35026,11 +34367,11 @@ var SparkWallet = class _SparkWallet extends import_eventemitter3.EventEmitter {
       leaves: leafKeyTweaks,
       exitTxId: coopExitTxId,
       connectorOutputs,
-      receiverPubKey: sspPubIdentityKey
+      receiverPubKey: sspPubIdentityKey,
+      transferId
     });
     const completeResponse = await sspClient.completeCoopExit({
-      userOutboundTransferExternalId: transfer.transfer.id,
-      coopExitRequestId: coopExitRequest.id
+      userOutboundTransferExternalId: transfer.transfer.id
     });
     return completeResponse;
   }
@@ -35712,11 +35053,11 @@ var SparkWallet = class _SparkWallet extends import_eventemitter3.EventEmitter {
     this.leaves.push(...leavesToAdd);
   }
   async queryNodes(baseRequest, sparkClientAddress, pageSize = 100) {
-    const address2 = sparkClientAddress ?? this.config.getCoordinatorAddress();
+    const address = sparkClientAddress ?? this.config.getCoordinatorAddress();
     const aggregatedNodes = {};
     let offset = 0;
     while (true) {
-      const sparkClient = await this.connectionManager.createSparkClient(address2);
+      const sparkClient = await this.connectionManager.createSparkClient(address);
       const response = await sparkClient.query_nodes({
         ...baseRequest,
         limit: pageSize,
@@ -35752,7 +35093,6 @@ var SparkWallet = class _SparkWallet extends import_eventemitter3.EventEmitter {
     const consoleOptions = wallet.config.getConsoleOptions();
     const spanProcessors = [];
     if (consoleOptions.otel) {
-      console.log("OpenTelemetry client logging enabled.");
       spanProcessors.push(new import_sdk_trace_base.SimpleSpanProcessor(new import_sdk_trace_base.ConsoleSpanExporter()));
     }
     const traceUrls = this.getOtelTraceUrls();
@@ -35851,27 +35191,96 @@ var import_instrumentation = require("@opentelemetry/instrumentation");
 var import_instrumentation_fetch = require("@opentelemetry/instrumentation-fetch");
 var import_core14 = require("@opentelemetry/core");
 var import_api2 = require("@opentelemetry/api");
-var SparkWalletBrowser = class _SparkWalletBrowser extends SparkWallet {
-  static async initialize({
-    mnemonicOrSeed,
-    accountNumber,
-    signer,
-    options
-  }) {
-    const wallet = new _SparkWalletBrowser(options, signer);
-    wallet.initializeTracer(wallet);
-    if (options && options.signerWithPreExistingKeys) {
-      await wallet.initWalletWithoutSeed();
-      return {
-        wallet
-      };
+
+// src/services/connection/connection.browser.ts
+init_buffer();
+var import_nice_grpc_web = require("nice-grpc-web");
+var import_nice_grpc_common2 = require("nice-grpc-common");
+var import_nice_grpc_client_middleware_retry = require("nice-grpc-client-middleware-retry");
+var ConnectionManagerBrowser = class extends ConnectionManager {
+  transport;
+  constructor(config, transport = (0, import_nice_grpc_web.FetchTransport)()) {
+    super(config);
+    this.transport = transport;
+  }
+  async createChannelWithTLS(address, certPath) {
+    try {
+      return (0, import_nice_grpc_web.createChannel)(address, this.transport);
+    } catch (error) {
+      console.error("Channel creation error:", error);
+      throw new NetworkError(
+        "Failed to create channel",
+        {
+          url: address,
+          operation: "createChannel",
+          errorCount: 1,
+          errors: error instanceof Error ? error.message : String(error)
+        },
+        error
+      );
+    }
+  }
+  createAuthnMiddleware() {
+    return async function* (call, options) {
+      const metadata = (0, import_nice_grpc_common2.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(address, initialAuthToken) {
+    return async function* (call, options) {
+      const metadata = (0, import_nice_grpc_common2.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.set(
+            "Authorization",
+            `Bearer ${this.clients.get(address)?.authToken || initialAuthToken}`
+          )
+        });
+      } catch (error) {
+        return yield* this.handleMiddlewareError(
+          error,
+          address,
+          call,
+          metadata,
+          options
+        );
+      }
+    }.bind(this);
+  }
+  async createGrpcClient(defintion, channel, withRetries, middleware) {
+    let clientFactory;
+    const retryOptions = {
+      retry: true,
+      retryMaxAttempts: 3
+    };
+    let options = {};
+    clientFactory = (0, import_nice_grpc_web.createClientFactory)();
+    if (withRetries) {
+      options = retryOptions;
+      clientFactory = clientFactory.use(import_nice_grpc_client_middleware_retry.retryMiddleware);
     }
-    const initResponse = await wallet.initWallet(mnemonicOrSeed, accountNumber);
+    if (middleware) {
+      clientFactory = clientFactory.use(middleware);
+    }
+    const client = clientFactory.create(defintion, channel, {
+      "*": options
+    });
     return {
-      wallet,
-      ...initResponse
+      ...client,
+      close: void 0
     };
   }
+};
+
+// src/spark-wallet/spark-wallet.browser.ts
+var SparkWalletBrowser = class extends SparkWallet {
+  buildConnectionManager(config) {
+    return new ConnectionManagerBrowser(config);
+  }
   initializeTracerEnv({
     spanProcessors,
     traceUrls
@@ -35909,6 +35318,7 @@ setCrypto(cryptoImpl2);
 0 && (module.exports = {
   AuthenticationError,
   ConfigurationError,
+  ConnectionManager,
   DEFAULT_FEE_SATS,
   DIRECT_TIMELOCK_OFFSET,
   DefaultSparkSigner,
@@ -35917,7 +35327,6 @@ setCrypto(cryptoImpl2);
   InternalValidationError,
   KeyDerivationType,
   LOGGER_NAMES,
-  LRC_WALLET_NETWORK,
   Network,
   NetworkError,
   NetworkToProto,