@toruslabs/ethereum-controllers 5.5.8 → 5.6.1

package/dist/ethereumControllers.cjs.js

@@ -2939,8 +2939,8 @@ class AddChainController extends AbstractMessageController {
     this.initialize();
   }
   async processAddChain(messageId) {
+    const msgObject = this.getMessage(messageId);
     try {
-      const msgObject = this.getMessage(messageId);
       await this.approveMessage(messageId, msgObject.messageParams);
       await this.addChain(msgObject.messageParams);
       this.updateMessage(objectSpread2_default()(objectSpread2_default()({}, msgObject), {}, {
@@ -2950,6 +2950,7 @@ class AddChainController extends AbstractMessageController {
       return null;
     } catch (error) {
       external_loglevel_default().error(error);
+      msgObject.error = (error === null || error === void 0 ? void 0 : error.message) || (error === null || error === void 0 ? void 0 : error.toString());
       this.setMessageStatus(messageId, MessageStatus.FAILED);
     }
   }
@@ -3009,8 +3010,8 @@ class DecryptMessageController extends AbstractMessageController {
     this.initialize();
   }
   async processDecryptMessage(messageId) {
+    const msgObject = this.getMessage(messageId);
     try {
-      const msgObject = this.getMessage(messageId);
       const cleanMsgParams = await this.approveMessage(messageId, msgObject.messageParams);
       const parsedData = parseDecryptMessageData(cleanMsgParams.data);
       const rawSig = this.decryptMessage(parsedData, cleanMsgParams.from);
@@ -3021,6 +3022,7 @@ class DecryptMessageController extends AbstractMessageController {
       return rawSig;
     } catch (error) {
       external_loglevel_default().error(error);
+      msgObject.error = (error === null || error === void 0 ? void 0 : error.message) || (error === null || error === void 0 ? void 0 : error.toString());
       this.setMessageStatus(messageId, MessageStatus.FAILED);
     }
   }
@@ -3081,8 +3083,8 @@ class EncryptionPublicKeyController extends AbstractMessageController {
     this.initialize();
   }
   async processGetEncryptionPublicKey(messageId) {
+    const msgObject = this.getMessage(messageId);
     try {
-      const msgObject = this.getMessage(messageId);
       const cleanMsgParams = await this.approveMessage(messageId, msgObject.messageParams);
       const publicKey = this.signEncryptionPublicKey(cleanMsgParams.from);
       this.updateMessage(objectSpread2_default()(objectSpread2_default()({}, msgObject), {}, {
@@ -3092,6 +3094,7 @@ class EncryptionPublicKeyController extends AbstractMessageController {
       return publicKey;
     } catch (error) {
       external_loglevel_default().error(error);
+      msgObject.error = (error === null || error === void 0 ? void 0 : error.message) || (error === null || error === void 0 ? void 0 : error.toString());
       this.setMessageStatus(messageId, MessageStatus.FAILED);
     }
   }
@@ -3153,8 +3156,8 @@ class MessageController extends AbstractMessageController {
     this.initialize();
   }
   async processSignMessage(messageId) {
+    const msgObject = this.getMessage(messageId);
     try {
-      const msgObject = this.getMessage(messageId);
       const cleanMsgParams = await this.approveMessage(messageId, msgObject.messageParams);
       const rawSig = await this.signMessage(cleanMsgParams.data, cleanMsgParams.from);
       this.updateMessage(objectSpread2_default()(objectSpread2_default()({}, msgObject), {}, {
@@ -3164,6 +3167,7 @@ class MessageController extends AbstractMessageController {
       return rawSig;
     } catch (error) {
       external_loglevel_default().error(error);
+      msgObject.error = (error === null || error === void 0 ? void 0 : error.message) || (error === null || error === void 0 ? void 0 : error.toString());
       this.setMessageStatus(messageId, MessageStatus.FAILED);
     }
   }
@@ -3223,8 +3227,8 @@ class PersonalMessageController extends AbstractMessageController {
     this.initialize();
   }
   async processSignPersonalMessage(messageId) {
+    const msgObject = this.getMessage(messageId);
     try {
-      const msgObject = this.getMessage(messageId);
       const cleanMsgParams = await this.approveMessage(messageId, msgObject.messageParams);
       const rawSig = await this.signPersonalMessage(cleanMsgParams.data, cleanMsgParams.from);
       this.updateMessage(objectSpread2_default()(objectSpread2_default()({}, msgObject), {}, {
@@ -3234,6 +3238,7 @@ class PersonalMessageController extends AbstractMessageController {
       return rawSig;
     } catch (error) {
       external_loglevel_default().error(error);
+      msgObject.error = (error === null || error === void 0 ? void 0 : error.message) || (error === null || error === void 0 ? void 0 : error.toString());
       this.setMessageStatus(messageId, MessageStatus.FAILED);
     }
   }
@@ -3293,8 +3298,8 @@ class SwitchChainController extends AbstractMessageController {
     this.initialize();
   }
   async processSwitchChain(messageId) {
+    const msgObject = this.getMessage(messageId);
     try {
-      const msgObject = this.getMessage(messageId);
       await this.approveMessage(messageId, msgObject.messageParams);
       this.switchChain({
         chainId: msgObject.messageParams.chainId
@@ -3306,6 +3311,7 @@ class SwitchChainController extends AbstractMessageController {
       return null;
     } catch (error) {
       external_loglevel_default().error(error);
+      msgObject.error = (error === null || error === void 0 ? void 0 : error.message) || (error === null || error === void 0 ? void 0 : error.toString());
       this.setMessageStatus(messageId, MessageStatus.FAILED);
     }
   }
@@ -3377,8 +3383,8 @@ class TypedMessageController extends AbstractMessageController {
     this.initialize();
   }
   async processSignTypedMessage(messageId) {
+    const msgObject = this.getMessage(messageId);
     try {
-      const msgObject = this.getMessage(messageId);
       const cleanMsgParams = await this.approveMessage(messageId, msgObject.messageParams);
       const msgData = cleanMsgParams.version === eth_sig_util_namespaceObject.SignTypedDataVersion.V1 ? cleanMsgParams.data : JSON.parse(cleanMsgParams.data);
       const rawSig = await this.signTypedData(msgData, cleanMsgParams.from, cleanMsgParams.version);
@@ -3389,6 +3395,7 @@ class TypedMessageController extends AbstractMessageController {
       return rawSig;
     } catch (error) {
       external_loglevel_default().error(error);
+      msgObject.error = (error === null || error === void 0 ? void 0 : error.message) || (error === null || error === void 0 ? void 0 : error.toString());
       this.setMessageStatus(messageId, MessageStatus.FAILED);
     }
   }
@@ -4543,7 +4550,9 @@ class PreferencesController extends base_controllers_namespaceObject.BasePrefere
       type,
       signatures,
       web3AuthClientId,
-      web3AuthNetwork
+      web3AuthNetwork,
+      loginMode,
+      sessionPubKey
     } = params;
     await super.init({
       address,
@@ -4575,7 +4584,7 @@ class PreferencesController extends base_controllers_namespaceObject.BasePrefere
         web3AuthNetwork
       });
     }
-    await this.storeUserLogin({
+    this.storeUserLogin({
       verifier: aggregateVerifier || verifier,
       verifierId,
       options: {
@@ -4584,7 +4593,9 @@ class PreferencesController extends base_controllers_namespaceObject.BasePrefere
       },
       address,
       web3AuthClientId,
-      web3AuthNetwork
+      web3AuthNetwork,
+      sessionPubKey,
+      loginMode
     });
   }
   getSelectedAddress() {
@@ -4678,6 +4689,7 @@ class PreferencesController extends base_controllers_namespaceObject.BasePrefere
   async refetchEtherscanTx(address) {
     var _this$getAddressState3;
     const selectedAddress = address || this.state.selectedAddress;
+    const lowerCaseSelectedAddress = selectedAddress.toLowerCase();
     if ((_this$getAddressState3 = this.getAddressState(selectedAddress)) !== null && _this$getAddressState3 !== void 0 && _this$getAddressState3.jwtToken) {
       const {
         chainId
@@ -4687,7 +4699,7 @@ class PreferencesController extends base_controllers_namespaceObject.BasePrefere
           selectedAddress,
           chainId: this.getProviderConfig().chainId
         });
-        const finalEthScanTxn = await addEtherscanTransactions(etherscanTxn, selectedAddress, this.provider, chainId);
+        const finalEthScanTxn = await addEtherscanTransactions(etherscanTxn, lowerCaseSelectedAddress, this.provider, chainId);
         external_loglevel_default().info("Formatted Etherscan Response", finalEthScanTxn);
         this.updateState({
           etherscanTransactions: finalEthScanTxn

package/dist/ethereumControllers.esm.js

@@ -2628,8 +2628,8 @@ class AddChainController extends AbstractMessageController {
     this.initialize();
   }
   async processAddChain(messageId) {
+    const msgObject = this.getMessage(messageId);
     try {
-      const msgObject = this.getMessage(messageId);
       await this.approveMessage(messageId, msgObject.messageParams);
       await this.addChain(msgObject.messageParams);
       this.updateMessage(_objectSpread(_objectSpread({}, msgObject), {}, {
@@ -2639,6 +2639,7 @@ class AddChainController extends AbstractMessageController {
       return null;
     } catch (error) {
       log.error(error);
+      msgObject.error = (error === null || error === void 0 ? void 0 : error.message) || (error === null || error === void 0 ? void 0 : error.toString());
       this.setMessageStatus(messageId, MessageStatus.FAILED);
     }
   }
@@ -2690,8 +2691,8 @@ class DecryptMessageController extends AbstractMessageController {
     this.initialize();
   }
   async processDecryptMessage(messageId) {
+    const msgObject = this.getMessage(messageId);
     try {
-      const msgObject = this.getMessage(messageId);
       const cleanMsgParams = await this.approveMessage(messageId, msgObject.messageParams);
       const parsedData = parseDecryptMessageData(cleanMsgParams.data);
       const rawSig = this.decryptMessage(parsedData, cleanMsgParams.from);
@@ -2702,6 +2703,7 @@ class DecryptMessageController extends AbstractMessageController {
       return rawSig;
     } catch (error) {
       log.error(error);
+      msgObject.error = (error === null || error === void 0 ? void 0 : error.message) || (error === null || error === void 0 ? void 0 : error.toString());
       this.setMessageStatus(messageId, MessageStatus.FAILED);
     }
   }
@@ -2754,8 +2756,8 @@ class EncryptionPublicKeyController extends AbstractMessageController {
     this.initialize();
   }
   async processGetEncryptionPublicKey(messageId) {
+    const msgObject = this.getMessage(messageId);
     try {
-      const msgObject = this.getMessage(messageId);
       const cleanMsgParams = await this.approveMessage(messageId, msgObject.messageParams);
       const publicKey = this.signEncryptionPublicKey(cleanMsgParams.from);
       this.updateMessage(_objectSpread(_objectSpread({}, msgObject), {}, {
@@ -2765,6 +2767,7 @@ class EncryptionPublicKeyController extends AbstractMessageController {
       return publicKey;
     } catch (error) {
       log.error(error);
+      msgObject.error = (error === null || error === void 0 ? void 0 : error.message) || (error === null || error === void 0 ? void 0 : error.toString());
       this.setMessageStatus(messageId, MessageStatus.FAILED);
     }
   }
@@ -2819,8 +2822,8 @@ class MessageController extends AbstractMessageController {
     this.initialize();
   }
   async processSignMessage(messageId) {
+    const msgObject = this.getMessage(messageId);
     try {
-      const msgObject = this.getMessage(messageId);
       const cleanMsgParams = await this.approveMessage(messageId, msgObject.messageParams);
       const rawSig = await this.signMessage(cleanMsgParams.data, cleanMsgParams.from);
       this.updateMessage(_objectSpread(_objectSpread({}, msgObject), {}, {
@@ -2830,6 +2833,7 @@ class MessageController extends AbstractMessageController {
       return rawSig;
     } catch (error) {
       log.error(error);
+      msgObject.error = (error === null || error === void 0 ? void 0 : error.message) || (error === null || error === void 0 ? void 0 : error.toString());
       this.setMessageStatus(messageId, MessageStatus.FAILED);
     }
   }
@@ -2882,8 +2886,8 @@ class PersonalMessageController extends AbstractMessageController {
     this.initialize();
   }
   async processSignPersonalMessage(messageId) {
+    const msgObject = this.getMessage(messageId);
     try {
-      const msgObject = this.getMessage(messageId);
       const cleanMsgParams = await this.approveMessage(messageId, msgObject.messageParams);
       const rawSig = await this.signPersonalMessage(cleanMsgParams.data, cleanMsgParams.from);
       this.updateMessage(_objectSpread(_objectSpread({}, msgObject), {}, {
@@ -2893,6 +2897,7 @@ class PersonalMessageController extends AbstractMessageController {
       return rawSig;
     } catch (error) {
       log.error(error);
+      msgObject.error = (error === null || error === void 0 ? void 0 : error.message) || (error === null || error === void 0 ? void 0 : error.toString());
       this.setMessageStatus(messageId, MessageStatus.FAILED);
     }
   }
@@ -2945,8 +2950,8 @@ class SwitchChainController extends AbstractMessageController {
     this.initialize();
   }
   async processSwitchChain(messageId) {
+    const msgObject = this.getMessage(messageId);
     try {
-      const msgObject = this.getMessage(messageId);
       await this.approveMessage(messageId, msgObject.messageParams);
       this.switchChain({
         chainId: msgObject.messageParams.chainId
@@ -2958,6 +2963,7 @@ class SwitchChainController extends AbstractMessageController {
       return null;
     } catch (error) {
       log.error(error);
+      msgObject.error = (error === null || error === void 0 ? void 0 : error.message) || (error === null || error === void 0 ? void 0 : error.toString());
       this.setMessageStatus(messageId, MessageStatus.FAILED);
     }
   }
@@ -3021,8 +3027,8 @@ class TypedMessageController extends AbstractMessageController {
     this.initialize();
   }
   async processSignTypedMessage(messageId) {
+    const msgObject = this.getMessage(messageId);
     try {
-      const msgObject = this.getMessage(messageId);
       const cleanMsgParams = await this.approveMessage(messageId, msgObject.messageParams);
       const msgData = cleanMsgParams.version === SignTypedDataVersion.V1 ? cleanMsgParams.data : JSON.parse(cleanMsgParams.data);
       const rawSig = await this.signTypedData(msgData, cleanMsgParams.from, cleanMsgParams.version);
@@ -3033,6 +3039,7 @@ class TypedMessageController extends AbstractMessageController {
       return rawSig;
     } catch (error) {
       log.error(error);
+      msgObject.error = (error === null || error === void 0 ? void 0 : error.message) || (error === null || error === void 0 ? void 0 : error.toString());
       this.setMessageStatus(messageId, MessageStatus.FAILED);
     }
   }
@@ -4142,7 +4149,9 @@ class PreferencesController extends BasePreferencesController {
       type,
       signatures,
       web3AuthClientId,
-      web3AuthNetwork
+      web3AuthNetwork,
+      loginMode,
+      sessionPubKey
     } = params;
     await super.init({
       address,
@@ -4174,7 +4183,7 @@ class PreferencesController extends BasePreferencesController {
         web3AuthNetwork
       });
     }
-    await this.storeUserLogin({
+    this.storeUserLogin({
       verifier: aggregateVerifier || verifier,
       verifierId,
       options: {
@@ -4183,7 +4192,9 @@ class PreferencesController extends BasePreferencesController {
       },
       address,
       web3AuthClientId,
-      web3AuthNetwork
+      web3AuthNetwork,
+      sessionPubKey,
+      loginMode
     });
   }
   getSelectedAddress() {
@@ -4277,6 +4288,7 @@ class PreferencesController extends BasePreferencesController {
   async refetchEtherscanTx(address) {
     var _this$getAddressState3;
     const selectedAddress = address || this.state.selectedAddress;
+    const lowerCaseSelectedAddress = selectedAddress.toLowerCase();
     if ((_this$getAddressState3 = this.getAddressState(selectedAddress)) !== null && _this$getAddressState3 !== void 0 && _this$getAddressState3.jwtToken) {
       const {
         chainId
@@ -4286,7 +4298,7 @@ class PreferencesController extends BasePreferencesController {
           selectedAddress,
           chainId: this.getProviderConfig().chainId
         });
-        const finalEthScanTxn = await addEtherscanTransactions(etherscanTxn, selectedAddress, this.provider, chainId);
+        const finalEthScanTxn = await addEtherscanTransactions(etherscanTxn, lowerCaseSelectedAddress, this.provider, chainId);
         log.info("Formatted Etherscan Response", finalEthScanTxn);
         this.updateState({
           etherscanTransactions: finalEthScanTxn