@towns-protocol/contracts 0.0.377 → 0.0.379

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@towns-protocol/contracts",
-  "version": "0.0.377",
+  "version": "0.0.379",
   "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.377",
+    "@towns-protocol/prettier-config": "^0.0.379",
     "@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": "a289c507ab3ae080d0b07e9f881743223580fdf4"
+  "gitHead": "2f050be64e496b13fa8a67053bfdd0605180aa45"
 }

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

@@ -14,6 +14,7 @@ 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";
 
 // contracts
@@ -46,6 +47,7 @@ contract DeployAppRegistry is IDiamondInitHelper, DiamondHelper, Deployer {
         facetHelper.add("DiamondLoupeFacet");
         facetHelper.add("IntrospectionFacet");
         facetHelper.add("OwnableFacet");
+        facetHelper.add("MetadataFacet");
 
         // Deploy the first batch of facets
         facetHelper.deployBatch(deployer);
@@ -78,28 +80,28 @@ contract DeployAppRegistry is IDiamondInitHelper, DiamondHelper, Deployer {
             facet,
             DeployOwnable.makeInitData(deployer)
         );
+
+        facet = facetHelper.getDeployedAddress("MetadataFacet");
+        addFacet(
+            makeCut(facet, FacetCutAction.Add, DeployMetadata.selectors()),
+            facet,
+            DeployMetadata.makeInitData(bytes32("AppRegistry"), "")
+        );
     }
 
     function diamondInitParams(address deployer) public returns (Diamond.InitParams memory) {
         // Queue up feature facets for batch deployment
         facetHelper.add("MultiInit");
-        facetHelper.add("MetadataFacet");
         facetHelper.add("UpgradeableBeaconFacet");
         facetHelper.add("AppRegistryFacet");
         facetHelper.add("AppInstallerFacet");
+        facetHelper.add("AppFactoryFacet");
         facetHelper.add("SimpleApp");
 
         facetHelper.deployBatch(deployer);
 
-        address facet = facetHelper.getDeployedAddress("MetadataFacet");
-        addFacet(
-            makeCut(facet, FacetCutAction.Add, DeployMetadata.selectors()),
-            facet,
-            DeployMetadata.makeInitData(bytes32("AppRegistry"), "")
-        );
-
         address simpleApp = facetHelper.getDeployedAddress("SimpleApp");
-        facet = facetHelper.getDeployedAddress("UpgradeableBeaconFacet");
+        address facet = facetHelper.getDeployedAddress("UpgradeableBeaconFacet");
 
         addFacet(
             makeCut(facet, FacetCutAction.Add, DeployUpgradeableBeacon.selectors()),
@@ -121,6 +123,13 @@ contract DeployAppRegistry is IDiamondInitHelper, DiamondHelper, Deployer {
             DeployAppInstallerFacet.makeInitData()
         );
 
+        facet = facetHelper.getDeployedAddress("AppFactoryFacet");
+        addFacet(
+            makeCut(facet, FacetCutAction.Add, DeployAppFactoryFacet.selectors()),
+            facet,
+            DeployAppFactoryFacet.makeInitData()
+        );
+
         address multiInit = facetHelper.getDeployedAddress("MultiInit");
 
         return
@@ -153,6 +162,9 @@ contract DeployAppRegistry is IDiamondInitHelper, DiamondHelper, Deployer {
             if (facetName.eq("AppInstallerFacet")) {
                 addCut(makeCut(facet, FacetCutAction.Add, DeployAppInstallerFacet.selectors()));
             }
+            if (facetName.eq("AppFactoryFacet")) {
+                addCut(makeCut(facet, FacetCutAction.Add, DeployAppFactoryFacet.selectors()));
+            }
         }
 
         return baseFacets();

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

@@ -0,0 +1,45 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.23;
+
+//interfaces
+import {IDiamond} from "@towns-protocol/diamond/src/IDiamond.sol";
+
+//libraries
+
+//contracts
+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";
+
+library DeployAppFactoryFacet {
+    using DynamicArrayLib for DynamicArrayLib.DynamicArray;
+
+    function selectors() internal pure returns (bytes4[] memory res) {
+        DynamicArrayLib.DynamicArray memory arr = DynamicArrayLib.p().reserve(1);
+        arr.p(AppFactoryFacet.createApp.selector);
+        bytes32[] memory selectors_ = arr.asBytes32Array();
+        assembly ("memory-safe") {
+            res := selectors_
+        }
+    }
+
+    function makeCut(
+        address facetAddress,
+        IDiamond.FacetCutAction action
+    ) internal pure returns (IDiamond.FacetCut memory) {
+        return
+            IDiamond.FacetCut({
+                action: action,
+                facetAddress: facetAddress,
+                functionSelectors: selectors()
+            });
+    }
+
+    function makeInitData() internal pure returns (bytes memory) {
+        return abi.encodeCall(AppFactoryFacet.__AppFactory_init, ());
+    }
+
+    function deploy() internal returns (address) {
+        return LibDeploy.deployCode("AppFactoryFacet.sol", "");
+    }
+}

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

@@ -16,14 +16,13 @@ library DeployAppRegistryFacet {
     using DynamicArrayLib for DynamicArrayLib.DynamicArray;
 
     function selectors() internal pure returns (bytes4[] memory res) {
-        DynamicArrayLib.DynamicArray memory arr = DynamicArrayLib.p().reserve(14);
+        DynamicArrayLib.DynamicArray memory arr = DynamicArrayLib.p().reserve(13);
         arr.p(AppRegistryFacet.getAppSchema.selector);
         arr.p(AppRegistryFacet.getAppSchemaId.selector);
         arr.p(AppRegistryFacet.getAppById.selector);
         arr.p(AppRegistryFacet.getLatestAppId.selector);
         arr.p(AppRegistryFacet.registerApp.selector);
         arr.p(AppRegistryFacet.removeApp.selector);
-        arr.p(AppRegistryFacet.createApp.selector);
         arr.p(AppRegistryFacet.upgradeApp.selector);
         arr.p(AppRegistryFacet.getAppPrice.selector);
         arr.p(AppRegistryFacet.getAppDuration.selector);

package/scripts/interactions/InteractRegisterApp.s.sol

@@ -2,14 +2,14 @@
 pragma solidity ^0.8.23;
 
 //interfaces
-import {IAppRegistry} from "src/apps/facets/registry/IAppRegistry.sol";
+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 {IAppRegistryBase} from "src/apps/facets/registry/IAppRegistry.sol";
+import {IAppFactoryBase} from "src/apps/facets/factory/IAppFactory.sol";
 
-contract InteractRegisterApp is Interaction, IAppRegistryBase {
+contract InteractRegisterApp is Interaction, IAppFactoryBase {
     function __interact(address deployer) internal override {
         address appRegistry = getDeployment("appRegistry");
 
@@ -32,7 +32,7 @@ contract InteractRegisterApp is Interaction, IAppRegistryBase {
         });
 
         vm.broadcast(deployer);
-        (address app, bytes32 appId) = IAppRegistry(appRegistry).createApp(appData);
+        (address app, bytes32 appId) = IAppFactory(appRegistry).createApp(appData);
 
         saveApp("SimpleApp", appId, address(app));
     }

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

@@ -0,0 +1,52 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.29;
+
+// interfaces
+import {IAppFactory} from "./IAppFactory.sol";
+import {ISimpleApp} from "../../helpers/ISimpleApp.sol";
+import {ITownsApp} from "../../ITownsApp.sol";
+
+// libraries
+import {LibClone} from "solady/utils/LibClone.sol";
+import {CustomRevert} from "../../../utils/libraries/CustomRevert.sol";
+
+// contracts
+import {Facet} from "@towns-protocol/diamond/src/facets/Facet.sol";
+import {AppRegistryBase} from "../registry/AppRegistryBase.sol";
+import {ReentrancyGuardTransient} from "solady/utils/ReentrancyGuardTransient.sol";
+
+/// @title AppInstallerFacet
+/// @author Towns Protocol
+/// @notice Facet for installing apps to spaces
+contract AppFactoryFacet is IAppFactory, AppRegistryBase, ReentrancyGuardTransient, Facet {
+    using CustomRevert for bytes4;
+
+    function __AppFactory_init() external onlyInitializing {
+        _addInterface(type(IAppFactory).interfaceId);
+    }
+
+    /// @notice Create an upgradeable simple app contract
+    /// @param params The parameters of the app
+    function createApp(
+        AppParams calldata params
+    ) external payable nonReentrant returns (address app, bytes32 appId) {
+        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();
+
+        uint48 duration = _validateDuration(params.accessDuration);
+
+        app = LibClone.deployERC1967BeaconProxy(address(this));
+        ISimpleApp(app).initialize(
+            msg.sender,
+            params.name,
+            params.permissions,
+            params.installPrice,
+            duration,
+            params.client
+        );
+
+        appId = _registerApp(ITownsApp(app), params.client);
+        emit AppCreated(app, appId);
+    }
+}

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

@@ -0,0 +1,42 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.29;
+
+// interfaces
+
+// libraries
+
+// contracts
+
+interface IAppFactoryBase {
+    struct AppParams {
+        string name;
+        bytes32[] permissions;
+        address client;
+        uint256 installPrice;
+        uint48 accessDuration;
+    }
+
+    /*´:°•.°+.*•´.*:˚.°*.˚•´.°:°•.°•.*•´.*:˚.°*.˚•´.°:°•.°+.*•´.*:*/
+    /*                           ERRORS                           */
+    /*.•°:°.´+˚.*°.˚:*.´•*.+°.•°:´*.´•*.•°.•°:°.´:•˚°.*°.˚:*.´+°.•*/
+    error AppFactory__InvalidAppName();
+    error AppFactory__InvalidArrayInput();
+    error AppFactory__InvalidAddressInput();
+
+    /*.•°:°.´+˚.*°.˚:*.´•*.+°.•°:´*.´•*.•°.•°:°.´:•˚°.*°.˚:*.´+°.•*/
+
+    /*´:°•.°+.*•´.*:˚.°*.˚•´.°:°•.°•.*•´.*:˚.°*.˚•´.°:°•.°+.*•´.*:*/
+    /*                           EVENTS                           */
+    /*.•°:°.´+˚.*°.˚:*.´•*.+°.•°:´*.´•*.•°.•°:°.´:•˚°.*°.˚:*.´+°.•*/
+    event AppCreated(address indexed app, bytes32 indexed uid);
+}
+
+interface IAppFactory is IAppFactoryBase {
+    /// @notice Create a new app
+    /// @param params The parameters of the app
+    /// @return app The app address
+    /// @return appId The attestation UID of the registered app
+    function createApp(
+        AppParams calldata params
+    ) external payable returns (address app, bytes32 appId);
+}

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

@@ -123,33 +123,6 @@ abstract contract AppRegistryBase is IAppRegistryBase, SchemaBase, AttestationBa
         return AppRegistryStorage.getLayout().client[client].app;
     }
 
-    /// @notice Creates a new app with the specified parameters
-    /// @param params The parameters for creating the app
-    /// @return app The address of the created app
-    /// @return version The version ID of the registered app
-    /// @dev Validates inputs, deploys app contract, and registers it
-    function _createApp(AppParams calldata params) internal returns (address app, bytes32 version) {
-        // Validate basic parameters
-        if (bytes(params.name).length == 0) InvalidAppName.selector.revertWith();
-        if (params.permissions.length == 0) InvalidArrayInput.selector.revertWith();
-        if (params.client == address(0)) InvalidAddressInput.selector.revertWith();
-
-        uint48 duration = _validateDuration(params.accessDuration);
-
-        app = LibClone.deployERC1967BeaconProxy(address(this));
-        ISimpleApp(app).initialize(
-            msg.sender,
-            params.name,
-            params.permissions,
-            params.installPrice,
-            duration,
-            params.client
-        );
-
-        version = _registerApp(ITownsApp(app), params.client);
-        emit AppCreated(app, version);
-    }
-
     function _upgradeApp(
         ITownsApp app,
         address client,

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

@@ -4,7 +4,6 @@ pragma solidity ^0.8.23;
 // interfaces
 import {IAppRegistry} from "./IAppRegistry.sol";
 import {ISchemaResolver} from "@ethereum-attestation-service/eas-contracts/resolver/ISchemaResolver.sol";
-import {IAppAccount} from "../../../spaces/facets/account/IAppAccount.sol";
 import {ITownsApp} from "../../ITownsApp.sol";
 
 // types
@@ -55,14 +54,6 @@ contract AppRegistryFacet is IAppRegistry, AppRegistryBase, OwnableBase, Reentra
     /*                           App Functions                    */
     /*.•°:°.´+˚.*°.˚:*.´•*.+°.•°:´*.´•*.•°.•°:°.´:•˚°.*°.˚:*.´+°.•*/
 
-    /// @notice Create an upgradeable simple app contract
-    /// @param params The parameters of the app
-    function createApp(
-        AppParams calldata params
-    ) external payable nonReentrant returns (address app, bytes32 appId) {
-        return _createApp(params);
-    }
-
     /// @notice Register a new app with permissions
     /// @param app The app address to register
     /// @param client The client address that will make calls from this app

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

@@ -40,10 +40,10 @@ library AppRegistryStorage {
         0xe1abd3beb055e0136b3111c2c34ff6e869f8c0d7540225f8056528d6eb12b500;
 
     /// @notice Returns the storage layout for the module registry
-    /// @return l The storage layout struct
-    function getLayout() internal pure returns (Layout storage l) {
+    /// @return $ The storage layout struct
+    function getLayout() internal pure returns (Layout storage $) {
         assembly {
-            l.slot := STORAGE_SLOT
+            $.slot := STORAGE_SLOT
         }
     }
 }

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

@@ -11,14 +11,6 @@ import {Attestation} from "@ethereum-attestation-service/eas-contracts/Common.so
 import {ExecutionManifest} from "@erc6900/reference-implementation/interfaces/IExecutionModule.sol";
 
 interface IAppRegistryBase {
-    struct AppParams {
-        string name;
-        bytes32[] permissions;
-        address client;
-        uint256 installPrice;
-        uint48 accessDuration;
-    }
-
     struct App {
         bytes32 appId;
         address module;
@@ -58,7 +50,6 @@ interface IAppRegistryBase {
     event AppUpdated(address indexed app, bytes32 uid);
     event AppBanned(address indexed app, bytes32 uid);
     event AppSchemaSet(bytes32 uid);
-    event AppCreated(address indexed app, bytes32 uid);
     event AppInstalled(address indexed app, address indexed account, bytes32 indexed appId);
     event AppUninstalled(address indexed app, address indexed account, bytes32 indexed appId);
     event AppRenewed(address indexed app, address indexed account, bytes32 indexed appId);
@@ -111,14 +102,6 @@ interface IAppRegistry is IAppRegistryBase {
     /// @return isBanned True if the app is banned, false otherwise
     function isAppBanned(address app) external view returns (bool);
 
-    /// @notice Create a new app
-    /// @param params The parameters of the app
-    /// @return app The app address
-    /// @return appId The attestation UID of the registered app
-    function createApp(
-        AppParams calldata params
-    ) external payable returns (address app, bytes32 appId);
-
     /// @notice Register a new app with permissions
     /// @param app The app address to register
     /// @param client The client contract address that will use this app