@ledgerhq/coin-tron 4.5.0-nightly.2 → 4.5.1-nightly.0

package/lib-es/network/trongrid/trongrid-adapters.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"trongrid-adapters.test.js","sourceRoot":"","sources":["../../../src/network/trongrid/trongrid-adapters.test.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"trongrid-adapters.test.js","sourceRoot":"","sources":["../../../src/network/trongrid/trongrid-adapters.test.ts"],"names":[],"mappings":"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"}

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

@@ -1,14 +1,4 @@
-import { Asset, StringMemo } from "@ledgerhq/coin-framework/api/types";
+import { StringMemo } from "@ledgerhq/coin-framework/api/types";
 import { MemoNotSupported } from "@ledgerhq/coin-framework/lib-es/api/types";
-export type TronToken = Trc10Token | Trc20Token;
-export type TronAsset = Asset<TronToken>;
-export type Trc10Token = {
-    standard: "trc10";
-    tokenId: string;
-};
-export type Trc20Token = {
-    standard: "trc20";
-    contractAddress: string;
-};
 export type TronMemo = MemoNotSupported | StringMemo<"memo">;
 //# sourceMappingURL=assets.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"assets.d.ts","sourceRoot":"","sources":["../../src/types/assets.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,UAAU,EAAE,MAAM,oCAAoC,CAAC;AACvE,OAAO,EAAE,gBAAgB,EAAE,MAAM,2CAA2C,CAAC;AAE7E,MAAM,MAAM,SAAS,GAAG,UAAU,GAAG,UAAU,CAAC;AAChD,MAAM,MAAM,SAAS,GAAG,KAAK,CAAC,SAAS,CAAC,CAAC;AAczC,MAAM,MAAM,UAAU,GAAG;IACvB,QAAQ,EAAE,OAAO,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAWF,MAAM,MAAM,UAAU,GAAG;IACvB,QAAQ,EAAE,OAAO,CAAC;IAClB,eAAe,EAAE,MAAM,CAAC;CACzB,CAAC;AAGF,MAAM,MAAM,QAAQ,GAAG,gBAAgB,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC"}
+{"version":3,"file":"assets.d.ts","sourceRoot":"","sources":["../../src/types/assets.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,oCAAoC,CAAC;AAChE,OAAO,EAAE,gBAAgB,EAAE,MAAM,2CAA2C,CAAC;AAyB7E,MAAM,MAAM,QAAQ,GAAG,gBAAgB,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ledgerhq/coin-tron",
-  "version": "4.5.0-nightly.2",
+  "version": "4.5.1-nightly.0",
   "description": "Ledger Tron Coin integration",
   "keywords": [
     "Ledger",
@@ -96,15 +96,15 @@
     "lodash": "^4.17.21",
     "rxjs": "^7.8.1",
     "tronweb": "5.3.2",
-    "@ledgerhq/coin-framework": "^5.7.0-nightly.2",
-    "@ledgerhq/cryptoassets": "^13.22.0-nightly.5",
-    "@ledgerhq/devices": "8.4.8-nightly.0",
-    "@ledgerhq/errors": "^6.23.0-nightly.0",
-    "@ledgerhq/live-network": "^2.0.13-nightly.1",
+    "@ledgerhq/coin-framework": "^5.9.0-nightly.0",
+    "@ledgerhq/cryptoassets": "^13.23.0",
+    "@ledgerhq/devices": "8.4.8",
+    "@ledgerhq/errors": "^6.23.0",
+    "@ledgerhq/live-network": "^2.0.14-nightly.0",
     "@ledgerhq/live-promise": "^0.1.1",
     "@ledgerhq/logs": "^6.13.0",
-    "@ledgerhq/types-cryptoassets": "^7.24.0-nightly.0",
-    "@ledgerhq/types-live": "^6.78.0-nightly.0"
+    "@ledgerhq/types-cryptoassets": "^7.24.0",
+    "@ledgerhq/types-live": "^6.79.0"
   },
   "devDependencies": {
     "@agrozyme/types-tronweb": "^5.3.2",
@@ -118,7 +118,7 @@
     "ts-jest": "^29.1.1",
     "typescript": "^5.4.5",
     "@ledgerhq/disable-network-setup": "^0.0.0",
-    "@ledgerhq/types-cryptoassets": "^7.24.0-nightly.0"
+    "@ledgerhq/types-cryptoassets": "^7.24.0"
   },
   "scripts": {
     "clean": "rimraf lib lib-es",

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

@@ -4,7 +4,6 @@ import dotenv from "dotenv";
 import TronWeb from "tronweb";
 import { createApi } from ".";
 import { createTronWeb } from "../logic/utils";
-import { TronAsset } from "../types";
 
 const TRONGRID_URL = "https://api.shasta.trongrid.io";
 dotenv.config();
@@ -25,7 +24,7 @@ const wallet = {
  * Testnet faucet: https://shasta.tronex.io/
  */
 describe("API", () => {
-  let module: AlpacaApi<TronAsset>;
+  let module: AlpacaApi;
   let tronWeb: TronWeb;
 
   beforeAll(() => {

package/src/api/index.test.ts

@@ -11,7 +11,6 @@ import coinConfig from "../config";
 import { TronConfig } from "../config";
 import { AlpacaApi, Pagination, TransactionIntent } from "@ledgerhq/coin-framework/api/types";
 import { createApi } from ".";
-import { TronAsset } from "../types";
 
 jest.mock("../config", () => ({
   setCoinConfig: jest.fn(),
@@ -49,16 +48,15 @@ describe("createApi", () => {
   });
 
   it("should pass parameters correctly", async () => {
-    const api: AlpacaApi<TronAsset> = createApi(mockTronConfig);
-    const intent: TransactionIntent<TronAsset> = {
+    const api: AlpacaApi = createApi(mockTronConfig);
+    const intent: TransactionIntent = {
       type: "send",
       sender: "sender",
       recipient: "recipient",
       amount: BigInt(10),
       asset: {
-        type: "token",
-        standard: "trc10",
-        tokenId: "1002000",
+        type: "trc10",
+        assetReference: "1002000",
       },
     };
     // Simulate calling all methods

package/src/api/index.ts

@@ -18,9 +18,9 @@ import {
   lastBlock,
   Options,
 } from "../logic";
-import type { TronAsset, TronMemo } from "../types";
+import type { TronMemo } from "../types";
 
-export function createApi(config: TronConfig): AlpacaApi<TronAsset, TronMemo> {
+export function createApi(config: TronConfig): AlpacaApi<TronMemo> {
   coinConfig.setCoinConfig(() => ({ ...config, status: { type: "active" } }));
 
   return {
@@ -31,7 +31,7 @@ export function createApi(config: TronConfig): AlpacaApi<TronAsset, TronMemo> {
     getBalance,
     lastBlock,
     listOperations,
-    getBlock(_height): Promise<Block<TronAsset>> {
+    getBlock(_height): Promise<Block> {
       throw new Error("getBlock is not supported");
     },
     getBlockInfo(_height: number): Promise<BlockInfo> {
@@ -40,9 +40,7 @@ export function createApi(config: TronConfig): AlpacaApi<TronAsset, TronMemo> {
   };
 }
 
-async function estimate(
-  transactionIntent: TransactionIntent<TronAsset, TronMemo>,
-): Promise<FeeEstimation> {
+async function estimate(transactionIntent: TransactionIntent<TronMemo>): Promise<FeeEstimation> {
   const fees = await estimateFees(transactionIntent);
   return { value: fees };
 }
@@ -50,7 +48,7 @@ async function estimate(
 async function listOperations(
   address: string,
   pagination: Pagination,
-): Promise<[Operation<TronAsset>[], string]> {
+): Promise<[Operation[], string]> {
   const { minHeight } = pagination;
   const options: Options = {
     softLimit: 200,

package/src/bridge/getEstimateFees.ts

@@ -2,7 +2,7 @@ import { Account, TokenAccount } from "@ledgerhq/types-live";
 import BigNumber from "bignumber.js";
 import { ACTIVATION_FEES, STANDARD_FEES_NATIVE, STANDARD_FEES_TRC_20 } from "../logic/constants";
 import type { AccountTronAPI } from "../network/types";
-import type { Transaction, TronAsset } from "../types";
+import type { Transaction } from "../types";
 import { extractBandwidthInfo, getEstimatedBlockSize } from "./utils";
 import { estimateFees, getAccount } from "../logic";
 import type { TransactionIntent } from "@ledgerhq/coin-framework/api/index";
@@ -48,7 +48,7 @@ const getFeesFromAccountActivation = async (
       return ACTIVATION_FEES; // cost is around 1 TRX
     }
 
-    const transactionIntent: TransactionIntent<TronAsset> = {
+    const transactionIntent: TransactionIntent = {
       type: transaction.mode,
       sender: account.freshAddress,
       recipient: transaction.recipient,
@@ -56,11 +56,10 @@ const getFeesFromAccountActivation = async (
       asset:
         tokenAccount?.token.tokenType === "trc20"
           ? {
-              type: "token",
-              standard: "trc20",
-              contractAddress: tokenAccount.token.contractAddress,
+              type: "trc20",
+              assetReference: tokenAccount.token.contractAddress,
             }
-          : { type: "token", standard: "trc10", tokenId: tokenAccount?.token.id },
+          : { type: "trc10", assetReference: tokenAccount?.token.id },
     };
 
     // if we have a token account but the recipient is either not active or the account does not have a trc20 balance for the given token.

package/src/logic/craftTransaction.integ.test.ts

@@ -25,9 +25,8 @@ describe("Testing craftTransaction function", () => {
     const result = await craftTransaction({
       type: "send",
       asset: {
-        type: "token",
-        standard: "trc10",
-        tokenId: "1002000",
+        type: "trc10",
+        assetReference: "1002000",
       },
       sender,
       recipient,
@@ -67,9 +66,8 @@ describe("Testing craftTransaction function", () => {
     const result = await craftTransaction({
       type: "send",
       asset: {
-        type: "token",
-        standard: "trc20",
-        contractAddress: "TLa2f6VPqDgRE67v1736s7bJ8Ray5wYjU7",
+        type: "trc20",
+        assetReference: "TLa2f6VPqDgRE67v1736s7bJ8Ray5wYjU7",
       },
       sender,
       recipient,
@@ -107,9 +105,8 @@ describe("Testing craftTransaction function", () => {
     const result = await craftTransaction({
       type: "send",
       asset: {
-        type: "token",
-        standard: "trc20",
-        contractAddress: "TLa2f6VPqDgRE67v1736s7bJ8Ray5wYjU7",
+        type: "trc20",
+        assetReference: "TLa2f6VPqDgRE67v1736s7bJ8Ray5wYjU7",
       },
       sender,
       recipient,
@@ -136,15 +133,14 @@ describe("Testing craftTransaction function", () => {
       {
         type: "send",
         asset: {
-          type: "token",
-          standard: "trc20",
-          contractAddress: "TLa2f6VPqDgRE67v1736s7bJ8Ray5wYjU7",
+          type: "trc20",
+          assetReference: "TLa2f6VPqDgRE67v1736s7bJ8Ray5wYjU7",
         },
         sender,
         recipient,
         amount,
       },
-      customFees,
+      { value: customFees },
     );
 
     const decodeResult = await decodeTransaction(result);
@@ -233,9 +229,8 @@ describe("Testing craftTransaction function", () => {
       craftTransaction({
         type: "send",
         asset: {
-          type: "token",
-          standard: "trc20",
-          contractAddress: "TLa2f6VPqDgRE67v1736s7bJ8Ray5wYjU7",
+          type: "trc20",
+          assetReference: "TLa2f6VPqDgRE67v1736s7bJ8Ray5wYjU7",
         },
         sender,
         recipient,

package/src/logic/craftTransaction.test.ts

@@ -2,7 +2,6 @@ import { TransactionIntent } from "@ledgerhq/coin-framework/api/index";
 import BigNumber from "bignumber.js";
 import { craftStandardTransaction, craftTrc20Transaction } from "../network";
 import { decode58Check } from "../network/format";
-import { TronAsset } from "../types";
 import { craftTransaction } from "./craftTransaction";
 
 jest.mock("../network/format", () => ({
@@ -22,7 +21,7 @@ describe("craftTransaction", () => {
   });
 
   it("should craft a standard transaction", async () => {
-    const transactionIntent: TransactionIntent<TronAsset> = {
+    const transactionIntent: TransactionIntent = {
       asset: { type: "native" },
       type: "send",
       recipient: "recipient",
@@ -52,12 +51,11 @@ describe("craftTransaction", () => {
   });
 
   it("should craft a TRC20 transaction", async () => {
-    const transactionIntent: TransactionIntent<TronAsset> = {
+    const transactionIntent: TransactionIntent = {
       type: "send",
       asset: {
-        type: "token",
-        standard: "trc20",
-        contractAddress: "contractAddress",
+        type: "trc20",
+        assetReference: "contractAddress",
       },
       recipient: "recipient",
       sender: "sender",
@@ -89,19 +87,18 @@ describe("craftTransaction", () => {
     const amount: number = 1000;
     const transactionIntent = {
       asset: {
-        type: "token",
-        standard: "trc20",
-        contractAddress: "contractAddress",
+        type: "trc20",
+        assetReference: "contractAddress",
       },
       amount: BigInt(amount),
-    } as TransactionIntent<TronAsset>;
+    } as TransactionIntent;
 
     (decode58Check as jest.Mock).mockImplementation(_address => undefined);
     (craftTrc20Transaction as jest.Mock).mockResolvedValue({
       raw_data_hex: "extendedRawDataHex",
     });
 
-    await craftTransaction(transactionIntent, customFees);
+    await craftTransaction(transactionIntent, { value: customFees });
     expect(craftTrc20Transaction).toHaveBeenCalledWith(
       "contractAddress",
       undefined,
@@ -116,12 +113,11 @@ describe("craftTransaction", () => {
     const amount = 1000;
     const transactionIntent = {
       asset: {
-        type: "token",
-        standard: "trc20",
-        contractAddress: "contractAddress",
+        type: "trc20",
+        assetReference: "contractAddress",
       },
       amount: BigInt(amount),
-    } as TransactionIntent<TronAsset>;
+    } as TransactionIntent;
 
     (decode58Check as jest.Mock).mockImplementation(_address => undefined);
     (craftTrc20Transaction as jest.Mock).mockResolvedValue({
@@ -146,12 +142,11 @@ describe("craftTransaction", () => {
         await craftTransaction(
           {
             asset: {
-              type: "token",
-              standard: "trc20",
-              contractAddress: "contractAddress",
+              type: "trc20",
+              assetReference: "contractAddress",
             },
-          } as TransactionIntent<TronAsset>,
-          customFees,
+          } as TransactionIntent,
+          { value: customFees },
         );
       } catch (error) {
         expect((error as Error).message).toEqual(

package/src/logic/craftTransaction.ts

@@ -1,13 +1,13 @@
-import { TransactionIntent } from "@ledgerhq/coin-framework/api/index";
+import { FeeEstimation, TransactionIntent } from "@ledgerhq/coin-framework/api/index";
 import BigNumber from "bignumber.js";
 import { craftStandardTransaction, craftTrc20Transaction } from "../network";
 import { decode58Check } from "../network/format";
-import { TronAsset, TronMemo } from "../types";
+import { TronMemo } from "../types";
 import { feesToNumber } from "./utils";
 
 export async function craftTransaction(
-  transactionIntent: TransactionIntent<TronAsset, TronMemo>,
-  customFees?: bigint,
+  transactionIntent: TransactionIntent<TronMemo>,
+  customFees?: FeeEstimation,
 ): Promise<string> {
   const { asset, recipient, sender, amount, expiration } = transactionIntent;
   const rawMemo = "memo" in transactionIntent ? transactionIntent.memo : undefined;
@@ -16,8 +16,9 @@ export async function craftTransaction(
   const recipientAddress = decode58Check(recipient);
   const senderAddress = decode58Check(sender);
 
-  if (asset.type === "token" && asset.standard === "trc20" && asset.contractAddress) {
-    if (customFees !== undefined && (customFees <= 0 || customFees > Number.MAX_SAFE_INTEGER)) {
+  if (asset.type === "trc20" && asset.assetReference) {
+    const fees = customFees?.value;
+    if (fees !== undefined && (fees <= 0 || fees > Number.MAX_SAFE_INTEGER)) {
       throw new Error(
         `fees must be between 0 and ${Number.MAX_SAFE_INTEGER} (Typescript Number type value limit)`,
       );
@@ -28,18 +29,17 @@ export async function craftTransaction(
     }
 
     const { raw_data_hex: rawDataHex } = await craftTrc20Transaction(
-      asset.contractAddress,
+      asset.assetReference,
       recipientAddress,
       senderAddress,
       new BigNumber(amount.toString()),
-      feesToNumber(customFees),
+      feesToNumber(fees),
       expiration,
     );
     return rawDataHex as string;
   } else {
-    const isTransferAsset = asset.type === "token" && asset.standard === "trc10";
-    const tokenId =
-      asset.type === "token" && asset.standard === "trc10" ? asset.tokenId : undefined;
+    const isTransferAsset = asset.type === "trc10";
+    const tokenId = asset.type === "trc10" ? asset.assetReference : undefined;
     const { raw_data_hex: rawDataHex } = await craftStandardTransaction(
       tokenId,
       recipientAddress,

package/src/logic/estimateFees.test.ts

@@ -1,11 +1,10 @@
 import { estimateFees } from "./estimateFees";
 import { ACTIVATION_FEES_TRC_20, STANDARD_FEES_NATIVE } from "./constants";
 import { TransactionIntent } from "@ledgerhq/coin-framework/api/index";
-import { TronAsset } from "../types";
 
 describe("estimateFees", () => {
   it("should calculate fees for native trx transactionIntent", async () => {
-    const transactionIntent: TransactionIntent<TronAsset> = {
+    const transactionIntent: TransactionIntent = {
       type: "send",
       sender: "sender1",
       recipient: "recipient1",
@@ -18,15 +17,14 @@ describe("estimateFees", () => {
     expect(result).toEqual(BigInt(STANDARD_FEES_NATIVE.toString()));
   });
   it("should calculate fees for trc10 transactionIntent", async () => {
-    const transactionIntent: TransactionIntent<TronAsset> = {
+    const transactionIntent: TransactionIntent = {
       type: "send",
       sender: "sender1",
       recipient: "recipient1",
       amount: BigInt(1000),
       asset: {
-        type: "token",
-        standard: "trc10",
-        tokenId: "1002000",
+        type: "trc10",
+        assetReference: "1002000",
       },
     };
 
@@ -36,15 +34,14 @@ describe("estimateFees", () => {
   });
 
   it("should calculate fees for trc20 transactionIntent", async () => {
-    const transactionIntent: TransactionIntent<TronAsset> = {
+    const transactionIntent: TransactionIntent = {
       type: "send",
       sender: "sender1",
       recipient: "recipient1",
       amount: BigInt(1000),
       asset: {
-        type: "token",
-        standard: "trc20",
-        contractAddress: "T9yD14Nj9j7xAB4dbGeiX9h8unkKHxuWwb",
+        type: "trc20",
+        assetReference: "T9yD14Nj9j7xAB4dbGeiX9h8unkKHxuWwb",
       },
     };
     const result = await estimateFees(transactionIntent);

package/src/logic/estimateFees.ts

@@ -1,11 +1,11 @@
-import { TronAsset, TronMemo } from "../types";
+import { TronMemo } from "../types";
 import { ACTIVATION_FEES_TRC_20, STANDARD_FEES_NATIVE } from "./constants";
 import type { TransactionIntent } from "@ledgerhq/coin-framework/api/index";
 
 export async function estimateFees(
-  transactionIntent: TransactionIntent<TronAsset, TronMemo>,
+  transactionIntent: TransactionIntent<TronMemo>,
 ): Promise<bigint> {
-  if (transactionIntent.asset.type === "token" && transactionIntent.asset.standard === "trc20") {
+  if (transactionIntent.asset.type === "trc20") {
     return BigInt(ACTIVATION_FEES_TRC_20.toString());
   } else {
     return BigInt(STANDARD_FEES_NATIVE.toString());

package/src/logic/getBalance.integ.test.ts

@@ -17,7 +17,10 @@ describe("getBalance", () => {
     const balances = await getBalance("TRqkRnAj6ceJFYAn2p1eE7aWrgBBwtdhS9");
 
     expect(balances[0].asset).toEqual({ type: "native" });
-    balances.slice(1).forEach(balance => expect(balance.asset).toMatchObject({ type: "token" }));
+    // Backend either returns trc10 or trc20 first (randomly)
+    balances
+      .slice(1)
+      .forEach(balance => expect(["trc20", "trc10"].includes(balance.asset.type)).toBe(true));
     balances.forEach(balance => expect(balance.value).toBeGreaterThanOrEqual(0));
   });
 });

package/src/logic/getBalance.test.ts

@@ -224,33 +224,73 @@ describe("getBalance", () => {
     const balance = await getBalance("41ae18eb0a9e067f8884058470ed187f44135d816d");
     expect(balance).toEqual([
       { asset: { type: "native" }, value: 27781772n },
-      { asset: { standard: "trc10", tokenId: "1002897", type: "token" }, value: 10000000n },
-      { asset: { standard: "trc10", tokenId: "1002775", type: "token" }, value: 5000000n },
-      { asset: { standard: "trc10", tokenId: "1002830", type: "token" }, value: 10000000n },
-      { asset: { standard: "trc10", tokenId: "1002962", type: "token" }, value: 10000000n },
-      { asset: { standard: "trc10", tokenId: "1002876", type: "token" }, value: 10000000n },
-      { asset: { standard: "trc10", tokenId: "1002398", type: "token" }, value: 5000000n },
-      { asset: { standard: "trc10", tokenId: "1002573", type: "token" }, value: 5000000n },
-      { asset: { standard: "trc10", tokenId: "1002881", type: "token" }, value: 10000000n },
-      { asset: { standard: "trc10", tokenId: "1002927", type: "token" }, value: 10000000n },
-      { asset: { standard: "trc10", tokenId: "1002736", type: "token" }, value: 5000000n },
-      { asset: { standard: "trc10", tokenId: "1002814", type: "token" }, value: 10000000n },
-      { asset: { standard: "trc10", tokenId: "1002858", type: "token" }, value: 10000000n },
-      { asset: { standard: "trc10", tokenId: "1002000", type: "token" }, value: 26888000n },
-      { asset: { standard: "trc10", tokenId: "1004031", type: "token" }, value: 9856699n },
+      {
+        asset: { type: "trc10", assetReference: "1002897" },
+        value: 10000000n,
+      },
+      {
+        asset: { type: "trc10", assetReference: "1002775" },
+        value: 5000000n,
+      },
+      {
+        asset: { type: "trc10", assetReference: "1002830" },
+        value: 10000000n,
+      },
+      {
+        asset: { type: "trc10", assetReference: "1002962" },
+        value: 10000000n,
+      },
+      {
+        asset: { type: "trc10", assetReference: "1002876" },
+        value: 10000000n,
+      },
+      {
+        asset: { type: "trc10", assetReference: "1002398" },
+        value: 5000000n,
+      },
+      {
+        asset: { type: "trc10", assetReference: "1002573" },
+        value: 5000000n,
+      },
+      {
+        asset: { type: "trc10", assetReference: "1002881" },
+        value: 10000000n,
+      },
+      {
+        asset: { type: "trc10", assetReference: "1002927" },
+        value: 10000000n,
+      },
+      {
+        asset: { type: "trc10", assetReference: "1002736" },
+        value: 5000000n,
+      },
+      {
+        asset: { type: "trc10", assetReference: "1002814" },
+        value: 10000000n,
+      },
+      {
+        asset: { type: "trc10", assetReference: "1002858" },
+        value: 10000000n,
+      },
+      {
+        asset: { type: "trc10", assetReference: "1002000" },
+        value: 26888000n,
+      },
+      {
+        asset: { type: "trc10", assetReference: "1004031" },
+        value: 9856699n,
+      },
       {
         asset: {
-          contractAddress: "TLa2f6VPqDgRE67v1736s7bJ8Ray5wYjU7",
-          standard: "trc20",
-          type: "token",
+          type: "trc20",
+          assetReference: "TLa2f6VPqDgRE67v1736s7bJ8Ray5wYjU7",
         },
         value: 46825830n,
       },
       {
         asset: {
-          contractAddress: "TR7NHqjeKQxGTCi8q8ZY4pL8otSzgjLj6t",
-          standard: "trc20",
-          type: "token",
+          type: "trc20",
+          assetReference: "TR7NHqjeKQxGTCi8q8ZY4pL8otSzgjLj6t",
         },
         value: 376n,
       },

package/src/logic/getBalance.ts

@@ -1,14 +1,13 @@
 import BigNumber from "bignumber.js";
 import type { AccountTronAPI } from "../network/types";
 import { getTronResources } from "./utils";
-import { Asset, Balance } from "@ledgerhq/coin-framework/api/index";
+import { Balance } from "@ledgerhq/coin-framework/api/index";
 import { fetchTronAccount } from "../network";
-import { Trc10Token, Trc20Token, TronAsset } from "../types";
 
 const bigIntOrZero = (val: number | BigNumber | undefined | null): bigint =>
   BigInt(val?.toString() ?? 0);
 
-export async function getBalance(address: string): Promise<Balance<TronAsset>[]> {
+export async function getBalance(address: string): Promise<Balance[]> {
   const accounts = await fetchTronAccount(address);
 
   // if account is not activated, an empty array is returned
@@ -16,43 +15,41 @@ export async function getBalance(address: string): Promise<Balance<TronAsset>[]>
 
   const account = accounts[0];
 
-  const nativeBalance: Balance<TronAsset> = computeBalance(account);
-  const trc10Balance: Balance<TronAsset>[] = extractTrc10Balance(account);
-  const trc20Balance: Balance<TronAsset>[] = extractTrc20Balance(account);
+  const nativeBalance: Balance = computeBalance(account);
+  const trc10Balance: Balance[] = extractTrc10Balance(account);
+  const trc20Balance: Balance[] = extractTrc20Balance(account);
 
   return [nativeBalance].concat(trc10Balance).concat(trc20Balance);
 }
 
-function extractTrc10Balance(account: AccountTronAPI): Balance<Asset<Trc10Token>>[] {
+function extractTrc10Balance(account: AccountTronAPI): Balance[] {
   return (
     account.assetV2?.map(trc => {
       return {
         value: BigInt(trc.value),
         asset: {
-          type: "token",
-          standard: "trc10",
-          tokenId: trc.key,
+          type: "trc10",
+          assetReference: trc.key,
         },
       };
     }) ?? []
   );
 }
 
-function extractTrc20Balance(account: AccountTronAPI): Balance<Asset<Trc20Token>>[] {
+function extractTrc20Balance(account: AccountTronAPI): Balance[] {
   return account.trc20.map(trc => {
     const [[contractAddress, balance]] = Object.entries(trc);
     return {
       value: BigInt(balance),
       asset: {
-        type: "token",
-        standard: "trc20",
-        contractAddress,
+        type: "trc20",
+        assetReference: contractAddress,
       },
     };
   });
 }
 
-export function computeBalance(account: AccountTronAPI): Balance<Asset> {
+export function computeBalance(account: AccountTronAPI): Balance {
   const tronResources = getTronResources(account);
 
   let balance = bigIntOrZero(account.balance ?? 0);