add data

dl-tokenf · Feb 26, 2024 · e7b37de · e7b37de
1 parent 2d9428a
commit e7b37de
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 19 deletions.
diff --git a/contracts/TokenF.sol b/contracts/TokenF.sol
@@ -104,7 +104,8 @@ abstract contract TokenF is Diamond, DiamondERC20, AgentAccessControl {
                 from_,
                 to_,
                 amount_,
-                operator_
+                operator_,
+                ""
             )
         {} catch {
             revert("TokenF: transferred reverted");
@@ -123,7 +124,8 @@ abstract contract TokenF is Diamond, DiamondERC20, AgentAccessControl {
                 from_,
                 to_,
                 amount_,
-                operator_
+                operator_,
+                ""
             )
         returns (bool canTransfer_) {
             require(canTransfer_, "TokenF: cannot transfer");
@@ -144,7 +146,8 @@ abstract contract TokenF is Diamond, DiamondERC20, AgentAccessControl {
                 from_,
                 to_,
                 amount_,
-                operator_
+                operator_,
+                ""
             )
         returns (bool isKYCed_) {
             require(isKYCed_, "TokenF: not KYCed");

diff --git a/contracts/interfaces/IKYCModule.sol b/contracts/interfaces/IKYCModule.sol
@@ -7,7 +7,8 @@ interface IKYCModule {
         address from_,
         address to_,
         uint256 amount_,
-        address operator_
+        address operator_,
+        bytes memory data_
     ) external view returns (bool);
 
     function getTokenF() external view returns (address);

diff --git a/contracts/interfaces/IRegulatoryModule.sol b/contracts/interfaces/IRegulatoryModule.sol
@@ -7,15 +7,17 @@ interface IRegulatoryModule {
         address from_,
         address to_,
         uint256 amount_,
-        address operator_
+        address operator_,
+        bytes memory data_
     ) external;
 
     function canTransfer(
         bytes4 selector_,
         address from_,
         address to_,
         uint256 amount_,
-        address operator_
+        address operator_,
+        bytes memory data_
     ) external view returns (bool);
 
     function getTokenF() external view returns (address);

diff --git a/contracts/kyc/KYCCompliance.sol b/contracts/kyc/KYCCompliance.sol
@@ -35,7 +35,8 @@ abstract contract KYCCompliance is KYCComplianceStorage, AgentAccessControl {
         address from_,
         address to_,
         uint256 amount_,
-        address operator_
+        address operator_,
+        bytes memory data_
     ) public view virtual returns (bool) {
         address[] memory regulatoryModules_ = getKYCModules();
 
@@ -46,7 +47,8 @@ abstract contract KYCCompliance is KYCComplianceStorage, AgentAccessControl {
                     from_,
                     to_,
                     amount_,
-                    operator_
+                    operator_,
+                    data_
                 )
             ) {
                 return false;

diff --git a/contracts/kyc/modules/RarimoModule.sol b/contracts/kyc/modules/RarimoModule.sol
@@ -20,7 +20,8 @@ abstract contract RarimoModule is AbstractKYCModule {
         address,
         address to_,
         uint256,
-        address
+        address,
+        bytes memory
     ) public view virtual override returns (bool) {
         if (selector_ == TokenF.forcedTransfer.selector || selector_ == TokenF.burn.selector) {
             return true;

diff --git a/contracts/regulatory/RegulatoryCompliance.sol b/contracts/regulatory/RegulatoryCompliance.sol
@@ -42,7 +42,8 @@ abstract contract RegulatoryCompliance is RegulatoryComplianceStorage, AgentAcce
         address from_,
         address to_,
         uint256 amount_,
-        address operator_
+        address operator_,
+        bytes memory data_
     ) public virtual onlyThis {
         address[] memory regulatoryModules_ = getRegulatoryModules();
 
@@ -52,7 +53,8 @@ abstract contract RegulatoryCompliance is RegulatoryComplianceStorage, AgentAcce
                 from_,
                 to_,
                 amount_,
-                operator_
+                operator_,
+                data_
             );
         }
     }
@@ -62,7 +64,8 @@ abstract contract RegulatoryCompliance is RegulatoryComplianceStorage, AgentAcce
         address from_,
         address to_,
         uint256 amount_,
-        address operator_
+        address operator_,
+        bytes memory data_
     ) public view virtual returns (bool) {
         address[] memory regulatoryModules_ = getRegulatoryModules();
 
@@ -73,7 +76,8 @@ abstract contract RegulatoryCompliance is RegulatoryComplianceStorage, AgentAcce
                     from_,
                     to_,
                     amount_,
-                    operator_
+                    operator_,
+                    data_
                 )
             ) {
                 return false;

diff --git a/contracts/regulatory/modules/TransferLimitsModule.sol b/contracts/regulatory/modules/TransferLimitsModule.sol
@@ -35,19 +35,21 @@ abstract contract TransferLimitsModule is AbstractRegulatoryModule {
     }
 
     function transferred(
-        bytes4 selector_,
-        address from_,
-        address to_,
-        uint256 amount_,
-        address operator_
+        bytes4,
+        address,
+        address,
+        uint256,
+        address,
+        bytes memory
     ) public virtual override {}
 
     function canTransfer(
         bytes4 selector_,
         address,
         address,
         uint256 amount_,
-        address
+        address,
+        bytes memory
     ) public view virtual override returns (bool) {
         if (
             selector_ == TokenF.burn.selector ||