Optimise requests to mirror node to speed up relay (#788)

* Edit mirror node client

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

* Fix promises

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

* Edit promises

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

* Fix tests

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

* Edit dapp test

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

* Bump hedera-local version

* Resolve conflicts

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

* Edit default gas price

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

* Remove metamask reset

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

* Edit test

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

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

Author: natanasow

dapp-example/tests/e2e/index.spec.js

@@ -58,9 +58,7 @@ describe('Test Core Hedera User Scenarios', function() {
   }).timeout(180000);
 
   it('Transfer HBARs', function() {
-    cy.resetMetamaskAccount();
-
-    cy.get('#sendHbarsToField').type('0x54C51b7637BF6fE9709e1e0EBc8b2Ca6a24b0f0A');
+    cy.get('#sendHbarsToField').clear().type('0x54C51b7637BF6fE9709e1e0EBc8b2Ca6a24b0f0A');
     cy.get('#sendHbarsAmountField').clear().type('10000000000000000').trigger('change');
     cy.get('#sendHbarsBtn').should('not.be.disabled').click();
     cy.confirmMetamaskTransaction();

package-lock.json

@@ -46,7 +46,7 @@
         "check:node": "ts-node packages/server/tests/helpers/nodeCheck.ts"
     },
     "dependencies": {
-        "@hashgraph/hedera-local": "^2.1.3",
+        "@hashgraph/hedera-local": "^2.4.1",
         "@open-rpc/schema-utils-js": "^1.16.1",
         "@types/find-config": "^1.0.1",
         "keyv-file": "^0.2.0",

package.json

@@ -503,30 +503,57 @@ export class MirrorNodeClient {
         }
     }
 
-    public async resolveEntityType(entityIdentifier: string, requestId?: string) {
-        const contractResult = await this.getContract(entityIdentifier, requestId);
-        if (contractResult) {
-            return {
-                type: constants.TYPE_CONTRACT,
-                entity: contractResult
-            };
+    public async resolveEntityType(
+      entityIdentifier: string,
+      requestId?: string,
+      searchableTypes: any[] = [constants.TYPE_CONTRACT, constants.TYPE_ACCOUNT, constants.TYPE_TOKEN]
+    ) {
+        const buildPromise = (fn) => new Promise((resolve, reject) => fn.then((values) => {
+            if (values == null) reject();
+            resolve(values);
+        }));
+
+        if (searchableTypes.find(t => t === constants.TYPE_CONTRACT)) {
+            const contract = await this.getContract(entityIdentifier, requestId);
+            if (contract) {
+                return {
+                    type: constants.TYPE_CONTRACT,
+                    entity: contract
+                };
+            }
         }
-        const accountResult = await this.getAccount(entityIdentifier, requestId);
-        if (accountResult) {
-            return {
-                type: constants.TYPE_ACCOUNT,
-                entity: accountResult
-            };
+
+        let data;
+        try {
+            const promises = [
+                searchableTypes.find(t => t === constants.TYPE_ACCOUNT) ? buildPromise(this.getAccount(entityIdentifier, requestId)) : Promise.reject(),
+                searchableTypes.find(t => t === constants.TYPE_TOKEN) ? buildPromise(this.getTokenById(`0.0.${parseInt(entityIdentifier, 16)}`, requestId)) : Promise.reject()
+            ];
+            // maps the promises with indices of the promises array
+            // because there is no such method as Promise.anyWithIndex in js
+            // the index is needed afterward for detecting the resolved promise type (contract, account, or token)
+            // @ts-ignore
+            data = await Promise.any(promises.map((promise, index) => promise.then(value => ({ value, index }))));
+        } catch (e) {
+            return null;
         }
-        const tokenResult = await this.getTokenById(`0.0.${parseInt(entityIdentifier, 16)}`, requestId);
-        if (tokenResult) {
-            return {
-                type: constants.TYPE_TOKEN,
-                entity: tokenResult
+
+        let type;
+        switch (data.index) {
+            case 0: {
+                type = constants.TYPE_ACCOUNT;
+                break;
+            }
+            case 1: {
+                type = constants.TYPE_TOKEN;
+                break;
             }
         }
 
-        return null;
+        return {
+            type,
+            entity: data.value
+        };
     }
 
     //exposing mirror node instance for tests

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

@@ -714,7 +714,7 @@ export class EthImpl implements Eth {
     }
 
     try {
-      const result = await this.mirrorNodeClient.resolveEntityType(address, requestId);
+      const result = await this.mirrorNodeClient.resolveEntityType(address, requestId, [constants.TYPE_CONTRACT, constants.TYPE_TOKEN]);
       if (result) {
         if (result?.type === constants.TYPE_TOKEN) {
           this.logger.trace(`${requestIdPrefix} Token redirect case, return redirectBytecode`);
@@ -891,7 +891,7 @@ export class EthImpl implements Eth {
 
     // check consensus node as back up
     try {
-      const result = await this.mirrorNodeClient.resolveEntityType(address, requestId);
+      const result = await this.mirrorNodeClient.resolveEntityType(address, requestId, [constants.TYPE_ACCOUNT, constants.TYPE_CONTRACT]);
       if (result?.type === constants.TYPE_ACCOUNT) {
         const accountInfo = await this.sdkClient.getAccountInfo(result?.entity.account, EthImpl.ethGetTransactionCount, requestId);
         return EthImpl.numberTo0x(Number(accountInfo.ethereumNonce));

packages/relay/src/lib/eth.ts

@@ -261,13 +261,15 @@ describe("Open RPC Specification", function () {
         validateResponseSchema(methodsResponseSchema.eth_getBlockTransactionCountByNumber, response);
     });
 
-    it('should execute "eth_getCode" with block tag', async function () {
+    it('should execute "eth_getCode" with block tag', async function() {
+        mock.onGet(`tokens/${defaultContractResults.results[0].contract_id}`).reply(404);
         const response = await ethImpl.getCode(contractAddress1, 'latest');
 
         validateResponseSchema(methodsResponseSchema.eth_getCode, response);
     });
 
-    it('should execute "eth_getCode" with block number', async function () {
+    it('should execute "eth_getCode" with block number', async function() {
+        mock.onGet(`tokens/${defaultContractResults.results[0].contract_id}`).reply(404);
         const response = await ethImpl.getCode(contractAddress1, '0x3');
 
         validateResponseSchema(methodsResponseSchema.eth_getCode, response);

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

@@ -29,7 +29,7 @@ export default class Assertions {
     static emptyArrayHex = '0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347';
     static emptyBloom = "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000";
     static ethEmptyTrie = '0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421';
-    static defaultGasPrice = 720_000_000_000;
+    static defaultGasPrice = 710_000_000_000;
     static datedGasPrice = 570_000_000_000;
     static updatedGasPrice = 640_000_000_000;
     static maxBlockGasLimit = 15_000_000;