Merge branch 'caip-multichain' into jl/caip-multichain/fix-provider-r…

…equest-scopeObject-check
MetaMask · Jul 18, 2024 · ce0efff · ce0efff
2 parents 6670adc + c8dad3d
commit ce0efff
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 289 deletions.
diff --git a/app/scripts/lib/multichain-api/scope/assert.test.ts b/app/scripts/lib/multichain-api/scope/assert.test.ts
@@ -138,15 +138,13 @@ describe('Scope Assert', () => {
   describe('assertScopesSupported', () => {
     const findNetworkClientIdByChainId = jest.fn();
 
-    it('throws an error if no scopes are defined', () => {
-      expect(() => {
-        assertScopesSupported(
-          {},
-          {
-            findNetworkClientIdByChainId,
-          },
-        );
-      }).toThrow(new EthereumRpcError(5100, 'Unknown error with request'));
+    it('does not throw an error if no scopes are defined', () => {
+      assertScopesSupported(
+        {},
+        {
+          findNetworkClientIdByChainId,
+        },
+      );
     });
 
     it('throws an error if any scope is invalid', () => {

diff --git a/app/scripts/lib/multichain-api/scope/assert.ts b/app/scripts/lib/multichain-api/scope/assert.ts
@@ -65,14 +65,6 @@ export const assertScopesSupported = (
     findNetworkClientIdByChainId: (chainId: Hex) => NetworkClientId;
   },
 ) => {
-  // TODO: Should we be less strict validating optional scopes? As in we can
-  // drop parts or the entire optional scope when we hit something invalid which
-  // is not true for the required scopes.
-
-  if (Object.keys(scopes).length === 0) {
-    throw new EthereumRpcError(5000, 'Unknown error with request');
-  }
-
   for (const [scopeString, scopeObject] of Object.entries(scopes)) {
     assertScopeSupported(scopeString, scopeObject, {
       findNetworkClientIdByChainId,

diff --git a/app/scripts/lib/multichain-api/scope/validation.test.ts b/app/scripts/lib/multichain-api/scope/validation.test.ts
@@ -151,24 +151,12 @@ describe('Scope Validation', () => {
       accounts: [],
     };
 
-    it('throws an error if required scopes are defined but none are valid', () => {
-      expect(() =>
-        validateScopes({ 'eip155:1': {} as unknown as ScopeObject }, undefined),
-      ).toThrow(
-        new Error(
-          '`requiredScopes` object MUST contain 1 more `scopeObjects`, if present',
-        ),
-      );
+    it('does not throw an error if required scopes are defined but none are valid', () => {
+      validateScopes({ 'eip155:1': {} as unknown as ScopeObject }, undefined);
     });
 
-    it('throws an error if optional scopes are defined but none are valid', () => {
-      expect(() =>
-        validateScopes(undefined, { 'eip155:1': {} as unknown as ScopeObject }),
-      ).toThrow(
-        new Error(
-          '`optionalScopes` object MUST contain 1 more `scopeObjects`, if present',
-        ),
-      );
+    it('does not throw an error if optional scopes are defined but none are valid', () => {
+      validateScopes(undefined, { 'eip155:1': {} as unknown as ScopeObject });
     });
 
     it('returns the valid required and optional scopes', () => {

diff --git a/app/scripts/lib/multichain-api/scope/validation.ts b/app/scripts/lib/multichain-api/scope/validation.ts
@@ -90,12 +90,6 @@ export const validateScopes = (
       };
     }
   }
-  if (requiredScopes && Object.keys(validRequiredScopes).length === 0) {
-    // What error code and message here?
-    throw new Error(
-      '`requiredScopes` object MUST contain 1 more `scopeObjects`, if present',
-    );
-  }
 
   const validOptionalScopes: ScopesObject = {};
   for (const [scopeString, scopeObject] of Object.entries(
@@ -108,12 +102,6 @@ export const validateScopes = (
       };
     }
   }
-  if (optionalScopes && Object.keys(validOptionalScopes).length === 0) {
-    // What error code and message here?
-    throw new Error(
-      '`optionalScopes` object MUST contain 1 more `scopeObjects`, if present',
-    );
-  }
 
   return {
     validRequiredScopes,

diff --git a/lavamoat/browserify/beta/policy.json b/lavamoat/browserify/beta/policy.json
@@ -3007,62 +3007,6 @@
         "crypto": true
       }
     },
-    "@open-rpc/schema-utils-js": {
-      "packages": {
-        "@open-rpc/meta-schema": true,
-        "@open-rpc/schema-utils-js>@json-schema-tools/dereferencer": true,
-        "@open-rpc/schema-utils-js>@json-schema-tools/meta-schema": true,
-        "@open-rpc/schema-utils-js>@json-schema-tools/reference-resolver": true,
-        "@open-rpc/schema-utils-js>ajv": true,
-        "@open-rpc/schema-utils-js>is-url": true,
-        "eth-rpc-errors>fast-safe-stringify": true
-      }
-    },
-    "@open-rpc/schema-utils-js>@json-schema-tools/dereferencer": {
-      "packages": {
-        "@open-rpc/schema-utils-js>@json-schema-tools/dereferencer>@json-schema-tools/traverse": true,
-        "@open-rpc/schema-utils-js>@json-schema-tools/reference-resolver": true,
-        "eth-rpc-errors>fast-safe-stringify": true
-      }
-    },
-    "@open-rpc/schema-utils-js>@json-schema-tools/reference-resolver": {
-      "packages": {
-        "@open-rpc/schema-utils-js>@json-schema-tools/reference-resolver>@json-schema-spec/json-pointer": true,
-        "@open-rpc/test-coverage>isomorphic-fetch": true
-      }
-    },
-    "@open-rpc/schema-utils-js>ajv": {
-      "globals": {
-        "console": true
-      },
-      "packages": {
-        "@metamask/snaps-utils>fast-json-stable-stringify": true,
-        "@open-rpc/schema-utils-js>ajv>json-schema-traverse": true,
-        "eslint>ajv>uri-js": true,
-        "eslint>fast-deep-equal": true
-      }
-    },
-    "@open-rpc/test-coverage>isomorphic-fetch": {
-      "globals": {
-        "fetch.bind": true
-      },
-      "packages": {
-        "@open-rpc/test-coverage>isomorphic-fetch>whatwg-fetch": true
-      }
-    },
-    "@open-rpc/test-coverage>isomorphic-fetch>whatwg-fetch": {
-      "globals": {
-        "AbortController": true,
-        "Blob": true,
-        "FileReader": true,
-        "FormData": true,
-        "URLSearchParams.prototype.isPrototypeOf": true,
-        "XMLHttpRequest": true,
-        "console.warn": true,
-        "define": true,
-        "setTimeout": true
-      }
-    },
     "@popperjs/core": {
       "globals": {
         "Element": true,
@@ -3875,11 +3819,6 @@
         "koa>is-generator-function>has-tostringtag": true
       }
     },
-    "eslint>ajv>uri-js": {
-      "globals": {
-        "define": true
-      }
-    },
     "eslint>optionator>fast-levenshtein": {
       "globals": {
         "Intl": true,

diff --git a/lavamoat/browserify/flask/policy.json b/lavamoat/browserify/flask/policy.json
@@ -3007,62 +3007,6 @@
         "crypto": true
       }
     },
-    "@open-rpc/schema-utils-js": {
-      "packages": {
-        "@open-rpc/meta-schema": true,
-        "@open-rpc/schema-utils-js>@json-schema-tools/dereferencer": true,
-        "@open-rpc/schema-utils-js>@json-schema-tools/meta-schema": true,
-        "@open-rpc/schema-utils-js>@json-schema-tools/reference-resolver": true,
-        "@open-rpc/schema-utils-js>ajv": true,
-        "@open-rpc/schema-utils-js>is-url": true,
-        "eth-rpc-errors>fast-safe-stringify": true
-      }
-    },
-    "@open-rpc/schema-utils-js>@json-schema-tools/dereferencer": {
-      "packages": {
-        "@open-rpc/schema-utils-js>@json-schema-tools/dereferencer>@json-schema-tools/traverse": true,
-        "@open-rpc/schema-utils-js>@json-schema-tools/reference-resolver": true,
-        "eth-rpc-errors>fast-safe-stringify": true
-      }
-    },
-    "@open-rpc/schema-utils-js>@json-schema-tools/reference-resolver": {
-      "packages": {
-        "@open-rpc/schema-utils-js>@json-schema-tools/reference-resolver>@json-schema-spec/json-pointer": true,
-        "@open-rpc/test-coverage>isomorphic-fetch": true
-      }
-    },
-    "@open-rpc/schema-utils-js>ajv": {
-      "globals": {
-        "console": true
-      },
-      "packages": {
-        "@metamask/snaps-utils>fast-json-stable-stringify": true,
-        "@open-rpc/schema-utils-js>ajv>json-schema-traverse": true,
-        "eslint>ajv>uri-js": true,
-        "eslint>fast-deep-equal": true
-      }
-    },
-    "@open-rpc/test-coverage>isomorphic-fetch": {
-      "globals": {
-        "fetch.bind": true
-      },
-      "packages": {
-        "@open-rpc/test-coverage>isomorphic-fetch>whatwg-fetch": true
-      }
-    },
-    "@open-rpc/test-coverage>isomorphic-fetch>whatwg-fetch": {
-      "globals": {
-        "AbortController": true,
-        "Blob": true,
-        "FileReader": true,
-        "FormData": true,
-        "URLSearchParams.prototype.isPrototypeOf": true,
-        "XMLHttpRequest": true,
-        "console.warn": true,
-        "define": true,
-        "setTimeout": true
-      }
-    },
     "@popperjs/core": {
       "globals": {
         "Element": true,
@@ -3875,11 +3819,6 @@
         "koa>is-generator-function>has-tostringtag": true
       }
     },
-    "eslint>ajv>uri-js": {
-      "globals": {
-        "define": true
-      }
-    },
     "eslint>optionator>fast-levenshtein": {
       "globals": {
         "Intl": true,

diff --git a/lavamoat/browserify/main/policy.json b/lavamoat/browserify/main/policy.json
@@ -3007,62 +3007,6 @@
         "crypto": true
       }
     },
-    "@open-rpc/schema-utils-js": {
-      "packages": {
-        "@open-rpc/meta-schema": true,
-        "@open-rpc/schema-utils-js>@json-schema-tools/dereferencer": true,
-        "@open-rpc/schema-utils-js>@json-schema-tools/meta-schema": true,
-        "@open-rpc/schema-utils-js>@json-schema-tools/reference-resolver": true,
-        "@open-rpc/schema-utils-js>ajv": true,
-        "@open-rpc/schema-utils-js>is-url": true,
-        "eth-rpc-errors>fast-safe-stringify": true
-      }
-    },
-    "@open-rpc/schema-utils-js>@json-schema-tools/dereferencer": {
-      "packages": {
-        "@open-rpc/schema-utils-js>@json-schema-tools/dereferencer>@json-schema-tools/traverse": true,
-        "@open-rpc/schema-utils-js>@json-schema-tools/reference-resolver": true,
-        "eth-rpc-errors>fast-safe-stringify": true
-      }
-    },
-    "@open-rpc/schema-utils-js>@json-schema-tools/reference-resolver": {
-      "packages": {
-        "@open-rpc/schema-utils-js>@json-schema-tools/reference-resolver>@json-schema-spec/json-pointer": true,
-        "@open-rpc/test-coverage>isomorphic-fetch": true
-      }
-    },
-    "@open-rpc/schema-utils-js>ajv": {
-      "globals": {
-        "console": true
-      },
-      "packages": {
-        "@metamask/snaps-utils>fast-json-stable-stringify": true,
-        "@open-rpc/schema-utils-js>ajv>json-schema-traverse": true,
-        "eslint>ajv>uri-js": true,
-        "eslint>fast-deep-equal": true
-      }
-    },
-    "@open-rpc/test-coverage>isomorphic-fetch": {
-      "globals": {
-        "fetch.bind": true
-      },
-      "packages": {
-        "@open-rpc/test-coverage>isomorphic-fetch>whatwg-fetch": true
-      }
-    },
-    "@open-rpc/test-coverage>isomorphic-fetch>whatwg-fetch": {
-      "globals": {
-        "AbortController": true,
-        "Blob": true,
-        "FileReader": true,
-        "FormData": true,
-        "URLSearchParams.prototype.isPrototypeOf": true,
-        "XMLHttpRequest": true,
-        "console.warn": true,
-        "define": true,
-        "setTimeout": true
-      }
-    },
     "@popperjs/core": {
       "globals": {
         "Element": true,
@@ -3875,11 +3819,6 @@
         "koa>is-generator-function>has-tostringtag": true
       }
     },
-    "eslint>ajv>uri-js": {
-      "globals": {
-        "define": true
-      }
-    },
     "eslint>optionator>fast-levenshtein": {
       "globals": {
         "Intl": true,

diff --git a/lavamoat/browserify/mmi/policy.json b/lavamoat/browserify/mmi/policy.json
@@ -3099,62 +3099,6 @@
         "crypto": true
       }
     },
-    "@open-rpc/schema-utils-js": {
-      "packages": {
-        "@open-rpc/meta-schema": true,
-        "@open-rpc/schema-utils-js>@json-schema-tools/dereferencer": true,
-        "@open-rpc/schema-utils-js>@json-schema-tools/meta-schema": true,
-        "@open-rpc/schema-utils-js>@json-schema-tools/reference-resolver": true,
-        "@open-rpc/schema-utils-js>ajv": true,
-        "@open-rpc/schema-utils-js>is-url": true,
-        "eth-rpc-errors>fast-safe-stringify": true
-      }
-    },
-    "@open-rpc/schema-utils-js>@json-schema-tools/dereferencer": {
-      "packages": {
-        "@open-rpc/schema-utils-js>@json-schema-tools/dereferencer>@json-schema-tools/traverse": true,
-        "@open-rpc/schema-utils-js>@json-schema-tools/reference-resolver": true,
-        "eth-rpc-errors>fast-safe-stringify": true
-      }
-    },
-    "@open-rpc/schema-utils-js>@json-schema-tools/reference-resolver": {
-      "packages": {
-        "@open-rpc/schema-utils-js>@json-schema-tools/reference-resolver>@json-schema-spec/json-pointer": true,
-        "@open-rpc/test-coverage>isomorphic-fetch": true
-      }
-    },
-    "@open-rpc/schema-utils-js>ajv": {
-      "globals": {
-        "console": true
-      },
-      "packages": {
-        "@metamask/snaps-utils>fast-json-stable-stringify": true,
-        "@open-rpc/schema-utils-js>ajv>json-schema-traverse": true,
-        "eslint>ajv>uri-js": true,
-        "eslint>fast-deep-equal": true
-      }
-    },
-    "@open-rpc/test-coverage>isomorphic-fetch": {
-      "globals": {
-        "fetch.bind": true
-      },
-      "packages": {
-        "@open-rpc/test-coverage>isomorphic-fetch>whatwg-fetch": true
-      }
-    },
-    "@open-rpc/test-coverage>isomorphic-fetch>whatwg-fetch": {
-      "globals": {
-        "AbortController": true,
-        "Blob": true,
-        "FileReader": true,
-        "FormData": true,
-        "URLSearchParams.prototype.isPrototypeOf": true,
-        "XMLHttpRequest": true,
-        "console.warn": true,
-        "define": true,
-        "setTimeout": true
-      }
-    },
     "@popperjs/core": {
       "globals": {
         "Element": true,
@@ -3967,11 +3911,6 @@
         "koa>is-generator-function>has-tostringtag": true
       }
     },
-    "eslint>ajv>uri-js": {
-      "globals": {
-        "define": true
-      }
-    },
     "eslint>optionator>fast-levenshtein": {
       "globals": {
         "Intl": true,