@gooddollar/goodcollective-contracts 1.3.0 → 1.4.0

package/contracts/UBI/UBIPoolFactory.sol

@@ -11,11 +11,14 @@ import { AccessControlUpgradeable } from "@openzeppelin/contracts-upgradeable/ac
 import { UUPSUpgradeable } from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";
 
 import "../Interfaces.sol";
+import "../GoodCollective/GoodCollectiveSuperApp.sol";
+import "../GoodCollective/SuperAppBaseFlow.sol";
 
 // import "hardhat/console.sol";
 
 contract UBIPoolFactory is AccessControlUpgradeable, UUPSUpgradeable {
     error NOT_PROJECT_OWNER();
+    error NOT_PROJECT_MANAGER();
     error NOT_POOL();
 
     event PoolCreated(
@@ -29,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;
@@ -58,8 +62,8 @@ contract UBIPoolFactory is AccessControlUpgradeable, UUPSUpgradeable {
         _;
     }
 
-    modifier onlyPoolOwner(UBIPool pool) {
-        if (pool.hasRole(pool.DEFAULT_ADMIN_ROLE(), msg.sender) == false) {
+    modifier onlyPoolManager(UBIPool pool) {
+        if (pool.hasRole(pool.MANAGER_ROLE(), msg.sender) == false) {
             revert NOT_PROJECT_OWNER();
         }
 
@@ -121,6 +125,19 @@ contract UBIPoolFactory is AccessControlUpgradeable, UUPSUpgradeable {
             pool = UBIPool(address(new ERC1967Proxy(impl.implementation(), initCall)));
         }
 
+        // Register the app with the host
+        if (pool.host().isApp(pool) == false) {
+            try
+                IRegisterSuperapp(address(pool.host())).registerApp(address(pool), SuperAppDefinitions.APP_LEVEL_FINAL)
+            {} catch {
+                //fallback for older versions of superfluid used in unit tests
+                IRegisterSuperapp(address(pool.host())).registerAppByFactory(
+                    address(pool),
+                    SuperAppDefinitions.APP_LEVEL_FINAL
+                );
+            }
+        }
+
         //access control to project is determinted by the first pool access control rules
         if (address(projectIdToControlPool[keccak256(bytes(_projectId))]) == address(0))
             projectIdToControlPool[keccak256(bytes(_projectId))] = pool;
@@ -134,7 +151,7 @@ contract UBIPoolFactory is AccessControlUpgradeable, UUPSUpgradeable {
         emit PoolCreated(address(pool), _projectId, _ipfs, _settings, _limits);
     }
 
-    function changePoolDetails(UBIPool _pool, string memory _ipfs) external onlyPoolOwner(_pool) {
+    function changePoolDetails(UBIPool _pool, string memory _ipfs) external onlyPoolManager(_pool) {
         registry[address(_pool)].ipfs = _ipfs;
         emit PoolDetailsChanged(address(_pool), _ipfs);
     }
@@ -154,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/HelperLibrary.sol

@@ -16,6 +16,9 @@ library HelperLibrary {
     using SuperTokenV1Library for ISuperToken;
     using CFAv1Library for CFAv1Library.InitData;
 
+    error ZERO_AMOUNT();
+    error ZERO_ADDRESS();
+
     /**
      * @dev A struct containing information about a token swap
      * @param swapFrom The address of the token being swapped
@@ -179,4 +182,11 @@ library HelperLibrary {
             }
         } else if (newFeeRate > 0) newCtx = cfaV1.createFlowWithCtx(newCtx, recipient, superToken, newFeeRate); //passing in the ctx which is sent to the callback here
     }
+
+    function recoverFunds(ISuperToken superToken, address recipient, uint256 amount) external {
+        require(IGoodCollectiveSuperApp(address(this)).getRegistry().hasRole(0x00, msg.sender), "not owner");
+        if (amount == 0) revert ZERO_AMOUNT();
+        if (recipient == address(0)) revert ZERO_ADDRESS();
+        superToken.transfer(recipient, amount);
+    }
 }

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.0",
+  "version": "1.4.0",
   "license": "MIT",
   "types": "./typechain-types/index.ts",
   "files": [
@@ -35,11 +35,11 @@
     "dotenv": "^16.3.1",
     "ethereum-waffle": "^3.0.0",
     "graphql": "^16.7.1",
-    "hardhat": "^2.17.1",
+    "hardhat": "^2.26.2",
     "hardhat-abi-exporter": "^2.10.1",
     "hardhat-celo": "^0.0.4",
     "hardhat-contract-sizer": "^2.10.0",
-    "hardhat-deploy": "^0.12.4",
+    "hardhat-deploy": "^1.0.4",
     "hardhat-gas-reporter": "^1.0.8",
     "prettier": "^2.8.8",
     "prettier-plugin-solidity": "^1.1.3",
@@ -69,4 +69,4 @@
     "test:setup": "yarn exec ./scripts/deployContracts.sh",
     "verify": "npx hardhat run scripts/verify.ts --network ${0}"
   }
-}
+}