@towns-protocol/contracts 0.0.431 → 0.0.433

package/README.md

@@ -58,11 +58,10 @@ The system also supports cross-chain delegation between Ethereum L1 and Base L2,
 
 ## Requirements
 
-Install [yarn](https://yarnpkg.com/getting-started/install) via corepack:
+Install [Bun](https://bun.sh/):
 
 ```shell
-npm install -g corepack
-corepack enable
+curl -fsSL https://bun.sh/install | bash
 ```
 
 Install [Foundry](https://github.com/foundry-rs/foundry):
@@ -77,7 +76,7 @@ foundryup
 Clone the repo, then:
 
 ```shell
-yarn
+bun install
 ```
 
 **To compile the smart contracts:**

package/docs/permitAndStake_integration_guide.md

@@ -39,7 +39,7 @@ function permitAndStake(
 #### Dependencies
 
 ```bash
-yarn add @uniswap/permit2-sdk viem
+bun add @uniswap/permit2-sdk viem
 ```
 
 #### Complete Integration Example

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@towns-protocol/contracts",
-  "version": "0.0.431",
+  "version": "0.0.433",
   "scripts": {
     "clean": "forge clean",
     "compile": "forge build",
@@ -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.431",
+    "@towns-protocol/prettier-config": "^0.0.433",
     "@wagmi/cli": "^2.2.0",
     "forge-std": "github:foundry-rs/forge-std#v1.10.0",
     "prettier": "^3.5.3",
@@ -50,5 +50,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "02cd0a82c6fe5e92ce21456e2aa910978b46a1bf"
+  "gitHead": "0fe7289140a4eb11ccc26cc9deb3c1818d0d5ea3"
 }

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

@@ -33,7 +33,9 @@ abstract contract AppRegistryBase is IAppRegistryBase, SchemaBase, AttestationBa
     using CustomRevert for bytes4;
 
     modifier onlyAllowed(IAppAccount account) {
-        if (IERC173(address(account)).owner() != msg.sender) NotAllowed.selector.revertWith();
+        if (address(account) != msg.sender && IERC173(address(account)).owner() != msg.sender) {
+            NotAllowed.selector.revertWith();
+        }
         _;
     }
 
@@ -247,7 +249,6 @@ abstract contract AppRegistryBase is IAppRegistryBase, SchemaBase, AttestationBa
 
         ITownsApp appContract = ITownsApp(app);
         uint256 installPrice = appContract.installPrice();
-
         _chargeForInstall(msg.sender, app, installPrice);
 
         IAppAccount(account).onInstallApp(appId, data);

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

@@ -3,6 +3,7 @@ pragma solidity ^0.8.23;
 
 // interfaces
 import {IAppAccount} from "./IAppAccount.sol";
+import {IAppExecution} from "./IAppExecution.sol";
 
 // libraries
 import {AppAccountBase} from "./AppAccountBase.sol";
@@ -17,12 +18,12 @@ import {ReentrancyGuard} from "solady/utils/ReentrancyGuard.sol";
  * @notice A lightweight modular erc6900 semi-compatible account
  * @dev This account is used to execute transactions on behalf of a Space
  */
-contract AppAccount is IAppAccount, AppAccountBase, ReentrancyGuard, Facet {
+contract AppAccount is IAppAccount, IAppExecution, AppAccountBase, ReentrancyGuard, Facet {
     /*´:°•.°+.*•´.*:˚.°*.˚•´.°:°•.°•.*•´.*:˚.°*.˚•´.°:°•.°+.*•´.*:*/
     /*                      Execution                             */
     /*.•°:°.´+˚.*°.˚:*.´•*.+°.•°:´*.´•*.•°.•°:°.´:•˚°.*°.˚:*.´+°.•*/
 
-    /// @inheritdoc IAppAccount
+    /// @inheritdoc IAppExecution
     function execute(
         address target,
         uint256 value,
@@ -98,8 +99,8 @@ contract AppAccount is IAppAccount, AppAccountBase, ReentrancyGuard, Facet {
         return _isAppEntitled(app, publicKey, permission);
     }
 
-    /// @inheritdoc IAppAccount
-    function isAppExecuting(address app) external view returns (bool) {
+    /// @inheritdoc IAppExecution
+    function isAppExecuting(address app) external view override returns (bool) {
         return _isAppExecuting(app);
     }
 }

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

@@ -78,20 +78,4 @@ interface IAppAccount is IAppAccountBase {
         address publicKey,
         bytes32 permission
     ) external view returns (bool);
-
-    /// @notice Checks if an app is executing
-    /// @param app The address of the app to check
-    /// @return True if the app is executing, false otherwise
-    function isAppExecuting(address app) external view returns (bool);
-
-    /// @notice Executes a function on the app
-    /// @param target The address of the app to execute the function on
-    /// @param value The value to send with the function
-    /// @param data The data to send with the function
-    /// @return The result of the function
-    function execute(
-        address target,
-        uint256 value,
-        bytes calldata data
-    ) external payable returns (bytes memory);
 }

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

@@ -0,0 +1,26 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.29;
+
+// interfaces
+
+// libraries
+
+// contracts
+
+interface IAppExecution {
+    /// @notice Checks if an app is executing
+    /// @param app The address of the app to check
+    /// @return True if the app is executing, false otherwise
+    function isAppExecuting(address app) external view returns (bool);
+
+    /// @notice Executes a function on the app
+    /// @param target The address of the app to execute the function on
+    /// @param value The value to send with the function
+    /// @param data The data to send with the function
+    /// @return The result of the function
+    function execute(
+        address target,
+        uint256 value,
+        bytes calldata data
+    ) external payable returns (bytes memory);
+}