Merge pull request #6852 from BitGo/COIN-5065

fix: fixed gasPrice issue for base

Author: HimanshuS2212

modules/abstract-eth/src/abstractEthLikeNewCoins.ts

@@ -1486,7 +1486,7 @@ export abstract class AbstractEthLikeNewCoins extends AbstractEthLikeCoin {
     // Get sequence ID using contract call
     // we need to wait between making two explorer api calls to avoid getting banned
     await new Promise((resolve) => setTimeout(resolve, 1000));
-    const sequenceId = await this.querySequenceId(params.walletContractAddress);
+    const sequenceId = await this.querySequenceId(params.walletContractAddress, params.apiKey);
 
     let operationHash, signature;
     // Get operation hash and sign it
@@ -1681,7 +1681,7 @@ export abstract class AbstractEthLikeNewCoins extends AbstractEthLikeCoin {
       ? new optionalDeps.ethUtil.BN(params.eip1559.maxFeePerGas)
       : params.gasPrice
       ? new optionalDeps.ethUtil.BN(this.setGasPrice(params.gasPrice))
-      : await this.getGasPriceFromExternalAPI(this.staticsCoin?.name as string);
+      : await this.getGasPriceFromExternalAPI(this.staticsCoin?.name as string, params.apiKey);
 
     const bitgoFeeAddressNonce = await this.getAddressNonce(bitgoFeeAddress, params.apiKey);
 
@@ -1916,7 +1916,7 @@ export abstract class AbstractEthLikeNewCoins extends AbstractEthLikeCoin {
     // Get sequence ID using contract call
     // we need to wait between making two explorer api calls to avoid getting banned
     await new Promise((resolve) => setTimeout(resolve, 1000));
-    const sequenceId = await this.querySequenceId(params.walletContractAddress);
+    const sequenceId = await this.querySequenceId(params.walletContractAddress, params.apiKey);
 
     const txBuilder = this.getTransactionBuilder(params.common) as TransactionBuilder;
     txBuilder.counter(bitgoFeeAddressNonce);
@@ -1975,7 +1975,8 @@ export abstract class AbstractEthLikeNewCoins extends AbstractEthLikeCoin {
         params.intendedChain as string,
         params.bitgoFeeAddress as string,
         params.walletContractAddress,
-        sendData
+        sendData,
+        apiKey
       );
       txBuilder.fee({
         ...txFee,
@@ -1984,7 +1985,7 @@ export abstract class AbstractEthLikeNewCoins extends AbstractEthLikeCoin {
     }
 
     // Get the balance of bitgoFeeAddress to ensure funds are available to pay fees
-    await this.ensureSufficientBalance(params.bitgoFeeAddress as string, gasPrice, gasLimit);
+    await this.ensureSufficientBalance(params.bitgoFeeAddress as string, gasPrice, gasLimit, params.apiKey);
 
     const tx = await txBuilder.build();
 

modules/sdk-coin-evm/src/evmCoin.ts

@@ -52,16 +52,20 @@ export class EvmCoin extends AbstractEthLikeNewCoins {
   /**
    * Make a query to chain explorer for information such as balance, token balance, solidity calls
    * @param {Object} query key-value pairs of parameters to append after /api
+   * @param {string} apiKey optional API key to use for the query falls back to EVM config if not provided
    * @returns {Promise<Object>} response from chain explorer
    */
-  async recoveryBlockchainExplorerQuery(query: Record<string, string>): Promise<Record<string, unknown>> {
+  async recoveryBlockchainExplorerQuery(
+    query: Record<string, string>,
+    apiKey?: string
+  ): Promise<Record<string, unknown>> {
     const evmConfig = common.Environments[this.bitgo.getEnv()].evm;
     assert(
       evmConfig && this.getFamily() in evmConfig,
       `env config is missing for ${this.getFamily()} in ${this.bitgo.getEnv()}`
     );
 
-    const apiToken = evmConfig[this.getFamily()].apiToken;
+    const apiToken = apiKey || evmConfig[this.getFamily()].apiToken;
     const explorerUrl = evmConfig[this.getFamily()].baseUrl;
     return await recoveryBlockchainExplorerQuery(query, explorerUrl as string, apiToken as string);
   }

modules/sdk-core/src/bitgo/environments.ts

@@ -251,6 +251,9 @@ const mainnetBase: EnvironmentTemplate = {
     somi: {
       baseUrl: 'https://mainnet.somnia.w3us.site/',
     },
+    baseeth: {
+      baseUrl: 'https://api.etherscan.io/v2',
+    },
   },
   icpNodeUrl: 'https://ic0.app',
   worldExplorerBaseUrl: 'https://worldscan.org/',
@@ -370,6 +373,9 @@ const testnetBase: EnvironmentTemplate = {
     ip: {
       baseUrl: 'https://api.storyscan.app/',
     },
+    tbaseeth: {
+      baseUrl: 'https://api.etherscan.io/v2',
+    },
   },
   stxNodeUrl: 'https://api.testnet.hiro.so',
   vetNodeUrl: 'https://rpc-testnet.vechain.energy',