Update CMTAT (v.3.0.0), RuleEngine library, adapt rules to the new RuleEngine, remove operation rule

Author: rya-sge

lib/CMTAT

@@ -5,7 +5,7 @@ pragma solidity ^0.8.20;
 import "./abstract/RuleAddressList/invariantStorage/RuleBlacklistInvariantStorage.sol";
 import "./abstract/RuleAddressList/RuleAddressList.sol";
 import "./abstract/RuleValidateTransfer.sol";
-
+//import {IERC1404Extend} from "CMTAT/interfaces/tokenization/draft-IERC1404.sol";
 /**
  * @title a blacklist manager
  */
@@ -15,6 +15,7 @@ contract RuleBlacklist is
     RuleAddressList,
     RuleBlacklistInvariantStorage
 {
+
     /**
      * @param admin Address of the contract (Access Control)
      * @param forwarderIrrevocable Address of the forwarder, required for the gasless support
@@ -40,7 +41,7 @@ contract RuleBlacklist is
         } else if (addressIsListed(to)) {
             return CODE_ADDRESS_TO_IS_BLACKLISTED;
         } else {
-            return uint8(REJECTED_CODE_BASE.TRANSFER_OK);
+            return uint8(IERC1404Extend.REJECTED_CODE_BASE.TRANSFER_OK);
         }
     }
 
@@ -91,4 +92,25 @@ contract RuleBlacklist is
             return TEXT_CODE_NOT_FOUND;
         }
     }
+
+    function transferred(address from, address to, uint256 value) public view {
+        uint8 code = this.detectTransferRestriction(from, to, value);
+        require(
+            code == uint8(REJECTED_CODE_BASE.TRANSFER_OK),
+            RuleBlacklist_InvalidTransfer(from, to, value, code)
+        );
+    }
+
+    function transferred(
+        address spender,
+        address from,
+        address to,
+        uint256 value
+    ) public view {
+        uint8 code = this.detectTransferRestrictionFrom(spender, from, to, value);
+        require(
+            code == uint8(REJECTED_CODE_BASE.TRANSFER_OK),
+            RuleBlacklist_InvalidTransfer(from, to, value, code)
+        );
+    }
 }

lib/RuleEngine

@@ -7,6 +7,7 @@ import "../../modules/MetaTxModuleStandalone.sol";
 import "./abstract/RuleSanctionListInvariantStorage.sol";
 import "./abstract/RuleValidateTransfer.sol";
 
+
 interface SanctionsList {
     function isSanctioned(address addr) external view returns (bool);
 }
@@ -17,6 +18,7 @@ contract RuleSanctionList is
     RuleValidateTransfer,
     RuleSanctionlistInvariantStorage
 {
+    
     SanctionsList public sanctionsList;
 
     /**
@@ -49,7 +51,7 @@ contract RuleSanctionList is
     }
 
     /**
-     * @notice Check if an addres is in the whitelist or not
+     * @notice Check if an addres is in the SanctionsList or not
      * @param from the origin address
      * @param to the destination address
      * @return The restricion code or REJECTED_CODE_BASE.TRANSFER_OK
@@ -119,6 +121,27 @@ contract RuleSanctionList is
         }
     }
 
+    function transferred(address from, address to, uint256 value) public view {
+        uint8 code = this.detectTransferRestriction(from, to, value);
+        require(
+            code == uint8(REJECTED_CODE_BASE.TRANSFER_OK),
+            RuleSanctionsList_InvalidTransfer(from, to, value, code)
+        );
+    }
+
+    function transferred(
+        address spender,
+        address from,
+        address to,
+        uint256 value
+    ) public view {
+        uint8 code = this.detectTransferRestrictionFrom(spender, from, to, value);
+        require(
+            code == uint8(REJECTED_CODE_BASE.TRANSFER_OK),
+            RuleSanctionsList_InvalidTransfer(from, to, value, code)
+        );
+    }
+
     /* ============ ACCESS CONTROL ============ */
     /**
      * @dev Returns `true` if `account` has been granted `role`.
@@ -130,8 +153,10 @@ contract RuleSanctionList is
         // The Default Admin has all roles
         if (AccessControl.hasRole(DEFAULT_ADMIN_ROLE, account)) {
             return true;
+        } else{
+            return AccessControl.hasRole(role, account);
         }
-        return AccessControl.hasRole(role, account);
+        
     }
 
     /*//////////////////////////////////////////////////////////////

…es/operation/RuleConditionalTransfer.sol …les/operation/RuleConditionalTransferOldsrc/rules/operation/RuleConditionalTransfer.sol renamed to src/rules/operation/RuleConditionalTransferOld src/rules/operation/RuleConditionalTransfer.sol renamed to src/rules/operation/RuleConditionalTransferOld

@@ -5,6 +5,8 @@ pragma solidity ^0.8.20;
 import "./abstract/RuleAddressList/RuleAddressList.sol";
 import "./abstract/RuleWhitelistCommon.sol";
 
+import {IERC1404, IERC1404Extend} from "CMTAT/interfaces/tokenization/draft-IERC1404.sol";
+
 /**
  * @title a whitelist manager
  */
@@ -18,6 +20,8 @@ contract RuleWhitelist is RuleAddressList, RuleWhitelistCommon {
         address forwarderIrrevocable
     ) RuleAddressList(admin, forwarderIrrevocable) {}
 
+
+
     /**
      * @notice Check if an addres is in the whitelist or not
      * @param from the origin address
@@ -44,10 +48,12 @@ contract RuleWhitelist is RuleAddressList, RuleWhitelistCommon {
         address to,
         uint256 value
     ) public view override returns (uint8) {
-        if (addressIsListed(spender)) {
+        if (!addressIsListed(spender)) {
             return CODE_ADDRESS_SPENDER_NOT_WHITELISTED;
         } else {
-            return detectTransferRestriction(from,to,value);
+            return detectTransferRestriction(from, to, value);
         }
     }
+
+
 }

…eConditionalTransferInvariantStorage.sol …leConditionalTransferInvariantStorageOldsrc/rules/operation/abstract/RuleConditionalTransferInvariantStorage.sol renamed to src/rules/operation/abstract/RuleConditionalTransferInvariantStorageOld src/rules/operation/abstract/RuleConditionalTransferInvariantStorage.sol renamed to src/rules/operation/abstract/RuleConditionalTransferInvariantStorageOld

@@ -3,16 +3,17 @@
 pragma solidity ^0.8.20;
 
 import "OZ/access/AccessControl.sol";
-import "RuleEngine/modules/RuleEngineValidationCommon.sol";
 import "../../modules/MetaTxModuleStandalone.sol";
 import "./abstract/RuleAddressList/RuleAddressList.sol";
 import "./abstract/RuleWhitelistCommon.sol";
-
+import {RulesManagementModule} from "RuleEngine/modules/RulesManagementModule.sol";
+import {RuleEngineInvariantStorage} from "RuleEngine/modules/library/RuleEngineInvariantStorage.sol";
+import {IRule} from "RuleEngine/interfaces/IRule.sol";
 /**
  * @title Wrapper to call several different whitelist rules
  */
 contract RuleWhitelistWrapper is
-    RuleEngineValidationCommon,
+    RulesManagementModule,
     MetaTxModuleStandalone,
     RuleWhitelistCommon
 {
@@ -25,7 +26,7 @@ contract RuleWhitelistWrapper is
         address forwarderIrrevocable
     ) MetaTxModuleStandalone(forwarderIrrevocable) {
         if (admin == address(0)) {
-            revert RuleEngine_AdminWithAddressZeroNotAllowed();
+            revert RuleEngineInvariantStorage.RuleEngine_AdminWithAddressZeroNotAllowed();
         }
         _grantRole(DEFAULT_ADMIN_ROLE, admin);
     }
@@ -46,11 +47,11 @@ contract RuleWhitelistWrapper is
         bool[] memory result = new bool[](2);
         targetAddress[0] = from;
         targetAddress[1] = to;
-        uint256 rulesLength = _rulesValidation.length;
+        uint256 rulesLength = rulesCount();
         // For each whitelist rule, we ask if from or to are in the whitelist
         for (uint256 i = 0; i < rulesLength; ++i) {
             // External call
-            isListed = RuleAddressList(_rulesValidation[i])
+            isListed = RuleAddressList(rule(i))
                 .addressIsListedBatch(targetAddress);
             if (isListed[0] && !result[0]) {
                 // Update if from is in the list
@@ -85,11 +86,11 @@ contract RuleWhitelistWrapper is
         targetAddress[0] = from;
         targetAddress[1] = to;
         targetAddress[2] = spender;
-        uint256 rulesLength = _rulesValidation.length;
+        uint256 rulesLength = rulesCount();
         // For each whitelist rule, we ask if from or to are in the whitelist
         for (uint256 i = 0; i < rulesLength; ++i) {
             // External call
-            isListed = RuleAddressList(_rulesValidation[i])
+            isListed = RuleAddressList(rule(i))
                 .addressIsListedBatch(targetAddress);
             if (isListed[0] && !result[0]) {
                 // Update if from is in the list
@@ -129,8 +130,10 @@ contract RuleWhitelistWrapper is
         // The Default Admin has all roles
         if (AccessControl.hasRole(DEFAULT_ADMIN_ROLE, account)) {
             return true;
+        } else {
+            return AccessControl.hasRole(role, account);
         }
-        return AccessControl.hasRole(role, account);
+   
     }
 
     /*//////////////////////////////////////////////////////////////

…ract/RuleConditionalTransferOperator.sol …tract/RuleConditionalTransferOperatorOldsrc/rules/operation/abstract/RuleConditionalTransferOperator.sol renamed to src/rules/operation/abstract/RuleConditionalTransferOperatorOld src/rules/operation/abstract/RuleConditionalTransferOperator.sol renamed to src/rules/operation/abstract/RuleConditionalTransferOperatorOld

@@ -5,6 +5,12 @@ pragma solidity ^0.8.20;
 import "../../RuleCommonInvariantStorage.sol";
 
 abstract contract RuleBlacklistInvariantStorage is RuleCommonInvariantStorage {
+        error RuleBlacklist_InvalidTransfer(
+        address from,
+        address to,
+        uint256 value,
+        uint8 code
+    );
     /* ============ String message ============ */
     string constant TEXT_ADDRESS_FROM_IS_BLACKLISTED =
         "The sender is blacklisted";