@buildonspark/issuer-sdk 0.0.84 → 0.0.86

package/src/issuer-wallet/issuer-spark-wallet.ts

@@ -1,4 +1,3 @@
-import { TokenPubkey, TokenPubkeyAnnouncement } from "@buildonspark/lrc20-sdk";
 import {
   NetworkError,
   SparkWallet,
@@ -57,62 +56,16 @@ export class IssuerSparkWallet extends SparkWallet {
     options,
   }: SparkWalletProps) {
     const wallet = new IssuerSparkWallet(options, signer);
+    wallet.initializeTracer(wallet);
 
     const initResponse = await wallet.initWallet(mnemonicOrSeed, accountNumber);
 
-    if (isNode) {
-      wallet.wrapIssuerSparkWalletWithTracing();
-    }
-
     return {
       wallet,
       ...initResponse,
     };
   }
 
-  private wrapIssuerSparkWalletWithTracing() {
-    this.getIssuerTokenBalance = this.wrapWithOtelSpan(
-      "SparkIssuerWallet.getIssuerTokenBalance",
-      this.getIssuerTokenBalance.bind(this),
-    );
-    this.getIssuerTokenMetadata = this.wrapWithOtelSpan(
-      "SparkIssuerWallet.getIssuerTokenMetadata",
-      this.getIssuerTokenMetadata.bind(this),
-    );
-    this.getIssuerTokenIdentifier = this.wrapWithOtelSpan(
-      "SparkIssuerWallet.getIssuerTokenIdentifier",
-      this.getIssuerTokenIdentifier.bind(this),
-    );
-    this.createToken = this.wrapWithOtelSpan(
-      "SparkIssuerWallet.createToken",
-      this.createToken.bind(this),
-    );
-    this.mintTokens = this.wrapWithOtelSpan(
-      "SparkIssuerWallet.mintTokens",
-      this.mintTokens.bind(this),
-    );
-    this.burnTokens = this.wrapWithOtelSpan(
-      "SparkIssuerWallet.burnTokens",
-      this.burnTokens.bind(this),
-    );
-    this.freezeTokens = this.wrapWithOtelSpan(
-      "SparkIssuerWallet.freezeTokens",
-      this.freezeTokens.bind(this),
-    );
-    this.unfreezeTokens = this.wrapWithOtelSpan(
-      "SparkIssuerWallet.unfreezeTokens",
-      this.unfreezeTokens.bind(this),
-    );
-    this.getIssuerTokenDistribution = this.wrapWithOtelSpan(
-      "SparkIssuerWallet.getIssuerTokenDistribution",
-      this.getIssuerTokenDistribution.bind(this),
-    );
-    this.announceTokenL1 = this.wrapWithOtelSpan(
-      "SparkIssuerWallet.announceTokenL1",
-      this.announceTokenL1.bind(this),
-    );
-  }
-
   protected constructor(configOptions?: ConfigOptions, signer?: SparkSigner) {
     super(configOptions, signer);
     this.issuerTokenTransactionService = new IssuerTokenTransactionService(
@@ -123,6 +76,7 @@ export class IssuerSparkWallet extends SparkWallet {
       this.config,
       this.connectionManager,
     );
+    this.wrapIssuerSparkWalletMethodsWithTracing();
   }
 
   /**
@@ -187,7 +141,7 @@ export class IssuerSparkWallet extends SparkWallet {
       });
       if (response.tokenMetadata.length === 0) {
         throw new ValidationError(
-          "Token metadata not found - If a token has not yet been announced, please announce. If a token was recently announced, it is being confirmed. Try again in a few seconds.",
+          "Token metadata not found - If a token has not yet been created, please create it first. Try again in a few seconds.",
           {
             field: "tokenMetadata",
             value: response.tokenMetadata,
@@ -226,7 +180,7 @@ export class IssuerSparkWallet extends SparkWallet {
    * @returns The bech32m encoded token identifier for the issuer's token
    * @throws {NetworkError} If the token identifier cannot be retrieved
    */
-  public async getIssuerTokenIdentifier(): Promise<Bech32mTokenIdentifier | null> {
+  public async getIssuerTokenIdentifier(): Promise<Bech32mTokenIdentifier> {
     const tokenMetadata = await this.getIssuerTokenMetadata();
 
     return encodeBech32mTokenIdentifier({
@@ -329,11 +283,8 @@ export class IssuerSparkWallet extends SparkWallet {
       identityPublicKey: BURN_ADDRESS,
       network: this.config.getNetworkType(),
     });
-    const issuerTokenIdentifier: Bech32mTokenIdentifier | null =
+    const issuerTokenIdentifier: Bech32mTokenIdentifier =
       await this.getIssuerTokenIdentifier();
-    if (issuerTokenIdentifier === null) {
-      throw new ValidationError("Issuer token identifier not found");
-    }
 
     return await this.transferTokens({
       tokenIdentifier: issuerTokenIdentifier,
@@ -358,13 +309,6 @@ export class IssuerSparkWallet extends SparkWallet {
     );
 
     const issuerTokenIdentifier = await this.getIssuerTokenIdentifier();
-    if (issuerTokenIdentifier === null) {
-      throw new ValidationError("Issuer token identifier not found", {
-        field: "issuerTokenIdentifier",
-        value: issuerTokenIdentifier,
-        expected: "non-null token identifier",
-      });
-    }
 
     const rawTokenIdentifier = decodeBech32mTokenIdentifier(
       issuerTokenIdentifier,
@@ -400,13 +344,6 @@ export class IssuerSparkWallet extends SparkWallet {
     );
 
     const issuerTokenIdentifier = await this.getIssuerTokenIdentifier();
-    if (issuerTokenIdentifier === null) {
-      throw new ValidationError("Issuer token identifier not found", {
-        field: "issuerTokenIdentifier",
-        value: issuerTokenIdentifier,
-        expected: "non-null token identifier",
-      });
-    }
 
     const rawTokenIdentifier = decodeBech32mTokenIdentifier(
       issuerTokenIdentifier,
@@ -433,69 +370,44 @@ export class IssuerSparkWallet extends SparkWallet {
     throw new NotImplementedError("Token distribution is not yet supported");
   }
 
-  /**
-   * Announces a new token on the L1 (Bitcoin) network.
-   * @param tokenName - The name of the token
-   * @param tokenTicker - The ticker symbol for the token
-   * @param decimals - The number of decimal places for the token
-   * @param maxSupply - The maximum supply of the token
-   * @param isFreezable - Whether the token can be frozen
-   * @param feeRateSatsPerVb - The fee rate in satoshis per virtual byte (default: 4.0)
-   * @returns The transaction ID of the announcement
-   * @throws {ValidationError} If decimals is not a safe integer
-   * @throws {NetworkError} If the announcement transaction cannot be broadcast
-   */
-  public async announceTokenL1(
-    tokenName: string,
-    tokenTicker: string,
-    decimals: number,
-    maxSupply: bigint,
-    isFreezable: boolean,
-    feeRateSatsPerVb: number = 4.0,
-  ): Promise<string> {
-    validateTokenParameters(tokenName, tokenTicker, decimals, maxSupply);
+  protected getTraceName(methodName: string) {
+    return `IssuerSparkWallet.${methodName}`;
+  }
 
-    if (!Number.isSafeInteger(decimals)) {
-      throw new ValidationError("Decimals must be less than 2^53", {
-        field: "decimals",
-        value: decimals,
-        expected: "smaller or equal to " + Number.MAX_SAFE_INTEGER,
-      });
+  private wrapPublicIssuerSparkWalletMethodWithOtelSpan<
+    M extends keyof IssuerSparkWallet,
+  >(methodName: M) {
+    const original = this[methodName];
+
+    if (typeof original !== "function") {
+      throw new Error(
+        `Method ${methodName} is not a function on IssuerSparkWallet.`,
+      );
     }
 
-    await this.lrc20Wallet!.syncWallet();
+    const wrapped = this.wrapWithOtelSpan(
+      this.getTraceName(methodName),
+      original.bind(this) as (...args: unknown[]) => Promise<unknown>,
+    ) as IssuerSparkWallet[M];
 
-    const tokenPublicKey = new TokenPubkey(this.lrc20Wallet!.pubkey);
+    (this as IssuerSparkWallet)[methodName] = wrapped;
+  }
 
-    const announcement = new TokenPubkeyAnnouncement(
-      tokenPublicKey,
-      tokenName,
-      tokenTicker,
-      decimals,
-      maxSupply,
-      isFreezable,
+  private wrapIssuerSparkWalletMethodsWithTracing() {
+    const methods = [
+      "getIssuerTokenBalance",
+      "getIssuerTokenMetadata",
+      "getIssuerTokenIdentifier",
+      "createToken",
+      "mintTokens",
+      "burnTokens",
+      "freezeTokens",
+      "unfreezeTokens",
+      "getIssuerTokenDistribution",
+    ] as const;
+
+    methods.forEach((m) =>
+      this.wrapPublicIssuerSparkWalletMethodWithOtelSpan(m),
     );
-
-    try {
-      const tx = await this.lrc20Wallet!.prepareAnnouncement(
-        announcement,
-        feeRateSatsPerVb,
-      );
-
-      const txId = await this.lrc20Wallet!.broadcastRawBtcTransaction(
-        tx.bitcoin_tx.toHex(),
-      );
-
-      return txId;
-    } catch (error) {
-      throw new NetworkError(
-        "Failed to broadcast announcement transaction on L1",
-        {
-          operation: "broadcastRawBtcTransaction",
-          errorCount: 1,
-          errors: error instanceof Error ? error.message : String(error),
-        },
-      );
-    }
   }
 }