Merge pull request #302 from GoodDollar/ipfs-manager-role

add: update ipfs by manager + new registerapp

Author: sirpy

packages/contracts/contracts/DirectPayments/DirectPaymentsFactory.sol

@@ -4,17 +4,18 @@ pragma solidity >=0.8.0;
 // import the DirectPayments contract
 import "./DirectPaymentsPool.sol";
 import "./ProvableNFT.sol";
+import "../GoodCollective/SuperAppBaseFlow.sol";
 import "@openzeppelin/contracts/proxy/ERC1967/ERC1967Proxy.sol";
 import "@openzeppelin/contracts/proxy/beacon/BeaconProxy.sol";
 import "@openzeppelin/contracts/proxy/beacon/UpgradeableBeacon.sol";
-
 import { AccessControlUpgradeable } from "@openzeppelin/contracts-upgradeable/access/AccessControlUpgradeable.sol";
 import { UUPSUpgradeable } from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";
 
 // import "hardhat/console.sol";
 
 contract DirectPaymentsFactory is AccessControlUpgradeable, UUPSUpgradeable {
     error NOT_PROJECT_OWNER();
+    error NOT_PROJECT_MANAGER();
     error NOT_POOL();
 
     event PoolCreated(
@@ -60,9 +61,9 @@ contract DirectPaymentsFactory is AccessControlUpgradeable, UUPSUpgradeable {
         _;
     }
 
-    modifier onlyPoolOwner(DirectPaymentsPool pool) {
-        if (pool.hasRole(pool.DEFAULT_ADMIN_ROLE(), msg.sender) == false) {
-            revert NOT_PROJECT_OWNER();
+    modifier onlyPoolManager(DirectPaymentsPool pool) {
+        if (pool.hasRole(pool.MANAGER_ROLE(), msg.sender) == false) {
+            revert NOT_PROJECT_MANAGER();
         }
 
         _;
@@ -136,6 +137,9 @@ contract DirectPaymentsFactory is AccessControlUpgradeable, UUPSUpgradeable {
             pool = DirectPaymentsPool(address(new ERC1967Proxy(impl.implementation(), initCall)));
         }
 
+        // Register the app with the host
+        IRegisterSuperapp(address(pool.host())).registerApp(address(pool), SuperAppDefinitions.APP_LEVEL_FINAL);
+
         nft.grantRole(nft.getManagerRole(nextNftType), address(pool));
 
         //access control to project is determinted by the first pool access control rules
@@ -153,7 +157,7 @@ contract DirectPaymentsFactory is AccessControlUpgradeable, UUPSUpgradeable {
         nextNftType++;
     }
 
-    function changePoolDetails(DirectPaymentsPool _pool, string memory _ipfs) external onlyPoolOwner(_pool) {
+    function changePoolDetails(DirectPaymentsPool _pool, string memory _ipfs) external onlyPoolManager(_pool) {
         registry[address(_pool)].ipfs = _ipfs;
         emit PoolDetailsChanged(address(_pool), _ipfs);
     }

packages/contracts/contracts/GoodCollective/GoodCollectiveSuperApp.sol

@@ -3,7 +3,7 @@
 pragma solidity >=0.8.0;
 
 import { SuperAppBaseFlow } from "./SuperAppBaseFlow.sol";
-import { ISuperfluid, ISuperToken, SuperAppDefinitions } from "@superfluid-finance/ethereum-contracts/contracts/interfaces/superfluid/ISuperfluid.sol";
+import { ISuperfluid, ISuperToken, SuperAppDefinitions, ISuperApp } from "@superfluid-finance/ethereum-contracts/contracts/interfaces/superfluid/ISuperfluid.sol";
 import { ISuperGoodDollar } from "@gooddollar/goodprotocol/contracts/token/superfluid/ISuperGoodDollar.sol";
 import { SuperTokenV1Library } from "@superfluid-finance/ethereum-contracts/contracts/apps/SuperTokenV1Library.sol";
 import { CFAv1Library, IConstantFlowAgreementV1 } from "@superfluid-finance/ethereum-contracts/contracts/apps/CFAv1Library.sol";
@@ -90,11 +90,11 @@ abstract contract GoodCollectiveSuperApp is SuperAppBaseFlow {
         // Set the super token address
         superToken = _superToken;
 
-        // Define the callback definitions for the app
-        uint256 callBackDefinitions = SuperAppDefinitions.APP_LEVEL_FINAL;
+        // // Define the callback definitions for the app
+        // uint256 callBackDefinitions = SuperAppDefinitions.APP_LEVEL_FINAL;
 
-        // Register the app with the host
-        host.registerApp(callBackDefinitions);
+        // // Register the app with the host
+        // host.registerApp(callBackDefinitions);
 
         //initialize InitData struct, and set equal to cfaV1
         cfaV1 = CFAv1Library.InitData(

packages/contracts/contracts/GoodCollective/SuperAppBaseFlow.sol

@@ -6,6 +6,10 @@ import { SuperTokenV1Library } from "@superfluid-finance/ethereum-contracts/cont
 
 // import "hardhat/console.sol";
 
+interface IRegisterSuperapp {
+    function registerApp(address app, uint256 configWord) external;
+}
+
 abstract contract SuperAppBaseFlow is ISuperApp {
     using SuperTokenV1Library for ISuperToken;
 

packages/contracts/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(
@@ -58,8 +61,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 +124,9 @@ contract UBIPoolFactory is AccessControlUpgradeable, UUPSUpgradeable {
             pool = UBIPool(address(new ERC1967Proxy(impl.implementation(), initCall)));
         }
 
+        // Register the app with the host
+        IRegisterSuperapp(address(pool.host())).registerApp(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 +140,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);
     }

packages/contracts/hardhat.config.ts

@@ -82,7 +82,7 @@ const config: HardhatUserConfig = {
     'production-celo': {
       chainId: 42220,
       url: `https://forno.celo.org`,
-      gasPrice: 5000000000,
+      gasPrice: 25.1e9,
       accounts: [privateKey],
       verify: {
         etherscan: {
@@ -94,7 +94,7 @@ const config: HardhatUserConfig = {
     'development-celo': {
       chainId: 42220,
       url: `https://forno.celo.org`,
-      gasPrice: 5000000000,
+      gasPrice: 25.1e9,
       accounts: {
         mnemonic,
       },