@towns-protocol/contracts 0.0.426 → 0.0.428

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@towns-protocol/contracts",
-  "version": "0.0.426",
+  "version": "0.0.428",
   "scripts": {
     "clean": "forge clean",
     "compile": "forge build",
@@ -33,7 +33,7 @@
     "@layerzerolabs/oapp-evm": "^0.3.2",
     "@openzeppelin/merkle-tree": "^1.0.8",
     "@prb/test": "^0.6.4",
-    "@towns-protocol/prettier-config": "^0.0.426",
+    "@towns-protocol/prettier-config": "^0.0.428",
     "@wagmi/cli": "^2.2.0",
     "forge-std": "github:foundry-rs/forge-std#v1.10.0",
     "prettier": "^3.5.3",
@@ -53,5 +53,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "546bca3241d785992e428f973be7a558715cdbb1"
+  "gitHead": "8500096a8786765d97f2dbe88c17f24f051796db"
 }

package/scripts/interactions/InteractPostDeploy.s.sol

@@ -51,14 +51,6 @@ contract InteractPostDeploy is Interaction {
         IImplementationRegistry(spaceFactory).addImplementation(baseRegistry);
         IImplementationRegistry(spaceFactory).addImplementation(riverAirdrop);
         IImplementationRegistry(spaceFactory).addImplementation(appRegistry);
-        IFeeManager(spaceFactory).setFeeConfig(
-            FeeTypesLib.TIP_MEMBER,
-            deployer,
-            FeeCalculationMethod.PERCENT,
-            50,
-            0,
-            true
-        );
         ISubscriptionModule(subscriptionModule).setSpaceFactory(spaceFactory);
         IMainnetDelegation(baseRegistry).setProxyDelegation(proxyDelegation);
         IRewardsDistribution(baseRegistry).setRewardNotifier(deployer, true);

package/src/factory/facets/fee/FeeManagerFacet.sol

@@ -8,6 +8,9 @@ import {OwnableBase} from "@towns-protocol/diamond/src/facets/ownable/OwnableBas
 import {Facet} from "@towns-protocol/diamond/src/facets/Facet.sol";
 import {ReentrancyGuardTransient} from "solady/utils/ReentrancyGuardTransient.sol";
 
+// libraries
+import {FeeTypesLib} from "./FeeTypesLib.sol";
+
 /// @title FeeManagerFacet
 /// @notice Facet for unified fee management across the protocol
 contract FeeManagerFacet is
@@ -28,6 +31,7 @@ contract FeeManagerFacet is
 
     function __FeeManagerFacet__init_unchained(address protocolRecipient) internal {
         _setProtocolFeeRecipient(protocolRecipient);
+        _setInitialFeeConfigs(protocolRecipient);
     }
 
     /*´:°•.°+.*•´.*:˚.°*.˚•´.°:°•.°•.*•´.*:˚.°*.˚•´.°:°•.°+.*•´.*:*/
@@ -100,4 +104,36 @@ contract FeeManagerFacet is
     function getProtocolFeeRecipient() external view returns (address recipient) {
         return _getProtocolFeeRecipient();
     }
+
+    function _setInitialFeeConfigs(address protocolRecipient) internal {
+        // tipping fee
+        _setFeeConfig(
+            FeeTypesLib.TIP_MEMBER,
+            protocolRecipient,
+            FeeCalculationMethod.PERCENT,
+            50,
+            0,
+            true
+        );
+
+        // membership fee
+        _setFeeConfig(
+            FeeTypesLib.MEMBERSHIP,
+            protocolRecipient,
+            FeeCalculationMethod.HYBRID,
+            1000, // 10%
+            0.0005 ether,
+            true
+        );
+
+        // app installation fee
+        _setFeeConfig(
+            FeeTypesLib.APP_INSTALL,
+            protocolRecipient,
+            FeeCalculationMethod.HYBRID,
+            1000, // 10%
+            0.0005 ether,
+            true
+        );
+    }
 }

package/src/spaces/facets/membership/IMembership.sol

@@ -63,7 +63,6 @@ interface IMembershipBase {
     error Membership__InvalidPricingModule();
     error Membership__AlreadyMember();
     error Membership__InsufficientPayment();
-    error Membership__PriceTooLow();
     error Membership__MaxSupplyReached();
     error Membership__InvalidTokenId();
     error Membership__NotExpired();

package/src/spaces/facets/membership/MembershipBase.sol

@@ -35,7 +35,6 @@ abstract contract MembershipBase is IMembershipBase {
         $.freeAllocationEnabled = true;
 
         if (info.price > 0) {
-            _verifyPrice(info.price);
             if (info.freeAllocation > 0)
                 Membership__CannotSetFreeAllocationOnPaidSpace.selector.revertWith();
             IMembershipPricing(info.pricingModule).setPrice(info.price);
@@ -66,14 +65,29 @@ abstract contract MembershipBase is IMembershipBase {
         );
     }
 
+    function _getMembershipPrice(
+        uint256 totalSupply
+    ) internal view virtual returns (uint256 membershipPrice) {
+        address pricingModule = _getPricingModule();
+        if (pricingModule == address(0)) return 0;
+        uint256 freeAllocation = _getMembershipFreeAllocation();
+        membershipPrice = IMembershipPricing(pricingModule).getPrice(freeAllocation, totalSupply);
+    }
+
     function _getProtocolFee(uint256 membershipPrice) internal view returns (uint256) {
         IPlatformRequirements platform = _getPlatformRequirements();
+        uint256 baseFee = platform.getMembershipFee();
+        if (membershipPrice == 0) return baseFee;
+        uint256 bpsFee = BasisPoints.calculate(membershipPrice, platform.getMembershipBps());
+        return FixedPointMathLib.max(bpsFee, baseFee);
+    }
 
-        uint256 minPrice = platform.getMembershipMinPrice();
-
-        if (membershipPrice < minPrice) return platform.getMembershipFee();
-
-        return BasisPoints.calculate(membershipPrice, platform.getMembershipBps());
+    function _getTotalMembershipPayment(
+        uint256 membershipPrice
+    ) internal view returns (uint256 totalRequired, uint256 protocolFee) {
+        protocolFee = _getProtocolFee(membershipPrice);
+        if (membershipPrice == 0) return (protocolFee, protocolFee);
+        return (membershipPrice + protocolFee, protocolFee);
     }
 
     function _transferIn(address from, uint256 amount) internal returns (uint256) {
@@ -152,31 +166,9 @@ abstract contract MembershipBase is IMembershipBase {
     }
 
     /*´:°•.°+.*•´.*:˚.°*.˚•´.°:°•.°•.*•´.*:˚.°*.˚•´.°:°•.°+.*•´.*:*/
-    /*                           PRICING                          */
+    /*                           RENEWAL                          */
     /*.•°:°.´+˚.*°.˚:*.´•*.+°.•°:´*.´•*.•°.•°:°.´:•˚°.*°.˚:*.´+°.•*/
 
-    function _verifyPrice(uint256 newPrice) internal view {
-        uint256 minFee = _getPlatformRequirements().getMembershipFee();
-        if (newPrice < minFee) Membership__PriceTooLow.selector.revertWith();
-    }
-
-    /// @dev Makes it virtual to allow other pricing strategies
-    function _getMembershipPrice(
-        uint256 totalSupply
-    ) internal view virtual returns (uint256 membershipPrice) {
-        address pricingModule = _getPricingModule();
-        IPlatformRequirements platform = _getPlatformRequirements();
-        if (pricingModule == address(0)) return platform.getMembershipFee();
-
-        // get free allocation
-        uint256 freeAllocation = _getMembershipFreeAllocation();
-        membershipPrice = IMembershipPricing(pricingModule).getPrice(freeAllocation, totalSupply);
-        if (membershipPrice == 0) return 0;
-
-        uint256 minPrice = platform.getMembershipMinPrice();
-        if (membershipPrice < minPrice) return platform.getMembershipFee();
-    }
-
     function _setMembershipRenewalPrice(uint256 tokenId, uint256 pricePaid) internal {
         MembershipStorage.layout().renewalPriceByTokenId[tokenId] = pricePaid;
     }
@@ -186,22 +178,14 @@ abstract contract MembershipBase is IMembershipBase {
         uint256 totalSupply
     ) internal view returns (uint256) {
         MembershipStorage.Layout storage $ = MembershipStorage.layout();
-        IPlatformRequirements platform = _getPlatformRequirements();
-
-        uint256 minFee = platform.getMembershipFee();
-        uint256 renewalPrice = $.renewalPriceByTokenId[tokenId];
+        uint256 lockedRenewalPrice = $.renewalPriceByTokenId[tokenId];
         uint256 currentPrice = _getMembershipPrice(totalSupply);
 
-        // If no stored renewal price, use current price
-        if (renewalPrice == 0) {
-            return FixedPointMathLib.max(currentPrice, minFee);
-        }
+        // If no locked price, use current price
+        if (lockedRenewalPrice == 0) return currentPrice;
 
-        // Use the LOWER of stored renewal price or current price
-        // This ensures users benefit from price drops (including free transitions)
-        // while maintaining their locked-in rate if prices increase
-        uint256 effectivePrice = FixedPointMathLib.min(renewalPrice, currentPrice);
-        return FixedPointMathLib.max(effectivePrice, minFee);
+        // Return the lower of the two prices (benefits user)
+        return FixedPointMathLib.min(lockedRenewalPrice, currentPrice);
     }
 
     /*´:°•.°+.*•´.*:˚.°*.˚•´.°:°•.°•.*•´.*:˚.°*.˚•´.°:°•.°+.*•´.*:*/

package/src/spaces/facets/membership/MembershipFacet.sol

@@ -98,25 +98,26 @@ contract MembershipFacet is IMembership, MembershipJoin, ReentrancyGuard, Facet
 
     /// @inheritdoc IMembership
     function setMembershipPrice(uint256 newPrice) external onlyOwner {
-        _verifyPrice(newPrice);
-        if (newPrice > 0 && _getMembershipFreeAllocation() > 0)
-            Membership__CannotSetPriceOnFreeSpace.selector.revertWith();
         IMembershipPricing(_getPricingModule()).setPrice(newPrice);
     }
 
     /// @inheritdoc IMembership
-    function getMembershipPrice() external view returns (uint256) {
-        return _getMembershipPrice(_totalSupply());
+    function getMembershipPrice() external view returns (uint256 totalRequired) {
+        (totalRequired, ) = _getTotalMembershipPayment(_getMembershipPrice(_totalSupply()));
     }
 
     /// @inheritdoc IMembership
-    function getMembershipRenewalPrice(uint256 tokenId) external view returns (uint256) {
-        return _getMembershipRenewalPrice(tokenId, _totalSupply());
+    function getMembershipRenewalPrice(
+        uint256 tokenId
+    ) external view returns (uint256 totalRequired) {
+        (totalRequired, ) = _getTotalMembershipPayment(
+            _getMembershipRenewalPrice(tokenId, _totalSupply())
+        );
     }
 
     /// @inheritdoc IMembership
-    function getProtocolFee() external view returns (uint256) {
-        return _getProtocolFee(_getMembershipPrice(_totalSupply()));
+    function getProtocolFee() external view returns (uint256 protocolFee) {
+        (, protocolFee) = _getTotalMembershipPayment(_getMembershipPrice(_totalSupply()));
     }
 
     /*´:°•.°+.*•´.*:˚.°*.˚•´.°:°•.°•.*•´.*:˚.°*.˚•´.°:°•.°+.*•´.*:*/
@@ -133,11 +134,6 @@ contract MembershipFacet is IMembership, MembershipJoin, ReentrancyGuard, Facet
             Membership__InvalidFreeAllocation.selector.revertWith();
         }
 
-        if (_getMembershipPrice(_totalSupply()) > 0) {
-            Membership__CannotSetFreeAllocationOnPaidSpace.selector.revertWith();
-        }
-
-        // verify newLimit is not more than the allowed platform limit
         _verifyFreeAllocation(newAllocation);
         _setMembershipFreeAllocation(newAllocation);
     }

package/src/spaces/facets/membership/join/MembershipJoin.sol

@@ -89,8 +89,8 @@ abstract contract MembershipJoin is
             return joinDetails;
         }
 
-        // Regular paid join
-        (joinDetails.amountDue, joinDetails.shouldCharge) = (membershipPrice, true);
+        (uint256 totalRequired, ) = _getTotalMembershipPayment(membershipPrice);
+        (joinDetails.amountDue, joinDetails.shouldCharge) = (totalRequired, true);
     }
 
     /// @notice Handles the process of joining a space
@@ -317,8 +317,7 @@ abstract contract MembershipJoin is
             sender,
             receiver,
             joinDetails.amountDue,
-            ownerProceeds,
-            joinDetails.basePrice
+            ownerProceeds
         );
     }
 
@@ -365,8 +364,7 @@ abstract contract MembershipJoin is
             sender,
             receiver,
             joinDetails.amountDue,
-            ownerProceeds,
-            joinDetails.basePrice
+            ownerProceeds
         );
     }
 
@@ -375,8 +373,7 @@ abstract contract MembershipJoin is
         address payer,
         address receiver,
         uint256 paymentRequired,
-        uint256 ownerProceeds,
-        uint256 membershipPrice
+        uint256 ownerProceeds
     ) internal {
         // account for owner's proceeds
         if (ownerProceeds != 0) _transferIn(payer, ownerProceeds);
@@ -384,7 +381,7 @@ abstract contract MembershipJoin is
         _releaseCapturedValue(transactionId, paymentRequired);
         _deleteCapturedData(transactionId);
 
-        _mintMembershipPoints(receiver, membershipPrice);
+        _mintMembershipPoints(receiver, paymentRequired);
     }
 
     /// @notice Issues a membership token to the receiver
@@ -498,22 +495,25 @@ abstract contract MembershipJoin is
 
     function _renewMembership(address payer, uint256 tokenId) internal {
         address receiver = _ownerOf(tokenId);
-
         if (receiver == address(0)) Membership__InvalidAddress.selector.revertWith();
 
         uint256 duration = _getMembershipDuration();
-        uint256 membershipPrice = _getMembershipRenewalPrice(tokenId, _totalSupply());
+        uint256 basePrice = _getMembershipRenewalPrice(tokenId, _totalSupply());
+        (uint256 totalRequired, ) = _getTotalMembershipPayment(basePrice);
 
-        if (membershipPrice > msg.value) Membership__InvalidPayment.selector.revertWith();
+        if (totalRequired > msg.value) Membership__InvalidPayment.selector.revertWith();
 
-        _mintMembershipPoints(receiver, membershipPrice);
+        // Collect protocol fee (transfers from payer)
+        uint256 protocolFee = _collectProtocolFee(payer, basePrice);
 
-        uint256 protocolFee = _collectProtocolFee(payer, membershipPrice);
+        // Calculate owner proceeds (what goes to space owner)
+        uint256 ownerProceeds = totalRequired - protocolFee;
 
-        uint256 remainingDue = membershipPrice - protocolFee;
-        if (remainingDue > 0) _transferIn(payer, remainingDue);
+        // Transfer owner proceeds to contract
+        if (ownerProceeds > 0) _transferIn(payer, ownerProceeds);
 
-        uint256 excess = msg.value - membershipPrice;
+        // Handle excess payment
+        uint256 excess = msg.value - totalRequired;
         if (excess > 0) {
             CurrencyTransfer.transferCurrency(
                 _getMembershipCurrency(),
@@ -523,6 +523,7 @@ abstract contract MembershipJoin is
             );
         }
 
+        _mintMembershipPoints(receiver, totalRequired);
         _renewSubscription(tokenId, uint64(duration));
     }