Merge pull request #37 from CMTA/dev

Rule Engine 2.0.0

Author: rya-sge

CHANGELOG.md

@@ -2,6 +2,15 @@
 
 Please follow [https://changelog.md/](https://changelog.md/) conventions.
 
+## v2.0.0
+
+- Implement the new architecture for the RuleEngine, with ValidationRule and OperationRule
+- Add the rule ConditionalTransfer as an Operation rule
+- Add the rule Blacklist as a Validation rule
+- Whitelist and blacklist rules share a part of their code.
+- Upgrade the library CMTAT to the version [v2.4.0](https://github.com/CMTA/CMTAT/releases/tag/v2.4.0)
+- Fix a minor bug when rules are deleted with clearRules
+
 ## v1.0.3 - 20231122
 
 - Upgrade the library CMTAT to the version [v2.3.1](https://github.com/CMTA/CMTAT/releases/tag/v2.3.1)

README.md

@@ -3,11 +3,40 @@
 # RuleEngine
 
 This repository includes the RuleEngine contract for the [CMTAT](https://github.com/CMTA/CMTAT) token. 
-- The CMTAT version used is the version [v2.3.1](https://github.com/CMTA/CMTAT/releases/tag/v2.3.1)
-- The OpenZeppelin version used is the version [v5.0.0](https://github.com/OpenZeppelin/openzeppelin-contracts/releases/tag/v5.0.0)
+- The CMTAT version used is the version [v2.4.0](https://github.com/CMTA/CMTAT/releases/tag/v2.4.0)
+- The OpenZeppelin version used is the version [v5.0.2](https://github.com/OpenZeppelin/openzeppelin-contracts/releases/tag/v5.0.2)
 
 The CMTAT contracts and the OpenZeppelin library are included as a submodule of the present repository.
 
+## How to include it
+
+While it has been designed for the CMTAT, the ruleEngine can be used with others contracts to apply restriction on transfer.
+
+For that, the only thing to do is to import in your contract the interface `IRuleEngine` which declares the function `operateOnTransfer`
+
+This interface can be found in [CMTAT/contracts/interfaces/engine/IRuleEngine.sol](https://github.com/CMTA/CMTAT/blob/23a1e59f913d079d0c09d32fafbd95ab2d426093/contracts/interfaces/engine/IRuleEngine.sol)
+
+Before each transfer, your contract must call the function `operateOnTransfer` which is the entrypoint for the RuleEngine.
+
+## Schema
+
+![Engine-RuleEngine.drawio](./doc/schema/Engine-RuleEngine.drawio.png)
+
+
+
+## Available Rules
+
+The following rules are available:
+
+| Rule                                                         | Type           | Description                                                  | Doc                                                          |
+| ------------------------------------------------------------ | -------------- | ------------------------------------------------------------ | ------------------------------------------------------------ |
+| [RuleWhitelist](src/rules/validation/RuleWhitelist.sol)      | RuleValidation | This rule can be used to restrict transfers from/to only addresses inside a whitelist. | [RuleWhitelist.md](./doc/technical/RuleWhitelist.md)<br />[surya-report](./doc/surya/surya_report/surya_report_RuleWhitelist.sol.md) |
+| [RuleBlacklist](src/rules/validation/RuleBlacklist.sol)      | RuleValidation | This rule can be used to forbid transfer from/to addresses in the blacklist | [RuleBlacklist.md](./doc/technical/RuleBlacklist.md)<br />[surya-report](./doc/surya/surya_report/surya_report_RuleBlacklist.sol.md) |
+| [RuleSanctionList](src/rules/validation/RuleSanctionList.sol) | RuleValidation | The purpose of this contract is to use the oracle contract from Chainalysis to forbid transfer from/to an address  included in a sanctions designation (US, EU, or UN). | [RuleSanctionList.md](./doc/technical/RuleSanctionList.md)<br />[surya-report](./doc/surya/surya_report/surya_report_RuleSanctionList.sol.md) |
+| [RuleConditionalTransfer](src/rules/operation/RuleConditionalTransfer.sol) | RuleOperation  | This page describes a Conditional Transfer implementation. This rule requires that transfers have to be approved before being executed by the token holders. | [RuleConditionalTransfer.md](./doc/technical/RuleConditionalTransfer.md)<br />[surya-report](./doc/surya/surya_report/surya_report_RuleConditionalTransfer.sol.md) |
+
+
+
 ## Audit
 
 The contracts have been audited by [ABDKConsulting](https://www.abdk.consulting/), a globally recognized firm specialized in smart contracts' security.
@@ -30,21 +59,22 @@ You will find the report performed with [Slither](https://github.com/crytic/slit
 
 | Version | File                                                         |
 | ------- | ------------------------------------------------------------ |
-| v1.0.2  | [v1.0.2-slither-report.md](./doc/audits/tools/v1.0.2-slither-report.md) |
-| v1.0.3  | [v1.0.3-slither-report.md](./doc/audits/tools/v1.0.3-slither-report.md) |
+| latest  | [slither-report.md](./doc/security/audits/tools/slither-report.md) |
+| v1.0.2  | [v1.0.2-slither-report.md](./doc/security/audits/archive/v1.0.2-slither-report.md) |
+| v1.0.3  | [v1.0.3-slither-report.md](./doc/security/audits/archive/v1.0.3-slither-report.md) |
+
+
 
 ## Documentation
 
 Here a summary of the main documentation
 
-| Document                            | Link/Files                                             |
-| ----------------------------------- | ------------------------------------------------------ |
-| Solidity API Documentation (docgen) | [doc/solidityAPI](./doc/solidityAPI)                   |
-| Technical documentation             | [doc/technical](./doc/technical)                       |
-| Toolchain                           | [doc/TOOLCHAIN.md](./doc/TOOLCHAIN.md)                 |
-| Functionalities                     | [doc/functionalities.pdf](./doc/functionalities.pdf)   |
-| Surya report                        | [doc/surya](./doc/surya)                               |
-| Test (v1.0.2)                       | [doc/test/v1.0.2/test.pdf](./doc/test/v1.0.2/test.pdf) |
+| Document                | Link/Files                                           |
+| ----------------------- | ---------------------------------------------------- |
+| Technical documentation | [doc/technical/general](./doc/technical/general.md)  |
+| Toolchain               | [doc/TOOLCHAIN.md](./doc/TOOLCHAIN.md)               |
+| Functionalities         | [doc/functionalities.pdf](./doc/functionalities.pdf) |
+| Surya report            | [doc/surya](./doc/surya/)                            |
 
 
 
@@ -150,21 +180,3 @@ Only RuleEngine with a Whitelist contract
 ```bash
 forge script script/RuleEngineScript.s.sol:RuleEngineScript --rpc-url=$RPC_URL  --broadcast --verify -vvv
 ```
-
-### Local
-
-> This documentation has been written for the version v1.0.2
-
-With Foundry, you [can create a local testnet](https://book.getfoundry.sh/reference/anvil/) node for deploying and testing smart contracts, based on the [Anvil](https://anvil.works/) framework. 
-
-On Linux, using the default RPC URL, and Anvil's test private key, run:  
-
-Example - Deploy the CMTAT, standalone version
-
-```  bash
-export RPC_URL=http://127.0.0.1:8545
-export PRIVATE_KEY=<Local Private Key>
-forge create CMTAT_BASE --rpc-url=$RPC_URL --private-key=$PRIVATE_KEY --constructor-args 0x0000000000000000000000000000000000000000,ADMIN,"CMTA Token","CMTAT","CMTAT_ISIN","https://cmta.ch",0x0000000000000000000000000000000000000000,"CMTAT_info",5
-```
-
-See also the command's [documentation](https://book.getfoundry.sh/reference/forge/deploy-command).

doc/accessControl/.$access-control.drawio.bkp

@@ -4,13 +4,17 @@
 
 Here the list of codes used by the different rules
 
-| Contract         | Constant name                     | Value |
-| ---------------- | --------------------------------- | ----- |
-| All              | NO_ERROR                          | 0     |
-| RuleWhitelist    | CODE_ADDRESS_FROM_NOT_WHITELISTED | 21    |
-| RuleWhitelist    | CODE_ADDRESS_TO_NOT_WHITELISTED   | 22    |
-| RuleSanctionList | CODE_ADDRESS_FROM_IS_SANCTIONED   | 31    |
-| RuleSanctionList | CODE_ADDRESS_TO_IS_SANCTIONED     | 32    |
+| Contract                | Constant name                      | Value |
+| ----------------------- | ---------------------------------- | ----- |
+| All                     | TRANSFER_OK (from CMTAT)           | 0     |
+| RuleWhitelist           | CODE_ADDRESS_FROM_NOT_WHITELISTED  | 21    |
+| RuleWhitelist           | CODE_ADDRESS_TO_NOT_WHITELISTED    | 22    |
+| RuleSanctionList        | CODE_ADDRESS_FROM_IS_SANCTIONED    | 31    |
+| RuleSanctionList        | CODE_ADDRESS_TO_IS_SANCTIONED      | 32    |
+| RuleBlacklist           | CODE_ADDRESS_FROM_IS_BLACKLISTED   | 41    |
+| RuleBlacklist           | CODE_ADDRESS_TO_IS_BLACKLISTED     | 42    |
+| RuleConditionalTransfer | CODE_TRANSFER_REQUEST_NOT_APPROVED | 51    |
 
 
 
+Warning: the CMTAT already uses the code 0-4 and the code 5-9 should be left free to allow further additions in the CMTAT