@buildonspark/issuer-sdk 0.0.26 → 0.0.27

package/dist/index.cjs

@@ -335,6 +335,7 @@ function convertTokenActivityToHexEncoded(rawTransactions) {
 }
 
 // src/issuer-spark-wallet.ts
+var import_address2 = require("@buildonspark/spark-sdk/address");
 var BURN_ADDRESS = "02".repeat(33);
 var IssuerSparkWallet = class _IssuerSparkWallet extends import_spark_sdk.SparkWallet {
   issuerTokenTransactionService;
@@ -438,8 +439,12 @@ var IssuerSparkWallet = class _IssuerSparkWallet extends import_spark_sdk.SparkW
   async freezeTokens(ownerPublicKey) {
     await this.syncTokenLeaves();
     const tokenPublicKey = await super.getIdentityPublicKey();
+    const decodedOwnerPubkey = (0, import_address2.decodeSparkAddress)(
+      ownerPublicKey,
+      this.config.getNetworkType()
+    );
     const response = await this.tokenFreezeService.freezeTokens(
-      (0, import_utils6.hexToBytes)(ownerPublicKey),
+      (0, import_utils6.hexToBytes)(decodedOwnerPubkey),
       (0, import_utils6.hexToBytes)(tokenPublicKey)
     );
     const tokenAmount = (0, import_utils6.bytesToNumberBE)(response.impactedTokenAmount);
@@ -451,8 +456,12 @@ var IssuerSparkWallet = class _IssuerSparkWallet extends import_spark_sdk.SparkW
   async unfreezeTokens(ownerPublicKey) {
     await this.syncTokenLeaves();
     const tokenPublicKey = await super.getIdentityPublicKey();
+    const decodedOwnerPubkey = (0, import_address2.decodeSparkAddress)(
+      ownerPublicKey,
+      this.config.getNetworkType()
+    );
     const response = await this.tokenFreezeService.unfreezeTokens(
-      (0, import_utils6.hexToBytes)(ownerPublicKey),
+      (0, import_utils6.hexToBytes)(decodedOwnerPubkey),
       (0, import_utils6.hexToBytes)(tokenPublicKey)
     );
     const tokenAmount = (0, import_utils6.bytesToNumberBE)(response.impactedTokenAmount);

package/dist/index.js

@@ -315,6 +315,7 @@ function convertTokenActivityToHexEncoded(rawTransactions) {
 }
 
 // src/issuer-spark-wallet.ts
+import { decodeSparkAddress } from "@buildonspark/spark-sdk/address";
 var BURN_ADDRESS = "02".repeat(33);
 var IssuerSparkWallet = class _IssuerSparkWallet extends SparkWallet {
   issuerTokenTransactionService;
@@ -418,8 +419,12 @@ var IssuerSparkWallet = class _IssuerSparkWallet extends SparkWallet {
   async freezeTokens(ownerPublicKey) {
     await this.syncTokenLeaves();
     const tokenPublicKey = await super.getIdentityPublicKey();
+    const decodedOwnerPubkey = decodeSparkAddress(
+      ownerPublicKey,
+      this.config.getNetworkType()
+    );
     const response = await this.tokenFreezeService.freezeTokens(
-      hexToBytes(ownerPublicKey),
+      hexToBytes(decodedOwnerPubkey),
       hexToBytes(tokenPublicKey)
     );
     const tokenAmount = bytesToNumberBE2(response.impactedTokenAmount);
@@ -431,8 +436,12 @@ var IssuerSparkWallet = class _IssuerSparkWallet extends SparkWallet {
   async unfreezeTokens(ownerPublicKey) {
     await this.syncTokenLeaves();
     const tokenPublicKey = await super.getIdentityPublicKey();
+    const decodedOwnerPubkey = decodeSparkAddress(
+      ownerPublicKey,
+      this.config.getNetworkType()
+    );
     const response = await this.tokenFreezeService.unfreezeTokens(
-      hexToBytes(ownerPublicKey),
+      hexToBytes(decodedOwnerPubkey),
       hexToBytes(tokenPublicKey)
     );
     const tokenAmount = bytesToNumberBE2(response.impactedTokenAmount);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@buildonspark/issuer-sdk",
-  "version": "0.0.26",
+  "version": "0.0.27",
   "description": "Spark Issuer SDK for token issuance",
   "license": "Apache-2.0",
   "module": "./dist/index.js",
@@ -54,8 +54,8 @@
   },
   "dependencies": {
     "@bufbuild/protobuf": "^2.2.5",
-    "@buildonspark/lrc20-sdk": "0.0.24",
-    "@buildonspark/spark-sdk": "0.0.26",
+    "@buildonspark/lrc20-sdk": "0.0.25",
+    "@buildonspark/spark-sdk": "0.0.27",
     "@noble/curves": "^1.8.0",
     "@scure/bip39": "^1.5.4",
     "@scure/btc-signer": "^1.5.0",

package/src/issuer-spark-wallet.ts

@@ -2,9 +2,12 @@ import {
   LRCWallet,
   TokenPubkey,
   TokenPubkeyAnnouncement,
-  TokenPubkeyInfo
+  TokenPubkeyInfo,
 } from "@buildonspark/lrc20-sdk";
-import { ListAllTokenTransactionsCursor, OperationType } from "@buildonspark/lrc20-sdk/proto/rpc/v1/types";
+import {
+  ListAllTokenTransactionsCursor,
+  OperationType,
+} from "@buildonspark/lrc20-sdk/proto/rpc/v1/types";
 import { SparkWallet, SparkWalletProps } from "@buildonspark/spark-sdk";
 import { encodeSparkAddress } from "@buildonspark/spark-sdk/address";
 import { LeafWithPreviousTransactionData } from "@buildonspark/spark-sdk/proto/spark";
@@ -30,12 +33,14 @@ import {
   convertTokenActivityToHexEncoded,
   convertToTokenPubKeyInfoResponse,
 } from "./utils/type-mappers.js";
+import { decodeSparkAddress } from "@buildonspark/spark-sdk/address";
 
 const BURN_ADDRESS = "02".repeat(33);
 
 export class IssuerSparkWallet
   extends SparkWallet
-  implements IssuerWalletInterface {
+  implements IssuerWalletInterface
+{
   private issuerTokenTransactionService: IssuerTokenTransactionService;
   private tokenFreezeService: TokenFreezeService;
   private tokenPublicKeyInfo?: TokenPubkeyInfo;
@@ -88,7 +93,7 @@ export class IssuerSparkWallet
         bytesToHex(identityKey.privateKey!),
         LRC_WALLET_NETWORK[network],
         LRC_WALLET_NETWORK_TYPE[network],
-        this.config.lrc20ApiConfig
+        this.config.lrc20ApiConfig,
       );
     }
 
@@ -115,11 +120,9 @@ export class IssuerSparkWallet
     if (this.tokenPublicKeyInfo) {
       return convertToTokenPubKeyInfoResponse(this.tokenPublicKeyInfo);
     }
-
     const tokenPublicKey = bytesToHex(this.lrc20Wallet!.pubkey);
     const rawTokenPubkeyInfo =
       await this.lrc20Wallet!.getTokenPubkeyInfo(tokenPublicKey);
-
     this.tokenPublicKeyInfo = rawTokenPubkeyInfo;
     if (!rawTokenPubkeyInfo) {
       return null;
@@ -166,9 +169,12 @@ export class IssuerSparkWallet
   ): Promise<{ impactedLeafIds: string[]; impactedTokenAmount: bigint }> {
     await this.syncTokenLeaves();
     const tokenPublicKey = await super.getIdentityPublicKey();
-
+    const decodedOwnerPubkey = decodeSparkAddress(
+      ownerPublicKey,
+      this.config.getNetworkType(),
+    );
     const response = await this.tokenFreezeService!.freezeTokens(
-      hexToBytes(ownerPublicKey),
+      hexToBytes(decodedOwnerPubkey),
       hexToBytes(tokenPublicKey),
     );
 
@@ -186,9 +192,12 @@ export class IssuerSparkWallet
   ): Promise<{ impactedLeafIds: string[]; impactedTokenAmount: bigint }> {
     await this.syncTokenLeaves();
     const tokenPublicKey = await super.getIdentityPublicKey();
-
+    const decodedOwnerPubkey = decodeSparkAddress(
+      ownerPublicKey,
+      this.config.getNetworkType(),
+    );
     const response = await this.tokenFreezeService!.unfreezeTokens(
-      hexToBytes(ownerPublicKey),
+      hexToBytes(decodedOwnerPubkey),
       hexToBytes(tokenPublicKey),
     );
     const tokenAmount = bytesToNumberBE(response.impactedTokenAmount);

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

@@ -9,11 +9,7 @@ import { BitcoinFaucet } from "../../../../spark-sdk/src/tests/utils/test-faucet
 import { IssuerSparkWallet } from "../../issuer-spark-wallet.js";
 
 describe("token integration test", () => {
-  // Skip all tests if running in GitHub Actions
-  process.env.GITHUB_ACTIONS ? it.skip : it;
-
-  // Increase timeout for all tests in this suite
-  jest.setTimeout(60000);
+  jest.setTimeout(80000);
 
   it("should issue a single token with ECDSA", async () => {
     const tokenAmount: bigint = 1000n;
@@ -284,7 +280,6 @@ describe("token integration test", () => {
       tokenPublicKey: await issuerWallet.getIdentityPublicKey(),
       receiverSparkAddress: userWalletPublicKey,
     });
-
     const issuerBalanceAfterTransfer =
       await issuerWallet.getIssuerTokenBalance();
     expect(issuerBalanceAfterTransfer.balance).toEqual(0n);
@@ -295,7 +290,6 @@ describe("token integration test", () => {
       tokenPublicKey,
     );
     expect(userBalanceAfterTransfer.balance).toEqual(tokenAmount);
-
     // Freeze tokens
     const freezeResponse = await issuerWallet.freezeTokens(userWalletPublicKey);
     expect(freezeResponse.impactedLeafIds.length).toBeGreaterThan(0);
@@ -413,7 +407,6 @@ describe("token integration test", () => {
     const issuerBalanceAfterTransfer =
       await issuerWallet.getIssuerTokenBalance();
     expect(issuerBalanceAfterTransfer.balance).toEqual(0n);
-
     const tokenPublicKeyHex = await issuerWallet.getIdentityPublicKey();
     const userWalletPublicKeyHex = await userWallet.getSparkAddress();
     const userBalanceAfterTransfer = await getSparkWalletTokenBalanceOrZero(
@@ -421,24 +414,22 @@ describe("token integration test", () => {
       tokenPublicKeyHex,
     );
     expect(userBalanceAfterTransfer.balance).toEqual(tokenAmount);
-
     await userWallet.transferTokens({
       tokenPublicKey: tokenPublicKeyHex,
       tokenAmount,
-      receiverSparkAddress: userWalletPublicKeyHex,
+      receiverSparkAddress: await issuerWallet.getSparkAddress(),
     });
 
     const userBalanceAfterTransferBack = await getSparkWalletTokenBalanceOrZero(
       userWallet,
       tokenPublicKeyHex,
     );
+
     expect(userBalanceAfterTransferBack.balance).toEqual(0n);
 
     const issuerTokenBalance = await issuerWallet.getIssuerTokenBalance();
     expect(issuerTokenBalance.balance).toEqual(tokenAmount);
-
     await issuerWallet.burnTokens(tokenAmount);
-
     const issuerTokenBalanceAfterBurn =
       await issuerWallet.getIssuerTokenBalance();
     expect(issuerTokenBalanceAfterBurn.balance).toEqual(0n);
@@ -474,7 +465,6 @@ describe("token integration test", () => {
     expect(issuerBalanceAfterTransfer.balance).toEqual(0n);
 
     const tokenPublicKeyHex = await issuerWallet.getIdentityPublicKey();
-    const userWalletPublicKeyHex = await userWallet.getSparkAddress();
     const userBalanceAfterTransfer = await getSparkWalletTokenBalanceOrZero(
       userWallet,
       tokenPublicKeyHex,
@@ -484,7 +474,7 @@ describe("token integration test", () => {
     await userWallet.transferTokens({
       tokenPublicKey: tokenPublicKeyHex,
       tokenAmount,
-      receiverSparkAddress: userWalletPublicKeyHex,
+      receiverSparkAddress: await issuerWallet.getSparkAddress(),
     });
 
     const userBalanceAfterTransferBack = await getSparkWalletTokenBalanceOrZero(