@toruslabs/ethereum-controllers 5.3.3 → 5.3.5

package/dist/ethereumControllers.cjs.js

@@ -115,7 +115,15 @@ __webpack_require__.d(__webpack_exports__, {
   TransactionStateManager: () => (/* reexport */ TransactionStateManager),
   TypedMessageController: () => (/* reexport */ TypedMessageController),
   XDAI_CHAIN_ID: () => (/* reexport */ XDAI_CHAIN_ID),
+  addCurrencies: () => (/* reexport */ addCurrencies),
+  addEtherscanTransactions: () => (/* reexport */ addEtherscanTransactions),
   bnLessThan: () => (/* reexport */ bnLessThan),
+  conversionGTE: () => (/* reexport */ conversionGTE),
+  conversionGreaterThan: () => (/* reexport */ conversionGreaterThan),
+  conversionLTE: () => (/* reexport */ conversionLTE),
+  conversionLessThan: () => (/* reexport */ conversionLessThan),
+  conversionMax: () => (/* reexport */ conversionMax),
+  conversionUtil: () => (/* reexport */ conversionUtil),
   createChainIdMiddleware: () => (/* reexport */ createChainIdMiddleware),
   createEthereumMiddleware: () => (/* reexport */ createEthereumMiddleware),
   createGetAccountsMiddleware: () => (/* reexport */ createGetAccountsMiddleware),
@@ -134,6 +142,7 @@ __webpack_require__.d(__webpack_exports__, {
   createProcessTypedMessageV4: () => (/* reexport */ createProcessTypedMessageV4),
   createProviderConfigMiddleware: () => (/* reexport */ createProviderConfigMiddleware),
   createRequestAccountsMiddleware: () => (/* reexport */ createRequestAccountsMiddleware),
+  decGWEIToHexWEI: () => (/* reexport */ decGWEIToHexWEI),
   determineTransactionType: () => (/* reexport */ determineTransactionType),
   ensureFieldIsString: () => (/* reexport */ ensureFieldIsString),
   ensureMutuallyExclusiveFieldsNotProvided: () => (/* reexport */ ensureMutuallyExclusiveFieldsNotProvided),
@@ -145,15 +154,18 @@ __webpack_require__.d(__webpack_exports__, {
   formatTime: () => (/* reexport */ formatTime),
   formatTxMetaForRpcResult: () => (/* reexport */ formatTxMetaForRpcResult),
   generateHistoryEntry: () => (/* reexport */ generateHistoryEntry),
+  getBigNumber: () => (/* reexport */ getBigNumber),
   getChainType: () => (/* reexport */ getChainType),
   getEthTxStatus: () => (/* reexport */ getEthTxStatus),
   getEtherScanHashLink: () => (/* reexport */ getEtherScanHashLink),
   getFinalStates: () => (/* reexport */ getFinalStates),
   getIpfsEndpoint: () => (/* reexport */ getIpfsEndpoint),
+  hexWEIToDecGWEI: () => (/* reexport */ hexWEIToDecGWEI),
   idleTimeTracker: () => (/* reexport */ idleTimeTracker),
   isAddressByChainId: () => (/* reexport */ isAddressByChainId),
   isEIP1559Transaction: () => (/* reexport */ isEIP1559Transaction),
   isLegacyTransaction: () => (/* reexport */ isLegacyTransaction),
+  multiplyCurrencies: () => (/* reexport */ multiplyCurrencies),
   normalizeAndValidateTxParams: () => (/* reexport */ normalizeAndValidateTxParams),
   normalizeMessageData: () => (/* reexport */ normalizeMessageData),
   normalizeTxParameters: () => (/* reexport */ normalizeTxParameters),
@@ -164,7 +176,9 @@ __webpack_require__.d(__webpack_exports__, {
   sanitizeNftMetdataUrl: () => (/* reexport */ sanitizeNftMetdataUrl),
   singleBalanceCheckerAbi: () => (/* reexport */ singleBalanceCheckerAbi),
   snapshotFromTxMeta: () => (/* reexport */ snapshotFromTxMeta),
+  subtractCurrencies: () => (/* reexport */ subtractCurrencies),
   toChecksumAddressByChainId: () => (/* reexport */ toChecksumAddressByChainId),
+  toNegative: () => (/* reexport */ toNegative),
   transactionMatchesNetwork: () => (/* reexport */ transactionMatchesNetwork),
   validateAddChainData: () => (/* reexport */ validateAddChainData),
   validateAddress: () => (/* reexport */ validateAddress),
@@ -755,7 +769,7 @@ const SUPPORTED_NETWORKS = {
     blockExplorerUrl: "https://bscscan.com",
     chainId: BSC_MAINNET_CHAIN_ID,
     displayName: "Binance Smart Chain (BSC)",
-    logo: "bnb_logo.png",
+    logo: "bnb_logo.svg",
     rpcTarget: `https://bsc-dataseed.binance.org`,
     ticker: "BNB",
     tickerName: "Binance Coin"
@@ -810,7 +824,7 @@ const SUPPORTED_NETWORKS = {
     blockExplorerUrl: "https://gnosis.blockscout.com",
     chainId: XDAI_CHAIN_ID,
     displayName: "xDai",
-    logo: "xdai.svg",
+    logo: "xDai.svg",
     rpcTarget: `https://rpc.gnosischain.com`,
     ticker: "DAI",
     tickerName: "xDai Token"
@@ -856,7 +870,7 @@ const SUPPORTED_NETWORKS = {
     blockExplorerUrl: "https://testnet.bscscan.com",
     chainId: BSC_TESTNET_CHAIN_ID,
     displayName: "Binance Smart Chain Testnet",
-    logo: "bnb_logo.png",
+    logo: "bnb_logo.svg",
     rpcTarget: `https://data-seed-prebsc-1-s1.binance.org:8545`,
     ticker: "BNB",
     tickerName: "Binance Coin",
@@ -1206,12 +1220,351 @@ const util_namespaceObject = require("@ethereumjs/util");
 ;// CONCATENATED MODULE: external "bignumber.js"
 const external_bignumber_js_namespaceObject = require("bignumber.js");
 var external_bignumber_js_default = /*#__PURE__*/__webpack_require__.n(external_bignumber_js_namespaceObject);
+;// CONCATENATED MODULE: external "@metamask/rpc-errors"
+const rpc_errors_namespaceObject = require("@metamask/rpc-errors");
+;// CONCATENATED MODULE: ./src/Transaction/TransactionUtils.ts
+
+
+
+
+
+
+
+const erc20Interface = new external_ethers_namespaceObject.Interface(erc20Abi);
+const erc721Interface = new external_ethers_namespaceObject.Interface(erc721Abi);
+const erc1155Interface = new external_ethers_namespaceObject.Interface(erc1155Abi);
+
+// functions that handle normalizing of that key in txParams
+
+const normalizers = {
+  from: function (from) {
+    let LowerCase = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
+    return LowerCase ? (0,util_namespaceObject.addHexPrefix)(from).toLowerCase() : (0,util_namespaceObject.addHexPrefix)(from);
+  },
+  to: function (to) {
+    let LowerCase = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
+    return LowerCase ? (0,util_namespaceObject.addHexPrefix)(to).toLowerCase() : (0,util_namespaceObject.addHexPrefix)(to);
+  },
+  nonce: nonce => (0,util_namespaceObject.addHexPrefix)(nonce),
+  customNonceValue: nonce => (0,util_namespaceObject.addHexPrefix)(nonce),
+  value: value => (0,util_namespaceObject.addHexPrefix)(value),
+  data: data => (0,util_namespaceObject.addHexPrefix)(data),
+  gas: gas => (0,util_namespaceObject.addHexPrefix)(gas),
+  gasPrice: gasPrice => (0,util_namespaceObject.addHexPrefix)(gasPrice),
+  type: util_namespaceObject.addHexPrefix,
+  maxFeePerGas: util_namespaceObject.addHexPrefix,
+  maxPriorityFeePerGas: util_namespaceObject.addHexPrefix
+};
+
+/**
+ * normalizes txParams
+ */
+function normalizeTxParameters(txParameters) {
+  let lowerCase = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
+  // apply only keys in the normalizers
+  const normalizedTxParameters = {
+    id: txParameters.id || (0,base_controllers_namespaceObject.randomId)(),
+    from: txParameters.from
+  };
+  for (const key in normalizers) {
+    const currentKey = key;
+    if (txParameters[currentKey])
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      normalizedTxParameters[currentKey] = normalizers[currentKey](txParameters[currentKey], lowerCase);
+  }
+  return normalizedTxParameters;
+}
+function transactionMatchesNetwork(transaction, chainId) {
+  if (typeof transaction.chainId !== "undefined") {
+    return transaction.chainId === chainId;
+  }
+  return false;
+}
+
+/**
+ * Determines if the maxFeePerGas and maxPriorityFeePerGas fields are supplied
+ * and valid inputs. This will return false for non hex string inputs.
+ *  the transaction to check
+ * @returns true if transaction uses valid EIP1559 fields
+ */
+function isEIP1559Transaction(transaction) {
+  var _transaction$transact, _transaction$transact2;
+  return (0,util_namespaceObject.isHexString)((0,util_namespaceObject.addHexPrefix)(transaction === null || transaction === void 0 || (_transaction$transact = transaction.transaction) === null || _transaction$transact === void 0 ? void 0 : _transaction$transact.maxFeePerGas)) && (0,util_namespaceObject.isHexString)((0,util_namespaceObject.addHexPrefix)(transaction === null || transaction === void 0 || (_transaction$transact2 = transaction.transaction) === null || _transaction$transact2 === void 0 ? void 0 : _transaction$transact2.maxPriorityFeePerGas));
+}
+
+/**
+ * Determine if the maxFeePerGas and maxPriorityFeePerGas fields are not
+ * supplied and that the gasPrice field is valid if it is provided. This will
+ * return false if gasPrice is a non hex string.
+ * transaction -
+ *  the transaction to check
+ * @returns true if transaction uses valid Legacy fields OR lacks
+ *  EIP1559 fields
+ */
+function isLegacyTransaction(transaction) {
+  return typeof transaction.transaction.maxFeePerGas === "undefined" && typeof transaction.transaction.maxPriorityFeePerGas === "undefined" && (typeof transaction.transaction.gasPrice === "undefined" || (0,util_namespaceObject.isHexString)((0,util_namespaceObject.addHexPrefix)(transaction.transaction.gasPrice)));
+}
+
+/**
+ * Given two fields, ensure that the second field is not included in txParams,
+ * and if it is throw an invalidParams error.
+ */
+function ensureMutuallyExclusiveFieldsNotProvided(txParams, fieldBeingValidated, mutuallyExclusiveField) {
+  if (typeof txParams[mutuallyExclusiveField] !== "undefined") {
+    throw rpc_errors_namespaceObject.rpcErrors.invalidParams(`Invalid transaction params: specified ${fieldBeingValidated} but also included ${mutuallyExclusiveField}, these cannot be mixed`);
+  }
+}
+
+/**
+ * Ensures that the provided value for field is a string, throws an
+ * invalidParams error if field is not a string.
+ */
+function ensureFieldIsString(txParams, field) {
+  if (typeof txParams[field] !== "string") {
+    throw rpc_errors_namespaceObject.rpcErrors.invalidParams(`Invalid transaction params: ${field} is not a string. got: (${txParams[field]})`);
+  }
+}
+
+/**
+ * Ensures that the provided txParams has the proper 'type' specified for the
+ * given field, if it is provided. If types do not match throws an
+ * invalidParams error.
+ */
+function ensureProperTransactionEnvelopeTypeProvided(txParams, field) {
+  switch (field) {
+    case "maxFeePerGas":
+    case "maxPriorityFeePerGas":
+      if (txParams.type && txParams.type !== TRANSACTION_ENVELOPE_TYPES.FEE_MARKET) {
+        throw rpc_errors_namespaceObject.rpcErrors.invalidParams(`Invalid transaction envelope type: specified type "${txParams.type}" but ` + `including maxFeePerGas and maxPriorityFeePerGas requires type: "${TRANSACTION_ENVELOPE_TYPES.FEE_MARKET}"`);
+      }
+      break;
+    case "gasPrice":
+    default:
+      if (txParams.type && txParams.type === TRANSACTION_ENVELOPE_TYPES.FEE_MARKET) {
+        throw rpc_errors_namespaceObject.rpcErrors.invalidParams(`Invalid transaction envelope type: specified type "${txParams.type}" but ` + "included a gasPrice instead of maxFeePerGas and maxPriorityFeePerGas");
+      }
+  }
+}
+
+/**
+ * validates the from field in  txParams
+ */
+function validateFrom(txParams) {
+  if (!(typeof txParams.from === "string")) {
+    throw rpc_errors_namespaceObject.rpcErrors.invalidParams(`Invalid "from" address "${txParams.from}": not a string.`);
+  }
+  if (!(0,util_namespaceObject.isValidAddress)(txParams.from)) {
+    throw rpc_errors_namespaceObject.rpcErrors.invalidParams('Invalid "from" address.');
+  }
+}
+
+/**
+ * validates the to field in  txParams
+ */
+function validateRecipient(txParameters) {
+  if (txParameters.to === "0x" || txParameters.to === null) {
+    if (txParameters.data) {
+      delete txParameters.to;
+    } else {
+      throw rpc_errors_namespaceObject.rpcErrors.invalidParams('Invalid "to" address.');
+    }
+  } else if (txParameters.to !== undefined && !(0,util_namespaceObject.isValidAddress)(txParameters.to)) {
+    throw rpc_errors_namespaceObject.rpcErrors.invalidParams('Invalid "to" address.');
+  }
+  return txParameters;
+}
+
+/**
+ * Validates the given tx parameters
+ * @throws if the tx params contains invalid fields
+ */
+function validateTxParameters(txParams) {
+  let eip1559Compatibility = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
+  if (!txParams || typeof txParams !== "object" || Array.isArray(txParams)) {
+    throw rpc_errors_namespaceObject.rpcErrors.invalidParams("Invalid transaction params: must be an object.");
+  }
+  if (!txParams.to && !txParams.data) {
+    throw rpc_errors_namespaceObject.rpcErrors.invalidParams('Invalid transaction params: must specify "data" for contract deployments, or "to" (and optionally "data") for all other types of transactions.');
+  }
+  if (isEIP1559Transaction({
+    transaction: txParams
+  }) && !eip1559Compatibility) {
+    throw rpc_errors_namespaceObject.rpcErrors.invalidParams("Invalid transaction params: params specify an EIP-1559 transaction but the current network does not support EIP-1559");
+  }
+  Object.entries(txParams).forEach(_ref => {
+    let [key, value] = _ref;
+    // validate types
+    switch (key) {
+      case "from":
+        validateFrom(txParams);
+        break;
+      case "to":
+        validateRecipient(txParams);
+        break;
+      case "gasPrice":
+        ensureProperTransactionEnvelopeTypeProvided(txParams, "gasPrice");
+        ensureMutuallyExclusiveFieldsNotProvided(txParams, "gasPrice", "maxFeePerGas");
+        ensureMutuallyExclusiveFieldsNotProvided(txParams, "gasPrice", "maxPriorityFeePerGas");
+        ensureFieldIsString(txParams, "gasPrice");
+        break;
+      case "maxFeePerGas":
+        ensureProperTransactionEnvelopeTypeProvided(txParams, "maxFeePerGas");
+        ensureMutuallyExclusiveFieldsNotProvided(txParams, "maxFeePerGas", "gasPrice");
+        ensureFieldIsString(txParams, "maxFeePerGas");
+        break;
+      case "maxPriorityFeePerGas":
+        ensureProperTransactionEnvelopeTypeProvided(txParams, "maxPriorityFeePerGas");
+        ensureMutuallyExclusiveFieldsNotProvided(txParams, "maxPriorityFeePerGas", "gasPrice");
+        ensureFieldIsString(txParams, "maxPriorityFeePerGas");
+        break;
+      case "value":
+        ensureFieldIsString(txParams, "value");
+        if (value.toString().includes("-")) {
+          throw rpc_errors_namespaceObject.rpcErrors.invalidParams(`Invalid transaction value "${value}": not a positive number.`);
+        }
+        if (value.toString().includes(".")) {
+          throw rpc_errors_namespaceObject.rpcErrors.invalidParams(`Invalid transaction value of "${value}": number must be in wei.`);
+        }
+        break;
+      case "chainId":
+        if (typeof value !== "number" && typeof value !== "string") {
+          throw rpc_errors_namespaceObject.rpcErrors.invalidParams(`Invalid transaction params: ${key} is not a Number or hex string. got: (${value})`);
+        }
+        break;
+      default:
+        ensureFieldIsString(txParams, key);
+    }
+  });
+}
+function normalizeAndValidateTxParams(txParams) {
+  let lowerCase = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
+  const normalizedTxParams = normalizeTxParameters(txParams, lowerCase);
+  validateTxParameters(normalizedTxParams);
+  return normalizedTxParams;
+}
+
+/**
+ * @returns an array of states that can be considered final
+ */
+function getFinalStates() {
+  return [base_controllers_namespaceObject.TransactionStatus.rejected,
+  // the user has responded no!
+  base_controllers_namespaceObject.TransactionStatus.confirmed,
+  // the tx has been included in a block.
+  base_controllers_namespaceObject.TransactionStatus.failed,
+  // the tx failed for some reason, included on tx data.
+  base_controllers_namespaceObject.TransactionStatus.dropped // the tx nonce was already used
+  ];
+}
+function parseStandardTokenTransactionData(data) {
+  try {
+    const txDesc = erc20Interface.parseTransaction({
+      data
+    });
+    if (txDesc) return {
+      name: txDesc.name,
+      methodParams: txDesc.args.toArray(),
+      type: CONTRACT_TYPE_ERC20
+    };
+  } catch {
+    // ignore and next try to parse with erc721 ABI
+  }
+  try {
+    const txDesc = erc721Interface.parseTransaction({
+      data
+    });
+    if (txDesc) return {
+      name: txDesc.name,
+      methodParams: txDesc.args.toArray(),
+      type: CONTRACT_TYPE_ERC721
+    };
+  } catch {
+    // ignore and next try to parse with erc1155 ABI
+  }
+  try {
+    const txDesc = erc1155Interface.parseTransaction({
+      data
+    });
+    if (txDesc) return {
+      name: txDesc.name,
+      methodParams: txDesc.args.toArray(),
+      type: CONTRACT_TYPE_ERC1155
+    };
+  } catch {
+    // ignore and return undefined
+  }
+  return undefined;
+}
+const readAddressAsContract = async (provider, address) => {
+  let contractCode;
+  try {
+    contractCode = await provider.request({
+      method: METHOD_TYPES.ETH_GET_CODE,
+      params: [address, "latest"]
+    });
+  } catch (e) {
+    contractCode = null;
+  }
+  const isContractAddress = contractCode ? contractCode !== "0x" && contractCode !== "0x0" : false;
+  return {
+    contractCode,
+    isContractAddress
+  };
+};
+async function determineTransactionType(txParams, provider) {
+  const {
+    data,
+    to
+  } = txParams;
+  let name = "";
+  let methodParams = [];
+  let type = "";
+  try {
+    ({
+      name,
+      methodParams,
+      type
+    } = data && parseStandardTokenTransactionData(data) || {});
+  } catch (error) {
+    external_loglevel_default().debug("Failed to parse transaction data", error);
+  }
+  let result;
+  let contractCode = "";
+  if (data && !to) {
+    result = base_controllers_namespaceObject.TRANSACTION_TYPES.DEPLOY_CONTRACT;
+  } else {
+    const {
+      contractCode: resultCode,
+      isContractAddress
+    } = await readAddressAsContract(provider, to);
+    contractCode = resultCode;
+    if (isContractAddress) {
+      const valueExists = txParams.value && Number(txParams.value) !== 0;
+      const tokenMethodName = [base_controllers_namespaceObject.TRANSACTION_TYPES.TOKEN_METHOD_APPROVE, base_controllers_namespaceObject.TRANSACTION_TYPES.TOKEN_METHOD_TRANSFER, base_controllers_namespaceObject.TRANSACTION_TYPES.TOKEN_METHOD_TRANSFER_FROM, base_controllers_namespaceObject.TRANSACTION_TYPES.COLLECTIBLE_METHOD_SAFE_TRANSFER_FROM, base_controllers_namespaceObject.TRANSACTION_TYPES.SET_APPROVAL_FOR_ALL].find(x => {
+        var _name;
+        return x.toLowerCase() === ((_name = name) === null || _name === void 0 ? void 0 : _name.toLowerCase());
+      });
+      result = data && tokenMethodName && !valueExists ? tokenMethodName : base_controllers_namespaceObject.TRANSACTION_TYPES.CONTRACT_INTERACTION;
+    } else {
+      result = base_controllers_namespaceObject.TRANSACTION_TYPES.SENT_ETHER;
+    }
+  }
+  return {
+    type: type || CONTRACT_TYPE_ETH,
+    category: result,
+    methodParams,
+    getCodeResponse: contractCode
+  };
+}
 ;// CONCATENATED MODULE: ./src/utils/helpers.ts
 
 
 
 
 
+
+
+
 function getEtherScanHashLink(txHash, chainId) {
   if (!SUPPORTED_NETWORKS[chainId]) return "";
   return `${SUPPORTED_NETWORKS[chainId].blockExplorerUrl}/tx/${txHash}`;
@@ -1246,9 +1599,9 @@ const formatPastTx = (x, lowerCaseSelectedAddress) => {
     transaction_hash: x.transaction_hash,
     transaction_category: x.transaction_category,
     // TODO: // figure out how to handle these values.
-    // isEtherscan: x.isEtherscan,
-    // input: x.input || "",
-    // token_id: x.token_id || "",
+    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,
@@ -1349,6 +1702,55 @@ function getChainType(chainId) {
   }
   return "custom";
 }
+const addEtherscanTransactions = async (txn, lowerCaseSelectedAddress, provider, chainId) => {
+  const transactionPromises = await Promise.all(txn.map(async tx => {
+    var _SUPPORTED_NETWORKS$c, _SUPPORTED_NETWORKS$c2;
+    const {
+      category,
+      type
+    } = await determineTransactionType(objectSpread2_default()(objectSpread2_default()({}, tx), {}, {
+      data: tx.input
+    }), provider);
+    tx.transaction_category = tx.transaction_category || category;
+    tx.type_image_link = ((_SUPPORTED_NETWORKS$c = SUPPORTED_NETWORKS[chainId]) === null || _SUPPORTED_NETWORKS$c === void 0 ? void 0 : _SUPPORTED_NETWORKS$c.logo) || "";
+    tx.type_name = (_SUPPORTED_NETWORKS$c2 = SUPPORTED_NETWORKS[chainId]) === null || _SUPPORTED_NETWORKS$c2 === void 0 ? void 0 : _SUPPORTED_NETWORKS$c2.ticker;
+    tx.type = type;
+    return tx;
+  }));
+  const finalTxs = transactionPromises.reduce((accumulator, x) => {
+    var _SUPPORTED_NETWORKS$c3, _SUPPORTED_NETWORKS$c4;
+    const totalAmount = x.value ? (0,external_ethers_namespaceObject.formatEther)(x.value) : "";
+    const etherscanTransaction = {
+      etherscanLink: getEtherScanHashLink(x.hash, chainId),
+      type: x.type || ((_SUPPORTED_NETWORKS$c3 = SUPPORTED_NETWORKS[chainId]) === null || _SUPPORTED_NETWORKS$c3 === void 0 ? void 0 : _SUPPORTED_NETWORKS$c3.ticker) || CONTRACT_TYPE_ETH,
+      type_image_link: x.type_image_link || "n/a",
+      type_name: x.type_name || "n/a",
+      symbol: (_SUPPORTED_NETWORKS$c4 = SUPPORTED_NETWORKS[chainId]) === null || _SUPPORTED_NETWORKS$c4 === void 0 ? void 0 : _SUPPORTED_NETWORKS$c4.ticker,
+      token_id: x.tokenID || "",
+      total_amount: totalAmount,
+      created_at: new Date(Number(x.timeStamp) * 1000),
+      from: x.from,
+      to: x.to,
+      transaction_hash: x.hash,
+      status: x.txreceipt_status && x.txreceipt_status === "0" ? base_controllers_namespaceObject.TransactionStatus.failed : base_controllers_namespaceObject.TransactionStatus.approved,
+      isEtherscan: true,
+      input: x.input,
+      contract_address: x.contractAddress,
+      transaction_category: x.transaction_category,
+      gas: x.gas,
+      gasPrice: x.gasPrice,
+      chain_id: chainId,
+      currency_amount: "",
+      nonce: x.nonce,
+      from_aa_address: "",
+      is_cancel: false,
+      selected_currency: ""
+    };
+    accumulator.push(formatPastTx(etherscanTransaction, lowerCaseSelectedAddress));
+    return accumulator;
+  }, []);
+  return finalTxs;
+};
 ;// CONCATENATED MODULE: ./src/Block/PollingBlockTracker.ts
 
 
@@ -1547,6 +1949,7 @@ class CurrencyController extends base_controllers_namespaceObject.BaseCurrencyCo
 const external_lodash_namespaceObject = require("lodash");
 ;// CONCATENATED MODULE: external "@babel/runtime/helpers/objectDestructuringEmpty"
 const objectDestructuringEmpty_namespaceObject = require("@babel/runtime/helpers/objectDestructuringEmpty");
+var objectDestructuringEmpty_default = /*#__PURE__*/__webpack_require__.n(objectDestructuringEmpty_namespaceObject);
 ;// CONCATENATED MODULE: external "@babel/runtime/helpers/objectWithoutProperties"
 const objectWithoutProperties_namespaceObject = require("@babel/runtime/helpers/objectWithoutProperties");
 var objectWithoutProperties_default = /*#__PURE__*/__webpack_require__.n(objectWithoutProperties_namespaceObject);
@@ -1557,9 +1960,9 @@ var external_bn_js_default = /*#__PURE__*/__webpack_require__.n(external_bn_js_n
 
 
 
-const _excluded = (/* unused pure expression or super */ null && (["aBase", "bBase"])),
-  _excluded2 = (/* unused pure expression or super */ null && (["aBase", "bBase"])),
-  _excluded3 = (/* unused pure expression or super */ null && (["multiplicandBase", "multiplierBase"]));
+const _excluded = ["aBase", "bBase"],
+  _excluded2 = ["aBase", "bBase"],
+  _excluded3 = ["multiplicandBase", "multiplierBase"];
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-nocheck
 /* Currency Conversion Utility
@@ -1698,10 +2101,10 @@ const getBigNumber = (value, base) => {
 
   // We don't include 'number' here, because BigNumber will throw if passed
   // a number primitive it considers unsafe.
-  if (typeof value === "string" || value instanceof BigNumber) {
-    return new BigNumber(value, base);
+  if (typeof value === "string" || value instanceof (external_bignumber_js_default())) {
+    return new (external_bignumber_js_default())(value, base);
   }
-  return new BigNumber(String(value), base);
+  return new (external_bignumber_js_default())(String(value), base);
 };
 const addCurrencies = function (a, b) {
   let options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
@@ -1709,12 +2112,12 @@ const addCurrencies = function (a, b) {
       aBase,
       bBase
     } = options,
-    conversionOptions = _objectWithoutProperties(options, _excluded);
+    conversionOptions = objectWithoutProperties_default()(options, _excluded);
   if (!isValidBase(aBase) || !isValidBase(bBase)) {
     throw new Error("Must specify valid aBase and bBase");
   }
   const value = getBigNumber(a, aBase).plus(getBigNumber(b, bBase));
-  return converter(_objectSpread({
+  return converter(objectSpread2_default()({
     value
   }, conversionOptions));
 };
@@ -1724,12 +2127,12 @@ const subtractCurrencies = function (a, b) {
       aBase,
       bBase
     } = options,
-    conversionOptions = _objectWithoutProperties(options, _excluded2);
+    conversionOptions = objectWithoutProperties_default()(options, _excluded2);
   if (!isValidBase(aBase) || !isValidBase(bBase)) {
     throw new Error("Must specify valid aBase and bBase");
   }
   const value = getBigNumber(a, aBase).minus(getBigNumber(b, bBase));
-  return converter(_objectSpread({
+  return converter(objectSpread2_default()({
     value
   }, conversionOptions));
 };
@@ -1739,47 +2142,47 @@ const multiplyCurrencies = function (a, b) {
       multiplicandBase,
       multiplierBase
     } = options,
-    conversionOptions = _objectWithoutProperties(options, _excluded3);
+    conversionOptions = objectWithoutProperties_default()(options, _excluded3);
   if (!isValidBase(multiplicandBase) || !isValidBase(multiplierBase)) {
     throw new Error("Must specify valid multiplicandBase and multiplierBase");
   }
   const value = getBigNumber(a, multiplicandBase).times(getBigNumber(b, multiplierBase));
-  return converter(_objectSpread({
+  return converter(objectSpread2_default()({
     value
   }, conversionOptions));
 };
 const conversionGreaterThan = (_ref3, _ref4) => {
-  let secondProps = Object.assign({}, (_objectDestructuringEmpty(_ref4), _ref4));
-  let firstProps = Object.assign({}, (_objectDestructuringEmpty(_ref3), _ref3));
-  const firstValue = converter(_objectSpread({}, firstProps));
-  const secondValue = converter(_objectSpread({}, secondProps));
+  let secondProps = Object.assign({}, (objectDestructuringEmpty_default()(_ref4), _ref4));
+  let firstProps = Object.assign({}, (objectDestructuringEmpty_default()(_ref3), _ref3));
+  const firstValue = converter(objectSpread2_default()({}, firstProps));
+  const secondValue = converter(objectSpread2_default()({}, secondProps));
   return firstValue.gt(secondValue);
 };
 const conversionLessThan = (_ref5, _ref6) => {
-  let secondProps = Object.assign({}, (_objectDestructuringEmpty(_ref6), _ref6));
-  let firstProps = Object.assign({}, (_objectDestructuringEmpty(_ref5), _ref5));
-  const firstValue = converter(_objectSpread({}, firstProps));
-  const secondValue = converter(_objectSpread({}, secondProps));
+  let secondProps = Object.assign({}, (objectDestructuringEmpty_default()(_ref6), _ref6));
+  let firstProps = Object.assign({}, (objectDestructuringEmpty_default()(_ref5), _ref5));
+  const firstValue = converter(objectSpread2_default()({}, firstProps));
+  const secondValue = converter(objectSpread2_default()({}, secondProps));
   return firstValue.lt(secondValue);
 };
 const conversionMax = (_ref7, _ref8) => {
-  let secondProps = Object.assign({}, (_objectDestructuringEmpty(_ref8), _ref8));
-  let firstProps = Object.assign({}, (_objectDestructuringEmpty(_ref7), _ref7));
-  const firstIsGreater = conversionGreaterThan(_objectSpread({}, firstProps), _objectSpread({}, secondProps));
+  let secondProps = Object.assign({}, (objectDestructuringEmpty_default()(_ref8), _ref8));
+  let firstProps = Object.assign({}, (objectDestructuringEmpty_default()(_ref7), _ref7));
+  const firstIsGreater = conversionGreaterThan(objectSpread2_default()({}, firstProps), objectSpread2_default()({}, secondProps));
   return firstIsGreater ? firstProps.value : secondProps.value;
 };
 const conversionGTE = (_ref9, _ref10) => {
-  let secondProps = Object.assign({}, (_objectDestructuringEmpty(_ref10), _ref10));
-  let firstProps = Object.assign({}, (_objectDestructuringEmpty(_ref9), _ref9));
-  const firstValue = converter(_objectSpread({}, firstProps));
-  const secondValue = converter(_objectSpread({}, secondProps));
+  let secondProps = Object.assign({}, (objectDestructuringEmpty_default()(_ref10), _ref10));
+  let firstProps = Object.assign({}, (objectDestructuringEmpty_default()(_ref9), _ref9));
+  const firstValue = converter(objectSpread2_default()({}, firstProps));
+  const secondValue = converter(objectSpread2_default()({}, secondProps));
   return firstValue.isGreaterThanOrEqualTo(secondValue);
 };
 const conversionLTE = (_ref11, _ref12) => {
-  let secondProps = Object.assign({}, (_objectDestructuringEmpty(_ref12), _ref12));
-  let firstProps = Object.assign({}, (_objectDestructuringEmpty(_ref11), _ref11));
-  const firstValue = converter(_objectSpread({}, firstProps));
-  const secondValue = converter(_objectSpread({}, secondProps));
+  let secondProps = Object.assign({}, (objectDestructuringEmpty_default()(_ref12), _ref12));
+  let firstProps = Object.assign({}, (objectDestructuringEmpty_default()(_ref11), _ref11));
+  const firstValue = converter(objectSpread2_default()({}, firstProps));
+  const secondValue = converter(objectSpread2_default()({}, secondProps));
   return firstValue.isLessThanOrEqualTo(secondValue);
 };
 const toNegative = function (n) {
@@ -2267,8 +2670,6 @@ class KeyringController extends base_controllers_namespaceObject.BaseKeyringCont
     return wallet;
   }
 }
-;// CONCATENATED MODULE: external "@metamask/rpc-errors"
-const rpc_errors_namespaceObject = require("@metamask/rpc-errors");
 ;// CONCATENATED MODULE: ./src/Message/AbstractMessageController.ts
 
 
@@ -4099,7 +4500,8 @@ class PreferencesController extends base_controllers_namespaceObject.BasePrefere
       defaultPreferences: {
         formattedPastTransactions: [],
         fetchedPastTx: [],
-        paymentTx: []
+        paymentTx: [],
+        etherscanTransactions: []
       },
       signAuthMessage
     });
@@ -4280,10 +4682,15 @@ class PreferencesController extends base_controllers_namespaceObject.BasePrefere
         chainId
       } = this.getProviderConfig();
       if (ETHERSCAN_SUPPORTED_CHAINS.includes(chainId)) {
-        return this.fetchEtherscanTx({
+        const etherscanTxn = await this.fetchEtherscanTx({
           selectedAddress,
           chainId: this.getProviderConfig().chainId
         });
+        const finalEthScanTxn = await addEtherscanTransactions(etherscanTxn, selectedAddress, this.provider, chainId);
+        this.updateState({
+          etherscanTransactions: finalEthScanTxn
+        });
+        return etherscanTxn;
       }
     }
   }
@@ -4292,6 +4699,7 @@ class PreferencesController extends base_controllers_namespaceObject.BasePrefere
       const url = new URL(`${this.config.api}/etherscan`);
       url.searchParams.append("chainId", parameters.chainId);
       const response = await (0,http_helpers_namespaceObject.get)(url.href, this.headers(parameters.selectedAddress));
+      external_loglevel_default().info("Etherscan Response", response);
       return response.success ? response.data : [];
     } catch (error) {
       external_loglevel_default().error("unable to fetch etherscan tx", error);
@@ -5359,412 +5767,78 @@ class TransactionGasUtil {
   addGasBuffer(initialGasLimitHex, blockGasLimitHex) {
     let multiplier = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 1.5;
     const initialGasLimitBn = new external_bn_js_namespaceObject.BN((0,util_namespaceObject.stripHexPrefix)(initialGasLimitHex), 16);
-    const blockGasLimitBn = new external_bn_js_namespaceObject.BN((0,util_namespaceObject.stripHexPrefix)(blockGasLimitHex), 16);
-    const upperGasLimitBn = blockGasLimitBn.muln(0.9);
-    const bufferedGasLimitBn = initialGasLimitBn.muln(multiplier);
-
-    // if initialGasLimit is above blockGasLimit, dont modify it
-    if (initialGasLimitBn.gt(upperGasLimitBn)) return (0,util_namespaceObject.addHexPrefix)(initialGasLimitBn.toString("hex"));
-    // if bufferedGasLimit is below blockGasLimit, use bufferedGasLimit
-    if (bufferedGasLimitBn.lt(upperGasLimitBn)) return (0,util_namespaceObject.addHexPrefix)(bufferedGasLimitBn.toString("hex"));
-    // otherwise use blockGasLimit
-    return (0,util_namespaceObject.addHexPrefix)(upperGasLimitBn.toString("hex"));
-  }
-
-  /**
-    Estimates the tx's gas usage
-  */
-  async estimateTxGas(txMeta) {
-    const txParams = (0,external_lodash_namespaceObject.cloneDeep)(txMeta.transaction);
-
-    // `eth_estimateGas` can fail if the user has insufficient balance for the
-    // value being sent, or for the gas cost. We don't want to check their
-    // balance here, we just want the gas estimate. The gas price is removed
-    // to skip those balance checks. We check balance elsewhere. We also delete
-    // maxFeePerGas and maxPriorityFeePerGas to support EIP-1559 txs.
-    delete txParams.gasPrice;
-    delete txParams.maxFeePerGas;
-    delete txParams.maxPriorityFeePerGas;
-    return this.provider.request({
-      method: "eth_estimateGas",
-      params: [txParams]
-    });
-  }
-}
-;// CONCATENATED MODULE: external "fast-json-patch"
-const external_fast_json_patch_namespaceObject = require("fast-json-patch");
-var external_fast_json_patch_default = /*#__PURE__*/__webpack_require__.n(external_fast_json_patch_namespaceObject);
-;// CONCATENATED MODULE: ./src/Transaction/TransactionStateHistoryHelper.ts
-
-
-
-/**
-  Generates an array of history objects sense the previous state.
-  The object has the keys
-    op (the operation performed),
-    path (the key and if a nested object then each key will be seperated with a `/`)
-    value
-  with the first entry having the note and a timestamp when the change took place
-*/
-function generateHistoryEntry(previousState, newState, note) {
-  const entry = external_fast_json_patch_default().compare(previousState, newState);
-  // Add a note to the first op, since it breaks if we append it to the entry
-  if (entry[0]) {
-    if (note) {
-      entry[0].note = note;
-    }
-    entry[0].timestamp = Date.now();
-  }
-  return entry;
-}
-
-/**
-  Recovers previous txMeta state obj
-*/
-function replayHistory(_shortHistory) {
-  const shortHistory = (0,external_lodash_namespaceObject.cloneDeep)(_shortHistory);
-  return shortHistory.reduce((val, entry) => external_fast_json_patch_default().applyPatch(val, entry).newDocument);
-}
-function snapshotFromTxMeta(txMeta) {
-  const shallow = objectSpread2_default()({}, txMeta);
-  delete shallow.history;
-  return (0,external_lodash_namespaceObject.cloneDeep)(shallow);
-}
-
-;// CONCATENATED MODULE: ./src/Transaction/TransactionUtils.ts
-
-
-
-
-
-
-
-const erc20Interface = new external_ethers_namespaceObject.Interface(erc20Abi);
-const erc721Interface = new external_ethers_namespaceObject.Interface(erc721Abi);
-const erc1155Interface = new external_ethers_namespaceObject.Interface(erc1155Abi);
-
-// functions that handle normalizing of that key in txParams
-
-const normalizers = {
-  from: function (from) {
-    let LowerCase = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
-    return LowerCase ? (0,util_namespaceObject.addHexPrefix)(from).toLowerCase() : (0,util_namespaceObject.addHexPrefix)(from);
-  },
-  to: function (to) {
-    let LowerCase = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
-    return LowerCase ? (0,util_namespaceObject.addHexPrefix)(to).toLowerCase() : (0,util_namespaceObject.addHexPrefix)(to);
-  },
-  nonce: nonce => (0,util_namespaceObject.addHexPrefix)(nonce),
-  customNonceValue: nonce => (0,util_namespaceObject.addHexPrefix)(nonce),
-  value: value => (0,util_namespaceObject.addHexPrefix)(value),
-  data: data => (0,util_namespaceObject.addHexPrefix)(data),
-  gas: gas => (0,util_namespaceObject.addHexPrefix)(gas),
-  gasPrice: gasPrice => (0,util_namespaceObject.addHexPrefix)(gasPrice),
-  type: util_namespaceObject.addHexPrefix,
-  maxFeePerGas: util_namespaceObject.addHexPrefix,
-  maxPriorityFeePerGas: util_namespaceObject.addHexPrefix
-};
-
-/**
- * normalizes txParams
- */
-function normalizeTxParameters(txParameters) {
-  let lowerCase = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
-  // apply only keys in the normalizers
-  const normalizedTxParameters = {
-    id: txParameters.id || (0,base_controllers_namespaceObject.randomId)(),
-    from: txParameters.from
-  };
-  for (const key in normalizers) {
-    const currentKey = key;
-    if (txParameters[currentKey])
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      normalizedTxParameters[currentKey] = normalizers[currentKey](txParameters[currentKey], lowerCase);
-  }
-  return normalizedTxParameters;
-}
-function transactionMatchesNetwork(transaction, chainId) {
-  if (typeof transaction.chainId !== "undefined") {
-    return transaction.chainId === chainId;
-  }
-  return false;
-}
-
-/**
- * Determines if the maxFeePerGas and maxPriorityFeePerGas fields are supplied
- * and valid inputs. This will return false for non hex string inputs.
- *  the transaction to check
- * @returns true if transaction uses valid EIP1559 fields
- */
-function isEIP1559Transaction(transaction) {
-  var _transaction$transact, _transaction$transact2;
-  return (0,util_namespaceObject.isHexString)((0,util_namespaceObject.addHexPrefix)(transaction === null || transaction === void 0 || (_transaction$transact = transaction.transaction) === null || _transaction$transact === void 0 ? void 0 : _transaction$transact.maxFeePerGas)) && (0,util_namespaceObject.isHexString)((0,util_namespaceObject.addHexPrefix)(transaction === null || transaction === void 0 || (_transaction$transact2 = transaction.transaction) === null || _transaction$transact2 === void 0 ? void 0 : _transaction$transact2.maxPriorityFeePerGas));
-}
-
-/**
- * Determine if the maxFeePerGas and maxPriorityFeePerGas fields are not
- * supplied and that the gasPrice field is valid if it is provided. This will
- * return false if gasPrice is a non hex string.
- * transaction -
- *  the transaction to check
- * @returns true if transaction uses valid Legacy fields OR lacks
- *  EIP1559 fields
- */
-function isLegacyTransaction(transaction) {
-  return typeof transaction.transaction.maxFeePerGas === "undefined" && typeof transaction.transaction.maxPriorityFeePerGas === "undefined" && (typeof transaction.transaction.gasPrice === "undefined" || (0,util_namespaceObject.isHexString)((0,util_namespaceObject.addHexPrefix)(transaction.transaction.gasPrice)));
-}
-
-/**
- * Given two fields, ensure that the second field is not included in txParams,
- * and if it is throw an invalidParams error.
- */
-function ensureMutuallyExclusiveFieldsNotProvided(txParams, fieldBeingValidated, mutuallyExclusiveField) {
-  if (typeof txParams[mutuallyExclusiveField] !== "undefined") {
-    throw rpc_errors_namespaceObject.rpcErrors.invalidParams(`Invalid transaction params: specified ${fieldBeingValidated} but also included ${mutuallyExclusiveField}, these cannot be mixed`);
-  }
-}
-
-/**
- * Ensures that the provided value for field is a string, throws an
- * invalidParams error if field is not a string.
- */
-function ensureFieldIsString(txParams, field) {
-  if (typeof txParams[field] !== "string") {
-    throw rpc_errors_namespaceObject.rpcErrors.invalidParams(`Invalid transaction params: ${field} is not a string. got: (${txParams[field]})`);
-  }
-}
-
-/**
- * Ensures that the provided txParams has the proper 'type' specified for the
- * given field, if it is provided. If types do not match throws an
- * invalidParams error.
- */
-function ensureProperTransactionEnvelopeTypeProvided(txParams, field) {
-  switch (field) {
-    case "maxFeePerGas":
-    case "maxPriorityFeePerGas":
-      if (txParams.type && txParams.type !== TRANSACTION_ENVELOPE_TYPES.FEE_MARKET) {
-        throw rpc_errors_namespaceObject.rpcErrors.invalidParams(`Invalid transaction envelope type: specified type "${txParams.type}" but ` + `including maxFeePerGas and maxPriorityFeePerGas requires type: "${TRANSACTION_ENVELOPE_TYPES.FEE_MARKET}"`);
-      }
-      break;
-    case "gasPrice":
-    default:
-      if (txParams.type && txParams.type === TRANSACTION_ENVELOPE_TYPES.FEE_MARKET) {
-        throw rpc_errors_namespaceObject.rpcErrors.invalidParams(`Invalid transaction envelope type: specified type "${txParams.type}" but ` + "included a gasPrice instead of maxFeePerGas and maxPriorityFeePerGas");
-      }
-  }
-}
+    const blockGasLimitBn = new external_bn_js_namespaceObject.BN((0,util_namespaceObject.stripHexPrefix)(blockGasLimitHex), 16);
+    const upperGasLimitBn = blockGasLimitBn.muln(0.9);
+    const bufferedGasLimitBn = initialGasLimitBn.muln(multiplier);
 
-/**
- * validates the from field in  txParams
- */
-function validateFrom(txParams) {
-  if (!(typeof txParams.from === "string")) {
-    throw rpc_errors_namespaceObject.rpcErrors.invalidParams(`Invalid "from" address "${txParams.from}": not a string.`);
+    // if initialGasLimit is above blockGasLimit, dont modify it
+    if (initialGasLimitBn.gt(upperGasLimitBn)) return (0,util_namespaceObject.addHexPrefix)(initialGasLimitBn.toString("hex"));
+    // if bufferedGasLimit is below blockGasLimit, use bufferedGasLimit
+    if (bufferedGasLimitBn.lt(upperGasLimitBn)) return (0,util_namespaceObject.addHexPrefix)(bufferedGasLimitBn.toString("hex"));
+    // otherwise use blockGasLimit
+    return (0,util_namespaceObject.addHexPrefix)(upperGasLimitBn.toString("hex"));
   }
-  if (!(0,util_namespaceObject.isValidAddress)(txParams.from)) {
-    throw rpc_errors_namespaceObject.rpcErrors.invalidParams('Invalid "from" address.');
+
+  /**
+    Estimates the tx's gas usage
+  */
+  async estimateTxGas(txMeta) {
+    const txParams = (0,external_lodash_namespaceObject.cloneDeep)(txMeta.transaction);
+
+    // `eth_estimateGas` can fail if the user has insufficient balance for the
+    // value being sent, or for the gas cost. We don't want to check their
+    // balance here, we just want the gas estimate. The gas price is removed
+    // to skip those balance checks. We check balance elsewhere. We also delete
+    // maxFeePerGas and maxPriorityFeePerGas to support EIP-1559 txs.
+    delete txParams.gasPrice;
+    delete txParams.maxFeePerGas;
+    delete txParams.maxPriorityFeePerGas;
+    return this.provider.request({
+      method: "eth_estimateGas",
+      params: [txParams]
+    });
   }
 }
+;// CONCATENATED MODULE: external "fast-json-patch"
+const external_fast_json_patch_namespaceObject = require("fast-json-patch");
+var external_fast_json_patch_default = /*#__PURE__*/__webpack_require__.n(external_fast_json_patch_namespaceObject);
+;// CONCATENATED MODULE: ./src/Transaction/TransactionStateHistoryHelper.ts
+
+
 
 /**
- * validates the to field in  txParams
- */
-function validateRecipient(txParameters) {
-  if (txParameters.to === "0x" || txParameters.to === null) {
-    if (txParameters.data) {
-      delete txParameters.to;
-    } else {
-      throw rpc_errors_namespaceObject.rpcErrors.invalidParams('Invalid "to" address.');
+  Generates an array of history objects sense the previous state.
+  The object has the keys
+    op (the operation performed),
+    path (the key and if a nested object then each key will be seperated with a `/`)
+    value
+  with the first entry having the note and a timestamp when the change took place
+*/
+function generateHistoryEntry(previousState, newState, note) {
+  const entry = external_fast_json_patch_default().compare(previousState, newState);
+  // Add a note to the first op, since it breaks if we append it to the entry
+  if (entry[0]) {
+    if (note) {
+      entry[0].note = note;
     }
-  } else if (txParameters.to !== undefined && !(0,util_namespaceObject.isValidAddress)(txParameters.to)) {
-    throw rpc_errors_namespaceObject.rpcErrors.invalidParams('Invalid "to" address.');
+    entry[0].timestamp = Date.now();
   }
-  return txParameters;
+  return entry;
 }
 
 /**
- * Validates the given tx parameters
- * @throws if the tx params contains invalid fields
- */
-function validateTxParameters(txParams) {
-  let eip1559Compatibility = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
-  if (!txParams || typeof txParams !== "object" || Array.isArray(txParams)) {
-    throw rpc_errors_namespaceObject.rpcErrors.invalidParams("Invalid transaction params: must be an object.");
-  }
-  if (!txParams.to && !txParams.data) {
-    throw rpc_errors_namespaceObject.rpcErrors.invalidParams('Invalid transaction params: must specify "data" for contract deployments, or "to" (and optionally "data") for all other types of transactions.');
-  }
-  if (isEIP1559Transaction({
-    transaction: txParams
-  }) && !eip1559Compatibility) {
-    throw rpc_errors_namespaceObject.rpcErrors.invalidParams("Invalid transaction params: params specify an EIP-1559 transaction but the current network does not support EIP-1559");
-  }
-  Object.entries(txParams).forEach(_ref => {
-    let [key, value] = _ref;
-    // validate types
-    switch (key) {
-      case "from":
-        validateFrom(txParams);
-        break;
-      case "to":
-        validateRecipient(txParams);
-        break;
-      case "gasPrice":
-        ensureProperTransactionEnvelopeTypeProvided(txParams, "gasPrice");
-        ensureMutuallyExclusiveFieldsNotProvided(txParams, "gasPrice", "maxFeePerGas");
-        ensureMutuallyExclusiveFieldsNotProvided(txParams, "gasPrice", "maxPriorityFeePerGas");
-        ensureFieldIsString(txParams, "gasPrice");
-        break;
-      case "maxFeePerGas":
-        ensureProperTransactionEnvelopeTypeProvided(txParams, "maxFeePerGas");
-        ensureMutuallyExclusiveFieldsNotProvided(txParams, "maxFeePerGas", "gasPrice");
-        ensureFieldIsString(txParams, "maxFeePerGas");
-        break;
-      case "maxPriorityFeePerGas":
-        ensureProperTransactionEnvelopeTypeProvided(txParams, "maxPriorityFeePerGas");
-        ensureMutuallyExclusiveFieldsNotProvided(txParams, "maxPriorityFeePerGas", "gasPrice");
-        ensureFieldIsString(txParams, "maxPriorityFeePerGas");
-        break;
-      case "value":
-        ensureFieldIsString(txParams, "value");
-        if (value.toString().includes("-")) {
-          throw rpc_errors_namespaceObject.rpcErrors.invalidParams(`Invalid transaction value "${value}": not a positive number.`);
-        }
-        if (value.toString().includes(".")) {
-          throw rpc_errors_namespaceObject.rpcErrors.invalidParams(`Invalid transaction value of "${value}": number must be in wei.`);
-        }
-        break;
-      case "chainId":
-        if (typeof value !== "number" && typeof value !== "string") {
-          throw rpc_errors_namespaceObject.rpcErrors.invalidParams(`Invalid transaction params: ${key} is not a Number or hex string. got: (${value})`);
-        }
-        break;
-      default:
-        ensureFieldIsString(txParams, key);
-    }
-  });
+  Recovers previous txMeta state obj
+*/
+function replayHistory(_shortHistory) {
+  const shortHistory = (0,external_lodash_namespaceObject.cloneDeep)(_shortHistory);
+  return shortHistory.reduce((val, entry) => external_fast_json_patch_default().applyPatch(val, entry).newDocument);
 }
-function normalizeAndValidateTxParams(txParams) {
-  let lowerCase = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
-  const normalizedTxParams = normalizeTxParameters(txParams, lowerCase);
-  validateTxParameters(normalizedTxParams);
-  return normalizedTxParams;
+function snapshotFromTxMeta(txMeta) {
+  const shallow = objectSpread2_default()({}, txMeta);
+  delete shallow.history;
+  return (0,external_lodash_namespaceObject.cloneDeep)(shallow);
 }
 
-/**
- * @returns an array of states that can be considered final
- */
-function getFinalStates() {
-  return [base_controllers_namespaceObject.TransactionStatus.rejected,
-  // the user has responded no!
-  base_controllers_namespaceObject.TransactionStatus.confirmed,
-  // the tx has been included in a block.
-  base_controllers_namespaceObject.TransactionStatus.failed,
-  // the tx failed for some reason, included on tx data.
-  base_controllers_namespaceObject.TransactionStatus.dropped // the tx nonce was already used
-  ];
-}
-function parseStandardTokenTransactionData(data) {
-  try {
-    const txDesc = erc20Interface.parseTransaction({
-      data
-    });
-    if (txDesc) return {
-      name: txDesc.name,
-      methodParams: txDesc.args.toArray(),
-      type: CONTRACT_TYPE_ERC20
-    };
-  } catch {
-    // ignore and next try to parse with erc721 ABI
-  }
-  try {
-    const txDesc = erc721Interface.parseTransaction({
-      data
-    });
-    if (txDesc) return {
-      name: txDesc.name,
-      methodParams: txDesc.args.toArray(),
-      type: CONTRACT_TYPE_ERC721
-    };
-  } catch {
-    // ignore and next try to parse with erc1155 ABI
-  }
-  try {
-    const txDesc = erc1155Interface.parseTransaction({
-      data
-    });
-    if (txDesc) return {
-      name: txDesc.name,
-      methodParams: txDesc.args.toArray(),
-      type: CONTRACT_TYPE_ERC1155
-    };
-  } catch {
-    // ignore and return undefined
-  }
-  return undefined;
-}
-const readAddressAsContract = async (provider, address) => {
-  let contractCode;
-  try {
-    contractCode = await provider.request({
-      method: METHOD_TYPES.ETH_GET_CODE,
-      params: [address, "latest"]
-    });
-  } catch (e) {
-    contractCode = null;
-  }
-  const isContractAddress = contractCode ? contractCode !== "0x" && contractCode !== "0x0" : false;
-  return {
-    contractCode,
-    isContractAddress
-  };
-};
-async function determineTransactionType(txParams, provider) {
-  const {
-    data,
-    to
-  } = txParams;
-  let name = "";
-  let methodParams = [];
-  let type = "";
-  try {
-    ({
-      name,
-      methodParams,
-      type
-    } = data && parseStandardTokenTransactionData(data) || {});
-  } catch (error) {
-    external_loglevel_default().debug("Failed to parse transaction data", error);
-  }
-  let result;
-  let contractCode = "";
-  if (data && !to) {
-    result = base_controllers_namespaceObject.TRANSACTION_TYPES.DEPLOY_CONTRACT;
-  } else {
-    const {
-      contractCode: resultCode,
-      isContractAddress
-    } = await readAddressAsContract(provider, to);
-    contractCode = resultCode;
-    if (isContractAddress) {
-      const valueExists = txParams.value && Number(txParams.value) !== 0;
-      const tokenMethodName = [base_controllers_namespaceObject.TRANSACTION_TYPES.TOKEN_METHOD_APPROVE, base_controllers_namespaceObject.TRANSACTION_TYPES.TOKEN_METHOD_TRANSFER, base_controllers_namespaceObject.TRANSACTION_TYPES.TOKEN_METHOD_TRANSFER_FROM, base_controllers_namespaceObject.TRANSACTION_TYPES.COLLECTIBLE_METHOD_SAFE_TRANSFER_FROM, base_controllers_namespaceObject.TRANSACTION_TYPES.SET_APPROVAL_FOR_ALL].find(x => {
-        var _name;
-        return x.toLowerCase() === ((_name = name) === null || _name === void 0 ? void 0 : _name.toLowerCase());
-      });
-      result = data && tokenMethodName && !valueExists ? tokenMethodName : base_controllers_namespaceObject.TRANSACTION_TYPES.CONTRACT_INTERACTION;
-    } else {
-      result = base_controllers_namespaceObject.TRANSACTION_TYPES.SENT_ETHER;
-    }
-  }
-  return {
-    type: type || CONTRACT_TYPE_ETH,
-    category: result,
-    methodParams,
-    getCodeResponse: contractCode
-  };
-}
 ;// CONCATENATED MODULE: ./src/Transaction/TransactionStateManager.ts
 
 
@@ -6603,6 +6677,7 @@ class TransactionController extends TransactionStateManager {
 
 
 
+
 
 
 /**