Good Collective bulk add members

packages/contracts/contracts/DirectPayments/DirectPaymentsFactory.sol

@@ -30,6 +30,7 @@ contract DirectPaymentsFactory is AccessControlUpgradeable, UUPSUpgradeable {
     event PoolDetailsChanged(address indexed pool, string ipfs);
     event PoolVerifiedChanged(address indexed pool, bool isVerified);
     event UpdatedImpl(address indexed impl);
+    event MemberAdded(address indexed member, address indexed pool);
 
     struct PoolRegistry {
         string ipfs;
@@ -189,6 +190,15 @@ contract DirectPaymentsFactory is AccessControlUpgradeable, UUPSUpgradeable {
 
     function addMember(address member) external onlyPool {
         memberPools[member].push(msg.sender);
+        emit MemberAdded(member, msg.sender);
+    }
+
+    function addMembers(address[] calldata members) external onlyPool {
+        for (uint i = 0; i < members.length; ) {
+            memberPools[members[i]].push(msg.sender);
+            emit MemberAdded(members[i], msg.sender);
+            unchecked { ++i; }
+        }
     }
 
     function removeMember(address member) external onlyPool {

packages/contracts/contracts/DirectPayments/DirectPaymentsPool.sol

@@ -5,7 +5,9 @@ import { UUPSUpgradeable } from "@openzeppelin/contracts-upgradeable/proxy/utils
 import { IERC721Upgradeable } from "@openzeppelin/contracts-upgradeable/token/ERC721/IERC721Upgradeable.sol";
 import { SafeERC20Upgradeable } from "@openzeppelin/contracts-upgradeable/token/ERC20/utils/SafeERC20Upgradeable.sol";
 import { IERC20Upgradeable } from "@openzeppelin/contracts-upgradeable/token/ERC20/IERC20Upgradeable.sol";
-import { IERC721ReceiverUpgradeable } from "@openzeppelin/contracts-upgradeable/token/ERC721/IERC721ReceiverUpgradeable.sol";
+import {
+    IERC721ReceiverUpgradeable
+} from "@openzeppelin/contracts-upgradeable/token/ERC721/IERC721ReceiverUpgradeable.sol";
 
 import { ProvableNFT } from "./ProvableNFT.sol";
 import { DirectPaymentsFactory } from "./DirectPaymentsFactory.sol";
@@ -48,6 +50,7 @@ contract DirectPaymentsPool is
     error NO_BALANCE();
     error NFTTYPE_CHANGED();
     error EMPTY_MANAGER();
+    error LENGTH_MISMATCH();
 
     bytes32 public constant MANAGER_ROLE = keccak256("MANAGER_ROLE");
     bytes32 public constant MEMBER_ROLE = keccak256("MEMBER_ROLE");
@@ -75,6 +78,7 @@ contract DirectPaymentsPool is
     );
     event NFTClaimed(uint256 indexed tokenId, uint256 totalRewards);
     event NOT_MEMBER_OR_WHITELISTED_OR_LIMITS(address contributer);
+    event MemberAdded(address indexed member);
 
     // Define functions
     struct PoolSettings {
@@ -214,6 +218,27 @@ contract DirectPaymentsPool is
         return true;
     }
 
+    /**
+     * @dev Adds multiple members to the pool in a single transaction.
+     * @param members Array of member addresses to add.
+     * @param extraData Array of additional validation data for each member.
+     */
+    function addMembers(address[] calldata members, bytes[] calldata extraData) external onlyRole(MANAGER_ROLE) {
+        if (members.length != extraData.length) revert LENGTH_MISMATCH();
+
+        for (uint i = 0; i < members.length; ) {
+            bool added = _addMember(members[i], extraData[i]);
+            if (added) {
+                emit MemberAdded(members[i]);
+            }
+            unchecked {
+                ++i;
+            }
+        }
+    }
+
+
+
     function _grantRole(bytes32 role, address account) internal virtual override {
         if (role == MEMBER_ROLE) {
             registry.addMember(account);

packages/contracts/contracts/UBI/UBIPool.sol

@@ -5,7 +5,9 @@ import { UUPSUpgradeable } from "@openzeppelin/contracts-upgradeable/proxy/utils
 import { IERC721Upgradeable } from "@openzeppelin/contracts-upgradeable/token/ERC721/IERC721Upgradeable.sol";
 import { SafeERC20Upgradeable } from "@openzeppelin/contracts-upgradeable/token/ERC20/utils/SafeERC20Upgradeable.sol";
 import { IERC20Upgradeable } from "@openzeppelin/contracts-upgradeable/token/ERC20/IERC20Upgradeable.sol";
-import { IERC721ReceiverUpgradeable } from "@openzeppelin/contracts-upgradeable/token/ERC721/IERC721ReceiverUpgradeable.sol";
+import {
+    IERC721ReceiverUpgradeable
+} from "@openzeppelin/contracts-upgradeable/token/ERC721/IERC721ReceiverUpgradeable.sol";
 
 import "../GoodCollective/GoodCollectiveSuperApp.sol";
 import "./UBIPoolFactory.sol";
@@ -23,6 +25,7 @@ contract UBIPool is AccessControlUpgradeable, GoodCollectiveSuperApp, UUPSUpgrad
     error EMPTY_MANAGER();
     error MAX_MEMBERS_REACHED();
     error MAX_PERIOD_CLAIMERS_REACHED(uint256 claimers);
+    error LENGTH_MISMATCH();
 
     bytes32 public constant MANAGER_ROLE = keccak256("MANAGER_ROLE");
     bytes32 public constant MEMBER_ROLE = keccak256("MEMBER_ROLE");
@@ -42,6 +45,7 @@ contract UBIPool is AccessControlUpgradeable, GoodCollectiveSuperApp, UUPSUpgrad
     event UBICycleCalculated(uint256 day, uint256 pool, uint256 cycleLength, uint256 dailyUBIPool);
 
     event UBIClaimed(address indexed whitelistedRoot, address indexed claimer, uint256 amount);
+    event MemberAdded(address indexed member);
 
     struct UBISettings {
         //number of days of each UBI pool cycle
@@ -189,10 +193,8 @@ contract UBIPool is AccessControlUpgradeable, GoodCollectiveSuperApp, UUPSUpgrad
 
         nextPeriodPool = status.dailyCyclePool;
         nextDailyUbi;
-        if (
-            (currentDayInCycle() + 1) >= status.currentCycleLength || shouldStartEarlyCycle
-        ) //start of cycle or first time
-        {
+        if ((currentDayInCycle() + 1) >= status.currentCycleLength || shouldStartEarlyCycle) {
+            //start of cycle or first time
             nextPeriodPool = currentBalance / ubiSettings.cycleLengthDays;
             newCycle = true;
         }
@@ -296,10 +298,44 @@ contract UBIPool is AccessControlUpgradeable, GoodCollectiveSuperApp, UUPSUpgrad
         return true;
     }
 
+    /**
+     * @dev Adds multiple members to the pool in a single transaction.
+     * @param members Array of member addresses to add.
+     * @param extraData Array of additional validation data for each member.
+     */
+    function addMembers(address[] calldata members, bytes[] calldata extraData) external onlyRole(MANAGER_ROLE) {
+        if (members.length != extraData.length) revert LENGTH_MISMATCH();
+
+        for (uint i = 0; i < members.length; ) {
+            address member = members[i];
+
+            // Validate uniqueness if validator is set
+            if (address(settings.uniquenessValidator) != address(0)) {
+                address rootAddress = settings.uniquenessValidator.getWhitelistedRoot(member);
+                if (rootAddress == address(0)) revert NOT_WHITELISTED(member);
+            }
+
+            // Validate with members validator if set (manager can bypass)
+            if (address(settings.membersValidator) != address(0)) {
+                if (!settings.membersValidator.isMemberValid(address(this), msg.sender, member, extraData[i])) {
+                    revert NOT_MEMBER(member);
+                }
+            }
+
+            _grantRole(MEMBER_ROLE, member);
+
+            unchecked {
+                ++i;
+            }
+        }
+    }
+
     function removeMember(address member) external onlyRole(MANAGER_ROLE) {
         _revokeRole(MEMBER_ROLE, member);
     }
 
+
+
     function _grantRole(bytes32 role, address account) internal virtual override {
         if (role == MEMBER_ROLE && hasRole(MEMBER_ROLE, account) == false) {
             if (ubiSettings.maxMembers > 0 && status.membersCount > ubiSettings.maxMembers)

packages/contracts/contracts/UBI/UBIPoolFactory.sol

@@ -32,6 +32,7 @@ contract UBIPoolFactory is AccessControlUpgradeable, UUPSUpgradeable {
     event PoolDetailsChanged(address indexed pool, string ipfs);
     event PoolVerifiedChanged(address indexed pool, bool isVerified);
     event UpdatedImpl(address indexed impl);
+    event MemberAdded(address indexed member, address indexed pool);
 
     struct PoolRegistry {
         string ipfs;
@@ -172,6 +173,15 @@ contract UBIPoolFactory is AccessControlUpgradeable, UUPSUpgradeable {
 
     function addMember(address account) external onlyPool {
         memberPools[account].push(msg.sender);
+        emit MemberAdded(account, msg.sender);
+    }
+
+    function addMembers(address[] calldata members) external onlyPool {
+        for (uint i = 0; i < members.length; ) {
+            memberPools[members[i]].push(msg.sender);
+            emit MemberAdded(members[i], msg.sender);
+            unchecked { ++i; }
+        }
     }
 
     function removeMember(address member) external onlyPool {