From 0112c803d89aec71dba42346bf2f9f99e3550ea3 Mon Sep 17 00:00:00 2001 From: Esteban Mino Date: Tue, 19 Jan 2021 12:59:04 -0300 Subject: [PATCH 1/3] bump --- CHANGELOG.md | 14 ++++++++++++-- package.json | 2 +- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4cb28e93bc0..67fb6656759 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,16 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), ## [Unreleased] +## [6.0.0] - 2021-19-01 + +### Changed + +- Remove default approval controller type ([#321](https://github.com/MetaMask/controllers/pull/321)) + +### Fixed + +- Enforce the usage of `chainId` instead of `networkId` in `NetworkController` ([#324](https://github.com/MetaMask/controllers/pull/324)) + ## [5.1.0] - 2020-12-02 ### Changed @@ -151,8 +161,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), - Remove shapeshift controller (#209) -[Unreleased]:https://github.com/MetaMask/controllers/compare/v5.1.0...HEAD -[5.1.0]:https://github.com/MetaMask/controllers/compare/v5.0.0...v5.1.0 +[Unreleased]:https://github.com/MetaMask/controllers/compare/v6.0.0...HEAD +[5.1.0]:https://github.com/MetaMask/controllers/compare/v5.1.0...v6.0.0 [5.0.0]:https://github.com/MetaMask/controllers/compare/v4.2.0...v5.0.0 [4.2.0]:https://github.com/MetaMask/controllers/compare/v4.1.0...v4.2.0 [4.1.0]:https://github.com/MetaMask/controllers/compare/v4.0.2...v4.1.0 diff --git a/package.json b/package.json index dfc50a9e716..13a9ea9d54d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@metamask/controllers", - "version": "5.1.0", + "version": "6.0.0", "description": "Collection of platform-agnostic modules for creating secure data models for cryptocurrency wallets", "license": "MIT", "files": [ From b55904f35179c00bbe9dee7492520f962d63927f Mon Sep 17 00:00:00 2001 From: Esteban Mino Date: Tue, 19 Jan 2021 13:08:52 -0300 Subject: [PATCH 2/3] date --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 67fb6656759..ff8cee07cc9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), ## [Unreleased] -## [6.0.0] - 2021-19-01 +## [6.0.0] - 2021-01-19 ### Changed From c6b7161ceecd8a016c7505022259455f605a9187 Mon Sep 17 00:00:00 2001 From: Erik Marks <25517051+rekmarks@users.noreply.github.com> Date: Tue, 19 Jan 2021 08:20:00 -0800 Subject: [PATCH 3/3] Update CHANGELOG.md --- CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ff8cee07cc9..65d0a1f87b0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -162,7 +162,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), - Remove shapeshift controller (#209) [Unreleased]:https://github.com/MetaMask/controllers/compare/v6.0.0...HEAD -[5.1.0]:https://github.com/MetaMask/controllers/compare/v5.1.0...v6.0.0 +[6.0.0]:https://github.com/MetaMask/controllers/compare/v5.1.0...v6.0.0 +[5.1.0]:https://github.com/MetaMask/controllers/compare/v5.0.0...v5.1.0 [5.0.0]:https://github.com/MetaMask/controllers/compare/v4.2.0...v5.0.0 [4.2.0]:https://github.com/MetaMask/controllers/compare/v4.1.0...v4.2.0 [4.1.0]:https://github.com/MetaMask/controllers/compare/v4.0.2...v4.1.0