@toruslabs/ethereum-controllers 6.0.4 → 6.1.1

package/dist/ethereumControllers.cjs.js

@@ -1,46 +1,7 @@
 /******/ (() => { // webpackBootstrap
 /******/ 	"use strict";
-/******/ 	var __webpack_modules__ = ({
-
-/***/ 652:
-/***/ ((module) => {
-
-module.exports = require("@ethereumjs/common");
-
-/***/ }),
-
-/***/ 81:
-/***/ ((module) => {
-
-module.exports = require("@ethereumjs/tx");
-
-/***/ })
-
-/******/ 	});
-/************************************************************************/
-/******/ 	// The module cache
-/******/ 	var __webpack_module_cache__ = {};
-/******/ 	
-/******/ 	// The require function
-/******/ 	function __webpack_require__(moduleId) {
-/******/ 		// Check if module is in cache
-/******/ 		var cachedModule = __webpack_module_cache__[moduleId];
-/******/ 		if (cachedModule !== undefined) {
-/******/ 			return cachedModule.exports;
-/******/ 		}
-/******/ 		// Create a new module (and put it into the cache)
-/******/ 		var module = __webpack_module_cache__[moduleId] = {
-/******/ 			// no module.id needed
-/******/ 			// no module.loaded needed
-/******/ 			exports: {}
-/******/ 		};
-/******/ 	
-/******/ 		// Execute the module function
-/******/ 		__webpack_modules__[moduleId](module, module.exports, __webpack_require__);
-/******/ 	
-/******/ 		// Return the exports of the module
-/******/ 		return module.exports;
-/******/ 	}
+/******/ 	// The require scope
+/******/ 	var __webpack_require__ = {};
 /******/ 	
 /************************************************************************/
 /******/ 	/* webpack/runtime/compat get default export */
@@ -55,36 +16,6 @@ module.exports = require("@ethereumjs/tx");
 /******/ 		};
 /******/ 	})();
 /******/ 	
-/******/ 	/* webpack/runtime/create fake namespace object */
-/******/ 	(() => {
-/******/ 		var getProto = Object.getPrototypeOf ? (obj) => (Object.getPrototypeOf(obj)) : (obj) => (obj.__proto__);
-/******/ 		var leafPrototypes;
-/******/ 		// create a fake namespace object
-/******/ 		// mode & 1: value is a module id, require it
-/******/ 		// mode & 2: merge all properties of value into the ns
-/******/ 		// mode & 4: return value when already ns object
-/******/ 		// mode & 16: return value when it's Promise-like
-/******/ 		// mode & 8|1: behave like require
-/******/ 		__webpack_require__.t = function(value, mode) {
-/******/ 			if(mode & 1) value = this(value);
-/******/ 			if(mode & 8) return value;
-/******/ 			if(typeof value === 'object' && value) {
-/******/ 				if((mode & 4) && value.__esModule) return value;
-/******/ 				if((mode & 16) && typeof value.then === 'function') return value;
-/******/ 			}
-/******/ 			var ns = Object.create(null);
-/******/ 			__webpack_require__.r(ns);
-/******/ 			var def = {};
-/******/ 			leafPrototypes = leafPrototypes || [null, getProto({}), getProto([]), getProto(getProto)];
-/******/ 			for(var current = mode & 2 && value; typeof current == 'object' && !~leafPrototypes.indexOf(current); current = getProto(current)) {
-/******/ 				Object.getOwnPropertyNames(current).forEach((key) => (def[key] = () => (value[key])));
-/******/ 			}
-/******/ 			def['default'] = () => (value);
-/******/ 			__webpack_require__.d(ns, def);
-/******/ 			return ns;
-/******/ 		};
-/******/ 	})();
-/******/ 	
 /******/ 	/* webpack/runtime/define property getters */
 /******/ 	(() => {
 /******/ 		// define getter functions for harmony exports
@@ -2627,12 +2558,11 @@ class KeyringController extends base_controllers_namespaceObject.BaseKeyringCont
     this.initialize();
   }
   async signTransaction(tx, address) {
-    const txPayload = tx;
     const wallet = this._getWalletForAccount(address);
-    const privKey = this.getBufferPrivateKey(wallet.privateKey);
-    const signedTx = txPayload.sign(privKey);
-    // Newer versions of Ethereumjs-tx are immutable and return a new tx object
-    return signedTx === undefined ? tx : signedTx;
+    const privKey = new external_ethers_namespaceObject.SigningKey((0,util_namespaceObject.addHexPrefix)(wallet.privateKey));
+    const localTx = tx;
+    localTx.signature = privKey.sign(localTx.unsignedHash);
+    return localTx;
   }
   getAccounts() {
     return this.state.wallets.map(w => w.publicKey);
@@ -5185,11 +5115,14 @@ class TokensController extends base_controllers_namespaceObject.BaseController {
           chainId: x.chainId
         };
       } catch (error) {
-        external_loglevel_default().warn("Invalid contract address while fetching", error);
+        external_loglevel_default().warn("could not fetch user token balance", error);
         return undefined;
       }
     }));
-    const nonZeroTokens = promiseSettledResult.filter(x => x.status === "fulfilled").map(x => x.value);
+    const nonZeroTokens = promiseSettledResult.reduce((acc, x) => {
+      if (x.status === "fulfilled" && x.value) acc.push(x.value);
+      return acc;
+    }, []);
     this.update({
       tokens: {
         [this.userSelectedAddress]: mergeTokenArrays(this.userTokens, nonZeroTokens)
@@ -6018,7 +5951,6 @@ class TransactionController extends TransactionStateManager {
     signEthTx,
     getCurrentChainId,
     getCurrentNetworkEIP1559Compatibility,
-    getProviderConfig,
     getCurrentAccountEIP1559Compatibility,
     getSelectedAddress,
     getEIP1559GasFeeEstimates
@@ -6035,7 +5967,6 @@ class TransactionController extends TransactionStateManager {
     defineProperty_default()(this, "txGasUtil", void 0);
     defineProperty_default()(this, "_getCurrentNetworkEIP1559Compatibility", void 0);
     defineProperty_default()(this, "_getCurrentAccountEIP1559Compatibility", void 0);
-    defineProperty_default()(this, "getProviderConfig", void 0);
     defineProperty_default()(this, "signEthTx", void 0);
     defineProperty_default()(this, "provider", void 0);
     defineProperty_default()(this, "blockTracker", void 0);
@@ -6043,7 +5974,6 @@ class TransactionController extends TransactionStateManager {
     defineProperty_default()(this, "getUnapprovedTxCount", () => Object.keys(this.getUnapprovedTxList()).length);
     defineProperty_default()(this, "getPendingTxCount", account => this.getPendingTransactions(account).length);
     this.blockTracker = blockTracker;
-    this.getProviderConfig = getProviderConfig;
     this._getCurrentNetworkEIP1559Compatibility = getCurrentNetworkEIP1559Compatibility;
     this._getCurrentAccountEIP1559Compatibility = getCurrentAccountEIP1559Compatibility;
     this.getSelectedAddress = getSelectedAddress;
@@ -6144,27 +6074,27 @@ class TransactionController extends TransactionStateManager {
     const txMeta = this.getTransaction(txId);
     const chainId = this.getCurrentChainId();
     const type = isEIP1559Transaction(txMeta) ? TRANSACTION_ENVELOPE_TYPES.FEE_MARKET : TRANSACTION_ENVELOPE_TYPES.LEGACY;
-    const txParams = objectSpread2_default()(objectSpread2_default()({}, txMeta.transaction), {}, {
-      type,
+    const txParams = {
+      type: Number.parseInt(type, 16),
       chainId,
-      gasLimit: txMeta.transaction.gas
-    });
-    const fromAddress = txParams.from;
-    const common = await this.getCommonConfiguration(fromAddress);
-    const {
-      TransactionFactory
-    } = await Promise.resolve(/* import() */).then(__webpack_require__.t.bind(__webpack_require__, 81, 23));
-    // TODO: fix this when @ethereumjs/tx is updated.
-    const unsignedEthTx = TransactionFactory.fromTxData(txParams, {
-      common
-    });
-    const signedEthTx = await this.signEthTx(unsignedEthTx, fromAddress);
-    txMeta.r = (0,util_namespaceObject.addHexPrefix)(signedEthTx.r.toString(16));
-    txMeta.s = (0,util_namespaceObject.addHexPrefix)(signedEthTx.s.toString(16));
-    txMeta.v = (0,util_namespaceObject.addHexPrefix)(signedEthTx.v.toString(16));
+      gasLimit: txMeta.transaction.gas,
+      accessList: txMeta.transaction.accessList,
+      data: txMeta.transaction.data,
+      gasPrice: txMeta.transaction.gasPrice,
+      maxFeePerGas: txMeta.transaction.maxFeePerGas,
+      maxPriorityFeePerGas: txMeta.transaction.maxPriorityFeePerGas,
+      nonce: Number.parseInt(txMeta.transaction.nonce, 16),
+      to: txMeta.transaction.to
+    };
+    const fromAddress = txMeta.transaction.from;
+    const tx = external_ethers_namespaceObject.Transaction.from(txParams);
+    const signedEthTx = await this.signEthTx(tx, fromAddress);
+    txMeta.r = signedEthTx.signature.r;
+    txMeta.s = signedEthTx.signature.s;
+    txMeta.v = (0,util_namespaceObject.addHexPrefix)(signedEthTx.signature.v.toString(16));
     this.updateTransactionInState(txMeta, "transactions#signTransaction: add r, s, v values");
     this.setTxStatusSigned(txId);
-    const rawTx = (0,util_namespaceObject.addHexPrefix)(Buffer.from(signedEthTx.serialize()).toString("hex"));
+    const rawTx = signedEthTx.serialized;
     return rawTx;
   }
   async publishTransaction(txId, rawTx) {
@@ -6465,24 +6395,6 @@ class TransactionController extends TransactionStateManager {
       external_loglevel_default().error(error);
     }
   }
-  async getCommonConfiguration(fromAddress) {
-    const {
-      chainId,
-      displayName
-    } = this.getProviderConfig();
-    const supportsEIP1559 = await this.getEIP1559Compatibility(fromAddress);
-    const {
-      Common,
-      Hardfork
-    } = await Promise.resolve(/* import() */).then(__webpack_require__.t.bind(__webpack_require__, 652, 23));
-    const hardfork = supportsEIP1559 ? Hardfork.Paris : Hardfork.Berlin;
-    return Common.custom({
-      chainId: chainId === "loading" ? 0 : Number.parseInt(chainId, 16),
-      defaultHardfork: hardfork,
-      name: displayName,
-      networkId: chainId === "loading" ? 0 : Number.parseInt(chainId, 16)
-    });
-  }
   markNonceDuplicatesDropped(txId) {
     const txMeta = this.getTransaction(txId);
     const {

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, cloneDeep, BaseKeyringController, concatSig, PROVIDER_JRPC_METHODS, createFetchMiddleware, createInflightCacheMiddleware, createSwappableProxy, createEventEmitterProxy, BasePreferencesController, isUnauthorizedError, TX_EVENTS, BaseTransactionStateManager, omitBy, transactionMatchesNetwork as transactionMatchesNetwork$1, pickBy } from '@toruslabs/base-controllers';
 import { Mutex } from 'async-mutex';
-import { BrowserProvider, toQuantity, Contract, Interface, SigningKey, hashMessage, TypedDataEncoder, isHexString as isHexString$1, JsonRpcProvider, keccak256 } from 'ethers';
+import { BrowserProvider, toQuantity, Contract, Interface, SigningKey, hashMessage, TypedDataEncoder, isHexString as isHexString$1, JsonRpcProvider, Transaction, keccak256 } from 'ethers';
 import log from 'loglevel';
 import { isHexString, addHexPrefix, isValidAddress, stripHexPrefix, toChecksumAddress, bytesToHex, privateToPublic, privateToAddress, ecsign, bigIntToBytes } from '@ethereumjs/util';
 import BigNumber from 'bignumber.js';
@@ -2274,12 +2274,11 @@ class KeyringController extends BaseKeyringController {
     this.initialize();
   }
   async signTransaction(tx, address) {
-    const txPayload = tx;
     const wallet = this._getWalletForAccount(address);
-    const privKey = this.getBufferPrivateKey(wallet.privateKey);
-    const signedTx = txPayload.sign(privKey);
-    // Newer versions of Ethereumjs-tx are immutable and return a new tx object
-    return signedTx === undefined ? tx : signedTx;
+    const privKey = new SigningKey(addHexPrefix(wallet.privateKey));
+    const localTx = tx;
+    localTx.signature = privKey.sign(localTx.unsignedHash);
+    return localTx;
   }
   getAccounts() {
     return this.state.wallets.map(w => w.publicKey);
@@ -4721,11 +4720,14 @@ class TokensController extends BaseController {
           chainId: x.chainId
         };
       } catch (error) {
-        log.warn("Invalid contract address while fetching", error);
+        log.warn("could not fetch user token balance", error);
         return undefined;
       }
     }));
-    const nonZeroTokens = promiseSettledResult.filter(x => x.status === "fulfilled").map(x => x.value);
+    const nonZeroTokens = promiseSettledResult.reduce((acc, x) => {
+      if (x.status === "fulfilled" && x.value) acc.push(x.value);
+      return acc;
+    }, []);
     this.update({
       tokens: {
         [this.userSelectedAddress]: mergeTokenArrays(this.userTokens, nonZeroTokens)
@@ -5511,7 +5513,6 @@ class TransactionController extends TransactionStateManager {
     signEthTx,
     getCurrentChainId,
     getCurrentNetworkEIP1559Compatibility,
-    getProviderConfig,
     getCurrentAccountEIP1559Compatibility,
     getSelectedAddress,
     getEIP1559GasFeeEstimates
@@ -5528,7 +5529,6 @@ class TransactionController extends TransactionStateManager {
     _defineProperty(this, "txGasUtil", void 0);
     _defineProperty(this, "_getCurrentNetworkEIP1559Compatibility", void 0);
     _defineProperty(this, "_getCurrentAccountEIP1559Compatibility", void 0);
-    _defineProperty(this, "getProviderConfig", void 0);
     _defineProperty(this, "signEthTx", void 0);
     _defineProperty(this, "provider", void 0);
     _defineProperty(this, "blockTracker", void 0);
@@ -5536,7 +5536,6 @@ class TransactionController extends TransactionStateManager {
     _defineProperty(this, "getUnapprovedTxCount", () => Object.keys(this.getUnapprovedTxList()).length);
     _defineProperty(this, "getPendingTxCount", account => this.getPendingTransactions(account).length);
     this.blockTracker = blockTracker;
-    this.getProviderConfig = getProviderConfig;
     this._getCurrentNetworkEIP1559Compatibility = getCurrentNetworkEIP1559Compatibility;
     this._getCurrentAccountEIP1559Compatibility = getCurrentAccountEIP1559Compatibility;
     this.getSelectedAddress = getSelectedAddress;
@@ -5637,27 +5636,27 @@ class TransactionController extends TransactionStateManager {
     const txMeta = this.getTransaction(txId);
     const chainId = this.getCurrentChainId();
     const type = isEIP1559Transaction(txMeta) ? TRANSACTION_ENVELOPE_TYPES.FEE_MARKET : TRANSACTION_ENVELOPE_TYPES.LEGACY;
-    const txParams = _objectSpread(_objectSpread({}, txMeta.transaction), {}, {
-      type,
+    const txParams = {
+      type: Number.parseInt(type, 16),
       chainId,
-      gasLimit: txMeta.transaction.gas
-    });
-    const fromAddress = txParams.from;
-    const common = await this.getCommonConfiguration(fromAddress);
-    const {
-      TransactionFactory
-    } = await import('@ethereumjs/tx');
-    // TODO: fix this when @ethereumjs/tx is updated.
-    const unsignedEthTx = TransactionFactory.fromTxData(txParams, {
-      common
-    });
-    const signedEthTx = await this.signEthTx(unsignedEthTx, fromAddress);
-    txMeta.r = addHexPrefix(signedEthTx.r.toString(16));
-    txMeta.s = addHexPrefix(signedEthTx.s.toString(16));
-    txMeta.v = addHexPrefix(signedEthTx.v.toString(16));
+      gasLimit: txMeta.transaction.gas,
+      accessList: txMeta.transaction.accessList,
+      data: txMeta.transaction.data,
+      gasPrice: txMeta.transaction.gasPrice,
+      maxFeePerGas: txMeta.transaction.maxFeePerGas,
+      maxPriorityFeePerGas: txMeta.transaction.maxPriorityFeePerGas,
+      nonce: Number.parseInt(txMeta.transaction.nonce, 16),
+      to: txMeta.transaction.to
+    };
+    const fromAddress = txMeta.transaction.from;
+    const tx = Transaction.from(txParams);
+    const signedEthTx = await this.signEthTx(tx, fromAddress);
+    txMeta.r = signedEthTx.signature.r;
+    txMeta.s = signedEthTx.signature.s;
+    txMeta.v = addHexPrefix(signedEthTx.signature.v.toString(16));
     this.updateTransactionInState(txMeta, "transactions#signTransaction: add r, s, v values");
     this.setTxStatusSigned(txId);
-    const rawTx = addHexPrefix(Buffer.from(signedEthTx.serialize()).toString("hex"));
+    const rawTx = signedEthTx.serialized;
     return rawTx;
   }
   async publishTransaction(txId, rawTx) {
@@ -5958,24 +5957,6 @@ class TransactionController extends TransactionStateManager {
       log.error(error);
     }
   }
-  async getCommonConfiguration(fromAddress) {
-    const {
-      chainId,
-      displayName
-    } = this.getProviderConfig();
-    const supportsEIP1559 = await this.getEIP1559Compatibility(fromAddress);
-    const {
-      Common,
-      Hardfork
-    } = await import('@ethereumjs/common');
-    const hardfork = supportsEIP1559 ? Hardfork.Paris : Hardfork.Berlin;
-    return Common.custom({
-      chainId: chainId === "loading" ? 0 : Number.parseInt(chainId, 16),
-      defaultHardfork: hardfork,
-      name: displayName,
-      networkId: chainId === "loading" ? 0 : Number.parseInt(chainId, 16)
-    });
-  }
   markNonceDuplicatesDropped(txId) {
     const txMeta = this.getTransaction(txId);
     const {