Automatic claims

src/contracts/AutomaticSavingCircles.sol

@@ -46,7 +46,7 @@
    * @param _savingCircles Address of the main SavingCircles contract
    * @param _owner Owner of the automatic deposits extension
    */
   constructor(address _savingCircles, address _owner) Ownable(_owner) {
     SAVING_CIRCLES = ISavingCircles(_savingCircles);
   }
 
@@ -72,6 +72,15 @@
     _executeAutomatedDepositTarget(_circleId, _member);
   }
 
+  /**
+   * @dev External trampoline used to isolate single-target failures with try/catch during batch claim execution
+   * @param _circleId Circle to process
+   * @param _member Member to claim for
+   */
+  function executeAutomatedClaimTarget(uint256 _circleId, address _member) external onlySelf {
+    _executeAutomatedClaimTarget(_circleId, _member);
+  }
+
   /// @inheritdoc IAutomaticSavingCircles
   function batchExecuteAutomatedDeposits(
     uint256[] calldata _circleIds,
@@ -87,13 +96,28 @@
     }
   }
 
+  /// @inheritdoc IAutomaticSavingCircles
+  function batchExecuteAutomatedClaims(
+    uint256[] calldata _circleIds,
+    address[] calldata _members
+  ) external override nonReentrant onlyAutomationExecutor {
+    if (_circleIds.length != _members.length) revert ArrayLengthMismatch();
+
+    for (uint256 i = 0; i < _circleIds.length; i++) {
+      try this.executeAutomatedClaimTarget(_circleIds[i], _members[i]) {}
+      catch (bytes memory reason) {
+        emit AutomatedClaimFailed(_circleIds[i], _members[i], reason);
+      }
+    }
+  }
+
   /// @inheritdoc IAutomaticSavingCircles
   function isAutomaticDepositsEnabled(address _member) external view override returns (bool) {
     return automaticDepositsEnabled[_member];
   }
 
   /// @inheritdoc IAutomaticSavingCircles
-  function checker() external view override returns (bool canExec, bytes memory execPayload) {
+  function depositChecker() external view override returns (bool canExec, bytes memory execPayload) {
     uint256[] memory circleIds;
     address[] memory members;
 
@@ -108,6 +132,22 @@
     execPayload = abi.encodeCall(IAutomaticSavingCircles.batchExecuteAutomatedDeposits, (circleIds, members));
   }
 
+  /// @inheritdoc IAutomaticSavingCircles
+  function claimChecker() external view override returns (bool canExec, bytes memory execPayload) {
+    uint256[] memory circleIds;
+    address[] memory members;
+
+    if (automationExecutor != address(0)) {
+      (circleIds, members) = getEligibleAutomatedClaims();
+      canExec = circleIds.length > 0;
+    } else {
+      circleIds = new uint256[](0);
+      members = new address[](0);
+    }
+
+    execPayload = abi.encodeCall(IAutomaticSavingCircles.batchExecuteAutomatedClaims, (circleIds, members));
+  }
+
   /// @inheritdoc IAutomaticSavingCircles
   function getEligibleAutomatedDeposits()
     public
@@ -131,6 +171,29 @@
     }
   }
 
+  /// @inheritdoc IAutomaticSavingCircles
+  function getEligibleAutomatedClaims()
+    public
+    view
+    override
+    returns (uint256[] memory circleIds, address[] memory members)
+  {
+    uint256 circleCount = SAVING_CIRCLES.nextId();
+    uint256 eligibleCount = 0;
+
+    for (uint256 circleId = 0; circleId < circleCount; circleId++) {
+      eligibleCount += _countEligibleAutomatedClaimsForCircle(circleId);
+    }
+
+    circleIds = new uint256[](eligibleCount);
+    members = new address[](eligibleCount);
+
+    uint256 index = 0;
+    for (uint256 circleId = 0; circleId < circleCount; circleId++) {
+      index = _populateEligibleAutomatedClaimsForCircle(circleId, circleIds, members, index);
+    }
+  }
+
   /**
    * @dev Executes a single automated deposit target after re-validating all onchain constraints
    * @param _circleId Circle to process
@@ -163,6 +226,24 @@
     SAVING_CIRCLES.depositFor(_circleId, requiredAmount, _member);
   }
 
+  /**
+   * @dev Executes a single automated claim target after re-validating all onchain constraints
+   * @param _circleId Circle to process
+   * @param _member Member to claim for
+   */
+  function _executeAutomatedClaimTarget(uint256 _circleId, address _member) internal {
+    ISavingCircles.Circle memory _circle = SAVING_CIRCLES.getCircle(_circleId);
+    address[] memory members = SAVING_CIRCLES.getCircleMembers(_circleId);
+    (bool isMember, uint256 memberIndex) = _getMemberIndex(members, _member);
+
+    if (!isMember) revert ISavingCircles.NotMember();
+    if (!_isEligibleForAutomatedClaim(_circleId, _circle, _member, memberIndex)) {
+      revert ISavingCircles.NotWithdrawable();
+    }
+
+    SAVING_CIRCLES.withdrawFor(_circleId, _member);
+  }
+
   /**
    * @dev Returns the current round index for a circle using the live block timestamp
    * @param _circle Circle configuration to evaluate
@@ -179,6 +260,16 @@
     return (block.timestamp - _circle.effectiveCircleStartTime) / _circle.depositInterval;
   }
 
+  /**
+   * @dev Returns the ending timestamp for a round
+   * @param _circle Circle configuration to evaluate
+   * @param _round Zero-based round index
+   * @return Timestamp when the round's time condition has passed
+   */
+  function _roundEndTime(ISavingCircles.Circle memory _circle, uint256 _round) internal pure returns (uint256) {
+    return _circle.effectiveCircleStartTime + (_circle.depositInterval * (_round + 1));
+  }
+
   /**
    * @dev Returns whether a member currently satisfies the offchain selection criteria for automated deposit
    * @param _circle Circle configuration to evaluate
@@ -186,7 +277,7 @@
    * @param _currentBalance Amount already deposited by the member in the active round
    * @return Whether the member can be included in the automation payload
    */
   function _isEligibleForAutomatedDeposit(
     ISavingCircles.Circle memory _circle,
     address _member,
     uint256 _currentBalance
@@ -221,6 +312,27 @@
     }
   }
 
+  /**
+   * @dev Counts how many members in a circle are currently eligible for automated claim
+   * @param _circleId Circle to inspect
+   * @return eligibleCount Number of eligible claim targets found
+   */
+  function _countEligibleAutomatedClaimsForCircle(uint256 _circleId) internal view returns (uint256 eligibleCount) {
+    try SAVING_CIRCLES.getCircle(_circleId) returns (ISavingCircles.Circle memory _circle) {
+      if (!SAVING_CIRCLES.isActive(_circleId)) return 0;
+      if (SAVING_CIRCLES.isDecommissionable(_circleId)) return 0;
+
+      address[] memory members = SAVING_CIRCLES.getCircleMembers(_circleId);
+      for (uint256 i = 0; i < members.length; i++) {
+        if (_isEligibleForAutomatedClaim(_circleId, _circle, members[i], i)) {
+          eligibleCount++;
+        }
+      }
+    } catch {
+      return 0;
+    }
+  }
+
   /**
    * @dev Appends the eligible targets for a circle into the output arrays used by the selector
    * @param _circleId Circle to inspect
@@ -254,6 +366,39 @@
     }
   }
 
+  /**
+   * @dev Appends the eligible claim targets for a circle into the output arrays used by the selector
+   * @param _circleId Circle to inspect
+   * @param _circleIds Output array of eligible circle IDs
+   * @param _members Output array of eligible members
+   * @param _index Current write index in the output arrays
+   * @return nextIndex Updated write index after appending any eligible targets
+   */
+  function _populateEligibleAutomatedClaimsForCircle(
+    uint256 _circleId,
+    uint256[] memory _circleIds,
+    address[] memory _members,
+    uint256 _index
+  ) internal view returns (uint256 nextIndex) {
+    nextIndex = _index;
+
+    try SAVING_CIRCLES.getCircle(_circleId) returns (ISavingCircles.Circle memory _circle) {
+      if (!SAVING_CIRCLES.isActive(_circleId)) return nextIndex;
+      if (SAVING_CIRCLES.isDecommissionable(_circleId)) return nextIndex;
+
+      address[] memory members = SAVING_CIRCLES.getCircleMembers(_circleId);
+      for (uint256 i = 0; i < members.length; i++) {
+        if (!_isEligibleForAutomatedClaim(_circleId, _circle, members[i], i)) continue;
+
+        _circleIds[nextIndex] = _circleId;
+        _members[nextIndex] = members[i];
+        nextIndex++;
+      }
+    } catch {
+      return nextIndex;
+    }
+  }
+
   /**
    * @dev Returns whether a circle is in a state where automation can process deposits
    * @param _circleId Circle identifier
@@ -275,6 +420,29 @@
     return true;
   }
 
+  /**
+   * @dev Returns whether a member currently satisfies the automated claim criteria.
+   *      Gelato should only claim after every member deposited for the member's round and that round's time has passed.
+   * @param _circleId Circle identifier
+   * @param _circle Circle configuration to evaluate
+   * @param _member Member being checked
+   * @param _memberIndex The member's zero-based payout round
+   * @return Whether the member can be included in the claim automation payload
+   */
+  function _isEligibleForAutomatedClaim(
+    uint256 _circleId,
+    ISavingCircles.Circle memory _circle,
+    address _member,
+    uint256 _memberIndex
+  ) internal view returns (bool) {
+    if (!SAVING_CIRCLES.isActive(_circleId)) return false;
+    if (_circle.effectiveCircleStartTime == 0) return false;
+    if (SAVING_CIRCLES.isDecommissionable(_circleId)) return false;
+    if (block.timestamp < _roundEndTime(_circle, _memberIndex)) return false;
+
+    return SAVING_CIRCLES.isMemberWithdrawable(_circleId, _member);
+  }
+
   /**
    * @dev Looks up whether a member belongs to the supplied balances snapshot and returns their current balance
    * @param _members Snapshot of circle members
@@ -293,4 +461,21 @@
       return (true, _balances[i]);
     }
   }
+
+  /**
+   * @dev Looks up whether a member belongs to the supplied member snapshot and returns their index
+   * @param _members Snapshot of circle members
+   * @param _member Member being searched for
+   * @return isMember Whether the member was found in the snapshot
+   * @return memberIndex The member's zero-based index in the circle
+   */
+  function _getMemberIndex(
+    address[] memory _members,
+    address _member
+  ) internal pure returns (bool isMember, uint256 memberIndex) {
+    for (uint256 i = 0; i < _members.length; i++) {
+      if (_members[i] != _member) continue;
+      return (true, i);
+    }
+  }
 }

src/contracts/SavingCircles.sol

@@ -376,11 +376,10 @@ contract SavingCircles is ISavingCircles, ReentrancyGuardUpgradeable, OwnableUpg
   }
 
   /**
-   * @dev Make a withdrawal from a specified circle
-   *      Permissionless: anyone can trigger the payout for the member whose turn it is to withdraw
-   *      A withdrawal must be made by a member of the circle, even if it is for another member.
+   * @dev Make a withdrawal from a specified circle.
+   *      Anyone can trigger the payout for a valid member whose turn is withdrawable.
    */
-  function _withdraw(uint256 _id, address _member) internal onlyMember(_id, msg.sender) {
+  function _withdraw(uint256 _id, address _member) internal onlyMember(_id, _member) {
     Circle storage _circle = circles[_id];
 
     if (!_claimable(_id, _member)) revert NotWithdrawable();

src/interfaces/IAutomaticSavingCircles.sol

@@ -29,6 +29,14 @@ interface IAutomaticSavingCircles {
    */
   event AutomatedDepositFailed(uint256 indexed circleId, address indexed member, bytes reason);
 
+  /**
+   * @notice Emitted when an automated claim target fails during batch execution
+   * @param circleId The circle that failed
+   * @param member The member that failed
+   * @param reason The raw revert data returned by the failed execution
+   */
+  event AutomatedClaimFailed(uint256 indexed circleId, address indexed member, bytes reason);
+
   /**
    * @notice Thrown when a non-Gelato caller attempts an automated execution
    */
@@ -73,6 +81,13 @@ interface IAutomaticSavingCircles {
    */
   function batchExecuteAutomatedDeposits(uint256[] calldata circleIds, address[] calldata members) external;
 
+  /**
+   * @notice Execute automated claims for precomputed targets
+   * @param circleIds Circle IDs to process
+   * @param members Members to process for each circle ID
+   */
+  function batchExecuteAutomatedClaims(uint256[] calldata circleIds, address[] calldata members) external;
+
   /**
    * @notice The configured Gelato dedicated msg.sender
    * @return The automation executor address
@@ -93,10 +108,24 @@ interface IAutomaticSavingCircles {
    */
   function getEligibleAutomatedDeposits() external view returns (uint256[] memory circleIds, address[] memory members);
 
+  /**
+   * @notice Return every member/circle pair currently eligible for automated claim
+   * @return circleIds Circle IDs with pending automated claims
+   * @return members Members eligible to claim in each circle
+   */
+  function getEligibleAutomatedClaims() external view returns (uint256[] memory circleIds, address[] memory members);
+
   /**
    * @notice Gelato resolver-style checker for automatic deposits across every circle
    * @return canExec Whether Gelato should execute the sweep
    * @return execPayload Encoded calldata for the automated deposit execution
    */
-  function checker() external view returns (bool canExec, bytes memory execPayload);
+  function depositChecker() external view returns (bool canExec, bytes memory execPayload);
+
+  /**
+   * @notice Gelato resolver-style checker for automatic claims across every circle
+   * @return canExec Whether Gelato should execute the claims
+   * @return execPayload Encoded calldata for the automated claim execution
+   */
+  function claimChecker() external view returns (bool canExec, bytes memory execPayload);
 }