@toruslabs/ethereum-controllers 5.6.5 → 5.7.0

package/dist/ethereumControllers.cjs.js

@@ -1560,43 +1560,48 @@ function getEtherScanHashLink(txHash, chainId) {
   if (!SUPPORTED_NETWORKS[chainId]) return "";
   return `${SUPPORTED_NETWORKS[chainId].blockExplorerUrl}/tx/${txHash}`;
 }
-const formatPastTx = (x, lowerCaseSelectedAddress) => {
-  var _x$to;
+const formatPastTx = params => {
+  var _transaction$to;
+  const {
+    transaction,
+    lowerCaseSelectedAddress,
+    blockExplorerUrl
+  } = params;
   let totalAmountString = "";
-  if (x.type === CONTRACT_TYPE_ERC721 || x.type === CONTRACT_TYPE_ERC1155) totalAmountString = x.symbol;else if (x.type === CONTRACT_TYPE_ERC20) totalAmountString = (0,base_controllers_namespaceObject.formatSmallNumbers)(Number.parseFloat(x.total_amount), x.symbol, true);else totalAmountString = (0,base_controllers_namespaceObject.formatSmallNumbers)(Number.parseFloat(x.total_amount), x.type_name, true);
-  const currencyAmountString = x.type === CONTRACT_TYPE_ERC721 || x.type === CONTRACT_TYPE_ERC1155 || x.isEtherscan ? "" : (0,base_controllers_namespaceObject.formatSmallNumbers)(Number.parseFloat(x.currency_amount), x.selected_currency, true);
+  if (transaction.type === CONTRACT_TYPE_ERC721 || transaction.type === CONTRACT_TYPE_ERC1155) totalAmountString = transaction.symbol;else if (transaction.type === CONTRACT_TYPE_ERC20) totalAmountString = (0,base_controllers_namespaceObject.formatSmallNumbers)(Number.parseFloat(transaction.total_amount), transaction.symbol, true);else totalAmountString = (0,base_controllers_namespaceObject.formatSmallNumbers)(Number.parseFloat(transaction.total_amount), transaction.type_name, true);
+  const currencyAmountString = transaction.type === CONTRACT_TYPE_ERC721 || transaction.type === CONTRACT_TYPE_ERC1155 || transaction.isEtherscan ? "" : (0,base_controllers_namespaceObject.formatSmallNumbers)(Number.parseFloat(transaction.currency_amount), transaction.selected_currency, true);
   const finalObject = {
-    id: x.created_at.toString(),
-    date: new Date(x.created_at).toString(),
-    from: x.from,
-    from_aa_address: x.from_aa_address,
-    slicedFrom: typeof x.from === "string" ? (0,base_controllers_namespaceObject.addressSlicer)(x.from) : "",
-    to: x.to,
-    slicedTo: typeof x.to === "string" ? (0,base_controllers_namespaceObject.addressSlicer)(x.to) : "",
-    action: lowerCaseSelectedAddress === ((_x$to = x.to) === null || _x$to === void 0 ? void 0 : _x$to.toLowerCase()) || "" ? base_controllers_namespaceObject.ACTIVITY_ACTION_RECEIVE : base_controllers_namespaceObject.ACTIVITY_ACTION_SEND,
-    totalAmount: x.total_amount,
+    id: transaction.created_at.toString(),
+    date: new Date(transaction.created_at).toString(),
+    from: transaction.from,
+    from_aa_address: transaction.from_aa_address,
+    slicedFrom: typeof transaction.from === "string" ? (0,base_controllers_namespaceObject.addressSlicer)(transaction.from) : "",
+    to: transaction.to,
+    slicedTo: typeof transaction.to === "string" ? (0,base_controllers_namespaceObject.addressSlicer)(transaction.to) : "",
+    action: lowerCaseSelectedAddress === ((_transaction$to = transaction.to) === null || _transaction$to === void 0 ? void 0 : _transaction$to.toLowerCase()) || "" ? base_controllers_namespaceObject.ACTIVITY_ACTION_RECEIVE : base_controllers_namespaceObject.ACTIVITY_ACTION_SEND,
+    totalAmount: transaction.total_amount,
     totalAmountString,
-    currencyAmount: x.currency_amount,
+    currencyAmount: transaction.currency_amount,
     currencyAmountString,
     amount: `${totalAmountString} / ${currencyAmountString}`,
-    status: x.status,
-    etherscanLink: getEtherScanHashLink(x.transaction_hash, x.chain_id || MAINNET_CHAIN_ID),
-    chainId: x.chain_id,
-    ethRate: Number.parseFloat(x === null || x === void 0 ? void 0 : x.total_amount) && Number.parseFloat(x === null || x === void 0 ? void 0 : x.currency_amount) ? `1 ${x.symbol} = ${(0,base_controllers_namespaceObject.significantDigits)(Number.parseFloat(x.currency_amount) / Number.parseFloat(x.total_amount))}` : "",
-    currencyUsed: x.selected_currency,
-    type: x.type,
-    type_name: x.type_name,
-    type_image_link: x.type_image_link,
-    transaction_hash: x.transaction_hash,
-    transaction_category: x.transaction_category,
-    isEtherscan: x.isEtherscan,
-    input: x.input || "",
-    token_id: x.token_id || "",
-    contract_address: x.contract_address || "",
-    nonce: x.nonce || "",
-    is_cancel: !!x.is_cancel || false,
-    gas: x.gas || "",
-    gasPrice: x.gasPrice || ""
+    status: transaction.status,
+    etherscanLink: blockExplorerUrl ? `${blockExplorerUrl}/tx/${transaction.transaction_hash}` : "",
+    chainId: transaction.chain_id,
+    ethRate: Number.parseFloat(transaction === null || transaction === void 0 ? void 0 : transaction.total_amount) && Number.parseFloat(transaction === null || transaction === void 0 ? void 0 : transaction.currency_amount) ? `1 ${transaction.symbol} = ${(0,base_controllers_namespaceObject.significantDigits)(Number.parseFloat(transaction.currency_amount) / Number.parseFloat(transaction.total_amount))}` : "",
+    currencyUsed: transaction.selected_currency,
+    type: transaction.type,
+    type_name: transaction.type_name,
+    type_image_link: transaction.type_image_link,
+    transaction_hash: transaction.transaction_hash,
+    transaction_category: transaction.transaction_category,
+    isEtherscan: transaction.isEtherscan,
+    input: transaction.input || "",
+    token_id: transaction.token_id || "",
+    contract_address: transaction.contract_address || "",
+    nonce: transaction.nonce || "",
+    is_cancel: !!transaction.is_cancel || false,
+    gas: transaction.gas || "",
+    gasPrice: transaction.gasPrice || ""
   };
   return finalObject;
 };
@@ -1692,7 +1697,14 @@ function getChainType(chainId) {
   }
   return "custom";
 }
-const addEtherscanTransactions = async (txn, lowerCaseSelectedAddress, provider, chainId) => {
+const addEtherscanTransactions = async params => {
+  const {
+    txn,
+    lowerCaseSelectedAddress,
+    provider,
+    chainId,
+    blockExplorerUrl
+  } = params;
   const transactionPromises = await Promise.all(txn.map(async tx => {
     var _SUPPORTED_NETWORKS$c, _SUPPORTED_NETWORKS$c2;
     const {
@@ -1722,7 +1734,6 @@ const addEtherscanTransactions = async (txn, lowerCaseSelectedAddress, provider,
       totalAmountString = x.tokenValue;
     }
     const etherscanTransaction = {
-      etherscanLink: getEtherScanHashLink(x.hash, chainId),
       type,
       type_image_link: x.type_image_link || "n/a",
       type_name: x.tokenName || ((_SUPPORTED_NETWORKS$c3 = SUPPORTED_NETWORKS[chainId]) === null || _SUPPORTED_NETWORKS$c3 === void 0 ? void 0 : _SUPPORTED_NETWORKS$c3.ticker) || "n/a",
@@ -1747,7 +1758,11 @@ const addEtherscanTransactions = async (txn, lowerCaseSelectedAddress, provider,
       is_cancel: false,
       selected_currency: ""
     };
-    accumulator.push(formatPastTx(etherscanTransaction, lowerCaseSelectedAddress));
+    accumulator.push(formatPastTx({
+      transaction: etherscanTransaction,
+      lowerCaseSelectedAddress,
+      blockExplorerUrl
+    }));
     return accumulator;
   }, []);
   return finalTxs;
@@ -2425,7 +2440,7 @@ class GasFeeController extends base_controllers_namespaceObject.BaseController {
     const newChainId = this.getNetworkIdentifier();
     if (this.currentChainId !== newChainId) {
       this.currentChainId = newChainId;
-      await this.resetPolling();
+      await this.fetchGasFeeEstimates();
     }
   }
   async resetPolling() {
@@ -3847,11 +3862,120 @@ function createEthereumMiddleware(providerHandlers) {
     processAddEthereumChain
   })]);
 }
+;// CONCATENATED MODULE: external "fast-safe-stringify"
+const external_fast_safe_stringify_namespaceObject = require("fast-safe-stringify");
+var external_fast_safe_stringify_default = /*#__PURE__*/__webpack_require__.n(external_fast_safe_stringify_namespaceObject);
+;// CONCATENATED MODULE: ./src/Network/cacheIdentifier.ts
+
+let CacheStrategy = /*#__PURE__*/function (CacheStrategy) {
+  CacheStrategy["Block"] = "block";
+  CacheStrategy["Fork"] = "fork";
+  CacheStrategy["Never"] = "never";
+  CacheStrategy["Permanent"] = "perma";
+  return CacheStrategy;
+}({});
+function blockTagParamIndex(method) {
+  switch (method) {
+    // blockTag is at index 2
+    case "eth_getStorageAt":
+      return 2;
+    // blockTag is at index 1
+    case "eth_getBalance":
+    case "eth_getCode":
+    case "eth_getTransactionCount":
+    case "eth_call":
+      return 1;
+    // blockTag is at index 0
+    case "eth_getBlockByNumber":
+      return 0;
+    // there is no blockTag
+    default:
+      return undefined;
+  }
+}
+function cacheTypeForMethod(method) {
+  switch (method) {
+    // cache permanently
+    case "web3_clientVersion":
+    case "web3_sha3":
+    case "eth_protocolVersion":
+    case "eth_getBlockTransactionCountByHash":
+    case "eth_getUncleCountByBlockHash":
+    case "eth_getCode":
+    case "eth_getBlockByHash":
+    case "eth_getTransactionByHash":
+    case "eth_getTransactionByBlockHashAndIndex":
+    case "eth_getTransactionReceipt":
+    case "eth_getUncleByBlockHashAndIndex":
+    case "eth_getCompilers":
+    case "eth_compileLLL":
+    case "eth_compileSolidity":
+    case "eth_compileSerpent":
+    case "shh_version":
+    case "test_permaCache":
+      return CacheStrategy.Permanent;
+
+    // cache until fork
+    case "eth_getBlockByNumber":
+    case "eth_getBlockTransactionCountByNumber":
+    case "eth_getUncleCountByBlockNumber":
+    case "eth_getTransactionByBlockNumberAndIndex":
+    case "eth_getUncleByBlockNumberAndIndex":
+    case "test_forkCache":
+      return CacheStrategy.Fork;
+
+    // cache for block
+    case "eth_gasPrice":
+    case "eth_blockNumber":
+    case "eth_getBalance":
+    case "eth_getStorageAt":
+    case "eth_getTransactionCount":
+    case "eth_call":
+    case "eth_estimateGas":
+    case "eth_getFilterLogs":
+    case "eth_getLogs":
+    case "test_blockCache":
+      return CacheStrategy.Block;
+
+    // never cache
+    default:
+      return CacheStrategy.Never;
+  }
+}
+function canCache(method) {
+  return cacheTypeForMethod(method) !== CacheStrategy.Never;
+}
+function paramsWithoutBlockTag(request) {
+  if (!request.params) {
+    return [];
+  }
+  const index = blockTagParamIndex(request.method);
+
+  // Block tag param not passed.
+  if (index === undefined || !Array.isArray(request.params) || index >= request.params.length) {
+    return request.params;
+  }
+
+  // eth_getBlockByNumber has the block tag first, then the optional includeTx? param
+  if (request.method === "eth_getBlockByNumber") {
+    return request.params.slice(1);
+  }
+  return request.params.slice(0, index);
+}
+function cacheIdentifierForRequest(request, skipBlockRef) {
+  var _request$params;
+  const simpleParams = skipBlockRef ? paramsWithoutBlockTag(request) : (_request$params = request.params) !== null && _request$params !== void 0 ? _request$params : [];
+  if (canCache(request.method)) {
+    return `${request.method}:${external_fast_safe_stringify_default()(simpleParams)}`;
+  }
+  return null;
+}
 ;// CONCATENATED MODULE: ./src/Network/createJsonRpcClient.ts
 
 
 
 
+
 function createChainIdMiddleware(chainId) {
   return (req, res, next, end) => {
     if (req.method === "eth_chainId") {
@@ -3894,7 +4018,9 @@ function createJsonRpcClient(providerConfig, networkConfig) {
   // No need for the following middlewares for web because all browser sessions are quite short lived and each session is limited to scope of a window/tab
   // createBlockRefRewriteMiddleware({ blockTracker }),
   // createBlockCacheMiddleware({ blockTracker }),
-  // createInflightCacheMiddleware(),
+  (0,base_controllers_namespaceObject.createInflightCacheMiddleware)({
+    cacheIdentifierForRequest: cacheIdentifierForRequest
+  }),
   // createBlockTrackerInspectorMiddleware({ blockTracker }),
   fetchMiddleware]);
   return {
@@ -4663,7 +4789,10 @@ class PreferencesController extends base_controllers_namespaceObject.BasePrefere
   }
   async patchNewTx(tx, address) {
     var _this$getAddressState2;
-    const formattedTx = formatPastTx(tx);
+    const formattedTx = formatPastTx({
+      transaction: tx,
+      blockExplorerUrl: this.getBlockExplorerUrl()
+    });
     const storePastTx = ((_this$getAddressState2 = this.getAddressState(address)) === null || _this$getAddressState2 === void 0 ? void 0 : _this$getAddressState2.formattedPastTransactions) || [];
     const duplicateIndex = storePastTx.findIndex(x => x.transaction_hash === tx.transaction_hash && x.chainId === tx.chain_id);
     if (tx.status === base_controllers_namespaceObject.TransactionStatus.submitted || tx.status === base_controllers_namespaceObject.TransactionStatus.confirmed) {
@@ -4709,7 +4838,13 @@ class PreferencesController extends base_controllers_namespaceObject.BasePrefere
           selectedAddress,
           chainId: this.getProviderConfig().chainId
         });
-        const finalEthScanTxn = await addEtherscanTransactions(etherscanTxn, lowerCaseSelectedAddress, this.provider, chainId);
+        const finalEthScanTxn = await addEtherscanTransactions({
+          txn: etherscanTxn,
+          lowerCaseSelectedAddress,
+          provider: this.provider,
+          chainId,
+          blockExplorerUrl: this.getBlockExplorerUrl()
+        });
         external_loglevel_default().info("Formatted Etherscan Response", finalEthScanTxn);
         this.updateState({
           etherscanTransactions: finalEthScanTxn
@@ -4897,17 +5032,29 @@ class PreferencesController extends base_controllers_namespaceObject.BasePrefere
     }, []);
     return [...supported, ...custom];
   }
+  getBlockExplorerUrl() {
+    const supportedNetworks = this.getChainOptions();
+    const network = supportedNetworks.find(x => x.chainId === this.getProviderConfig().chainId);
+    if (!network) return "";
+    return `${network.blockExplorerUrl}`;
+  }
   async calculatePastTx(txs, address) {
     const pastTx = [];
     const pendingTx = [];
     const lowerCaseSelectedAddress = address.toLowerCase();
+    const supportedNetworks = this.getChainOptions(address);
+    const supportedNetwork = supportedNetworks.find(x => x.chainId === this.getProviderConfig().chainId);
     for (const x of txs) {
       var _x$to;
-      if (x.chain_id === SUPPORTED_NETWORKS[this.getProviderConfig().chainId].chainId && x.to && x.from && (lowerCaseSelectedAddress === x.from.toLowerCase() || lowerCaseSelectedAddress === ((_x$to = x.to) === null || _x$to === void 0 ? void 0 : _x$to.toLowerCase()))) {
+      if ((supportedNetwork === null || supportedNetwork === void 0 ? void 0 : supportedNetwork.chainId) === x.chain_id && x.to && x.from && (lowerCaseSelectedAddress === x.from.toLowerCase() || lowerCaseSelectedAddress === ((_x$to = x.to) === null || _x$to === void 0 ? void 0 : _x$to.toLowerCase()))) {
         if (x.status !== "confirmed") {
           pendingTx.push(x);
         } else {
-          const finalObject = formatPastTx(x, lowerCaseSelectedAddress);
+          const finalObject = formatPastTx({
+            transaction: x,
+            lowerCaseSelectedAddress,
+            blockExplorerUrl: this.getBlockExplorerUrl()
+          });
           pastTx.push(finalObject);
         }
       }
@@ -4915,7 +5062,11 @@ class PreferencesController extends base_controllers_namespaceObject.BasePrefere
     const pendingTxPromises = pendingTx.map(x => getEthTxStatus(x.transaction_hash, this.provider).catch(error => external_loglevel_default().error(error)));
     const resolvedTxStatuses = await Promise.all(pendingTxPromises);
     for (const [index, element] of pendingTx.entries()) {
-      const finalObject = formatPastTx(element, lowerCaseSelectedAddress);
+      const finalObject = formatPastTx({
+        transaction: element,
+        lowerCaseSelectedAddress,
+        blockExplorerUrl: this.getBlockExplorerUrl()
+      });
       finalObject.status = resolvedTxStatuses[index] || base_controllers_namespaceObject.TransactionStatus.submitted;
       pastTx.push(finalObject);
       if (lowerCaseSelectedAddress === element.from.toLowerCase() && finalObject.status && finalObject.status !== element.status) this.patchPastTx({

package/dist/ethereumControllers.esm.js

@@ -1,6 +1,6 @@
 import _objectSpread from '@babel/runtime/helpers/objectSpread2';
 import _defineProperty from '@babel/runtime/helpers/defineProperty';
-import { CHAIN_NAMESPACES, BaseController, randomId, TransactionStatus, TRANSACTION_TYPES, formatSmallNumbers, addressSlicer, ACTIVITY_ACTION_RECEIVE, ACTIVITY_ACTION_SEND, significantDigits, BaseBlockTracker, timeout, BaseCurrencyController, BaseKeyringController, PROVIDER_JRPC_METHODS, createFetchMiddleware, createSwappableProxy, createEventEmitterProxy, BasePreferencesController, TX_EVENTS, BaseTransactionStateManager, transactionMatchesNetwork as transactionMatchesNetwork$1 } from '@toruslabs/base-controllers';
+import { CHAIN_NAMESPACES, BaseController, randomId, TransactionStatus, TRANSACTION_TYPES, formatSmallNumbers, addressSlicer, ACTIVITY_ACTION_RECEIVE, ACTIVITY_ACTION_SEND, significantDigits, BaseBlockTracker, timeout, BaseCurrencyController, BaseKeyringController, PROVIDER_JRPC_METHODS, createFetchMiddleware, createInflightCacheMiddleware, createSwappableProxy, createEventEmitterProxy, BasePreferencesController, TX_EVENTS, BaseTransactionStateManager, transactionMatchesNetwork as transactionMatchesNetwork$1 } from '@toruslabs/base-controllers';
 import { Mutex } from 'async-mutex';
 import { BrowserProvider, toQuantity, Contract, Interface, isHexString as isHexString$1, JsonRpcProvider, keccak256 } from 'ethers';
 import log from 'loglevel';
@@ -15,6 +15,7 @@ import BN, { BN as BN$1 } from 'bn.js';
 import { concatSig, personalSign, signTypedData, getEncryptionPublicKey, decrypt, typedSignatureHash, TYPED_MESSAGE_SCHEMA, SignTypedDataVersion } from '@metamask/eth-sig-util';
 import { validate } from 'jsonschema';
 import { createAsyncMiddleware, mergeMiddleware, createScaffoldMiddleware, providerFromMiddleware, JRPCEngine, providerFromEngine, SafeEventEmitter } from '@toruslabs/openlogin-jrpc';
+import stringify from 'fast-safe-stringify';
 import { Hardfork, Common } from '@ethereumjs/common';
 import { TransactionFactory } from '@ethereumjs/tx';
 import jsonDiffer from 'fast-json-patch';
@@ -1338,43 +1339,48 @@ function getEtherScanHashLink(txHash, chainId) {
   if (!SUPPORTED_NETWORKS[chainId]) return "";
   return `${SUPPORTED_NETWORKS[chainId].blockExplorerUrl}/tx/${txHash}`;
 }
-const formatPastTx = (x, lowerCaseSelectedAddress) => {
-  var _x$to;
+const formatPastTx = params => {
+  var _transaction$to;
+  const {
+    transaction,
+    lowerCaseSelectedAddress,
+    blockExplorerUrl
+  } = params;
   let totalAmountString = "";
-  if (x.type === CONTRACT_TYPE_ERC721 || x.type === CONTRACT_TYPE_ERC1155) totalAmountString = x.symbol;else if (x.type === CONTRACT_TYPE_ERC20) totalAmountString = formatSmallNumbers(Number.parseFloat(x.total_amount), x.symbol, true);else totalAmountString = formatSmallNumbers(Number.parseFloat(x.total_amount), x.type_name, true);
-  const currencyAmountString = x.type === CONTRACT_TYPE_ERC721 || x.type === CONTRACT_TYPE_ERC1155 || x.isEtherscan ? "" : formatSmallNumbers(Number.parseFloat(x.currency_amount), x.selected_currency, true);
+  if (transaction.type === CONTRACT_TYPE_ERC721 || transaction.type === CONTRACT_TYPE_ERC1155) totalAmountString = transaction.symbol;else if (transaction.type === CONTRACT_TYPE_ERC20) totalAmountString = formatSmallNumbers(Number.parseFloat(transaction.total_amount), transaction.symbol, true);else totalAmountString = formatSmallNumbers(Number.parseFloat(transaction.total_amount), transaction.type_name, true);
+  const currencyAmountString = transaction.type === CONTRACT_TYPE_ERC721 || transaction.type === CONTRACT_TYPE_ERC1155 || transaction.isEtherscan ? "" : formatSmallNumbers(Number.parseFloat(transaction.currency_amount), transaction.selected_currency, true);
   const finalObject = {
-    id: x.created_at.toString(),
-    date: new Date(x.created_at).toString(),
-    from: x.from,
-    from_aa_address: x.from_aa_address,
-    slicedFrom: typeof x.from === "string" ? addressSlicer(x.from) : "",
-    to: x.to,
-    slicedTo: typeof x.to === "string" ? addressSlicer(x.to) : "",
-    action: lowerCaseSelectedAddress === ((_x$to = x.to) === null || _x$to === void 0 ? void 0 : _x$to.toLowerCase()) || "" ? ACTIVITY_ACTION_RECEIVE : ACTIVITY_ACTION_SEND,
-    totalAmount: x.total_amount,
+    id: transaction.created_at.toString(),
+    date: new Date(transaction.created_at).toString(),
+    from: transaction.from,
+    from_aa_address: transaction.from_aa_address,
+    slicedFrom: typeof transaction.from === "string" ? addressSlicer(transaction.from) : "",
+    to: transaction.to,
+    slicedTo: typeof transaction.to === "string" ? addressSlicer(transaction.to) : "",
+    action: lowerCaseSelectedAddress === ((_transaction$to = transaction.to) === null || _transaction$to === void 0 ? void 0 : _transaction$to.toLowerCase()) || "" ? ACTIVITY_ACTION_RECEIVE : ACTIVITY_ACTION_SEND,
+    totalAmount: transaction.total_amount,
     totalAmountString,
-    currencyAmount: x.currency_amount,
+    currencyAmount: transaction.currency_amount,
     currencyAmountString,
     amount: `${totalAmountString} / ${currencyAmountString}`,
-    status: x.status,
-    etherscanLink: getEtherScanHashLink(x.transaction_hash, x.chain_id || MAINNET_CHAIN_ID),
-    chainId: x.chain_id,
-    ethRate: Number.parseFloat(x === null || x === void 0 ? void 0 : x.total_amount) && Number.parseFloat(x === null || x === void 0 ? void 0 : x.currency_amount) ? `1 ${x.symbol} = ${significantDigits(Number.parseFloat(x.currency_amount) / Number.parseFloat(x.total_amount))}` : "",
-    currencyUsed: x.selected_currency,
-    type: x.type,
-    type_name: x.type_name,
-    type_image_link: x.type_image_link,
-    transaction_hash: x.transaction_hash,
-    transaction_category: x.transaction_category,
-    isEtherscan: x.isEtherscan,
-    input: x.input || "",
-    token_id: x.token_id || "",
-    contract_address: x.contract_address || "",
-    nonce: x.nonce || "",
-    is_cancel: !!x.is_cancel || false,
-    gas: x.gas || "",
-    gasPrice: x.gasPrice || ""
+    status: transaction.status,
+    etherscanLink: blockExplorerUrl ? `${blockExplorerUrl}/tx/${transaction.transaction_hash}` : "",
+    chainId: transaction.chain_id,
+    ethRate: Number.parseFloat(transaction === null || transaction === void 0 ? void 0 : transaction.total_amount) && Number.parseFloat(transaction === null || transaction === void 0 ? void 0 : transaction.currency_amount) ? `1 ${transaction.symbol} = ${significantDigits(Number.parseFloat(transaction.currency_amount) / Number.parseFloat(transaction.total_amount))}` : "",
+    currencyUsed: transaction.selected_currency,
+    type: transaction.type,
+    type_name: transaction.type_name,
+    type_image_link: transaction.type_image_link,
+    transaction_hash: transaction.transaction_hash,
+    transaction_category: transaction.transaction_category,
+    isEtherscan: transaction.isEtherscan,
+    input: transaction.input || "",
+    token_id: transaction.token_id || "",
+    contract_address: transaction.contract_address || "",
+    nonce: transaction.nonce || "",
+    is_cancel: !!transaction.is_cancel || false,
+    gas: transaction.gas || "",
+    gasPrice: transaction.gasPrice || ""
   };
   return finalObject;
 };
@@ -1470,7 +1476,14 @@ function getChainType(chainId) {
   }
   return "custom";
 }
-const addEtherscanTransactions = async (txn, lowerCaseSelectedAddress, provider, chainId) => {
+const addEtherscanTransactions = async params => {
+  const {
+    txn,
+    lowerCaseSelectedAddress,
+    provider,
+    chainId,
+    blockExplorerUrl
+  } = params;
   const transactionPromises = await Promise.all(txn.map(async tx => {
     var _SUPPORTED_NETWORKS$c, _SUPPORTED_NETWORKS$c2;
     const {
@@ -1500,7 +1513,6 @@ const addEtherscanTransactions = async (txn, lowerCaseSelectedAddress, provider,
       totalAmountString = x.tokenValue;
     }
     const etherscanTransaction = {
-      etherscanLink: getEtherScanHashLink(x.hash, chainId),
       type,
       type_image_link: x.type_image_link || "n/a",
       type_name: x.tokenName || ((_SUPPORTED_NETWORKS$c3 = SUPPORTED_NETWORKS[chainId]) === null || _SUPPORTED_NETWORKS$c3 === void 0 ? void 0 : _SUPPORTED_NETWORKS$c3.ticker) || "n/a",
@@ -1525,7 +1537,11 @@ const addEtherscanTransactions = async (txn, lowerCaseSelectedAddress, provider,
       is_cancel: false,
       selected_currency: ""
     };
-    accumulator.push(formatPastTx(etherscanTransaction, lowerCaseSelectedAddress));
+    accumulator.push(formatPastTx({
+      transaction: etherscanTransaction,
+      lowerCaseSelectedAddress,
+      blockExplorerUrl
+    }));
     return accumulator;
   }, []);
   return finalTxs;
@@ -2136,7 +2152,7 @@ class GasFeeController extends BaseController {
     const newChainId = this.getNetworkIdentifier();
     if (this.currentChainId !== newChainId) {
       this.currentChainId = newChainId;
-      await this.resetPolling();
+      await this.fetchGasFeeEstimates();
     }
   }
   async resetPolling() {
@@ -3486,6 +3502,110 @@ function createEthereumMiddleware(providerHandlers) {
   })]);
 }
 
+let CacheStrategy = /*#__PURE__*/function (CacheStrategy) {
+  CacheStrategy["Block"] = "block";
+  CacheStrategy["Fork"] = "fork";
+  CacheStrategy["Never"] = "never";
+  CacheStrategy["Permanent"] = "perma";
+  return CacheStrategy;
+}({});
+function blockTagParamIndex(method) {
+  switch (method) {
+    // blockTag is at index 2
+    case "eth_getStorageAt":
+      return 2;
+    // blockTag is at index 1
+    case "eth_getBalance":
+    case "eth_getCode":
+    case "eth_getTransactionCount":
+    case "eth_call":
+      return 1;
+    // blockTag is at index 0
+    case "eth_getBlockByNumber":
+      return 0;
+    // there is no blockTag
+    default:
+      return undefined;
+  }
+}
+function cacheTypeForMethod(method) {
+  switch (method) {
+    // cache permanently
+    case "web3_clientVersion":
+    case "web3_sha3":
+    case "eth_protocolVersion":
+    case "eth_getBlockTransactionCountByHash":
+    case "eth_getUncleCountByBlockHash":
+    case "eth_getCode":
+    case "eth_getBlockByHash":
+    case "eth_getTransactionByHash":
+    case "eth_getTransactionByBlockHashAndIndex":
+    case "eth_getTransactionReceipt":
+    case "eth_getUncleByBlockHashAndIndex":
+    case "eth_getCompilers":
+    case "eth_compileLLL":
+    case "eth_compileSolidity":
+    case "eth_compileSerpent":
+    case "shh_version":
+    case "test_permaCache":
+      return CacheStrategy.Permanent;
+
+    // cache until fork
+    case "eth_getBlockByNumber":
+    case "eth_getBlockTransactionCountByNumber":
+    case "eth_getUncleCountByBlockNumber":
+    case "eth_getTransactionByBlockNumberAndIndex":
+    case "eth_getUncleByBlockNumberAndIndex":
+    case "test_forkCache":
+      return CacheStrategy.Fork;
+
+    // cache for block
+    case "eth_gasPrice":
+    case "eth_blockNumber":
+    case "eth_getBalance":
+    case "eth_getStorageAt":
+    case "eth_getTransactionCount":
+    case "eth_call":
+    case "eth_estimateGas":
+    case "eth_getFilterLogs":
+    case "eth_getLogs":
+    case "test_blockCache":
+      return CacheStrategy.Block;
+
+    // never cache
+    default:
+      return CacheStrategy.Never;
+  }
+}
+function canCache(method) {
+  return cacheTypeForMethod(method) !== CacheStrategy.Never;
+}
+function paramsWithoutBlockTag(request) {
+  if (!request.params) {
+    return [];
+  }
+  const index = blockTagParamIndex(request.method);
+
+  // Block tag param not passed.
+  if (index === undefined || !Array.isArray(request.params) || index >= request.params.length) {
+    return request.params;
+  }
+
+  // eth_getBlockByNumber has the block tag first, then the optional includeTx? param
+  if (request.method === "eth_getBlockByNumber") {
+    return request.params.slice(1);
+  }
+  return request.params.slice(0, index);
+}
+function cacheIdentifierForRequest(request, skipBlockRef) {
+  var _request$params;
+  const simpleParams = skipBlockRef ? paramsWithoutBlockTag(request) : (_request$params = request.params) !== null && _request$params !== void 0 ? _request$params : [];
+  if (canCache(request.method)) {
+    return `${request.method}:${stringify(simpleParams)}`;
+  }
+  return null;
+}
+
 function createChainIdMiddleware(chainId) {
   return (req, res, next, end) => {
     if (req.method === "eth_chainId") {
@@ -3528,7 +3648,9 @@ function createJsonRpcClient(providerConfig, networkConfig) {
   // No need for the following middlewares for web because all browser sessions are quite short lived and each session is limited to scope of a window/tab
   // createBlockRefRewriteMiddleware({ blockTracker }),
   // createBlockCacheMiddleware({ blockTracker }),
-  // createInflightCacheMiddleware(),
+  createInflightCacheMiddleware({
+    cacheIdentifierForRequest
+  }),
   // createBlockTrackerInspectorMiddleware({ blockTracker }),
   fetchMiddleware]);
   return {
@@ -4262,7 +4384,10 @@ class PreferencesController extends BasePreferencesController {
   }
   async patchNewTx(tx, address) {
     var _this$getAddressState2;
-    const formattedTx = formatPastTx(tx);
+    const formattedTx = formatPastTx({
+      transaction: tx,
+      blockExplorerUrl: this.getBlockExplorerUrl()
+    });
     const storePastTx = ((_this$getAddressState2 = this.getAddressState(address)) === null || _this$getAddressState2 === void 0 ? void 0 : _this$getAddressState2.formattedPastTransactions) || [];
     const duplicateIndex = storePastTx.findIndex(x => x.transaction_hash === tx.transaction_hash && x.chainId === tx.chain_id);
     if (tx.status === TransactionStatus.submitted || tx.status === TransactionStatus.confirmed) {
@@ -4308,7 +4433,13 @@ class PreferencesController extends BasePreferencesController {
           selectedAddress,
           chainId: this.getProviderConfig().chainId
         });
-        const finalEthScanTxn = await addEtherscanTransactions(etherscanTxn, lowerCaseSelectedAddress, this.provider, chainId);
+        const finalEthScanTxn = await addEtherscanTransactions({
+          txn: etherscanTxn,
+          lowerCaseSelectedAddress,
+          provider: this.provider,
+          chainId,
+          blockExplorerUrl: this.getBlockExplorerUrl()
+        });
         log.info("Formatted Etherscan Response", finalEthScanTxn);
         this.updateState({
           etherscanTransactions: finalEthScanTxn
@@ -4496,17 +4627,29 @@ class PreferencesController extends BasePreferencesController {
     }, []);
     return [...supported, ...custom];
   }
+  getBlockExplorerUrl() {
+    const supportedNetworks = this.getChainOptions();
+    const network = supportedNetworks.find(x => x.chainId === this.getProviderConfig().chainId);
+    if (!network) return "";
+    return `${network.blockExplorerUrl}`;
+  }
   async calculatePastTx(txs, address) {
     const pastTx = [];
     const pendingTx = [];
     const lowerCaseSelectedAddress = address.toLowerCase();
+    const supportedNetworks = this.getChainOptions(address);
+    const supportedNetwork = supportedNetworks.find(x => x.chainId === this.getProviderConfig().chainId);
     for (const x of txs) {
       var _x$to;
-      if (x.chain_id === SUPPORTED_NETWORKS[this.getProviderConfig().chainId].chainId && x.to && x.from && (lowerCaseSelectedAddress === x.from.toLowerCase() || lowerCaseSelectedAddress === ((_x$to = x.to) === null || _x$to === void 0 ? void 0 : _x$to.toLowerCase()))) {
+      if ((supportedNetwork === null || supportedNetwork === void 0 ? void 0 : supportedNetwork.chainId) === x.chain_id && x.to && x.from && (lowerCaseSelectedAddress === x.from.toLowerCase() || lowerCaseSelectedAddress === ((_x$to = x.to) === null || _x$to === void 0 ? void 0 : _x$to.toLowerCase()))) {
         if (x.status !== "confirmed") {
           pendingTx.push(x);
         } else {
-          const finalObject = formatPastTx(x, lowerCaseSelectedAddress);
+          const finalObject = formatPastTx({
+            transaction: x,
+            lowerCaseSelectedAddress,
+            blockExplorerUrl: this.getBlockExplorerUrl()
+          });
           pastTx.push(finalObject);
         }
       }
@@ -4514,7 +4657,11 @@ class PreferencesController extends BasePreferencesController {
     const pendingTxPromises = pendingTx.map(x => getEthTxStatus(x.transaction_hash, this.provider).catch(error => log.error(error)));
     const resolvedTxStatuses = await Promise.all(pendingTxPromises);
     for (const [index, element] of pendingTx.entries()) {
-      const finalObject = formatPastTx(element, lowerCaseSelectedAddress);
+      const finalObject = formatPastTx({
+        transaction: element,
+        lowerCaseSelectedAddress,
+        blockExplorerUrl: this.getBlockExplorerUrl()
+      });
       finalObject.status = resolvedTxStatuses[index] || TransactionStatus.submitted;
       pastTx.push(finalObject);
       if (lowerCaseSelectedAddress === element.from.toLowerCase() && finalObject.status && finalObject.status !== element.status) this.patchPastTx({