Cherry-Pick PR 1115 (#1140)

Removed the unnecessary call to the mirrornode for the account transa… (#1115)

* Removed the unnecessary call to the mirrornode for the account transactions.



* Implemented a pagination fix and updated mocks.



* Applied feedback from PR review.



* Updated test to include corrent next linl in account pagination.



---------

Signed-off-by: ebadiere <[email protected]>
Signed-off-by: Alfredo Gutierrez <[email protected]>
Co-authored-by: Eric Badiere <[email protected]>

Author: AlfredoG87

packages/relay/src/lib/clients/mirrorNodeClient.ts

@@ -82,7 +82,6 @@ export class MirrorNodeClient {
     private static CONTRACT_STATE_PROPERTY = 'state';
 
 
-
     private static ORDER = {
         ASC: 'asc',
         DESC: 'desc'
@@ -322,6 +321,13 @@ export class MirrorNodeClient {
             requestId);
     }
 
+    public async getAccountPageLimit(idOrAliasOrEvmAddress: string, requestId?: string) {
+        return this.get(`${MirrorNodeClient.GET_ACCOUNTS_ENDPOINT}${idOrAliasOrEvmAddress}?limit=${constants.MIRROR_NODE_QUERY_LIMIT}`,
+            MirrorNodeClient.GET_ACCOUNTS_ENDPOINT,
+            [400, 404],
+            requestId);
+    }
+
     public async getTransactionsForAccount(accountId: string, timestampFrom: string, timestampTo: string, requestId?: string) {
         const queryParamObject = {};
         this.setQueryParam(queryParamObject, 'account.id', accountId);

packages/relay/src/lib/eth.ts

@@ -642,7 +642,7 @@ export class EthImpl implements Eth {
     let blockNumber = null;
     let balanceFound = false;
     let weibars: BigInt = BigInt(0);
-    const mirrorAccount = await this.mirrorNodeClient.getAccount(account, requestId);
+    const mirrorAccount = await this.mirrorNodeClient.getAccountPageLimit(account, requestId);
 
     try {
       if (!EthImpl.blockTagIsLatestOrPending(blockNumberOrTag)) {
@@ -669,12 +669,38 @@ export class EthImpl implements Eth {
                   currentTimestamp = mirrorAccount.balance.timestamp;
                 }
 
-                let transactionsInTimeWindow = await this.mirrorNodeClient.getTransactionsForAccount(
-                  mirrorAccount.account,
-                  block.timestamp.to,
-                  currentTimestamp,
-                  requestId
-                );
+                // Need to check if there are any transactions before the block.timestamp.to in the current account set returned from the inital
+                // call to getAccountPageLimit.  If there are we may need to paginate.
+                let lastTransactionOnPageTimestamp;
+                if(mirrorAccount.links.next !== null) {
+                  // Get the end of the page of transactions timestamp
+                  const params = new URLSearchParams(mirrorAccount.links.next.split('?')[1]);
+                  if((params === null) || (params === undefined)) {
+                    this.logger.debug(`${requestIdPrefix} Unable to find expected search parameters in account next page link ${mirrorAccount.links.next}), returning 0x0 balance`);
+                    return EthImpl.zeroHex;
+                  }
+
+                  const timestampParameters = params.getAll('timestamp'); 
+                  lastTransactionOnPageTimestamp = timestampParameters[0].split(':')[1];
+                  if((lastTransactionOnPageTimestamp === null) || (lastTransactionOnPageTimestamp === undefined)) {
+                    this.logger.debug(`${requestIdPrefix} Unable to find expected beginning (gte:) timestamp in account next page link ${mirrorAccount.links.next}), returning 0x0 balance`);
+                    return EthImpl.zeroHex;
+                  }
+                }
+
+                let transactionsInTimeWindow: any = [];
+                if((typeof lastTransactionOnPageTimestamp !== "undefined") && (mirrorAccount.transactions[mirrorAccount.transactions.length -1].consensus_timestamp >= lastTransactionOnPageTimestamp)) {
+                  transactionsInTimeWindow = await this.mirrorNodeClient.getTransactionsForAccount(
+                    mirrorAccount.account,
+                    block.timestamp.to,
+                    currentTimestamp,
+                    requestId
+                  );
+                } else {
+                    transactionsInTimeWindow = mirrorAccount.transactions.filter((tx: any) => {
+                    return tx.consensus_timestamp >= block.timestamp.to && tx.consensus_timestamp <= currentTimestamp;
+                  });
+                }
 
                 for(const tx of transactionsInTimeWindow) {
                   for (const transfer of tx.transfers) {
@@ -1611,7 +1637,7 @@ export class EthImpl implements Eth {
     const logs = logResults.flatMap(logResult => logResult ? logResult : [] );
     logs.sort((a: any, b: any) => {
       return a.timestamp >= b.timestamp ? 1 : -1;
-    })
+    });
 
     return logs;
   }