@etherisc/gif-next 0.0.2-e8b06c8-540 → 0.0.2-e8ea5fe-337

package/contracts/instance/InstanceAuthorizationV3.sol

@@ -6,17 +6,15 @@ import {
 } from "../../contracts/type/ObjectType.sol";
 
 import {
-     ADMIN_ROLE, DISTRIBUTION_OWNER_ROLE, ORACLE_OWNER_ROLE, POOL_OWNER_ROLE, PRODUCT_OWNER_ROLE
+     DISTRIBUTION_OWNER_ROLE, ORACLE_OWNER_ROLE, POOL_OWNER_ROLE, PRODUCT_OWNER_ROLE
 } from "../../contracts/type/RoleId.sol";
 
-import {BundleManager} from "../instance/BundleManager.sol"; 
+import {BundleSet} from "../instance/BundleSet.sol"; 
 import {IAccess} from "../authorization/IAccess.sol";
 import {Instance} from "../instance/Instance.sol";
-import {InstanceAdminNew} from "../instance/InstanceAdminNew.sol";
+import {InstanceAdmin} from "../instance/InstanceAdmin.sol";
 import {InstanceStore} from "../instance/InstanceStore.sol";
 import {ModuleAuthorization} from "../authorization/ModuleAuthorization.sol";
-import {RoleId} from "../type/RoleId.sol";
-import {VersionPart, VersionPartLib} from "../type/Version.sol";
 
 
 contract InstanceAuthorizationV3
@@ -26,7 +24,7 @@ contract InstanceAuthorizationV3
      string public constant INSTANCE_TARGET_NAME = "Instance";
      string public constant INSTANCE_STORE_TARGET_NAME = "InstanceStore";
      string public constant INSTANCE_ADMIN_TARGET_NAME = "InstanceAdmin";
-     string public constant BUNDLE_MANAGER_TARGET_NAME = "BundleManager";
+     string public constant BUNDLE_SET_TARGET_NAME = "BundleSet";
 
      string public constant INSTANCE_ROLE_NAME = "InstanceRole";
      string public constant DISTRIBUTION_OWNER_ROLE_NAME = "DistributionOwnerRole";
@@ -61,7 +59,7 @@ contract InstanceAuthorizationV3
           // instance supporting targets
           _addTarget(INSTANCE_STORE_TARGET_NAME);
           _addTarget(INSTANCE_ADMIN_TARGET_NAME);
-          _addTarget(BUNDLE_MANAGER_TARGET_NAME);
+          _addTarget(BUNDLE_SET_TARGET_NAME);
 
           // service targets relevant to instance
           _addServiceTargetWithRole(INSTANCE());
@@ -84,22 +82,22 @@ contract InstanceAuthorizationV3
           _setupInstanceAuthorization();
           _setupInstanceAdminAuthorization();
           _setupInstanceStoreAuthorization();
-          _setupBundleManagerAuthorization();
+          _setupBundleSetAuthorization();
      }
 
 
-     function _setupBundleManagerAuthorization()
+     function _setupBundleSetAuthorization()
           internal
      {
           IAccess.FunctionInfo[] storage functions;
 
           // authorize bundle service role
-          functions = _authorizeForTarget(BUNDLE_MANAGER_TARGET_NAME, getServiceRole(BUNDLE()));
-          _authorize(functions, BundleManager.linkPolicy.selector, "linkPolicy");
-          _authorize(functions, BundleManager.unlinkPolicy.selector, "unlinkPolicy");
-          _authorize(functions, BundleManager.add.selector, "add");
-          _authorize(functions, BundleManager.lock.selector, "lock");
-          _authorize(functions, BundleManager.unlock.selector, "unlock");
+          functions = _authorizeForTarget(BUNDLE_SET_TARGET_NAME, getServiceRole(BUNDLE()));
+          _authorize(functions, BundleSet.linkPolicy.selector, "linkPolicy");
+          _authorize(functions, BundleSet.unlinkPolicy.selector, "unlinkPolicy");
+          _authorize(functions, BundleSet.add.selector, "add");
+          _authorize(functions, BundleSet.lock.selector, "lock");
+          _authorize(functions, BundleSet.unlock.selector, "unlock");
      }
 
 
@@ -108,12 +106,8 @@ contract InstanceAuthorizationV3
      {
           IAccess.FunctionInfo[] storage functions;
 
-          // TODO cleanup
           // authorize instance service role
           functions = _authorizeForTarget(INSTANCE_TARGET_NAME, getServiceRole(INSTANCE()));
-          // _authorize(functions, Instance.setInstanceAdmin.selector, "setInstanceAdmin");
-          // _authorize(functions, Instance.setInstanceStore.selector, "setInstanceStore");
-          // _authorize(functions, Instance.setBundleManager.selector, "setBundleManager");
           _authorize(functions, Instance.setInstanceReader.selector, "setInstanceReader");
      }
 
@@ -125,17 +119,10 @@ contract InstanceAuthorizationV3
 
           // authorize instance role
           functions = _authorizeForTarget(INSTANCE_ADMIN_TARGET_NAME, _getTargetRoleId(INSTANCE()));
-          // _authorize(functions, InstanceAdminNew.createRole.selector, "createRole");
-          _authorize(functions, InstanceAdminNew.grantRole.selector, "grantRole");
-          // _authorize(functions, InstanceAdminNew.createTarget.selector, "createTarget");
-          // _authorize(functions, InstanceAdminNew.setTargetFunctionRoleByInstance.selector, "setTargetFunctionRoleByInstance");
-          // _authorize(functions, InstanceAdminNew.setTargetLockedByInstance.selector, "setTargetLockedByInstance");
+          _authorize(functions, InstanceAdmin.grantRole.selector, "grantRole");
 
           // authorize instance service role
-          functions = _authorizeForTarget(INSTANCE_ADMIN_TARGET_NAME, getServiceRole(INSTANCE()));
-          // _authorize(functions, InstanceAdminNew.createGifTarget.selector, "createGifTarget");
-          // _authorize(functions, InstanceAdminNew.setTargetLockedByService.selector, "setTargetLockedByService");
-          // _authorize(functions, InstanceAdminNew.setTargetFunctionRoleByService.selector, "setTargetFunctionRoleByService");
+          // functions = _authorizeForTarget(INSTANCE_ADMIN_TARGET_NAME, getServiceRole(INSTANCE()));
      }
 
 
@@ -152,7 +139,9 @@ contract InstanceAuthorizationV3
           _authorize(functions, InstanceStore.createProduct.selector, "createProduct");
           _authorize(functions, InstanceStore.updateProduct.selector, "updateProduct");
           _authorize(functions, InstanceStore.increaseBalance.selector, "increaseBalance");
+          _authorize(functions, InstanceStore.decreaseBalance.selector, "decreaseBalance");
           _authorize(functions, InstanceStore.increaseFees.selector, "increaseFees");
+          _authorize(functions, InstanceStore.decreaseFees.selector, "decreaseFees");
 
           // authorize distribution service role
           functions = _authorizeForTarget(INSTANCE_STORE_TARGET_NAME, getServiceRole(DISTRIBUTION()));
@@ -200,6 +189,8 @@ contract InstanceAuthorizationV3
           functions = _authorizeForTarget(INSTANCE_STORE_TARGET_NAME, getServiceRole(POLICY()));
           _authorize(functions, InstanceStore.updatePolicy.selector, "updatePolicy");
           _authorize(functions, InstanceStore.updatePolicyState.selector, "updatePolicyState");
+          _authorize(functions, InstanceStore.createPremium.selector, "createPremium");
+          _authorize(functions, InstanceStore.updatePremiumState.selector, "updatePremiumState");
 
           // authorize claim service role
           functions = _authorizeForTarget(INSTANCE_STORE_TARGET_NAME, getServiceRole(CLAIM()));

package/contracts/instance/InstanceReader.sol

@@ -1,25 +1,20 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.20;
 
-import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
-
 import {Amount} from "../type/Amount.sol";
 import {ClaimId} from "../type/ClaimId.sol";
 import {DistributorType} from "../type/DistributorType.sol";
-import {Fee, FeeLib} from "../type/Fee.sol";
 import {Key32} from "../type/Key32.sol";
 import {NftId} from "../type/NftId.sol";
-import {ObjectType, COMPONENT, DISTRIBUTOR, DISTRIBUTION, INSTANCE, PRODUCT, POLICY, POOL, BUNDLE} from "../type/ObjectType.sol";
+import {COMPONENT, DISTRIBUTOR, DISTRIBUTION, PREMIUM, PRODUCT, POLICY, POOL, BUNDLE} from "../type/ObjectType.sol";
 import {PayoutId} from "../type/PayoutId.sol";
 import {ReferralId, ReferralStatus, ReferralLib, REFERRAL_OK, REFERRAL_ERROR_UNKNOWN, REFERRAL_ERROR_EXPIRED, REFERRAL_ERROR_EXHAUSTED} from "../type/Referral.sol";
 import {RequestId} from "../type/RequestId.sol";
 import {RiskId} from "../type/RiskId.sol";
 import {RoleId} from "../type/RoleId.sol";
 import {StateId} from "../type/StateId.sol";
-import {UFixed, MathLib, UFixedLib} from "../type/UFixed.sol";
-import {Version} from "../type/Version.sol";
+import {UFixed, UFixedLib} from "../type/UFixed.sol";
 
-import {IRegistry} from "../registry/IRegistry.sol";
 import {IBundle} from "../instance/module/IBundle.sol";
 import {IComponents} from "../instance/module/IComponents.sol";
 import {IDistribution} from "../instance/module/IDistribution.sol";
@@ -49,11 +44,6 @@ contract InstanceReader {
             revert ErrorInstanceReaderAlreadyInitialized();
         }
 
-        // TODO cleanup
-        // _initialized = true;
-        // _instance = IInstance(msg.sender);
-        // _store = _instance.getInstanceStore();
-
         initializeWithInstance(msg.sender);
     }
 
@@ -90,6 +80,33 @@ contract InstanceReader {
         return _store.getState(toPolicyKey(policyNftId));
     }
 
+    function getPremiumInfo(NftId policyNftId) 
+        public
+        view
+        returns (IPolicy.PremiumInfo memory info)
+    {
+        bytes memory data = _store.getData(toPremiumKey(policyNftId));
+        if (data.length > 0) {
+            return abi.decode(data, (IPolicy.PremiumInfo));
+        }
+    }
+
+    function getPremiumInfoState(NftId policyNftId) 
+        public
+        view
+        returns (StateId state)
+    {
+        return _store.getState(toPremiumKey(policyNftId));
+    }
+
+    function getBundleState(NftId bundleNftId)
+        public
+        view
+        returns (StateId state)
+    {
+        return _store.getState(toBundleKey(bundleNftId));
+    }
+
     /// @dev returns true iff policy may be closed
     /// a policy can be closed all conditions below are met
     /// - policy exists
@@ -366,6 +383,9 @@ contract InstanceReader {
         return policyNftId.toKey32(POLICY());
     }
 
+    function toPremiumKey(NftId policyNftId) public pure returns (Key32) { 
+        return policyNftId.toKey32(PREMIUM());
+    }
 
     function toDistributorKey(NftId distributorNftId) public pure returns (Key32) { 
         return distributorNftId.toKey32(DISTRIBUTOR());

package/contracts/instance/InstanceService.sol

@@ -4,8 +4,9 @@ pragma solidity ^0.8.20;
 import {Clones} from "@openzeppelin/contracts/proxy/Clones.sol";
 import {ShortString, ShortStrings} from "@openzeppelin/contracts/utils/ShortStrings.sol";
 
+import {AccessManagerCloneable} from "../authorization/AccessManagerCloneable.sol";
 import {Amount} from "../type/Amount.sol";
-import {BundleManager} from "./BundleManager.sol";
+import {BundleSet} from "./BundleSet.sol";
 import {ChainNft} from "../registry/ChainNft.sol";
 import {NftId} from "../type/NftId.sol";
 import {RoleId} from "../type/RoleId.sol";
@@ -30,13 +31,10 @@ import {TargetManagerLib} from "../staking/TargetManagerLib.sol";
 import {Instance} from "./Instance.sol";
 import {IModuleAuthorization} from "../authorization/IModuleAuthorization.sol";
 import {IInstance} from "./IInstance.sol";
-// TODO cleanup
 import {InstanceAdmin} from "./InstanceAdmin.sol";
-import {InstanceAdminNew} from "./InstanceAdminNew.sol";
 import {IInstanceService} from "./IInstanceService.sol";
 import {InstanceReader} from "./InstanceReader.sol";
 import {InstanceStore} from "./InstanceStore.sol";
-import {InstanceAuthorizationsLib} from "./InstanceAuthorizationsLib.sol";
 import {Seconds} from "../type/Seconds.sol";
 import {VersionPart, VersionPartLib} from "../type/Version.sol";
 
@@ -52,16 +50,17 @@ contract InstanceService is
     IRegistryService internal _registryService;
     IStakingService internal _stakingService;
 
+    address internal _masterAccessManager;
     address internal _masterInstanceAdmin;
     address internal _masterInstance;
     address internal _masterInstanceReader;
-    address internal _masterInstanceBundleManager;
+    address internal _masterInstanceBundleSet;
     address internal _masterInstanceStore;
 
 
     modifier onlyInstance() {        
         address instanceAddress = msg.sender;
-        NftId instanceNftId = getRegistry().getNftId(msg.sender);
+        NftId instanceNftId = getRegistry().getNftIdForAddress(msg.sender);
         if (instanceNftId.eqz()) {
             revert ErrorInstanceServiceNotRegistered(instanceAddress);
         }
@@ -95,7 +94,7 @@ contract InstanceService is
         _;
     }
 
-    function createInstanceClone()
+    function createInstance()
         external 
         returns (
             Instance clonedInstance,
@@ -105,37 +104,9 @@ contract InstanceService is
         // tx sender will become instance owner
         address instanceOwner = msg.sender;
 
-        // start with setting up the instance admin
-        InstanceAdminNew clonedInstanceAdmin = InstanceAdminNew(Clones.clone(_masterInstanceAdmin));
-        clonedInstanceAdmin.initialize(InstanceAdminNew(_masterInstanceAdmin).getInstanceAuthorization());
-
-        InstanceStore clonedInstanceStore = InstanceStore(Clones.clone(address(_masterInstanceStore)));
-        BundleManager clonedBundleManager = BundleManager(Clones.clone(_masterInstanceBundleManager));
-        InstanceReader clonedInstanceReader = InstanceReader(Clones.clone(address(_masterInstanceReader)));
-
-        // clone instance
-        clonedInstance = Instance(Clones.clone(_masterInstance));
-        clonedInstance.initialize(
-            clonedInstanceAdmin,
-            clonedInstanceStore,
-            clonedBundleManager,
-            clonedInstanceReader,
-            getRegistry(),
-            instanceOwner);
-
-        // TODO cleanup
-        // // initialize and set before instance reader
-        // InstanceStore clonedInstanceStore = InstanceStore(Clones.clone(address(_masterInstanceStore)));
-        // clonedInstanceStore.initialize(address(clonedInstance));
-        // clonedInstance.setInstanceStore(clonedInstanceStore);
-        
-        // InstanceReader clonedInstanceReader = InstanceReader(Clones.clone(address(_masterInstanceReader)));
-        // clonedInstanceReader.initialize(address(clonedInstance));
-        // clonedInstance.setInstanceReader(clonedInstanceReader);
-
-        // BundleManager clonedBundleManager = BundleManager(Clones.clone(_masterInstanceBundleManager));
-        // clonedBundleManager.initialize(address(clonedInstance));
-        // clonedInstance.setBundleManager(clonedBundleManager);
+        // create instance admin and instance
+        InstanceAdmin instanceAdmin = _createInstanceAdmin();
+        clonedInstance = _createInstance(instanceAdmin, instanceOwner);
 
         // register cloned instance with registry
         clonedInstanceNftId = _registryService.registerInstance(
@@ -148,90 +119,20 @@ contract InstanceService is
             TargetManagerLib.getDefaultRewardRate());
 
         // MUST be set after instance is set up and registered
-        clonedInstanceAdmin.initializeInstanceAuthorization(address(clonedInstance));
+        instanceAdmin.initializeInstanceAuthorization(address(clonedInstance));
 
         emit LogInstanceCloned(
             clonedInstanceNftId,
             address(clonedInstance));
     }
 
-    // TODO cleanup/remove
-    // function _createInstanceCloneOld()
-    //     external 
-    //     returns (
-    //         Instance clonedInstance,
-    //         NftId clonedInstanceNftId
-    //     )
-    // {
-    //     address instanceOwner = msg.sender;
-    //     AccessManagerExtendedInitializeable clonedAccessManager = AccessManagerExtendedInitializeable(
-    //         Clones.clone(_masterAccessManager));
-
-    //     // initially grants ADMIN_ROLE to this (being the instance service). 
-    //     // This will allow the instance service to bootstrap the authorizations of the instance.
-    //     // Instance service will renounce ADMIN_ROLE when bootstraping is finished
-    //     clonedAccessManager.initialize(address(this));
-
-    //     clonedInstance = Instance(Clones.clone(_masterInstance));
-    //     // clonedInstance.initialize(
-    //     //     address(clonedAccessManager),
-    //     //     address(getRegistry()), 
-    //     //     instanceOwner);
-    //     // initialize and set before instance reader
-    //     InstanceStore clonedInstanceStore = InstanceStore(Clones.clone(address(_masterInstanceStore)));
-    //     // clonedInstanceStore.initialize(address(clonedInstance));
-    //     clonedInstance.setInstanceStore(clonedInstanceStore);
-        
-    //     InstanceReader clonedInstanceReader = InstanceReader(Clones.clone(address(_masterInstanceReader)));
-    //     // clonedInstanceReader.initialize(address(clonedInstance));
-    //     clonedInstance.setInstanceReader(clonedInstanceReader);
-
-    //     BundleManager clonedBundleManager = BundleManager(Clones.clone(_masterInstanceBundleManager));
-    //     // clonedBundleManager.initialize(address(clonedInstance));
-    //     clonedInstance.setBundleManager(clonedBundleManager);
-
-    //     InstanceAdmin clonedInstanceAdmin = InstanceAdmin(Clones.clone(_masterInstanceAdmin));
-    //     clonedAccessManager.grantRole(ADMIN_ROLE().toInt(), address(clonedInstanceAdmin), 0);
-    //     // clonedInstanceAdmin.initialize(address(clonedInstance));
-    //     // clonedInstance.setInstanceAdmin(clonedInstanceAdmin);
-
-    //     // TODO amend setters with instance specific , policy manager ...
-
-    //     // TODO library does external calls -> but it is registry and access manager -> find out is it best practice
-    //     InstanceAuthorizationsLib.grantInitialAuthorizations(
-    //         clonedAccessManager, 
-    //         clonedInstanceAdmin, 
-    //         clonedInstance, 
-    //         clonedBundleManager, 
-    //         clonedInstanceStore, 
-    //         instanceOwner,
-    //         getRegistry(),
-    //         getVersion().toMajorPart());
-
-    //     clonedAccessManager.renounceRole(ADMIN_ROLE().toInt(), address(this));
-
-    //     // register new instance with registry
-    //     IRegistry.ObjectInfo memory info = _registryService.registerInstance(clonedInstance, instanceOwner);
-    //     clonedInstanceNftId = info.nftId;
-
-    //     // create corresponding staking target
-    //     _stakingService.createInstanceTarget(
-    //         clonedInstanceNftId,
-    //         TargetManagerLib.getDefaultLockingPeriod(),
-    //         TargetManagerLib.getDefaultRewardRate());
-
-    //     emit LogInstanceCloned(
-    //         clonedInstanceNftId,
-    //         address(clonedInstance));
-    // }
-
 
     function setStakingLockingPeriod(Seconds stakeLockingPeriod)
         external
         virtual
         onlyInstance()
     {
-        NftId instanceNftId = getRegistry().getNftId(msg.sender);
+        NftId instanceNftId = getRegistry().getNftIdForAddress(msg.sender);
         _stakingService.setInstanceLockingPeriod(
             instanceNftId,
             stakeLockingPeriod);
@@ -243,7 +144,7 @@ contract InstanceService is
         virtual
         onlyInstance()
     {
-        NftId instanceNftId = getRegistry().getNftId(msg.sender);
+        NftId instanceNftId = getRegistry().getNftIdForAddress(msg.sender);
         _stakingService.setInstanceRewardRate(
             instanceNftId,
             rewardRate);
@@ -255,7 +156,7 @@ contract InstanceService is
         virtual
         onlyInstance()
     {
-        NftId instanceNftId = getRegistry().getNftId(msg.sender);
+        NftId instanceNftId = getRegistry().getNftIdForAddress(msg.sender);
         _stakingService.refillInstanceRewardReserves(
             instanceNftId,
             rewardProvider,
@@ -269,7 +170,7 @@ contract InstanceService is
         onlyInstance()
         returns (Amount newBalance)
     {
-        NftId instanceNftId = getRegistry().getNftId(msg.sender);
+        NftId instanceNftId = getRegistry().getNftIdForAddress(msg.sender);
         _stakingService.withdrawInstanceRewardReserves(
             instanceNftId,
             dipAmount);
@@ -314,35 +215,38 @@ contract InstanceService is
     {
         if(_masterInstance != address(0)) { revert ErrorInstanceServiceMasterInstanceAlreadySet(); }
         if(_masterInstanceAdmin != address(0)) { revert ErrorInstanceServiceMasterInstanceAdminAlreadySet(); }
-        if(_masterInstanceBundleManager != address(0)) { revert ErrorInstanceServiceMasterBundleManagerAlreadySet(); }
+        if(_masterInstanceBundleSet != address(0)) { revert ErrorInstanceServiceMasterBundleSetAlreadySet(); }
 
         if(instanceAddress == address(0)) { revert ErrorInstanceServiceInstanceAddressZero(); }
 
         IInstance instance = IInstance(instanceAddress);
-        InstanceAdminNew instanceAdmin = instance.getInstanceAdmin();
+        address accessManagerAddress = instance.authority();
+        InstanceAdmin instanceAdmin = instance.getInstanceAdmin();
         address instanceAdminAddress = address(instanceAdmin);
         InstanceReader instanceReader = instance.getInstanceReader();
         address instanceReaderAddress = address(instanceReader);
-        BundleManager bundleManager = instance.getBundleManager();
+        BundleSet bundleManager = instance.getBundleSet();
         address bundleManagerAddress = address(bundleManager);
         InstanceStore instanceStore = instance.getInstanceStore();
         address instanceStoreAddress = address(instanceStore);
 
+        if(accessManagerAddress == address(0)) { revert ErrorInstanceServiceAccessManagerZero(); }
         if(instanceAdminAddress == address(0)) { revert ErrorInstanceServiceInstanceAdminZero(); }
         if(instanceReaderAddress == address(0)) { revert ErrorInstanceServiceInstanceReaderZero(); }
-        if(bundleManagerAddress == address(0)) { revert ErrorInstanceServiceBundleManagerZero(); }
+        if(bundleManagerAddress == address(0)) { revert ErrorInstanceServiceBundleSetZero(); }
         if(instanceStoreAddress == address(0)) { revert ErrorInstanceServiceInstanceStoreZero(); }
         
         if(instance.authority() != instanceAdmin.authority()) { revert ErrorInstanceServiceInstanceAuthorityMismatch(); }
-        if(bundleManager.authority() != instanceAdmin.authority()) { revert ErrorInstanceServiceBundleManagerAuthorityMismatch(); }
+        if(bundleManager.authority() != instanceAdmin.authority()) { revert ErrorInstanceServiceBundleSetAuthorityMismatch(); }
         if(instanceStore.authority() != instanceAdmin.authority()) { revert ErrorInstanceServiceInstanceStoreAuthorityMismatch(); }
         if(bundleManager.getInstance() != instance) { revert ErrorInstanceServiceBundleMangerInstanceMismatch(); }
         if(instanceReader.getInstance() != instance) { revert ErrorInstanceServiceInstanceReaderInstanceMismatch2(); }
 
+        _masterAccessManager = accessManagerAddress;
         _masterInstanceAdmin = instanceAdminAddress;
         _masterInstance = instanceAddress;
         _masterInstanceReader = instanceReaderAddress;
-        _masterInstanceBundleManager = bundleManagerAddress;
+        _masterInstanceBundleSet = bundleManagerAddress;
         _masterInstanceStore = instanceStoreAddress;
         
         IInstance masterInstance = IInstance(_masterInstance);
@@ -408,9 +312,9 @@ contract InstanceService is
             instanceNftId, 
             address(component));
 
-        InstanceAdminNew instanceAdmin = instance.getInstanceAdmin();
+        InstanceAdmin instanceAdmin = instance.getInstanceAdmin();
         instanceAdmin.initializeComponentAuthorization(
-            address(component),
+            component,
             component.getAuthorization());
     }
 
@@ -435,6 +339,53 @@ contract InstanceService is
         );
     }
 
+    /// @dev create new cloned instance admin
+    /// function used to setup a new instance
+    function _createInstanceAdmin()
+        internal
+        virtual
+        returns (InstanceAdmin clonedInstanceAdmin)
+    {
+        // start with setting up a new OZ access manager
+        AccessManagerCloneable clonedAccessManager = AccessManagerCloneable(
+            Clones.clone(_masterAccessManager));
+        
+        // set up the instance admin
+        clonedInstanceAdmin = InstanceAdmin(Clones.clone(_masterInstanceAdmin));
+        clonedAccessManager.initialize(
+            address(clonedInstanceAdmin)); // grant ADMIN_ROLE to instance admin
+
+        clonedInstanceAdmin.initialize(
+            clonedAccessManager,
+            InstanceAdmin(_masterInstanceAdmin).getInstanceAuthorization());
+    }
+
+
+    /// @dev create new cloned instance
+    /// function used to setup a new instance
+    function _createInstance(
+        InstanceAdmin instanceAdmin,
+        address instanceOwner
+    )
+        internal
+        virtual
+        returns (Instance clonedInstance)
+    {
+        InstanceStore clonedInstanceStore = InstanceStore(Clones.clone(address(_masterInstanceStore)));
+        BundleSet clonedBundleSet = BundleSet(Clones.clone(_masterInstanceBundleSet));
+        InstanceReader clonedInstanceReader = InstanceReader(Clones.clone(address(_masterInstanceReader)));
+
+        // clone instance
+        clonedInstance = Instance(Clones.clone(_masterInstance));
+        clonedInstance.initialize(
+            instanceAdmin,
+            clonedInstanceStore,
+            clonedBundleSet,
+            clonedInstanceReader,
+            getRegistry(),
+            instanceOwner);
+    }
+
 
     /// all gif targets MUST be children of instanceNftId
     function _createGifTarget(
@@ -453,7 +404,7 @@ contract InstanceService is
             // or targetInfo
         ) = _validateInstanceAndComponent(instanceNftId, targetAddress);
 
-        InstanceAdminNew instanceAdmin = instance.getInstanceAdmin();
+        InstanceAdmin instanceAdmin = instance.getInstanceAdmin();
 
         // TODO refactor/implement
         // instanceAdmin.createGifTarget(targetAddress, targetName);

package/contracts/instance/InstanceServiceManager.sol

@@ -1,13 +1,9 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.20;
 
-import {Instance} from "./Instance.sol";
-import {IVersionable} from "../shared/IVersionable.sol";
-import {ProxyManager} from "../shared/ProxyManager.sol";
+import {IVersionable} from "../upgradeability/IVersionable.sol";
+import {ProxyManager} from "../upgradeability/ProxyManager.sol";
 import {InstanceService} from "./InstanceService.sol";
-import {Registry} from "../registry/Registry.sol";
-import {RegistryService} from "../registry/RegistryService.sol";
-import {REGISTRY} from "../type/ObjectType.sol";
 
 contract InstanceServiceManager is ProxyManager {
 

package/contracts/instance/InstanceStore.sol

@@ -7,7 +7,7 @@ import {Amount} from "../type/Amount.sol";
 import {Key32} from "../type/Key32.sol";
 import {NftId} from "../type/NftId.sol";
 import {ClaimId} from "../type/ClaimId.sol";
-import {ObjectType, BUNDLE, POLICY, POOL, PRODUCT, COMPONENT, DISTRIBUTOR, DISTRIBUTOR_TYPE} from "../type/ObjectType.sol";
+import {ObjectType, BUNDLE, POLICY, POOL, PREMIUM, PRODUCT, COMPONENT, DISTRIBUTOR} from "../type/ObjectType.sol";
 import {RequestId} from "../type/RequestId.sol";
 import {RiskId} from "../type/RiskId.sol";
 import {StateId} from "../type/StateId.sol";
@@ -27,12 +27,15 @@ import {IPolicy} from "./module/IPolicy.sol";
 import {IOracle} from "../oracle/IOracle.sol";
 import {IRisk} from "./module/IRisk.sol";
 
+import {ObjectLifecycle} from "./base/ObjectLifecycle.sol";
+
 
 contract InstanceStore is
     AccessManagedUpgradeable, 
     BalanceStore,
     KeyValueStore,
-    ObjectCounter
+    ObjectCounter,
+    ObjectLifecycle
 {
 
     /// @dev This initializer needs to be called from the instance itself.
@@ -44,8 +47,8 @@ contract InstanceStore is
         address authority = IInstance(instance).authority();
 
         __AccessManaged_init(authority);
-
-        initializeLifecycle();
+        // double initialization, safe
+        _initializeLifecycle();
     }
 
     //--- Component ---------------------------------------------------------//
@@ -113,6 +116,7 @@ contract InstanceStore is
 
     //--- Distributor -------------------------------------------------------//
     function createDistributor(NftId distributorNftId, IDistribution.DistributorInfo memory info) external restricted() {
+        _registerBalanceTarget(distributorNftId);
         _create(_toNftKey32(distributorNftId, DISTRIBUTOR()), abi.encode(info));
     }
 
@@ -191,6 +195,16 @@ contract InstanceStore is
         _updateState(_toNftKey32(policyNftId, POLICY()), newState);
     }
 
+    
+    //--- Premium (Policy) ----------------------------------------------//
+    function createPremium(NftId policyNftId, IPolicy.PremiumInfo memory premium) external restricted() {
+        _create(_toNftKey32(policyNftId, PREMIUM()), abi.encode(premium));
+    }
+
+    function updatePremiumState(NftId policyNftId, StateId newState) external restricted() {
+        _updateState(_toNftKey32(policyNftId, PREMIUM()), newState);
+    }
+
     //--- Claim -------------------------------------------------------------//
     function createClaim(NftId policyNftId, ClaimId claimId, IPolicy.ClaimInfo memory claim) external restricted() {
         _create(_toClaimKey32(policyNftId, claimId), abi.encode(claim));