@towns-protocol/contracts 0.0.302 → 0.0.304

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@towns-protocol/contracts",
-  "version": "0.0.302",
+  "version": "0.0.304",
   "packageManager": "yarn@3.8.0",
   "scripts": {
     "build": "forge build",
@@ -32,7 +32,7 @@
     "@layerzerolabs/oapp-evm": "^0.3.2",
     "@openzeppelin/merkle-tree": "^1.0.8",
     "@prb/test": "^0.6.4",
-    "@towns-protocol/prettier-config": "^0.0.302",
+    "@towns-protocol/prettier-config": "^0.0.304",
     "@wagmi/cli": "^2.2.0",
     "account-abstraction": "https://github.com/eth-infinitism/account-abstraction/archive/refs/tags/v0.7.0.tar.gz",
     "forge-std": "github:foundry-rs/forge-std#v1.10.0",
@@ -53,5 +53,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "34c8d901987c0ecd0b2c01f1b93b5365daf11306"
+  "gitHead": "f288ff8d07f5c94aa46d291dc8554c8233d6fd60"
 }

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

@@ -14,7 +14,7 @@ library DeployMainnetDelegation {
     using DynamicArrayLib for DynamicArrayLib.DynamicArray;
 
     function selectors() internal pure returns (bytes4[] memory res) {
-        DynamicArrayLib.DynamicArray memory arr = DynamicArrayLib.p().reserve(11);
+        DynamicArrayLib.DynamicArray memory arr = DynamicArrayLib.p().reserve(12);
         arr.p(MainnetDelegation.setProxyDelegation.selector);
         arr.p(MainnetDelegation.setDelegationDigest.selector);
         arr.p(MainnetDelegation.relayDelegations.selector);
@@ -26,6 +26,7 @@ library DeployMainnetDelegation {
         arr.p(MainnetDelegation.getAuthorizedClaimer.selector);
         arr.p(MainnetDelegation.getProxyDelegation.selector);
         arr.p(MainnetDelegation.getMessenger.selector);
+        arr.p(MainnetDelegation.getDelegatorsByAuthorizedClaimer.selector);
 
         bytes32[] memory selectors_ = arr.asBytes32Array();
         assembly ("memory-safe") {

package/src/base/registry/facets/mainnet/IMainnetDelegation.sol

@@ -124,4 +124,11 @@ interface IMainnetDelegation is IMainnetDelegationBase {
     /// @param delegator The mainnet delegator address
     /// @return The authorized claimer address for the delegator
     function getAuthorizedClaimer(address delegator) external view returns (address);
+
+    /// @notice Get all delegators that have the specified authorized claimer
+    /// @param claimer The address of the authorized claimer to check for
+    /// @return An array of addresses that have the specified authorized claimer
+    function getDelegatorsByAuthorizedClaimer(
+        address claimer
+    ) external view returns (address[] memory);
 }

package/src/base/registry/facets/mainnet/MainnetDelegation.sol

@@ -116,4 +116,11 @@ contract MainnetDelegation is IMainnetDelegation, MainnetDelegationBase, Ownable
     function getAuthorizedClaimer(address delegator) external view returns (address) {
         return _getAuthorizedClaimer(delegator);
     }
+
+    /// @inheritdoc IMainnetDelegation
+    function getDelegatorsByAuthorizedClaimer(
+        address claimer
+    ) external view returns (address[] memory) {
+        return _getDelegatorsByAuthorizedClaimer(claimer);
+    }
 }

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

@@ -1,12 +1,6 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.23;
 
-// interfaces
-
-// libraries
-
-// contracts
-
 interface ITippingBase {
     // =============================================================
     //                           Structs
@@ -44,6 +38,8 @@ interface ITippingBase {
     error CannotTipSelf();
     error AmountIsZero();
     error CurrencyIsZero();
+    error MsgValueMismatch();
+    error UnexpectedETH();
 }
 
 interface ITipping is ITippingBase {

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

@@ -5,7 +5,8 @@ pragma solidity ^0.8.23;
 
 // libraries
 import {EnumerableSet} from "@openzeppelin/contracts/utils/structs/EnumerableSet.sol";
-import {CurrencyTransfer} from "src/utils/libraries/CurrencyTransfer.sol";
+import {CurrencyTransfer} from "../../../utils/libraries/CurrencyTransfer.sol";
+
 // contracts
 
 library TippingBase {

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

@@ -2,24 +2,26 @@
 pragma solidity ^0.8.23;
 
 // interfaces
+import {ITownsPointsBase} from "../../../airdrop/points/ITownsPoints.sol";
+import {IPlatformRequirements} from "../../../factory/facets/platform/requirements/IPlatformRequirements.sol";
 import {ITipping} from "./ITipping.sol";
-import {ITownsPointsBase} from "src/airdrop/points/ITownsPoints.sol";
-import {IPlatformRequirements} from "src/factory/facets/platform/requirements/IPlatformRequirements.sol";
 
 // libraries
+import {BasisPoints} from "../../../utils/libraries/BasisPoints.sol";
+import {CurrencyTransfer} from "../../../utils/libraries/CurrencyTransfer.sol";
+import {CustomRevert} from "../../../utils/libraries/CustomRevert.sol";
+import {MembershipStorage} from "../membership/MembershipStorage.sol";
 import {TippingBase} from "./TippingBase.sol";
-import {MembershipStorage} from "src/spaces/facets/membership/MembershipStorage.sol";
-import {BasisPoints} from "src/utils/libraries/BasisPoints.sol";
-import {CurrencyTransfer} from "src/utils/libraries/CurrencyTransfer.sol";
-import {CustomRevert} from "src/utils/libraries/CustomRevert.sol";
 
 // contracts
 import {Facet} from "@towns-protocol/diamond/src/facets/Facet.sol";
 import {ReentrancyGuard} from "solady/utils/ReentrancyGuard.sol";
-import {ERC721ABase} from "src/diamond/facets/token/ERC721A/ERC721ABase.sol";
+import {ERC721ABase} from "../../../diamond/facets/token/ERC721A/ERC721ABase.sol";
 import {PointsBase} from "../points/PointsBase.sol";
 
 contract TippingFacet is ITipping, ERC721ABase, PointsBase, Facet, ReentrancyGuard {
+    using CustomRevert for bytes4;
+
     function __Tipping_init() external onlyInitializing {
         _addInterface(type(ITipping).interfaceId);
     }
@@ -35,9 +37,13 @@ contract TippingFacet is ITipping, ERC721ABase, PointsBase, Facet, ReentrancyGua
 
         uint256 tipAmount = tipRequest.amount;
 
-        if (tipRequest.currency == CurrencyTransfer.NATIVE_TOKEN) {
-            uint256 protocolFee = _payProtocol(msg.sender, tipRequest.amount);
-            tipAmount = tipRequest.amount - protocolFee;
+        if (tipRequest.currency != CurrencyTransfer.NATIVE_TOKEN) {
+            if (msg.value != 0) UnexpectedETH.selector.revertWith();
+        } else {
+            if (msg.value != tipAmount) MsgValueMismatch.selector.revertWith();
+
+            uint256 protocolFee = _payProtocol(msg.sender, tipAmount);
+            tipAmount -= protocolFee;
 
             address airdropDiamond = _getAirdropDiamond();
             uint256 points = _getPoints(
@@ -100,11 +106,9 @@ contract TippingFacet is ITipping, ERC721ABase, PointsBase, Facet, ReentrancyGua
         address currency,
         uint256 amount
     ) internal pure {
-        if (currency == address(0)) {
-            CustomRevert.revertWith(CurrencyIsZero.selector);
-        }
-        if (sender == receiver) CustomRevert.revertWith(CannotTipSelf.selector);
-        if (amount == 0) CustomRevert.revertWith(AmountIsZero.selector);
+        if (currency == address(0)) CurrencyIsZero.selector.revertWith();
+        if (sender == receiver) CannotTipSelf.selector.revertWith();
+        if (amount == 0) AmountIsZero.selector.revertWith();
     }
 
     function _payProtocol(address sender, uint256 amount) internal returns (uint256 protocolFee) {