From 1e0edaa080ddf944b295f7790d1c85baeae7a1d9 Mon Sep 17 00:00:00 2001 From: Frederik Bolding Date: Thu, 24 Aug 2023 10:41:58 +0200 Subject: [PATCH] Update snaps URLs (#20582) --- app/scripts/metamask-controller.js | 4 ++-- builds.yml | 6 +++--- shared/modules/provider-injection.js | 1 + test/env.js | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js index 570cd457e..7c82ee3a8 100644 --- a/app/scripts/metamask-controller.js +++ b/app/scripts/metamask-controller.js @@ -1065,8 +1065,8 @@ export default class MetamaskController extends EventEmitter { refetchOnAllowlistMiss: requireAllowlist, failOnUnavailableRegistry: requireAllowlist, url: { - registry: 'https://acl.execution.metamask.io/latest/registry.json', - signature: 'https://acl.execution.metamask.io/latest/signature.json', + registry: 'https://acl.execution.consensys.io/latest/registry.json', + signature: 'https://acl.execution.consensys.io/latest/signature.json', }, publicKey: '0x025b65308f0f0fb8bc7f7ff87bfc296e0330eee5d3c1d1ee4a048b2fd6a86fa0a6', diff --git a/builds.yml b/builds.yml index f31a7557c..180e7fa1e 100644 --- a/builds.yml +++ b/builds.yml @@ -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.metamask.io/1.0.1/index.html + - IFRAME_EXECUTION_ENVIRONMENT_URL: https://execution.consensys.io/1.0.1/index.html # Main build uses the default browser manifest manifestOverrides: false @@ -56,7 +56,7 @@ buildTypes: - SEGMENT_FLASK_WRITE_KEY - ALLOW_LOCAL_SNAPS: true - REQUIRE_SNAPS_ALLOWLIST: false - - IFRAME_EXECUTION_ENVIRONMENT_URL: https://execution.metamask.io/0.38.1-flask.1/index.html + - IFRAME_EXECUTION_ENVIRONMENT_URL: https://execution.consensys.io/0.38.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 @@ -75,7 +75,7 @@ buildTypes: - SEGMENT_FLASK_WRITE_KEY - ALLOW_LOCAL_SNAPS: true - REQUIRE_SNAPS_ALLOWLIST: false - - IFRAME_EXECUTION_ENVIRONMENT_URL: https://execution.metamask.io/0.38.1-flask.1/index.html + - IFRAME_EXECUTION_ENVIRONMENT_URL: https://execution.consensys.io/0.38.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/shared/modules/provider-injection.js b/shared/modules/provider-injection.js index 1fff08854..2a71762ad 100644 --- a/shared/modules/provider-injection.js +++ b/shared/modules/provider-injection.js @@ -65,6 +65,7 @@ function documentElementCheck() { */ function blockedDomainCheck() { const blockedDomains = [ + 'execution.consensys.io', 'execution.metamask.io', 'uscourts.gov', 'dropbox.com', diff --git a/test/env.js b/test/env.js index dd3c370b8..b451e2a80 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.36.1-flask.1/index.html'; + 'https://execution.consensys.io/0.36.1-flask.1/index.html';