@etherisc/gif-next 3.0.0-15742bc-193 → 3.0.0-1664e67-168

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,14 +41,13 @@ contract BundleService is
     )
         internal
         virtual override
-        initializer()
+        onlyInitializing()
     {
         (
-            address authority,
-            address registry
-        ) = abi.decode(data, (address, address));
+            address authority
+        ) = abi.decode(data, (address));
 
-        __Service_init(authority, registry, owner);
+        __Service_init(authority, owner);
 
         _registryService = IRegistryService(_getServiceAddress(REGISTRY()));
         _accountingService = IAccountingService(_getServiceAddress(ACCOUNTING()));
@@ -66,9 +65,12 @@ contract BundleService is
         virtual
         restricted()
     {
-        _checkNftType(bundleNftId, BUNDLE());
+        (
+            NftId poolNftId, 
+            IInstance instance
+        ) = ContractLib.getAndVerifyPoolForBundle(
+            bundleNftId, getRelease());
 
-        (NftId poolNftId, IInstance instance) = PoolLib.getAndVerifyActivePool(getRegistry(), msg.sender);
         InstanceReader instanceReader = instance.getInstanceReader();
         IBundle.BundleInfo memory bundleInfo = instanceReader.getBundleInfo(bundleNftId);
         if(bundleInfo.poolNftId.eqz()) {
@@ -97,7 +99,10 @@ contract BundleService is
         restricted()
         returns(NftId bundleNftId)
     {
-        (NftId poolNftId, IInstance instance) = PoolLib.getAndVerifyActivePool(getRegistry(), msg.sender);
+        (
+            NftId poolNftId, 
+            IInstance instance
+        ) = ContractLib.getAndVerifyPool(getRelease());
 
         // register bundle with registry
         bundleNftId = _registryService.registerBundle(
@@ -105,11 +110,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
@@ -191,9 +196,8 @@ contract BundleService is
         restricted()
     {
         // checks
-        _checkNftType(bundleNftId, BUNDLE());
-
-        (, IInstance instance) = PoolLib.getAndVerifyActivePool(getRegistry(), msg.sender);
+        (, IInstance instance) = ContractLib.getAndVerifyPoolForBundle(
+            bundleNftId, getRelease());
 
         // effects
         // update set of active bundles
@@ -331,9 +335,12 @@ contract BundleService is
         returns (Timestamp extendedExpiredAt) 
     {
         // checks
-        _checkNftType(bundleNftId, BUNDLE());
+        (
+            NftId poolNftId, 
+            IInstance instance
+        ) = ContractLib.getAndVerifyPoolForBundle(
+            bundleNftId, getRelease());
 
-        (NftId poolNftId, IInstance instance) = PoolLib.getAndVerifyActivePool(getRegistry(), msg.sender);
         IBundle.BundleInfo memory bundleInfo = instance.getInstanceReader().getBundleInfo(bundleNftId);
         StateId bundleState = instance.getInstanceReader().getBundleState(bundleNftId);
 
@@ -379,7 +386,6 @@ 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 {IVersionable} from "../upgradeability/IVersionable.sol";
+import {IUpgradeable} from "../upgradeability/IUpgradeable.sol";
 import {ProxyManager} from "../upgradeability/ProxyManager.sol";
 import {BundleService} from "./BundleService.sol";
 
@@ -11,20 +11,18 @@ contract BundleServiceManager is ProxyManager {
 
     /// @dev initializes proxy manager with pool service implementation 
     constructor(
-        address authority, 
-        address registry,
+        address authority,
         bytes32 salt
     ) 
     {
         BundleService svc = new BundleService{salt: salt}();
-        bytes memory data = abi.encode(authority, registry);
-        IVersionable versionable = initialize(
-            registry,
+        bytes memory data = abi.encode(authority);
+        IUpgradeable upgradeable = initialize(
             address(svc), 
             data,
             salt);
 
-        _bundleService = BundleService(address(versionable));
+        _bundleService = BundleService(address(upgradeable));
     }
 
     //--- view functions ----------------------------------------------------//

package/contracts/pool/IPoolService.sol

@@ -18,15 +18,14 @@ interface IPoolService is IService {
     event LogPoolServiceWalletFunded(NftId poolNftId, address poolOwner, Amount amount);
     event LogPoolServiceWalletDefunded(NftId poolNftId, address poolOwner, Amount amount);
 
-    event LogPoolServiceBundleCreated(NftId instanceNftId, NftId poolNftId, NftId bundleNftId);
-    event LogPoolServiceBundleClosed(NftId instanceNftId, NftId poolNftId, NftId bundleNftId);
+    event LogPoolServiceBundleClosed(NftId poolNftId, NftId bundleNftId);
 
-    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 LogPoolServiceBundleStaked(NftId poolNftId, NftId bundleNftId, Amount amount, Amount netAmount);
+    event LogPoolServiceBundleUnstaked(NftId poolNftId, NftId bundleNftId, Amount amount, Amount netAmount);
 
-    event LogPoolServiceFeesWithdrawn(NftId bundleNftId, address recipient, address tokenAddress, Amount amount);
+    event LogPoolServiceFeesWithdrawn(NftId poolNftId, NftId bundleNftId, address recipient, address tokenAddress, Amount amount);
 
-    event LogPoolServiceProcessFundedClaim(NftId policyNftId, ClaimId claimId, Amount availableAmount);
+    event LogPoolServiceProcessFundedClaim(NftId poolNftId, 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,7 +124,6 @@ abstract contract Pool is
     // Internals
 
     function __Pool_init(
-        address registry,
         NftId productNftId,
         string memory name,
         IComponents.PoolInfo memory poolInfo,
@@ -136,7 +135,6 @@ abstract contract Pool is
         onlyInitializing()
     {
         __InstanceLinkedComponent_init(
-            registry, 
             productNftId,  
             name, 
             POOL(), 

package/contracts/pool/PoolLib.sol

@@ -18,6 +18,7 @@ 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 {
 
@@ -76,7 +77,6 @@ library PoolLib {
 
 
     function calculateStakingAmounts(
-        IRegistry registry,
         InstanceReader instanceReader,
         NftId poolNftId,
         Amount stakingAmount
@@ -88,7 +88,7 @@ library PoolLib {
             Amount netStakingAmount
         )
     {
-        NftId productNftId = registry.getParentNftId(poolNftId);
+        NftId productNftId = ContractLib.getRegistry().getParentNftId(poolNftId);
         Fee memory stakingFee = instanceReader.getFeeInfo(productNftId).stakingFee;
         (
             feeAmount,
@@ -100,7 +100,6 @@ library PoolLib {
 
 
     function calculatePayoutAmounts(
-        IRegistry registry,
         InstanceReader instanceReader,
         NftId productNftId,
         NftId policyNftId,
@@ -121,7 +120,7 @@ library PoolLib {
             netPayoutAmount = payoutAmount;
 
             if (payoutBeneficiary == address(0)) {
-                beneficiary = registry.ownerOf(policyNftId);
+                beneficiary = ContractLib.getRegistry().ownerOf(policyNftId);
             } else { 
                 beneficiary = payoutBeneficiary;
             }
@@ -136,14 +135,13 @@ library PoolLib {
 
 
     function getPolicyHolder(
-        IRegistry registry, 
         NftId policyNftId
     )
         internal 
         view 
         returns (IPolicyHolder policyHolder)
     {
-        address policyHolderAddress = registry.ownerOf(policyNftId);
+        address policyHolderAddress = ContractLib.getRegistry().ownerOf(policyNftId);
         policyHolder = IPolicyHolder(policyHolderAddress);
 
         if (!ContractLib.isPolicyHolder(policyHolderAddress)) {
@@ -151,99 +149,7 @@ 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,
@@ -265,7 +171,6 @@ library PoolLib {
             processingFeeAmount,
             beneficiary
         ) = calculatePayoutAmounts(
-            registry,
             instanceReader,
             productNftId, 
             policyNftId,
@@ -287,7 +192,6 @@ library PoolLib {
 
         // callback to policy holder if applicable
         policyHolderPayoutExecuted(
-            registry,
             policyNftId, 
             payoutId, 
             beneficiary, 
@@ -295,7 +199,6 @@ library PoolLib {
     }
 
     function policyHolderPayoutExecuted(
-        IRegistry registry,
         NftId policyNftId, 
         PayoutId payoutId,
         address beneficiary,
@@ -303,7 +206,7 @@ library PoolLib {
     )
         private
     {
-        IPolicyHolder policyHolder = getPolicyHolder(registry, policyNftId);
+        IPolicyHolder policyHolder = getPolicyHolder(policyNftId);
         if(address(policyHolder) != address(0)) {
             policyHolder.payoutExecuted(policyNftId, payoutId, payoutAmount, beneficiary);
         }