Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump snaps packages and remove -flask versions #20984

Merged
merged 10 commits into from
Sep 25, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions .depcheckrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,6 @@ ignores:
- '@fortawesome/fontawesome-free'
- 'punycode'

#
# snaps flask deps
#
- '@metamask/rpc-methods-flask'
- '@metamask/snaps-controllers-flask'
- '@metamask/snaps-ui-flask'
- '@metamask/snaps-utils-flask'

#
# dev deps
#
Expand Down
4 changes: 2 additions & 2 deletions app/scripts/controllers/permissions/specifications.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ describe('PermissionController specifications', () => {
expect(caveatSpecifications.permittedCoinTypes.type).toStrictEqual(
SnapCaveatType.PermittedCoinTypes,
);
expect(caveatSpecifications.snapKeyring.type).toStrictEqual(
SnapCaveatType.SnapKeyring,
expect(caveatSpecifications.chainIds.type).toStrictEqual(
SnapCaveatType.ChainIds,
);
expect(caveatSpecifications.snapCronjob.type).toStrictEqual(
SnapCaveatType.SnapCronjob,
Expand Down
8 changes: 4 additions & 4 deletions builds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ buildTypes:
- SEGMENT_WRITE_KEY_REF: SEGMENT_PROD_WRITE_KEY
- ALLOW_LOCAL_SNAPS: false
- REQUIRE_SNAPS_ALLOWLIST: true
- IFRAME_EXECUTION_ENVIRONMENT_URL: https://execution.consensys.io/1.0.2/index.html
- IFRAME_EXECUTION_ENVIRONMENT_URL: https://execution.consensys.io/2.0.0/index.html
# Main build uses the default browser manifest
manifestOverrides: false

Expand Down Expand Up @@ -58,7 +58,7 @@ buildTypes:
- SEGMENT_FLASK_WRITE_KEY
- ALLOW_LOCAL_SNAPS: true
- REQUIRE_SNAPS_ALLOWLIST: false
- IFRAME_EXECUTION_ENVIRONMENT_URL: https://execution.consensys.io/0.39.0-flask.1/index.html
- IFRAME_EXECUTION_ENVIRONMENT_URL: https://execution.consensys.io/2.0.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 @@ -77,7 +77,7 @@ buildTypes:
- SEGMENT_FLASK_WRITE_KEY
- ALLOW_LOCAL_SNAPS: true
- REQUIRE_SNAPS_ALLOWLIST: false
- IFRAME_EXECUTION_ENVIRONMENT_URL: https://execution.consensys.io/0.39.0-flask.1/index.html
- IFRAME_EXECUTION_ENVIRONMENT_URL: https://execution.consensys.io/2.0.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 @@ -96,7 +96,7 @@ buildTypes:
- SEGMENT_WRITE_KEY_REF: SEGMENT_MMI_WRITE_KEY
- ALLOW_LOCAL_SNAPS: false
- REQUIRE_SNAPS_ALLOWLIST: true
- IFRAME_EXECUTION_ENVIRONMENT_URL: https://execution.consensys.io/1.0.2/index.html
- IFRAME_EXECUTION_ENVIRONMENT_URL: https://execution.consensys.io/2.0.0/index.html
- MMI_CONFIGURATION_SERVICE_URL: https://configuration.metamask-institutional.io/v2/configuration/default
- SUPPORT_LINK: https://mmi-support.zendesk.com/hc/en-us
- SUPPORT_REQUEST_LINK: https://mmi-support.zendesk.com/hc/en-us/requests/new
Expand Down
20 changes: 0 additions & 20 deletions development/build/scripts.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ const Sqrl = require('squirrelly');
const lavapack = require('@lavamoat/lavapack');
const lavamoatBrowserify = require('lavamoat-browserify');
const terser = require('terser');
const moduleResolver = require('babel-plugin-module-resolver');

const bifyModuleGroups = require('bify-module-groups');

Expand Down Expand Up @@ -931,9 +930,6 @@ function setupBundlerDefaults(
const { bundlerOpts } = buildConfiguration;
const extensions = ['.js', '.ts', '.tsx'];

const isSnapsFlask =
features.active.has('snaps') && features.active.has('build-flask');

Object.assign(bundlerOpts, {
// Source transforms
transform: [
Expand All @@ -945,22 +941,6 @@ function setupBundlerDefaults(
// Run TypeScript files through Babel
{
extensions,
plugins: isSnapsFlask
? [
[
moduleResolver,
{
alias: {
'@metamask/snaps-controllers':
'@metamask/snaps-controllers-flask',
'@metamask/snaps-ui': '@metamask/snaps-ui-flask',
'@metamask/snaps-utils': '@metamask/snaps-utils-flask',
'@metamask/rpc-methods': '@metamask/rpc-methods-flask',
},
},
],
]
: [],
},
],
// Inline `fs.readFileSync` files
Expand Down
84 changes: 60 additions & 24 deletions lavamoat/browserify/beta/policy.json
Original file line number Diff line number Diff line change
Expand Up @@ -1475,6 +1475,29 @@
"jest-canvas-mock>moo-color>color-name": true
}
},
"@metamask/key-tree": {
"packages": {
"@metamask/key-tree>@metamask/utils": true,
"@metamask/key-tree>@noble/ed25519": true,
"@metamask/key-tree>@noble/hashes": true,
"@metamask/key-tree>@noble/secp256k1": true,
"@metamask/key-tree>@scure/base": true,
"@metamask/scure-bip39": true
}
},
"@metamask/key-tree>@metamask/utils": {
"globals": {
"TextDecoder": true,
"TextEncoder": true
},
"packages": {
"@metamask/key-tree>@noble/hashes": true,
"browserify>buffer": true,
"nock>debug": true,
"semver": true,
"superstruct": true
}
},
"@metamask/key-tree>@noble/ed25519": {
"globals": {
"crypto": true
Expand Down Expand Up @@ -1830,12 +1853,10 @@
},
"@metamask/rpc-methods": {
"packages": {
"@metamask/browser-passworder": true,
"@metamask/key-tree": true,
"@metamask/key-tree>@noble/hashes": true,
"@metamask/permission-controller": true,
"@metamask/rpc-methods>@metamask/key-tree": true,
"@metamask/rpc-methods>@metamask/utils": true,
"@metamask/rpc-methods>nanoid": true,
"@metamask/snaps-ui": true,
"@metamask/snaps-utils": true,
"eth-rpc-errors": true,
Expand All @@ -1847,16 +1868,6 @@
"crypto.getRandomValues": true
}
},
"@metamask/rpc-methods>@metamask/key-tree": {
"packages": {
"@metamask/key-tree>@noble/ed25519": true,
"@metamask/key-tree>@noble/hashes": true,
"@metamask/key-tree>@noble/secp256k1": true,
"@metamask/key-tree>@scure/base": true,
"@metamask/rpc-methods>@metamask/utils": true,
"@metamask/scure-bip39": true
}
},
"@metamask/rpc-methods>@metamask/utils": {
"globals": {
"TextDecoder": true,
Expand Down Expand Up @@ -1989,28 +2000,23 @@
"document.createElement": true
},
"packages": {
"@metamask/key-tree": true,
"@metamask/key-tree>@noble/hashes": true,
"@metamask/key-tree>@scure/base": true,
"@metamask/snaps-utils>@metamask/key-tree": true,
"@metamask/snaps-utils>@metamask/utils": true,
"@metamask/snaps-utils>cron-parser": true,
"@metamask/snaps-utils>fast-json-stable-stringify": true,
"@metamask/snaps-utils>is-svg": true,
"@metamask/snaps-utils>rfdc": true,
"@metamask/snaps-utils>validate-npm-package-name": true,
"browserify>buffer": true,
"browserify>path-browserify": true,
"browserify>process": true,
"chalk": true,
"semver": true,
"superstruct": true
}
},
"@metamask/snaps-utils>@metamask/key-tree": {
"packages": {
"@metamask/key-tree>@noble/ed25519": true,
"@metamask/key-tree>@noble/hashes": true,
"@metamask/key-tree>@noble/secp256k1": true,
"@metamask/key-tree>@scure/base": true,
"@metamask/scure-bip39": true,
"@metamask/snaps-utils>@metamask/utils": true
}
},
"@metamask/snaps-utils>@metamask/utils": {
"globals": {
"TextDecoder": true,
Expand All @@ -2030,6 +2036,20 @@
"luxon": true
}
},
"@metamask/snaps-utils>is-svg": {
"packages": {
"@metamask/snaps-utils>is-svg>fast-xml-parser": true
}
},
"@metamask/snaps-utils>is-svg>fast-xml-parser": {
"globals": {
"entityName": true,
"val": true
},
"packages": {
"@metamask/snaps-utils>is-svg>fast-xml-parser>strnum": true
}
},
"@metamask/snaps-utils>rfdc": {
"packages": {
"browserify>buffer": true
Expand Down Expand Up @@ -3133,6 +3153,22 @@
"document.createElement": true
}
},
"chalk": {
"packages": {
"chalk>ansi-styles": true,
"chalk>supports-color": true
}
},
"chalk>ansi-styles": {
"packages": {
"chalk>ansi-styles>color-convert": true
}
},
"chalk>ansi-styles>color-convert": {
"packages": {
"jest-canvas-mock>moo-color>color-name": true
}
},
"classnames": {
"globals": {
"classNames": "write",
Expand Down
Loading
Loading