@toruslabs/ethereum-controllers 5.5.2 → 5.5.4

package/dist/ethereumControllers.cjs.js

@@ -1090,9 +1090,6 @@ class AccountTrackerController extends base_controllers_namespaceObject.BaseCont
     this.defaultState = {
       accounts: {}
     };
-    this.defaultConfig = {
-      _currentBlock: null
-    };
     this.initialize();
     this.provider = provider;
     this.blockTracker = blockTracker;
@@ -1108,10 +1105,7 @@ class AccountTrackerController extends base_controllers_namespaceObject.BaseCont
     });
     this.blockTrackerListener = this.blockTrackerListener.bind(this);
   }
-  blockTrackerListener(block) {
-    this.configure({
-      _currentBlock: block
-    });
+  blockTrackerListener() {
     this.refresh();
   }
   startPolling() {
@@ -1152,8 +1146,6 @@ class AccountTrackerController extends base_controllers_namespaceObject.BaseCont
   async refresh() {
     const releaseLock = await this.mutex.acquire();
     try {
-      const currentBlock = this.config._currentBlock;
-      if (!currentBlock) return;
       this._updateAccounts();
     } catch (error) {} finally {
       releaseLock();
@@ -1564,7 +1556,6 @@ async function determineTransactionType(txParams, provider) {
 
 
 
-
 function getEtherScanHashLink(txHash, chainId) {
   if (!SUPPORTED_NETWORKS[chainId]) return "";
   return `${SUPPORTED_NETWORKS[chainId].blockExplorerUrl}/tx/${txHash}`;
@@ -1718,13 +1709,24 @@ const addEtherscanTransactions = async (txn, lowerCaseSelectedAddress, provider,
   }));
   const finalTxs = transactionPromises.reduce((accumulator, x) => {
     var _SUPPORTED_NETWORKS$c3, _SUPPORTED_NETWORKS$c4;
-    const totalAmountString = x.value ? (0,external_ethers_namespaceObject.formatEther)(x.value) : "";
+    let totalAmountString = x.value ? new (external_bignumber_js_default())(x.value).div(new (external_bignumber_js_default())(10).pow(new (external_bignumber_js_default())(x.tokenDecimal || 18))).toString() : "";
+    let type = CONTRACT_TYPE_ETH;
+    if (x.contractAddress !== "") {
+      if (x.tokenID) {
+        type = x.tokenValue ? CONTRACT_TYPE_ERC1155 : CONTRACT_TYPE_ERC721;
+      } else {
+        type = CONTRACT_TYPE_ERC20;
+      }
+    }
+    if (type === CONTRACT_TYPE_ERC1155) {
+      totalAmountString = x.tokenValue;
+    }
     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,
       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,
+      type_name: x.tokenName || ((_SUPPORTED_NETWORKS$c3 = SUPPORTED_NETWORKS[chainId]) === null || _SUPPORTED_NETWORKS$c3 === void 0 ? void 0 : _SUPPORTED_NETWORKS$c3.ticker) || "n/a",
+      symbol: x.tokenSymbol || ((_SUPPORTED_NETWORKS$c4 = SUPPORTED_NETWORKS[chainId]) === null || _SUPPORTED_NETWORKS$c4 === void 0 ? void 0 : _SUPPORTED_NETWORKS$c4.ticker),
       token_id: x.tokenID || "",
       total_amount: totalAmountString,
       created_at: new Date(Number(x.timeStamp) * 1000),
@@ -1736,8 +1738,8 @@ const addEtherscanTransactions = async (txn, lowerCaseSelectedAddress, provider,
       input: x.input,
       contract_address: x.contractAddress,
       transaction_category: x.transaction_category,
-      gas: x.gas,
-      gasPrice: x.gasPrice,
+      gas: `0x${new (external_bignumber_js_default())(x.gasUsed || 0, 10).toString(16)}`,
+      gasPrice: `0x${new (external_bignumber_js_default())(x.gasPrice || 0, 10).toString(16)}`,
       chain_id: chainId,
       currency_amount: "",
       nonce: x.nonce,
@@ -2591,7 +2593,7 @@ class KeyringController extends base_controllers_namespaceObject.BaseKeyringCont
     const hexPrivateKey = accountPrivateKey.padStart(64, "0");
     const bufferPrivKey = Buffer.from(hexPrivateKey, "hex");
     const publicKey = (0,util_namespaceObject.bytesToHex)((0,util_namespaceObject.privateToPublic)(bufferPrivKey));
-    const address = (0,util_namespaceObject.bytesToHex)((0,util_namespaceObject.privateToAddress)(bufferPrivKey));
+    const address = (0,util_namespaceObject.toChecksumAddress)((0,util_namespaceObject.bytesToHex)((0,util_namespaceObject.privateToAddress)(bufferPrivKey)));
     const existingWallet = this.state.wallets.find(w => w.address === address);
     if (existingWallet) return existingWallet.address;
     this.update({
@@ -4537,7 +4539,7 @@ class PreferencesController extends base_controllers_namespaceObject.BasePrefere
       calledFromEmbed,
       userInfo,
       rehydrate,
-      locale = "en-US",
+      locale = "en",
       type,
       signatures,
       web3AuthClientId,
@@ -4641,7 +4643,7 @@ class PreferencesController extends base_controllers_namespaceObject.BasePrefere
   async patchNewTx(tx, address) {
     var _this$getAddressState2;
     const formattedTx = formatPastTx(tx);
-    const storePastTx = (_this$getAddressState2 = this.getAddressState(address)) === null || _this$getAddressState2 === void 0 ? void 0 : _this$getAddressState2.formattedPastTransactions;
+    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) {
       if (duplicateIndex === -1) {
@@ -6692,5 +6694,4 @@ class TransactionController extends TransactionStateManager {
  */
 module.exports = __webpack_exports__;
 /******/ })()
-;
-//# sourceMappingURL=ethereumControllers.cjs.js.map
+;

package/dist/ethereumControllers.esm.js

@@ -2,7 +2,7 @@ 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 { Mutex } from 'async-mutex';
-import { BrowserProvider, toQuantity, Contract, Interface, formatEther, isHexString as isHexString$1, JsonRpcProvider, keccak256 } from 'ethers';
+import { BrowserProvider, toQuantity, Contract, Interface, isHexString as isHexString$1, JsonRpcProvider, keccak256 } from 'ethers';
 import log from 'loglevel';
 import { isHexString, addHexPrefix, isValidAddress, toChecksumAddress, stripHexPrefix, bytesToHex, privateToPublic, privateToAddress, ecsign, bigIntToBytes } from '@ethereumjs/util';
 import BigNumber from 'bignumber.js';
@@ -890,9 +890,6 @@ class AccountTrackerController extends BaseController {
     this.defaultState = {
       accounts: {}
     };
-    this.defaultConfig = {
-      _currentBlock: null
-    };
     this.initialize();
     this.provider = provider;
     this.blockTracker = blockTracker;
@@ -908,10 +905,7 @@ class AccountTrackerController extends BaseController {
     });
     this.blockTrackerListener = this.blockTrackerListener.bind(this);
   }
-  blockTrackerListener(block) {
-    this.configure({
-      _currentBlock: block
-    });
+  blockTrackerListener() {
     this.refresh();
   }
   startPolling() {
@@ -952,8 +946,6 @@ class AccountTrackerController extends BaseController {
   async refresh() {
     const releaseLock = await this.mutex.acquire();
     try {
-      const currentBlock = this.config._currentBlock;
-      if (!currentBlock) return;
       this._updateAccounts();
     } catch (error) {} finally {
       releaseLock();
@@ -1495,13 +1487,24 @@ const addEtherscanTransactions = async (txn, lowerCaseSelectedAddress, provider,
   }));
   const finalTxs = transactionPromises.reduce((accumulator, x) => {
     var _SUPPORTED_NETWORKS$c3, _SUPPORTED_NETWORKS$c4;
-    const totalAmountString = x.value ? formatEther(x.value) : "";
+    let totalAmountString = x.value ? new BigNumber(x.value).div(new BigNumber(10).pow(new BigNumber(x.tokenDecimal || 18))).toString() : "";
+    let type = CONTRACT_TYPE_ETH;
+    if (x.contractAddress !== "") {
+      if (x.tokenID) {
+        type = x.tokenValue ? CONTRACT_TYPE_ERC1155 : CONTRACT_TYPE_ERC721;
+      } else {
+        type = CONTRACT_TYPE_ERC20;
+      }
+    }
+    if (type === CONTRACT_TYPE_ERC1155) {
+      totalAmountString = x.tokenValue;
+    }
     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,
       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,
+      type_name: x.tokenName || ((_SUPPORTED_NETWORKS$c3 = SUPPORTED_NETWORKS[chainId]) === null || _SUPPORTED_NETWORKS$c3 === void 0 ? void 0 : _SUPPORTED_NETWORKS$c3.ticker) || "n/a",
+      symbol: x.tokenSymbol || ((_SUPPORTED_NETWORKS$c4 = SUPPORTED_NETWORKS[chainId]) === null || _SUPPORTED_NETWORKS$c4 === void 0 ? void 0 : _SUPPORTED_NETWORKS$c4.ticker),
       token_id: x.tokenID || "",
       total_amount: totalAmountString,
       created_at: new Date(Number(x.timeStamp) * 1000),
@@ -1513,8 +1516,8 @@ const addEtherscanTransactions = async (txn, lowerCaseSelectedAddress, provider,
       input: x.input,
       contract_address: x.contractAddress,
       transaction_category: x.transaction_category,
-      gas: x.gas,
-      gasPrice: x.gasPrice,
+      gas: `0x${new BigNumber(x.gasUsed || 0, 10).toString(16)}`,
+      gasPrice: `0x${new BigNumber(x.gasPrice || 0, 10).toString(16)}`,
       chain_id: chainId,
       currency_amount: "",
       nonce: x.nonce,
@@ -2296,7 +2299,7 @@ class KeyringController extends BaseKeyringController {
     const hexPrivateKey = accountPrivateKey.padStart(64, "0");
     const bufferPrivKey = Buffer.from(hexPrivateKey, "hex");
     const publicKey = bytesToHex(privateToPublic(bufferPrivKey));
-    const address = bytesToHex(privateToAddress(bufferPrivKey));
+    const address = toChecksumAddress(bytesToHex(privateToAddress(bufferPrivKey)));
     const existingWallet = this.state.wallets.find(w => w.address === address);
     if (existingWallet) return existingWallet.address;
     this.update({
@@ -4135,7 +4138,7 @@ class PreferencesController extends BasePreferencesController {
       calledFromEmbed,
       userInfo,
       rehydrate,
-      locale = "en-US",
+      locale = "en",
       type,
       signatures,
       web3AuthClientId,
@@ -4239,7 +4242,7 @@ class PreferencesController extends BasePreferencesController {
   async patchNewTx(tx, address) {
     var _this$getAddressState2;
     const formattedTx = formatPastTx(tx);
-    const storePastTx = (_this$getAddressState2 = this.getAddressState(address)) === null || _this$getAddressState2 === void 0 ? void 0 : _this$getAddressState2.formattedPastTransactions;
+    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) {
       if (duplicateIndex === -1) {
@@ -6168,4 +6171,3 @@ class TransactionController extends TransactionStateManager {
 }
 
 export { ARBITRUM_MAINNET_CHAIN_ID, ARBITRUM_TESTNET_CHAIN_ID, AVALANCHE_MAINNET_CHAIN_ID, AVALANCHE_TESTNET_CHAIN_ID, AccountTrackerController, AddChainController, BASE_CHAIN_ID, BASE_TESTNET_CHAIN_ID, BSC_MAINNET_CHAIN_ID, BSC_TESTNET_CHAIN_ID, CELO_MAINNET_CHAIN_ID, CHAIN_ID_TO_GAS_LIMIT_BUFFER_MAP, COINGECKO_PLATFORMS_CHAIN_CODE_MAP, COINGECKO_SUPPORTED_CURRENCIES, CONTRACT_TYPE_ERC1155, CONTRACT_TYPE_ERC20, CONTRACT_TYPE_ERC721, CONTRACT_TYPE_ETH, CurrencyController, DEFAULT_CURRENCY, DecryptMessageController, ERC1155_INTERFACE_ID, ERC721_ENUMERABLE_INTERFACE_ID, ERC721_INTERFACE_ID, ERC721_METADATA_INTERFACE_ID, ETHERSCAN_SUPPORTED_CHAINS, EncryptionPublicKeyController, GAS_ESTIMATE_TYPES, GAS_LIMITS, GasFeeController, KeyringController, LOCALHOST, MAINNET_CHAIN_ID, MESSAGE_EVENTS, METHOD_TYPES, MessageController, MessageStatus, NetworkController, NftHandler, NftsController, NonceTracker, OLD_ERC721_LIST, OPTIMISM_MAINNET_CHAIN_ID, OPTIMISM_TESTNET_CHAIN_ID, POLYGON_CHAIN_ID, POLYGON_MUMBAI_CHAIN_ID, PendingTransactionTracker, PersonalMessageController, PollingBlockTracker, PreferencesController, SEPOLIA_CHAIN_ID, SIMPLEHASH_SUPPORTED_CHAINS, SUPPORTED_NETWORKS, SwitchChainController, TEST_CHAINS, TRANSACTION_ENVELOPE_TYPES, TokenHandler, TokenRatesController, TokensController, TransactionController, TransactionGasUtil, TransactionStateManager, TypedMessageController, XDAI_CHAIN_ID, addCurrencies, addEtherscanTransactions, bnLessThan, conversionGTE, conversionGreaterThan, conversionLTE, conversionLessThan, conversionMax, conversionUtil, createChainIdMiddleware, createEthereumMiddleware, createGetAccountsMiddleware, createJsonRpcClient, createPendingNonceMiddleware, createPendingTxMiddleware, createProcessAddEthereumChain, createProcessDecryptMessageMiddleware, createProcessEncryptionPublicKeyMiddleware, createProcessEthSignMessage, createProcessPersonalMessage, createProcessSwitchEthereumChain, createProcessTransactionMiddleware, createProcessTypedMessage, createProcessTypedMessageV3, createProcessTypedMessageV4, createProviderConfigMiddleware, createRequestAccountsMiddleware, decGWEIToHexWEI, determineTransactionType, ensureFieldIsString, ensureMutuallyExclusiveFieldsNotProvided, erc1155Abi, erc20Abi, erc721Abi, formatDate, formatPastTx, formatTime, formatTxMetaForRpcResult, generateHistoryEntry, getBigNumber, getChainType, getEthTxStatus, getEtherScanHashLink, getFinalStates, getIpfsEndpoint, hexWEIToDecGWEI, idleTimeTracker, isAddressByChainId, isEIP1559Transaction, isLegacyTransaction, multiplyCurrencies, normalizeAndValidateTxParams, normalizeMessageData, normalizeTxParameters, parseDecryptMessageData, parseStandardTokenTransactionData, readAddressAsContract, replayHistory, sanitizeNftMetdataUrl, singleBalanceCheckerAbi, snapshotFromTxMeta, subtractCurrencies, toChecksumAddressByChainId, toNegative, transactionMatchesNetwork, validateAddChainData, validateAddress, validateDecryptedMessageData, validateEncryptionPublicKeyMessageData, validateFrom, validateRecipient, validateSignMessageData, validateSwitchChainData, validateTxParameters, validateTypedSignMessageDataV1, validateTypedSignMessageDataV3V4 };
-//# sourceMappingURL=ethereumControllers.esm.js.map