@buildonspark/spark-sdk 0.3.0 → 0.3.2

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @buildonspark/spark-sdk
 
+## 0.3.2
+
+### Patch Changes
+
+- - Ensure android/build folder excluded from publish
+
+## 0.3.1
+
+### Patch Changes
+
+- - Temporarily revert address prefix change
+
 ## 0.3.0
 
 ### Minor Changes

package/dist/bare/index.cjs

@@ -1422,7 +1422,6 @@ __export(index_exports, {
   addPublicKeys: () => addPublicKeys,
   applyAdaptorToSignature: () => applyAdaptorToSignature,
   applyAdditiveTweakToPublicKey: () => applyAdditiveTweakToPublicKey,
-  assertBech32: () => assertBech32,
   bech32mDecode: () => bech32mDecode,
   bigIntToPrivateKey: () => bigIntToPrivateKey,
   checkIfSelectedOutputsAreAvailable: () => checkIfSelectedOutputsAreAvailable,
@@ -1485,7 +1484,6 @@ __export(index_exports, {
   getTxId: () => getTxId,
   getTxIdNoReverse: () => getTxIdNoReverse,
   isEphemeralAnchorOutput: () => isEphemeralAnchorOutput,
-  isLegacySparkAddress: () => isLegacySparkAddress,
   isSafeForNumber: () => isSafeForNumber,
   isTxBroadcast: () => isTxBroadcast,
   isValidPublicKey: () => isValidPublicKey,
@@ -18497,7 +18495,7 @@ var isWebExtension = (
   "chrome" in globalThis && globalThis.chrome.runtime?.id
 );
 var userAgent = "navigator" in globalThis ? globalThis.navigator.userAgent || "unknown-user-agent" : void 0;
-var packageVersion = true ? "0.3.0" : "unknown";
+var packageVersion = true ? "0.3.2" : "unknown";
 var baseEnvStr = "unknown";
 if (isBun) {
   const bunVersion = "version" in globalThis.Bun ? globalThis.Bun.version : "unknown-version";
@@ -27521,13 +27519,6 @@ function uint64be(value) {
 // src/utils/address.ts
 var BECH32M_LIMIT = 1024;
 var AddressNetwork = {
-  MAINNET: "spark",
-  TESTNET: "sparkt",
-  REGTEST: "sparkrt",
-  SIGNET: "sparks",
-  LOCAL: "sparkl"
-};
-var LegacyAddressNetwork = {
   MAINNET: "sp",
   TESTNET: "spt",
   REGTEST: "sprt",
@@ -27575,11 +27566,11 @@ function encodeSparkAddressWithSignature(payload, signature) {
 function decodeSparkAddress(address2, network) {
   try {
     const decoded = bech32mDecode(address2);
-    if (network !== getNetworkFromSparkAddress(address2)) {
+    if (decoded.prefix !== AddressNetwork[network]) {
       throw new ValidationError("Invalid Spark address prefix", {
         field: "address",
         value: address2,
-        expected: `prefix='${AddressNetwork[network]}' or '${LegacyAddressNetwork[network]}'`
+        expected: `prefix='${AddressNetwork[network]}'`
       });
     }
     const payload = SparkAddress.decode(import_base2.bech32m.fromWords(decoded.words));
@@ -27625,35 +27616,18 @@ function decodeSparkAddress(address2, network) {
     );
   }
 }
-var PrefixToNetwork = Object.fromEntries(
-  Object.entries(AddressNetwork).map(([k, v]) => [v, k])
-);
-var LegacyPrefixToNetwork = Object.fromEntries(
-  Object.entries(LegacyAddressNetwork).map(([k, v]) => [v, k])
-);
-function getNetworkFromSparkAddress(address2) {
-  const { prefix } = bech32mDecode(address2);
-  const network = PrefixToNetwork[prefix] ?? LegacyPrefixToNetwork[prefix];
-  if (!network) {
-    throw new ValidationError("Invalid Spark address prefix", {
-      field: "network",
-      value: address2,
-      expected: "prefix='spark1', 'sparkt1', 'sparkrt1', 'sparks1', 'sparkl1' or legacy ('sp1', 'spt1', 'sprt1', 'sps1', 'spl1')"
-    });
-  }
-  return network;
-}
-function isLegacySparkAddress(address2) {
-  try {
-    const { prefix } = bech32mDecode(address2);
-    return prefix in LegacyPrefixToNetwork;
-  } catch (error) {
-    return false;
-  }
-}
 function isValidSparkAddress(address2) {
   try {
-    const network = getNetworkFromSparkAddress(address2);
+    const network = Object.entries(AddressNetwork).find(
+      ([_, prefix]) => address2.startsWith(prefix)
+    )?.[0];
+    if (!network) {
+      throw new ValidationError("Invalid Spark address network", {
+        field: "network",
+        value: address2,
+        expected: Object.values(AddressNetwork)
+      });
+    }
     decodeSparkAddress(address2, network);
     return true;
   } catch (error) {
@@ -27849,16 +27823,25 @@ function validateSparkInvoiceSignature(invoice) {
     );
   }
 }
+function getNetworkFromSparkAddress(address2) {
+  const { prefix } = bech32mDecode(address2);
+  const network = Object.entries(AddressNetwork).find(
+    ([, p]) => p === prefix
+  )?.[0];
+  if (!network) {
+    throw new ValidationError("Invalid Spark address network", {
+      field: "network",
+      value: address2,
+      expected: Object.values(AddressNetwork)
+    });
+  }
+  return network;
+}
 function toProtoTimestamp(date) {
   const ms = date.getTime();
   return { seconds: Math.floor(ms / 1e3), nanos: ms % 1e3 * 1e6 };
 }
-function assertBech32(s) {
-  const i = s.lastIndexOf("1");
-  if (i <= 0 || i >= s.length - 1) throw new Error("invalid bech32 string");
-}
 function bech32mDecode(address2) {
-  assertBech32(address2);
   return import_base2.bech32m.decode(address2, BECH32M_LIMIT);
 }
 function bech32mEncode(prefix, words) {
@@ -32257,14 +32240,14 @@ var SparkWallet = class _SparkWallet extends import_eventemitter3.EventEmitter {
    * @param {Object} params - Parameters for the sats payment
    * @param {number} params.amount - The amount of sats to receive
    * @param {string} [params.memo] - The memo for the payment
-   * @param {string} [params.senderSparkAddress] - The spark address of the expected sender
+   * @param {string} [params.senderPublicKey] - The public key of the expected sender
    * @param {Date} [params.expiryTime] - The expiry time of the payment
-   * @returns {Promise<SparkAddressFormat>} The Spark invoice for the sats payment
+   * @returns {Promise<SparkAddressFormat>} The Spark address for the sats payment
    */
   async createSatsInvoice({
     amount,
     memo,
-    senderSparkAddress,
+    senderPublicKey,
     expiryTime
   }) {
     const MAX_SATS_AMOUNT = 21e14;
@@ -32284,15 +32267,12 @@ var SparkWallet = class _SparkWallet extends import_eventemitter3.EventEmitter {
         amount
       }
     };
-    const senderPublicKey = senderSparkAddress ? (0, import_utils23.hexToBytes)(
-      decodeSparkAddress(senderSparkAddress, this.config.getNetworkType()).identityPublicKey
-    ) : void 0;
     const invoiceFields = {
       version: 1,
       id: (0, import_uuidv75.uuidv7obj)().bytes,
       paymentType: protoPayment,
       memo,
-      senderPublicKey,
+      senderPublicKey: senderPublicKey ? (0, import_utils23.hexToBytes)(senderPublicKey) : void 0,
       expiryTime: expiryTime ?? void 0
     };
     validateSparkInvoiceFields(invoiceFields);
@@ -32319,15 +32299,15 @@ var SparkWallet = class _SparkWallet extends import_eventemitter3.EventEmitter {
    * @param {bigint} [params.amount] - The amount of tokens to receive
    * @param {Bech32mTokenIdentifier} [params.tokenIdentifier] - The token identifier
    * @param {string} [params.memo] - The memo for the payment
-   * @param {string} [params.senderSparkAddress] - The spark address of the expected sender
+   * @param {string} [params.senderPublicKey] - The public key of the expected sender
    * @param {Date} [params.expiryTime] - The expiry time of the payment
-   * @returns {Promise<SparkAddressFormat>} The Spark invoice for the tokens payment
+   * @returns {Promise<SparkAddressFormat>} The Spark address for the tokens payment
    */
   async createTokensInvoice({
     amount,
     tokenIdentifier,
     memo,
-    senderSparkAddress,
+    senderPublicKey,
     expiryTime
   }) {
     const MAX_UINT128 = BigInt(2 ** 128 - 1);
@@ -32352,15 +32332,12 @@ var SparkWallet = class _SparkWallet extends import_eventemitter3.EventEmitter {
         amount: amount ? (0, import_utils23.numberToVarBytesBE)(amount) : void 0
       }
     };
-    const senderPublicKey = senderSparkAddress ? (0, import_utils23.hexToBytes)(
-      decodeSparkAddress(senderSparkAddress, this.config.getNetworkType()).identityPublicKey
-    ) : void 0;
     const invoiceFields = {
       version: 1,
       id: (0, import_uuidv75.uuidv7obj)().bytes,
       paymentType: protoPayment,
       memo: memo ?? void 0,
-      senderPublicKey,
+      senderPublicKey: senderPublicKey ? (0, import_utils23.hexToBytes)(senderPublicKey) : void 0,
       expiryTime: expiryTime ?? void 0
     };
     validateSparkInvoiceFields(invoiceFields);
@@ -34559,19 +34536,14 @@ var SparkWallet = class _SparkWallet extends import_eventemitter3.EventEmitter {
           tokenAmount: d.amount,
           receiverSparkAddress: d.invoice
         }));
-        const invoices = decodedInvoices.map(
-          (d) => d.invoice
-        );
         tokenTransferTasks.push(
           this.tokenTransactionService.tokenTransfer({ tokenOutputs: this.tokenOutputs, receiverOutputs }).then((txid) => ({
             ok: true,
             tokenIdentifier: tokenIdB32,
-            invoices,
             txid
           })).catch((e) => ({
             ok: false,
             tokenIdentifier: tokenIdB32,
-            invoices,
             error: e instanceof Error ? e : new Error(String(e))
           }))
         );
@@ -34581,13 +34553,11 @@ var SparkWallet = class _SparkWallet extends import_eventemitter3.EventEmitter {
         if (r.ok) {
           tokenTransactionSuccess.push({
             tokenIdentifier: r.tokenIdentifier,
-            invoices: r.invoices,
             txid: r.txid
           });
         } else {
           tokenTransactionErrors.push({
             tokenIdentifier: r.tokenIdentifier,
-            invoices: r.invoices,
             error: r.error
           });
         }
@@ -34624,17 +34594,6 @@ var SparkWallet = class _SparkWallet extends import_eventemitter3.EventEmitter {
     const identityPublicKey = await this.getIdentityPublicKey();
     sparkInvoices.forEach((input) => {
       const { invoice, amount } = input;
-      if (isLegacySparkAddress(invoice)) {
-        invalidInvoices.push({
-          invoice,
-          error: new ValidationError("Deprecated spark invoice format", {
-            field: "invoice",
-            value: invoice,
-            expected: "Modern spark invoice format. Deprecated formats are not supported."
-          })
-        });
-        return;
-      }
       const addressData = decodeSparkAddress(
         invoice,
         this.config.getNetworkType()
@@ -36425,7 +36384,6 @@ setFetch(sparkBareFetch, Headers2);
   addPublicKeys,
   applyAdaptorToSignature,
   applyAdditiveTweakToPublicKey,
-  assertBech32,
   bech32mDecode,
   bigIntToPrivateKey,
   checkIfSelectedOutputsAreAvailable,
@@ -36488,7 +36446,6 @@ setFetch(sparkBareFetch, Headers2);
   getTxId,
   getTxIdNoReverse,
   isEphemeralAnchorOutput,
-  isLegacySparkAddress,
   isSafeForNumber,
   isTxBroadcast,
   isValidPublicKey,

package/dist/bare/index.d.cts

@@ -2956,10 +2956,7 @@ declare class ConnectionManager {
 }
 
 declare const AddressNetwork: Record<NetworkType, string>;
-declare const LegacyAddressNetwork: Record<NetworkType, string>;
-type Bech32String = `${string}1${string}`;
 type SparkAddressFormat = `${(typeof AddressNetwork)[keyof typeof AddressNetwork]}1${string}`;
-type LegacySparkAddressFormat = `${(typeof LegacyAddressNetwork)[keyof typeof LegacyAddressNetwork]}1${string}`;
 interface SparkAddressData {
     identityPublicKey: string;
     network: NetworkType;
@@ -2988,18 +2985,16 @@ interface DecodedSparkAddressData {
 declare function encodeSparkAddress(payload: SparkAddressData): SparkAddressFormat;
 declare function encodeSparkAddressWithSignature(payload: SparkAddressData, signature?: Uint8Array): SparkAddressFormat;
 declare function decodeSparkAddress(address: string, network: NetworkType): DecodedSparkAddressData;
-declare function getNetworkFromSparkAddress(address: string): NetworkType;
-declare function isLegacySparkAddress(address: string): address is LegacySparkAddressFormat;
 declare function isValidSparkAddress(address: string): boolean;
 declare function isValidPublicKey(publicKey: string): void;
 declare function validateSparkInvoiceFields(sparkInvoiceFields: SparkInvoiceFields): void;
 declare function validateSparkInvoiceSignature(invoice: SparkAddressFormat): void;
+declare function getNetworkFromSparkAddress(address: SparkAddressFormat): "MAINNET" | "REGTEST" | "SIGNET" | "TESTNET" | "LOCAL";
 declare function toProtoTimestamp(date: Date): {
     seconds: number;
     nanos: number;
 };
-declare function assertBech32(s: string): asserts s is Bech32String;
-declare function bech32mDecode(address: string): _scure_base.Bech32Decoded<string>;
+declare function bech32mDecode(address: SparkAddressFormat): _scure_base.Bech32Decoded<string>;
 declare function isSafeForNumber(bi: bigint): boolean;
 
 declare class SigningService {
@@ -3137,23 +3132,20 @@ type FulfillSparkInvoiceResponse = {
     }[];
     tokenTransactionSuccess: {
         tokenIdentifier: Bech32mTokenIdentifier;
-        invoices: SparkAddressFormat[];
         txid: string;
     }[];
     satsTransactionErrors: {
-        invoice: SparkAddressFormat;
+        invoice: string;
         error: Error;
     }[];
     tokenTransactionErrors: {
         tokenIdentifier: Bech32mTokenIdentifier;
-        invoices: SparkAddressFormat[];
         error: Error;
     }[];
-    invalidInvoices: InvalidInvoice[];
-};
-type InvalidInvoice = {
-    invoice: SparkAddressFormat;
-    error: Error;
+    invalidInvoices: {
+        invoice: string;
+        error: Error;
+    }[];
 };
 /**
  * Token metadata containing essential information about a token.
@@ -3291,14 +3283,14 @@ declare class SparkWallet extends EventEmitter<SparkWalletEvents> {
      * @param {Object} params - Parameters for the sats payment
      * @param {number} params.amount - The amount of sats to receive
      * @param {string} [params.memo] - The memo for the payment
-     * @param {string} [params.senderSparkAddress] - The spark address of the expected sender
+     * @param {string} [params.senderPublicKey] - The public key of the expected sender
      * @param {Date} [params.expiryTime] - The expiry time of the payment
-     * @returns {Promise<SparkAddressFormat>} The Spark invoice for the sats payment
+     * @returns {Promise<SparkAddressFormat>} The Spark address for the sats payment
      */
-    createSatsInvoice({ amount, memo, senderSparkAddress, expiryTime, }: {
+    createSatsInvoice({ amount, memo, senderPublicKey, expiryTime, }: {
         amount?: number;
         memo?: string;
-        senderSparkAddress?: SparkAddressFormat;
+        senderPublicKey?: string;
         expiryTime?: Date;
     }): Promise<SparkAddressFormat>;
     /**
@@ -3308,15 +3300,15 @@ declare class SparkWallet extends EventEmitter<SparkWalletEvents> {
      * @param {bigint} [params.amount] - The amount of tokens to receive
      * @param {Bech32mTokenIdentifier} [params.tokenIdentifier] - The token identifier
      * @param {string} [params.memo] - The memo for the payment
-     * @param {string} [params.senderSparkAddress] - The spark address of the expected sender
+     * @param {string} [params.senderPublicKey] - The public key of the expected sender
      * @param {Date} [params.expiryTime] - The expiry time of the payment
-     * @returns {Promise<SparkAddressFormat>} The Spark invoice for the tokens payment
+     * @returns {Promise<SparkAddressFormat>} The Spark address for the tokens payment
      */
-    createTokensInvoice({ amount, tokenIdentifier, memo, senderSparkAddress, expiryTime, }: {
+    createTokensInvoice({ amount, tokenIdentifier, memo, senderPublicKey, expiryTime, }: {
         tokenIdentifier?: Bech32mTokenIdentifier;
         amount?: bigint;
         memo?: string;
-        senderSparkAddress?: SparkAddressFormat;
+        senderPublicKey?: string;
         expiryTime?: Date;
     }): Promise<SparkAddressFormat>;
     /**
@@ -4040,4 +4032,4 @@ declare class SparkSdkLogger {
     static setAllEnabled(enabled: boolean): void;
 }
 
-export { type AggregateFrostParams, AuthenticationError, type Bech32mTokenIdentifier, type Bech32mTokenIdentifierData, type BroadcastConfig, type BroadcastResult, ConfigurationError, DEFAULT_FEE_SATS, DIRECT_TIMELOCK_OFFSET, type DecodedSparkAddressData, DefaultSparkSigner, type FeeBumpTxChain, type FeeBumpTxPackage, type FeeRate, type IKeyPackage, INITIAL_DIRECT_SEQUENCE, INITIAL_SEQUENCE, InternalValidationError, LOGGER_NAMES, LRC_WALLET_NETWORK, type LeafInfo, type LegacySparkAddressFormat, type LoggerName, Network, NetworkError, NetworkToProto, type NetworkType, NotImplementedError, RPCError, type SignFrostParams, type SparkAddressData, type SparkAddressFormat, SparkSDKError, SparkSdkLogger, type SparkSigner, SparkWalletBrowser as SparkWallet, TEST_UNILATERAL_DIRECT_SEQUENCE, TEST_UNILATERAL_SEQUENCE, TaprootOutputKeysGenerator, TaprootSparkSigner, type TxChain, UnsafeStatelessSparkSigner, type Utxo, ValidationError, type VerifiableSecretShare, addPrivateKeys, addPublicKeys, applyAdaptorToSignature, applyAdditiveTweakToPublicKey, assertBech32, bech32mDecode, bigIntToPrivateKey, checkIfSelectedOutputsAreAvailable, checkIfValidSequence, collectResponses, computeTaprootKeyNoScript, computerLagrangeCoefficients, constructFeeBumpTx, constructUnilateralExitFeeBumpPackages, constructUnilateralExitTxs, createConnectorRefundTransactions, createLeafNodeTx, createNodeTx, createNodeTxs, createRefundTx, createRefundTxs, createRootTx, createSigningCommitment, createSigningNonce, createSplitTx, decodeBech32mTokenIdentifier, decodeBytesToSigningCommitment, decodeBytesToSigningNonce, decodeSparkAddress, doesLeafNeedRefresh, encodeBech32mTokenIdentifier, encodeSigningCommitmentToBytes, encodeSigningNonceToBytes, encodeSparkAddress, encodeSparkAddressWithSignature, evaluatePolynomial, fieldDiv, filterTokenBalanceForTokenIdentifier, generateAdaptorFromSignature, generatePolynomialForSecretSharing, generateSignatureFromExistingAdaptor, getCurrentTimelock, getEphemeralAnchorOutput, getLatestDepositTxId, getNetwork, getNetworkFromAddress, getNetworkFromBech32mTokenIdentifier, getNetworkFromSparkAddress, getNetworkFromString, getNextTransactionSequence, getP2TRAddressFromPkScript, getP2TRAddressFromPublicKey, getP2TRScriptFromPublicKey, getP2WPKHAddressFromPublicKey, getRandomBigInt, getRandomSigningNonce, getSigHashFromTx, getSigningCommitmentFromNonce, getSparkAddressFromTaproot, getTransactionSequence, getTransferPackageSigningPayload, getTxEstimatedVbytesSizeByNumberOfInputsOutputs, getTxFromRawTxBytes, getTxFromRawTxHex, getTxId, getTxIdNoReverse, isEphemeralAnchorOutput, isLegacySparkAddress, isSafeForNumber, isTxBroadcast, isValidPublicKey, isValidSparkAddress, lastKeyWithTarget, maybeApplyFee, modInverse, proofOfPossessionMessageHashForDepositAddress, protoToNetwork, recoverSecret, splitSecret, splitSecretWithProofs, subtractPrivateKeys, subtractPublicKeys, sumAvailableTokens, sumOfPrivateKeys, toProtoTimestamp, validateOutboundAdaptorSignature, validateShare, validateSparkInvoiceFields, validateSparkInvoiceSignature };
+export { type AggregateFrostParams, AuthenticationError, type Bech32mTokenIdentifier, type Bech32mTokenIdentifierData, type BroadcastConfig, type BroadcastResult, ConfigurationError, DEFAULT_FEE_SATS, DIRECT_TIMELOCK_OFFSET, type DecodedSparkAddressData, DefaultSparkSigner, type FeeBumpTxChain, type FeeBumpTxPackage, type FeeRate, type IKeyPackage, INITIAL_DIRECT_SEQUENCE, INITIAL_SEQUENCE, InternalValidationError, LOGGER_NAMES, LRC_WALLET_NETWORK, type LeafInfo, type LoggerName, Network, NetworkError, NetworkToProto, type NetworkType, NotImplementedError, RPCError, type SignFrostParams, type SparkAddressData, type SparkAddressFormat, SparkSDKError, SparkSdkLogger, type SparkSigner, SparkWalletBrowser as SparkWallet, TEST_UNILATERAL_DIRECT_SEQUENCE, TEST_UNILATERAL_SEQUENCE, TaprootOutputKeysGenerator, TaprootSparkSigner, type TxChain, UnsafeStatelessSparkSigner, type Utxo, ValidationError, type VerifiableSecretShare, addPrivateKeys, addPublicKeys, applyAdaptorToSignature, applyAdditiveTweakToPublicKey, bech32mDecode, bigIntToPrivateKey, checkIfSelectedOutputsAreAvailable, checkIfValidSequence, collectResponses, computeTaprootKeyNoScript, computerLagrangeCoefficients, constructFeeBumpTx, constructUnilateralExitFeeBumpPackages, constructUnilateralExitTxs, createConnectorRefundTransactions, createLeafNodeTx, createNodeTx, createNodeTxs, createRefundTx, createRefundTxs, createRootTx, createSigningCommitment, createSigningNonce, createSplitTx, decodeBech32mTokenIdentifier, decodeBytesToSigningCommitment, decodeBytesToSigningNonce, decodeSparkAddress, doesLeafNeedRefresh, encodeBech32mTokenIdentifier, encodeSigningCommitmentToBytes, encodeSigningNonceToBytes, encodeSparkAddress, encodeSparkAddressWithSignature, evaluatePolynomial, fieldDiv, filterTokenBalanceForTokenIdentifier, generateAdaptorFromSignature, generatePolynomialForSecretSharing, generateSignatureFromExistingAdaptor, getCurrentTimelock, getEphemeralAnchorOutput, getLatestDepositTxId, getNetwork, getNetworkFromAddress, getNetworkFromBech32mTokenIdentifier, getNetworkFromSparkAddress, getNetworkFromString, getNextTransactionSequence, getP2TRAddressFromPkScript, getP2TRAddressFromPublicKey, getP2TRScriptFromPublicKey, getP2WPKHAddressFromPublicKey, getRandomBigInt, getRandomSigningNonce, getSigHashFromTx, getSigningCommitmentFromNonce, getSparkAddressFromTaproot, getTransactionSequence, getTransferPackageSigningPayload, getTxEstimatedVbytesSizeByNumberOfInputsOutputs, getTxFromRawTxBytes, getTxFromRawTxHex, getTxId, getTxIdNoReverse, isEphemeralAnchorOutput, isSafeForNumber, isTxBroadcast, isValidPublicKey, isValidSparkAddress, lastKeyWithTarget, maybeApplyFee, modInverse, proofOfPossessionMessageHashForDepositAddress, protoToNetwork, recoverSecret, splitSecret, splitSecretWithProofs, subtractPrivateKeys, subtractPublicKeys, sumAvailableTokens, sumOfPrivateKeys, toProtoTimestamp, validateOutboundAdaptorSignature, validateShare, validateSparkInvoiceFields, validateSparkInvoiceSignature };

package/dist/bare/index.d.ts

@@ -2956,10 +2956,7 @@ declare class ConnectionManager {
 }
 
 declare const AddressNetwork: Record<NetworkType, string>;
-declare const LegacyAddressNetwork: Record<NetworkType, string>;
-type Bech32String = `${string}1${string}`;
 type SparkAddressFormat = `${(typeof AddressNetwork)[keyof typeof AddressNetwork]}1${string}`;
-type LegacySparkAddressFormat = `${(typeof LegacyAddressNetwork)[keyof typeof LegacyAddressNetwork]}1${string}`;
 interface SparkAddressData {
     identityPublicKey: string;
     network: NetworkType;
@@ -2988,18 +2985,16 @@ interface DecodedSparkAddressData {
 declare function encodeSparkAddress(payload: SparkAddressData): SparkAddressFormat;
 declare function encodeSparkAddressWithSignature(payload: SparkAddressData, signature?: Uint8Array): SparkAddressFormat;
 declare function decodeSparkAddress(address: string, network: NetworkType): DecodedSparkAddressData;
-declare function getNetworkFromSparkAddress(address: string): NetworkType;
-declare function isLegacySparkAddress(address: string): address is LegacySparkAddressFormat;
 declare function isValidSparkAddress(address: string): boolean;
 declare function isValidPublicKey(publicKey: string): void;
 declare function validateSparkInvoiceFields(sparkInvoiceFields: SparkInvoiceFields): void;
 declare function validateSparkInvoiceSignature(invoice: SparkAddressFormat): void;
+declare function getNetworkFromSparkAddress(address: SparkAddressFormat): "MAINNET" | "REGTEST" | "SIGNET" | "TESTNET" | "LOCAL";
 declare function toProtoTimestamp(date: Date): {
     seconds: number;
     nanos: number;
 };
-declare function assertBech32(s: string): asserts s is Bech32String;
-declare function bech32mDecode(address: string): _scure_base.Bech32Decoded<string>;
+declare function bech32mDecode(address: SparkAddressFormat): _scure_base.Bech32Decoded<string>;
 declare function isSafeForNumber(bi: bigint): boolean;
 
 declare class SigningService {
@@ -3137,23 +3132,20 @@ type FulfillSparkInvoiceResponse = {
     }[];
     tokenTransactionSuccess: {
         tokenIdentifier: Bech32mTokenIdentifier;
-        invoices: SparkAddressFormat[];
         txid: string;
     }[];
     satsTransactionErrors: {
-        invoice: SparkAddressFormat;
+        invoice: string;
         error: Error;
     }[];
     tokenTransactionErrors: {
         tokenIdentifier: Bech32mTokenIdentifier;
-        invoices: SparkAddressFormat[];
         error: Error;
     }[];
-    invalidInvoices: InvalidInvoice[];
-};
-type InvalidInvoice = {
-    invoice: SparkAddressFormat;
-    error: Error;
+    invalidInvoices: {
+        invoice: string;
+        error: Error;
+    }[];
 };
 /**
  * Token metadata containing essential information about a token.
@@ -3291,14 +3283,14 @@ declare class SparkWallet extends EventEmitter<SparkWalletEvents> {
      * @param {Object} params - Parameters for the sats payment
      * @param {number} params.amount - The amount of sats to receive
      * @param {string} [params.memo] - The memo for the payment
-     * @param {string} [params.senderSparkAddress] - The spark address of the expected sender
+     * @param {string} [params.senderPublicKey] - The public key of the expected sender
      * @param {Date} [params.expiryTime] - The expiry time of the payment
-     * @returns {Promise<SparkAddressFormat>} The Spark invoice for the sats payment
+     * @returns {Promise<SparkAddressFormat>} The Spark address for the sats payment
      */
-    createSatsInvoice({ amount, memo, senderSparkAddress, expiryTime, }: {
+    createSatsInvoice({ amount, memo, senderPublicKey, expiryTime, }: {
         amount?: number;
         memo?: string;
-        senderSparkAddress?: SparkAddressFormat;
+        senderPublicKey?: string;
         expiryTime?: Date;
     }): Promise<SparkAddressFormat>;
     /**
@@ -3308,15 +3300,15 @@ declare class SparkWallet extends EventEmitter<SparkWalletEvents> {
      * @param {bigint} [params.amount] - The amount of tokens to receive
      * @param {Bech32mTokenIdentifier} [params.tokenIdentifier] - The token identifier
      * @param {string} [params.memo] - The memo for the payment
-     * @param {string} [params.senderSparkAddress] - The spark address of the expected sender
+     * @param {string} [params.senderPublicKey] - The public key of the expected sender
      * @param {Date} [params.expiryTime] - The expiry time of the payment
-     * @returns {Promise<SparkAddressFormat>} The Spark invoice for the tokens payment
+     * @returns {Promise<SparkAddressFormat>} The Spark address for the tokens payment
      */
-    createTokensInvoice({ amount, tokenIdentifier, memo, senderSparkAddress, expiryTime, }: {
+    createTokensInvoice({ amount, tokenIdentifier, memo, senderPublicKey, expiryTime, }: {
         tokenIdentifier?: Bech32mTokenIdentifier;
         amount?: bigint;
         memo?: string;
-        senderSparkAddress?: SparkAddressFormat;
+        senderPublicKey?: string;
         expiryTime?: Date;
     }): Promise<SparkAddressFormat>;
     /**
@@ -4040,4 +4032,4 @@ declare class SparkSdkLogger {
     static setAllEnabled(enabled: boolean): void;
 }
 
-export { type AggregateFrostParams, AuthenticationError, type Bech32mTokenIdentifier, type Bech32mTokenIdentifierData, type BroadcastConfig, type BroadcastResult, ConfigurationError, DEFAULT_FEE_SATS, DIRECT_TIMELOCK_OFFSET, type DecodedSparkAddressData, DefaultSparkSigner, type FeeBumpTxChain, type FeeBumpTxPackage, type FeeRate, type IKeyPackage, INITIAL_DIRECT_SEQUENCE, INITIAL_SEQUENCE, InternalValidationError, LOGGER_NAMES, LRC_WALLET_NETWORK, type LeafInfo, type LegacySparkAddressFormat, type LoggerName, Network, NetworkError, NetworkToProto, type NetworkType, NotImplementedError, RPCError, type SignFrostParams, type SparkAddressData, type SparkAddressFormat, SparkSDKError, SparkSdkLogger, type SparkSigner, SparkWalletBrowser as SparkWallet, TEST_UNILATERAL_DIRECT_SEQUENCE, TEST_UNILATERAL_SEQUENCE, TaprootOutputKeysGenerator, TaprootSparkSigner, type TxChain, UnsafeStatelessSparkSigner, type Utxo, ValidationError, type VerifiableSecretShare, addPrivateKeys, addPublicKeys, applyAdaptorToSignature, applyAdditiveTweakToPublicKey, assertBech32, bech32mDecode, bigIntToPrivateKey, checkIfSelectedOutputsAreAvailable, checkIfValidSequence, collectResponses, computeTaprootKeyNoScript, computerLagrangeCoefficients, constructFeeBumpTx, constructUnilateralExitFeeBumpPackages, constructUnilateralExitTxs, createConnectorRefundTransactions, createLeafNodeTx, createNodeTx, createNodeTxs, createRefundTx, createRefundTxs, createRootTx, createSigningCommitment, createSigningNonce, createSplitTx, decodeBech32mTokenIdentifier, decodeBytesToSigningCommitment, decodeBytesToSigningNonce, decodeSparkAddress, doesLeafNeedRefresh, encodeBech32mTokenIdentifier, encodeSigningCommitmentToBytes, encodeSigningNonceToBytes, encodeSparkAddress, encodeSparkAddressWithSignature, evaluatePolynomial, fieldDiv, filterTokenBalanceForTokenIdentifier, generateAdaptorFromSignature, generatePolynomialForSecretSharing, generateSignatureFromExistingAdaptor, getCurrentTimelock, getEphemeralAnchorOutput, getLatestDepositTxId, getNetwork, getNetworkFromAddress, getNetworkFromBech32mTokenIdentifier, getNetworkFromSparkAddress, getNetworkFromString, getNextTransactionSequence, getP2TRAddressFromPkScript, getP2TRAddressFromPublicKey, getP2TRScriptFromPublicKey, getP2WPKHAddressFromPublicKey, getRandomBigInt, getRandomSigningNonce, getSigHashFromTx, getSigningCommitmentFromNonce, getSparkAddressFromTaproot, getTransactionSequence, getTransferPackageSigningPayload, getTxEstimatedVbytesSizeByNumberOfInputsOutputs, getTxFromRawTxBytes, getTxFromRawTxHex, getTxId, getTxIdNoReverse, isEphemeralAnchorOutput, isLegacySparkAddress, isSafeForNumber, isTxBroadcast, isValidPublicKey, isValidSparkAddress, lastKeyWithTarget, maybeApplyFee, modInverse, proofOfPossessionMessageHashForDepositAddress, protoToNetwork, recoverSecret, splitSecret, splitSecretWithProofs, subtractPrivateKeys, subtractPublicKeys, sumAvailableTokens, sumOfPrivateKeys, toProtoTimestamp, validateOutboundAdaptorSignature, validateShare, validateSparkInvoiceFields, validateSparkInvoiceSignature };
+export { type AggregateFrostParams, AuthenticationError, type Bech32mTokenIdentifier, type Bech32mTokenIdentifierData, type BroadcastConfig, type BroadcastResult, ConfigurationError, DEFAULT_FEE_SATS, DIRECT_TIMELOCK_OFFSET, type DecodedSparkAddressData, DefaultSparkSigner, type FeeBumpTxChain, type FeeBumpTxPackage, type FeeRate, type IKeyPackage, INITIAL_DIRECT_SEQUENCE, INITIAL_SEQUENCE, InternalValidationError, LOGGER_NAMES, LRC_WALLET_NETWORK, type LeafInfo, type LoggerName, Network, NetworkError, NetworkToProto, type NetworkType, NotImplementedError, RPCError, type SignFrostParams, type SparkAddressData, type SparkAddressFormat, SparkSDKError, SparkSdkLogger, type SparkSigner, SparkWalletBrowser as SparkWallet, TEST_UNILATERAL_DIRECT_SEQUENCE, TEST_UNILATERAL_SEQUENCE, TaprootOutputKeysGenerator, TaprootSparkSigner, type TxChain, UnsafeStatelessSparkSigner, type Utxo, ValidationError, type VerifiableSecretShare, addPrivateKeys, addPublicKeys, applyAdaptorToSignature, applyAdditiveTweakToPublicKey, bech32mDecode, bigIntToPrivateKey, checkIfSelectedOutputsAreAvailable, checkIfValidSequence, collectResponses, computeTaprootKeyNoScript, computerLagrangeCoefficients, constructFeeBumpTx, constructUnilateralExitFeeBumpPackages, constructUnilateralExitTxs, createConnectorRefundTransactions, createLeafNodeTx, createNodeTx, createNodeTxs, createRefundTx, createRefundTxs, createRootTx, createSigningCommitment, createSigningNonce, createSplitTx, decodeBech32mTokenIdentifier, decodeBytesToSigningCommitment, decodeBytesToSigningNonce, decodeSparkAddress, doesLeafNeedRefresh, encodeBech32mTokenIdentifier, encodeSigningCommitmentToBytes, encodeSigningNonceToBytes, encodeSparkAddress, encodeSparkAddressWithSignature, evaluatePolynomial, fieldDiv, filterTokenBalanceForTokenIdentifier, generateAdaptorFromSignature, generatePolynomialForSecretSharing, generateSignatureFromExistingAdaptor, getCurrentTimelock, getEphemeralAnchorOutput, getLatestDepositTxId, getNetwork, getNetworkFromAddress, getNetworkFromBech32mTokenIdentifier, getNetworkFromSparkAddress, getNetworkFromString, getNextTransactionSequence, getP2TRAddressFromPkScript, getP2TRAddressFromPublicKey, getP2TRScriptFromPublicKey, getP2WPKHAddressFromPublicKey, getRandomBigInt, getRandomSigningNonce, getSigHashFromTx, getSigningCommitmentFromNonce, getSparkAddressFromTaproot, getTransactionSequence, getTransferPackageSigningPayload, getTxEstimatedVbytesSizeByNumberOfInputsOutputs, getTxFromRawTxBytes, getTxFromRawTxHex, getTxId, getTxIdNoReverse, isEphemeralAnchorOutput, isSafeForNumber, isTxBroadcast, isValidPublicKey, isValidSparkAddress, lastKeyWithTarget, maybeApplyFee, modInverse, proofOfPossessionMessageHashForDepositAddress, protoToNetwork, recoverSecret, splitSecret, splitSecretWithProofs, subtractPrivateKeys, subtractPublicKeys, sumAvailableTokens, sumOfPrivateKeys, toProtoTimestamp, validateOutboundAdaptorSignature, validateShare, validateSparkInvoiceFields, validateSparkInvoiceSignature };