@ledgerhq/coin-hedera 1.15.0-nightly.20251126023856 → 1.15.0-nightly.20251126160702

package/lib-es/types/mirror.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mirror.d.ts","sourceRoot":"","sources":["../../src/types/mirror.ts"],"names":[],"mappings":"AAAA,KAAK,YAAY,GAAG,gBAAgB,GAAG,QAAQ,GAAG,UAAU,CAAC;AAE7D,KAAK,SAAS,GAAG,gBAAgB,GAAG,SAAS,GAAG,SAAS,CAAC;AAE1D,MAAM,WAAW,wBAAwB;IACvC,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,yBAAyB;IACxC,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB;AAED,MAAM,WAAW,uBAAuB;IACtC,SAAS,EAAE,wBAAwB,EAAE,CAAC;IACtC,eAAe,EAAE,yBAAyB,EAAE,CAAC;IAC7C,cAAc,EAAE,MAAM,CAAC;IACvB,gBAAgB,EAAE,MAAM,CAAC;IACzB,mBAAmB,EAAE,MAAM,CAAC;IAC5B,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,iBAAiB;IAChC,qBAAqB,EAAE,OAAO,CAAC;IAC/B,OAAO,EAAE,MAAM,CAAC;IAChB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,aAAa,EAAE,YAAY,CAAC;IAC5B,UAAU,EAAE,SAAS,CAAC;CACvB;AAED,MAAM,WAAW,mBAAmB;IAClC,OAAO,EAAE,MAAM,CAAC;IAChB,gCAAgC,EAAE,MAAM,CAAC;IACzC,OAAO,EAAE;QACP,OAAO,EAAE,MAAM,CAAC;QAChB,SAAS,EAAE,MAAM,CAAC;QAClB,MAAM,EAAE;YACN,QAAQ,EAAE,MAAM,CAAC;YACjB,OAAO,EAAE,MAAM,CAAC;SACjB,EAAE,CAAC;KACL,CAAC;CACH;AAED,MAAM,WAAW,iCAAiC;IAChD,MAAM,EAAE,iBAAiB,EAAE,CAAC;IAC5B,KAAK,EAAE;QACL,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;KACrB,CAAC;CACH;AAED,MAAM,WAAW,4BAA4B;IAC3C,QAAQ,EAAE,mBAAmB,EAAE,CAAC;IAChC,KAAK,EAAE;QACL,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;KACrB,CAAC;CACH;AAED,MAAM,WAAW,gCAAgC;IAC/C,YAAY,EAAE,uBAAuB,EAAE,CAAC;IACxC,KAAK,EAAE;QACL,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;KACrB,CAAC;CACH"}
+{"version":3,"file":"mirror.d.ts","sourceRoot":"","sources":["../../src/types/mirror.ts"],"names":[],"mappings":"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"}

package/lib-es/types/thirdweb.d.ts

@@ -0,0 +1,34 @@
+export interface HederaThirdwebDecodedTransferParams {
+    from: string;
+    to: string;
+    value: string;
+}
+export interface HederaThirdwebTransaction {
+    address: string;
+    blockHash: string;
+    blockNumber: number;
+    blockTimestamp: number;
+    chainId: string;
+    data: string;
+    decoded: {
+        name: string;
+        params: Record<string, unknown>;
+        signature: string;
+    };
+    logIndex: number;
+    topics: string[];
+    transactionHash: string;
+    transactionIndex: number;
+}
+export interface HederaThirdwebPagination {
+    limit: number;
+    page: number;
+    totalCount: number;
+}
+export interface HederaThirdwebContractEventsResponse {
+    result: {
+        events: HederaThirdwebTransaction[];
+        pagination: HederaThirdwebPagination;
+    };
+}
+//# sourceMappingURL=thirdweb.d.ts.map

package/lib-es/types/thirdweb.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"thirdweb.d.ts","sourceRoot":"","sources":["../../src/types/thirdweb.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,mCAAmC;IAClD,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,yBAAyB;IACxC,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,cAAc,EAAE,MAAM,CAAC;IACvB,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE;QACP,IAAI,EAAE,MAAM,CAAC;QACb,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QAChC,SAAS,EAAE,MAAM,CAAC;KACnB,CAAC;IACF,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,eAAe,EAAE,MAAM,CAAC;IACxB,gBAAgB,EAAE,MAAM,CAAC;CAC1B;AAED,MAAM,WAAW,wBAAwB;IACvC,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,oCAAoC;IACnD,MAAM,EAAE;QACN,MAAM,EAAE,yBAAyB,EAAE,CAAC;QACpC,UAAU,EAAE,wBAAwB,CAAC;KACtC,CAAC;CACH"}

package/lib-es/types/thirdweb.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=thirdweb.js.map

package/lib-es/types/thirdweb.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"thirdweb.js","sourceRoot":"","sources":["../../src/types/thirdweb.ts"],"names":[],"mappings":""}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ledgerhq/coin-hedera",
-  "version": "1.15.0-nightly.20251126023856",
+  "version": "1.15.0-nightly.20251126160702",
   "description": "Ledger Hedera Coin integration",
   "keywords": [
     "Ledger",
@@ -75,20 +75,21 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@hashgraph/sdk": "2.14.2",
+    "@hashgraph/sdk": "2.74.0",
     "bignumber.js": "^9.1.2",
     "expect": "^27.4.6",
     "invariant": "^2.2.2",
     "lodash": "^4.17.21",
     "rxjs": "^7.8.1",
-    "@ledgerhq/coin-framework": "^6.10.0-nightly.20251126023856",
-    "@ledgerhq/cryptoassets": "^13.34.0-nightly.20251126023856",
+    "viem": "^2.27.0",
+    "@ledgerhq/coin-framework": "^6.10.0-nightly.20251126160702",
+    "@ledgerhq/cryptoassets": "^13.34.0-nightly.20251126160702",
     "@ledgerhq/devices": "8.7.0",
     "@ledgerhq/errors": "^6.27.0",
-    "@ledgerhq/live-countervalues": "^0.10.1-nightly.20251126023856",
-    "@ledgerhq/live-env": "^2.21.1-nightly.20251126023856",
-    "@ledgerhq/live-network": "^2.1.2-nightly.20251126023856",
-    "@ledgerhq/types-live": "^6.90.0-nightly.20251126023856"
+    "@ledgerhq/live-countervalues": "^0.10.1-nightly.20251126160702",
+    "@ledgerhq/live-env": "^2.22.0-nightly.20251126160702",
+    "@ledgerhq/live-network": "^2.1.2-nightly.20251126160702",
+    "@ledgerhq/types-live": "^6.90.0-nightly.20251126160702"
   },
   "devDependencies": {
     "@types/invariant": "^2.2.2",

package/src/api/index.integ.test.ts

@@ -4,6 +4,7 @@ import {
   AccountId,
   Hbar,
   HbarUnit,
+  Long,
   TokenAssociateTransaction,
   TransferTransaction,
 } from "@hashgraph/sdk";
@@ -14,11 +15,12 @@ import { getSyntheticBlock } from "../logic/utils";
 import { MAINNET_TEST_ACCOUNTS } from "../test/fixtures/account.fixture";
 
 describe("createApi", () => {
+  const api = createApi({});
+
   beforeAll(() => {
     // Setup CAL client store (automatically set as global store)
     setupCalClientStore();
   });
-  const api = createApi({});
 
   describe("craftTransaction", () => {
     it("returns serialized native coin TransferTransaction", async () => {
@@ -81,10 +83,8 @@ describe("createApi", () => {
       const senderTransfer = tokenTransfers?.get(MAINNET_TEST_ACCOUNTS.withoutTokens.accountId);
       const recipientTransfer = tokenTransfers?.get(MAINNET_TEST_ACCOUNTS.withTokens.accountId);
 
-      // .toString() is used because tokenTransfers values are Long objects
-      // this is internal dependency of @hashgraph/sdk, re-exported in newer version
-      expect(senderTransfer?.toString()).toEqual("-1");
-      expect(recipientTransfer?.toString()).toEqual("1");
+      expect(senderTransfer).toEqual(Long.fromNumber(-1));
+      expect(recipientTransfer).toEqual(Long.fromNumber(1));
       expect(tokenTransfers).not.toBeNull();
       expect(rawTx.transactionMemo).toBe("token transfer");
     });
@@ -116,7 +116,7 @@ describe("createApi", () => {
         AccountId.fromString(MAINNET_TEST_ACCOUNTS.withoutTokens.accountId),
       );
       // .toString() is used because sdk.TokenId.fromString() sets `_checksum` to undefined,
-      // but tokenIds elements from TokenAssociateTransaction.fromBytes have it set to null
+      // where tokenIds elements from TokenAssociateTransaction.fromBytes have it set to null
       expect(rawTx.tokenIds?.[0]?.toString()).toEqual("0.0.5022567");
       expect(rawTx.transactionMemo).toBe("token association");
     });
@@ -147,11 +147,11 @@ describe("createApi", () => {
       );
 
       const rawTx = TransferTransaction.fromBytes(Buffer.from(hex, "hex"));
+      const expectedMaxFee = Hbar.from(customFees.value.toString(), HbarUnit.Tinybar);
 
       expect(rawTx).toBeInstanceOf(TransferTransaction);
       invariant(rawTx instanceof TransferTransaction, "TransferTransaction type guard");
-
-      expect(rawTx.maxTransactionFee).toEqual(Hbar.from(customFees.value, HbarUnit.Tinybar));
+      expect(rawTx.maxTransactionFee).toEqual(expectedMaxFee);
     });
   });
 
@@ -365,6 +365,9 @@ describe("createApi", () => {
           minHeight: 0,
           limit: 10,
           order,
+          ...(order === "desc" && {
+            lastPagingToken: "1762168437.643463899",
+          }),
         } satisfies Pagination;
 
         const [page1, pagingToken1] = await api.listOperations(

package/src/api/index.ts

@@ -13,11 +13,12 @@ import type {
 } from "@ledgerhq/coin-framework/api/index";
 import { getCryptoCurrencyById } from "@ledgerhq/cryptoassets/currencies";
 import coinConfig from "../config";
+import { HEDERA_OPERATION_TYPES } from "../constants";
 import {
   broadcast as logicBroadcast,
   combine,
   craftTransaction,
-  estimateFees,
+  estimateFees as logicEstimateFees,
   getBalance,
   listOperations as logicListOperations,
   getAssetFromToken,
@@ -35,6 +36,7 @@ export function createApi(config: Record<string, never>): Api<HederaMemo> {
   return {
     broadcast: async tx => {
       const response = await logicBroadcast(tx);
+
       return Buffer.from(response.transactionHash).toString("base64");
     },
     combine,
@@ -55,10 +57,15 @@ export function createApi(config: Record<string, never>): Api<HederaMemo> {
     },
     estimateFees: async transactionIntent => {
       const operationType = mapIntentToSDKOperation(transactionIntent);
-      const estimatedFee = await estimateFees(currency, operationType);
+
+      if (operationType === HEDERA_OPERATION_TYPES.ContractCall) {
+        throw new Error("hedera: estimateFees for ContractCall is not supported yet");
+      }
+
+      const estimatedFee = await logicEstimateFees({ currency, operationType });
 
       return {
-        value: BigInt(estimatedFee.toString()),
+        value: BigInt(estimatedFee.tinybars.toString()),
       };
     },
     getBalance: address => getBalance(currency, address),

package/src/bridge/broadcast.ts

@@ -1,7 +1,7 @@
 import { AccountBridge, Operation } from "@ledgerhq/types-live";
 import { patchOperationWithHash } from "@ledgerhq/coin-framework/operation";
 import { broadcast as logicBroadcast } from "../logic/broadcast";
-import { base64ToUrlSafeBase64, isValidExtra } from "../logic/utils";
+import { base64ToUrlSafeBase64, isValidExtra, formatTransactionId } from "../logic/utils";
 import type { HederaOperationExtra, Transaction } from "../types";
 import { patchOperationWithExtra } from "./utils";
 
@@ -13,7 +13,7 @@ export const broadcast: AccountBridge<Transaction>["broadcast"] = async ({ signe
   const base64HashUrlSafe = base64ToUrlSafeBase64(base64Hash);
   const extra: HederaOperationExtra = {
     ...(isValidExtra(operation.extra) ? operation.extra : {}),
-    transactionId: response.transactionId.toString(),
+    transactionId: formatTransactionId(response.transactionId),
   };
 
   let patchedOperation: Operation = operation;

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

@@ -3,25 +3,16 @@ import { buildOptimisticOperation } from "./buildOptimisticOperation";
 import { HEDERA_OPERATION_TYPES, HEDERA_TRANSACTION_MODES } from "../constants";
 import { estimateFees } from "../logic/estimateFees";
 import { getMockedAccount, getMockedTokenAccount } from "../test/fixtures/account.fixture";
-import { getMockedTokenCurrency } from "../test/fixtures/currency.fixture";
+import {
+  getMockedERC20TokenCurrency,
+  getMockedHTSTokenCurrency,
+} from "../test/fixtures/currency.fixture";
 import { getMockedTransaction } from "../test/fixtures/transaction.fixture";
 
 describe("buildOptimisticOperation", () => {
-  let estimatedFees: Record<"crypto" | "associate", BigNumber>;
-
-  beforeAll(async () => {
-    const mockedAccount = getMockedAccount();
-    const [crypto, associate] = await Promise.all([
-      estimateFees(mockedAccount.currency, HEDERA_OPERATION_TYPES.CryptoTransfer),
-      estimateFees(mockedAccount.currency, HEDERA_OPERATION_TYPES.TokenAssociate),
-    ]);
-
-    estimatedFees = { crypto, associate };
-  });
-
   test("builds optimistic operation for token association", async () => {
     const mockedAccount = getMockedAccount();
-    const mockedToken = getMockedTokenCurrency();
+    const mockedToken = getMockedHTSTokenCurrency();
     const mockedTransaction = getMockedTransaction({
       mode: HEDERA_TRANSACTION_MODES.TokenAssociate,
       amount: new BigNumber(0),
@@ -31,6 +22,11 @@ describe("buildOptimisticOperation", () => {
       },
     });
 
+    const estimatedFee = await estimateFees({
+      currency: mockedAccount.currency,
+      operationType: HEDERA_OPERATION_TYPES.TokenAssociate,
+    });
+
     const op = await buildOptimisticOperation({
       account: mockedAccount,
       transaction: mockedTransaction,
@@ -38,7 +34,7 @@ describe("buildOptimisticOperation", () => {
 
     expect(op.type).toBe("ASSOCIATE_TOKEN");
     expect(op.extra).toEqual({ associatedTokenId: mockedToken.contractAddress });
-    expect(op.fee).toEqual(estimatedFees.associate);
+    expect(op.fee).toEqual(estimatedFee.tinybars);
     expect(op.senders).toContain(mockedAccount.freshAddress);
     expect(op.recipients).toContain("0.0.1234");
   });
@@ -50,20 +46,57 @@ describe("buildOptimisticOperation", () => {
       recipient: "0.0.5678",
     });
 
+    const estimatedFee = await estimateFees({
+      currency: mockedAccount.currency,
+      operationType: HEDERA_OPERATION_TYPES.CryptoTransfer,
+    });
+
     const op = await buildOptimisticOperation({
       account: mockedAccount,
       transaction: mockedTransaction,
     });
 
     expect(op.type).toBe("OUT");
-    expect(op.fee).toEqual(estimatedFees.crypto);
+    expect(op.fee).toEqual(estimatedFee.tinybars);
     expect(op.value).toEqual(new BigNumber(123));
     expect(op.senders).toContain(mockedAccount.freshAddress);
     expect(op.recipients).toContain("0.0.5678");
   });
 
-  test("builds optimistic operation for token", async () => {
-    const mockedTokenCurrency = getMockedTokenCurrency();
+  test("builds optimistic operation for HTS token", async () => {
+    const mockedAccount = getMockedAccount();
+    const mockedTokenCurrency = getMockedHTSTokenCurrency();
+    const tokenAccount = getMockedTokenAccount(mockedTokenCurrency);
+    const parentAccount = getMockedAccount({ subAccounts: [tokenAccount] });
+    const mockedTransaction = getMockedTransaction({
+      subAccountId: tokenAccount.id,
+      amount: new BigNumber(123),
+      recipient: "0.0.9999",
+    });
+
+    const estimatedFee = await estimateFees({
+      currency: mockedAccount.currency,
+      operationType: HEDERA_OPERATION_TYPES.TokenTransfer,
+    });
+
+    const op = await buildOptimisticOperation({
+      account: parentAccount,
+      transaction: mockedTransaction,
+    });
+    const subOp = (op.subOperations ?? [])[0];
+
+    expect(op.type).toBe("FEES");
+    expect(op.value).toEqual(estimatedFee.tinybars);
+    expect(op.subOperations).toHaveLength(1);
+    expect(subOp.type).toBe("OUT");
+    expect(subOp.value).toEqual(new BigNumber(123));
+    expect(subOp.fee).toEqual(estimatedFee.tinybars);
+    expect(subOp.accountId).toBe(tokenAccount.id);
+    expect(subOp.recipients).toContain("0.0.9999");
+  });
+
+  test("builds optimistic operation for ERC20 token", async () => {
+    const mockedTokenCurrency = getMockedERC20TokenCurrency();
     const tokenAccount = getMockedTokenAccount(mockedTokenCurrency);
     const parentAccount = getMockedAccount({ subAccounts: [tokenAccount] });
     const mockedTransaction = getMockedTransaction({
@@ -72,16 +105,34 @@ describe("buildOptimisticOperation", () => {
       recipient: "0.0.9999",
     });
 
+    const estimatedFee = await estimateFees({
+      operationType: HEDERA_OPERATION_TYPES.ContractCall,
+      txIntent: {
+        intentType: "transaction",
+        type: HEDERA_TRANSACTION_MODES.Send,
+        asset: {
+          type: "erc20",
+          assetReference: tokenAccount.token.contractAddress,
+          assetOwner: parentAccount.freshAddress,
+        },
+        amount: BigInt(mockedTransaction.amount.toString()),
+        sender: parentAccount.freshAddress,
+        recipient: mockedTransaction.recipient,
+      },
+    });
+
     const op = await buildOptimisticOperation({
       account: parentAccount,
       transaction: mockedTransaction,
     });
-    const subOp = op.subOperations![0];
+    const subOp = (op.subOperations ?? [])[0];
 
     expect(op.type).toBe("FEES");
+    expect(op.value).toEqual(estimatedFee.tinybars);
     expect(op.subOperations).toHaveLength(1);
     expect(subOp.type).toBe("OUT");
     expect(subOp.value).toEqual(new BigNumber(123));
+    expect(subOp.fee).toEqual(estimatedFee.tinybars);
     expect(subOp.accountId).toBe(tokenAccount.id);
     expect(subOp.recipients).toContain("0.0.9999");
   });

package/src/bridge/buildOptimisticOperation.ts

@@ -1,10 +1,11 @@
+import BigNumber from "bignumber.js";
 import invariant from "invariant";
 import type { Account, Operation, OperationType, TokenAccount } from "@ledgerhq/types-live";
 import { encodeOperationId } from "@ledgerhq/coin-framework/operation";
-import { findSubAccountById, isTokenAccount } from "@ledgerhq/coin-framework/account/helpers";
-import { HEDERA_OPERATION_TYPES } from "../constants";
+import { findSubAccountById } from "@ledgerhq/coin-framework/account/helpers";
+import { HEDERA_OPERATION_TYPES, HEDERA_TRANSACTION_MODES } from "../constants";
 import { estimateFees } from "../logic/estimateFees";
-import { isTokenAssociateTransaction, safeParseAccountId } from "../logic/utils";
+import { safeParseAccountId, isTokenAssociateTransaction } from "../logic/utils";
 import type { HederaOperationExtra, Transaction } from "../types";
 
 const buildOptimisticTokenAssociateOperation = async ({
@@ -16,15 +17,18 @@ const buildOptimisticTokenAssociateOperation = async ({
 }): Promise<Operation> => {
   invariant(isTokenAssociateTransaction(transaction), "invalid transaction properties");
 
-  const estimatedFee = await estimateFees(account.currency, HEDERA_OPERATION_TYPES.TokenAssociate);
+  const estimatedFee = await estimateFees({
+    currency: account.currency,
+    operationType: HEDERA_OPERATION_TYPES.TokenAssociate,
+  });
   const type: OperationType = "ASSOCIATE_TOKEN";
 
   const operation: Operation = {
     id: encodeOperationId(account.id, "", type),
     hash: "",
     type,
-    value: estimatedFee,
-    fee: estimatedFee,
+    value: estimatedFee.tinybars,
+    fee: estimatedFee.tinybars,
     blockHash: null,
     blockHeight: null,
     senders: [account.freshAddress.toString()],
@@ -51,18 +55,22 @@ const buildOptimisticCoinOperation = async ({
   const estimatedFee =
     transactionType === "FEES"
       ? transaction.amount
-      : await estimateFees(account.currency, HEDERA_OPERATION_TYPES.CryptoTransfer);
+      : await estimateFees({
+          currency: account.currency,
+          operationType: HEDERA_OPERATION_TYPES.CryptoTransfer,
+        });
   const value = transaction.amount;
   const type: OperationType = transactionType ?? "OUT";
   const [_, recipientAddress] = safeParseAccountId(transaction.recipient);
   const recipientWithoutChecksum = recipientAddress?.accountId ?? transaction.recipient;
+  const memo = transaction.memo;
 
   const operation: Operation = {
     id: encodeOperationId(account.id, "", type),
     hash: "",
     type,
     value,
-    fee: estimatedFee,
+    fee: BigNumber.isBigNumber(estimatedFee) ? estimatedFee : estimatedFee.tinybars,
     blockHash: null,
     blockHeight: null,
     senders: [account.freshAddress.toString()],
@@ -70,14 +78,14 @@ const buildOptimisticCoinOperation = async ({
     accountId: account.id,
     date: new Date(),
     extra: {
-      ...(!!transaction.memo && { memo: transaction.memo }),
-    },
+      ...(memo && { memo }),
+    } satisfies HederaOperationExtra,
   };
 
   return operation;
 };
 
-const buildOptimisticTokenOperation = async ({
+const buildOptimisticHTSTokenOperation = async ({
   account,
   tokenAccount,
   transaction,
@@ -86,18 +94,21 @@ const buildOptimisticTokenOperation = async ({
   tokenAccount: TokenAccount;
   transaction: Transaction;
 }): Promise<Operation> => {
-  const estimatedFee = await estimateFees(account.currency, HEDERA_OPERATION_TYPES.TokenTransfer);
+  const estimatedFee = await estimateFees({
+    currency: account.currency,
+    operationType: HEDERA_OPERATION_TYPES.TokenTransfer,
+  });
   const value = transaction.amount;
   const type: OperationType = "OUT";
   const [_, recipientAddress] = safeParseAccountId(transaction.recipient);
   const recipientWithoutChecksum = recipientAddress?.accountId ?? transaction.recipient;
+  const memo = transaction.memo;
 
   const coinOperation = await buildOptimisticCoinOperation({
     account,
     transaction: {
       ...transaction,
-      recipient: tokenAccount.token.contractAddress,
-      amount: estimatedFee,
+      amount: estimatedFee.tinybars,
     },
     transactionType: "FEES",
   });
@@ -110,7 +121,7 @@ const buildOptimisticTokenOperation = async ({
         hash: "",
         type,
         value,
-        fee: estimatedFee,
+        fee: estimatedFee.tinybars,
         blockHash: null,
         blockHeight: null,
         senders: [account.freshAddress.toString()],
@@ -118,8 +129,70 @@ const buildOptimisticTokenOperation = async ({
         accountId: tokenAccount.id,
         date: new Date(),
         extra: {
-          ...(!!transaction.memo && { memo: transaction.memo }),
-        },
+          ...(memo && { memo }),
+        } satisfies HederaOperationExtra,
+      },
+    ],
+  };
+
+  return operation;
+};
+
+const buildOptimisticERC20TokenOperation = async ({
+  account,
+  tokenAccount,
+  transaction,
+}: {
+  account: Account;
+  tokenAccount: TokenAccount;
+  transaction: Transaction;
+}): Promise<Operation> => {
+  const estimatedFees = await estimateFees({
+    operationType: HEDERA_OPERATION_TYPES.ContractCall,
+    txIntent: {
+      intentType: "transaction",
+      type: HEDERA_TRANSACTION_MODES.Send,
+      asset: {
+        type: "erc20",
+        assetReference: tokenAccount.token.contractAddress,
+        assetOwner: account.freshAddress,
+      },
+      amount: BigInt(transaction.amount.toString()),
+      sender: account.freshAddress,
+      recipient: transaction.recipient,
+    },
+  });
+  const value = transaction.amount;
+  const type: OperationType = "OUT";
+  const memo = transaction.memo;
+
+  const coinOperation = await buildOptimisticCoinOperation({
+    account,
+    transaction: {
+      ...transaction,
+      amount: estimatedFees.tinybars,
+    },
+    transactionType: "FEES",
+  });
+
+  const operation: Operation = {
+    ...coinOperation,
+    subOperations: [
+      {
+        id: encodeOperationId(tokenAccount.id, "", type),
+        hash: "",
+        type,
+        value,
+        fee: estimatedFees.tinybars,
+        blockHash: null,
+        blockHeight: null,
+        senders: [account.freshAddress.toString()],
+        recipients: [transaction.recipient],
+        accountId: tokenAccount.id,
+        date: new Date(),
+        extra: {
+          ...(memo && { memo }),
+        } satisfies HederaOperationExtra,
       },
     ],
   };
@@ -135,12 +208,17 @@ export const buildOptimisticOperation = async ({
   transaction: Transaction;
 }): Promise<Operation> => {
   const subAccount = findSubAccountById(account, transaction.subAccountId || "");
-  const isTokenTransaction = isTokenAccount(subAccount);
+  const isHTSTokenTransaction =
+    transaction.mode === HEDERA_TRANSACTION_MODES.Send && subAccount?.token.tokenType === "hts";
+  const isERC20TokenTransaction =
+    transaction.mode === HEDERA_TRANSACTION_MODES.Send && subAccount?.token.tokenType === "erc20";
 
   if (isTokenAssociateTransaction(transaction)) {
     return buildOptimisticTokenAssociateOperation({ account, transaction });
-  } else if (isTokenTransaction) {
-    return buildOptimisticTokenOperation({ account, tokenAccount: subAccount, transaction });
+  } else if (isHTSTokenTransaction) {
+    return buildOptimisticHTSTokenOperation({ account, tokenAccount: subAccount, transaction });
+  } else if (isERC20TokenTransaction) {
+    return buildOptimisticERC20TokenOperation({ account, tokenAccount: subAccount, transaction });
   } else {
     return buildOptimisticCoinOperation({ account, transaction });
   }

package/src/bridge/estimateMaxSpendable.ts

@@ -18,11 +18,11 @@ export const estimateMaxSpendable: AccountBridge<Transaction>["estimateMaxSpenda
     return Promise.resolve(balance);
   }
 
-  const estimatedFees = await estimateFees(
-    mainAccount.currency,
-    HEDERA_OPERATION_TYPES.CryptoTransfer,
-  );
-  let maxSpendable = balance.minus(estimatedFees);
+  const estimatedFees = await estimateFees({
+    currency: mainAccount.currency,
+    operationType: HEDERA_OPERATION_TYPES.CryptoTransfer,
+  });
+  let maxSpendable = balance.minus(estimatedFees.tinybars);
 
   // set max spendable to 0 if negative
   // for cases where the user's account balance is smaller than the estimated fee