From 4eb303f4e4f149583ba55b5f72e01e29f541700b Mon Sep 17 00:00:00 2001 From: MetaMask Bot Date: Mon, 4 Apr 2022 20:56:53 +0000 Subject: [PATCH 1/5] Version v10.12.4 --- CHANGELOG.md | 5 ++++- package.json | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index aac2a6694..918dc7196 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [10.12.4] + ## [10.12.2] ### Fixed - Fix error where unlock failed after update to v10.12.0 @@ -2849,7 +2851,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Uncategorized - Added the ability to restore accounts from seed words. -[Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v10.12.2...HEAD +[Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v10.12.4...HEAD +[10.12.4]: https://github.com/MetaMask/metamask-extension/compare/v10.12.2...v10.12.4 [10.12.2]: https://github.com/MetaMask/metamask-extension/compare/v10.12.1...v10.12.2 [10.12.1]: https://github.com/MetaMask/metamask-extension/compare/v10.12.0...v10.12.1 [10.12.0]: https://github.com/MetaMask/metamask-extension/compare/v10.11.4...v10.12.0 diff --git a/package.json b/package.json index a30a0d52e..3b774b736 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "metamask-crx", - "version": "10.12.2", + "version": "10.12.4", "private": true, "repository": { "type": "git", From 831d274a40bd900b9b3fe8256a96985dfdb82a7e Mon Sep 17 00:00:00 2001 From: Mark Stacey Date: Mon, 4 Apr 2022 16:44:32 -0230 Subject: [PATCH 2/5] Restore `version` missing from certain build steps (#14344) Certain build steps accidentally omitted the `version` variable. It has now been restored to all steps, ensuring that all environment variables are correctly injected into all bundles. A check has been added to the Sentry setup module to ensure the release is not omitted in the future. --- app/scripts/lib/setupSentry.js | 7 ++++--- development/build/scripts.js | 13 ++++++++++++- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/app/scripts/lib/setupSentry.js b/app/scripts/lib/setupSentry.js index 052be66ce..7332041bb 100644 --- a/app/scripts/lib/setupSentry.js +++ b/app/scripts/lib/setupSentry.js @@ -68,9 +68,9 @@ export const SENTRY_STATE = { }; export default function setupSentry({ release, getState }) { - let sentryTarget; - - if (METAMASK_DEBUG) { + if (!release) { + throw new Error('Missing release'); + } else if (METAMASK_DEBUG) { return undefined; } @@ -79,6 +79,7 @@ export default function setupSentry({ release, getState }) { ? METAMASK_ENVIRONMENT : `${METAMASK_ENVIRONMENT}-${METAMASK_BUILD_TYPE}`; + let sentryTarget; if (METAMASK_ENVIRONMENT === 'production') { if (!process.env.SENTRY_DSN) { throw new Error( diff --git a/development/build/scripts.js b/development/build/scripts.js index 063fc5a7e..41a9cb6ca 100644 --- a/development/build/scripts.js +++ b/development/build/scripts.js @@ -269,6 +269,7 @@ function createScriptTasks({ testing, policyOnly, shouldLintFenceFiles, + version, }); } @@ -285,6 +286,7 @@ function createScriptTasks({ testing, policyOnly, shouldLintFenceFiles, + version, }); } @@ -301,6 +303,7 @@ function createScriptTasks({ testing, policyOnly, shouldLintFenceFiles, + version, }); } @@ -320,6 +323,7 @@ function createScriptTasks({ policyOnly, shouldLintFenceFiles, testing, + version, }), createNormalBundle({ buildType, @@ -332,6 +336,7 @@ function createScriptTasks({ policyOnly, shouldLintFenceFiles, testing, + version, }), ); } @@ -532,6 +537,7 @@ function createNormalBundle({ modulesToExpose, shouldLintFenceFiles, testing, + version, }) { return async function () { // create bundler setup and apply defaults @@ -543,7 +549,12 @@ function createNormalBundle({ const reloadOnChange = Boolean(devMode); const minify = Boolean(devMode) === false; - const envVars = getEnvironmentVariables({ buildType, devMode, testing }); + const envVars = getEnvironmentVariables({ + buildType, + devMode, + testing, + version, + }); setupBundlerDefaults(buildConfiguration, { buildType, devMode, From 2185d2f7efc9794d20f3896a14785e147a7d4bc3 Mon Sep 17 00:00:00 2001 From: Dan Miller Date: Mon, 4 Apr 2022 21:07:48 -0230 Subject: [PATCH 3/5] Update changelog --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 918dc7196..c03202ae4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] ## [10.12.4] +### Fixed +- Fix MetaMask internal error reporting (#14344) + +## [10.12.3] +### Changed +- This version was used to rollback from v10.12.0 to v10.11.4. ## [10.12.2] ### Fixed From 70a3d3a620d64d92f1571557aae4b31211ad71fd Mon Sep 17 00:00:00 2001 From: ryanml Date: Tue, 5 Apr 2022 04:44:32 -0700 Subject: [PATCH 4/5] changelog fix --- CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c03202ae4..86c650b86 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2858,7 +2858,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Added the ability to restore accounts from seed words. [Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v10.12.4...HEAD -[10.12.4]: https://github.com/MetaMask/metamask-extension/compare/v10.12.2...v10.12.4 +[10.12.4]: https://github.com/MetaMask/metamask-extension/compare/v10.12.3...v10.12.4 +[10.12.3]: https://github.com/MetaMask/metamask-extension/compare/v10.12.2...v10.12.3 [10.12.2]: https://github.com/MetaMask/metamask-extension/compare/v10.12.1...v10.12.2 [10.12.1]: https://github.com/MetaMask/metamask-extension/compare/v10.12.0...v10.12.1 [10.12.0]: https://github.com/MetaMask/metamask-extension/compare/v10.11.4...v10.12.0 From fc1463cef364174ce4fce61541c7dfa5bfd5186b Mon Sep 17 00:00:00 2001 From: Dan J Miller Date: Tue, 5 Apr 2022 11:38:02 -0230 Subject: [PATCH 5/5] Update CHANGELOG.md Co-authored-by: Mark Stacey --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 86c650b86..c3b11cccb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,7 +12,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [10.12.3] ### Changed -- This version was used to rollback from v10.12.0 to v10.11.4. +- This version was used to rollback from v10.12.0 to v10.11.3. ## [10.12.2] ### Fixed