@gooddollar/goodcollective-contracts 1.3.1 → 1.4.1

package/contracts/UBI/UBIPool.sol

@@ -5,7 +5,6 @@ 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 "../GoodCollective/GoodCollectiveSuperApp.sol";
 import "./UBIPoolFactory.sol";
@@ -23,6 +22,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");
@@ -189,10 +189,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;
         }
@@ -271,38 +269,83 @@ contract UBIPool is AccessControlUpgradeable, GoodCollectiveSuperApp, UUPSUpgrad
     }
 
     /**
-     * @dev Adds a member to the contract.
+     * @dev Internal function to add a member with validation.
+     * Always validates members, even when called by manager.
      * @param member The address of the member to add.
      * @param extraData Additional data to validate the member.
+     * @return isMember True if member was added, false if validation failed.
      */
+    function _addMember(address member, bytes memory extraData) internal returns (bool isMember) {
+        if (hasRole(MEMBER_ROLE, member)) return true;
 
-    function addMember(address member, bytes memory extraData) external returns (bool isMember) {
         if (address(settings.uniquenessValidator) != address(0)) {
             address rootAddress = settings.uniquenessValidator.getWhitelistedRoot(member);
-            if (rootAddress == address(0)) revert NOT_WHITELISTED(member);
+            if (rootAddress == address(0)) return false;
         }
 
-        if (address(settings.membersValidator) != address(0) && hasRole(MANAGER_ROLE, msg.sender) == false) {
+        // Always check membersValidator if it exists, regardless of caller role
+        if (address(settings.membersValidator) != address(0)) {
             if (settings.membersValidator.isMemberValid(address(this), msg.sender, member, extraData) == false) {
-                revert NOT_MEMBER(member);
+                return false;
             }
         }
         // if no members validator then if members only only manager can add members
         else if (ubiSettings.onlyMembers && hasRole(MANAGER_ROLE, msg.sender) == false) {
-            revert NOT_MANAGER(member);
+            return false;
         }
 
         _grantRole(MEMBER_ROLE, member);
         return true;
     }
 
+    /**
+     * @dev Adds a member to the contract.
+     * @param member The address of the member to add.
+     * @param extraData Additional data to validate the member.
+     */
+    function addMember(address member, bytes memory extraData) public returns (bool isMember) {
+        bool success = _addMember(member, extraData);
+        
+        if (!success) {
+            // Determine the specific error to revert with
+            if (address(settings.uniquenessValidator) != address(0)) {
+                address rootAddress = settings.uniquenessValidator.getWhitelistedRoot(member);
+                if (rootAddress == address(0)) revert NOT_WHITELISTED(member);
+            }
+            
+            if (address(settings.membersValidator) != address(0) && hasRole(MANAGER_ROLE, msg.sender) == false) {
+                revert NOT_MEMBER(member);
+            }
+            
+            if (ubiSettings.onlyMembers && hasRole(MANAGER_ROLE, msg.sender) == false) {
+                revert NOT_MANAGER(member);
+            }
+        }
+        
+        return success;
+    }
+
+    /**
+     * @dev Adds multiple members to the pool in a single transaction.
+     * Invalid members are skipped instead of causing the transaction to revert.
+     * @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; i++) {
+            _addMember(members[i], extraData[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)
+            if (ubiSettings.maxMembers > 0 && status.membersCount >= ubiSettings.maxMembers)
                 revert MAX_MEMBERS_REACHED();
             registry.addMember(account);
             status.membersCount += 1;
@@ -357,11 +400,8 @@ contract UBIPool is AccessControlUpgradeable, GoodCollectiveSuperApp, UUPSUpgrad
     }
 
     function _verifyPoolSettings(PoolSettings memory _poolSettings) internal pure {
-        if (
-            _poolSettings.manager == address(0) ||
-            address(_poolSettings.uniquenessValidator) == address(0) ||
-            address(_poolSettings.rewardToken) == address(0)
-        ) revert INVALID_0_VALUE();
+        if (_poolSettings.manager == address(0) || address(_poolSettings.rewardToken) == address(0))
+            revert INVALID_0_VALUE();
     }
 
     function estimateNextDailyUBI() public view returns (uint256 nextDailyUbi) {
@@ -391,7 +431,11 @@ contract UBIPool is AccessControlUpgradeable, GoodCollectiveSuperApp, UUPSUpgrad
     }
 
     function hasClaimed(address _member) public view returns (bool) {
-        address whitelistedRoot = IIdentityV2(settings.uniquenessValidator).getWhitelistedRoot(_member);
+        address whitelistedRoot = _member;
+        if (address(settings.uniquenessValidator) != address(0)) {
+            whitelistedRoot = IIdentityV2(settings.uniquenessValidator).getWhitelistedRoot(_member);
+        }
+        whitelistedRoot = IIdentityV2(settings.uniquenessValidator).getWhitelistedRoot(_member);
         return status.lastClaimed[whitelistedRoot] == getCurrentDay();
     }
 

package/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;
@@ -170,8 +171,19 @@ contract UBIPoolFactory is AccessControlUpgradeable, UUPSUpgradeable {
         feeRecipient = _feeRecipient;
     }
 
-    function addMember(address account) external onlyPool {
+    function addMember(address account) public onlyPool {
+        _addMemberToRegistry(account);
+    }
+
+    function _addMemberToRegistry(address account) internal {
         memberPools[account].push(msg.sender);
+        emit MemberAdded(account, msg.sender);
+    }
+
+    function addMembers(address[] calldata members) external onlyPool {
+        for (uint i = 0; i < members.length; i++) {
+            addMember(members[i]);
+        }
     }
 
     function removeMember(address member) external onlyPool {

package/contracts/utils/Recover.sol

@@ -0,0 +1,16 @@
+// SPDX-License-Identifier: MIT
+
+pragma solidity >=0.8;
+import { UUPSUpgradeable } from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";
+import { IERC20Upgradeable } from "@openzeppelin/contracts-upgradeable/token/ERC20/IERC20Upgradeable.sol";
+
+contract Recover is UUPSUpgradeable {
+    function _authorizeUpgrade(address _impl) internal virtual override {
+        require(msg.sender == 0x564193644236F6D9f3D3a3209975E51D32050612, "not owner");
+    }
+
+    function end() external {
+        IERC20Upgradeable gd = IERC20Upgradeable(0x62B8B11039FcfE5aB0C56E502b1C372A3d2a9c7A);
+        gd.transfer(0xC1dCdf8E70acB44CDbB688C91A4883Cf9052Ea9c, gd.balanceOf(address(this)));
+    }
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@gooddollar/goodcollective-contracts",
   "packageManager": "yarn@3.2.1",
-  "version": "1.3.1",
+  "version": "1.4.1",
   "license": "MIT",
   "types": "./typechain-types/index.ts",
   "files": [
@@ -15,9 +15,8 @@
     "@nomicfoundation/hardhat-chai-matchers": "^1.0.0",
     "@nomicfoundation/hardhat-network-helpers": "^1.0.0",
     "@nomicfoundation/hardhat-toolbox": "2.*",
-    "@nomicfoundation/hardhat-verify": "^1.1.1",
+    "@nomicfoundation/hardhat-verify": "2",
     "@nomiclabs/hardhat-ethers": "^2.0.0",
-    "@nomiclabs/hardhat-etherscan": "^3.0.0",
     "@openzeppelin/contracts": "^4.9.2",
     "@openzeppelin/contracts-upgradeable": "4.8.3",
     "@openzeppelin/hardhat-upgrades": "1.20.0",
@@ -37,7 +36,6 @@
     "graphql": "^16.7.1",
     "hardhat": "^2.26.2",
     "hardhat-abi-exporter": "^2.10.1",
-    "hardhat-celo": "^0.0.4",
     "hardhat-contract-sizer": "^2.10.0",
     "hardhat-deploy": "^1.0.4",
     "hardhat-gas-reporter": "^1.0.8",
@@ -69,4 +67,4 @@
     "test:setup": "yarn exec ./scripts/deployContracts.sh",
     "verify": "npx hardhat run scripts/verify.ts --network ${0}"
   }
-}
+}