@towns-protocol/contracts 0.0.441 → 0.0.443

package/src/spaces/facets/treasury/Treasury.sol

@@ -2,53 +2,50 @@
 pragma solidity ^0.8.23;
 
 // interfaces
-
 import {IERC1155Receiver} from "@openzeppelin/contracts/token/ERC1155/IERC1155Receiver.sol";
-import {IMembershipBase} from "src/spaces/facets/membership/IMembership.sol";
-import {ITreasury} from "src/spaces/facets/treasury/ITreasury.sol";
+import {IMembershipBase} from "../membership/IMembership.sol";
+import {ITreasury} from "./ITreasury.sol";
 
 // libraries
-import {CurrencyTransfer} from "src/utils/libraries/CurrencyTransfer.sol";
+import {SafeTransferLib} from "solady/utils/SafeTransferLib.sol";
+import {CurrencyTransfer} from "../../../utils/libraries/CurrencyTransfer.sol";
+import {CustomRevert} from "../../../utils/libraries/CustomRevert.sol";
 
 // contracts
-
 import {Facet} from "@towns-protocol/diamond/src/facets/Facet.sol";
 import {TokenOwnableBase} from "@towns-protocol/diamond/src/facets/ownable/token/TokenOwnableBase.sol";
-import {MembershipStorage} from "src/spaces/facets/membership/MembershipStorage.sol";
-import {CustomRevert} from "src/utils/libraries/CustomRevert.sol";
 import {ReentrancyGuard} from "solady/utils/ReentrancyGuard.sol";
 
 contract Treasury is TokenOwnableBase, ReentrancyGuard, Facet, ITreasury {
+    using CustomRevert for bytes4;
+    using SafeTransferLib for address;
+
     function __Treasury_init() external onlyInitializing {
         _addInterface(type(IERC1155Receiver).interfaceId);
     }
 
-    ///@inheritdoc ITreasury
-    function withdraw(address account) external onlyOwner nonReentrant {
-        if (account == address(0)) {
-            CustomRevert.revertWith(IMembershipBase.Membership__InvalidAddress.selector);
-        }
-
-        // get the balance
-        uint256 balance = address(this).balance;
+    /// @inheritdoc ITreasury
+    function withdraw(address currency, address account) external onlyOwner nonReentrant {
+        if (account == address(0)) IMembershipBase.Membership__InvalidAddress.selector.revertWith();
 
-        // verify the balance is not 0
-        if (balance == 0) {
-            CustomRevert.revertWith(IMembershipBase.Membership__InsufficientPayment.selector);
-        }
+        // Get balance based on currency type
+        uint256 balance = currency == CurrencyTransfer.NATIVE_TOKEN
+            ? address(this).balance
+            : currency.balanceOf(address(this));
 
-        address currency = MembershipStorage.layout().membershipCurrency;
+        // Verify the balance is not 0
+        if (balance == 0) IMembershipBase.Membership__InsufficientPayment.selector.revertWith();
 
         CurrencyTransfer.transferCurrency(currency, address(this), account, balance);
 
-        emit IMembershipBase.MembershipWithdrawal(account, balance);
+        emit IMembershipBase.MembershipWithdrawal(currency, account, balance);
     }
 
     /*´:°•.°+.*•´.*:˚.°*.˚•´.°:°•.°•.*•´.*:˚.°*.˚•´.°:°•.°+.*•´.*:*/
     /*                           Hooks                            */
     /*.•°:°.´+˚.*°.˚:*.´•*.+°.•°:´*.´•*.•°.•°:°.´:•˚°.*°.˚:*.´+°.•*/
 
-    ///@inheritdoc ITreasury
+    /// @inheritdoc ITreasury
     function onERC721Received(
         address,
         address,
@@ -58,7 +55,7 @@ contract Treasury is TokenOwnableBase, ReentrancyGuard, Facet, ITreasury {
         return this.onERC721Received.selector;
     }
 
-    ///@inheritdoc ITreasury
+    /// @inheritdoc ITreasury
     function onERC1155Received(
         address,
         address,
@@ -69,7 +66,7 @@ contract Treasury is TokenOwnableBase, ReentrancyGuard, Facet, ITreasury {
         return this.onERC1155Received.selector;
     }
 
-    ///@inheritdoc ITreasury
+    /// @inheritdoc ITreasury
     function onERC1155BatchReceived(
         address,
         address,

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

@@ -4,15 +4,12 @@ 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";
 
 /// @title SpaceEntitlementGated
 /// @notice Handles entitlement-gated access to spaces and membership token issuance
-/// @dev Inherits from ISpaceEntitlementGatedBase, MembershipJoin, and EntitlementGated
 contract SpaceEntitlementGated is MembershipJoin, EntitlementGated {
     /// @notice Processes the result of an entitlement check
     /// @dev This function is called when the result of an entitlement check is posted
@@ -34,7 +31,9 @@ contract SpaceEntitlementGated is MembershipJoin, EntitlementGated {
         if (result == NodeVoteStatus.PASSED) {
             PricingDetails memory joinDetails = _getPricingDetails();
 
-            if (joinDetails.shouldCharge) {
+            if (!joinDetails.shouldCharge) {
+                _afterChargeForJoinSpace(transactionId, receiver, 0);
+            } else {
                 uint256 payment = _getCapturedValue(transactionId);
 
                 if (payment < joinDetails.amountDue) {

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/factory/facets/feature/FeatureManagerBase.sol

@@ -1,152 +0,0 @@
-// SPDX-License-Identifier: MIT
-pragma solidity ^0.8.23;
-
-// interfaces
-import {IFeatureManagerFacetBase} from "./IFeatureManagerFacet.sol";
-import {IVotes} from "@openzeppelin/contracts/governance/utils/IVotes.sol";
-import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
-
-// libraries
-import {CustomRevert} from "../../../utils/libraries/CustomRevert.sol";
-import {FeatureManagerStorage} from "./FeatureManagerStorage.sol";
-import {FeatureCondition} from "./IFeatureManagerFacet.sol";
-import {EnumerableSetLib} from "solady/utils/EnumerableSetLib.sol";
-import {LibCall} from "solady/utils/LibCall.sol";
-
-// contracts
-
-abstract contract FeatureManagerBase is IFeatureManagerFacetBase {
-    using EnumerableSetLib for EnumerableSetLib.Bytes32Set;
-    using CustomRevert for bytes4;
-
-    /// @notice Creates or updates a feature condition based on the create flag
-    /// @dev Validates token interface compliance before storing the condition
-    /// @param featureId The unique identifier for the feature
-    /// @param condition The condition struct containing token, threshold, active status, and extra data
-    /// @param create True to create new feature, false to update existing
-    function _upsertFeatureCondition(
-        bytes32 featureId,
-        FeatureCondition calldata condition,
-        bool create
-    ) internal {
-        _validateToken(condition);
-
-        FeatureManagerStorage.Layout storage $ = FeatureManagerStorage.getLayout();
-        if (!create) {
-            if (!$.featureIds.contains(featureId)) FeatureNotActive.selector.revertWith();
-        } else {
-            if (!$.featureIds.add(featureId)) FeatureAlreadyExists.selector.revertWith();
-        }
-
-        $.conditions[featureId] = condition;
-    }
-
-    /// @notice Disables a feature by setting its active flag to false
-    /// @dev This does not delete the condition, only deactivates it
-    /// @param featureId The unique identifier for the feature to disable
-    function _disableFeatureCondition(bytes32 featureId) internal {
-        FeatureCondition storage condition = _getFeatureCondition(featureId);
-        if (!condition.active) FeatureNotActive.selector.revertWith();
-        condition.active = false;
-    }
-
-    /// @notice Retrieves the condition for a specific feature
-    /// @dev Returns the complete condition struct with all parameters
-    /// @param featureId The unique identifier for the feature
-    /// @return The complete condition configuration for the feature
-    function _getFeatureCondition(
-        bytes32 featureId
-    ) internal view returns (FeatureCondition storage) {
-        return FeatureManagerStorage.getLayout().conditions[featureId];
-    }
-
-    /// @notice Retrieves all feature conditions
-    /// @dev Returns an array of all feature conditions
-    /// @return conditions An array of all feature conditions
-    function _getFeatureConditions() internal view returns (FeatureCondition[] memory conditions) {
-        FeatureManagerStorage.Layout storage $ = FeatureManagerStorage.getLayout();
-        // Use values() over at() for full iteration - avoids bounds checking overhead
-        bytes32[] memory ids = $.featureIds.values();
-        uint256 featureCount = ids.length;
-
-        conditions = new FeatureCondition[](featureCount);
-        for (uint256 i; i < featureCount; ++i) {
-            conditions[i] = $.conditions[ids[i]];
-        }
-    }
-
-    /// @notice Retrieves all feature conditions for a specific space
-    /// @dev Returns an array of all feature conditions that are active for the space
-    /// @return conditions An array of all feature conditions that are active for the space
-    function _getFeatureConditionsForSpace(
-        address space
-    ) internal view returns (FeatureCondition[] memory conditions) {
-        FeatureManagerStorage.Layout storage $ = FeatureManagerStorage.getLayout();
-        // Use values() over at() for full iteration - avoids bounds checking overhead
-        bytes32[] memory ids = $.featureIds.values();
-        uint256 featureCount = ids.length;
-
-        // Gas optimization: Allocate full array then resize (memory cheaper than storage reads)
-        conditions = new FeatureCondition[](featureCount);
-        uint256 index;
-
-        for (uint256 i; i < featureCount; ++i) {
-            FeatureCondition storage cond = $.conditions[ids[i]];
-
-            if (_isValidCondition(cond, space)) {
-                conditions[index++] = cond;
-            }
-        }
-
-        // Resize array to actual number of valid conditions
-        assembly ("memory-safe") {
-            mstore(conditions, index)
-        }
-    }
-
-    function _validateToken(FeatureCondition calldata condition) internal view {
-        if (condition.token == address(0)) InvalidToken.selector.revertWith();
-
-        // Check if the token implements IVotes.getVotes with proper return data
-        (bool success, bool exceededMaxCopy, bytes memory data) = LibCall.tryStaticCall(
-            condition.token,
-            gasleft(),
-            32,
-            abi.encodeCall(IVotes.getVotes, (address(this)))
-        );
-
-        if (!success || exceededMaxCopy || data.length != 32)
-            InvalidInterface.selector.revertWith();
-
-        // Check if the token implements ERC20.totalSupply with proper return data
-        (success, exceededMaxCopy, data) = LibCall.tryStaticCall(
-            condition.token,
-            gasleft(),
-            32,
-            abi.encodeCall(IERC20.totalSupply, ())
-        );
-
-        if (!success || exceededMaxCopy || data.length != 32)
-            InvalidInterface.selector.revertWith();
-
-        uint256 totalSupply = abi.decode(data, (uint256));
-        if (totalSupply == 0) InvalidTotalSupply.selector.revertWith();
-        if (condition.threshold > totalSupply) InvalidThreshold.selector.revertWith();
-    }
-
-    /// @notice Checks if a condition should be included for a given space
-    /// @dev Returns true if the condition is active, has a valid token, and meets the threshold
-    /// @param condition The condition to check
-    /// @param space The space address to check against
-    /// @return True if the condition should be included, false otherwise
-    function _isValidCondition(
-        FeatureCondition storage condition,
-        address space
-    ) internal view returns (bool) {
-        if (!condition.active) return false;
-        address token = condition.token;
-        if (token == address(0)) return false;
-        uint256 votes = IVotes(token).getVotes(space);
-        return votes >= condition.threshold;
-    }
-}

package/src/factory/facets/feature/FeatureManagerStorage.sol

@@ -1,47 +0,0 @@
-// SPDX-License-Identifier: MIT
-pragma solidity ^0.8.23;
-
-// interfaces
-
-// libraries
-import {EnumerableSetLib} from "solady/utils/EnumerableSetLib.sol";
-
-// contracts
-
-/// @notice Represents a condition for feature activation
-/// @dev Used to determine if a feature should be enabled based on token voting power
-/// @param token The address of the token used for voting (must implement IVotes)
-/// @param threshold The minimum voting power (votes) required to activate the feature
-/// @param active Whether the condition is currently active
-/// @param extraData Additional data that might be used for specialized condition logic
-struct FeatureCondition {
-    address token;
-    bool active;
-    uint256 threshold;
-    bytes extraData;
-}
-
-/// @title FeatureManager
-library FeatureManagerStorage {
-    using EnumerableSetLib for EnumerableSetLib.Bytes32Set;
-
-    // keccak256(abi.encode(uint256(keccak256("factory.facets.feature.manager.storage")) - 1)) & ~bytes32(uint256(0xff))
-    bytes32 constant DEFAULT_STORAGE_SLOT =
-        0x20c456a8ea15fcf7965033c954321ffd9dc82a2c65f686a77e2a67da65c29000;
-
-    /// @notice Storage layout for the FeatureManager
-    /// @dev Maps feature IDs to their activation conditions
-    /// @custom:storage-location erc7201:towns.storage.FeatureManager
-    struct Layout {
-        // Feature IDs
-        EnumerableSetLib.Bytes32Set featureIds;
-        // Feature ID => Condition
-        mapping(bytes32 featureId => FeatureCondition condition) conditions;
-    }
-
-    function getLayout() internal pure returns (Layout storage $) {
-        assembly {
-            $.slot := DEFAULT_STORAGE_SLOT
-        }
-    }
-}

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
-        }
-    }
-}