@towns-protocol/contracts 0.0.441 → 0.0.442

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@towns-protocol/contracts",
-  "version": "0.0.441",
+  "version": "0.0.442",
   "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.441",
+    "@towns-protocol/prettier-config": "^0.0.442",
     "@wagmi/cli": "^2.2.0",
     "forge-std": "github:foundry-rs/forge-std#v1.10.0",
     "prettier": "^3.5.3",
@@ -50,5 +50,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "7b6cdd45d3c3c2e94efdb26a68f4c8ff11e3699f"
+  "gitHead": "d2e07ef0deb899067d0d1a47e30c4edd5bb22547"
 }

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

@@ -20,7 +20,6 @@ import {DeployEntitlementsManager} from "../facets/DeployEntitlementsManager.s.s
 import {DeployMembership} from "../facets/DeployMembership.s.sol";
 import {DeployMembershipMetadata} from "../facets/DeployMembershipMetadata.s.sol";
 import {DeployMembershipToken} from "../facets/DeployMembershipToken.s.sol";
-import {DeployPrepayFacet} from "../facets/DeployPrepayFacet.s.sol";
 import {DeployReferrals} from "../facets/DeployReferrals.s.sol";
 import {DeployReviewFacet} from "../facets/DeployReviewFacet.s.sol";
 import {DeployRoles} from "../facets/DeployRoles.s.sol";
@@ -112,7 +111,6 @@ contract DeploySpace is IDiamondInitHelper, DiamondHelper, Deployer {
         facetHelper.add("Roles");
         facetHelper.add("Channels");
         facetHelper.add("TokenPausableFacet");
-        facetHelper.add("PrepayFacet");
         facetHelper.add("ReferralsFacet");
         facetHelper.add("ReviewFacet");
 
@@ -164,9 +162,6 @@ contract DeploySpace is IDiamondInitHelper, DiamondHelper, Deployer {
         facet = facetHelper.getDeployedAddress("TokenPausableFacet");
         addCut(makeCut(facet, FacetCutAction.Add, DeployTokenPausable.selectors()));
 
-        facet = facetHelper.getDeployedAddress("PrepayFacet");
-        addCut(makeCut(facet, FacetCutAction.Add, DeployPrepayFacet.selectors()));
-
         facet = facetHelper.getDeployedAddress("ReferralsFacet");
         addCut(makeCut(facet, FacetCutAction.Add, DeployReferrals.selectors()));
 
@@ -247,8 +242,6 @@ contract DeploySpace is IDiamondInitHelper, DiamondHelper, Deployer {
                 addCut(makeCut(facet, FacetCutAction.Add, DeployChannels.selectors()));
             } else if (facetName.eq("TokenPausableFacet")) {
                 addCut(makeCut(facet, FacetCutAction.Add, DeployTokenPausable.selectors()));
-            } else if (facetName.eq("PrepayFacet")) {
-                addCut(makeCut(facet, FacetCutAction.Add, DeployPrepayFacet.selectors()));
             } else if (facetName.eq("ReferralsFacet")) {
                 addCut(makeCut(facet, FacetCutAction.Add, DeployReferrals.selectors()));
             } else if (facetName.eq("ReviewFacet")) {

package/scripts/interactions/InteractBaseAlpha.s.sol

@@ -38,8 +38,11 @@ contract InteractBaseAlpha is AlphaHelper {
         executeDiamondCutsWithLogging(deployer, space, "Space", deploySpace);
         executeDiamondCutsWithLogging(deployer, spaceOwner, "SpaceOwner", deploySpaceOwner);
 
+        deploySpaceFactory.diamondInitParams(deployer);
         address spaceFactoryInit = deploySpaceFactory.spaceFactoryInit();
         bytes memory initData = deploySpaceFactory.spaceFactoryInitData();
+        deploySpaceFactory.clearCuts();
+
         executeDiamondCutsWithLogging(
             deployer,
             spaceFactory,

package/src/apps/facets/registry/AppRegistryBase.sol

@@ -9,7 +9,6 @@ import {ITownsApp} from "../../ITownsApp.sol";
 import {IAppRegistryBase} from "./IAppRegistry.sol";
 import {ISchemaResolver} from "@ethereum-attestation-service/eas-contracts/resolver/ISchemaResolver.sol";
 import {IPlatformRequirements} from "../../../factory/facets/platform/requirements/IPlatformRequirements.sol";
-import {IERC173} from "@towns-protocol/diamond/src/facets/ownable/IERC173.sol";
 import {IAppAccount} from "../../../spaces/facets/account/IAppAccount.sol";
 import {IEntitlementsManager} from "../../../spaces/facets/entitlements/IEntitlementsManager.sol";
 
@@ -320,7 +319,7 @@ abstract contract AppRegistryBase is IAppRegistryBase, SchemaBase, AttestationBa
         uint256 installPrice
     ) internal view returns (uint256 totalRequired, uint256 protocolFee) {
         protocolFee = _getProtocolFee(installPrice);
-        if (installPrice == 0) return (protocolFee, protocolFee);
+        if (installPrice == 0) return (0, protocolFee);
         return (installPrice + protocolFee, protocolFee);
     }
 
@@ -332,6 +331,9 @@ abstract contract AppRegistryBase is IAppRegistryBase, SchemaBase, AttestationBa
     function _chargeForInstall(address payer, address recipient, uint256 installPrice) internal {
         (uint256 totalRequired, uint256 protocolFee) = _getTotalRequiredPayment(installPrice);
 
+        if (totalRequired == 0 && msg.value != 0) UnexpectedETH.selector.revertWith();
+        if (totalRequired == 0) return;
+
         if (msg.value < totalRequired) InsufficientPayment.selector.revertWith();
 
         // Cache platform requirements to avoid multiple storage reads

package/src/apps/facets/registry/IAppRegistry.sol

@@ -3,7 +3,6 @@ pragma solidity ^0.8.23;
 
 // interfaces
 import {ISchemaResolver} from "@ethereum-attestation-service/eas-contracts/resolver/ISchemaResolver.sol";
-import {IAppAccount} from "../../../spaces/facets/account/IAppAccount.sol";
 import {ITownsApp} from "../../ITownsApp.sol";
 
 // libraries
@@ -39,6 +38,7 @@ interface IAppRegistryBase {
     error NotAllowed();
     error ClientAlreadyRegistered();
     error ClientNotRegistered();
+    error UnexpectedETH();
 
     error AppRegistry__InvalidDuration();
     error AppRegistry__InvalidPrice();

package/src/factory/facets/architect/IArchitect.sol

@@ -97,6 +97,7 @@ interface IArchitectBase {
     error Architect__InvalidAddress();
     error Architect__NotContract();
     error Architect__InvalidPricingModule();
+    error Architect__UnexpectedETH();
 
     event Architect__ProxyInitializerSet(address indexed proxyInitializer);
 }

package/src/factory/facets/create/CreateSpaceBase.sol

@@ -12,7 +12,6 @@ import {IUserEntitlement} from "../../../spaces/entitlements/user/IUserEntitleme
 import {IChannel} from "../../../spaces/facets/channels/IChannel.sol";
 import {IEntitlementsManager} from "../../../spaces/facets/entitlements/IEntitlementsManager.sol";
 import {IMembershipBase} from "../../../spaces/facets/membership/IMembership.sol";
-import {IPrepay} from "../../../spaces/facets/prepay/IPrepay.sol";
 import {IRoles, IRolesBase} from "../../../spaces/facets/roles/IRoles.sol";
 import {IArchitectBase} from "../architect/IArchitect.sol";
 
@@ -43,6 +42,7 @@ abstract contract CreateSpaceBase is IArchitectBase {
         CreateSpace calldata space,
         SpaceOptions memory spaceOptions
     ) internal returns (address spaceAddress) {
+        if (msg.value > 0) revert Architect__UnexpectedETH();
         Validator.checkAddress(space.membership.settings.pricingModule);
         Validator.checkAddress(spaceOptions.to);
 
@@ -54,10 +54,6 @@ abstract contract CreateSpaceBase is IArchitectBase {
             space.channel,
             spaceOptions
         );
-
-        if (space.prepay.supply > 0) {
-            IPrepay(spaceAddress).prepayMembership{value: msg.value}(space.prepay.supply);
-        }
     }
 
     /// @dev Converts legacy CreateSpaceOld format and creates space
@@ -65,6 +61,7 @@ abstract contract CreateSpaceBase is IArchitectBase {
         CreateSpaceOld calldata space,
         SpaceOptions memory spaceOptions
     ) internal returns (address spaceAddress) {
+        if (msg.value > 0) revert Architect__UnexpectedETH();
         Validator.checkAddress(space.membership.settings.pricingModule);
         Validator.checkAddress(spaceOptions.to);
 
@@ -84,10 +81,6 @@ abstract contract CreateSpaceBase is IArchitectBase {
             space.channel,
             spaceOptions
         );
-
-        if (space.prepay.supply > 0) {
-            IPrepay(spaceAddress).prepayMembership{value: msg.value}(space.prepay.supply);
-        }
     }
 
     function _createSpaceCore(

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

@@ -41,38 +41,22 @@ interface IMembershipBase {
         string referralCode;
     }
 
-    struct PricingDetails {
-        uint256 basePrice;
-        uint256 amountDue;
-        bool shouldCharge;
-        bool isPrepaid;
-    }
-
     /*´:°•.°+.*•´.*:˚.°*.˚•´.°:°•.°•.*•´.*:˚.°*.˚•´.°:°•.°+.*•´.*:*/
     /*                           ERRORS                           */
     /*.•°:°.´+˚.*°.˚:*.´•*.+°.•°:´*.´•*.•°.•°:°.´:•˚°.*°.˚:*.´+°.•*/
 
     error Membership__InvalidAddress();
-    error Membership__InvalidPrice();
-    error Membership__InvalidLimit();
-    error Membership__InvalidCurrency();
-    error Membership__InvalidFeeRecipient();
     error Membership__InvalidDuration();
     error Membership__InvalidMaxSupply();
     error Membership__InvalidFreeAllocation();
     error Membership__InvalidPricingModule();
-    error Membership__AlreadyMember();
     error Membership__InsufficientPayment();
     error Membership__MaxSupplyReached();
-    error Membership__InvalidTokenId();
-    error Membership__NotExpired();
-    error Membership__InsufficientAllowance();
     error Membership__InvalidPayment();
     error Membership__InvalidTransactionType();
     error Membership__Banned();
     error Membership__InvalidAction();
     error Membership__CannotSetFreeAllocationOnPaidSpace();
-    error Membership__CannotSetPriceOnFreeSpace();
 
     /*´:°•.°+.*•´.*:˚.°*.˚•´.°:°•.°•.*•´.*:˚.°*.˚•´.°:°•.°+.*•´.*:*/
     /*                           EVENTS                           */

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

@@ -22,7 +22,6 @@ import {DispatcherBase} from "../../dispatcher/DispatcherBase.sol";
 import {Entitled} from "../../Entitled.sol";
 import {EntitlementGatedBase} from "../../gated/EntitlementGatedBase.sol";
 import {PointsBase} from "../../points/PointsBase.sol";
-import {PrepayBase} from "../../prepay/PrepayBase.sol";
 import {ReferralsBase} from "../../referrals/ReferralsBase.sol";
 import {RolesBase} from "../../roles/RolesBase.sol";
 import {MembershipBase} from "../MembershipBase.sol";
@@ -41,7 +40,6 @@ abstract contract MembershipJoin is
     RolesBase,
     EntitlementGatedBase,
     Entitled,
-    PrepayBase,
     PointsBase,
     ERC721ABase
 {
@@ -53,6 +51,12 @@ abstract contract MembershipJoin is
     /// @notice Constant representing the joinSpace(address) function selector
     bytes4 internal constant JOIN_SPACE_SELECTOR = bytes4(keccak256("joinSpace(address)"));
 
+    struct PricingDetails {
+        uint256 basePrice;
+        uint256 amountDue;
+        bool shouldCharge;
+    }
+
     /// @notice Encodes data for joining a space
     /// @param selector The type of transaction (join with or without referral)
     /// @param sender The address of the sender
@@ -82,13 +86,6 @@ abstract contract MembershipJoin is
             return joinDetails;
         }
 
-        // Check if this is a free join due to prepaid supply
-        uint256 prepaidSupply = _getPrepaidSupply();
-        if (prepaidSupply > 0) {
-            joinDetails.isPrepaid = true;
-            return joinDetails;
-        }
-
         (uint256 totalRequired, ) = _getTotalMembershipPayment(membershipPrice);
         (joinDetails.amountDue, joinDetails.shouldCharge) = (totalRequired, true);
     }
@@ -105,9 +102,6 @@ abstract contract MembershipJoin is
             Membership__InsufficientPayment.selector.revertWith();
         }
 
-        // Consume prepaid membership if applicable
-        if (joinDetails.isPrepaid) _reducePrepay(1);
-
         bytes32 transactionId = _registerTransaction(
             receiver,
             _encodeJoinSpaceData(JOIN_SPACE_SELECTOR, msg.sender, receiver, "")
@@ -144,9 +138,6 @@ abstract contract MembershipJoin is
             Membership__InsufficientPayment.selector.revertWith();
         }
 
-        // Consume prepaid membership if applicable
-        if (joinDetails.isPrepaid) _reducePrepay(1);
-
         _validateUserReferral(receiver, referral);
 
         bytes memory referralData = abi.encode(referral);

package/src/spaces/facets/xchain/SpaceEntitlementGated.sol

@@ -4,8 +4,6 @@ pragma solidity ^0.8.23;
 // interfaces
 import {IMembership} from "../membership/IMembership.sol";
 
-// libraries
-
 // contracts
 import {EntitlementGated} from "../gated/EntitlementGated.sol";
 import {MembershipJoin} from "../membership/join/MembershipJoin.sol";

package/scripts/deployments/facets/DeployPrepayFacet.s.sol

@@ -1,31 +0,0 @@
-// SPDX-License-Identifier: MIT
-pragma solidity ^0.8.23;
-
-//interfaces
-import {IDiamond} from "@towns-protocol/diamond/src/Diamond.sol";
-import {IPrepay} from "src/spaces/facets/prepay/IPrepay.sol";
-
-//libraries
-import {LibDeploy} from "@towns-protocol/diamond/src/utils/LibDeploy.sol";
-
-//contracts
-
-library DeployPrepayFacet {
-    function selectors() internal pure returns (bytes4[] memory res) {
-        res = new bytes4[](3);
-        res[0] = IPrepay.prepayMembership.selector;
-        res[1] = IPrepay.prepaidMembershipSupply.selector;
-        res[2] = IPrepay.calculateMembershipPrepayFee.selector;
-    }
-
-    function makeCut(
-        address facetAddress,
-        IDiamond.FacetCutAction action
-    ) internal pure returns (IDiamond.FacetCut memory) {
-        return IDiamond.FacetCut(facetAddress, action, selectors());
-    }
-
-    function deploy() internal returns (address) {
-        return LibDeploy.deployCode("PrepayFacet.sol", "");
-    }
-}

package/scripts/interactions/InteractPrepay.s.sol

@@ -1,30 +0,0 @@
-// SPDX-License-Identifier: MIT
-pragma solidity ^0.8.23;
-
-// interfaces
-
-// libraries
-
-// contracts
-import {Interaction} from "scripts/common/Interaction.s.sol";
-import {IPrepay} from "src/spaces/facets/prepay/IPrepay.sol";
-
-// debuggging
-import {console} from "forge-std/console.sol";
-
-contract InteractPrepay is Interaction {
-    IPrepay prepay = IPrepay(0x0000000000000000000000000000000000000000);
-
-    function __interact(address deployer) internal override {
-        uint256 expectedAmount = 1000;
-        uint256 totalAmount = prepay.calculateMembershipPrepayFee(expectedAmount);
-
-        console.log("paying:", totalAmount);
-
-        vm.startBroadcast(deployer);
-        IPrepay(prepay).prepayMembership{value: totalAmount}(expectedAmount);
-        vm.stopBroadcast();
-
-        console.log("prepaidSupply", prepay.prepaidMembershipSupply());
-    }
-}

package/src/spaces/facets/prepay/IPrepay.sol

@@ -1,44 +0,0 @@
-// SPDX-License-Identifier: MIT
-pragma solidity ^0.8.23;
-
-// interfaces
-
-// libraries
-
-// contracts
-interface IPrepayBase {
-    // =============================================================
-    //                           ERRORS
-    // =============================================================
-    error Prepay__InvalidSupplyAmount();
-    error Prepay__InvalidAmount();
-    error Prepay__InvalidAddress();
-    error Prepay__InvalidMembership();
-    error Prepay__NotAllowed();
-
-    // =============================================================
-    //                           EVENTS
-    // =============================================================
-    event Prepay__Prepaid(uint256 supply);
-}
-
-interface IPrepay is IPrepayBase {
-    /**
-     * @notice Prepay a membership
-     * @param supply The amount of memberships to prepay
-     */
-    function prepayMembership(uint256 supply) external payable;
-
-    /**
-     * @notice Get the prepaid supply
-     * @return The remaining prepaid supply
-     */
-    function prepaidMembershipSupply() external view returns (uint256);
-
-    /**
-     * @notice Calculate the prepay fee for a given supply
-     * @param supply The supply to calculate the fee for
-     * @return The fee
-     */
-    function calculateMembershipPrepayFee(uint256 supply) external view returns (uint256);
-}

package/src/spaces/facets/prepay/PrepayBase.sol

@@ -1,27 +0,0 @@
-// SPDX-License-Identifier: MIT
-pragma solidity ^0.8.23;
-
-// interfaces
-import {IPrepayBase} from "./IPrepay.sol";
-
-// libraries
-import {PrepayStorage} from "./PrepayStorage.sol";
-
-// contracts
-
-abstract contract PrepayBase is IPrepayBase {
-    function _addPrepay(uint256 supply) internal {
-        PrepayStorage.Layout storage ds = PrepayStorage.layout();
-        ds.supply += supply;
-        emit Prepay__Prepaid(supply);
-    }
-
-    function _reducePrepay(uint256 supply) internal {
-        PrepayStorage.Layout storage ds = PrepayStorage.layout();
-        ds.supply -= supply;
-    }
-
-    function _getPrepaidSupply() internal view returns (uint256) {
-        return PrepayStorage.layout().supply;
-    }
-}

package/src/spaces/facets/prepay/PrepayFacet.sol

@@ -1,65 +0,0 @@
-// SPDX-License-Identifier: MIT
-pragma solidity ^0.8.23;
-
-// interfaces
-
-import {IPlatformRequirements} from "src/factory/facets/platform/requirements/IPlatformRequirements.sol";
-import {IPrepay} from "src/spaces/facets/prepay/IPrepay.sol";
-
-// libraries
-import {MembershipStorage} from "src/spaces/facets/membership/MembershipStorage.sol";
-import {CurrencyTransfer} from "src/utils/libraries/CurrencyTransfer.sol";
-
-// contracts
-import {PrepayBase} from "./PrepayBase.sol";
-
-import {Facet} from "@towns-protocol/diamond/src/facets/Facet.sol";
-import {Entitled} from "src/spaces/facets/Entitled.sol";
-import {ReentrancyGuard} from "solady/utils/ReentrancyGuard.sol";
-
-contract PrepayFacet is IPrepay, PrepayBase, ReentrancyGuard, Entitled, Facet {
-    function __PrepayFacet_init() external onlyInitializing {
-        _addInterface(type(IPrepay).interfaceId);
-    }
-
-    function prepayMembership(uint256 supply) external payable nonReentrant {
-        _validatePrepayCaller();
-        if (supply == 0) revert Prepay__InvalidSupplyAmount();
-
-        MembershipStorage.Layout storage ds = MembershipStorage.layout();
-        IPlatformRequirements platform = IPlatformRequirements(ds.spaceFactory);
-
-        uint256 cost = supply * platform.getMembershipFee();
-
-        // validate payment covers membership fee
-        if (msg.value != cost) revert Prepay__InvalidAmount();
-
-        // add prepay
-        _addPrepay(supply);
-
-        // transfer fee to platform recipient
-        address currency = ds.membershipCurrency;
-        address platformRecipient = platform.getFeeRecipient();
-        CurrencyTransfer.transferCurrency(
-            currency,
-            msg.sender, // from
-            platformRecipient, // to
-            cost
-        );
-    }
-
-    function prepaidMembershipSupply() external view returns (uint256) {
-        return _getPrepaidSupply();
-    }
-
-    function calculateMembershipPrepayFee(uint256 supply) external view returns (uint256) {
-        MembershipStorage.Layout storage ds = MembershipStorage.layout();
-        IPlatformRequirements platform = IPlatformRequirements(ds.spaceFactory);
-        return supply * platform.getMembershipFee();
-    }
-
-    function _validatePrepayCaller() internal view {
-        address spaceFactory = MembershipStorage.layout().spaceFactory;
-        if (msg.sender != spaceFactory && msg.sender != _owner()) revert Prepay__NotAllowed();
-    }
-}

package/src/spaces/facets/prepay/PrepayStorage.sol

@@ -1,26 +0,0 @@
-// SPDX-License-Identifier: MIT
-pragma solidity ^0.8.23;
-
-// interfaces
-
-// libraries
-
-// contracts
-
-library PrepayStorage {
-    // keccak256(abi.encode(uint256(keccak256("spaces.facets.prepay.storage")) - 1)) &
-    // ~bytes32(uint256(0xff))
-    bytes32 constant STORAGE_SLOT =
-        0x097b4f25b64e012d0cf55f67e9b34fe5d57f15b11b95baa4ddd136b424967c00;
-
-    struct Layout {
-        uint256 supply;
-    }
-
-    function layout() internal pure returns (Layout storage l) {
-        bytes32 slot = STORAGE_SLOT;
-        assembly {
-            l.slot := slot
-        }
-    }
-}