@towns-protocol/contracts 0.0.439 → 0.0.441

package/src/account/facets/hub/IAccountHub.sol

@@ -0,0 +1,25 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.29;
+
+interface IAccountHub {
+    /// @notice Sets the space factory
+    /// @param spaceFactory The address of the space factory
+    function setSpaceFactory(address spaceFactory) external;
+
+    /// @notice Sets the app registry
+    /// @param appRegistry The address of the app registry
+    function setAppRegistry(address appRegistry) external;
+
+    /// @notice Gets the space factory
+    /// @return The address of the space factory
+    function getSpaceFactory() external view returns (address);
+
+    /// @notice Gets the app registry
+    /// @return The address of the app registry
+    function getAppRegistry() external view returns (address);
+
+    /// @notice Checks if an account is installed
+    /// @param account The address of the account
+    /// @return True if the account is installed, false otherwise
+    function isInstalled(address account) external view returns (bool);
+}

package/src/account/facets/tipping/AccountTippingFacet.sol

@@ -0,0 +1,72 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.29;
+
+// interfaces
+import {ITipping} from "src/spaces/facets/tipping/ITipping.sol";
+
+// libraries
+import "./AccountTippingMod.sol" as AccountTipping;
+import {EnumerableSetLib} from "solady/utils/EnumerableSetLib.sol";
+import {CustomRevert} from "../../../utils/libraries/CustomRevert.sol";
+
+// contracts
+import {Facet} from "@towns-protocol/diamond/src/facets/Facet.sol";
+import {ReentrancyGuardTransient} from "solady/utils/ReentrancyGuardTransient.sol";
+
+contract AccountTippingFacet is ITipping, ReentrancyGuardTransient, Facet {
+    using EnumerableSetLib for EnumerableSetLib.AddressSet;
+    using CustomRevert for bytes4;
+
+    function __AccountTippingFacet_init() external onlyInitializing {
+        _addInterface(type(ITipping).interfaceId);
+    }
+
+    /// @inheritdoc ITipping
+    function sendTip(
+        TipRecipientType recipientType,
+        bytes calldata data
+    ) external payable nonReentrant {
+        AccountTipping.tipAny(address(this), uint8(recipientType), data);
+    }
+
+    /// @inheritdoc ITipping
+    function tip(TipRequest calldata) external payable {
+        CustomRevert.revertWith(Deprecated.selector);
+    }
+
+    /// @inheritdoc ITipping
+    function tipsByWalletAndCurrency(
+        address wallet,
+        address currency
+    ) external view returns (uint256) {
+        return AccountTipping.getStorage().accountStatsByCurrency[wallet][currency].amount;
+    }
+
+    /// @inheritdoc ITipping
+    function tipCountByWalletAndCurrency(
+        address wallet,
+        address currency
+    ) external view returns (uint256) {
+        return AccountTipping.getStorage().accountStatsByCurrency[wallet][currency].total;
+    }
+
+    /// @inheritdoc ITipping
+    function tipsByCurrencyAndTokenId(uint256, address) external pure returns (uint256) {
+        CustomRevert.revertWith(Deprecated.selector);
+    }
+
+    /// @inheritdoc ITipping
+    function tippingCurrencies() external view returns (address[] memory) {
+        return AccountTipping.getStorage().currencies.values();
+    }
+
+    /// @inheritdoc ITipping
+    function totalTipsByCurrency(address currency) external view returns (uint256) {
+        return AccountTipping.getStorage().currencyStats[currency].total;
+    }
+
+    /// @inheritdoc ITipping
+    function tipAmountByCurrency(address currency) external view returns (uint256) {
+        return AccountTipping.getStorage().currencyStats[currency].amount;
+    }
+}

package/src/account/facets/tipping/AccountTippingMod.sol

@@ -0,0 +1,144 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.29;
+
+// interfaces
+import {ITippingBase} from "../../../spaces/facets/tipping/ITipping.sol";
+
+// libraries
+import {EnumerableSetLib} from "solady/utils/EnumerableSetLib.sol";
+import {CustomRevert} from "../../../utils/libraries/CustomRevert.sol";
+import {CurrencyTransfer} from "../../../utils/libraries/CurrencyTransfer.sol";
+
+/*´:°•.°+.*•´.*:˚.°*.˚•´.°:°•.°•.*•´.*:˚.°*.˚•´.°:°•.°+.*•´.*:*/
+/*                         TYPES                            */
+/*.•°:°.´+˚.*°.˚:*.´•*.+°.•°:´*.´•*.•°.•°:°.´:•˚°.*°.˚:*.´+°.•*/
+using CustomRevert for bytes4;
+using EnumerableSetLib for EnumerableSetLib.AddressSet;
+
+/*´:°•.°+.*•´.*:˚.°*.˚•´.°:°•.°•.*•´.*:˚.°*.˚•´.°:°•.°+.*•´.*:*/
+/*                          STORAGE                           */
+/*.•°:°.´+˚.*°.˚:*.´•*.+°.•°:´*.´•*.•°.•°:°.´:•˚°.*°.˚:*.´+°.•*/
+
+// keccak256(abi.encode(uint256(keccak256("towns.account.tipping.mod.storage")) - 1)) & ~bytes32(uint256(0xff))
+bytes32 constant STORAGE_SLOT = 0x2a95e0ca73c50924d5ddd84672da871cae538509d7dabaedae2f730a19f18300;
+
+/// @notice Stats for a currency
+/// @param total The total number of tips
+/// @param amount The total amount of tips
+struct Stats {
+    uint256 total;
+    uint256 amount;
+}
+
+/// @notice Storage layout for the AccountTippingMod
+/// @custom:storage-location erc7201:towns.account.tipping.mod.storage
+struct Layout {
+    // Global mappings
+    EnumerableSetLib.AddressSet currencies;
+    mapping(address currency => Stats stats) currencyStats;
+    mapping(address account => Stats stats) accountStats;
+    mapping(address account => mapping(address currency => Stats stats)) accountStatsByCurrency;
+}
+
+/// @notice Returns the storage layout for the AccountTippingMod
+function getStorage() pure returns (Layout storage $) {
+    assembly {
+        $.slot := STORAGE_SLOT
+    }
+}
+
+/*´:°•.°+.*•´.*:˚.°*.˚•´.°:°•.°•.*•´.*:˚.°*.˚•´.°:°•.°+.*•´.*:*/
+/*                         FUNCTIONS                          */
+/*.•°:°.´+˚.*°.˚:*.´•*.+°.•°:´*.´•*.•°.•°:°.´:•˚°.*°.˚:*.´+°.•*/
+
+/// @notice Sends a tip
+/// @param recipientType The type of recipient
+/// @param data The data for the tip
+/// @return tipAmount The amount of the tip
+/// @return protocolFee The protocol fee
+function tipAny(
+    address self,
+    uint8 recipientType,
+    bytes calldata data
+) returns (uint256 tipAmount, uint256 protocolFee) {
+    if (recipientType != uint8(ITippingBase.TipRecipientType.Any))
+        ITippingBase.InvalidRecipientType.selector.revertWith();
+
+    ITippingBase.AnyTipParams memory request = abi.decode(data, (ITippingBase.AnyTipParams));
+
+    protocolFee;
+    tipAmount = request.amount;
+
+    validateTip(request.sender, request.receiver, request.currency, request.amount);
+    depositTip(self, request.currency, request.amount);
+    processTip(getStorage(), self, request.receiver, request.currency, request.amount);
+
+    emit ITippingBase.TipSent(
+        msg.sender,
+        request.receiver,
+        ITippingBase.TipRecipientType.Any,
+        request.currency,
+        request.amount,
+        request.data
+    );
+}
+
+/// @notice Processes a tip
+/// @param $ The storage layout
+/// @param self The address of the facet
+/// @param receiver The address of the recipient
+/// @param currency The currency of the tip
+/// @param amount The amount of the tip
+function processTip(
+    Layout storage $,
+    address self,
+    address receiver,
+    address currency,
+    uint256 amount
+) {
+    // Add currency to set
+    $.currencies.add(currency);
+
+    // Update global currency stats
+    Stats storage stats = $.currencyStats[currency];
+    stats.amount += amount;
+    stats.total += 1;
+
+    // Update account-specific stats
+    Stats storage accountStats = $.accountStats[receiver];
+    accountStats.amount += amount;
+    accountStats.total += 1;
+
+    Stats storage accountStatsByCurrency = $.accountStatsByCurrency[receiver][currency];
+    accountStatsByCurrency.amount += amount;
+    accountStatsByCurrency.total += 1;
+
+    // Transfer currency
+    CurrencyTransfer.transferCurrency(currency, self, receiver, amount);
+}
+
+/// @notice Validates a tip
+/// @param sender The address of the sender
+/// @param receiver The address of the recipient
+/// @param currency The currency of the tip
+/// @param amount The amount of the tip
+function validateTip(address sender, address receiver, address currency, uint256 amount) view {
+    if (currency == address(0)) ITippingBase.CurrencyIsZero.selector.revertWith();
+    if (receiver == address(0)) ITippingBase.InvalidAddressInput.selector.revertWith();
+    if (amount == 0) ITippingBase.AmountIsZero.selector.revertWith();
+    if (sender != msg.sender) ITippingBase.NotSenderOfTip.selector.revertWith();
+    if (sender == receiver) ITippingBase.CannotTipSelf.selector.revertWith();
+}
+
+/// @notice Deposits a tip
+/// @param self The address of the facet
+/// @param currency The currency of the tip
+/// @param amount The amount of the tip
+function depositTip(address self, address currency, uint256 amount) {
+    if (currency == CurrencyTransfer.NATIVE_TOKEN) {
+        if (msg.value != amount) ITippingBase.MsgValueMismatch.selector.revertWith();
+    } else {
+        if (msg.value != 0) ITippingBase.UnexpectedETH.selector.revertWith();
+        CurrencyTransfer.transferCurrency(currency, msg.sender, self, amount);
+    }
+}

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

@@ -11,6 +11,7 @@ import {ISchemaResolver} from "@ethereum-attestation-service/eas-contracts/resol
 import {IPlatformRequirements} from "../../../factory/facets/platform/requirements/IPlatformRequirements.sol";
 import {IERC173} from "@towns-protocol/diamond/src/facets/ownable/IERC173.sol";
 import {IAppAccount} from "../../../spaces/facets/account/IAppAccount.sol";
+import {IEntitlementsManager} from "../../../spaces/facets/entitlements/IEntitlementsManager.sol";
 
 // libraries
 import {CustomRevert} from "../../../utils/libraries/CustomRevert.sol";
@@ -24,6 +25,7 @@ import {LibAppRegistry} from "./LibAppRegistry.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";
+import {Permissions} from "../../../spaces/facets/Permissions.sol";
 
 // contracts
 import {SchemaBase} from "../schema/SchemaBase.sol";
@@ -32,8 +34,16 @@ import {AttestationBase} from "../attest/AttestationBase.sol";
 abstract contract AppRegistryBase is IAppRegistryBase, SchemaBase, AttestationBase {
     using CustomRevert for bytes4;
 
+    /// @notice Modifier to check if the caller is allowed to interact with the app registry
+    /// @dev Only the owner of the space or modular account can interact
     modifier onlyAllowed(IAppAccount account) {
-        if (address(account) != msg.sender && IERC173(address(account)).owner() != msg.sender) {
+        if (
+            address(account) != msg.sender &&
+            !IEntitlementsManager(address(account)).isEntitledToSpace(
+                msg.sender,
+                Permissions.ModifyAppSettings
+            )
+        ) {
             NotAllowed.selector.revertWith();
         }
         _;

package/src/spaces/facets/Permissions.sol

@@ -8,14 +8,15 @@ pragma solidity ^0.8.23;
 // contracts
 
 library Permissions {
-    string public constant ModifyChannel = "ModifyChannel";
-    string public constant AddRemoveChannels = "AddRemoveChannels";
-    string public constant ModifySpaceSettings = "ModifySpaceSettings";
-    string public constant ModifyRoles = "ModifyRoles";
-    string public constant JoinSpace = "JoinSpace";
-    string public constant ModifyBanning = "ModifyBanning";
-    string public constant Read = "Read";
-    string public constant Write = "Write";
-    string public constant React = "React";
-    string public constant Ping = "Ping";
+    string internal constant ModifyChannel = "ModifyChannel";
+    string internal constant AddRemoveChannels = "AddRemoveChannels";
+    string internal constant ModifySpaceSettings = "ModifySpaceSettings";
+    string internal constant ModifyRoles = "ModifyRoles";
+    string internal constant JoinSpace = "JoinSpace";
+    string internal constant ModifyBanning = "ModifyBanning";
+    string internal constant Read = "Read";
+    string internal constant Write = "Write";
+    string internal constant React = "React";
+    string internal constant Ping = "Ping";
+    string internal constant ModifyAppSettings = "ModifyAppSettings";
 }

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

@@ -6,7 +6,6 @@ import {IAppRegistry} from "src/apps/facets/registry/IAppRegistry.sol";
 
 // libraries
 import {EnumerableSetLib} from "solady/utils/EnumerableSetLib.sol";
-import {ExecutorStorage} from "src/spaces/facets/executor/ExecutorStorage.sol";
 import {DependencyLib} from "src/spaces/facets/DependencyLib.sol";
 import {EMPTY_UID} from "@ethereum-attestation-service/eas-contracts/Common.sol";
 

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

@@ -2,26 +2,27 @@
 pragma solidity ^0.8.23;
 
 interface ITippingBase {
-    // =============================================================
-    //                           Enums
-    // =============================================================
-
     enum TipRecipientType {
         Member, // Tips to token holders
         Bot, // Tips to bot wallets
-        Pool // Tips to pool wallets
+        Any // Tips to any address
     }
 
-    // =============================================================
-    //                           Structs
-    // =============================================================
-
     struct TipMetadata {
         bytes32 messageId;
         bytes32 channelId;
         bytes data; // Extensible metadata
     }
 
+    /// @notice Params for any tip
+    struct AnyTipParams {
+        address currency;
+        address sender;
+        address receiver;
+        uint256 amount;
+        bytes data;
+    }
+
     /// @notice Params for Member tips (includes tokenId)
     struct MembershipTipParams {
         address receiver;
@@ -50,10 +51,6 @@ interface ITippingBase {
         bytes32 channelId;
     }
 
-    // =============================================================
-    //                           Events
-    // =============================================================
-
     event TipSent(
         address indexed sender,
         address indexed receiver,
@@ -74,10 +71,6 @@ interface ITippingBase {
         bytes32 channelId
     );
 
-    // =============================================================
-    //                           Errors
-    // =============================================================
-
     error InvalidRecipientType();
     error InvalidTipData();
     error TokenDoesNotExist();
@@ -87,6 +80,9 @@ interface ITippingBase {
     error CurrencyIsZero();
     error MsgValueMismatch();
     error UnexpectedETH();
+    error NotSenderOfTip();
+    error Deprecated();
+    error InvalidAddressInput();
 }
 
 interface ITipping is ITippingBase {
@@ -94,9 +90,8 @@ interface ITipping is ITippingBase {
     /// @param recipientType The type of recipient (Member, Wallet, Bot, Pool)
     /// @param data ABI-encoded tip params based on recipientType:
     ///   - Member: abi.encode(MembershipTipParams)
-    ///   - Wallet: abi.encode(WalletTipParams)
     ///   - Bot: abi.encode(BotTipParams)
-    ///   - Pool: Reserved for future implementation
+    ///   - Any: abi.encode(AnyTipParams)
     function sendTip(TipRecipientType recipientType, bytes calldata data) external payable;
 
     /// @notice Sends a tip to a space member (legacy)

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

@@ -6,7 +6,6 @@ import {ITippingBase} from "./ITipping.sol";
 import {ITownsPointsBase} from "../../../airdrop/points/ITownsPoints.sol";
 import {IFeeManager} from "../../../factory/facets/fee/IFeeManager.sol";
 import {FeeTypesLib} from "../../../factory/facets/fee/FeeTypesLib.sol";
-import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 
 // libraries
 import {EnumerableSet} from "@openzeppelin/contracts/utils/structs/EnumerableSet.sol";