@metamask-previews/transaction-controller 39.1.0-preview-fd7ad7de → 39.1.0-preview-690da12e

package/dist/api/accounts-api.cjs

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getAccountTransactionsAllPages = exports.getAccountTransactions = void 0;
+exports.getAccountTransactions = void 0;
+const controller_utils_1 = require("@metamask/controller-utils");
 const utils_1 = require("@metamask/utils");
 const logger_1 = require("../logger.cjs");
 const BASE_URL = `https://accounts.api.cx.metamask.io/v1/accounts/`;
@@ -13,7 +14,7 @@ const log = (0, utils_1.createModuleLogger)(logger_1.projectLogger, 'accounts-ap
  * @returns The response object.
  */
 async function getAccountTransactions(request) {
-    const { address, chainIds, cursor, endTimestamp, startTimestamp } = request;
+    const { address, chainIds, cursor, endTimestamp, sortDirection, startTimestamp, } = request;
     let url = `${BASE_URL}${address}/transactions`;
     const params = [];
     if (chainIds) {
@@ -29,6 +30,9 @@ async function getAccountTransactions(request) {
     if (cursor) {
         params.push(`cursor=${cursor}`);
     }
+    if (sortDirection) {
+        params.push(`sortDirection=${sortDirection}`);
+    }
     if (params.length) {
         url += `?${params.join('&')}`;
     }
@@ -36,31 +40,10 @@ async function getAccountTransactions(request) {
     const headers = {
         [CLIENT_HEADER]: CLIENT_ID,
     };
-    const response = await fetch(url, { headers });
+    const response = await (0, controller_utils_1.successfulFetch)(url, { headers });
     const responseJson = await response.json();
     log('Retrieved account transactions', responseJson);
     return responseJson;
 }
 exports.getAccountTransactions = getAccountTransactions;
-/**
- * Fetch account transactions from the accounts API.
- * Automatically fetches all pages.
- * @param request - The request object.
- * @returns An array of transaction objects.
- */
-async function getAccountTransactionsAllPages(request) {
-    const transactions = [];
-    let cursor;
-    let hasNextPage = true;
-    log('Getting account transactions from all pages', request);
-    while (hasNextPage) {
-        const response = await getAccountTransactions({ ...request, cursor });
-        transactions.push(...response.data);
-        cursor = response.pageInfo.cursor;
-        hasNextPage = response.pageInfo.hasNextPage;
-    }
-    log('Retrieved account transactions from all pages', transactions);
-    return transactions;
-}
-exports.getAccountTransactionsAllPages = getAccountTransactionsAllPages;
 //# sourceMappingURL=accounts-api.cjs.map

package/dist/api/accounts-api.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"accounts-api.cjs","sourceRoot":"","sources":["../../src/api/accounts-api.ts"],"names":[],"mappings":";;;AAAA,2CAA+D;AAE/D,0CAA0C;AA8C1C,MAAM,QAAQ,GAAG,kDAAkD,CAAC;AACpE,MAAM,aAAa,GAAG,0BAA0B,CAAC;AACjD,MAAM,SAAS,GAAG,gCAAgC,CAAC;AAEnD,MAAM,GAAG,GAAG,IAAA,0BAAkB,EAAC,sBAAa,EAAE,cAAc,CAAC,CAAC;AAE9D;;;;GAIG;AACI,KAAK,UAAU,sBAAsB,CAC1C,OAAsC;IAEtC,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,YAAY,EAAE,cAAc,EAAE,GAAG,OAAO,CAAC;IAE5E,IAAI,GAAG,GAAG,GAAG,QAAQ,GAAG,OAAO,eAAe,CAAC;IAC/C,MAAM,MAAM,GAAG,EAAE,CAAC;IAElB,IAAI,QAAQ,EAAE;QACZ,MAAM,OAAO,GAAG,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACnC,MAAM,CAAC,IAAI,CAAC,YAAY,OAAO,EAAE,CAAC,CAAC;KACpC;IAED,IAAI,cAAc,EAAE;QAClB,MAAM,CAAC,IAAI,CAAC,kBAAkB,cAAc,EAAE,CAAC,CAAC;KACjD;IAED,IAAI,YAAY,EAAE;QAChB,MAAM,CAAC,IAAI,CAAC,gBAAgB,YAAY,EAAE,CAAC,CAAC;KAC7C;IAED,IAAI,MAAM,EAAE;QACV,MAAM,CAAC,IAAI,CAAC,UAAU,MAAM,EAAE,CAAC,CAAC;KACjC;IAED,IAAI,MAAM,CAAC,MAAM,EAAE;QACjB,GAAG,IAAI,IAAI,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;KAC/B;IAED,GAAG,CAAC,8BAA8B,EAAE,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,CAAC;IAEtD,MAAM,OAAO,GAAG;QACd,CAAC,aAAa,CAAC,EAAE,SAAS;KAC3B,CAAC;IAEF,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,GAAG,EAAE,EAAE,OAAO,EAAE,CAAC,CAAC;IAC/C,MAAM,YAAY,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;IAE3C,GAAG,CAAC,gCAAgC,EAAE,YAAY,CAAC,CAAC;IAEpD,OAAO,YAAY,CAAC;AACtB,CAAC;AAzCD,wDAyCC;AAED;;;;;GAKG;AACI,KAAK,UAAU,8BAA8B,CAClD,OAAsC;IAEtC,MAAM,YAAY,GAAG,EAAE,CAAC;IAExB,IAAI,MAAM,CAAC;IACX,IAAI,WAAW,GAAG,IAAI,CAAC;IAEvB,GAAG,CAAC,6CAA6C,EAAE,OAAO,CAAC,CAAC;IAE5D,OAAO,WAAW,EAAE;QAClB,MAAM,QAAQ,GAAG,MAAM,sBAAsB,CAAC,EAAE,GAAG,OAAO,EAAE,MAAM,EAAE,CAAC,CAAC;QACtE,YAAY,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC;QAEpC,MAAM,GAAG,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC;QAClC,WAAW,GAAG,QAAQ,CAAC,QAAQ,CAAC,WAAW,CAAC;KAC7C;IAED,GAAG,CAAC,+CAA+C,EAAE,YAAY,CAAC,CAAC;IAEnE,OAAO,YAAY,CAAC;AACtB,CAAC;AArBD,wEAqBC","sourcesContent":["import { createModuleLogger, type Hex } from '@metamask/utils';\n\nimport { projectLogger } from '../logger';\n\nexport type TransactionResponse = {\n  hash: Hex;\n  timestamp: string;\n  chainId: number;\n  blockNumber: number;\n  blockHash: Hex;\n  gas: number;\n  gasUsed: number;\n  gasPrice: string;\n  effectiveGasPrice: string;\n  nonce: number;\n  cumulativeGasUsed: number;\n  methodId: null;\n  value: string;\n  to: string;\n  from: string;\n  isError: boolean;\n  valueTransfers: {\n    contractAddress: string;\n    decimal: number;\n    symbol: string;\n    from: string;\n    to: string;\n    amount: string;\n  }[];\n};\n\nexport type GetAccountTransactionsRequest = {\n  address: Hex;\n  chainIds?: Hex[];\n  cursor?: string;\n  endTimestamp?: number;\n  startTimestamp?: number;\n};\n\nexport type GetAccountTransactionsResponse = {\n  data: TransactionResponse[];\n  pageInfo: {\n    count: number;\n    hasNextPage: boolean;\n    cursor?: string;\n  };\n};\n\nconst BASE_URL = `https://accounts.api.cx.metamask.io/v1/accounts/`;\nconst CLIENT_HEADER = 'x-metamask-clientproduct';\nconst CLIENT_ID = 'metamask-incoming-transactions';\n\nconst log = createModuleLogger(projectLogger, 'accounts-api');\n\n/**\n * Fetch account transactions from the accounts API.\n * @param request - The request object.\n * @returns The response object.\n */\nexport async function getAccountTransactions(\n  request: GetAccountTransactionsRequest,\n): Promise<GetAccountTransactionsResponse> {\n  const { address, chainIds, cursor, endTimestamp, startTimestamp } = request;\n\n  let url = `${BASE_URL}${address}/transactions`;\n  const params = [];\n\n  if (chainIds) {\n    const network = chainIds.join(',');\n    params.push(`networks=${network}`);\n  }\n\n  if (startTimestamp) {\n    params.push(`startTimestamp=${startTimestamp}`);\n  }\n\n  if (endTimestamp) {\n    params.push(`endTimestamp=${endTimestamp}`);\n  }\n\n  if (cursor) {\n    params.push(`cursor=${cursor}`);\n  }\n\n  if (params.length) {\n    url += `?${params.join('&')}`;\n  }\n\n  log('Getting account transactions', { request, url });\n\n  const headers = {\n    [CLIENT_HEADER]: CLIENT_ID,\n  };\n\n  const response = await fetch(url, { headers });\n  const responseJson = await response.json();\n\n  log('Retrieved account transactions', responseJson);\n\n  return responseJson;\n}\n\n/**\n * Fetch account transactions from the accounts API.\n * Automatically fetches all pages.\n * @param request - The request object.\n * @returns An array of transaction objects.\n */\nexport async function getAccountTransactionsAllPages(\n  request: GetAccountTransactionsRequest,\n): Promise<TransactionResponse[]> {\n  const transactions = [];\n\n  let cursor;\n  let hasNextPage = true;\n\n  log('Getting account transactions from all pages', request);\n\n  while (hasNextPage) {\n    const response = await getAccountTransactions({ ...request, cursor });\n    transactions.push(...response.data);\n\n    cursor = response.pageInfo.cursor;\n    hasNextPage = response.pageInfo.hasNextPage;\n  }\n\n  log('Retrieved account transactions from all pages', transactions);\n\n  return transactions;\n}\n"]}
+{"version":3,"file":"accounts-api.cjs","sourceRoot":"","sources":["../../src/api/accounts-api.ts"],"names":[],"mappings":";;;AAAA,iEAA6D;AAC7D,2CAA+D;AAE/D,0CAA0C;AA+C1C,MAAM,QAAQ,GAAG,kDAAkD,CAAC;AACpE,MAAM,aAAa,GAAG,0BAA0B,CAAC;AACjD,MAAM,SAAS,GAAG,gCAAgC,CAAC;AAEnD,MAAM,GAAG,GAAG,IAAA,0BAAkB,EAAC,sBAAa,EAAE,cAAc,CAAC,CAAC;AAE9D;;;;GAIG;AACI,KAAK,UAAU,sBAAsB,CAC1C,OAAsC;IAEtC,MAAM,EACJ,OAAO,EACP,QAAQ,EACR,MAAM,EACN,YAAY,EACZ,aAAa,EACb,cAAc,GACf,GAAG,OAAO,CAAC;IAEZ,IAAI,GAAG,GAAG,GAAG,QAAQ,GAAG,OAAO,eAAe,CAAC;IAC/C,MAAM,MAAM,GAAG,EAAE,CAAC;IAElB,IAAI,QAAQ,EAAE;QACZ,MAAM,OAAO,GAAG,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACnC,MAAM,CAAC,IAAI,CAAC,YAAY,OAAO,EAAE,CAAC,CAAC;KACpC;IAED,IAAI,cAAc,EAAE;QAClB,MAAM,CAAC,IAAI,CAAC,kBAAkB,cAAc,EAAE,CAAC,CAAC;KACjD;IAED,IAAI,YAAY,EAAE;QAChB,MAAM,CAAC,IAAI,CAAC,gBAAgB,YAAY,EAAE,CAAC,CAAC;KAC7C;IAED,IAAI,MAAM,EAAE;QACV,MAAM,CAAC,IAAI,CAAC,UAAU,MAAM,EAAE,CAAC,CAAC;KACjC;IAED,IAAI,aAAa,EAAE;QACjB,MAAM,CAAC,IAAI,CAAC,iBAAiB,aAAa,EAAE,CAAC,CAAC;KAC/C;IAED,IAAI,MAAM,CAAC,MAAM,EAAE;QACjB,GAAG,IAAI,IAAI,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;KAC/B;IAED,GAAG,CAAC,8BAA8B,EAAE,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,CAAC;IAEtD,MAAM,OAAO,GAAG;QACd,CAAC,aAAa,CAAC,EAAE,SAAS;KAC3B,CAAC;IAEF,MAAM,QAAQ,GAAG,MAAM,IAAA,kCAAe,EAAC,GAAG,EAAE,EAAE,OAAO,EAAE,CAAC,CAAC;IACzD,MAAM,YAAY,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;IAE3C,GAAG,CAAC,gCAAgC,EAAE,YAAY,CAAC,CAAC;IAEpD,OAAO,YAAY,CAAC;AACtB,CAAC;AApDD,wDAoDC","sourcesContent":["import { successfulFetch } from '@metamask/controller-utils';\nimport { createModuleLogger, type Hex } from '@metamask/utils';\n\nimport { projectLogger } from '../logger';\n\nexport type TransactionResponse = {\n  hash: Hex;\n  timestamp: string;\n  chainId: number;\n  blockNumber: number;\n  blockHash: Hex;\n  gas: number;\n  gasUsed: number;\n  gasPrice: string;\n  effectiveGasPrice: string;\n  nonce: number;\n  cumulativeGasUsed: number;\n  methodId: null;\n  value: string;\n  to: string;\n  from: string;\n  isError: boolean;\n  valueTransfers: {\n    contractAddress: string;\n    decimal: number;\n    symbol: string;\n    from: string;\n    to: string;\n    amount: string;\n  }[];\n};\n\nexport type GetAccountTransactionsRequest = {\n  address: Hex;\n  chainIds?: Hex[];\n  cursor?: string;\n  endTimestamp?: number;\n  sortDirection?: 'ASC' | 'DESC';\n  startTimestamp?: number;\n};\n\nexport type GetAccountTransactionsResponse = {\n  data: TransactionResponse[];\n  pageInfo: {\n    count: number;\n    hasNextPage: boolean;\n    cursor?: string;\n  };\n};\n\nconst BASE_URL = `https://accounts.api.cx.metamask.io/v1/accounts/`;\nconst CLIENT_HEADER = 'x-metamask-clientproduct';\nconst CLIENT_ID = 'metamask-incoming-transactions';\n\nconst log = createModuleLogger(projectLogger, 'accounts-api');\n\n/**\n * Fetch account transactions from the accounts API.\n * @param request - The request object.\n * @returns The response object.\n */\nexport async function getAccountTransactions(\n  request: GetAccountTransactionsRequest,\n): Promise<GetAccountTransactionsResponse> {\n  const {\n    address,\n    chainIds,\n    cursor,\n    endTimestamp,\n    sortDirection,\n    startTimestamp,\n  } = request;\n\n  let url = `${BASE_URL}${address}/transactions`;\n  const params = [];\n\n  if (chainIds) {\n    const network = chainIds.join(',');\n    params.push(`networks=${network}`);\n  }\n\n  if (startTimestamp) {\n    params.push(`startTimestamp=${startTimestamp}`);\n  }\n\n  if (endTimestamp) {\n    params.push(`endTimestamp=${endTimestamp}`);\n  }\n\n  if (cursor) {\n    params.push(`cursor=${cursor}`);\n  }\n\n  if (sortDirection) {\n    params.push(`sortDirection=${sortDirection}`);\n  }\n\n  if (params.length) {\n    url += `?${params.join('&')}`;\n  }\n\n  log('Getting account transactions', { request, url });\n\n  const headers = {\n    [CLIENT_HEADER]: CLIENT_ID,\n  };\n\n  const response = await successfulFetch(url, { headers });\n  const responseJson = await response.json();\n\n  log('Retrieved account transactions', responseJson);\n\n  return responseJson;\n}\n"]}

package/dist/api/accounts-api.d.cts

@@ -30,6 +30,7 @@ export type GetAccountTransactionsRequest = {
     chainIds?: Hex[];
     cursor?: string;
     endTimestamp?: number;
+    sortDirection?: 'ASC' | 'DESC';
     startTimestamp?: number;
 };
 export type GetAccountTransactionsResponse = {
@@ -46,11 +47,4 @@ export type GetAccountTransactionsResponse = {
  * @returns The response object.
  */
 export declare function getAccountTransactions(request: GetAccountTransactionsRequest): Promise<GetAccountTransactionsResponse>;
-/**
- * Fetch account transactions from the accounts API.
- * Automatically fetches all pages.
- * @param request - The request object.
- * @returns An array of transaction objects.
- */
-export declare function getAccountTransactionsAllPages(request: GetAccountTransactionsRequest): Promise<TransactionResponse[]>;
 //# sourceMappingURL=accounts-api.d.cts.map

package/dist/api/accounts-api.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"accounts-api.d.cts","sourceRoot":"","sources":["../../src/api/accounts-api.ts"],"names":[],"mappings":"AAAA,OAAO,EAAsB,KAAK,GAAG,EAAE,wBAAwB;AAI/D,MAAM,MAAM,mBAAmB,GAAG;IAChC,IAAI,EAAE,GAAG,CAAC;IACV,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,GAAG,CAAC;IACf,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,KAAK,EAAE,MAAM,CAAC;IACd,iBAAiB,EAAE,MAAM,CAAC;IAC1B,QAAQ,EAAE,IAAI,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,OAAO,CAAC;IACjB,cAAc,EAAE;QACd,eAAe,EAAE,MAAM,CAAC;QACxB,OAAO,EAAE,MAAM,CAAC;QAChB,MAAM,EAAE,MAAM,CAAC;QACf,IAAI,EAAE,MAAM,CAAC;QACb,EAAE,EAAE,MAAM,CAAC;QACX,MAAM,EAAE,MAAM,CAAC;KAChB,EAAE,CAAC;CACL,CAAC;AAEF,MAAM,MAAM,6BAA6B,GAAG;IAC1C,OAAO,EAAE,GAAG,CAAC;IACb,QAAQ,CAAC,EAAE,GAAG,EAAE,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB,CAAC;AAEF,MAAM,MAAM,8BAA8B,GAAG;IAC3C,IAAI,EAAE,mBAAmB,EAAE,CAAC;IAC5B,QAAQ,EAAE;QACR,KAAK,EAAE,MAAM,CAAC;QACd,WAAW,EAAE,OAAO,CAAC;QACrB,MAAM,CAAC,EAAE,MAAM,CAAC;KACjB,CAAC;CACH,CAAC;AAQF;;;;GAIG;AACH,wBAAsB,sBAAsB,CAC1C,OAAO,EAAE,6BAA6B,GACrC,OAAO,CAAC,8BAA8B,CAAC,CAuCzC;AAED;;;;;GAKG;AACH,wBAAsB,8BAA8B,CAClD,OAAO,EAAE,6BAA6B,GACrC,OAAO,CAAC,mBAAmB,EAAE,CAAC,CAmBhC"}
+{"version":3,"file":"accounts-api.d.cts","sourceRoot":"","sources":["../../src/api/accounts-api.ts"],"names":[],"mappings":"AACA,OAAO,EAAsB,KAAK,GAAG,EAAE,wBAAwB;AAI/D,MAAM,MAAM,mBAAmB,GAAG;IAChC,IAAI,EAAE,GAAG,CAAC;IACV,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,GAAG,CAAC;IACf,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,KAAK,EAAE,MAAM,CAAC;IACd,iBAAiB,EAAE,MAAM,CAAC;IAC1B,QAAQ,EAAE,IAAI,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,OAAO,CAAC;IACjB,cAAc,EAAE;QACd,eAAe,EAAE,MAAM,CAAC;QACxB,OAAO,EAAE,MAAM,CAAC;QAChB,MAAM,EAAE,MAAM,CAAC;QACf,IAAI,EAAE,MAAM,CAAC;QACb,EAAE,EAAE,MAAM,CAAC;QACX,MAAM,EAAE,MAAM,CAAC;KAChB,EAAE,CAAC;CACL,CAAC;AAEF,MAAM,MAAM,6BAA6B,GAAG;IAC1C,OAAO,EAAE,GAAG,CAAC;IACb,QAAQ,CAAC,EAAE,GAAG,EAAE,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,aAAa,CAAC,EAAE,KAAK,GAAG,MAAM,CAAC;IAC/B,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB,CAAC;AAEF,MAAM,MAAM,8BAA8B,GAAG;IAC3C,IAAI,EAAE,mBAAmB,EAAE,CAAC;IAC5B,QAAQ,EAAE;QACR,KAAK,EAAE,MAAM,CAAC;QACd,WAAW,EAAE,OAAO,CAAC;QACrB,MAAM,CAAC,EAAE,MAAM,CAAC;KACjB,CAAC;CACH,CAAC;AAQF;;;;GAIG;AACH,wBAAsB,sBAAsB,CAC1C,OAAO,EAAE,6BAA6B,GACrC,OAAO,CAAC,8BAA8B,CAAC,CAkDzC"}

package/dist/api/accounts-api.d.mts

@@ -30,6 +30,7 @@ export type GetAccountTransactionsRequest = {
     chainIds?: Hex[];
     cursor?: string;
     endTimestamp?: number;
+    sortDirection?: 'ASC' | 'DESC';
     startTimestamp?: number;
 };
 export type GetAccountTransactionsResponse = {
@@ -46,11 +47,4 @@ export type GetAccountTransactionsResponse = {
  * @returns The response object.
  */
 export declare function getAccountTransactions(request: GetAccountTransactionsRequest): Promise<GetAccountTransactionsResponse>;
-/**
- * Fetch account transactions from the accounts API.
- * Automatically fetches all pages.
- * @param request - The request object.
- * @returns An array of transaction objects.
- */
-export declare function getAccountTransactionsAllPages(request: GetAccountTransactionsRequest): Promise<TransactionResponse[]>;
 //# sourceMappingURL=accounts-api.d.mts.map

package/dist/api/accounts-api.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"accounts-api.d.mts","sourceRoot":"","sources":["../../src/api/accounts-api.ts"],"names":[],"mappings":"AAAA,OAAO,EAAsB,KAAK,GAAG,EAAE,wBAAwB;AAI/D,MAAM,MAAM,mBAAmB,GAAG;IAChC,IAAI,EAAE,GAAG,CAAC;IACV,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,GAAG,CAAC;IACf,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,KAAK,EAAE,MAAM,CAAC;IACd,iBAAiB,EAAE,MAAM,CAAC;IAC1B,QAAQ,EAAE,IAAI,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,OAAO,CAAC;IACjB,cAAc,EAAE;QACd,eAAe,EAAE,MAAM,CAAC;QACxB,OAAO,EAAE,MAAM,CAAC;QAChB,MAAM,EAAE,MAAM,CAAC;QACf,IAAI,EAAE,MAAM,CAAC;QACb,EAAE,EAAE,MAAM,CAAC;QACX,MAAM,EAAE,MAAM,CAAC;KAChB,EAAE,CAAC;CACL,CAAC;AAEF,MAAM,MAAM,6BAA6B,GAAG;IAC1C,OAAO,EAAE,GAAG,CAAC;IACb,QAAQ,CAAC,EAAE,GAAG,EAAE,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB,CAAC;AAEF,MAAM,MAAM,8BAA8B,GAAG;IAC3C,IAAI,EAAE,mBAAmB,EAAE,CAAC;IAC5B,QAAQ,EAAE;QACR,KAAK,EAAE,MAAM,CAAC;QACd,WAAW,EAAE,OAAO,CAAC;QACrB,MAAM,CAAC,EAAE,MAAM,CAAC;KACjB,CAAC;CACH,CAAC;AAQF;;;;GAIG;AACH,wBAAsB,sBAAsB,CAC1C,OAAO,EAAE,6BAA6B,GACrC,OAAO,CAAC,8BAA8B,CAAC,CAuCzC;AAED;;;;;GAKG;AACH,wBAAsB,8BAA8B,CAClD,OAAO,EAAE,6BAA6B,GACrC,OAAO,CAAC,mBAAmB,EAAE,CAAC,CAmBhC"}
+{"version":3,"file":"accounts-api.d.mts","sourceRoot":"","sources":["../../src/api/accounts-api.ts"],"names":[],"mappings":"AACA,OAAO,EAAsB,KAAK,GAAG,EAAE,wBAAwB;AAI/D,MAAM,MAAM,mBAAmB,GAAG;IAChC,IAAI,EAAE,GAAG,CAAC;IACV,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,GAAG,CAAC;IACf,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,KAAK,EAAE,MAAM,CAAC;IACd,iBAAiB,EAAE,MAAM,CAAC;IAC1B,QAAQ,EAAE,IAAI,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,OAAO,CAAC;IACjB,cAAc,EAAE;QACd,eAAe,EAAE,MAAM,CAAC;QACxB,OAAO,EAAE,MAAM,CAAC;QAChB,MAAM,EAAE,MAAM,CAAC;QACf,IAAI,EAAE,MAAM,CAAC;QACb,EAAE,EAAE,MAAM,CAAC;QACX,MAAM,EAAE,MAAM,CAAC;KAChB,EAAE,CAAC;CACL,CAAC;AAEF,MAAM,MAAM,6BAA6B,GAAG;IAC1C,OAAO,EAAE,GAAG,CAAC;IACb,QAAQ,CAAC,EAAE,GAAG,EAAE,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,aAAa,CAAC,EAAE,KAAK,GAAG,MAAM,CAAC;IAC/B,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB,CAAC;AAEF,MAAM,MAAM,8BAA8B,GAAG;IAC3C,IAAI,EAAE,mBAAmB,EAAE,CAAC;IAC5B,QAAQ,EAAE;QACR,KAAK,EAAE,MAAM,CAAC;QACd,WAAW,EAAE,OAAO,CAAC;QACrB,MAAM,CAAC,EAAE,MAAM,CAAC;KACjB,CAAC;CACH,CAAC;AAQF;;;;GAIG;AACH,wBAAsB,sBAAsB,CAC1C,OAAO,EAAE,6BAA6B,GACrC,OAAO,CAAC,8BAA8B,CAAC,CAkDzC"}

package/dist/api/accounts-api.mjs

@@ -1,3 +1,4 @@
+import { successfulFetch } from "@metamask/controller-utils";
 import { createModuleLogger } from "@metamask/utils";
 import { projectLogger } from "../logger.mjs";
 const BASE_URL = `https://accounts.api.cx.metamask.io/v1/accounts/`;
@@ -10,7 +11,7 @@ const log = createModuleLogger(projectLogger, 'accounts-api');
  * @returns The response object.
  */
 export async function getAccountTransactions(request) {
-    const { address, chainIds, cursor, endTimestamp, startTimestamp } = request;
+    const { address, chainIds, cursor, endTimestamp, sortDirection, startTimestamp, } = request;
     let url = `${BASE_URL}${address}/transactions`;
     const params = [];
     if (chainIds) {
@@ -26,6 +27,9 @@ export async function getAccountTransactions(request) {
     if (cursor) {
         params.push(`cursor=${cursor}`);
     }
+    if (sortDirection) {
+        params.push(`sortDirection=${sortDirection}`);
+    }
     if (params.length) {
         url += `?${params.join('&')}`;
     }
@@ -33,29 +37,9 @@ export async function getAccountTransactions(request) {
     const headers = {
         [CLIENT_HEADER]: CLIENT_ID,
     };
-    const response = await fetch(url, { headers });
+    const response = await successfulFetch(url, { headers });
     const responseJson = await response.json();
     log('Retrieved account transactions', responseJson);
     return responseJson;
 }
-/**
- * Fetch account transactions from the accounts API.
- * Automatically fetches all pages.
- * @param request - The request object.
- * @returns An array of transaction objects.
- */
-export async function getAccountTransactionsAllPages(request) {
-    const transactions = [];
-    let cursor;
-    let hasNextPage = true;
-    log('Getting account transactions from all pages', request);
-    while (hasNextPage) {
-        const response = await getAccountTransactions({ ...request, cursor });
-        transactions.push(...response.data);
-        cursor = response.pageInfo.cursor;
-        hasNextPage = response.pageInfo.hasNextPage;
-    }
-    log('Retrieved account transactions from all pages', transactions);
-    return transactions;
-}
 //# sourceMappingURL=accounts-api.mjs.map

package/dist/api/accounts-api.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"accounts-api.mjs","sourceRoot":"","sources":["../../src/api/accounts-api.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAY,wBAAwB;AAE/D,OAAO,EAAE,aAAa,EAAE,sBAAkB;AA8C1C,MAAM,QAAQ,GAAG,kDAAkD,CAAC;AACpE,MAAM,aAAa,GAAG,0BAA0B,CAAC;AACjD,MAAM,SAAS,GAAG,gCAAgC,CAAC;AAEnD,MAAM,GAAG,GAAG,kBAAkB,CAAC,aAAa,EAAE,cAAc,CAAC,CAAC;AAE9D;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,sBAAsB,CAC1C,OAAsC;IAEtC,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,YAAY,EAAE,cAAc,EAAE,GAAG,OAAO,CAAC;IAE5E,IAAI,GAAG,GAAG,GAAG,QAAQ,GAAG,OAAO,eAAe,CAAC;IAC/C,MAAM,MAAM,GAAG,EAAE,CAAC;IAElB,IAAI,QAAQ,EAAE;QACZ,MAAM,OAAO,GAAG,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACnC,MAAM,CAAC,IAAI,CAAC,YAAY,OAAO,EAAE,CAAC,CAAC;KACpC;IAED,IAAI,cAAc,EAAE;QAClB,MAAM,CAAC,IAAI,CAAC,kBAAkB,cAAc,EAAE,CAAC,CAAC;KACjD;IAED,IAAI,YAAY,EAAE;QAChB,MAAM,CAAC,IAAI,CAAC,gBAAgB,YAAY,EAAE,CAAC,CAAC;KAC7C;IAED,IAAI,MAAM,EAAE;QACV,MAAM,CAAC,IAAI,CAAC,UAAU,MAAM,EAAE,CAAC,CAAC;KACjC;IAED,IAAI,MAAM,CAAC,MAAM,EAAE;QACjB,GAAG,IAAI,IAAI,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;KAC/B;IAED,GAAG,CAAC,8BAA8B,EAAE,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,CAAC;IAEtD,MAAM,OAAO,GAAG;QACd,CAAC,aAAa,CAAC,EAAE,SAAS;KAC3B,CAAC;IAEF,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,GAAG,EAAE,EAAE,OAAO,EAAE,CAAC,CAAC;IAC/C,MAAM,YAAY,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;IAE3C,GAAG,CAAC,gCAAgC,EAAE,YAAY,CAAC,CAAC;IAEpD,OAAO,YAAY,CAAC;AACtB,CAAC;AAED;;;;;GAKG;AACH,MAAM,CAAC,KAAK,UAAU,8BAA8B,CAClD,OAAsC;IAEtC,MAAM,YAAY,GAAG,EAAE,CAAC;IAExB,IAAI,MAAM,CAAC;IACX,IAAI,WAAW,GAAG,IAAI,CAAC;IAEvB,GAAG,CAAC,6CAA6C,EAAE,OAAO,CAAC,CAAC;IAE5D,OAAO,WAAW,EAAE;QAClB,MAAM,QAAQ,GAAG,MAAM,sBAAsB,CAAC,EAAE,GAAG,OAAO,EAAE,MAAM,EAAE,CAAC,CAAC;QACtE,YAAY,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC;QAEpC,MAAM,GAAG,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC;QAClC,WAAW,GAAG,QAAQ,CAAC,QAAQ,CAAC,WAAW,CAAC;KAC7C;IAED,GAAG,CAAC,+CAA+C,EAAE,YAAY,CAAC,CAAC;IAEnE,OAAO,YAAY,CAAC;AACtB,CAAC","sourcesContent":["import { createModuleLogger, type Hex } from '@metamask/utils';\n\nimport { projectLogger } from '../logger';\n\nexport type TransactionResponse = {\n  hash: Hex;\n  timestamp: string;\n  chainId: number;\n  blockNumber: number;\n  blockHash: Hex;\n  gas: number;\n  gasUsed: number;\n  gasPrice: string;\n  effectiveGasPrice: string;\n  nonce: number;\n  cumulativeGasUsed: number;\n  methodId: null;\n  value: string;\n  to: string;\n  from: string;\n  isError: boolean;\n  valueTransfers: {\n    contractAddress: string;\n    decimal: number;\n    symbol: string;\n    from: string;\n    to: string;\n    amount: string;\n  }[];\n};\n\nexport type GetAccountTransactionsRequest = {\n  address: Hex;\n  chainIds?: Hex[];\n  cursor?: string;\n  endTimestamp?: number;\n  startTimestamp?: number;\n};\n\nexport type GetAccountTransactionsResponse = {\n  data: TransactionResponse[];\n  pageInfo: {\n    count: number;\n    hasNextPage: boolean;\n    cursor?: string;\n  };\n};\n\nconst BASE_URL = `https://accounts.api.cx.metamask.io/v1/accounts/`;\nconst CLIENT_HEADER = 'x-metamask-clientproduct';\nconst CLIENT_ID = 'metamask-incoming-transactions';\n\nconst log = createModuleLogger(projectLogger, 'accounts-api');\n\n/**\n * Fetch account transactions from the accounts API.\n * @param request - The request object.\n * @returns The response object.\n */\nexport async function getAccountTransactions(\n  request: GetAccountTransactionsRequest,\n): Promise<GetAccountTransactionsResponse> {\n  const { address, chainIds, cursor, endTimestamp, startTimestamp } = request;\n\n  let url = `${BASE_URL}${address}/transactions`;\n  const params = [];\n\n  if (chainIds) {\n    const network = chainIds.join(',');\n    params.push(`networks=${network}`);\n  }\n\n  if (startTimestamp) {\n    params.push(`startTimestamp=${startTimestamp}`);\n  }\n\n  if (endTimestamp) {\n    params.push(`endTimestamp=${endTimestamp}`);\n  }\n\n  if (cursor) {\n    params.push(`cursor=${cursor}`);\n  }\n\n  if (params.length) {\n    url += `?${params.join('&')}`;\n  }\n\n  log('Getting account transactions', { request, url });\n\n  const headers = {\n    [CLIENT_HEADER]: CLIENT_ID,\n  };\n\n  const response = await fetch(url, { headers });\n  const responseJson = await response.json();\n\n  log('Retrieved account transactions', responseJson);\n\n  return responseJson;\n}\n\n/**\n * Fetch account transactions from the accounts API.\n * Automatically fetches all pages.\n * @param request - The request object.\n * @returns An array of transaction objects.\n */\nexport async function getAccountTransactionsAllPages(\n  request: GetAccountTransactionsRequest,\n): Promise<TransactionResponse[]> {\n  const transactions = [];\n\n  let cursor;\n  let hasNextPage = true;\n\n  log('Getting account transactions from all pages', request);\n\n  while (hasNextPage) {\n    const response = await getAccountTransactions({ ...request, cursor });\n    transactions.push(...response.data);\n\n    cursor = response.pageInfo.cursor;\n    hasNextPage = response.pageInfo.hasNextPage;\n  }\n\n  log('Retrieved account transactions from all pages', transactions);\n\n  return transactions;\n}\n"]}
+{"version":3,"file":"accounts-api.mjs","sourceRoot":"","sources":["../../src/api/accounts-api.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,mCAAmC;AAC7D,OAAO,EAAE,kBAAkB,EAAY,wBAAwB;AAE/D,OAAO,EAAE,aAAa,EAAE,sBAAkB;AA+C1C,MAAM,QAAQ,GAAG,kDAAkD,CAAC;AACpE,MAAM,aAAa,GAAG,0BAA0B,CAAC;AACjD,MAAM,SAAS,GAAG,gCAAgC,CAAC;AAEnD,MAAM,GAAG,GAAG,kBAAkB,CAAC,aAAa,EAAE,cAAc,CAAC,CAAC;AAE9D;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,sBAAsB,CAC1C,OAAsC;IAEtC,MAAM,EACJ,OAAO,EACP,QAAQ,EACR,MAAM,EACN,YAAY,EACZ,aAAa,EACb,cAAc,GACf,GAAG,OAAO,CAAC;IAEZ,IAAI,GAAG,GAAG,GAAG,QAAQ,GAAG,OAAO,eAAe,CAAC;IAC/C,MAAM,MAAM,GAAG,EAAE,CAAC;IAElB,IAAI,QAAQ,EAAE;QACZ,MAAM,OAAO,GAAG,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACnC,MAAM,CAAC,IAAI,CAAC,YAAY,OAAO,EAAE,CAAC,CAAC;KACpC;IAED,IAAI,cAAc,EAAE;QAClB,MAAM,CAAC,IAAI,CAAC,kBAAkB,cAAc,EAAE,CAAC,CAAC;KACjD;IAED,IAAI,YAAY,EAAE;QAChB,MAAM,CAAC,IAAI,CAAC,gBAAgB,YAAY,EAAE,CAAC,CAAC;KAC7C;IAED,IAAI,MAAM,EAAE;QACV,MAAM,CAAC,IAAI,CAAC,UAAU,MAAM,EAAE,CAAC,CAAC;KACjC;IAED,IAAI,aAAa,EAAE;QACjB,MAAM,CAAC,IAAI,CAAC,iBAAiB,aAAa,EAAE,CAAC,CAAC;KAC/C;IAED,IAAI,MAAM,CAAC,MAAM,EAAE;QACjB,GAAG,IAAI,IAAI,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;KAC/B;IAED,GAAG,CAAC,8BAA8B,EAAE,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,CAAC;IAEtD,MAAM,OAAO,GAAG;QACd,CAAC,aAAa,CAAC,EAAE,SAAS;KAC3B,CAAC;IAEF,MAAM,QAAQ,GAAG,MAAM,eAAe,CAAC,GAAG,EAAE,EAAE,OAAO,EAAE,CAAC,CAAC;IACzD,MAAM,YAAY,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;IAE3C,GAAG,CAAC,gCAAgC,EAAE,YAAY,CAAC,CAAC;IAEpD,OAAO,YAAY,CAAC;AACtB,CAAC","sourcesContent":["import { successfulFetch } from '@metamask/controller-utils';\nimport { createModuleLogger, type Hex } from '@metamask/utils';\n\nimport { projectLogger } from '../logger';\n\nexport type TransactionResponse = {\n  hash: Hex;\n  timestamp: string;\n  chainId: number;\n  blockNumber: number;\n  blockHash: Hex;\n  gas: number;\n  gasUsed: number;\n  gasPrice: string;\n  effectiveGasPrice: string;\n  nonce: number;\n  cumulativeGasUsed: number;\n  methodId: null;\n  value: string;\n  to: string;\n  from: string;\n  isError: boolean;\n  valueTransfers: {\n    contractAddress: string;\n    decimal: number;\n    symbol: string;\n    from: string;\n    to: string;\n    amount: string;\n  }[];\n};\n\nexport type GetAccountTransactionsRequest = {\n  address: Hex;\n  chainIds?: Hex[];\n  cursor?: string;\n  endTimestamp?: number;\n  sortDirection?: 'ASC' | 'DESC';\n  startTimestamp?: number;\n};\n\nexport type GetAccountTransactionsResponse = {\n  data: TransactionResponse[];\n  pageInfo: {\n    count: number;\n    hasNextPage: boolean;\n    cursor?: string;\n  };\n};\n\nconst BASE_URL = `https://accounts.api.cx.metamask.io/v1/accounts/`;\nconst CLIENT_HEADER = 'x-metamask-clientproduct';\nconst CLIENT_ID = 'metamask-incoming-transactions';\n\nconst log = createModuleLogger(projectLogger, 'accounts-api');\n\n/**\n * Fetch account transactions from the accounts API.\n * @param request - The request object.\n * @returns The response object.\n */\nexport async function getAccountTransactions(\n  request: GetAccountTransactionsRequest,\n): Promise<GetAccountTransactionsResponse> {\n  const {\n    address,\n    chainIds,\n    cursor,\n    endTimestamp,\n    sortDirection,\n    startTimestamp,\n  } = request;\n\n  let url = `${BASE_URL}${address}/transactions`;\n  const params = [];\n\n  if (chainIds) {\n    const network = chainIds.join(',');\n    params.push(`networks=${network}`);\n  }\n\n  if (startTimestamp) {\n    params.push(`startTimestamp=${startTimestamp}`);\n  }\n\n  if (endTimestamp) {\n    params.push(`endTimestamp=${endTimestamp}`);\n  }\n\n  if (cursor) {\n    params.push(`cursor=${cursor}`);\n  }\n\n  if (sortDirection) {\n    params.push(`sortDirection=${sortDirection}`);\n  }\n\n  if (params.length) {\n    url += `?${params.join('&')}`;\n  }\n\n  log('Getting account transactions', { request, url });\n\n  const headers = {\n    [CLIENT_HEADER]: CLIENT_ID,\n  };\n\n  const response = await successfulFetch(url, { headers });\n  const responseJson = await response.json();\n\n  log('Retrieved account transactions', responseJson);\n\n  return responseJson;\n}\n"]}

package/dist/helpers/AccountsApiRemoteTransactionSource.cjs

@@ -7,9 +7,9 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
-var _AccountsApiRemoteTransactionSource_instances, _AccountsApiRemoteTransactionSource_getTransactions, _AccountsApiRemoteTransactionSource_filterTransactions, _AccountsApiRemoteTransactionSource_normalizeTransaction;
+var _AccountsApiRemoteTransactionSource_instances, _AccountsApiRemoteTransactionSource_getTransactions, _AccountsApiRemoteTransactionSource_queryTransactions, _AccountsApiRemoteTransactionSource_filterTransactions, _AccountsApiRemoteTransactionSource_normalizeTransaction, _AccountsApiRemoteTransactionSource_getCacheKey, _AccountsApiRemoteTransactionSource_getCacheCursor, _AccountsApiRemoteTransactionSource_getTimestampSeconds;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AccountsApiRemoteTransactionSource = void 0;
+exports.AccountsApiRemoteTransactionSource = exports.SUPPORTED_CHAIN_IDS = void 0;
 const controller_utils_1 = require("@metamask/controller-utils");
 const bn_js_1 = __importDefault(require("bn.js"));
 const uuid_1 = require("uuid");
@@ -17,7 +17,7 @@ const accounts_api_1 = require("../api/accounts-api.cjs");
 const constants_1 = require("../constants.cjs");
 const logger_1 = require("../logger.cjs");
 const types_1 = require("../types.cjs");
-const SUPPORTED_CHAIN_IDS = [
+exports.SUPPORTED_CHAIN_IDS = [
     constants_1.CHAIN_IDS.MAINNET,
     constants_1.CHAIN_IDS.POLYGON,
     constants_1.CHAIN_IDS.BSC,
@@ -36,44 +36,83 @@ class AccountsApiRemoteTransactionSource {
         _AccountsApiRemoteTransactionSource_instances.add(this);
     }
     getSupportedChains() {
-        return SUPPORTED_CHAIN_IDS;
+        return exports.SUPPORTED_CHAIN_IDS;
     }
     async fetchTransactions(request) {
         const { address } = request;
         const responseTransactions = await __classPrivateFieldGet(this, _AccountsApiRemoteTransactionSource_instances, "m", _AccountsApiRemoteTransactionSource_getTransactions).call(this, request);
-        const incomingTransactions = __classPrivateFieldGet(this, _AccountsApiRemoteTransactionSource_instances, "m", _AccountsApiRemoteTransactionSource_filterTransactions).call(this, request, responseTransactions);
-        const normalizedTransactions = incomingTransactions.map((tx) => __classPrivateFieldGet(this, _AccountsApiRemoteTransactionSource_instances, "m", _AccountsApiRemoteTransactionSource_normalizeTransaction).call(this, address, tx));
-        log('Filtered and normalized transactions', normalizedTransactions);
-        return normalizedTransactions;
+        log('Fetched transactions', responseTransactions);
+        const normalizedTransactions = responseTransactions.map((tx) => __classPrivateFieldGet(this, _AccountsApiRemoteTransactionSource_instances, "m", _AccountsApiRemoteTransactionSource_normalizeTransaction).call(this, address, tx));
+        log('Normalized transactions', normalizedTransactions);
+        const filteredTransactions = __classPrivateFieldGet(this, _AccountsApiRemoteTransactionSource_instances, "m", _AccountsApiRemoteTransactionSource_filterTransactions).call(this, request, normalizedTransactions);
+        log('Filtered transactions', filteredTransactions);
+        return filteredTransactions;
     }
 }
 exports.AccountsApiRemoteTransactionSource = AccountsApiRemoteTransactionSource;
 _AccountsApiRemoteTransactionSource_instances = new WeakSet(), _AccountsApiRemoteTransactionSource_getTransactions = async function _AccountsApiRemoteTransactionSource_getTransactions(request) {
-    log('Fetching transactions', request);
-    const { address, chainIds: requestedChainIds, endTimestamp, startTimestampByChainId, } = request;
-    const chainIds = requestedChainIds.filter((chainId) => SUPPORTED_CHAIN_IDS.includes(chainId));
+    log('Getting transactions', request);
+    const { address, cache, chainIds: requestedChainIds } = request;
+    const chainIds = requestedChainIds.filter((chainId) => exports.SUPPORTED_CHAIN_IDS.includes(chainId));
     const unsupportedChainIds = requestedChainIds.filter((chainId) => !chainIds.includes(chainId));
     if (unsupportedChainIds.length) {
         log('Ignoring unsupported chain IDs', unsupportedChainIds);
     }
-    const startTimestamp = Math.min(...Object.values(startTimestampByChainId));
-    return await (0, accounts_api_1.getAccountTransactionsAllPages)({
-        address,
-        chainIds,
-        startTimestamp,
-        endTimestamp,
-    });
-}, _AccountsApiRemoteTransactionSource_filterTransactions = function _AccountsApiRemoteTransactionSource_filterTransactions(request, responseTransactions) {
-    const { address, startTimestampByChainId, limit } = request;
-    const incomingTransactions = responseTransactions.filter((tx) => tx.to === address || tx.valueTransfers.some((vt) => vt.to === address));
-    log('Fetched incoming transactions from accounts API', incomingTransactions);
-    const incomingTransactionsMatchingTimestamp = incomingTransactions.filter((tx) => {
-        const chainId = `0x${tx.chainId.toString(16)}`;
-        const chainStartTimestamp = startTimestampByChainId[chainId];
-        const timestamp = new Date(tx.timestamp).getTime();
-        return timestamp >= chainStartTimestamp;
-    });
-    return incomingTransactionsMatchingTimestamp.slice(0, limit);
+    const cursor = __classPrivateFieldGet(this, _AccountsApiRemoteTransactionSource_instances, "m", _AccountsApiRemoteTransactionSource_getCacheCursor).call(this, cache, chainIds, address);
+    if (cursor) {
+        log('Using cached cursor', cursor);
+    }
+    return await __classPrivateFieldGet(this, _AccountsApiRemoteTransactionSource_instances, "m", _AccountsApiRemoteTransactionSource_queryTransactions).call(this, request, chainIds, cursor);
+}, _AccountsApiRemoteTransactionSource_queryTransactions = async function _AccountsApiRemoteTransactionSource_queryTransactions(request, chainIds, cursor) {
+    const { address, queryEntireHistory, updateCache } = request;
+    const transactions = [];
+    let hasNextPage = true;
+    let currentCursor = cursor;
+    let pageCount = 0;
+    const startTimestamp = queryEntireHistory
+        ? undefined
+        : __classPrivateFieldGet(this, _AccountsApiRemoteTransactionSource_instances, "m", _AccountsApiRemoteTransactionSource_getTimestampSeconds).call(this, Date.now());
+    while (hasNextPage) {
+        try {
+            const response = await (0, accounts_api_1.getAccountTransactions)({
+                address,
+                chainIds,
+                cursor: currentCursor,
+                sortDirection: 'ASC',
+                startTimestamp,
+            });
+            pageCount += 1;
+            if (response?.data) {
+                transactions.push(...response.data);
+            }
+            hasNextPage = response?.pageInfo?.hasNextPage;
+            currentCursor = response?.pageInfo?.cursor;
+            if (currentCursor) {
+                // eslint-disable-next-line no-loop-func
+                updateCache((cache) => {
+                    const key = __classPrivateFieldGet(this, _AccountsApiRemoteTransactionSource_instances, "m", _AccountsApiRemoteTransactionSource_getCacheKey).call(this, chainIds, address);
+                    cache[key] = currentCursor;
+                    log('Updated cache', { key, newCursor: currentCursor });
+                });
+            }
+        }
+        catch (error) {
+            log('Error while fetching transactions', error);
+            break;
+        }
+    }
+    log('Queried transactions', { pageCount });
+    return transactions;
+}, _AccountsApiRemoteTransactionSource_filterTransactions = function _AccountsApiRemoteTransactionSource_filterTransactions(request, transactions) {
+    const { address, includeTokenTransfers, updateTransactions } = request;
+    let filteredTransactions = transactions;
+    if (!updateTransactions) {
+        filteredTransactions = filteredTransactions.filter((tx) => tx.txParams.to === address);
+    }
+    if (!includeTokenTransfers) {
+        filteredTransactions = filteredTransactions.filter((tx) => !tx.isTransfer);
+    }
+    return filteredTransactions;
 }, _AccountsApiRemoteTransactionSource_normalizeTransaction = function _AccountsApiRemoteTransactionSource_normalizeTransaction(address, responseTransaction) {
     const blockNumber = String(responseTransaction.blockNumber);
     const chainId = `0x${responseTransaction.chainId.toString(16)}`;
@@ -90,13 +129,13 @@ _AccountsApiRemoteTransactionSource_instances = new WeakSet(), _AccountsApiRemot
     const status = responseTransaction.isError
         ? types_1.TransactionStatus.failed
         : types_1.TransactionStatus.confirmed;
-    const valueTransfer = responseTransaction.valueTransfers.find((vt) => vt.to === address);
+    const valueTransfer = responseTransaction.valueTransfers.find((vt) => vt.to === address && vt.contractAddress);
     const isTransfer = Boolean(valueTransfer);
     const contractAddress = valueTransfer?.contractAddress;
     const decimals = valueTransfer?.decimal;
     const symbol = valueTransfer?.symbol;
     const value = (0, controller_utils_1.BNToHex)(new bn_js_1.default(valueTransfer?.amount ?? responseTransaction.value));
-    const to = address;
+    const to = valueTransfer ? address : responseTransaction.to;
     return {
         blockNumber,
         chainId,
@@ -128,5 +167,12 @@ _AccountsApiRemoteTransactionSource_instances = new WeakSet(), _AccountsApiRemot
             }
             : undefined,
     };
+}, _AccountsApiRemoteTransactionSource_getCacheKey = function _AccountsApiRemoteTransactionSource_getCacheKey(chainIds, address) {
+    return `accounts-api#${chainIds.join(',')}#${address}`;
+}, _AccountsApiRemoteTransactionSource_getCacheCursor = function _AccountsApiRemoteTransactionSource_getCacheCursor(cache, chainIds, address) {
+    const key = __classPrivateFieldGet(this, _AccountsApiRemoteTransactionSource_instances, "m", _AccountsApiRemoteTransactionSource_getCacheKey).call(this, chainIds, address);
+    return cache[key];
+}, _AccountsApiRemoteTransactionSource_getTimestampSeconds = function _AccountsApiRemoteTransactionSource_getTimestampSeconds(timestampMs) {
+    return Math.floor(timestampMs / 1000);
 };
 //# sourceMappingURL=AccountsApiRemoteTransactionSource.cjs.map

package/dist/helpers/AccountsApiRemoteTransactionSource.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"AccountsApiRemoteTransactionSource.cjs","sourceRoot":"","sources":["../../src/helpers/AccountsApiRemoteTransactionSource.ts"],"names":[],"mappings":"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","sourcesContent":["import { BNToHex } from '@metamask/controller-utils';\nimport type { Hex } from '@metamask/utils';\nimport BN from 'bn.js';\nimport { v1 as random } from 'uuid';\n\nimport type {\n  GetAccountTransactionsResponse,\n  TransactionResponse,\n} from '../api/accounts-api';\nimport { getAccountTransactionsAllPages } from '../api/accounts-api';\nimport { CHAIN_IDS } from '../constants';\nimport { createModuleLogger, incomingTransactionsLogger } from '../logger';\nimport type {\n  RemoteTransactionSource,\n  RemoteTransactionSourceRequest,\n  TransactionError,\n  TransactionMeta,\n} from '../types';\nimport { TransactionStatus, TransactionType } from '../types';\n\nconst SUPPORTED_CHAIN_IDS: Hex[] = [\n  CHAIN_IDS.MAINNET,\n  CHAIN_IDS.POLYGON,\n  CHAIN_IDS.BSC,\n  CHAIN_IDS.LINEA_MAINNET,\n  CHAIN_IDS.BASE,\n  CHAIN_IDS.OPTIMISM,\n  CHAIN_IDS.ARBITRUM,\n  CHAIN_IDS.SCROLL,\n];\n\nconst log = createModuleLogger(\n  incomingTransactionsLogger,\n  'accounts-api-source',\n);\n\n/**\n * A RemoteTransactionSource that fetches incoming transactions using the Accounts API.\n */\nexport class AccountsApiRemoteTransactionSource\n  implements RemoteTransactionSource\n{\n  getSupportedChains(): Hex[] {\n    return SUPPORTED_CHAIN_IDS;\n  }\n\n  async fetchTransactions(\n    request: RemoteTransactionSourceRequest,\n  ): Promise<TransactionMeta[]> {\n    const { address } = request;\n\n    const responseTransactions = await this.#getTransactions(request);\n\n    const incomingTransactions = this.#filterTransactions(\n      request,\n      responseTransactions,\n    );\n\n    const normalizedTransactions = incomingTransactions.map((tx) =>\n      this.#normalizeTransaction(address, tx),\n    );\n\n    log('Filtered and normalized transactions', normalizedTransactions);\n\n    return normalizedTransactions;\n  }\n\n  async #getTransactions(request: RemoteTransactionSourceRequest) {\n    log('Fetching transactions', request);\n\n    const {\n      address,\n      chainIds: requestedChainIds,\n      endTimestamp,\n      startTimestampByChainId,\n    } = request;\n\n    const chainIds = requestedChainIds.filter((chainId) =>\n      SUPPORTED_CHAIN_IDS.includes(chainId),\n    );\n\n    const unsupportedChainIds = requestedChainIds.filter(\n      (chainId) => !chainIds.includes(chainId),\n    );\n\n    if (unsupportedChainIds.length) {\n      log('Ignoring unsupported chain IDs', unsupportedChainIds);\n    }\n\n    const startTimestamp = Math.min(...Object.values(startTimestampByChainId));\n\n    return await getAccountTransactionsAllPages({\n      address,\n      chainIds,\n      startTimestamp,\n      endTimestamp,\n    });\n  }\n\n  #filterTransactions(\n    request: RemoteTransactionSourceRequest,\n    responseTransactions: TransactionResponse[],\n  ) {\n    const { address, startTimestampByChainId, limit } = request;\n\n    const incomingTransactions = responseTransactions.filter(\n      (tx) =>\n        tx.to === address || tx.valueTransfers.some((vt) => vt.to === address),\n    );\n\n    log(\n      'Fetched incoming transactions from accounts API',\n      incomingTransactions,\n    );\n\n    const incomingTransactionsMatchingTimestamp = incomingTransactions.filter(\n      (tx) => {\n        const chainId = `0x${tx.chainId.toString(16)}` as Hex;\n        const chainStartTimestamp = startTimestampByChainId[chainId];\n        const timestamp = new Date(tx.timestamp).getTime();\n        return timestamp >= chainStartTimestamp;\n      },\n    );\n\n    return incomingTransactionsMatchingTimestamp.slice(0, limit);\n  }\n\n  #normalizeTransaction(\n    address: Hex,\n    responseTransaction: GetAccountTransactionsResponse['data'][0],\n  ): TransactionMeta {\n    const blockNumber = String(responseTransaction.blockNumber);\n    const chainId = `0x${responseTransaction.chainId.toString(16)}` as Hex;\n    const { hash } = responseTransaction;\n    const time = new Date(responseTransaction.timestamp).getTime();\n    const id = random({ msecs: time });\n    const { from } = responseTransaction;\n    const gas = BNToHex(new BN(responseTransaction.gas));\n    const gasPrice = BNToHex(new BN(responseTransaction.gasPrice));\n    const gasUsed = BNToHex(new BN(responseTransaction.gasUsed));\n    const nonce = BNToHex(new BN(responseTransaction.nonce));\n    const type = TransactionType.incoming;\n    const verifiedOnBlockchain = false;\n\n    const status = responseTransaction.isError\n      ? TransactionStatus.failed\n      : TransactionStatus.confirmed;\n\n    const valueTransfer = responseTransaction.valueTransfers.find(\n      (vt) => vt.to === address,\n    );\n\n    const isTransfer = Boolean(valueTransfer);\n    const contractAddress = valueTransfer?.contractAddress as string;\n    const decimals = valueTransfer?.decimal as number;\n    const symbol = valueTransfer?.symbol as string;\n\n    const value = BNToHex(\n      new BN(valueTransfer?.amount ?? responseTransaction.value),\n    );\n\n    const to = address;\n\n    return {\n      blockNumber,\n      chainId,\n      hash,\n      id,\n      status,\n      error:\n        status === TransactionStatus.failed\n          ? new Error('Transaction failed')\n          : (undefined as unknown as TransactionError),\n      time,\n      txParams: {\n        chainId,\n        from,\n        gas,\n        gasPrice,\n        gasUsed,\n        nonce,\n        to,\n        value,\n      },\n      type,\n      verifiedOnBlockchain,\n      isTransfer,\n      transferInformation: isTransfer\n        ? {\n            contractAddress,\n            decimals,\n            symbol,\n          }\n        : undefined,\n    };\n  }\n}\n"]}
+{"version":3,"file":"AccountsApiRemoteTransactionSource.cjs","sourceRoot":"","sources":["../../src/helpers/AccountsApiRemoteTransactionSource.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,iEAAqD;AAErD,kDAAuB;AACvB,+BAAoC;AAMpC,0DAA6D;AAC7D,gDAAyC;AACzC,0CAA2E;AAO3E,wCAA8D;AAEjD,QAAA,mBAAmB,GAAU;IACxC,qBAAS,CAAC,OAAO;IACjB,qBAAS,CAAC,OAAO;IACjB,qBAAS,CAAC,GAAG;IACb,qBAAS,CAAC,aAAa;IACvB,qBAAS,CAAC,IAAI;IACd,qBAAS,CAAC,QAAQ;IAClB,qBAAS,CAAC,QAAQ;IAClB,qBAAS,CAAC,MAAM;CACjB,CAAC;AAEF,MAAM,GAAG,GAAG,IAAA,2BAAkB,EAC5B,mCAA0B,EAC1B,qBAAqB,CACtB,CAAC;AAEF;;GAEG;AACH,MAAa,kCAAkC;IAA/C;;IA8NA,CAAC;IA3NC,kBAAkB;QAChB,OAAO,2BAAmB,CAAC;IAC7B,CAAC;IAED,KAAK,CAAC,iBAAiB,CACrB,OAAuC;QAEvC,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;QAE5B,MAAM,oBAAoB,GAAG,MAAM,uBAAA,IAAI,0GAAiB,MAArB,IAAI,EAAkB,OAAO,CAAC,CAAC;QAElE,GAAG,CAAC,sBAAsB,EAAE,oBAAoB,CAAC,CAAC;QAElD,MAAM,sBAAsB,GAAG,oBAAoB,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAC7D,uBAAA,IAAI,+GAAsB,MAA1B,IAAI,EAAuB,OAAO,EAAE,EAAE,CAAC,CACxC,CAAC;QAEF,GAAG,CAAC,yBAAyB,EAAE,sBAAsB,CAAC,CAAC;QAEvD,MAAM,oBAAoB,GAAG,uBAAA,IAAI,6GAAoB,MAAxB,IAAI,EAC/B,OAAO,EACP,sBAAsB,CACvB,CAAC;QAEF,GAAG,CAAC,uBAAuB,EAAE,oBAAoB,CAAC,CAAC;QAEnD,OAAO,oBAAoB,CAAC;IAC9B,CAAC;CAgMF;AA9ND,gFA8NC;qHA9LC,KAAK,8DAAkB,OAAuC;IAC5D,GAAG,CAAC,sBAAsB,EAAE,OAAO,CAAC,CAAC;IAErC,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,iBAAiB,EAAE,GAAG,OAAO,CAAC;IAEhE,MAAM,QAAQ,GAAG,iBAAiB,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE,CACpD,2BAAmB,CAAC,QAAQ,CAAC,OAAO,CAAC,CACtC,CAAC;IAEF,MAAM,mBAAmB,GAAG,iBAAiB,CAAC,MAAM,CAClD,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,CACzC,CAAC;IAEF,IAAI,mBAAmB,CAAC,MAAM,EAAE;QAC9B,GAAG,CAAC,gCAAgC,EAAE,mBAAmB,CAAC,CAAC;KAC5D;IAED,MAAM,MAAM,GAAG,uBAAA,IAAI,yGAAgB,MAApB,IAAI,EAAiB,KAAK,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;IAE9D,IAAI,MAAM,EAAE;QACV,GAAG,CAAC,qBAAqB,EAAE,MAAM,CAAC,CAAC;KACpC;IAED,OAAO,MAAM,uBAAA,IAAI,4GAAmB,MAAvB,IAAI,EAAoB,OAAO,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC;AAClE,CAAC,0DAED,KAAK,gEACH,OAAuC,EACvC,QAAe,EACf,MAAe;IAEf,MAAM,EAAE,OAAO,EAAE,kBAAkB,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC;IAC7D,MAAM,YAAY,GAA0B,EAAE,CAAC;IAE/C,IAAI,WAAW,GAAG,IAAI,CAAC;IACvB,IAAI,aAAa,GAAG,MAAM,CAAC;IAC3B,IAAI,SAAS,GAAG,CAAC,CAAC;IAElB,MAAM,cAAc,GAAG,kBAAkB;QACvC,CAAC,CAAC,SAAS;QACX,CAAC,CAAC,uBAAA,IAAI,8GAAqB,MAAzB,IAAI,EAAsB,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;IAE1C,OAAO,WAAW,EAAE;QAClB,IAAI;YACF,MAAM,QAAQ,GAAG,MAAM,IAAA,qCAAsB,EAAC;gBAC5C,OAAO;gBACP,QAAQ;gBACR,MAAM,EAAE,aAAa;gBACrB,aAAa,EAAE,KAAK;gBACpB,cAAc;aACf,CAAC,CAAC;YAEH,SAAS,IAAI,CAAC,CAAC;YAEf,IAAI,QAAQ,EAAE,IAAI,EAAE;gBAClB,YAAY,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC;aACrC;YAED,WAAW,GAAG,QAAQ,EAAE,QAAQ,EAAE,WAAW,CAAC;YAC9C,aAAa,GAAG,QAAQ,EAAE,QAAQ,EAAE,MAAM,CAAC;YAE3C,IAAI,aAAa,EAAE;gBACjB,wCAAwC;gBACxC,WAAW,CAAC,CAAC,KAAK,EAAE,EAAE;oBACpB,MAAM,GAAG,GAAG,uBAAA,IAAI,sGAAa,MAAjB,IAAI,EAAc,QAAQ,EAAE,OAAO,CAAC,CAAC;oBACjD,KAAK,CAAC,GAAG,CAAC,GAAG,aAAa,CAAC;oBAE3B,GAAG,CAAC,eAAe,EAAE,EAAE,GAAG,EAAE,SAAS,EAAE,aAAa,EAAE,CAAC,CAAC;gBAC1D,CAAC,CAAC,CAAC;aACJ;SACF;QAAC,OAAO,KAAK,EAAE;YACd,GAAG,CAAC,mCAAmC,EAAE,KAAK,CAAC,CAAC;YAChD,MAAM;SACP;KACF;IAED,GAAG,CAAC,sBAAsB,EAAE,EAAE,SAAS,EAAE,CAAC,CAAC;IAE3C,OAAO,YAAY,CAAC;AACtB,CAAC,2HAGC,OAAuC,EACvC,YAA+B;IAE/B,MAAM,EAAE,OAAO,EAAE,qBAAqB,EAAE,kBAAkB,EAAE,GAAG,OAAO,CAAC;IAEvE,IAAI,oBAAoB,GAAG,YAAY,CAAC;IAExC,IAAI,CAAC,kBAAkB,EAAE;QACvB,oBAAoB,GAAG,oBAAoB,CAAC,MAAM,CAChD,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,QAAQ,CAAC,EAAE,KAAK,OAAO,CACnC,CAAC;KACH;IAED,IAAI,CAAC,qBAAqB,EAAE;QAC1B,oBAAoB,GAAG,oBAAoB,CAAC,MAAM,CAChD,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,UAAU,CACvB,CAAC;KACH;IAED,OAAO,oBAAoB,CAAC;AAC9B,CAAC,+HAGC,OAAY,EACZ,mBAA8D;IAE9D,MAAM,WAAW,GAAG,MAAM,CAAC,mBAAmB,CAAC,WAAW,CAAC,CAAC;IAC5D,MAAM,OAAO,GAAG,KAAK,mBAAmB,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC,EAAS,CAAC;IACvE,MAAM,EAAE,IAAI,EAAE,GAAG,mBAAmB,CAAC;IACrC,MAAM,IAAI,GAAG,IAAI,IAAI,CAAC,mBAAmB,CAAC,SAAS,CAAC,CAAC,OAAO,EAAE,CAAC;IAC/D,MAAM,EAAE,GAAG,IAAA,SAAM,EAAC,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;IACnC,MAAM,EAAE,IAAI,EAAE,GAAG,mBAAmB,CAAC;IACrC,MAAM,GAAG,GAAG,IAAA,0BAAO,EAAC,IAAI,eAAE,CAAC,mBAAmB,CAAC,GAAG,CAAC,CAAC,CAAC;IACrD,MAAM,QAAQ,GAAG,IAAA,0BAAO,EAAC,IAAI,eAAE,CAAC,mBAAmB,CAAC,QAAQ,CAAC,CAAC,CAAC;IAC/D,MAAM,OAAO,GAAG,IAAA,0BAAO,EAAC,IAAI,eAAE,CAAC,mBAAmB,CAAC,OAAO,CAAC,CAAC,CAAC;IAC7D,MAAM,KAAK,GAAG,IAAA,0BAAO,EAAC,IAAI,eAAE,CAAC,mBAAmB,CAAC,KAAK,CAAC,CAAC,CAAC;IACzD,MAAM,IAAI,GAAG,uBAAe,CAAC,QAAQ,CAAC;IACtC,MAAM,oBAAoB,GAAG,KAAK,CAAC;IAEnC,MAAM,MAAM,GAAG,mBAAmB,CAAC,OAAO;QACxC,CAAC,CAAC,yBAAiB,CAAC,MAAM;QAC1B,CAAC,CAAC,yBAAiB,CAAC,SAAS,CAAC;IAEhC,MAAM,aAAa,GAAG,mBAAmB,CAAC,cAAc,CAAC,IAAI,CAC3D,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,KAAK,OAAO,IAAI,EAAE,CAAC,eAAe,CAChD,CAAC;IAEF,MAAM,UAAU,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;IAC1C,MAAM,eAAe,GAAG,aAAa,EAAE,eAAyB,CAAC;IACjE,MAAM,QAAQ,GAAG,aAAa,EAAE,OAAiB,CAAC;IAClD,MAAM,MAAM,GAAG,aAAa,EAAE,MAAgB,CAAC;IAE/C,MAAM,KAAK,GAAG,IAAA,0BAAO,EACnB,IAAI,eAAE,CAAC,aAAa,EAAE,MAAM,IAAI,mBAAmB,CAAC,KAAK,CAAC,CAC3D,CAAC;IAEF,MAAM,EAAE,GAAG,aAAa,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,mBAAmB,CAAC,EAAE,CAAC;IAE5D,OAAO;QACL,WAAW;QACX,OAAO;QACP,IAAI;QACJ,EAAE;QACF,MAAM;QACN,KAAK,EACH,MAAM,KAAK,yBAAiB,CAAC,MAAM;YACjC,CAAC,CAAC,IAAI,KAAK,CAAC,oBAAoB,CAAC;YACjC,CAAC,CAAE,SAAyC;QAChD,IAAI;QACJ,QAAQ,EAAE;YACR,OAAO;YACP,IAAI;YACJ,GAAG;YACH,QAAQ;YACR,OAAO;YACP,KAAK;YACL,EAAE;YACF,KAAK;SACN;QACD,IAAI;QACJ,oBAAoB;QACpB,UAAU;QACV,mBAAmB,EAAE,UAAU;YAC7B,CAAC,CAAC;gBACE,eAAe;gBACf,QAAQ;gBACR,MAAM;aACP;YACH,CAAC,CAAC,SAAS;KACd,CAAC;AACJ,CAAC,6GAEY,QAAe,EAAE,OAAY;IACxC,OAAO,gBAAgB,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,OAAO,EAAE,CAAC;AACzD,CAAC,mHAGC,KAA8B,EAC9B,QAAe,EACf,OAAY;IAEZ,MAAM,GAAG,GAAG,uBAAA,IAAI,sGAAa,MAAjB,IAAI,EAAc,QAAQ,EAAE,OAAO,CAAC,CAAC;IACjD,OAAO,KAAK,CAAC,GAAG,CAAuB,CAAC;AAC1C,CAAC,6HAEoB,WAAmB;IACtC,OAAO,IAAI,CAAC,KAAK,CAAC,WAAW,GAAG,IAAI,CAAC,CAAC;AACxC,CAAC","sourcesContent":["import { BNToHex } from '@metamask/controller-utils';\nimport type { Hex } from '@metamask/utils';\nimport BN from 'bn.js';\nimport { v1 as random } from 'uuid';\n\nimport type {\n  GetAccountTransactionsResponse,\n  TransactionResponse,\n} from '../api/accounts-api';\nimport { getAccountTransactions } from '../api/accounts-api';\nimport { CHAIN_IDS } from '../constants';\nimport { createModuleLogger, incomingTransactionsLogger } from '../logger';\nimport type {\n  RemoteTransactionSource,\n  RemoteTransactionSourceRequest,\n  TransactionError,\n  TransactionMeta,\n} from '../types';\nimport { TransactionStatus, TransactionType } from '../types';\n\nexport const SUPPORTED_CHAIN_IDS: Hex[] = [\n  CHAIN_IDS.MAINNET,\n  CHAIN_IDS.POLYGON,\n  CHAIN_IDS.BSC,\n  CHAIN_IDS.LINEA_MAINNET,\n  CHAIN_IDS.BASE,\n  CHAIN_IDS.OPTIMISM,\n  CHAIN_IDS.ARBITRUM,\n  CHAIN_IDS.SCROLL,\n];\n\nconst log = createModuleLogger(\n  incomingTransactionsLogger,\n  'accounts-api-source',\n);\n\n/**\n * A RemoteTransactionSource that fetches incoming transactions using the Accounts API.\n */\nexport class AccountsApiRemoteTransactionSource\n  implements RemoteTransactionSource\n{\n  getSupportedChains(): Hex[] {\n    return SUPPORTED_CHAIN_IDS;\n  }\n\n  async fetchTransactions(\n    request: RemoteTransactionSourceRequest,\n  ): Promise<TransactionMeta[]> {\n    const { address } = request;\n\n    const responseTransactions = await this.#getTransactions(request);\n\n    log('Fetched transactions', responseTransactions);\n\n    const normalizedTransactions = responseTransactions.map((tx) =>\n      this.#normalizeTransaction(address, tx),\n    );\n\n    log('Normalized transactions', normalizedTransactions);\n\n    const filteredTransactions = this.#filterTransactions(\n      request,\n      normalizedTransactions,\n    );\n\n    log('Filtered transactions', filteredTransactions);\n\n    return filteredTransactions;\n  }\n\n  async #getTransactions(request: RemoteTransactionSourceRequest) {\n    log('Getting transactions', request);\n\n    const { address, cache, chainIds: requestedChainIds } = request;\n\n    const chainIds = requestedChainIds.filter((chainId) =>\n      SUPPORTED_CHAIN_IDS.includes(chainId),\n    );\n\n    const unsupportedChainIds = requestedChainIds.filter(\n      (chainId) => !chainIds.includes(chainId),\n    );\n\n    if (unsupportedChainIds.length) {\n      log('Ignoring unsupported chain IDs', unsupportedChainIds);\n    }\n\n    const cursor = this.#getCacheCursor(cache, chainIds, address);\n\n    if (cursor) {\n      log('Using cached cursor', cursor);\n    }\n\n    return await this.#queryTransactions(request, chainIds, cursor);\n  }\n\n  async #queryTransactions(\n    request: RemoteTransactionSourceRequest,\n    chainIds: Hex[],\n    cursor?: string,\n  ): Promise<TransactionResponse[]> {\n    const { address, queryEntireHistory, updateCache } = request;\n    const transactions: TransactionResponse[] = [];\n\n    let hasNextPage = true;\n    let currentCursor = cursor;\n    let pageCount = 0;\n\n    const startTimestamp = queryEntireHistory\n      ? undefined\n      : this.#getTimestampSeconds(Date.now());\n\n    while (hasNextPage) {\n      try {\n        const response = await getAccountTransactions({\n          address,\n          chainIds,\n          cursor: currentCursor,\n          sortDirection: 'ASC',\n          startTimestamp,\n        });\n\n        pageCount += 1;\n\n        if (response?.data) {\n          transactions.push(...response.data);\n        }\n\n        hasNextPage = response?.pageInfo?.hasNextPage;\n        currentCursor = response?.pageInfo?.cursor;\n\n        if (currentCursor) {\n          // eslint-disable-next-line no-loop-func\n          updateCache((cache) => {\n            const key = this.#getCacheKey(chainIds, address);\n            cache[key] = currentCursor;\n\n            log('Updated cache', { key, newCursor: currentCursor });\n          });\n        }\n      } catch (error) {\n        log('Error while fetching transactions', error);\n        break;\n      }\n    }\n\n    log('Queried transactions', { pageCount });\n\n    return transactions;\n  }\n\n  #filterTransactions(\n    request: RemoteTransactionSourceRequest,\n    transactions: TransactionMeta[],\n  ) {\n    const { address, includeTokenTransfers, updateTransactions } = request;\n\n    let filteredTransactions = transactions;\n\n    if (!updateTransactions) {\n      filteredTransactions = filteredTransactions.filter(\n        (tx) => tx.txParams.to === address,\n      );\n    }\n\n    if (!includeTokenTransfers) {\n      filteredTransactions = filteredTransactions.filter(\n        (tx) => !tx.isTransfer,\n      );\n    }\n\n    return filteredTransactions;\n  }\n\n  #normalizeTransaction(\n    address: Hex,\n    responseTransaction: GetAccountTransactionsResponse['data'][0],\n  ): TransactionMeta {\n    const blockNumber = String(responseTransaction.blockNumber);\n    const chainId = `0x${responseTransaction.chainId.toString(16)}` as Hex;\n    const { hash } = responseTransaction;\n    const time = new Date(responseTransaction.timestamp).getTime();\n    const id = random({ msecs: time });\n    const { from } = responseTransaction;\n    const gas = BNToHex(new BN(responseTransaction.gas));\n    const gasPrice = BNToHex(new BN(responseTransaction.gasPrice));\n    const gasUsed = BNToHex(new BN(responseTransaction.gasUsed));\n    const nonce = BNToHex(new BN(responseTransaction.nonce));\n    const type = TransactionType.incoming;\n    const verifiedOnBlockchain = false;\n\n    const status = responseTransaction.isError\n      ? TransactionStatus.failed\n      : TransactionStatus.confirmed;\n\n    const valueTransfer = responseTransaction.valueTransfers.find(\n      (vt) => vt.to === address && vt.contractAddress,\n    );\n\n    const isTransfer = Boolean(valueTransfer);\n    const contractAddress = valueTransfer?.contractAddress as string;\n    const decimals = valueTransfer?.decimal as number;\n    const symbol = valueTransfer?.symbol as string;\n\n    const value = BNToHex(\n      new BN(valueTransfer?.amount ?? responseTransaction.value),\n    );\n\n    const to = valueTransfer ? address : responseTransaction.to;\n\n    return {\n      blockNumber,\n      chainId,\n      hash,\n      id,\n      status,\n      error:\n        status === TransactionStatus.failed\n          ? new Error('Transaction failed')\n          : (undefined as unknown as TransactionError),\n      time,\n      txParams: {\n        chainId,\n        from,\n        gas,\n        gasPrice,\n        gasUsed,\n        nonce,\n        to,\n        value,\n      },\n      type,\n      verifiedOnBlockchain,\n      isTransfer,\n      transferInformation: isTransfer\n        ? {\n            contractAddress,\n            decimals,\n            symbol,\n          }\n        : undefined,\n    };\n  }\n\n  #getCacheKey(chainIds: Hex[], address: Hex): string {\n    return `accounts-api#${chainIds.join(',')}#${address}`;\n  }\n\n  #getCacheCursor(\n    cache: Record<string, unknown>,\n    chainIds: Hex[],\n    address: Hex,\n  ): string | undefined {\n    const key = this.#getCacheKey(chainIds, address);\n    return cache[key] as string | undefined;\n  }\n\n  #getTimestampSeconds(timestampMs: number): number {\n    return Math.floor(timestampMs / 1000);\n  }\n}\n"]}

package/dist/helpers/AccountsApiRemoteTransactionSource.d.cts

@@ -1,5 +1,6 @@
 import type { Hex } from "@metamask/utils";
 import type { RemoteTransactionSource, RemoteTransactionSourceRequest, TransactionMeta } from "../types.cjs";
+export declare const SUPPORTED_CHAIN_IDS: Hex[];
 /**
  * A RemoteTransactionSource that fetches incoming transactions using the Accounts API.
  */

package/dist/helpers/AccountsApiRemoteTransactionSource.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"AccountsApiRemoteTransactionSource.d.cts","sourceRoot":"","sources":["../../src/helpers/AccountsApiRemoteTransactionSource.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,GAAG,EAAE,wBAAwB;AAW3C,OAAO,KAAK,EACV,uBAAuB,EACvB,8BAA8B,EAE9B,eAAe,EAChB,qBAAiB;AAmBlB;;GAEG;AACH,qBAAa,kCACX,YAAW,uBAAuB;;IAElC,kBAAkB,IAAI,GAAG,EAAE;IAIrB,iBAAiB,CACrB,OAAO,EAAE,8BAA8B,GACtC,OAAO,CAAC,eAAe,EAAE,CAAC;CAoJ9B"}
+{"version":3,"file":"AccountsApiRemoteTransactionSource.d.cts","sourceRoot":"","sources":["../../src/helpers/AccountsApiRemoteTransactionSource.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,GAAG,EAAE,wBAAwB;AAW3C,OAAO,KAAK,EACV,uBAAuB,EACvB,8BAA8B,EAE9B,eAAe,EAChB,qBAAiB;AAGlB,eAAO,MAAM,mBAAmB,EAAE,GAAG,EASpC,CAAC;AAOF;;GAEG;AACH,qBAAa,kCACX,YAAW,uBAAuB;;IAElC,kBAAkB,IAAI,GAAG,EAAE;IAIrB,iBAAiB,CACrB,OAAO,EAAE,8BAA8B,GACtC,OAAO,CAAC,eAAe,EAAE,CAAC;CAqN9B"}

package/dist/helpers/AccountsApiRemoteTransactionSource.d.mts

@@ -1,5 +1,6 @@
 import type { Hex } from "@metamask/utils";
 import type { RemoteTransactionSource, RemoteTransactionSourceRequest, TransactionMeta } from "../types.mjs";
+export declare const SUPPORTED_CHAIN_IDS: Hex[];
 /**
  * A RemoteTransactionSource that fetches incoming transactions using the Accounts API.
  */

package/dist/helpers/AccountsApiRemoteTransactionSource.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"AccountsApiRemoteTransactionSource.d.mts","sourceRoot":"","sources":["../../src/helpers/AccountsApiRemoteTransactionSource.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,GAAG,EAAE,wBAAwB;AAW3C,OAAO,KAAK,EACV,uBAAuB,EACvB,8BAA8B,EAE9B,eAAe,EAChB,qBAAiB;AAmBlB;;GAEG;AACH,qBAAa,kCACX,YAAW,uBAAuB;;IAElC,kBAAkB,IAAI,GAAG,EAAE;IAIrB,iBAAiB,CACrB,OAAO,EAAE,8BAA8B,GACtC,OAAO,CAAC,eAAe,EAAE,CAAC;CAoJ9B"}
+{"version":3,"file":"AccountsApiRemoteTransactionSource.d.mts","sourceRoot":"","sources":["../../src/helpers/AccountsApiRemoteTransactionSource.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,GAAG,EAAE,wBAAwB;AAW3C,OAAO,KAAK,EACV,uBAAuB,EACvB,8BAA8B,EAE9B,eAAe,EAChB,qBAAiB;AAGlB,eAAO,MAAM,mBAAmB,EAAE,GAAG,EASpC,CAAC;AAOF;;GAEG;AACH,qBAAa,kCACX,YAAW,uBAAuB;;IAElC,kBAAkB,IAAI,GAAG,EAAE;IAIrB,iBAAiB,CACrB,OAAO,EAAE,8BAA8B,GACtC,OAAO,CAAC,eAAe,EAAE,CAAC;CAqN9B"}