@toruslabs/ethereum-controllers 5.5.1 → 5.5.3

package/dist/ethereumControllers.esm.js

@@ -2,9 +2,9 @@ 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, SigningKey, Wallet, 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, ecsign, bigIntToBytes, bytesToHex } from '@ethereumjs/util';
+import { isHexString, addHexPrefix, isValidAddress, toChecksumAddress, stripHexPrefix, bytesToHex, privateToPublic, privateToAddress, ecsign, bigIntToBytes } from '@ethereumjs/util';
 import BigNumber from 'bignumber.js';
 import { rpcErrors, providerErrors } from '@metamask/rpc-errors';
 import { get, post, remove, patch } from '@toruslabs/http-helpers';
@@ -1495,13 +1495,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 +1524,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,
@@ -2293,17 +2304,15 @@ class KeyringController extends BaseKeyringController {
     return this.state.wallets.map(w => w.publicKey);
   }
   importAccount(accountPrivateKey) {
-    const hexPrivateKey = addHexPrefix(accountPrivateKey);
-    const signingKey = new SigningKey(hexPrivateKey);
-    const wallet = new Wallet(signingKey.privateKey);
-    const {
-      address
-    } = wallet;
+    const hexPrivateKey = accountPrivateKey.padStart(64, "0");
+    const bufferPrivKey = Buffer.from(hexPrivateKey, "hex");
+    const publicKey = bytesToHex(privateToPublic(bufferPrivKey));
+    const address = bytesToHex(privateToAddress(bufferPrivKey));
     const existingWallet = this.state.wallets.find(w => w.address === address);
     if (existingWallet) return existingWallet.address;
     this.update({
       wallets: [...this.state.wallets, {
-        publicKey: signingKey.publicKey,
+        publicKey,
         privateKey: accountPrivateKey,
         address
       }]
@@ -4137,7 +4146,7 @@ class PreferencesController extends BasePreferencesController {
       calledFromEmbed,
       userInfo,
       rehydrate,
-      locale = "en-US",
+      locale = "en",
       type,
       signatures,
       web3AuthClientId,
@@ -4241,7 +4250,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) {