@buildonspark/issuer-sdk 0.0.78 → 0.0.79

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @buildonspark/issuer-sdk
 
+## 0.0.79
+
+### Patch Changes
+
+- Updated dependencies
+  - @buildonspark/spark-sdk@0.2.0
+
 ## 0.0.78
 
 ### Patch Changes

package/dist/index.cjs

@@ -181,20 +181,21 @@ var IssuerTokenTransactionService = class extends import_spark_sdk3.TokenTransac
       sparkOperatorIdentityPublicKeys: super.collectOperatorIdentityPublicKeys()
     };
   }
-  async constructMintTokenTransaction(tokenPublicKey, tokenAmount) {
+  async constructMintTokenTransaction(rawTokenIdentifierBytes, issuerTokenPublicKey, tokenAmount) {
     return {
       version: 1,
       network: this.config.getNetworkProto(),
       tokenInputs: {
         $case: "mintInput",
         mintInput: {
-          issuerPublicKey: tokenPublicKey
+          issuerPublicKey: issuerTokenPublicKey,
+          tokenIdentifier: rawTokenIdentifierBytes
         }
       },
       tokenOutputs: [
         {
-          ownerPublicKey: tokenPublicKey,
-          tokenPublicKey,
+          ownerPublicKey: issuerTokenPublicKey,
+          tokenIdentifier: rawTokenIdentifierBytes,
           tokenAmount: (0, import_utils3.numberToBytesBE)(tokenAmount, 16)
         }
       ],
@@ -207,6 +208,7 @@ var IssuerTokenTransactionService = class extends import_spark_sdk3.TokenTransac
 
 // src/issuer-wallet/issuer-spark-wallet.ts
 var import_spark_sdk6 = require("@buildonspark/spark-sdk");
+var import_spark_sdk7 = require("@buildonspark/spark-sdk");
 var BURN_ADDRESS = "02".repeat(33);
 var IssuerSparkWallet = class _IssuerSparkWallet extends import_spark_sdk4.SparkWallet {
   issuerTokenTransactionService;
@@ -242,6 +244,10 @@ var IssuerSparkWallet = class _IssuerSparkWallet extends import_spark_sdk4.Spark
       "SparkIssuerWallet.getIssuerTokenMetadata",
       this.getIssuerTokenMetadata.bind(this)
     );
+    this.getIssuerTokenIdentifier = this.wrapWithOtelSpan(
+      "SparkIssuerWallet.getIssuerTokenIdentifier",
+      this.getIssuerTokenIdentifier.bind(this)
+    );
     this.mintTokens = this.wrapWithOtelSpan(
       "SparkIssuerWallet.mintTokens",
       this.mintTokens.bind(this)
@@ -290,22 +296,28 @@ var IssuerSparkWallet = class _IssuerSparkWallet extends import_spark_sdk4.Spark
     );
     if (!balanceObj.tokenBalances || issuerBalance === void 0) {
       return {
+        tokenIdentifier: void 0,
         balance: 0n
       };
     }
     return {
+      tokenIdentifier: issuerBalance[0] ?? void 0,
       balance: issuerBalance[1].balance
     };
   }
   /**
-   * Retrieves metadata about the issuer's token.
+   * Retrieves information about the issuer's token.
    * @returns An object containing token information including public key, name, symbol, decimals, max supply, and freeze status
    * @throws {NetworkError} If the token metadata cannot be retrieved
    */
   async getIssuerTokenMetadata() {
     const issuerPublicKey = await super.getIdentityPublicKey();
-    if (this.tokenMetadata.has(issuerPublicKey)) {
-      const metadata = this.tokenMetadata.get(issuerPublicKey);
+    const tokenMetadata = this.tokenMetadata;
+    const cachedIssuerTokenMetadata = [...tokenMetadata.entries()].find(
+      ([, metadata]) => (0, import_utils4.bytesToHex)(metadata.issuerPublicKey) === issuerPublicKey
+    );
+    if (cachedIssuerTokenMetadata !== void 0) {
+      const metadata = cachedIssuerTokenMetadata[1];
       return {
         tokenPublicKey: (0, import_utils4.bytesToHex)(metadata.issuerPublicKey),
         rawTokenIdentifier: metadata.tokenIdentifier,
@@ -336,7 +348,11 @@ var IssuerSparkWallet = class _IssuerSparkWallet extends import_spark_sdk4.Spark
         );
       }
       const metadata = response.tokenMetadata[0];
-      this.tokenMetadata.set(issuerPublicKey, metadata);
+      const tokenIdentifier = (0, import_spark_sdk7.encodeBech32mTokenIdentifier)({
+        tokenIdentifier: metadata.tokenIdentifier,
+        network: this.config.getNetworkType()
+      });
+      this.tokenMetadata.set(tokenIdentifier, metadata);
       return {
         tokenPublicKey: (0, import_utils4.bytesToHex)(metadata.issuerPublicKey),
         rawTokenIdentifier: metadata.tokenIdentifier,
@@ -353,22 +369,38 @@ var IssuerSparkWallet = class _IssuerSparkWallet extends import_spark_sdk4.Spark
       });
     }
   }
+  /**
+   * Retrieves the bech32m encoded token identifier for the issuer's token.
+   * @returns The bech32m encoded token identifier for the issuer's token
+   * @throws {NetworkError} If the token identifier cannot be retrieved
+   */
+  async getIssuerTokenIdentifier() {
+    const tokenMetadata = await this.getIssuerTokenMetadata();
+    return (0, import_spark_sdk7.encodeBech32mTokenIdentifier)({
+      tokenIdentifier: tokenMetadata.rawTokenIdentifier,
+      network: this.config.getNetworkType()
+    });
+  }
   /**
    * Mints new tokens
    * @param tokenAmount - The amount of tokens to mint
    * @returns The transaction ID of the mint operation
    */
   async mintTokens(tokenAmount) {
-    const tokenPublicKey = await super.getIdentityPublicKey();
     let tokenTransaction;
+    const issuerTokenPublicKey = await super.getIdentityPublicKey();
+    const issuerTokenPublicKeyBytes = (0, import_utils4.hexToBytes)(issuerTokenPublicKey);
+    const tokenMetadata = await this.getIssuerTokenMetadata();
+    const rawTokenIdentifier = tokenMetadata.rawTokenIdentifier;
     if (this.config.getTokenTransactionVersion() === "V0") {
       tokenTransaction = await this.issuerTokenTransactionService.constructMintTokenTransactionV0(
-        (0, import_utils4.hexToBytes)(tokenPublicKey),
+        issuerTokenPublicKeyBytes,
         tokenAmount
       );
     } else {
       tokenTransaction = await this.issuerTokenTransactionService.constructMintTokenTransaction(
-        (0, import_utils4.hexToBytes)(tokenPublicKey),
+        rawTokenIdentifier,
+        issuerTokenPublicKeyBytes,
         tokenAmount
       );
     }
@@ -387,8 +419,12 @@ var IssuerSparkWallet = class _IssuerSparkWallet extends import_spark_sdk4.Spark
       identityPublicKey: BURN_ADDRESS,
       network: this.config.getNetworkType()
     });
+    const issuerTokenIdentifier = await this.getIssuerTokenIdentifier();
+    if (issuerTokenIdentifier === null) {
+      throw new import_spark_sdk4.ValidationError("Issuer token identifier not found");
+    }
     return await this.transferTokens({
-      tokenPublicKey: await super.getIdentityPublicKey(),
+      tokenIdentifier: issuerTokenIdentifier,
       tokenAmount,
       receiverSparkAddress: burnAddress,
       selectedOutputs

package/dist/index.d.cts

@@ -1,4 +1,4 @@
-import { SparkWallet, SparkWalletProps, ConfigOptions, SparkSigner } from '@buildonspark/spark-sdk';
+import { SparkWallet, SparkWalletProps, ConfigOptions, SparkSigner, Bech32mTokenIdentifier } from '@buildonspark/spark-sdk';
 import { OutputWithPreviousTransactionData } from '@buildonspark/spark-sdk/proto/spark';
 
 /**
@@ -71,14 +71,21 @@ declare class IssuerSparkWallet extends SparkWallet {
      * @returns An object containing the token balance as a bigint
      */
     getIssuerTokenBalance(): Promise<{
+        tokenIdentifier: Bech32mTokenIdentifier | undefined;
         balance: bigint;
     }>;
     /**
-     * Retrieves metadata about the issuer's token.
+     * Retrieves information about the issuer's token.
      * @returns An object containing token information including public key, name, symbol, decimals, max supply, and freeze status
      * @throws {NetworkError} If the token metadata cannot be retrieved
      */
     getIssuerTokenMetadata(): Promise<IssuerTokenMetadata>;
+    /**
+     * Retrieves the bech32m encoded token identifier for the issuer's token.
+     * @returns The bech32m encoded token identifier for the issuer's token
+     * @throws {NetworkError} If the token identifier cannot be retrieved
+     */
+    getIssuerTokenIdentifier(): Promise<Bech32mTokenIdentifier | null>;
     /**
      * Mints new tokens
      * @param tokenAmount - The amount of tokens to mint

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { SparkWallet, SparkWalletProps, ConfigOptions, SparkSigner } from '@buildonspark/spark-sdk';
+import { SparkWallet, SparkWalletProps, ConfigOptions, SparkSigner, Bech32mTokenIdentifier } from '@buildonspark/spark-sdk';
 import { OutputWithPreviousTransactionData } from '@buildonspark/spark-sdk/proto/spark';
 
 /**
@@ -71,14 +71,21 @@ declare class IssuerSparkWallet extends SparkWallet {
      * @returns An object containing the token balance as a bigint
      */
     getIssuerTokenBalance(): Promise<{
+        tokenIdentifier: Bech32mTokenIdentifier | undefined;
         balance: bigint;
     }>;
     /**
-     * Retrieves metadata about the issuer's token.
+     * Retrieves information about the issuer's token.
      * @returns An object containing token information including public key, name, symbol, decimals, max supply, and freeze status
      * @throws {NetworkError} If the token metadata cannot be retrieved
      */
     getIssuerTokenMetadata(): Promise<IssuerTokenMetadata>;
+    /**
+     * Retrieves the bech32m encoded token identifier for the issuer's token.
+     * @returns The bech32m encoded token identifier for the issuer's token
+     * @throws {NetworkError} If the token identifier cannot be retrieved
+     */
+    getIssuerTokenIdentifier(): Promise<Bech32mTokenIdentifier | null>;
     /**
      * Mints new tokens
      * @param tokenAmount - The amount of tokens to mint

package/dist/index.js

@@ -157,20 +157,21 @@ var IssuerTokenTransactionService = class extends TokenTransactionService {
       sparkOperatorIdentityPublicKeys: super.collectOperatorIdentityPublicKeys()
     };
   }
-  async constructMintTokenTransaction(tokenPublicKey, tokenAmount) {
+  async constructMintTokenTransaction(rawTokenIdentifierBytes, issuerTokenPublicKey, tokenAmount) {
     return {
       version: 1,
       network: this.config.getNetworkProto(),
       tokenInputs: {
         $case: "mintInput",
         mintInput: {
-          issuerPublicKey: tokenPublicKey
+          issuerPublicKey: issuerTokenPublicKey,
+          tokenIdentifier: rawTokenIdentifierBytes
         }
       },
       tokenOutputs: [
         {
-          ownerPublicKey: tokenPublicKey,
-          tokenPublicKey,
+          ownerPublicKey: issuerTokenPublicKey,
+          tokenIdentifier: rawTokenIdentifierBytes,
           tokenAmount: numberToBytesBE(tokenAmount, 16)
         }
       ],
@@ -183,6 +184,9 @@ var IssuerTokenTransactionService = class extends TokenTransactionService {
 
 // src/issuer-wallet/issuer-spark-wallet.ts
 import { NotImplementedError } from "@buildonspark/spark-sdk";
+import {
+  encodeBech32mTokenIdentifier
+} from "@buildonspark/spark-sdk";
 var BURN_ADDRESS = "02".repeat(33);
 var IssuerSparkWallet = class _IssuerSparkWallet extends SparkWallet {
   issuerTokenTransactionService;
@@ -218,6 +222,10 @@ var IssuerSparkWallet = class _IssuerSparkWallet extends SparkWallet {
       "SparkIssuerWallet.getIssuerTokenMetadata",
       this.getIssuerTokenMetadata.bind(this)
     );
+    this.getIssuerTokenIdentifier = this.wrapWithOtelSpan(
+      "SparkIssuerWallet.getIssuerTokenIdentifier",
+      this.getIssuerTokenIdentifier.bind(this)
+    );
     this.mintTokens = this.wrapWithOtelSpan(
       "SparkIssuerWallet.mintTokens",
       this.mintTokens.bind(this)
@@ -266,22 +274,28 @@ var IssuerSparkWallet = class _IssuerSparkWallet extends SparkWallet {
     );
     if (!balanceObj.tokenBalances || issuerBalance === void 0) {
       return {
+        tokenIdentifier: void 0,
         balance: 0n
       };
     }
     return {
+      tokenIdentifier: issuerBalance[0] ?? void 0,
       balance: issuerBalance[1].balance
     };
   }
   /**
-   * Retrieves metadata about the issuer's token.
+   * Retrieves information about the issuer's token.
    * @returns An object containing token information including public key, name, symbol, decimals, max supply, and freeze status
    * @throws {NetworkError} If the token metadata cannot be retrieved
    */
   async getIssuerTokenMetadata() {
     const issuerPublicKey = await super.getIdentityPublicKey();
-    if (this.tokenMetadata.has(issuerPublicKey)) {
-      const metadata = this.tokenMetadata.get(issuerPublicKey);
+    const tokenMetadata = this.tokenMetadata;
+    const cachedIssuerTokenMetadata = [...tokenMetadata.entries()].find(
+      ([, metadata]) => bytesToHex(metadata.issuerPublicKey) === issuerPublicKey
+    );
+    if (cachedIssuerTokenMetadata !== void 0) {
+      const metadata = cachedIssuerTokenMetadata[1];
       return {
         tokenPublicKey: bytesToHex(metadata.issuerPublicKey),
         rawTokenIdentifier: metadata.tokenIdentifier,
@@ -312,7 +326,11 @@ var IssuerSparkWallet = class _IssuerSparkWallet extends SparkWallet {
         );
       }
       const metadata = response.tokenMetadata[0];
-      this.tokenMetadata.set(issuerPublicKey, metadata);
+      const tokenIdentifier = encodeBech32mTokenIdentifier({
+        tokenIdentifier: metadata.tokenIdentifier,
+        network: this.config.getNetworkType()
+      });
+      this.tokenMetadata.set(tokenIdentifier, metadata);
       return {
         tokenPublicKey: bytesToHex(metadata.issuerPublicKey),
         rawTokenIdentifier: metadata.tokenIdentifier,
@@ -329,22 +347,38 @@ var IssuerSparkWallet = class _IssuerSparkWallet extends SparkWallet {
       });
     }
   }
+  /**
+   * Retrieves the bech32m encoded token identifier for the issuer's token.
+   * @returns The bech32m encoded token identifier for the issuer's token
+   * @throws {NetworkError} If the token identifier cannot be retrieved
+   */
+  async getIssuerTokenIdentifier() {
+    const tokenMetadata = await this.getIssuerTokenMetadata();
+    return encodeBech32mTokenIdentifier({
+      tokenIdentifier: tokenMetadata.rawTokenIdentifier,
+      network: this.config.getNetworkType()
+    });
+  }
   /**
    * Mints new tokens
    * @param tokenAmount - The amount of tokens to mint
    * @returns The transaction ID of the mint operation
    */
   async mintTokens(tokenAmount) {
-    const tokenPublicKey = await super.getIdentityPublicKey();
     let tokenTransaction;
+    const issuerTokenPublicKey = await super.getIdentityPublicKey();
+    const issuerTokenPublicKeyBytes = hexToBytes2(issuerTokenPublicKey);
+    const tokenMetadata = await this.getIssuerTokenMetadata();
+    const rawTokenIdentifier = tokenMetadata.rawTokenIdentifier;
     if (this.config.getTokenTransactionVersion() === "V0") {
       tokenTransaction = await this.issuerTokenTransactionService.constructMintTokenTransactionV0(
-        hexToBytes2(tokenPublicKey),
+        issuerTokenPublicKeyBytes,
         tokenAmount
       );
     } else {
       tokenTransaction = await this.issuerTokenTransactionService.constructMintTokenTransaction(
-        hexToBytes2(tokenPublicKey),
+        rawTokenIdentifier,
+        issuerTokenPublicKeyBytes,
         tokenAmount
       );
     }
@@ -363,8 +397,12 @@ var IssuerSparkWallet = class _IssuerSparkWallet extends SparkWallet {
       identityPublicKey: BURN_ADDRESS,
       network: this.config.getNetworkType()
     });
+    const issuerTokenIdentifier = await this.getIssuerTokenIdentifier();
+    if (issuerTokenIdentifier === null) {
+      throw new ValidationError2("Issuer token identifier not found");
+    }
     return await this.transferTokens({
-      tokenPublicKey: await super.getIdentityPublicKey(),
+      tokenIdentifier: issuerTokenIdentifier,
       tokenAmount,
       receiverSparkAddress: burnAddress,
       selectedOutputs

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@buildonspark/issuer-sdk",
-  "version": "0.0.78",
+  "version": "0.0.79",
   "description": "Spark Issuer SDK for token issuance",
   "license": "Apache-2.0",
   "module": "./dist/index.js",
@@ -55,7 +55,7 @@
   },
   "dependencies": {
     "@buildonspark/lrc20-sdk": "0.0.59",
-    "@buildonspark/spark-sdk": "0.1.47",
+    "@buildonspark/spark-sdk": "0.2.0",
     "@lightsparkdev/core": "^1.4.2",
     "@noble/curves": "^1.8.0",
     "@scure/btc-signer": "^1.5.0",

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

@@ -3,6 +3,7 @@ import {
   NetworkError,
   SparkWallet,
   SparkWalletProps,
+  UserTokenMetadata,
   ValidationError,
 } from "@buildonspark/spark-sdk";
 import { isNode } from "@lightsparkdev/core";
@@ -26,6 +27,10 @@ import { IssuerTokenTransactionService } from "../services/token-transactions.js
 import { TokenDistribution, IssuerTokenMetadata } from "./types.js";
 import { NotImplementedError } from "@buildonspark/spark-sdk";
 import { SparkSigner } from "@buildonspark/spark-sdk";
+import {
+  encodeBech32mTokenIdentifier,
+  Bech32mTokenIdentifier,
+} from "@buildonspark/spark-sdk";
 
 const BURN_ADDRESS = "02".repeat(33);
 
@@ -73,6 +78,10 @@ export class IssuerSparkWallet extends SparkWallet {
       "SparkIssuerWallet.getIssuerTokenMetadata",
       this.getIssuerTokenMetadata.bind(this),
     );
+    this.getIssuerTokenIdentifier = this.wrapWithOtelSpan(
+      "SparkIssuerWallet.getIssuerTokenIdentifier",
+      this.getIssuerTokenIdentifier.bind(this),
+    );
     this.mintTokens = this.wrapWithOtelSpan(
       "SparkIssuerWallet.mintTokens",
       this.mintTokens.bind(this),
@@ -116,6 +125,7 @@ export class IssuerSparkWallet extends SparkWallet {
    * @returns An object containing the token balance as a bigint
    */
   public async getIssuerTokenBalance(): Promise<{
+    tokenIdentifier: Bech32mTokenIdentifier | undefined;
     balance: bigint;
   }> {
     const publicKey = await super.getIdentityPublicKey();
@@ -126,24 +136,31 @@ export class IssuerSparkWallet extends SparkWallet {
 
     if (!balanceObj.tokenBalances || issuerBalance === undefined) {
       return {
+        tokenIdentifier: undefined,
         balance: 0n,
       };
     }
     return {
+      tokenIdentifier: issuerBalance[0] ?? undefined,
       balance: issuerBalance[1].balance,
     };
   }
 
   /**
-   * Retrieves metadata about the issuer's token.
+   * Retrieves information about the issuer's token.
    * @returns An object containing token information including public key, name, symbol, decimals, max supply, and freeze status
    * @throws {NetworkError} If the token metadata cannot be retrieved
    */
   public async getIssuerTokenMetadata(): Promise<IssuerTokenMetadata> {
     const issuerPublicKey = await super.getIdentityPublicKey();
-    if (this.tokenMetadata.has(issuerPublicKey)) {
-      const metadata = this.tokenMetadata.get(issuerPublicKey)!;
+    const tokenMetadata = this.tokenMetadata;
 
+    const cachedIssuerTokenMetadata = [...tokenMetadata.entries()].find(
+      ([, metadata]) =>
+        bytesToHex(metadata.issuerPublicKey) === issuerPublicKey,
+    );
+    if (cachedIssuerTokenMetadata !== undefined) {
+      const metadata = cachedIssuerTokenMetadata[1];
       return {
         tokenPublicKey: bytesToHex(metadata.issuerPublicKey),
         rawTokenIdentifier: metadata.tokenIdentifier,
@@ -163,7 +180,6 @@ export class IssuerSparkWallet extends SparkWallet {
       const response = await sparkTokenClient.query_token_metadata({
         issuerPublicKeys: Array.of(hexToBytes(issuerPublicKey)),
       });
-
       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.",
@@ -176,9 +192,12 @@ export class IssuerSparkWallet extends SparkWallet {
           },
         );
       }
-
       const metadata = response.tokenMetadata[0];
-      this.tokenMetadata.set(issuerPublicKey, metadata);
+      const tokenIdentifier = encodeBech32mTokenIdentifier({
+        tokenIdentifier: metadata.tokenIdentifier,
+        network: this.config.getNetworkType(),
+      });
+      this.tokenMetadata.set(tokenIdentifier, metadata);
 
       return {
         tokenPublicKey: bytesToHex(metadata.issuerPublicKey),
@@ -197,25 +216,44 @@ export class IssuerSparkWallet extends SparkWallet {
     }
   }
 
+  /**
+   * Retrieves the bech32m encoded token identifier for the issuer's token.
+   * @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> {
+    const tokenMetadata = await this.getIssuerTokenMetadata();
+
+    return encodeBech32mTokenIdentifier({
+      tokenIdentifier: tokenMetadata.rawTokenIdentifier,
+      network: this.config.getNetworkType(),
+    });
+  }
+
   /**
    * Mints new tokens
    * @param tokenAmount - The amount of tokens to mint
    * @returns The transaction ID of the mint operation
    */
   public async mintTokens(tokenAmount: bigint): Promise<string> {
-    const tokenPublicKey = await super.getIdentityPublicKey();
     let tokenTransaction: TokenTransactionV0 | TokenTransaction;
+    const issuerTokenPublicKey = await super.getIdentityPublicKey();
+    const issuerTokenPublicKeyBytes = hexToBytes(issuerTokenPublicKey);
+
+    const tokenMetadata = await this.getIssuerTokenMetadata();
+    const rawTokenIdentifier: Uint8Array = tokenMetadata.rawTokenIdentifier;
 
     if (this.config.getTokenTransactionVersion() === "V0") {
       tokenTransaction =
         await this.issuerTokenTransactionService.constructMintTokenTransactionV0(
-          hexToBytes(tokenPublicKey),
+          issuerTokenPublicKeyBytes,
           tokenAmount,
         );
     } else {
       tokenTransaction =
         await this.issuerTokenTransactionService.constructMintTokenTransaction(
-          hexToBytes(tokenPublicKey),
+          rawTokenIdentifier,
+          issuerTokenPublicKeyBytes,
           tokenAmount,
         );
     }
@@ -239,8 +277,14 @@ export class IssuerSparkWallet extends SparkWallet {
       identityPublicKey: BURN_ADDRESS,
       network: this.config.getNetworkType(),
     });
+    const issuerTokenIdentifier: Bech32mTokenIdentifier | null =
+      await this.getIssuerTokenIdentifier();
+    if (issuerTokenIdentifier === null) {
+      throw new ValidationError("Issuer token identifier not found");
+    }
+
     return await this.transferTokens({
-      tokenPublicKey: await super.getIdentityPublicKey(),
+      tokenIdentifier: issuerTokenIdentifier,
       tokenAmount,
       receiverSparkAddress: burnAddress,
       selectedOutputs,

package/src/services/token-transactions.ts

@@ -39,7 +39,8 @@ export class IssuerTokenTransactionService extends TokenTransactionService {
   }
 
   async constructMintTokenTransaction(
-    tokenPublicKey: Uint8Array,
+    rawTokenIdentifierBytes: Uint8Array,
+    issuerTokenPublicKey: Uint8Array,
     tokenAmount: bigint,
   ): Promise<TokenTransaction> {
     return {
@@ -48,13 +49,14 @@ export class IssuerTokenTransactionService extends TokenTransactionService {
       tokenInputs: {
         $case: "mintInput",
         mintInput: {
-          issuerPublicKey: tokenPublicKey,
+          issuerPublicKey: issuerTokenPublicKey,
+          tokenIdentifier: rawTokenIdentifierBytes,
         },
       },
       tokenOutputs: [
         {
-          ownerPublicKey: tokenPublicKey,
-          tokenPublicKey: tokenPublicKey,
+          ownerPublicKey: issuerTokenPublicKey,
+          tokenIdentifier: rawTokenIdentifierBytes,
           tokenAmount: numberToBytesBE(tokenAmount, 16),
         },
       ],

package/src/tests/integration/spark.test.ts

@@ -139,9 +139,14 @@ describe.each(TEST_CONFIGS)(
       const tokenAmount: bigint = 1000n;
 
       await sharedIssuerWallet.mintTokens(tokenAmount);
+
+      const sharedIssuerBalance =
+        await sharedIssuerWallet.getIssuerTokenBalance();
+      expect(sharedIssuerBalance).toBeDefined();
+      expect(sharedIssuerBalance.tokenIdentifier).toBeDefined();
       await sharedIssuerWallet.transferTokens({
         tokenAmount,
-        tokenPublicKey: sharedTokenPublicKey,
+        tokenIdentifier: sharedIssuerBalance.tokenIdentifier!,
         receiverSparkAddress: await sharedUserWallet.getSparkAddress(),
       });
 
@@ -308,24 +313,28 @@ describe.each(TEST_CONFIGS)(
         });
 
       await sharedIssuerWallet.mintTokens(tokenAmount);
-      const sourceBalanceBefore = (
-        await sharedIssuerWallet.getIssuerTokenBalance()
-      ).balance;
+      const sharedIssuerBalance =
+        await sharedIssuerWallet.getIssuerTokenBalance();
+      expect(sharedIssuerBalance).toBeDefined();
+      expect(sharedIssuerBalance.tokenIdentifier).toBeDefined();
+
+      const tokenIdentifier = sharedIssuerBalance.tokenIdentifier!;
+      const sourceBalanceBefore = sharedIssuerBalance.balance;
 
       await sharedIssuerWallet.batchTransferTokens([
         {
           tokenAmount: tokenAmount / 3n,
-          tokenPublicKey: sharedTokenPublicKey,
+          tokenIdentifier,
           receiverSparkAddress: await destinationWallet.getSparkAddress(),
         },
         {
           tokenAmount: tokenAmount / 3n,
-          tokenPublicKey: sharedTokenPublicKey,
+          tokenIdentifier,
           receiverSparkAddress: await destinationWallet2.getSparkAddress(),
         },
         {
           tokenAmount: tokenAmount / 3n,
-          tokenPublicKey: sharedTokenPublicKey,
+          tokenIdentifier,
           receiverSparkAddress: await destinationWallet3.getSparkAddress(),
         },
       ]);
@@ -461,9 +470,14 @@ describe.each(TEST_CONFIGS)(
         await issuerWallet.mintTokens(tokenAmount);
 
         // Check issuer balance after minting
-        const issuerBalanceAfterMint = (
-          await issuerWallet.getIssuerTokenBalance()
-        ).balance;
+        const issuerBalanceObjAfterMint =
+          await issuerWallet.getIssuerTokenBalance();
+        expect(issuerBalanceObjAfterMint).toBeDefined();
+        expect(issuerBalanceObjAfterMint.tokenIdentifier).toBeDefined();
+
+        const issuerBalanceAfterMint = issuerBalanceObjAfterMint.balance;
+        const tokenIdentifier = issuerBalanceObjAfterMint.tokenIdentifier!;
+
         expect(issuerBalanceAfterMint).toEqual(tokenAmount);
 
         const { wallet: userWallet } = await SparkWalletTesting.initialize({
@@ -473,7 +487,7 @@ describe.each(TEST_CONFIGS)(
 
         await issuerWallet.transferTokens({
           tokenAmount,
-          tokenPublicKey: await issuerWallet.getIdentityPublicKey(),
+          tokenIdentifier,
           receiverSparkAddress: userWalletPublicKey,
         });
         const issuerBalanceAfterTransfer = (
@@ -533,17 +547,18 @@ describe.each(TEST_CONFIGS)(
         .balance;
 
       await sharedIssuerWallet.mintTokens(tokenAmount);
-
-      const issuerBalanceAfterMint = (
-        await sharedIssuerWallet.getIssuerTokenBalance()
-      ).balance;
+      const issuerBalanceObjAfterMint =
+        await sharedIssuerWallet.getIssuerTokenBalance();
+      expect(issuerBalanceObjAfterMint).toBeDefined();
+      const issuerBalanceAfterMint = issuerBalanceObjAfterMint.balance;
       expect(issuerBalanceAfterMint).toEqual(initialBalance + tokenAmount);
-
+      expect(issuerBalanceObjAfterMint.tokenIdentifier).toBeDefined();
+      const tokenIdentifier = issuerBalanceObjAfterMint.tokenIdentifier!;
       const userWalletPublicKey = await userWallet.getSparkAddress();
 
       await sharedIssuerWallet.transferTokens({
         tokenAmount,
-        tokenPublicKey: sharedTokenPublicKey,
+        tokenIdentifier,
         receiverSparkAddress: userWalletPublicKey,
       });
 
@@ -560,7 +575,7 @@ describe.each(TEST_CONFIGS)(
       expect(userBalanceAfterTransfer.balance).toEqual(tokenAmount);
 
       await userWallet.transferTokens({
-        tokenPublicKey: sharedTokenPublicKey,
+        tokenIdentifier,
         tokenAmount,
         receiverSparkAddress: await sharedIssuerWallet.getSparkAddress(),
       });

package/src/tests/stress/transfers.test.ts

@@ -45,6 +45,10 @@ describe("Stress test for token transfers", () => {
     const tokenPublicKey = await issuerWallet.getIdentityPublicKey();
     const userWalletSparkAddress = await userWallet.getSparkAddress();
     const issuerWalletSparkAddress = await issuerWallet.getSparkAddress();
+    const issuerBalanceObj = await issuerWallet.getIssuerTokenBalance();
+    expect(issuerBalanceObj).toBeDefined();
+    expect(issuerBalanceObj.tokenIdentifier).toBeDefined();
+    const tokenIdentifier = issuerBalanceObj.tokenIdentifier!;
 
     for (let i = 0; i < maxTransactionCycles; i++) {
       if (timeoutReached) {
@@ -59,7 +63,7 @@ describe("Stress test for token transfers", () => {
       try {
         // Transfer tokens from issuer to user
         await issuerWallet.transferTokens({
-          tokenPublicKey,
+          tokenIdentifier,
           tokenAmount: TOKEN_AMOUNT,
           receiverSparkAddress: userWalletSparkAddress,
         });
@@ -75,7 +79,7 @@ describe("Stress test for token transfers", () => {
 
         // Transfer tokens from user to issuer
         await userWallet.transferTokens({
-          tokenPublicKey: tokenPublicKey,
+          tokenIdentifier,
           tokenAmount: TOKEN_AMOUNT,
           receiverSparkAddress: issuerWalletSparkAddress,
         });
@@ -126,20 +130,23 @@ describe("Stress test for token transfers", () => {
           });
 
           await issuer.wallet.mintTokens(TOKEN_AMOUNT);
-          const tokenPublicKey = await issuer.wallet.getIdentityPublicKey();
           const userAddress = await user.wallet.getSparkAddress();
+          const issuerBalanceObj = await issuer.wallet.getIssuerTokenBalance();
+          expect(issuerBalanceObj).toBeDefined();
+          expect(issuerBalanceObj.tokenIdentifier).toBeDefined();
+          const tokenIdentifier = issuerBalanceObj.tokenIdentifier!;
 
-          return { issuer, tokenPublicKey, userAddress };
+          return { issuer, tokenIdentifier, userAddress };
         }),
     );
 
     const transactions = walletPairs.map(
-      ({ issuer, tokenPublicKey, userAddress }) =>
+      ({ issuer, tokenIdentifier, userAddress }) =>
         async () => {
           const start_time = Date.now();
           try {
             await issuer.wallet.transferTokens({
-              tokenPublicKey,
+              tokenIdentifier,
               tokenAmount: TOKEN_AMOUNT,
               receiverSparkAddress: userAddress,
             });