From 4c9f460c0964b21706f938524e6bbdfa8904ea1d Mon Sep 17 00:00:00 2001 From: Shane Jonas Date: Fri, 12 Jul 2024 11:39:50 -0400 Subject: [PATCH 01/21] fix: added initial code for multichain api spec tests --- test/e2e/api-specs/helpers.ts | 109 +++++++++++++-------------- test/e2e/run-api-specs-multichain.ts | 39 +++++----- yarn.lock | 16 ++++ 3 files changed, 90 insertions(+), 74 deletions(-) diff --git a/test/e2e/api-specs/helpers.ts b/test/e2e/api-specs/helpers.ts index 05ed6a41e977..ac77e995927e 100644 --- a/test/e2e/api-specs/helpers.ts +++ b/test/e2e/api-specs/helpers.ts @@ -79,73 +79,70 @@ export const pollForResult = async ( export const createMultichainDriverTransport = (driver: Driver) => { // use externally_connectable to communicate with the extension // https://developer.chrome.com/docs/extensions/mv3/messaging/ + return async ( _: string, method: string, params: unknown[] | Record, ) => { const generatedKey = uuid(); - addToQueue({ - name: 'transport', - resolve: () => { - // noop - }, - reject: () => { - // noop - }, - task: async () => { - // don't wait for executeScript to finish window.ethereum promise - // we need this because if we wait for the promise to resolve it - // will hang in selenium since it can only do one thing at a time. - // the workaround is to put the response on window.asyncResult and poll for it. - driver.executeScript( - ([m, p, g]: [ - string, - unknown[] | Record, - string, - ]) => { - const EXTENSION_ID = 'famgliladofnadeldnodcgnjhafnbnhj'; - const extensionPort = chrome.runtime.connect(EXTENSION_ID); - - const listener = ({ - type, - data, - }: { - type: string; - data: JsonRpcResponse; - }) => { - if (type !== 'caip-x') { - return; - } - if (data?.id !== g) { - return; - } + return new Promise((resolve, reject) => { + const execute = async () => { + await addToQueue({ + name: 'transport', + resolve, + reject, + task: async () => { + console.log('about to call executeScript'); - if (data.id || (data as JsonRpcFailure).error) { - window[g] = data; - extensionPort.onMessage.removeListener(listener); - } - }; + // don't wait for executeScript to finish window.ethereum promise + // we need this because if we wait for the promise to resolve it + // will hang in selenium since it can only do one thing at a time. + // the workaround is to put the response on window.asyncResult and poll for it. + driver.executeScript( + ([m, p, g]: [ + string, + unknown[] | Record, + string, + ]) => { + window[g] = null; + const EXTENSION_ID = 'famgliladofnadeldnodcgnjhafnbnhj'; + const extensionPort = chrome.runtime.connect(EXTENSION_ID); + console.log('got poart'); - extensionPort.onMessage.addListener(listener); - const msg = { - type: 'caip-x', - data: { - jsonrpc: '2.0', - method: m, - params: p, - id: g, + extensionPort.onMessage.addListener(({ type, data }: any) => { + console.log('got message', type, data); + if (type !== 'caip-x') { + return; + } + if (data.id || data.error) { + window[g] = data; + } + }); + const msg = { + type: 'caip-x', + data: { + jsonrpc: '2.0', + method: m, + params: p, + id: g, + }, + }; + console.log('sending postmessage', msg); + extensionPort.postMessage(msg); }, - }; - extensionPort.postMessage(msg); + method, + params, + generatedKey, + ); }, - method, - params, - generatedKey, - ); - }, + }); + }; + return execute(); + }).then(async () => { + const response = await pollForResult(driver, generatedKey); + return response; }); - return pollForResult(driver, generatedKey); }; }; diff --git a/test/e2e/run-api-specs-multichain.ts b/test/e2e/run-api-specs-multichain.ts index c03d4a49bc9e..06e031828ff6 100644 --- a/test/e2e/run-api-specs-multichain.ts +++ b/test/e2e/run-api-specs-multichain.ts @@ -1,12 +1,10 @@ import testCoverage from '@open-rpc/test-coverage'; import { parseOpenRPCDocument } from '@open-rpc/schema-utils-js'; import HtmlReporter from '@open-rpc/test-coverage/build/reporters/html-reporter'; -import { - MultiChainOpenRPCDocument, - MetaMaskOpenRPCDocument, -} from '@metamask/api-specs'; +import ExamplesRule from '@open-rpc/test-coverage/build/rules/examples-rule'; +import JsonSchemaFakerRule from '@open-rpc/test-coverage/build/rules/json-schema-faker-rule'; +import { MultiChainOpenRPCDocument } from '@metamask/api-specs'; -import { MethodObject, OpenrpcDocument } from '@open-rpc/meta-schema'; import { Driver, PAGES } from './webdriver/driver'; import { createMultichainDriverTransport } from './api-specs/helpers'; @@ -19,20 +17,17 @@ import { DAPP_URL, ACCOUNT_1, } from './helpers'; -import { MultichainAuthorizationConfirmation } from './api-specs/MultichainAuthorizationConfirmation'; -import transformOpenRPCDocument from './api-specs/transform'; // eslint-disable-next-line @typescript-eslint/no-require-imports, @typescript-eslint/no-var-requires -const mockServer = require('@open-rpc/mock-server/build/index').default; +// const mockServer = require('@open-rpc/mock-server/build/index').default; async function main() { - const port = 8545; + // const port = 8545; const chainId = 1337; await withFixtures( { dapp: true, fixtures: new FixtureBuilder().build(), - disableGanache: true, title: 'api-specs coverage', }, async ({ driver }: { driver: Driver }) => { @@ -85,7 +80,7 @@ async function main() { }, ], result: { - name: 'provider_authorizationResultExample', + name: 'wallet_createSessionResultExample', value: { sessionId: '0xdeadbeef', sessionScopes: { @@ -117,19 +112,27 @@ async function main() { await parseOpenRPCDocument(MetaMaskOpenRPCDocument as never); const testCoverageResults = await testCoverage({ - openrpcDocument: doc, + openrpcDocument: (await parseOpenRPCDocument( + MultiChainOpenRPCDocument as never, + )) as never, transport, reporters: [ 'console-streaming', - new HtmlReporter({ - autoOpen: !process.env.CI, - destination: `${process.cwd()}/html-report-multichain`, - }), + new HtmlReporter({ autoOpen: !process.env.CI }), + ], + skip: [ + 'provider_request' ], skip: ['wallet_invokeMethod'], rules: [ - new MultichainAuthorizationConfirmation({ - driver, + new JsonSchemaFakerRule({ + only: [], + skip: [], + numCalls: 2, + }), + new ExamplesRule({ + only: [], + skip: [], }), ], }); diff --git a/yarn.lock b/yarn.lock index f0fa9e9b0d7e..132757a2a937 100644 --- a/yarn.lock +++ b/yarn.lock @@ -10359,6 +10359,22 @@ __metadata: languageName: node linkType: hard +"@types/filesystem@npm:*": + version: 0.0.36 + resolution: "@types/filesystem@npm:0.0.36" + dependencies: + "@types/filewriter": "npm:*" + checksum: 10/ec831040fe3aff066ffb7b7541e21a5dd59aa06e7175c61e592736e38b018b1d513551438254631e2a3fbc81ff671bf618401000f4c8ea79156934cbc7dcaeaa + languageName: node + linkType: hard + +"@types/filewriter@npm:*": + version: 0.0.33 + resolution: "@types/filewriter@npm:0.0.33" + checksum: 10/495a4bb424c27eda967fe9ac3b8f7b781e6b3f9ce59403a991590cb1073022f9c5383d3c7d808ef6956b785550c36664c4fcd502dc0baf69e340bd481171e0ca + languageName: node + linkType: hard + "@types/find-cache-dir@npm:^3.2.1": version: 3.2.1 resolution: "@types/find-cache-dir@npm:3.2.1" From 96864a9334328e7b58369032d33f99dc0f29f612 Mon Sep 17 00:00:00 2001 From: Shane Jonas Date: Thu, 22 Aug 2024 11:14:19 -0400 Subject: [PATCH 02/21] fix: get happy path provider_authorize working --- .../MultichainAuthorizationConfirmation.ts | 41 ++++--- test/e2e/api-specs/helpers.ts | 103 +++++++++--------- test/e2e/api-specs/transform.ts | 18 +-- test/e2e/run-api-specs-multichain.ts | 56 ++++++---- test/e2e/run-openrpc-api-test-coverage.ts | 12 +- 5 files changed, 125 insertions(+), 105 deletions(-) diff --git a/test/e2e/api-specs/MultichainAuthorizationConfirmation.ts b/test/e2e/api-specs/MultichainAuthorizationConfirmation.ts index 57c1d23174d4..21603c978378 100644 --- a/test/e2e/api-specs/MultichainAuthorizationConfirmation.ts +++ b/test/e2e/api-specs/MultichainAuthorizationConfirmation.ts @@ -7,7 +7,6 @@ import { MethodObject, } from '@open-rpc/meta-schema'; import paramsToObj from '@open-rpc/test-coverage/build/utils/params-to-obj'; -import _ from 'lodash'; import { Driver } from '../webdriver/driver'; import { WINDOW_TITLES, switchToOrOpenDapp } from '../helpers'; import { addToQueue } from './helpers'; @@ -16,7 +15,9 @@ type MultichainAuthorizationConfirmationOptions = { driver: Driver; only?: string[]; }; -// this rule makes sure that a multichain authorization confirmation dialog is shown and confirmed +// this rule makes sure that all confirmation requests are rejected. +// it also validates that the JSON-RPC response is an error with +// error code 4001 (user rejected request) export class MultichainAuthorizationConfirmation implements Rule { private driver: Driver; @@ -31,7 +32,7 @@ export class MultichainAuthorizationConfirmation implements Rule { return 'Multichain Authorization Confirmation Rule'; } - async afterRequest(__: unknown, call: Call) { + async afterRequest(_: unknown, call: Call) { await new Promise((resolve, reject) => { addToQueue({ name: 'afterRequest', @@ -56,10 +57,10 @@ export class MultichainAuthorizationConfirmation implements Rule { }); await this.driver.clickElement({ text, tag: 'button' }); - const screenshotConfirm = await this.driver.driver.takeScreenshot(); + const screenshot_confirm = await this.driver.driver.takeScreenshot(); call.attachments.push({ type: 'image', - data: `data:image/png;base64,${screenshotConfirm}`, + data: `data:image/png;base64,${screenshot_confirm}`, }); await this.driver.findClickableElements({ @@ -78,7 +79,7 @@ export class MultichainAuthorizationConfirmation implements Rule { } // get all the confirmation calls to make and expect to pass - getCalls(__: unknown, method: MethodObject) { + getCalls(_: unknown, method: MethodObject) { const calls: Call[] = []; const isMethodAllowed = this.only ? this.only.includes(method.name) : true; if (isMethodAllowed) { @@ -117,19 +118,31 @@ export class MultichainAuthorizationConfirmation implements Rule { return calls; } + async afterResponse(_: unknown, call: Call) { + await new Promise((resolve, reject) => { + addToQueue({ + name: 'afterResponse', + resolve, + reject, + task: async () => { + try { + } catch (e) { + console.log(e); + } + }, + }); + }); + } + validateCall(call: Call) { if (call.error) { call.valid = false; - call.reason = `Expected a result but got error \ncode: ${call.error.code}\n message: ${call.error.message}`; - } else { - call.valid = _.isEqual(call.result, call.expectedResult); if (!call.valid) { - call.reason = `Expected:\n${JSON.stringify( - call.expectedResult, - null, - 4, - )} but got\n${JSON.stringify(call.result, null, 4)}`; + call.reason = `Expected a result but got error \ncode: ${call.error.code}\n message: ${call.error.message}`; } + } else { + // TODO: change this to check if the result matches the expected result + call.valid = true; } return call; } diff --git a/test/e2e/api-specs/helpers.ts b/test/e2e/api-specs/helpers.ts index ac77e995927e..b28693a009cc 100644 --- a/test/e2e/api-specs/helpers.ts +++ b/test/e2e/api-specs/helpers.ts @@ -79,70 +79,67 @@ export const pollForResult = async ( export const createMultichainDriverTransport = (driver: Driver) => { // use externally_connectable to communicate with the extension // https://developer.chrome.com/docs/extensions/mv3/messaging/ - return async ( _: string, method: string, params: unknown[] | Record, ) => { const generatedKey = uuid(); - return new Promise((resolve, reject) => { - const execute = async () => { - await addToQueue({ - name: 'transport', - resolve, - reject, - task: async () => { - console.log('about to call executeScript'); + addToQueue({ + name: 'transport', + resolve: () => { + // noop + }, + reject: () => { + // noop + }, + task: async () => { + // don't wait for executeScript to finish window.ethereum promise + // we need this because if we wait for the promise to resolve it + // will hang in selenium since it can only do one thing at a time. + // the workaround is to put the response on window.asyncResult and poll for it. + driver.executeScript( + ([m, p, g]: [ + string, + unknown[] | Record, + string, + ]) => { + const EXTENSION_ID = 'famgliladofnadeldnodcgnjhafnbnhj'; + const extensionPort = chrome.runtime.connect(EXTENSION_ID); - // don't wait for executeScript to finish window.ethereum promise - // we need this because if we wait for the promise to resolve it - // will hang in selenium since it can only do one thing at a time. - // the workaround is to put the response on window.asyncResult and poll for it. - driver.executeScript( - ([m, p, g]: [ - string, - unknown[] | Record, - string, - ]) => { - window[g] = null; - const EXTENSION_ID = 'famgliladofnadeldnodcgnjhafnbnhj'; - const extensionPort = chrome.runtime.connect(EXTENSION_ID); - console.log('got poart'); + const listener = ({ type, data }: any) => { + if (type !== 'caip-x') { + return; + } + if (data?.id !== g) { + return; + } - extensionPort.onMessage.addListener(({ type, data }: any) => { - console.log('got message', type, data); - if (type !== 'caip-x') { - return; - } - if (data.id || data.error) { - window[g] = data; - } - }); - const msg = { - type: 'caip-x', - data: { - jsonrpc: '2.0', - method: m, - params: p, - id: g, - }, - }; - console.log('sending postmessage', msg); - extensionPort.postMessage(msg); + if (data.id || data.error) { + window[g] = data; + extensionPort.onMessage.removeListener(listener); + } + }; + + extensionPort.onMessage.addListener(listener); + const msg = { + type: 'caip-x', + data: { + jsonrpc: '2.0', + method: m, + params: p, + id: g, }, - method, - params, - generatedKey, - ); + }; + extensionPort.postMessage(msg); }, - }); - }; - return execute(); - }).then(async () => { - const response = await pollForResult(driver, generatedKey); - return response; + method, + params, + generatedKey, + ); + }, }); + return pollForResult(driver, generatedKey); }; }; diff --git a/test/e2e/api-specs/transform.ts b/test/e2e/api-specs/transform.ts index 40ec73dfa770..530b238eee56 100644 --- a/test/e2e/api-specs/transform.ts +++ b/test/e2e/api-specs/transform.ts @@ -1,15 +1,6 @@ -import { - ExampleObject, - ExamplePairingObject, - MethodObject, - OpenrpcDocument, -} from '@open-rpc/meta-schema'; +import { ExampleObject, ExamplePairingObject, MethodObject, OpenrpcDocument } from '@open-rpc/meta-schema'; -const transformOpenRPCDocument = ( - openrpcDocument: OpenrpcDocument, - chainId: number, - account: string, -) => { +const transformOpenRPCDocument = (openrpcDocument: OpenrpcDocument, chainId: number, account: string) => { // transform the document here const transaction = @@ -133,8 +124,9 @@ const transformOpenRPCDocument = ( (signTypedData4Example.params[0] as ExampleObject).value = account; // update chainId for signTypedData - (signTypedData4Example.params[1] as ExampleObject).value.domain.chainId = - chainId; + ( + signTypedData4Example.params[1] as ExampleObject + ).value.domain.chainId = chainId; // net_version missing from execution-apis. see here: https://github.com/ethereum/execution-apis/issues/540 const netVersion: MethodObject = { diff --git a/test/e2e/run-api-specs-multichain.ts b/test/e2e/run-api-specs-multichain.ts index 06e031828ff6..40887d5e7ece 100644 --- a/test/e2e/run-api-specs-multichain.ts +++ b/test/e2e/run-api-specs-multichain.ts @@ -1,10 +1,14 @@ import testCoverage from '@open-rpc/test-coverage'; -import { parseOpenRPCDocument } from '@open-rpc/schema-utils-js'; +import { + parseOpenRPCDocument, +} from '@open-rpc/schema-utils-js'; import HtmlReporter from '@open-rpc/test-coverage/build/reporters/html-reporter'; -import ExamplesRule from '@open-rpc/test-coverage/build/rules/examples-rule'; -import JsonSchemaFakerRule from '@open-rpc/test-coverage/build/rules/json-schema-faker-rule'; -import { MultiChainOpenRPCDocument } from '@metamask/api-specs'; +import { + MultiChainOpenRPCDocument, + MetaMaskOpenRPCDocument, +} from '@metamask/api-specs'; +import { MethodObject, OpenrpcDocument } from '@open-rpc/meta-schema'; import { Driver, PAGES } from './webdriver/driver'; import { createMultichainDriverTransport } from './api-specs/helpers'; @@ -17,17 +21,20 @@ import { DAPP_URL, ACCOUNT_1, } from './helpers'; +import { MultichainAuthorizationConfirmation } from './api-specs/MultichainAuthorizationConfirmation'; +import transformOpenRPCDocument from './api-specs/transform'; // eslint-disable-next-line @typescript-eslint/no-require-imports, @typescript-eslint/no-var-requires -// const mockServer = require('@open-rpc/mock-server/build/index').default; +const mockServer = require('@open-rpc/mock-server/build/index').default; async function main() { - // const port = 8545; + const port = 8545; const chainId = 1337; await withFixtures( { dapp: true, fixtures: new FixtureBuilder().build(), + disableGanache: true, title: 'api-specs coverage', }, async ({ driver }: { driver: Driver }) => { @@ -112,28 +119,26 @@ async function main() { await parseOpenRPCDocument(MetaMaskOpenRPCDocument as never); const testCoverageResults = await testCoverage({ - openrpcDocument: (await parseOpenRPCDocument( - MultiChainOpenRPCDocument as never, - )) as never, + openrpcDocument: doc, transport, reporters: [ 'console-streaming', new HtmlReporter({ autoOpen: !process.env.CI }), ], - skip: [ - 'provider_request' - ], skip: ['wallet_invokeMethod'], rules: [ - new JsonSchemaFakerRule({ - only: [], - skip: [], - numCalls: 2, - }), - new ExamplesRule({ - only: [], - skip: [], + new MultichainAuthorizationConfirmation({ + driver, }), + // new JsonSchemaFakerRule({ + // only: [], + // skip: [], + // numCalls: 2, + // }), + // new ExamplesRule({ + // only: [], + // skip: [], + // }), ], }); @@ -148,5 +153,14 @@ async function main() { }, ); } +process.on('unhandledRejection', (...args) => { + console.error('Unhandled Rejection:', args, JSON.stringify(args, null, 4)); + process.exit(1); +}); -main(); +try { + main(); +} catch (e: any) { + console.log('ERR', e.message); + console.log('stack', e.stack); +} diff --git a/test/e2e/run-openrpc-api-test-coverage.ts b/test/e2e/run-openrpc-api-test-coverage.ts index 0078f0ba1424..b72f2848e3d6 100644 --- a/test/e2e/run-openrpc-api-test-coverage.ts +++ b/test/e2e/run-openrpc-api-test-coverage.ts @@ -4,7 +4,11 @@ import HtmlReporter from '@open-rpc/test-coverage/build/reporters/html-reporter' import ExamplesRule from '@open-rpc/test-coverage/build/rules/examples-rule'; import JsonSchemaFakerRule from '@open-rpc/test-coverage/build/rules/json-schema-faker-rule'; -import { MethodObject, OpenrpcDocument } from '@open-rpc/meta-schema'; +import { + ExampleObject, + ExamplePairingObject, + MethodObject, +} from '@open-rpc/meta-schema'; import { MetaMaskOpenRPCDocument } from '@metamask/api-specs'; import { ConfirmationsRejectRule } from './api-specs/ConfirmationRejectionRule'; @@ -45,8 +49,8 @@ async function main() { await openDapp(driver, undefined, DAPP_URL); const transport = createDriverTransport(driver); - const doc: OpenrpcDocument = transformOpenRPCDocument( - MetaMaskOpenRPCDocument as unknown as OpenrpcDocument, + const doc = transformOpenRPCDocument( + MetaMaskOpenRPCDocument as any, chainId, ACCOUNT_1, ); @@ -90,7 +94,7 @@ async function main() { .map((m) => (m as MethodObject).name); const testCoverageResults = await testCoverage({ - openrpcDocument: await parseOpenRPCDocument(doc), + openrpcDocument: (await parseOpenRPCDocument(doc as never)) as never, transport, reporters: [ 'console-streaming', From 4618476b660544e6483ae924de8cc5919d958749 Mon Sep 17 00:00:00 2001 From: Shane Jonas Date: Fri, 23 Aug 2024 14:58:35 -0400 Subject: [PATCH 03/21] fix: linting --- .gitignore | 2 -- .../MultichainAuthorizationConfirmation.ts | 20 ++------------ test/e2e/api-specs/helpers.ts | 10 +++++-- test/e2e/api-specs/transform.ts | 18 +++++++++---- test/e2e/run-api-specs-multichain.ts | 26 +++---------------- test/e2e/run-openrpc-api-test-coverage.ts | 12 +++------ yarn.lock | 16 ------------ 7 files changed, 30 insertions(+), 74 deletions(-) diff --git a/.gitignore b/.gitignore index bd92b2445908..80a6ff2db51d 100644 --- a/.gitignore +++ b/.gitignore @@ -79,5 +79,3 @@ licenseInfos.json html-report/ html-report-multichain/ -/app/images/branding - diff --git a/test/e2e/api-specs/MultichainAuthorizationConfirmation.ts b/test/e2e/api-specs/MultichainAuthorizationConfirmation.ts index 21603c978378..2c71ca1e7ea3 100644 --- a/test/e2e/api-specs/MultichainAuthorizationConfirmation.ts +++ b/test/e2e/api-specs/MultichainAuthorizationConfirmation.ts @@ -57,10 +57,10 @@ export class MultichainAuthorizationConfirmation implements Rule { }); await this.driver.clickElement({ text, tag: 'button' }); - const screenshot_confirm = await this.driver.driver.takeScreenshot(); + const screenshotConfirm = await this.driver.driver.takeScreenshot(); call.attachments.push({ type: 'image', - data: `data:image/png;base64,${screenshot_confirm}`, + data: `data:image/png;base64,${screenshotConfirm}`, }); await this.driver.findClickableElements({ @@ -118,22 +118,6 @@ export class MultichainAuthorizationConfirmation implements Rule { return calls; } - async afterResponse(_: unknown, call: Call) { - await new Promise((resolve, reject) => { - addToQueue({ - name: 'afterResponse', - resolve, - reject, - task: async () => { - try { - } catch (e) { - console.log(e); - } - }, - }); - }); - } - validateCall(call: Call) { if (call.error) { call.valid = false; diff --git a/test/e2e/api-specs/helpers.ts b/test/e2e/api-specs/helpers.ts index b28693a009cc..05ed6a41e977 100644 --- a/test/e2e/api-specs/helpers.ts +++ b/test/e2e/api-specs/helpers.ts @@ -107,7 +107,13 @@ export const createMultichainDriverTransport = (driver: Driver) => { const EXTENSION_ID = 'famgliladofnadeldnodcgnjhafnbnhj'; const extensionPort = chrome.runtime.connect(EXTENSION_ID); - const listener = ({ type, data }: any) => { + const listener = ({ + type, + data, + }: { + type: string; + data: JsonRpcResponse; + }) => { if (type !== 'caip-x') { return; } @@ -115,7 +121,7 @@ export const createMultichainDriverTransport = (driver: Driver) => { return; } - if (data.id || data.error) { + if (data.id || (data as JsonRpcFailure).error) { window[g] = data; extensionPort.onMessage.removeListener(listener); } diff --git a/test/e2e/api-specs/transform.ts b/test/e2e/api-specs/transform.ts index 530b238eee56..40ec73dfa770 100644 --- a/test/e2e/api-specs/transform.ts +++ b/test/e2e/api-specs/transform.ts @@ -1,6 +1,15 @@ -import { ExampleObject, ExamplePairingObject, MethodObject, OpenrpcDocument } from '@open-rpc/meta-schema'; +import { + ExampleObject, + ExamplePairingObject, + MethodObject, + OpenrpcDocument, +} from '@open-rpc/meta-schema'; -const transformOpenRPCDocument = (openrpcDocument: OpenrpcDocument, chainId: number, account: string) => { +const transformOpenRPCDocument = ( + openrpcDocument: OpenrpcDocument, + chainId: number, + account: string, +) => { // transform the document here const transaction = @@ -124,9 +133,8 @@ const transformOpenRPCDocument = (openrpcDocument: OpenrpcDocument, chainId: num (signTypedData4Example.params[0] as ExampleObject).value = account; // update chainId for signTypedData - ( - signTypedData4Example.params[1] as ExampleObject - ).value.domain.chainId = chainId; + (signTypedData4Example.params[1] as ExampleObject).value.domain.chainId = + chainId; // net_version missing from execution-apis. see here: https://github.com/ethereum/execution-apis/issues/540 const netVersion: MethodObject = { diff --git a/test/e2e/run-api-specs-multichain.ts b/test/e2e/run-api-specs-multichain.ts index 40887d5e7ece..6a961779486a 100644 --- a/test/e2e/run-api-specs-multichain.ts +++ b/test/e2e/run-api-specs-multichain.ts @@ -1,7 +1,5 @@ import testCoverage from '@open-rpc/test-coverage'; -import { - parseOpenRPCDocument, -} from '@open-rpc/schema-utils-js'; +import { parseOpenRPCDocument } from '@open-rpc/schema-utils-js'; import HtmlReporter from '@open-rpc/test-coverage/build/reporters/html-reporter'; import { MultiChainOpenRPCDocument, @@ -123,22 +121,13 @@ async function main() { transport, reporters: [ 'console-streaming', - new HtmlReporter({ autoOpen: !process.env.CI }), + new HtmlReporter({ autoOpen: !process.env.CI, destination: process.cwd() + "/html-report-multichain" }), ], skip: ['wallet_invokeMethod'], rules: [ new MultichainAuthorizationConfirmation({ driver, }), - // new JsonSchemaFakerRule({ - // only: [], - // skip: [], - // numCalls: 2, - // }), - // new ExamplesRule({ - // only: [], - // skip: [], - // }), ], }); @@ -153,14 +142,5 @@ async function main() { }, ); } -process.on('unhandledRejection', (...args) => { - console.error('Unhandled Rejection:', args, JSON.stringify(args, null, 4)); - process.exit(1); -}); -try { - main(); -} catch (e: any) { - console.log('ERR', e.message); - console.log('stack', e.stack); -} +main(); diff --git a/test/e2e/run-openrpc-api-test-coverage.ts b/test/e2e/run-openrpc-api-test-coverage.ts index b72f2848e3d6..0078f0ba1424 100644 --- a/test/e2e/run-openrpc-api-test-coverage.ts +++ b/test/e2e/run-openrpc-api-test-coverage.ts @@ -4,11 +4,7 @@ import HtmlReporter from '@open-rpc/test-coverage/build/reporters/html-reporter' import ExamplesRule from '@open-rpc/test-coverage/build/rules/examples-rule'; import JsonSchemaFakerRule from '@open-rpc/test-coverage/build/rules/json-schema-faker-rule'; -import { - ExampleObject, - ExamplePairingObject, - MethodObject, -} from '@open-rpc/meta-schema'; +import { MethodObject, OpenrpcDocument } from '@open-rpc/meta-schema'; import { MetaMaskOpenRPCDocument } from '@metamask/api-specs'; import { ConfirmationsRejectRule } from './api-specs/ConfirmationRejectionRule'; @@ -49,8 +45,8 @@ async function main() { await openDapp(driver, undefined, DAPP_URL); const transport = createDriverTransport(driver); - const doc = transformOpenRPCDocument( - MetaMaskOpenRPCDocument as any, + const doc: OpenrpcDocument = transformOpenRPCDocument( + MetaMaskOpenRPCDocument as unknown as OpenrpcDocument, chainId, ACCOUNT_1, ); @@ -94,7 +90,7 @@ async function main() { .map((m) => (m as MethodObject).name); const testCoverageResults = await testCoverage({ - openrpcDocument: (await parseOpenRPCDocument(doc as never)) as never, + openrpcDocument: await parseOpenRPCDocument(doc), transport, reporters: [ 'console-streaming', diff --git a/yarn.lock b/yarn.lock index 132757a2a937..f0fa9e9b0d7e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -10359,22 +10359,6 @@ __metadata: languageName: node linkType: hard -"@types/filesystem@npm:*": - version: 0.0.36 - resolution: "@types/filesystem@npm:0.0.36" - dependencies: - "@types/filewriter": "npm:*" - checksum: 10/ec831040fe3aff066ffb7b7541e21a5dd59aa06e7175c61e592736e38b018b1d513551438254631e2a3fbc81ff671bf618401000f4c8ea79156934cbc7dcaeaa - languageName: node - linkType: hard - -"@types/filewriter@npm:*": - version: 0.0.33 - resolution: "@types/filewriter@npm:0.0.33" - checksum: 10/495a4bb424c27eda967fe9ac3b8f7b781e6b3f9ce59403a991590cb1073022f9c5383d3c7d808ef6956b785550c36664c4fcd502dc0baf69e340bd481171e0ca - languageName: node - linkType: hard - "@types/find-cache-dir@npm:^3.2.1": version: 3.2.1 resolution: "@types/find-cache-dir@npm:3.2.1" From fe26bd653919083784a57607e2dfb77dcdd48e21 Mon Sep 17 00:00:00 2001 From: Shane Jonas Date: Fri, 23 Aug 2024 15:42:50 -0400 Subject: [PATCH 04/21] fix: add assertion for MultichainAuthorizationConfirmation --- .../MultichainAuthorizationConfirmation.ts | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/test/e2e/api-specs/MultichainAuthorizationConfirmation.ts b/test/e2e/api-specs/MultichainAuthorizationConfirmation.ts index 2c71ca1e7ea3..764cac8d4e6d 100644 --- a/test/e2e/api-specs/MultichainAuthorizationConfirmation.ts +++ b/test/e2e/api-specs/MultichainAuthorizationConfirmation.ts @@ -10,14 +10,13 @@ import paramsToObj from '@open-rpc/test-coverage/build/utils/params-to-obj'; import { Driver } from '../webdriver/driver'; import { WINDOW_TITLES, switchToOrOpenDapp } from '../helpers'; import { addToQueue } from './helpers'; +import _ from 'lodash'; type MultichainAuthorizationConfirmationOptions = { driver: Driver; only?: string[]; }; -// this rule makes sure that all confirmation requests are rejected. -// it also validates that the JSON-RPC response is an error with -// error code 4001 (user rejected request) +// this rule makes sure that a multichain authorization confirmation dialog is shown and confirmed export class MultichainAuthorizationConfirmation implements Rule { private driver: Driver; @@ -121,12 +120,12 @@ export class MultichainAuthorizationConfirmation implements Rule { validateCall(call: Call) { if (call.error) { call.valid = false; + call.reason = `Expected a result but got error \ncode: ${call.error.code}\n message: ${call.error.message}`; + } else { + call.valid = _.isEqual(call.result, call.expectedResult); if (!call.valid) { - call.reason = `Expected a result but got error \ncode: ${call.error.code}\n message: ${call.error.message}`; + call.reason = `Expected:\n${JSON.stringify(call.expectedResult, null, 4)} but got\n${JSON.stringify(call.result, null, 4)}`; } - } else { - // TODO: change this to check if the result matches the expected result - call.valid = true; } return call; } From e69b70f070f790e3371470ad95d2c977ec4dc721 Mon Sep 17 00:00:00 2001 From: Shane Jonas Date: Fri, 23 Aug 2024 15:59:38 -0400 Subject: [PATCH 05/21] fix: linting again --- .../api-specs/MultichainAuthorizationConfirmation.ts | 12 ++++++++---- test/e2e/run-api-specs-multichain.ts | 5 ++++- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/test/e2e/api-specs/MultichainAuthorizationConfirmation.ts b/test/e2e/api-specs/MultichainAuthorizationConfirmation.ts index 764cac8d4e6d..57c1d23174d4 100644 --- a/test/e2e/api-specs/MultichainAuthorizationConfirmation.ts +++ b/test/e2e/api-specs/MultichainAuthorizationConfirmation.ts @@ -7,10 +7,10 @@ import { MethodObject, } from '@open-rpc/meta-schema'; import paramsToObj from '@open-rpc/test-coverage/build/utils/params-to-obj'; +import _ from 'lodash'; import { Driver } from '../webdriver/driver'; import { WINDOW_TITLES, switchToOrOpenDapp } from '../helpers'; import { addToQueue } from './helpers'; -import _ from 'lodash'; type MultichainAuthorizationConfirmationOptions = { driver: Driver; @@ -31,7 +31,7 @@ export class MultichainAuthorizationConfirmation implements Rule { return 'Multichain Authorization Confirmation Rule'; } - async afterRequest(_: unknown, call: Call) { + async afterRequest(__: unknown, call: Call) { await new Promise((resolve, reject) => { addToQueue({ name: 'afterRequest', @@ -78,7 +78,7 @@ export class MultichainAuthorizationConfirmation implements Rule { } // get all the confirmation calls to make and expect to pass - getCalls(_: unknown, method: MethodObject) { + getCalls(__: unknown, method: MethodObject) { const calls: Call[] = []; const isMethodAllowed = this.only ? this.only.includes(method.name) : true; if (isMethodAllowed) { @@ -124,7 +124,11 @@ export class MultichainAuthorizationConfirmation implements Rule { } else { call.valid = _.isEqual(call.result, call.expectedResult); if (!call.valid) { - call.reason = `Expected:\n${JSON.stringify(call.expectedResult, null, 4)} but got\n${JSON.stringify(call.result, null, 4)}`; + call.reason = `Expected:\n${JSON.stringify( + call.expectedResult, + null, + 4, + )} but got\n${JSON.stringify(call.result, null, 4)}`; } } return call; diff --git a/test/e2e/run-api-specs-multichain.ts b/test/e2e/run-api-specs-multichain.ts index 6a961779486a..79e3466eae57 100644 --- a/test/e2e/run-api-specs-multichain.ts +++ b/test/e2e/run-api-specs-multichain.ts @@ -121,7 +121,10 @@ async function main() { transport, reporters: [ 'console-streaming', - new HtmlReporter({ autoOpen: !process.env.CI, destination: process.cwd() + "/html-report-multichain" }), + new HtmlReporter({ + autoOpen: !process.env.CI, + destination: `${process.cwd()}/html-report-multichain`, + }), ], skip: ['wallet_invokeMethod'], rules: [ From 095da2951fe9d6ddc6071af980437370709c01ea Mon Sep 17 00:00:00 2001 From: Shane Jonas Date: Fri, 30 Aug 2024 16:49:26 -0400 Subject: [PATCH 06/21] fix: added initial provider authorize error rule --- .../multichainMethodCallValidator.ts | 2 +- .../wallet-createSession/handler.js | 2 +- .../wallet-createSession/handler.test.js | 2 +- app/scripts/metamask-controller.js | 4 +- package.json | 9 +- ...ltichainAuthorizationConfirmationErrors.ts | 161 ++++++++++++++++++ test/e2e/run-api-specs-multichain.ts | 17 +- yarn.lock | 17 +- 8 files changed, 193 insertions(+), 21 deletions(-) create mode 100644 test/e2e/api-specs/MultichainAuthorizationConfirmationErrors.ts diff --git a/app/scripts/lib/multichain-api/multichainMethodCallValidator.ts b/app/scripts/lib/multichain-api/multichainMethodCallValidator.ts index 90830a150374..4a28bbdd24b3 100644 --- a/app/scripts/lib/multichain-api/multichainMethodCallValidator.ts +++ b/app/scripts/lib/multichain-api/multichainMethodCallValidator.ts @@ -65,7 +65,7 @@ export const multichainMethodCallValidator = async ( const result = v.validate(paramToCheck, p.schema as unknown as Schema, { required: true, }); - if (result.errors) { + if (result.errors && p.required) { errors.push( ...result.errors.map((e) => { return transformError(e, p, paramToCheck); diff --git a/app/scripts/lib/multichain-api/wallet-createSession/handler.js b/app/scripts/lib/multichain-api/wallet-createSession/handler.js index 0995c386879f..daa98b90abe9 100644 --- a/app/scripts/lib/multichain-api/wallet-createSession/handler.js +++ b/app/scripts/lib/multichain-api/wallet-createSession/handler.js @@ -35,7 +35,7 @@ export async function walletCreateSessionHandler(req, res, _next, end, hooks) { if (sessionProperties && Object.keys(sessionProperties).length === 0) { return end( - new EthereumRpcError(5300, 'Invalid Session Properties requested'), + new EthereumRpcError(5302, 'Invalid sessionProperties requested'), ); } diff --git a/app/scripts/lib/multichain-api/wallet-createSession/handler.test.js b/app/scripts/lib/multichain-api/wallet-createSession/handler.test.js index 947f551fc8b6..fdf92355bfab 100644 --- a/app/scripts/lib/multichain-api/wallet-createSession/handler.test.js +++ b/app/scripts/lib/multichain-api/wallet-createSession/handler.test.js @@ -148,7 +148,7 @@ describe('wallet_createSession', () => { }, }); expect(end).toHaveBeenCalledWith( - new EthereumRpcError(5300, 'Invalid Session Properties requested'), + new EthereumRpcError(5302, 'Invalid sessionProperties requested'), ); }); diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js index 88d90f1c8e93..fbcd743550c0 100644 --- a/app/scripts/metamask-controller.js +++ b/app/scripts/metamask-controller.js @@ -343,7 +343,7 @@ import { Caip25CaveatType, Caip25EndowmentPermissionName, } from './lib/multichain-api/caip25permissions'; -// import { multichainMethodCallValidatorMiddleware } from './lib/multichain-api/multichainMethodCallValidator'; +import { multichainMethodCallValidatorMiddleware } from './lib/multichain-api/multichainMethodCallValidator'; import { decodeTransactionData } from './lib/transaction/decode/util'; import MultichainSubscriptionManager from './lib/multichain-api/MultichainSubscriptionManager'; @@ -5970,7 +5970,7 @@ export default class MetamaskController extends EventEmitter { }); // TODO: Uncomment this when wallet lifecycle methods are added to api-specs - // engine.push(multichainMethodCallValidatorMiddleware); + engine.push(multichainMethodCallValidatorMiddleware); engine.push( createScaffoldMiddleware({ diff --git a/package.json b/package.json index aef7ffacd687..9209f6c61222 100644 --- a/package.json +++ b/package.json @@ -304,11 +304,10 @@ "@metamask-institutional/transaction-update": "^0.2.5", "@metamask-institutional/types": "^1.1.0", "@metamask/abi-utils": "^2.0.2", - "@metamask/account-watcher": "^4.1.0", - "@metamask/accounts-controller": "^18.1.0", - "@metamask/address-book-controller": "^5.0.0", - "@metamask/announcement-controller": "^7.0.0", - "@metamask/api-specs": "^0.10.2", + "@metamask/accounts-controller": "^17.2.0", + "@metamask/address-book-controller": "^4.0.1", + "@metamask/announcement-controller": "^6.1.0", + "@metamask/api-specs": "^0.10.7", "@metamask/approval-controller": "^7.0.0", "@metamask/assets-controllers": "^36.0.0", "@metamask/base-controller": "^6.0.2", diff --git a/test/e2e/api-specs/MultichainAuthorizationConfirmationErrors.ts b/test/e2e/api-specs/MultichainAuthorizationConfirmationErrors.ts new file mode 100644 index 000000000000..c2ffcb0d5433 --- /dev/null +++ b/test/e2e/api-specs/MultichainAuthorizationConfirmationErrors.ts @@ -0,0 +1,161 @@ +import Rule from '@open-rpc/test-coverage/build/rules/rule'; +import { Call } from '@open-rpc/test-coverage/build/coverage'; +import { + ContentDescriptorObject, + ErrorObject, + MethodObject, +} from '@open-rpc/meta-schema'; +import _ from 'lodash'; +import { Driver } from '../webdriver/driver'; +import { WINDOW_TITLES, switchToOrOpenDapp } from '../helpers'; +import { addToQueue } from './helpers'; + +type MultichainAuthorizationConfirmationOptions = { + driver: Driver; + only?: string[]; +}; +// this rule makes sure that a multichain authorization confirmation dialog is shown and confirmed +export class MultichainAuthorizationConfirmationErrors implements Rule { + private driver: Driver; + + private only: string[]; + + private errorCodesToHitCancel: number[]; + + constructor(options: MultichainAuthorizationConfirmationOptions) { + this.driver = options.driver; + this.only = options.only || ['provider_authorize']; + this.errorCodesToHitCancel = [5001, 5002]; + } + + getTitle() { + return 'Multichain Authorization Confirmation Rule'; + } + + async afterRequest(__: unknown, call: Call) { + await new Promise((resolve, reject) => { + addToQueue({ + name: 'afterRequest', + resolve, + reject, + task: async () => { + if (this.errorCodesToHitCancel.includes(call.expectedResult?.code)) { + try { + await this.driver.switchToWindowWithTitle(WINDOW_TITLES.Dialog); + + const text = 'Cancel'; + + await this.driver.findClickableElements({ + text: 'Cancel', + tag: 'button', + }); + + const screenshot = await this.driver.driver.takeScreenshot(); + call.attachments = call.attachments || []; + call.attachments.push({ + type: 'image', + data: `data:image/png;base64,${screenshot}`, + }); + await this.driver.clickElement({ text, tag: 'button' }); + // make sure to switch back to the dapp or else the next test will fail on the wrong window + await switchToOrOpenDapp(this.driver); + } catch (e) { + console.log(e); + } + } + }, + }); + }); + } + + // get all the confirmation calls to make and expect to pass + getCalls(__: unknown, method: MethodObject) { + const calls: Call[] = []; + const isMethodAllowed = this.only ? this.only.includes(method.name) : true; + if (isMethodAllowed) { + if (method.errors) { + method.errors.forEach((err) => { + const unsupportedErrorCodes = [5000, 5203, 5204, 5300, 5301]; + const error = err as ErrorObject; + if (unsupportedErrorCodes.includes(error.code)) { + return; + } + let params: Record = {}; + switch (error.code) { + case 5100: + params = { + requiredScopes: { + 'eip155:10124': { + methods: ['eth_signTypedData_v4'], + notifications: [], + }, + }, + }; + break; + case 5101: + params = { + requiredScopes: { + 'eip155:1': { + methods: ['foo'], + notifications: [], + }, + }, + }; + break; + case 5102: + params = { + requiredScopes: { + 'eip155:1': { + methods: [], + notifications: ['potato'], + }, + }, + }; + break; + case 5302: + params = { + requiredScopes: { + 'eip155:1': { + methods: ['eth_signTypedData_v4'], + notifications: [], + }, + }, + sessionProperties: {}, + }; + break; + default: + break; + } + + // params should make error happen (or lifecycle hooks will make it happen) + calls.push({ + title: `${this.getTitle()} - with error ${error.code} ${ + error.message + } `, + methodName: method.name, + // eslint-disable-next-line @typescript-eslint/no-explicit-any + params: params as any, + url: '', + resultSchema: (method.result as ContentDescriptorObject).schema, + expectedResult: error, + }); + }); + } + } + return calls; + } + + validateCall(call: Call) { + if (call.error) { + call.valid = _.isEqual(call.error.code, call.expectedResult.code); + if (!call.valid) { + call.reason = `Expected:\n${JSON.stringify( + call.expectedResult, + null, + 4, + )} but got\n${JSON.stringify(call.error, null, 4)}`; + } + } + return call; + } +} diff --git a/test/e2e/run-api-specs-multichain.ts b/test/e2e/run-api-specs-multichain.ts index 79e3466eae57..30e52d70d44d 100644 --- a/test/e2e/run-api-specs-multichain.ts +++ b/test/e2e/run-api-specs-multichain.ts @@ -21,6 +21,7 @@ import { } from './helpers'; import { MultichainAuthorizationConfirmation } from './api-specs/MultichainAuthorizationConfirmation'; import transformOpenRPCDocument from './api-specs/transform'; +import { MultichainAuthorizationConfirmationErrors } from './api-specs/MultichainAuthorizationConfirmationErrors'; // eslint-disable-next-line @typescript-eslint/no-require-imports, @typescript-eslint/no-var-requires const mockServer = require('@open-rpc/mock-server/build/index').default; @@ -60,7 +61,7 @@ async function main() { name: 'requiredScopes', value: { eip155: { - scopes: ['eip155:1337'], + scopes: ['eip155:1'], methods: [ 'eth_sendTransaction', 'eth_getBalance', @@ -89,7 +90,16 @@ async function main() { value: { sessionId: '0xdeadbeef', sessionScopes: { - 'eip155:1337': { + 'eip155:1': { + accounts: [`eip155:1:${ACCOUNT_1}`], + methods: [ + 'eth_sendTransaction', + 'eth_getBalance', + 'personal_sign', + ], + notifications: [], + }, + [`eip155:${chainId}`]: { accounts: [`eip155:${chainId}:${ACCOUNT_1}`], methods: [ 'eth_sendTransaction', @@ -131,6 +141,9 @@ async function main() { new MultichainAuthorizationConfirmation({ driver, }), + new MultichainAuthorizationConfirmationErrors({ + driver, + }), ], }); diff --git a/yarn.lock b/yarn.lock index f0fa9e9b0d7e..17bacc712176 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4814,10 +4814,10 @@ __metadata: languageName: node linkType: hard -"@metamask/api-specs@npm:^0.10.2": - version: 0.10.2 - resolution: "@metamask/api-specs@npm:0.10.2" - checksum: 10/c7e4f8846a9837342cc5082501b93dacd937dc44a66401b557fbc79a8c60aaa714b4ef935fbdaa41ec3a63b9a5874b6da6a9ad6454922b0bb4d3a471944356a7 +"@metamask/api-specs@npm:^0.10.7": + version: 0.10.7 + resolution: "@metamask/api-specs@npm:0.10.7" + checksum: 10/bd4c3afb6851b515b9080c47c302fcd4adefd23ff55da7a8b27f529e03dbd022a421baa55454f9f799d4092d946c2d94dd1d07b5462c099b17a9b5b75dc76108 languageName: node linkType: hard @@ -26130,11 +26130,10 @@ __metadata: "@metamask-institutional/transaction-update": "npm:^0.2.5" "@metamask-institutional/types": "npm:^1.1.0" "@metamask/abi-utils": "npm:^2.0.2" - "@metamask/account-watcher": "npm:^4.1.0" - "@metamask/accounts-controller": "npm:^18.1.0" - "@metamask/address-book-controller": "npm:^5.0.0" - "@metamask/announcement-controller": "npm:^7.0.0" - "@metamask/api-specs": "npm:^0.10.2" + "@metamask/accounts-controller": "npm:^17.2.0" + "@metamask/address-book-controller": "npm:^4.0.1" + "@metamask/announcement-controller": "npm:^6.1.0" + "@metamask/api-specs": "npm:^0.10.7" "@metamask/approval-controller": "npm:^7.0.0" "@metamask/assets-controllers": "npm:^36.0.0" "@metamask/auto-changelog": "npm:^2.1.0" From f0995703957dfba4d3da0ba26c366d95174ec754 Mon Sep 17 00:00:00 2001 From: Shane Jonas Date: Fri, 30 Aug 2024 16:53:38 -0400 Subject: [PATCH 07/21] fix: lint --- test/e2e/api-specs/MultichainAuthorizationConfirmationErrors.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/e2e/api-specs/MultichainAuthorizationConfirmationErrors.ts b/test/e2e/api-specs/MultichainAuthorizationConfirmationErrors.ts index c2ffcb0d5433..404855b7f7dc 100644 --- a/test/e2e/api-specs/MultichainAuthorizationConfirmationErrors.ts +++ b/test/e2e/api-specs/MultichainAuthorizationConfirmationErrors.ts @@ -75,7 +75,7 @@ export class MultichainAuthorizationConfirmationErrors implements Rule { if (isMethodAllowed) { if (method.errors) { method.errors.forEach((err) => { - const unsupportedErrorCodes = [5000, 5203, 5204, 5300, 5301]; + const unsupportedErrorCodes = [5000, 5300, 5301]; const error = err as ErrorObject; if (unsupportedErrorCodes.includes(error.code)) { return; From fad3261449fce7097075b775d377b62168ceb6af Mon Sep 17 00:00:00 2001 From: Shane Jonas Date: Tue, 3 Sep 2024 10:01:54 -0400 Subject: [PATCH 08/21] fix: bump api sepc version --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 9209f6c61222..2d25248ae8bb 100644 --- a/package.json +++ b/package.json @@ -307,7 +307,7 @@ "@metamask/accounts-controller": "^17.2.0", "@metamask/address-book-controller": "^4.0.1", "@metamask/announcement-controller": "^6.1.0", - "@metamask/api-specs": "^0.10.7", + "@metamask/api-specs": "^0.10.8", "@metamask/approval-controller": "^7.0.0", "@metamask/assets-controllers": "^36.0.0", "@metamask/base-controller": "^6.0.2", diff --git a/yarn.lock b/yarn.lock index 17bacc712176..1e47df723249 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4814,10 +4814,10 @@ __metadata: languageName: node linkType: hard -"@metamask/api-specs@npm:^0.10.7": - version: 0.10.7 - resolution: "@metamask/api-specs@npm:0.10.7" - checksum: 10/bd4c3afb6851b515b9080c47c302fcd4adefd23ff55da7a8b27f529e03dbd022a421baa55454f9f799d4092d946c2d94dd1d07b5462c099b17a9b5b75dc76108 +"@metamask/api-specs@npm:^0.10.8": + version: 0.10.8 + resolution: "@metamask/api-specs@npm:0.10.8" + checksum: 10/2daa426db88f4682f20cad7d8c10fa1197188f7394fbe8ba07fb5d8f9f15980bed9dc49b65fbb22c8080c056cb25a64a6ee84ce3db683476b3f0402284157482 languageName: node linkType: hard @@ -26133,7 +26133,7 @@ __metadata: "@metamask/accounts-controller": "npm:^17.2.0" "@metamask/address-book-controller": "npm:^4.0.1" "@metamask/announcement-controller": "npm:^6.1.0" - "@metamask/api-specs": "npm:^0.10.7" + "@metamask/api-specs": "npm:^0.10.8" "@metamask/approval-controller": "npm:^7.0.0" "@metamask/assets-controllers": "npm:^36.0.0" "@metamask/auto-changelog": "npm:^2.1.0" From 207c87101835e6eefb1a5839b77ea7e0cc4a38fe Mon Sep 17 00:00:00 2001 From: Shane Jonas Date: Wed, 4 Sep 2024 10:03:28 -0400 Subject: [PATCH 09/21] fix: yarn lock --- yarn.lock | 148 +++++++++++++++++------------------------------------- 1 file changed, 46 insertions(+), 102 deletions(-) diff --git a/yarn.lock b/yarn.lock index 1e47df723249..83b144bf16a0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2445,7 +2445,7 @@ __metadata: languageName: node linkType: hard -"@ethereumjs/tx@npm:^5.1.0, @ethereumjs/tx@npm:^5.2.1": +"@ethereumjs/tx@npm:^5.2.1": version: 5.4.0 resolution: "@ethereumjs/tx@npm:5.4.0" dependencies: @@ -2468,7 +2468,7 @@ __metadata: languageName: node linkType: hard -"@ethereumjs/util@npm:^9.0.1, @ethereumjs/util@npm:^9.0.2, @ethereumjs/util@npm:^9.1.0": +"@ethereumjs/util@npm:^9.0.2, @ethereumjs/util@npm:^9.1.0": version: 9.1.0 resolution: "@ethereumjs/util@npm:9.1.0" dependencies: @@ -4734,21 +4734,6 @@ __metadata: languageName: node linkType: hard -"@metamask/account-watcher@npm:^4.1.0": - version: 4.1.0 - resolution: "@metamask/account-watcher@npm:4.1.0" - dependencies: - "@ethereumjs/tx": "npm:^5.1.0" - "@ethereumjs/util": "npm:^9.0.1" - "@metamask/keyring-api": "npm:^4.0.1" - "@metamask/snaps-sdk": "npm:^6.2.1" - "@metamask/utils": "npm:^8.3.0" - ethers: "npm:^5.7.2" - uuid: "npm:^9.0.0" - checksum: 10/51c150cc1a703c6726f7c11eb6b4906636a5c33cf25c2b60c7d120e67483fae37ac79ba46a5156518cb9666c2c64fea00f1d6ec23faa266b28a814c4fcefa561 - languageName: node - linkType: hard - "@metamask/accounts-controller@npm:^17.2.0": version: 17.2.0 resolution: "@metamask/accounts-controller@npm:17.2.0" @@ -4772,45 +4757,23 @@ __metadata: languageName: node linkType: hard -"@metamask/accounts-controller@npm:^18.1.0": - version: 18.1.0 - resolution: "@metamask/accounts-controller@npm:18.1.0" - dependencies: - "@ethereumjs/util": "npm:^8.1.0" - "@metamask/base-controller": "npm:^6.0.3" - "@metamask/eth-snap-keyring": "npm:^4.3.1" - "@metamask/keyring-api": "npm:^8.1.0" - "@metamask/snaps-sdk": "npm:^6.1.1" - "@metamask/snaps-utils": "npm:^7.8.1" - "@metamask/utils": "npm:^9.1.0" - deepmerge: "npm:^4.2.2" - ethereum-cryptography: "npm:^2.1.2" - immer: "npm:^9.0.6" - uuid: "npm:^8.3.2" - peerDependencies: - "@metamask/keyring-controller": ^17.0.0 - "@metamask/snaps-controllers": ^9.3.0 - checksum: 10/31885a06f394a36e90a941ab15ed96fae8a39f2c650ce7523489114af0df1acf522bb8b5275e5e572354cdb42b286be805c336718b721105a2888c8be695c616 - languageName: node - linkType: hard - -"@metamask/address-book-controller@npm:^5.0.0": - version: 5.0.0 - resolution: "@metamask/address-book-controller@npm:5.0.0" +"@metamask/address-book-controller@npm:^4.0.1": + version: 4.0.2 + resolution: "@metamask/address-book-controller@npm:4.0.2" dependencies: - "@metamask/base-controller": "npm:^6.0.0" - "@metamask/controller-utils": "npm:^11.0.0" + "@metamask/base-controller": "npm:^5.0.2" + "@metamask/controller-utils": "npm:^10.0.0" "@metamask/utils": "npm:^8.3.0" - checksum: 10/f4f3ec2c569457243cc4771c2d146a91227114431ecf8bb0d74e42b2e93fcc4d10545c32f865c918c9f1586379016d3ea2d7f2bc056a6b10b6cfd985f2b3c432 + checksum: 10/6a7ed650453fe7404578c2789de53ab4f2ee76c7709750b54b8b5541598976c31ba7e4112e2a380e76113d86eb7757fffc40a214714d80c1bbb05727c3515bab languageName: node linkType: hard -"@metamask/announcement-controller@npm:^7.0.0": - version: 7.0.0 - resolution: "@metamask/announcement-controller@npm:7.0.0" +"@metamask/announcement-controller@npm:^6.1.0": + version: 6.1.1 + resolution: "@metamask/announcement-controller@npm:6.1.1" dependencies: - "@metamask/base-controller": "npm:^6.0.0" - checksum: 10/0f8c9112a6514fd2dc4c135d1ab0445f627451d0583ef2eb92f52f133a448fd97b67d5aa615b7409f4380a01590546376ccc6b728d94cf32a4b62686e18c0a4d + "@metamask/base-controller": "npm:^5.0.2" + checksum: 10/cde5fe33b9a6b0bf39430e7b91e26e16d9a076084aced81716679c05c5312153b0ad547b66bf940852f52eae8bcae75839014fe33611265e8701cbc2f9d09f4e languageName: node linkType: hard @@ -4889,7 +4852,17 @@ __metadata: languageName: node linkType: hard -"@metamask/base-controller@npm:^5.0.1": +"@metamask/base-controller@npm:^3.0.0": + version: 3.2.3 + resolution: "@metamask/base-controller@npm:3.2.3" + dependencies: + "@metamask/utils": "npm:^8.1.0" + immer: "npm:^9.0.6" + checksum: 10/1a3005f4143f0a3e37094ce389ae9c2010194672d67c1b115a401379c1b712fb3d7ce8f1cbc8a4d21cffba61aafba6dc1aaae12172e57b9f14021a2505fadafe + languageName: node + linkType: hard + +"@metamask/base-controller@npm:^5.0.1, @metamask/base-controller@npm:^5.0.2": version: 5.0.2 resolution: "@metamask/base-controller@npm:5.0.2" dependencies: @@ -4952,9 +4925,26 @@ __metadata: languageName: node linkType: hard -"@metamask/controller-utils@npm:^11.0.0, @metamask/controller-utils@npm:^11.0.1, @metamask/controller-utils@npm:^11.0.2, @metamask/controller-utils@npm:^11.1.0, @metamask/controller-utils@npm:^11.2.0": - version: 11.2.0 - resolution: "@metamask/controller-utils@npm:11.2.0" +"@metamask/controller-utils@npm:^10.0.0": + version: 10.0.0 + resolution: "@metamask/controller-utils@npm:10.0.0" + dependencies: + "@ethereumjs/util": "npm:^8.1.0" + "@metamask/eth-query": "npm:^4.0.0" + "@metamask/ethjs-unit": "npm:^0.3.0" + "@metamask/utils": "npm:^8.3.0" + "@spruceid/siwe-parser": "npm:2.1.0" + "@types/bn.js": "npm:^5.1.5" + bn.js: "npm:^5.2.1" + eth-ens-namehash: "npm:^2.0.8" + fast-deep-equal: "npm:^3.1.3" + checksum: 10/ba32231e246aeacff640ca4383df74aaf9510d1d9cdcb33326a65c497fb927a6546306a02c98924218cef3c19eec569d5d6d9ca568d600af0afdf198b8c16477 + languageName: node + linkType: hard + +"@metamask/controller-utils@npm:^11.0.0, @metamask/controller-utils@npm:^11.0.1, @metamask/controller-utils@npm:^11.0.2, @metamask/controller-utils@npm:^11.1.0": + version: 11.1.0 + resolution: "@metamask/controller-utils@npm:11.1.0" dependencies: "@ethereumjs/util": "npm:^8.1.0" "@metamask/eth-query": "npm:^4.0.0" @@ -5535,18 +5525,6 @@ __metadata: languageName: node linkType: hard -"@metamask/json-rpc-middleware-stream@npm:^6.0.2": - version: 6.0.2 - resolution: "@metamask/json-rpc-middleware-stream@npm:6.0.2" - dependencies: - "@metamask/json-rpc-engine": "npm:^7.3.2" - "@metamask/safe-event-emitter": "npm:^3.0.0" - "@metamask/utils": "npm:^8.3.0" - readable-stream: "npm:^3.6.2" - checksum: 10/eb6fc179959206abeba8b12118757d55cc0028681566008a4005b570d21a9369795452e1bdb672fc9858f46a4e9ed5c996cfff0e85b47cef8bf39a6edfee8f1e - languageName: node - linkType: hard - "@metamask/json-rpc-middleware-stream@npm:^8.0.1, @metamask/json-rpc-middleware-stream@npm:^8.0.2": version: 8.0.2 resolution: "@metamask/json-rpc-middleware-stream@npm:8.0.2" @@ -5572,21 +5550,7 @@ __metadata: languageName: node linkType: hard -"@metamask/keyring-api@npm:^4.0.1": - version: 4.0.2 - resolution: "@metamask/keyring-api@npm:4.0.2" - dependencies: - "@metamask/providers": "npm:^15.0.0" - "@metamask/snaps-sdk": "npm:^3.1.1" - "@metamask/utils": "npm:^8.3.0" - "@types/uuid": "npm:^9.0.1" - superstruct: "npm:^1.0.3" - uuid: "npm:^9.0.0" - checksum: 10/8f6dc3b4913803eba8e22228ac6307ca66247900d70755a6dd457c2037b9fb6d3979da472a08e24ccdd81c28c68db3ad41219d915e5e8442ef640a3c0c46b261 - languageName: node - linkType: hard - -"@metamask/keyring-api@npm:^8.0.0, @metamask/keyring-api@npm:^8.1.0": +"@metamask/keyring-api@npm:^8.0.0": version: 8.1.0 resolution: "@metamask/keyring-api@npm:8.1.0" dependencies: @@ -6073,26 +6037,6 @@ __metadata: languageName: node linkType: hard -"@metamask/providers@npm:^15.0.0": - version: 15.0.0 - resolution: "@metamask/providers@npm:15.0.0" - dependencies: - "@metamask/json-rpc-engine": "npm:^7.3.2" - "@metamask/json-rpc-middleware-stream": "npm:^6.0.2" - "@metamask/object-multiplex": "npm:^2.0.0" - "@metamask/rpc-errors": "npm:^6.2.1" - "@metamask/safe-event-emitter": "npm:^3.0.0" - "@metamask/utils": "npm:^8.3.0" - detect-browser: "npm:^5.2.0" - extension-port-stream: "npm:^3.0.0" - fast-deep-equal: "npm:^3.1.3" - is-stream: "npm:^2.0.0" - readable-stream: "npm:^3.6.2" - webextension-polyfill: "npm:^0.10.0" - checksum: 10/d022fe6d2db577fcd299477f19dd1a0ca88baeae542d8a80330694d004bffc289eecf7008c619408c819de8f43eb9fc989b27e266a5961ffd43cb9c2ec749dd5 - languageName: node - linkType: hard - "@metamask/providers@npm:^17.1.2": version: 17.1.2 resolution: "@metamask/providers@npm:17.1.2" @@ -18660,7 +18604,7 @@ __metadata: languageName: node linkType: hard -"ethers@npm:^5.7.0, ethers@npm:^5.7.2": +"ethers@npm:^5.7.0": version: 5.7.2 resolution: "ethers@npm:5.7.2" dependencies: From 5f9c66b1866b21cb8f01051bb8b03c2da16564f2 Mon Sep 17 00:00:00 2001 From: Shane Jonas Date: Wed, 4 Sep 2024 15:53:26 -0400 Subject: [PATCH 10/21] fix: use package.json from feature branch --- .../multichainMethodCallValidator.ts | 6 +- package.json | 7 +- yarn.lock | 139 +++++++++++++----- 3 files changed, 110 insertions(+), 42 deletions(-) diff --git a/app/scripts/lib/multichain-api/multichainMethodCallValidator.ts b/app/scripts/lib/multichain-api/multichainMethodCallValidator.ts index 4a28bbdd24b3..a0a663b9ce2f 100644 --- a/app/scripts/lib/multichain-api/multichainMethodCallValidator.ts +++ b/app/scripts/lib/multichain-api/multichainMethodCallValidator.ts @@ -63,12 +63,12 @@ export const multichainMethodCallValidator = async ( paramToCheck = params[i]; } const result = v.validate(paramToCheck, p.schema as unknown as Schema, { - required: true, + required: p.required, }); - if (result.errors && p.required) { + if (result.errors) { errors.push( ...result.errors.map((e) => { - return transformError(e, p, paramToCheck); + return transformError(e, p, paramToCheck) as JsonRpcError; }), ); } diff --git a/package.json b/package.json index 2d25248ae8bb..217841008511 100644 --- a/package.json +++ b/package.json @@ -304,9 +304,10 @@ "@metamask-institutional/transaction-update": "^0.2.5", "@metamask-institutional/types": "^1.1.0", "@metamask/abi-utils": "^2.0.2", - "@metamask/accounts-controller": "^17.2.0", - "@metamask/address-book-controller": "^4.0.1", - "@metamask/announcement-controller": "^6.1.0", + "@metamask/account-watcher": "^4.1.0", + "@metamask/accounts-controller": "^18.1.0", + "@metamask/address-book-controller": "^5.0.0", + "@metamask/announcement-controller": "^7.0.0", "@metamask/api-specs": "^0.10.8", "@metamask/approval-controller": "^7.0.0", "@metamask/assets-controllers": "^36.0.0", diff --git a/yarn.lock b/yarn.lock index 83b144bf16a0..69eb0bbef704 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2445,7 +2445,7 @@ __metadata: languageName: node linkType: hard -"@ethereumjs/tx@npm:^5.2.1": +"@ethereumjs/tx@npm:^5.1.0, @ethereumjs/tx@npm:^5.2.1": version: 5.4.0 resolution: "@ethereumjs/tx@npm:5.4.0" dependencies: @@ -2468,7 +2468,7 @@ __metadata: languageName: node linkType: hard -"@ethereumjs/util@npm:^9.0.2, @ethereumjs/util@npm:^9.1.0": +"@ethereumjs/util@npm:^9.0.1, @ethereumjs/util@npm:^9.0.2, @ethereumjs/util@npm:^9.1.0": version: 9.1.0 resolution: "@ethereumjs/util@npm:9.1.0" dependencies: @@ -4734,6 +4734,21 @@ __metadata: languageName: node linkType: hard +"@metamask/account-watcher@npm:^4.1.0": + version: 4.1.0 + resolution: "@metamask/account-watcher@npm:4.1.0" + dependencies: + "@ethereumjs/tx": "npm:^5.1.0" + "@ethereumjs/util": "npm:^9.0.1" + "@metamask/keyring-api": "npm:^4.0.1" + "@metamask/snaps-sdk": "npm:^6.2.1" + "@metamask/utils": "npm:^8.3.0" + ethers: "npm:^5.7.2" + uuid: "npm:^9.0.0" + checksum: 10/51c150cc1a703c6726f7c11eb6b4906636a5c33cf25c2b60c7d120e67483fae37ac79ba46a5156518cb9666c2c64fea00f1d6ec23faa266b28a814c4fcefa561 + languageName: node + linkType: hard + "@metamask/accounts-controller@npm:^17.2.0": version: 17.2.0 resolution: "@metamask/accounts-controller@npm:17.2.0" @@ -4757,23 +4772,45 @@ __metadata: languageName: node linkType: hard -"@metamask/address-book-controller@npm:^4.0.1": - version: 4.0.2 - resolution: "@metamask/address-book-controller@npm:4.0.2" +"@metamask/accounts-controller@npm:^18.1.0": + version: 18.1.1 + resolution: "@metamask/accounts-controller@npm:18.1.1" dependencies: - "@metamask/base-controller": "npm:^5.0.2" - "@metamask/controller-utils": "npm:^10.0.0" + "@ethereumjs/util": "npm:^8.1.0" + "@metamask/base-controller": "npm:^7.0.0" + "@metamask/eth-snap-keyring": "npm:^4.3.1" + "@metamask/keyring-api": "npm:^8.1.0" + "@metamask/snaps-sdk": "npm:^6.1.1" + "@metamask/snaps-utils": "npm:^7.8.1" + "@metamask/utils": "npm:^9.1.0" + deepmerge: "npm:^4.2.2" + ethereum-cryptography: "npm:^2.1.2" + immer: "npm:^9.0.6" + uuid: "npm:^8.3.2" + peerDependencies: + "@metamask/keyring-controller": ^17.0.0 + "@metamask/snaps-controllers": ^9.3.0 + checksum: 10/15d02b265daea6bfc6a487ae9476bdbf4c26e2d4211542d8bdae9b3b3fcac3d7e6d161b0ab7e1967f9472eb18dd10b5f8fc49b9b89e6eaa690446dad53bc552b + languageName: node + linkType: hard + +"@metamask/address-book-controller@npm:^5.0.0": + version: 5.0.0 + resolution: "@metamask/address-book-controller@npm:5.0.0" + dependencies: + "@metamask/base-controller": "npm:^6.0.0" + "@metamask/controller-utils": "npm:^11.0.0" "@metamask/utils": "npm:^8.3.0" - checksum: 10/6a7ed650453fe7404578c2789de53ab4f2ee76c7709750b54b8b5541598976c31ba7e4112e2a380e76113d86eb7757fffc40a214714d80c1bbb05727c3515bab + checksum: 10/f4f3ec2c569457243cc4771c2d146a91227114431ecf8bb0d74e42b2e93fcc4d10545c32f865c918c9f1586379016d3ea2d7f2bc056a6b10b6cfd985f2b3c432 languageName: node linkType: hard -"@metamask/announcement-controller@npm:^6.1.0": - version: 6.1.1 - resolution: "@metamask/announcement-controller@npm:6.1.1" +"@metamask/announcement-controller@npm:^7.0.0": + version: 7.0.0 + resolution: "@metamask/announcement-controller@npm:7.0.0" dependencies: - "@metamask/base-controller": "npm:^5.0.2" - checksum: 10/cde5fe33b9a6b0bf39430e7b91e26e16d9a076084aced81716679c05c5312153b0ad547b66bf940852f52eae8bcae75839014fe33611265e8701cbc2f9d09f4e + "@metamask/base-controller": "npm:^6.0.0" + checksum: 10/0f8c9112a6514fd2dc4c135d1ab0445f627451d0583ef2eb92f52f133a448fd97b67d5aa615b7409f4380a01590546376ccc6b728d94cf32a4b62686e18c0a4d languageName: node linkType: hard @@ -4862,7 +4899,7 @@ __metadata: languageName: node linkType: hard -"@metamask/base-controller@npm:^5.0.1, @metamask/base-controller@npm:^5.0.2": +"@metamask/base-controller@npm:^5.0.1": version: 5.0.2 resolution: "@metamask/base-controller@npm:5.0.2" dependencies: @@ -4925,23 +4962,6 @@ __metadata: languageName: node linkType: hard -"@metamask/controller-utils@npm:^10.0.0": - version: 10.0.0 - resolution: "@metamask/controller-utils@npm:10.0.0" - dependencies: - "@ethereumjs/util": "npm:^8.1.0" - "@metamask/eth-query": "npm:^4.0.0" - "@metamask/ethjs-unit": "npm:^0.3.0" - "@metamask/utils": "npm:^8.3.0" - "@spruceid/siwe-parser": "npm:2.1.0" - "@types/bn.js": "npm:^5.1.5" - bn.js: "npm:^5.2.1" - eth-ens-namehash: "npm:^2.0.8" - fast-deep-equal: "npm:^3.1.3" - checksum: 10/ba32231e246aeacff640ca4383df74aaf9510d1d9cdcb33326a65c497fb927a6546306a02c98924218cef3c19eec569d5d6d9ca568d600af0afdf198b8c16477 - languageName: node - linkType: hard - "@metamask/controller-utils@npm:^11.0.0, @metamask/controller-utils@npm:^11.0.1, @metamask/controller-utils@npm:^11.0.2, @metamask/controller-utils@npm:^11.1.0": version: 11.1.0 resolution: "@metamask/controller-utils@npm:11.1.0" @@ -5525,6 +5545,18 @@ __metadata: languageName: node linkType: hard +"@metamask/json-rpc-middleware-stream@npm:^6.0.2": + version: 6.0.2 + resolution: "@metamask/json-rpc-middleware-stream@npm:6.0.2" + dependencies: + "@metamask/json-rpc-engine": "npm:^7.3.2" + "@metamask/safe-event-emitter": "npm:^3.0.0" + "@metamask/utils": "npm:^8.3.0" + readable-stream: "npm:^3.6.2" + checksum: 10/eb6fc179959206abeba8b12118757d55cc0028681566008a4005b570d21a9369795452e1bdb672fc9858f46a4e9ed5c996cfff0e85b47cef8bf39a6edfee8f1e + languageName: node + linkType: hard + "@metamask/json-rpc-middleware-stream@npm:^8.0.1, @metamask/json-rpc-middleware-stream@npm:^8.0.2": version: 8.0.2 resolution: "@metamask/json-rpc-middleware-stream@npm:8.0.2" @@ -5550,7 +5582,21 @@ __metadata: languageName: node linkType: hard -"@metamask/keyring-api@npm:^8.0.0": +"@metamask/keyring-api@npm:^4.0.1": + version: 4.0.2 + resolution: "@metamask/keyring-api@npm:4.0.2" + dependencies: + "@metamask/providers": "npm:^15.0.0" + "@metamask/snaps-sdk": "npm:^3.1.1" + "@metamask/utils": "npm:^8.3.0" + "@types/uuid": "npm:^9.0.1" + superstruct: "npm:^1.0.3" + uuid: "npm:^9.0.0" + checksum: 10/8f6dc3b4913803eba8e22228ac6307ca66247900d70755a6dd457c2037b9fb6d3979da472a08e24ccdd81c28c68db3ad41219d915e5e8442ef640a3c0c46b261 + languageName: node + linkType: hard + +"@metamask/keyring-api@npm:^8.0.0, @metamask/keyring-api@npm:^8.1.0": version: 8.1.0 resolution: "@metamask/keyring-api@npm:8.1.0" dependencies: @@ -6037,6 +6083,26 @@ __metadata: languageName: node linkType: hard +"@metamask/providers@npm:^15.0.0": + version: 15.0.0 + resolution: "@metamask/providers@npm:15.0.0" + dependencies: + "@metamask/json-rpc-engine": "npm:^7.3.2" + "@metamask/json-rpc-middleware-stream": "npm:^6.0.2" + "@metamask/object-multiplex": "npm:^2.0.0" + "@metamask/rpc-errors": "npm:^6.2.1" + "@metamask/safe-event-emitter": "npm:^3.0.0" + "@metamask/utils": "npm:^8.3.0" + detect-browser: "npm:^5.2.0" + extension-port-stream: "npm:^3.0.0" + fast-deep-equal: "npm:^3.1.3" + is-stream: "npm:^2.0.0" + readable-stream: "npm:^3.6.2" + webextension-polyfill: "npm:^0.10.0" + checksum: 10/d022fe6d2db577fcd299477f19dd1a0ca88baeae542d8a80330694d004bffc289eecf7008c619408c819de8f43eb9fc989b27e266a5961ffd43cb9c2ec749dd5 + languageName: node + linkType: hard + "@metamask/providers@npm:^17.1.2": version: 17.1.2 resolution: "@metamask/providers@npm:17.1.2" @@ -18604,7 +18670,7 @@ __metadata: languageName: node linkType: hard -"ethers@npm:^5.7.0": +"ethers@npm:^5.7.0, ethers@npm:^5.7.2": version: 5.7.2 resolution: "ethers@npm:5.7.2" dependencies: @@ -26074,9 +26140,10 @@ __metadata: "@metamask-institutional/transaction-update": "npm:^0.2.5" "@metamask-institutional/types": "npm:^1.1.0" "@metamask/abi-utils": "npm:^2.0.2" - "@metamask/accounts-controller": "npm:^17.2.0" - "@metamask/address-book-controller": "npm:^4.0.1" - "@metamask/announcement-controller": "npm:^6.1.0" + "@metamask/account-watcher": "npm:^4.1.0" + "@metamask/accounts-controller": "npm:^18.1.0" + "@metamask/address-book-controller": "npm:^5.0.0" + "@metamask/announcement-controller": "npm:^7.0.0" "@metamask/api-specs": "npm:^0.10.8" "@metamask/approval-controller": "npm:^7.0.0" "@metamask/assets-controllers": "npm:^36.0.0" From cc5f86c153520cb0d1b8f3a2bd65389e5c8ead98 Mon Sep 17 00:00:00 2001 From: MetaMask Bot Date: Wed, 4 Sep 2024 20:12:29 +0000 Subject: [PATCH 11/21] Update LavaMoat policies --- lavamoat/browserify/beta/policy.json | 362 ++++++++++++++++++++++++-- lavamoat/browserify/flask/policy.json | 362 ++++++++++++++++++++++++-- lavamoat/browserify/main/policy.json | 362 ++++++++++++++++++++++++-- lavamoat/browserify/mmi/policy.json | 362 ++++++++++++++++++++++++-- lavamoat/build-system/policy.json | 12 +- 5 files changed, 1382 insertions(+), 78 deletions(-) diff --git a/lavamoat/browserify/beta/policy.json b/lavamoat/browserify/beta/policy.json index 8cbb2cfe5181..f9191fbfcb11 100644 --- a/lavamoat/browserify/beta/policy.json +++ b/lavamoat/browserify/beta/policy.json @@ -766,6 +766,7 @@ }, "@metamask/abi-utils": { "packages": { + "@metamask/utils": true, "@metamask/utils": true, "@metamask/utils>@metamask/superstruct": true } @@ -774,14 +775,23 @@ "packages": { "@ethereumjs/tx>@ethereumjs/util": true, "@ethereumjs/tx>ethereum-cryptography": true, - "@metamask/base-controller": true, + "@metamask/accounts-controller>@metamask/base-controller": true, "@metamask/eth-snap-keyring": true, "@metamask/keyring-api": true, "@metamask/keyring-controller": true, "@metamask/utils": true, + "@metamask/utils": true, "uuid": true } }, + "@metamask/accounts-controller>@metamask/base-controller": { + "globals": { + "setTimeout": true + }, + "packages": { + "immer": true + } + }, "@metamask/address-book-controller": { "packages": { "@metamask/base-controller": true, @@ -846,6 +856,7 @@ "@metamask/name-controller>async-mutex": true, "@metamask/rpc-errors": true, "@metamask/utils": true, + "@metamask/utils": true, "bn.js": true, "lodash": true, "single-call-balance-checker-abi": true, @@ -905,6 +916,7 @@ "crypto.subtle.importKey": true }, "packages": { + "@metamask/browser-passworder>@metamask/utils": true, "@metamask/browser-passworder>@metamask/utils": true, "browserify>buffer": true } @@ -924,6 +936,21 @@ "semver": true } }, + "@metamask/browser-passworder>@metamask/utils": { + "globals": { + "TextDecoder": true, + "TextEncoder": true + }, + "packages": { + "@metamask/utils>@metamask/superstruct": true, + "@metamask/utils>@scure/base": true, + "@metamask/utils>pony-cause": true, + "@noble/hashes": true, + "browserify>buffer": true, + "nock>debug": true, + "semver": true + } + }, "@metamask/controller-utils": { "globals": { "URL": true, @@ -936,6 +963,7 @@ "@metamask/controller-utils>@spruceid/siwe-parser": true, "@metamask/ethjs>@metamask/ethjs-unit": true, "@metamask/utils": true, + "@metamask/utils": true, "bn.js": true, "browserify>buffer": true, "eslint>fast-deep-equal": true, @@ -978,6 +1006,7 @@ "@metamask/base-controller": true, "@metamask/controller-utils": true, "@metamask/utils": true, + "@metamask/utils": true, "punycode": true } }, @@ -1001,11 +1030,28 @@ }, "@metamask/eth-json-rpc-filters>@metamask/json-rpc-engine": { "packages": { + "@metamask/eth-json-rpc-filters>@metamask/json-rpc-engine>@metamask/utils": true, "@metamask/eth-json-rpc-filters>@metamask/json-rpc-engine>@metamask/utils": true, "@metamask/rpc-errors": true, "@metamask/safe-event-emitter": true } }, + "@metamask/eth-json-rpc-filters>@metamask/json-rpc-engine>@metamask/utils": { + "globals": { + "TextDecoder": true, + "TextEncoder": true + }, + "packages": { + "@metamask/utils>@metamask/superstruct": true, + "@metamask/utils>@scure/base": true, + "@metamask/utils>pony-cause": true, + "@noble/hashes": true, + "browserify>buffer": true, + "nock>debug": true, + "semver": true + "@metamask/safe-event-emitter": true + } + }, "@metamask/eth-json-rpc-filters>@metamask/json-rpc-engine>@metamask/utils": { "globals": { "TextDecoder": true, @@ -1042,6 +1088,8 @@ "@metamask/rpc-errors": true, "@metamask/snaps-controllers>@metamask/json-rpc-engine": true, "@metamask/utils": true + "@metamask/snaps-controllers>@metamask/json-rpc-engine": true, + "@metamask/utils": true } }, "@metamask/eth-ledger-bridge-keyring": { @@ -1076,6 +1124,7 @@ "@metamask/abi-utils": true, "@metamask/eth-sig-util>tweetnacl": true, "@metamask/utils": true, + "@metamask/utils": true, "@metamask/utils>@scure/base": true, "browserify>buffer": true } @@ -1099,6 +1148,7 @@ "@ethereumjs/tx": true, "@metamask/eth-sig-util": true, "@metamask/eth-snap-keyring>@metamask/utils": true, + "@metamask/eth-snap-keyring>@metamask/utils": true, "@metamask/eth-snap-keyring>uuid": true, "@metamask/keyring-api": true, "superstruct": true, @@ -1120,6 +1170,21 @@ "semver": true } }, + "@metamask/eth-snap-keyring>@metamask/utils": { + "globals": { + "TextDecoder": true, + "TextEncoder": true + }, + "packages": { + "@metamask/utils>@metamask/superstruct": true, + "@metamask/utils>@scure/base": true, + "@metamask/utils>pony-cause": true, + "@noble/hashes": true, + "browserify>buffer": true, + "nock>debug": true, + "semver": true + } + }, "@metamask/eth-snap-keyring>uuid": { "globals": { "crypto": true @@ -1149,6 +1214,7 @@ "packages": { "@metamask/eth-query>json-rpc-random-id": true, "@metamask/eth-token-tracker>@metamask/eth-block-tracker>@metamask/utils": true, + "@metamask/eth-token-tracker>@metamask/eth-block-tracker>@metamask/utils": true, "@metamask/safe-event-emitter": true, "pify": true } @@ -1168,6 +1234,21 @@ "semver": true } }, + "@metamask/eth-token-tracker>@metamask/eth-block-tracker>@metamask/utils": { + "globals": { + "TextDecoder": true, + "TextEncoder": true + }, + "packages": { + "@metamask/utils>@metamask/superstruct": true, + "@metamask/utils>@scure/base": true, + "@metamask/utils>pony-cause": true, + "@noble/hashes": true, + "browserify>buffer": true, + "nock>debug": true, + "semver": true + } + }, "@metamask/eth-token-tracker>deep-equal": { "packages": { "@lavamoat/lavapack>json-stable-stringify>isarray": true, @@ -1471,6 +1552,7 @@ "@metamask/keyring-api>bech32": true, "@metamask/keyring-api>uuid": true, "@metamask/utils": true, + "@metamask/utils": true, "@metamask/utils>@metamask/superstruct": true } }, @@ -1490,6 +1572,8 @@ "@metamask/keyring-controller>ethereumjs-wallet": true, "@metamask/name-controller>async-mutex": true, "@metamask/utils": true + "@metamask/name-controller>async-mutex": true, + "@metamask/utils": true } }, "@metamask/keyring-controller>@metamask/eth-hd-keyring": { @@ -1501,6 +1585,7 @@ "@ethereumjs/tx>ethereum-cryptography": true, "@metamask/eth-sig-util": true, "@metamask/keyring-controller>@metamask/eth-hd-keyring>@metamask/utils": true, + "@metamask/keyring-controller>@metamask/eth-hd-keyring>@metamask/utils": true, "@metamask/scure-bip39": true, "browserify>buffer": true } @@ -1520,16 +1605,33 @@ "semver": true } }, + "@metamask/keyring-controller>@metamask/eth-hd-keyring>@metamask/utils": { + "globals": { + "TextDecoder": true, + "TextEncoder": true + }, + "packages": { + "@metamask/utils>@metamask/superstruct": true, + "@metamask/utils>@scure/base": true, + "@metamask/utils>pony-cause": true, + "@noble/hashes": true, + "browserify>buffer": true, + "nock>debug": true, + "semver": true + } + }, "@metamask/keyring-controller>@metamask/eth-simple-keyring": { "packages": { "@ethereumjs/tx>@ethereumjs/util": true, "@ethereumjs/tx>ethereum-cryptography": true, "@metamask/eth-sig-util": true, "@metamask/keyring-controller>@metamask/eth-simple-keyring>@metamask/utils": true, + "@metamask/keyring-controller>@metamask/eth-simple-keyring>@metamask/utils": true, "browserify>buffer": true, "crypto-browserify>randombytes": true } }, + "@metamask/keyring-controller>@metamask/eth-simple-keyring>@metamask/utils": { "@metamask/keyring-controller>@metamask/eth-simple-keyring>@metamask/utils": { "globals": { "TextDecoder": true, @@ -1607,27 +1709,12 @@ "packages": { "@metamask/controller-utils": true, "@metamask/eth-sig-util": true, - "@metamask/message-manager>@metamask/base-controller": true, - "@metamask/message-manager>jsonschema": true, "@metamask/utils": true, "browserify>buffer": true, "uuid": true, "webpack>events": true } }, - "@metamask/message-manager>@metamask/base-controller": { - "globals": { - "setTimeout": true - }, - "packages": { - "immer": true - } - }, - "@metamask/message-manager>jsonschema": { - "packages": { - "browserify>url": true - } - }, "@metamask/message-signing-snap>@noble/ciphers": { "globals": { "TextDecoder": true, @@ -1654,6 +1741,23 @@ "@metamask/name-controller>async-mutex": true } }, + "@metamask/name-controller>@metamask/utils": { + "globals": { + "TextDecoder": true, + "TextEncoder": true + }, + "packages": { + "@metamask/utils>@metamask/superstruct": true, + "@metamask/utils>@scure/base": true, + "@metamask/utils>pony-cause": true, + "@noble/hashes": true, + "browserify>buffer": true, + "nock>debug": true, + "semver": true + "@metamask/name-controller>@metamask/utils": true, + "@metamask/name-controller>async-mutex": true + } + }, "@metamask/name-controller>@metamask/utils": { "globals": { "TextDecoder": true, @@ -1697,6 +1801,7 @@ "@metamask/rpc-errors": true, "@metamask/snaps-controllers>@metamask/json-rpc-engine": true, "@metamask/utils": true, + "@metamask/utils": true, "browserify>assert": true, "uuid": true } @@ -1709,6 +1814,7 @@ "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/eth-json-rpc-provider": true, "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/json-rpc-engine": true, "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/utils": true, + "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/utils": true, "@metamask/rpc-errors": true, "node-fetch": true } @@ -1721,11 +1827,28 @@ }, "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/json-rpc-engine": { "packages": { + "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/utils": true, "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/utils": true, "@metamask/rpc-errors": true, "@metamask/safe-event-emitter": true } }, + "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/utils": { + "globals": { + "TextDecoder": true, + "TextEncoder": true + }, + "packages": { + "@metamask/utils>@metamask/superstruct": true, + "@metamask/utils>@scure/base": true, + "@metamask/utils>pony-cause": true, + "@noble/hashes": true, + "browserify>buffer": true, + "nock>debug": true, + "semver": true + "@metamask/safe-event-emitter": true + } + }, "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/utils": { "globals": { "TextDecoder": true, @@ -1794,6 +1917,14 @@ "@metamask/notification-controller>nanoid": true } }, + "@metamask/notification-controller>@metamask/utils": { + "@metamask/notification-controller": { + "packages": { + "@metamask/base-controller": true, + "@metamask/notification-controller>@metamask/utils": true, + "@metamask/notification-controller>nanoid": true + } + }, "@metamask/notification-controller>@metamask/utils": { "globals": { "TextDecoder": true, @@ -1981,6 +2112,7 @@ "@metamask/base-controller": true, "@metamask/controller-utils": true, "@metamask/permission-controller>@metamask/utils": true, + "@metamask/permission-controller>@metamask/utils": true, "@metamask/permission-controller>nanoid": true, "@metamask/rpc-errors": true, "@metamask/snaps-controllers>@metamask/json-rpc-engine": true, @@ -2003,6 +2135,21 @@ "semver": true } }, + "@metamask/permission-controller>@metamask/utils": { + "globals": { + "TextDecoder": true, + "TextEncoder": true + }, + "packages": { + "@metamask/utils>@metamask/superstruct": true, + "@metamask/utils>@scure/base": true, + "@metamask/utils>pony-cause": true, + "@noble/hashes": true, + "browserify>buffer": true, + "nock>debug": true, + "semver": true + } + }, "@metamask/permission-controller>nanoid": { "globals": { "crypto.getRandomValues": true @@ -2012,6 +2159,7 @@ "packages": { "@metamask/permission-log-controller>@metamask/base-controller": true, "@metamask/permission-log-controller>@metamask/utils": true + "@metamask/permission-log-controller>@metamask/utils": true } }, "@metamask/permission-log-controller>@metamask/base-controller": { @@ -2037,6 +2185,21 @@ "semver": true } }, + "@metamask/permission-log-controller>@metamask/utils": { + "globals": { + "TextDecoder": true, + "TextEncoder": true + }, + "packages": { + "@metamask/utils>@metamask/superstruct": true, + "@metamask/utils>@scure/base": true, + "@metamask/utils>pony-cause": true, + "@noble/hashes": true, + "browserify>buffer": true, + "nock>debug": true, + "semver": true + } + }, "@metamask/phishing-controller": { "globals": { "TextEncoder": true, @@ -2072,6 +2235,7 @@ "removeEventListener": true }, "packages": { + "@metamask/post-message-stream>@metamask/utils": true, "@metamask/post-message-stream>@metamask/utils": true, "readable-stream": true } @@ -2091,6 +2255,21 @@ "semver": true } }, + "@metamask/post-message-stream>@metamask/utils": { + "globals": { + "TextDecoder": true, + "TextEncoder": true + }, + "packages": { + "@metamask/utils>@metamask/superstruct": true, + "@metamask/utils>@scure/base": true, + "@metamask/utils>pony-cause": true, + "@noble/hashes": true, + "browserify>buffer": true, + "nock>debug": true, + "semver": true + } + }, "@metamask/ppom-validator": { "globals": { "URL": true, @@ -2120,6 +2299,7 @@ "@metamask/controller-utils>@spruceid/siwe-parser": true, "@metamask/ethjs>@metamask/ethjs-unit": true, "@metamask/ppom-validator>@metamask/utils": true, + "@metamask/ppom-validator>@metamask/utils": true, "bn.js": true, "browserify>buffer": true, "eslint>fast-deep-equal": true, @@ -2141,6 +2321,21 @@ "semver": true } }, + "@metamask/ppom-validator>@metamask/utils": { + "globals": { + "TextDecoder": true, + "TextEncoder": true + }, + "packages": { + "@metamask/utils>@metamask/superstruct": true, + "@metamask/utils>@scure/base": true, + "@metamask/utils>pony-cause": true, + "@noble/hashes": true, + "browserify>buffer": true, + "nock>debug": true, + "semver": true + } + }, "@metamask/ppom-validator>crypto-js": { "globals": { "crypto": true, @@ -2243,11 +2438,28 @@ "packages": { "@metamask/base-controller": true, "@metamask/queued-request-controller>@metamask/utils": true, + "@metamask/queued-request-controller>@metamask/utils": true, "@metamask/rpc-errors": true, "@metamask/selected-network-controller": true, "@metamask/snaps-controllers>@metamask/json-rpc-engine": true } }, + "@metamask/queued-request-controller>@metamask/utils": { + "globals": { + "TextDecoder": true, + "TextEncoder": true + }, + "packages": { + "@metamask/utils>@metamask/superstruct": true, + "@metamask/utils>@scure/base": true, + "@metamask/utils>pony-cause": true, + "@noble/hashes": true, + "browserify>buffer": true, + "nock>debug": true, + "semver": true + "@metamask/snaps-controllers>@metamask/json-rpc-engine": true + } + }, "@metamask/queued-request-controller>@metamask/utils": { "globals": { "TextDecoder": true, @@ -2271,8 +2483,11 @@ "@metamask/base-controller": true, "@metamask/rate-limit-controller>@metamask/utils": true, "@metamask/rpc-errors": true + "@metamask/rate-limit-controller>@metamask/utils": true, + "@metamask/rpc-errors": true } }, + "@metamask/rate-limit-controller>@metamask/utils": { "@metamask/rate-limit-controller>@metamask/utils": { "globals": { "TextDecoder": true, @@ -2294,6 +2509,12 @@ "eth-rpc-errors>fast-safe-stringify": true } }, + "@metamask/rpc-errors": { + "packages": { + "@metamask/utils": true, + "eth-rpc-errors>fast-safe-stringify": true + } + }, "@metamask/rpc-methods-flask>nanoid": { "globals": { "crypto.getRandomValues": true @@ -2439,6 +2660,7 @@ "@metamask/smart-transactions-controller>@metamask/transaction-controller>@ethereumjs/util": true, "@metamask/smart-transactions-controller>@metamask/transaction-controller>@metamask/nonce-tracker": true, "@metamask/smart-transactions-controller>@metamask/transaction-controller>@metamask/utils": true, + "@metamask/smart-transactions-controller>@metamask/transaction-controller>@metamask/utils": true, "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry": true, "bn.js": true, "browserify>buffer": true, @@ -2502,6 +2724,21 @@ "semver": true } }, + "@metamask/smart-transactions-controller>@metamask/transaction-controller>@metamask/utils": { + "globals": { + "TextDecoder": true, + "TextEncoder": true + }, + "packages": { + "@metamask/utils>@metamask/superstruct": true, + "@metamask/utils>@scure/base": true, + "@metamask/utils>pony-cause": true, + "@noble/hashes": true, + "browserify>buffer": true, + "nock>debug": true, + "semver": true + } + }, "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry": { "packages": { "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-contract": true, @@ -2588,6 +2825,7 @@ "@metamask/snaps-utils": true, "@metamask/snaps-utils>@metamask/snaps-registry": true, "@metamask/utils": true, + "@metamask/utils": true, "browserify>browserify-zlib": true, "eslint>fast-deep-equal": true, "readable-stream": true @@ -2603,6 +2841,7 @@ "@metamask/rpc-errors": true, "@metamask/safe-event-emitter": true, "@metamask/utils": true + "@metamask/utils": true } }, "@metamask/snaps-controllers>@metamask/json-rpc-middleware-stream": { @@ -2613,6 +2852,7 @@ "packages": { "@metamask/safe-event-emitter": true, "@metamask/utils": true, + "@metamask/utils": true, "readable-stream": true } }, @@ -2627,6 +2867,7 @@ "@metamask/snaps-controllers>@metamask/json-rpc-engine": true, "@metamask/snaps-controllers>nanoid": true, "@metamask/utils": true, + "@metamask/utils": true, "deep-freeze-strict": true, "immer": true } @@ -2715,6 +2956,7 @@ "@metamask/snaps-utils>rfdc": true, "@metamask/snaps-utils>validate-npm-package-name": true, "@metamask/utils": true, + "@metamask/utils": true, "@metamask/utils>@metamask/superstruct": true, "@metamask/utils>@scure/base": true, "@noble/hashes": true, @@ -2733,6 +2975,7 @@ "@metamask/snaps-controllers>@metamask/json-rpc-engine": true, "@metamask/snaps-execution-environments>nanoid": true, "@metamask/utils": true, + "@metamask/utils": true, "deep-freeze-strict": true, "immer": true } @@ -2750,6 +2993,7 @@ "@metamask/snaps-sdk>@metamask/key-tree": true, "@metamask/snaps-utils": true, "@metamask/utils": true, + "@metamask/utils": true, "@metamask/utils>@metamask/superstruct": true, "@noble/hashes": true } @@ -2765,6 +3009,7 @@ "@metamask/snaps-controllers>@metamask/json-rpc-engine": true, "@metamask/snaps-rpc-methods>@metamask/permission-controller>nanoid": true, "@metamask/utils": true, + "@metamask/utils": true, "deep-freeze-strict": true, "immer": true } @@ -2781,6 +3026,7 @@ "packages": { "@metamask/rpc-errors": true, "@metamask/utils": true, + "@metamask/utils": true, "@metamask/utils>@metamask/superstruct": true } }, @@ -2789,6 +3035,7 @@ "@metamask/message-signing-snap>@noble/curves": true, "@metamask/scure-bip39": true, "@metamask/utils": true, + "@metamask/utils": true, "@metamask/utils>@scure/base": true, "@noble/hashes": true } @@ -2821,6 +3068,7 @@ "@metamask/snaps-utils>rfdc": true, "@metamask/snaps-utils>validate-npm-package-name": true, "@metamask/utils": true, + "@metamask/utils": true, "@metamask/utils>@metamask/superstruct": true, "@metamask/utils>@scure/base": true, "@noble/hashes": true, @@ -2839,6 +3087,7 @@ "@metamask/snaps-controllers>@metamask/json-rpc-engine": true, "@metamask/snaps-utils>@metamask/permission-controller>nanoid": true, "@metamask/utils": true, + "@metamask/utils": true, "deep-freeze-strict": true, "immer": true } @@ -2852,6 +3101,7 @@ "packages": { "@metamask/message-signing-snap>@noble/curves": true, "@metamask/utils": true, + "@metamask/utils": true, "@metamask/utils>@metamask/superstruct": true, "@noble/hashes": true } @@ -2970,6 +3220,7 @@ "@metamask/rpc-errors": true, "@metamask/transaction-controller>@metamask/nonce-tracker": true, "@metamask/utils": true, + "@metamask/utils": true, "bn.js": true, "browserify>buffer": true, "eth-method-registry": true, @@ -3008,6 +3259,7 @@ "@metamask/rpc-errors": true, "@metamask/transaction-controller": true, "@metamask/user-operation-controller>@metamask/utils": true, + "@metamask/user-operation-controller>@metamask/utils": true, "bn.js": true, "lodash": true, "superstruct": true, @@ -3030,6 +3282,21 @@ "semver": true } }, + "@metamask/user-operation-controller>@metamask/utils": { + "globals": { + "TextDecoder": true, + "TextEncoder": true + }, + "packages": { + "@metamask/utils>@metamask/superstruct": true, + "@metamask/utils>@scure/base": true, + "@metamask/utils>pony-cause": true, + "@noble/hashes": true, + "browserify>buffer": true, + "nock>debug": true, + "semver": true + } + }, "@metamask/utils": { "globals": { "TextDecoder": true, @@ -3099,6 +3366,62 @@ "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, @@ -3982,6 +4305,11 @@ "koa>is-generator-function>has-tostringtag": true } }, + "eslint>ajv>uri-js": { + "globals": { + "define": true + } + }, "eth-ens-namehash": { "globals": { "name": "write" @@ -5404,4 +5732,4 @@ } } } -} \ No newline at end of file +} diff --git a/lavamoat/browserify/flask/policy.json b/lavamoat/browserify/flask/policy.json index 8cbb2cfe5181..f9191fbfcb11 100644 --- a/lavamoat/browserify/flask/policy.json +++ b/lavamoat/browserify/flask/policy.json @@ -766,6 +766,7 @@ }, "@metamask/abi-utils": { "packages": { + "@metamask/utils": true, "@metamask/utils": true, "@metamask/utils>@metamask/superstruct": true } @@ -774,14 +775,23 @@ "packages": { "@ethereumjs/tx>@ethereumjs/util": true, "@ethereumjs/tx>ethereum-cryptography": true, - "@metamask/base-controller": true, + "@metamask/accounts-controller>@metamask/base-controller": true, "@metamask/eth-snap-keyring": true, "@metamask/keyring-api": true, "@metamask/keyring-controller": true, "@metamask/utils": true, + "@metamask/utils": true, "uuid": true } }, + "@metamask/accounts-controller>@metamask/base-controller": { + "globals": { + "setTimeout": true + }, + "packages": { + "immer": true + } + }, "@metamask/address-book-controller": { "packages": { "@metamask/base-controller": true, @@ -846,6 +856,7 @@ "@metamask/name-controller>async-mutex": true, "@metamask/rpc-errors": true, "@metamask/utils": true, + "@metamask/utils": true, "bn.js": true, "lodash": true, "single-call-balance-checker-abi": true, @@ -905,6 +916,7 @@ "crypto.subtle.importKey": true }, "packages": { + "@metamask/browser-passworder>@metamask/utils": true, "@metamask/browser-passworder>@metamask/utils": true, "browserify>buffer": true } @@ -924,6 +936,21 @@ "semver": true } }, + "@metamask/browser-passworder>@metamask/utils": { + "globals": { + "TextDecoder": true, + "TextEncoder": true + }, + "packages": { + "@metamask/utils>@metamask/superstruct": true, + "@metamask/utils>@scure/base": true, + "@metamask/utils>pony-cause": true, + "@noble/hashes": true, + "browserify>buffer": true, + "nock>debug": true, + "semver": true + } + }, "@metamask/controller-utils": { "globals": { "URL": true, @@ -936,6 +963,7 @@ "@metamask/controller-utils>@spruceid/siwe-parser": true, "@metamask/ethjs>@metamask/ethjs-unit": true, "@metamask/utils": true, + "@metamask/utils": true, "bn.js": true, "browserify>buffer": true, "eslint>fast-deep-equal": true, @@ -978,6 +1006,7 @@ "@metamask/base-controller": true, "@metamask/controller-utils": true, "@metamask/utils": true, + "@metamask/utils": true, "punycode": true } }, @@ -1001,11 +1030,28 @@ }, "@metamask/eth-json-rpc-filters>@metamask/json-rpc-engine": { "packages": { + "@metamask/eth-json-rpc-filters>@metamask/json-rpc-engine>@metamask/utils": true, "@metamask/eth-json-rpc-filters>@metamask/json-rpc-engine>@metamask/utils": true, "@metamask/rpc-errors": true, "@metamask/safe-event-emitter": true } }, + "@metamask/eth-json-rpc-filters>@metamask/json-rpc-engine>@metamask/utils": { + "globals": { + "TextDecoder": true, + "TextEncoder": true + }, + "packages": { + "@metamask/utils>@metamask/superstruct": true, + "@metamask/utils>@scure/base": true, + "@metamask/utils>pony-cause": true, + "@noble/hashes": true, + "browserify>buffer": true, + "nock>debug": true, + "semver": true + "@metamask/safe-event-emitter": true + } + }, "@metamask/eth-json-rpc-filters>@metamask/json-rpc-engine>@metamask/utils": { "globals": { "TextDecoder": true, @@ -1042,6 +1088,8 @@ "@metamask/rpc-errors": true, "@metamask/snaps-controllers>@metamask/json-rpc-engine": true, "@metamask/utils": true + "@metamask/snaps-controllers>@metamask/json-rpc-engine": true, + "@metamask/utils": true } }, "@metamask/eth-ledger-bridge-keyring": { @@ -1076,6 +1124,7 @@ "@metamask/abi-utils": true, "@metamask/eth-sig-util>tweetnacl": true, "@metamask/utils": true, + "@metamask/utils": true, "@metamask/utils>@scure/base": true, "browserify>buffer": true } @@ -1099,6 +1148,7 @@ "@ethereumjs/tx": true, "@metamask/eth-sig-util": true, "@metamask/eth-snap-keyring>@metamask/utils": true, + "@metamask/eth-snap-keyring>@metamask/utils": true, "@metamask/eth-snap-keyring>uuid": true, "@metamask/keyring-api": true, "superstruct": true, @@ -1120,6 +1170,21 @@ "semver": true } }, + "@metamask/eth-snap-keyring>@metamask/utils": { + "globals": { + "TextDecoder": true, + "TextEncoder": true + }, + "packages": { + "@metamask/utils>@metamask/superstruct": true, + "@metamask/utils>@scure/base": true, + "@metamask/utils>pony-cause": true, + "@noble/hashes": true, + "browserify>buffer": true, + "nock>debug": true, + "semver": true + } + }, "@metamask/eth-snap-keyring>uuid": { "globals": { "crypto": true @@ -1149,6 +1214,7 @@ "packages": { "@metamask/eth-query>json-rpc-random-id": true, "@metamask/eth-token-tracker>@metamask/eth-block-tracker>@metamask/utils": true, + "@metamask/eth-token-tracker>@metamask/eth-block-tracker>@metamask/utils": true, "@metamask/safe-event-emitter": true, "pify": true } @@ -1168,6 +1234,21 @@ "semver": true } }, + "@metamask/eth-token-tracker>@metamask/eth-block-tracker>@metamask/utils": { + "globals": { + "TextDecoder": true, + "TextEncoder": true + }, + "packages": { + "@metamask/utils>@metamask/superstruct": true, + "@metamask/utils>@scure/base": true, + "@metamask/utils>pony-cause": true, + "@noble/hashes": true, + "browserify>buffer": true, + "nock>debug": true, + "semver": true + } + }, "@metamask/eth-token-tracker>deep-equal": { "packages": { "@lavamoat/lavapack>json-stable-stringify>isarray": true, @@ -1471,6 +1552,7 @@ "@metamask/keyring-api>bech32": true, "@metamask/keyring-api>uuid": true, "@metamask/utils": true, + "@metamask/utils": true, "@metamask/utils>@metamask/superstruct": true } }, @@ -1490,6 +1572,8 @@ "@metamask/keyring-controller>ethereumjs-wallet": true, "@metamask/name-controller>async-mutex": true, "@metamask/utils": true + "@metamask/name-controller>async-mutex": true, + "@metamask/utils": true } }, "@metamask/keyring-controller>@metamask/eth-hd-keyring": { @@ -1501,6 +1585,7 @@ "@ethereumjs/tx>ethereum-cryptography": true, "@metamask/eth-sig-util": true, "@metamask/keyring-controller>@metamask/eth-hd-keyring>@metamask/utils": true, + "@metamask/keyring-controller>@metamask/eth-hd-keyring>@metamask/utils": true, "@metamask/scure-bip39": true, "browserify>buffer": true } @@ -1520,16 +1605,33 @@ "semver": true } }, + "@metamask/keyring-controller>@metamask/eth-hd-keyring>@metamask/utils": { + "globals": { + "TextDecoder": true, + "TextEncoder": true + }, + "packages": { + "@metamask/utils>@metamask/superstruct": true, + "@metamask/utils>@scure/base": true, + "@metamask/utils>pony-cause": true, + "@noble/hashes": true, + "browserify>buffer": true, + "nock>debug": true, + "semver": true + } + }, "@metamask/keyring-controller>@metamask/eth-simple-keyring": { "packages": { "@ethereumjs/tx>@ethereumjs/util": true, "@ethereumjs/tx>ethereum-cryptography": true, "@metamask/eth-sig-util": true, "@metamask/keyring-controller>@metamask/eth-simple-keyring>@metamask/utils": true, + "@metamask/keyring-controller>@metamask/eth-simple-keyring>@metamask/utils": true, "browserify>buffer": true, "crypto-browserify>randombytes": true } }, + "@metamask/keyring-controller>@metamask/eth-simple-keyring>@metamask/utils": { "@metamask/keyring-controller>@metamask/eth-simple-keyring>@metamask/utils": { "globals": { "TextDecoder": true, @@ -1607,27 +1709,12 @@ "packages": { "@metamask/controller-utils": true, "@metamask/eth-sig-util": true, - "@metamask/message-manager>@metamask/base-controller": true, - "@metamask/message-manager>jsonschema": true, "@metamask/utils": true, "browserify>buffer": true, "uuid": true, "webpack>events": true } }, - "@metamask/message-manager>@metamask/base-controller": { - "globals": { - "setTimeout": true - }, - "packages": { - "immer": true - } - }, - "@metamask/message-manager>jsonschema": { - "packages": { - "browserify>url": true - } - }, "@metamask/message-signing-snap>@noble/ciphers": { "globals": { "TextDecoder": true, @@ -1654,6 +1741,23 @@ "@metamask/name-controller>async-mutex": true } }, + "@metamask/name-controller>@metamask/utils": { + "globals": { + "TextDecoder": true, + "TextEncoder": true + }, + "packages": { + "@metamask/utils>@metamask/superstruct": true, + "@metamask/utils>@scure/base": true, + "@metamask/utils>pony-cause": true, + "@noble/hashes": true, + "browserify>buffer": true, + "nock>debug": true, + "semver": true + "@metamask/name-controller>@metamask/utils": true, + "@metamask/name-controller>async-mutex": true + } + }, "@metamask/name-controller>@metamask/utils": { "globals": { "TextDecoder": true, @@ -1697,6 +1801,7 @@ "@metamask/rpc-errors": true, "@metamask/snaps-controllers>@metamask/json-rpc-engine": true, "@metamask/utils": true, + "@metamask/utils": true, "browserify>assert": true, "uuid": true } @@ -1709,6 +1814,7 @@ "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/eth-json-rpc-provider": true, "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/json-rpc-engine": true, "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/utils": true, + "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/utils": true, "@metamask/rpc-errors": true, "node-fetch": true } @@ -1721,11 +1827,28 @@ }, "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/json-rpc-engine": { "packages": { + "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/utils": true, "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/utils": true, "@metamask/rpc-errors": true, "@metamask/safe-event-emitter": true } }, + "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/utils": { + "globals": { + "TextDecoder": true, + "TextEncoder": true + }, + "packages": { + "@metamask/utils>@metamask/superstruct": true, + "@metamask/utils>@scure/base": true, + "@metamask/utils>pony-cause": true, + "@noble/hashes": true, + "browserify>buffer": true, + "nock>debug": true, + "semver": true + "@metamask/safe-event-emitter": true + } + }, "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/utils": { "globals": { "TextDecoder": true, @@ -1794,6 +1917,14 @@ "@metamask/notification-controller>nanoid": true } }, + "@metamask/notification-controller>@metamask/utils": { + "@metamask/notification-controller": { + "packages": { + "@metamask/base-controller": true, + "@metamask/notification-controller>@metamask/utils": true, + "@metamask/notification-controller>nanoid": true + } + }, "@metamask/notification-controller>@metamask/utils": { "globals": { "TextDecoder": true, @@ -1981,6 +2112,7 @@ "@metamask/base-controller": true, "@metamask/controller-utils": true, "@metamask/permission-controller>@metamask/utils": true, + "@metamask/permission-controller>@metamask/utils": true, "@metamask/permission-controller>nanoid": true, "@metamask/rpc-errors": true, "@metamask/snaps-controllers>@metamask/json-rpc-engine": true, @@ -2003,6 +2135,21 @@ "semver": true } }, + "@metamask/permission-controller>@metamask/utils": { + "globals": { + "TextDecoder": true, + "TextEncoder": true + }, + "packages": { + "@metamask/utils>@metamask/superstruct": true, + "@metamask/utils>@scure/base": true, + "@metamask/utils>pony-cause": true, + "@noble/hashes": true, + "browserify>buffer": true, + "nock>debug": true, + "semver": true + } + }, "@metamask/permission-controller>nanoid": { "globals": { "crypto.getRandomValues": true @@ -2012,6 +2159,7 @@ "packages": { "@metamask/permission-log-controller>@metamask/base-controller": true, "@metamask/permission-log-controller>@metamask/utils": true + "@metamask/permission-log-controller>@metamask/utils": true } }, "@metamask/permission-log-controller>@metamask/base-controller": { @@ -2037,6 +2185,21 @@ "semver": true } }, + "@metamask/permission-log-controller>@metamask/utils": { + "globals": { + "TextDecoder": true, + "TextEncoder": true + }, + "packages": { + "@metamask/utils>@metamask/superstruct": true, + "@metamask/utils>@scure/base": true, + "@metamask/utils>pony-cause": true, + "@noble/hashes": true, + "browserify>buffer": true, + "nock>debug": true, + "semver": true + } + }, "@metamask/phishing-controller": { "globals": { "TextEncoder": true, @@ -2072,6 +2235,7 @@ "removeEventListener": true }, "packages": { + "@metamask/post-message-stream>@metamask/utils": true, "@metamask/post-message-stream>@metamask/utils": true, "readable-stream": true } @@ -2091,6 +2255,21 @@ "semver": true } }, + "@metamask/post-message-stream>@metamask/utils": { + "globals": { + "TextDecoder": true, + "TextEncoder": true + }, + "packages": { + "@metamask/utils>@metamask/superstruct": true, + "@metamask/utils>@scure/base": true, + "@metamask/utils>pony-cause": true, + "@noble/hashes": true, + "browserify>buffer": true, + "nock>debug": true, + "semver": true + } + }, "@metamask/ppom-validator": { "globals": { "URL": true, @@ -2120,6 +2299,7 @@ "@metamask/controller-utils>@spruceid/siwe-parser": true, "@metamask/ethjs>@metamask/ethjs-unit": true, "@metamask/ppom-validator>@metamask/utils": true, + "@metamask/ppom-validator>@metamask/utils": true, "bn.js": true, "browserify>buffer": true, "eslint>fast-deep-equal": true, @@ -2141,6 +2321,21 @@ "semver": true } }, + "@metamask/ppom-validator>@metamask/utils": { + "globals": { + "TextDecoder": true, + "TextEncoder": true + }, + "packages": { + "@metamask/utils>@metamask/superstruct": true, + "@metamask/utils>@scure/base": true, + "@metamask/utils>pony-cause": true, + "@noble/hashes": true, + "browserify>buffer": true, + "nock>debug": true, + "semver": true + } + }, "@metamask/ppom-validator>crypto-js": { "globals": { "crypto": true, @@ -2243,11 +2438,28 @@ "packages": { "@metamask/base-controller": true, "@metamask/queued-request-controller>@metamask/utils": true, + "@metamask/queued-request-controller>@metamask/utils": true, "@metamask/rpc-errors": true, "@metamask/selected-network-controller": true, "@metamask/snaps-controllers>@metamask/json-rpc-engine": true } }, + "@metamask/queued-request-controller>@metamask/utils": { + "globals": { + "TextDecoder": true, + "TextEncoder": true + }, + "packages": { + "@metamask/utils>@metamask/superstruct": true, + "@metamask/utils>@scure/base": true, + "@metamask/utils>pony-cause": true, + "@noble/hashes": true, + "browserify>buffer": true, + "nock>debug": true, + "semver": true + "@metamask/snaps-controllers>@metamask/json-rpc-engine": true + } + }, "@metamask/queued-request-controller>@metamask/utils": { "globals": { "TextDecoder": true, @@ -2271,8 +2483,11 @@ "@metamask/base-controller": true, "@metamask/rate-limit-controller>@metamask/utils": true, "@metamask/rpc-errors": true + "@metamask/rate-limit-controller>@metamask/utils": true, + "@metamask/rpc-errors": true } }, + "@metamask/rate-limit-controller>@metamask/utils": { "@metamask/rate-limit-controller>@metamask/utils": { "globals": { "TextDecoder": true, @@ -2294,6 +2509,12 @@ "eth-rpc-errors>fast-safe-stringify": true } }, + "@metamask/rpc-errors": { + "packages": { + "@metamask/utils": true, + "eth-rpc-errors>fast-safe-stringify": true + } + }, "@metamask/rpc-methods-flask>nanoid": { "globals": { "crypto.getRandomValues": true @@ -2439,6 +2660,7 @@ "@metamask/smart-transactions-controller>@metamask/transaction-controller>@ethereumjs/util": true, "@metamask/smart-transactions-controller>@metamask/transaction-controller>@metamask/nonce-tracker": true, "@metamask/smart-transactions-controller>@metamask/transaction-controller>@metamask/utils": true, + "@metamask/smart-transactions-controller>@metamask/transaction-controller>@metamask/utils": true, "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry": true, "bn.js": true, "browserify>buffer": true, @@ -2502,6 +2724,21 @@ "semver": true } }, + "@metamask/smart-transactions-controller>@metamask/transaction-controller>@metamask/utils": { + "globals": { + "TextDecoder": true, + "TextEncoder": true + }, + "packages": { + "@metamask/utils>@metamask/superstruct": true, + "@metamask/utils>@scure/base": true, + "@metamask/utils>pony-cause": true, + "@noble/hashes": true, + "browserify>buffer": true, + "nock>debug": true, + "semver": true + } + }, "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry": { "packages": { "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-contract": true, @@ -2588,6 +2825,7 @@ "@metamask/snaps-utils": true, "@metamask/snaps-utils>@metamask/snaps-registry": true, "@metamask/utils": true, + "@metamask/utils": true, "browserify>browserify-zlib": true, "eslint>fast-deep-equal": true, "readable-stream": true @@ -2603,6 +2841,7 @@ "@metamask/rpc-errors": true, "@metamask/safe-event-emitter": true, "@metamask/utils": true + "@metamask/utils": true } }, "@metamask/snaps-controllers>@metamask/json-rpc-middleware-stream": { @@ -2613,6 +2852,7 @@ "packages": { "@metamask/safe-event-emitter": true, "@metamask/utils": true, + "@metamask/utils": true, "readable-stream": true } }, @@ -2627,6 +2867,7 @@ "@metamask/snaps-controllers>@metamask/json-rpc-engine": true, "@metamask/snaps-controllers>nanoid": true, "@metamask/utils": true, + "@metamask/utils": true, "deep-freeze-strict": true, "immer": true } @@ -2715,6 +2956,7 @@ "@metamask/snaps-utils>rfdc": true, "@metamask/snaps-utils>validate-npm-package-name": true, "@metamask/utils": true, + "@metamask/utils": true, "@metamask/utils>@metamask/superstruct": true, "@metamask/utils>@scure/base": true, "@noble/hashes": true, @@ -2733,6 +2975,7 @@ "@metamask/snaps-controllers>@metamask/json-rpc-engine": true, "@metamask/snaps-execution-environments>nanoid": true, "@metamask/utils": true, + "@metamask/utils": true, "deep-freeze-strict": true, "immer": true } @@ -2750,6 +2993,7 @@ "@metamask/snaps-sdk>@metamask/key-tree": true, "@metamask/snaps-utils": true, "@metamask/utils": true, + "@metamask/utils": true, "@metamask/utils>@metamask/superstruct": true, "@noble/hashes": true } @@ -2765,6 +3009,7 @@ "@metamask/snaps-controllers>@metamask/json-rpc-engine": true, "@metamask/snaps-rpc-methods>@metamask/permission-controller>nanoid": true, "@metamask/utils": true, + "@metamask/utils": true, "deep-freeze-strict": true, "immer": true } @@ -2781,6 +3026,7 @@ "packages": { "@metamask/rpc-errors": true, "@metamask/utils": true, + "@metamask/utils": true, "@metamask/utils>@metamask/superstruct": true } }, @@ -2789,6 +3035,7 @@ "@metamask/message-signing-snap>@noble/curves": true, "@metamask/scure-bip39": true, "@metamask/utils": true, + "@metamask/utils": true, "@metamask/utils>@scure/base": true, "@noble/hashes": true } @@ -2821,6 +3068,7 @@ "@metamask/snaps-utils>rfdc": true, "@metamask/snaps-utils>validate-npm-package-name": true, "@metamask/utils": true, + "@metamask/utils": true, "@metamask/utils>@metamask/superstruct": true, "@metamask/utils>@scure/base": true, "@noble/hashes": true, @@ -2839,6 +3087,7 @@ "@metamask/snaps-controllers>@metamask/json-rpc-engine": true, "@metamask/snaps-utils>@metamask/permission-controller>nanoid": true, "@metamask/utils": true, + "@metamask/utils": true, "deep-freeze-strict": true, "immer": true } @@ -2852,6 +3101,7 @@ "packages": { "@metamask/message-signing-snap>@noble/curves": true, "@metamask/utils": true, + "@metamask/utils": true, "@metamask/utils>@metamask/superstruct": true, "@noble/hashes": true } @@ -2970,6 +3220,7 @@ "@metamask/rpc-errors": true, "@metamask/transaction-controller>@metamask/nonce-tracker": true, "@metamask/utils": true, + "@metamask/utils": true, "bn.js": true, "browserify>buffer": true, "eth-method-registry": true, @@ -3008,6 +3259,7 @@ "@metamask/rpc-errors": true, "@metamask/transaction-controller": true, "@metamask/user-operation-controller>@metamask/utils": true, + "@metamask/user-operation-controller>@metamask/utils": true, "bn.js": true, "lodash": true, "superstruct": true, @@ -3030,6 +3282,21 @@ "semver": true } }, + "@metamask/user-operation-controller>@metamask/utils": { + "globals": { + "TextDecoder": true, + "TextEncoder": true + }, + "packages": { + "@metamask/utils>@metamask/superstruct": true, + "@metamask/utils>@scure/base": true, + "@metamask/utils>pony-cause": true, + "@noble/hashes": true, + "browserify>buffer": true, + "nock>debug": true, + "semver": true + } + }, "@metamask/utils": { "globals": { "TextDecoder": true, @@ -3099,6 +3366,62 @@ "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, @@ -3982,6 +4305,11 @@ "koa>is-generator-function>has-tostringtag": true } }, + "eslint>ajv>uri-js": { + "globals": { + "define": true + } + }, "eth-ens-namehash": { "globals": { "name": "write" @@ -5404,4 +5732,4 @@ } } } -} \ No newline at end of file +} diff --git a/lavamoat/browserify/main/policy.json b/lavamoat/browserify/main/policy.json index 8cbb2cfe5181..f9191fbfcb11 100644 --- a/lavamoat/browserify/main/policy.json +++ b/lavamoat/browserify/main/policy.json @@ -766,6 +766,7 @@ }, "@metamask/abi-utils": { "packages": { + "@metamask/utils": true, "@metamask/utils": true, "@metamask/utils>@metamask/superstruct": true } @@ -774,14 +775,23 @@ "packages": { "@ethereumjs/tx>@ethereumjs/util": true, "@ethereumjs/tx>ethereum-cryptography": true, - "@metamask/base-controller": true, + "@metamask/accounts-controller>@metamask/base-controller": true, "@metamask/eth-snap-keyring": true, "@metamask/keyring-api": true, "@metamask/keyring-controller": true, "@metamask/utils": true, + "@metamask/utils": true, "uuid": true } }, + "@metamask/accounts-controller>@metamask/base-controller": { + "globals": { + "setTimeout": true + }, + "packages": { + "immer": true + } + }, "@metamask/address-book-controller": { "packages": { "@metamask/base-controller": true, @@ -846,6 +856,7 @@ "@metamask/name-controller>async-mutex": true, "@metamask/rpc-errors": true, "@metamask/utils": true, + "@metamask/utils": true, "bn.js": true, "lodash": true, "single-call-balance-checker-abi": true, @@ -905,6 +916,7 @@ "crypto.subtle.importKey": true }, "packages": { + "@metamask/browser-passworder>@metamask/utils": true, "@metamask/browser-passworder>@metamask/utils": true, "browserify>buffer": true } @@ -924,6 +936,21 @@ "semver": true } }, + "@metamask/browser-passworder>@metamask/utils": { + "globals": { + "TextDecoder": true, + "TextEncoder": true + }, + "packages": { + "@metamask/utils>@metamask/superstruct": true, + "@metamask/utils>@scure/base": true, + "@metamask/utils>pony-cause": true, + "@noble/hashes": true, + "browserify>buffer": true, + "nock>debug": true, + "semver": true + } + }, "@metamask/controller-utils": { "globals": { "URL": true, @@ -936,6 +963,7 @@ "@metamask/controller-utils>@spruceid/siwe-parser": true, "@metamask/ethjs>@metamask/ethjs-unit": true, "@metamask/utils": true, + "@metamask/utils": true, "bn.js": true, "browserify>buffer": true, "eslint>fast-deep-equal": true, @@ -978,6 +1006,7 @@ "@metamask/base-controller": true, "@metamask/controller-utils": true, "@metamask/utils": true, + "@metamask/utils": true, "punycode": true } }, @@ -1001,11 +1030,28 @@ }, "@metamask/eth-json-rpc-filters>@metamask/json-rpc-engine": { "packages": { + "@metamask/eth-json-rpc-filters>@metamask/json-rpc-engine>@metamask/utils": true, "@metamask/eth-json-rpc-filters>@metamask/json-rpc-engine>@metamask/utils": true, "@metamask/rpc-errors": true, "@metamask/safe-event-emitter": true } }, + "@metamask/eth-json-rpc-filters>@metamask/json-rpc-engine>@metamask/utils": { + "globals": { + "TextDecoder": true, + "TextEncoder": true + }, + "packages": { + "@metamask/utils>@metamask/superstruct": true, + "@metamask/utils>@scure/base": true, + "@metamask/utils>pony-cause": true, + "@noble/hashes": true, + "browserify>buffer": true, + "nock>debug": true, + "semver": true + "@metamask/safe-event-emitter": true + } + }, "@metamask/eth-json-rpc-filters>@metamask/json-rpc-engine>@metamask/utils": { "globals": { "TextDecoder": true, @@ -1042,6 +1088,8 @@ "@metamask/rpc-errors": true, "@metamask/snaps-controllers>@metamask/json-rpc-engine": true, "@metamask/utils": true + "@metamask/snaps-controllers>@metamask/json-rpc-engine": true, + "@metamask/utils": true } }, "@metamask/eth-ledger-bridge-keyring": { @@ -1076,6 +1124,7 @@ "@metamask/abi-utils": true, "@metamask/eth-sig-util>tweetnacl": true, "@metamask/utils": true, + "@metamask/utils": true, "@metamask/utils>@scure/base": true, "browserify>buffer": true } @@ -1099,6 +1148,7 @@ "@ethereumjs/tx": true, "@metamask/eth-sig-util": true, "@metamask/eth-snap-keyring>@metamask/utils": true, + "@metamask/eth-snap-keyring>@metamask/utils": true, "@metamask/eth-snap-keyring>uuid": true, "@metamask/keyring-api": true, "superstruct": true, @@ -1120,6 +1170,21 @@ "semver": true } }, + "@metamask/eth-snap-keyring>@metamask/utils": { + "globals": { + "TextDecoder": true, + "TextEncoder": true + }, + "packages": { + "@metamask/utils>@metamask/superstruct": true, + "@metamask/utils>@scure/base": true, + "@metamask/utils>pony-cause": true, + "@noble/hashes": true, + "browserify>buffer": true, + "nock>debug": true, + "semver": true + } + }, "@metamask/eth-snap-keyring>uuid": { "globals": { "crypto": true @@ -1149,6 +1214,7 @@ "packages": { "@metamask/eth-query>json-rpc-random-id": true, "@metamask/eth-token-tracker>@metamask/eth-block-tracker>@metamask/utils": true, + "@metamask/eth-token-tracker>@metamask/eth-block-tracker>@metamask/utils": true, "@metamask/safe-event-emitter": true, "pify": true } @@ -1168,6 +1234,21 @@ "semver": true } }, + "@metamask/eth-token-tracker>@metamask/eth-block-tracker>@metamask/utils": { + "globals": { + "TextDecoder": true, + "TextEncoder": true + }, + "packages": { + "@metamask/utils>@metamask/superstruct": true, + "@metamask/utils>@scure/base": true, + "@metamask/utils>pony-cause": true, + "@noble/hashes": true, + "browserify>buffer": true, + "nock>debug": true, + "semver": true + } + }, "@metamask/eth-token-tracker>deep-equal": { "packages": { "@lavamoat/lavapack>json-stable-stringify>isarray": true, @@ -1471,6 +1552,7 @@ "@metamask/keyring-api>bech32": true, "@metamask/keyring-api>uuid": true, "@metamask/utils": true, + "@metamask/utils": true, "@metamask/utils>@metamask/superstruct": true } }, @@ -1490,6 +1572,8 @@ "@metamask/keyring-controller>ethereumjs-wallet": true, "@metamask/name-controller>async-mutex": true, "@metamask/utils": true + "@metamask/name-controller>async-mutex": true, + "@metamask/utils": true } }, "@metamask/keyring-controller>@metamask/eth-hd-keyring": { @@ -1501,6 +1585,7 @@ "@ethereumjs/tx>ethereum-cryptography": true, "@metamask/eth-sig-util": true, "@metamask/keyring-controller>@metamask/eth-hd-keyring>@metamask/utils": true, + "@metamask/keyring-controller>@metamask/eth-hd-keyring>@metamask/utils": true, "@metamask/scure-bip39": true, "browserify>buffer": true } @@ -1520,16 +1605,33 @@ "semver": true } }, + "@metamask/keyring-controller>@metamask/eth-hd-keyring>@metamask/utils": { + "globals": { + "TextDecoder": true, + "TextEncoder": true + }, + "packages": { + "@metamask/utils>@metamask/superstruct": true, + "@metamask/utils>@scure/base": true, + "@metamask/utils>pony-cause": true, + "@noble/hashes": true, + "browserify>buffer": true, + "nock>debug": true, + "semver": true + } + }, "@metamask/keyring-controller>@metamask/eth-simple-keyring": { "packages": { "@ethereumjs/tx>@ethereumjs/util": true, "@ethereumjs/tx>ethereum-cryptography": true, "@metamask/eth-sig-util": true, "@metamask/keyring-controller>@metamask/eth-simple-keyring>@metamask/utils": true, + "@metamask/keyring-controller>@metamask/eth-simple-keyring>@metamask/utils": true, "browserify>buffer": true, "crypto-browserify>randombytes": true } }, + "@metamask/keyring-controller>@metamask/eth-simple-keyring>@metamask/utils": { "@metamask/keyring-controller>@metamask/eth-simple-keyring>@metamask/utils": { "globals": { "TextDecoder": true, @@ -1607,27 +1709,12 @@ "packages": { "@metamask/controller-utils": true, "@metamask/eth-sig-util": true, - "@metamask/message-manager>@metamask/base-controller": true, - "@metamask/message-manager>jsonschema": true, "@metamask/utils": true, "browserify>buffer": true, "uuid": true, "webpack>events": true } }, - "@metamask/message-manager>@metamask/base-controller": { - "globals": { - "setTimeout": true - }, - "packages": { - "immer": true - } - }, - "@metamask/message-manager>jsonschema": { - "packages": { - "browserify>url": true - } - }, "@metamask/message-signing-snap>@noble/ciphers": { "globals": { "TextDecoder": true, @@ -1654,6 +1741,23 @@ "@metamask/name-controller>async-mutex": true } }, + "@metamask/name-controller>@metamask/utils": { + "globals": { + "TextDecoder": true, + "TextEncoder": true + }, + "packages": { + "@metamask/utils>@metamask/superstruct": true, + "@metamask/utils>@scure/base": true, + "@metamask/utils>pony-cause": true, + "@noble/hashes": true, + "browserify>buffer": true, + "nock>debug": true, + "semver": true + "@metamask/name-controller>@metamask/utils": true, + "@metamask/name-controller>async-mutex": true + } + }, "@metamask/name-controller>@metamask/utils": { "globals": { "TextDecoder": true, @@ -1697,6 +1801,7 @@ "@metamask/rpc-errors": true, "@metamask/snaps-controllers>@metamask/json-rpc-engine": true, "@metamask/utils": true, + "@metamask/utils": true, "browserify>assert": true, "uuid": true } @@ -1709,6 +1814,7 @@ "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/eth-json-rpc-provider": true, "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/json-rpc-engine": true, "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/utils": true, + "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/utils": true, "@metamask/rpc-errors": true, "node-fetch": true } @@ -1721,11 +1827,28 @@ }, "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/json-rpc-engine": { "packages": { + "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/utils": true, "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/utils": true, "@metamask/rpc-errors": true, "@metamask/safe-event-emitter": true } }, + "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/utils": { + "globals": { + "TextDecoder": true, + "TextEncoder": true + }, + "packages": { + "@metamask/utils>@metamask/superstruct": true, + "@metamask/utils>@scure/base": true, + "@metamask/utils>pony-cause": true, + "@noble/hashes": true, + "browserify>buffer": true, + "nock>debug": true, + "semver": true + "@metamask/safe-event-emitter": true + } + }, "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/utils": { "globals": { "TextDecoder": true, @@ -1794,6 +1917,14 @@ "@metamask/notification-controller>nanoid": true } }, + "@metamask/notification-controller>@metamask/utils": { + "@metamask/notification-controller": { + "packages": { + "@metamask/base-controller": true, + "@metamask/notification-controller>@metamask/utils": true, + "@metamask/notification-controller>nanoid": true + } + }, "@metamask/notification-controller>@metamask/utils": { "globals": { "TextDecoder": true, @@ -1981,6 +2112,7 @@ "@metamask/base-controller": true, "@metamask/controller-utils": true, "@metamask/permission-controller>@metamask/utils": true, + "@metamask/permission-controller>@metamask/utils": true, "@metamask/permission-controller>nanoid": true, "@metamask/rpc-errors": true, "@metamask/snaps-controllers>@metamask/json-rpc-engine": true, @@ -2003,6 +2135,21 @@ "semver": true } }, + "@metamask/permission-controller>@metamask/utils": { + "globals": { + "TextDecoder": true, + "TextEncoder": true + }, + "packages": { + "@metamask/utils>@metamask/superstruct": true, + "@metamask/utils>@scure/base": true, + "@metamask/utils>pony-cause": true, + "@noble/hashes": true, + "browserify>buffer": true, + "nock>debug": true, + "semver": true + } + }, "@metamask/permission-controller>nanoid": { "globals": { "crypto.getRandomValues": true @@ -2012,6 +2159,7 @@ "packages": { "@metamask/permission-log-controller>@metamask/base-controller": true, "@metamask/permission-log-controller>@metamask/utils": true + "@metamask/permission-log-controller>@metamask/utils": true } }, "@metamask/permission-log-controller>@metamask/base-controller": { @@ -2037,6 +2185,21 @@ "semver": true } }, + "@metamask/permission-log-controller>@metamask/utils": { + "globals": { + "TextDecoder": true, + "TextEncoder": true + }, + "packages": { + "@metamask/utils>@metamask/superstruct": true, + "@metamask/utils>@scure/base": true, + "@metamask/utils>pony-cause": true, + "@noble/hashes": true, + "browserify>buffer": true, + "nock>debug": true, + "semver": true + } + }, "@metamask/phishing-controller": { "globals": { "TextEncoder": true, @@ -2072,6 +2235,7 @@ "removeEventListener": true }, "packages": { + "@metamask/post-message-stream>@metamask/utils": true, "@metamask/post-message-stream>@metamask/utils": true, "readable-stream": true } @@ -2091,6 +2255,21 @@ "semver": true } }, + "@metamask/post-message-stream>@metamask/utils": { + "globals": { + "TextDecoder": true, + "TextEncoder": true + }, + "packages": { + "@metamask/utils>@metamask/superstruct": true, + "@metamask/utils>@scure/base": true, + "@metamask/utils>pony-cause": true, + "@noble/hashes": true, + "browserify>buffer": true, + "nock>debug": true, + "semver": true + } + }, "@metamask/ppom-validator": { "globals": { "URL": true, @@ -2120,6 +2299,7 @@ "@metamask/controller-utils>@spruceid/siwe-parser": true, "@metamask/ethjs>@metamask/ethjs-unit": true, "@metamask/ppom-validator>@metamask/utils": true, + "@metamask/ppom-validator>@metamask/utils": true, "bn.js": true, "browserify>buffer": true, "eslint>fast-deep-equal": true, @@ -2141,6 +2321,21 @@ "semver": true } }, + "@metamask/ppom-validator>@metamask/utils": { + "globals": { + "TextDecoder": true, + "TextEncoder": true + }, + "packages": { + "@metamask/utils>@metamask/superstruct": true, + "@metamask/utils>@scure/base": true, + "@metamask/utils>pony-cause": true, + "@noble/hashes": true, + "browserify>buffer": true, + "nock>debug": true, + "semver": true + } + }, "@metamask/ppom-validator>crypto-js": { "globals": { "crypto": true, @@ -2243,11 +2438,28 @@ "packages": { "@metamask/base-controller": true, "@metamask/queued-request-controller>@metamask/utils": true, + "@metamask/queued-request-controller>@metamask/utils": true, "@metamask/rpc-errors": true, "@metamask/selected-network-controller": true, "@metamask/snaps-controllers>@metamask/json-rpc-engine": true } }, + "@metamask/queued-request-controller>@metamask/utils": { + "globals": { + "TextDecoder": true, + "TextEncoder": true + }, + "packages": { + "@metamask/utils>@metamask/superstruct": true, + "@metamask/utils>@scure/base": true, + "@metamask/utils>pony-cause": true, + "@noble/hashes": true, + "browserify>buffer": true, + "nock>debug": true, + "semver": true + "@metamask/snaps-controllers>@metamask/json-rpc-engine": true + } + }, "@metamask/queued-request-controller>@metamask/utils": { "globals": { "TextDecoder": true, @@ -2271,8 +2483,11 @@ "@metamask/base-controller": true, "@metamask/rate-limit-controller>@metamask/utils": true, "@metamask/rpc-errors": true + "@metamask/rate-limit-controller>@metamask/utils": true, + "@metamask/rpc-errors": true } }, + "@metamask/rate-limit-controller>@metamask/utils": { "@metamask/rate-limit-controller>@metamask/utils": { "globals": { "TextDecoder": true, @@ -2294,6 +2509,12 @@ "eth-rpc-errors>fast-safe-stringify": true } }, + "@metamask/rpc-errors": { + "packages": { + "@metamask/utils": true, + "eth-rpc-errors>fast-safe-stringify": true + } + }, "@metamask/rpc-methods-flask>nanoid": { "globals": { "crypto.getRandomValues": true @@ -2439,6 +2660,7 @@ "@metamask/smart-transactions-controller>@metamask/transaction-controller>@ethereumjs/util": true, "@metamask/smart-transactions-controller>@metamask/transaction-controller>@metamask/nonce-tracker": true, "@metamask/smart-transactions-controller>@metamask/transaction-controller>@metamask/utils": true, + "@metamask/smart-transactions-controller>@metamask/transaction-controller>@metamask/utils": true, "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry": true, "bn.js": true, "browserify>buffer": true, @@ -2502,6 +2724,21 @@ "semver": true } }, + "@metamask/smart-transactions-controller>@metamask/transaction-controller>@metamask/utils": { + "globals": { + "TextDecoder": true, + "TextEncoder": true + }, + "packages": { + "@metamask/utils>@metamask/superstruct": true, + "@metamask/utils>@scure/base": true, + "@metamask/utils>pony-cause": true, + "@noble/hashes": true, + "browserify>buffer": true, + "nock>debug": true, + "semver": true + } + }, "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry": { "packages": { "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-contract": true, @@ -2588,6 +2825,7 @@ "@metamask/snaps-utils": true, "@metamask/snaps-utils>@metamask/snaps-registry": true, "@metamask/utils": true, + "@metamask/utils": true, "browserify>browserify-zlib": true, "eslint>fast-deep-equal": true, "readable-stream": true @@ -2603,6 +2841,7 @@ "@metamask/rpc-errors": true, "@metamask/safe-event-emitter": true, "@metamask/utils": true + "@metamask/utils": true } }, "@metamask/snaps-controllers>@metamask/json-rpc-middleware-stream": { @@ -2613,6 +2852,7 @@ "packages": { "@metamask/safe-event-emitter": true, "@metamask/utils": true, + "@metamask/utils": true, "readable-stream": true } }, @@ -2627,6 +2867,7 @@ "@metamask/snaps-controllers>@metamask/json-rpc-engine": true, "@metamask/snaps-controllers>nanoid": true, "@metamask/utils": true, + "@metamask/utils": true, "deep-freeze-strict": true, "immer": true } @@ -2715,6 +2956,7 @@ "@metamask/snaps-utils>rfdc": true, "@metamask/snaps-utils>validate-npm-package-name": true, "@metamask/utils": true, + "@metamask/utils": true, "@metamask/utils>@metamask/superstruct": true, "@metamask/utils>@scure/base": true, "@noble/hashes": true, @@ -2733,6 +2975,7 @@ "@metamask/snaps-controllers>@metamask/json-rpc-engine": true, "@metamask/snaps-execution-environments>nanoid": true, "@metamask/utils": true, + "@metamask/utils": true, "deep-freeze-strict": true, "immer": true } @@ -2750,6 +2993,7 @@ "@metamask/snaps-sdk>@metamask/key-tree": true, "@metamask/snaps-utils": true, "@metamask/utils": true, + "@metamask/utils": true, "@metamask/utils>@metamask/superstruct": true, "@noble/hashes": true } @@ -2765,6 +3009,7 @@ "@metamask/snaps-controllers>@metamask/json-rpc-engine": true, "@metamask/snaps-rpc-methods>@metamask/permission-controller>nanoid": true, "@metamask/utils": true, + "@metamask/utils": true, "deep-freeze-strict": true, "immer": true } @@ -2781,6 +3026,7 @@ "packages": { "@metamask/rpc-errors": true, "@metamask/utils": true, + "@metamask/utils": true, "@metamask/utils>@metamask/superstruct": true } }, @@ -2789,6 +3035,7 @@ "@metamask/message-signing-snap>@noble/curves": true, "@metamask/scure-bip39": true, "@metamask/utils": true, + "@metamask/utils": true, "@metamask/utils>@scure/base": true, "@noble/hashes": true } @@ -2821,6 +3068,7 @@ "@metamask/snaps-utils>rfdc": true, "@metamask/snaps-utils>validate-npm-package-name": true, "@metamask/utils": true, + "@metamask/utils": true, "@metamask/utils>@metamask/superstruct": true, "@metamask/utils>@scure/base": true, "@noble/hashes": true, @@ -2839,6 +3087,7 @@ "@metamask/snaps-controllers>@metamask/json-rpc-engine": true, "@metamask/snaps-utils>@metamask/permission-controller>nanoid": true, "@metamask/utils": true, + "@metamask/utils": true, "deep-freeze-strict": true, "immer": true } @@ -2852,6 +3101,7 @@ "packages": { "@metamask/message-signing-snap>@noble/curves": true, "@metamask/utils": true, + "@metamask/utils": true, "@metamask/utils>@metamask/superstruct": true, "@noble/hashes": true } @@ -2970,6 +3220,7 @@ "@metamask/rpc-errors": true, "@metamask/transaction-controller>@metamask/nonce-tracker": true, "@metamask/utils": true, + "@metamask/utils": true, "bn.js": true, "browserify>buffer": true, "eth-method-registry": true, @@ -3008,6 +3259,7 @@ "@metamask/rpc-errors": true, "@metamask/transaction-controller": true, "@metamask/user-operation-controller>@metamask/utils": true, + "@metamask/user-operation-controller>@metamask/utils": true, "bn.js": true, "lodash": true, "superstruct": true, @@ -3030,6 +3282,21 @@ "semver": true } }, + "@metamask/user-operation-controller>@metamask/utils": { + "globals": { + "TextDecoder": true, + "TextEncoder": true + }, + "packages": { + "@metamask/utils>@metamask/superstruct": true, + "@metamask/utils>@scure/base": true, + "@metamask/utils>pony-cause": true, + "@noble/hashes": true, + "browserify>buffer": true, + "nock>debug": true, + "semver": true + } + }, "@metamask/utils": { "globals": { "TextDecoder": true, @@ -3099,6 +3366,62 @@ "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, @@ -3982,6 +4305,11 @@ "koa>is-generator-function>has-tostringtag": true } }, + "eslint>ajv>uri-js": { + "globals": { + "define": true + } + }, "eth-ens-namehash": { "globals": { "name": "write" @@ -5404,4 +5732,4 @@ } } } -} \ No newline at end of file +} diff --git a/lavamoat/browserify/mmi/policy.json b/lavamoat/browserify/mmi/policy.json index 1cbf803bc079..dead03aefcb5 100644 --- a/lavamoat/browserify/mmi/policy.json +++ b/lavamoat/browserify/mmi/policy.json @@ -858,6 +858,7 @@ }, "@metamask/abi-utils": { "packages": { + "@metamask/utils": true, "@metamask/utils": true, "@metamask/utils>@metamask/superstruct": true } @@ -866,14 +867,23 @@ "packages": { "@ethereumjs/tx>@ethereumjs/util": true, "@ethereumjs/tx>ethereum-cryptography": true, - "@metamask/base-controller": true, + "@metamask/accounts-controller>@metamask/base-controller": true, "@metamask/eth-snap-keyring": true, "@metamask/keyring-api": true, "@metamask/keyring-controller": true, "@metamask/utils": true, + "@metamask/utils": true, "uuid": true } }, + "@metamask/accounts-controller>@metamask/base-controller": { + "globals": { + "setTimeout": true + }, + "packages": { + "immer": true + } + }, "@metamask/address-book-controller": { "packages": { "@metamask/base-controller": true, @@ -938,6 +948,7 @@ "@metamask/name-controller>async-mutex": true, "@metamask/rpc-errors": true, "@metamask/utils": true, + "@metamask/utils": true, "bn.js": true, "lodash": true, "single-call-balance-checker-abi": true, @@ -997,6 +1008,7 @@ "crypto.subtle.importKey": true }, "packages": { + "@metamask/browser-passworder>@metamask/utils": true, "@metamask/browser-passworder>@metamask/utils": true, "browserify>buffer": true } @@ -1016,6 +1028,21 @@ "semver": true } }, + "@metamask/browser-passworder>@metamask/utils": { + "globals": { + "TextDecoder": true, + "TextEncoder": true + }, + "packages": { + "@metamask/utils>@metamask/superstruct": true, + "@metamask/utils>@scure/base": true, + "@metamask/utils>pony-cause": true, + "@noble/hashes": true, + "browserify>buffer": true, + "nock>debug": true, + "semver": true + } + }, "@metamask/controller-utils": { "globals": { "URL": true, @@ -1028,6 +1055,7 @@ "@metamask/controller-utils>@spruceid/siwe-parser": true, "@metamask/ethjs>@metamask/ethjs-unit": true, "@metamask/utils": true, + "@metamask/utils": true, "bn.js": true, "browserify>buffer": true, "eslint>fast-deep-equal": true, @@ -1070,6 +1098,7 @@ "@metamask/base-controller": true, "@metamask/controller-utils": true, "@metamask/utils": true, + "@metamask/utils": true, "punycode": true } }, @@ -1093,11 +1122,28 @@ }, "@metamask/eth-json-rpc-filters>@metamask/json-rpc-engine": { "packages": { + "@metamask/eth-json-rpc-filters>@metamask/json-rpc-engine>@metamask/utils": true, "@metamask/eth-json-rpc-filters>@metamask/json-rpc-engine>@metamask/utils": true, "@metamask/rpc-errors": true, "@metamask/safe-event-emitter": true } }, + "@metamask/eth-json-rpc-filters>@metamask/json-rpc-engine>@metamask/utils": { + "globals": { + "TextDecoder": true, + "TextEncoder": true + }, + "packages": { + "@metamask/utils>@metamask/superstruct": true, + "@metamask/utils>@scure/base": true, + "@metamask/utils>pony-cause": true, + "@noble/hashes": true, + "browserify>buffer": true, + "nock>debug": true, + "semver": true + "@metamask/safe-event-emitter": true + } + }, "@metamask/eth-json-rpc-filters>@metamask/json-rpc-engine>@metamask/utils": { "globals": { "TextDecoder": true, @@ -1134,6 +1180,8 @@ "@metamask/rpc-errors": true, "@metamask/snaps-controllers>@metamask/json-rpc-engine": true, "@metamask/utils": true + "@metamask/snaps-controllers>@metamask/json-rpc-engine": true, + "@metamask/utils": true } }, "@metamask/eth-ledger-bridge-keyring": { @@ -1168,6 +1216,7 @@ "@metamask/abi-utils": true, "@metamask/eth-sig-util>tweetnacl": true, "@metamask/utils": true, + "@metamask/utils": true, "@metamask/utils>@scure/base": true, "browserify>buffer": true } @@ -1191,6 +1240,7 @@ "@ethereumjs/tx": true, "@metamask/eth-sig-util": true, "@metamask/eth-snap-keyring>@metamask/utils": true, + "@metamask/eth-snap-keyring>@metamask/utils": true, "@metamask/eth-snap-keyring>uuid": true, "@metamask/keyring-api": true, "superstruct": true, @@ -1212,6 +1262,21 @@ "semver": true } }, + "@metamask/eth-snap-keyring>@metamask/utils": { + "globals": { + "TextDecoder": true, + "TextEncoder": true + }, + "packages": { + "@metamask/utils>@metamask/superstruct": true, + "@metamask/utils>@scure/base": true, + "@metamask/utils>pony-cause": true, + "@noble/hashes": true, + "browserify>buffer": true, + "nock>debug": true, + "semver": true + } + }, "@metamask/eth-snap-keyring>uuid": { "globals": { "crypto": true @@ -1241,6 +1306,7 @@ "packages": { "@metamask/eth-query>json-rpc-random-id": true, "@metamask/eth-token-tracker>@metamask/eth-block-tracker>@metamask/utils": true, + "@metamask/eth-token-tracker>@metamask/eth-block-tracker>@metamask/utils": true, "@metamask/safe-event-emitter": true, "pify": true } @@ -1260,6 +1326,21 @@ "semver": true } }, + "@metamask/eth-token-tracker>@metamask/eth-block-tracker>@metamask/utils": { + "globals": { + "TextDecoder": true, + "TextEncoder": true + }, + "packages": { + "@metamask/utils>@metamask/superstruct": true, + "@metamask/utils>@scure/base": true, + "@metamask/utils>pony-cause": true, + "@noble/hashes": true, + "browserify>buffer": true, + "nock>debug": true, + "semver": true + } + }, "@metamask/eth-token-tracker>deep-equal": { "packages": { "@lavamoat/lavapack>json-stable-stringify>isarray": true, @@ -1563,6 +1644,7 @@ "@metamask/keyring-api>bech32": true, "@metamask/keyring-api>uuid": true, "@metamask/utils": true, + "@metamask/utils": true, "@metamask/utils>@metamask/superstruct": true } }, @@ -1582,6 +1664,8 @@ "@metamask/keyring-controller>ethereumjs-wallet": true, "@metamask/name-controller>async-mutex": true, "@metamask/utils": true + "@metamask/name-controller>async-mutex": true, + "@metamask/utils": true } }, "@metamask/keyring-controller>@metamask/eth-hd-keyring": { @@ -1593,6 +1677,7 @@ "@ethereumjs/tx>ethereum-cryptography": true, "@metamask/eth-sig-util": true, "@metamask/keyring-controller>@metamask/eth-hd-keyring>@metamask/utils": true, + "@metamask/keyring-controller>@metamask/eth-hd-keyring>@metamask/utils": true, "@metamask/scure-bip39": true, "browserify>buffer": true } @@ -1612,16 +1697,33 @@ "semver": true } }, + "@metamask/keyring-controller>@metamask/eth-hd-keyring>@metamask/utils": { + "globals": { + "TextDecoder": true, + "TextEncoder": true + }, + "packages": { + "@metamask/utils>@metamask/superstruct": true, + "@metamask/utils>@scure/base": true, + "@metamask/utils>pony-cause": true, + "@noble/hashes": true, + "browserify>buffer": true, + "nock>debug": true, + "semver": true + } + }, "@metamask/keyring-controller>@metamask/eth-simple-keyring": { "packages": { "@ethereumjs/tx>@ethereumjs/util": true, "@ethereumjs/tx>ethereum-cryptography": true, "@metamask/eth-sig-util": true, "@metamask/keyring-controller>@metamask/eth-simple-keyring>@metamask/utils": true, + "@metamask/keyring-controller>@metamask/eth-simple-keyring>@metamask/utils": true, "browserify>buffer": true, "crypto-browserify>randombytes": true } }, + "@metamask/keyring-controller>@metamask/eth-simple-keyring>@metamask/utils": { "@metamask/keyring-controller>@metamask/eth-simple-keyring>@metamask/utils": { "globals": { "TextDecoder": true, @@ -1699,27 +1801,12 @@ "packages": { "@metamask/controller-utils": true, "@metamask/eth-sig-util": true, - "@metamask/message-manager>@metamask/base-controller": true, - "@metamask/message-manager>jsonschema": true, "@metamask/utils": true, "browserify>buffer": true, "uuid": true, "webpack>events": true } }, - "@metamask/message-manager>@metamask/base-controller": { - "globals": { - "setTimeout": true - }, - "packages": { - "immer": true - } - }, - "@metamask/message-manager>jsonschema": { - "packages": { - "browserify>url": true - } - }, "@metamask/message-signing-snap>@noble/ciphers": { "globals": { "TextDecoder": true, @@ -1746,6 +1833,23 @@ "@metamask/name-controller>async-mutex": true } }, + "@metamask/name-controller>@metamask/utils": { + "globals": { + "TextDecoder": true, + "TextEncoder": true + }, + "packages": { + "@metamask/utils>@metamask/superstruct": true, + "@metamask/utils>@scure/base": true, + "@metamask/utils>pony-cause": true, + "@noble/hashes": true, + "browserify>buffer": true, + "nock>debug": true, + "semver": true + "@metamask/name-controller>@metamask/utils": true, + "@metamask/name-controller>async-mutex": true + } + }, "@metamask/name-controller>@metamask/utils": { "globals": { "TextDecoder": true, @@ -1789,6 +1893,7 @@ "@metamask/rpc-errors": true, "@metamask/snaps-controllers>@metamask/json-rpc-engine": true, "@metamask/utils": true, + "@metamask/utils": true, "browserify>assert": true, "uuid": true } @@ -1801,6 +1906,7 @@ "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/eth-json-rpc-provider": true, "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/json-rpc-engine": true, "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/utils": true, + "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/utils": true, "@metamask/rpc-errors": true, "node-fetch": true } @@ -1813,11 +1919,28 @@ }, "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/json-rpc-engine": { "packages": { + "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/utils": true, "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/utils": true, "@metamask/rpc-errors": true, "@metamask/safe-event-emitter": true } }, + "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/utils": { + "globals": { + "TextDecoder": true, + "TextEncoder": true + }, + "packages": { + "@metamask/utils>@metamask/superstruct": true, + "@metamask/utils>@scure/base": true, + "@metamask/utils>pony-cause": true, + "@noble/hashes": true, + "browserify>buffer": true, + "nock>debug": true, + "semver": true + "@metamask/safe-event-emitter": true + } + }, "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/utils": { "globals": { "TextDecoder": true, @@ -1886,6 +2009,14 @@ "@metamask/notification-controller>nanoid": true } }, + "@metamask/notification-controller>@metamask/utils": { + "@metamask/notification-controller": { + "packages": { + "@metamask/base-controller": true, + "@metamask/notification-controller>@metamask/utils": true, + "@metamask/notification-controller>nanoid": true + } + }, "@metamask/notification-controller>@metamask/utils": { "globals": { "TextDecoder": true, @@ -2073,6 +2204,7 @@ "@metamask/base-controller": true, "@metamask/controller-utils": true, "@metamask/permission-controller>@metamask/utils": true, + "@metamask/permission-controller>@metamask/utils": true, "@metamask/permission-controller>nanoid": true, "@metamask/rpc-errors": true, "@metamask/snaps-controllers>@metamask/json-rpc-engine": true, @@ -2095,6 +2227,21 @@ "semver": true } }, + "@metamask/permission-controller>@metamask/utils": { + "globals": { + "TextDecoder": true, + "TextEncoder": true + }, + "packages": { + "@metamask/utils>@metamask/superstruct": true, + "@metamask/utils>@scure/base": true, + "@metamask/utils>pony-cause": true, + "@noble/hashes": true, + "browserify>buffer": true, + "nock>debug": true, + "semver": true + } + }, "@metamask/permission-controller>nanoid": { "globals": { "crypto.getRandomValues": true @@ -2104,6 +2251,7 @@ "packages": { "@metamask/permission-log-controller>@metamask/base-controller": true, "@metamask/permission-log-controller>@metamask/utils": true + "@metamask/permission-log-controller>@metamask/utils": true } }, "@metamask/permission-log-controller>@metamask/base-controller": { @@ -2129,6 +2277,21 @@ "semver": true } }, + "@metamask/permission-log-controller>@metamask/utils": { + "globals": { + "TextDecoder": true, + "TextEncoder": true + }, + "packages": { + "@metamask/utils>@metamask/superstruct": true, + "@metamask/utils>@scure/base": true, + "@metamask/utils>pony-cause": true, + "@noble/hashes": true, + "browserify>buffer": true, + "nock>debug": true, + "semver": true + } + }, "@metamask/phishing-controller": { "globals": { "TextEncoder": true, @@ -2164,6 +2327,7 @@ "removeEventListener": true }, "packages": { + "@metamask/post-message-stream>@metamask/utils": true, "@metamask/post-message-stream>@metamask/utils": true, "readable-stream": true } @@ -2183,6 +2347,21 @@ "semver": true } }, + "@metamask/post-message-stream>@metamask/utils": { + "globals": { + "TextDecoder": true, + "TextEncoder": true + }, + "packages": { + "@metamask/utils>@metamask/superstruct": true, + "@metamask/utils>@scure/base": true, + "@metamask/utils>pony-cause": true, + "@noble/hashes": true, + "browserify>buffer": true, + "nock>debug": true, + "semver": true + } + }, "@metamask/ppom-validator": { "globals": { "URL": true, @@ -2212,6 +2391,7 @@ "@metamask/controller-utils>@spruceid/siwe-parser": true, "@metamask/ethjs>@metamask/ethjs-unit": true, "@metamask/ppom-validator>@metamask/utils": true, + "@metamask/ppom-validator>@metamask/utils": true, "bn.js": true, "browserify>buffer": true, "eslint>fast-deep-equal": true, @@ -2233,6 +2413,21 @@ "semver": true } }, + "@metamask/ppom-validator>@metamask/utils": { + "globals": { + "TextDecoder": true, + "TextEncoder": true + }, + "packages": { + "@metamask/utils>@metamask/superstruct": true, + "@metamask/utils>@scure/base": true, + "@metamask/utils>pony-cause": true, + "@noble/hashes": true, + "browserify>buffer": true, + "nock>debug": true, + "semver": true + } + }, "@metamask/ppom-validator>crypto-js": { "globals": { "crypto": true, @@ -2335,11 +2530,28 @@ "packages": { "@metamask/base-controller": true, "@metamask/queued-request-controller>@metamask/utils": true, + "@metamask/queued-request-controller>@metamask/utils": true, "@metamask/rpc-errors": true, "@metamask/selected-network-controller": true, "@metamask/snaps-controllers>@metamask/json-rpc-engine": true } }, + "@metamask/queued-request-controller>@metamask/utils": { + "globals": { + "TextDecoder": true, + "TextEncoder": true + }, + "packages": { + "@metamask/utils>@metamask/superstruct": true, + "@metamask/utils>@scure/base": true, + "@metamask/utils>pony-cause": true, + "@noble/hashes": true, + "browserify>buffer": true, + "nock>debug": true, + "semver": true + "@metamask/snaps-controllers>@metamask/json-rpc-engine": true + } + }, "@metamask/queued-request-controller>@metamask/utils": { "globals": { "TextDecoder": true, @@ -2363,8 +2575,11 @@ "@metamask/base-controller": true, "@metamask/rate-limit-controller>@metamask/utils": true, "@metamask/rpc-errors": true + "@metamask/rate-limit-controller>@metamask/utils": true, + "@metamask/rpc-errors": true } }, + "@metamask/rate-limit-controller>@metamask/utils": { "@metamask/rate-limit-controller>@metamask/utils": { "globals": { "TextDecoder": true, @@ -2386,6 +2601,12 @@ "eth-rpc-errors>fast-safe-stringify": true } }, + "@metamask/rpc-errors": { + "packages": { + "@metamask/utils": true, + "eth-rpc-errors>fast-safe-stringify": true + } + }, "@metamask/rpc-methods-flask>nanoid": { "globals": { "crypto.getRandomValues": true @@ -2531,6 +2752,7 @@ "@metamask/smart-transactions-controller>@metamask/transaction-controller>@ethereumjs/util": true, "@metamask/smart-transactions-controller>@metamask/transaction-controller>@metamask/nonce-tracker": true, "@metamask/smart-transactions-controller>@metamask/transaction-controller>@metamask/utils": true, + "@metamask/smart-transactions-controller>@metamask/transaction-controller>@metamask/utils": true, "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry": true, "bn.js": true, "browserify>buffer": true, @@ -2594,6 +2816,21 @@ "semver": true } }, + "@metamask/smart-transactions-controller>@metamask/transaction-controller>@metamask/utils": { + "globals": { + "TextDecoder": true, + "TextEncoder": true + }, + "packages": { + "@metamask/utils>@metamask/superstruct": true, + "@metamask/utils>@scure/base": true, + "@metamask/utils>pony-cause": true, + "@noble/hashes": true, + "browserify>buffer": true, + "nock>debug": true, + "semver": true + } + }, "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry": { "packages": { "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-contract": true, @@ -2680,6 +2917,7 @@ "@metamask/snaps-utils": true, "@metamask/snaps-utils>@metamask/snaps-registry": true, "@metamask/utils": true, + "@metamask/utils": true, "browserify>browserify-zlib": true, "eslint>fast-deep-equal": true, "readable-stream": true @@ -2695,6 +2933,7 @@ "@metamask/rpc-errors": true, "@metamask/safe-event-emitter": true, "@metamask/utils": true + "@metamask/utils": true } }, "@metamask/snaps-controllers>@metamask/json-rpc-middleware-stream": { @@ -2705,6 +2944,7 @@ "packages": { "@metamask/safe-event-emitter": true, "@metamask/utils": true, + "@metamask/utils": true, "readable-stream": true } }, @@ -2719,6 +2959,7 @@ "@metamask/snaps-controllers>@metamask/json-rpc-engine": true, "@metamask/snaps-controllers>nanoid": true, "@metamask/utils": true, + "@metamask/utils": true, "deep-freeze-strict": true, "immer": true } @@ -2807,6 +3048,7 @@ "@metamask/snaps-utils>rfdc": true, "@metamask/snaps-utils>validate-npm-package-name": true, "@metamask/utils": true, + "@metamask/utils": true, "@metamask/utils>@metamask/superstruct": true, "@metamask/utils>@scure/base": true, "@noble/hashes": true, @@ -2825,6 +3067,7 @@ "@metamask/snaps-controllers>@metamask/json-rpc-engine": true, "@metamask/snaps-execution-environments>nanoid": true, "@metamask/utils": true, + "@metamask/utils": true, "deep-freeze-strict": true, "immer": true } @@ -2842,6 +3085,7 @@ "@metamask/snaps-sdk>@metamask/key-tree": true, "@metamask/snaps-utils": true, "@metamask/utils": true, + "@metamask/utils": true, "@metamask/utils>@metamask/superstruct": true, "@noble/hashes": true } @@ -2857,6 +3101,7 @@ "@metamask/snaps-controllers>@metamask/json-rpc-engine": true, "@metamask/snaps-rpc-methods>@metamask/permission-controller>nanoid": true, "@metamask/utils": true, + "@metamask/utils": true, "deep-freeze-strict": true, "immer": true } @@ -2873,6 +3118,7 @@ "packages": { "@metamask/rpc-errors": true, "@metamask/utils": true, + "@metamask/utils": true, "@metamask/utils>@metamask/superstruct": true } }, @@ -2881,6 +3127,7 @@ "@metamask/message-signing-snap>@noble/curves": true, "@metamask/scure-bip39": true, "@metamask/utils": true, + "@metamask/utils": true, "@metamask/utils>@scure/base": true, "@noble/hashes": true } @@ -2913,6 +3160,7 @@ "@metamask/snaps-utils>rfdc": true, "@metamask/snaps-utils>validate-npm-package-name": true, "@metamask/utils": true, + "@metamask/utils": true, "@metamask/utils>@metamask/superstruct": true, "@metamask/utils>@scure/base": true, "@noble/hashes": true, @@ -2931,6 +3179,7 @@ "@metamask/snaps-controllers>@metamask/json-rpc-engine": true, "@metamask/snaps-utils>@metamask/permission-controller>nanoid": true, "@metamask/utils": true, + "@metamask/utils": true, "deep-freeze-strict": true, "immer": true } @@ -2944,6 +3193,7 @@ "packages": { "@metamask/message-signing-snap>@noble/curves": true, "@metamask/utils": true, + "@metamask/utils": true, "@metamask/utils>@metamask/superstruct": true, "@noble/hashes": true } @@ -3062,6 +3312,7 @@ "@metamask/rpc-errors": true, "@metamask/transaction-controller>@metamask/nonce-tracker": true, "@metamask/utils": true, + "@metamask/utils": true, "bn.js": true, "browserify>buffer": true, "eth-method-registry": true, @@ -3100,6 +3351,7 @@ "@metamask/rpc-errors": true, "@metamask/transaction-controller": true, "@metamask/user-operation-controller>@metamask/utils": true, + "@metamask/user-operation-controller>@metamask/utils": true, "bn.js": true, "lodash": true, "superstruct": true, @@ -3122,6 +3374,21 @@ "semver": true } }, + "@metamask/user-operation-controller>@metamask/utils": { + "globals": { + "TextDecoder": true, + "TextEncoder": true + }, + "packages": { + "@metamask/utils>@metamask/superstruct": true, + "@metamask/utils>@scure/base": true, + "@metamask/utils>pony-cause": true, + "@noble/hashes": true, + "browserify>buffer": true, + "nock>debug": true, + "semver": true + } + }, "@metamask/utils": { "globals": { "TextDecoder": true, @@ -3191,6 +3458,62 @@ "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, @@ -4074,6 +4397,11 @@ "koa>is-generator-function>has-tostringtag": true } }, + "eslint>ajv>uri-js": { + "globals": { + "define": true + } + }, "eth-ens-namehash": { "globals": { "name": "write" @@ -5472,4 +5800,4 @@ } } } -} \ No newline at end of file +} diff --git a/lavamoat/build-system/policy.json b/lavamoat/build-system/policy.json index 277b4c9f7164..54ce1a525794 100644 --- a/lavamoat/build-system/policy.json +++ b/lavamoat/build-system/policy.json @@ -2117,8 +2117,7 @@ "chokidar>normalize-path": true, "chokidar>readdirp": true, "del>is-glob": true, - "eslint>glob-parent": true, - "tsx>fsevents": true + "eslint>glob-parent": true } }, "chokidar>anymatch": { @@ -6701,7 +6700,7 @@ "tty.isatty": true }, "globals": { - "process.argv.includes": true, + "process.argv": true, "process.env": true, "process.platform": true } @@ -8894,13 +8893,6 @@ "typescript": true } }, - "tsx>fsevents": { - "globals": { - "console.assert": true, - "process.platform": true - }, - "native": true - }, "typescript": { "builtin": { "buffer.Buffer": true, From d0efeaebc7505333ef9831f5f36360e24a87739f Mon Sep 17 00:00:00 2001 From: Shane Jonas Date: Thu, 5 Sep 2024 16:00:16 -0400 Subject: [PATCH 12/21] fix: typing issue --- .../lib/multichain-api/multichainMethodCallValidator.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/scripts/lib/multichain-api/multichainMethodCallValidator.ts b/app/scripts/lib/multichain-api/multichainMethodCallValidator.ts index a0a663b9ce2f..65289e0c3930 100644 --- a/app/scripts/lib/multichain-api/multichainMethodCallValidator.ts +++ b/app/scripts/lib/multichain-api/multichainMethodCallValidator.ts @@ -46,7 +46,7 @@ const dereffedPromise = dereferenceDocument( ); export const multichainMethodCallValidator = async ( method: string, - params: JsonRpcParams, + params: JsonRpcParams | undefined, ) => { const dereffed = await dereffedPromise; const methodToCheck = dereffed.methods.find( @@ -59,7 +59,7 @@ export const multichainMethodCallValidator = async ( const p = param as ContentDescriptorObject; if (isObject(params)) { paramToCheck = params[p.name]; - } else { + } else if (params && Array.isArray(params)) { paramToCheck = params[i]; } const result = v.validate(paramToCheck, p.schema as unknown as Schema, { From 07c486374370dff0c329d23ff810df093cf06bc1 Mon Sep 17 00:00:00 2001 From: Shane Jonas Date: Fri, 6 Sep 2024 13:53:50 -0400 Subject: [PATCH 13/21] fix: paramToCheck typing errors --- .../lib/multichain-api/multichainMethodCallValidator.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/scripts/lib/multichain-api/multichainMethodCallValidator.ts b/app/scripts/lib/multichain-api/multichainMethodCallValidator.ts index 65289e0c3930..cff2841ecf98 100644 --- a/app/scripts/lib/multichain-api/multichainMethodCallValidator.ts +++ b/app/scripts/lib/multichain-api/multichainMethodCallValidator.ts @@ -55,12 +55,14 @@ export const multichainMethodCallValidator = async ( const errors: JsonRpcError[] = []; // check each param and aggregate errors (methodToCheck as unknown as MethodObject).params.forEach((param, i) => { - let paramToCheck: Json; + let paramToCheck: Json | undefined; const p = param as ContentDescriptorObject; if (isObject(params)) { paramToCheck = params[p.name]; } else if (params && Array.isArray(params)) { paramToCheck = params[i]; + } else { + paramToCheck = undefined; } const result = v.validate(paramToCheck, p.schema as unknown as Schema, { required: p.required, From 265b66770caf448ec5049a9fad9a0ceb6e3a5cca Mon Sep 17 00:00:00 2001 From: Shane Date: Fri, 6 Sep 2024 10:58:38 -0700 Subject: [PATCH 14/21] Update test/e2e/api-specs/MultichainAuthorizationConfirmationErrors.ts --- test/e2e/api-specs/MultichainAuthorizationConfirmationErrors.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/test/e2e/api-specs/MultichainAuthorizationConfirmationErrors.ts b/test/e2e/api-specs/MultichainAuthorizationConfirmationErrors.ts index 404855b7f7dc..5b3af50331e2 100644 --- a/test/e2e/api-specs/MultichainAuthorizationConfirmationErrors.ts +++ b/test/e2e/api-specs/MultichainAuthorizationConfirmationErrors.ts @@ -68,7 +68,6 @@ export class MultichainAuthorizationConfirmationErrors implements Rule { }); } - // get all the confirmation calls to make and expect to pass getCalls(__: unknown, method: MethodObject) { const calls: Call[] = []; const isMethodAllowed = this.only ? this.only.includes(method.name) : true; From 58ce2efe01523fd18f52e218f58288f17f034c41 Mon Sep 17 00:00:00 2001 From: Shane Date: Fri, 6 Sep 2024 10:58:57 -0700 Subject: [PATCH 15/21] Update test/e2e/api-specs/MultichainAuthorizationConfirmationErrors.ts --- test/e2e/api-specs/MultichainAuthorizationConfirmationErrors.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/e2e/api-specs/MultichainAuthorizationConfirmationErrors.ts b/test/e2e/api-specs/MultichainAuthorizationConfirmationErrors.ts index 5b3af50331e2..476957ea8fd0 100644 --- a/test/e2e/api-specs/MultichainAuthorizationConfirmationErrors.ts +++ b/test/e2e/api-specs/MultichainAuthorizationConfirmationErrors.ts @@ -14,7 +14,7 @@ type MultichainAuthorizationConfirmationOptions = { driver: Driver; only?: string[]; }; -// this rule makes sure that a multichain authorization confirmation dialog is shown and confirmed +// this rule makes sure that a multichain authorization error codes are returned export class MultichainAuthorizationConfirmationErrors implements Rule { private driver: Driver; From 587e7d33b203c6c2500d9ef0e89b43b380652db0 Mon Sep 17 00:00:00 2001 From: Shane Jonas Date: Fri, 6 Sep 2024 14:04:07 -0400 Subject: [PATCH 16/21] fix: revert gitignore branding removal --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index 80a6ff2db51d..71759f352b29 100644 --- a/.gitignore +++ b/.gitignore @@ -75,6 +75,9 @@ lavamoat/**/policy-debug.json # Attributions licenseInfos.json +# Branding +/app/images/branding + # API Spec tests html-report/ html-report-multichain/ From 968af5a0ccc5aa28ca3eb39e666cf87a73e574ce Mon Sep 17 00:00:00 2001 From: Shane Jonas Date: Tue, 10 Sep 2024 14:37:56 -0400 Subject: [PATCH 17/21] fix: revert lavamoat policy + bump api spec version to get renamed methods --- lavamoat/browserify/main/policy.json | 301 +----------------- lavamoat/build-system/policy.json | 10 +- package.json | 2 +- .../MultichainAuthorizationConfirmation.ts | 1 + ...ltichainAuthorizationConfirmationErrors.ts | 2 +- yarn.lock | 34 +- 6 files changed, 41 insertions(+), 309 deletions(-) diff --git a/lavamoat/browserify/main/policy.json b/lavamoat/browserify/main/policy.json index f9191fbfcb11..4f7fc4412007 100644 --- a/lavamoat/browserify/main/policy.json +++ b/lavamoat/browserify/main/policy.json @@ -766,7 +766,6 @@ }, "@metamask/abi-utils": { "packages": { - "@metamask/utils": true, "@metamask/utils": true, "@metamask/utils>@metamask/superstruct": true } @@ -775,23 +774,14 @@ "packages": { "@ethereumjs/tx>@ethereumjs/util": true, "@ethereumjs/tx>ethereum-cryptography": true, - "@metamask/accounts-controller>@metamask/base-controller": true, + "@metamask/base-controller": true, "@metamask/eth-snap-keyring": true, "@metamask/keyring-api": true, "@metamask/keyring-controller": true, "@metamask/utils": true, - "@metamask/utils": true, "uuid": true } }, - "@metamask/accounts-controller>@metamask/base-controller": { - "globals": { - "setTimeout": true - }, - "packages": { - "immer": true - } - }, "@metamask/address-book-controller": { "packages": { "@metamask/base-controller": true, @@ -856,7 +846,6 @@ "@metamask/name-controller>async-mutex": true, "@metamask/rpc-errors": true, "@metamask/utils": true, - "@metamask/utils": true, "bn.js": true, "lodash": true, "single-call-balance-checker-abi": true, @@ -916,7 +905,6 @@ "crypto.subtle.importKey": true }, "packages": { - "@metamask/browser-passworder>@metamask/utils": true, "@metamask/browser-passworder>@metamask/utils": true, "browserify>buffer": true } @@ -936,21 +924,6 @@ "semver": true } }, - "@metamask/browser-passworder>@metamask/utils": { - "globals": { - "TextDecoder": true, - "TextEncoder": true - }, - "packages": { - "@metamask/utils>@metamask/superstruct": true, - "@metamask/utils>@scure/base": true, - "@metamask/utils>pony-cause": true, - "@noble/hashes": true, - "browserify>buffer": true, - "nock>debug": true, - "semver": true - } - }, "@metamask/controller-utils": { "globals": { "URL": true, @@ -963,7 +936,6 @@ "@metamask/controller-utils>@spruceid/siwe-parser": true, "@metamask/ethjs>@metamask/ethjs-unit": true, "@metamask/utils": true, - "@metamask/utils": true, "bn.js": true, "browserify>buffer": true, "eslint>fast-deep-equal": true, @@ -1006,7 +978,6 @@ "@metamask/base-controller": true, "@metamask/controller-utils": true, "@metamask/utils": true, - "@metamask/utils": true, "punycode": true } }, @@ -1030,28 +1001,11 @@ }, "@metamask/eth-json-rpc-filters>@metamask/json-rpc-engine": { "packages": { - "@metamask/eth-json-rpc-filters>@metamask/json-rpc-engine>@metamask/utils": true, "@metamask/eth-json-rpc-filters>@metamask/json-rpc-engine>@metamask/utils": true, "@metamask/rpc-errors": true, "@metamask/safe-event-emitter": true } }, - "@metamask/eth-json-rpc-filters>@metamask/json-rpc-engine>@metamask/utils": { - "globals": { - "TextDecoder": true, - "TextEncoder": true - }, - "packages": { - "@metamask/utils>@metamask/superstruct": true, - "@metamask/utils>@scure/base": true, - "@metamask/utils>pony-cause": true, - "@noble/hashes": true, - "browserify>buffer": true, - "nock>debug": true, - "semver": true - "@metamask/safe-event-emitter": true - } - }, "@metamask/eth-json-rpc-filters>@metamask/json-rpc-engine>@metamask/utils": { "globals": { "TextDecoder": true, @@ -1088,8 +1042,6 @@ "@metamask/rpc-errors": true, "@metamask/snaps-controllers>@metamask/json-rpc-engine": true, "@metamask/utils": true - "@metamask/snaps-controllers>@metamask/json-rpc-engine": true, - "@metamask/utils": true } }, "@metamask/eth-ledger-bridge-keyring": { @@ -1124,7 +1076,6 @@ "@metamask/abi-utils": true, "@metamask/eth-sig-util>tweetnacl": true, "@metamask/utils": true, - "@metamask/utils": true, "@metamask/utils>@scure/base": true, "browserify>buffer": true } @@ -1148,7 +1099,6 @@ "@ethereumjs/tx": true, "@metamask/eth-sig-util": true, "@metamask/eth-snap-keyring>@metamask/utils": true, - "@metamask/eth-snap-keyring>@metamask/utils": true, "@metamask/eth-snap-keyring>uuid": true, "@metamask/keyring-api": true, "superstruct": true, @@ -1170,21 +1120,6 @@ "semver": true } }, - "@metamask/eth-snap-keyring>@metamask/utils": { - "globals": { - "TextDecoder": true, - "TextEncoder": true - }, - "packages": { - "@metamask/utils>@metamask/superstruct": true, - "@metamask/utils>@scure/base": true, - "@metamask/utils>pony-cause": true, - "@noble/hashes": true, - "browserify>buffer": true, - "nock>debug": true, - "semver": true - } - }, "@metamask/eth-snap-keyring>uuid": { "globals": { "crypto": true @@ -1214,7 +1149,6 @@ "packages": { "@metamask/eth-query>json-rpc-random-id": true, "@metamask/eth-token-tracker>@metamask/eth-block-tracker>@metamask/utils": true, - "@metamask/eth-token-tracker>@metamask/eth-block-tracker>@metamask/utils": true, "@metamask/safe-event-emitter": true, "pify": true } @@ -1234,21 +1168,6 @@ "semver": true } }, - "@metamask/eth-token-tracker>@metamask/eth-block-tracker>@metamask/utils": { - "globals": { - "TextDecoder": true, - "TextEncoder": true - }, - "packages": { - "@metamask/utils>@metamask/superstruct": true, - "@metamask/utils>@scure/base": true, - "@metamask/utils>pony-cause": true, - "@noble/hashes": true, - "browserify>buffer": true, - "nock>debug": true, - "semver": true - } - }, "@metamask/eth-token-tracker>deep-equal": { "packages": { "@lavamoat/lavapack>json-stable-stringify>isarray": true, @@ -1552,7 +1471,6 @@ "@metamask/keyring-api>bech32": true, "@metamask/keyring-api>uuid": true, "@metamask/utils": true, - "@metamask/utils": true, "@metamask/utils>@metamask/superstruct": true } }, @@ -1572,8 +1490,6 @@ "@metamask/keyring-controller>ethereumjs-wallet": true, "@metamask/name-controller>async-mutex": true, "@metamask/utils": true - "@metamask/name-controller>async-mutex": true, - "@metamask/utils": true } }, "@metamask/keyring-controller>@metamask/eth-hd-keyring": { @@ -1585,7 +1501,6 @@ "@ethereumjs/tx>ethereum-cryptography": true, "@metamask/eth-sig-util": true, "@metamask/keyring-controller>@metamask/eth-hd-keyring>@metamask/utils": true, - "@metamask/keyring-controller>@metamask/eth-hd-keyring>@metamask/utils": true, "@metamask/scure-bip39": true, "browserify>buffer": true } @@ -1605,33 +1520,16 @@ "semver": true } }, - "@metamask/keyring-controller>@metamask/eth-hd-keyring>@metamask/utils": { - "globals": { - "TextDecoder": true, - "TextEncoder": true - }, - "packages": { - "@metamask/utils>@metamask/superstruct": true, - "@metamask/utils>@scure/base": true, - "@metamask/utils>pony-cause": true, - "@noble/hashes": true, - "browserify>buffer": true, - "nock>debug": true, - "semver": true - } - }, "@metamask/keyring-controller>@metamask/eth-simple-keyring": { "packages": { "@ethereumjs/tx>@ethereumjs/util": true, "@ethereumjs/tx>ethereum-cryptography": true, "@metamask/eth-sig-util": true, "@metamask/keyring-controller>@metamask/eth-simple-keyring>@metamask/utils": true, - "@metamask/keyring-controller>@metamask/eth-simple-keyring>@metamask/utils": true, "browserify>buffer": true, "crypto-browserify>randombytes": true } }, - "@metamask/keyring-controller>@metamask/eth-simple-keyring>@metamask/utils": { "@metamask/keyring-controller>@metamask/eth-simple-keyring>@metamask/utils": { "globals": { "TextDecoder": true, @@ -1709,12 +1607,22 @@ "packages": { "@metamask/controller-utils": true, "@metamask/eth-sig-util": true, + "@metamask/message-manager>@metamask/base-controller": true, "@metamask/utils": true, "browserify>buffer": true, + "jsonschema": true, "uuid": true, "webpack>events": true } }, + "@metamask/message-manager>@metamask/base-controller": { + "globals": { + "setTimeout": true + }, + "packages": { + "immer": true + } + }, "@metamask/message-signing-snap>@noble/ciphers": { "globals": { "TextDecoder": true, @@ -1741,23 +1649,6 @@ "@metamask/name-controller>async-mutex": true } }, - "@metamask/name-controller>@metamask/utils": { - "globals": { - "TextDecoder": true, - "TextEncoder": true - }, - "packages": { - "@metamask/utils>@metamask/superstruct": true, - "@metamask/utils>@scure/base": true, - "@metamask/utils>pony-cause": true, - "@noble/hashes": true, - "browserify>buffer": true, - "nock>debug": true, - "semver": true - "@metamask/name-controller>@metamask/utils": true, - "@metamask/name-controller>async-mutex": true - } - }, "@metamask/name-controller>@metamask/utils": { "globals": { "TextDecoder": true, @@ -1801,7 +1692,6 @@ "@metamask/rpc-errors": true, "@metamask/snaps-controllers>@metamask/json-rpc-engine": true, "@metamask/utils": true, - "@metamask/utils": true, "browserify>assert": true, "uuid": true } @@ -1814,7 +1704,6 @@ "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/eth-json-rpc-provider": true, "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/json-rpc-engine": true, "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/utils": true, - "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/utils": true, "@metamask/rpc-errors": true, "node-fetch": true } @@ -1827,28 +1716,11 @@ }, "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/json-rpc-engine": { "packages": { - "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/utils": true, "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/utils": true, "@metamask/rpc-errors": true, "@metamask/safe-event-emitter": true } }, - "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/utils": { - "globals": { - "TextDecoder": true, - "TextEncoder": true - }, - "packages": { - "@metamask/utils>@metamask/superstruct": true, - "@metamask/utils>@scure/base": true, - "@metamask/utils>pony-cause": true, - "@noble/hashes": true, - "browserify>buffer": true, - "nock>debug": true, - "semver": true - "@metamask/safe-event-emitter": true - } - }, "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/utils": { "globals": { "TextDecoder": true, @@ -1917,14 +1789,6 @@ "@metamask/notification-controller>nanoid": true } }, - "@metamask/notification-controller>@metamask/utils": { - "@metamask/notification-controller": { - "packages": { - "@metamask/base-controller": true, - "@metamask/notification-controller>@metamask/utils": true, - "@metamask/notification-controller>nanoid": true - } - }, "@metamask/notification-controller>@metamask/utils": { "globals": { "TextDecoder": true, @@ -2112,7 +1976,6 @@ "@metamask/base-controller": true, "@metamask/controller-utils": true, "@metamask/permission-controller>@metamask/utils": true, - "@metamask/permission-controller>@metamask/utils": true, "@metamask/permission-controller>nanoid": true, "@metamask/rpc-errors": true, "@metamask/snaps-controllers>@metamask/json-rpc-engine": true, @@ -2135,21 +1998,6 @@ "semver": true } }, - "@metamask/permission-controller>@metamask/utils": { - "globals": { - "TextDecoder": true, - "TextEncoder": true - }, - "packages": { - "@metamask/utils>@metamask/superstruct": true, - "@metamask/utils>@scure/base": true, - "@metamask/utils>pony-cause": true, - "@noble/hashes": true, - "browserify>buffer": true, - "nock>debug": true, - "semver": true - } - }, "@metamask/permission-controller>nanoid": { "globals": { "crypto.getRandomValues": true @@ -2159,7 +2007,6 @@ "packages": { "@metamask/permission-log-controller>@metamask/base-controller": true, "@metamask/permission-log-controller>@metamask/utils": true - "@metamask/permission-log-controller>@metamask/utils": true } }, "@metamask/permission-log-controller>@metamask/base-controller": { @@ -2185,21 +2032,6 @@ "semver": true } }, - "@metamask/permission-log-controller>@metamask/utils": { - "globals": { - "TextDecoder": true, - "TextEncoder": true - }, - "packages": { - "@metamask/utils>@metamask/superstruct": true, - "@metamask/utils>@scure/base": true, - "@metamask/utils>pony-cause": true, - "@noble/hashes": true, - "browserify>buffer": true, - "nock>debug": true, - "semver": true - } - }, "@metamask/phishing-controller": { "globals": { "TextEncoder": true, @@ -2235,7 +2067,6 @@ "removeEventListener": true }, "packages": { - "@metamask/post-message-stream>@metamask/utils": true, "@metamask/post-message-stream>@metamask/utils": true, "readable-stream": true } @@ -2255,21 +2086,6 @@ "semver": true } }, - "@metamask/post-message-stream>@metamask/utils": { - "globals": { - "TextDecoder": true, - "TextEncoder": true - }, - "packages": { - "@metamask/utils>@metamask/superstruct": true, - "@metamask/utils>@scure/base": true, - "@metamask/utils>pony-cause": true, - "@noble/hashes": true, - "browserify>buffer": true, - "nock>debug": true, - "semver": true - } - }, "@metamask/ppom-validator": { "globals": { "URL": true, @@ -2299,7 +2115,6 @@ "@metamask/controller-utils>@spruceid/siwe-parser": true, "@metamask/ethjs>@metamask/ethjs-unit": true, "@metamask/ppom-validator>@metamask/utils": true, - "@metamask/ppom-validator>@metamask/utils": true, "bn.js": true, "browserify>buffer": true, "eslint>fast-deep-equal": true, @@ -2321,21 +2136,6 @@ "semver": true } }, - "@metamask/ppom-validator>@metamask/utils": { - "globals": { - "TextDecoder": true, - "TextEncoder": true - }, - "packages": { - "@metamask/utils>@metamask/superstruct": true, - "@metamask/utils>@scure/base": true, - "@metamask/utils>pony-cause": true, - "@noble/hashes": true, - "browserify>buffer": true, - "nock>debug": true, - "semver": true - } - }, "@metamask/ppom-validator>crypto-js": { "globals": { "crypto": true, @@ -2438,28 +2238,11 @@ "packages": { "@metamask/base-controller": true, "@metamask/queued-request-controller>@metamask/utils": true, - "@metamask/queued-request-controller>@metamask/utils": true, "@metamask/rpc-errors": true, "@metamask/selected-network-controller": true, "@metamask/snaps-controllers>@metamask/json-rpc-engine": true } }, - "@metamask/queued-request-controller>@metamask/utils": { - "globals": { - "TextDecoder": true, - "TextEncoder": true - }, - "packages": { - "@metamask/utils>@metamask/superstruct": true, - "@metamask/utils>@scure/base": true, - "@metamask/utils>pony-cause": true, - "@noble/hashes": true, - "browserify>buffer": true, - "nock>debug": true, - "semver": true - "@metamask/snaps-controllers>@metamask/json-rpc-engine": true - } - }, "@metamask/queued-request-controller>@metamask/utils": { "globals": { "TextDecoder": true, @@ -2483,11 +2266,8 @@ "@metamask/base-controller": true, "@metamask/rate-limit-controller>@metamask/utils": true, "@metamask/rpc-errors": true - "@metamask/rate-limit-controller>@metamask/utils": true, - "@metamask/rpc-errors": true } }, - "@metamask/rate-limit-controller>@metamask/utils": { "@metamask/rate-limit-controller>@metamask/utils": { "globals": { "TextDecoder": true, @@ -2509,12 +2289,6 @@ "eth-rpc-errors>fast-safe-stringify": true } }, - "@metamask/rpc-errors": { - "packages": { - "@metamask/utils": true, - "eth-rpc-errors>fast-safe-stringify": true - } - }, "@metamask/rpc-methods-flask>nanoid": { "globals": { "crypto.getRandomValues": true @@ -2660,7 +2434,6 @@ "@metamask/smart-transactions-controller>@metamask/transaction-controller>@ethereumjs/util": true, "@metamask/smart-transactions-controller>@metamask/transaction-controller>@metamask/nonce-tracker": true, "@metamask/smart-transactions-controller>@metamask/transaction-controller>@metamask/utils": true, - "@metamask/smart-transactions-controller>@metamask/transaction-controller>@metamask/utils": true, "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry": true, "bn.js": true, "browserify>buffer": true, @@ -2724,21 +2497,6 @@ "semver": true } }, - "@metamask/smart-transactions-controller>@metamask/transaction-controller>@metamask/utils": { - "globals": { - "TextDecoder": true, - "TextEncoder": true - }, - "packages": { - "@metamask/utils>@metamask/superstruct": true, - "@metamask/utils>@scure/base": true, - "@metamask/utils>pony-cause": true, - "@noble/hashes": true, - "browserify>buffer": true, - "nock>debug": true, - "semver": true - } - }, "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry": { "packages": { "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-contract": true, @@ -2825,7 +2583,6 @@ "@metamask/snaps-utils": true, "@metamask/snaps-utils>@metamask/snaps-registry": true, "@metamask/utils": true, - "@metamask/utils": true, "browserify>browserify-zlib": true, "eslint>fast-deep-equal": true, "readable-stream": true @@ -2841,7 +2598,6 @@ "@metamask/rpc-errors": true, "@metamask/safe-event-emitter": true, "@metamask/utils": true - "@metamask/utils": true } }, "@metamask/snaps-controllers>@metamask/json-rpc-middleware-stream": { @@ -2852,7 +2608,6 @@ "packages": { "@metamask/safe-event-emitter": true, "@metamask/utils": true, - "@metamask/utils": true, "readable-stream": true } }, @@ -2867,7 +2622,6 @@ "@metamask/snaps-controllers>@metamask/json-rpc-engine": true, "@metamask/snaps-controllers>nanoid": true, "@metamask/utils": true, - "@metamask/utils": true, "deep-freeze-strict": true, "immer": true } @@ -2956,7 +2710,6 @@ "@metamask/snaps-utils>rfdc": true, "@metamask/snaps-utils>validate-npm-package-name": true, "@metamask/utils": true, - "@metamask/utils": true, "@metamask/utils>@metamask/superstruct": true, "@metamask/utils>@scure/base": true, "@noble/hashes": true, @@ -2975,7 +2728,6 @@ "@metamask/snaps-controllers>@metamask/json-rpc-engine": true, "@metamask/snaps-execution-environments>nanoid": true, "@metamask/utils": true, - "@metamask/utils": true, "deep-freeze-strict": true, "immer": true } @@ -2993,7 +2745,6 @@ "@metamask/snaps-sdk>@metamask/key-tree": true, "@metamask/snaps-utils": true, "@metamask/utils": true, - "@metamask/utils": true, "@metamask/utils>@metamask/superstruct": true, "@noble/hashes": true } @@ -3009,7 +2760,6 @@ "@metamask/snaps-controllers>@metamask/json-rpc-engine": true, "@metamask/snaps-rpc-methods>@metamask/permission-controller>nanoid": true, "@metamask/utils": true, - "@metamask/utils": true, "deep-freeze-strict": true, "immer": true } @@ -3026,7 +2776,6 @@ "packages": { "@metamask/rpc-errors": true, "@metamask/utils": true, - "@metamask/utils": true, "@metamask/utils>@metamask/superstruct": true } }, @@ -3035,7 +2784,6 @@ "@metamask/message-signing-snap>@noble/curves": true, "@metamask/scure-bip39": true, "@metamask/utils": true, - "@metamask/utils": true, "@metamask/utils>@scure/base": true, "@noble/hashes": true } @@ -3068,7 +2816,6 @@ "@metamask/snaps-utils>rfdc": true, "@metamask/snaps-utils>validate-npm-package-name": true, "@metamask/utils": true, - "@metamask/utils": true, "@metamask/utils>@metamask/superstruct": true, "@metamask/utils>@scure/base": true, "@noble/hashes": true, @@ -3087,7 +2834,6 @@ "@metamask/snaps-controllers>@metamask/json-rpc-engine": true, "@metamask/snaps-utils>@metamask/permission-controller>nanoid": true, "@metamask/utils": true, - "@metamask/utils": true, "deep-freeze-strict": true, "immer": true } @@ -3101,7 +2847,6 @@ "packages": { "@metamask/message-signing-snap>@noble/curves": true, "@metamask/utils": true, - "@metamask/utils": true, "@metamask/utils>@metamask/superstruct": true, "@noble/hashes": true } @@ -3220,7 +2965,6 @@ "@metamask/rpc-errors": true, "@metamask/transaction-controller>@metamask/nonce-tracker": true, "@metamask/utils": true, - "@metamask/utils": true, "bn.js": true, "browserify>buffer": true, "eth-method-registry": true, @@ -3259,7 +3003,6 @@ "@metamask/rpc-errors": true, "@metamask/transaction-controller": true, "@metamask/user-operation-controller>@metamask/utils": true, - "@metamask/user-operation-controller>@metamask/utils": true, "bn.js": true, "lodash": true, "superstruct": true, @@ -3282,21 +3025,6 @@ "semver": true } }, - "@metamask/user-operation-controller>@metamask/utils": { - "globals": { - "TextDecoder": true, - "TextEncoder": true - }, - "packages": { - "@metamask/utils>@metamask/superstruct": true, - "@metamask/utils>@scure/base": true, - "@metamask/utils>pony-cause": true, - "@noble/hashes": true, - "browserify>buffer": true, - "nock>debug": true, - "semver": true - } - }, "@metamask/utils": { "globals": { "TextDecoder": true, @@ -4782,6 +4510,11 @@ "readable-stream": true } }, + "jsonschema": { + "packages": { + "browserify>url": true + } + }, "koa>content-disposition>safe-buffer": { "packages": { "browserify>buffer": true @@ -5732,4 +5465,4 @@ } } } -} +} \ No newline at end of file diff --git a/lavamoat/build-system/policy.json b/lavamoat/build-system/policy.json index 54ce1a525794..a77bbd9bf84e 100644 --- a/lavamoat/build-system/policy.json +++ b/lavamoat/build-system/policy.json @@ -2117,7 +2117,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": { @@ -8893,6 +8894,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 index 217841008511..1bc7d8092c30 100644 --- a/package.json +++ b/package.json @@ -308,7 +308,7 @@ "@metamask/accounts-controller": "^18.1.0", "@metamask/address-book-controller": "^5.0.0", "@metamask/announcement-controller": "^7.0.0", - "@metamask/api-specs": "^0.10.8", + "@metamask/api-specs": "^0.10.10", "@metamask/approval-controller": "^7.0.0", "@metamask/assets-controllers": "^36.0.0", "@metamask/base-controller": "^6.0.2", diff --git a/test/e2e/api-specs/MultichainAuthorizationConfirmation.ts b/test/e2e/api-specs/MultichainAuthorizationConfirmation.ts index 57c1d23174d4..1cca549c7a27 100644 --- a/test/e2e/api-specs/MultichainAuthorizationConfirmation.ts +++ b/test/e2e/api-specs/MultichainAuthorizationConfirmation.ts @@ -114,6 +114,7 @@ export class MultichainAuthorizationConfirmation implements Rule { }); } } + console.log('calls', calls); return calls; } diff --git a/test/e2e/api-specs/MultichainAuthorizationConfirmationErrors.ts b/test/e2e/api-specs/MultichainAuthorizationConfirmationErrors.ts index 476957ea8fd0..d41e588ce2f7 100644 --- a/test/e2e/api-specs/MultichainAuthorizationConfirmationErrors.ts +++ b/test/e2e/api-specs/MultichainAuthorizationConfirmationErrors.ts @@ -24,7 +24,7 @@ export class MultichainAuthorizationConfirmationErrors implements Rule { constructor(options: MultichainAuthorizationConfirmationOptions) { this.driver = options.driver; - this.only = options.only || ['provider_authorize']; + this.only = options.only || ['wallet_createSession']; this.errorCodesToHitCancel = [5001, 5002]; } diff --git a/yarn.lock b/yarn.lock index 69eb0bbef704..72084adffbf3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4773,11 +4773,11 @@ __metadata: linkType: hard "@metamask/accounts-controller@npm:^18.1.0": - version: 18.1.1 - resolution: "@metamask/accounts-controller@npm:18.1.1" + version: 18.1.0 + resolution: "@metamask/accounts-controller@npm:18.1.0" dependencies: "@ethereumjs/util": "npm:^8.1.0" - "@metamask/base-controller": "npm:^7.0.0" + "@metamask/base-controller": "npm:^6.0.3" "@metamask/eth-snap-keyring": "npm:^4.3.1" "@metamask/keyring-api": "npm:^8.1.0" "@metamask/snaps-sdk": "npm:^6.1.1" @@ -4790,7 +4790,7 @@ __metadata: peerDependencies: "@metamask/keyring-controller": ^17.0.0 "@metamask/snaps-controllers": ^9.3.0 - checksum: 10/15d02b265daea6bfc6a487ae9476bdbf4c26e2d4211542d8bdae9b3b3fcac3d7e6d161b0ab7e1967f9472eb18dd10b5f8fc49b9b89e6eaa690446dad53bc552b + checksum: 10/31885a06f394a36e90a941ab15ed96fae8a39f2c650ce7523489114af0df1acf522bb8b5275e5e572354cdb42b286be805c336718b721105a2888c8be695c616 languageName: node linkType: hard @@ -4814,10 +4814,10 @@ __metadata: languageName: node linkType: hard -"@metamask/api-specs@npm:^0.10.8": - version: 0.10.8 - resolution: "@metamask/api-specs@npm:0.10.8" - checksum: 10/2daa426db88f4682f20cad7d8c10fa1197188f7394fbe8ba07fb5d8f9f15980bed9dc49b65fbb22c8080c056cb25a64a6ee84ce3db683476b3f0402284157482 +"@metamask/api-specs@npm:^0.10.10": + version: 0.10.10 + resolution: "@metamask/api-specs@npm:0.10.10" + checksum: 10/0318b5b5e1fc39e3d0b7c9c44abd3b459bd15e7e8578c062d059806c12836975ef0a69fa090022eb87a372d766105b0bec222c13507d95eaea9f5b38dcfc7313 languageName: node linkType: hard @@ -4889,16 +4889,6 @@ __metadata: languageName: node linkType: hard -"@metamask/base-controller@npm:^3.0.0": - version: 3.2.3 - resolution: "@metamask/base-controller@npm:3.2.3" - dependencies: - "@metamask/utils": "npm:^8.1.0" - immer: "npm:^9.0.6" - checksum: 10/1a3005f4143f0a3e37094ce389ae9c2010194672d67c1b115a401379c1b712fb3d7ce8f1cbc8a4d21cffba61aafba6dc1aaae12172e57b9f14021a2505fadafe - languageName: node - linkType: hard - "@metamask/base-controller@npm:^5.0.1": version: 5.0.2 resolution: "@metamask/base-controller@npm:5.0.2" @@ -4962,9 +4952,9 @@ __metadata: languageName: node linkType: hard -"@metamask/controller-utils@npm:^11.0.0, @metamask/controller-utils@npm:^11.0.1, @metamask/controller-utils@npm:^11.0.2, @metamask/controller-utils@npm:^11.1.0": - version: 11.1.0 - resolution: "@metamask/controller-utils@npm:11.1.0" +"@metamask/controller-utils@npm:^11.0.0, @metamask/controller-utils@npm:^11.0.1, @metamask/controller-utils@npm:^11.0.2, @metamask/controller-utils@npm:^11.1.0, @metamask/controller-utils@npm:^11.2.0": + version: 11.2.0 + resolution: "@metamask/controller-utils@npm:11.2.0" dependencies: "@ethereumjs/util": "npm:^8.1.0" "@metamask/eth-query": "npm:^4.0.0" @@ -26144,7 +26134,7 @@ __metadata: "@metamask/accounts-controller": "npm:^18.1.0" "@metamask/address-book-controller": "npm:^5.0.0" "@metamask/announcement-controller": "npm:^7.0.0" - "@metamask/api-specs": "npm:^0.10.8" + "@metamask/api-specs": "npm:^0.10.10" "@metamask/approval-controller": "npm:^7.0.0" "@metamask/assets-controllers": "npm:^36.0.0" "@metamask/auto-changelog": "npm:^2.1.0" From 6959991ff553fdcf12f29a1473a8fdfdfb35aba3 Mon Sep 17 00:00:00 2001 From: Shane Jonas Date: Tue, 10 Sep 2024 14:42:02 -0400 Subject: [PATCH 18/21] fix: revert browserify policy --- lavamoat/browserify/beta/policy.json | 362 ++------------------------ lavamoat/browserify/flask/policy.json | 362 ++------------------------ lavamoat/browserify/main/policy.json | 73 +----- lavamoat/browserify/mmi/policy.json | 362 ++------------------------ lavamoat/build-system/policy.json | 2 +- 5 files changed, 58 insertions(+), 1103 deletions(-) diff --git a/lavamoat/browserify/beta/policy.json b/lavamoat/browserify/beta/policy.json index f9191fbfcb11..8cbb2cfe5181 100644 --- a/lavamoat/browserify/beta/policy.json +++ b/lavamoat/browserify/beta/policy.json @@ -766,7 +766,6 @@ }, "@metamask/abi-utils": { "packages": { - "@metamask/utils": true, "@metamask/utils": true, "@metamask/utils>@metamask/superstruct": true } @@ -775,23 +774,14 @@ "packages": { "@ethereumjs/tx>@ethereumjs/util": true, "@ethereumjs/tx>ethereum-cryptography": true, - "@metamask/accounts-controller>@metamask/base-controller": true, + "@metamask/base-controller": true, "@metamask/eth-snap-keyring": true, "@metamask/keyring-api": true, "@metamask/keyring-controller": true, "@metamask/utils": true, - "@metamask/utils": true, "uuid": true } }, - "@metamask/accounts-controller>@metamask/base-controller": { - "globals": { - "setTimeout": true - }, - "packages": { - "immer": true - } - }, "@metamask/address-book-controller": { "packages": { "@metamask/base-controller": true, @@ -856,7 +846,6 @@ "@metamask/name-controller>async-mutex": true, "@metamask/rpc-errors": true, "@metamask/utils": true, - "@metamask/utils": true, "bn.js": true, "lodash": true, "single-call-balance-checker-abi": true, @@ -916,7 +905,6 @@ "crypto.subtle.importKey": true }, "packages": { - "@metamask/browser-passworder>@metamask/utils": true, "@metamask/browser-passworder>@metamask/utils": true, "browserify>buffer": true } @@ -936,21 +924,6 @@ "semver": true } }, - "@metamask/browser-passworder>@metamask/utils": { - "globals": { - "TextDecoder": true, - "TextEncoder": true - }, - "packages": { - "@metamask/utils>@metamask/superstruct": true, - "@metamask/utils>@scure/base": true, - "@metamask/utils>pony-cause": true, - "@noble/hashes": true, - "browserify>buffer": true, - "nock>debug": true, - "semver": true - } - }, "@metamask/controller-utils": { "globals": { "URL": true, @@ -963,7 +936,6 @@ "@metamask/controller-utils>@spruceid/siwe-parser": true, "@metamask/ethjs>@metamask/ethjs-unit": true, "@metamask/utils": true, - "@metamask/utils": true, "bn.js": true, "browserify>buffer": true, "eslint>fast-deep-equal": true, @@ -1006,7 +978,6 @@ "@metamask/base-controller": true, "@metamask/controller-utils": true, "@metamask/utils": true, - "@metamask/utils": true, "punycode": true } }, @@ -1030,28 +1001,11 @@ }, "@metamask/eth-json-rpc-filters>@metamask/json-rpc-engine": { "packages": { - "@metamask/eth-json-rpc-filters>@metamask/json-rpc-engine>@metamask/utils": true, "@metamask/eth-json-rpc-filters>@metamask/json-rpc-engine>@metamask/utils": true, "@metamask/rpc-errors": true, "@metamask/safe-event-emitter": true } }, - "@metamask/eth-json-rpc-filters>@metamask/json-rpc-engine>@metamask/utils": { - "globals": { - "TextDecoder": true, - "TextEncoder": true - }, - "packages": { - "@metamask/utils>@metamask/superstruct": true, - "@metamask/utils>@scure/base": true, - "@metamask/utils>pony-cause": true, - "@noble/hashes": true, - "browserify>buffer": true, - "nock>debug": true, - "semver": true - "@metamask/safe-event-emitter": true - } - }, "@metamask/eth-json-rpc-filters>@metamask/json-rpc-engine>@metamask/utils": { "globals": { "TextDecoder": true, @@ -1088,8 +1042,6 @@ "@metamask/rpc-errors": true, "@metamask/snaps-controllers>@metamask/json-rpc-engine": true, "@metamask/utils": true - "@metamask/snaps-controllers>@metamask/json-rpc-engine": true, - "@metamask/utils": true } }, "@metamask/eth-ledger-bridge-keyring": { @@ -1124,7 +1076,6 @@ "@metamask/abi-utils": true, "@metamask/eth-sig-util>tweetnacl": true, "@metamask/utils": true, - "@metamask/utils": true, "@metamask/utils>@scure/base": true, "browserify>buffer": true } @@ -1148,7 +1099,6 @@ "@ethereumjs/tx": true, "@metamask/eth-sig-util": true, "@metamask/eth-snap-keyring>@metamask/utils": true, - "@metamask/eth-snap-keyring>@metamask/utils": true, "@metamask/eth-snap-keyring>uuid": true, "@metamask/keyring-api": true, "superstruct": true, @@ -1170,21 +1120,6 @@ "semver": true } }, - "@metamask/eth-snap-keyring>@metamask/utils": { - "globals": { - "TextDecoder": true, - "TextEncoder": true - }, - "packages": { - "@metamask/utils>@metamask/superstruct": true, - "@metamask/utils>@scure/base": true, - "@metamask/utils>pony-cause": true, - "@noble/hashes": true, - "browserify>buffer": true, - "nock>debug": true, - "semver": true - } - }, "@metamask/eth-snap-keyring>uuid": { "globals": { "crypto": true @@ -1214,7 +1149,6 @@ "packages": { "@metamask/eth-query>json-rpc-random-id": true, "@metamask/eth-token-tracker>@metamask/eth-block-tracker>@metamask/utils": true, - "@metamask/eth-token-tracker>@metamask/eth-block-tracker>@metamask/utils": true, "@metamask/safe-event-emitter": true, "pify": true } @@ -1234,21 +1168,6 @@ "semver": true } }, - "@metamask/eth-token-tracker>@metamask/eth-block-tracker>@metamask/utils": { - "globals": { - "TextDecoder": true, - "TextEncoder": true - }, - "packages": { - "@metamask/utils>@metamask/superstruct": true, - "@metamask/utils>@scure/base": true, - "@metamask/utils>pony-cause": true, - "@noble/hashes": true, - "browserify>buffer": true, - "nock>debug": true, - "semver": true - } - }, "@metamask/eth-token-tracker>deep-equal": { "packages": { "@lavamoat/lavapack>json-stable-stringify>isarray": true, @@ -1552,7 +1471,6 @@ "@metamask/keyring-api>bech32": true, "@metamask/keyring-api>uuid": true, "@metamask/utils": true, - "@metamask/utils": true, "@metamask/utils>@metamask/superstruct": true } }, @@ -1572,8 +1490,6 @@ "@metamask/keyring-controller>ethereumjs-wallet": true, "@metamask/name-controller>async-mutex": true, "@metamask/utils": true - "@metamask/name-controller>async-mutex": true, - "@metamask/utils": true } }, "@metamask/keyring-controller>@metamask/eth-hd-keyring": { @@ -1585,7 +1501,6 @@ "@ethereumjs/tx>ethereum-cryptography": true, "@metamask/eth-sig-util": true, "@metamask/keyring-controller>@metamask/eth-hd-keyring>@metamask/utils": true, - "@metamask/keyring-controller>@metamask/eth-hd-keyring>@metamask/utils": true, "@metamask/scure-bip39": true, "browserify>buffer": true } @@ -1605,33 +1520,16 @@ "semver": true } }, - "@metamask/keyring-controller>@metamask/eth-hd-keyring>@metamask/utils": { - "globals": { - "TextDecoder": true, - "TextEncoder": true - }, - "packages": { - "@metamask/utils>@metamask/superstruct": true, - "@metamask/utils>@scure/base": true, - "@metamask/utils>pony-cause": true, - "@noble/hashes": true, - "browserify>buffer": true, - "nock>debug": true, - "semver": true - } - }, "@metamask/keyring-controller>@metamask/eth-simple-keyring": { "packages": { "@ethereumjs/tx>@ethereumjs/util": true, "@ethereumjs/tx>ethereum-cryptography": true, "@metamask/eth-sig-util": true, "@metamask/keyring-controller>@metamask/eth-simple-keyring>@metamask/utils": true, - "@metamask/keyring-controller>@metamask/eth-simple-keyring>@metamask/utils": true, "browserify>buffer": true, "crypto-browserify>randombytes": true } }, - "@metamask/keyring-controller>@metamask/eth-simple-keyring>@metamask/utils": { "@metamask/keyring-controller>@metamask/eth-simple-keyring>@metamask/utils": { "globals": { "TextDecoder": true, @@ -1709,12 +1607,27 @@ "packages": { "@metamask/controller-utils": true, "@metamask/eth-sig-util": true, + "@metamask/message-manager>@metamask/base-controller": true, + "@metamask/message-manager>jsonschema": true, "@metamask/utils": true, "browserify>buffer": true, "uuid": true, "webpack>events": true } }, + "@metamask/message-manager>@metamask/base-controller": { + "globals": { + "setTimeout": true + }, + "packages": { + "immer": true + } + }, + "@metamask/message-manager>jsonschema": { + "packages": { + "browserify>url": true + } + }, "@metamask/message-signing-snap>@noble/ciphers": { "globals": { "TextDecoder": true, @@ -1741,23 +1654,6 @@ "@metamask/name-controller>async-mutex": true } }, - "@metamask/name-controller>@metamask/utils": { - "globals": { - "TextDecoder": true, - "TextEncoder": true - }, - "packages": { - "@metamask/utils>@metamask/superstruct": true, - "@metamask/utils>@scure/base": true, - "@metamask/utils>pony-cause": true, - "@noble/hashes": true, - "browserify>buffer": true, - "nock>debug": true, - "semver": true - "@metamask/name-controller>@metamask/utils": true, - "@metamask/name-controller>async-mutex": true - } - }, "@metamask/name-controller>@metamask/utils": { "globals": { "TextDecoder": true, @@ -1801,7 +1697,6 @@ "@metamask/rpc-errors": true, "@metamask/snaps-controllers>@metamask/json-rpc-engine": true, "@metamask/utils": true, - "@metamask/utils": true, "browserify>assert": true, "uuid": true } @@ -1814,7 +1709,6 @@ "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/eth-json-rpc-provider": true, "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/json-rpc-engine": true, "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/utils": true, - "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/utils": true, "@metamask/rpc-errors": true, "node-fetch": true } @@ -1827,28 +1721,11 @@ }, "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/json-rpc-engine": { "packages": { - "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/utils": true, "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/utils": true, "@metamask/rpc-errors": true, "@metamask/safe-event-emitter": true } }, - "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/utils": { - "globals": { - "TextDecoder": true, - "TextEncoder": true - }, - "packages": { - "@metamask/utils>@metamask/superstruct": true, - "@metamask/utils>@scure/base": true, - "@metamask/utils>pony-cause": true, - "@noble/hashes": true, - "browserify>buffer": true, - "nock>debug": true, - "semver": true - "@metamask/safe-event-emitter": true - } - }, "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/utils": { "globals": { "TextDecoder": true, @@ -1917,14 +1794,6 @@ "@metamask/notification-controller>nanoid": true } }, - "@metamask/notification-controller>@metamask/utils": { - "@metamask/notification-controller": { - "packages": { - "@metamask/base-controller": true, - "@metamask/notification-controller>@metamask/utils": true, - "@metamask/notification-controller>nanoid": true - } - }, "@metamask/notification-controller>@metamask/utils": { "globals": { "TextDecoder": true, @@ -2112,7 +1981,6 @@ "@metamask/base-controller": true, "@metamask/controller-utils": true, "@metamask/permission-controller>@metamask/utils": true, - "@metamask/permission-controller>@metamask/utils": true, "@metamask/permission-controller>nanoid": true, "@metamask/rpc-errors": true, "@metamask/snaps-controllers>@metamask/json-rpc-engine": true, @@ -2135,21 +2003,6 @@ "semver": true } }, - "@metamask/permission-controller>@metamask/utils": { - "globals": { - "TextDecoder": true, - "TextEncoder": true - }, - "packages": { - "@metamask/utils>@metamask/superstruct": true, - "@metamask/utils>@scure/base": true, - "@metamask/utils>pony-cause": true, - "@noble/hashes": true, - "browserify>buffer": true, - "nock>debug": true, - "semver": true - } - }, "@metamask/permission-controller>nanoid": { "globals": { "crypto.getRandomValues": true @@ -2159,7 +2012,6 @@ "packages": { "@metamask/permission-log-controller>@metamask/base-controller": true, "@metamask/permission-log-controller>@metamask/utils": true - "@metamask/permission-log-controller>@metamask/utils": true } }, "@metamask/permission-log-controller>@metamask/base-controller": { @@ -2185,21 +2037,6 @@ "semver": true } }, - "@metamask/permission-log-controller>@metamask/utils": { - "globals": { - "TextDecoder": true, - "TextEncoder": true - }, - "packages": { - "@metamask/utils>@metamask/superstruct": true, - "@metamask/utils>@scure/base": true, - "@metamask/utils>pony-cause": true, - "@noble/hashes": true, - "browserify>buffer": true, - "nock>debug": true, - "semver": true - } - }, "@metamask/phishing-controller": { "globals": { "TextEncoder": true, @@ -2235,7 +2072,6 @@ "removeEventListener": true }, "packages": { - "@metamask/post-message-stream>@metamask/utils": true, "@metamask/post-message-stream>@metamask/utils": true, "readable-stream": true } @@ -2255,21 +2091,6 @@ "semver": true } }, - "@metamask/post-message-stream>@metamask/utils": { - "globals": { - "TextDecoder": true, - "TextEncoder": true - }, - "packages": { - "@metamask/utils>@metamask/superstruct": true, - "@metamask/utils>@scure/base": true, - "@metamask/utils>pony-cause": true, - "@noble/hashes": true, - "browserify>buffer": true, - "nock>debug": true, - "semver": true - } - }, "@metamask/ppom-validator": { "globals": { "URL": true, @@ -2299,7 +2120,6 @@ "@metamask/controller-utils>@spruceid/siwe-parser": true, "@metamask/ethjs>@metamask/ethjs-unit": true, "@metamask/ppom-validator>@metamask/utils": true, - "@metamask/ppom-validator>@metamask/utils": true, "bn.js": true, "browserify>buffer": true, "eslint>fast-deep-equal": true, @@ -2321,21 +2141,6 @@ "semver": true } }, - "@metamask/ppom-validator>@metamask/utils": { - "globals": { - "TextDecoder": true, - "TextEncoder": true - }, - "packages": { - "@metamask/utils>@metamask/superstruct": true, - "@metamask/utils>@scure/base": true, - "@metamask/utils>pony-cause": true, - "@noble/hashes": true, - "browserify>buffer": true, - "nock>debug": true, - "semver": true - } - }, "@metamask/ppom-validator>crypto-js": { "globals": { "crypto": true, @@ -2438,28 +2243,11 @@ "packages": { "@metamask/base-controller": true, "@metamask/queued-request-controller>@metamask/utils": true, - "@metamask/queued-request-controller>@metamask/utils": true, "@metamask/rpc-errors": true, "@metamask/selected-network-controller": true, "@metamask/snaps-controllers>@metamask/json-rpc-engine": true } }, - "@metamask/queued-request-controller>@metamask/utils": { - "globals": { - "TextDecoder": true, - "TextEncoder": true - }, - "packages": { - "@metamask/utils>@metamask/superstruct": true, - "@metamask/utils>@scure/base": true, - "@metamask/utils>pony-cause": true, - "@noble/hashes": true, - "browserify>buffer": true, - "nock>debug": true, - "semver": true - "@metamask/snaps-controllers>@metamask/json-rpc-engine": true - } - }, "@metamask/queued-request-controller>@metamask/utils": { "globals": { "TextDecoder": true, @@ -2483,11 +2271,8 @@ "@metamask/base-controller": true, "@metamask/rate-limit-controller>@metamask/utils": true, "@metamask/rpc-errors": true - "@metamask/rate-limit-controller>@metamask/utils": true, - "@metamask/rpc-errors": true } }, - "@metamask/rate-limit-controller>@metamask/utils": { "@metamask/rate-limit-controller>@metamask/utils": { "globals": { "TextDecoder": true, @@ -2509,12 +2294,6 @@ "eth-rpc-errors>fast-safe-stringify": true } }, - "@metamask/rpc-errors": { - "packages": { - "@metamask/utils": true, - "eth-rpc-errors>fast-safe-stringify": true - } - }, "@metamask/rpc-methods-flask>nanoid": { "globals": { "crypto.getRandomValues": true @@ -2660,7 +2439,6 @@ "@metamask/smart-transactions-controller>@metamask/transaction-controller>@ethereumjs/util": true, "@metamask/smart-transactions-controller>@metamask/transaction-controller>@metamask/nonce-tracker": true, "@metamask/smart-transactions-controller>@metamask/transaction-controller>@metamask/utils": true, - "@metamask/smart-transactions-controller>@metamask/transaction-controller>@metamask/utils": true, "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry": true, "bn.js": true, "browserify>buffer": true, @@ -2724,21 +2502,6 @@ "semver": true } }, - "@metamask/smart-transactions-controller>@metamask/transaction-controller>@metamask/utils": { - "globals": { - "TextDecoder": true, - "TextEncoder": true - }, - "packages": { - "@metamask/utils>@metamask/superstruct": true, - "@metamask/utils>@scure/base": true, - "@metamask/utils>pony-cause": true, - "@noble/hashes": true, - "browserify>buffer": true, - "nock>debug": true, - "semver": true - } - }, "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry": { "packages": { "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-contract": true, @@ -2825,7 +2588,6 @@ "@metamask/snaps-utils": true, "@metamask/snaps-utils>@metamask/snaps-registry": true, "@metamask/utils": true, - "@metamask/utils": true, "browserify>browserify-zlib": true, "eslint>fast-deep-equal": true, "readable-stream": true @@ -2841,7 +2603,6 @@ "@metamask/rpc-errors": true, "@metamask/safe-event-emitter": true, "@metamask/utils": true - "@metamask/utils": true } }, "@metamask/snaps-controllers>@metamask/json-rpc-middleware-stream": { @@ -2852,7 +2613,6 @@ "packages": { "@metamask/safe-event-emitter": true, "@metamask/utils": true, - "@metamask/utils": true, "readable-stream": true } }, @@ -2867,7 +2627,6 @@ "@metamask/snaps-controllers>@metamask/json-rpc-engine": true, "@metamask/snaps-controllers>nanoid": true, "@metamask/utils": true, - "@metamask/utils": true, "deep-freeze-strict": true, "immer": true } @@ -2956,7 +2715,6 @@ "@metamask/snaps-utils>rfdc": true, "@metamask/snaps-utils>validate-npm-package-name": true, "@metamask/utils": true, - "@metamask/utils": true, "@metamask/utils>@metamask/superstruct": true, "@metamask/utils>@scure/base": true, "@noble/hashes": true, @@ -2975,7 +2733,6 @@ "@metamask/snaps-controllers>@metamask/json-rpc-engine": true, "@metamask/snaps-execution-environments>nanoid": true, "@metamask/utils": true, - "@metamask/utils": true, "deep-freeze-strict": true, "immer": true } @@ -2993,7 +2750,6 @@ "@metamask/snaps-sdk>@metamask/key-tree": true, "@metamask/snaps-utils": true, "@metamask/utils": true, - "@metamask/utils": true, "@metamask/utils>@metamask/superstruct": true, "@noble/hashes": true } @@ -3009,7 +2765,6 @@ "@metamask/snaps-controllers>@metamask/json-rpc-engine": true, "@metamask/snaps-rpc-methods>@metamask/permission-controller>nanoid": true, "@metamask/utils": true, - "@metamask/utils": true, "deep-freeze-strict": true, "immer": true } @@ -3026,7 +2781,6 @@ "packages": { "@metamask/rpc-errors": true, "@metamask/utils": true, - "@metamask/utils": true, "@metamask/utils>@metamask/superstruct": true } }, @@ -3035,7 +2789,6 @@ "@metamask/message-signing-snap>@noble/curves": true, "@metamask/scure-bip39": true, "@metamask/utils": true, - "@metamask/utils": true, "@metamask/utils>@scure/base": true, "@noble/hashes": true } @@ -3068,7 +2821,6 @@ "@metamask/snaps-utils>rfdc": true, "@metamask/snaps-utils>validate-npm-package-name": true, "@metamask/utils": true, - "@metamask/utils": true, "@metamask/utils>@metamask/superstruct": true, "@metamask/utils>@scure/base": true, "@noble/hashes": true, @@ -3087,7 +2839,6 @@ "@metamask/snaps-controllers>@metamask/json-rpc-engine": true, "@metamask/snaps-utils>@metamask/permission-controller>nanoid": true, "@metamask/utils": true, - "@metamask/utils": true, "deep-freeze-strict": true, "immer": true } @@ -3101,7 +2852,6 @@ "packages": { "@metamask/message-signing-snap>@noble/curves": true, "@metamask/utils": true, - "@metamask/utils": true, "@metamask/utils>@metamask/superstruct": true, "@noble/hashes": true } @@ -3220,7 +2970,6 @@ "@metamask/rpc-errors": true, "@metamask/transaction-controller>@metamask/nonce-tracker": true, "@metamask/utils": true, - "@metamask/utils": true, "bn.js": true, "browserify>buffer": true, "eth-method-registry": true, @@ -3259,7 +3008,6 @@ "@metamask/rpc-errors": true, "@metamask/transaction-controller": true, "@metamask/user-operation-controller>@metamask/utils": true, - "@metamask/user-operation-controller>@metamask/utils": true, "bn.js": true, "lodash": true, "superstruct": true, @@ -3282,21 +3030,6 @@ "semver": true } }, - "@metamask/user-operation-controller>@metamask/utils": { - "globals": { - "TextDecoder": true, - "TextEncoder": true - }, - "packages": { - "@metamask/utils>@metamask/superstruct": true, - "@metamask/utils>@scure/base": true, - "@metamask/utils>pony-cause": true, - "@noble/hashes": true, - "browserify>buffer": true, - "nock>debug": true, - "semver": true - } - }, "@metamask/utils": { "globals": { "TextDecoder": true, @@ -3366,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, @@ -4305,11 +3982,6 @@ "koa>is-generator-function>has-tostringtag": true } }, - "eslint>ajv>uri-js": { - "globals": { - "define": true - } - }, "eth-ens-namehash": { "globals": { "name": "write" @@ -5732,4 +5404,4 @@ } } } -} +} \ No newline at end of file diff --git a/lavamoat/browserify/flask/policy.json b/lavamoat/browserify/flask/policy.json index f9191fbfcb11..8cbb2cfe5181 100644 --- a/lavamoat/browserify/flask/policy.json +++ b/lavamoat/browserify/flask/policy.json @@ -766,7 +766,6 @@ }, "@metamask/abi-utils": { "packages": { - "@metamask/utils": true, "@metamask/utils": true, "@metamask/utils>@metamask/superstruct": true } @@ -775,23 +774,14 @@ "packages": { "@ethereumjs/tx>@ethereumjs/util": true, "@ethereumjs/tx>ethereum-cryptography": true, - "@metamask/accounts-controller>@metamask/base-controller": true, + "@metamask/base-controller": true, "@metamask/eth-snap-keyring": true, "@metamask/keyring-api": true, "@metamask/keyring-controller": true, "@metamask/utils": true, - "@metamask/utils": true, "uuid": true } }, - "@metamask/accounts-controller>@metamask/base-controller": { - "globals": { - "setTimeout": true - }, - "packages": { - "immer": true - } - }, "@metamask/address-book-controller": { "packages": { "@metamask/base-controller": true, @@ -856,7 +846,6 @@ "@metamask/name-controller>async-mutex": true, "@metamask/rpc-errors": true, "@metamask/utils": true, - "@metamask/utils": true, "bn.js": true, "lodash": true, "single-call-balance-checker-abi": true, @@ -916,7 +905,6 @@ "crypto.subtle.importKey": true }, "packages": { - "@metamask/browser-passworder>@metamask/utils": true, "@metamask/browser-passworder>@metamask/utils": true, "browserify>buffer": true } @@ -936,21 +924,6 @@ "semver": true } }, - "@metamask/browser-passworder>@metamask/utils": { - "globals": { - "TextDecoder": true, - "TextEncoder": true - }, - "packages": { - "@metamask/utils>@metamask/superstruct": true, - "@metamask/utils>@scure/base": true, - "@metamask/utils>pony-cause": true, - "@noble/hashes": true, - "browserify>buffer": true, - "nock>debug": true, - "semver": true - } - }, "@metamask/controller-utils": { "globals": { "URL": true, @@ -963,7 +936,6 @@ "@metamask/controller-utils>@spruceid/siwe-parser": true, "@metamask/ethjs>@metamask/ethjs-unit": true, "@metamask/utils": true, - "@metamask/utils": true, "bn.js": true, "browserify>buffer": true, "eslint>fast-deep-equal": true, @@ -1006,7 +978,6 @@ "@metamask/base-controller": true, "@metamask/controller-utils": true, "@metamask/utils": true, - "@metamask/utils": true, "punycode": true } }, @@ -1030,28 +1001,11 @@ }, "@metamask/eth-json-rpc-filters>@metamask/json-rpc-engine": { "packages": { - "@metamask/eth-json-rpc-filters>@metamask/json-rpc-engine>@metamask/utils": true, "@metamask/eth-json-rpc-filters>@metamask/json-rpc-engine>@metamask/utils": true, "@metamask/rpc-errors": true, "@metamask/safe-event-emitter": true } }, - "@metamask/eth-json-rpc-filters>@metamask/json-rpc-engine>@metamask/utils": { - "globals": { - "TextDecoder": true, - "TextEncoder": true - }, - "packages": { - "@metamask/utils>@metamask/superstruct": true, - "@metamask/utils>@scure/base": true, - "@metamask/utils>pony-cause": true, - "@noble/hashes": true, - "browserify>buffer": true, - "nock>debug": true, - "semver": true - "@metamask/safe-event-emitter": true - } - }, "@metamask/eth-json-rpc-filters>@metamask/json-rpc-engine>@metamask/utils": { "globals": { "TextDecoder": true, @@ -1088,8 +1042,6 @@ "@metamask/rpc-errors": true, "@metamask/snaps-controllers>@metamask/json-rpc-engine": true, "@metamask/utils": true - "@metamask/snaps-controllers>@metamask/json-rpc-engine": true, - "@metamask/utils": true } }, "@metamask/eth-ledger-bridge-keyring": { @@ -1124,7 +1076,6 @@ "@metamask/abi-utils": true, "@metamask/eth-sig-util>tweetnacl": true, "@metamask/utils": true, - "@metamask/utils": true, "@metamask/utils>@scure/base": true, "browserify>buffer": true } @@ -1148,7 +1099,6 @@ "@ethereumjs/tx": true, "@metamask/eth-sig-util": true, "@metamask/eth-snap-keyring>@metamask/utils": true, - "@metamask/eth-snap-keyring>@metamask/utils": true, "@metamask/eth-snap-keyring>uuid": true, "@metamask/keyring-api": true, "superstruct": true, @@ -1170,21 +1120,6 @@ "semver": true } }, - "@metamask/eth-snap-keyring>@metamask/utils": { - "globals": { - "TextDecoder": true, - "TextEncoder": true - }, - "packages": { - "@metamask/utils>@metamask/superstruct": true, - "@metamask/utils>@scure/base": true, - "@metamask/utils>pony-cause": true, - "@noble/hashes": true, - "browserify>buffer": true, - "nock>debug": true, - "semver": true - } - }, "@metamask/eth-snap-keyring>uuid": { "globals": { "crypto": true @@ -1214,7 +1149,6 @@ "packages": { "@metamask/eth-query>json-rpc-random-id": true, "@metamask/eth-token-tracker>@metamask/eth-block-tracker>@metamask/utils": true, - "@metamask/eth-token-tracker>@metamask/eth-block-tracker>@metamask/utils": true, "@metamask/safe-event-emitter": true, "pify": true } @@ -1234,21 +1168,6 @@ "semver": true } }, - "@metamask/eth-token-tracker>@metamask/eth-block-tracker>@metamask/utils": { - "globals": { - "TextDecoder": true, - "TextEncoder": true - }, - "packages": { - "@metamask/utils>@metamask/superstruct": true, - "@metamask/utils>@scure/base": true, - "@metamask/utils>pony-cause": true, - "@noble/hashes": true, - "browserify>buffer": true, - "nock>debug": true, - "semver": true - } - }, "@metamask/eth-token-tracker>deep-equal": { "packages": { "@lavamoat/lavapack>json-stable-stringify>isarray": true, @@ -1552,7 +1471,6 @@ "@metamask/keyring-api>bech32": true, "@metamask/keyring-api>uuid": true, "@metamask/utils": true, - "@metamask/utils": true, "@metamask/utils>@metamask/superstruct": true } }, @@ -1572,8 +1490,6 @@ "@metamask/keyring-controller>ethereumjs-wallet": true, "@metamask/name-controller>async-mutex": true, "@metamask/utils": true - "@metamask/name-controller>async-mutex": true, - "@metamask/utils": true } }, "@metamask/keyring-controller>@metamask/eth-hd-keyring": { @@ -1585,7 +1501,6 @@ "@ethereumjs/tx>ethereum-cryptography": true, "@metamask/eth-sig-util": true, "@metamask/keyring-controller>@metamask/eth-hd-keyring>@metamask/utils": true, - "@metamask/keyring-controller>@metamask/eth-hd-keyring>@metamask/utils": true, "@metamask/scure-bip39": true, "browserify>buffer": true } @@ -1605,33 +1520,16 @@ "semver": true } }, - "@metamask/keyring-controller>@metamask/eth-hd-keyring>@metamask/utils": { - "globals": { - "TextDecoder": true, - "TextEncoder": true - }, - "packages": { - "@metamask/utils>@metamask/superstruct": true, - "@metamask/utils>@scure/base": true, - "@metamask/utils>pony-cause": true, - "@noble/hashes": true, - "browserify>buffer": true, - "nock>debug": true, - "semver": true - } - }, "@metamask/keyring-controller>@metamask/eth-simple-keyring": { "packages": { "@ethereumjs/tx>@ethereumjs/util": true, "@ethereumjs/tx>ethereum-cryptography": true, "@metamask/eth-sig-util": true, "@metamask/keyring-controller>@metamask/eth-simple-keyring>@metamask/utils": true, - "@metamask/keyring-controller>@metamask/eth-simple-keyring>@metamask/utils": true, "browserify>buffer": true, "crypto-browserify>randombytes": true } }, - "@metamask/keyring-controller>@metamask/eth-simple-keyring>@metamask/utils": { "@metamask/keyring-controller>@metamask/eth-simple-keyring>@metamask/utils": { "globals": { "TextDecoder": true, @@ -1709,12 +1607,27 @@ "packages": { "@metamask/controller-utils": true, "@metamask/eth-sig-util": true, + "@metamask/message-manager>@metamask/base-controller": true, + "@metamask/message-manager>jsonschema": true, "@metamask/utils": true, "browserify>buffer": true, "uuid": true, "webpack>events": true } }, + "@metamask/message-manager>@metamask/base-controller": { + "globals": { + "setTimeout": true + }, + "packages": { + "immer": true + } + }, + "@metamask/message-manager>jsonschema": { + "packages": { + "browserify>url": true + } + }, "@metamask/message-signing-snap>@noble/ciphers": { "globals": { "TextDecoder": true, @@ -1741,23 +1654,6 @@ "@metamask/name-controller>async-mutex": true } }, - "@metamask/name-controller>@metamask/utils": { - "globals": { - "TextDecoder": true, - "TextEncoder": true - }, - "packages": { - "@metamask/utils>@metamask/superstruct": true, - "@metamask/utils>@scure/base": true, - "@metamask/utils>pony-cause": true, - "@noble/hashes": true, - "browserify>buffer": true, - "nock>debug": true, - "semver": true - "@metamask/name-controller>@metamask/utils": true, - "@metamask/name-controller>async-mutex": true - } - }, "@metamask/name-controller>@metamask/utils": { "globals": { "TextDecoder": true, @@ -1801,7 +1697,6 @@ "@metamask/rpc-errors": true, "@metamask/snaps-controllers>@metamask/json-rpc-engine": true, "@metamask/utils": true, - "@metamask/utils": true, "browserify>assert": true, "uuid": true } @@ -1814,7 +1709,6 @@ "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/eth-json-rpc-provider": true, "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/json-rpc-engine": true, "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/utils": true, - "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/utils": true, "@metamask/rpc-errors": true, "node-fetch": true } @@ -1827,28 +1721,11 @@ }, "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/json-rpc-engine": { "packages": { - "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/utils": true, "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/utils": true, "@metamask/rpc-errors": true, "@metamask/safe-event-emitter": true } }, - "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/utils": { - "globals": { - "TextDecoder": true, - "TextEncoder": true - }, - "packages": { - "@metamask/utils>@metamask/superstruct": true, - "@metamask/utils>@scure/base": true, - "@metamask/utils>pony-cause": true, - "@noble/hashes": true, - "browserify>buffer": true, - "nock>debug": true, - "semver": true - "@metamask/safe-event-emitter": true - } - }, "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/utils": { "globals": { "TextDecoder": true, @@ -1917,14 +1794,6 @@ "@metamask/notification-controller>nanoid": true } }, - "@metamask/notification-controller>@metamask/utils": { - "@metamask/notification-controller": { - "packages": { - "@metamask/base-controller": true, - "@metamask/notification-controller>@metamask/utils": true, - "@metamask/notification-controller>nanoid": true - } - }, "@metamask/notification-controller>@metamask/utils": { "globals": { "TextDecoder": true, @@ -2112,7 +1981,6 @@ "@metamask/base-controller": true, "@metamask/controller-utils": true, "@metamask/permission-controller>@metamask/utils": true, - "@metamask/permission-controller>@metamask/utils": true, "@metamask/permission-controller>nanoid": true, "@metamask/rpc-errors": true, "@metamask/snaps-controllers>@metamask/json-rpc-engine": true, @@ -2135,21 +2003,6 @@ "semver": true } }, - "@metamask/permission-controller>@metamask/utils": { - "globals": { - "TextDecoder": true, - "TextEncoder": true - }, - "packages": { - "@metamask/utils>@metamask/superstruct": true, - "@metamask/utils>@scure/base": true, - "@metamask/utils>pony-cause": true, - "@noble/hashes": true, - "browserify>buffer": true, - "nock>debug": true, - "semver": true - } - }, "@metamask/permission-controller>nanoid": { "globals": { "crypto.getRandomValues": true @@ -2159,7 +2012,6 @@ "packages": { "@metamask/permission-log-controller>@metamask/base-controller": true, "@metamask/permission-log-controller>@metamask/utils": true - "@metamask/permission-log-controller>@metamask/utils": true } }, "@metamask/permission-log-controller>@metamask/base-controller": { @@ -2185,21 +2037,6 @@ "semver": true } }, - "@metamask/permission-log-controller>@metamask/utils": { - "globals": { - "TextDecoder": true, - "TextEncoder": true - }, - "packages": { - "@metamask/utils>@metamask/superstruct": true, - "@metamask/utils>@scure/base": true, - "@metamask/utils>pony-cause": true, - "@noble/hashes": true, - "browserify>buffer": true, - "nock>debug": true, - "semver": true - } - }, "@metamask/phishing-controller": { "globals": { "TextEncoder": true, @@ -2235,7 +2072,6 @@ "removeEventListener": true }, "packages": { - "@metamask/post-message-stream>@metamask/utils": true, "@metamask/post-message-stream>@metamask/utils": true, "readable-stream": true } @@ -2255,21 +2091,6 @@ "semver": true } }, - "@metamask/post-message-stream>@metamask/utils": { - "globals": { - "TextDecoder": true, - "TextEncoder": true - }, - "packages": { - "@metamask/utils>@metamask/superstruct": true, - "@metamask/utils>@scure/base": true, - "@metamask/utils>pony-cause": true, - "@noble/hashes": true, - "browserify>buffer": true, - "nock>debug": true, - "semver": true - } - }, "@metamask/ppom-validator": { "globals": { "URL": true, @@ -2299,7 +2120,6 @@ "@metamask/controller-utils>@spruceid/siwe-parser": true, "@metamask/ethjs>@metamask/ethjs-unit": true, "@metamask/ppom-validator>@metamask/utils": true, - "@metamask/ppom-validator>@metamask/utils": true, "bn.js": true, "browserify>buffer": true, "eslint>fast-deep-equal": true, @@ -2321,21 +2141,6 @@ "semver": true } }, - "@metamask/ppom-validator>@metamask/utils": { - "globals": { - "TextDecoder": true, - "TextEncoder": true - }, - "packages": { - "@metamask/utils>@metamask/superstruct": true, - "@metamask/utils>@scure/base": true, - "@metamask/utils>pony-cause": true, - "@noble/hashes": true, - "browserify>buffer": true, - "nock>debug": true, - "semver": true - } - }, "@metamask/ppom-validator>crypto-js": { "globals": { "crypto": true, @@ -2438,28 +2243,11 @@ "packages": { "@metamask/base-controller": true, "@metamask/queued-request-controller>@metamask/utils": true, - "@metamask/queued-request-controller>@metamask/utils": true, "@metamask/rpc-errors": true, "@metamask/selected-network-controller": true, "@metamask/snaps-controllers>@metamask/json-rpc-engine": true } }, - "@metamask/queued-request-controller>@metamask/utils": { - "globals": { - "TextDecoder": true, - "TextEncoder": true - }, - "packages": { - "@metamask/utils>@metamask/superstruct": true, - "@metamask/utils>@scure/base": true, - "@metamask/utils>pony-cause": true, - "@noble/hashes": true, - "browserify>buffer": true, - "nock>debug": true, - "semver": true - "@metamask/snaps-controllers>@metamask/json-rpc-engine": true - } - }, "@metamask/queued-request-controller>@metamask/utils": { "globals": { "TextDecoder": true, @@ -2483,11 +2271,8 @@ "@metamask/base-controller": true, "@metamask/rate-limit-controller>@metamask/utils": true, "@metamask/rpc-errors": true - "@metamask/rate-limit-controller>@metamask/utils": true, - "@metamask/rpc-errors": true } }, - "@metamask/rate-limit-controller>@metamask/utils": { "@metamask/rate-limit-controller>@metamask/utils": { "globals": { "TextDecoder": true, @@ -2509,12 +2294,6 @@ "eth-rpc-errors>fast-safe-stringify": true } }, - "@metamask/rpc-errors": { - "packages": { - "@metamask/utils": true, - "eth-rpc-errors>fast-safe-stringify": true - } - }, "@metamask/rpc-methods-flask>nanoid": { "globals": { "crypto.getRandomValues": true @@ -2660,7 +2439,6 @@ "@metamask/smart-transactions-controller>@metamask/transaction-controller>@ethereumjs/util": true, "@metamask/smart-transactions-controller>@metamask/transaction-controller>@metamask/nonce-tracker": true, "@metamask/smart-transactions-controller>@metamask/transaction-controller>@metamask/utils": true, - "@metamask/smart-transactions-controller>@metamask/transaction-controller>@metamask/utils": true, "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry": true, "bn.js": true, "browserify>buffer": true, @@ -2724,21 +2502,6 @@ "semver": true } }, - "@metamask/smart-transactions-controller>@metamask/transaction-controller>@metamask/utils": { - "globals": { - "TextDecoder": true, - "TextEncoder": true - }, - "packages": { - "@metamask/utils>@metamask/superstruct": true, - "@metamask/utils>@scure/base": true, - "@metamask/utils>pony-cause": true, - "@noble/hashes": true, - "browserify>buffer": true, - "nock>debug": true, - "semver": true - } - }, "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry": { "packages": { "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-contract": true, @@ -2825,7 +2588,6 @@ "@metamask/snaps-utils": true, "@metamask/snaps-utils>@metamask/snaps-registry": true, "@metamask/utils": true, - "@metamask/utils": true, "browserify>browserify-zlib": true, "eslint>fast-deep-equal": true, "readable-stream": true @@ -2841,7 +2603,6 @@ "@metamask/rpc-errors": true, "@metamask/safe-event-emitter": true, "@metamask/utils": true - "@metamask/utils": true } }, "@metamask/snaps-controllers>@metamask/json-rpc-middleware-stream": { @@ -2852,7 +2613,6 @@ "packages": { "@metamask/safe-event-emitter": true, "@metamask/utils": true, - "@metamask/utils": true, "readable-stream": true } }, @@ -2867,7 +2627,6 @@ "@metamask/snaps-controllers>@metamask/json-rpc-engine": true, "@metamask/snaps-controllers>nanoid": true, "@metamask/utils": true, - "@metamask/utils": true, "deep-freeze-strict": true, "immer": true } @@ -2956,7 +2715,6 @@ "@metamask/snaps-utils>rfdc": true, "@metamask/snaps-utils>validate-npm-package-name": true, "@metamask/utils": true, - "@metamask/utils": true, "@metamask/utils>@metamask/superstruct": true, "@metamask/utils>@scure/base": true, "@noble/hashes": true, @@ -2975,7 +2733,6 @@ "@metamask/snaps-controllers>@metamask/json-rpc-engine": true, "@metamask/snaps-execution-environments>nanoid": true, "@metamask/utils": true, - "@metamask/utils": true, "deep-freeze-strict": true, "immer": true } @@ -2993,7 +2750,6 @@ "@metamask/snaps-sdk>@metamask/key-tree": true, "@metamask/snaps-utils": true, "@metamask/utils": true, - "@metamask/utils": true, "@metamask/utils>@metamask/superstruct": true, "@noble/hashes": true } @@ -3009,7 +2765,6 @@ "@metamask/snaps-controllers>@metamask/json-rpc-engine": true, "@metamask/snaps-rpc-methods>@metamask/permission-controller>nanoid": true, "@metamask/utils": true, - "@metamask/utils": true, "deep-freeze-strict": true, "immer": true } @@ -3026,7 +2781,6 @@ "packages": { "@metamask/rpc-errors": true, "@metamask/utils": true, - "@metamask/utils": true, "@metamask/utils>@metamask/superstruct": true } }, @@ -3035,7 +2789,6 @@ "@metamask/message-signing-snap>@noble/curves": true, "@metamask/scure-bip39": true, "@metamask/utils": true, - "@metamask/utils": true, "@metamask/utils>@scure/base": true, "@noble/hashes": true } @@ -3068,7 +2821,6 @@ "@metamask/snaps-utils>rfdc": true, "@metamask/snaps-utils>validate-npm-package-name": true, "@metamask/utils": true, - "@metamask/utils": true, "@metamask/utils>@metamask/superstruct": true, "@metamask/utils>@scure/base": true, "@noble/hashes": true, @@ -3087,7 +2839,6 @@ "@metamask/snaps-controllers>@metamask/json-rpc-engine": true, "@metamask/snaps-utils>@metamask/permission-controller>nanoid": true, "@metamask/utils": true, - "@metamask/utils": true, "deep-freeze-strict": true, "immer": true } @@ -3101,7 +2852,6 @@ "packages": { "@metamask/message-signing-snap>@noble/curves": true, "@metamask/utils": true, - "@metamask/utils": true, "@metamask/utils>@metamask/superstruct": true, "@noble/hashes": true } @@ -3220,7 +2970,6 @@ "@metamask/rpc-errors": true, "@metamask/transaction-controller>@metamask/nonce-tracker": true, "@metamask/utils": true, - "@metamask/utils": true, "bn.js": true, "browserify>buffer": true, "eth-method-registry": true, @@ -3259,7 +3008,6 @@ "@metamask/rpc-errors": true, "@metamask/transaction-controller": true, "@metamask/user-operation-controller>@metamask/utils": true, - "@metamask/user-operation-controller>@metamask/utils": true, "bn.js": true, "lodash": true, "superstruct": true, @@ -3282,21 +3030,6 @@ "semver": true } }, - "@metamask/user-operation-controller>@metamask/utils": { - "globals": { - "TextDecoder": true, - "TextEncoder": true - }, - "packages": { - "@metamask/utils>@metamask/superstruct": true, - "@metamask/utils>@scure/base": true, - "@metamask/utils>pony-cause": true, - "@noble/hashes": true, - "browserify>buffer": true, - "nock>debug": true, - "semver": true - } - }, "@metamask/utils": { "globals": { "TextDecoder": true, @@ -3366,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, @@ -4305,11 +3982,6 @@ "koa>is-generator-function>has-tostringtag": true } }, - "eslint>ajv>uri-js": { - "globals": { - "define": true - } - }, "eth-ens-namehash": { "globals": { "name": "write" @@ -5732,4 +5404,4 @@ } } } -} +} \ No newline at end of file diff --git a/lavamoat/browserify/main/policy.json b/lavamoat/browserify/main/policy.json index 4f7fc4412007..8cbb2cfe5181 100644 --- a/lavamoat/browserify/main/policy.json +++ b/lavamoat/browserify/main/policy.json @@ -1608,9 +1608,9 @@ "@metamask/controller-utils": true, "@metamask/eth-sig-util": true, "@metamask/message-manager>@metamask/base-controller": true, + "@metamask/message-manager>jsonschema": true, "@metamask/utils": true, "browserify>buffer": true, - "jsonschema": true, "uuid": true, "webpack>events": true } @@ -1623,6 +1623,11 @@ "immer": true } }, + "@metamask/message-manager>jsonschema": { + "packages": { + "browserify>url": true + } + }, "@metamask/message-signing-snap>@noble/ciphers": { "globals": { "TextDecoder": true, @@ -3094,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, @@ -4033,11 +3982,6 @@ "koa>is-generator-function>has-tostringtag": true } }, - "eslint>ajv>uri-js": { - "globals": { - "define": true - } - }, "eth-ens-namehash": { "globals": { "name": "write" @@ -4510,11 +4454,6 @@ "readable-stream": true } }, - "jsonschema": { - "packages": { - "browserify>url": true - } - }, "koa>content-disposition>safe-buffer": { "packages": { "browserify>buffer": true diff --git a/lavamoat/browserify/mmi/policy.json b/lavamoat/browserify/mmi/policy.json index dead03aefcb5..1cbf803bc079 100644 --- a/lavamoat/browserify/mmi/policy.json +++ b/lavamoat/browserify/mmi/policy.json @@ -858,7 +858,6 @@ }, "@metamask/abi-utils": { "packages": { - "@metamask/utils": true, "@metamask/utils": true, "@metamask/utils>@metamask/superstruct": true } @@ -867,23 +866,14 @@ "packages": { "@ethereumjs/tx>@ethereumjs/util": true, "@ethereumjs/tx>ethereum-cryptography": true, - "@metamask/accounts-controller>@metamask/base-controller": true, + "@metamask/base-controller": true, "@metamask/eth-snap-keyring": true, "@metamask/keyring-api": true, "@metamask/keyring-controller": true, "@metamask/utils": true, - "@metamask/utils": true, "uuid": true } }, - "@metamask/accounts-controller>@metamask/base-controller": { - "globals": { - "setTimeout": true - }, - "packages": { - "immer": true - } - }, "@metamask/address-book-controller": { "packages": { "@metamask/base-controller": true, @@ -948,7 +938,6 @@ "@metamask/name-controller>async-mutex": true, "@metamask/rpc-errors": true, "@metamask/utils": true, - "@metamask/utils": true, "bn.js": true, "lodash": true, "single-call-balance-checker-abi": true, @@ -1008,7 +997,6 @@ "crypto.subtle.importKey": true }, "packages": { - "@metamask/browser-passworder>@metamask/utils": true, "@metamask/browser-passworder>@metamask/utils": true, "browserify>buffer": true } @@ -1028,21 +1016,6 @@ "semver": true } }, - "@metamask/browser-passworder>@metamask/utils": { - "globals": { - "TextDecoder": true, - "TextEncoder": true - }, - "packages": { - "@metamask/utils>@metamask/superstruct": true, - "@metamask/utils>@scure/base": true, - "@metamask/utils>pony-cause": true, - "@noble/hashes": true, - "browserify>buffer": true, - "nock>debug": true, - "semver": true - } - }, "@metamask/controller-utils": { "globals": { "URL": true, @@ -1055,7 +1028,6 @@ "@metamask/controller-utils>@spruceid/siwe-parser": true, "@metamask/ethjs>@metamask/ethjs-unit": true, "@metamask/utils": true, - "@metamask/utils": true, "bn.js": true, "browserify>buffer": true, "eslint>fast-deep-equal": true, @@ -1098,7 +1070,6 @@ "@metamask/base-controller": true, "@metamask/controller-utils": true, "@metamask/utils": true, - "@metamask/utils": true, "punycode": true } }, @@ -1122,28 +1093,11 @@ }, "@metamask/eth-json-rpc-filters>@metamask/json-rpc-engine": { "packages": { - "@metamask/eth-json-rpc-filters>@metamask/json-rpc-engine>@metamask/utils": true, "@metamask/eth-json-rpc-filters>@metamask/json-rpc-engine>@metamask/utils": true, "@metamask/rpc-errors": true, "@metamask/safe-event-emitter": true } }, - "@metamask/eth-json-rpc-filters>@metamask/json-rpc-engine>@metamask/utils": { - "globals": { - "TextDecoder": true, - "TextEncoder": true - }, - "packages": { - "@metamask/utils>@metamask/superstruct": true, - "@metamask/utils>@scure/base": true, - "@metamask/utils>pony-cause": true, - "@noble/hashes": true, - "browserify>buffer": true, - "nock>debug": true, - "semver": true - "@metamask/safe-event-emitter": true - } - }, "@metamask/eth-json-rpc-filters>@metamask/json-rpc-engine>@metamask/utils": { "globals": { "TextDecoder": true, @@ -1180,8 +1134,6 @@ "@metamask/rpc-errors": true, "@metamask/snaps-controllers>@metamask/json-rpc-engine": true, "@metamask/utils": true - "@metamask/snaps-controllers>@metamask/json-rpc-engine": true, - "@metamask/utils": true } }, "@metamask/eth-ledger-bridge-keyring": { @@ -1216,7 +1168,6 @@ "@metamask/abi-utils": true, "@metamask/eth-sig-util>tweetnacl": true, "@metamask/utils": true, - "@metamask/utils": true, "@metamask/utils>@scure/base": true, "browserify>buffer": true } @@ -1240,7 +1191,6 @@ "@ethereumjs/tx": true, "@metamask/eth-sig-util": true, "@metamask/eth-snap-keyring>@metamask/utils": true, - "@metamask/eth-snap-keyring>@metamask/utils": true, "@metamask/eth-snap-keyring>uuid": true, "@metamask/keyring-api": true, "superstruct": true, @@ -1262,21 +1212,6 @@ "semver": true } }, - "@metamask/eth-snap-keyring>@metamask/utils": { - "globals": { - "TextDecoder": true, - "TextEncoder": true - }, - "packages": { - "@metamask/utils>@metamask/superstruct": true, - "@metamask/utils>@scure/base": true, - "@metamask/utils>pony-cause": true, - "@noble/hashes": true, - "browserify>buffer": true, - "nock>debug": true, - "semver": true - } - }, "@metamask/eth-snap-keyring>uuid": { "globals": { "crypto": true @@ -1306,7 +1241,6 @@ "packages": { "@metamask/eth-query>json-rpc-random-id": true, "@metamask/eth-token-tracker>@metamask/eth-block-tracker>@metamask/utils": true, - "@metamask/eth-token-tracker>@metamask/eth-block-tracker>@metamask/utils": true, "@metamask/safe-event-emitter": true, "pify": true } @@ -1326,21 +1260,6 @@ "semver": true } }, - "@metamask/eth-token-tracker>@metamask/eth-block-tracker>@metamask/utils": { - "globals": { - "TextDecoder": true, - "TextEncoder": true - }, - "packages": { - "@metamask/utils>@metamask/superstruct": true, - "@metamask/utils>@scure/base": true, - "@metamask/utils>pony-cause": true, - "@noble/hashes": true, - "browserify>buffer": true, - "nock>debug": true, - "semver": true - } - }, "@metamask/eth-token-tracker>deep-equal": { "packages": { "@lavamoat/lavapack>json-stable-stringify>isarray": true, @@ -1644,7 +1563,6 @@ "@metamask/keyring-api>bech32": true, "@metamask/keyring-api>uuid": true, "@metamask/utils": true, - "@metamask/utils": true, "@metamask/utils>@metamask/superstruct": true } }, @@ -1664,8 +1582,6 @@ "@metamask/keyring-controller>ethereumjs-wallet": true, "@metamask/name-controller>async-mutex": true, "@metamask/utils": true - "@metamask/name-controller>async-mutex": true, - "@metamask/utils": true } }, "@metamask/keyring-controller>@metamask/eth-hd-keyring": { @@ -1677,7 +1593,6 @@ "@ethereumjs/tx>ethereum-cryptography": true, "@metamask/eth-sig-util": true, "@metamask/keyring-controller>@metamask/eth-hd-keyring>@metamask/utils": true, - "@metamask/keyring-controller>@metamask/eth-hd-keyring>@metamask/utils": true, "@metamask/scure-bip39": true, "browserify>buffer": true } @@ -1697,33 +1612,16 @@ "semver": true } }, - "@metamask/keyring-controller>@metamask/eth-hd-keyring>@metamask/utils": { - "globals": { - "TextDecoder": true, - "TextEncoder": true - }, - "packages": { - "@metamask/utils>@metamask/superstruct": true, - "@metamask/utils>@scure/base": true, - "@metamask/utils>pony-cause": true, - "@noble/hashes": true, - "browserify>buffer": true, - "nock>debug": true, - "semver": true - } - }, "@metamask/keyring-controller>@metamask/eth-simple-keyring": { "packages": { "@ethereumjs/tx>@ethereumjs/util": true, "@ethereumjs/tx>ethereum-cryptography": true, "@metamask/eth-sig-util": true, "@metamask/keyring-controller>@metamask/eth-simple-keyring>@metamask/utils": true, - "@metamask/keyring-controller>@metamask/eth-simple-keyring>@metamask/utils": true, "browserify>buffer": true, "crypto-browserify>randombytes": true } }, - "@metamask/keyring-controller>@metamask/eth-simple-keyring>@metamask/utils": { "@metamask/keyring-controller>@metamask/eth-simple-keyring>@metamask/utils": { "globals": { "TextDecoder": true, @@ -1801,12 +1699,27 @@ "packages": { "@metamask/controller-utils": true, "@metamask/eth-sig-util": true, + "@metamask/message-manager>@metamask/base-controller": true, + "@metamask/message-manager>jsonschema": true, "@metamask/utils": true, "browserify>buffer": true, "uuid": true, "webpack>events": true } }, + "@metamask/message-manager>@metamask/base-controller": { + "globals": { + "setTimeout": true + }, + "packages": { + "immer": true + } + }, + "@metamask/message-manager>jsonschema": { + "packages": { + "browserify>url": true + } + }, "@metamask/message-signing-snap>@noble/ciphers": { "globals": { "TextDecoder": true, @@ -1833,23 +1746,6 @@ "@metamask/name-controller>async-mutex": true } }, - "@metamask/name-controller>@metamask/utils": { - "globals": { - "TextDecoder": true, - "TextEncoder": true - }, - "packages": { - "@metamask/utils>@metamask/superstruct": true, - "@metamask/utils>@scure/base": true, - "@metamask/utils>pony-cause": true, - "@noble/hashes": true, - "browserify>buffer": true, - "nock>debug": true, - "semver": true - "@metamask/name-controller>@metamask/utils": true, - "@metamask/name-controller>async-mutex": true - } - }, "@metamask/name-controller>@metamask/utils": { "globals": { "TextDecoder": true, @@ -1893,7 +1789,6 @@ "@metamask/rpc-errors": true, "@metamask/snaps-controllers>@metamask/json-rpc-engine": true, "@metamask/utils": true, - "@metamask/utils": true, "browserify>assert": true, "uuid": true } @@ -1906,7 +1801,6 @@ "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/eth-json-rpc-provider": true, "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/json-rpc-engine": true, "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/utils": true, - "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/utils": true, "@metamask/rpc-errors": true, "node-fetch": true } @@ -1919,28 +1813,11 @@ }, "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/json-rpc-engine": { "packages": { - "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/utils": true, "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/utils": true, "@metamask/rpc-errors": true, "@metamask/safe-event-emitter": true } }, - "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/utils": { - "globals": { - "TextDecoder": true, - "TextEncoder": true - }, - "packages": { - "@metamask/utils>@metamask/superstruct": true, - "@metamask/utils>@scure/base": true, - "@metamask/utils>pony-cause": true, - "@noble/hashes": true, - "browserify>buffer": true, - "nock>debug": true, - "semver": true - "@metamask/safe-event-emitter": true - } - }, "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/utils": { "globals": { "TextDecoder": true, @@ -2009,14 +1886,6 @@ "@metamask/notification-controller>nanoid": true } }, - "@metamask/notification-controller>@metamask/utils": { - "@metamask/notification-controller": { - "packages": { - "@metamask/base-controller": true, - "@metamask/notification-controller>@metamask/utils": true, - "@metamask/notification-controller>nanoid": true - } - }, "@metamask/notification-controller>@metamask/utils": { "globals": { "TextDecoder": true, @@ -2204,7 +2073,6 @@ "@metamask/base-controller": true, "@metamask/controller-utils": true, "@metamask/permission-controller>@metamask/utils": true, - "@metamask/permission-controller>@metamask/utils": true, "@metamask/permission-controller>nanoid": true, "@metamask/rpc-errors": true, "@metamask/snaps-controllers>@metamask/json-rpc-engine": true, @@ -2227,21 +2095,6 @@ "semver": true } }, - "@metamask/permission-controller>@metamask/utils": { - "globals": { - "TextDecoder": true, - "TextEncoder": true - }, - "packages": { - "@metamask/utils>@metamask/superstruct": true, - "@metamask/utils>@scure/base": true, - "@metamask/utils>pony-cause": true, - "@noble/hashes": true, - "browserify>buffer": true, - "nock>debug": true, - "semver": true - } - }, "@metamask/permission-controller>nanoid": { "globals": { "crypto.getRandomValues": true @@ -2251,7 +2104,6 @@ "packages": { "@metamask/permission-log-controller>@metamask/base-controller": true, "@metamask/permission-log-controller>@metamask/utils": true - "@metamask/permission-log-controller>@metamask/utils": true } }, "@metamask/permission-log-controller>@metamask/base-controller": { @@ -2277,21 +2129,6 @@ "semver": true } }, - "@metamask/permission-log-controller>@metamask/utils": { - "globals": { - "TextDecoder": true, - "TextEncoder": true - }, - "packages": { - "@metamask/utils>@metamask/superstruct": true, - "@metamask/utils>@scure/base": true, - "@metamask/utils>pony-cause": true, - "@noble/hashes": true, - "browserify>buffer": true, - "nock>debug": true, - "semver": true - } - }, "@metamask/phishing-controller": { "globals": { "TextEncoder": true, @@ -2327,7 +2164,6 @@ "removeEventListener": true }, "packages": { - "@metamask/post-message-stream>@metamask/utils": true, "@metamask/post-message-stream>@metamask/utils": true, "readable-stream": true } @@ -2347,21 +2183,6 @@ "semver": true } }, - "@metamask/post-message-stream>@metamask/utils": { - "globals": { - "TextDecoder": true, - "TextEncoder": true - }, - "packages": { - "@metamask/utils>@metamask/superstruct": true, - "@metamask/utils>@scure/base": true, - "@metamask/utils>pony-cause": true, - "@noble/hashes": true, - "browserify>buffer": true, - "nock>debug": true, - "semver": true - } - }, "@metamask/ppom-validator": { "globals": { "URL": true, @@ -2391,7 +2212,6 @@ "@metamask/controller-utils>@spruceid/siwe-parser": true, "@metamask/ethjs>@metamask/ethjs-unit": true, "@metamask/ppom-validator>@metamask/utils": true, - "@metamask/ppom-validator>@metamask/utils": true, "bn.js": true, "browserify>buffer": true, "eslint>fast-deep-equal": true, @@ -2413,21 +2233,6 @@ "semver": true } }, - "@metamask/ppom-validator>@metamask/utils": { - "globals": { - "TextDecoder": true, - "TextEncoder": true - }, - "packages": { - "@metamask/utils>@metamask/superstruct": true, - "@metamask/utils>@scure/base": true, - "@metamask/utils>pony-cause": true, - "@noble/hashes": true, - "browserify>buffer": true, - "nock>debug": true, - "semver": true - } - }, "@metamask/ppom-validator>crypto-js": { "globals": { "crypto": true, @@ -2530,28 +2335,11 @@ "packages": { "@metamask/base-controller": true, "@metamask/queued-request-controller>@metamask/utils": true, - "@metamask/queued-request-controller>@metamask/utils": true, "@metamask/rpc-errors": true, "@metamask/selected-network-controller": true, "@metamask/snaps-controllers>@metamask/json-rpc-engine": true } }, - "@metamask/queued-request-controller>@metamask/utils": { - "globals": { - "TextDecoder": true, - "TextEncoder": true - }, - "packages": { - "@metamask/utils>@metamask/superstruct": true, - "@metamask/utils>@scure/base": true, - "@metamask/utils>pony-cause": true, - "@noble/hashes": true, - "browserify>buffer": true, - "nock>debug": true, - "semver": true - "@metamask/snaps-controllers>@metamask/json-rpc-engine": true - } - }, "@metamask/queued-request-controller>@metamask/utils": { "globals": { "TextDecoder": true, @@ -2575,11 +2363,8 @@ "@metamask/base-controller": true, "@metamask/rate-limit-controller>@metamask/utils": true, "@metamask/rpc-errors": true - "@metamask/rate-limit-controller>@metamask/utils": true, - "@metamask/rpc-errors": true } }, - "@metamask/rate-limit-controller>@metamask/utils": { "@metamask/rate-limit-controller>@metamask/utils": { "globals": { "TextDecoder": true, @@ -2601,12 +2386,6 @@ "eth-rpc-errors>fast-safe-stringify": true } }, - "@metamask/rpc-errors": { - "packages": { - "@metamask/utils": true, - "eth-rpc-errors>fast-safe-stringify": true - } - }, "@metamask/rpc-methods-flask>nanoid": { "globals": { "crypto.getRandomValues": true @@ -2752,7 +2531,6 @@ "@metamask/smart-transactions-controller>@metamask/transaction-controller>@ethereumjs/util": true, "@metamask/smart-transactions-controller>@metamask/transaction-controller>@metamask/nonce-tracker": true, "@metamask/smart-transactions-controller>@metamask/transaction-controller>@metamask/utils": true, - "@metamask/smart-transactions-controller>@metamask/transaction-controller>@metamask/utils": true, "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry": true, "bn.js": true, "browserify>buffer": true, @@ -2816,21 +2594,6 @@ "semver": true } }, - "@metamask/smart-transactions-controller>@metamask/transaction-controller>@metamask/utils": { - "globals": { - "TextDecoder": true, - "TextEncoder": true - }, - "packages": { - "@metamask/utils>@metamask/superstruct": true, - "@metamask/utils>@scure/base": true, - "@metamask/utils>pony-cause": true, - "@noble/hashes": true, - "browserify>buffer": true, - "nock>debug": true, - "semver": true - } - }, "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry": { "packages": { "@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-contract": true, @@ -2917,7 +2680,6 @@ "@metamask/snaps-utils": true, "@metamask/snaps-utils>@metamask/snaps-registry": true, "@metamask/utils": true, - "@metamask/utils": true, "browserify>browserify-zlib": true, "eslint>fast-deep-equal": true, "readable-stream": true @@ -2933,7 +2695,6 @@ "@metamask/rpc-errors": true, "@metamask/safe-event-emitter": true, "@metamask/utils": true - "@metamask/utils": true } }, "@metamask/snaps-controllers>@metamask/json-rpc-middleware-stream": { @@ -2944,7 +2705,6 @@ "packages": { "@metamask/safe-event-emitter": true, "@metamask/utils": true, - "@metamask/utils": true, "readable-stream": true } }, @@ -2959,7 +2719,6 @@ "@metamask/snaps-controllers>@metamask/json-rpc-engine": true, "@metamask/snaps-controllers>nanoid": true, "@metamask/utils": true, - "@metamask/utils": true, "deep-freeze-strict": true, "immer": true } @@ -3048,7 +2807,6 @@ "@metamask/snaps-utils>rfdc": true, "@metamask/snaps-utils>validate-npm-package-name": true, "@metamask/utils": true, - "@metamask/utils": true, "@metamask/utils>@metamask/superstruct": true, "@metamask/utils>@scure/base": true, "@noble/hashes": true, @@ -3067,7 +2825,6 @@ "@metamask/snaps-controllers>@metamask/json-rpc-engine": true, "@metamask/snaps-execution-environments>nanoid": true, "@metamask/utils": true, - "@metamask/utils": true, "deep-freeze-strict": true, "immer": true } @@ -3085,7 +2842,6 @@ "@metamask/snaps-sdk>@metamask/key-tree": true, "@metamask/snaps-utils": true, "@metamask/utils": true, - "@metamask/utils": true, "@metamask/utils>@metamask/superstruct": true, "@noble/hashes": true } @@ -3101,7 +2857,6 @@ "@metamask/snaps-controllers>@metamask/json-rpc-engine": true, "@metamask/snaps-rpc-methods>@metamask/permission-controller>nanoid": true, "@metamask/utils": true, - "@metamask/utils": true, "deep-freeze-strict": true, "immer": true } @@ -3118,7 +2873,6 @@ "packages": { "@metamask/rpc-errors": true, "@metamask/utils": true, - "@metamask/utils": true, "@metamask/utils>@metamask/superstruct": true } }, @@ -3127,7 +2881,6 @@ "@metamask/message-signing-snap>@noble/curves": true, "@metamask/scure-bip39": true, "@metamask/utils": true, - "@metamask/utils": true, "@metamask/utils>@scure/base": true, "@noble/hashes": true } @@ -3160,7 +2913,6 @@ "@metamask/snaps-utils>rfdc": true, "@metamask/snaps-utils>validate-npm-package-name": true, "@metamask/utils": true, - "@metamask/utils": true, "@metamask/utils>@metamask/superstruct": true, "@metamask/utils>@scure/base": true, "@noble/hashes": true, @@ -3179,7 +2931,6 @@ "@metamask/snaps-controllers>@metamask/json-rpc-engine": true, "@metamask/snaps-utils>@metamask/permission-controller>nanoid": true, "@metamask/utils": true, - "@metamask/utils": true, "deep-freeze-strict": true, "immer": true } @@ -3193,7 +2944,6 @@ "packages": { "@metamask/message-signing-snap>@noble/curves": true, "@metamask/utils": true, - "@metamask/utils": true, "@metamask/utils>@metamask/superstruct": true, "@noble/hashes": true } @@ -3312,7 +3062,6 @@ "@metamask/rpc-errors": true, "@metamask/transaction-controller>@metamask/nonce-tracker": true, "@metamask/utils": true, - "@metamask/utils": true, "bn.js": true, "browserify>buffer": true, "eth-method-registry": true, @@ -3351,7 +3100,6 @@ "@metamask/rpc-errors": true, "@metamask/transaction-controller": true, "@metamask/user-operation-controller>@metamask/utils": true, - "@metamask/user-operation-controller>@metamask/utils": true, "bn.js": true, "lodash": true, "superstruct": true, @@ -3374,21 +3122,6 @@ "semver": true } }, - "@metamask/user-operation-controller>@metamask/utils": { - "globals": { - "TextDecoder": true, - "TextEncoder": true - }, - "packages": { - "@metamask/utils>@metamask/superstruct": true, - "@metamask/utils>@scure/base": true, - "@metamask/utils>pony-cause": true, - "@noble/hashes": true, - "browserify>buffer": true, - "nock>debug": true, - "semver": true - } - }, "@metamask/utils": { "globals": { "TextDecoder": true, @@ -3458,62 +3191,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, @@ -4397,11 +4074,6 @@ "koa>is-generator-function>has-tostringtag": true } }, - "eslint>ajv>uri-js": { - "globals": { - "define": true - } - }, "eth-ens-namehash": { "globals": { "name": "write" @@ -5800,4 +5472,4 @@ } } } -} +} \ No newline at end of file diff --git a/lavamoat/build-system/policy.json b/lavamoat/build-system/policy.json index a77bbd9bf84e..277b4c9f7164 100644 --- a/lavamoat/build-system/policy.json +++ b/lavamoat/build-system/policy.json @@ -6701,7 +6701,7 @@ "tty.isatty": true }, "globals": { - "process.argv": true, + "process.argv.includes": true, "process.env": true, "process.platform": true } From 94b2ac8965c28a1185b1e81d32333f8935daee9b Mon Sep 17 00:00:00 2001 From: MetaMask Bot Date: Tue, 10 Sep 2024 18:54:13 +0000 Subject: [PATCH 19/21] Update LavaMoat policies --- lavamoat/browserify/beta/policy.json | 73 ++++++++++++++++++++++++--- lavamoat/browserify/flask/policy.json | 73 ++++++++++++++++++++++++--- lavamoat/browserify/main/policy.json | 73 ++++++++++++++++++++++++--- lavamoat/browserify/mmi/policy.json | 73 ++++++++++++++++++++++++--- lavamoat/build-system/policy.json | 12 +---- 5 files changed, 270 insertions(+), 34 deletions(-) diff --git a/lavamoat/browserify/beta/policy.json b/lavamoat/browserify/beta/policy.json index 8cbb2cfe5181..4f7fc4412007 100644 --- a/lavamoat/browserify/beta/policy.json +++ b/lavamoat/browserify/beta/policy.json @@ -1608,9 +1608,9 @@ "@metamask/controller-utils": true, "@metamask/eth-sig-util": true, "@metamask/message-manager>@metamask/base-controller": true, - "@metamask/message-manager>jsonschema": true, "@metamask/utils": true, "browserify>buffer": true, + "jsonschema": true, "uuid": true, "webpack>events": true } @@ -1623,11 +1623,6 @@ "immer": true } }, - "@metamask/message-manager>jsonschema": { - "packages": { - "browserify>url": true - } - }, "@metamask/message-signing-snap>@noble/ciphers": { "globals": { "TextDecoder": true, @@ -3099,6 +3094,62 @@ "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, @@ -3982,6 +4033,11 @@ "koa>is-generator-function>has-tostringtag": true } }, + "eslint>ajv>uri-js": { + "globals": { + "define": true + } + }, "eth-ens-namehash": { "globals": { "name": "write" @@ -4454,6 +4510,11 @@ "readable-stream": true } }, + "jsonschema": { + "packages": { + "browserify>url": true + } + }, "koa>content-disposition>safe-buffer": { "packages": { "browserify>buffer": true diff --git a/lavamoat/browserify/flask/policy.json b/lavamoat/browserify/flask/policy.json index 8cbb2cfe5181..4f7fc4412007 100644 --- a/lavamoat/browserify/flask/policy.json +++ b/lavamoat/browserify/flask/policy.json @@ -1608,9 +1608,9 @@ "@metamask/controller-utils": true, "@metamask/eth-sig-util": true, "@metamask/message-manager>@metamask/base-controller": true, - "@metamask/message-manager>jsonschema": true, "@metamask/utils": true, "browserify>buffer": true, + "jsonschema": true, "uuid": true, "webpack>events": true } @@ -1623,11 +1623,6 @@ "immer": true } }, - "@metamask/message-manager>jsonschema": { - "packages": { - "browserify>url": true - } - }, "@metamask/message-signing-snap>@noble/ciphers": { "globals": { "TextDecoder": true, @@ -3099,6 +3094,62 @@ "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, @@ -3982,6 +4033,11 @@ "koa>is-generator-function>has-tostringtag": true } }, + "eslint>ajv>uri-js": { + "globals": { + "define": true + } + }, "eth-ens-namehash": { "globals": { "name": "write" @@ -4454,6 +4510,11 @@ "readable-stream": true } }, + "jsonschema": { + "packages": { + "browserify>url": true + } + }, "koa>content-disposition>safe-buffer": { "packages": { "browserify>buffer": true diff --git a/lavamoat/browserify/main/policy.json b/lavamoat/browserify/main/policy.json index 8cbb2cfe5181..4f7fc4412007 100644 --- a/lavamoat/browserify/main/policy.json +++ b/lavamoat/browserify/main/policy.json @@ -1608,9 +1608,9 @@ "@metamask/controller-utils": true, "@metamask/eth-sig-util": true, "@metamask/message-manager>@metamask/base-controller": true, - "@metamask/message-manager>jsonschema": true, "@metamask/utils": true, "browserify>buffer": true, + "jsonschema": true, "uuid": true, "webpack>events": true } @@ -1623,11 +1623,6 @@ "immer": true } }, - "@metamask/message-manager>jsonschema": { - "packages": { - "browserify>url": true - } - }, "@metamask/message-signing-snap>@noble/ciphers": { "globals": { "TextDecoder": true, @@ -3099,6 +3094,62 @@ "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, @@ -3982,6 +4033,11 @@ "koa>is-generator-function>has-tostringtag": true } }, + "eslint>ajv>uri-js": { + "globals": { + "define": true + } + }, "eth-ens-namehash": { "globals": { "name": "write" @@ -4454,6 +4510,11 @@ "readable-stream": true } }, + "jsonschema": { + "packages": { + "browserify>url": true + } + }, "koa>content-disposition>safe-buffer": { "packages": { "browserify>buffer": true diff --git a/lavamoat/browserify/mmi/policy.json b/lavamoat/browserify/mmi/policy.json index 1cbf803bc079..9f1c6d22184c 100644 --- a/lavamoat/browserify/mmi/policy.json +++ b/lavamoat/browserify/mmi/policy.json @@ -1700,9 +1700,9 @@ "@metamask/controller-utils": true, "@metamask/eth-sig-util": true, "@metamask/message-manager>@metamask/base-controller": true, - "@metamask/message-manager>jsonschema": true, "@metamask/utils": true, "browserify>buffer": true, + "jsonschema": true, "uuid": true, "webpack>events": true } @@ -1715,11 +1715,6 @@ "immer": true } }, - "@metamask/message-manager>jsonschema": { - "packages": { - "browserify>url": true - } - }, "@metamask/message-signing-snap>@noble/ciphers": { "globals": { "TextDecoder": true, @@ -3191,6 +3186,62 @@ "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, @@ -4074,6 +4125,11 @@ "koa>is-generator-function>has-tostringtag": true } }, + "eslint>ajv>uri-js": { + "globals": { + "define": true + } + }, "eth-ens-namehash": { "globals": { "name": "write" @@ -4546,6 +4602,11 @@ "readable-stream": true } }, + "jsonschema": { + "packages": { + "browserify>url": true + } + }, "koa>content-disposition>safe-buffer": { "packages": { "browserify>buffer": true diff --git a/lavamoat/build-system/policy.json b/lavamoat/build-system/policy.json index 277b4c9f7164..54ce1a525794 100644 --- a/lavamoat/build-system/policy.json +++ b/lavamoat/build-system/policy.json @@ -2117,8 +2117,7 @@ "chokidar>normalize-path": true, "chokidar>readdirp": true, "del>is-glob": true, - "eslint>glob-parent": true, - "tsx>fsevents": true + "eslint>glob-parent": true } }, "chokidar>anymatch": { @@ -6701,7 +6700,7 @@ "tty.isatty": true }, "globals": { - "process.argv.includes": true, + "process.argv": true, "process.env": true, "process.platform": true } @@ -8894,13 +8893,6 @@ "typescript": true } }, - "tsx>fsevents": { - "globals": { - "console.assert": true, - "process.platform": true - }, - "native": true - }, "typescript": { "builtin": { "buffer.Buffer": true, From 31352fa63ebce3d11b89125db10b9951b7eb0027 Mon Sep 17 00:00:00 2001 From: Shane Jonas Date: Tue, 10 Sep 2024 15:31:48 -0400 Subject: [PATCH 20/21] fix: dont use personal_sign method in createSession call --- .../MultichainAuthorizationConfirmation.ts | 3 +-- test/e2e/run-api-specs-multichain.ts | 24 ++++--------------- 2 files changed, 5 insertions(+), 22 deletions(-) diff --git a/test/e2e/api-specs/MultichainAuthorizationConfirmation.ts b/test/e2e/api-specs/MultichainAuthorizationConfirmation.ts index 1cca549c7a27..1dfa4a37f811 100644 --- a/test/e2e/api-specs/MultichainAuthorizationConfirmation.ts +++ b/test/e2e/api-specs/MultichainAuthorizationConfirmation.ts @@ -1,5 +1,5 @@ import Rule from '@open-rpc/test-coverage/build/rules/rule'; -import { Call } from '@open-rpc/test-coverage/build/coverage'; +import { Call, IOptions } from '@open-rpc/test-coverage/build/coverage'; import { ContentDescriptorObject, ExampleObject, @@ -114,7 +114,6 @@ export class MultichainAuthorizationConfirmation implements Rule { }); } } - console.log('calls', calls); return calls; } diff --git a/test/e2e/run-api-specs-multichain.ts b/test/e2e/run-api-specs-multichain.ts index 30e52d70d44d..4f04ef7c10e5 100644 --- a/test/e2e/run-api-specs-multichain.ts +++ b/test/e2e/run-api-specs-multichain.ts @@ -62,11 +62,7 @@ async function main() { value: { eip155: { scopes: ['eip155:1'], - methods: [ - 'eth_sendTransaction', - 'eth_getBalance', - 'personal_sign', - ], + methods: ['eth_sendTransaction', 'eth_getBalance'], notifications: [], }, }, @@ -75,11 +71,7 @@ async function main() { name: 'optionalScopes', value: { 'eip155:1337': { - methods: [ - 'eth_sendTransaction', - 'eth_getBalance', - 'personal_sign', - ], + methods: ['eth_sendTransaction', 'eth_getBalance'], notifications: [], }, }, @@ -92,20 +84,12 @@ async function main() { sessionScopes: { 'eip155:1': { accounts: [`eip155:1:${ACCOUNT_1}`], - methods: [ - 'eth_sendTransaction', - 'eth_getBalance', - 'personal_sign', - ], + methods: ['eth_sendTransaction', 'eth_getBalance'], notifications: [], }, [`eip155:${chainId}`]: { accounts: [`eip155:${chainId}:${ACCOUNT_1}`], - methods: [ - 'eth_sendTransaction', - 'eth_getBalance', - 'personal_sign', - ], + methods: ['eth_sendTransaction', 'eth_getBalance'], notifications: [], }, }, From bd8cd7af44e244f3ee44e7a8cddded7ef6cbfa41 Mon Sep 17 00:00:00 2001 From: Shane Jonas Date: Wed, 11 Sep 2024 09:18:04 -0400 Subject: [PATCH 21/21] fix: linting --- test/e2e/api-specs/MultichainAuthorizationConfirmation.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/e2e/api-specs/MultichainAuthorizationConfirmation.ts b/test/e2e/api-specs/MultichainAuthorizationConfirmation.ts index 1dfa4a37f811..57c1d23174d4 100644 --- a/test/e2e/api-specs/MultichainAuthorizationConfirmation.ts +++ b/test/e2e/api-specs/MultichainAuthorizationConfirmation.ts @@ -1,5 +1,5 @@ import Rule from '@open-rpc/test-coverage/build/rules/rule'; -import { Call, IOptions } from '@open-rpc/test-coverage/build/coverage'; +import { Call } from '@open-rpc/test-coverage/build/coverage'; import { ContentDescriptorObject, ExampleObject,