Skip to content

Commit

Permalink
chore: Bump Snaps packages (#25292)
Browse files Browse the repository at this point in the history
## **Description**

Bump snaps packages to latest and handle breaking changes.

~~Depends on #25302~~

Summary of changes in the snaps deps:
- **Breaking:** Defer creation of offscreen document
- Fix an issue with decrypting legacy state blobs
- Support nested children in JSX
- Allow usage of the `tooltip` prop on `Row`
- Revert requiring at least one child in JSX components
- Update `onNameLookup` response to include `domainName`

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/25292?quickstart=1)
  • Loading branch information
FrederikBolding committed Jun 19, 2024
1 parent da4b61c commit b0f57cf
Show file tree
Hide file tree
Showing 10 changed files with 223 additions and 400 deletions.
4 changes: 1 addition & 3 deletions app/scripts/metamask-controller.js
Original file line number Diff line number Diff line change
Expand Up @@ -1259,9 +1259,8 @@ export default class MetamaskController extends EventEmitter {
iframeUrl: new URL(process.env.IFRAME_EXECUTION_ENVIRONMENT_URL),
})
: new OffscreenExecutionService({
// eslint-disable-next-line no-undef
documentUrl: chrome.runtime.getURL('./offscreen.html'),
...snapExecutionServiceArgs,
offscreenPromise: this.offscreenPromise,
});

const snapControllerMessenger = this.controllerMessenger.getRestricted({
Expand Down Expand Up @@ -1409,7 +1408,6 @@ export default class MetamaskController extends EventEmitter {
state: initState.SnapsRegistry,
messenger: snapsRegistryMessenger,
refetchOnAllowlistMiss: requireAllowlist,
failOnUnavailableRegistry: requireAllowlist,
url: {
registry: 'https://acl.execution.metamask.io/latest/registry.json',
signature: 'https://acl.execution.metamask.io/latest/signature.json',
Expand Down
6 changes: 3 additions & 3 deletions builds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ buildTypes:
- SEGMENT_WRITE_KEY_REF: SEGMENT_PROD_WRITE_KEY
- ALLOW_LOCAL_SNAPS: false
- REQUIRE_SNAPS_ALLOWLIST: true
- IFRAME_EXECUTION_ENVIRONMENT_URL: https://execution.metamask.io/iframe/6.3.0/index.html
- IFRAME_EXECUTION_ENVIRONMENT_URL: https://execution.metamask.io/iframe/6.4.0/index.html
- ACCOUNT_SNAPS_DIRECTORY_URL: https://snaps.metamask.io/account-management
- BTC_BETA_SUPPORT: false
# Main build uses the default browser manifest
Expand Down Expand Up @@ -64,7 +64,7 @@ buildTypes:
- SEGMENT_FLASK_WRITE_KEY
- ALLOW_LOCAL_SNAPS: true
- REQUIRE_SNAPS_ALLOWLIST: false
- IFRAME_EXECUTION_ENVIRONMENT_URL: https://execution.metamask.io/iframe/6.3.0/index.html
- IFRAME_EXECUTION_ENVIRONMENT_URL: https://execution.metamask.io/iframe/6.4.0/index.html
- SUPPORT_LINK: https://metamask-flask.zendesk.com/hc
- SUPPORT_REQUEST_LINK: https://metamask-flask.zendesk.com/hc/en-us/requests/new
- INFURA_ENV_KEY_REF: INFURA_FLASK_PROJECT_ID
Expand All @@ -89,7 +89,7 @@ buildTypes:
- SEGMENT_WRITE_KEY_REF: SEGMENT_MMI_WRITE_KEY
- ALLOW_LOCAL_SNAPS: false
- REQUIRE_SNAPS_ALLOWLIST: true
- IFRAME_EXECUTION_ENVIRONMENT_URL: https://execution.metamask.io/iframe/6.3.0/index.html
- IFRAME_EXECUTION_ENVIRONMENT_URL: https://execution.metamask.io/iframe/6.4.0/index.html
- MMI_CONFIGURATION_SERVICE_URL: https://configuration.metamask-institutional.io/v2/configuration/default
- SUPPORT_LINK: https://mmi-support.metamask.io/hc/en-us
- SUPPORT_REQUEST_LINK: https://mmi-support.metamask.io/hc/en-us/requests/new
Expand Down
98 changes: 20 additions & 78 deletions lavamoat/browserify/beta/policy.json
Original file line number Diff line number Diff line change
Expand Up @@ -1945,35 +1945,24 @@
"@metamask/utils": true
}
},
"@metamask/permission-log-controller>@metamask/json-rpc-engine": {
"packages": {
"@metamask/rpc-errors": true,
"@metamask/safe-event-emitter": true,
"@metamask/utils": true
}
},
"@metamask/phishing-controller": {
"globals": {
"fetch": true
},
"packages": {
"@metamask/base-controller": true,
"@metamask/phishing-controller>@metamask/controller-utils": true,
"@metamask/controller-utils": true,
"@metamask/phishing-warning>eth-phishing-detect": true,
"punycode": true
}
},
"@metamask/phishing-controller>@metamask/controller-utils": {
"globals": {
"URL": true,
"console.error": true,
"fetch": true,
"setTimeout": true
},
"packages": {
"@ethereumjs/tx>@ethereumjs/util": true,
"@metamask/controller-utils>@spruceid/siwe-parser": true,
"@metamask/ethjs>@metamask/ethjs-unit": true,
"@metamask/utils": true,
"bn.js": true,
"browserify>buffer": true,
"eslint>fast-deep-equal": true,
"eth-ens-namehash": true
}
},
"@metamask/phishing-warning>eth-phishing-detect": {
"packages": {
"eslint>optionator>fast-levenshtein": true
Expand Down Expand Up @@ -2025,9 +2014,9 @@
"@metamask/queued-request-controller": {
"packages": {
"@metamask/base-controller": true,
"@metamask/permission-log-controller>@metamask/json-rpc-engine": true,
"@metamask/rpc-errors": true,
"@metamask/selected-network-controller": true,
"@metamask/snaps-controllers>@metamask/json-rpc-engine": true,
"@metamask/utils": true
}
},
Expand Down Expand Up @@ -2450,13 +2439,6 @@
"crypto.getRandomValues": true
}
},
"@metamask/snaps-controllers>@metamask/json-rpc-engine": {
"packages": {
"@metamask/rpc-errors": true,
"@metamask/safe-event-emitter": true,
"@metamask/utils": true
}
},
"@metamask/snaps-controllers>nanoid": {
"globals": {
"crypto.getRandomValues": true
Expand All @@ -2474,8 +2456,8 @@
},
"@metamask/snaps-rpc-methods": {
"packages": {
"@metamask/permission-controller": true,
"@metamask/rpc-errors": true,
"@metamask/snaps-rpc-methods>@metamask/permission-controller": true,
"@metamask/snaps-sdk": true,
"@metamask/snaps-sdk>@metamask/key-tree": true,
"@metamask/snaps-utils": true,
Expand All @@ -2484,33 +2466,12 @@
"superstruct": true
}
},
"@metamask/snaps-rpc-methods>@metamask/permission-controller": {
"globals": {
"console.error": true
},
"packages": {
"@metamask/base-controller": true,
"@metamask/controller-utils": true,
"@metamask/rpc-errors": true,
"@metamask/snaps-controllers>@metamask/json-rpc-engine": true,
"@metamask/snaps-rpc-methods>@metamask/permission-controller>nanoid": true,
"@metamask/utils": true,
"deep-freeze-strict": true,
"immer": true
}
},
"@metamask/snaps-rpc-methods>@metamask/permission-controller>nanoid": {
"globals": {
"crypto.getRandomValues": true
}
},
"@metamask/snaps-sdk": {
"globals": {
"fetch": true
},
"packages": {
"@metamask/rpc-errors": true,
"@metamask/snaps-sdk>fast-xml-parser": true,
"@metamask/utils": true,
"superstruct": true
}
Expand All @@ -2524,15 +2485,6 @@
"@noble/hashes": true
}
},
"@metamask/snaps-sdk>fast-xml-parser": {
"globals": {
"entityName": true,
"val": true
},
"packages": {
"@metamask/snaps-sdk>fast-xml-parser>strnum": true
}
},
"@metamask/snaps-utils": {
"globals": {
"File": true,
Expand All @@ -2549,13 +2501,14 @@
"fetch": true
},
"packages": {
"@metamask/permission-controller": true,
"@metamask/rpc-errors": true,
"@metamask/snaps-sdk": true,
"@metamask/snaps-sdk>@metamask/key-tree": true,
"@metamask/snaps-utils>@metamask/permission-controller": true,
"@metamask/snaps-utils>@metamask/slip44": true,
"@metamask/snaps-utils>cron-parser": true,
"@metamask/snaps-utils>fast-json-stable-stringify": true,
"@metamask/snaps-utils>fast-xml-parser": true,
"@metamask/snaps-utils>marked": true,
"@metamask/snaps-utils>rfdc": true,
"@metamask/snaps-utils>validate-npm-package-name": true,
Expand All @@ -2567,30 +2520,19 @@
"superstruct": true
}
},
"@metamask/snaps-utils>@metamask/permission-controller": {
"globals": {
"console.error": true
},
"@metamask/snaps-utils>cron-parser": {
"packages": {
"@metamask/base-controller": true,
"@metamask/controller-utils": true,
"@metamask/rpc-errors": true,
"@metamask/snaps-controllers>@metamask/json-rpc-engine": true,
"@metamask/snaps-utils>@metamask/permission-controller>nanoid": true,
"@metamask/utils": true,
"deep-freeze-strict": true,
"immer": true
"browserify>browser-resolve": true,
"luxon": true
}
},
"@metamask/snaps-utils>@metamask/permission-controller>nanoid": {
"@metamask/snaps-utils>fast-xml-parser": {
"globals": {
"crypto.getRandomValues": true
}
},
"@metamask/snaps-utils>cron-parser": {
"entityName": true,
"val": true
},
"packages": {
"browserify>browser-resolve": true,
"luxon": true
"@metamask/snaps-utils>fast-xml-parser>strnum": true
}
},
"@metamask/snaps-utils>marked": {
Expand Down
Loading

0 comments on commit b0f57cf

Please sign in to comment.