From ac20c586abf5d069ac7b666f0fc8fdb556ddcf7e Mon Sep 17 00:00:00 2001 From: Hadrien Croubois Date: Sat, 15 May 2021 10:55:02 +0200 Subject: [PATCH 1/3] move ERC20Votes and ERC20FlashMint out of draft --- contracts/mocks/{ERC3156Mock.sol => ERC20FlashMintMock.sol} | 2 +- contracts/mocks/ERC20VotesMock.sol | 2 +- .../extensions/{draft-ERC20FlashMint.sol => ERC20FlashMint.sol} | 0 .../ERC20/extensions/{draft-ERC20Votes.sol => ERC20Votes.sol} | 2 +- .../ERC20/extensions/{draft-IERC20Votes.sol => IERC20Votes.sol} | 0 5 files changed, 3 insertions(+), 3 deletions(-) rename contracts/mocks/{ERC3156Mock.sol => ERC20FlashMintMock.sol} (84%) rename contracts/token/ERC20/extensions/{draft-ERC20FlashMint.sol => ERC20FlashMint.sol} (100%) rename contracts/token/ERC20/extensions/{draft-ERC20Votes.sol => ERC20Votes.sol} (99%) rename contracts/token/ERC20/extensions/{draft-IERC20Votes.sol => IERC20Votes.sol} (100%) diff --git a/contracts/mocks/ERC3156Mock.sol b/contracts/mocks/ERC20FlashMintMock.sol similarity index 84% rename from contracts/mocks/ERC3156Mock.sol rename to contracts/mocks/ERC20FlashMintMock.sol index ccc344141af..33dba245d94 100644 --- a/contracts/mocks/ERC3156Mock.sol +++ b/contracts/mocks/ERC20FlashMintMock.sol @@ -3,7 +3,7 @@ pragma solidity ^0.8.0; -import "../token/ERC20/extensions/draft-ERC20FlashMint.sol"; +import "../token/ERC20/extensions/ERC20FlashMint.sol"; contract ERC20FlashMintMock is ERC20FlashMint { constructor ( diff --git a/contracts/mocks/ERC20VotesMock.sol b/contracts/mocks/ERC20VotesMock.sol index f7f45bf94d6..27affad7c67 100644 --- a/contracts/mocks/ERC20VotesMock.sol +++ b/contracts/mocks/ERC20VotesMock.sol @@ -3,7 +3,7 @@ pragma solidity ^0.8.0; -import "../token/ERC20/extensions/draft-ERC20Votes.sol"; +import "../token/ERC20/extensions/ERC20Votes.sol"; contract ERC20VotesMock is ERC20Votes { constructor ( diff --git a/contracts/token/ERC20/extensions/draft-ERC20FlashMint.sol b/contracts/token/ERC20/extensions/ERC20FlashMint.sol similarity index 100% rename from contracts/token/ERC20/extensions/draft-ERC20FlashMint.sol rename to contracts/token/ERC20/extensions/ERC20FlashMint.sol diff --git a/contracts/token/ERC20/extensions/draft-ERC20Votes.sol b/contracts/token/ERC20/extensions/ERC20Votes.sol similarity index 99% rename from contracts/token/ERC20/extensions/draft-ERC20Votes.sol rename to contracts/token/ERC20/extensions/ERC20Votes.sol index d4b3a094ee3..c0fada30fae 100644 --- a/contracts/token/ERC20/extensions/draft-ERC20Votes.sol +++ b/contracts/token/ERC20/extensions/ERC20Votes.sol @@ -3,7 +3,7 @@ pragma solidity ^0.8.0; import "./draft-ERC20Permit.sol"; -import "./draft-IERC20Votes.sol"; +import "./IERC20Votes.sol"; import "../../../utils/math/Math.sol"; import "../../../utils/math/SafeCast.sol"; import "../../../utils/cryptography/ECDSA.sol"; diff --git a/contracts/token/ERC20/extensions/draft-IERC20Votes.sol b/contracts/token/ERC20/extensions/IERC20Votes.sol similarity index 100% rename from contracts/token/ERC20/extensions/draft-IERC20Votes.sol rename to contracts/token/ERC20/extensions/IERC20Votes.sol From 31c5939635163174cf52591cb18cc26fa683a158 Mon Sep 17 00:00:00 2001 From: Hadrien Croubois Date: Mon, 17 May 2021 13:48:18 +0200 Subject: [PATCH 2/3] add changelog entry --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f24736d3db7..facb3e9b36c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ * `ERC20Votes`: add a new extension of the `ERC20` token with support for voting snapshots and delegation. This extension is compatible with Compound's `Comp` token interface. ([#2632](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/2632)) * Enumerables: Improve gas cost of removal in `EnumerableSet` and `EnumerableMap`. * Enumerables: Improve gas cost of lookup in `EnumerableSet` and `EnumerableMap`. + * `ERC20Votes` is no longer marked as draft. ([#2673](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/2673))) ## 4.1.0 (2021-04-29) From 0e20de4b4c3fbb6e689728a846ff9b223f9c10c3 Mon Sep 17 00:00:00 2001 From: Hadrien Croubois Date: Thu, 20 May 2021 10:14:40 +0200 Subject: [PATCH 3/3] Update CHANGELOG.md Co-authored-by: Francisco Giordano --- CHANGELOG.md | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index facb3e9b36c..aa14428fe26 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,14 @@ * `ERC20Votes`: add a new extension of the `ERC20` token with support for voting snapshots and delegation. This extension is compatible with Compound's `Comp` token interface. ([#2632](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/2632)) * Enumerables: Improve gas cost of removal in `EnumerableSet` and `EnumerableMap`. * Enumerables: Improve gas cost of lookup in `EnumerableSet` and `EnumerableMap`. - * `ERC20Votes` is no longer marked as draft. ([#2673](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/2673))) + + ### Breaking Changes + + * `ERC20FlashMint` is no longer a Draft ERC. ([#2673](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/2673))) + +**How to update:** Change your import paths by removing the `draft-` prefix from `@openzeppelin/contracts/token/ERC20/extensions/draft-ERC20FlashMint.sol`. + +> See [Releases and Stability: Drafts](https://docs.openzeppelin.com/contracts/4.x/releases-stability#drafts). ## 4.1.0 (2021-04-29)