From a041da7c740f21e21505fb33f615dc9b094ef289 Mon Sep 17 00:00:00 2001 From: Frederik Bolding Date: Tue, 11 Jul 2023 13:50:50 +0200 Subject: [PATCH] [FLASK] `snaps@0.36.1-flask.1` (#19939) * snaps@0.36.0-flask.1 * Update LavaMoat policies * snaps@0.36.1-flask.1 --- builds.yml | 4 +- lavamoat/browserify/desktop/policy.json | 2 - lavamoat/browserify/flask/policy.json | 2 - package.json | 8 +- test/env.js | 2 +- yarn.lock | 123 ++++++++++++++++++++++-- 6 files changed, 122 insertions(+), 19 deletions(-) diff --git a/builds.yml b/builds.yml index ad33dcf5b..fe4d755d3 100644 --- a/builds.yml +++ b/builds.yml @@ -52,7 +52,7 @@ buildTypes: - SEGMENT_FLASK_WRITE_KEY - ALLOW_LOCAL_SNAPS: true - REQUIRE_SNAPS_ALLOWLIST: false - - IFRAME_EXECUTION_ENVIRONMENT_URL: https://execution.metamask.io/0.35.2-flask.1/index.html + - IFRAME_EXECUTION_ENVIRONMENT_URL: https://execution.metamask.io/0.36.1-flask.1/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 @@ -71,7 +71,7 @@ buildTypes: - SEGMENT_FLASK_WRITE_KEY - ALLOW_LOCAL_SNAPS: true - REQUIRE_SNAPS_ALLOWLIST: false - - IFRAME_EXECUTION_ENVIRONMENT_URL: https://execution.metamask.io/0.35.2-flask.1/index.html + - IFRAME_EXECUTION_ENVIRONMENT_URL: https://execution.metamask.io/0.36.1-flask.1/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 diff --git a/lavamoat/browserify/desktop/policy.json b/lavamoat/browserify/desktop/policy.json index aa3b955d2..e9b8572ae 100644 --- a/lavamoat/browserify/desktop/policy.json +++ b/lavamoat/browserify/desktop/policy.json @@ -1967,7 +1967,6 @@ "@metamask/rpc-methods-flask>@metamask/snaps-ui": true, "@metamask/rpc-methods-flask>@metamask/snaps-utils": true, "@metamask/rpc-methods-flask>@metamask/utils": true, - "@metamask/rpc-methods-flask>nanoid": true, "eth-rpc-errors": true, "superstruct": true } @@ -2173,7 +2172,6 @@ "@metamask/snaps-controllers-flask>@metamask/snaps-utils": true, "@metamask/snaps-controllers-flask>@metamask/snaps-utils>@metamask/snaps-ui": true, "@metamask/snaps-controllers-flask>@metamask/utils": true, - "@metamask/snaps-controllers-flask>nanoid": true, "eth-rpc-errors": true, "superstruct": true } diff --git a/lavamoat/browserify/flask/policy.json b/lavamoat/browserify/flask/policy.json index aa3b955d2..e9b8572ae 100644 --- a/lavamoat/browserify/flask/policy.json +++ b/lavamoat/browserify/flask/policy.json @@ -1967,7 +1967,6 @@ "@metamask/rpc-methods-flask>@metamask/snaps-ui": true, "@metamask/rpc-methods-flask>@metamask/snaps-utils": true, "@metamask/rpc-methods-flask>@metamask/utils": true, - "@metamask/rpc-methods-flask>nanoid": true, "eth-rpc-errors": true, "superstruct": true } @@ -2173,7 +2172,6 @@ "@metamask/snaps-controllers-flask>@metamask/snaps-utils": true, "@metamask/snaps-controllers-flask>@metamask/snaps-utils>@metamask/snaps-ui": true, "@metamask/snaps-controllers-flask>@metamask/utils": true, - "@metamask/snaps-controllers-flask>nanoid": true, "eth-rpc-errors": true, "superstruct": true } diff --git a/package.json b/package.json index 2c393499f..fdb303c67 100644 --- a/package.json +++ b/package.json @@ -255,18 +255,18 @@ "@metamask/providers": "^11.1.0", "@metamask/rate-limit-controller": "^3.0.0", "@metamask/rpc-methods": "^1.0.0-prerelease.1", - "@metamask/rpc-methods-flask": "npm:@metamask/rpc-methods@0.35.2-flask.1", + "@metamask/rpc-methods-flask": "npm:@metamask/rpc-methods@0.36.1-flask.1", "@metamask/safe-event-emitter": "^2.0.0", "@metamask/scure-bip39": "^2.0.3", "@metamask/signature-controller": "^4.0.1", "@metamask/slip44": "^3.0.0", "@metamask/smart-transactions-controller": "^3.1.0", "@metamask/snaps-controllers": "^1.0.0-prerelease.1", - "@metamask/snaps-controllers-flask": "npm:@metamask/snaps-controllers@0.35.2-flask.1", + "@metamask/snaps-controllers-flask": "npm:@metamask/snaps-controllers@0.36.1-flask.1", "@metamask/snaps-ui": "^1.0.0-prerelease.1", - "@metamask/snaps-ui-flask": "npm:@metamask/snaps-ui@0.35.2-flask.1", + "@metamask/snaps-ui-flask": "npm:@metamask/snaps-ui@0.36.1-flask.1", "@metamask/snaps-utils": "^1.0.0-prerelease.1", - "@metamask/snaps-utils-flask": "npm:@metamask/snaps-utils@0.35.2-flask.1", + "@metamask/snaps-utils-flask": "npm:@metamask/snaps-utils@0.36.1-flask.1", "@metamask/subject-metadata-controller": "^2.0.0", "@metamask/utils": "^5.0.0", "@ngraveio/bc-ur": "^1.1.6", diff --git a/test/env.js b/test/env.js index 4056fc287..dd3c370b8 100644 --- a/test/env.js +++ b/test/env.js @@ -1,4 +1,4 @@ process.env.METAMASK_ENVIRONMENT = 'test'; process.env.SUPPORT_LINK = 'https://support.metamask.io'; process.env.IFRAME_EXECUTION_ENVIRONMENT_URL = - 'https://execution.metamask.io/0.35.2-flask.1/index.html'; + 'https://execution.metamask.io/0.36.1-flask.1/index.html'; diff --git a/yarn.lock b/yarn.lock index 5a8426729..db6d24afd 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4621,7 +4621,24 @@ __metadata: languageName: node linkType: hard -"@metamask/rpc-methods-flask@npm:@metamask/rpc-methods@0.35.2-flask.1, @metamask/rpc-methods@npm:^0.35.2-flask.1": +"@metamask/rpc-methods-flask@npm:@metamask/rpc-methods@0.36.1-flask.1, @metamask/rpc-methods@npm:^0.36.1-flask.1": + version: 0.36.1-flask.1 + resolution: "@metamask/rpc-methods@npm:0.36.1-flask.1" + dependencies: + "@metamask/key-tree": ^7.1.1 + "@metamask/permission-controller": ^4.0.0 + "@metamask/snaps-ui": ^0.36.1-flask.1 + "@metamask/snaps-utils": ^0.36.1-flask.1 + "@metamask/types": ^1.1.0 + "@metamask/utils": ^6.0.1 + "@noble/hashes": ^1.3.1 + eth-rpc-errors: ^4.0.3 + superstruct: ^1.0.3 + checksum: 1172d2783285656478ba14fc9dbebfd7ad4150826f5eddd737a6cae376cf0e1d69e7b53570c9be45d95a14cc0533269ab4f2c8c4f28e3d867cfd06d68b5a2aac + languageName: node + linkType: hard + +"@metamask/rpc-methods@npm:^0.35.2-flask.1": version: 0.35.2-flask.1 resolution: "@metamask/rpc-methods@npm:0.35.2-flask.1" dependencies: @@ -4746,7 +4763,37 @@ __metadata: languageName: node linkType: hard -"@metamask/snaps-controllers-flask@npm:@metamask/snaps-controllers@0.35.2-flask.1, @metamask/snaps-controllers@npm:^0.35.2-flask.1": +"@metamask/snaps-controllers-flask@npm:@metamask/snaps-controllers@0.36.1-flask.1": + version: 0.36.1-flask.1 + resolution: "@metamask/snaps-controllers@npm:0.36.1-flask.1" + dependencies: + "@metamask/approval-controller": ^3.0.0 + "@metamask/base-controller": ^3.0.0 + "@metamask/object-multiplex": ^1.2.0 + "@metamask/permission-controller": ^4.0.0 + "@metamask/post-message-stream": ^6.1.2 + "@metamask/rpc-methods": ^0.36.1-flask.1 + "@metamask/snaps-execution-environments": ^0.36.1-flask.1 + "@metamask/snaps-registry": ^1.2.1 + "@metamask/snaps-utils": ^0.36.1-flask.1 + "@metamask/utils": ^6.0.1 + "@xstate/fsm": ^2.0.0 + concat-stream: ^2.0.0 + cron-parser: ^4.5.0 + eth-rpc-errors: ^4.0.3 + gunzip-maybe: ^1.4.2 + immer: ^9.0.6 + json-rpc-engine: ^6.1.0 + json-rpc-middleware-stream: ^4.2.0 + nanoid: ^3.1.31 + pump: ^3.0.0 + readable-web-to-node-stream: ^3.0.2 + tar-stream: ^2.2.0 + checksum: 9e7f9fa7a5989d4afda7cb6c8c7071059c2b48a2f3c6548eba0aca4ccf0103c3aa59167b1a31f905b9e8cbf79f41b9344945dd35719934083a18a85225985766 + languageName: node + linkType: hard + +"@metamask/snaps-controllers@npm:^0.35.2-flask.1": version: 0.35.2-flask.1 resolution: "@metamask/snaps-controllers@npm:0.35.2-flask.1" dependencies: @@ -4827,6 +4874,27 @@ __metadata: languageName: node linkType: hard +"@metamask/snaps-execution-environments@npm:^0.36.1-flask.1": + version: 0.36.1-flask.1 + resolution: "@metamask/snaps-execution-environments@npm:0.36.1-flask.1" + dependencies: + "@metamask/object-multiplex": ^1.2.0 + "@metamask/post-message-stream": ^6.1.2 + "@metamask/providers": ^11.0.0 + "@metamask/rpc-methods": ^0.36.1-flask.1 + "@metamask/snaps-utils": ^0.36.1-flask.1 + "@metamask/utils": ^6.0.1 + eth-rpc-errors: ^4.0.3 + json-rpc-engine: ^6.1.0 + nanoid: ^3.1.31 + pump: ^3.0.0 + ses: ^0.18.1 + stream-browserify: ^3.0.0 + superstruct: ^1.0.3 + checksum: 1863a37df13f8c0684a5b5d281e53294869a75daa4c4b8429593aee29bff6bf4aad4365eee19a1a1e20cfa47557dc12c4e266dae74c5ab0e951a6917cf9af6e6 + languageName: node + linkType: hard + "@metamask/snaps-execution-environments@npm:^1.0.0-prerelease.1": version: 1.0.0-prerelease.1 resolution: "@metamask/snaps-execution-environments@npm:1.0.0-prerelease.1" @@ -4858,7 +4926,17 @@ __metadata: languageName: node linkType: hard -"@metamask/snaps-ui-flask@npm:@metamask/snaps-ui@0.35.2-flask.1, @metamask/snaps-ui@npm:^0.35.2-flask.1": +"@metamask/snaps-ui-flask@npm:@metamask/snaps-ui@0.36.1-flask.1, @metamask/snaps-ui@npm:^0.36.1-flask.1": + version: 0.36.1-flask.1 + resolution: "@metamask/snaps-ui@npm:0.36.1-flask.1" + dependencies: + "@metamask/utils": ^6.0.1 + superstruct: ^1.0.3 + checksum: 85c8426003008836e3461a6287e0199ccc083f9e84053862a2e12a7763141c1a71bfdf9c2b46607a0ae14fdcd93cff22cbee3adf5fcef9364413c91acbeb812d + languageName: node + linkType: hard + +"@metamask/snaps-ui@npm:^0.35.2-flask.1": version: 0.35.2-flask.1 resolution: "@metamask/snaps-ui@npm:0.35.2-flask.1" dependencies: @@ -4878,7 +4956,36 @@ __metadata: languageName: node linkType: hard -"@metamask/snaps-utils-flask@npm:@metamask/snaps-utils@0.35.2-flask.1, @metamask/snaps-utils@npm:^0.35.2-flask.1": +"@metamask/snaps-utils-flask@npm:@metamask/snaps-utils@0.36.1-flask.1, @metamask/snaps-utils@npm:^0.36.1-flask.1": + version: 0.36.1-flask.1 + resolution: "@metamask/snaps-utils@npm:0.36.1-flask.1" + dependencies: + "@babel/core": ^7.20.12 + "@babel/types": ^7.18.7 + "@metamask/base-controller": ^3.0.0 + "@metamask/key-tree": ^7.1.1 + "@metamask/permission-controller": ^4.0.0 + "@metamask/providers": ^11.0.0 + "@metamask/snaps-registry": ^1.2.1 + "@metamask/snaps-ui": ^0.36.1-flask.1 + "@metamask/utils": ^6.0.1 + "@noble/hashes": ^1.3.1 + "@scure/base": ^1.1.1 + cron-parser: ^4.5.0 + eth-rpc-errors: ^4.0.3 + fast-deep-equal: ^3.1.3 + fast-json-stable-stringify: ^2.1.0 + is-svg: ^4.4.0 + rfdc: ^1.3.0 + semver: ^7.3.7 + ses: ^0.18.1 + superstruct: ^1.0.3 + validate-npm-package-name: ^5.0.0 + checksum: 9d7d1d77ac03c58c51221a551b4718add396e5591c33dcb0c6799d0ba69ae775bb8c2f55b2bb1642842d13fd7b979437f34d4cabf6ec69832bff050ee6bb46d3 + languageName: node + linkType: hard + +"@metamask/snaps-utils@npm:^0.35.2-flask.1": version: 0.35.2-flask.1 resolution: "@metamask/snaps-utils@npm:0.35.2-flask.1" dependencies: @@ -24516,18 +24623,18 @@ __metadata: "@metamask/providers": ^11.1.0 "@metamask/rate-limit-controller": ^3.0.0 "@metamask/rpc-methods": ^1.0.0-prerelease.1 - "@metamask/rpc-methods-flask": "npm:@metamask/rpc-methods@0.35.2-flask.1" + "@metamask/rpc-methods-flask": "npm:@metamask/rpc-methods@0.36.1-flask.1" "@metamask/safe-event-emitter": ^2.0.0 "@metamask/scure-bip39": ^2.0.3 "@metamask/signature-controller": ^4.0.1 "@metamask/slip44": ^3.0.0 "@metamask/smart-transactions-controller": ^3.1.0 "@metamask/snaps-controllers": ^1.0.0-prerelease.1 - "@metamask/snaps-controllers-flask": "npm:@metamask/snaps-controllers@0.35.2-flask.1" + "@metamask/snaps-controllers-flask": "npm:@metamask/snaps-controllers@0.36.1-flask.1" "@metamask/snaps-ui": ^1.0.0-prerelease.1 - "@metamask/snaps-ui-flask": "npm:@metamask/snaps-ui@0.35.2-flask.1" + "@metamask/snaps-ui-flask": "npm:@metamask/snaps-ui@0.36.1-flask.1" "@metamask/snaps-utils": ^1.0.0-prerelease.1 - "@metamask/snaps-utils-flask": "npm:@metamask/snaps-utils@0.35.2-flask.1" + "@metamask/snaps-utils-flask": "npm:@metamask/snaps-utils@0.36.1-flask.1" "@metamask/subject-metadata-controller": ^2.0.0 "@metamask/test-dapp": ^7.0.1 "@metamask/utils": ^5.0.0