Update versions for v2.0.0 release

* Upgraded version to 2.0.0. Deployed Rules Engine to Sepolia and Amoy
* Updated Deployment Directory
* Removed the indexed keyword from event string parameters and added a getter to appName
* Exposed rule processor address in ProtocolApplicationHandler
* Removed old stuff in abi-aggregator we don't need anymore

---------

Co-authored-by: Robert Kotz <[email protected]>

CHANGELOG.md

@@ -0,0 +1,16 @@
+## 2.0.0 - 2024-08-19
+
+### Changed
+- The repository was renamed to rules-engine
+- The Minimum Hold Time rule was refactored to conform to common rule storage and processing conventions
+- Documentation was added for admin role removal and renunciation
+- Additional data was added to the TokenRegistered event to support offchain processing
+- Deployment Scripts were updated to better align with the documented integration strategy and AppManager based RBAC items were removed
+- String parameters in the event were changed to not be indexed
+
+### Added
+- FeeCollected events are now emitted when fees are collected
+- Token Max Trading Volume and Token Max Supply Volatility rule now have additional configuration functions
+
+### Removed
+- ProtocolERC20 was removed in favor of minimalistic integration strategies

README.md

@@ -4,7 +4,7 @@
 
 This repository contains an EVM-based protocol designed to meet the unique needs of tokenized assets and on-chain economies. The protocol enables the creation and management of economic and compliance controls for your on-chain economy at the token level, allowing for maximum flexibility while maintaining the transparency and trustlessness of Web3.
 
-[version-image]: https://img.shields.io/badge/Version-1.3.1-brightgreen?style=for-the-badge&logo=appveyor
+[version-image]: https://img.shields.io/badge/Version-2.0.0-brightgreen?style=for-the-badge&logo=appveyor
 [version-url]: https://github.com/thrackle-io/rules-engine
 
 ## Installation

abi-aggregator.mjs

@@ -21,27 +21,27 @@ const repoBranch = process.argv[3]
 const ABIFiles = [
   {
     name: "ApplicationERC20Pricing",
-    branches: ["main", "internal"],
+    branches: ["main"],
     files: ["./out/ApplicationERC20Pricing.sol/ApplicationERC20Pricing.json"],
   },
   {
     name: "ApplicationERC721Pricing",
-    branches: ["main", "internal"],
+    branches: ["main"],
     files: ["./out/ApplicationERC721Pricing.sol/ApplicationERC721Pricing.json"],
   },
   {
     name: "ApplicationHandler",
-    branches: ["main", "internal"],
+    branches: ["main"],
     files: ["./out/ApplicationHandler.sol/ApplicationHandler.json"],
   },
   {
     name: "AppManager",
-    branches: ["main", "internal"],
+    branches: ["main"],
     files: ["./out/AppManager.sol/AppManager.json"],
   },
   {
     name: "HandlerDiamond",
-    branches: ["main", "internal"],
+    branches: ["main"],
     files: [
       "./out/ERC20HandlerMainFacet.sol/ERC20HandlerMainFacet.json",
       "./out/ERC20TaggedRuleFacet.sol/ERC20TaggedRuleFacet.json",
@@ -55,32 +55,32 @@ const ABIFiles = [
   },
   {
     name: "OracleApproved",
-    branches: ["main", "internal"],
+    branches: ["main"],
     files: ["./out/OracleApproved.sol/OracleApproved.json"],
   },
   {
     name: "OracleDenied",
-    branches: ["main", "internal"],
+    branches: ["main"],
     files: ["./out/OracleDenied.sol/OracleDenied.json"],
   },
   {
     name: "PauseRules",
-    branches: ["main", "internal"],
+    branches: ["main"],
     files: ["./out/PauseRules.sol/PauseRules.json"],
   },
   {
     name: "ApplicationERC20",
-    branches: ["main", "internal"],
+    branches: ["main"],
     files: ["./out/ApplicationERC20.sol/ApplicationERC20.json"],
   },
   {
     name: "ApplicationERC721",
-    branches: ["main", "internal"],
+    branches: ["main"],
     files: ["./out/ApplicationERC721.sol/ApplicationERC721.json"],
   },
   {
     name: "RuleDiamond",
-    branches: ["main", "internal"],
+    branches: ["main"],
     files: [
       "./out/ApplicationAccessLevelProcessorFacet.sol/ApplicationAccessLevelProcessorFacet.json",
       "./out/ApplicationPauseProcessorFacet.sol/ApplicationPauseProcessorFacet.json",
@@ -97,53 +97,6 @@ const ABIFiles = [
       "./out/TaggedRuleDataFacet.sol/TaggedRuleDataFacet.json",
     ],
   },
-  {
-    name: "ProtocolAMMCalcConst",
-    branches: ["internal"],
-    files: ["./out/ProtocolAMMCalcConst.sol/ProtocolAMMCalcConst.json"],
-  },
-  {
-    name: "ProtocolAMMCalcCP",
-    branches: ["internal"],
-    files: ["./out/ProtocolAMMCalcCP.sol/ProtocolAMMCalcCP.json"],
-  },
-  {
-    name: "ProtocolAMMCalcLinear",
-    branches: ["internal"],
-    files: ["./out/ProtocolAMMCalcLinear.sol/ProtocolAMMCalcLinear.json"],
-  },
-  {
-    name: "ProtocolAMMCalcSample01",
-    branches: ["internal"],
-    files: ["./out/ProtocolAMMCalcSample01.sol/ProtocolAMMCalcSample01.json"],
-  },
-  {
-    name: "ProtocolAMMFactory",
-    branches: ["internal"],
-    files: ["./out/ProtocolAMMFactory.sol/ProtocolAMMFactory.json"],
-  },
-  {
-    name: "ProtocolAMMHandler",
-    branches: ["internal"],
-    files: ["./out/ProtocolAMMHandler.sol/ProtocolAMMHandler.json"],
-  },
-  {
-    name: "ProtocolNFTAMMCalcDualLinear",
-    branches: ["internal"],
-    files: [
-      "./out/ProtocolNFTAMMCalcDualLinear.sol/ProtocolNFTAMMCalcDualLinear.json",
-    ],
-  },
-  {
-    name: "ProtocolERC20AMM",
-    branches: ["internal"],
-    files: ["./out/ProtocolERC20AMM.sol/ProtocolERC20AMM.json"],
-  },
-  {
-    name: "ProtocolERC721AMM",
-    branches: ["internal"],
-    files: ["./out/ProtocolERC721AMM.sol/ProtocolERC721AMM.json"],
-  },
 ]
 
 const createOutputDir = (dir) => (!existsSync(dir) ? mkdirSync(dir, { recursive: true }) : undefined)

deployments/11155111/2.0.0/2024-08-19T13:33:24/diamond/diamonds.json

@@ -0,0 +1,23 @@
+{
+    "11155111": {
+        "ProtocolProcessorDiamond": {
+            "2024-08-19": {
+                "VersionFacet": "0xE136D772F91B4023f28643db93d977b68eaBf021",
+                "ProtocolNativeFacet": "0x8Bb5375c8C497247D77081A3DE7E1765Ae8FC855",
+                "ProtocolRawFacet": "0xCC0535d1753eA5162809296Ece03646A0540c9b1",
+                "ERC20RuleProcessorFacet": "0x7Bb5eC9e5E0304f96A3C8B0CE54638c2aDe7456c",
+                "ERC721RuleProcessorFacet": "0xB45db96d97BCb4D4F00479F78ddA6B30dD8242C6",
+                "RuleProcessorDiamond": "0xd0dcE3E14aF7fFB89537c5b97aAFDAf337B842e4",
+                "ApplicationRiskProcessorFacet": "0x92b4FB39Fef7e70FF3c704357c398e2cA7551Dae",
+                "ApplicationAccessLevelProcessorFacet": "0x56b2cE9Bc8d6c498C61d25e88632C6BA6ADcE3C7",
+                "ApplicationPauseProcessorFacet": "0x6026eD5Ca275a4D3085ceedBf4388D14b384963B",
+                "ERC20TaggedRuleProcessorFacet": "0xF09D87822fA1dD0cA00D5449B0AE35212605FC97",
+                "ERC721TaggedRuleProcessorFacet": "0x8860A2B0d339CC01ddbcB6983dDC27c323bC9490",
+                "RuleApplicationValidationFacet": "0xA3564B92189f0Bb341877e8A34863Ef458cd6cB6",
+                "RuleDataFacet": "0x0135325DBF66dd348C44c206A501bE2f2e92049d",
+                "TaggedRuleDataFacet": "0xD122F38C57166B87AcFd86340B2d61Ced86D7070",
+                "AppRuleDataFacet": "0x86A3F6292e3f79A0Cf9fBf74fEe4aa04480b1c0B"
+            }
+        }
+    }
+}