Update eth_transactioncount to use mirror (0.8) (#557)

Nana-EC · web-flow · commit 0091f246716e · 2022-09-25T23:28:53.000-05:00
Update eth_transactionaccount to use mirror node

Signed-off-by: Nana Essilfie-Conduah &lt;nana@swirldslabs.com&gt;
diff --git a/packages/relay/src/lib/clients/sdkClient.ts b/packages/relay/src/lib/clients/sdkClient.ts
@@ -261,9 +261,9 @@ export class SDKClient {
         const requestIdPrefix = formatRequestIdMessage(requestId);
         try {
             const resp = await query.execute(client);
-            this.logger.info(`${requestIdPrefix} Consensus Node query response: ${query.constructor.name} ${Status.Success._code}`);
+            this.logger.info(`${requestIdPrefix} Consensus Node ${query.constructor.name} response: ${query.paymentTransactionId} ${Status.Success._code}`);
             // local free queries will have a '0.0.0' accountId on transactionId
-            this.logger.trace(`${requestIdPrefix} ${query.paymentTransactionId} ${callerName} query cost: ${query._queryPayment}`);
+            this.logger.trace(`${requestIdPrefix} ${callerName} query cost: ${query._queryPayment}`);
 
             this.captureMetrics(
                 SDKClient.queryMode,
@@ -310,14 +310,15 @@ export class SDKClient {
         }
     };
 
-    executeGetTransactionRecord = async (resp: TransactionResponse, transactionName: string, callerName: string, requestId?: string): Promise<TransactionRecord> => {
+    async executeGetTransactionRecord(resp: TransactionResponse, transactionName: string, callerName: string, requestId?: string): Promise<TransactionRecord> {
         const requestIdPrefix = formatRequestIdMessage(requestId);
         try {
             if (!resp.getRecord) {
                 throw new SDKClientError({}, `${requestIdPrefix} Invalid response format, expected record availability: ${JSON.stringify(resp)}`);
             }
 
             const transactionRecord: TransactionRecord = await resp.getRecord(this.clientMain);
+            this.logger.info(`${requestIdPrefix} Consensus Node ${transactionName} record response: ${resp.transactionId.toString()} ${Status.Success._code}`);
             this.logger.trace(`${requestIdPrefix} ${resp.transactionId.toString()} ${callerName} transaction cost: ${transactionRecord.transactionFee}`);
             this.captureMetrics(
                 SDKClient.transactionMode,
@@ -330,14 +331,14 @@ export class SDKClient {
         catch (e: any) {
             // capture sdk record retrieval errors and shorten familiar stack trace
             const sdkClientError = new SDKClientError(e);
-            if(sdkClientError.isValidNetworkError()) {
-                this.captureMetrics(
-                    SDKClient.transactionMode,
-                    transactionName,
-                    sdkClientError.status,
-                    0,
-                    callerName);
-            }
+            this.captureMetrics(
+                SDKClient.transactionMode,
+                transactionName,
+                sdkClientError.status,
+                0,
+                callerName);
+
+            this.logger.debug(`${requestIdPrefix} Consensus Node ${transactionName} record response: ${resp.transactionId.toString()} ${sdkClientError.status}`);
 
             throw sdkClientError;
         }
diff --git a/packages/relay/src/lib/eth.ts b/packages/relay/src/lib/eth.ts
@@ -320,7 +320,7 @@ export class EthImpl implements Eth {
 
       return EthImpl.numberTo0x(gasPrice);
     } catch (error) {
-      this.logger.trace(error);
+      this.logger.error(error, `${requestIdPrefix} Failed to retrieve gasPrice`);
       throw error;
     }
   }
@@ -688,24 +688,31 @@ export class EthImpl implements Eth {
     this.logger.trace(`${requestIdPrefix} getTransactionCount(address=${address}, blockNumOrTag=${blockNumOrTag})`);
     const blockNumber = await this.translateBlockTag(blockNumOrTag, requestId);
     if (blockNumber === 0) {
-      return '0x0';
-    } else {
-      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));
-        }
-        else if (result?.type === constants.TYPE_CONTRACT) {
-          return EthImpl.numberTo0x(1);
-        }
-      } catch (e: any) {
-        this.logger.error(e, `${requestIdPrefix} Error raised during getTransactionCount for address ${address}, block number or tag ${blockNumOrTag}`);
-        return predefined.INTERNAL_ERROR;
+      return EthImpl.zeroHex;
+    } else if (address && !blockNumOrTag) {
+      // get latest ethereumNonce
+      const mirrorAccount = await this.mirrorNodeClient.getAccount(address, requestId);
+      if (mirrorAccount && mirrorAccount.ethereum_nonce) {
+        return EthImpl.numberTo0x(mirrorAccount.ethereum_nonce);
       }
-
-      return EthImpl.numberTo0x(0);
     }
+
+    // check consensus node as back up
+    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));
+      }
+      else if (result?.type === constants.TYPE_CONTRACT) {
+        return EthImpl.numberTo0x(1)
+      }
+
+      return EthImpl.zeroHex;
+    } catch (e: any) {
+      this.logger.error(e, `${requestIdPrefix} Error raised during getTransactionCount for address ${address}, block number or tag ${blockNumOrTag}`);
+      return predefined.INTERNAL_ERROR;
+    } 
   }
 
   /**
@@ -735,9 +742,16 @@ export class EthImpl implements Eth {
       try {
         // Wait for the record from the execution.
         const record = await this.sdkClient.executeGetTransactionRecord(contractExecuteResponse, EthereumTransaction.name, EthImpl.ethSendRawTransaction, requestId);
+        if (!record) {
+          this.logger.warn(`${requestIdPrefix} No record retrieved`);
+          throw predefined.INTERNAL_ERROR;
+        }
+
         if (record.ethereumHash == null) {
-          throw new Error('The ethereumHash can never be null for an ethereum transaction, and yet it was!!');
+          this.logger.error(`${requestIdPrefix} The ethereumHash can never be null for an ethereum transaction, and yet it was!!`);
+          throw predefined.INTERNAL_ERROR;
         }
+
         return  EthImpl.prepend0x(Buffer.from(record.ethereumHash).toString('hex'));
       } catch (e) {
         this.logger.error(e,
diff --git a/packages/relay/tests/lib/eth.spec.ts b/packages/relay/tests/lib/eth.spec.ts
@@ -27,7 +27,7 @@ import { Registry } from 'prom-client';
 import sinon from 'sinon';
 import cache from 'js-cache';
 dotenv.config({ path: path.resolve(__dirname, '../test.env') });
-import {RelayImpl, predefined, MirrorNodeClientError} from '@hashgraph/json-rpc-relay';
+import {RelayImpl, MirrorNodeClientError} from '@hashgraph/json-rpc-relay';
 import { EthImpl } from '../../src/lib/eth';
 import { MirrorNodeClient } from '../../src/lib/clients/mirrorNodeClient';
 import { expectUnsupportedMethod } from '../helpers';
@@ -120,7 +120,6 @@ describe('Eth calls using MirrorNode', async function () {
   const blockTimestamp = '1651560386';
   const blockTimestampHex = EthImpl.numberTo0x(Number(blockTimestamp));
   const firstTransactionTimestampSeconds = '1653077547';
-  const firstTransactionTimestampSecondsHex = EthImpl.numberTo0x(Number(firstTransactionTimestampSeconds));
   const contractAddress1 = '0x000000000000000000000000000000000000055f';
   const contractTimestamp1 = `${firstTransactionTimestampSeconds}.983983199`;
   const contractHash1 = '0x4a563af33c4871b51a8b108aa2fe1dd5280a30dfb7236170ae5e5e7957eb6392';
diff --git a/packages/relay/tests/lib/precheck.spec.ts b/packages/relay/tests/lib/precheck.spec.ts
@@ -20,7 +20,6 @@
 
 import { expect } from 'chai';
 import { Registry } from 'prom-client';
-import { BigNumber } from 'ethers';
 import { Hbar, HbarUnit } from '@hashgraph/sdk';
 const registry = new Registry();
 
@@ -33,6 +32,7 @@ import axios from "axios";
 import MockAdapter from "axios-mock-adapter";
 import { ethers } from "ethers";
 import constants from '../../src/lib/constants';
+import { predefined } from '../../src';
 const logger = pino();
 
 describe('Precheck', async function() {
