@towns-protocol/contracts 0.0.376 → 0.0.377

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@towns-protocol/contracts",
-  "version": "0.0.376",
+  "version": "0.0.377",
   "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.376",
+    "@towns-protocol/prettier-config": "^0.0.377",
     "@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": "500000c0d1b16a866df765a75c7972b5d1691693"
+  "gitHead": "a289c507ab3ae080d0b07e9f881743223580fdf4"
 }

package/src/spaces/facets/Entitled.sol

@@ -14,13 +14,13 @@ import {CustomRevert} from "../../utils/libraries/CustomRevert.sol";
 import {EntitlementsManagerStorage} from "./entitlements/EntitlementsManagerStorage.sol";
 import {MembershipStorage} from "./membership/MembershipStorage.sol";
 import {BanningStorage} from "./banning/BanningStorage.sol";
-import {AppAccountStorage} from "./account/AppAccountStorage.sol";
+import {AppAccountBase} from "./account/AppAccountBase.sol";
 import {DependencyLib} from "./DependencyLib.sol";
 
 // contracts
 import {TokenOwnableBase} from "@towns-protocol/diamond/src/facets/ownable/token/TokenOwnableBase.sol";
 
-abstract contract Entitled is IEntitlementBase, TokenOwnableBase {
+abstract contract Entitled is IEntitlementBase, TokenOwnableBase, AppAccountBase {
     using EnumerableSet for EnumerableSet.AddressSet;
     using EnumerableSet for EnumerableSet.UintSet;
     using CustomRevert for bytes4;
@@ -135,7 +135,7 @@ abstract contract Entitled is IEntitlementBase, TokenOwnableBase {
         address app = DependencyLib.getAppRegistry().getAppByClient(client);
         if (app == address(0)) return false;
 
-        return AppAccountStorage.isAppEntitled(app, client, permission);
+        return _isAppEntitled(app, client, permission);
     }
 
     function _hasAnyBannedWallet(address[] memory wallets) internal view returns (bool) {

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

@@ -241,7 +241,27 @@ abstract contract AppAccountBase is
         address client,
         bytes32 permission
     ) internal view returns (bool) {
-        return AppAccountStorage.isAppEntitled(module, client, permission);
+        bytes32 appId = AppAccountStorage.getLayout().appIdByApp[module];
+        if (appId == EMPTY_UID) return false;
+
+        IAppRegistry registry = DependencyLib.getAppRegistry();
+        if (registry.isAppBanned(module)) return false;
+
+        IAppRegistry.App memory app = registry.getAppById(appId);
+        if (app.appId == EMPTY_UID) return false;
+
+        (bool hasClientAccess, , bool isGroupActive) = ExecutorStorage.hasGroupAccess(
+            app.appId,
+            client
+        );
+        if (!hasClientAccess || !isGroupActive) return false;
+
+        uint256 permissionsLength = app.permissions.length;
+        for (uint256 i; i < permissionsLength; ++i) {
+            if (app.permissions[i] == permission) return true;
+        }
+
+        return false;
     }
 
     /// @notice Gets the ID of the installed app.

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

@@ -37,27 +37,4 @@ library AppAccountStorage {
         if (appId == EMPTY_UID) return app;
         return DependencyLib.getAppRegistry().getAppById(appId);
     }
-
-    function isAppEntitled(
-        address module,
-        address client,
-        bytes32 permission
-    ) internal view returns (bool) {
-        IAppRegistry.App memory app = getApp(module);
-
-        if (app.appId == EMPTY_UID) return false;
-
-        (bool hasClientAccess, , bool isGroupActive) = ExecutorStorage.hasGroupAccess(
-            app.appId,
-            client
-        );
-        if (!hasClientAccess || !isGroupActive) return false;
-
-        uint256 permissionsLength = app.permissions.length;
-        for (uint256 i; i < permissionsLength; ++i) {
-            if (app.permissions[i] == permission) return true;
-        }
-
-        return false;
-    }
 }

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

@@ -60,7 +60,7 @@ interface ITippingBase {
         TipRecipientType indexed recipientType,
         address currency,
         uint256 amount,
-        uint256 tokenId // 0 if not a member tip
+        bytes data
     );
 
     // Maintain legacy event for backwards compatibility

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

@@ -84,7 +84,7 @@ abstract contract TippingBase is ITippingBase, PointsBase {
             TipRecipientType.Member,
             tipRequest.currency,
             tipAmount,
-            tipRequest.tokenId
+            abi.encode(tipRequest.tokenId)
         );
     }
 
@@ -121,7 +121,7 @@ abstract contract TippingBase is ITippingBase, PointsBase {
             TipRecipientType.Member,
             params.currency,
             tipAmount,
-            params.tokenId
+            params.metadata.data
         );
 
         emit Tip(
@@ -165,7 +165,7 @@ abstract contract TippingBase is ITippingBase, PointsBase {
             TipRecipientType.Bot,
             params.currency,
             tipAmount,
-            0
+            params.metadata.data
         );
     }