@ledgerhq/coin-filecoin 1.14.1-nightly.20251113102200 → 1.15.0-nightly.20251115023630

package/.unimportedrc.json

@@ -5,6 +5,7 @@
     "proxy-from-env"
   ],
   "ignoreUnused": [
+    "@ledgerhq/cryptoassets",
     "@ledgerhq/devices",
     "expect"
   ],
@@ -15,6 +16,7 @@
     "src/test/bot-specs.ts",
     "src/test/bridgeDatasetTest.ts",
     "src/test/cli.ts",
+    "src/test/fixtures.ts",
     "src/test/index.ts",
     "src/test/speculos-deviceActions.ts"
   ]

package/CHANGELOG.md

@@ -1,15 +1,19 @@
 # @ledgerhq/coin-filecoin
 
-## 1.14.1-nightly.20251113102200
+## 1.15.0-nightly.20251115023630
+
+### Minor Changes
+
+- [#12304](https://github.com/LedgerHQ/ledger-live/pull/12304) [`bb5420d`](https://github.com/LedgerHQ/ledger-live/commit/bb5420df34ae3020f3c9e6270e85dda230922612) Thanks [@scavassa-yld](https://github.com/scavassa-yld)! - Add incremental sync and network api upgrade
 
 ### Patch Changes
 
-- Updated dependencies [[`74a340b`](https://github.com/LedgerHQ/ledger-live/commit/74a340b258589c9c37476103029eb036b930616c), [`a6bc24e`](https://github.com/LedgerHQ/ledger-live/commit/a6bc24ee988b98bf82f807ac5ce731ba79813901), [`b69c97d`](https://github.com/LedgerHQ/ledger-live/commit/b69c97d979ba97154c9abfda6abfc2a36becee4f), [`544721d`](https://github.com/LedgerHQ/ledger-live/commit/544721d198454526ef83516619d59c881ba34eb9), [`1c6f5f5`](https://github.com/LedgerHQ/ledger-live/commit/1c6f5f5843349b1955f7ca466f98cbe4ffcdaddf), [`d5d838a`](https://github.com/LedgerHQ/ledger-live/commit/d5d838a23e00edd53293843781c559c41db4e854), [`9f61dcf`](https://github.com/LedgerHQ/ledger-live/commit/9f61dcf6163fd66657e5be732c28bea623a40515), [`938b970`](https://github.com/LedgerHQ/ledger-live/commit/938b970e15118dc706c759a3bec27dc01c3dd268), [`c40e9da`](https://github.com/LedgerHQ/ledger-live/commit/c40e9da68452fe9827b9435ff2d162291186be73), [`c0b5b9f`](https://github.com/LedgerHQ/ledger-live/commit/c0b5b9f4cdcb2ea3e15419cbf3d1a14f725c3e6a), [`70049be`](https://github.com/LedgerHQ/ledger-live/commit/70049bed0cd0a8c7a9e4947a63af82061dad46c0), [`5b41dd5`](https://github.com/LedgerHQ/ledger-live/commit/5b41dd56e024a5d03ba0e49084113c04887395db), [`eb5a17e`](https://github.com/LedgerHQ/ledger-live/commit/eb5a17e4db336eaa871eaeb52ffa5248e0f78bec), [`9659a34`](https://github.com/LedgerHQ/ledger-live/commit/9659a34d9998d5c4dff8618bf6cef7d16403680d), [`c70f6a8`](https://github.com/LedgerHQ/ledger-live/commit/c70f6a8370056b6fd8f236205471359d6f9b846f)]:
-  - @ledgerhq/types-live@6.89.0-nightly.20251113102200
-  - @ledgerhq/cryptoassets@13.33.0-nightly.20251113102200
-  - @ledgerhq/coin-framework@6.9.0-nightly.20251113102200
-  - @ledgerhq/live-env@2.21.0-nightly.20251113102200
-  - @ledgerhq/live-network@2.1.1-nightly.20251113102200
+- Updated dependencies [[`74a340b`](https://github.com/LedgerHQ/ledger-live/commit/74a340b258589c9c37476103029eb036b930616c), [`a6bc24e`](https://github.com/LedgerHQ/ledger-live/commit/a6bc24ee988b98bf82f807ac5ce731ba79813901), [`b69c97d`](https://github.com/LedgerHQ/ledger-live/commit/b69c97d979ba97154c9abfda6abfc2a36becee4f), [`544721d`](https://github.com/LedgerHQ/ledger-live/commit/544721d198454526ef83516619d59c881ba34eb9), [`fe81926`](https://github.com/LedgerHQ/ledger-live/commit/fe81926afeb2df8e917e6bd1e4cbab13f09647fd), [`1c6f5f5`](https://github.com/LedgerHQ/ledger-live/commit/1c6f5f5843349b1955f7ca466f98cbe4ffcdaddf), [`d5d838a`](https://github.com/LedgerHQ/ledger-live/commit/d5d838a23e00edd53293843781c559c41db4e854), [`9f61dcf`](https://github.com/LedgerHQ/ledger-live/commit/9f61dcf6163fd66657e5be732c28bea623a40515), [`903ea9c`](https://github.com/LedgerHQ/ledger-live/commit/903ea9cdacf704a0119de2803a4f409b775391a5), [`938b970`](https://github.com/LedgerHQ/ledger-live/commit/938b970e15118dc706c759a3bec27dc01c3dd268), [`c40e9da`](https://github.com/LedgerHQ/ledger-live/commit/c40e9da68452fe9827b9435ff2d162291186be73), [`02ef98f`](https://github.com/LedgerHQ/ledger-live/commit/02ef98faeb13c182ef255e06a43c39abeb55ecc7), [`c0b5b9f`](https://github.com/LedgerHQ/ledger-live/commit/c0b5b9f4cdcb2ea3e15419cbf3d1a14f725c3e6a), [`70049be`](https://github.com/LedgerHQ/ledger-live/commit/70049bed0cd0a8c7a9e4947a63af82061dad46c0), [`0d33751`](https://github.com/LedgerHQ/ledger-live/commit/0d33751bb2ae599d0d26ce6a8efdbe01757f12fb), [`5b41dd5`](https://github.com/LedgerHQ/ledger-live/commit/5b41dd56e024a5d03ba0e49084113c04887395db), [`eb5a17e`](https://github.com/LedgerHQ/ledger-live/commit/eb5a17e4db336eaa871eaeb52ffa5248e0f78bec), [`9659a34`](https://github.com/LedgerHQ/ledger-live/commit/9659a34d9998d5c4dff8618bf6cef7d16403680d), [`c70f6a8`](https://github.com/LedgerHQ/ledger-live/commit/c70f6a8370056b6fd8f236205471359d6f9b846f)]:
+  - @ledgerhq/types-live@6.89.0-nightly.20251115023630
+  - @ledgerhq/cryptoassets@13.33.0-nightly.20251115023630
+  - @ledgerhq/coin-framework@6.9.0-nightly.20251115023630
+  - @ledgerhq/live-env@2.21.0-nightly.20251115023630
+  - @ledgerhq/live-network@2.1.1-nightly.20251115023630
 
 ## 1.14.0
 

package/lib/api/api.d.ts

@@ -1,9 +1,11 @@
-import { BalanceResponse, BroadcastTransactionRequest, BroadcastTransactionResponse, EstimatedFeesRequest, EstimatedFeesResponse, NetworkStatusResponse, TransactionResponse, ERC20Transfer } from "../types";
+import { BalanceResponse, BroadcastTransactionRequest, BroadcastTransactionResponse, EstimatedFeesRequest, EstimatedFeesResponse, NetworkStatusResponse, TransactionResponse, TransactionsResponse, FetchERC20TransactionsResponse, ERC20Transfer } from "../types";
 export declare const fetchBalances: (addr: string) => Promise<BalanceResponse>;
 export declare const fetchEstimatedFees: import("@ledgerhq/live-network/cache").CacheRes<[request: EstimatedFeesRequest], EstimatedFeesResponse>;
 export declare const fetchBlockHeight: () => Promise<NetworkStatusResponse>;
-export declare const fetchTxs: (addr: string) => Promise<TransactionResponse[]>;
+export declare const fetchTxs: (addr: string, lastHeight: number, offset?: number, limit?: number) => Promise<TransactionsResponse>;
+export declare const fetchTxsWithPages: (addr: string, lastHeight: number) => Promise<TransactionResponse[]>;
 export declare const broadcastTx: (message: BroadcastTransactionRequest) => Promise<BroadcastTransactionResponse>;
 export declare const fetchERC20TokenBalance: (ethAddr: string, contractAddr: string) => Promise<string>;
-export declare const fetchERC20Transactions: (ethAddr: string) => Promise<ERC20Transfer[]>;
+export declare const fetchERC20Transactions: (ethAddr: string, lastHeight: number, offset?: number, limit?: number) => Promise<FetchERC20TransactionsResponse>;
+export declare const fetchERC20TransactionsWithPages: (addr: string, lastHeight: number) => Promise<ERC20Transfer[]>;
 //# sourceMappingURL=api.d.ts.map

package/lib/api/api.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"api.d.ts","sourceRoot":"","sources":["../../src/api/api.ts"],"names":[],"mappings":"AAOA,OAAO,EACL,eAAe,EACf,2BAA2B,EAC3B,4BAA4B,EAC5B,oBAAoB,EACpB,qBAAqB,EACrB,qBAAqB,EACrB,mBAAmB,EAGnB,aAAa,EAEd,MAAM,UAAU,CAAC;AA+ClB,eAAO,MAAM,aAAa,SAAgB,MAAM,KAAG,QAAQ,eAAe,CAGzE,CAAC;AAEF,eAAO,MAAM,kBAAkB,yGAc9B,CAAC;AAEF,eAAO,MAAM,gBAAgB,QAAa,QAAQ,qBAAqB,CAGtE,CAAC;AAEF,eAAO,MAAM,QAAQ,SAAgB,MAAM,KAAG,QAAQ,mBAAmB,EAAE,CAG1E,CAAC;AAEF,eAAO,MAAM,WAAW,YACb,2BAA2B,KACnC,QAAQ,4BAA4B,CAGtC,CAAC;AAEF,eAAO,MAAM,sBAAsB,YACxB,MAAM,gBACD,MAAM,KACnB,QAAQ,MAAM,CAUhB,CAAC;AAEF,eAAO,MAAM,sBAAsB,YAAmB,MAAM,KAAG,QAAQ,aAAa,EAAE,CAKrF,CAAC"}
+{"version":3,"file":"api.d.ts","sourceRoot":"","sources":["../../src/api/api.ts"],"names":[],"mappings":"AAMA,OAAO,EACL,eAAe,EACf,2BAA2B,EAC3B,4BAA4B,EAC5B,oBAAoB,EACpB,qBAAqB,EACrB,qBAAqB,EACrB,mBAAmB,EACnB,oBAAoB,EACpB,8BAA8B,EAC9B,aAAa,EAEd,MAAM,UAAU,CAAC;AA4DlB,eAAO,MAAM,aAAa,SAAgB,MAAM,KAAG,QAAQ,eAAe,CAKzE,CAAC;AAEF,eAAO,MAAM,kBAAkB,yGAiB9B,CAAC;AAEF,eAAO,MAAM,gBAAgB,QAAa,QAAQ,qBAAqB,CAKtE,CAAC;AAEF,eAAO,MAAM,QAAQ,SACb,MAAM,cACA,MAAM,WACV,MAAM,UACP,MAAM,KACZ,QAAQ,oBAAoB,CAQ9B,CAAC;AAEF,eAAO,MAAM,iBAAiB,SACtB,MAAM,cACA,MAAM,KACjB,QAAQ,mBAAmB,EAAE,CAc/B,CAAC;AAEF,eAAO,MAAM,WAAW,YACb,2BAA2B,KACnC,QAAQ,4BAA4B,CAMtC,CAAC;AAEF,eAAO,MAAM,sBAAsB,YACxB,MAAM,gBACD,MAAM,KACnB,QAAQ,MAAM,CAahB,CAAC;AAEF,eAAO,MAAM,sBAAsB,YACxB,MAAM,cACH,MAAM,WACV,MAAM,UACP,MAAM,KACZ,QAAQ,8BAA8B,CAQxC,CAAC;AAEF,eAAO,MAAM,+BAA+B,SACpC,MAAM,cACA,MAAM,KACjB,QAAQ,aAAa,EAAE,CAczB,CAAC"}

package/lib/api/api.js

@@ -3,53 +3,61 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.fetchERC20Transactions = exports.fetchERC20TokenBalance = exports.broadcastTx = exports.fetchTxs = exports.fetchBlockHeight = exports.fetchEstimatedFees = exports.fetchBalances = void 0;
+exports.fetchERC20TransactionsWithPages = exports.fetchERC20Transactions = exports.fetchERC20TokenBalance = exports.broadcastTx = exports.fetchTxsWithPages = exports.fetchTxs = exports.fetchBlockHeight = exports.fetchEstimatedFees = exports.fetchBalances = void 0;
 const logs_1 = require("@ledgerhq/logs");
-const network_1 = __importDefault(require("@ledgerhq/live-network/network"));
+const live_network_1 = __importDefault(require("@ledgerhq/live-network"));
 const cache_1 = require("@ledgerhq/live-network/cache");
 const live_env_1 = require("@ledgerhq/live-env");
 const errors_1 = require("../errors");
-const getFilecoinURL = (path) => {
+const txsPerPageLimit = 1000;
+const currentVersion = "/v2";
+const fromHeightQueryParam = "from_height";
+const getFilecoinURL = (version = currentVersion, path) => {
     const baseUrl = (0, live_env_1.getEnv)("API_FILECOIN_ENDPOINT");
     if (!baseUrl)
         throw new Error("API base URL not available");
-    return `${baseUrl}${path ? path : ""}`;
+    return `${baseUrl}${version ? version : ""}${path ? path : ""}`;
 };
-const fetch = async (path) => {
-    const url = getFilecoinURL(path);
+const fetch = async (path, { version }) => {
+    const url = getFilecoinURL(version, path);
     // We force data to this way as network func is not using the correct param type. Changing that func will generate errors in other implementations
     const opts = {
         method: "GET",
         url,
     };
-    const rawResponse = await (0, network_1.default)(opts);
+    const rawResponse = await (0, live_network_1.default)(opts);
     // We force data to this way as network func is not using the correct param type. Changing that func will generate errors in other implementations
     const { data } = rawResponse;
     (0, logs_1.log)("http", url);
     return data;
 };
-const send = async (path, data) => {
-    const url = getFilecoinURL(path);
+const send = async (path, { version, data }) => {
+    const url = getFilecoinURL(version, path);
     const opts = {
         method: "POST",
         url,
         data: JSON.stringify(data),
         headers: { "Content-Type": "application/json" },
     };
-    const rawResponse = await (0, network_1.default)(opts);
+    const rawResponse = await (0, live_network_1.default)(opts);
     // We force data to this way as network func is not using generics. Changing that func will generate errors in other implementations
     const { data: responseData } = rawResponse;
     (0, logs_1.log)("http", url);
     return responseData;
 };
 const fetchBalances = async (addr) => {
-    const data = await fetch(`/addresses/${addr}/balance`);
+    const data = await fetch(`/addresses/${addr}/balance`, {
+        version: currentVersion,
+    });
     return data; // TODO Validate if the response fits this interface
 };
 exports.fetchBalances = fetchBalances;
 exports.fetchEstimatedFees = (0, cache_1.makeLRUCache)(async (request) => {
     try {
-        const data = await send(`/fees/estimate`, request);
+        const data = await send(`/fees/estimate`, {
+            version: currentVersion,
+            data: request,
+        });
         return data; // TODO Validate if the response fits this interface
     }
     catch (e) {
@@ -60,31 +68,68 @@ exports.fetchEstimatedFees = (0, cache_1.makeLRUCache)(async (request) => {
     ttl: 5 * 1000, // 5 seconds
 });
 const fetchBlockHeight = async () => {
-    const data = await fetch("/network/status");
+    const data = await fetch("/network/status", {
+        version: currentVersion,
+    });
     return data; // TODO Validate if the response fits this interface
 };
 exports.fetchBlockHeight = fetchBlockHeight;
-const fetchTxs = async (addr) => {
-    const response = await fetch(`/addresses/${addr}/transactions`);
-    return response.txs; // TODO Validate if the response fits this interface
+const fetchTxs = async (addr, lastHeight, offset = 0, limit = 0) => {
+    const response = await fetch(`/addresses/${addr}/transactions?${fromHeightQueryParam}=${lastHeight}&offset=${offset}&limit=${limit}`, {
+        version: currentVersion,
+    });
+    return response; // TODO Validate if the response fits this interface
 };
 exports.fetchTxs = fetchTxs;
+const fetchTxsWithPages = async (addr, lastHeight) => {
+    let result = [];
+    let offset = 0;
+    let txsLen = txsPerPageLimit;
+    while (txsLen === txsPerPageLimit) {
+        const { txs } = await (0, exports.fetchTxs)(addr, lastHeight, offset, txsPerPageLimit);
+        result = result.concat(txs);
+        txsLen = txs.length;
+        offset += txsLen;
+    }
+    return result;
+};
+exports.fetchTxsWithPages = fetchTxsWithPages;
 const broadcastTx = async (message) => {
-    const response = await send(`/transaction/broadcast`, message);
+    const response = await send(`/transaction/broadcast`, {
+        version: currentVersion,
+        data: message,
+    });
     return response; // TODO Validate if the response fits this interface
 };
 exports.broadcastTx = broadcastTx;
 const fetchERC20TokenBalance = async (ethAddr, contractAddr) => {
-    const res = await fetch(`/contract/${contractAddr}/address/${ethAddr}/balance/erc20`);
+    const res = await fetch(`/contract/${contractAddr}/address/${ethAddr}/balance/erc20`, {
+        version: currentVersion,
+    });
     if (res.data.length) {
         return res.data[0].balance;
     }
     return "0";
 };
 exports.fetchERC20TokenBalance = fetchERC20TokenBalance;
-const fetchERC20Transactions = async (ethAddr) => {
-    const res = await fetch(`/addresses/${ethAddr}/transactions/erc20`);
-    return res.txs.sort((a, b) => b.timestamp - a.timestamp);
+const fetchERC20Transactions = async (ethAddr, lastHeight, offset = 0, limit = 0) => {
+    const res = await fetch(`/addresses/${ethAddr}/transactions/erc20?${fromHeightQueryParam}=${lastHeight}&offset=${offset}&limit=${limit}`, {
+        version: currentVersion,
+    });
+    return res;
 };
 exports.fetchERC20Transactions = fetchERC20Transactions;
+const fetchERC20TransactionsWithPages = async (addr, lastHeight) => {
+    let result = [];
+    let offset = 0;
+    let txsLen = txsPerPageLimit;
+    while (txsLen === txsPerPageLimit) {
+        const { txs } = await (0, exports.fetchERC20Transactions)(addr, lastHeight, offset, txsPerPageLimit);
+        result = result.concat(txs);
+        txsLen = txs.length;
+        offset += txsLen;
+    }
+    return result.sort((a, b) => b.timestamp - a.timestamp);
+};
+exports.fetchERC20TransactionsWithPages = fetchERC20TransactionsWithPages;
 //# sourceMappingURL=api.js.map

package/lib/api/api.js.map

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

package/lib/common-logic/index.d.ts

@@ -1,2 +1,2 @@
-export { getUnit, processTxs, mapTxToOps, getAddress, getTxToBroadcast, getAccountShape, getSubAccount, valueFromUnit, } from "./utils";
+export { mapTxToOps, getAddress, getTxToBroadcast, getAccountShape, getSubAccount, valueFromUnit, } from "./utils";
 //# sourceMappingURL=index.d.ts.map

package/lib/common-logic/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/common-logic/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,OAAO,EACP,UAAU,EACV,UAAU,EACV,UAAU,EACV,gBAAgB,EAChB,eAAe,EACf,aAAa,EACb,aAAa,GACd,MAAM,SAAS,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/common-logic/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EACV,UAAU,EACV,gBAAgB,EAChB,eAAe,EACf,aAAa,EACb,aAAa,GACd,MAAM,SAAS,CAAC"}

package/lib/common-logic/index.js

@@ -1,9 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.valueFromUnit = exports.getSubAccount = exports.getAccountShape = exports.getTxToBroadcast = exports.getAddress = exports.mapTxToOps = exports.processTxs = exports.getUnit = void 0;
+exports.valueFromUnit = exports.getSubAccount = exports.getAccountShape = exports.getTxToBroadcast = exports.getAddress = exports.mapTxToOps = void 0;
 var utils_1 = require("./utils");
-Object.defineProperty(exports, "getUnit", { enumerable: true, get: function () { return utils_1.getUnit; } });
-Object.defineProperty(exports, "processTxs", { enumerable: true, get: function () { return utils_1.processTxs; } });
 Object.defineProperty(exports, "mapTxToOps", { enumerable: true, get: function () { return utils_1.mapTxToOps; } });
 Object.defineProperty(exports, "getAddress", { enumerable: true, get: function () { return utils_1.getAddress; } });
 Object.defineProperty(exports, "getTxToBroadcast", { enumerable: true, get: function () { return utils_1.getTxToBroadcast; } });

package/lib/common-logic/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/common-logic/index.ts"],"names":[],"mappings":";;;AAAA,iCASiB;AARf,gGAAA,OAAO,OAAA;AACP,mGAAA,UAAU,OAAA;AACV,mGAAA,UAAU,OAAA;AACV,mGAAA,UAAU,OAAA;AACV,yGAAA,gBAAgB,OAAA;AAChB,wGAAA,eAAe,OAAA;AACf,sGAAA,aAAa,OAAA;AACb,sGAAA,aAAa,OAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/common-logic/index.ts"],"names":[],"mappings":";;;AAAA,iCAOiB;AANf,mGAAA,UAAU,OAAA;AACV,mGAAA,UAAU,OAAA;AACV,yGAAA,gBAAgB,OAAA;AAChB,wGAAA,eAAe,OAAA;AACf,sGAAA,aAAa,OAAA;AACb,sGAAA,aAAa,OAAA"}

package/lib/common-logic/utils.d.ts

@@ -3,8 +3,6 @@ import type { Unit } from "@ledgerhq/types-cryptoassets";
 import { BigNumber } from "bignumber.js";
 import { BroadcastTransactionRequest, TransactionResponse, Transaction } from "../types";
 import { GetAccountShape, AccountShapeInfo } from "@ledgerhq/coin-framework/bridge/jsHelpers";
-export declare const getUnit: () => Unit;
-export declare const processTxs: (txs: TransactionResponse[]) => TransactionResponse[];
 export declare const mapTxToOps: (accountId: string, { address }: AccountShapeInfo) => (tx: TransactionResponse) => Operation[];
 export declare const getAddress: (a: Account) => {
     address: string;

package/lib/common-logic/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/common-logic/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,8BAA8B,CAAC;AAIzD,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,2BAA2B,EAAE,mBAAmB,EAAY,WAAW,EAAE,MAAM,UAAU,CAAC;AACnG,OAAO,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,2CAA2C,CAAC;AAmB9F,eAAO,MAAM,OAAO,YAAmD,CAAC;AAExE,eAAO,MAAM,UAAU,QAAS,mBAAmB,EAAE,KAAG,mBAAmB,EAyD1E,CAAC;AAEF,eAAO,MAAM,UAAU,cACT,MAAM,eAAe,gBAAgB,UAC5C,mBAAmB,KAAG,SAAS,EAkDnC,CAAC;AAEJ,eAAO,MAAM,UAAU,MAClB,OAAO,KACT;IACD,OAAO,EAAE,MAAM,CAAC;IAChB,cAAc,EAAE,MAAM,CAAC;CAC6C,CAAC;AAEvE,eAAO,MAAM,gBAAgB,cAChB,SAAS,aACT,MAAM,WACR,OAAO,MAAM,EAAE,GAAG,CAAC,KAC3B,2BAiCF,CAAC;AAEF,eAAO,MAAM,eAAe,EAAE,eA6B7B,CAAC;AAEF,eAAO,MAAM,aAAa,YAAa,OAAO,MAAM,WAAW,mEAO9D,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,aAAa,gBAAiB,SAAS,QAAQ,IAAI,cACN,CAAC"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/common-logic/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,8BAA8B,CAAC;AACzD,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,2BAA2B,EAAE,mBAAmB,EAAY,WAAW,EAAE,MAAM,UAAU,CAAC;AACnG,OAAO,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,2CAA2C,CAAC;AAO9F,eAAO,MAAM,UAAU,cACT,MAAM,eAAe,gBAAgB,UAC5C,mBAAmB,KAAG,SAAS,EAmDnC,CAAC;AAEJ,eAAO,MAAM,UAAU,MAClB,OAAO,KACT;IACD,OAAO,EAAE,MAAM,CAAC;IAChB,cAAc,EAAE,MAAM,CAAC;CAC6C,CAAC;AAEvE,eAAO,MAAM,gBAAgB,cAChB,SAAS,aACT,MAAM,WACR,OAAO,MAAM,EAAE,GAAG,CAAC,KAC3B,2BAiCF,CAAC;AAEF,eAAO,MAAM,eAAe,EAAE,eAiC7B,CAAC;AAEF,eAAO,MAAM,aAAa,YAAa,OAAO,MAAM,WAAW,mEAO9D,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,aAAa,gBAAiB,SAAS,QAAQ,IAAI,cACN,CAAC"}

package/lib/common-logic/utils.js

@@ -3,10 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.valueFromUnit = exports.getSubAccount = exports.getAccountShape = exports.getTxToBroadcast = exports.getAddress = exports.mapTxToOps = exports.processTxs = exports.getUnit = void 0;
-const logs_1 = require("@ledgerhq/logs");
-const currencies_1 = require("@ledgerhq/coin-framework/currencies");
-const cryptoassets_1 = require("@ledgerhq/cryptoassets");
+exports.valueFromUnit = exports.getSubAccount = exports.getAccountShape = exports.getTxToBroadcast = exports.getAddress = exports.mapTxToOps = void 0;
 const bignumber_js_1 = require("bignumber.js");
 const types_1 = require("../types");
 const api_1 = require("../api/api");
@@ -14,65 +11,12 @@ const account_1 = require("@ledgerhq/coin-framework/account");
 const operation_1 = require("@ledgerhq/coin-framework/operation");
 const flatMap_1 = __importDefault(require("lodash/flatMap"));
 const tokenAccounts_1 = require("../erc20/tokenAccounts");
-const getUnit = () => (0, cryptoassets_1.getCryptoCurrencyById)("filecoin").units[0];
-exports.getUnit = getUnit;
-const processTxs = (txs) => {
-    // Group all tx types related to same tx cid into the same object
-    const txsByTxCid = txs.reduce((txsByTxCidResult, currentTx) => {
-        const { hash: txCid, type: txType } = currentTx;
-        const txByType = txsByTxCidResult[txCid] || {};
-        switch (txType) {
-            case "Send":
-                txByType.Send = currentTx;
-                break;
-            case "InvokeContract":
-                txByType.InvokeContract = currentTx;
-                break;
-            case "Fee":
-                txByType.Fee = currentTx;
-                break;
-            default:
-                (0, logs_1.log)("warn", `tx type [${txType}] on tx cid [${txCid}] was not recognized.`);
-                break;
-        }
-        txsByTxCidResult[txCid] = txByType;
-        return txsByTxCidResult;
-    }, {});
-    // Once all tx types have been grouped, we want to find
-    const processedTxs = [];
-    for (const txCid in txsByTxCid) {
-        const item = txsByTxCid[txCid];
-        const feeTx = item.Fee;
-        let mainTx;
-        if ("Send" in item) {
-            mainTx = item.Send;
-        }
-        else if ("InvokeContract" in item) {
-            mainTx = item.InvokeContract;
-        }
-        else {
-            (0, logs_1.log)("warn", `unexpected tx type, tx with cid [${txCid}] and payload [${JSON.stringify(item)}]`);
-        }
-        if (!mainTx) {
-            if (feeTx) {
-                (0, logs_1.log)("warn", `feeTx [${feeTx.hash}] found without a mainTx linked to it.`);
-            }
-            continue;
-        }
-        if (feeTx) {
-            mainTx.fee = feeTx.amount;
-        }
-        processedTxs.push(mainTx);
-    }
-    return processedTxs;
-};
-exports.processTxs = processTxs;
 const mapTxToOps = (accountId, { address }) => (tx) => {
-    const { to, from, hash, timestamp, amount, fee, status } = tx;
+    const { to, from, hash, timestamp, amount, fee_data, status } = tx;
     const ops = [];
     const date = new Date(timestamp * 1000);
-    const value = (0, currencies_1.parseCurrencyUnit)((0, exports.getUnit)(), amount.toString());
-    const feeToUse = (0, currencies_1.parseCurrencyUnit)((0, exports.getUnit)(), (fee || 0).toString());
+    const value = new bignumber_js_1.BigNumber(amount);
+    const feeToUse = new bignumber_js_1.BigNumber(fee_data?.TotalCost || 0);
     const isSending = address === from;
     const isReceiving = address === to;
     const hasFailed = status !== types_1.TxStatus.Ok;
@@ -140,7 +84,11 @@ const getTxToBroadcast = (operation, signature, rawData) => {
 };
 exports.getTxToBroadcast = getTxToBroadcast;
 const getAccountShape = async (info) => {
-    const { address, currency, derivationMode } = info;
+    const { address, currency, derivationMode, initialAccount } = info;
+    const blockSafeDelta = 1200;
+    let lastHeight = (initialAccount?.blockHeight ?? 0) - blockSafeDelta;
+    if (lastHeight < 0)
+        lastHeight = 0;
     const accountId = (0, account_1.encodeAccountId)({
         type: "js",
         version: "2",
@@ -148,18 +96,18 @@ const getAccountShape = async (info) => {
         xpubOrAddress: address,
         derivationMode,
     });
-    const blockHeight = await (0, api_1.fetchBlockHeight)();
-    const balance = await (0, api_1.fetchBalances)(address);
-    const rawTxs = await (0, api_1.fetchTxs)(address);
-    const tokenAccounts = await (0, tokenAccounts_1.buildTokenAccounts)(address, accountId, info.initialAccount);
-    const operations = (0, flatMap_1.default)((0, exports.processTxs)(rawTxs), (0, exports.mapTxToOps)(accountId, info)).sort((a, b) => b.date.getTime() - a.date.getTime());
+    const [blockHeight, balance, rawTxs, tokenAccounts] = await Promise.all([
+        (0, api_1.fetchBlockHeight)(),
+        (0, api_1.fetchBalances)(address),
+        (0, api_1.fetchTxsWithPages)(address, lastHeight),
+        (0, tokenAccounts_1.buildTokenAccounts)(address, lastHeight, accountId, info.initialAccount),
+    ]);
     const result = {
         id: accountId,
         subAccounts: tokenAccounts,
         balance: new bignumber_js_1.BigNumber(balance.total_balance),
         spendableBalance: new bignumber_js_1.BigNumber(balance.spendable_balance),
-        operations,
-        operationsCount: operations.length,
+        operations: (0, flatMap_1.default)(rawTxs, (0, exports.mapTxToOps)(accountId, info)).sort((a, b) => b.date.getTime() - a.date.getTime()),
         blockHeight: blockHeight.current_block_identifier.index,
     };
     return result;

package/lib/common-logic/utils.js.map

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

package/lib/erc20/tokenAccounts.d.ts

@@ -1,9 +1,8 @@
 import { Account, Operation, TokenAccount } from "@ledgerhq/types-live";
 import { ERC20Transfer } from "../types";
 import BigNumber from "bignumber.js";
-import { Unit } from "@ledgerhq/types-cryptoassets";
-export declare const erc20TxnToOperation: (tx: ERC20Transfer, address: string, accountId: string, unit: Unit) => Operation[];
-export declare function buildTokenAccounts(filAddr: string, parentAccountId: string, initialAccount?: Account): Promise<TokenAccount[]>;
+export declare const erc20TxnToOperation: (tx: ERC20Transfer, address: string, accountId: string) => Operation[];
+export declare function buildTokenAccounts(filAddr: string, lastHeight: number, parentAccountId: string, initialAccount?: Account): Promise<TokenAccount[]>;
 export declare const encodeTxnParams: (abiEncodedParams: string) => string;
 export declare const abiEncodeTransferParams: (recipient: string, amount: string) => string;
 export declare const generateTokenTxnParams: (recipient: string, amount: BigNumber) => string;

package/lib/erc20/tokenAccounts.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tokenAccounts.d.ts","sourceRoot":"","sources":["../../src/erc20/tokenAccounts.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAGxE,OAAO,EAAE,aAAa,EAAY,MAAM,UAAU,CAAC;AAInD,OAAO,SAAS,MAAM,cAAc,CAAC;AAMrC,OAAO,EAAE,IAAI,EAAE,MAAM,8BAA8B,CAAC;AAIpD,eAAO,MAAM,mBAAmB,OAC1B,aAAa,WACR,MAAM,aACJ,MAAM,QACX,IAAI,KACT,SAAS,EA0DX,CAAC;AAEF,wBAAsB,kBAAkB,CACtC,OAAO,EAAE,MAAM,EACf,eAAe,EAAE,MAAM,EACvB,cAAc,CAAC,EAAE,OAAO,GACvB,OAAO,CAAC,YAAY,EAAE,CAAC,CAiEzB;AAED,eAAO,MAAM,eAAe,qBAAsB,MAAM,WAUvD,CAAC;AAEF,eAAO,MAAM,uBAAuB,cAAe,MAAM,UAAU,MAAM,WAIxE,CAAC;AAEF,eAAO,MAAM,sBAAsB,cAAe,MAAM,UAAU,SAAS,WAU1E,CAAC"}
+{"version":3,"file":"tokenAccounts.d.ts","sourceRoot":"","sources":["../../src/erc20/tokenAccounts.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAGxE,OAAO,EAAE,aAAa,EAAY,MAAM,UAAU,CAAC;AAInD,OAAO,SAAS,MAAM,cAAc,CAAC;AASrC,eAAO,MAAM,mBAAmB,OAC1B,aAAa,WACR,MAAM,aACJ,MAAM,KAChB,SAAS,EA0DX,CAAC;AAEF,wBAAsB,kBAAkB,CACtC,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,EAClB,eAAe,EAAE,MAAM,EACvB,cAAc,CAAC,EAAE,OAAO,GACvB,OAAO,CAAC,YAAY,EAAE,CAAC,CA2FzB;AAED,eAAO,MAAM,eAAe,qBAAsB,MAAM,WAUvD,CAAC;AAEF,eAAO,MAAM,uBAAuB,cAAe,MAAM,UAAU,MAAM,WAIxE,CAAC;AAEF,eAAO,MAAM,sBAAsB,cAAe,MAAM,UAAU,SAAS,WAU1E,CAAC"}

package/lib/erc20/tokenAccounts.js

@@ -18,11 +18,11 @@ const ethers_1 = require("ethers");
 const ERC20_json_1 = __importDefault(require("./ERC20.json"));
 const errors_1 = require("@ledgerhq/errors");
 const utils_1 = require("../bridge/utils");
-const utils_2 = require("../common-logic/utils");
-const erc20TxnToOperation = (tx, address, accountId, unit) => {
+const jsHelpers_1 = require("@ledgerhq/coin-framework/bridge/jsHelpers");
+const erc20TxnToOperation = (tx, address, accountId) => {
     try {
         const { to, from, timestamp, tx_hash, tx_cid, amount, height, status } = tx;
-        const value = (0, utils_2.valueFromUnit)(new bignumber_js_1.default(amount), unit);
+        const txAmount = new bignumber_js_1.default(amount);
         const isSending = address.toLowerCase() === from.toLowerCase();
         const isReceiving = address.toLowerCase() === to.toLowerCase();
         const fee = new bignumber_js_1.default(0);
@@ -35,7 +35,7 @@ const erc20TxnToOperation = (tx, address, accountId, unit) => {
                 id: (0, operation_1.encodeOperationId)(accountId, hash, "OUT"),
                 hash,
                 type: "OUT",
-                value: value,
+                value: txAmount,
                 fee,
                 blockHeight: height,
                 blockHash: "",
@@ -52,7 +52,7 @@ const erc20TxnToOperation = (tx, address, accountId, unit) => {
                 id: (0, operation_1.encodeOperationId)(accountId, hash, "IN"),
                 hash,
                 type: "IN",
-                value,
+                value: txAmount,
                 fee,
                 blockHeight: height,
                 blockHash: "",
@@ -73,40 +73,48 @@ const erc20TxnToOperation = (tx, address, accountId, unit) => {
     }
 };
 exports.erc20TxnToOperation = erc20TxnToOperation;
-async function buildTokenAccounts(filAddr, parentAccountId, initialAccount) {
+async function buildTokenAccounts(filAddr, lastHeight, parentAccountId, initialAccount) {
     try {
-        const transfers = await (0, api_1.fetchERC20Transactions)(filAddr);
-        const transfersUntangled = transfers.reduce((prev, curr) => {
-            curr.contract_address = curr.contract_address.toLowerCase();
-            if (prev[curr.contract_address]) {
-                prev[curr.contract_address] = [...prev[curr.contract_address], curr];
-            }
-            else {
-                prev[curr.contract_address] = [curr];
+        const transfers = await (0, api_1.fetchERC20TransactionsWithPages)(filAddr, lastHeight);
+        if (!transfers.length) {
+            return initialAccount?.subAccounts ?? [];
+        }
+        // Group transfers by contract address (normalized to lowercase)
+        const transfersByContract = transfers.reduce((acc, transfer) => {
+            const contractAddr = transfer.contract_address.toLowerCase();
+            transfer.contract_address = contractAddr;
+            if (!acc[contractAddr]) {
+                acc[contractAddr] = [];
             }
-            return prev;
+            acc[contractAddr].push(transfer);
+            return acc;
         }, {});
-        const subs = [];
-        for (const [cAddr, txns] of Object.entries(transfersUntangled)) {
-            const token = await (0, index_2.getCryptoAssetsStore)().findTokenByAddressInCurrency(cAddr, "filecoin");
+        // Create lookup map for existing sub-accounts
+        const existingSubAccounts = new Map(initialAccount?.subAccounts?.map(sa => [sa.token.contractAddress.toLowerCase(), sa]) ?? []);
+        // Track which existing accounts we've processed
+        const processedContracts = new Set();
+        const tokenAccounts = [];
+        // Process accounts with new transfers
+        for (const [contractAddr, txns] of Object.entries(transfersByContract)) {
+            processedContracts.add(contractAddr);
+            const token = await (0, index_2.getCryptoAssetsStore)().findTokenByAddressInCurrency(contractAddr, "filecoin");
             if (!token) {
-                (0, logs_1.log)("error", `filecoin token not found, addr: ${cAddr}`);
+                (0, logs_1.log)("error", `filecoin token not found, addr: ${contractAddr}`);
                 continue;
             }
-            const balance = await (0, api_1.fetchERC20TokenBalance)(filAddr, cAddr);
-            const bnBalance = new bignumber_js_1.default(balance.toString());
+            const balance = await (0, api_1.fetchERC20TokenBalance)(filAddr, contractAddr);
+            const bnBalance = new bignumber_js_1.default(balance);
             const tokenAccountId = (0, index_1.encodeTokenAccountId)(parentAccountId, token);
             const operations = txns
-                .flatMap(txn => (0, exports.erc20TxnToOperation)(txn, filAddr, tokenAccountId, token.units[0]))
+                .flatMap(txn => (0, exports.erc20TxnToOperation)(txn, filAddr, tokenAccountId))
                 .flat()
                 .sort((a, b) => b.date.getTime() - a.date.getTime());
+            // Skip if no operations and zero balance
             if (operations.length === 0 && bnBalance.isZero()) {
                 continue;
             }
-            const maybeExistingSubAccount = initialAccount &&
-                initialAccount.subAccounts &&
-                initialAccount.subAccounts.find(a => a.id === tokenAccountId);
-            const sub = {
+            const existingAccount = existingSubAccounts.get(contractAddr);
+            const tokenAccount = {
                 type: utils_1.AccountType.TokenAccount,
                 id: tokenAccountId,
                 parentId: parentAccountId,
@@ -114,15 +122,21 @@ async function buildTokenAccounts(filAddr, parentAccountId, initialAccount) {
                 balance: bnBalance,
                 spendableBalance: bnBalance,
                 operationsCount: txns.length,
-                operations,
-                pendingOperations: maybeExistingSubAccount ? maybeExistingSubAccount.pendingOperations : [],
-                creationDate: operations.length > 0 ? operations[0].date : new Date(),
-                swapHistory: maybeExistingSubAccount ? maybeExistingSubAccount.swapHistory : [],
+                operations: (0, jsHelpers_1.mergeOps)(existingAccount?.operations ?? [], operations),
+                pendingOperations: existingAccount?.pendingOperations ?? [],
+                creationDate: operations[operations.length - 1]?.date ?? new Date(),
+                swapHistory: existingAccount?.swapHistory ?? [],
                 balanceHistoryCache: index_1.emptyHistoryCache, // calculated in the jsHelpers
             };
-            subs.push(sub);
+            tokenAccounts.push(tokenAccount);
+        }
+        // Add existing accounts that didn't have new transfers
+        for (const [contractAddr, existingAccount] of existingSubAccounts) {
+            if (!processedContracts.has(contractAddr)) {
+                tokenAccounts.push(existingAccount);
+            }
         }
-        return subs;
+        return tokenAccounts;
     }
     catch (e) {
         (0, logs_1.log)("error", "filecoin error building token accounts", e);