Update CMTAT to the version 2.2, OZ to the version 4.8.1

CMTA · Jan 22, 2023 · 7b76518 · 7b76518
1 parent eb87b18
commit 7b76518
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,5 +2,11 @@
 
 Please follow [https://changelog.md/](https://changelog.md/) conventions.
 
+## 1.0.1 - 20230122
+
+- Update the library CMTAT to the version [2.2](https://github.com/CMTA/CMTAT/releases/tag/2.2)
+- Update the library OpenZeppelin to the version [4.8.1](https://github.com/OpenZeppelin/openzeppelin-contracts/releases/tag/v4.8.1)
+- Improve integration test with CMTAT    
+
 ## 1.0.0 - 20221114
 - 🎉 first release!
diff --git a/README.md b/README.md
@@ -1,8 +1,8 @@
 # RuleEngine
 
 This repository includes the RuleEngine contract for the [CMTAT](https://github.com/CMTA/CMTAT) token. 
-- The CMTAT version used is the version [2.1](https://github.com/CMTA/CMTAT/releases/tag/2.1)
-- The OpenZeppelin version used is the version [4.8.0](https://github.com/OpenZeppelin/openzeppelin-contracts/releases/tag/v4.8.0)
+- The CMTAT version used is the version [2.2](https://github.com/CMTA/CMTAT/releases/tag/2.2)
+- The OpenZeppelin version used is the version [4.8.1](https://github.com/OpenZeppelin/openzeppelin-contracts/releases/tag/v4.8.1)
 
 The CMTAT contracts and the OpenZeppelin library are included as a submodule of the present repository.
 

diff --git a/lib/CMTAT b/lib/CMTAT
diff --git a/lib/openzeppelin-contracts b/lib/openzeppelin-contracts
diff --git a/script/CMTATWithRuleEngine.s.sol b/script/CMTATWithRuleEngine.s.sol
@@ -17,7 +17,7 @@ contract MyScript is Script {
         address OWNER = vm.addr(deployerPrivateKey);
         address trustedForwarder = address(0x0);
         vm.startBroadcast(deployerPrivateKey);
-
+        uint256 flag = 5;
         // CMTAT
         CMTAT CMTAT_CONTRACT = new CMTAT(
             trustedForwarder,
@@ -26,7 +26,10 @@ contract MyScript is Script {
             "CMTA Token",
             "CMTAT",
             "CMTAT_ISIN",
-            "https://cmta.ch"
+            "https://cmta.ch",
+            IRuleEngine(address(0)), 
+            'CMTAT_info',
+            flag
         );
         console.log("CMTAT CMTAT_CONTRACT : ", address(CMTAT_CONTRACT));
         // whitelist

diff --git a/test/CMTATIntegration.t.sol b/test/CMTATIntegration.t.sol
@@ -22,6 +22,8 @@ contract CMTATIntegration is Test, HelperContract, RuleWhitelist {
     uint256 ADDRESS2_BALANCE_INIT = 32;
     uint256 ADDRESS3_BALANCE_INIT = 33;
 
+    uint256 FLAG = 5;
+
     // Arrange
     function setUp() public {
         vm.prank(DEFAULT_ADMIN_ADDRESS);
@@ -35,7 +37,10 @@ contract CMTATIntegration is Test, HelperContract, RuleWhitelist {
             "CMTA Token",
             "CMTAT",
             "CMTAT_ISIN",
-            "https://cmta.ch"
+            "https://cmta.ch",
+            IRuleEngine(address(0)), 
+            'CMTAT_info',
+            FLAG
         );
 
         // specific arrange
+3 −0		.github/workflows/docs.yml
+16 −0		CHANGELOG.md
+2 −0		contracts/access/README.adoc
+1 −1		contracts/package.json
+3 −3		contracts/proxy/utils/Initializable.sol
+4 −1		contracts/token/ERC20/extensions/ERC20Votes.sol
+17 −6		contracts/token/ERC20/extensions/ERC4626.sol
+12 −2		contracts/utils/Checkpoints.sol
+7 −0		docs/modules/ROOT/pages/extending-contracts.adoc
+5 −23		docs/modules/ROOT/pages/governance.adoc
+2 −2		package-lock.json
+1 −1		package.json
+5 −1		scripts/generate/templates/Checkpoints.js