@towns-protocol/contracts 0.0.368 → 0.0.370

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@towns-protocol/contracts",
-  "version": "0.0.368",
+  "version": "0.0.370",
   "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.370",
     "@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": "a39b3d31251fbe2ec4f6c0902d9a5195974e8b9e"
 }

package/scripts/deployments/diamonds/DeployAppRegistry.s.sol

@@ -54,7 +54,6 @@ contract DeployAppRegistry is IDiamondInitHelper, DiamondHelper, Deployer {
         facetHelper.add("DiamondLoupeFacet");
         facetHelper.add("IntrospectionFacet");
         facetHelper.add("OwnableFacet");
-        facetHelper.add("MetadataFacet");
 
         // Deploy the first batch of facets
         facetHelper.deployBatch(deployer);
@@ -87,26 +86,27 @@ contract DeployAppRegistry is IDiamondInitHelper, DiamondHelper, Deployer {
             facet,
             DeployOwnable.makeInitData(deployer)
         );
-
-        facet = facetHelper.predictAddress("MetadataFacet");
-        addFacet(
-            makeCut(facet, FacetCutAction.Add, DeployMetadata.selectors()),
-            facet,
-            DeployMetadata.makeInitData(bytes32("AppRegistry"), "")
-        );
     }
 
     function diamondInitParams(address deployer) public returns (Diamond.InitParams memory) {
         // Queue up feature facets for batch deployment
         facetHelper.add("MultiInit");
+        facetHelper.add("MetadataFacet");
         facetHelper.add("UpgradeableBeaconFacet");
         facetHelper.add("AppRegistryFacet");
         facetHelper.add("SimpleApp");
 
         facetHelper.deployBatch(deployer);
 
+        address facet = facetHelper.getDeployedAddress("MetadataFacet");
+        addFacet(
+            makeCut(facet, FacetCutAction.Add, DeployMetadata.selectors()),
+            facet,
+            DeployMetadata.makeInitData(bytes32("AppRegistry"), "")
+        );
+
         address simpleApp = facetHelper.getDeployedAddress("SimpleApp");
-        address facet = facetHelper.getDeployedAddress("UpgradeableBeaconFacet");
+        facet = facetHelper.getDeployedAddress("UpgradeableBeaconFacet");
 
         addFacet(
             makeCut(facet, FacetCutAction.Add, DeployUpgradeableBeacon.selectors()),

package/scripts/deployments/diamonds/DeploySubscriptionModule.s.sol

@@ -62,13 +62,21 @@ contract DeploySubscriptionModule is DiamondHelper, Deployer, IDiamondInitHelper
     function diamondInitParams(address deployer) public returns (Diamond.InitParams memory) {
         // Queue up feature facets for batch deployment
         facetHelper.add("MultiInit");
+        facetHelper.add("MetadataFacet");
         facetHelper.add("SubscriptionModuleFacet");
 
         // Deploy all facets in a batch
         facetHelper.deployBatch(deployer);
 
         // Add feature facets
-        address facet = facetHelper.getDeployedAddress("SubscriptionModuleFacet");
+        address facet = facetHelper.getDeployedAddress("MetadataFacet");
+        addFacet(
+            makeCut(facet, FacetCutAction.Add, DeployMetadata.selectors()),
+            facet,
+            DeployMetadata.makeInitData(METADATA_NAME, "")
+        );
+
+        facet = facetHelper.getDeployedAddress("SubscriptionModuleFacet");
         addFacet(
             makeCut(facet, FacetCutAction.Add, DeploySubscriptionModuleFacet.selectors()),
             facet,
@@ -95,7 +103,6 @@ contract DeploySubscriptionModule is DiamondHelper, Deployer, IDiamondInitHelper
         facetHelper.add("DiamondLoupeFacet");
         facetHelper.add("IntrospectionFacet");
         facetHelper.add("OwnableFacet");
-        facetHelper.add("MetadataFacet");
 
         // Get predicted addresses
         address facet = facetHelper.predictAddress("DiamondCutFacet");
@@ -125,13 +132,6 @@ contract DeploySubscriptionModule is DiamondHelper, Deployer, IDiamondInitHelper
             facet,
             DeployOwnable.makeInitData(deployer)
         );
-
-        facet = facetHelper.predictAddress("MetadataFacet");
-        addFacet(
-            makeCut(facet, FacetCutAction.Add, DeployMetadata.selectors()),
-            facet,
-            DeployMetadata.makeInitData(METADATA_NAME, "")
-        );
     }
 
     function __deploy(address deployer) internal override returns (address) {

package/scripts/interactions/helpers/AlphaHelper.sol

@@ -8,6 +8,7 @@ import {IDiamondLoupe, IDiamondLoupeBase} from "@towns-protocol/diamond/src/face
 import {IERC173} from "@towns-protocol/diamond/src/facets/ownable/IERC173.sol";
 import {IOwnablePending} from "@towns-protocol/diamond/src/facets/ownable/pending/IOwnablePending.sol";
 import {IDiamondInitHelper} from "scripts/deployments/diamonds/IDiamondInitHelper.sol";
+import {IMetadata} from "src/diamond/facets/metadata/IMetadata.sol";
 
 // libraries
 import {EnumerableSet} from "@openzeppelin/contracts/utils/structs/EnumerableSet.sol";
@@ -55,13 +56,14 @@ abstract contract AlphaHelper is Interaction, DiamondHelper, IDiamondLoupeBase {
     function getCoreFacetAddresses(
         address diamond
     ) internal view returns (address[] memory coreFacets) {
-        coreFacets = new address[](5);
+        coreFacets = new address[](6);
 
         coreFacets[0] = IDiamondLoupe(diamond).facetAddress(IDiamondCut.diamondCut.selector);
         coreFacets[1] = IDiamondLoupe(diamond).facetAddress(IDiamondLoupe.facets.selector);
         coreFacets[2] = IDiamondLoupe(diamond).facetAddress(IERC165.supportsInterface.selector);
         coreFacets[3] = IDiamondLoupe(diamond).facetAddress(IERC173.owner.selector);
         coreFacets[4] = IDiamondLoupe(diamond).facetAddress(IOwnablePending.currentOwner.selector);
+        coreFacets[5] = IDiamondLoupe(diamond).facetAddress(IMetadata.contractType.selector);
     }
 
     /// @notice Check if an address is a core facet that should not be removed
@@ -254,7 +256,7 @@ abstract contract AlphaHelper is Interaction, DiamondHelper, IDiamondLoupeBase {
             }
 
             if (removeSelectors.length() > 0) {
-                addCut(FacetCut(address(0), FacetCutAction.Remove, asBytes4Array(removeSelectors)));
+                addCut(FacetCut(facetAddr, FacetCutAction.Remove, asBytes4Array(removeSelectors)));
             }
         }
     }

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;