@etherisc/gif-next 3.0.0-c46a89a-335 → 3.0.0-c7ba312-823

package/contracts/oracle/OracleServiceManager.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.20;
 
-import {IUpgradeable} from "../upgradeability/IUpgradeable.sol";
+import {IVersionable} from "../upgradeability/IVersionable.sol";
 import {ProxyManager} from "../upgradeability/ProxyManager.sol";
 import {OracleService} from "./OracleService.sol";
 
@@ -12,17 +12,19 @@ contract OracleServiceManager is ProxyManager {
     /// @dev initializes proxy manager with service implementation and deploys instance
     constructor(
         address authority, 
+        address registry,
         bytes32 salt
     ) 
     {
         OracleService svc = new OracleService{salt: salt}();
-        bytes memory data = abi.encode(authority);
-        IUpgradeable upgradeable = initialize(
+        bytes memory data = abi.encode(authority, registry);
+        IVersionable versionable = initialize(
+            registry,
             address(svc), 
             data,
             salt);
 
-        _oracleService = OracleService(address(upgradeable));
+        _oracleService = OracleService(address(versionable));
     }
 
     //--- view functions ----------------------------------------------------//

package/contracts/pool/BasicPool.sol

@@ -18,6 +18,7 @@ abstract contract BasicPool is
 {
 
     function _initializeBasicPool(
+        address registry,
         NftId productNftId,
         string memory name,
         IComponents.PoolInfo memory poolInfo,
@@ -29,6 +30,7 @@ abstract contract BasicPool is
         onlyInitializing()
     {
         __Pool_init(
+            registry, 
             productNftId, 
             name, 
             poolInfo, 
@@ -43,8 +45,8 @@ abstract contract BasicPool is
         public
         virtual
         restricted()
-        onlyBundleOwner(bundleNftId) // TODO single modifier to check everything about given arbitrary nftId
-        onlyNftOfType(bundleNftId, BUNDLE()) // TODO service will check this
+        onlyBundleOwner(bundleNftId)
+        onlyNftOfType(bundleNftId, BUNDLE())
     {
         _stake(bundleNftId, amount);
     }

package/contracts/pool/BasicPoolAuthorization.sol

@@ -2,7 +2,7 @@
 pragma solidity ^0.8.20;
 
 import {IAccess} from "../authorization/IAccess.sol";
-import {IComponent} from "../shared/IComponent.sol";
+import {IInstanceLinkedComponent} from "../shared/IInstanceLinkedComponent.sol";
 import {IPoolComponent} from "./IPoolComponent.sol";
 
 import {Authorization} from "../authorization/Authorization.sol";
@@ -10,9 +10,8 @@ import {BasicPool} from "./BasicPool.sol";
 import {COMPONENT, POOL} from "../type/ObjectType.sol";
 import {PUBLIC_ROLE} from "../../contracts/type/RoleId.sol";
 import {RoleId} from "../type/RoleId.sol";
-import {GIF_INITIAL_RELEASE} from "../registry/Registry.sol";
 import {TokenHandler} from "../shared/TokenHandler.sol";
-import {VersionPartLib} from "../type/Version.sol";
+
 
 contract BasicPoolAuthorization
      is Authorization
@@ -22,7 +21,7 @@ contract BasicPoolAuthorization
           Authorization(
                poolName, 
                POOL(), 
-               GIF_INITIAL_RELEASE(),
+               3,
                COMMIT_HASH,
                TargetType.Component, 
                true)
@@ -71,7 +70,7 @@ contract BasicPoolAuthorization
           _authorize(functions, BasicPool.unstake.selector, "unstake");
           _authorize(functions, BasicPool.extend.selector, "extend");
 
-          _authorize(functions, IComponent.withdrawFees.selector, "withdrawFees");
+          _authorize(functions, IInstanceLinkedComponent.withdrawFees.selector, "withdrawFees");
           _authorize(functions, BasicPool.withdrawBundleFees.selector, "withdrawBundleFees");
 
           // authorize pool service

package/contracts/pool/BundleService.sol

@@ -12,11 +12,11 @@ import {InstanceStore} from "../instance/InstanceStore.sol";
 
 import {Amount, AmountLib} from "../type/Amount.sol";
 import {BundleSet} from "../instance/BundleSet.sol";
-import {ContractLib} from "../shared/ContractLib.sol";
 import {Fee} from "../type/Fee.sol";
 import {InstanceReader} from "../instance/InstanceReader.sol";
 import {NftId, NftIdLib} from "../type/NftId.sol";
 import {ObjectType, ACCOUNTING, COMPONENT, POOL, BUNDLE, POLICY, REGISTRY} from "../type/ObjectType.sol";
+import {PoolLib} from "./PoolLib.sol";
 import {Seconds} from "../type/Seconds.sol";
 import {Service} from "../shared/Service.sol";
 import {StateId, ACTIVE, PAUSED, CLOSED, KEEP_STATE} from "../type/StateId.sol";
@@ -41,13 +41,14 @@ contract BundleService is
     )
         internal
         virtual override
-        onlyInitializing()
+        initializer()
     {
         (
-            address authority
-        ) = abi.decode(data, (address));
+            address authority,
+            address registry
+        ) = abi.decode(data, (address, address));
 
-        __Service_init(authority, owner);
+        __Service_init(authority, registry, owner);
 
         _registryService = IRegistryService(_getServiceAddress(REGISTRY()));
         _accountingService = IAccountingService(_getServiceAddress(ACCOUNTING()));
@@ -65,12 +66,9 @@ contract BundleService is
         virtual
         restricted()
     {
-        (
-            NftId poolNftId, 
-            IInstance instance
-        ) = ContractLib.getAndVerifyPoolForBundle(
-            bundleNftId, getRelease());
+        _checkNftType(bundleNftId, BUNDLE());
 
+        (NftId poolNftId, IInstance instance) = PoolLib.getAndVerifyActivePool(getRegistry(), msg.sender);
         InstanceReader instanceReader = instance.getInstanceReader();
         IBundle.BundleInfo memory bundleInfo = instanceReader.getBundleInfo(bundleNftId);
         if(bundleInfo.poolNftId.eqz()) {
@@ -99,10 +97,7 @@ contract BundleService is
         restricted()
         returns(NftId bundleNftId)
     {
-        (
-            NftId poolNftId, 
-            IInstance instance
-        ) = ContractLib.getAndVerifyPool(getRelease());
+        (NftId poolNftId, IInstance instance) = PoolLib.getAndVerifyActivePool(getRegistry(), msg.sender);
 
         // register bundle with registry
         bundleNftId = _registryService.registerBundle(
@@ -110,11 +105,11 @@ contract BundleService is
                 NftIdLib.zero(), 
                 poolNftId,
                 BUNDLE(),
-                getRelease(),
                 false, // intercepting property for bundles is defined on pool
-                address(0)),
-            owner,
-            "" // bundle data to be stored in registry
+                address(0),
+                owner,
+                "" // bundle data to be stored in registry
+            )
         );
 
         // create bundle info in instance
@@ -135,7 +130,7 @@ contract BundleService is
         BundleSet bundleManager = instance.getBundleSet();
         bundleManager.add(bundleNftId);
 
-        emit LogBundleServiceBundleCreated(bundleNftId, poolNftId, lifetime);
+        emit LogBundleServiceBundleCreated(bundleNftId, poolNftId, lifetime, bundleFee.fixedFee, bundleFee.fractionalFee);
     }
 
 
@@ -196,8 +191,9 @@ contract BundleService is
         restricted()
     {
         // checks
-        (, IInstance instance) = ContractLib.getAndVerifyPoolForBundle(
-            bundleNftId, getRelease());
+        _checkNftType(bundleNftId, BUNDLE());
+
+        (, IInstance instance) = PoolLib.getAndVerifyActivePool(getRegistry(), msg.sender);
 
         // effects
         // update set of active bundles
@@ -335,12 +331,9 @@ contract BundleService is
         returns (Timestamp extendedExpiredAt) 
     {
         // checks
-        (
-            NftId poolNftId, 
-            IInstance instance
-        ) = ContractLib.getAndVerifyPoolForBundle(
-            bundleNftId, getRelease());
+        _checkNftType(bundleNftId, BUNDLE());
 
+        (NftId poolNftId, IInstance instance) = PoolLib.getAndVerifyActivePool(getRegistry(), msg.sender);
         IBundle.BundleInfo memory bundleInfo = instance.getInstanceReader().getBundleInfo(bundleNftId);
         StateId bundleState = instance.getInstanceReader().getBundleState(bundleNftId);
 
@@ -386,6 +379,7 @@ contract BundleService is
         emit LogBundleServiceCollateralReleased(bundleNftId, policyNftId, collateralAmount);
     }
 
+
     function _getDomain() internal pure override returns(ObjectType) {
         return BUNDLE();
     }

package/contracts/pool/BundleServiceManager.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.20;
 
-import {IUpgradeable} from "../upgradeability/IUpgradeable.sol";
+import {IVersionable} from "../upgradeability/IVersionable.sol";
 import {ProxyManager} from "../upgradeability/ProxyManager.sol";
 import {BundleService} from "./BundleService.sol";
 
@@ -11,18 +11,20 @@ contract BundleServiceManager is ProxyManager {
 
     /// @dev initializes proxy manager with pool service implementation 
     constructor(
-        address authority,
+        address authority, 
+        address registry,
         bytes32 salt
     ) 
     {
         BundleService svc = new BundleService{salt: salt}();
-        bytes memory data = abi.encode(authority);
-        IUpgradeable upgradeable = initialize(
+        bytes memory data = abi.encode(authority, registry);
+        IVersionable versionable = initialize(
+            registry,
             address(svc), 
             data,
             salt);
 
-        _bundleService = BundleService(address(upgradeable));
+        _bundleService = BundleService(address(versionable));
     }
 
     //--- view functions ----------------------------------------------------//

package/contracts/pool/IBundleService.sol

@@ -30,7 +30,7 @@ interface IBundleService is IService {
 
     error ErrorBundleServiceExtensionLifetimeIsZero();
 
-    event LogBundleServiceBundleCreated(NftId bundleNftId, NftId poolNftId, Seconds lifetime);
+    event LogBundleServiceBundleCreated(NftId bundleNftId, NftId poolNftId, Seconds lifetime, Amount fixedFee, UFixed fractionalFee);
     event LogBundleServiceBundleClosed(NftId bundleNftId);
     event LogBundleServiceBundleLocked(NftId bundleNftId);
     event LogBundleServiceBundleUnlocked(NftId bundleNftId);

package/contracts/pool/IPoolService.sol

@@ -18,14 +18,15 @@ interface IPoolService is IService {
     event LogPoolServiceWalletFunded(NftId poolNftId, address poolOwner, Amount amount);
     event LogPoolServiceWalletDefunded(NftId poolNftId, address poolOwner, Amount amount);
 
-    event LogPoolServiceBundleClosed(NftId poolNftId, NftId bundleNftId);
+    event LogPoolServiceBundleCreated(NftId instanceNftId, NftId poolNftId, NftId bundleNftId);
+    event LogPoolServiceBundleClosed(NftId instanceNftId, NftId poolNftId, NftId bundleNftId, Amount balanceAmount, Amount feeAmount);
 
-    event LogPoolServiceBundleStaked(NftId poolNftId, NftId bundleNftId, Amount amount, Amount netAmount);
-    event LogPoolServiceBundleUnstaked(NftId poolNftId, NftId bundleNftId, Amount amount, Amount netAmount);
+    event LogPoolServiceBundleStaked(NftId instanceNftId, NftId poolNftId, NftId bundleNftId, Amount amount, Amount netAmount);
+    event LogPoolServiceBundleUnstaked(NftId instanceNftId, NftId poolNftId, NftId bundleNftId, Amount amount, Amount netAmount);
 
-    event LogPoolServiceFeesWithdrawn(NftId poolNftId, NftId bundleNftId, address recipient, address tokenAddress, Amount amount);
+    event LogPoolServiceFeesWithdrawn(NftId bundleNftId, address recipient, address tokenAddress, Amount amount);
 
-    event LogPoolServiceProcessFundedClaim(NftId poolNftId, NftId policyNftId, ClaimId claimId, Amount availableAmount);
+    event LogPoolServiceProcessFundedClaim(NftId policyNftId, ClaimId claimId, Amount availableAmount);
 
     event LogPoolServiceApplicationVerified(NftId poolNftId, NftId bundleNftId, NftId applicationNftId, Amount totalCollateralAmount);
     event LogPoolServiceCollateralLocked(NftId poolNftId, NftId bundleNftId, NftId applicationNftId, Amount totalCollateralAmount, Amount lockedCollateralAmount);

package/contracts/pool/Pool.sol

@@ -35,7 +35,7 @@ abstract contract Pool is
 
 
     modifier onlyBundleOwner(NftId bundleNftId) {
-        if(msg.sender != _getRegistry().ownerOf(bundleNftId)) {
+        if(msg.sender != getRegistry().ownerOf(bundleNftId)) {
             revert ErrorPoolNotBundleOwner(bundleNftId, msg.sender);
         }
         _;
@@ -124,6 +124,7 @@ abstract contract Pool is
     // Internals
 
     function __Pool_init(
+        address registry,
         NftId productNftId,
         string memory name,
         IComponents.PoolInfo memory poolInfo,
@@ -135,6 +136,7 @@ abstract contract Pool is
         onlyInitializing()
     {
         __InstanceLinkedComponent_init(
+            registry, 
             productNftId,  
             name, 
             POOL(), 

package/contracts/pool/PoolLib.sol

@@ -18,7 +18,6 @@ import {ObjectType, BUNDLE, POOL} from "../type/ObjectType.sol";
 import {PayoutId} from "../type/PayoutId.sol";
 import {TokenHandler} from "../shared/TokenHandler.sol";
 import {UFixed} from "../type/UFixed.sol";
-import {VersionPart} from "../type/Version.sol";
 
 library PoolLib {
 
@@ -77,6 +76,7 @@ library PoolLib {
 
 
     function calculateStakingAmounts(
+        IRegistry registry,
         InstanceReader instanceReader,
         NftId poolNftId,
         Amount stakingAmount
@@ -88,7 +88,7 @@ library PoolLib {
             Amount netStakingAmount
         )
     {
-        NftId productNftId = ContractLib.getRegistry().getParentNftId(poolNftId);
+        NftId productNftId = registry.getParentNftId(poolNftId);
         Fee memory stakingFee = instanceReader.getFeeInfo(productNftId).stakingFee;
         (
             feeAmount,
@@ -100,6 +100,7 @@ library PoolLib {
 
 
     function calculatePayoutAmounts(
+        IRegistry registry,
         InstanceReader instanceReader,
         NftId productNftId,
         NftId policyNftId,
@@ -120,7 +121,7 @@ library PoolLib {
             netPayoutAmount = payoutAmount;
 
             if (payoutBeneficiary == address(0)) {
-                beneficiary = ContractLib.getRegistry().ownerOf(policyNftId);
+                beneficiary = registry.ownerOf(policyNftId);
             } else { 
                 beneficiary = payoutBeneficiary;
             }
@@ -135,13 +136,14 @@ library PoolLib {
 
 
     function getPolicyHolder(
+        IRegistry registry, 
         NftId policyNftId
     )
         internal 
         view 
         returns (IPolicyHolder policyHolder)
     {
-        address policyHolderAddress = ContractLib.getRegistry().ownerOf(policyNftId);
+        address policyHolderAddress = registry.ownerOf(policyNftId);
         policyHolder = IPolicyHolder(policyHolderAddress);
 
         if (!ContractLib.isPolicyHolder(policyHolderAddress)) {
@@ -149,7 +151,99 @@ library PoolLib {
         }
     }
 
+
+    function checkAndGetPoolInfo(
+        IRegistry registry,
+        address sender,
+        NftId bundleNftId
+    )
+        public
+        view
+        returns (
+            InstanceReader instanceReader,
+            InstanceStore instanceStore,
+            NftId instanceNftId,
+            NftId poolNftId,
+            IComponents.PoolInfo memory poolInfo
+        )
+    {
+        checkNftType(registry, bundleNftId, BUNDLE());
+
+        IInstance instance;
+        (poolNftId, instance) = getAndVerifyActivePool(registry, sender);
+        instanceReader = instance.getInstanceReader();
+        instanceStore = instance.getInstanceStore();
+        instanceNftId = instance.getNftId();
+        poolInfo = instanceReader.getPoolInfo(poolNftId);
+
+        if (registry.getParentNftId(bundleNftId) != poolNftId) {
+            revert IPoolService.ErrorPoolServiceBundlePoolMismatch(bundleNftId, poolNftId);
+        }
+    }
+
+
+    function getAndVerifyActivePool(
+        IRegistry registry,
+        address sender
+    )
+        public
+        view
+        returns (
+            NftId poolNftId,
+            IInstance instance
+        )
+    {
+        (
+            IRegistry.ObjectInfo memory info, 
+            address instanceAddress
+        ) = ContractLib.getAndVerifyComponent(
+            registry, 
+            sender,
+            POOL(),
+            true); // only active pools
+
+        poolNftId = info.nftId;
+        instance = IInstance(instanceAddress);
+    }
+
+
+    function getAndVerifyActiveComponent(
+        IRegistry registry,
+        address sender,
+        ObjectType expectedComponentType
+    )
+        public
+        view
+        returns (
+            NftId componentNftId,
+            IInstance instance
+        )
+    {
+        (
+            IRegistry.ObjectInfo memory info, 
+            address instanceAddress
+        ) = ContractLib.getAndVerifyComponent(
+            registry, 
+            sender,
+            expectedComponentType,
+            true); // only active components
+
+        componentNftId = info.nftId;
+        instance = IInstance(instanceAddress);
+    }
+
+    function checkNftType(
+        IRegistry registry, 
+        NftId nftId, 
+        ObjectType expectedObjectType
+    ) internal view {
+        if(!registry.isObjectType(nftId, expectedObjectType)) {
+            revert INftOwnable.ErrorNftOwnableInvalidType(nftId, expectedObjectType);
+        }
+    }
+
     function transferTokenAndNotifyPolicyHolder(
+        IRegistry registry,
         InstanceReader instanceReader,
         TokenHandler poolTokenHandler,
         NftId productNftId,
@@ -171,6 +265,7 @@ library PoolLib {
             processingFeeAmount,
             beneficiary
         ) = calculatePayoutAmounts(
+            registry,
             instanceReader,
             productNftId, 
             policyNftId,
@@ -192,6 +287,7 @@ library PoolLib {
 
         // callback to policy holder if applicable
         policyHolderPayoutExecuted(
+            registry,
             policyNftId, 
             payoutId, 
             beneficiary, 
@@ -199,6 +295,7 @@ library PoolLib {
     }
 
     function policyHolderPayoutExecuted(
+        IRegistry registry,
         NftId policyNftId, 
         PayoutId payoutId,
         address beneficiary,
@@ -206,7 +303,7 @@ library PoolLib {
     )
         private
     {
-        IPolicyHolder policyHolder = getPolicyHolder(policyNftId);
+        IPolicyHolder policyHolder = getPolicyHolder(registry, policyNftId);
         if(address(policyHolder) != address(0)) {
             policyHolder.payoutExecuted(policyNftId, payoutId, payoutAmount, beneficiary);
         }