@toruslabs/ethereum-controllers 4.2.0 → 4.3.0

package/dist/ethereumControllers.cjs.js

@@ -82,6 +82,7 @@ __webpack_require__.d(__webpack_exports__, {
   KeyringController: () => (/* reexport */ KeyringController),
   LOCALHOST: () => (/* reexport */ LOCALHOST),
   MAINNET_CHAIN_ID: () => (/* reexport */ MAINNET_CHAIN_ID),
+  MESSAGE_EVENTS: () => (/* reexport */ MESSAGE_EVENTS),
   METHOD_TYPES: () => (/* reexport */ METHOD_TYPES),
   MessageController: () => (/* reexport */ MessageController),
   MessageStatus: () => (/* reexport */ MessageStatus),
@@ -958,6 +959,9 @@ const MessageStatus = {
   REJECTED: "rejected",
   FAILED: "failed"
 };
+const MESSAGE_EVENTS = {
+  UNAPPROVED_MESSAGE: "unapprovedMessage"
+};
 ;// CONCATENATED MODULE: ./src/utils/contractAddresses.ts
 
 const SINGLE_CALL_BALANCES_ADDRESSES = {
@@ -2240,8 +2244,8 @@ class AbstractMessageController extends base_controllers_namespaceObject.BaseCon
     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) {
@@ -2417,7 +2421,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(objectSpread2_default()(objectSpread2_default()({}, msgObject), {}, {
@@ -2449,7 +2453,7 @@ class DecryptMessageController extends AbstractMessageController {
       type: METHOD_TYPES.ETH_DECRYPT
     };
     await this.addMessage(messageData);
-    this.emit(`unapprovedMessage`, objectSpread2_default()({}, messageParams));
+    this.emit(MESSAGE_EVENTS.UNAPPROVED_MESSAGE, messageData);
     return messageId;
   }
   prepMessageForSigning(messageParams) {
@@ -2486,7 +2490,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(objectSpread2_default()(objectSpread2_default()({}, msgObject), {}, {
         rawSig: publicKey
@@ -2516,7 +2520,7 @@ class EncryptionPublicKeyController extends AbstractMessageController {
       type: METHOD_TYPES.ETH_GET_ENCRYPTION_PUBLIC_KEY
     };
     await this.addMessage(messageData);
-    this.emit(`unapprovedMessage`, objectSpread2_default()({}, messageParams));
+    this.emit(MESSAGE_EVENTS.UNAPPROVED_MESSAGE, messageData);
     return messageId;
   }
   prepMessageForSigning(messageParams) {
@@ -2555,7 +2559,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(objectSpread2_default()(objectSpread2_default()({}, msgObject), {}, {
         rawSig
@@ -2586,7 +2590,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) {
@@ -2622,7 +2626,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(objectSpread2_default()(objectSpread2_default()({}, msgObject), {}, {
         rawSig
@@ -2644,7 +2648,7 @@ class PersonalMessageController extends AbstractMessageController {
       messageParams.origin = req.origin;
     }
     messageParams.data = normalizeMessageData(messageParams.data);
-    const messageId = (0,base_controllers_namespaceObject.randomId)();
+    const messageId = messageParams.id || (0,base_controllers_namespaceObject.randomId)();
     const messageData = {
       id: messageId,
       messageParams,
@@ -2653,7 +2657,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) {
@@ -2702,7 +2706,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(objectSpread2_default()(objectSpread2_default()({}, msgObject), {}, {
         rawSig
@@ -2742,7 +2746,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) {
@@ -3470,7 +3474,6 @@ class NftsController extends base_controllers_namespaceObject.BaseController {
       config,
       state,
       provider,
-      getNetworkIdentifier,
       getCustomNfts,
       getSimpleHashNfts,
       onPreferencesStateChange,
@@ -3484,12 +3487,10 @@ class NftsController extends base_controllers_namespaceObject.BaseController {
     defineProperty_default()(this, "provider", void 0);
     defineProperty_default()(this, "ethersProvider", void 0);
     defineProperty_default()(this, "_timer", void 0);
-    defineProperty_default()(this, "getNetworkIdentifier", void 0);
     defineProperty_default()(this, "getCustomNfts", void 0);
     defineProperty_default()(this, "getSimpleHashNfts", void 0);
     this.provider = provider;
     this.ethersProvider = new external_ethers_namespaceObject.BrowserProvider(this.provider, "any");
-    this.getNetworkIdentifier = getNetworkIdentifier;
     this.getCustomNfts = getCustomNfts;
     this.getSimpleHashNfts = getSimpleHashNfts;
     this.defaultConfig = {
@@ -3567,7 +3568,7 @@ class NftsController extends base_controllers_namespaceObject.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({
@@ -3622,7 +3623,7 @@ class NftsController extends base_controllers_namespaceObject.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);
@@ -4264,7 +4265,6 @@ class TokensController extends base_controllers_namespaceObject.BaseController {
       config,
       state,
       provider,
-      getNetworkIdentifier,
       getCustomTokens,
       getEtherScanTokens,
       getProviderConfig,
@@ -4279,13 +4279,11 @@ class TokensController extends base_controllers_namespaceObject.BaseController {
     defineProperty_default()(this, "provider", void 0);
     defineProperty_default()(this, "ethersProvider", void 0);
     defineProperty_default()(this, "_timer", void 0);
-    defineProperty_default()(this, "getNetworkIdentifier", void 0);
     defineProperty_default()(this, "getProviderConfig", void 0);
     defineProperty_default()(this, "getCustomTokens", void 0);
     defineProperty_default()(this, "getEtherScanTokens", void 0);
     this.provider = provider;
     this.ethersProvider = new external_ethers_namespaceObject.BrowserProvider(this.provider, "any");
-    this.getNetworkIdentifier = getNetworkIdentifier;
     this.getCustomTokens = getCustomTokens;
     this.getEtherScanTokens = getEtherScanTokens;
     this.getProviderConfig = getProviderConfig;
@@ -4364,7 +4362,7 @@ class TokensController extends base_controllers_namespaceObject.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({
@@ -4416,7 +4414,7 @@ class TokensController extends base_controllers_namespaceObject.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);
@@ -5360,7 +5358,7 @@ class TransactionStateManager extends base_controllers_namespaceObject.BaseTrans
       }
     }
     return objectSpread2_default()({
-      id: (0,base_controllers_namespaceObject.randomId)(),
+      id: opts.transaction.id || (0,base_controllers_namespaceObject.randomId)(),
       time: Date.now(),
       status: base_controllers_namespaceObject.TransactionStatus.unapproved,
       loadingDefaults: true,