@towns-protocol/contracts 0.0.328 → 0.0.330

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@towns-protocol/contracts",
-  "version": "0.0.328",
+  "version": "0.0.330",
   "packageManager": "yarn@3.8.0",
   "scripts": {
     "build": "forge build",
@@ -16,7 +16,7 @@
     "typings": "wagmi generate"
   },
   "dependencies": {
-    "@erc6900/reference-implementation": "^0.8.1",
+    "@erc6900/reference-implementation": "https://github.com/erc6900/reference-implementation/archive/refs/tags/v0.8.0.tar.gz",
     "@ethereum-attestation-service/eas-contracts": "^1.8.0",
     "@layerzerolabs/oft-evm": "^3.1.4",
     "@openzeppelin/contracts": "^5.4.0",
@@ -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.328",
+    "@towns-protocol/prettier-config": "^0.0.330",
     "@typechain/ethers-v5": "^10.1.1",
     "@wagmi/cli": "^2.2.0",
     "account-abstraction": "https://github.com/eth-infinitism/account-abstraction/archive/refs/tags/v0.7.0.tar.gz",
@@ -56,5 +56,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "22fa8f23dd75dd7507ad3343f59f4c5ec8f5f79d"
+  "gitHead": "f472a3c4a6f67a96e378db552e2880327eef42ba"
 }

package/src/apps/BaseApp.sol

@@ -2,15 +2,15 @@
 pragma solidity ^0.8.23;
 
 // interfaces
-import {IERC6900ExecutionModule} from "@erc6900/reference-implementation/interfaces/IERC6900ExecutionModule.sol";
-import {IERC6900Module} from "@erc6900/reference-implementation/interfaces/IERC6900Module.sol";
+import {IExecutionModule} from "@erc6900/reference-implementation/interfaces/IExecutionModule.sol";
+import {IModule} from "@erc6900/reference-implementation/interfaces/IModule.sol";
 import {ITownsApp} from "./ITownsApp.sol";
 
 /// @title BaseApp
 /// @notice Base contract for Towns apps implementing core ERC-6900 module functionality
 /// @dev Provides base implementation for module installation/uninstallation and interface support
 /// @dev Inheriting contracts should override _onInstall and _onUninstall as needed
-/// @dev Implements IERC6900Module, IERC6900ExecutionModule, and ITownsApp interfaces
+/// @dev Implements IModule, IExecutionModule, and ITownsApp interfaces
 
 abstract contract BaseApp is ITownsApp {
     receive() external payable {
@@ -20,17 +20,17 @@ abstract contract BaseApp is ITownsApp {
     // External functions
     function supportsInterface(bytes4 interfaceId) external pure returns (bool) {
         return
-            interfaceId == type(IERC6900ExecutionModule).interfaceId ||
-            interfaceId == type(IERC6900Module).interfaceId ||
+            interfaceId == type(IExecutionModule).interfaceId ||
+            interfaceId == type(IModule).interfaceId ||
             interfaceId == type(ITownsApp).interfaceId;
     }
 
-    /// @notice Required by IERC6900Module - called when module is installed
+    /// @notice Required by IModule - called when module is installed
     function onInstall(bytes calldata postInstallData) external {
         _onInstall(postInstallData);
     }
 
-    /// @notice Required by IERC6900Module - called when module is uninstalled
+    /// @notice Required by IModule - called when module is uninstalled
     function onUninstall(bytes calldata postUninstallData) external {
         _onUninstall(postUninstallData);
     }

package/src/apps/ITownsApp.sol

@@ -2,14 +2,14 @@
 pragma solidity ^0.8.23;
 
 // interfaces
-import {IERC6900ExecutionModule} from "@erc6900/reference-implementation/interfaces/IERC6900ExecutionModule.sol";
-import {IERC6900Module} from "@erc6900/reference-implementation/interfaces/IERC6900Module.sol";
+import {IExecutionModule} from "@erc6900/reference-implementation/interfaces/IExecutionModule.sol";
+import {IModule} from "@erc6900/reference-implementation/interfaces/IModule.sol";
 
 /// @title ITownsApp Interface
 /// @notice Base interface for Towns apps implementing core module functionality
-/// @dev Combines IERC6900Module (module lifecycle), and IERC6900ExecutionModule (execution)
+/// @dev Combines IModule (module lifecycle), and IExecutionModule (execution)
 /// @dev Apps must implement required permissions and support these interfaces
-interface ITownsApp is IERC6900Module, IERC6900ExecutionModule {
+interface ITownsApp is IModule, IExecutionModule {
     /// @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/registry/AppRegistryBase.sol

@@ -2,8 +2,8 @@
 pragma solidity ^0.8.23;
 
 // interfaces
-import {IERC6900ExecutionModule} from "@erc6900/reference-implementation/interfaces/IERC6900ExecutionModule.sol";
-import {IERC6900Module} from "@erc6900/reference-implementation/interfaces/IERC6900Module.sol";
+import {IExecutionModule} from "@erc6900/reference-implementation/interfaces/IExecutionModule.sol";
+import {IModule} from "@erc6900/reference-implementation/interfaces/IModule.sol";
 import {IERC165} from "@openzeppelin/contracts/interfaces/IERC165.sol";
 import {ITownsApp} from "../../ITownsApp.sol";
 import {IAppRegistryBase} from "./IAppRegistry.sol";
@@ -22,7 +22,7 @@ import {FixedPointMathLib} from "solady/utils/FixedPointMathLib.sol";
 import {CurrencyTransfer} from "../../../utils/libraries/CurrencyTransfer.sol";
 
 // types
-import {ExecutionManifest} from "@erc6900/reference-implementation/interfaces/IERC6900ExecutionModule.sol";
+import {ExecutionManifest} from "@erc6900/reference-implementation/interfaces/IExecutionModule.sol";
 import {Attestation, EMPTY_UID} from "@ethereum-attestation-service/eas-contracts/Common.sol";
 import {AttestationRequest, RevocationRequestData} from "@ethereum-attestation-service/eas-contracts/IEAS.sol";
 
@@ -389,8 +389,8 @@ abstract contract AppRegistryBase is IAppRegistryBase, SchemaBase, AttestationBa
         if (client == address(0)) InvalidAddressInput.selector.revertWith();
 
         if (
-            !IERC165(app).supportsInterface(type(IERC6900Module).interfaceId) ||
-            !IERC165(app).supportsInterface(type(IERC6900ExecutionModule).interfaceId) ||
+            !IERC165(app).supportsInterface(type(IModule).interfaceId) ||
+            !IERC165(app).supportsInterface(type(IExecutionModule).interfaceId) ||
             !IERC165(app).supportsInterface(type(ITownsApp).interfaceId)
         ) {
             AppDoesNotImplementInterface.selector.revertWith();

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

@@ -8,7 +8,7 @@ import {ITownsApp} from "../../ITownsApp.sol";
 
 // libraries
 import {Attestation} from "@ethereum-attestation-service/eas-contracts/Common.sol";
-import {ExecutionManifest} from "@erc6900/reference-implementation/interfaces/IERC6900ExecutionModule.sol";
+import {ExecutionManifest} from "@erc6900/reference-implementation/interfaces/IExecutionModule.sol";
 
 interface IAppRegistryBase {
     struct AppParams {

package/src/apps/helpers/SimpleApp.sol

@@ -4,13 +4,12 @@ pragma solidity ^0.8.23;
 // interfaces
 import {ISimpleApp} from "../../apps/helpers/ISimpleApp.sol";
 import {ITownsApp} from "../../apps/ITownsApp.sol";
-import {IERC6900Module} from "@erc6900/reference-implementation/interfaces/IERC6900Module.sol";
-import {IERC6900ExecutionModule} from "@erc6900/reference-implementation/interfaces/IERC6900ExecutionModule.sol";
+import {ExecutionManifest, IExecutionModule} from "@erc6900/reference-implementation/interfaces/IExecutionModule.sol";
+import {IModule} from "@erc6900/reference-implementation/interfaces/IModule.sol";
 
 // contracts
 import {BaseApp} from "../../apps/BaseApp.sol";
 import {Ownable} from "solady/auth/Ownable.sol";
-import {ExecutionManifest} from "@erc6900/reference-implementation/interfaces/IERC6900ExecutionModule.sol";
 import {Initializable} from "solady/utils/Initializable.sol";
 
 // libraries
@@ -66,13 +65,13 @@ contract SimpleApp is ISimpleApp, Ownable, BaseApp, Initializable {
         return $.permissions;
     }
 
-    /// @inheritdoc IERC6900Module
+    /// @inheritdoc IModule
     function moduleId() public view returns (string memory) {
         SimpleAppStorage.Layout storage $ = SimpleAppStorage.getLayout();
         return $.name;
     }
 
-    /// @inheritdoc IERC6900ExecutionModule
+    /// @inheritdoc IExecutionModule
     function executionManifest() external pure returns (ExecutionManifest memory) {
         // solhint-disable no-empty-blocks
     }

package/src/spaces/facets/account/AppAccountBase.sol

@@ -5,12 +5,11 @@ pragma solidity ^0.8.23;
 import {IAppAccountBase} from "./IAppAccount.sol";
 import {IAppRegistry} from "src/apps/facets/registry/AppRegistryFacet.sol";
 import {ITownsApp} from "src/apps/ITownsApp.sol";
-import {IERC6900Module} from "@erc6900/reference-implementation/interfaces/IERC6900Module.sol";
-import {IERC6900ExecutionModule} from "@erc6900/reference-implementation/interfaces/IERC6900ExecutionModule.sol";
-import {IERC6900Account} from "@erc6900/reference-implementation/interfaces/IERC6900Account.sol";
+import {IExecutionModule} from "@erc6900/reference-implementation/interfaces/IExecutionModule.sol";
 import {IERC165} from "@openzeppelin/contracts/utils/introspection/IERC165.sol";
 import {IDiamondCut} from "@towns-protocol/diamond/src/facets/cut/IDiamondCut.sol";
 import {IAppRegistryBase} from "src/apps/facets/registry/IAppRegistry.sol";
+import {IModule} from "@erc6900/reference-implementation/interfaces/IModule.sol";
 
 // libraries
 import {MembershipStorage} from "src/spaces/facets/membership/MembershipStorage.sol";
@@ -25,7 +24,7 @@ import {ExecutorBase} from "../executor/ExecutorBase.sol";
 import {TokenOwnableBase} from "@towns-protocol/diamond/src/facets/ownable/token/TokenOwnableBase.sol";
 
 // types
-import {ExecutionManifest, ManifestExecutionFunction} from "@erc6900/reference-implementation/interfaces/IERC6900ExecutionModule.sol";
+import {ExecutionManifest, ManifestExecutionFunction} from "@erc6900/reference-implementation/interfaces/IExecutionModule.sol";
 import {Attestation, EMPTY_UID} from "@ethereum-attestation-service/eas-contracts/Common.sol";
 
 abstract contract AppAccountBase is
@@ -86,11 +85,11 @@ abstract contract AppAccountBase is
         // Call module's onInstall if it has install data using LibCall
         // revert if it fails
         if (postInstallData.length > 0) {
-            bytes memory callData = abi.encodeCall(IERC6900Module.onInstall, (postInstallData));
+            bytes memory callData = abi.encodeCall(IModule.onInstall, (postInstallData));
             LibCall.callContract(app.module, 0, callData);
         }
 
-        emit IERC6900Account.ExecutionInstalled(app.module, app.manifest);
+        emit ExecutionInstalled(app.module, app.manifest);
     }
 
     function _uninstallApp(bytes32 appId, bytes calldata uninstallData) internal {
@@ -119,12 +118,12 @@ abstract contract AppAccountBase is
         bool onUninstallSuccess = true;
         if (uninstallData.length > 0) {
             // solhint-disable-next-line no-empty-blocks
-            try IERC6900Module(app.module).onUninstall(uninstallData) {} catch {
+            try IModule(app.module).onUninstall(uninstallData) {} catch {
                 onUninstallSuccess = false;
             }
         }
 
-        emit IERC6900Account.ExecutionUninstalled(app.module, onUninstallSuccess, app.manifest);
+        emit ExecutionUninstalled(app.module, onUninstallSuccess, app.manifest);
     }
 
     function _onRenewApp(bytes32 appId, bytes calldata /* data */) internal {
@@ -251,19 +250,11 @@ abstract contract AppAccountBase is
 
     function _isInvalidSelector(bytes4 selector) internal pure returns (bool) {
         return
-            selector == IERC6900Account.installExecution.selector ||
-            selector == IERC6900Account.uninstallExecution.selector ||
-            selector == IERC6900Account.installValidation.selector ||
-            selector == IERC6900Account.uninstallValidation.selector ||
-            selector == IERC6900Account.execute.selector ||
-            selector == IERC6900Account.executeBatch.selector ||
-            selector == IERC6900Account.executeWithRuntimeValidation.selector ||
-            selector == IERC6900Account.accountId.selector ||
             selector == IERC165.supportsInterface.selector ||
-            selector == IERC6900Module.moduleId.selector ||
-            selector == IERC6900Module.onInstall.selector ||
-            selector == IERC6900Module.onUninstall.selector ||
-            selector == IERC6900ExecutionModule.executionManifest.selector ||
+            selector == IModule.moduleId.selector ||
+            selector == IModule.onInstall.selector ||
+            selector == IModule.onUninstall.selector ||
+            selector == IExecutionModule.executionManifest.selector ||
             selector == IDiamondCut.diamondCut.selector ||
             selector == ITownsApp.requiredPermissions.selector;
     }

package/src/spaces/facets/account/IAppAccount.sol

@@ -2,6 +2,7 @@
 pragma solidity ^0.8.23;
 
 // interfaces
+import {ExecutionManifest} from "@erc6900/reference-implementation/interfaces/IExecutionModule.sol";
 
 // libraries
 
@@ -14,6 +15,9 @@ interface IAppAccountBase {
     error AppAlreadyInstalled();
     error UnauthorizedApp(address app);
     error InvalidCaller();
+
+    event ExecutionInstalled(address indexed module, ExecutionManifest manifest);
+    event ExecutionUninstalled(address indexed module, bool success, ExecutionManifest manifest);
 }
 
 interface IAppAccount is IAppAccountBase {