Remove eth.getLogEvmAddress() (#768)

* Remove methods

Signed-off-by: nikolay <[email protected]>

* Edit eth.ts

Signed-off-by: nikolay <[email protected]>

* Edit mirror node version

Signed-off-by: nikolay <[email protected]>

* Edit test

Signed-off-by: nikolay <[email protected]>

* Edit test

Signed-off-by: nikolay <[email protected]>

* Edit test

Signed-off-by: nikolay <[email protected]>

Signed-off-by: nikolay <[email protected]>

Author: natanasow

packages/relay/src/lib/eth.ts

@@ -93,7 +93,7 @@ export class EthImpl implements Eth {
    *
    * @private
    */
-   private readonly cache;
+  private readonly cache;
 
   /**
    * The sdk client use for connecting to both the consensus nodes and mirror node. The account
@@ -583,10 +583,10 @@ export class EthImpl implements Eth {
                 }
 
                 let transactionsInTimeWindow = await this.mirrorNodeClient.getTransactionsForAccount(
-                    mirrorAccount.account,
-                    block.timestamp.to,
-                    currentTimestamp,
-                    requestId
+                  mirrorAccount.account,
+                  block.timestamp.to,
+                  currentTimestamp,
+                  requestId
                 );
 
                 for(const tx of transactionsInTimeWindow) {
@@ -665,7 +665,7 @@ export class EthImpl implements Eth {
         }
         else if (result?.type === constants.TYPE_CONTRACT) {
           if (result?.entity.runtime_bytecode !== EthImpl.emptyHex) {
-              return result?.entity.runtime_bytecode;
+            return result?.entity.runtime_bytecode;
           }
         }
       }
@@ -836,8 +836,8 @@ export class EthImpl implements Eth {
     try {
       const result = await this.mirrorNodeClient.resolveEntityType(address, requestId);
       if (result?.type === constants.TYPE_ACCOUNT) {
-          const accountInfo = await this.sdkClient.getAccountInfo(result?.entity.account, EthImpl.ethGetTransactionCount, requestId);
-          return EthImpl.numberTo0x(Number(accountInfo.ethereumNonce));
+        const accountInfo = await this.sdkClient.getAccountInfo(result?.entity.account, EthImpl.ethGetTransactionCount, requestId);
+        return EthImpl.numberTo0x(Number(accountInfo.ethereumNonce));
       }
       else if (result?.type === constants.TYPE_CONTRACT) {
         return EthImpl.numberTo0x(1);
@@ -1414,7 +1414,7 @@ export class EthImpl implements Eth {
         return EMPTY_RESPONSE;
       }
     } else if ( !(await this.validateBlockRangeAndAddTimestampToParams(params, fromBlock, toBlock, requestId)) ) {
-        return EMPTY_RESPONSE;
+      return EMPTY_RESPONSE;
     }
 
     this.addTopicsToParams(params, topics);
@@ -1435,7 +1435,7 @@ export class EthImpl implements Eth {
     for(const log of logResults) {
       logs.push(
         new Log({
-          address: await this.getLogEvmAddress(log.address, requestId) || log.address,
+          address: log.address,
           blockHash: EthImpl.toHash32(log.block_hash),
           blockNumber: EthImpl.numberTo0x(log.block_number),
           data: log.data,
@@ -1457,21 +1457,6 @@ export class EthImpl implements Eth {
     return EthImpl.zeroHex;
   }
 
-  private async getLogEvmAddress(address: string, requestId: string | undefined) {
-    const cachedLabel = `getLogEvmAddress.${address}`;
-    let contractAddress = this.cache.get(cachedLabel);
-
-    // If contractAddress === undefined it means there's no cache record
-    // and a mirror node request should be executed.
-    if (contractAddress === undefined) {
-      const contract = await this.mirrorNodeClient.getContract(address, requestId);
-      contractAddress = contract.evm_address;
-      this.cache.set(cachedLabel, contractAddress);
-    }
-
-    return contractAddress;
-  }
-
   static isArrayNonEmpty(input: any): boolean {
     return Array.isArray(input) && input.length > 0;
   }

packages/relay/tests/lib/eth.spec.ts

@@ -261,7 +261,7 @@ describe('Eth calls using MirrorNode', async function () {
 
   const defaultLogs1 = [
     {
-      "address": "0x0000000000000000000000000000000002131951",
+      "address": "0x67D8d32E9Bf1a9968a5ff53B87d777Aa8EBBEe69",
       "bloom": logBloom1,
       "contract_id": contractId1,
       "data": "0x",
@@ -275,7 +275,7 @@ describe('Eth calls using MirrorNode', async function () {
       "transaction_index": 1
     },
     {
-      "address": "0x0000000000000000000000000000000002131951",
+      "address": "0x67D8d32E9Bf1a9968a5ff53B87d777Aa8EBBEe69",
       "bloom": logBloom2,
       "contract_id": contractId1,
       "data": "0x",
@@ -292,7 +292,7 @@ describe('Eth calls using MirrorNode', async function () {
 
   const defaultLogs2 = [
     {
-      "address": "0x0000000000000000000000000000000002131951",
+      "address": "0x67D8d32E9Bf1a9968a5ff53B87d777Aa8EBBEe69",
       "bloom": logBloom3,
       "contract_id": contractId1,
       "data": "0x",
@@ -309,7 +309,7 @@ describe('Eth calls using MirrorNode', async function () {
 
   const defaultLogs3 = [
     {
-      "address": "0x0000000000000000000000000000000002131951",
+      "address": "0x67D8d32E9Bf1a9968a5ff53B87d777Aa8EBBEe69",
       "bloom": logBloom4,
       "contract_id": contractId2,
       "data": "0x",
@@ -326,7 +326,7 @@ describe('Eth calls using MirrorNode', async function () {
 
   const defaultLogs4 = [
     {
-      "address": "0x0000000000000000000000000000000002131951",
+      "address": "0x67D8d32E9Bf1a9968a5ff53B87d777Aa8EBBEe69",
       "bloom": logBloom4,
       "contract_id": contractId2,
       "data": "0x",
@@ -1679,15 +1679,15 @@ describe('Eth calls using MirrorNode', async function () {
     it('should be able to return more than two logs with limit of two per request', async function () {
       const unfilteredLogs = {
         logs: [
-          {...defaultLogs.logs[0], address: "0x0000000000000000000000000000000002131951"},
+          {...defaultLogs.logs[0], address: "0x67D8d32E9Bf1a9968a5ff53B87d777Aa8EBBEe69"},
           {...defaultLogs.logs[1], address: "0x0000000000000000000000000000000002131952"},
           {...defaultLogs.logs[2], address: "0x0000000000000000000000000000000002131953"},
           {...defaultLogs.logs[3], address: "0x0000000000000000000000000000000002131954"}
         ]
       }
       const filteredLogs = {
         logs: [
-          {...defaultLogs.logs[0], address: "0x0000000000000000000000000000000002131951"},
+          {...defaultLogs.logs[0], address: "0x67D8d32E9Bf1a9968a5ff53B87d777Aa8EBBEe69"},
           {...defaultLogs.logs[1], address: "0x0000000000000000000000000000000002131952"}
         ],
         links: {next: 'contracts/results/logs?limit=2&order=desc&timestamp=lte:1668432962.375200975&index=lt:0'}
@@ -1739,24 +1739,6 @@ describe('Eth calls using MirrorNode', async function () {
       expect(result[0].address).to.eq(defaultEvmAddress);
     });
 
-    it('Should cache contracts/contractIdOrAddress request', async function () {
-      mock.onGet("blocks?limit=1&order=desc").reply(200, { blocks: [defaultBlock] });
-      mock.onGet(`contracts/results/logs?timestamp=gte:${defaultBlock.timestamp.from}&timestamp=lte:${defaultBlock.timestamp.to}&limit=100&order=asc`).reply(200, defaultLogs);
-      mock.onGet(`contracts/${defaultLogs.logs[0].address}`).replyOnce(200, defaultContract); // This mock will fire only once, if the request is not cached, the test will fail with no mock error
-
-      const result = await ethImpl.getLogs(null, null, null, null, null);
-
-      expect(cache.keyList.includes('getLogEvmAddress.0x0000000000000000000000000000000002131951')).to.be.true;
-
-      expect(result).to.exist;
-      expect(result.length).to.eq(4);
-
-      expectLogData1(result[0]);
-      expectLogData2(result[1]);
-      expectLogData3(result[2]);
-      expectLogData4(result[3]);
-    });
-
     it('address filter', async function () {
       const filteredLogs = {
         logs: [defaultLogs.logs[0], defaultLogs.logs[1], defaultLogs.logs[2]]