@metamask-institutional/extension - npm Package Compare versions

Comparing version 0.1.6 to 0.2.0

dist/ExtensionUtils.d.ts

@@ -22,4 +22,3 @@ import { CustodyController } from "@metamask-institutional/custody-controller";
     setTxHash: (number: any, string: any) => void;
-    typedMessageManager: any;
-    personalMessageManager: any;
+    signatureController: any;
     txStateManager: any;
@@ -29,3 +28,3 @@ custodyController: CustodyController;
 }
-export declare function custodianEventHandlerFactory({ getState, log, getPendingNonce, setTxHash, typedMessageManager, personalMessageManager, txStateManager, custodyController, trackTransactionEvent, }: CustodianEventHandlerFactoryParameters): (txData: ICustodianUpdate) => void;
+export declare function custodianEventHandlerFactory({ getState, log, getPendingNonce, setTxHash, signatureController, txStateManager, custodyController, trackTransactionEvent, }: CustodianEventHandlerFactoryParameters): (txData: ICustodianUpdate) => void;
 interface ShowCustodianDeepLinkParameters {
@@ -32,0 +31,0 @@ dispatch: (any: any) => any;

dist/ExtensionUtils.js

@@ -55,5 +55,4 @@ "use strict";
 exports.updateCustodianTransactions = updateCustodianTransactions;
-function custodianEventHandlerFactory({ getState, log, getPendingNonce, setTxHash, typedMessageManager, personalMessageManager, txStateManager, custodyController, trackTransactionEvent, }) {
+function custodianEventHandlerFactory({ getState, log, getPendingNonce, setTxHash, signatureController, txStateManager, custodyController, trackTransactionEvent, }) {
     return async (txData) => {
-        var _a, _b;
         let address;
@@ -83,21 +82,16 @@ if (Object.hasOwnProperty.call(txData, "transaction") &&
             }
-            if (!/personal/.test(txData.signedMessage.signatureVersion)) {
-                const msgId = (_a = typedMessageManager.getMsgByCustodyId(txData.signedMessage.id)) === null || _a === void 0 ? void 0 : _a.id;
-                if (txData.signedMessage.signature && txData.signedMessage.signature != "0x") {
-                    typedMessageManager.setMsgStatusSigned(msgId, txData.signedMessage.signature);
-                }
-                else if (txData.signedMessage.status.finished && !txData.signedMessage.status.success) {
-                    typedMessageManager.rejectMsg(msgId);
-                }
+            const allMessages = signatureController.messages;
+            const filteredItem = Object.keys(allMessages)
+                .map(key => allMessages[key])
+                .find(item => { var _a; return ((_a = item.metadata) === null || _a === void 0 ? void 0 : _a.custodian_transactionId) === txData.signedMessage.id; });
+            if (!filteredItem) {
+                return;
             }
-            else {
-                const msgId = (_b = personalMessageManager.getMsgByCustodyId(txData.signedMessage.id)) === null || _b === void 0 ? void 0 : _b.id;
-                console.log(personalMessageManager.getMsgByCustodyId(txData.signedMessage.id));
-                if (txData.signedMessage.signature && txData.signedMessage.signature != "0x") {
-                    personalMessageManager.setMsgStatusSigned(msgId, txData.signedMessage.signature);
-                }
-                else if (txData.signedMessage.status.finished && !txData.signedMessage.status.success) {
-                    personalMessageManager.rejectMsg(msgId);
-                }
+            const messageId = filteredItem.id;
+            if (txData.signedMessage.signature && txData.signedMessage.signature != "0x") {
+                signatureController.setMessageStatusSigned(messageId, txData.signedMessage.signature);
             }
+            else if (txData.signedMessage.status.finished && !txData.signedMessage.status.success) {
+                signatureController.cancelAbstractMessage(messageId);
+            }
             return;
@@ -104,0 +98,0 @@ }

dist/package.json

 {
   "name": "@metamask-institutional/extension",
-  "version": "0.1.6",
+  "version": "0.2.0",
   "description": "This package will export extension blocks used across the old @codefi/mmi-sdk library",
@@ -30,3 +30,3 @@ "author": "Antonio Regadas <[e-mail]>",
   },
-  "gitHead": "2a1cbf3db41addca9b44e1623411d1040de3e9c6",
+  "gitHead": "",
   "dependencies": {
@@ -33,0 +33,0 @@ "@ethereumjs/util": "^8.0.5",

package.json

 {
   "name": "@metamask-institutional/extension",
-  "version": "0.1.6",
+  "version": "0.2.0",
   "description": "This package will export extension blocks used across the old @codefi/mmi-sdk library",
@@ -30,3 +30,3 @@ "author": "Antonio Regadas <[e-mail]>",
   },
-  "gitHead": "2a1cbf3db41addca9b44e1623411d1040de3e9c6",
+  "gitHead": "",
   "dependencies": {
@@ -33,0 +33,0 @@ "@ethereumjs/util": "^8.0.5",

src/ExtensionUtils.ts

@@ -103,4 +103,3 @@ import { CustodyController, toChecksumHexAddress } from "@metamask-institutional/custody-controller";
   setTxHash: (number, string) => void;
-  typedMessageManager: any;
-  personalMessageManager: any;
+  signatureController: any;
   txStateManager: any;
@@ -118,4 +117,3 @@ custodyController: CustodyController;
   setTxHash,
-  typedMessageManager,
-  personalMessageManager,
+  signatureController,
   txStateManager,
@@ -158,21 +156,19 @@ custodyController,
 
-      if (!/personal/.test(txData.signedMessage.signatureVersion)) {
-        // EIP-712 signature
-        const msgId = typedMessageManager.getMsgByCustodyId(txData.signedMessage.id)?.id;
+      const allMessages = signatureController.messages;
+      const filteredItem = Object.keys(allMessages)
+        .map(key => allMessages[key])
+        .find(item => item.metadata?.custodian_transactionId === txData.signedMessage.id);
 
-        if (txData.signedMessage.signature && txData.signedMessage.signature != "0x") {
-          typedMessageManager.setMsgStatusSigned(msgId, txData.signedMessage.signature);
-        } else if (txData.signedMessage.status.finished && !txData.signedMessage.status.success) {
-          typedMessageManager.rejectMsg(msgId);
-        }
-      } else {
-        const msgId = personalMessageManager.getMsgByCustodyId(txData.signedMessage.id)?.id;
-        console.log(personalMessageManager.getMsgByCustodyId(txData.signedMessage.id));
+      if (!filteredItem) {
+        return;
+      }
 
-        if (txData.signedMessage.signature && txData.signedMessage.signature != "0x") {
-          personalMessageManager.setMsgStatusSigned(msgId, txData.signedMessage.signature);
-        } else if (txData.signedMessage.status.finished && !txData.signedMessage.status.success) {
-          personalMessageManager.rejectMsg(msgId);
-        }
+      const messageId = filteredItem.id;
+
+      if (txData.signedMessage.signature && txData.signedMessage.signature != "0x") {
+        signatureController.setMessageStatusSigned(messageId, txData.signedMessage.signature);
+      } else if (txData.signedMessage.status.finished && !txData.signedMessage.status.success) {
+        signatureController.cancelAbstractMessage(messageId);
       }
+
       return;
@@ -179,0 +175,0 @@ }

No alert changes

Worsened metrics

Total package byte prevSize

53455

decreased by-1.99%

Lines of code

978

decreased by-1.41%

No dependency changes