@towns-protocol/contracts 0.0.368 → 0.0.369

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@towns-protocol/contracts",
-  "version": "0.0.368",
+  "version": "0.0.369",
   "packageManager": "yarn@3.8.0",
   "scripts": {
     "build-types": "bash scripts/build-contract-types.sh",
@@ -35,7 +35,7 @@
     "@layerzerolabs/oapp-evm": "^0.3.2",
     "@openzeppelin/merkle-tree": "^1.0.8",
     "@prb/test": "^0.6.4",
-    "@towns-protocol/prettier-config": "^0.0.368",
+    "@towns-protocol/prettier-config": "^0.0.369",
     "@typechain/ethers-v5": "^11.1.2",
     "@wagmi/cli": "^2.2.0",
     "forge-std": "github:foundry-rs/forge-std#v1.10.0",
@@ -57,5 +57,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "bb014c92cd91d742be6ea53ac56027ec90e4d345"
+  "gitHead": "5a4adeead17c71980426b92b98c23952536e08fa"
 }

package/src/apps/modules/subscription/SubscriptionModuleStorage.sol

@@ -46,7 +46,7 @@ library SubscriptionModuleStorage {
 
     function getOperatorBuffer(address operator) internal view returns (uint256) {
         OperatorConfig storage config = getLayout().operatorConfig[operator];
-        if (config.interval == 0) return MIN_RENEWAL_BUFFER;
+        if (config.interval == 0 || config.buffer == 0) return MIN_RENEWAL_BUFFER;
         return config.buffer;
     }
 }

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

@@ -72,6 +72,8 @@ interface IMembershipBase {
     error Membership__InvalidTransactionType();
     error Membership__Banned();
     error Membership__InvalidAction();
+    error Membership__CannotSetFreeAllocationOnPaidSpace();
+    error Membership__CannotSetPriceOnFreeSpace();
 
     /*´:°•.°+.*•´.*:˚.°*.˚•´.°:°•.°•.*•´.*:˚.°*.˚•´.°:°•.°+.*•´.*:*/
     /*                           EVENTS                           */

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

@@ -36,6 +36,8 @@ abstract contract MembershipBase is IMembershipBase {
 
         if (info.price > 0) {
             _verifyPrice(info.price);
+            if (info.freeAllocation > 0)
+                Membership__CannotSetFreeAllocationOnPaidSpace.selector.revertWith();
             IMembershipPricing(info.pricingModule).setPrice(info.price);
         }
 
@@ -169,6 +171,8 @@ abstract contract MembershipBase is IMembershipBase {
         // 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();
     }

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

@@ -99,6 +99,8 @@ 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);
     }
 
@@ -131,6 +133,10 @@ 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

@@ -75,6 +75,8 @@ abstract contract MembershipJoin is
         uint256 membershipPrice = _getMembershipPrice(totalSupply);
         uint256 freeAllocation = _getMembershipFreeAllocation();
 
+        if (membershipPrice == 0) return joinDetails;
+
         joinDetails.basePrice = membershipPrice;
         if (freeAllocation > totalSupply) {
             return joinDetails;