native decimals

dexe-network · Apr 22, 2024 · ab85aba · ab85aba
1 parent dac37d0
commit ab85aba
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/contracts/gov/GovPool.sol b/contracts/gov/GovPool.sol
@@ -282,11 +282,12 @@ contract GovPool is
 
         if (amount != 0) {
             address token = _govUserKeeper.tokenAddress();
+            uint256 amountWithNativeDecimals = amount.from18Safe(token);
 
-            if (amount != msg.value) {
+            if (amountWithNativeDecimals != msg.value) {
                 IERC20(token).safeTransfer(
                     address(_govUserKeeper),
-                    (amount - msg.value).from18Safe(token)
+                    amountWithNativeDecimals - msg.value
                 );
             }
 
@@ -632,6 +633,10 @@ contract GovPool is
     }
 
     function _checkValue(uint256 amount) internal view {
-        require(msg.value <= amount, "Gov: value is greater than amount to transfer");
+        address token = _govUserKeeper.tokenAddress();
+        require(
+            msg.value <= amount.from18Safe(token),
+            "Gov: value is greater than amount to transfer"
+        );
     }
 }
diff --git a/contracts/gov/user-keeper/GovUserKeeper.sol b/contracts/gov/user-keeper/GovUserKeeper.sol
@@ -93,18 +93,18 @@ contract GovUserKeeper is IGovUserKeeper, OwnableUpgradeable, ERC721HolderUpgrad
         uint256 amount
     ) external payable override onlyOwner withSupportedToken {
         address token = tokenAddress;
-        uint256 fullAmount = amount;
+        uint256 amountWithNativeDecimals = amount.from18Safe(token);
 
         if (msg.value != 0) {
             _wrapNative(msg.value);
-            amount -= msg.value;
+            amountWithNativeDecimals -= msg.value;
         }
 
         if (amount > 0) {
-            IERC20(token).safeTransferFrom(payer, address(this), amount.from18Safe(token));
+            IERC20(token).safeTransferFrom(payer, address(this), amountWithNativeDecimals);
         }
 
-        _usersInfo[receiver].balances[IGovPool.VoteType.PersonalVote].tokens += fullAmount;
+        _usersInfo[receiver].balances[IGovPool.VoteType.PersonalVote].tokens += amount;
     }
 
     function withdrawTokens(