@towns-protocol/contracts 0.0.452 → 0.0.455

package/src/spaces/facets/tipping/TippingBase.sol

@@ -13,8 +13,7 @@ import {CurrencyTransfer} from "../../../utils/libraries/CurrencyTransfer.sol";
 import {CustomRevert} from "../../../utils/libraries/CustomRevert.sol";
 import {MembershipStorage} from "../membership/MembershipStorage.sol";
 import {TippingStorage} from "./TippingStorage.sol";
-import {BasisPoints} from "../../../utils/libraries/BasisPoints.sol";
-import {SafeTransferLib} from "solady/utils/SafeTransferLib.sol";
+import {ProtocolFeeLib} from "../ProtocolFeeLib.sol";
 
 // contracts
 import {PointsBase} from "../points/PointsBase.sol";
@@ -23,8 +22,6 @@ abstract contract TippingBase is ITippingBase, PointsBase {
     using EnumerableSet for EnumerableSet.AddressSet;
     using CustomRevert for bytes4;
 
-    uint256 internal constant MAX_FEE_TOLERANCE = 100; // 1% tolerance
-
     /*´:°•.°+.*•´.*:˚.°*.˚•´.°:°•.°•.*•´.*:˚.°*.˚•´.°:°•.°+.*•´.*:*/
     /*                      Internal Functions                    */
     /*.•°:°.´+˚.*°.˚:*.´•*.+°.•°:´*.´•*.•°.•°:°.´:•˚°.*°.˚:*.´+°.•*/
@@ -205,41 +202,28 @@ abstract contract TippingBase is ITippingBase, PointsBase {
         address currency,
         uint256 amount
     ) internal returns (uint256 protocolFee) {
-        MembershipStorage.Layout storage ds = MembershipStorage.layout();
-        address spaceFactory = ds.spaceFactory;
+        address spaceFactory = MembershipStorage.layout().spaceFactory;
 
-        // Calculate expected fee
-        uint256 expectedFee = IFeeManager(spaceFactory).calculateFee(
+        // Calculate fee first
+        protocolFee = IFeeManager(spaceFactory).calculateFee(
             FeeTypesLib.TIP_MEMBER,
             msg.sender,
             amount,
             ""
         );
 
-        if (expectedFee == 0) return 0;
-
-        // Add slippage tolerance (1%)
-        uint256 maxFee = expectedFee + BasisPoints.calculate(expectedFee, MAX_FEE_TOLERANCE);
-
-        // Approve ERC20 if needed (native token sends value with call)
-        bool isNative = currency == CurrencyTransfer.NATIVE_TOKEN;
-        if (!isNative) SafeTransferLib.safeApproveWithRetry(currency, spaceFactory, maxFee);
-
-        // Charge fee (excess native token will be refunded)
-        protocolFee = IFeeManager(spaceFactory).chargeFee{value: isNative ? maxFee : 0}(
+        // Charge with pre-calculated fee
+        protocolFee = ProtocolFeeLib.charge(
+            spaceFactory,
             FeeTypesLib.TIP_MEMBER,
             msg.sender,
-            amount,
             currency,
-            maxFee,
-            ""
+            amount,
+            protocolFee
         );
 
-        // Reset ERC20 approval
-        if (!isNative) SafeTransferLib.safeApprove(currency, spaceFactory, 0);
-
         // Mint points for fee payment (only for ETH tips)
-        if (isNative) {
+        if (protocolFee > 0 && currency == CurrencyTransfer.NATIVE_TOKEN) {
             address airdropDiamond = _getAirdropDiamond();
             uint256 points = _getPoints(
                 airdropDiamond,

package/src/tokens/Member.sol

@@ -1,13 +1,12 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.24;
 
-//interfaces
+// interfaces
 
-//libraries
+// libraries
 import {MerkleProof} from "@openzeppelin/contracts/utils/cryptography/MerkleProof.sol";
 
-//contracts
-
+// contracts
 import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";
 import {ERC721} from "@openzeppelin/contracts/token/ERC721/ERC721.sol";
 

package/src/utils/libraries/CurrencyTransfer.sol

@@ -8,8 +8,6 @@ import {IWETH} from "../interfaces/IWETH.sol";
 import {SafeTransferLib} from "solady/utils/SafeTransferLib.sol";
 import {CustomRevert} from "./CustomRevert.sol";
 
-// contracts
-
 library CurrencyTransfer {
     using SafeTransferLib for address;
     using CustomRevert for bytes4;
@@ -124,4 +122,10 @@ library CurrencyTransfer {
             if (actualFee > 0) safeTransferERC20(currency, payer, recipient, actualFee);
         }
     }
+
+    /// @dev Returns the balance of `account` in `currency`.
+    function balanceOf(address currency, address account) internal view returns (uint256) {
+        if (currency == NATIVE_TOKEN) return account.balance;
+        return currency.balanceOf(account);
+    }
 }

package/scripts/interactions/InteractRiverRegistrySetFreq.s.sol

@@ -1,27 +0,0 @@
-// SPDX-License-Identifier: MIT
-pragma solidity ^0.8.24;
-
-// interfaces
-import {IRiverConfig} from "src/river/registry/facets/config/IRiverConfig.sol";
-
-// libraries
-import {RiverConfigValues} from "scripts/interactions/helpers/RiverConfigValues.sol";
-
-// contracts
-import {Interaction} from "scripts/common/Interaction.s.sol";
-
-contract InteractRiverRegistrySetFreq is Interaction {
-    function __interact(address deployer) internal override {
-        address riverRegistry = getDeployment("riverRegistry");
-
-        uint64 value = 10;
-
-        vm.startBroadcast(deployer);
-        IRiverConfig(riverRegistry).setConfiguration(
-            RiverConfigValues.STREAM_MINIBLOCK_REGISTRATION_FREQUENCY,
-            0,
-            abi.encode(value)
-        );
-        vm.stopBroadcast();
-    }
-}