@buildonspark/spark-sdk 0.1.40 → 0.1.41

package/dist/native/index.js

@@ -746,6 +746,7 @@ import {
   Receipt
 } from "@buildonspark/lrc20-sdk";
 import { sha256 } from "@noble/hashes/sha2";
+import { taprootTweakPrivKey } from "@scure/btc-signer/utils";
 var sparkFrostModule = void 0;
 var getSparkFrostModule = async () => {
   if (isReactNative) {
@@ -757,8 +758,8 @@ var getSparkFrostModule = async () => {
   return sparkFrostModule;
 };
 var HARDENED_OFFSET = 2147483648;
-var DefaultHDKeyGenerator = class {
-  async deriveHDKeysFromSeed(seed, accountNumber) {
+var DefaultSparkKeysGenerator = class {
+  async deriveKeysFromSeed(seed, accountNumber) {
     const hdkey = HDKey.fromMasterSeed(seed);
     if (!hdkey.privateKey || !hdkey.publicKey) {
       throw new ValidationError("Failed to derive keys from seed", {
@@ -779,27 +780,21 @@ var DefaultHDKeyGenerator = class {
       );
     }
     return {
-      masterKey: {
-        hdKey: hdkey,
-        privateKey: hdkey.privateKey,
-        publicKey: hdkey.publicKey
-      },
+      masterPublicKey: hdkey.publicKey,
       identityKey: {
-        hdKey: identityKey,
         privateKey: identityKey.privateKey,
         publicKey: identityKey.publicKey
       },
-      signingKey: {
+      signingHDKey: {
         hdKey: signingKey,
         privateKey: signingKey.privateKey,
         publicKey: signingKey.publicKey
       },
       depositKey: {
-        hdKey: depositKey,
         privateKey: depositKey.privateKey,
         publicKey: depositKey.publicKey
       },
-      staticDepositKey: {
+      staticDepositHDKey: {
         hdKey: staticDepositKey,
         privateKey: staticDepositKey.privateKey,
         publicKey: staticDepositKey.publicKey
@@ -808,7 +803,7 @@ var DefaultHDKeyGenerator = class {
   }
 };
 var DefaultSparkSigner = class {
-  masterKey = null;
+  masterPublicKey = null;
   identityKey = null;
   signingKey = null;
   depositKey = null;
@@ -817,14 +812,16 @@ var DefaultSparkSigner = class {
   // <hex, hex>
   publicKeyToPrivateKeyMap = /* @__PURE__ */ new Map();
   commitmentToNonceMap = /* @__PURE__ */ new Map();
-  hdKeyGenerator;
-  constructor({ hdKeyGenerator } = {}) {
-    this.hdKeyGenerator = hdKeyGenerator ?? new DefaultHDKeyGenerator();
+  keysGenerator;
+  constructor({
+    sparkKeysGenerator
+  } = {}) {
+    this.keysGenerator = sparkKeysGenerator ?? new DefaultSparkKeysGenerator();
   }
   deriveSigningKey(hash) {
-    if (!this.masterKey) {
+    if (!this.signingKey) {
       throw new ValidationError("Private key not initialized", {
-        field: "masterKey"
+        field: "signingKey"
       });
     }
     const view = new DataView(hash.buffer);
@@ -838,9 +835,9 @@ var DefaultSparkSigner = class {
     return newPrivateKey;
   }
   async restoreSigningKeysFromLeafs(leafs) {
-    if (!this.masterKey) {
-      throw new ValidationError("Master key is not set", {
-        field: "masterKey"
+    if (!this.signingKey) {
+      throw new ValidationError("Signing key is not set", {
+        field: "signingKey"
       });
     }
     for (const leaf of leafs) {
@@ -960,9 +957,9 @@ var DefaultSparkSigner = class {
     return Array.from(this.publicKeyToPrivateKeyMap.keys()).map(hexToBytes);
   }
   async generatePublicKey(hash) {
-    if (!this.masterKey) {
+    if (!this.signingKey) {
       throw new ValidationError("Private key is not set", {
-        field: "masterKey"
+        field: "signingKey"
       });
     }
     let newPrivateKey = null;
@@ -1098,10 +1095,16 @@ var DefaultSparkSigner = class {
     if (typeof seed === "string") {
       seed = hexToBytes(seed);
     }
-    const { masterKey, identityKey, signingKey, depositKey, staticDepositKey } = await this.hdKeyGenerator.deriveHDKeysFromSeed(seed, accountNumber ?? 0);
-    this.masterKey = masterKey.hdKey;
-    this.identityKey = identityKey.hdKey;
-    this.depositKey = depositKey.hdKey;
+    const {
+      masterPublicKey,
+      identityKey,
+      signingHDKey: signingKey,
+      depositKey,
+      staticDepositHDKey: staticDepositKey
+    } = await this.keysGenerator.deriveKeysFromSeed(seed, accountNumber ?? 0);
+    this.masterPublicKey = masterPublicKey;
+    this.identityKey = identityKey;
+    this.depositKey = depositKey;
     this.signingKey = signingKey.hdKey;
     this.staticDepositKey = staticDepositKey.hdKey;
     this.publicKeyToPrivateKeyMap.set(
@@ -1190,10 +1193,10 @@ var DefaultSparkSigner = class {
     };
   }
   async getMasterPublicKey() {
-    if (!this.masterKey?.publicKey) {
+    if (!this.masterPublicKey) {
       throw new Error("Private key is not set");
     }
-    return this.masterKey.publicKey;
+    return this.masterPublicKey;
   }
   async validateMessageWithIdentityKey(message, signature) {
     if (!this.identityKey?.publicKey) {
@@ -1319,16 +1322,17 @@ var ReactNativeSparkSigner = class extends DefaultSparkSigner {
 import { isNode as isNode4, mapCurrencyAmount } from "@lightsparkdev/core";
 import {
   bytesToHex as bytesToHex12,
-  bytesToNumberBE as bytesToNumberBE7,
+  bytesToNumberBE as bytesToNumberBE8,
   equalBytes as equalBytes5,
-  hexToBytes as hexToBytes13
+  hexToBytes as hexToBytes13,
+  numberToVarBytesBE
 } from "@noble/curves/abstract/utils";
 import { secp256k1 as secp256k115 } from "@noble/curves/secp256k1";
 import { validateMnemonic } from "@scure/bip39";
 import { wordlist as wordlist2 } from "@scure/bip39/wordlists/english";
 import { Address as Address6, OutScript as OutScript5, Transaction as Transaction9 } from "@scure/btc-signer";
 import { Mutex } from "async-mutex";
-import { uuidv7 as uuidv74 } from "uuidv7";
+import { uuidv7 as uuidv75, uuidv7obj } from "uuidv7";
 
 // src/graphql/client.ts
 import {
@@ -1516,9 +1520,10 @@ var SparkTransferToLeavesConnectionFromJson = (obj) => {
 
 // src/graphql/objects/Transfer.ts
 var Transfer = class {
-  constructor(totalAmount, sparkId) {
+  constructor(totalAmount, sparkId, userRequestId) {
     this.totalAmount = totalAmount;
     this.sparkId = sparkId;
+    this.userRequestId = userRequestId;
     autoBind(this);
   }
   async getLeaves(client, first = void 0, after = void 0) {
@@ -1564,16 +1569,34 @@ query FetchSparkTransferToLeavesConnection($entity_id: ID!, $first: Int, $after:
   toJson() {
     return {
       transfer_total_amount: CurrencyAmountToJson(this.totalAmount),
-      transfer_spark_id: this.sparkId
+      transfer_spark_id: this.sparkId,
+      transfer_user_request: { id: this.userRequestId }
     };
   }
 };
 var TransferFromJson = (obj) => {
   return new Transfer(
     CurrencyAmountFromJson(obj["transfer_total_amount"]),
-    obj["transfer_spark_id"]
+    obj["transfer_spark_id"],
+    obj["transfer_user_request"]?.id ?? void 0
   );
 };
+var FRAGMENT2 = `
+fragment TransferFragment on Transfer {
+    __typename
+    transfer_total_amount: total_amount {
+        __typename
+        currency_amount_original_value: original_value
+        currency_amount_original_unit: original_unit
+        currency_amount_preferred_currency_unit: preferred_currency_unit
+        currency_amount_preferred_currency_value_rounded: preferred_currency_value_rounded
+        currency_amount_preferred_currency_value_approx: preferred_currency_value_approx
+    }
+    transfer_spark_id: spark_id
+    transfer_user_request: user_request {
+        id
+    }
+}`;
 
 // src/graphql/objects/CoopExitRequest.ts
 var CoopExitRequestFromJson = (obj) => {
@@ -1595,7 +1618,7 @@ var CoopExitRequestFromJson = (obj) => {
     transfer: !!obj["coop_exit_request_transfer"] ? TransferFromJson(obj["coop_exit_request_transfer"]) : void 0
   };
 };
-var FRAGMENT2 = `
+var FRAGMENT3 = `
 fragment CoopExitRequestFragment on CoopExitRequest {
     __typename
     coop_exit_request_id: id
@@ -1653,7 +1676,7 @@ var CompleteCoopExit = `
     }
   }
     
-  ${FRAGMENT2}
+  ${FRAGMENT3}
 `;
 
 // src/graphql/objects/LeavesSwapRequest.ts
@@ -1709,7 +1732,7 @@ var LeavesSwapRequestFromJson = (obj) => {
     expiresAt: obj["leaves_swap_request_expires_at"]
   };
 };
-var FRAGMENT3 = `
+var FRAGMENT4 = `
 fragment LeavesSwapRequestFragment on LeavesSwapRequest {
     __typename
     leaves_swap_request_id: id
@@ -1788,7 +1811,7 @@ var CompleteLeavesSwap = `
     }
   }
 
-  ${FRAGMENT3}
+  ${FRAGMENT4}
 `;
 
 // src/graphql/objects/GetChallengeOutput.ts
@@ -1797,7 +1820,7 @@ var GetChallengeOutputFromJson = (obj) => {
     protectedChallenge: obj["get_challenge_output_protected_challenge"]
   };
 };
-var FRAGMENT4 = `
+var FRAGMENT5 = `
 fragment GetChallengeOutputFragment on GetChallengeOutput {
     __typename
     get_challenge_output_protected_challenge: protected_challenge
@@ -1815,7 +1838,7 @@ var GetChallenge = `
     }
   }
     
-    ${FRAGMENT4}
+    ${FRAGMENT5}
 `;
 
 // src/graphql/mutations/RequestCoopExit.ts
@@ -1839,7 +1862,7 @@ var RequestCoopExit = `
       }
     }
   }
-  ${FRAGMENT2}
+  ${FRAGMENT3}
 `;
 
 // src/graphql/objects/LightningReceiveRequest.ts
@@ -1889,7 +1912,7 @@ var LightningReceiveRequestFromJson = (obj) => {
     paymentPreimage: obj["lightning_receive_request_payment_preimage"]
   };
 };
-var FRAGMENT5 = `
+var FRAGMENT6 = `
 fragment LightningReceiveRequestFragment on LightningReceiveRequest {
     __typename
     lightning_receive_request_id: id
@@ -1958,7 +1981,7 @@ var RequestLightningReceive = `
       }
     }
   }
-  ${FRAGMENT5}
+  ${FRAGMENT6}
 `;
 
 // src/graphql/objects/LightningSendRequest.ts
@@ -1994,7 +2017,7 @@ var LightningSendRequestFromJson = (obj) => {
     paymentPreimage: obj["lightning_send_request_payment_preimage"]
   };
 };
-var FRAGMENT6 = `
+var FRAGMENT7 = `
 fragment LightningSendRequestFragment on LightningSendRequest {
     __typename
     lightning_send_request_id: id
@@ -2042,7 +2065,7 @@ var RequestLightningSend = `
       }
     }
   }
-  ${FRAGMENT6}
+  ${FRAGMENT7}
 `;
 
 // src/graphql/mutations/RequestSwapLeaves.ts
@@ -2068,7 +2091,7 @@ var RequestSwapLeaves = `
       }
     }
   }
-  ${FRAGMENT3}
+  ${FRAGMENT4}
 `;
 
 // src/graphql/objects/VerifyChallengeOutput.ts
@@ -2078,7 +2101,7 @@ var VerifyChallengeOutputFromJson = (obj) => {
     sessionToken: obj["verify_challenge_output_session_token"]
   };
 };
-var FRAGMENT7 = `
+var FRAGMENT8 = `
 fragment VerifyChallengeOutputFragment on VerifyChallengeOutput {
     __typename
     verify_challenge_output_valid_until: valid_until
@@ -2103,7 +2126,7 @@ var VerifyChallenge = `
     }
   }
     
-    ${FRAGMENT7}
+    ${FRAGMENT8}
 `;
 
 // src/graphql/objects/ClaimStaticDepositRequestType.ts
@@ -2131,7 +2154,7 @@ var CoopExitFeeEstimatesOutputFromJson = (obj) => {
     speedSlow: !!obj["coop_exit_fee_estimates_output_speed_slow"] ? CoopExitFeeEstimateFromJson(obj["coop_exit_fee_estimates_output_speed_slow"]) : void 0
   };
 };
-var FRAGMENT8 = `
+var FRAGMENT9 = `
 fragment CoopExitFeeEstimatesOutputFragment on CoopExitFeeEstimatesOutput {
     __typename
     coop_exit_fee_estimates_output_speed_fast: speed_fast {
@@ -2199,7 +2222,7 @@ var LeavesSwapFeeEstimateOutputFromJson = (obj) => {
     feeEstimate: CurrencyAmountFromJson(obj["leaves_swap_fee_estimate_output_fee_estimate"])
   };
 };
-var FRAGMENT9 = `
+var FRAGMENT10 = `
 fragment LeavesSwapFeeEstimateOutputFragment on LeavesSwapFeeEstimateOutput {
     __typename
     leaves_swap_fee_estimate_output_fee_estimate: fee_estimate {
@@ -2218,7 +2241,7 @@ var LightningSendFeeEstimateOutputFromJson = (obj) => {
     feeEstimate: CurrencyAmountFromJson(obj["lightning_send_fee_estimate_output_fee_estimate"])
   };
 };
-var FRAGMENT10 = `
+var FRAGMENT11 = `
 fragment LightningSendFeeEstimateOutputFragment on LightningSendFeeEstimateOutput {
     __typename
     lightning_send_fee_estimate_output_fee_estimate: fee_estimate {
@@ -2241,7 +2264,7 @@ var StaticDepositQuoteOutputFromJson = (obj) => {
     signature: obj["static_deposit_quote_output_signature"]
   };
 };
-var FRAGMENT11 = `
+var FRAGMENT12 = `
 fragment StaticDepositQuoteOutputFragment on StaticDepositQuoteOutput {
     __typename
     static_deposit_quote_output_transaction_id: transaction_id
@@ -2266,7 +2289,7 @@ var CoopExitFeeEstimate2 = `
       ...CoopExitFeeEstimatesOutputFragment
     }
   }
-  ${FRAGMENT8}
+  ${FRAGMENT9}
 `;
 
 // src/graphql/queries/GetClaimDepositQuote.ts
@@ -2286,7 +2309,7 @@ var GetClaimDepositQuote = `
       ...StaticDepositQuoteOutputFragment
     }
   }
-  ${FRAGMENT11}
+  ${FRAGMENT12}
 `;
 
 // src/graphql/queries/LeavesSwapFeeEstimate.ts
@@ -2302,7 +2325,7 @@ var LeavesSwapFeeEstimate = `
       ...LeavesSwapFeeEstimateOutputFragment
     }
   }
-  ${FRAGMENT9}
+  ${FRAGMENT10}
 `;
 
 // src/graphql/queries/LightningSendFeeEstimate.ts
@@ -2318,12 +2341,22 @@ var LightningSendFeeEstimate = `
       ...LightningSendFeeEstimateOutputFragment
     }
   }
-  ${FRAGMENT10}
+  ${FRAGMENT11}
+`;
+
+// src/graphql/queries/Transfer.ts
+var GetTransfer = `
+  query Transfer($transfer_spark_id: UUID!) {
+    transfer(transfer_spark_id: $transfer_spark_id) {
+      ...TransferFragment
+    }
+  }
+  ${FRAGMENT2}
 `;
 
 // src/graphql/objects/UserRequest.ts
 import { LightsparkException, isObject as isObject5 } from "@lightsparkdev/core";
-var FRAGMENT12 = `
+var FRAGMENT13 = `
 fragment UserRequestFragment on UserRequest {
     __typename
     ... on ClaimStaticDeposit {
@@ -2535,7 +2568,7 @@ var UserRequest2 = `
       ...UserRequestFragment
     }
   }
-  ${FRAGMENT12}
+  ${FRAGMENT13}
 `;
 
 // src/graphql/client.ts
@@ -2861,6 +2894,17 @@ var SspClient = class {
       }
     });
   }
+  async getTransfer(id) {
+    return await this.executeRawQuery({
+      queryPayload: GetTransfer,
+      variables: {
+        transfer_spark_id: id
+      },
+      constructObject: (response) => {
+        return TransferFromJson(response.transfer);
+      }
+    });
+  }
   async getChallenge() {
     return await this.executeRawQuery(
       {
@@ -3232,14 +3276,14 @@ function isSet2(value) {
 }
 
 // src/proto/spark.ts
-var Network = /* @__PURE__ */ ((Network5) => {
-  Network5[Network5["UNSPECIFIED"] = 0] = "UNSPECIFIED";
-  Network5[Network5["MAINNET"] = 1] = "MAINNET";
-  Network5[Network5["REGTEST"] = 2] = "REGTEST";
-  Network5[Network5["TESTNET"] = 3] = "TESTNET";
-  Network5[Network5["SIGNET"] = 4] = "SIGNET";
-  Network5[Network5["UNRECOGNIZED"] = -1] = "UNRECOGNIZED";
-  return Network5;
+var Network = /* @__PURE__ */ ((Network6) => {
+  Network6[Network6["UNSPECIFIED"] = 0] = "UNSPECIFIED";
+  Network6[Network6["MAINNET"] = 1] = "MAINNET";
+  Network6[Network6["REGTEST"] = 2] = "REGTEST";
+  Network6[Network6["TESTNET"] = 3] = "TESTNET";
+  Network6[Network6["SIGNET"] = 4] = "SIGNET";
+  Network6[Network6["UNRECOGNIZED"] = -1] = "UNRECOGNIZED";
+  return Network6;
 })(Network || {});
 function networkFromJSON(object) {
   switch (object) {
@@ -3289,6 +3333,9 @@ function tokenTransactionStatusFromJSON(object) {
     case 1:
     case "TOKEN_TRANSACTION_SIGNED":
       return 1 /* TOKEN_TRANSACTION_SIGNED */;
+    case 5:
+    case "TOKEN_TRANSACTION_REVEALED":
+      return 5 /* TOKEN_TRANSACTION_REVEALED */;
     case 2:
     case "TOKEN_TRANSACTION_FINALIZED":
       return 2 /* TOKEN_TRANSACTION_FINALIZED */;
@@ -3313,6 +3360,8 @@ function tokenTransactionStatusToJSON(object) {
       return "TOKEN_TRANSACTION_STARTED";
     case 1 /* TOKEN_TRANSACTION_SIGNED */:
       return "TOKEN_TRANSACTION_SIGNED";
+    case 5 /* TOKEN_TRANSACTION_REVEALED */:
+      return "TOKEN_TRANSACTION_REVEALED";
     case 2 /* TOKEN_TRANSACTION_FINALIZED */:
       return "TOKEN_TRANSACTION_FINALIZED";
     case 3 /* TOKEN_TRANSACTION_STARTED_CANCELLED */:
@@ -8013,59 +8062,6 @@ var SecretShare = {
     return message;
   }
 };
-function createBaseSecretProof() {
-  return { proofs: [] };
-}
-var SecretProof = {
-  encode(message, writer = new BinaryWriter4()) {
-    for (const v of message.proofs) {
-      writer.uint32(10).bytes(v);
-    }
-    return writer;
-  },
-  decode(input, length) {
-    const reader = input instanceof BinaryReader4 ? input : new BinaryReader4(input);
-    let end = length === void 0 ? reader.len : reader.pos + length;
-    const message = createBaseSecretProof();
-    while (reader.pos < end) {
-      const tag = reader.uint32();
-      switch (tag >>> 3) {
-        case 1: {
-          if (tag !== 10) {
-            break;
-          }
-          message.proofs.push(reader.bytes());
-          continue;
-        }
-      }
-      if ((tag & 7) === 4 || tag === 0) {
-        break;
-      }
-      reader.skip(tag & 7);
-    }
-    return message;
-  },
-  fromJSON(object) {
-    return {
-      proofs: globalThis.Array.isArray(object?.proofs) ? object.proofs.map((e) => bytesFromBase642(e)) : []
-    };
-  },
-  toJSON(message) {
-    const obj = {};
-    if (message.proofs?.length) {
-      obj.proofs = message.proofs.map((e) => base64FromBytes2(e));
-    }
-    return obj;
-  },
-  create(base) {
-    return SecretProof.fromPartial(base ?? {});
-  },
-  fromPartial(object) {
-    const message = createBaseSecretProof();
-    message.proofs = object.proofs?.map((e) => e) || [];
-    return message;
-  }
-};
 function createBaseLeafRefundTxSigningJob() {
   return { leafId: "", refundTxSigningJob: void 0 };
 }
@@ -8478,7 +8474,6 @@ function createBaseStartTransferRequest() {
     leavesToSend: [],
     receiverIdentityPublicKey: new Uint8Array(0),
     expiryTime: void 0,
-    keyTweakProofs: {},
     transferPackage: void 0
   };
 }
@@ -8499,9 +8494,6 @@ var StartTransferRequest = {
     if (message.expiryTime !== void 0) {
       Timestamp.encode(toTimestamp(message.expiryTime), writer.uint32(42).fork()).join();
     }
-    Object.entries(message.keyTweakProofs).forEach(([key, value]) => {
-      StartTransferRequest_KeyTweakProofsEntry.encode({ key, value }, writer.uint32(50).fork()).join();
-    });
     if (message.transferPackage !== void 0) {
       TransferPackage.encode(message.transferPackage, writer.uint32(58).fork()).join();
     }
@@ -8549,16 +8541,6 @@ var StartTransferRequest = {
           message.expiryTime = fromTimestamp(Timestamp.decode(reader, reader.uint32()));
           continue;
         }
-        case 6: {
-          if (tag !== 50) {
-            break;
-          }
-          const entry6 = StartTransferRequest_KeyTweakProofsEntry.decode(reader, reader.uint32());
-          if (entry6.value !== void 0) {
-            message.keyTweakProofs[entry6.key] = entry6.value;
-          }
-          continue;
-        }
         case 7: {
           if (tag !== 58) {
             break;
@@ -8581,10 +8563,6 @@ var StartTransferRequest = {
       leavesToSend: globalThis.Array.isArray(object?.leavesToSend) ? object.leavesToSend.map((e) => LeafRefundTxSigningJob.fromJSON(e)) : [],
       receiverIdentityPublicKey: isSet3(object.receiverIdentityPublicKey) ? bytesFromBase642(object.receiverIdentityPublicKey) : new Uint8Array(0),
       expiryTime: isSet3(object.expiryTime) ? fromJsonTimestamp(object.expiryTime) : void 0,
-      keyTweakProofs: isObject8(object.keyTweakProofs) ? Object.entries(object.keyTweakProofs).reduce((acc, [key, value]) => {
-        acc[key] = SecretProof.fromJSON(value);
-        return acc;
-      }, {}) : {},
       transferPackage: isSet3(object.transferPackage) ? TransferPackage.fromJSON(object.transferPackage) : void 0
     };
   },
@@ -8605,15 +8583,6 @@ var StartTransferRequest = {
     if (message.expiryTime !== void 0) {
       obj.expiryTime = message.expiryTime.toISOString();
     }
-    if (message.keyTweakProofs) {
-      const entries = Object.entries(message.keyTweakProofs);
-      if (entries.length > 0) {
-        obj.keyTweakProofs = {};
-        entries.forEach(([k, v]) => {
-          obj.keyTweakProofs[k] = SecretProof.toJSON(v);
-        });
-      }
-    }
     if (message.transferPackage !== void 0) {
       obj.transferPackage = TransferPackage.toJSON(message.transferPackage);
     }
@@ -8629,87 +8598,10 @@ var StartTransferRequest = {
     message.leavesToSend = object.leavesToSend?.map((e) => LeafRefundTxSigningJob.fromPartial(e)) || [];
     message.receiverIdentityPublicKey = object.receiverIdentityPublicKey ?? new Uint8Array(0);
     message.expiryTime = object.expiryTime ?? void 0;
-    message.keyTweakProofs = Object.entries(object.keyTweakProofs ?? {}).reduce(
-      (acc, [key, value]) => {
-        if (value !== void 0) {
-          acc[key] = SecretProof.fromPartial(value);
-        }
-        return acc;
-      },
-      {}
-    );
     message.transferPackage = object.transferPackage !== void 0 && object.transferPackage !== null ? TransferPackage.fromPartial(object.transferPackage) : void 0;
     return message;
   }
 };
-function createBaseStartTransferRequest_KeyTweakProofsEntry() {
-  return { key: "", value: void 0 };
-}
-var StartTransferRequest_KeyTweakProofsEntry = {
-  encode(message, writer = new BinaryWriter4()) {
-    if (message.key !== "") {
-      writer.uint32(10).string(message.key);
-    }
-    if (message.value !== void 0) {
-      SecretProof.encode(message.value, writer.uint32(18).fork()).join();
-    }
-    return writer;
-  },
-  decode(input, length) {
-    const reader = input instanceof BinaryReader4 ? input : new BinaryReader4(input);
-    let end = length === void 0 ? reader.len : reader.pos + length;
-    const message = createBaseStartTransferRequest_KeyTweakProofsEntry();
-    while (reader.pos < end) {
-      const tag = reader.uint32();
-      switch (tag >>> 3) {
-        case 1: {
-          if (tag !== 10) {
-            break;
-          }
-          message.key = reader.string();
-          continue;
-        }
-        case 2: {
-          if (tag !== 18) {
-            break;
-          }
-          message.value = SecretProof.decode(reader, reader.uint32());
-          continue;
-        }
-      }
-      if ((tag & 7) === 4 || tag === 0) {
-        break;
-      }
-      reader.skip(tag & 7);
-    }
-    return message;
-  },
-  fromJSON(object) {
-    return {
-      key: isSet3(object.key) ? globalThis.String(object.key) : "",
-      value: isSet3(object.value) ? SecretProof.fromJSON(object.value) : void 0
-    };
-  },
-  toJSON(message) {
-    const obj = {};
-    if (message.key !== "") {
-      obj.key = message.key;
-    }
-    if (message.value !== void 0) {
-      obj.value = SecretProof.toJSON(message.value);
-    }
-    return obj;
-  },
-  create(base) {
-    return StartTransferRequest_KeyTweakProofsEntry.fromPartial(base ?? {});
-  },
-  fromPartial(object) {
-    const message = createBaseStartTransferRequest_KeyTweakProofsEntry();
-    message.key = object.key ?? "";
-    message.value = object.value !== void 0 && object.value !== null ? SecretProof.fromPartial(object.value) : void 0;
-    return message;
-  }
-};
 function createBaseStartTransferResponse() {
   return { transfer: void 0, signingResults: [] };
 }
@@ -9309,12 +9201,7 @@ var FinalizeTransferRequest = {
   }
 };
 function createBaseFinalizeTransferWithTransferPackageRequest() {
-  return {
-    transferId: "",
-    ownerIdentityPublicKey: new Uint8Array(0),
-    transferPackage: void 0,
-    refundSignatures: {}
-  };
+  return { transferId: "", ownerIdentityPublicKey: new Uint8Array(0), transferPackage: void 0 };
 }
 var FinalizeTransferWithTransferPackageRequest = {
   encode(message, writer = new BinaryWriter4()) {
@@ -9327,12 +9214,6 @@ var FinalizeTransferWithTransferPackageRequest = {
     if (message.transferPackage !== void 0) {
       TransferPackage.encode(message.transferPackage, writer.uint32(26).fork()).join();
     }
-    Object.entries(message.refundSignatures).forEach(([key, value]) => {
-      FinalizeTransferWithTransferPackageRequest_RefundSignaturesEntry.encode(
-        { key, value },
-        writer.uint32(34).fork()
-      ).join();
-    });
     return writer;
   },
   decode(input, length) {
@@ -9363,19 +9244,6 @@ var FinalizeTransferWithTransferPackageRequest = {
           message.transferPackage = TransferPackage.decode(reader, reader.uint32());
           continue;
         }
-        case 4: {
-          if (tag !== 34) {
-            break;
-          }
-          const entry4 = FinalizeTransferWithTransferPackageRequest_RefundSignaturesEntry.decode(
-            reader,
-            reader.uint32()
-          );
-          if (entry4.value !== void 0) {
-            message.refundSignatures[entry4.key] = entry4.value;
-          }
-          continue;
-        }
       }
       if ((tag & 7) === 4 || tag === 0) {
         break;
@@ -9388,11 +9256,7 @@ var FinalizeTransferWithTransferPackageRequest = {
     return {
       transferId: isSet3(object.transferId) ? globalThis.String(object.transferId) : "",
       ownerIdentityPublicKey: isSet3(object.ownerIdentityPublicKey) ? bytesFromBase642(object.ownerIdentityPublicKey) : new Uint8Array(0),
-      transferPackage: isSet3(object.transferPackage) ? TransferPackage.fromJSON(object.transferPackage) : void 0,
-      refundSignatures: isObject8(object.refundSignatures) ? Object.entries(object.refundSignatures).reduce((acc, [key, value]) => {
-        acc[key] = bytesFromBase642(value);
-        return acc;
-      }, {}) : {}
+      transferPackage: isSet3(object.transferPackage) ? TransferPackage.fromJSON(object.transferPackage) : void 0
     };
   },
   toJSON(message) {
@@ -9406,15 +9270,6 @@ var FinalizeTransferWithTransferPackageRequest = {
     if (message.transferPackage !== void 0) {
       obj.transferPackage = TransferPackage.toJSON(message.transferPackage);
     }
-    if (message.refundSignatures) {
-      const entries = Object.entries(message.refundSignatures);
-      if (entries.length > 0) {
-        obj.refundSignatures = {};
-        entries.forEach(([k, v]) => {
-          obj.refundSignatures[k] = base64FromBytes2(v);
-        });
-      }
-    }
     return obj;
   },
   create(base) {
@@ -9425,35 +9280,23 @@ var FinalizeTransferWithTransferPackageRequest = {
     message.transferId = object.transferId ?? "";
     message.ownerIdentityPublicKey = object.ownerIdentityPublicKey ?? new Uint8Array(0);
     message.transferPackage = object.transferPackage !== void 0 && object.transferPackage !== null ? TransferPackage.fromPartial(object.transferPackage) : void 0;
-    message.refundSignatures = Object.entries(object.refundSignatures ?? {}).reduce(
-      (acc, [key, value]) => {
-        if (value !== void 0) {
-          acc[key] = value;
-        }
-        return acc;
-      },
-      {}
-    );
     return message;
   }
 };
-function createBaseFinalizeTransferWithTransferPackageRequest_RefundSignaturesEntry() {
-  return { key: "", value: new Uint8Array(0) };
+function createBaseFinalizeTransferResponse() {
+  return { transfer: void 0 };
 }
-var FinalizeTransferWithTransferPackageRequest_RefundSignaturesEntry = {
+var FinalizeTransferResponse = {
   encode(message, writer = new BinaryWriter4()) {
-    if (message.key !== "") {
-      writer.uint32(10).string(message.key);
-    }
-    if (message.value.length !== 0) {
-      writer.uint32(18).bytes(message.value);
+    if (message.transfer !== void 0) {
+      Transfer6.encode(message.transfer, writer.uint32(10).fork()).join();
     }
     return writer;
   },
   decode(input, length) {
     const reader = input instanceof BinaryReader4 ? input : new BinaryReader4(input);
     let end = length === void 0 ? reader.len : reader.pos + length;
-    const message = createBaseFinalizeTransferWithTransferPackageRequest_RefundSignaturesEntry();
+    const message = createBaseFinalizeTransferResponse();
     while (reader.pos < end) {
       const tag = reader.uint32();
       switch (tag >>> 3) {
@@ -9461,14 +9304,7 @@ var FinalizeTransferWithTransferPackageRequest_RefundSignaturesEntry = {
           if (tag !== 10) {
             break;
           }
-          message.key = reader.string();
-          continue;
-        }
-        case 2: {
-          if (tag !== 18) {
-            break;
-          }
-          message.value = reader.bytes();
+          message.transfer = Transfer6.decode(reader, reader.uint32());
           continue;
         }
       }
@@ -9480,70 +9316,12 @@ var FinalizeTransferWithTransferPackageRequest_RefundSignaturesEntry = {
     return message;
   },
   fromJSON(object) {
-    return {
-      key: isSet3(object.key) ? globalThis.String(object.key) : "",
-      value: isSet3(object.value) ? bytesFromBase642(object.value) : new Uint8Array(0)
-    };
+    return { transfer: isSet3(object.transfer) ? Transfer6.fromJSON(object.transfer) : void 0 };
   },
   toJSON(message) {
     const obj = {};
-    if (message.key !== "") {
-      obj.key = message.key;
-    }
-    if (message.value.length !== 0) {
-      obj.value = base64FromBytes2(message.value);
-    }
-    return obj;
-  },
-  create(base) {
-    return FinalizeTransferWithTransferPackageRequest_RefundSignaturesEntry.fromPartial(base ?? {});
-  },
-  fromPartial(object) {
-    const message = createBaseFinalizeTransferWithTransferPackageRequest_RefundSignaturesEntry();
-    message.key = object.key ?? "";
-    message.value = object.value ?? new Uint8Array(0);
-    return message;
-  }
-};
-function createBaseFinalizeTransferResponse() {
-  return { transfer: void 0 };
-}
-var FinalizeTransferResponse = {
-  encode(message, writer = new BinaryWriter4()) {
-    if (message.transfer !== void 0) {
-      Transfer6.encode(message.transfer, writer.uint32(10).fork()).join();
-    }
-    return writer;
-  },
-  decode(input, length) {
-    const reader = input instanceof BinaryReader4 ? input : new BinaryReader4(input);
-    let end = length === void 0 ? reader.len : reader.pos + length;
-    const message = createBaseFinalizeTransferResponse();
-    while (reader.pos < end) {
-      const tag = reader.uint32();
-      switch (tag >>> 3) {
-        case 1: {
-          if (tag !== 10) {
-            break;
-          }
-          message.transfer = Transfer6.decode(reader, reader.uint32());
-          continue;
-        }
-      }
-      if ((tag & 7) === 4 || tag === 0) {
-        break;
-      }
-      reader.skip(tag & 7);
-    }
-    return message;
-  },
-  fromJSON(object) {
-    return { transfer: isSet3(object.transfer) ? Transfer6.fromJSON(object.transfer) : void 0 };
-  },
-  toJSON(message) {
-    const obj = {};
-    if (message.transfer !== void 0) {
-      obj.transfer = Transfer6.toJSON(message.transfer);
+    if (message.transfer !== void 0) {
+      obj.transfer = Transfer6.toJSON(message.transfer);
     }
     return obj;
   },
@@ -14701,13 +14479,16 @@ var QueryBalanceResponse_NodeBalancesEntry = {
   }
 };
 function createBaseSparkAddress() {
-  return { identityPublicKey: new Uint8Array(0) };
+  return { identityPublicKey: new Uint8Array(0), paymentIntentFields: void 0 };
 }
 var SparkAddress = {
   encode(message, writer = new BinaryWriter4()) {
     if (message.identityPublicKey.length !== 0) {
       writer.uint32(10).bytes(message.identityPublicKey);
     }
+    if (message.paymentIntentFields !== void 0) {
+      PaymentIntentFields.encode(message.paymentIntentFields, writer.uint32(18).fork()).join();
+    }
     return writer;
   },
   decode(input, length) {
@@ -14724,6 +14505,13 @@ var SparkAddress = {
           message.identityPublicKey = reader.bytes();
           continue;
         }
+        case 2: {
+          if (tag !== 18) {
+            break;
+          }
+          message.paymentIntentFields = PaymentIntentFields.decode(reader, reader.uint32());
+          continue;
+        }
       }
       if ((tag & 7) === 4 || tag === 0) {
         break;
@@ -14734,7 +14522,8 @@ var SparkAddress = {
   },
   fromJSON(object) {
     return {
-      identityPublicKey: isSet3(object.identityPublicKey) ? bytesFromBase642(object.identityPublicKey) : new Uint8Array(0)
+      identityPublicKey: isSet3(object.identityPublicKey) ? bytesFromBase642(object.identityPublicKey) : new Uint8Array(0),
+      paymentIntentFields: isSet3(object.paymentIntentFields) ? PaymentIntentFields.fromJSON(object.paymentIntentFields) : void 0
     };
   },
   toJSON(message) {
@@ -14742,6 +14531,9 @@ var SparkAddress = {
     if (message.identityPublicKey.length !== 0) {
       obj.identityPublicKey = base64FromBytes2(message.identityPublicKey);
     }
+    if (message.paymentIntentFields !== void 0) {
+      obj.paymentIntentFields = PaymentIntentFields.toJSON(message.paymentIntentFields);
+    }
     return obj;
   },
   create(base) {
@@ -14750,6 +14542,105 @@ var SparkAddress = {
   fromPartial(object) {
     const message = createBaseSparkAddress();
     message.identityPublicKey = object.identityPublicKey ?? new Uint8Array(0);
+    message.paymentIntentFields = object.paymentIntentFields !== void 0 && object.paymentIntentFields !== null ? PaymentIntentFields.fromPartial(object.paymentIntentFields) : void 0;
+    return message;
+  }
+};
+function createBasePaymentIntentFields() {
+  return { id: new Uint8Array(0), assetIdentifier: void 0, assetAmount: new Uint8Array(0), memo: void 0 };
+}
+var PaymentIntentFields = {
+  encode(message, writer = new BinaryWriter4()) {
+    if (message.id.length !== 0) {
+      writer.uint32(10).bytes(message.id);
+    }
+    if (message.assetIdentifier !== void 0) {
+      writer.uint32(18).bytes(message.assetIdentifier);
+    }
+    if (message.assetAmount.length !== 0) {
+      writer.uint32(26).bytes(message.assetAmount);
+    }
+    if (message.memo !== void 0) {
+      writer.uint32(34).string(message.memo);
+    }
+    return writer;
+  },
+  decode(input, length) {
+    const reader = input instanceof BinaryReader4 ? input : new BinaryReader4(input);
+    let end = length === void 0 ? reader.len : reader.pos + length;
+    const message = createBasePaymentIntentFields();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+        case 1: {
+          if (tag !== 10) {
+            break;
+          }
+          message.id = reader.bytes();
+          continue;
+        }
+        case 2: {
+          if (tag !== 18) {
+            break;
+          }
+          message.assetIdentifier = reader.bytes();
+          continue;
+        }
+        case 3: {
+          if (tag !== 26) {
+            break;
+          }
+          message.assetAmount = reader.bytes();
+          continue;
+        }
+        case 4: {
+          if (tag !== 34) {
+            break;
+          }
+          message.memo = reader.string();
+          continue;
+        }
+      }
+      if ((tag & 7) === 4 || tag === 0) {
+        break;
+      }
+      reader.skip(tag & 7);
+    }
+    return message;
+  },
+  fromJSON(object) {
+    return {
+      id: isSet3(object.id) ? bytesFromBase642(object.id) : new Uint8Array(0),
+      assetIdentifier: isSet3(object.assetIdentifier) ? bytesFromBase642(object.assetIdentifier) : void 0,
+      assetAmount: isSet3(object.assetAmount) ? bytesFromBase642(object.assetAmount) : new Uint8Array(0),
+      memo: isSet3(object.memo) ? globalThis.String(object.memo) : void 0
+    };
+  },
+  toJSON(message) {
+    const obj = {};
+    if (message.id.length !== 0) {
+      obj.id = base64FromBytes2(message.id);
+    }
+    if (message.assetIdentifier !== void 0) {
+      obj.assetIdentifier = base64FromBytes2(message.assetIdentifier);
+    }
+    if (message.assetAmount.length !== 0) {
+      obj.assetAmount = base64FromBytes2(message.assetAmount);
+    }
+    if (message.memo !== void 0) {
+      obj.memo = message.memo;
+    }
+    return obj;
+  },
+  create(base) {
+    return PaymentIntentFields.fromPartial(base ?? {});
+  },
+  fromPartial(object) {
+    const message = createBasePaymentIntentFields();
+    message.id = object.id ?? new Uint8Array(0);
+    message.assetIdentifier = object.assetIdentifier ?? void 0;
+    message.assetAmount = object.assetAmount ?? new Uint8Array(0);
+    message.memo = object.memo ?? void 0;
     return message;
   }
 };
@@ -16277,13 +16168,13 @@ function isSet3(value) {
 import { NetworkType as Lrc20NetworkType } from "@buildonspark/lrc20-sdk";
 import * as btc from "@scure/btc-signer";
 import * as bitcoin from "bitcoinjs-lib";
-var Network2 = /* @__PURE__ */ ((Network5) => {
-  Network5[Network5["MAINNET"] = 0] = "MAINNET";
-  Network5[Network5["TESTNET"] = 1] = "TESTNET";
-  Network5[Network5["SIGNET"] = 2] = "SIGNET";
-  Network5[Network5["REGTEST"] = 3] = "REGTEST";
-  Network5[Network5["LOCAL"] = 4] = "LOCAL";
-  return Network5;
+var Network2 = /* @__PURE__ */ ((Network6) => {
+  Network6[Network6["MAINNET"] = 0] = "MAINNET";
+  Network6[Network6["TESTNET"] = 1] = "TESTNET";
+  Network6[Network6["SIGNET"] = 2] = "SIGNET";
+  Network6[Network6["REGTEST"] = 3] = "REGTEST";
+  Network6[Network6["LOCAL"] = 4] = "LOCAL";
+  return Network6;
 })(Network2 || {});
 var NetworkToProto = {
   [0 /* MAINNET */]: 1 /* MAINNET */,
@@ -16475,6 +16366,7 @@ var BASE_CONFIG = {
   threshold: 2,
   signingOperators: getLocalSigningOperators(),
   tokenSignatures: "SCHNORR",
+  tokenTransactionVersion: "V0",
   electrsUrl: getElectrsUrl("LOCAL"),
   expectedWithdrawBondSats: 1e4,
   expectedWithdrawRelativeBlockLocktime: 1e3,
@@ -16682,6 +16574,9 @@ var WalletConfigService = class {
   getTokenSignatures() {
     return this.config.tokenSignatures;
   }
+  getTokenTransactionVersion() {
+    return this.config.tokenTransactionVersion;
+  }
   getElectrsUrl() {
     return this.config.electrsUrl;
   }
@@ -17456,108 +17351,1159 @@ function isSet5(value) {
   return value !== null && value !== void 0;
 }
 
-// src/services/connection.ts
-var ConnectionManager = class {
-  config;
-  clients = /* @__PURE__ */ new Map();
-  // We are going to .unref() the underlying channels for stream clients
-  // to prevent the stream from keeping the process alive
-  // Using a different map to avoid unforeseen problems with unary calls
-  streamClients = /* @__PURE__ */ new Map();
-  constructor(config) {
-    this.config = config;
-  }
-  // When initializing wallet, go ahead and instantiate all clients
-  async createClients() {
-    await Promise.all(
-      Object.values(this.config.getSigningOperators()).map((operator) => {
-        this.createSparkClient(operator.address);
-      })
-    );
-  }
-  async closeConnections() {
-    await Promise.all(
-      Array.from(this.clients.values()).map(
-        (client) => client.client.close?.()
-      )
-    );
-    this.clients.clear();
-  }
-  async createMockClient(address2) {
-    const channel = await this.createChannelWithTLS(address2);
-    const isNodeChannel = "close" in channel;
-    if (isNode2 && 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");
+// src/proto/spark_token.ts
+import { BinaryReader as BinaryReader7, BinaryWriter as BinaryWriter7 } from "@bufbuild/protobuf/wire";
+function createBaseTokenOutputToSpend2() {
+  return { prevTokenTransactionHash: new Uint8Array(0), prevTokenTransactionVout: 0 };
+}
+var TokenOutputToSpend2 = {
+  encode(message, writer = new BinaryWriter7()) {
+    if (message.prevTokenTransactionHash.length !== 0) {
+      writer.uint32(10).bytes(message.prevTokenTransactionHash);
     }
-  }
-  async createChannelWithTLS(address2, certPath) {
-    try {
-      if (isNode2 && !isBun) {
-        const grpcModule = await import("nice-grpc");
-        const { ChannelCredentials, createChannel } = "default" in grpcModule ? grpcModule.default : grpcModule;
-        if (certPath) {
-          try {
-            const fs2 = await import("fs");
-            const cert = fs2.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
-              })
-            );
+    if (message.prevTokenTransactionVout !== 0) {
+      writer.uint32(16).uint32(message.prevTokenTransactionVout);
+    }
+    return writer;
+  },
+  decode(input, length) {
+    const reader = input instanceof BinaryReader7 ? input : new BinaryReader7(input);
+    let end = length === void 0 ? reader.len : reader.pos + length;
+    const message = createBaseTokenOutputToSpend2();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+        case 1: {
+          if (tag !== 10) {
+            break;
           }
-        } else {
-          return createChannel(
-            address2,
-            ChannelCredentials.createSsl(null, null, null, {
-              rejectUnauthorized: false
-            })
-          );
+          message.prevTokenTransactionHash = reader.bytes();
+          continue;
+        }
+        case 2: {
+          if (tag !== 16) {
+            break;
+          }
+          message.prevTokenTransactionVout = reader.uint32();
+          continue;
         }
-      } else {
-        const grpcModule = await import("nice-grpc-web");
-        const { createChannel, FetchTransport } = "default" in grpcModule ? grpcModule.default : grpcModule;
-        const { XHRTransport } = await import("./xhr-transport-WHMS3FGG.js");
-        return createChannel(
-          address2,
-          isReactNative ? XHRTransport() : 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;
+      if ((tag & 7) === 4 || tag === 0) {
+        break;
+      }
+      reader.skip(tag & 7);
     }
-    const authToken = await this.authenticate(address2);
-    const channel = await this.createChannelWithTLS(address2, certPath);
-    const middleware = this.createMiddleware(address2, authToken);
+    return message;
+  },
+  fromJSON(object) {
+    return {
+      prevTokenTransactionHash: isSet6(object.prevTokenTransactionHash) ? bytesFromBase645(object.prevTokenTransactionHash) : new Uint8Array(0),
+      prevTokenTransactionVout: isSet6(object.prevTokenTransactionVout) ? globalThis.Number(object.prevTokenTransactionVout) : 0
+    };
+  },
+  toJSON(message) {
+    const obj = {};
+    if (message.prevTokenTransactionHash.length !== 0) {
+      obj.prevTokenTransactionHash = base64FromBytes5(message.prevTokenTransactionHash);
+    }
+    if (message.prevTokenTransactionVout !== 0) {
+      obj.prevTokenTransactionVout = Math.round(message.prevTokenTransactionVout);
+    }
+    return obj;
+  },
+  create(base) {
+    return TokenOutputToSpend2.fromPartial(base ?? {});
+  },
+  fromPartial(object) {
+    const message = createBaseTokenOutputToSpend2();
+    message.prevTokenTransactionHash = object.prevTokenTransactionHash ?? new Uint8Array(0);
+    message.prevTokenTransactionVout = object.prevTokenTransactionVout ?? 0;
+    return message;
+  }
+};
+function createBaseTokenTransferInput2() {
+  return { outputsToSpend: [] };
+}
+var TokenTransferInput2 = {
+  encode(message, writer = new BinaryWriter7()) {
+    for (const v of message.outputsToSpend) {
+      TokenOutputToSpend2.encode(v, writer.uint32(10).fork()).join();
+    }
+    return writer;
+  },
+  decode(input, length) {
+    const reader = input instanceof BinaryReader7 ? input : new BinaryReader7(input);
+    let end = length === void 0 ? reader.len : reader.pos + length;
+    const message = createBaseTokenTransferInput2();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+        case 1: {
+          if (tag !== 10) {
+            break;
+          }
+          message.outputsToSpend.push(TokenOutputToSpend2.decode(reader, reader.uint32()));
+          continue;
+        }
+      }
+      if ((tag & 7) === 4 || tag === 0) {
+        break;
+      }
+      reader.skip(tag & 7);
+    }
+    return message;
+  },
+  fromJSON(object) {
+    return {
+      outputsToSpend: globalThis.Array.isArray(object?.outputsToSpend) ? object.outputsToSpend.map((e) => TokenOutputToSpend2.fromJSON(e)) : []
+    };
+  },
+  toJSON(message) {
+    const obj = {};
+    if (message.outputsToSpend?.length) {
+      obj.outputsToSpend = message.outputsToSpend.map((e) => TokenOutputToSpend2.toJSON(e));
+    }
+    return obj;
+  },
+  create(base) {
+    return TokenTransferInput2.fromPartial(base ?? {});
+  },
+  fromPartial(object) {
+    const message = createBaseTokenTransferInput2();
+    message.outputsToSpend = object.outputsToSpend?.map((e) => TokenOutputToSpend2.fromPartial(e)) || [];
+    return message;
+  }
+};
+function createBaseTokenMintInput2() {
+  return { issuerPublicKey: new Uint8Array(0), issuerProvidedTimestamp: 0 };
+}
+var TokenMintInput2 = {
+  encode(message, writer = new BinaryWriter7()) {
+    if (message.issuerPublicKey.length !== 0) {
+      writer.uint32(10).bytes(message.issuerPublicKey);
+    }
+    if (message.issuerProvidedTimestamp !== 0) {
+      writer.uint32(16).uint64(message.issuerProvidedTimestamp);
+    }
+    return writer;
+  },
+  decode(input, length) {
+    const reader = input instanceof BinaryReader7 ? input : new BinaryReader7(input);
+    let end = length === void 0 ? reader.len : reader.pos + length;
+    const message = createBaseTokenMintInput2();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+        case 1: {
+          if (tag !== 10) {
+            break;
+          }
+          message.issuerPublicKey = reader.bytes();
+          continue;
+        }
+        case 2: {
+          if (tag !== 16) {
+            break;
+          }
+          message.issuerProvidedTimestamp = longToNumber4(reader.uint64());
+          continue;
+        }
+      }
+      if ((tag & 7) === 4 || tag === 0) {
+        break;
+      }
+      reader.skip(tag & 7);
+    }
+    return message;
+  },
+  fromJSON(object) {
+    return {
+      issuerPublicKey: isSet6(object.issuerPublicKey) ? bytesFromBase645(object.issuerPublicKey) : new Uint8Array(0),
+      issuerProvidedTimestamp: isSet6(object.issuerProvidedTimestamp) ? globalThis.Number(object.issuerProvidedTimestamp) : 0
+    };
+  },
+  toJSON(message) {
+    const obj = {};
+    if (message.issuerPublicKey.length !== 0) {
+      obj.issuerPublicKey = base64FromBytes5(message.issuerPublicKey);
+    }
+    if (message.issuerProvidedTimestamp !== 0) {
+      obj.issuerProvidedTimestamp = Math.round(message.issuerProvidedTimestamp);
+    }
+    return obj;
+  },
+  create(base) {
+    return TokenMintInput2.fromPartial(base ?? {});
+  },
+  fromPartial(object) {
+    const message = createBaseTokenMintInput2();
+    message.issuerPublicKey = object.issuerPublicKey ?? new Uint8Array(0);
+    message.issuerProvidedTimestamp = object.issuerProvidedTimestamp ?? 0;
+    return message;
+  }
+};
+function createBaseTokenOutput2() {
+  return {
+    id: void 0,
+    ownerPublicKey: new Uint8Array(0),
+    revocationCommitment: void 0,
+    withdrawBondSats: void 0,
+    withdrawRelativeBlockLocktime: void 0,
+    tokenPublicKey: new Uint8Array(0),
+    tokenAmount: new Uint8Array(0)
+  };
+}
+var TokenOutput2 = {
+  encode(message, writer = new BinaryWriter7()) {
+    if (message.id !== void 0) {
+      writer.uint32(10).string(message.id);
+    }
+    if (message.ownerPublicKey.length !== 0) {
+      writer.uint32(18).bytes(message.ownerPublicKey);
+    }
+    if (message.revocationCommitment !== void 0) {
+      writer.uint32(26).bytes(message.revocationCommitment);
+    }
+    if (message.withdrawBondSats !== void 0) {
+      writer.uint32(32).uint64(message.withdrawBondSats);
+    }
+    if (message.withdrawRelativeBlockLocktime !== void 0) {
+      writer.uint32(40).uint64(message.withdrawRelativeBlockLocktime);
+    }
+    if (message.tokenPublicKey.length !== 0) {
+      writer.uint32(50).bytes(message.tokenPublicKey);
+    }
+    if (message.tokenAmount.length !== 0) {
+      writer.uint32(58).bytes(message.tokenAmount);
+    }
+    return writer;
+  },
+  decode(input, length) {
+    const reader = input instanceof BinaryReader7 ? input : new BinaryReader7(input);
+    let end = length === void 0 ? reader.len : reader.pos + length;
+    const message = createBaseTokenOutput2();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+        case 1: {
+          if (tag !== 10) {
+            break;
+          }
+          message.id = reader.string();
+          continue;
+        }
+        case 2: {
+          if (tag !== 18) {
+            break;
+          }
+          message.ownerPublicKey = reader.bytes();
+          continue;
+        }
+        case 3: {
+          if (tag !== 26) {
+            break;
+          }
+          message.revocationCommitment = reader.bytes();
+          continue;
+        }
+        case 4: {
+          if (tag !== 32) {
+            break;
+          }
+          message.withdrawBondSats = longToNumber4(reader.uint64());
+          continue;
+        }
+        case 5: {
+          if (tag !== 40) {
+            break;
+          }
+          message.withdrawRelativeBlockLocktime = longToNumber4(reader.uint64());
+          continue;
+        }
+        case 6: {
+          if (tag !== 50) {
+            break;
+          }
+          message.tokenPublicKey = reader.bytes();
+          continue;
+        }
+        case 7: {
+          if (tag !== 58) {
+            break;
+          }
+          message.tokenAmount = reader.bytes();
+          continue;
+        }
+      }
+      if ((tag & 7) === 4 || tag === 0) {
+        break;
+      }
+      reader.skip(tag & 7);
+    }
+    return message;
+  },
+  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) : new Uint8Array(0),
+      tokenAmount: isSet6(object.tokenAmount) ? bytesFromBase645(object.tokenAmount) : new Uint8Array(0)
+    };
+  },
+  toJSON(message) {
+    const obj = {};
+    if (message.id !== void 0) {
+      obj.id = message.id;
+    }
+    if (message.ownerPublicKey.length !== 0) {
+      obj.ownerPublicKey = base64FromBytes5(message.ownerPublicKey);
+    }
+    if (message.revocationCommitment !== void 0) {
+      obj.revocationCommitment = base64FromBytes5(message.revocationCommitment);
+    }
+    if (message.withdrawBondSats !== void 0) {
+      obj.withdrawBondSats = Math.round(message.withdrawBondSats);
+    }
+    if (message.withdrawRelativeBlockLocktime !== void 0) {
+      obj.withdrawRelativeBlockLocktime = Math.round(message.withdrawRelativeBlockLocktime);
+    }
+    if (message.tokenPublicKey.length !== 0) {
+      obj.tokenPublicKey = base64FromBytes5(message.tokenPublicKey);
+    }
+    if (message.tokenAmount.length !== 0) {
+      obj.tokenAmount = base64FromBytes5(message.tokenAmount);
+    }
+    return obj;
+  },
+  create(base) {
+    return TokenOutput2.fromPartial(base ?? {});
+  },
+  fromPartial(object) {
+    const message = createBaseTokenOutput2();
+    message.id = object.id ?? void 0;
+    message.ownerPublicKey = object.ownerPublicKey ?? new Uint8Array(0);
+    message.revocationCommitment = object.revocationCommitment ?? void 0;
+    message.withdrawBondSats = object.withdrawBondSats ?? void 0;
+    message.withdrawRelativeBlockLocktime = object.withdrawRelativeBlockLocktime ?? void 0;
+    message.tokenPublicKey = object.tokenPublicKey ?? new Uint8Array(0);
+    message.tokenAmount = object.tokenAmount ?? new Uint8Array(0);
+    return message;
+  }
+};
+function createBaseTokenTransaction2() {
+  return {
+    version: 0,
+    tokenInputs: void 0,
+    tokenOutputs: [],
+    sparkOperatorIdentityPublicKeys: [],
+    expiryTime: void 0,
+    network: 0
+  };
+}
+var TokenTransaction2 = {
+  encode(message, writer = new BinaryWriter7()) {
+    if (message.version !== 0) {
+      writer.uint32(8).uint32(message.version);
+    }
+    switch (message.tokenInputs?.$case) {
+      case "mintInput":
+        TokenMintInput2.encode(message.tokenInputs.mintInput, writer.uint32(18).fork()).join();
+        break;
+      case "transferInput":
+        TokenTransferInput2.encode(message.tokenInputs.transferInput, writer.uint32(26).fork()).join();
+        break;
+    }
+    for (const v of message.tokenOutputs) {
+      TokenOutput2.encode(v, writer.uint32(34).fork()).join();
+    }
+    for (const v of message.sparkOperatorIdentityPublicKeys) {
+      writer.uint32(42).bytes(v);
+    }
+    if (message.expiryTime !== void 0) {
+      Timestamp.encode(toTimestamp2(message.expiryTime), writer.uint32(50).fork()).join();
+    }
+    if (message.network !== 0) {
+      writer.uint32(56).int32(message.network);
+    }
+    return writer;
+  },
+  decode(input, length) {
+    const reader = input instanceof BinaryReader7 ? input : new BinaryReader7(input);
+    let end = length === void 0 ? reader.len : reader.pos + length;
+    const message = createBaseTokenTransaction2();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+        case 1: {
+          if (tag !== 8) {
+            break;
+          }
+          message.version = reader.uint32();
+          continue;
+        }
+        case 2: {
+          if (tag !== 18) {
+            break;
+          }
+          message.tokenInputs = { $case: "mintInput", mintInput: TokenMintInput2.decode(reader, reader.uint32()) };
+          continue;
+        }
+        case 3: {
+          if (tag !== 26) {
+            break;
+          }
+          message.tokenInputs = {
+            $case: "transferInput",
+            transferInput: TokenTransferInput2.decode(reader, reader.uint32())
+          };
+          continue;
+        }
+        case 4: {
+          if (tag !== 34) {
+            break;
+          }
+          message.tokenOutputs.push(TokenOutput2.decode(reader, reader.uint32()));
+          continue;
+        }
+        case 5: {
+          if (tag !== 42) {
+            break;
+          }
+          message.sparkOperatorIdentityPublicKeys.push(reader.bytes());
+          continue;
+        }
+        case 6: {
+          if (tag !== 50) {
+            break;
+          }
+          message.expiryTime = fromTimestamp2(Timestamp.decode(reader, reader.uint32()));
+          continue;
+        }
+        case 7: {
+          if (tag !== 56) {
+            break;
+          }
+          message.network = reader.int32();
+          continue;
+        }
+      }
+      if ((tag & 7) === 4 || tag === 0) {
+        break;
+      }
+      reader.skip(tag & 7);
+    }
+    return message;
+  },
+  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) } : 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
+    };
+  },
+  toJSON(message) {
+    const obj = {};
+    if (message.version !== 0) {
+      obj.version = Math.round(message.version);
+    }
+    if (message.tokenInputs?.$case === "mintInput") {
+      obj.mintInput = TokenMintInput2.toJSON(message.tokenInputs.mintInput);
+    } else if (message.tokenInputs?.$case === "transferInput") {
+      obj.transferInput = TokenTransferInput2.toJSON(message.tokenInputs.transferInput);
+    }
+    if (message.tokenOutputs?.length) {
+      obj.tokenOutputs = message.tokenOutputs.map((e) => TokenOutput2.toJSON(e));
+    }
+    if (message.sparkOperatorIdentityPublicKeys?.length) {
+      obj.sparkOperatorIdentityPublicKeys = message.sparkOperatorIdentityPublicKeys.map((e) => base64FromBytes5(e));
+    }
+    if (message.expiryTime !== void 0) {
+      obj.expiryTime = message.expiryTime.toISOString();
+    }
+    if (message.network !== 0) {
+      obj.network = networkToJSON(message.network);
+    }
+    return obj;
+  },
+  create(base) {
+    return TokenTransaction2.fromPartial(base ?? {});
+  },
+  fromPartial(object) {
+    const message = createBaseTokenTransaction2();
+    message.version = object.version ?? 0;
+    switch (object.tokenInputs?.$case) {
+      case "mintInput": {
+        if (object.tokenInputs?.mintInput !== void 0 && object.tokenInputs?.mintInput !== null) {
+          message.tokenInputs = {
+            $case: "mintInput",
+            mintInput: TokenMintInput2.fromPartial(object.tokenInputs.mintInput)
+          };
+        }
+        break;
+      }
+      case "transferInput": {
+        if (object.tokenInputs?.transferInput !== void 0 && object.tokenInputs?.transferInput !== null) {
+          message.tokenInputs = {
+            $case: "transferInput",
+            transferInput: TokenTransferInput2.fromPartial(object.tokenInputs.transferInput)
+          };
+        }
+        break;
+      }
+    }
+    message.tokenOutputs = object.tokenOutputs?.map((e) => TokenOutput2.fromPartial(e)) || [];
+    message.sparkOperatorIdentityPublicKeys = object.sparkOperatorIdentityPublicKeys?.map((e) => e) || [];
+    message.expiryTime = object.expiryTime ?? void 0;
+    message.network = object.network ?? 0;
+    return message;
+  }
+};
+function createBaseSignatureWithIndex2() {
+  return { signature: new Uint8Array(0), inputIndex: 0 };
+}
+var SignatureWithIndex2 = {
+  encode(message, writer = new BinaryWriter7()) {
+    if (message.signature.length !== 0) {
+      writer.uint32(10).bytes(message.signature);
+    }
+    if (message.inputIndex !== 0) {
+      writer.uint32(16).uint32(message.inputIndex);
+    }
+    return writer;
+  },
+  decode(input, length) {
+    const reader = input instanceof BinaryReader7 ? input : new BinaryReader7(input);
+    let end = length === void 0 ? reader.len : reader.pos + length;
+    const message = createBaseSignatureWithIndex2();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+        case 1: {
+          if (tag !== 10) {
+            break;
+          }
+          message.signature = reader.bytes();
+          continue;
+        }
+        case 2: {
+          if (tag !== 16) {
+            break;
+          }
+          message.inputIndex = reader.uint32();
+          continue;
+        }
+      }
+      if ((tag & 7) === 4 || tag === 0) {
+        break;
+      }
+      reader.skip(tag & 7);
+    }
+    return message;
+  },
+  fromJSON(object) {
+    return {
+      signature: isSet6(object.signature) ? bytesFromBase645(object.signature) : new Uint8Array(0),
+      inputIndex: isSet6(object.inputIndex) ? globalThis.Number(object.inputIndex) : 0
+    };
+  },
+  toJSON(message) {
+    const obj = {};
+    if (message.signature.length !== 0) {
+      obj.signature = base64FromBytes5(message.signature);
+    }
+    if (message.inputIndex !== 0) {
+      obj.inputIndex = Math.round(message.inputIndex);
+    }
+    return obj;
+  },
+  create(base) {
+    return SignatureWithIndex2.fromPartial(base ?? {});
+  },
+  fromPartial(object) {
+    const message = createBaseSignatureWithIndex2();
+    message.signature = object.signature ?? new Uint8Array(0);
+    message.inputIndex = object.inputIndex ?? 0;
+    return message;
+  }
+};
+function createBaseInputTtxoSignaturesPerOperator() {
+  return { ttxoSignatures: [], operatorIdentityPublicKey: new Uint8Array(0) };
+}
+var InputTtxoSignaturesPerOperator = {
+  encode(message, writer = new BinaryWriter7()) {
+    for (const v of message.ttxoSignatures) {
+      SignatureWithIndex2.encode(v, writer.uint32(10).fork()).join();
+    }
+    if (message.operatorIdentityPublicKey.length !== 0) {
+      writer.uint32(18).bytes(message.operatorIdentityPublicKey);
+    }
+    return writer;
+  },
+  decode(input, length) {
+    const reader = input instanceof BinaryReader7 ? input : new BinaryReader7(input);
+    let end = length === void 0 ? reader.len : reader.pos + length;
+    const message = createBaseInputTtxoSignaturesPerOperator();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+        case 1: {
+          if (tag !== 10) {
+            break;
+          }
+          message.ttxoSignatures.push(SignatureWithIndex2.decode(reader, reader.uint32()));
+          continue;
+        }
+        case 2: {
+          if (tag !== 18) {
+            break;
+          }
+          message.operatorIdentityPublicKey = reader.bytes();
+          continue;
+        }
+      }
+      if ((tag & 7) === 4 || tag === 0) {
+        break;
+      }
+      reader.skip(tag & 7);
+    }
+    return message;
+  },
+  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)
+    };
+  },
+  toJSON(message) {
+    const obj = {};
+    if (message.ttxoSignatures?.length) {
+      obj.ttxoSignatures = message.ttxoSignatures.map((e) => SignatureWithIndex2.toJSON(e));
+    }
+    if (message.operatorIdentityPublicKey.length !== 0) {
+      obj.operatorIdentityPublicKey = base64FromBytes5(message.operatorIdentityPublicKey);
+    }
+    return obj;
+  },
+  create(base) {
+    return InputTtxoSignaturesPerOperator.fromPartial(base ?? {});
+  },
+  fromPartial(object) {
+    const message = createBaseInputTtxoSignaturesPerOperator();
+    message.ttxoSignatures = object.ttxoSignatures?.map((e) => SignatureWithIndex2.fromPartial(e)) || [];
+    message.operatorIdentityPublicKey = object.operatorIdentityPublicKey ?? new Uint8Array(0);
+    return message;
+  }
+};
+function createBaseStartTransactionRequest() {
+  return {
+    identityPublicKey: new Uint8Array(0),
+    partialTokenTransaction: void 0,
+    partialTokenTransactionOwnerSignatures: [],
+    validityDurationSeconds: 0
+  };
+}
+var StartTransactionRequest = {
+  encode(message, writer = new BinaryWriter7()) {
+    if (message.identityPublicKey.length !== 0) {
+      writer.uint32(10).bytes(message.identityPublicKey);
+    }
+    if (message.partialTokenTransaction !== void 0) {
+      TokenTransaction2.encode(message.partialTokenTransaction, writer.uint32(18).fork()).join();
+    }
+    for (const v of message.partialTokenTransactionOwnerSignatures) {
+      SignatureWithIndex2.encode(v, writer.uint32(26).fork()).join();
+    }
+    if (message.validityDurationSeconds !== 0) {
+      writer.uint32(32).uint64(message.validityDurationSeconds);
+    }
+    return writer;
+  },
+  decode(input, length) {
+    const reader = input instanceof BinaryReader7 ? input : new BinaryReader7(input);
+    let end = length === void 0 ? reader.len : reader.pos + length;
+    const message = createBaseStartTransactionRequest();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+        case 1: {
+          if (tag !== 10) {
+            break;
+          }
+          message.identityPublicKey = reader.bytes();
+          continue;
+        }
+        case 2: {
+          if (tag !== 18) {
+            break;
+          }
+          message.partialTokenTransaction = TokenTransaction2.decode(reader, reader.uint32());
+          continue;
+        }
+        case 3: {
+          if (tag !== 26) {
+            break;
+          }
+          message.partialTokenTransactionOwnerSignatures.push(SignatureWithIndex2.decode(reader, reader.uint32()));
+          continue;
+        }
+        case 4: {
+          if (tag !== 32) {
+            break;
+          }
+          message.validityDurationSeconds = longToNumber4(reader.uint64());
+          continue;
+        }
+      }
+      if ((tag & 7) === 4 || tag === 0) {
+        break;
+      }
+      reader.skip(tag & 7);
+    }
+    return message;
+  },
+  fromJSON(object) {
+    return {
+      identityPublicKey: isSet6(object.identityPublicKey) ? bytesFromBase645(object.identityPublicKey) : new Uint8Array(0),
+      partialTokenTransaction: isSet6(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
+    };
+  },
+  toJSON(message) {
+    const obj = {};
+    if (message.identityPublicKey.length !== 0) {
+      obj.identityPublicKey = base64FromBytes5(message.identityPublicKey);
+    }
+    if (message.partialTokenTransaction !== void 0) {
+      obj.partialTokenTransaction = TokenTransaction2.toJSON(message.partialTokenTransaction);
+    }
+    if (message.partialTokenTransactionOwnerSignatures?.length) {
+      obj.partialTokenTransactionOwnerSignatures = message.partialTokenTransactionOwnerSignatures.map(
+        (e) => SignatureWithIndex2.toJSON(e)
+      );
+    }
+    if (message.validityDurationSeconds !== 0) {
+      obj.validityDurationSeconds = Math.round(message.validityDurationSeconds);
+    }
+    return obj;
+  },
+  create(base) {
+    return StartTransactionRequest.fromPartial(base ?? {});
+  },
+  fromPartial(object) {
+    const message = createBaseStartTransactionRequest();
+    message.identityPublicKey = object.identityPublicKey ?? new Uint8Array(0);
+    message.partialTokenTransaction = object.partialTokenTransaction !== void 0 && object.partialTokenTransaction !== null ? TokenTransaction2.fromPartial(object.partialTokenTransaction) : void 0;
+    message.partialTokenTransactionOwnerSignatures = object.partialTokenTransactionOwnerSignatures?.map((e) => SignatureWithIndex2.fromPartial(e)) || [];
+    message.validityDurationSeconds = object.validityDurationSeconds ?? 0;
+    return message;
+  }
+};
+function createBaseStartTransactionResponse() {
+  return { finalTokenTransaction: void 0, keyshareInfo: void 0 };
+}
+var StartTransactionResponse = {
+  encode(message, writer = new BinaryWriter7()) {
+    if (message.finalTokenTransaction !== void 0) {
+      TokenTransaction2.encode(message.finalTokenTransaction, writer.uint32(10).fork()).join();
+    }
+    if (message.keyshareInfo !== void 0) {
+      SigningKeyshare.encode(message.keyshareInfo, writer.uint32(18).fork()).join();
+    }
+    return writer;
+  },
+  decode(input, length) {
+    const reader = input instanceof BinaryReader7 ? input : new BinaryReader7(input);
+    let end = length === void 0 ? reader.len : reader.pos + length;
+    const message = createBaseStartTransactionResponse();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+        case 1: {
+          if (tag !== 10) {
+            break;
+          }
+          message.finalTokenTransaction = TokenTransaction2.decode(reader, reader.uint32());
+          continue;
+        }
+        case 2: {
+          if (tag !== 18) {
+            break;
+          }
+          message.keyshareInfo = SigningKeyshare.decode(reader, reader.uint32());
+          continue;
+        }
+      }
+      if ((tag & 7) === 4 || tag === 0) {
+        break;
+      }
+      reader.skip(tag & 7);
+    }
+    return message;
+  },
+  fromJSON(object) {
+    return {
+      finalTokenTransaction: isSet6(object.finalTokenTransaction) ? TokenTransaction2.fromJSON(object.finalTokenTransaction) : void 0,
+      keyshareInfo: isSet6(object.keyshareInfo) ? SigningKeyshare.fromJSON(object.keyshareInfo) : void 0
+    };
+  },
+  toJSON(message) {
+    const obj = {};
+    if (message.finalTokenTransaction !== void 0) {
+      obj.finalTokenTransaction = TokenTransaction2.toJSON(message.finalTokenTransaction);
+    }
+    if (message.keyshareInfo !== void 0) {
+      obj.keyshareInfo = SigningKeyshare.toJSON(message.keyshareInfo);
+    }
+    return obj;
+  },
+  create(base) {
+    return StartTransactionResponse.fromPartial(base ?? {});
+  },
+  fromPartial(object) {
+    const message = createBaseStartTransactionResponse();
+    message.finalTokenTransaction = object.finalTokenTransaction !== void 0 && object.finalTokenTransaction !== null ? TokenTransaction2.fromPartial(object.finalTokenTransaction) : void 0;
+    message.keyshareInfo = object.keyshareInfo !== void 0 && object.keyshareInfo !== null ? SigningKeyshare.fromPartial(object.keyshareInfo) : void 0;
+    return message;
+  }
+};
+function createBaseCommitTransactionRequest() {
+  return {
+    finalTokenTransaction: void 0,
+    finalTokenTransactionHash: new Uint8Array(0),
+    inputTtxoSignaturesPerOperator: [],
+    ownerIdentityPublicKey: new Uint8Array(0)
+  };
+}
+var CommitTransactionRequest = {
+  encode(message, writer = new BinaryWriter7()) {
+    if (message.finalTokenTransaction !== void 0) {
+      TokenTransaction2.encode(message.finalTokenTransaction, writer.uint32(10).fork()).join();
+    }
+    if (message.finalTokenTransactionHash.length !== 0) {
+      writer.uint32(18).bytes(message.finalTokenTransactionHash);
+    }
+    for (const v of message.inputTtxoSignaturesPerOperator) {
+      InputTtxoSignaturesPerOperator.encode(v, writer.uint32(26).fork()).join();
+    }
+    if (message.ownerIdentityPublicKey.length !== 0) {
+      writer.uint32(34).bytes(message.ownerIdentityPublicKey);
+    }
+    return writer;
+  },
+  decode(input, length) {
+    const reader = input instanceof BinaryReader7 ? input : new BinaryReader7(input);
+    let end = length === void 0 ? reader.len : reader.pos + length;
+    const message = createBaseCommitTransactionRequest();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+        case 1: {
+          if (tag !== 10) {
+            break;
+          }
+          message.finalTokenTransaction = TokenTransaction2.decode(reader, reader.uint32());
+          continue;
+        }
+        case 2: {
+          if (tag !== 18) {
+            break;
+          }
+          message.finalTokenTransactionHash = reader.bytes();
+          continue;
+        }
+        case 3: {
+          if (tag !== 26) {
+            break;
+          }
+          message.inputTtxoSignaturesPerOperator.push(InputTtxoSignaturesPerOperator.decode(reader, reader.uint32()));
+          continue;
+        }
+        case 4: {
+          if (tag !== 34) {
+            break;
+          }
+          message.ownerIdentityPublicKey = reader.bytes();
+          continue;
+        }
+      }
+      if ((tag & 7) === 4 || tag === 0) {
+        break;
+      }
+      reader.skip(tag & 7);
+    }
+    return message;
+  },
+  fromJSON(object) {
+    return {
+      finalTokenTransaction: isSet6(object.finalTokenTransaction) ? TokenTransaction2.fromJSON(object.finalTokenTransaction) : void 0,
+      finalTokenTransactionHash: isSet6(object.finalTokenTransactionHash) ? bytesFromBase645(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)
+    };
+  },
+  toJSON(message) {
+    const obj = {};
+    if (message.finalTokenTransaction !== void 0) {
+      obj.finalTokenTransaction = TokenTransaction2.toJSON(message.finalTokenTransaction);
+    }
+    if (message.finalTokenTransactionHash.length !== 0) {
+      obj.finalTokenTransactionHash = base64FromBytes5(message.finalTokenTransactionHash);
+    }
+    if (message.inputTtxoSignaturesPerOperator?.length) {
+      obj.inputTtxoSignaturesPerOperator = message.inputTtxoSignaturesPerOperator.map(
+        (e) => InputTtxoSignaturesPerOperator.toJSON(e)
+      );
+    }
+    if (message.ownerIdentityPublicKey.length !== 0) {
+      obj.ownerIdentityPublicKey = base64FromBytes5(message.ownerIdentityPublicKey);
+    }
+    return obj;
+  },
+  create(base) {
+    return CommitTransactionRequest.fromPartial(base ?? {});
+  },
+  fromPartial(object) {
+    const message = createBaseCommitTransactionRequest();
+    message.finalTokenTransaction = object.finalTokenTransaction !== void 0 && object.finalTokenTransaction !== null ? TokenTransaction2.fromPartial(object.finalTokenTransaction) : void 0;
+    message.finalTokenTransactionHash = object.finalTokenTransactionHash ?? new Uint8Array(0);
+    message.inputTtxoSignaturesPerOperator = object.inputTtxoSignaturesPerOperator?.map((e) => InputTtxoSignaturesPerOperator.fromPartial(e)) || [];
+    message.ownerIdentityPublicKey = object.ownerIdentityPublicKey ?? new Uint8Array(0);
+    return message;
+  }
+};
+function createBaseCommitTransactionResponse() {
+  return {};
+}
+var CommitTransactionResponse = {
+  encode(_, writer = new BinaryWriter7()) {
+    return writer;
+  },
+  decode(input, length) {
+    const reader = input instanceof BinaryReader7 ? input : new BinaryReader7(input);
+    let end = length === void 0 ? reader.len : reader.pos + length;
+    const message = createBaseCommitTransactionResponse();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+      }
+      if ((tag & 7) === 4 || tag === 0) {
+        break;
+      }
+      reader.skip(tag & 7);
+    }
+    return message;
+  },
+  fromJSON(_) {
+    return {};
+  },
+  toJSON(_) {
+    const obj = {};
+    return obj;
+  },
+  create(base) {
+    return CommitTransactionResponse.fromPartial(base ?? {});
+  },
+  fromPartial(_) {
+    const message = createBaseCommitTransactionResponse();
+    return message;
+  }
+};
+var SparkTokenServiceDefinition = {
+  name: "SparkTokenService",
+  fullName: "spark_token.SparkTokenService",
+  methods: {
+    /**
+     * Start process to create final token transaction with all inputs required
+     * from user and SOs (including revocation secret commitment)
+     */
+    start_transaction: {
+      name: "start_transaction",
+      requestType: StartTransactionRequest,
+      requestStream: false,
+      responseType: StartTransactionResponse,
+      responseStream: false,
+      options: {}
+    },
+    /**
+     * Complete the transaction and commit it with all SOs. This will be
+     * coordinated by one SO.
+     */
+    commit_transaction: {
+      name: "commit_transaction",
+      requestType: CommitTransactionRequest,
+      requestStream: false,
+      responseType: CommitTransactionResponse,
+      responseStream: false,
+      options: {}
+    }
+  }
+};
+function bytesFromBase645(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 base64FromBytes5(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 toTimestamp2(date) {
+  const seconds = Math.trunc(date.getTime() / 1e3);
+  const nanos = date.getTime() % 1e3 * 1e6;
+  return { seconds, nanos };
+}
+function fromTimestamp2(t) {
+  let millis = (t.seconds || 0) * 1e3;
+  millis += (t.nanos || 0) / 1e6;
+  return new globalThis.Date(millis);
+}
+function fromJsonTimestamp2(o) {
+  if (o instanceof globalThis.Date) {
+    return o;
+  } else if (typeof o === "string") {
+    return new globalThis.Date(o);
+  } else {
+    return fromTimestamp2(Timestamp.fromJSON(o));
+  }
+}
+function longToNumber4(int64) {
+  const num = globalThis.Number(int64.toString());
+  if (num > globalThis.Number.MAX_SAFE_INTEGER) {
+    throw new globalThis.Error("Value is larger than Number.MAX_SAFE_INTEGER");
+  }
+  if (num < globalThis.Number.MIN_SAFE_INTEGER) {
+    throw new globalThis.Error("Value is smaller than Number.MIN_SAFE_INTEGER");
+  }
+  return num;
+}
+function isSet6(value) {
+  return value !== null && value !== void 0;
+}
+
+// src/services/connection.ts
+var ConnectionManager = class {
+  config;
+  clients = /* @__PURE__ */ new Map();
+  tokenClients = /* @__PURE__ */ new Map();
+  // We are going to .unref() the underlying channels for stream clients
+  // to prevent the stream from keeping the process alive
+  // Using a different map to avoid unforeseen problems with unary calls
+  streamClients = /* @__PURE__ */ new Map();
+  constructor(config) {
+    this.config = config;
+  }
+  // When initializing wallet, go ahead and instantiate all clients
+  async createClients() {
+    await Promise.all(
+      Object.values(this.config.getSigningOperators()).map((operator) => {
+        this.createSparkClient(operator.address);
+      })
+    );
+  }
+  async closeConnections() {
+    await Promise.all(
+      Array.from(this.clients.values()).map(
+        (client) => client.client.close?.()
+      )
+    );
+    this.clients.clear();
+  }
+  async createMockClient(address2) {
+    const channel = await this.createChannelWithTLS(address2);
+    const isNodeChannel = "close" in channel;
+    if (isNode2 && 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 (isNode2 && !isBun) {
+        const grpcModule = await import("nice-grpc");
+        const { ChannelCredentials, createChannel } = "default" in grpcModule ? grpcModule.default : grpcModule;
+        if (certPath) {
+          try {
+            const fs2 = await import("fs");
+            const cert = fs2.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 } = await import("./xhr-transport-WHMS3FGG.js");
+        return createChannel(
+          address2,
+          isReactNative ? XHRTransport() : 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;
+    }
+    const authToken = await this.authenticate(address2);
+    const channel = await this.createChannelWithTLS(address2, certPath);
+    const middleware = this.createMiddleware(address2, authToken);
     const client = await this.createGrpcClient(
       SparkServiceDefinition,
       channel,
@@ -17583,6 +18529,22 @@ var ConnectionManager = class {
     this.clients.set(address2, { client, authToken });
     return client;
   }
+  async createSparkTokenClient(address2, certPath) {
+    if (this.tokenClients.has(address2)) {
+      return this.tokenClients.get(address2).client;
+    }
+    const authToken = await this.authenticate(address2);
+    const channel = await this.createChannelWithTLS(address2, certPath);
+    const middleware = this.createMiddleware(address2, authToken);
+    const tokenClient = await this.createGrpcClient(
+      SparkTokenServiceDefinition,
+      channel,
+      true,
+      middleware
+    );
+    this.tokenClients.set(address2, { client: tokenClient, authToken });
+    return tokenClient;
+  }
   async getStreamChannel(address2) {
     return this.streamClients.get(address2)?.channel;
   }
@@ -17927,17 +18889,35 @@ function getTransactionSequence(currSequence) {
   const timelock = getCurrentTimelock(currSequence);
   return 1 << 30 | timelock;
 }
+function checkIfValidSequence(currSequence) {
+  const TIME_LOCK_ACTIVE = (currSequence || 0) & 2147483648;
+  if (TIME_LOCK_ACTIVE !== 0) {
+    throw new ValidationError("Timelock not active", {
+      field: "currSequence",
+      value: currSequence
+    });
+  }
+  const RELATIVE_TIME_LOCK_ACTIVE = (currSequence || 0) & 4194304;
+  if (RELATIVE_TIME_LOCK_ACTIVE !== 0) {
+    throw new ValidationError("Block based timelock not active", {
+      field: "currSequence",
+      value: currSequence
+    });
+  }
+}
 function getNextTransactionSequence(currSequence, forRefresh) {
+  checkIfValidSequence(currSequence);
   const currentTimelock = getCurrentTimelock(currSequence);
   const nextTimelock = currentTimelock - TIME_LOCK_INTERVAL;
+  checkIfValidSequence(nextTimelock);
   if (forRefresh && nextTimelock <= 100 && currentTimelock > 0) {
     return {
       nextSequence: 1 << 30 | nextTimelock,
       needRefresh: true
     };
   }
-  if (nextTimelock < 0) {
-    throw new ValidationError("timelock interval is less than or equal to 0", {
+  if (nextTimelock < 100) {
+    throw new ValidationError("timelock interval is less than 100", {
       field: "nextTimelock",
       value: nextTimelock
     });
@@ -20135,7 +21115,7 @@ import { retryMiddleware as retryMiddleware2 } from "nice-grpc-client-middleware
 import { Metadata as Metadata2 } from "nice-grpc-common";
 
 // src/proto/lrc20.ts
-import { BinaryReader as BinaryReader7, BinaryWriter as BinaryWriter7 } from "@bufbuild/protobuf/wire";
+import { BinaryReader as BinaryReader8, BinaryWriter as BinaryWriter8 } from "@bufbuild/protobuf/wire";
 function layerFromJSON(object) {
   switch (object) {
     case 0:
@@ -20300,7 +21280,7 @@ function createBaseSendSparkSignatureRequest() {
   };
 }
 var SendSparkSignatureRequest = {
-  encode(message, writer = new BinaryWriter7()) {
+  encode(message, writer = new BinaryWriter8()) {
     if (message.finalTokenTransaction !== void 0) {
       TokenTransaction.encode(message.finalTokenTransaction, writer.uint32(10).fork()).join();
     }
@@ -20316,7 +21296,7 @@ var SendSparkSignatureRequest = {
     return writer;
   },
   decode(input, length) {
-    const reader = input instanceof BinaryReader7 ? input : new BinaryReader7(input);
+    const reader = input instanceof BinaryReader8 ? input : new BinaryReader8(input);
     let end = length === void 0 ? reader.len : reader.pos + length;
     const message = createBaseSendSparkSignatureRequest();
     while (reader.pos < end) {
@@ -20360,9 +21340,9 @@ var SendSparkSignatureRequest = {
   },
   fromJSON(object) {
     return {
-      finalTokenTransaction: isSet6(object.finalTokenTransaction) ? TokenTransaction.fromJSON(object.finalTokenTransaction) : void 0,
+      finalTokenTransaction: isSet7(object.finalTokenTransaction) ? TokenTransaction.fromJSON(object.finalTokenTransaction) : void 0,
       operatorSpecificSignatures: globalThis.Array.isArray(object?.operatorSpecificSignatures) ? object.operatorSpecificSignatures.map((e) => OperatorSpecificOwnerSignature.fromJSON(e)) : [],
-      operatorSignatureData: isSet6(object.operatorSignatureData) ? SparkOperatorSignatureData.fromJSON(object.operatorSignatureData) : void 0,
+      operatorSignatureData: isSet7(object.operatorSignatureData) ? SparkOperatorSignatureData.fromJSON(object.operatorSignatureData) : void 0,
       revocationSecrets: globalThis.Array.isArray(object?.revocationSecrets) ? object.revocationSecrets.map((e) => RevocationSecretWithIndex.fromJSON(e)) : []
     };
   },
@@ -20400,7 +21380,7 @@ function createBaseSparkOperatorSignatureData() {
   return { sparkOperatorSignature: new Uint8Array(0), operatorIdentityPublicKey: new Uint8Array(0) };
 }
 var SparkOperatorSignatureData = {
-  encode(message, writer = new BinaryWriter7()) {
+  encode(message, writer = new BinaryWriter8()) {
     if (message.sparkOperatorSignature.length !== 0) {
       writer.uint32(10).bytes(message.sparkOperatorSignature);
     }
@@ -20410,7 +21390,7 @@ var SparkOperatorSignatureData = {
     return writer;
   },
   decode(input, length) {
-    const reader = input instanceof BinaryReader7 ? input : new BinaryReader7(input);
+    const reader = input instanceof BinaryReader8 ? input : new BinaryReader8(input);
     let end = length === void 0 ? reader.len : reader.pos + length;
     const message = createBaseSparkOperatorSignatureData();
     while (reader.pos < end) {
@@ -20440,17 +21420,17 @@ var SparkOperatorSignatureData = {
   },
   fromJSON(object) {
     return {
-      sparkOperatorSignature: isSet6(object.sparkOperatorSignature) ? bytesFromBase645(object.sparkOperatorSignature) : new Uint8Array(0),
-      operatorIdentityPublicKey: isSet6(object.operatorIdentityPublicKey) ? bytesFromBase645(object.operatorIdentityPublicKey) : new Uint8Array(0)
+      sparkOperatorSignature: isSet7(object.sparkOperatorSignature) ? bytesFromBase646(object.sparkOperatorSignature) : new Uint8Array(0),
+      operatorIdentityPublicKey: isSet7(object.operatorIdentityPublicKey) ? bytesFromBase646(object.operatorIdentityPublicKey) : new Uint8Array(0)
     };
   },
   toJSON(message) {
     const obj = {};
     if (message.sparkOperatorSignature.length !== 0) {
-      obj.sparkOperatorSignature = base64FromBytes5(message.sparkOperatorSignature);
+      obj.sparkOperatorSignature = base64FromBytes6(message.sparkOperatorSignature);
     }
     if (message.operatorIdentityPublicKey.length !== 0) {
-      obj.operatorIdentityPublicKey = base64FromBytes5(message.operatorIdentityPublicKey);
+      obj.operatorIdentityPublicKey = base64FromBytes6(message.operatorIdentityPublicKey);
     }
     return obj;
   },
@@ -20468,14 +21448,14 @@ function createBaseGetSparkTxRequest() {
   return { finalTokenTransactionHash: new Uint8Array(0) };
 }
 var GetSparkTxRequest = {
-  encode(message, writer = new BinaryWriter7()) {
+  encode(message, writer = new BinaryWriter8()) {
     if (message.finalTokenTransactionHash.length !== 0) {
       writer.uint32(10).bytes(message.finalTokenTransactionHash);
     }
     return writer;
   },
   decode(input, length) {
-    const reader = input instanceof BinaryReader7 ? input : new BinaryReader7(input);
+    const reader = input instanceof BinaryReader8 ? input : new BinaryReader8(input);
     let end = length === void 0 ? reader.len : reader.pos + length;
     const message = createBaseGetSparkTxRequest();
     while (reader.pos < end) {
@@ -20498,13 +21478,13 @@ var GetSparkTxRequest = {
   },
   fromJSON(object) {
     return {
-      finalTokenTransactionHash: isSet6(object.finalTokenTransactionHash) ? bytesFromBase645(object.finalTokenTransactionHash) : new Uint8Array(0)
+      finalTokenTransactionHash: isSet7(object.finalTokenTransactionHash) ? bytesFromBase646(object.finalTokenTransactionHash) : new Uint8Array(0)
     };
   },
   toJSON(message) {
     const obj = {};
     if (message.finalTokenTransactionHash.length !== 0) {
-      obj.finalTokenTransactionHash = base64FromBytes5(message.finalTokenTransactionHash);
+      obj.finalTokenTransactionHash = base64FromBytes6(message.finalTokenTransactionHash);
     }
     return obj;
   },
@@ -20521,14 +21501,14 @@ function createBaseVerifySparkTxRequest() {
   return { finalTokenTransaction: void 0 };
 }
 var VerifySparkTxRequest = {
-  encode(message, writer = new BinaryWriter7()) {
+  encode(message, writer = new BinaryWriter8()) {
     if (message.finalTokenTransaction !== void 0) {
       TokenTransaction.encode(message.finalTokenTransaction, writer.uint32(10).fork()).join();
     }
     return writer;
   },
   decode(input, length) {
-    const reader = input instanceof BinaryReader7 ? input : new BinaryReader7(input);
+    const reader = input instanceof BinaryReader8 ? input : new BinaryReader8(input);
     let end = length === void 0 ? reader.len : reader.pos + length;
     const message = createBaseVerifySparkTxRequest();
     while (reader.pos < end) {
@@ -20551,7 +21531,7 @@ var VerifySparkTxRequest = {
   },
   fromJSON(object) {
     return {
-      finalTokenTransaction: isSet6(object.finalTokenTransaction) ? TokenTransaction.fromJSON(object.finalTokenTransaction) : void 0
+      finalTokenTransaction: isSet7(object.finalTokenTransaction) ? TokenTransaction.fromJSON(object.finalTokenTransaction) : void 0
     };
   },
   toJSON(message) {
@@ -20574,7 +21554,7 @@ function createBaseListSparkTxsRequest() {
   return { pageToken: void 0, pageSize: void 0 };
 }
 var ListSparkTxsRequest = {
-  encode(message, writer = new BinaryWriter7()) {
+  encode(message, writer = new BinaryWriter8()) {
     if (message.pageToken !== void 0) {
       writer.uint32(10).bytes(message.pageToken);
     }
@@ -20584,7 +21564,7 @@ var ListSparkTxsRequest = {
     return writer;
   },
   decode(input, length) {
-    const reader = input instanceof BinaryReader7 ? input : new BinaryReader7(input);
+    const reader = input instanceof BinaryReader8 ? input : new BinaryReader8(input);
     let end = length === void 0 ? reader.len : reader.pos + length;
     const message = createBaseListSparkTxsRequest();
     while (reader.pos < end) {
@@ -20614,14 +21594,14 @@ var ListSparkTxsRequest = {
   },
   fromJSON(object) {
     return {
-      pageToken: isSet6(object.pageToken) ? bytesFromBase645(object.pageToken) : void 0,
-      pageSize: isSet6(object.pageSize) ? globalThis.Number(object.pageSize) : void 0
+      pageToken: isSet7(object.pageToken) ? bytesFromBase646(object.pageToken) : void 0,
+      pageSize: isSet7(object.pageSize) ? globalThis.Number(object.pageSize) : void 0
     };
   },
   toJSON(message) {
     const obj = {};
     if (message.pageToken !== void 0) {
-      obj.pageToken = base64FromBytes5(message.pageToken);
+      obj.pageToken = base64FromBytes6(message.pageToken);
     }
     if (message.pageSize !== void 0) {
       obj.pageSize = Math.round(message.pageSize);
@@ -20642,7 +21622,7 @@ function createBaseListWithdrawnOutputsRequest() {
   return { blockhash: void 0, pageToken: void 0, pageSize: void 0 };
 }
 var ListWithdrawnOutputsRequest = {
-  encode(message, writer = new BinaryWriter7()) {
+  encode(message, writer = new BinaryWriter8()) {
     if (message.blockhash !== void 0) {
       writer.uint32(10).bytes(message.blockhash);
     }
@@ -20655,7 +21635,7 @@ var ListWithdrawnOutputsRequest = {
     return writer;
   },
   decode(input, length) {
-    const reader = input instanceof BinaryReader7 ? input : new BinaryReader7(input);
+    const reader = input instanceof BinaryReader8 ? input : new BinaryReader8(input);
     let end = length === void 0 ? reader.len : reader.pos + length;
     const message = createBaseListWithdrawnOutputsRequest();
     while (reader.pos < end) {
@@ -20692,15 +21672,15 @@ var ListWithdrawnOutputsRequest = {
   },
   fromJSON(object) {
     return {
-      blockhash: isSet6(object.blockhash) ? bytesFromBase645(object.blockhash) : void 0,
-      pageToken: isSet6(object.pageToken) ? globalThis.String(object.pageToken) : void 0,
-      pageSize: isSet6(object.pageSize) ? globalThis.Number(object.pageSize) : void 0
+      blockhash: isSet7(object.blockhash) ? bytesFromBase646(object.blockhash) : void 0,
+      pageToken: isSet7(object.pageToken) ? globalThis.String(object.pageToken) : void 0,
+      pageSize: isSet7(object.pageSize) ? globalThis.Number(object.pageSize) : void 0
     };
   },
   toJSON(message) {
     const obj = {};
     if (message.blockhash !== void 0) {
-      obj.blockhash = base64FromBytes5(message.blockhash);
+      obj.blockhash = base64FromBytes6(message.blockhash);
     }
     if (message.pageToken !== void 0) {
       obj.pageToken = message.pageToken;
@@ -20725,7 +21705,7 @@ function createBaseListSparkTxsResponse() {
   return { tokenTransactions: [], nextPageToken: void 0 };
 }
 var ListSparkTxsResponse = {
-  encode(message, writer = new BinaryWriter7()) {
+  encode(message, writer = new BinaryWriter8()) {
     for (const v of message.tokenTransactions) {
       TokenTransactionResponse.encode(v, writer.uint32(10).fork()).join();
     }
@@ -20735,7 +21715,7 @@ var ListSparkTxsResponse = {
     return writer;
   },
   decode(input, length) {
-    const reader = input instanceof BinaryReader7 ? input : new BinaryReader7(input);
+    const reader = input instanceof BinaryReader8 ? input : new BinaryReader8(input);
     let end = length === void 0 ? reader.len : reader.pos + length;
     const message = createBaseListSparkTxsResponse();
     while (reader.pos < end) {
@@ -20766,7 +21746,7 @@ var ListSparkTxsResponse = {
   fromJSON(object) {
     return {
       tokenTransactions: globalThis.Array.isArray(object?.tokenTransactions) ? object.tokenTransactions.map((e) => TokenTransactionResponse.fromJSON(e)) : [],
-      nextPageToken: isSet6(object.nextPageToken) ? bytesFromBase645(object.nextPageToken) : void 0
+      nextPageToken: isSet7(object.nextPageToken) ? bytesFromBase646(object.nextPageToken) : void 0
     };
   },
   toJSON(message) {
@@ -20775,7 +21755,7 @@ var ListSparkTxsResponse = {
       obj.tokenTransactions = message.tokenTransactions.map((e) => TokenTransactionResponse.toJSON(e));
     }
     if (message.nextPageToken !== void 0) {
-      obj.nextPageToken = base64FromBytes5(message.nextPageToken);
+      obj.nextPageToken = base64FromBytes6(message.nextPageToken);
     }
     return obj;
   },
@@ -20793,9 +21773,9 @@ function createBaseListWithdrawnOutputsResponse() {
   return { outputs: [], nextPageToken: void 0 };
 }
 var ListWithdrawnOutputsResponse = {
-  encode(message, writer = new BinaryWriter7()) {
+  encode(message, writer = new BinaryWriter8()) {
     for (const v of message.outputs) {
-      TokenOutput2.encode(v, writer.uint32(10).fork()).join();
+      TokenOutput3.encode(v, writer.uint32(10).fork()).join();
     }
     if (message.nextPageToken !== void 0) {
       writer.uint32(18).string(message.nextPageToken);
@@ -20803,7 +21783,7 @@ var ListWithdrawnOutputsResponse = {
     return writer;
   },
   decode(input, length) {
-    const reader = input instanceof BinaryReader7 ? input : new BinaryReader7(input);
+    const reader = input instanceof BinaryReader8 ? input : new BinaryReader8(input);
     let end = length === void 0 ? reader.len : reader.pos + length;
     const message = createBaseListWithdrawnOutputsResponse();
     while (reader.pos < end) {
@@ -20813,7 +21793,7 @@ var ListWithdrawnOutputsResponse = {
           if (tag !== 10) {
             break;
           }
-          message.outputs.push(TokenOutput2.decode(reader, reader.uint32()));
+          message.outputs.push(TokenOutput3.decode(reader, reader.uint32()));
           continue;
         }
         case 2: {
@@ -20833,14 +21813,14 @@ var ListWithdrawnOutputsResponse = {
   },
   fromJSON(object) {
     return {
-      outputs: globalThis.Array.isArray(object?.outputs) ? object.outputs.map((e) => TokenOutput2.fromJSON(e)) : [],
-      nextPageToken: isSet6(object.nextPageToken) ? globalThis.String(object.nextPageToken) : void 0
+      outputs: globalThis.Array.isArray(object?.outputs) ? object.outputs.map((e) => TokenOutput3.fromJSON(e)) : [],
+      nextPageToken: isSet7(object.nextPageToken) ? globalThis.String(object.nextPageToken) : void 0
     };
   },
   toJSON(message) {
     const obj = {};
     if (message.outputs?.length) {
-      obj.outputs = message.outputs.map((e) => TokenOutput2.toJSON(e));
+      obj.outputs = message.outputs.map((e) => TokenOutput3.toJSON(e));
     }
     if (message.nextPageToken !== void 0) {
       obj.nextPageToken = message.nextPageToken;
@@ -20852,7 +21832,7 @@ var ListWithdrawnOutputsResponse = {
   },
   fromPartial(object) {
     const message = createBaseListWithdrawnOutputsResponse();
-    message.outputs = object.outputs?.map((e) => TokenOutput2.fromPartial(e)) || [];
+    message.outputs = object.outputs?.map((e) => TokenOutput3.fromPartial(e)) || [];
     message.nextPageToken = object.nextPageToken ?? void 0;
     return message;
   }
@@ -20861,14 +21841,14 @@ function createBaseGetSparkTxResponse() {
   return { finalTokenTransaction: void 0 };
 }
 var GetSparkTxResponse = {
-  encode(message, writer = new BinaryWriter7()) {
+  encode(message, writer = new BinaryWriter8()) {
     if (message.finalTokenTransaction !== void 0) {
       TokenTransaction.encode(message.finalTokenTransaction, writer.uint32(10).fork()).join();
     }
     return writer;
   },
   decode(input, length) {
-    const reader = input instanceof BinaryReader7 ? input : new BinaryReader7(input);
+    const reader = input instanceof BinaryReader8 ? input : new BinaryReader8(input);
     let end = length === void 0 ? reader.len : reader.pos + length;
     const message = createBaseGetSparkTxResponse();
     while (reader.pos < end) {
@@ -20891,7 +21871,7 @@ var GetSparkTxResponse = {
   },
   fromJSON(object) {
     return {
-      finalTokenTransaction: isSet6(object.finalTokenTransaction) ? TokenTransaction.fromJSON(object.finalTokenTransaction) : void 0
+      finalTokenTransaction: isSet7(object.finalTokenTransaction) ? TokenTransaction.fromJSON(object.finalTokenTransaction) : void 0
     };
   },
   toJSON(message) {
@@ -20914,7 +21894,7 @@ function createBaseFreezeTokensRequest2() {
   return { freezeTokensPayload: void 0, issuerSignature: new Uint8Array(0) };
 }
 var FreezeTokensRequest2 = {
-  encode(message, writer = new BinaryWriter7()) {
+  encode(message, writer = new BinaryWriter8()) {
     if (message.freezeTokensPayload !== void 0) {
       FreezeTokensPayload2.encode(message.freezeTokensPayload, writer.uint32(10).fork()).join();
     }
@@ -20924,7 +21904,7 @@ var FreezeTokensRequest2 = {
     return writer;
   },
   decode(input, length) {
-    const reader = input instanceof BinaryReader7 ? input : new BinaryReader7(input);
+    const reader = input instanceof BinaryReader8 ? input : new BinaryReader8(input);
     let end = length === void 0 ? reader.len : reader.pos + length;
     const message = createBaseFreezeTokensRequest2();
     while (reader.pos < end) {
@@ -20954,8 +21934,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: isSet7(object.freezeTokensPayload) ? FreezeTokensPayload2.fromJSON(object.freezeTokensPayload) : void 0,
+      issuerSignature: isSet7(object.issuerSignature) ? bytesFromBase646(object.issuerSignature) : new Uint8Array(0)
     };
   },
   toJSON(message) {
@@ -20964,7 +21944,7 @@ var FreezeTokensRequest2 = {
       obj.freezeTokensPayload = FreezeTokensPayload2.toJSON(message.freezeTokensPayload);
     }
     if (message.issuerSignature.length !== 0) {
-      obj.issuerSignature = base64FromBytes5(message.issuerSignature);
+      obj.issuerSignature = base64FromBytes6(message.issuerSignature);
     }
     return obj;
   },
@@ -20982,7 +21962,7 @@ function createBaseFreezeTokensResponse2() {
   return { impactedOutputIds: [], impactedTokenAmount: [] };
 }
 var FreezeTokensResponse2 = {
-  encode(message, writer = new BinaryWriter7()) {
+  encode(message, writer = new BinaryWriter8()) {
     for (const v of message.impactedOutputIds) {
       writer.uint32(10).string(v);
     }
@@ -20992,7 +21972,7 @@ var FreezeTokensResponse2 = {
     return writer;
   },
   decode(input, length) {
-    const reader = input instanceof BinaryReader7 ? input : new BinaryReader7(input);
+    const reader = input instanceof BinaryReader8 ? input : new BinaryReader8(input);
     let end = length === void 0 ? reader.len : reader.pos + length;
     const message = createBaseFreezeTokensResponse2();
     while (reader.pos < end) {
@@ -21023,7 +22003,7 @@ var FreezeTokensResponse2 = {
   fromJSON(object) {
     return {
       impactedOutputIds: globalThis.Array.isArray(object?.impactedOutputIds) ? object.impactedOutputIds.map((e) => globalThis.String(e)) : [],
-      impactedTokenAmount: globalThis.Array.isArray(object?.impactedTokenAmount) ? object.impactedTokenAmount.map((e) => bytesFromBase645(e)) : []
+      impactedTokenAmount: globalThis.Array.isArray(object?.impactedTokenAmount) ? object.impactedTokenAmount.map((e) => bytesFromBase646(e)) : []
     };
   },
   toJSON(message) {
@@ -21032,7 +22012,7 @@ var FreezeTokensResponse2 = {
       obj.impactedOutputIds = message.impactedOutputIds;
     }
     if (message.impactedTokenAmount?.length) {
-      obj.impactedTokenAmount = message.impactedTokenAmount.map((e) => base64FromBytes5(e));
+      obj.impactedTokenAmount = message.impactedTokenAmount.map((e) => base64FromBytes6(e));
     }
     return obj;
   },
@@ -21058,7 +22038,7 @@ function createBaseListAllTokenTransactionsRequest() {
   };
 }
 var ListAllTokenTransactionsRequest = {
-  encode(message, writer = new BinaryWriter7()) {
+  encode(message, writer = new BinaryWriter8()) {
     if (message.cursor !== void 0) {
       ListAllTokenTransactionsCursor.encode(message.cursor, writer.uint32(10).fork()).join();
     }
@@ -21072,10 +22052,10 @@ var ListAllTokenTransactionsRequest = {
       writer.uint32(34).bytes(message.tokenPublicKey);
     }
     if (message.beforeTimestamp !== void 0) {
-      Timestamp.encode(toTimestamp2(message.beforeTimestamp), writer.uint32(42).fork()).join();
+      Timestamp.encode(toTimestamp3(message.beforeTimestamp), writer.uint32(42).fork()).join();
     }
     if (message.afterTimestamp !== void 0) {
-      Timestamp.encode(toTimestamp2(message.afterTimestamp), writer.uint32(50).fork()).join();
+      Timestamp.encode(toTimestamp3(message.afterTimestamp), writer.uint32(50).fork()).join();
     }
     writer.uint32(58).fork();
     for (const v of message.operationTypes) {
@@ -21085,7 +22065,7 @@ var ListAllTokenTransactionsRequest = {
     return writer;
   },
   decode(input, length) {
-    const reader = input instanceof BinaryReader7 ? input : new BinaryReader7(input);
+    const reader = input instanceof BinaryReader8 ? input : new BinaryReader8(input);
     let end = length === void 0 ? reader.len : reader.pos + length;
     const message = createBaseListAllTokenTransactionsRequest();
     while (reader.pos < end) {
@@ -21123,14 +22103,14 @@ var ListAllTokenTransactionsRequest = {
           if (tag !== 42) {
             break;
           }
-          message.beforeTimestamp = fromTimestamp2(Timestamp.decode(reader, reader.uint32()));
+          message.beforeTimestamp = fromTimestamp3(Timestamp.decode(reader, reader.uint32()));
           continue;
         }
         case 6: {
           if (tag !== 50) {
             break;
           }
-          message.afterTimestamp = fromTimestamp2(Timestamp.decode(reader, reader.uint32()));
+          message.afterTimestamp = fromTimestamp3(Timestamp.decode(reader, reader.uint32()));
           continue;
         }
         case 7: {
@@ -21157,12 +22137,12 @@ var ListAllTokenTransactionsRequest = {
   },
   fromJSON(object) {
     return {
-      cursor: isSet6(object.cursor) ? ListAllTokenTransactionsCursor.fromJSON(object.cursor) : void 0,
-      pageSize: isSet6(object.pageSize) ? globalThis.Number(object.pageSize) : void 0,
-      ownerPublicKey: isSet6(object.ownerPublicKey) ? bytesFromBase645(object.ownerPublicKey) : void 0,
-      tokenPublicKey: isSet6(object.tokenPublicKey) ? bytesFromBase645(object.tokenPublicKey) : void 0,
-      beforeTimestamp: isSet6(object.beforeTimestamp) ? fromJsonTimestamp2(object.beforeTimestamp) : void 0,
-      afterTimestamp: isSet6(object.afterTimestamp) ? fromJsonTimestamp2(object.afterTimestamp) : void 0,
+      cursor: isSet7(object.cursor) ? ListAllTokenTransactionsCursor.fromJSON(object.cursor) : void 0,
+      pageSize: isSet7(object.pageSize) ? globalThis.Number(object.pageSize) : void 0,
+      ownerPublicKey: isSet7(object.ownerPublicKey) ? bytesFromBase646(object.ownerPublicKey) : void 0,
+      tokenPublicKey: isSet7(object.tokenPublicKey) ? bytesFromBase646(object.tokenPublicKey) : void 0,
+      beforeTimestamp: isSet7(object.beforeTimestamp) ? fromJsonTimestamp3(object.beforeTimestamp) : void 0,
+      afterTimestamp: isSet7(object.afterTimestamp) ? fromJsonTimestamp3(object.afterTimestamp) : void 0,
       operationTypes: globalThis.Array.isArray(object?.operationTypes) ? object.operationTypes.map((e) => operationTypeFromJSON(e)) : []
     };
   },
@@ -21175,10 +22155,10 @@ var ListAllTokenTransactionsRequest = {
       obj.pageSize = Math.round(message.pageSize);
     }
     if (message.ownerPublicKey !== void 0) {
-      obj.ownerPublicKey = base64FromBytes5(message.ownerPublicKey);
+      obj.ownerPublicKey = base64FromBytes6(message.ownerPublicKey);
     }
     if (message.tokenPublicKey !== void 0) {
-      obj.tokenPublicKey = base64FromBytes5(message.tokenPublicKey);
+      obj.tokenPublicKey = base64FromBytes6(message.tokenPublicKey);
     }
     if (message.beforeTimestamp !== void 0) {
       obj.beforeTimestamp = message.beforeTimestamp.toISOString();
@@ -21210,7 +22190,7 @@ function createBaseListAllTokenTransactionsResponse() {
   return { transactions: [], nextCursor: void 0 };
 }
 var ListAllTokenTransactionsResponse = {
-  encode(message, writer = new BinaryWriter7()) {
+  encode(message, writer = new BinaryWriter8()) {
     for (const v of message.transactions) {
       Transaction6.encode(v, writer.uint32(10).fork()).join();
     }
@@ -21220,7 +22200,7 @@ var ListAllTokenTransactionsResponse = {
     return writer;
   },
   decode(input, length) {
-    const reader = input instanceof BinaryReader7 ? input : new BinaryReader7(input);
+    const reader = input instanceof BinaryReader8 ? input : new BinaryReader8(input);
     let end = length === void 0 ? reader.len : reader.pos + length;
     const message = createBaseListAllTokenTransactionsResponse();
     while (reader.pos < end) {
@@ -21251,7 +22231,7 @@ var ListAllTokenTransactionsResponse = {
   fromJSON(object) {
     return {
       transactions: globalThis.Array.isArray(object?.transactions) ? object.transactions.map((e) => Transaction6.fromJSON(e)) : [],
-      nextCursor: isSet6(object.nextCursor) ? ListAllTokenTransactionsCursor.fromJSON(object.nextCursor) : void 0
+      nextCursor: isSet7(object.nextCursor) ? ListAllTokenTransactionsCursor.fromJSON(object.nextCursor) : void 0
     };
   },
   toJSON(message) {
@@ -21278,14 +22258,14 @@ function createBaseBlockInfoResponse() {
   return { blockInfo: void 0 };
 }
 var BlockInfoResponse = {
-  encode(message, writer = new BinaryWriter7()) {
+  encode(message, writer = new BinaryWriter8()) {
     if (message.blockInfo !== void 0) {
       BlockInfo.encode(message.blockInfo, writer.uint32(10).fork()).join();
     }
     return writer;
   },
   decode(input, length) {
-    const reader = input instanceof BinaryReader7 ? input : new BinaryReader7(input);
+    const reader = input instanceof BinaryReader8 ? input : new BinaryReader8(input);
     let end = length === void 0 ? reader.len : reader.pos + length;
     const message = createBaseBlockInfoResponse();
     while (reader.pos < end) {
@@ -21307,7 +22287,7 @@ var BlockInfoResponse = {
     return message;
   },
   fromJSON(object) {
-    return { blockInfo: isSet6(object.blockInfo) ? BlockInfo.fromJSON(object.blockInfo) : void 0 };
+    return { blockInfo: isSet7(object.blockInfo) ? BlockInfo.fromJSON(object.blockInfo) : void 0 };
   },
   toJSON(message) {
     const obj = {};
@@ -21329,7 +22309,7 @@ function createBaseSendRawTxRequest() {
   return { tx: "", maxBurnAmount: void 0 };
 }
 var SendRawTxRequest = {
-  encode(message, writer = new BinaryWriter7()) {
+  encode(message, writer = new BinaryWriter8()) {
     if (message.tx !== "") {
       writer.uint32(10).string(message.tx);
     }
@@ -21339,7 +22319,7 @@ var SendRawTxRequest = {
     return writer;
   },
   decode(input, length) {
-    const reader = input instanceof BinaryReader7 ? input : new BinaryReader7(input);
+    const reader = input instanceof BinaryReader8 ? input : new BinaryReader8(input);
     let end = length === void 0 ? reader.len : reader.pos + length;
     const message = createBaseSendRawTxRequest();
     while (reader.pos < end) {
@@ -21356,7 +22336,7 @@ var SendRawTxRequest = {
           if (tag !== 16) {
             break;
           }
-          message.maxBurnAmount = longToNumber4(reader.uint64());
+          message.maxBurnAmount = longToNumber5(reader.uint64());
           continue;
         }
       }
@@ -21369,8 +22349,8 @@ var SendRawTxRequest = {
   },
   fromJSON(object) {
     return {
-      tx: isSet6(object.tx) ? globalThis.String(object.tx) : "",
-      maxBurnAmount: isSet6(object.maxBurnAmount) ? globalThis.Number(object.maxBurnAmount) : void 0
+      tx: isSet7(object.tx) ? globalThis.String(object.tx) : "",
+      maxBurnAmount: isSet7(object.maxBurnAmount) ? globalThis.Number(object.maxBurnAmount) : void 0
     };
   },
   toJSON(message) {
@@ -21397,14 +22377,14 @@ function createBaseGetTokenPubkeyInfoRequest() {
   return { publicKeys: [] };
 }
 var GetTokenPubkeyInfoRequest = {
-  encode(message, writer = new BinaryWriter7()) {
+  encode(message, writer = new BinaryWriter8()) {
     for (const v of message.publicKeys) {
       writer.uint32(10).bytes(v);
     }
     return writer;
   },
   decode(input, length) {
-    const reader = input instanceof BinaryReader7 ? input : new BinaryReader7(input);
+    const reader = input instanceof BinaryReader8 ? input : new BinaryReader8(input);
     let end = length === void 0 ? reader.len : reader.pos + length;
     const message = createBaseGetTokenPubkeyInfoRequest();
     while (reader.pos < end) {
@@ -21427,13 +22407,13 @@ var GetTokenPubkeyInfoRequest = {
   },
   fromJSON(object) {
     return {
-      publicKeys: globalThis.Array.isArray(object?.publicKeys) ? object.publicKeys.map((e) => bytesFromBase645(e)) : []
+      publicKeys: globalThis.Array.isArray(object?.publicKeys) ? object.publicKeys.map((e) => bytesFromBase646(e)) : []
     };
   },
   toJSON(message) {
     const obj = {};
     if (message.publicKeys?.length) {
-      obj.publicKeys = message.publicKeys.map((e) => base64FromBytes5(e));
+      obj.publicKeys = message.publicKeys.map((e) => base64FromBytes6(e));
     }
     return obj;
   },
@@ -21450,14 +22430,14 @@ function createBaseGetTokenPubkeyInfoResponse() {
   return { tokenPubkeyInfos: [] };
 }
 var GetTokenPubkeyInfoResponse = {
-  encode(message, writer = new BinaryWriter7()) {
+  encode(message, writer = new BinaryWriter8()) {
     for (const v of message.tokenPubkeyInfos) {
       TokenPubkeyInfo.encode(v, writer.uint32(10).fork()).join();
     }
     return writer;
   },
   decode(input, length) {
-    const reader = input instanceof BinaryReader7 ? input : new BinaryReader7(input);
+    const reader = input instanceof BinaryReader8 ? input : new BinaryReader8(input);
     let end = length === void 0 ? reader.len : reader.pos + length;
     const message = createBaseGetTokenPubkeyInfoResponse();
     while (reader.pos < end) {
@@ -21503,7 +22483,7 @@ function createBaseTokenPubkeyInfo() {
   return { announcement: void 0, totalSupply: new Uint8Array(0), owner: void 0, logoUrl: void 0 };
 }
 var TokenPubkeyInfo = {
-  encode(message, writer = new BinaryWriter7()) {
+  encode(message, writer = new BinaryWriter8()) {
     if (message.announcement !== void 0) {
       TokenPubkeyAnnouncement.encode(message.announcement, writer.uint32(10).fork()).join();
     }
@@ -21519,7 +22499,7 @@ var TokenPubkeyInfo = {
     return writer;
   },
   decode(input, length) {
-    const reader = input instanceof BinaryReader7 ? input : new BinaryReader7(input);
+    const reader = input instanceof BinaryReader8 ? input : new BinaryReader8(input);
     let end = length === void 0 ? reader.len : reader.pos + length;
     const message = createBaseTokenPubkeyInfo();
     while (reader.pos < end) {
@@ -21563,10 +22543,10 @@ var TokenPubkeyInfo = {
   },
   fromJSON(object) {
     return {
-      announcement: isSet6(object.announcement) ? TokenPubkeyAnnouncement.fromJSON(object.announcement) : void 0,
-      totalSupply: isSet6(object.totalSupply) ? bytesFromBase645(object.totalSupply) : new Uint8Array(0),
-      owner: isSet6(object.owner) ? bytesFromBase645(object.owner) : void 0,
-      logoUrl: isSet6(object.logoUrl) ? globalThis.String(object.logoUrl) : void 0
+      announcement: isSet7(object.announcement) ? TokenPubkeyAnnouncement.fromJSON(object.announcement) : void 0,
+      totalSupply: isSet7(object.totalSupply) ? bytesFromBase646(object.totalSupply) : new Uint8Array(0),
+      owner: isSet7(object.owner) ? bytesFromBase646(object.owner) : void 0,
+      logoUrl: isSet7(object.logoUrl) ? globalThis.String(object.logoUrl) : void 0
     };
   },
   toJSON(message) {
@@ -21575,10 +22555,10 @@ var TokenPubkeyInfo = {
       obj.announcement = TokenPubkeyAnnouncement.toJSON(message.announcement);
     }
     if (message.totalSupply.length !== 0) {
-      obj.totalSupply = base64FromBytes5(message.totalSupply);
+      obj.totalSupply = base64FromBytes6(message.totalSupply);
     }
     if (message.owner !== void 0) {
-      obj.owner = base64FromBytes5(message.owner);
+      obj.owner = base64FromBytes6(message.owner);
     }
     if (message.logoUrl !== void 0) {
       obj.logoUrl = message.logoUrl;
@@ -21597,7 +22577,7 @@ var TokenPubkeyInfo = {
     return message;
   }
 };
-function createBaseTokenOutput2() {
+function createBaseTokenOutput3() {
   return {
     id: "",
     ownerPublicKey: new Uint8Array(0),
@@ -21609,8 +22589,8 @@ function createBaseTokenOutput2() {
     isFrozen: void 0
   };
 }
-var TokenOutput2 = {
-  encode(message, writer = new BinaryWriter7()) {
+var TokenOutput3 = {
+  encode(message, writer = new BinaryWriter8()) {
     if (message.id !== "") {
       writer.uint32(10).string(message.id);
     }
@@ -21638,9 +22618,9 @@ var TokenOutput2 = {
     return writer;
   },
   decode(input, length) {
-    const reader = input instanceof BinaryReader7 ? input : new BinaryReader7(input);
+    const reader = input instanceof BinaryReader8 ? input : new BinaryReader8(input);
     let end = length === void 0 ? reader.len : reader.pos + length;
-    const message = createBaseTokenOutput2();
+    const message = createBaseTokenOutput3();
     while (reader.pos < end) {
       const tag = reader.uint32();
       switch (tag >>> 3) {
@@ -21669,14 +22649,14 @@ var TokenOutput2 = {
           if (tag !== 32) {
             break;
           }
-          message.withdrawalBondSats = longToNumber4(reader.uint64());
+          message.withdrawalBondSats = longToNumber5(reader.uint64());
           continue;
         }
         case 5: {
           if (tag !== 40) {
             break;
           }
-          message.withdrawalLocktime = longToNumber4(reader.uint64());
+          message.withdrawalLocktime = longToNumber5(reader.uint64());
           continue;
         }
         case 6: {
@@ -21710,14 +22690,14 @@ var TokenOutput2 = {
   },
   fromJSON(object) {
     return {
-      id: isSet6(object.id) ? globalThis.String(object.id) : "",
-      ownerPublicKey: isSet6(object.ownerPublicKey) ? bytesFromBase645(object.ownerPublicKey) : new Uint8Array(0),
-      revocationCommitment: isSet6(object.revocationCommitment) ? bytesFromBase645(object.revocationCommitment) : new Uint8Array(0),
-      withdrawalBondSats: isSet6(object.withdrawalBondSats) ? globalThis.Number(object.withdrawalBondSats) : 0,
-      withdrawalLocktime: isSet6(object.withdrawalLocktime) ? globalThis.Number(object.withdrawalLocktime) : 0,
-      tokenPublicKey: isSet6(object.tokenPublicKey) ? bytesFromBase645(object.tokenPublicKey) : new Uint8Array(0),
-      tokenAmount: isSet6(object.tokenAmount) ? bytesFromBase645(object.tokenAmount) : new Uint8Array(0),
-      isFrozen: isSet6(object.isFrozen) ? globalThis.Boolean(object.isFrozen) : void 0
+      id: isSet7(object.id) ? globalThis.String(object.id) : "",
+      ownerPublicKey: isSet7(object.ownerPublicKey) ? bytesFromBase646(object.ownerPublicKey) : new Uint8Array(0),
+      revocationCommitment: isSet7(object.revocationCommitment) ? bytesFromBase646(object.revocationCommitment) : new Uint8Array(0),
+      withdrawalBondSats: isSet7(object.withdrawalBondSats) ? globalThis.Number(object.withdrawalBondSats) : 0,
+      withdrawalLocktime: isSet7(object.withdrawalLocktime) ? globalThis.Number(object.withdrawalLocktime) : 0,
+      tokenPublicKey: isSet7(object.tokenPublicKey) ? bytesFromBase646(object.tokenPublicKey) : new Uint8Array(0),
+      tokenAmount: isSet7(object.tokenAmount) ? bytesFromBase646(object.tokenAmount) : new Uint8Array(0),
+      isFrozen: isSet7(object.isFrozen) ? globalThis.Boolean(object.isFrozen) : void 0
     };
   },
   toJSON(message) {
@@ -21726,10 +22706,10 @@ var TokenOutput2 = {
       obj.id = message.id;
     }
     if (message.ownerPublicKey.length !== 0) {
-      obj.ownerPublicKey = base64FromBytes5(message.ownerPublicKey);
+      obj.ownerPublicKey = base64FromBytes6(message.ownerPublicKey);
     }
     if (message.revocationCommitment.length !== 0) {
-      obj.revocationCommitment = base64FromBytes5(message.revocationCommitment);
+      obj.revocationCommitment = base64FromBytes6(message.revocationCommitment);
     }
     if (message.withdrawalBondSats !== 0) {
       obj.withdrawalBondSats = Math.round(message.withdrawalBondSats);
@@ -21738,10 +22718,10 @@ var TokenOutput2 = {
       obj.withdrawalLocktime = Math.round(message.withdrawalLocktime);
     }
     if (message.tokenPublicKey.length !== 0) {
-      obj.tokenPublicKey = base64FromBytes5(message.tokenPublicKey);
+      obj.tokenPublicKey = base64FromBytes6(message.tokenPublicKey);
     }
     if (message.tokenAmount.length !== 0) {
-      obj.tokenAmount = base64FromBytes5(message.tokenAmount);
+      obj.tokenAmount = base64FromBytes6(message.tokenAmount);
     }
     if (message.isFrozen !== void 0) {
       obj.isFrozen = message.isFrozen;
@@ -21749,10 +22729,10 @@ var TokenOutput2 = {
     return obj;
   },
   create(base) {
-    return TokenOutput2.fromPartial(base ?? {});
+    return TokenOutput3.fromPartial(base ?? {});
   },
   fromPartial(object) {
-    const message = createBaseTokenOutput2();
+    const message = createBaseTokenOutput3();
     message.id = object.id ?? "";
     message.ownerPublicKey = object.ownerPublicKey ?? new Uint8Array(0);
     message.revocationCommitment = object.revocationCommitment ?? new Uint8Array(0);
@@ -21774,7 +22754,7 @@ function createBaseFreezeTokensPayload2() {
   };
 }
 var FreezeTokensPayload2 = {
-  encode(message, writer = new BinaryWriter7()) {
+  encode(message, writer = new BinaryWriter8()) {
     if (message.ownerPublicKey.length !== 0) {
       writer.uint32(10).bytes(message.ownerPublicKey);
     }
@@ -21793,7 +22773,7 @@ var FreezeTokensPayload2 = {
     return writer;
   },
   decode(input, length) {
-    const reader = input instanceof BinaryReader7 ? input : new BinaryReader7(input);
+    const reader = input instanceof BinaryReader8 ? input : new BinaryReader8(input);
     let end = length === void 0 ? reader.len : reader.pos + length;
     const message = createBaseFreezeTokensPayload2();
     while (reader.pos < end) {
@@ -21817,7 +22797,7 @@ var FreezeTokensPayload2 = {
           if (tag !== 24) {
             break;
           }
-          message.timestamp = longToNumber4(reader.uint64());
+          message.timestamp = longToNumber5(reader.uint64());
           continue;
         }
         case 4: {
@@ -21844,26 +22824,26 @@ var FreezeTokensPayload2 = {
   },
   fromJSON(object) {
     return {
-      ownerPublicKey: isSet6(object.ownerPublicKey) ? bytesFromBase645(object.ownerPublicKey) : new Uint8Array(0),
-      tokenPublicKey: isSet6(object.tokenPublicKey) ? bytesFromBase645(object.tokenPublicKey) : new Uint8Array(0),
-      timestamp: isSet6(object.timestamp) ? globalThis.Number(object.timestamp) : 0,
-      operatorIdentityPublicKey: isSet6(object.operatorIdentityPublicKey) ? bytesFromBase645(object.operatorIdentityPublicKey) : new Uint8Array(0),
-      shouldUnfreeze: isSet6(object.shouldUnfreeze) ? globalThis.Boolean(object.shouldUnfreeze) : false
+      ownerPublicKey: isSet7(object.ownerPublicKey) ? bytesFromBase646(object.ownerPublicKey) : new Uint8Array(0),
+      tokenPublicKey: isSet7(object.tokenPublicKey) ? bytesFromBase646(object.tokenPublicKey) : new Uint8Array(0),
+      timestamp: isSet7(object.timestamp) ? globalThis.Number(object.timestamp) : 0,
+      operatorIdentityPublicKey: isSet7(object.operatorIdentityPublicKey) ? bytesFromBase646(object.operatorIdentityPublicKey) : new Uint8Array(0),
+      shouldUnfreeze: isSet7(object.shouldUnfreeze) ? globalThis.Boolean(object.shouldUnfreeze) : false
     };
   },
   toJSON(message) {
     const obj = {};
     if (message.ownerPublicKey.length !== 0) {
-      obj.ownerPublicKey = base64FromBytes5(message.ownerPublicKey);
+      obj.ownerPublicKey = base64FromBytes6(message.ownerPublicKey);
     }
     if (message.tokenPublicKey.length !== 0) {
-      obj.tokenPublicKey = base64FromBytes5(message.tokenPublicKey);
+      obj.tokenPublicKey = base64FromBytes6(message.tokenPublicKey);
     }
     if (message.timestamp !== 0) {
       obj.timestamp = Math.round(message.timestamp);
     }
     if (message.operatorIdentityPublicKey.length !== 0) {
-      obj.operatorIdentityPublicKey = base64FromBytes5(message.operatorIdentityPublicKey);
+      obj.operatorIdentityPublicKey = base64FromBytes6(message.operatorIdentityPublicKey);
     }
     if (message.shouldUnfreeze !== false) {
       obj.shouldUnfreeze = message.shouldUnfreeze;
@@ -21887,7 +22867,7 @@ function createBaseTokenTransactionResponse() {
   return { finalized: false, finalTokenTransaction: void 0, finalTokenTransactionHash: new Uint8Array(0) };
 }
 var TokenTransactionResponse = {
-  encode(message, writer = new BinaryWriter7()) {
+  encode(message, writer = new BinaryWriter8()) {
     if (message.finalized !== false) {
       writer.uint32(8).bool(message.finalized);
     }
@@ -21900,7 +22880,7 @@ var TokenTransactionResponse = {
     return writer;
   },
   decode(input, length) {
-    const reader = input instanceof BinaryReader7 ? input : new BinaryReader7(input);
+    const reader = input instanceof BinaryReader8 ? input : new BinaryReader8(input);
     let end = length === void 0 ? reader.len : reader.pos + length;
     const message = createBaseTokenTransactionResponse();
     while (reader.pos < end) {
@@ -21937,9 +22917,9 @@ var TokenTransactionResponse = {
   },
   fromJSON(object) {
     return {
-      finalized: isSet6(object.finalized) ? globalThis.Boolean(object.finalized) : false,
-      finalTokenTransaction: isSet6(object.finalTokenTransaction) ? TokenTransaction.fromJSON(object.finalTokenTransaction) : void 0,
-      finalTokenTransactionHash: isSet6(object.finalTokenTransactionHash) ? bytesFromBase645(object.finalTokenTransactionHash) : new Uint8Array(0)
+      finalized: isSet7(object.finalized) ? globalThis.Boolean(object.finalized) : false,
+      finalTokenTransaction: isSet7(object.finalTokenTransaction) ? TokenTransaction.fromJSON(object.finalTokenTransaction) : void 0,
+      finalTokenTransactionHash: isSet7(object.finalTokenTransactionHash) ? bytesFromBase646(object.finalTokenTransactionHash) : new Uint8Array(0)
     };
   },
   toJSON(message) {
@@ -21951,7 +22931,7 @@ var TokenTransactionResponse = {
       obj.finalTokenTransaction = TokenTransaction.toJSON(message.finalTokenTransaction);
     }
     if (message.finalTokenTransactionHash.length !== 0) {
-      obj.finalTokenTransactionHash = base64FromBytes5(message.finalTokenTransactionHash);
+      obj.finalTokenTransactionHash = base64FromBytes6(message.finalTokenTransactionHash);
     }
     return obj;
   },
@@ -21970,7 +22950,7 @@ function createBaseTransaction() {
   return { transaction: void 0 };
 }
 var Transaction6 = {
-  encode(message, writer = new BinaryWriter7()) {
+  encode(message, writer = new BinaryWriter8()) {
     switch (message.transaction?.$case) {
       case "onChain":
         OnChainTransaction.encode(message.transaction.onChain, writer.uint32(10).fork()).join();
@@ -21982,7 +22962,7 @@ var Transaction6 = {
     return writer;
   },
   decode(input, length) {
-    const reader = input instanceof BinaryReader7 ? input : new BinaryReader7(input);
+    const reader = input instanceof BinaryReader8 ? input : new BinaryReader8(input);
     let end = length === void 0 ? reader.len : reader.pos + length;
     const message = createBaseTransaction();
     while (reader.pos < end) {
@@ -22012,7 +22992,7 @@ var Transaction6 = {
   },
   fromJSON(object) {
     return {
-      transaction: isSet6(object.onChain) ? { $case: "onChain", onChain: OnChainTransaction.fromJSON(object.onChain) } : isSet6(object.spark) ? { $case: "spark", spark: SparkTransaction.fromJSON(object.spark) } : void 0
+      transaction: isSet7(object.onChain) ? { $case: "onChain", onChain: OnChainTransaction.fromJSON(object.onChain) } : isSet7(object.spark) ? { $case: "spark", spark: SparkTransaction.fromJSON(object.spark) } : void 0
     };
   },
   toJSON(message) {
@@ -22053,7 +23033,7 @@ function createBaseListAllTokenTransactionsCursor() {
   return { lastTransactionHash: new Uint8Array(0), layer: 0 };
 }
 var ListAllTokenTransactionsCursor = {
-  encode(message, writer = new BinaryWriter7()) {
+  encode(message, writer = new BinaryWriter8()) {
     if (message.lastTransactionHash.length !== 0) {
       writer.uint32(10).bytes(message.lastTransactionHash);
     }
@@ -22063,7 +23043,7 @@ var ListAllTokenTransactionsCursor = {
     return writer;
   },
   decode(input, length) {
-    const reader = input instanceof BinaryReader7 ? input : new BinaryReader7(input);
+    const reader = input instanceof BinaryReader8 ? input : new BinaryReader8(input);
     let end = length === void 0 ? reader.len : reader.pos + length;
     const message = createBaseListAllTokenTransactionsCursor();
     while (reader.pos < end) {
@@ -22093,14 +23073,14 @@ var ListAllTokenTransactionsCursor = {
   },
   fromJSON(object) {
     return {
-      lastTransactionHash: isSet6(object.lastTransactionHash) ? bytesFromBase645(object.lastTransactionHash) : new Uint8Array(0),
-      layer: isSet6(object.layer) ? layerFromJSON(object.layer) : 0
+      lastTransactionHash: isSet7(object.lastTransactionHash) ? bytesFromBase646(object.lastTransactionHash) : new Uint8Array(0),
+      layer: isSet7(object.layer) ? layerFromJSON(object.layer) : 0
     };
   },
   toJSON(message) {
     const obj = {};
     if (message.lastTransactionHash.length !== 0) {
-      obj.lastTransactionHash = base64FromBytes5(message.lastTransactionHash);
+      obj.lastTransactionHash = base64FromBytes6(message.lastTransactionHash);
     }
     if (message.layer !== 0) {
       obj.layer = layerToJSON(message.layer);
@@ -22121,7 +23101,7 @@ function createBaseOnChainTokenOutput() {
   return { rawTx: new Uint8Array(0), vout: 0, amountSats: 0, tokenPublicKey: void 0, tokenAmount: void 0 };
 }
 var OnChainTokenOutput = {
-  encode(message, writer = new BinaryWriter7()) {
+  encode(message, writer = new BinaryWriter8()) {
     if (message.rawTx.length !== 0) {
       writer.uint32(10).bytes(message.rawTx);
     }
@@ -22140,7 +23120,7 @@ var OnChainTokenOutput = {
     return writer;
   },
   decode(input, length) {
-    const reader = input instanceof BinaryReader7 ? input : new BinaryReader7(input);
+    const reader = input instanceof BinaryReader8 ? input : new BinaryReader8(input);
     let end = length === void 0 ? reader.len : reader.pos + length;
     const message = createBaseOnChainTokenOutput();
     while (reader.pos < end) {
@@ -22164,7 +23144,7 @@ var OnChainTokenOutput = {
           if (tag !== 24) {
             break;
           }
-          message.amountSats = longToNumber4(reader.uint64());
+          message.amountSats = longToNumber5(reader.uint64());
           continue;
         }
         case 4: {
@@ -22191,17 +23171,17 @@ var OnChainTokenOutput = {
   },
   fromJSON(object) {
     return {
-      rawTx: isSet6(object.rawTx) ? bytesFromBase645(object.rawTx) : new Uint8Array(0),
-      vout: isSet6(object.vout) ? globalThis.Number(object.vout) : 0,
-      amountSats: isSet6(object.amountSats) ? globalThis.Number(object.amountSats) : 0,
-      tokenPublicKey: isSet6(object.tokenPublicKey) ? globalThis.String(object.tokenPublicKey) : void 0,
-      tokenAmount: isSet6(object.tokenAmount) ? bytesFromBase645(object.tokenAmount) : void 0
+      rawTx: isSet7(object.rawTx) ? bytesFromBase646(object.rawTx) : new Uint8Array(0),
+      vout: isSet7(object.vout) ? globalThis.Number(object.vout) : 0,
+      amountSats: isSet7(object.amountSats) ? globalThis.Number(object.amountSats) : 0,
+      tokenPublicKey: isSet7(object.tokenPublicKey) ? globalThis.String(object.tokenPublicKey) : void 0,
+      tokenAmount: isSet7(object.tokenAmount) ? bytesFromBase646(object.tokenAmount) : void 0
     };
   },
   toJSON(message) {
     const obj = {};
     if (message.rawTx.length !== 0) {
-      obj.rawTx = base64FromBytes5(message.rawTx);
+      obj.rawTx = base64FromBytes6(message.rawTx);
     }
     if (message.vout !== 0) {
       obj.vout = Math.round(message.vout);
@@ -22213,7 +23193,7 @@ var OnChainTokenOutput = {
       obj.tokenPublicKey = message.tokenPublicKey;
     }
     if (message.tokenAmount !== void 0) {
-      obj.tokenAmount = base64FromBytes5(message.tokenAmount);
+      obj.tokenAmount = base64FromBytes6(message.tokenAmount);
     }
     return obj;
   },
@@ -22243,7 +23223,7 @@ function createBaseOnChainTransaction() {
   };
 }
 var OnChainTransaction = {
-  encode(message, writer = new BinaryWriter7()) {
+  encode(message, writer = new BinaryWriter8()) {
     if (message.operationType !== 0) {
       writer.uint32(8).int32(message.operationType);
     }
@@ -22263,15 +23243,15 @@ var OnChainTransaction = {
       OnChainTokenOutput.encode(v, writer.uint32(50).fork()).join();
     }
     if (message.broadcastedAt !== void 0) {
-      Timestamp.encode(toTimestamp2(message.broadcastedAt), writer.uint32(58).fork()).join();
+      Timestamp.encode(toTimestamp3(message.broadcastedAt), writer.uint32(58).fork()).join();
     }
     if (message.confirmedAt !== void 0) {
-      Timestamp.encode(toTimestamp2(message.confirmedAt), writer.uint32(66).fork()).join();
+      Timestamp.encode(toTimestamp3(message.confirmedAt), writer.uint32(66).fork()).join();
     }
     return writer;
   },
   decode(input, length) {
-    const reader = input instanceof BinaryReader7 ? input : new BinaryReader7(input);
+    const reader = input instanceof BinaryReader8 ? input : new BinaryReader8(input);
     let end = length === void 0 ? reader.len : reader.pos + length;
     const message = createBaseOnChainTransaction();
     while (reader.pos < end) {
@@ -22323,14 +23303,14 @@ var OnChainTransaction = {
           if (tag !== 58) {
             break;
           }
-          message.broadcastedAt = fromTimestamp2(Timestamp.decode(reader, reader.uint32()));
+          message.broadcastedAt = fromTimestamp3(Timestamp.decode(reader, reader.uint32()));
           continue;
         }
         case 8: {
           if (tag !== 66) {
             break;
           }
-          message.confirmedAt = fromTimestamp2(Timestamp.decode(reader, reader.uint32()));
+          message.confirmedAt = fromTimestamp3(Timestamp.decode(reader, reader.uint32()));
           continue;
         }
       }
@@ -22343,14 +23323,14 @@ var OnChainTransaction = {
   },
   fromJSON(object) {
     return {
-      operationType: isSet6(object.operationType) ? operationTypeFromJSON(object.operationType) : 0,
-      transactionHash: isSet6(object.transactionHash) ? bytesFromBase645(object.transactionHash) : new Uint8Array(0),
-      rawtx: isSet6(object.rawtx) ? bytesFromBase645(object.rawtx) : new Uint8Array(0),
-      status: isSet6(object.status) ? onChainTransactionStatusFromJSON(object.status) : 0,
+      operationType: isSet7(object.operationType) ? operationTypeFromJSON(object.operationType) : 0,
+      transactionHash: isSet7(object.transactionHash) ? bytesFromBase646(object.transactionHash) : new Uint8Array(0),
+      rawtx: isSet7(object.rawtx) ? bytesFromBase646(object.rawtx) : new Uint8Array(0),
+      status: isSet7(object.status) ? onChainTransactionStatusFromJSON(object.status) : 0,
       inputs: globalThis.Array.isArray(object?.inputs) ? object.inputs.map((e) => OnChainTokenOutput.fromJSON(e)) : [],
       outputs: globalThis.Array.isArray(object?.outputs) ? object.outputs.map((e) => OnChainTokenOutput.fromJSON(e)) : [],
-      broadcastedAt: isSet6(object.broadcastedAt) ? fromJsonTimestamp2(object.broadcastedAt) : void 0,
-      confirmedAt: isSet6(object.confirmedAt) ? fromJsonTimestamp2(object.confirmedAt) : void 0
+      broadcastedAt: isSet7(object.broadcastedAt) ? fromJsonTimestamp3(object.broadcastedAt) : void 0,
+      confirmedAt: isSet7(object.confirmedAt) ? fromJsonTimestamp3(object.confirmedAt) : void 0
     };
   },
   toJSON(message) {
@@ -22359,10 +23339,10 @@ var OnChainTransaction = {
       obj.operationType = operationTypeToJSON(message.operationType);
     }
     if (message.transactionHash.length !== 0) {
-      obj.transactionHash = base64FromBytes5(message.transactionHash);
+      obj.transactionHash = base64FromBytes6(message.transactionHash);
     }
     if (message.rawtx.length !== 0) {
-      obj.rawtx = base64FromBytes5(message.rawtx);
+      obj.rawtx = base64FromBytes6(message.rawtx);
     }
     if (message.status !== 0) {
       obj.status = onChainTransactionStatusToJSON(message.status);
@@ -22409,7 +23389,7 @@ function createBaseSparkTransaction() {
   };
 }
 var SparkTransaction = {
-  encode(message, writer = new BinaryWriter7()) {
+  encode(message, writer = new BinaryWriter8()) {
     if (message.operationType !== 0) {
       writer.uint32(8).int32(message.operationType);
     }
@@ -22420,7 +23400,7 @@ var SparkTransaction = {
       writer.uint32(24).int32(message.status);
     }
     if (message.confirmedAt !== void 0) {
-      Timestamp.encode(toTimestamp2(message.confirmedAt), writer.uint32(34).fork()).join();
+      Timestamp.encode(toTimestamp3(message.confirmedAt), writer.uint32(34).fork()).join();
     }
     for (const v of message.leavesToCreate) {
       SparkLeaf.encode(v, writer.uint32(42).fork()).join();
@@ -22434,7 +23414,7 @@ var SparkTransaction = {
     return writer;
   },
   decode(input, length) {
-    const reader = input instanceof BinaryReader7 ? input : new BinaryReader7(input);
+    const reader = input instanceof BinaryReader8 ? input : new BinaryReader8(input);
     let end = length === void 0 ? reader.len : reader.pos + length;
     const message = createBaseSparkTransaction();
     while (reader.pos < end) {
@@ -22465,7 +23445,7 @@ var SparkTransaction = {
           if (tag !== 34) {
             break;
           }
-          message.confirmedAt = fromTimestamp2(Timestamp.decode(reader, reader.uint32()));
+          message.confirmedAt = fromTimestamp3(Timestamp.decode(reader, reader.uint32()));
           continue;
         }
         case 5: {
@@ -22499,13 +23479,13 @@ var SparkTransaction = {
   },
   fromJSON(object) {
     return {
-      operationType: isSet6(object.operationType) ? operationTypeFromJSON(object.operationType) : 0,
-      transactionHash: isSet6(object.transactionHash) ? bytesFromBase645(object.transactionHash) : new Uint8Array(0),
-      status: isSet6(object.status) ? sparkTransactionStatusFromJSON(object.status) : 0,
-      confirmedAt: isSet6(object.confirmedAt) ? fromJsonTimestamp2(object.confirmedAt) : void 0,
+      operationType: isSet7(object.operationType) ? operationTypeFromJSON(object.operationType) : 0,
+      transactionHash: isSet7(object.transactionHash) ? bytesFromBase646(object.transactionHash) : new Uint8Array(0),
+      status: isSet7(object.status) ? sparkTransactionStatusFromJSON(object.status) : 0,
+      confirmedAt: isSet7(object.confirmedAt) ? fromJsonTimestamp3(object.confirmedAt) : void 0,
       leavesToCreate: globalThis.Array.isArray(object?.leavesToCreate) ? object.leavesToCreate.map((e) => SparkLeaf.fromJSON(e)) : [],
       leavesToSpend: globalThis.Array.isArray(object?.leavesToSpend) ? object.leavesToSpend.map((e) => SparkLeaf.fromJSON(e)) : [],
-      sparkOperatorIdentityPublicKeys: globalThis.Array.isArray(object?.sparkOperatorIdentityPublicKeys) ? object.sparkOperatorIdentityPublicKeys.map((e) => bytesFromBase645(e)) : []
+      sparkOperatorIdentityPublicKeys: globalThis.Array.isArray(object?.sparkOperatorIdentityPublicKeys) ? object.sparkOperatorIdentityPublicKeys.map((e) => bytesFromBase646(e)) : []
     };
   },
   toJSON(message) {
@@ -22514,7 +23494,7 @@ var SparkTransaction = {
       obj.operationType = operationTypeToJSON(message.operationType);
     }
     if (message.transactionHash.length !== 0) {
-      obj.transactionHash = base64FromBytes5(message.transactionHash);
+      obj.transactionHash = base64FromBytes6(message.transactionHash);
     }
     if (message.status !== 0) {
       obj.status = sparkTransactionStatusToJSON(message.status);
@@ -22529,7 +23509,7 @@ var SparkTransaction = {
       obj.leavesToSpend = message.leavesToSpend.map((e) => SparkLeaf.toJSON(e));
     }
     if (message.sparkOperatorIdentityPublicKeys?.length) {
-      obj.sparkOperatorIdentityPublicKeys = message.sparkOperatorIdentityPublicKeys.map((e) => base64FromBytes5(e));
+      obj.sparkOperatorIdentityPublicKeys = message.sparkOperatorIdentityPublicKeys.map((e) => base64FromBytes6(e));
     }
     return obj;
   },
@@ -22565,7 +23545,7 @@ function createBaseSparkLeaf() {
   };
 }
 var SparkLeaf = {
-  encode(message, writer = new BinaryWriter7()) {
+  encode(message, writer = new BinaryWriter8()) {
     if (message.tokenPublicKey.length !== 0) {
       writer.uint32(10).bytes(message.tokenPublicKey);
     }
@@ -22605,7 +23585,7 @@ var SparkLeaf = {
     return writer;
   },
   decode(input, length) {
-    const reader = input instanceof BinaryReader7 ? input : new BinaryReader7(input);
+    const reader = input instanceof BinaryReader8 ? input : new BinaryReader8(input);
     let end = length === void 0 ? reader.len : reader.pos + length;
     const message = createBaseSparkLeaf();
     while (reader.pos < end) {
@@ -22643,14 +23623,14 @@ var SparkLeaf = {
           if (tag !== 40) {
             break;
           }
-          message.withdrawalBondSats = longToNumber4(reader.uint64());
+          message.withdrawalBondSats = longToNumber5(reader.uint64());
           continue;
         }
         case 6: {
           if (tag !== 48) {
             break;
           }
-          message.withdrawalLocktime = longToNumber4(reader.uint64());
+          message.withdrawalLocktime = longToNumber5(reader.uint64());
           continue;
         }
         case 7: {
@@ -22705,33 +23685,33 @@ var SparkLeaf = {
   },
   fromJSON(object) {
     return {
-      tokenPublicKey: isSet6(object.tokenPublicKey) ? bytesFromBase645(object.tokenPublicKey) : new Uint8Array(0),
-      id: isSet6(object.id) ? globalThis.String(object.id) : "",
-      ownerPublicKey: isSet6(object.ownerPublicKey) ? bytesFromBase645(object.ownerPublicKey) : new Uint8Array(0),
-      revocationPublicKey: isSet6(object.revocationPublicKey) ? bytesFromBase645(object.revocationPublicKey) : new Uint8Array(0),
-      withdrawalBondSats: isSet6(object.withdrawalBondSats) ? globalThis.Number(object.withdrawalBondSats) : 0,
-      withdrawalLocktime: isSet6(object.withdrawalLocktime) ? globalThis.Number(object.withdrawalLocktime) : 0,
-      tokenAmount: isSet6(object.tokenAmount) ? bytesFromBase645(object.tokenAmount) : new Uint8Array(0),
-      createTxHash: isSet6(object.createTxHash) ? bytesFromBase645(object.createTxHash) : new Uint8Array(0),
-      createTxVoutIndex: isSet6(object.createTxVoutIndex) ? globalThis.Number(object.createTxVoutIndex) : 0,
-      spendTxHash: isSet6(object.spendTxHash) ? bytesFromBase645(object.spendTxHash) : void 0,
-      spendTxVoutIndex: isSet6(object.spendTxVoutIndex) ? globalThis.Number(object.spendTxVoutIndex) : void 0,
-      isFrozen: isSet6(object.isFrozen) ? globalThis.Boolean(object.isFrozen) : void 0
+      tokenPublicKey: isSet7(object.tokenPublicKey) ? bytesFromBase646(object.tokenPublicKey) : new Uint8Array(0),
+      id: isSet7(object.id) ? globalThis.String(object.id) : "",
+      ownerPublicKey: isSet7(object.ownerPublicKey) ? bytesFromBase646(object.ownerPublicKey) : new Uint8Array(0),
+      revocationPublicKey: isSet7(object.revocationPublicKey) ? bytesFromBase646(object.revocationPublicKey) : new Uint8Array(0),
+      withdrawalBondSats: isSet7(object.withdrawalBondSats) ? globalThis.Number(object.withdrawalBondSats) : 0,
+      withdrawalLocktime: isSet7(object.withdrawalLocktime) ? globalThis.Number(object.withdrawalLocktime) : 0,
+      tokenAmount: isSet7(object.tokenAmount) ? bytesFromBase646(object.tokenAmount) : new Uint8Array(0),
+      createTxHash: isSet7(object.createTxHash) ? bytesFromBase646(object.createTxHash) : new Uint8Array(0),
+      createTxVoutIndex: isSet7(object.createTxVoutIndex) ? globalThis.Number(object.createTxVoutIndex) : 0,
+      spendTxHash: isSet7(object.spendTxHash) ? bytesFromBase646(object.spendTxHash) : void 0,
+      spendTxVoutIndex: isSet7(object.spendTxVoutIndex) ? globalThis.Number(object.spendTxVoutIndex) : void 0,
+      isFrozen: isSet7(object.isFrozen) ? globalThis.Boolean(object.isFrozen) : void 0
     };
   },
   toJSON(message) {
     const obj = {};
     if (message.tokenPublicKey.length !== 0) {
-      obj.tokenPublicKey = base64FromBytes5(message.tokenPublicKey);
+      obj.tokenPublicKey = base64FromBytes6(message.tokenPublicKey);
     }
     if (message.id !== "") {
       obj.id = message.id;
     }
     if (message.ownerPublicKey.length !== 0) {
-      obj.ownerPublicKey = base64FromBytes5(message.ownerPublicKey);
+      obj.ownerPublicKey = base64FromBytes6(message.ownerPublicKey);
     }
     if (message.revocationPublicKey.length !== 0) {
-      obj.revocationPublicKey = base64FromBytes5(message.revocationPublicKey);
+      obj.revocationPublicKey = base64FromBytes6(message.revocationPublicKey);
     }
     if (message.withdrawalBondSats !== 0) {
       obj.withdrawalBondSats = Math.round(message.withdrawalBondSats);
@@ -22740,16 +23720,16 @@ var SparkLeaf = {
       obj.withdrawalLocktime = Math.round(message.withdrawalLocktime);
     }
     if (message.tokenAmount.length !== 0) {
-      obj.tokenAmount = base64FromBytes5(message.tokenAmount);
+      obj.tokenAmount = base64FromBytes6(message.tokenAmount);
     }
     if (message.createTxHash.length !== 0) {
-      obj.createTxHash = base64FromBytes5(message.createTxHash);
+      obj.createTxHash = base64FromBytes6(message.createTxHash);
     }
     if (message.createTxVoutIndex !== 0) {
       obj.createTxVoutIndex = Math.round(message.createTxVoutIndex);
     }
     if (message.spendTxHash !== void 0) {
-      obj.spendTxHash = base64FromBytes5(message.spendTxHash);
+      obj.spendTxHash = base64FromBytes6(message.spendTxHash);
     }
     if (message.spendTxVoutIndex !== void 0) {
       obj.spendTxVoutIndex = Math.round(message.spendTxVoutIndex);
@@ -22783,7 +23763,7 @@ function createBaseBlockInfo() {
   return { blockHash: new Uint8Array(0), blockHeight: 0, minedAt: void 0 };
 }
 var BlockInfo = {
-  encode(message, writer = new BinaryWriter7()) {
+  encode(message, writer = new BinaryWriter8()) {
     if (message.blockHash.length !== 0) {
       writer.uint32(10).bytes(message.blockHash);
     }
@@ -22791,12 +23771,12 @@ var BlockInfo = {
       writer.uint32(16).uint32(message.blockHeight);
     }
     if (message.minedAt !== void 0) {
-      Timestamp.encode(toTimestamp2(message.minedAt), writer.uint32(34).fork()).join();
+      Timestamp.encode(toTimestamp3(message.minedAt), writer.uint32(34).fork()).join();
     }
     return writer;
   },
   decode(input, length) {
-    const reader = input instanceof BinaryReader7 ? input : new BinaryReader7(input);
+    const reader = input instanceof BinaryReader8 ? input : new BinaryReader8(input);
     let end = length === void 0 ? reader.len : reader.pos + length;
     const message = createBaseBlockInfo();
     while (reader.pos < end) {
@@ -22820,7 +23800,7 @@ var BlockInfo = {
           if (tag !== 34) {
             break;
           }
-          message.minedAt = fromTimestamp2(Timestamp.decode(reader, reader.uint32()));
+          message.minedAt = fromTimestamp3(Timestamp.decode(reader, reader.uint32()));
           continue;
         }
       }
@@ -22833,15 +23813,15 @@ var BlockInfo = {
   },
   fromJSON(object) {
     return {
-      blockHash: isSet6(object.blockHash) ? bytesFromBase645(object.blockHash) : new Uint8Array(0),
-      blockHeight: isSet6(object.blockHeight) ? globalThis.Number(object.blockHeight) : 0,
-      minedAt: isSet6(object.minedAt) ? fromJsonTimestamp2(object.minedAt) : void 0
+      blockHash: isSet7(object.blockHash) ? bytesFromBase646(object.blockHash) : new Uint8Array(0),
+      blockHeight: isSet7(object.blockHeight) ? globalThis.Number(object.blockHeight) : 0,
+      minedAt: isSet7(object.minedAt) ? fromJsonTimestamp3(object.minedAt) : void 0
     };
   },
   toJSON(message) {
     const obj = {};
     if (message.blockHash.length !== 0) {
-      obj.blockHash = base64FromBytes5(message.blockHash);
+      obj.blockHash = base64FromBytes6(message.blockHash);
     }
     if (message.blockHeight !== 0) {
       obj.blockHeight = Math.round(message.blockHeight);
@@ -22866,14 +23846,14 @@ function createBaseTokenPubkey() {
   return { publicKey: new Uint8Array(0) };
 }
 var TokenPubkey = {
-  encode(message, writer = new BinaryWriter7()) {
+  encode(message, writer = new BinaryWriter8()) {
     if (message.publicKey.length !== 0) {
       writer.uint32(10).bytes(message.publicKey);
     }
     return writer;
   },
   decode(input, length) {
-    const reader = input instanceof BinaryReader7 ? input : new BinaryReader7(input);
+    const reader = input instanceof BinaryReader8 ? input : new BinaryReader8(input);
     let end = length === void 0 ? reader.len : reader.pos + length;
     const message = createBaseTokenPubkey();
     while (reader.pos < end) {
@@ -22895,12 +23875,12 @@ var TokenPubkey = {
     return message;
   },
   fromJSON(object) {
-    return { publicKey: isSet6(object.publicKey) ? bytesFromBase645(object.publicKey) : new Uint8Array(0) };
+    return { publicKey: isSet7(object.publicKey) ? bytesFromBase646(object.publicKey) : new Uint8Array(0) };
   },
   toJSON(message) {
     const obj = {};
     if (message.publicKey.length !== 0) {
-      obj.publicKey = base64FromBytes5(message.publicKey);
+      obj.publicKey = base64FromBytes6(message.publicKey);
     }
     return obj;
   },
@@ -22924,7 +23904,7 @@ function createBaseTokenPubkeyAnnouncement() {
   };
 }
 var TokenPubkeyAnnouncement = {
-  encode(message, writer = new BinaryWriter7()) {
+  encode(message, writer = new BinaryWriter8()) {
     if (message.publicKey !== void 0) {
       TokenPubkey.encode(message.publicKey, writer.uint32(10).fork()).join();
     }
@@ -22946,7 +23926,7 @@ var TokenPubkeyAnnouncement = {
     return writer;
   },
   decode(input, length) {
-    const reader = input instanceof BinaryReader7 ? input : new BinaryReader7(input);
+    const reader = input instanceof BinaryReader8 ? input : new BinaryReader8(input);
     let end = length === void 0 ? reader.len : reader.pos + length;
     const message = createBaseTokenPubkeyAnnouncement();
     while (reader.pos < end) {
@@ -23004,12 +23984,12 @@ var TokenPubkeyAnnouncement = {
   },
   fromJSON(object) {
     return {
-      publicKey: isSet6(object.publicKey) ? TokenPubkey.fromJSON(object.publicKey) : void 0,
-      name: isSet6(object.name) ? globalThis.String(object.name) : "",
-      symbol: isSet6(object.symbol) ? globalThis.String(object.symbol) : "",
-      decimal: isSet6(object.decimal) ? bytesFromBase645(object.decimal) : new Uint8Array(0),
-      maxSupply: isSet6(object.maxSupply) ? bytesFromBase645(object.maxSupply) : new Uint8Array(0),
-      isFreezable: isSet6(object.isFreezable) ? globalThis.Boolean(object.isFreezable) : false
+      publicKey: isSet7(object.publicKey) ? TokenPubkey.fromJSON(object.publicKey) : void 0,
+      name: isSet7(object.name) ? globalThis.String(object.name) : "",
+      symbol: isSet7(object.symbol) ? globalThis.String(object.symbol) : "",
+      decimal: isSet7(object.decimal) ? bytesFromBase646(object.decimal) : new Uint8Array(0),
+      maxSupply: isSet7(object.maxSupply) ? bytesFromBase646(object.maxSupply) : new Uint8Array(0),
+      isFreezable: isSet7(object.isFreezable) ? globalThis.Boolean(object.isFreezable) : false
     };
   },
   toJSON(message) {
@@ -23024,10 +24004,10 @@ var TokenPubkeyAnnouncement = {
       obj.symbol = message.symbol;
     }
     if (message.decimal.length !== 0) {
-      obj.decimal = base64FromBytes5(message.decimal);
+      obj.decimal = base64FromBytes6(message.decimal);
     }
     if (message.maxSupply.length !== 0) {
-      obj.maxSupply = base64FromBytes5(message.maxSupply);
+      obj.maxSupply = base64FromBytes6(message.maxSupply);
     }
     if (message.isFreezable !== false) {
       obj.isFreezable = message.isFreezable;
@@ -23134,7 +24114,7 @@ var SparkServiceDefinition2 = {
     }
   }
 };
-function bytesFromBase645(b64) {
+function bytesFromBase646(b64) {
   if (globalThis.Buffer) {
     return Uint8Array.from(globalThis.Buffer.from(b64, "base64"));
   } else {
@@ -23146,7 +24126,7 @@ function bytesFromBase645(b64) {
     return arr;
   }
 }
-function base64FromBytes5(arr) {
+function base64FromBytes6(arr) {
   if (globalThis.Buffer) {
     return globalThis.Buffer.from(arr).toString("base64");
   } else {
@@ -23157,26 +24137,26 @@ function base64FromBytes5(arr) {
     return globalThis.btoa(bin.join(""));
   }
 }
-function toTimestamp2(date) {
+function toTimestamp3(date) {
   const seconds = Math.trunc(date.getTime() / 1e3);
   const nanos = date.getTime() % 1e3 * 1e6;
   return { seconds, nanos };
 }
-function fromTimestamp2(t) {
+function fromTimestamp3(t) {
   let millis = (t.seconds || 0) * 1e3;
   millis += (t.nanos || 0) / 1e6;
   return new globalThis.Date(millis);
 }
-function fromJsonTimestamp2(o) {
+function fromJsonTimestamp3(o) {
   if (o instanceof globalThis.Date) {
     return o;
   } else if (typeof o === "string") {
     return new globalThis.Date(o);
   } else {
-    return fromTimestamp2(Timestamp.fromJSON(o));
+    return fromTimestamp3(Timestamp.fromJSON(o));
   }
 }
-function longToNumber4(int64) {
+function longToNumber5(int64) {
   const num = globalThis.Number(int64.toString());
   if (num > globalThis.Number.MAX_SAFE_INTEGER) {
     throw new globalThis.Error("Value is larger than Number.MAX_SAFE_INTEGER");
@@ -23186,7 +24166,7 @@ function longToNumber4(int64) {
   }
   return num;
 }
-function isSet6(value) {
+function isSet7(value) {
   return value !== null && value !== void 0;
 }
 
@@ -23345,32 +24325,11 @@ var Lrc20ConnectionManager = class {
 // src/services/token-transactions.ts
 import {
   bytesToHex as bytesToHex9,
-  bytesToNumberBE as bytesToNumberBE6,
+  bytesToNumberBE as bytesToNumberBE7,
   numberToBytesBE as numberToBytesBE5
 } from "@noble/curves/abstract/utils";
 import { secp256k1 as secp256k113 } from "@noble/curves/secp256k1";
 
-// src/utils/response-validation.ts
-function collectResponses(responses) {
-  const successfulResponses = responses.filter(
-    (result) => result.status === "fulfilled"
-  ).map((result) => result.value);
-  const failedResponses = responses.filter(
-    (result) => result.status === "rejected"
-  );
-  if (failedResponses.length > 0) {
-    const errors = failedResponses.map((result) => result.reason).join("\n");
-    throw new NetworkError(
-      `${failedResponses.length} out of ${responses.length} requests failed, please try again`,
-      {
-        errorCount: failedResponses.length,
-        errors
-      }
-    );
-  }
-  return successfulResponses;
-}
-
 // src/utils/token-hashing.ts
 import { sha256 as sha25611 } from "@noble/hashes/sha2";
 function hashTokenTransaction(tokenTransaction, partialHash = false) {
@@ -23670,23 +24629,6 @@ function hashOperatorSpecificTokenTransactionSignablePayload(payload) {
   return finalHashObj.digest();
 }
 
-// src/utils/token-keyshares.ts
-import { secp256k1 as secp256k111 } from "@noble/curves/secp256k1";
-function recoverRevocationSecretFromKeyshares(keyshares, threshold) {
-  const shares = keyshares.map((keyshare) => ({
-    fieldModulus: BigInt("0x" + secp256k111.CURVE.n.toString(16)),
-    // secp256k1 curve order
-    threshold,
-    index: BigInt(keyshare.operatorIndex),
-    share: BigInt(
-      "0x" + Buffer.from(keyshare.keyshare.keyshare).toString("hex")
-    ),
-    proofs: []
-  }));
-  const recoveredSecret = recoverSecret(shares);
-  return bigIntToPrivateKey(recoveredSecret);
-}
-
 // src/utils/token-transactions.ts
 import { bytesToHex as bytesToHex7, bytesToNumberBE as bytesToNumberBE5 } from "@noble/curves/abstract/utils";
 function calculateAvailableTokenAmount(outputLeaves) {
@@ -23984,9 +24926,11 @@ function validateTokenTransaction(finalTokenTransaction, partialTokenTransaction
 import { hexToBytes as hexToBytes9 } from "@noble/hashes/utils";
 
 // src/address/address.ts
-import { secp256k1 as secp256k112 } from "@noble/curves/secp256k1";
+import { secp256k1 as secp256k111 } from "@noble/curves/secp256k1";
 import { bytesToHex as bytesToHex8, hexToBytes as hexToBytes8 } from "@noble/hashes/utils";
 import { bech32m } from "@scure/base";
+import { UUID } from "uuidv7";
+import { bytesToNumberBE as bytesToNumberBE6 } from "@noble/curves/abstract/utils";
 var AddressNetwork = {
   MAINNET: "sp",
   TESTNET: "spt",
@@ -23997,15 +24941,20 @@ var AddressNetwork = {
 function encodeSparkAddress(payload) {
   try {
     isValidPublicKey(payload.identityPublicKey);
+    let paymentIntentFields;
+    if (payload.paymentIntentFields) {
+      paymentIntentFields = payload.paymentIntentFields;
+    }
     const sparkAddressProto = SparkAddress.create({
-      identityPublicKey: hexToBytes8(payload.identityPublicKey)
+      identityPublicKey: hexToBytes8(payload.identityPublicKey),
+      paymentIntentFields
     });
     const serializedPayload = SparkAddress.encode(sparkAddressProto).finish();
     const words = bech32m.toWords(serializedPayload);
     return bech32m.encode(
       AddressNetwork[payload.network],
       words,
-      200
+      500
     );
   } catch (error) {
     throw new ValidationError(
@@ -24020,7 +24969,7 @@ function encodeSparkAddress(payload) {
 }
 function decodeSparkAddress(address2, network) {
   try {
-    const decoded = bech32m.decode(address2, 200);
+    const decoded = bech32m.decode(address2, 500);
     if (decoded.prefix !== AddressNetwork[network]) {
       throw new ValidationError("Invalid Spark address prefix", {
         field: "address",
@@ -24031,7 +24980,17 @@ function decodeSparkAddress(address2, network) {
     const payload = SparkAddress.decode(bech32m.fromWords(decoded.words));
     const publicKey = bytesToHex8(payload.identityPublicKey);
     isValidPublicKey(publicKey);
-    return publicKey;
+    const paymentIntentFields = payload.paymentIntentFields;
+    return {
+      identityPublicKey: publicKey,
+      network,
+      paymentIntentFields: paymentIntentFields && {
+        id: UUID.ofInner(paymentIntentFields.id).toString(),
+        assetIdentifier: paymentIntentFields.assetIdentifier ? bytesToHex8(paymentIntentFields.assetIdentifier) : void 0,
+        assetAmount: bytesToNumberBE6(paymentIntentFields.assetAmount),
+        memo: paymentIntentFields.memo
+      }
+    };
   } catch (error) {
     if (error instanceof ValidationError) {
       throw error;
@@ -24048,7 +25007,7 @@ function decodeSparkAddress(address2, network) {
 }
 function isValidPublicKey(publicKey) {
   try {
-    const point = secp256k112.ProjectivePoint.fromHex(publicKey);
+    const point = secp256k111.ProjectivePoint.fromHex(publicKey);
     point.assertValidity();
   } catch (error) {
     throw new ValidationError(
@@ -24062,6 +25021,44 @@ function isValidPublicKey(publicKey) {
   }
 }
 
+// src/utils/response-validation.ts
+function collectResponses(responses) {
+  const successfulResponses = responses.filter(
+    (result) => result.status === "fulfilled"
+  ).map((result) => result.value);
+  const failedResponses = responses.filter(
+    (result) => result.status === "rejected"
+  );
+  if (failedResponses.length > 0) {
+    const errors = failedResponses.map((result) => result.reason).join("\n");
+    throw new NetworkError(
+      `${failedResponses.length} out of ${responses.length} requests failed, please try again`,
+      {
+        errorCount: failedResponses.length,
+        errors
+      }
+    );
+  }
+  return successfulResponses;
+}
+
+// src/utils/token-keyshares.ts
+import { secp256k1 as secp256k112 } from "@noble/curves/secp256k1";
+function recoverRevocationSecretFromKeyshares(keyshares, threshold) {
+  const shares = keyshares.map((keyshare) => ({
+    fieldModulus: BigInt("0x" + secp256k112.CURVE.n.toString(16)),
+    // secp256k1 curve order
+    threshold,
+    index: BigInt(keyshare.operatorIndex),
+    share: BigInt(
+      "0x" + Buffer.from(keyshare.keyshare.keyshare).toString("hex")
+    ),
+    proofs: []
+  }));
+  const recoveredSecret = recoverSecret(shares);
+  return bigIntToPrivateKey(recoveredSecret);
+}
+
 // src/services/token-transactions.ts
 var MAX_TOKEN_OUTPUTS = 500;
 var TokenTransactionService = class {
@@ -24130,15 +25127,23 @@ var TokenTransactionService = class {
         this.config.getNetworkType()
       );
       return {
-        receiverSparkAddress: hexToBytes9(receiverAddress),
+        receiverSparkAddress: hexToBytes9(receiverAddress.identityPublicKey),
         tokenPublicKey: hexToBytes9(transfer.tokenPublicKey),
         tokenAmount: transfer.tokenAmount
       };
     });
-    const tokenTransaction = await this.constructTransferTokenTransaction(
-      outputsToUse,
-      tokenOutputData
-    );
+    let tokenTransaction;
+    if (this.config.getTokenTransactionVersion() === "V0") {
+      tokenTransaction = await this.constructTransferTokenTransactionV0(
+        outputsToUse,
+        tokenOutputData
+      );
+    } else {
+      tokenTransaction = await this.constructTransferTokenTransaction(
+        outputsToUse,
+        tokenOutputData
+      );
+    }
     const txId = await this.broadcastTokenTransaction(
       tokenTransaction,
       outputsToUse.map((output) => output.output.ownerPublicKey),
@@ -24146,7 +25151,7 @@ var TokenTransactionService = class {
     );
     return txId;
   }
-  async constructTransferTokenTransaction(selectedOutputs, tokenOutputData) {
+  async constructTransferTokenTransactionV0(selectedOutputs, tokenOutputData) {
     const availableTokenAmount = calculateAvailableTokenAmount(selectedOutputs);
     const totalRequestedAmount = tokenOutputData.reduce(
       (sum, output) => sum + output.tokenAmount,
@@ -24181,6 +25186,43 @@ var TokenTransactionService = class {
       sparkOperatorIdentityPublicKeys: this.collectOperatorIdentityPublicKeys()
     };
   }
+  async constructTransferTokenTransaction(selectedOutputs, tokenOutputData) {
+    const availableTokenAmount = calculateAvailableTokenAmount(selectedOutputs);
+    const totalRequestedAmount = tokenOutputData.reduce(
+      (sum, output) => sum + output.tokenAmount,
+      0n
+    );
+    const tokenOutputs = tokenOutputData.map((output) => ({
+      ownerPublicKey: output.receiverSparkAddress,
+      tokenPublicKey: output.tokenPublicKey,
+      tokenAmount: numberToBytesBE5(output.tokenAmount, 16)
+    }));
+    if (availableTokenAmount > totalRequestedAmount) {
+      const changeAmount = availableTokenAmount - totalRequestedAmount;
+      const firstTokenPublicKey = tokenOutputData[0].tokenPublicKey;
+      tokenOutputs.push({
+        ownerPublicKey: await this.config.signer.getIdentityPublicKey(),
+        tokenPublicKey: firstTokenPublicKey,
+        tokenAmount: numberToBytesBE5(changeAmount, 16)
+      });
+    }
+    return {
+      version: 1,
+      network: this.config.getNetworkProto(),
+      tokenInputs: {
+        $case: "transferInput",
+        transferInput: {
+          outputsToSpend: selectedOutputs.map((output) => ({
+            prevTokenTransactionHash: output.previousTransactionHash,
+            prevTokenTransactionVout: output.previousTransactionVout
+          }))
+        }
+      },
+      tokenOutputs,
+      sparkOperatorIdentityPublicKeys: this.collectOperatorIdentityPublicKeys(),
+      expiryTime: void 0
+    };
+  }
   collectOperatorIdentityPublicKeys() {
     const operatorKeys = [];
     for (const [_, operator] of Object.entries(
@@ -24192,13 +25234,30 @@ var TokenTransactionService = class {
   }
   async broadcastTokenTransaction(tokenTransaction, outputsToSpendSigningPublicKeys, outputsToSpendCommitments) {
     const signingOperators = this.config.getSigningOperators();
-    const { finalTokenTransaction, finalTokenTransactionHash, threshold } = await this.startTokenTransaction(
+    if (!isTokenTransaction(tokenTransaction)) {
+      return this.broadcastTokenTransactionV0(
+        tokenTransaction,
+        signingOperators,
+        outputsToSpendSigningPublicKeys,
+        outputsToSpendCommitments
+      );
+    } else {
+      return this.broadcastTokenTransactionV1(
+        tokenTransaction,
+        signingOperators,
+        outputsToSpendSigningPublicKeys,
+        outputsToSpendCommitments
+      );
+    }
+  }
+  async broadcastTokenTransactionV0(tokenTransaction, signingOperators, outputsToSpendSigningPublicKeys, outputsToSpendCommitments) {
+    const { finalTokenTransaction, finalTokenTransactionHash, threshold } = await this.startTokenTransactionV0(
       tokenTransaction,
       signingOperators,
       outputsToSpendSigningPublicKeys,
       outputsToSpendCommitments
     );
-    const { successfulSignatures } = await this.signTokenTransaction(
+    const { successfulSignatures } = await this.signTokenTransactionV0(
       finalTokenTransaction,
       finalTokenTransactionHash,
       signingOperators
@@ -24281,7 +25340,21 @@ var TokenTransactionService = class {
     }
     return bytesToHex9(finalTokenTransactionHash);
   }
-  async startTokenTransaction(tokenTransaction, signingOperators, outputsToSpendSigningPublicKeys, outputsToSpendCommitments) {
+  async broadcastTokenTransactionV1(tokenTransaction, signingOperators, outputsToSpendSigningPublicKeys, outputsToSpendCommitments) {
+    const { finalTokenTransaction, finalTokenTransactionHash, threshold } = await this.startTokenTransaction(
+      tokenTransaction,
+      signingOperators,
+      outputsToSpendSigningPublicKeys,
+      outputsToSpendCommitments
+    );
+    await this.signTokenTransaction(
+      finalTokenTransaction,
+      finalTokenTransactionHash,
+      signingOperators
+    );
+    return bytesToHex9(finalTokenTransactionHash);
+  }
+  async startTokenTransactionV0(tokenTransaction, signingOperators, outputsToSpendSigningPublicKeys, outputsToSpendCommitments) {
     const sparkClient = await this.connectionManager.createSparkClient(
       this.config.getCoordinatorAddress()
     );
@@ -24376,7 +25449,99 @@ var TokenTransactionService = class {
       threshold: startResponse.keyshareInfo.threshold
     };
   }
-  async signTokenTransaction(finalTokenTransaction, finalTokenTransactionHash, signingOperators) {
+  async startTokenTransaction(tokenTransaction, signingOperators, outputsToSpendSigningPublicKeys, outputsToSpendCommitments) {
+    const sparkClient = await this.connectionManager.createSparkTokenClient(
+      this.config.getCoordinatorAddress()
+    );
+    const partialTokenTransactionHash = hashTokenTransaction(
+      tokenTransaction,
+      true
+    );
+    const ownerSignaturesWithIndex = [];
+    if (tokenTransaction.tokenInputs.$case === "mintInput") {
+      const issuerPublicKey = tokenTransaction.tokenInputs.mintInput.issuerPublicKey;
+      if (!issuerPublicKey) {
+        throw new ValidationError("Invalid mint input", {
+          field: "issuerPublicKey",
+          value: null,
+          expected: "Non-null issuer public key"
+        });
+      }
+      const ownerSignature = await this.signMessageWithKey(
+        partialTokenTransactionHash,
+        issuerPublicKey
+      );
+      ownerSignaturesWithIndex.push({
+        signature: ownerSignature,
+        inputIndex: 0
+      });
+    } else if (tokenTransaction.tokenInputs.$case === "transferInput") {
+      if (!outputsToSpendSigningPublicKeys || !outputsToSpendCommitments) {
+        throw new ValidationError("Invalid transfer input", {
+          field: "outputsToSpend",
+          value: {
+            signingPublicKeys: outputsToSpendSigningPublicKeys,
+            revocationPublicKeys: outputsToSpendCommitments
+          },
+          expected: "Non-null signing and revocation public keys"
+        });
+      }
+      for (const [i, key] of outputsToSpendSigningPublicKeys.entries()) {
+        if (!key) {
+          throw new ValidationError("Invalid signing key", {
+            field: "outputsToSpendSigningPublicKeys",
+            value: i,
+            expected: "Non-null signing key"
+          });
+        }
+        const ownerSignature = await this.signMessageWithKey(
+          partialTokenTransactionHash,
+          key
+        );
+        ownerSignaturesWithIndex.push({
+          signature: ownerSignature,
+          inputIndex: i
+        });
+      }
+    }
+    const startResponse = await sparkClient.start_transaction(
+      {
+        identityPublicKey: await this.config.signer.getIdentityPublicKey(),
+        partialTokenTransaction: tokenTransaction
+      },
+      {
+        retry: true,
+        retryableStatuses: ["UNKNOWN", "UNAVAILABLE", "CANCELLED", "INTERNAL"],
+        retryMaxAttempts: 3
+      }
+    );
+    if (!startResponse.finalTokenTransaction) {
+      throw new Error("Final token transaction missing in start response");
+    }
+    if (!startResponse.keyshareInfo) {
+      throw new Error("Keyshare info missing in start response");
+    }
+    validateTokenTransaction(
+      startResponse.finalTokenTransaction,
+      tokenTransaction,
+      signingOperators,
+      startResponse.keyshareInfo,
+      this.config.getExpectedWithdrawBondSats(),
+      this.config.getExpectedWithdrawRelativeBlockLocktime(),
+      this.config.getThreshold()
+    );
+    const finalTokenTransaction = startResponse.finalTokenTransaction;
+    const finalTokenTransactionHash = hashTokenTransaction(
+      finalTokenTransaction,
+      false
+    );
+    return {
+      finalTokenTransaction,
+      finalTokenTransactionHash,
+      threshold: startResponse.keyshareInfo.threshold
+    };
+  }
+  async signTokenTransactionV0(finalTokenTransaction, finalTokenTransactionHash, signingOperators) {
     const soSignatures = await Promise.allSettled(
       Object.entries(signingOperators).map(
         async ([identifier, operator], index) => {
@@ -24473,49 +25638,44 @@ var TokenTransactionService = class {
       successfulSignatures
     };
   }
-  async finalizeTokenTransaction(finalTokenTransaction, revocationSecrets, threshold) {
-    const signingOperators = this.config.getSigningOperators();
-    const soResponses = await Promise.allSettled(
-      Object.entries(signingOperators).map(async ([identifier, operator]) => {
-        const internalSparkClient = await this.connectionManager.createSparkClient(operator.address);
-        const identityPublicKey = await this.config.signer.getIdentityPublicKey();
-        try {
-          const response = await internalSparkClient.finalize_token_transaction(
-            {
-              finalTokenTransaction,
-              revocationSecrets,
-              identityPublicKey
-            },
-            {
-              retry: true,
-              retryableStatuses: [
-                "UNKNOWN",
-                "UNAVAILABLE",
-                "CANCELLED",
-                "INTERNAL"
-              ],
-              retryMaxAttempts: 3
-            }
-          );
-          return {
-            identifier,
-            response
-          };
-        } catch (error) {
-          throw new NetworkError(
-            "Failed to finalize token transaction",
-            {
-              operation: "finalize_token_transaction",
-              errorCount: 1,
-              errors: error instanceof Error ? error.message : String(error)
-            },
-            error
-          );
-        }
-      })
+  async signTokenTransaction(finalTokenTransaction, finalTokenTransactionHash, signingOperators) {
+    const coordinatorClient = await this.connectionManager.createSparkTokenClient(
+      this.config.getCoordinatorAddress()
     );
-    collectResponses(soResponses);
-    return finalTokenTransaction;
+    const inputTtxoSignaturesPerOperator = await this.createSignaturesForOperators(
+      finalTokenTransaction,
+      finalTokenTransactionHash,
+      signingOperators
+    );
+    try {
+      await coordinatorClient.commit_transaction(
+        {
+          finalTokenTransaction,
+          inputTtxoSignaturesPerOperator,
+          ownerIdentityPublicKey: await this.config.signer.getIdentityPublicKey()
+        },
+        {
+          retry: true,
+          retryableStatuses: [
+            "UNKNOWN",
+            "UNAVAILABLE",
+            "CANCELLED",
+            "INTERNAL"
+          ],
+          retryMaxAttempts: 3
+        }
+      );
+    } catch (error) {
+      throw new NetworkError(
+        "Failed to sign token transaction",
+        {
+          operation: "sign_token_transaction",
+          errorCount: 1,
+          errors: error instanceof Error ? error.message : String(error)
+        },
+        error
+      );
+    }
   }
   async fetchOwnedTokenOutputs(ownerPublicKeys, tokenPublicKeys) {
     const sparkClient = await this.connectionManager.createSparkClient(
@@ -24562,7 +25722,7 @@ var TokenTransactionService = class {
       });
     }
     const exactMatch = tokenOutputs.find(
-      (item) => bytesToNumberBE6(item.output.tokenAmount) === tokenAmount
+      (item) => bytesToNumberBE7(item.output.tokenAmount) === tokenAmount
     );
     if (exactMatch) {
       return [exactMatch];
@@ -24573,7 +25733,7 @@ var TokenTransactionService = class {
     for (const outputWithPreviousTransactionData of tokenOutputs) {
       if (remainingAmount <= 0n) break;
       selectedOutputs.push(outputWithPreviousTransactionData);
-      remainingAmount -= bytesToNumberBE6(
+      remainingAmount -= bytesToNumberBE7(
         outputWithPreviousTransactionData.output.tokenAmount
       );
     }
@@ -24589,13 +25749,13 @@ var TokenTransactionService = class {
     if (strategy === "SMALL_FIRST") {
       tokenOutputs.sort((a, b) => {
         return Number(
-          bytesToNumberBE6(a.output.tokenAmount) - bytesToNumberBE6(b.output.tokenAmount)
+          bytesToNumberBE7(a.output.tokenAmount) - bytesToNumberBE7(b.output.tokenAmount)
         );
       });
     } else {
       tokenOutputs.sort((a, b) => {
         return Number(
-          bytesToNumberBE6(b.output.tokenAmount) - bytesToNumberBE6(a.output.tokenAmount)
+          bytesToNumberBE7(b.output.tokenAmount) - bytesToNumberBE7(a.output.tokenAmount)
         );
       });
     }
@@ -24620,7 +25780,107 @@ var TokenTransactionService = class {
       }
     }
   }
+  async finalizeTokenTransaction(finalTokenTransaction, revocationSecrets, threshold) {
+    const signingOperators = this.config.getSigningOperators();
+    const soResponses = await Promise.allSettled(
+      Object.entries(signingOperators).map(async ([identifier, operator]) => {
+        const internalSparkClient = await this.connectionManager.createSparkClient(operator.address);
+        const identityPublicKey = await this.config.signer.getIdentityPublicKey();
+        try {
+          const response = await internalSparkClient.finalize_token_transaction(
+            {
+              finalTokenTransaction,
+              revocationSecrets,
+              identityPublicKey
+            },
+            {
+              retry: true,
+              retryableStatuses: [
+                "UNKNOWN",
+                "UNAVAILABLE",
+                "CANCELLED",
+                "INTERNAL"
+              ],
+              retryMaxAttempts: 3
+            }
+          );
+          return {
+            identifier,
+            response
+          };
+        } catch (error) {
+          throw new NetworkError(
+            "Failed to finalize token transaction",
+            {
+              operation: "finalize_token_transaction",
+              errorCount: 1,
+              errors: error instanceof Error ? error.message : String(error)
+            },
+            error
+          );
+        }
+      })
+    );
+    collectResponses(soResponses);
+    return finalTokenTransaction;
+  }
+  async createSignaturesForOperators(finalTokenTransaction, finalTokenTransactionHash, signingOperators) {
+    const inputTtxoSignaturesPerOperator = [];
+    for (const [_, operator] of Object.entries(signingOperators)) {
+      let ttxoSignatures = [];
+      if (finalTokenTransaction.tokenInputs.$case === "mintInput") {
+        const issuerPublicKey = finalTokenTransaction.tokenInputs.mintInput.issuerPublicKey;
+        if (!issuerPublicKey) {
+          throw new ValidationError("Invalid mint input", {
+            field: "issuerPublicKey",
+            value: null,
+            expected: "Non-null issuer public key"
+          });
+        }
+        const payload = {
+          finalTokenTransactionHash,
+          operatorIdentityPublicKey: hexToBytes9(operator.identityPublicKey)
+        };
+        const payloadHash = await hashOperatorSpecificTokenTransactionSignablePayload(payload);
+        const ownerSignature = await this.signMessageWithKey(
+          payloadHash,
+          issuerPublicKey
+        );
+        ttxoSignatures.push({
+          signature: ownerSignature,
+          inputIndex: 0
+        });
+      } else if (finalTokenTransaction.tokenInputs.$case === "transferInput") {
+        const transferInput = finalTokenTransaction.tokenInputs.transferInput;
+        for (let i = 0; i < transferInput.outputsToSpend.length; i++) {
+          const payload = {
+            finalTokenTransactionHash,
+            operatorIdentityPublicKey: hexToBytes9(operator.identityPublicKey)
+          };
+          const payloadHash = await hashOperatorSpecificTokenTransactionSignablePayload(payload);
+          let ownerSignature;
+          if (this.config.getTokenSignatures() === "SCHNORR") {
+            ownerSignature = await this.config.signer.signSchnorrWithIdentityKey(payloadHash);
+          } else {
+            ownerSignature = await this.config.signer.signMessageWithIdentityKey(payloadHash);
+          }
+          ttxoSignatures.push({
+            signature: ownerSignature,
+            inputIndex: i
+          });
+        }
+      }
+      inputTtxoSignaturesPerOperator.push({
+        ttxoSignatures,
+        operatorIdentityPublicKey: hexToBytes9(operator.identityPublicKey)
+      });
+    }
+    return inputTtxoSignaturesPerOperator;
+  }
 };
+function isTokenTransaction(tokenTransaction) {
+  return "version" in tokenTransaction && "expiryTime" in tokenTransaction;
+}
 
 // src/services/tree-creation.ts
 import { hexToBytes as hexToBytes10 } from "@noble/curves/abstract/utils";
@@ -25169,7 +26429,7 @@ import { bytesToHex as bytesToHex10, hexToBytes as hexToBytes12 } from "@noble/c
 import { schnorr as schnorr5, secp256k1 as secp256k114 } from "@noble/curves/secp256k1";
 import * as btc4 from "@scure/btc-signer";
 import { Address as Address5, OutScript as OutScript4, SigHash as SigHash2, Transaction as Transaction8 } from "@scure/btc-signer";
-import { taprootTweakPrivKey } from "@scure/btc-signer/utils";
+import { taprootTweakPrivKey as taprootTweakPrivKey2 } from "@scure/btc-signer/utils";
 var STATIC_FAUCET_KEY = hexToBytes12(
   "deadbeef1337cafe4242424242424242deadbeef1337cafe4242424242424242"
 );
@@ -25352,7 +26612,7 @@ var BitcoinFaucet = class _BitcoinFaucet {
       new Array(unsignedTx.inputsLength).fill(fundingTxOut.amount)
     );
     const merkleRoot = new Uint8Array();
-    const tweakedKey = taprootTweakPrivKey(key, merkleRoot);
+    const tweakedKey = taprootTweakPrivKey2(key, merkleRoot);
     if (!tweakedKey)
       throw new Error("Invalid private key for taproot tweaking");
     const signature = schnorr5.sign(sighash, tweakedKey);
@@ -25945,6 +27205,48 @@ var SparkWallet = class _SparkWallet extends EventEmitter {
     }
     return this.sparkAddress;
   }
+  async createSparkPaymentIntent(assetIdentifier, assetAmount = BigInt(0), memo) {
+    const MAX_UINT128 = BigInt("340282366920938463463374607431768211455");
+    if (assetAmount < 0 || assetAmount > MAX_UINT128) {
+      throw new ValidationError(
+        "Asset amount must be between 0 and MAX_UINT128",
+        {
+          field: "assetAmount",
+          value: assetAmount
+        }
+      );
+    }
+    if (memo) {
+      const encoder = new TextEncoder();
+      const memoBytes = encoder.encode(memo);
+      if (memoBytes.length > 120) {
+        throw new ValidationError(
+          "Memo exceeds the maximum allowed byte length of 120.",
+          {
+            field: "memo",
+            value: memo,
+            expected: "less than 120 bytes"
+          }
+        );
+      }
+    }
+    if (assetIdentifier) {
+      isValidPublicKey(assetIdentifier);
+    }
+    const paymentRequest = encodeSparkAddress({
+      identityPublicKey: bytesToHex12(
+        await this.config.signer.getIdentityPublicKey()
+      ),
+      network: this.config.getNetworkType(),
+      paymentIntentFields: {
+        id: uuidv7obj().bytes,
+        assetIdentifier: assetIdentifier ? hexToBytes13(assetIdentifier) : void 0,
+        assetAmount: numberToVarBytesBE(assetAmount),
+        memo
+      }
+    });
+    return paymentRequest;
+  }
   /**
    * Initializes the wallet using either a mnemonic phrase or a raw seed.
    * initWallet will also claim any pending incoming lightning payment, spark transfer,
@@ -26145,7 +27447,7 @@ var SparkWallet = class _SparkWallet extends EventEmitter {
         totalAmountSats: leavesBatch.reduce((acc, leaf) => acc + leaf.value, 0),
         // TODO: Request fee from SSP
         feeSats: 0,
-        idempotencyKey: uuidv74()
+        idempotencyKey: uuidv75()
       });
       if (!request) {
         throw new Error("Failed to request leaves swap. No response returned.");
@@ -26247,8 +27549,8 @@ var SparkWallet = class _SparkWallet extends EventEmitter {
       tokenPublicKey: bytesToHex12(info.announcement.publicKey.publicKey),
       tokenName: info.announcement.name,
       tokenSymbol: info.announcement.symbol,
-      tokenDecimals: Number(bytesToNumberBE7(info.announcement.decimal)),
-      maxSupply: bytesToNumberBE7(info.announcement.maxSupply)
+      tokenDecimals: Number(bytesToNumberBE8(info.announcement.decimal)),
+      maxSupply: bytesToNumberBE8(info.announcement.maxSupply)
     }));
   }
   /**
@@ -26291,8 +27593,8 @@ var SparkWallet = class _SparkWallet extends EventEmitter {
           tokenPublicKey,
           tokenName: info.announcement.name,
           tokenSymbol: info.announcement.symbol,
-          tokenDecimals: Number(bytesToNumberBE7(info.announcement.decimal)),
-          maxSupply: bytesToNumberBE7(info.announcement.maxSupply)
+          tokenDecimals: Number(bytesToNumberBE8(info.announcement.decimal)),
+          maxSupply: bytesToNumberBE8(info.announcement.maxSupply)
         }
       });
     }
@@ -26344,7 +27646,7 @@ var SparkWallet = class _SparkWallet extends EventEmitter {
    * @private
    */
   async generateDepositAddress(isStatic) {
-    const leafId = uuidv74();
+    const leafId = uuidv75();
     let signingPubkey;
     if (isStatic) {
       signingPubkey = await this.config.signer.generateStaticDepositKey(0);
@@ -26531,7 +27833,7 @@ var SparkWallet = class _SparkWallet extends EventEmitter {
     const sparkClient = await this.connectionManager.createSparkClient(
       this.config.getCoordinatorAddress()
     );
-    const transferId = uuidv74();
+    const transferId = uuidv75();
     const swapResponse = await sparkClient.initiate_utxo_swap({
       onChainUtxo: {
         txid: hexToBytes13(depositTransactionId),
@@ -26963,7 +28265,7 @@ var SparkWallet = class _SparkWallet extends EventEmitter {
     const signerIdentityPublicKey = await this.config.signer.getIdentityPublicKey();
     const isSelfTransfer = equalBytes5(
       signerIdentityPublicKey,
-      hexToBytes13(receiverAddress)
+      hexToBytes13(receiverAddress.identityPublicKey)
     );
     return await this.withLeaves(async () => {
       let leavesToSend = await this.selectLeaves(amountSats);
@@ -26980,7 +28282,7 @@ var SparkWallet = class _SparkWallet extends EventEmitter {
       );
       const transfer = await this.transferService.sendTransferWithKeyTweaks(
         leafKeyTweaks,
-        hexToBytes13(receiverAddress)
+        hexToBytes13(receiverAddress.identityPublicKey)
       );
       const leavesToRemove = new Set(leavesToSend.map((leaf) => leaf.id));
       this.leaves = this.leaves.filter((leaf) => !leavesToRemove.has(leaf.id));
@@ -27639,7 +28941,7 @@ var SparkWallet = class _SparkWallet extends EventEmitter {
     const coopExitRequest = await sspClient.requestCoopExit({
       leafExternalIds: leavesToSend.map((leaf) => leaf.id),
       withdrawalAddress: onchainAddress,
-      idempotencyKey: uuidv74(),
+      idempotencyKey: uuidv75(),
       exitSpeed,
       withdrawAll: true
     });
@@ -27703,6 +29005,27 @@ var SparkWallet = class _SparkWallet extends EventEmitter {
     });
     return feeEstimate;
   }
+  /**
+   * Gets a transfer that has been sent by the SSP to the wallet.
+   *
+   * @param {string} id - The ID of the transfer
+   * @returns {Promise<GraphQLTransferObj | null>} The transfer
+   */
+  async getTransferFromSsp(id) {
+    const sspClient = this.getSspClient();
+    return await sspClient.getTransfer(id);
+  }
+  /**
+   * Gets a transfer, that the wallet is a participant of, in the Spark network.
+   * Only contains data about the spark->spark transfer, use getTransferFromSsp if you're
+   * looking for information related to a lightning transfer.
+   *
+   * @param {string} id - The ID of the transfer
+   * @returns {Promise<Transfer | undefined>} The transfer
+   */
+  async getTransfer(id) {
+    return await this.transferService.queryTransfer(id);
+  }
   // ***** Token Flow *****
   /**
    * Synchronizes token outputs for the wallet.
@@ -28792,6 +30115,36 @@ function constructFeeBumpTx(txHex, utxos, feeRate, previousFeeBumpTx) {
     correctedParentTx: correctedTxHex !== txHex ? correctedTxHex : void 0
   };
 }
+
+// src/utils/xchain-address.ts
+import * as btc6 from "@scure/btc-signer";
+var networkByType = {
+  MAINNET: btc6.NETWORK,
+  TESTNET: btc6.TEST_NETWORK,
+  REGTEST: {
+    ...btc6.TEST_NETWORK,
+    bech32: "bcrt"
+  }
+};
+function getSparkAddressFromTaproot(taprootAddress) {
+  for (const networkType of ["MAINNET", "TESTNET", "REGTEST"]) {
+    try {
+      const result = btc6.Address(networkByType[networkType]).decode(taprootAddress);
+      if (result.type === "tr") {
+        const outputPublicKey = result.pubkey;
+        return encodeSparkAddress({
+          identityPublicKey: Buffer.concat([
+            Buffer.from([2]),
+            outputPublicKey
+          ]).toString("hex"),
+          network: networkType
+        });
+      }
+    } catch (_) {
+    }
+  }
+  throw new ValidationError("Invalid taproot address");
+}
 export {
   AuthenticationError,
   ConfigurationError,
@@ -28816,6 +30169,7 @@ export {
   bigIntToPrivateKey,
   calculateAvailableTokenAmount,
   checkIfSelectedOutputsAreAvailable,
+  checkIfValidSequence,
   collectResponses,
   computeTaprootKeyNoScript,
   computerLagrangeCoefficients,
@@ -28850,6 +30204,7 @@ export {
   getRandomSigningNonce,
   getSigHashFromTx,
   getSigningCommitmentFromNonce,
+  getSparkAddressFromTaproot,
   getTransactionSequence,
   getTransferPackageSigningPayload,
   getTxFromRawTxBytes,