chore: edit check

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

Author: natanasow

packages/relay/src/lib/eth.ts

@@ -137,7 +137,6 @@ export class EthImpl implements Eth {
     this.filterService = new FilterService(mirrorNodeClient, logger, cacheService, this.common);
     this.feeService = new FeeService(mirrorNodeClient, this.common, logger);
     this.contractService = new ContractService(cacheService, this.common, hapiService, logger, mirrorNodeClient);
-    this.accountService = new AccountService(cacheService, this.common, logger, mirrorNodeClient);
     this.blockService = new BlockService(cacheService, chain, this.common, mirrorNodeClient, logger);
     const storage = this.redisClient
       ? new RedisPendingTransactionStorage(this.redisClient)
@@ -153,6 +152,13 @@ export class EthImpl implements Eth {
       mirrorNodeClient,
       transactionPoolService,
     );
+    this.accountService = new AccountService(
+      cacheService,
+      this.common,
+      logger,
+      mirrorNodeClient,
+      transactionPoolService,
+    );
   }
 
   /**

packages/relay/src/lib/precheck.ts

@@ -8,7 +8,7 @@ import { prepend0x } from '../formatters';
 import { MirrorNodeClient } from './clients';
 import constants from './constants';
 import { JsonRpcError, predefined } from './errors/JsonRpcError';
-import { CommonService } from './services';
+import { CommonService, TransactionPoolService } from './services';
 import { RequestDetails } from './types';
 
 /**
@@ -18,17 +18,24 @@ export class Precheck {
   private readonly mirrorNodeClient: MirrorNodeClient;
   private readonly chain: string;
   private readonly logger: Logger;
+  private readonly transactionPoolService: TransactionPoolService;
 
   /**
    * Creates an instance of Precheck.
    * @param {MirrorNodeClient} mirrorNodeClient - The MirrorNodeClient instance.
    * @param {Logger} logger - The logger instance.
    * @param {string} chainId - The chain ID.
    */
-  constructor(mirrorNodeClient: MirrorNodeClient, logger: Logger, chainId: string) {
+  constructor(
+    mirrorNodeClient: MirrorNodeClient,
+    logger: Logger,
+    chainId: string,
+    transactionPoolService: TransactionPoolService,
+  ) {
     this.mirrorNodeClient = mirrorNodeClient;
     this.logger = logger;
     this.chain = chainId;
+    this.transactionPoolService = transactionPoolService;
   }
 
   /**
@@ -70,7 +77,10 @@ export class Precheck {
     this.transactionType(parsedTx);
     this.gasLimit(parsedTx);
     const mirrorAccountInfo = await this.verifyAccount(parsedTx, requestDetails);
-    this.nonce(parsedTx, mirrorAccountInfo.ethereum_nonce);
+    this.nonce(
+      parsedTx,
+      mirrorAccountInfo.ethereum_nonce + (await this.transactionPoolService.getPendingCount(parsedTx.from!)),
+    );
     this.chainId(parsedTx);
     this.value(parsedTx);
     this.gasPrice(parsedTx, networkGasPriceInWeiBars);
@@ -105,17 +115,15 @@ export class Precheck {
   /**
    * Checks the nonce of the transaction.
    * @param tx - The transaction.
-   * @param accountInfoNonce - The nonce of the account.
+   * @param signerNonce - The nonce of the account.
    */
-  nonce(tx: Transaction, accountInfoNonce: number): void {
+  nonce(tx: Transaction, signerNonce: number): void {
     if (this.logger.isLevelEnabled('trace')) {
-      this.logger.trace(
-        `Nonce precheck for sendRawTransaction(tx.nonce=${tx.nonce}, accountInfoNonce=${accountInfoNonce})`,
-      );
+      this.logger.trace(`Nonce precheck for sendRawTransaction(tx.nonce=${tx.nonce}, signerNonce=${signerNonce})`);
     }
 
-    if (accountInfoNonce > tx.nonce) {
-      throw predefined.NONCE_TOO_LOW(tx.nonce, accountInfoNonce);
+    if (signerNonce > tx.nonce) {
+      throw predefined.NONCE_TOO_LOW(tx.nonce, signerNonce);
     }
   }
 

packages/relay/src/lib/services/ethService/accountService/AccountService.ts

@@ -9,6 +9,7 @@ import { JsonRpcError, predefined } from '../../../errors/JsonRpcError';
 import { RequestDetails } from '../../../types';
 import { LatestBlockNumberTimestamp } from '../../../types/mirrorNode';
 import { CacheService } from '../../cacheService/cacheService';
+import { TransactionPoolService } from '../../transactionPoolService/transactionPoolService';
 import { ICommonService } from '../ethCommonService/ICommonService';
 import { IAccountService } from './IAccountService';
 
@@ -70,18 +71,31 @@ export class AccountService implements IAccountService {
    */
   private readonly mirrorNodeClient: MirrorNodeClient;
 
+  /**
+   * The interface through which we interact with the transaction pool.
+   * @private
+   */
+  private readonly transactionPoolService: TransactionPoolService;
+
   /**
    * @constructor
    * @param cacheService
    * @param common
    * @param logger
    * @param mirrorNodeClient
    */
-  constructor(cacheService: CacheService, common: ICommonService, logger: Logger, mirrorNodeClient: MirrorNodeClient) {
+  constructor(
+    cacheService: CacheService,
+    common: ICommonService,
+    logger: Logger,
+    mirrorNodeClient: MirrorNodeClient,
+    transactionPoolService: TransactionPoolService,
+  ) {
     this.cacheService = cacheService;
     this.common = common;
     this.logger = logger;
     this.mirrorNodeClient = mirrorNodeClient;
+    this.transactionPoolService = transactionPoolService;
   }
 
   /**
@@ -303,8 +317,11 @@ export class AccountService implements IAccountService {
       // previewnet and testnet bug have a genesis blockNumber of 1 but non system account were yet to be created
       return constants.ZERO_HEX;
     } else if (this.common.blockTagIsLatestOrPending(blockNumOrTag)) {
-      // if latest or pending, get latest ethereumNonce from mirror node account API
-      return await this.getAccountLatestEthereumNonce(address, requestDetails);
+      const mnNonce = await this.getAccountLatestEthereumNonce(address, requestDetails);
+      if (blockNumOrTag == constants.BLOCK_PENDING) {
+        return numberTo0x(Number(mnNonce) + (await this.transactionPoolService.getPendingCount(address)));
+      }
+      return mnNonce;
     } else if (blockNumOrTag === constants.BLOCK_EARLIEST) {
       return await this.getAccountNonceForEarliestBlock(requestDetails);
     } else if (!isNaN(blockNum) && blockNumOrTag.length != constants.BLOCK_HASH_LENGTH && blockNum > 0) {

packages/relay/src/lib/services/ethService/transactionService/TransactionService.ts

@@ -94,7 +94,7 @@ export class TransactionService implements ITransactionService {
     this.hapiService = hapiService;
     this.logger = logger;
     this.mirrorNodeClient = mirrorNodeClient;
-    this.precheck = new Precheck(mirrorNodeClient, logger, chain);
+    this.precheck = new Precheck(mirrorNodeClient, logger, chain, transactionPoolService);
     this.transactionPoolService = transactionPoolService;
   }
 

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

@@ -3,7 +3,7 @@
 import MockAdapter from 'axios-mock-adapter';
 import { expect, use } from 'chai';
 import chaiAsPromised from 'chai-as-promised';
-import sinon from 'sinon';
+import sinon, { stub } from 'sinon';
 
 import { Eth, predefined } from '../../../src';
 import { numberTo0x } from '../../../src/formatters';
@@ -141,11 +141,13 @@ describe('@ethGetTransactionCount eth_getTransactionCount spec', async function
     expect(nonce).to.equal(numberTo0x(mockData.account.ethereum_nonce));
   });
 
-  it('should return latest nonce for pending block', async () => {
+  it('should return pending nonce for pending block', async () => {
+    const pendingTxs: number = 2;
+    stub(ethImpl['accountService']['transactionPoolService'], 'getPendingCount').returns(pendingTxs);
     restMock.onGet(accountPath).reply(200, JSON.stringify(mockData.account));
     const nonce = await ethImpl.getTransactionCount(MOCK_ACCOUNT_ADDR, constants.BLOCK_PENDING, requestDetails);
     expect(nonce).to.exist;
-    expect(nonce).to.equal(numberTo0x(mockData.account.ethereum_nonce));
+    expect(nonce).to.equal(numberTo0x(mockData.account.ethereum_nonce + pendingTxs));
   });
 
   it('should return 0x0 nonce for earliest block with valid block', async () => {

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

@@ -605,7 +605,7 @@ describe('Precheck', async function () {
       mock.onGet(`accounts/${parsedTx.from}${limitOrderPostFix}`).reply(200, JSON.stringify(mirrorAccount));
 
       try {
-        precheck.nonce(parsedTx, mirrorAccount.ethereum_nonce, requestDetails);
+        precheck.nonce(parsedTx, mirrorAccount.ethereum_nonce);
         expectedError();
       } catch (e: any) {
         expect(e).to.eql(predefined.NONCE_TOO_LOW(parsedTx.nonce, mirrorAccount.ethereum_nonce));
@@ -622,7 +622,7 @@ describe('Precheck', async function () {
 
       mock.onGet(`accounts/${parsedTx.from}${limitOrderPostFix}`).reply(200, JSON.stringify(mirrorAccount));
 
-      precheck.nonce(parsedTx, mirrorAccount.ethereum_nonce, requestDetails);
+      precheck.nonce(parsedTx, mirrorAccount.ethereum_nonce);
     });
   });
 

packages/relay/tests/lib/services/transactionPoolService/LocalPendingTransactionStorage.spec.ts

@@ -5,7 +5,7 @@ import * as sinon from 'sinon';
 
 import { LocalPendingTransactionStorage } from '../../../../src/lib/services/transactionPoolService/LocalPendingTransactionStorage';
 
-describe.only('LocalPendingTransactionStorage Test Suite', function () {
+describe('LocalPendingTransactionStorage Test Suite', function () {
   let storage: LocalPendingTransactionStorage;
 
   const testAddress1 = '0x742d35cc6db9027d0e0ba7d3c9e5a96f';

packages/relay/tests/lib/services/transactionPoolService/transactionPoolService.spec.ts

@@ -9,7 +9,7 @@ import { TransactionPoolService } from '../../../../src/lib/services/transaction
 import { IExecuteTransactionEventPayload } from '../../../../src/lib/types/events';
 import { AddToListResult, PendingTransactionStorage } from '../../../../src/lib/types/transactionPool';
 
-describe.only('TransactionPoolService Test Suite', function () {
+describe('TransactionPoolService Test Suite', function () {
   this.timeout(10000);
 
   let logger: Logger;