@ledgerhq/coin-hedera 1.12.0-nightly.3 → 1.12.0-nightly.4

package/src/bridge/utils.integration.test.ts

@@ -1,4 +1,5 @@
 import BigNumber from "bignumber.js";
+import { InvalidAddress } from "@ledgerhq/errors";
 import cvsApi from "@ledgerhq/live-countervalues/api/index";
 import { encodeTokenAccountId } from "@ledgerhq/coin-framework/account";
 import { getMockedAccount, getMockedTokenAccount } from "../test/fixtures/account.fixture";
@@ -12,6 +13,7 @@ import {
   getSubAccounts,
   getSyncHash,
   mergeSubAccounts,
+  safeParseAccountId,
   patchOperationWithExtra,
   prepareOperations,
 } from "./utils";
@@ -23,6 +25,7 @@ import {
 import { getMockedOperation } from "../test/fixtures/operation.fixture";
 import { HederaOperationExtra } from "../types";
 import { getAccount } from "../api/mirror";
+import { HederaRecipientInvalidChecksum } from "../errors";
 import { isValidExtra } from "../logic";
 import { getMockedMirrorToken } from "../test/fixtures/mirror.fixture";
 import { HEDERA_OPERATION_TYPES, HEDERA_TRANSACTION_KINDS } from "../constants";
@@ -539,5 +542,54 @@ describe("utils", () => {
       const result = await checkAccountTokenAssociationStatus(accountId, tokenId);
       expect(result).toBe(false);
     });
+
+    test("supports addresses with checksum", async () => {
+      const addressWithChecksum = "0.0.9124531-xrxlv";
+
+      mockedGetAccount.mockResolvedValueOnce({
+        account: accountId,
+        max_automatic_token_associations: 0,
+        balance: {
+          balance: 1,
+          timestamp: "",
+          tokens: [{ token_id: "0.0.9999", balance: 1 }],
+        },
+      });
+
+      await checkAccountTokenAssociationStatus(addressWithChecksum, tokenId);
+      expect(mockedGetAccount).toHaveBeenCalledWith("0.0.9124531");
+    });
+  });
+
+  describe("safeParseAccountId", () => {
+    test("returns account id and no checksum for valid address without checksum", () => {
+      const [error, result] = safeParseAccountId("0.0.9124531");
+
+      expect(error).toBeNull();
+      expect(result?.accountId).toBe("0.0.9124531");
+      expect(result?.checksum).toBeNull();
+    });
+
+    test("returns account id and checksum for valid address with correct checksum", () => {
+      const [error, result] = safeParseAccountId("0.0.9124531-xrxlv");
+
+      expect(error).toBeNull();
+      expect(result?.accountId).toBe("0.0.9124531");
+      expect(result?.checksum).toBe("xrxlv");
+    });
+
+    test("returns error for valid address with incorrect checksum", () => {
+      const [error, accountId] = safeParseAccountId("0.0.9124531-invld");
+
+      expect(error).toBeInstanceOf(HederaRecipientInvalidChecksum);
+      expect(accountId).toBeNull();
+    });
+
+    test("returns error for invalid address format", () => {
+      const [error, accountId] = safeParseAccountId("not-a-valid-address");
+
+      expect(error).toBeInstanceOf(InvalidAddress);
+      expect(accountId).toBeNull();
+    });
   });
 });

package/src/bridge/utils.ts

@@ -1,9 +1,12 @@
 import BigNumber from "bignumber.js";
 import murmurhash from "imurmurhash";
 import invariant from "invariant";
+import { AccountId } from "@hashgraph/sdk";
+import { InvalidAddress } from "@ledgerhq/errors";
 import type { Account, Operation, TokenAccount } from "@ledgerhq/types-live";
 import cvsApi from "@ledgerhq/live-countervalues/api/index";
 import {
+  findCryptoCurrencyById,
   findTokenByAddressInCurrency,
   getFiatCurrencyByTicker,
   listTokensForCryptoCurrency,
@@ -22,7 +25,9 @@ import { makeLRUCache, seconds } from "@ledgerhq/live-network/cache";
 import { estimateMaxSpendable } from "./estimateMaxSpendable";
 import type { HederaOperationExtra, Transaction } from "../types";
 import { getAccount } from "../api/mirror";
+import { getHederaClient } from "../api/network";
 import type { HederaMirrorToken } from "../api/types";
+import { HederaRecipientInvalidChecksum } from "../errors";
 import { isTokenAssociateTransaction, isValidExtra } from "../logic";
 import { BASE_USD_FEE_BY_OPERATION_TYPE, HEDERA_OPERATION_TYPES } from "../constants";
 
@@ -453,8 +458,15 @@ export function patchOperationWithExtra(
 }
 
 export const checkAccountTokenAssociationStatus = makeLRUCache(
-  async (accountId: string, tokenId: string) => {
-    const mirrorAccount = await getAccount(accountId);
+  async (address: string, tokenId: string) => {
+    const [parsingError, parsingResult] = safeParseAccountId(address);
+
+    if (parsingError) {
+      throw parsingError;
+    }
+
+    const addressWithoutChecksum = parsingResult.accountId;
+    const mirrorAccount = await getAccount(addressWithoutChecksum);
 
     // auto association is enabled
     if (mirrorAccount.max_automatic_token_associations === -1) {
@@ -470,3 +482,38 @@ export const checkAccountTokenAssociationStatus = makeLRUCache(
   (accountId, tokenId) => `${accountId}-${tokenId}`,
   seconds(30),
 );
+
+export const safeParseAccountId = (
+  address: string,
+): [Error, null] | [null, { accountId: string; checksum: string | null }] => {
+  const currency = findCryptoCurrencyById("hedera");
+  const currencyName = currency?.name ?? "Hedera";
+
+  try {
+    const accountId = AccountId.fromString(address);
+
+    // verify checksum if present
+    // FIXME: migrate to EntityIdHelper methods once SDK is upgraded:
+    // https://github.com/hiero-ledger/hiero-sdk-js/blob/main/src/EntityIdHelper.js#L197
+    // https://github.com/hiero-ledger/hiero-sdk-js/blob/main/src/EntityIdHelper.js#L446
+    const checksum: string | null = address.split("-")[1] ?? null;
+    if (checksum) {
+      const client = getHederaClient();
+      const recipientWithChecksum = accountId.toStringWithChecksum(client);
+      const expectedChecksum = recipientWithChecksum.split("-")[1];
+
+      if (checksum !== expectedChecksum) {
+        return [new HederaRecipientInvalidChecksum(), null];
+      }
+    }
+
+    const result = {
+      accountId: accountId.toString(),
+      checksum,
+    };
+
+    return [null, result];
+  } catch (err) {
+    return [new InvalidAddress("", { currencyName }), null];
+  }
+};

package/src/errors.ts

@@ -1,3 +1,15 @@
 import { createCustomErrorClass } from "@ledgerhq/errors";
 
 export const HederaAddAccountError = createCustomErrorClass("HederaAddAccountError");
+export const HederaRecipientInvalidChecksum = createCustomErrorClass(
+  "HederaRecipientInvalidChecksum",
+);
+export const HederaInsufficientFundsForAssociation = createCustomErrorClass(
+  "HederaInsufficientFundsForAssociation",
+);
+export const HederaRecipientTokenAssociationRequired = createCustomErrorClass(
+  "HederaRecipientTokenAssociationRequired",
+);
+export const HederaRecipientTokenAssociationUnverified = createCustomErrorClass(
+  "HederaRecipientTokenAssociationUnverified",
+);