@towns-protocol/contracts 0.0.440 → 0.0.442

package/src/account/facets/hub/IAccountHub.sol

@@ -0,0 +1,25 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.29;
+
+interface IAccountHub {
+    /// @notice Sets the space factory
+    /// @param spaceFactory The address of the space factory
+    function setSpaceFactory(address spaceFactory) external;
+
+    /// @notice Sets the app registry
+    /// @param appRegistry The address of the app registry
+    function setAppRegistry(address appRegistry) external;
+
+    /// @notice Gets the space factory
+    /// @return The address of the space factory
+    function getSpaceFactory() external view returns (address);
+
+    /// @notice Gets the app registry
+    /// @return The address of the app registry
+    function getAppRegistry() external view returns (address);
+
+    /// @notice Checks if an account is installed
+    /// @param account The address of the account
+    /// @return True if the account is installed, false otherwise
+    function isInstalled(address account) external view returns (bool);
+}

package/src/account/facets/tipping/AccountTippingFacet.sol

@@ -0,0 +1,72 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.29;
+
+// interfaces
+import {ITipping} from "src/spaces/facets/tipping/ITipping.sol";
+
+// libraries
+import "./AccountTippingMod.sol" as AccountTipping;
+import {EnumerableSetLib} from "solady/utils/EnumerableSetLib.sol";
+import {CustomRevert} from "../../../utils/libraries/CustomRevert.sol";
+
+// contracts
+import {Facet} from "@towns-protocol/diamond/src/facets/Facet.sol";
+import {ReentrancyGuardTransient} from "solady/utils/ReentrancyGuardTransient.sol";
+
+contract AccountTippingFacet is ITipping, ReentrancyGuardTransient, Facet {
+    using EnumerableSetLib for EnumerableSetLib.AddressSet;
+    using CustomRevert for bytes4;
+
+    function __AccountTippingFacet_init() external onlyInitializing {
+        _addInterface(type(ITipping).interfaceId);
+    }
+
+    /// @inheritdoc ITipping
+    function sendTip(
+        TipRecipientType recipientType,
+        bytes calldata data
+    ) external payable nonReentrant {
+        AccountTipping.tipAny(address(this), uint8(recipientType), data);
+    }
+
+    /// @inheritdoc ITipping
+    function tip(TipRequest calldata) external payable {
+        CustomRevert.revertWith(Deprecated.selector);
+    }
+
+    /// @inheritdoc ITipping
+    function tipsByWalletAndCurrency(
+        address wallet,
+        address currency
+    ) external view returns (uint256) {
+        return AccountTipping.getStorage().accountStatsByCurrency[wallet][currency].amount;
+    }
+
+    /// @inheritdoc ITipping
+    function tipCountByWalletAndCurrency(
+        address wallet,
+        address currency
+    ) external view returns (uint256) {
+        return AccountTipping.getStorage().accountStatsByCurrency[wallet][currency].total;
+    }
+
+    /// @inheritdoc ITipping
+    function tipsByCurrencyAndTokenId(uint256, address) external pure returns (uint256) {
+        CustomRevert.revertWith(Deprecated.selector);
+    }
+
+    /// @inheritdoc ITipping
+    function tippingCurrencies() external view returns (address[] memory) {
+        return AccountTipping.getStorage().currencies.values();
+    }
+
+    /// @inheritdoc ITipping
+    function totalTipsByCurrency(address currency) external view returns (uint256) {
+        return AccountTipping.getStorage().currencyStats[currency].total;
+    }
+
+    /// @inheritdoc ITipping
+    function tipAmountByCurrency(address currency) external view returns (uint256) {
+        return AccountTipping.getStorage().currencyStats[currency].amount;
+    }
+}

package/src/account/facets/tipping/AccountTippingMod.sol

@@ -0,0 +1,144 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.29;
+
+// interfaces
+import {ITippingBase} from "../../../spaces/facets/tipping/ITipping.sol";
+
+// libraries
+import {EnumerableSetLib} from "solady/utils/EnumerableSetLib.sol";
+import {CustomRevert} from "../../../utils/libraries/CustomRevert.sol";
+import {CurrencyTransfer} from "../../../utils/libraries/CurrencyTransfer.sol";
+
+/*´:°•.°+.*•´.*:˚.°*.˚•´.°:°•.°•.*•´.*:˚.°*.˚•´.°:°•.°+.*•´.*:*/
+/*                         TYPES                            */
+/*.•°:°.´+˚.*°.˚:*.´•*.+°.•°:´*.´•*.•°.•°:°.´:•˚°.*°.˚:*.´+°.•*/
+using CustomRevert for bytes4;
+using EnumerableSetLib for EnumerableSetLib.AddressSet;
+
+/*´:°•.°+.*•´.*:˚.°*.˚•´.°:°•.°•.*•´.*:˚.°*.˚•´.°:°•.°+.*•´.*:*/
+/*                          STORAGE                           */
+/*.•°:°.´+˚.*°.˚:*.´•*.+°.•°:´*.´•*.•°.•°:°.´:•˚°.*°.˚:*.´+°.•*/
+
+// keccak256(abi.encode(uint256(keccak256("towns.account.tipping.mod.storage")) - 1)) & ~bytes32(uint256(0xff))
+bytes32 constant STORAGE_SLOT = 0x2a95e0ca73c50924d5ddd84672da871cae538509d7dabaedae2f730a19f18300;
+
+/// @notice Stats for a currency
+/// @param total The total number of tips
+/// @param amount The total amount of tips
+struct Stats {
+    uint256 total;
+    uint256 amount;
+}
+
+/// @notice Storage layout for the AccountTippingMod
+/// @custom:storage-location erc7201:towns.account.tipping.mod.storage
+struct Layout {
+    // Global mappings
+    EnumerableSetLib.AddressSet currencies;
+    mapping(address currency => Stats stats) currencyStats;
+    mapping(address account => Stats stats) accountStats;
+    mapping(address account => mapping(address currency => Stats stats)) accountStatsByCurrency;
+}
+
+/// @notice Returns the storage layout for the AccountTippingMod
+function getStorage() pure returns (Layout storage $) {
+    assembly {
+        $.slot := STORAGE_SLOT
+    }
+}
+
+/*´:°•.°+.*•´.*:˚.°*.˚•´.°:°•.°•.*•´.*:˚.°*.˚•´.°:°•.°+.*•´.*:*/
+/*                         FUNCTIONS                          */
+/*.•°:°.´+˚.*°.˚:*.´•*.+°.•°:´*.´•*.•°.•°:°.´:•˚°.*°.˚:*.´+°.•*/
+
+/// @notice Sends a tip
+/// @param recipientType The type of recipient
+/// @param data The data for the tip
+/// @return tipAmount The amount of the tip
+/// @return protocolFee The protocol fee
+function tipAny(
+    address self,
+    uint8 recipientType,
+    bytes calldata data
+) returns (uint256 tipAmount, uint256 protocolFee) {
+    if (recipientType != uint8(ITippingBase.TipRecipientType.Any))
+        ITippingBase.InvalidRecipientType.selector.revertWith();
+
+    ITippingBase.AnyTipParams memory request = abi.decode(data, (ITippingBase.AnyTipParams));
+
+    protocolFee;
+    tipAmount = request.amount;
+
+    validateTip(request.sender, request.receiver, request.currency, request.amount);
+    depositTip(self, request.currency, request.amount);
+    processTip(getStorage(), self, request.receiver, request.currency, request.amount);
+
+    emit ITippingBase.TipSent(
+        msg.sender,
+        request.receiver,
+        ITippingBase.TipRecipientType.Any,
+        request.currency,
+        request.amount,
+        request.data
+    );
+}
+
+/// @notice Processes a tip
+/// @param $ The storage layout
+/// @param self The address of the facet
+/// @param receiver The address of the recipient
+/// @param currency The currency of the tip
+/// @param amount The amount of the tip
+function processTip(
+    Layout storage $,
+    address self,
+    address receiver,
+    address currency,
+    uint256 amount
+) {
+    // Add currency to set
+    $.currencies.add(currency);
+
+    // Update global currency stats
+    Stats storage stats = $.currencyStats[currency];
+    stats.amount += amount;
+    stats.total += 1;
+
+    // Update account-specific stats
+    Stats storage accountStats = $.accountStats[receiver];
+    accountStats.amount += amount;
+    accountStats.total += 1;
+
+    Stats storage accountStatsByCurrency = $.accountStatsByCurrency[receiver][currency];
+    accountStatsByCurrency.amount += amount;
+    accountStatsByCurrency.total += 1;
+
+    // Transfer currency
+    CurrencyTransfer.transferCurrency(currency, self, receiver, amount);
+}
+
+/// @notice Validates a tip
+/// @param sender The address of the sender
+/// @param receiver The address of the recipient
+/// @param currency The currency of the tip
+/// @param amount The amount of the tip
+function validateTip(address sender, address receiver, address currency, uint256 amount) view {
+    if (currency == address(0)) ITippingBase.CurrencyIsZero.selector.revertWith();
+    if (receiver == address(0)) ITippingBase.InvalidAddressInput.selector.revertWith();
+    if (amount == 0) ITippingBase.AmountIsZero.selector.revertWith();
+    if (sender != msg.sender) ITippingBase.NotSenderOfTip.selector.revertWith();
+    if (sender == receiver) ITippingBase.CannotTipSelf.selector.revertWith();
+}
+
+/// @notice Deposits a tip
+/// @param self The address of the facet
+/// @param currency The currency of the tip
+/// @param amount The amount of the tip
+function depositTip(address self, address currency, uint256 amount) {
+    if (currency == CurrencyTransfer.NATIVE_TOKEN) {
+        if (msg.value != amount) ITippingBase.MsgValueMismatch.selector.revertWith();
+    } else {
+        if (msg.value != 0) ITippingBase.UnexpectedETH.selector.revertWith();
+        CurrencyTransfer.transferCurrency(currency, msg.sender, self, amount);
+    }
+}

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/account/AppAccountStorage.sol

@@ -6,7 +6,6 @@ import {IAppRegistry} from "src/apps/facets/registry/IAppRegistry.sol";
 
 // libraries
 import {EnumerableSetLib} from "solady/utils/EnumerableSetLib.sol";
-import {ExecutorStorage} from "src/spaces/facets/executor/ExecutorStorage.sol";
 import {DependencyLib} from "src/spaces/facets/DependencyLib.sol";
 import {EMPTY_UID} from "@ethereum-attestation-service/eas-contracts/Common.sol";
 

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/tipping/ITipping.sol

@@ -2,26 +2,27 @@
 pragma solidity ^0.8.23;
 
 interface ITippingBase {
-    // =============================================================
-    //                           Enums
-    // =============================================================
-
     enum TipRecipientType {
         Member, // Tips to token holders
         Bot, // Tips to bot wallets
-        Pool // Tips to pool wallets
+        Any // Tips to any address
     }
 
-    // =============================================================
-    //                           Structs
-    // =============================================================
-
     struct TipMetadata {
         bytes32 messageId;
         bytes32 channelId;
         bytes data; // Extensible metadata
     }
 
+    /// @notice Params for any tip
+    struct AnyTipParams {
+        address currency;
+        address sender;
+        address receiver;
+        uint256 amount;
+        bytes data;
+    }
+
     /// @notice Params for Member tips (includes tokenId)
     struct MembershipTipParams {
         address receiver;
@@ -50,10 +51,6 @@ interface ITippingBase {
         bytes32 channelId;
     }
 
-    // =============================================================
-    //                           Events
-    // =============================================================
-
     event TipSent(
         address indexed sender,
         address indexed receiver,
@@ -74,10 +71,6 @@ interface ITippingBase {
         bytes32 channelId
     );
 
-    // =============================================================
-    //                           Errors
-    // =============================================================
-
     error InvalidRecipientType();
     error InvalidTipData();
     error TokenDoesNotExist();
@@ -87,6 +80,9 @@ interface ITippingBase {
     error CurrencyIsZero();
     error MsgValueMismatch();
     error UnexpectedETH();
+    error NotSenderOfTip();
+    error Deprecated();
+    error InvalidAddressInput();
 }
 
 interface ITipping is ITippingBase {
@@ -94,9 +90,8 @@ interface ITipping is ITippingBase {
     /// @param recipientType The type of recipient (Member, Wallet, Bot, Pool)
     /// @param data ABI-encoded tip params based on recipientType:
     ///   - Member: abi.encode(MembershipTipParams)
-    ///   - Wallet: abi.encode(WalletTipParams)
     ///   - Bot: abi.encode(BotTipParams)
-    ///   - Pool: Reserved for future implementation
+    ///   - Any: abi.encode(AnyTipParams)
     function sendTip(TipRecipientType recipientType, bytes calldata data) external payable;
 
     /// @notice Sends a tip to a space member (legacy)

package/src/spaces/facets/tipping/TippingBase.sol

@@ -6,7 +6,6 @@ import {ITippingBase} from "./ITipping.sol";
 import {ITownsPointsBase} from "../../../airdrop/points/ITownsPoints.sol";
 import {IFeeManager} from "../../../factory/facets/fee/IFeeManager.sol";
 import {FeeTypesLib} from "../../../factory/facets/fee/FeeTypesLib.sol";
-import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 
 // libraries
 import {EnumerableSet} from "@openzeppelin/contracts/utils/structs/EnumerableSet.sol";

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