@etherisc/gif-next 0.0.2-e1e92ab-754 → 0.0.2-e2d8c7d-942

package/contracts/instance/service/PoolService.sol

@@ -1,149 +1,124 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.19;
 
+import {Pool} from "../../components/Pool.sol";
 import {IRegistry} from "../../registry/IRegistry.sol";
 import {IInstance} from "../../instance/IInstance.sol";
-import {IBundle} from "../../instance/module/bundle/IBundle.sol";
-import {ITreasury, ITreasuryModule, TokenHandler} from "../../instance/module/treasury/ITreasury.sol";
+import {IBundle} from "../../instance/module/IBundle.sol";
+import {TokenHandler} from "../../instance/module/ITreasury.sol";
+import {ISetup} from "../module/ISetup.sol";
+import {IPolicy} from "../module/IPolicy.sol";
 
 import {IVersionable} from "../../shared/IVersionable.sol";
 import {Versionable} from "../../shared/Versionable.sol";
+import {INftOwnable} from "../../shared/INftOwnable.sol";
 
 import {NftId, NftIdLib, zeroNftId} from "../../types/NftId.sol";
 import {POOL, BUNDLE} from "../../types/ObjectType.sol";
-import {Fee} from "../../types/Fee.sol";
+import {POOL_OWNER_ROLE, RoleId} from "../../types/RoleId.sol";
+import {Fee, FeeLib} from "../../types/Fee.sol";
 import {Version, VersionLib} from "../../types/Version.sol";
+import {KEEP_STATE, StateId} from "../../types/StateId.sol";
+import {TimestampLib, zeroTimestamp} from "../../types/Timestamp.sol";
 
-import {IService} from "../base/IService.sol";
-import {ServiceBase} from "../base/ServiceBase.sol";
+import {IService} from "../../shared/IService.sol";
+import {Service} from "../../shared/Service.sol";
+import {BundleManager} from "../BundleManager.sol";
 import {ComponentServiceBase} from "../base/ComponentServiceBase.sol";
 import {IPoolService} from "./IPoolService.sol";
+import {IRegistryService} from "../../registry/IRegistryService.sol";
+import {InstanceService} from "../InstanceService.sol";
+import {InstanceReader} from "../InstanceReader.sol";
+import {IBaseComponent} from "../../components/IBaseComponent.sol";
 
+string constant POOL_SERVICE_NAME = "PoolService";
 
-contract PoolService is ComponentServiceBase, IPoolService {
+contract PoolService is 
+    ComponentServiceBase, 
+    IPoolService 
+{
     using NftIdLib for NftId;
 
     string public constant NAME = "PoolService";
 
-    constructor(
-        address registry,
-        NftId registryNftId,
-        address initialOwner
-    ) ComponentServiceBase(registry, registryNftId, initialOwner)
+    address internal _registryAddress;
+
+    function _initialize(
+        address owner, 
+        bytes memory data
+    )
+        internal
+        initializer
+        virtual override
     {
+        address registryAddress;
+        address initialOwner;
+        (registryAddress, initialOwner) = abi.decode(data, (address, address));
+        // TODO while PoolService is not deployed in PoolServiceManager constructor
+        //      owner is PoolServiceManager deployer
+        _initializeService(registryAddress, owner);
+
         _registerInterface(type(IPoolService).interfaceId);
     }
 
-    function getName() public pure override(IService, ServiceBase) returns(string memory name) {
+    function getName() public pure override(Service, IService) returns(string memory name) {
         return NAME;
     }
 
-    function setFees(
-        Fee memory poolFee,
-        Fee memory stakingFee,
-        Fee memory performanceFee
-    )
+    function register(address poolAddress) 
         external
-        override
+        returns(NftId poolNftId)
     {
-        (IRegistry.ObjectInfo memory poolInfo, IInstance instance) = _getAndVerifyComponentInfoAndInstance(POOL());
+        address poolOwner = msg.sender;
+        IBaseComponent pool = IBaseComponent(poolAddress);
+
+        IRegistry.ObjectInfo memory info;
+        bytes memory data;
+        (info, data) = getRegistryService().registerPool(pool, poolOwner);
+
+        IInstance instance = _getInstance(info);
+
+        bool hasRole = getInstanceService().hasRole(
+            poolOwner, 
+            POOL_OWNER_ROLE(), 
+            address(instance));
+
+        if(!hasRole) {
+            revert ExpectedRoleMissing(POOL_OWNER_ROLE(), poolOwner);
+        }
 
-        NftId productNftId = instance.getProductNftId(poolInfo.nftId);
-        ITreasury.TreasuryInfo memory treasuryInfo = instance.getTreasuryInfo(productNftId);
-        treasuryInfo.poolFee = poolFee;
-        treasuryInfo.stakingFee = stakingFee;
-        treasuryInfo.performanceFee = performanceFee;
-        instance.setTreasuryInfo(productNftId, treasuryInfo);
+        poolNftId = info.nftId;
+        ISetup.PoolSetupInfo memory initialSetup = _decodeAndVerifyPoolSetup(data);
+        instance.createPoolSetup(poolNftId, initialSetup);
     }
 
-    function createBundle(
-        address owner, 
-        Fee memory fee, 
-        uint256 stakingAmount, 
-        uint256 lifetime, 
-        bytes calldata filter
-    )
-        external
-        override
-        returns(NftId bundleNftId)
+    function _decodeAndVerifyPoolSetup(bytes memory data) internal returns(ISetup.PoolSetupInfo memory setup)
     {
-        (IRegistry.ObjectInfo memory info, IInstance instance) = _getAndVerifyComponentInfoAndInstance(POOL());
-
-        // register bundle with registry
-        NftId poolNftId = info.nftId;
-        bundleNftId = getRegistryService().registerBundle(
-            IRegistry.ObjectInfo(
-                zeroNftId(),
-                poolNftId,
-                BUNDLE(),
-                false, // intercepting property for bundles is defined on pool
-                address(0),
-                owner,
-                ""
-            )
+        setup = abi.decode(
+            data,
+            (ISetup.PoolSetupInfo)
         );
 
-        // create bundle info in instance
-        instance.createBundleInfo(
-            bundleNftId,
-            poolNftId,
-            fee,
-            stakingAmount,
-            lifetime,
-            filter);
-
-        // add bundle to pool in instance
-        instance.addBundleToPool(
-            bundleNftId,
-            poolNftId,
-            stakingAmount);
-
-        // collect capital
-        _processStakingByTreasury(
-            instance,
-            poolNftId,
-            bundleNftId,
-            stakingAmount);
-
-        // TODO add logging
+        // TODO add checks if applicable 
     }
 
-    function setBundleFee(
-        NftId bundleNftId,
-        Fee memory fee
+    function setFees(
+        Fee memory poolFee,
+        Fee memory stakingFee,
+        Fee memory performanceFee
     )
         external
         override
     {
         (IRegistry.ObjectInfo memory poolInfo, IInstance instance) = _getAndVerifyComponentInfoAndInstance(POOL());
-        IBundle.BundleInfo memory bundleInfo = instance.getBundleInfo(bundleNftId);
-        require(bundleInfo.poolNftId.gtz(), "ERROR:PLS-010:BUNDLE_UNKNOWN");
-        require(poolInfo.nftId == bundleInfo.poolNftId, "ERROR:PLS-011:BUNDLE_POOL_MISMATCH");
-        bundleInfo.fee = fee;
-        instance.setBundleInfo(bundleNftId, bundleInfo);
-    }
-
-
-    function _processStakingByTreasury(
-        IInstance instance,
-        NftId poolNftId,
-        NftId bundleNftId,
-        uint256 stakingAmount
-    )
-        internal
-    {
-        // process token transfer(s)
-        if(stakingAmount > 0) {
-            NftId productNftId = instance.getProductNftId(poolNftId);
-            TokenHandler tokenHandler = instance.getTokenHandler(productNftId);
-            address bundleOwner = getRegistry().ownerOf(bundleNftId);
-            address poolWallet = instance.getComponentWallet(poolNftId);
-
-            tokenHandler.transfer(
-                bundleOwner,
-                poolWallet,
-                stakingAmount
-            );
-        }
+        InstanceReader instanceReader = instance.getInstanceReader();
+        NftId poolNftId = poolInfo.nftId;
+
+        ISetup.PoolSetupInfo memory poolSetupInfo = instanceReader.getPoolSetupInfo(poolNftId);
+        poolSetupInfo.poolFee = poolFee;
+        poolSetupInfo.stakingFee = stakingFee;
+        poolSetupInfo.performanceFee = performanceFee;
+        
+        instance.updatePoolSetup(poolNftId, poolSetupInfo, KEEP_STATE());
     }
 }

package/contracts/instance/service/PoolServiceManager.sol

@@ -0,0 +1,54 @@
+// SPDX-License-Identifier: Apache-2.0
+pragma solidity ^0.8.20;
+
+import {IVersionable} from "../../shared/IVersionable.sol";
+import {ProxyManager} from "../../shared/ProxyManager.sol";
+import {PoolService} from "./PoolService.sol";
+import {Registry} from "../../registry/Registry.sol";
+import {RegistryService} from "../../registry/RegistryService.sol";
+import {VersionLib} from "../../types/Version.sol";
+
+contract PoolServiceManager is ProxyManager {
+
+    PoolService private _poolService;
+
+    /// @dev initializes proxy manager with pool service implementation 
+    constructor(
+        address registryAddress
+    )
+        ProxyManager()
+    {
+        PoolService poolSrv = new PoolService();
+        bytes memory data = abi.encode(registryAddress, address(this));
+        IVersionable versionable = deploy(
+            address(poolSrv), 
+            data);
+
+        _poolService = PoolService(address(versionable));
+
+        Registry registry = Registry(registryAddress);
+        address registryServiceAddress = registry.getServiceAddress("RegistryService", VersionLib.toVersion(3, 0, 0).toMajorPart());
+        RegistryService registryService = RegistryService(registryServiceAddress);
+        // TODO this must have a role or own nft to register service
+        //registryService.registerService(_poolService);
+        
+        // TODO no nft to link yet
+        // link ownership of instance service manager ot nft owner of instance service
+        //_linkToNftOwnable(
+        //    address(registryAddress),
+        //    address(_poolService));
+
+        // implies that after this constructor call only upgrade functionality is available
+        _isDeployed = true;
+    }
+
+    //--- view functions ----------------------------------------------------//
+    function getPoolService()
+        external
+        view
+        returns (PoolService poolService)
+    {
+        return _poolService;
+    }
+
+}