@toruslabs/ethereum-controllers 5.5.0 → 5.5.2

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, formatEther, 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';
@@ -2293,17 +2293,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
       }]
@@ -2630,7 +2628,7 @@ class AddChainController extends AbstractMessageController {
     try {
       const msgObject = this.getMessage(messageId);
       await this.approveMessage(messageId, msgObject.messageParams);
-      this.addChain(msgObject.messageParams);
+      await this.addChain(msgObject.messageParams);
       this.updateMessage(_objectSpread(_objectSpread({}, msgObject), {}, {
         rawSig: JSON.stringify(msgObject.messageParams)
       }));