fix: lattice signtyped error

MetaMask · Nov 25, 2024 · 1dc1748 · 1dc1748
1 parent 94d80bd
commit 1dc1748
Show file tree

Hide file tree

Showing 7 changed files with 69 additions and 44 deletions.
diff --git a/lavamoat/browserify/beta/policy.json b/lavamoat/browserify/beta/policy.json
@@ -4089,11 +4089,13 @@
         "eth-lattice-keyring>gridplus-sdk>bignumber.js": true,
         "eth-lattice-keyring>gridplus-sdk>bitwise": true,
         "eth-lattice-keyring>gridplus-sdk>borc": true,
-        "eth-lattice-keyring>gridplus-sdk>secp256k1": true,
+        "eth-lattice-keyring>gridplus-sdk>elliptic": true,
+        "eth-lattice-keyring>gridplus-sdk>eth-eip712-util-browser": true,
         "eth-lattice-keyring>gridplus-sdk>uuid": true,
         "eth-lattice-keyring>rlp": true,
         "ethereumjs-util>ethereum-cryptography>bs58check": true,
         "ethers>@ethersproject/sha2>hash.js": true,
+        "ganache>secp256k1": true,
         "lodash": true
       }
     },
@@ -4180,12 +4182,7 @@
         "location": true
       }
     },
-    "eth-lattice-keyring>gridplus-sdk>secp256k1": {
-      "packages": {
-        "eth-lattice-keyring>gridplus-sdk>secp256k1>elliptic": true
-      }
-    },
-    "eth-lattice-keyring>gridplus-sdk>secp256k1>elliptic": {
+    "eth-lattice-keyring>gridplus-sdk>elliptic": {
       "packages": {
         "@metamask/ppom-validator>elliptic>brorand": true,
         "@metamask/ppom-validator>elliptic>hmac-drbg": true,
@@ -4196,6 +4193,16 @@
         "pumpify>inherits": true
       }
     },
+    "eth-lattice-keyring>gridplus-sdk>eth-eip712-util-browser": {
+      "globals": {
+        "intToBuffer": true
+      },
+      "packages": {
+        "@metamask/ethjs>js-sha3": true,
+        "bn.js": true,
+        "buffer": true
+      }
+    },
     "eth-lattice-keyring>gridplus-sdk>uuid": {
       "globals": {
         "crypto": true

diff --git a/lavamoat/browserify/flask/policy.json b/lavamoat/browserify/flask/policy.json
@@ -4089,11 +4089,13 @@
         "eth-lattice-keyring>gridplus-sdk>bignumber.js": true,
         "eth-lattice-keyring>gridplus-sdk>bitwise": true,
         "eth-lattice-keyring>gridplus-sdk>borc": true,
-        "eth-lattice-keyring>gridplus-sdk>secp256k1": true,
+        "eth-lattice-keyring>gridplus-sdk>elliptic": true,
+        "eth-lattice-keyring>gridplus-sdk>eth-eip712-util-browser": true,
         "eth-lattice-keyring>gridplus-sdk>uuid": true,
         "eth-lattice-keyring>rlp": true,
         "ethereumjs-util>ethereum-cryptography>bs58check": true,
         "ethers>@ethersproject/sha2>hash.js": true,
+        "ganache>secp256k1": true,
         "lodash": true
       }
     },
@@ -4180,12 +4182,7 @@
         "location": true
       }
     },
-    "eth-lattice-keyring>gridplus-sdk>secp256k1": {
-      "packages": {
-        "eth-lattice-keyring>gridplus-sdk>secp256k1>elliptic": true
-      }
-    },
-    "eth-lattice-keyring>gridplus-sdk>secp256k1>elliptic": {
+    "eth-lattice-keyring>gridplus-sdk>elliptic": {
       "packages": {
         "@metamask/ppom-validator>elliptic>brorand": true,
         "@metamask/ppom-validator>elliptic>hmac-drbg": true,
@@ -4196,6 +4193,16 @@
         "pumpify>inherits": true
       }
     },
+    "eth-lattice-keyring>gridplus-sdk>eth-eip712-util-browser": {
+      "globals": {
+        "intToBuffer": true
+      },
+      "packages": {
+        "@metamask/ethjs>js-sha3": true,
+        "bn.js": true,
+        "buffer": true
+      }
+    },
     "eth-lattice-keyring>gridplus-sdk>uuid": {
       "globals": {
         "crypto": true

diff --git a/lavamoat/browserify/main/policy.json b/lavamoat/browserify/main/policy.json
@@ -4089,11 +4089,13 @@
         "eth-lattice-keyring>gridplus-sdk>bignumber.js": true,
         "eth-lattice-keyring>gridplus-sdk>bitwise": true,
         "eth-lattice-keyring>gridplus-sdk>borc": true,
-        "eth-lattice-keyring>gridplus-sdk>secp256k1": true,
+        "eth-lattice-keyring>gridplus-sdk>elliptic": true,
+        "eth-lattice-keyring>gridplus-sdk>eth-eip712-util-browser": true,
         "eth-lattice-keyring>gridplus-sdk>uuid": true,
         "eth-lattice-keyring>rlp": true,
         "ethereumjs-util>ethereum-cryptography>bs58check": true,
         "ethers>@ethersproject/sha2>hash.js": true,
+        "ganache>secp256k1": true,
         "lodash": true
       }
     },
@@ -4180,12 +4182,7 @@
         "location": true
       }
     },
-    "eth-lattice-keyring>gridplus-sdk>secp256k1": {
-      "packages": {
-        "eth-lattice-keyring>gridplus-sdk>secp256k1>elliptic": true
-      }
-    },
-    "eth-lattice-keyring>gridplus-sdk>secp256k1>elliptic": {
+    "eth-lattice-keyring>gridplus-sdk>elliptic": {
       "packages": {
         "@metamask/ppom-validator>elliptic>brorand": true,
         "@metamask/ppom-validator>elliptic>hmac-drbg": true,
@@ -4196,6 +4193,16 @@
         "pumpify>inherits": true
       }
     },
+    "eth-lattice-keyring>gridplus-sdk>eth-eip712-util-browser": {
+      "globals": {
+        "intToBuffer": true
+      },
+      "packages": {
+        "@metamask/ethjs>js-sha3": true,
+        "bn.js": true,
+        "buffer": true
+      }
+    },
     "eth-lattice-keyring>gridplus-sdk>uuid": {
       "globals": {
         "crypto": true

diff --git a/lavamoat/browserify/mmi/policy.json b/lavamoat/browserify/mmi/policy.json
@@ -4181,11 +4181,13 @@
         "eth-lattice-keyring>gridplus-sdk>bignumber.js": true,
         "eth-lattice-keyring>gridplus-sdk>bitwise": true,
         "eth-lattice-keyring>gridplus-sdk>borc": true,
-        "eth-lattice-keyring>gridplus-sdk>secp256k1": true,
+        "eth-lattice-keyring>gridplus-sdk>elliptic": true,
+        "eth-lattice-keyring>gridplus-sdk>eth-eip712-util-browser": true,
         "eth-lattice-keyring>gridplus-sdk>uuid": true,
         "eth-lattice-keyring>rlp": true,
         "ethereumjs-util>ethereum-cryptography>bs58check": true,
         "ethers>@ethersproject/sha2>hash.js": true,
+        "ganache>secp256k1": true,
         "lodash": true
       }
     },
@@ -4272,12 +4274,7 @@
         "location": true
       }
     },
-    "eth-lattice-keyring>gridplus-sdk>secp256k1": {
-      "packages": {
-        "eth-lattice-keyring>gridplus-sdk>secp256k1>elliptic": true
-      }
-    },
-    "eth-lattice-keyring>gridplus-sdk>secp256k1>elliptic": {
+    "eth-lattice-keyring>gridplus-sdk>elliptic": {
       "packages": {
         "@metamask/ppom-validator>elliptic>brorand": true,
         "@metamask/ppom-validator>elliptic>hmac-drbg": true,
@@ -4288,6 +4285,16 @@
         "pumpify>inherits": true
       }
     },
+    "eth-lattice-keyring>gridplus-sdk>eth-eip712-util-browser": {
+      "globals": {
+        "intToBuffer": true
+      },
+      "packages": {
+        "@metamask/ethjs>js-sha3": true,
+        "bn.js": true,
+        "buffer": true
+      }
+    },
     "eth-lattice-keyring>gridplus-sdk>uuid": {
       "globals": {
         "crypto": true

diff --git a/lavamoat/build-system/policy.json b/lavamoat/build-system/policy.json
@@ -2040,7 +2040,8 @@
         "chokidar>normalize-path": true,
         "chokidar>readdirp": true,
         "del>is-glob": true,
-        "eslint>glob-parent": true
+        "eslint>glob-parent": true,
+        "tsx>fsevents": true
       }
     },
     "chokidar>anymatch": {
@@ -8797,6 +8798,13 @@
         "typescript": true
       }
     },
+    "tsx>fsevents": {
+      "globals": {
+        "console.assert": true,
+        "process.platform": true
+      },
+      "native": true
+    },
     "typescript": {
       "builtin": {
         "buffer.Buffer": true,

diff --git a/package.json b/package.json
@@ -132,6 +132,7 @@
   },
   "resolutions": {
     "chokidar": "^3.6.0",
+    "gridplus-sdk": "2.5.1",
     "simple-update-notifier@^1.0.0": "^2.0.0",
     "@types/react": "^16.9.53",
     "analytics-node/axios": "^0.21.2",

diff --git a/yarn.lock b/yarn.lock
@@ -21061,7 +21061,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"gridplus-sdk@npm:^2.5.1":
+"gridplus-sdk@npm:2.5.1":
   version: 2.5.1
   resolution: "gridplus-sdk@npm:2.5.1"
   dependencies:
@@ -33108,27 +33108,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"secp256k1@npm:4.0.4, secp256k1@npm:^4.0.4":
+"secp256k1@npm:4.0.4":
   version: 4.0.4
   resolution: "secp256k1@npm:4.0.4"
   dependencies:
     elliptic: "npm:^6.5.2"
     node-addon-api: "npm:^2.0.0"
     node-gyp: "npm:latest"
     node-gyp-build: "npm:^4.2.0"
-  checksum: 10/80f0a5b44dbe0a062ed0fbf2a82044037a2598a0ea6ec5a0924bfa1f53006b423a43db82ff1cb2924d280b06f2a34235a1733631b3459b86b7a886c0ef41e0c5
-  languageName: node
-  linkType: hard
-
-"secp256k1@npm:4.0.3, secp256k1@npm:^4.0.0, secp256k1@npm:^4.0.1":
-  version: 4.0.3
-  resolution: "secp256k1@npm:4.0.3"
-  dependencies:
-    elliptic: "npm:^6.5.4"
-    node-addon-api: "npm:^2.0.0"
-    node-gyp: "npm:latest"
-    node-gyp-build: "npm:^4.2.0"
-  checksum: 10/8b45820cd90fd2f95cc8fdb9bf8a71e572de09f2311911ae461a951ffa9e30c99186a129d0f1afeb380dd67eca0c10493f8a7513c39063fda015e99995088e3b
+  checksum: 10/45000f348c853df7c1e2b67c48efb062ae78c0620ab1a5cfb02fa20d3aad39c641f4e7a18b3de3b54a7c0cc1e0addeb8ecd9d88bc332e92df17a92b60c36122a
   languageName: node
   linkType: hard