@toruslabs/ethereum-controllers 4.2.0 → 4.4.0

package/dist/ethereumControllers.esm.js

@@ -794,6 +794,9 @@ const MessageStatus = {
   REJECTED: "rejected",
   FAILED: "failed"
 };
+const MESSAGE_EVENTS = {
+  UNAPPROVED_MESSAGE: "unapprovedMessage"
+};
 
 const SINGLE_CALL_BALANCES_ADDRESSES = {
   [MAINNET_CHAIN_ID]: "0xb1f8e55c7f64d203c1400b9d8555d050f94adf39",
@@ -1876,8 +1879,8 @@ class AbstractMessageController extends BaseController {
     this.messages.push(message);
     this.saveMessageList();
   }
-  approveMessage(messageParams) {
-    this.setMessageStatus(messageParams.id, MessageStatus.APPROVED);
+  approveMessage(messageId, messageParams) {
+    this.setMessageStatus(messageId, MessageStatus.APPROVED);
     return this.prepMessageForSigning(messageParams);
   }
   setMessageStatus(messageId, status) {
@@ -2040,7 +2043,7 @@ class DecryptMessageController extends AbstractMessageController {
   async processDecryptMessage(messageId) {
     try {
       const msgObject = this.getMessage(messageId);
-      const cleanMsgParams = await this.approveMessage(msgObject.messageParams);
+      const cleanMsgParams = await this.approveMessage(messageId, msgObject.messageParams);
       const parsedData = parseDecryptMessageData(cleanMsgParams.data);
       const rawSig = this.decryptMessage(parsedData, cleanMsgParams.from);
       this.updateMessage(_objectSpread(_objectSpread({}, msgObject), {}, {
@@ -2072,7 +2075,7 @@ class DecryptMessageController extends AbstractMessageController {
       type: METHOD_TYPES.ETH_DECRYPT
     };
     await this.addMessage(messageData);
-    this.emit(`unapprovedMessage`, _objectSpread({}, messageParams));
+    this.emit(MESSAGE_EVENTS.UNAPPROVED_MESSAGE, messageData);
     return messageId;
   }
   prepMessageForSigning(messageParams) {
@@ -2101,7 +2104,7 @@ class EncryptionPublicKeyController extends AbstractMessageController {
   async processGetEncryptionPublicKey(messageId) {
     try {
       const msgObject = this.getMessage(messageId);
-      const cleanMsgParams = await this.approveMessage(msgObject.messageParams);
+      const cleanMsgParams = await this.approveMessage(messageId, msgObject.messageParams);
       const publicKey = this.signEncryptionPublicKey(cleanMsgParams.from);
       this.updateMessage(_objectSpread(_objectSpread({}, msgObject), {}, {
         rawSig: publicKey
@@ -2131,7 +2134,7 @@ class EncryptionPublicKeyController extends AbstractMessageController {
       type: METHOD_TYPES.ETH_GET_ENCRYPTION_PUBLIC_KEY
     };
     await this.addMessage(messageData);
-    this.emit(`unapprovedMessage`, _objectSpread({}, messageParams));
+    this.emit(MESSAGE_EVENTS.UNAPPROVED_MESSAGE, messageData);
     return messageId;
   }
   prepMessageForSigning(messageParams) {
@@ -2163,7 +2166,7 @@ class MessageController extends AbstractMessageController {
   async processSignMessage(messageId) {
     try {
       const msgObject = this.getMessage(messageId);
-      const cleanMsgParams = await this.approveMessage(msgObject.messageParams);
+      const cleanMsgParams = await this.approveMessage(messageId, msgObject.messageParams);
       const rawSig = this.signMessage(cleanMsgParams.data, cleanMsgParams.from);
       this.updateMessage(_objectSpread(_objectSpread({}, msgObject), {}, {
         rawSig
@@ -2194,7 +2197,7 @@ class MessageController extends AbstractMessageController {
       type: METHOD_TYPES.ETH_SIGN
     };
     await this.addMessage(messageData);
-    this.emit(`unapprovedMessage`, messageParams);
+    this.emit(MESSAGE_EVENTS.UNAPPROVED_MESSAGE, messageData);
     return messageId;
   }
   prepMessageForSigning(messageParams) {
@@ -2223,7 +2226,7 @@ class PersonalMessageController extends AbstractMessageController {
   async processPersonalSignMessage(messageId) {
     try {
       const msgObject = this.getMessage(messageId);
-      const cleanMsgParams = await this.approveMessage(msgObject.messageParams);
+      const cleanMsgParams = await this.approveMessage(messageId, msgObject.messageParams);
       const rawSig = await this.signPersonalMessage(cleanMsgParams.data, cleanMsgParams.from);
       this.updateMessage(_objectSpread(_objectSpread({}, msgObject), {}, {
         rawSig
@@ -2245,7 +2248,7 @@ class PersonalMessageController extends AbstractMessageController {
       messageParams.origin = req.origin;
     }
     messageParams.data = normalizeMessageData(messageParams.data);
-    const messageId = randomId();
+    const messageId = messageParams.id || randomId();
     const messageData = {
       id: messageId,
       messageParams,
@@ -2254,7 +2257,7 @@ class PersonalMessageController extends AbstractMessageController {
       type: METHOD_TYPES.PERSONAL_SIGN
     };
     await this.addMessage(messageData);
-    this.emit(`unapprovedMessage`, messageParams);
+    this.emit(MESSAGE_EVENTS.UNAPPROVED_MESSAGE, messageData);
     return messageId;
   }
   prepMessageForSigning(messageParams) {
@@ -2295,7 +2298,7 @@ class TypedMessageController extends AbstractMessageController {
   async processPersonalSignMessage(messageId) {
     try {
       const msgObject = this.getMessage(messageId);
-      const cleanMsgParams = await this.approveMessage(msgObject.messageParams);
+      const cleanMsgParams = await this.approveMessage(messageId, msgObject.messageParams);
       const rawSig = await this.signTypedData(cleanMsgParams.data, cleanMsgParams.from, cleanMsgParams.version);
       this.updateMessage(_objectSpread(_objectSpread({}, msgObject), {}, {
         rawSig
@@ -2335,7 +2338,7 @@ class TypedMessageController extends AbstractMessageController {
       type: getMessageType(version)
     };
     await this.addMessage(messageData);
-    this.emit(`unapprovedMessage`, messageParams);
+    this.emit(MESSAGE_EVENTS.UNAPPROVED_MESSAGE, messageData);
     return messageId;
   }
   prepMessageForSigning(messageParams) {
@@ -3028,7 +3031,6 @@ class NftsController extends BaseController {
       config,
       state,
       provider,
-      getNetworkIdentifier,
       getCustomNfts,
       getSimpleHashNfts,
       onPreferencesStateChange,
@@ -3042,12 +3044,10 @@ class NftsController extends BaseController {
     _defineProperty(this, "provider", void 0);
     _defineProperty(this, "ethersProvider", void 0);
     _defineProperty(this, "_timer", void 0);
-    _defineProperty(this, "getNetworkIdentifier", void 0);
     _defineProperty(this, "getCustomNfts", void 0);
     _defineProperty(this, "getSimpleHashNfts", void 0);
     this.provider = provider;
     this.ethersProvider = new BrowserProvider(this.provider, "any");
-    this.getNetworkIdentifier = getNetworkIdentifier;
     this.getCustomNfts = getCustomNfts;
     this.getSimpleHashNfts = getSimpleHashNfts;
     this.defaultConfig = {
@@ -3125,7 +3125,7 @@ class NftsController extends BaseController {
   detectNewNfts() {
     const userAddress = this.userSelectedAddress;
     if (!userAddress) return;
-    const currentChainId = this.getNetworkIdentifier();
+    const currentChainId = this.config.chainId;
     const nftsToDetect = []; // object[]
     if (!currentChainId) {
       this.update({
@@ -3180,7 +3180,7 @@ class NftsController extends BaseController {
     const oldNfts = [...this.userNfts];
     const nonZeroNfts = [];
     try {
-      const currentChainId = this.getNetworkIdentifier();
+      const currentChainId = this.config.chainId;
       if (SIMPLEHASH_SUPPORTED_CHAINS.includes(currentChainId)) {
         const simpleHashBalances = await this.getSimpleHashNfts(userAddress, currentChainId);
         nonZeroNfts.push(...simpleHashBalances);
@@ -3785,7 +3785,6 @@ class TokensController extends BaseController {
       config,
       state,
       provider,
-      getNetworkIdentifier,
       getCustomTokens,
       getEtherScanTokens,
       getProviderConfig,
@@ -3800,13 +3799,11 @@ class TokensController extends BaseController {
     _defineProperty(this, "provider", void 0);
     _defineProperty(this, "ethersProvider", void 0);
     _defineProperty(this, "_timer", void 0);
-    _defineProperty(this, "getNetworkIdentifier", void 0);
     _defineProperty(this, "getProviderConfig", void 0);
     _defineProperty(this, "getCustomTokens", void 0);
     _defineProperty(this, "getEtherScanTokens", void 0);
     this.provider = provider;
     this.ethersProvider = new BrowserProvider(this.provider, "any");
-    this.getNetworkIdentifier = getNetworkIdentifier;
     this.getCustomTokens = getCustomTokens;
     this.getEtherScanTokens = getEtherScanTokens;
     this.getProviderConfig = getProviderConfig;
@@ -3885,7 +3882,7 @@ class TokensController extends BaseController {
   detectNewTokens() {
     const userAddress = this.userSelectedAddress;
     if (!userAddress) return;
-    const currentChainId = this.getNetworkIdentifier();
+    const currentChainId = this.config.chainId;
     const tokens = []; // object[]
     if (!currentChainId) {
       this.update({
@@ -3937,7 +3934,7 @@ class TokensController extends BaseController {
     const tokenAddresses = oldTokens.map(x => x.tokenAddress);
     const nonZeroTokens = [];
     try {
-      const currentChainId = this.getNetworkIdentifier();
+      const currentChainId = this.config.chainId;
       if (ETHERSCAN_SUPPORTED_CHAINS.includes(currentChainId)) {
         const etherscanBalances = await this.getEtherScanTokens(userAddress, currentChainId);
         nonZeroTokens.push(...etherscanBalances);
@@ -4842,7 +4839,7 @@ class TransactionStateManager extends BaseTransactionStateManager {
       }
     }
     return _objectSpread({
-      id: randomId(),
+      id: opts.transaction.id || randomId(),
       time: Date.now(),
       status: TransactionStatus.unapproved,
       loadingDefaults: true,
@@ -5581,5 +5578,5 @@ class TransactionController extends TransactionStateManager {
   }
 }
 
-export { ARBITRUM_MAINNET_CHAIN_ID, ARBITRUM_TESTNET_CHAIN_ID, AVALANCHE_MAINNET_CHAIN_ID, AVALANCHE_TESTNET_CHAIN_ID, AccountTrackerController, 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, GOERLI_CHAIN_ID, GasFeeController, KeyringController, LOCALHOST, MAINNET_CHAIN_ID, 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, TEST_CHAINS, TRANSACTION_ENVELOPE_TYPES, TokenHandler, TokenRatesController, TokensController, TransactionController, TransactionGasUtil, TransactionStateManager, TypedMessageController, XDAI_CHAIN_ID, bnLessThan, createChainIdMiddleware, createEthereumMiddleware, createGetAccountsMiddleware, createJsonRpcClient, createPendingNonceMiddleware, createPendingTxMiddleware, createProcessDecryptMessageMiddleware, createProcessEncryptionPublicKeyMiddleware, createProcessEthSignMessage, createProcessPersonalMessage, createProcessTransactionMiddleware, createProcessTypedMessage, createProcessTypedMessageV3, createProcessTypedMessageV4, createProviderConfigMiddleware, createRequestAccountsMiddleware, determineTransactionType, ensureFieldIsString, ensureMutuallyExclusiveFieldsNotProvided, formatDate, formatPastTx, formatTime, formatTxMetaForRpcResult, generateHistoryEntry, getChainType, getEthTxStatus, getEtherScanHashLink, getFinalStates, getIpfsEndpoint, idleTimeTracker, isAddressByChainId, isEIP1559Transaction, isLegacyTransaction, normalizeAndValidateTxParams, normalizeMessageData, normalizeTxParameters, parseDecryptMessageData, parseStandardTokenTransactionData, readAddressAsContract, replayHistory, sanitizeNftMetdataUrl, snapshotFromTxMeta, toChecksumAddressByChainId, transactionMatchesNetwork, validateAddress, validateDecryptedMessageData, validateEncryptionPublicKeyMessageData, validateFrom, validateRecipient, validateSignMessageData, validateTxParameters, validateTypedSignMessageDataV1, validateTypedSignMessageDataV3V4 };
+export { ARBITRUM_MAINNET_CHAIN_ID, ARBITRUM_TESTNET_CHAIN_ID, AVALANCHE_MAINNET_CHAIN_ID, AVALANCHE_TESTNET_CHAIN_ID, AccountTrackerController, 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, GOERLI_CHAIN_ID, 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, TEST_CHAINS, TRANSACTION_ENVELOPE_TYPES, TokenHandler, TokenRatesController, TokensController, TransactionController, TransactionGasUtil, TransactionStateManager, TypedMessageController, XDAI_CHAIN_ID, bnLessThan, createChainIdMiddleware, createEthereumMiddleware, createGetAccountsMiddleware, createJsonRpcClient, createPendingNonceMiddleware, createPendingTxMiddleware, createProcessDecryptMessageMiddleware, createProcessEncryptionPublicKeyMiddleware, createProcessEthSignMessage, createProcessPersonalMessage, createProcessTransactionMiddleware, createProcessTypedMessage, createProcessTypedMessageV3, createProcessTypedMessageV4, createProviderConfigMiddleware, createRequestAccountsMiddleware, determineTransactionType, ensureFieldIsString, ensureMutuallyExclusiveFieldsNotProvided, formatDate, formatPastTx, formatTime, formatTxMetaForRpcResult, generateHistoryEntry, getChainType, getEthTxStatus, getEtherScanHashLink, getFinalStates, getIpfsEndpoint, idleTimeTracker, isAddressByChainId, isEIP1559Transaction, isLegacyTransaction, normalizeAndValidateTxParams, normalizeMessageData, normalizeTxParameters, parseDecryptMessageData, parseStandardTokenTransactionData, readAddressAsContract, replayHistory, sanitizeNftMetdataUrl, snapshotFromTxMeta, toChecksumAddressByChainId, transactionMatchesNetwork, validateAddress, validateDecryptedMessageData, validateEncryptionPublicKeyMessageData, validateFrom, validateRecipient, validateSignMessageData, validateTxParameters, validateTypedSignMessageDataV1, validateTypedSignMessageDataV3V4 };
 //# sourceMappingURL=ethereumControllers.esm.js.map