Issue 126 (#128)

* the commission works without a whitelist * function renaming * update payFee function
The-Poolz · Dec 14, 2022 · bda8a93 · bda8a93
1 parent a48fa72
commit bda8a93
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 20 deletions.
diff --git a/contracts/LockedCreation.sol b/contracts/LockedCreation.sol
@@ -88,10 +88,7 @@ contract LockedCreation is LockedPoolz {
     }
 
     function payFee(address _token, uint256 _amount) internal {
-        if (
-            WhiteList_Address != address(0) &&
-            !(isUserWithoutFee(msg.sender) || isTokenWithoutFee(_token))
-        ) {
+        if (isTokenWithFee(_token) && isUserPaysFee(msg.sender)) {
             PayFee(_amount);
         }
     }

diff --git a/contracts/LockedDealModifiers.sol b/contracts/LockedDealModifiers.sol
@@ -28,6 +28,7 @@ contract LockedDealModifiers {
         require(_address != address(0x0), "Zero Address is not allowed");
         _;
     }
+
     modifier isPoolValid(uint256 _PoolId) {
         require(_PoolId < Index, "Pool does not exist");
         _;

diff --git a/contracts/LockedManageable.sol b/contracts/LockedManageable.sol
@@ -36,17 +36,13 @@ contract LockedManageable is
         isTokenFilterOn = !isTokenFilterOn;
     }
 
-    function isTokenWithoutFee(address _tokenAddress)
-        public
-        view
-        notZeroAddress(WhiteList_Address)
-        returns (bool)
-    {
+    function isTokenWithFee(address _tokenAddress) public view returns (bool) {
         return
-            IWhiteList(WhiteList_Address).Check(
+            WhiteList_Address == address(0) ||
+            !(IWhiteList(WhiteList_Address).Check(
                 _tokenAddress,
                 TokenFeeWhiteListId
-            ) > 0;
+            ) > 0);
     }
 
     function isTokenWhiteListed(address _tokenAddress)
@@ -63,15 +59,13 @@ contract LockedManageable is
             0;
     }
 
-    function isUserWithoutFee(address _UserAddress)
-        public
-        view
-        notZeroAddress(WhiteList_Address)
-        returns (bool)
-    {
+    function isUserPaysFee(address _UserAddress) public view returns (bool) {
         return
-            IWhiteList(WhiteList_Address).Check(_UserAddress, UserWhiteListId) >
-            0;
+            WhiteList_Address == address(0) ||
+            !(IWhiteList(WhiteList_Address).Check(
+                _UserAddress,
+                UserWhiteListId
+            ) > 0);
     }
 
     function setMaxTransactionLimit(uint256 _newLimit) external onlyOwner {
-Original file line number
+Diff line change
@@ Expand Up / @@ -28,6 +28,7 @@ contract LockedDealModifiers { @@
             require(_address != address(0x0), "Zero Address is not allowed");
             _;
         }
         modifier isPoolValid(uint256 _PoolId) {
             require(_PoolId < Index, "Pool does not exist");
             _;
@@ Expand Down @@