@towns-protocol/contracts 0.0.383 → 0.0.385

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@towns-protocol/contracts",
-  "version": "0.0.383",
+  "version": "0.0.385",
   "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.383",
+    "@towns-protocol/prettier-config": "^0.0.385",
     "@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": "7c6bb682702d1d6977ee42ce7d249c2bd4f62c85"
+  "gitHead": "2b60b355cb85529d292b3702a695750f5c884ab7"
 }

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

@@ -3,6 +3,7 @@ pragma solidity ^0.8.23;
 
 // interfaces
 import {IDiamondInitHelper} from "./IDiamondInitHelper.sol";
+import {IAppFactory, IAppFactoryBase} from "src/apps/facets/factory/IAppFactory.sol";
 
 // libraries
 import {DeployDiamondCut} from "@towns-protocol/diamond/scripts/deployments/facets/DeployDiamondCut.sol";
@@ -12,15 +13,16 @@ import {DeployOwnable} from "@towns-protocol/diamond/scripts/deployments/facets/
 import {LibString} from "solady/utils/LibString.sol";
 import {DeployMetadata} from "../facets/DeployMetadata.s.sol";
 import {DeployAppRegistryFacet} from "../facets/DeployAppRegistryFacet.s.sol";
-import {DeployUpgradeableBeacon} from "../facets/DeployUpgradeableBeacon.s.sol";
 import {DeployAppInstallerFacet} from "../facets/DeployAppInstallerFacet.s.sol";
 import {DeployAppFactoryFacet} from "../facets/DeployAppFactoryFacet.s.sol";
 import {DeploySpaceFactory} from "../diamonds/DeploySpaceFactory.s.sol";
+import {DeploySimpleAppBeacon} from "../diamonds/DeploySimpleAppBeacon.s.sol";
 
 // contracts
 import {Diamond} from "@towns-protocol/diamond/src/Diamond.sol";
 import {MultiInit} from "@towns-protocol/diamond/src/initializers/MultiInit.sol";
 import {DiamondHelper} from "@towns-protocol/diamond/scripts/common/helpers/DiamondHelper.s.sol";
+import {EntryPoint} from "@eth-infinitism/account-abstraction/core/EntryPoint.sol";
 
 // deployers
 import {DeployFacet} from "../../common/DeployFacet.s.sol";
@@ -31,9 +33,11 @@ contract DeployAppRegistry is IDiamondInitHelper, DiamondHelper, Deployer {
 
     DeployFacet private facetHelper = new DeployFacet();
     DeploySpaceFactory private deploySpaceFactory = new DeploySpaceFactory();
+    DeploySimpleAppBeacon private deploySimpleAppBeacon = new DeploySimpleAppBeacon();
 
     string internal constant APP_REGISTRY_SCHEMA = "address app, address client";
     address internal spaceFactory;
+    address internal simpleAppBeacon;
 
     function versionName() public pure override returns (string memory) {
         return "appRegistry";
@@ -41,6 +45,7 @@ contract DeployAppRegistry is IDiamondInitHelper, DiamondHelper, Deployer {
 
     function addImmutableCuts(address deployer) internal {
         spaceFactory = deploySpaceFactory.deploy(deployer);
+        simpleAppBeacon = deploySimpleAppBeacon.deploy(deployer);
 
         // Queue up all core facets for batch deployment
         facetHelper.add("DiamondCutFacet");
@@ -81,7 +86,7 @@ contract DeployAppRegistry is IDiamondInitHelper, DiamondHelper, Deployer {
             DeployOwnable.makeInitData(deployer)
         );
 
-        facet = facetHelper.getDeployedAddress("MetadataFacet");
+        facet = facetHelper.predictAddress("MetadataFacet");
         addFacet(
             makeCut(facet, FacetCutAction.Add, DeployMetadata.selectors()),
             facet,
@@ -96,20 +101,10 @@ contract DeployAppRegistry is IDiamondInitHelper, DiamondHelper, Deployer {
         facetHelper.add("AppRegistryFacet");
         facetHelper.add("AppInstallerFacet");
         facetHelper.add("AppFactoryFacet");
-        facetHelper.add("SimpleApp");
 
         facetHelper.deployBatch(deployer);
 
-        address simpleApp = facetHelper.getDeployedAddress("SimpleApp");
-        address facet = facetHelper.getDeployedAddress("UpgradeableBeaconFacet");
-
-        addFacet(
-            makeCut(facet, FacetCutAction.Add, DeployUpgradeableBeacon.selectors()),
-            facet,
-            DeployUpgradeableBeacon.makeInitData(simpleApp)
-        );
-
-        facet = facetHelper.getDeployedAddress("AppRegistryFacet");
+        address facet = facetHelper.getDeployedAddress("AppRegistryFacet");
         addFacet(
             makeCut(facet, FacetCutAction.Add, DeployAppRegistryFacet.selectors()),
             facet,
@@ -123,11 +118,17 @@ contract DeployAppRegistry is IDiamondInitHelper, DiamondHelper, Deployer {
             DeployAppInstallerFacet.makeInitData()
         );
 
+        IAppFactoryBase.Beacon[] memory beacons = new IAppFactoryBase.Beacon[](1);
+        beacons[0] = IAppFactoryBase.Beacon({
+            beaconId: deploySimpleAppBeacon.SIMPLE_APP_BEACON_ID(),
+            beacon: simpleAppBeacon
+        });
+
         facet = facetHelper.getDeployedAddress("AppFactoryFacet");
         addFacet(
             makeCut(facet, FacetCutAction.Add, DeployAppFactoryFacet.selectors()),
             facet,
-            DeployAppFactoryFacet.makeInitData()
+            DeployAppFactoryFacet.makeInitData(beacons, _getEntryPoint())
         );
 
         address multiInit = facetHelper.getDeployedAddress("MultiInit");
@@ -175,9 +176,15 @@ contract DeployAppRegistry is IDiamondInitHelper, DiamondHelper, Deployer {
 
         Diamond.InitParams memory initDiamondCut = diamondInitParams(deployer);
 
-        vm.broadcast(deployer);
+        vm.startBroadcast(deployer);
         Diamond diamond = new Diamond(initDiamondCut);
+        vm.stopBroadcast();
 
         return address(diamond);
     }
+
+    function _getEntryPoint() internal returns (address) {
+        if (isTesting()) return address(new EntryPoint());
+        return 0x4337084D9E255Ff0702461CF8895CE9E3b5Ff108;
+    }
 }

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

@@ -0,0 +1,149 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.23;
+
+// interfaces
+import {IDiamondInitHelper} from "./IDiamondInitHelper.sol";
+
+// libraries
+import {DeployDiamondCut} from "@towns-protocol/diamond/scripts/deployments/facets/DeployDiamondCut.sol";
+import {DeployDiamondLoupe} from "@towns-protocol/diamond/scripts/deployments/facets/DeployDiamondLoupe.sol";
+import {DeployIntrospection} from "@towns-protocol/diamond/scripts/deployments/facets/DeployIntrospection.sol";
+import {DeployOwnable} from "@towns-protocol/diamond/scripts/deployments/facets/DeployOwnable.sol";
+import {DeployMetadata} from "../facets/DeployMetadata.s.sol";
+import {DeployUpgradeableBeacon} from "../facets/DeployUpgradeableBeacon.s.sol";
+import {LibString} from "solady/utils/LibString.sol";
+
+// contracts
+import {Diamond} from "@towns-protocol/diamond/src/Diamond.sol";
+import {MultiInit} from "@towns-protocol/diamond/src/initializers/MultiInit.sol";
+import {DiamondHelper} from "@towns-protocol/diamond/scripts/common/helpers/DiamondHelper.s.sol";
+
+// deployers
+import {DeployFacet} from "../../common/DeployFacet.s.sol";
+import {Deployer} from "../../common/Deployer.s.sol";
+
+contract DeploySimpleAppBeacon is DiamondHelper, Deployer, IDiamondInitHelper {
+    using LibString for string;
+
+    DeployFacet private facetHelper = new DeployFacet();
+
+    // keccak256("SimpleAppBeacon")
+    bytes32 public constant SIMPLE_APP_BEACON_ID =
+        0xff51c4406dd10a0ec471147fd1e468ff84c7fe0c8a9bc8165c6ac339490f6027;
+
+    function versionName() public pure override returns (string memory) {
+        return "simpleAppBeacon";
+    }
+
+    function diamondInitHelper(
+        address deployer,
+        string[] memory facetNames
+    ) external override returns (FacetCut[] memory) {
+        // Queue up all requested facets for batch deployment
+        for (uint256 i; i < facetNames.length; ++i) {
+            facetHelper.add(facetNames[i]);
+        }
+
+        // Deploy all requested facets in a single batch transaction
+        facetHelper.deployBatch(deployer);
+
+        for (uint256 i; i < facetNames.length; ++i) {
+            string memory facetName = facetNames[i];
+            address facet = facetHelper.getDeployedAddress(facetName);
+
+            if (facetName.eq("UpgradeableBeaconFacet")) {
+                addCut(makeCut(facet, FacetCutAction.Add, DeployUpgradeableBeacon.selectors()));
+            }
+        }
+
+        return baseFacets();
+    }
+
+    function diamondInitParams(address deployer) public returns (Diamond.InitParams memory) {
+        // Queue up feature facets for batch deployment
+        facetHelper.add("MultiInit");
+        facetHelper.add("UpgradeableBeaconFacet");
+        facetHelper.add("SimpleAppFacet");
+
+        // Deploy all facets in a batch
+        facetHelper.deployBatch(deployer);
+
+        // Add feature facets
+        address simpleApp = facetHelper.getDeployedAddress("SimpleAppFacet");
+        address facet = facetHelper.getDeployedAddress("UpgradeableBeaconFacet");
+        addFacet(
+            makeCut(facet, FacetCutAction.Add, DeployUpgradeableBeacon.selectors()),
+            facet,
+            DeployUpgradeableBeacon.makeInitData(simpleApp)
+        );
+
+        address multiInit = facetHelper.getDeployedAddress("MultiInit");
+
+        return
+            Diamond.InitParams({
+                baseFacets: baseFacets(),
+                init: multiInit,
+                initData: abi.encodeCall(MultiInit.multiInit, (_initAddresses, _initDatas))
+            });
+    }
+
+    /*´:°•.°+.*•´.*:˚.°*.˚•´.°:°•.°•.*•´.*:˚.°*.˚•´.°:°•.°+.*•´.*:*/
+    /*                          Internal                          */
+    /*.•°:°.´+˚.*°.˚:*.´•*.+°.•°:´*.´•*.•°.•°:°.´:•˚°.*°.˚:*.´+°.•*/
+
+    function _coreFacets(address deployer) private {
+        // Queue up all core facets for batch deployment
+        facetHelper.add("DiamondCutFacet");
+        facetHelper.add("DiamondLoupeFacet");
+        facetHelper.add("IntrospectionFacet");
+        facetHelper.add("OwnableFacet");
+        facetHelper.add("MetadataFacet");
+
+        // Get predicted addresses
+        address facet = facetHelper.predictAddress("DiamondCutFacet");
+        addFacet(
+            makeCut(facet, FacetCutAction.Add, DeployDiamondCut.selectors()),
+            facet,
+            DeployDiamondCut.makeInitData()
+        );
+
+        facet = facetHelper.predictAddress("DiamondLoupeFacet");
+        addFacet(
+            makeCut(facet, FacetCutAction.Add, DeployDiamondLoupe.selectors()),
+            facet,
+            DeployDiamondLoupe.makeInitData()
+        );
+
+        facet = facetHelper.predictAddress("IntrospectionFacet");
+        addFacet(
+            makeCut(facet, FacetCutAction.Add, DeployIntrospection.selectors()),
+            facet,
+            DeployIntrospection.makeInitData()
+        );
+
+        facet = facetHelper.predictAddress("MetadataFacet");
+        addFacet(
+            makeCut(facet, FacetCutAction.Add, DeployMetadata.selectors()),
+            facet,
+            DeployMetadata.makeInitData(SIMPLE_APP_BEACON_ID, "")
+        );
+
+        facet = facetHelper.predictAddress("OwnableFacet");
+        addFacet(
+            makeCut(facet, FacetCutAction.Add, DeployOwnable.selectors()),
+            facet,
+            DeployOwnable.makeInitData(deployer)
+        );
+    }
+
+    function __deploy(address deployer) internal override returns (address) {
+        _coreFacets(deployer);
+
+        Diamond.InitParams memory initDiamondCut = diamondInitParams(deployer);
+
+        vm.broadcast(deployer);
+        Diamond diamond = new Diamond(initDiamondCut);
+
+        return address(diamond);
+    }
+}

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

@@ -12,7 +12,6 @@ import {DeployIntrospection} from "@towns-protocol/diamond/scripts/deployments/f
 import {DeployOwnable} from "@towns-protocol/diamond/scripts/deployments/facets/DeployOwnable.sol";
 import {DeployPausable} from "@towns-protocol/diamond/scripts/deployments/facets/DeployPausable.sol";
 import {DeployProxyManager} from "@towns-protocol/diamond/scripts/deployments/utils/DeployProxyManager.sol";
-import {LibDeploy} from "@towns-protocol/diamond/src/utils/LibDeploy.sol";
 import {DeployFeatureManager} from "../facets/DeployFeatureManager.s.sol";
 import {DeployMetadata} from "../facets/DeployMetadata.s.sol";
 import {DeployPricingModules} from "../facets/DeployPricingModules.s.sol";

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

@@ -10,13 +10,21 @@ import {IDiamond} from "@towns-protocol/diamond/src/IDiamond.sol";
 import {LibDeploy} from "@towns-protocol/diamond/src/utils/LibDeploy.sol";
 import {AppFactoryFacet} from "src/apps/facets/factory/AppFactoryFacet.sol";
 import {DynamicArrayLib} from "solady/utils/DynamicArrayLib.sol";
+import {IAppFactoryBase} from "src/apps/facets/factory/IAppFactory.sol";
 
 library DeployAppFactoryFacet {
     using DynamicArrayLib for DynamicArrayLib.DynamicArray;
 
     function selectors() internal pure returns (bytes4[] memory res) {
-        DynamicArrayLib.DynamicArray memory arr = DynamicArrayLib.p().reserve(1);
+        DynamicArrayLib.DynamicArray memory arr = DynamicArrayLib.p().reserve(8);
+        arr.p(AppFactoryFacet.addBeacons.selector);
+        arr.p(AppFactoryFacet.removeBeacons.selector);
+        arr.p(AppFactoryFacet.getBeacon.selector);
+        arr.p(AppFactoryFacet.getBeacons.selector);
+        arr.p(AppFactoryFacet.setEntryPoint.selector);
+        arr.p(AppFactoryFacet.getEntryPoint.selector);
         arr.p(AppFactoryFacet.createApp.selector);
+        arr.p(AppFactoryFacet.createAppByBeacon.selector);
         bytes32[] memory selectors_ = arr.asBytes32Array();
         assembly ("memory-safe") {
             res := selectors_
@@ -35,8 +43,11 @@ library DeployAppFactoryFacet {
             });
     }
 
-    function makeInitData() internal pure returns (bytes memory) {
-        return abi.encodeCall(AppFactoryFacet.__AppFactory_init, ());
+    function makeInitData(
+        IAppFactoryBase.Beacon[] memory beacons,
+        address entryPoint
+    ) internal pure returns (bytes memory) {
+        return abi.encodeCall(AppFactoryFacet.__AppFactory_init, (beacons, entryPoint));
     }
 
     function deploy() internal returns (address) {

package/scripts/interactions/InteractRegisterApp.s.sol

@@ -6,7 +6,6 @@ import {IAppFactory} from "src/apps/facets/factory/IAppFactory.sol";
 
 //contracts
 import {Interaction} from "../common/Interaction.s.sol";
-import {SimpleApp} from "src/apps/helpers/SimpleApp.sol";
 import {IAppFactoryBase} from "src/apps/facets/factory/IAppFactory.sol";
 
 contract InteractRegisterApp is Interaction, IAppFactoryBase {

package/scripts/interactions/diamonds/InteractAppRegistry.s.sol

@@ -0,0 +1,75 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.23;
+
+// interfaces
+import {IAppFactory, IAppFactoryBase} from "src/apps/facets/factory/IAppFactory.sol";
+
+// libraries
+import {console} from "forge-std/console.sol";
+
+// contracts
+import {Interaction} from "../../common/Interaction.s.sol";
+import {AlphaHelper} from "../helpers/AlphaHelper.sol";
+import {DeployAppRegistry} from "../../deployments/diamonds/DeployAppRegistry.s.sol";
+import {DeploySimpleAppBeacon} from "../../deployments/diamonds/DeploySimpleAppBeacon.s.sol";
+
+// facet deployers
+import {DeployAppRegistryFacet} from "../../deployments/facets/DeployAppRegistryFacet.s.sol";
+import {DeployAppInstallerFacet} from "../../deployments/facets/DeployAppInstallerFacet.s.sol";
+import {DeployAppFactoryFacet} from "../../deployments/facets/DeployAppFactoryFacet.s.sol";
+
+contract InteractAppRegistry is Interaction, AlphaHelper {
+    DeployAppRegistry private deployHelper = new DeployAppRegistry();
+    DeploySimpleAppBeacon private beaconHelper = new DeploySimpleAppBeacon();
+
+    function __interact(address deployer) internal override {
+        // Get the deployed AppRegistry diamond address
+        address appRegistry = getDeployment("appRegistry");
+        address spaceFactory = getDeployment("spaceFactory");
+        address simpleAppBeacon = getDeployment("simpleAppBeacon");
+        address entryPoint = getDeployment("entryPoint");
+
+        console.log("AppRegistry Diamond:", appRegistry);
+        console.log("Space Factory:", spaceFactory);
+        console.log("Simple App Beacon:", simpleAppBeacon);
+
+        // Deploy new facet implementations
+        console.log("\n=== Deploying New Facets ===");
+        vm.setEnv("OVERRIDE_DEPLOYMENTS", "1");
+
+        address appRegistryFacet = DeployAppRegistryFacet.deploy();
+        console.log("AppRegistryFacet deployed at:", appRegistryFacet);
+
+        address appInstallerFacet = DeployAppInstallerFacet.deploy();
+        console.log("AppInstallerFacet deployed at:", appInstallerFacet);
+
+        address appFactoryFacet = DeployAppFactoryFacet.deploy();
+        console.log("AppFactoryFacet deployed at:", appFactoryFacet);
+
+        // Add the cuts for the new facet implementations
+        addCut(DeployAppRegistryFacet.makeCut(appRegistryFacet, FacetCutAction.Replace));
+        addCut(DeployAppInstallerFacet.makeCut(appInstallerFacet, FacetCutAction.Replace));
+        addCut(DeployAppFactoryFacet.makeCut(appFactoryFacet, FacetCutAction.Replace));
+
+        // Prepare initialization data for AppFactoryFacet with the beacon configuration
+        IAppFactoryBase.Beacon[] memory beacons = new IAppFactoryBase.Beacon[](1);
+        beacons[0] = IAppFactoryBase.Beacon({
+            beaconId: beaconHelper.SIMPLE_APP_BEACON_ID(),
+            beacon: simpleAppBeacon
+        });
+        bytes memory initData = DeployAppFactoryFacet.makeInitData(beacons, entryPoint);
+
+        // Generate and execute smart cuts with initialization
+        console.log("\n=== Executing Diamond Cut with Initialization ===");
+        executeDiamondCutsWithLogging(
+            deployer,
+            appRegistry,
+            "AppRegistry",
+            deployHelper,
+            appFactoryFacet,
+            initData
+        );
+
+        console.log("\n=== Diamond Cut Complete ===");
+    }
+}

package/src/apps/BaseApp.sol

@@ -12,18 +12,21 @@ import {ITownsApp} from "./ITownsApp.sol";
 /// @dev Inheriting contracts should override _onInstall and _onUninstall as needed
 /// @dev Implements IModule, IExecutionModule, and ITownsApp interfaces
 abstract contract BaseApp is ITownsApp {
-    receive() external payable {
+    receive() external payable virtual {
         _onPayment(msg.sender, msg.value);
     }
 
-    // External functions
-    function supportsInterface(bytes4 interfaceId) external pure returns (bool) {
+    function supportsInterface(bytes4 interfaceId) public view virtual returns (bool) {
         return
+            interfaceId == type(ITownsApp).interfaceId ||
             interfaceId == type(IExecutionModule).interfaceId ||
-            interfaceId == type(IModule).interfaceId ||
-            interfaceId == type(ITownsApp).interfaceId;
+            interfaceId == type(IModule).interfaceId;
     }
 
+    /*´:°•.°+.*•´.*:˚.°*.˚•´.°:°•.°•.*•´.*:˚.°*.˚•´.°:°•.°+.*•´.*:*/
+    /*                    Base App Functions                      */
+    /*.•°:°.´+˚.*°.˚:*.´•*.+°.•°:´*.´•*.•°.•°:°.´:•˚°.*°.˚:*.´+°.•*/
+
     /// @notice Required by IModule - called when module is installed
     function onInstall(bytes calldata postInstallData) external {
         _onInstall(postInstallData);
@@ -46,7 +49,7 @@ abstract contract BaseApp is ITownsApp {
         return _accessDuration();
     }
 
-    // Internal functions
+    // Hooks
     function _onInstall(bytes calldata postInstallData) internal virtual {}
 
     function _onUninstall(bytes calldata postUninstallData) internal virtual {}

package/src/apps/ITownsApp.sol

@@ -10,6 +10,10 @@ import {IModule} from "@erc6900/reference-implementation/interfaces/IModule.sol"
 /// @dev Combines IModule (module lifecycle), and IExecutionModule (execution)
 /// @dev Apps must implement required permissions and support these interfaces
 interface ITownsApp is IModule, IExecutionModule {
+    /// @notice Initializes the app
+    /// @param data The data to initialize the app
+    function initialize(bytes calldata data) external;
+
     /// @notice Returns the required permissions for the app
     /// @return permissions The required permissions for the app
     function requiredPermissions() external view returns (bytes32[] memory);

package/src/apps/facets/factory/AppFactoryBase.sol

@@ -0,0 +1,108 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.29;
+
+// interfaces
+import {IAppFactoryBase} from "./IAppFactory.sol";
+import {ITownsApp} from "../../ITownsApp.sol";
+
+// libraries
+import {LibClone} from "solady/utils/LibClone.sol";
+import {CustomRevert} from "../../../utils/libraries/CustomRevert.sol";
+import {AppFactoryStorage} from "./AppFactoryStorage.sol";
+import {EnumerableSetLib} from "solady/utils/EnumerableSetLib.sol";
+import {LibAppRegistry} from "../registry/LibAppRegistry.sol";
+
+// contracts
+import {Facet} from "@towns-protocol/diamond/src/facets/Facet.sol";
+
+/// @title AppInstallerFacet
+/// @author Towns Protocol
+/// @notice Facet for installing apps to spaces
+abstract contract AppFactoryBase is IAppFactoryBase {
+    using CustomRevert for bytes4;
+    using EnumerableSetLib for EnumerableSetLib.Bytes32Set;
+
+    function _addBeacons(Beacon[] calldata beacons) internal {
+        AppFactoryStorage.Layout storage $ = AppFactoryStorage.getLayout();
+        uint256 length = beacons.length;
+        for (uint256 i; i < length; ++i) {
+            Beacon calldata beacon = beacons[i];
+            if (beacon.beacon == address(0)) AppFactory__InvalidAddressInput.selector.revertWith();
+            if (beacon.beaconId == bytes32(0)) AppFactory__InvalidBeaconId.selector.revertWith();
+            if ($.beaconIds.contains(beacon.beaconId))
+                AppFactory__BeaconAlreadyExists.selector.revertWith();
+            $.beacons[beacon.beaconId] = beacon.beacon;
+            $.beaconIds.add(beacon.beaconId);
+            emit BeaconAdded(beacon.beaconId, beacon.beacon);
+        }
+    }
+
+    function _removeBeacons(bytes32[] calldata beaconIds) internal {
+        AppFactoryStorage.Layout storage $ = AppFactoryStorage.getLayout();
+        uint256 length = beaconIds.length;
+        for (uint256 i; i < length; ++i) {
+            bytes32 beaconId = beaconIds[i];
+            address beacon = $.beacons[beaconId];
+
+            if (beaconId == bytes32(0)) AppFactory__InvalidBeaconId.selector.revertWith();
+            if (beacon == address(0)) AppFactory__BeaconNotFound.selector.revertWith();
+
+            delete $.beacons[beaconId];
+            $.beaconIds.remove(beaconId);
+            emit BeaconRemoved(beaconId, beacon);
+        }
+    }
+
+    function _setEntryPoint(address entryPoint) internal {
+        AppFactoryStorage.Layout storage $ = AppFactoryStorage.getLayout();
+        address oldEntryPoint = $.entryPoint;
+        $.entryPoint = entryPoint;
+        emit EntryPointSet(oldEntryPoint, entryPoint);
+    }
+
+    function _getBeacon(bytes32 beaconId) internal view returns (address beacon) {
+        return AppFactoryStorage.getLayout().beacons[beaconId];
+    }
+
+    function _getBeacons() internal view returns (bytes32[] memory beaconIds) {
+        return AppFactoryStorage.getLayout().beaconIds.values();
+    }
+
+    function _getDefaultBeaconId() internal view returns (bytes32 beaconId) {
+        return AppFactoryStorage.getLayout().beaconIds.at(0);
+    }
+
+    /// @notice Create an upgradeable simple app contract
+    /// @param params The parameters of the app
+    function _createApp(
+        bytes32 beaconId,
+        AppParams calldata params
+    ) internal returns (address app) {
+        AppFactoryStorage.Layout storage $ = AppFactoryStorage.getLayout();
+
+        address beacon = $.beacons[beaconId];
+        if (beacon == address(0)) AppFactory__BeaconNotFound.selector.revertWith();
+
+        uint48 accessDuration = LibAppRegistry.validateDuration(params.accessDuration);
+
+        app = LibClone.deployERC1967BeaconProxy(beacon);
+        ITownsApp(app).initialize(
+            abi.encode(
+                msg.sender,
+                params.name,
+                params.permissions,
+                params.installPrice,
+                accessDuration,
+                params.client,
+                $.entryPoint,
+                address(this)
+            )
+        );
+    }
+
+    function _validateParams(AppParams calldata params) internal pure {
+        if (bytes(params.name).length == 0) AppFactory__InvalidAppName.selector.revertWith();
+        if (params.permissions.length == 0) AppFactory__InvalidArrayInput.selector.revertWith();
+        if (params.client == address(0)) AppFactory__InvalidAddressInput.selector.revertWith();
+    }
+}