fixes

dl-tokenf · Mar 7, 2024 · 1ffc5b4 · 1ffc5b4
1 parent 4090e9e
commit 1ffc5b4
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 7 deletions.
diff --git a/contracts/modules/AbstractComplianceModule.sol b/contracts/modules/AbstractComplianceModule.sol
@@ -32,6 +32,20 @@ abstract contract AbstractComplianceModule is Initializable {
 
     function _getClaimTopicKey(TokenF.Context memory ctx_) internal view virtual returns (bytes32);
 
+    function addClaimTopics(
+        bytes32 claimTopicKey_,
+        bytes32[] memory claimTopics_
+    ) public virtual onlyRole(_complianceModuleRole()) {
+        _addClaimTopics(claimTopicKey_, claimTopics_);
+    }
+
+    function removeClaimTopics(
+        bytes32 claimTopicKey_,
+        bytes32[] memory claimTopics_
+    ) public virtual onlyRole(_complianceModuleRole()) {
+        _removeClaimTopics(claimTopicKey_, claimTopics_);
+    }
+
     function getClaimTopics(
         bytes32 claimTopicsKey_
     ) public view virtual returns (bytes32[] memory) {

diff --git a/contracts/modules/AbstractKYCModule.sol b/contracts/modules/AbstractKYCModule.sol
@@ -12,6 +12,8 @@ abstract contract AbstractKYCModule is AbstractComplianceModule {
         Operator
     }
 
+    function __AbstractKYCModule_init() internal onlyInitializing {}
+
     function isKYCed(TokenF.Context calldata ctx_) public view virtual returns (bool) {
         return _hook(ctx_);
     }

diff --git a/contracts/modules/AbstractRegulatoryModule.sol b/contracts/modules/AbstractRegulatoryModule.sol
@@ -6,6 +6,8 @@ import {TokenF} from "../core/TokenF.sol";
 import {AbstractComplianceModule} from "./AbstractComplianceModule.sol";
 
 abstract contract AbstractRegulatoryModule is AbstractComplianceModule {
+    function __AbstractRegulatoryModule_init() internal onlyInitializing {}
+
     function transferred(TokenF.Context calldata ctx_) public virtual {}
 
     function canTransfer(TokenF.Context calldata ctx_) public view virtual returns (bool) {

diff --git a/examples/equity-token/contracts/EquityKYCCompliance.sol b/examples/equity-token/contracts/EquityKYCCompliance.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.20;
 
-import {KYCCompliance} from "@tokenf/contracts/kyc/KYCCompliance.sol";
+import {KYCCompliance} from "@tokenf/contracts/core/KYCCompliance.sol";
 
 contract EquityKYCCompliance is KYCCompliance {
     function __EquityKYCCompliance_init() external initializer(KYC_COMPLIANCE_STORAGE_SLOT) {

diff --git a/examples/equity-token/contracts/EquityRarimoModule.sol b/examples/equity-token/contracts/EquityRarimoModule.sol
@@ -1,11 +1,11 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.20;
 
-import {RarimoModule} from "@tokenf/contracts/kyc/modules/RarimoModule.sol";
+import {RarimoModule} from "@tokenf/contracts/modules/kyc/RarimoModule.sol";
 
 contract EquityRarimoModule is RarimoModule {
     function __EquityRarimoModule_init(address tokenF_, address sbt_) external initializer {
-        __AbstractKYCModule_init(tokenF_);
+        __AbstractComplianceModule_init(tokenF_);
         __RarimoModule_init(sbt_);
     }
 }
diff --git a/examples/equity-token/contracts/EquityRegulatoryCompliance.sol b/examples/equity-token/contracts/EquityRegulatoryCompliance.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.20;
 
-import {RegulatoryCompliance} from "@tokenf/contracts/regulatory/RegulatoryCompliance.sol";
+import {RegulatoryCompliance} from "@tokenf/contracts/core/RegulatoryCompliance.sol";
 
 contract EquityRegulatoryCompliance is RegulatoryCompliance {
     function __EquityRegulatoryCompliance_init()

diff --git a/examples/equity-token/contracts/EquityToken.sol b/examples/equity-token/contracts/EquityToken.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.20;
 
-import {TokenF} from "@tokenf/contracts/TokenF.sol";
+import {TokenF} from "@tokenf/contracts/core/TokenF.sol";
 
 contract EquityToken is TokenF {
     function __EquityToken_init(

diff --git a/examples/equity-token/contracts/EquityTransferLimitsModule.sol b/examples/equity-token/contracts/EquityTransferLimitsModule.sol
@@ -1,11 +1,11 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.20;
 
-import {TransferLimitsModule} from "@tokenf/contracts/regulatory/modules/TransferLimitsModule.sol";
+import {TransferLimitsModule} from "@tokenf/contracts/modules/regulatory/TransferLimitsModule.sol";
 
 contract EquityTransferLimitsModule is TransferLimitsModule {
     function __EquityTransferLimitsModule_init(address tokenF_) external initializer {
-        __AbstractRegulatoryModule_init(tokenF_);
+        __AbstractComplianceModule_init(tokenF_);
         __TransferLimitsModule_init(1 ether, MAX_TRANSFER_LIMIT);
     }
 }