@etherisc/gif-next 0.0.2-e769e2e-077 → 0.0.2-e802d97-477

package/contracts/instance/InstanceService.sol

@@ -4,15 +4,19 @@ pragma solidity ^0.8.20;
 import {Clones} from "@openzeppelin/contracts/proxy/Clones.sol";
 import {ShortString, ShortStrings} from "@openzeppelin/contracts/utils/ShortStrings.sol";
 
+import {BundleManager} from "./BundleManager.sol";
+import {ChainNft} from "../registry/ChainNft.sol";
 import {NftId} from "../type/NftId.sol";
 import {RoleId} from "../type/RoleId.sol";
+import {SecondsLib} from "../type/Seconds.sol";
+import {UFixedLib} from "../type/UFixed.sol";
 import {ADMIN_ROLE, INSTANCE_OWNER_ROLE, DISTRIBUTION_OWNER_ROLE, POOL_OWNER_ROLE, PRODUCT_OWNER_ROLE, INSTANCE_SERVICE_ROLE, DISTRIBUTION_SERVICE_ROLE, POOL_SERVICE_ROLE, PRODUCT_SERVICE_ROLE, APPLICATION_SERVICE_ROLE, POLICY_SERVICE_ROLE, CLAIM_SERVICE_ROLE, BUNDLE_SERVICE_ROLE, INSTANCE_ROLE} from "../type/RoleId.sol";
-import {ObjectType, INSTANCE, BUNDLE, APPLICATION, POLICY, CLAIM, PRODUCT, DISTRIBUTION, REGISTRY, POOL} from "../type/ObjectType.sol";
+import {ObjectType, INSTANCE, BUNDLE, APPLICATION, CLAIM, DISTRIBUTION, POLICY, POOL, PRODUCT, REGISTRY, STAKING} from "../type/ObjectType.sol";
 
 import {Service} from "../shared/Service.sol";
 import {IInstanceLinkedComponent} from "../shared/IInstanceLinkedComponent.sol";
 import {IService} from "../shared/IService.sol";
-import {AccessManagerUpgradeableInitializeable} from "../shared/AccessManagerUpgradeableInitializeable.sol";
+import {AccessManagerExtendedInitializeable} from "../shared/AccessManagerExtendedInitializeable.sol";
 
 import {IDistributionComponent} from "../distribution/IDistributionComponent.sol";
 import {IPoolComponent} from "../pool/IPoolComponent.sol";
@@ -20,14 +24,14 @@ import {IProductComponent} from "../product/IProductComponent.sol";
 
 import {IRegistry} from "../registry/IRegistry.sol";
 import {IRegistryService} from "../registry/IRegistryService.sol";
-import {ChainNft} from "../registry/ChainNft.sol";
+import {IStakingService} from "../staking/IStakingService.sol";
+import {TargetManagerLib} from "../staking/TargetManagerLib.sol";
 
 import {Instance} from "./Instance.sol";
 import {IInstance} from "./IInstance.sol";
-import {InstanceAccessManager} from "./InstanceAccessManager.sol";
+import {InstanceAdmin} from "./InstanceAdmin.sol";
 import {IInstanceService} from "./IInstanceService.sol";
 import {InstanceReader} from "./InstanceReader.sol";
-import {BundleManager} from "./BundleManager.sol";
 import {InstanceStore} from "./InstanceStore.sol";
 import {InstanceAuthorizationsLib} from "./InstanceAuthorizationsLib.sol";
 
@@ -40,8 +44,10 @@ contract InstanceService is
     bytes32 public constant INSTANCE_CREATION_CODE_HASH = bytes32(0);
 
     IRegistryService internal _registryService;
-    address internal _masterOzAccessManager;
-    address internal _masterInstanceAccessManager;
+    IStakingService internal _stakingService;
+
+    address internal _masterAccessManager;
+    address internal _masterInstanceAdmin;
     address internal _masterInstance;
     address internal _masterInstanceReader;
     address internal _masterInstanceBundleManager;
@@ -54,6 +60,13 @@ contract InstanceService is
         _;
     }
 
+    // TODO check component - service - instance version match
+    modifier onlyComponent() {
+        if (! getRegistry().isRegisteredComponent(msg.sender)) {
+            revert ErrorInstanceServiceRequestUnauhorized(msg.sender);
+        }
+        _;
+    }
 
     function createInstanceClone()
         external 
@@ -63,18 +76,17 @@ contract InstanceService is
         )
     {
         address instanceOwner = msg.sender;
-        AccessManagerUpgradeableInitializeable clonedOzAccessManager = AccessManagerUpgradeableInitializeable(
-            Clones.clone(_masterOzAccessManager));
+        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 not use oz access manager directlly but through instance access manager instead
         // Instance service will renounce ADMIN_ROLE when bootstraping is finished
-        clonedOzAccessManager.initialize(address(this));
+        clonedAccessManager.initialize(address(this));
 
         clonedInstance = Instance(Clones.clone(_masterInstance));
         clonedInstance.initialize(
-            address(clonedOzAccessManager),
+            address(clonedAccessManager),
             address(getRegistry()), 
             instanceOwner);
         // initialize and set before instance reader
@@ -90,16 +102,17 @@ contract InstanceService is
         clonedBundleManager.initialize(address(clonedInstance));
         clonedInstance.setBundleManager(clonedBundleManager);
 
-        InstanceAccessManager clonedInstanceAccessManager = InstanceAccessManager(Clones.clone(_masterInstanceAccessManager));
-        clonedOzAccessManager.grantRole(ADMIN_ROLE().toInt(), address(clonedInstanceAccessManager), 0);
-        clonedInstanceAccessManager.initialize(address(clonedInstance));
-        clonedInstance.setInstanceAccessManager(clonedInstanceAccessManager);
+        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(
-            clonedInstanceAccessManager, 
+            clonedAccessManager, 
+            clonedInstanceAdmin, 
             clonedInstance, 
             clonedBundleManager, 
             clonedInstanceStore, 
@@ -107,14 +120,21 @@ contract InstanceService is
             getRegistry(),
             getVersion().toMajorPart());
 
-        clonedOzAccessManager.renounceRole(ADMIN_ROLE().toInt(), address(this));
+        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(
-            address(clonedOzAccessManager), 
-            address(clonedInstanceAccessManager), 
+            address(clonedAccessManager), 
+            address(clonedInstanceAdmin), 
             address(clonedInstance),
             address(clonedInstanceStore),
             address(clonedBundleManager), 
@@ -122,10 +142,10 @@ contract InstanceService is
             clonedInstanceNftId);
     }
 
-
     function setComponentLocked(bool locked)
         external
         virtual
+        onlyComponent()
     {
         // checks
         address componentAddress = msg.sender;
@@ -137,16 +157,12 @@ contract InstanceService is
         IRegistry registry = getRegistry();
         NftId instanceNftId = registry.getObjectInfo(componentAddress).parentNftId;
 
-        if (instanceNftId.eqz()) {
-            revert ErrorInstanceServiceComponentNotRegistered(componentAddress);
-        }
-
         IInstance instance = IInstance(
             registry.getObjectInfo(
                 instanceNftId).objectAddress);
 
-        // interaction
-        instance.getInstanceAccessManager().setTargetLockedByService(
+        // no revert in case already locked
+        instance.getInstanceAdmin().setTargetLockedByService(
             componentAddress, 
             locked);
     }
@@ -167,15 +183,15 @@ contract InstanceService is
             returns(NftId masterInstanceNftId)
     {
         if(_masterInstance != address(0)) { revert ErrorInstanceServiceMasterInstanceAlreadySet(); }
-        if(_masterOzAccessManager != address(0)) { revert ErrorInstanceServiceMasterOzAccessManagerAlreadySet(); }
-        if(_masterInstanceAccessManager != address(0)) { revert ErrorInstanceServiceMasterInstanceAccessManagerAlreadySet(); }
+        if(_masterAccessManager != address(0)) { revert ErrorInstanceServiceMasterInstanceAccessManagerAlreadySet(); }
+        if(_masterInstanceAdmin != address(0)) { revert ErrorInstanceServiceMasterInstanceAdminAlreadySet(); }
         if(_masterInstanceBundleManager != address(0)) { revert ErrorInstanceServiceMasterBundleManagerAlreadySet(); }
 
         if(instanceAddress == address(0)) { revert ErrorInstanceServiceInstanceAddressZero(); }
 
         IInstance instance = IInstance(instanceAddress);
-        InstanceAccessManager instanceAccessManager = instance.getInstanceAccessManager();
-        address instanceAccessManagerAddress = address(instanceAccessManager);
+        InstanceAdmin instanceAdmin = instance.getInstanceAdmin();
+        address instanceAdminAddress = address(instanceAdmin);
         InstanceReader instanceReader = instance.getInstanceReader();
         address instanceReaderAddress = address(instanceReader);
         BundleManager bundleManager = instance.getBundleManager();
@@ -183,19 +199,19 @@ contract InstanceService is
         InstanceStore instanceStore = instance.getInstanceStore();
         address instanceStoreAddress = address(instanceStore);
 
-        if(instanceAccessManagerAddress == address(0)) { revert ErrorInstanceServiceInstanceAccessManagerZero(); }
+        if(instanceAdminAddress == address(0)) { revert ErrorInstanceServiceInstanceAdminZero(); }
         if(instanceReaderAddress == address(0)) { revert ErrorInstanceServiceInstanceReaderZero(); }
         if(bundleManagerAddress == address(0)) { revert ErrorInstanceServiceBundleManagerZero(); }
         if(instanceStoreAddress == address(0)) { revert ErrorInstanceServiceInstanceStoreZero(); }
         
-        if(instance.authority() != instanceAccessManager.authority()) { revert ErrorInstanceServiceInstanceAuthorityMismatch(); }
-        if(bundleManager.authority() != instanceAccessManager.authority()) { revert ErrorInstanceServiceBundleManagerAuthorityMismatch(); }
-        if(instanceStore.authority() != instanceAccessManager.authority()) { revert ErrorInstanceServiceInstanceStoreAuthorityMismatch(); }
+        if(instance.authority() != instanceAdmin.authority()) { revert ErrorInstanceServiceInstanceAuthorityMismatch(); }
+        if(bundleManager.authority() != instanceAdmin.authority()) { revert ErrorInstanceServiceBundleManagerAuthorityMismatch(); }
+        if(instanceStore.authority() != instanceAdmin.authority()) { revert ErrorInstanceServiceInstanceStoreAuthorityMismatch(); }
         if(bundleManager.getInstance() != instance) { revert ErrorInstanceServiceBundleMangerInstanceMismatch(); }
         if(instanceReader.getInstance() != instance) { revert ErrorInstanceServiceInstanceReaderInstanceMismatch2(); }
 
-        _masterOzAccessManager = instance.authority();
-        _masterInstanceAccessManager = instanceAccessManagerAddress;
+        _masterAccessManager = instance.authority();
+        _masterInstanceAdmin = instanceAdminAddress;
         _masterInstance = instanceAddress;
         _masterInstanceReader = instanceReaderAddress;
         _masterInstanceBundleManager = bundleManagerAddress;
@@ -206,7 +222,7 @@ contract InstanceService is
         masterInstanceNftId = info.nftId;
     }
 
-    function setMasterInstanceReader(address instanceReaderAddress) external onlyOwner {
+    function upgradeMasterInstanceReader(address instanceReaderAddress) external onlyOwner {
         if(_masterInstanceReader == address(0)) { revert ErrorInstanceServiceMasterInstanceReaderNotSet(); }
         if(instanceReaderAddress == address(0)) { revert ErrorInstanceServiceInstanceReaderAddressZero(); }
         if(instanceReaderAddress == _masterInstanceReader) { revert ErrorInstanceServiceInstanceReaderSameAsMasterInstanceReader(); }
@@ -261,8 +277,7 @@ contract InstanceService is
     )
         external
         virtual
-        // TODO re-enable once role - contract association is fixed
-        // restricted()
+        restricted()
     {
         _createGifTarget(
             instanceNftId,
@@ -285,18 +300,19 @@ contract InstanceService is
         internal
         virtual
     {
+        // TODO instanceAdmin will check target instance match anyway
         (
             IInstance instance, // or instanceInfo
             // or targetInfo
         ) = _validateInstanceAndComponent(instanceNftId, targetAddress);
 
-        InstanceAccessManager accessManager = instance.getInstanceAccessManager();
-        accessManager.createGifTarget(targetAddress, targetName);
+        InstanceAdmin instanceAdmin = instance.getInstanceAdmin();
+        instanceAdmin.createGifTarget(targetAddress, targetName);
         // set proposed target config
         // TODO restriction: gif targets are set only once and only here?
         //      assume config is a mix of gif and custom roles and no further configuration by INSTANCE_OWNER_ROLE is ever needed?
         for(uint roleIdx = 0; roleIdx < roles.length; roleIdx++) {
-            accessManager.setCoreTargetFunctionRole(targetName, selectors[roleIdx], roles[roleIdx]);
+            instanceAdmin.setTargetFunctionRoleByService(targetName, selectors[roleIdx], roles[roleIdx]);
         }
     }
     
@@ -310,18 +326,16 @@ contract InstanceService is
         virtual override
     {
         (
-            address registryAddress,
-            address initialOwner
-        ) = abi.decode(data, (address, address));
-
-        _registryService = IRegistryService(
-            IRegistry(registryAddress).getServiceAddress(
-                REGISTRY(), 
-                getVersion().toMajorPart()));
-
-        // TODO while InstanceService is not deployed in InstanceServiceManager constructor
-        //      owner is InstanceServiceManager deployer
-        initializeService(registryAddress, address(0), owner);
+            address registryAddress,, 
+            //address managerAddress
+            address authority
+        ) = abi.decode(data, (address, address, address));
+
+        initializeService(registryAddress, authority, owner);
+
+        _registryService = IRegistryService(_getServiceAddress(REGISTRY()));
+        _stakingService = IStakingService(_getServiceAddress(STAKING()));
+
         registerInterface(type(IInstanceService).interfaceId);
     }
 

package/contracts/instance/InstanceServiceManager.sol

@@ -13,33 +13,23 @@ contract InstanceServiceManager is ProxyManager {
 
     InstanceService private _instanceService;
 
-    /// @dev initializes proxy manager with instance service implementation and deploys instance
+    /// @dev initializes proxy manager with instance service implementation
     constructor(
-        address registryAddress
-    )
+        address authority, 
+        address registryAddress,
+        bytes32 salt
+    ) 
         ProxyManager(registryAddress)
     {
-        InstanceService instSrv = new InstanceService();
+        InstanceService instSrv = new InstanceService{salt: salt}();
         // bytes memory initCode = type(InstanceService).creationCode;
-        bytes memory data = abi.encode(registryAddress, address(this));
-        IVersionable versionable = deploy(
+        bytes memory data = abi.encode(registryAddress, address(this), authority);
+        IVersionable versionable = deployDetermenistic(
             address(instSrv), 
-            data);
+            data,
+            salt);
 
         _instanceService = InstanceService(address(versionable));
-
-        // TODO `this` must have a role or own nft to register service
-        //Registry registry = Registry(registryAddress);
-        //address registryServiceAddress = registry.getServiceAddress(REGISTRY(), _instanceService.getMajorVersion());
-        //RegistryService registryService = RegistryService(registryServiceAddress);
-        //registryService.registerService(_instanceService);
-        // RegistryService registryService = _instanceService.getRegistryService();
-
-        // TODO no nft to link yet
-        // link ownership of instance service manager ot nft owner of instance service
-        //_linkToNftOwnable(
-        //    address(registryAddress),
-        //    address(_instanceService));
     }
 
     //--- view functions ----------------------------------------------------//

package/contracts/instance/InstanceStore.sol

@@ -7,7 +7,8 @@ import {Amount} from "../type/Amount.sol";
 import {Key32, KeyId, Key32Lib} from "../type/Key32.sol";
 import {NftId} from "../type/NftId.sol";
 import {ClaimId} from "../type/ClaimId.sol";
-import {ObjectType, BUNDLE, DISTRIBUTION, FEE, INSTANCE, POLICY, POOL, ROLE, PRODUCT, TARGET, COMPONENT, DISTRIBUTOR, DISTRIBUTOR_TYPE} from "../type/ObjectType.sol";
+import {ObjectType, BUNDLE, DISTRIBUTION, INSTANCE, POLICY, POOL, ROLE, PRODUCT, TARGET, COMPONENT, DISTRIBUTOR, DISTRIBUTOR_TYPE} from "../type/ObjectType.sol";
+import {RequestId} from "../type/RequestId.sol";
 import {RiskId, RiskIdLib} from "../type/RiskId.sol";
 import {RoleId, RoleIdLib, INSTANCE_ROLE, INSTANCE_OWNER_ROLE} from "../type/RoleId.sol";
 import {StateId, ACTIVE} from "../type/StateId.sol";
@@ -21,18 +22,21 @@ import {BalanceStore} from "./base/BalanceStore.sol";
 import {IInstance} from "./IInstance.sol";
 import {KeyValueStore} from "../shared/KeyValueStore.sol";
 import {IKeyValueStore} from "../shared/KeyValueStore.sol";
+import {ObjectCounter} from "./base/ObjectCounter.sol";
 
 import {IBundle} from "./module/IBundle.sol";
 import {IComponents} from "./module/IComponents.sol";
 import {IDistribution} from "./module/IDistribution.sol";
 import {IPolicy} from "./module/IPolicy.sol";
+import {IOracle} from "../oracle/IOracle.sol";
 import {IRisk} from "./module/IRisk.sol";
 
 
 contract InstanceStore is
     AccessManagedUpgradeable, 
+    BalanceStore,
     KeyValueStore,
-    BalanceStore
+    ObjectCounter
 {
     function initialize(address instance)
         public 
@@ -40,10 +44,12 @@ contract InstanceStore is
     {
         address authority = IInstance(instance).authority();
         __AccessManaged_init(authority);
+
         initializeLifecycle();
     }
 
     //--- Component ---------------------------------------------------------//
+
     function createComponent(
         NftId componentNftId, 
         IComponents.ComponentInfo memory componentInfo
@@ -51,8 +57,8 @@ contract InstanceStore is
         external 
         restricted()
     {
-        _registerTarget(componentNftId);
-        create(_toNftKey32(componentNftId, COMPONENT()), abi.encode(componentInfo));
+        _registerBalanceTarget(componentNftId);
+        _create(_toNftKey32(componentNftId, COMPONENT()), abi.encode(componentInfo));
     }
 
     function updateComponent(
@@ -63,24 +69,24 @@ contract InstanceStore is
         external 
         restricted()
     {
-        update(_toNftKey32(componentNftId, COMPONENT()), abi.encode(componentInfo), newState);
+        _update(_toNftKey32(componentNftId, COMPONENT()), abi.encode(componentInfo), newState);
     }
 
-    //--- ProductSetup ------------------------------------------------------//
+    //--- Product -----------------------------------------------------------//
 
     function createProduct(NftId productNftId, IComponents.ProductInfo memory info) external restricted() {
-        create(_toNftKey32(productNftId, PRODUCT()), abi.encode(info));
+        _create(_toNftKey32(productNftId, PRODUCT()), abi.encode(info));
     }
 
     function updateProduct(NftId productNftId, IComponents.ProductInfo memory info, StateId newState) external restricted() {
-        update(_toNftKey32(productNftId, PRODUCT()), abi.encode(info), newState);
+        _update(_toNftKey32(productNftId, PRODUCT()), abi.encode(info), newState);
     }
 
     function updateProductSetupState(NftId productNftId, StateId newState) external restricted() {
-        updateState(_toNftKey32(productNftId, PRODUCT()), newState);
+        _updateState(_toNftKey32(productNftId, PRODUCT()), newState);
     }
 
-    //--- PoolSetup ------------------------------------------------------//
+    //--- Pool --------------------------------------------------------------//
 
     function createPool(
         NftId poolNftId, 
@@ -89,133 +95,149 @@ contract InstanceStore is
         external 
         restricted()
     {
-        create(_toNftKey32(poolNftId, POOL()), abi.encode(info));
+        _create(_toNftKey32(poolNftId, POOL()), abi.encode(info));
     }
 
     function updatePool(NftId poolNftId, IComponents.PoolInfo memory info, StateId newState) external restricted() {
-        update(_toNftKey32(poolNftId, POOL()), abi.encode(info), newState);
+        _update(_toNftKey32(poolNftId, POOL()), abi.encode(info), newState);
     }
 
     function updatePoolState(NftId poolNftId, StateId newState) external restricted() {
-        updateState(_toNftKey32(poolNftId, POOL()), newState);
+        _updateState(_toNftKey32(poolNftId, POOL()), newState);
     }
 
-    //--- DistributorType -------------------------------------------------------//
+    //--- DistributorType ---------------------------------------------------//
     function createDistributorType(DistributorType distributorType, IDistribution.DistributorTypeInfo memory info) external restricted() {
-        create(distributorType.toKey32(), abi.encode(info));
+        _create(distributorType.toKey32(), abi.encode(info));
     }
 
     function updateDistributorType(DistributorType distributorType, IDistribution.DistributorTypeInfo memory info, StateId newState) external restricted() {
-        update(distributorType.toKey32(), abi.encode(info), newState);
+        _update(distributorType.toKey32(), abi.encode(info), newState);
     }
 
     function updateDistributorTypeState(DistributorType distributorType, StateId newState) external restricted() {
-        updateState(distributorType.toKey32(), newState);
+        _updateState(distributorType.toKey32(), newState);
     }
 
     //--- Distributor -------------------------------------------------------//
     function createDistributor(NftId distributorNftId, IDistribution.DistributorInfo memory info) external restricted() {
-        create(_toNftKey32(distributorNftId, DISTRIBUTOR()), abi.encode(info));
+        _create(_toNftKey32(distributorNftId, DISTRIBUTOR()), abi.encode(info));
     }
 
     function updateDistributor(NftId distributorNftId, IDistribution.DistributorInfo memory info, StateId newState) external restricted() {
-        update(_toNftKey32(distributorNftId, DISTRIBUTOR()), abi.encode(info), newState);
+        _update(_toNftKey32(distributorNftId, DISTRIBUTOR()), abi.encode(info), newState);
     }
 
     function updateDistributorState(NftId distributorNftId, StateId newState) external restricted() {
-        updateState(_toNftKey32(distributorNftId, DISTRIBUTOR()), newState);
+        _updateState(_toNftKey32(distributorNftId, DISTRIBUTOR()), newState);
     }
 
     //--- Referral ----------------------------------------------------------//
     function createReferral(ReferralId referralId, IDistribution.ReferralInfo memory referralInfo) external restricted() {
-        create(referralId.toKey32(), abi.encode(referralInfo));
+        _create(referralId.toKey32(), abi.encode(referralInfo));
     }
 
     function updateReferral(ReferralId referralId, IDistribution.ReferralInfo memory referralInfo, StateId newState) external restricted() {
-        update(referralId.toKey32(), abi.encode(referralInfo), newState);
+        _update(referralId.toKey32(), abi.encode(referralInfo), newState);
     }
 
     function updateReferralState(ReferralId referralId, StateId newState) external restricted() {
-        updateState(referralId.toKey32(), newState);
+        _updateState(referralId.toKey32(), newState);
     }
 
     //--- Bundle ------------------------------------------------------------//
     function createBundle(NftId bundleNftId, IBundle.BundleInfo memory bundle) external restricted() {
-        _registerTarget(bundleNftId);
-        create(_toNftKey32(bundleNftId, BUNDLE()), abi.encode(bundle));
+        _registerBalanceTarget(bundleNftId);
+        _create(_toNftKey32(bundleNftId, BUNDLE()), abi.encode(bundle));
     }
 
     function updateBundle(NftId bundleNftId, IBundle.BundleInfo memory bundle, StateId newState) external restricted() {
-        update(_toNftKey32(bundleNftId, BUNDLE()), abi.encode(bundle), newState);
+        _update(_toNftKey32(bundleNftId, BUNDLE()), abi.encode(bundle), newState);
     }
 
     function updateBundleState(NftId bundleNftId, StateId newState) external restricted() {
-        updateState(_toNftKey32(bundleNftId, BUNDLE()), newState);
+        _updateState(_toNftKey32(bundleNftId, BUNDLE()), newState);
     }
 
     //--- Risk --------------------------------------------------------------//
     function createRisk(RiskId riskId, IRisk.RiskInfo memory risk) external restricted() {
-        create(riskId.toKey32(), abi.encode(risk));
+        _create(riskId.toKey32(), abi.encode(risk));
     }
 
     function updateRisk(RiskId riskId, IRisk.RiskInfo memory risk, StateId newState) external restricted() {
-        update(riskId.toKey32(), abi.encode(risk), newState);
+        _update(riskId.toKey32(), abi.encode(risk), newState);
     }
 
     function updateRiskState(RiskId riskId, StateId newState) external restricted() {
-        updateState(riskId.toKey32(), newState);
+        _updateState(riskId.toKey32(), newState);
     }
 
     //--- Application (Policy) ----------------------------------------------//
     function createApplication(NftId applicationNftId, IPolicy.PolicyInfo memory policy) external restricted() {
-        create(_toNftKey32(applicationNftId, POLICY()), abi.encode(policy));
+        _registerBalanceTarget(applicationNftId);
+        _create(_toNftKey32(applicationNftId, POLICY()), abi.encode(policy));
     }
 
     function updateApplication(NftId applicationNftId, IPolicy.PolicyInfo memory policy, StateId newState) external restricted() {
-        update(_toNftKey32(applicationNftId, POLICY()), abi.encode(policy), newState);
+        _update(_toNftKey32(applicationNftId, POLICY()), abi.encode(policy), newState);
     }
 
     function updateApplicationState(NftId applicationNftId, StateId newState) external restricted() {
-        updateState(_toNftKey32(applicationNftId, POLICY()), newState);
+        _updateState(_toNftKey32(applicationNftId, POLICY()), newState);
     }
 
     //--- Policy ------------------------------------------------------------//
     function updatePolicy(NftId policyNftId, IPolicy.PolicyInfo memory policy, StateId newState) external restricted() {
-        update(_toNftKey32(policyNftId, POLICY()), abi.encode(policy), newState);
+        _update(_toNftKey32(policyNftId, POLICY()), abi.encode(policy), newState);
     }
 
     function updatePolicyClaims(NftId policyNftId, IPolicy.PolicyInfo memory policy, StateId newState) external restricted() {
-        update(_toNftKey32(policyNftId, POLICY()), abi.encode(policy), newState);
+        _update(_toNftKey32(policyNftId, POLICY()), abi.encode(policy), newState);
     }
 
     function updatePolicyState(NftId policyNftId, StateId newState) external restricted() {
-        updateState(_toNftKey32(policyNftId, POLICY()), newState);
+        _updateState(_toNftKey32(policyNftId, POLICY()), newState);
     }
 
     //--- Claim -------------------------------------------------------------//
     function createClaim(NftId policyNftId, ClaimId claimId, IPolicy.ClaimInfo memory claim) external restricted() {
-        create(_toClaimKey32(policyNftId, claimId), abi.encode(claim));
+        _create(_toClaimKey32(policyNftId, claimId), abi.encode(claim));
     }
 
     function updateClaim(NftId policyNftId, ClaimId claimId, IPolicy.ClaimInfo memory claim, StateId newState) external restricted() {
-        update(_toClaimKey32(policyNftId, claimId), abi.encode(claim), newState);
+        _update(_toClaimKey32(policyNftId, claimId), abi.encode(claim), newState);
     }
 
     function updateClaimState(NftId policyNftId, ClaimId claimId, StateId newState) external restricted() {
-        updateState(_toClaimKey32(policyNftId, claimId), newState);
+        _updateState(_toClaimKey32(policyNftId, claimId), newState);
     }
 
     //--- Payout ------------------------------------------------------------//
     function createPayout(NftId policyNftId, PayoutId payoutId, IPolicy.PayoutInfo memory payout) external restricted() {
-        create(_toPayoutKey32(policyNftId, payoutId), abi.encode(payout));
+        _create(_toPayoutKey32(policyNftId, payoutId), abi.encode(payout));
     }
 
     function updatePayout(NftId policyNftId, PayoutId payoutId, IPolicy.PayoutInfo memory payout, StateId newState) external restricted() {
-        update(_toPayoutKey32(policyNftId, payoutId), abi.encode(payout), newState);
+        _update(_toPayoutKey32(policyNftId, payoutId), abi.encode(payout), newState);
     }
 
     function updatePayoutState(NftId policyNftId, PayoutId payoutId, StateId newState) external restricted() {
-        updateState(_toPayoutKey32(policyNftId, payoutId), newState);
+        _updateState(_toPayoutKey32(policyNftId, payoutId), newState);
+    }
+
+    //--- Request -----------------------------------------------------------//
+
+    function createRequest(IOracle.RequestInfo memory request) external restricted() returns (RequestId requestId) {
+        requestId = _createNextRequestId();
+        _create(requestId.toKey32(), abi.encode(request));
+    }
+
+    function updateRequest(RequestId requestId, IOracle.RequestInfo memory request, StateId newState) external restricted() {
+        _update(requestId.toKey32(), abi.encode(request), newState);
+    }
+
+    function updateRequestState(RequestId requestId, StateId newState) external restricted() {
+        _updateState(requestId.toKey32(), newState);
     }
 
     //--- balance and fee management functions ------------------------------//

package/contracts/instance/base/BalanceStore.sol

@@ -54,7 +54,7 @@ contract BalanceStore {
         feeAmount = _feeAmount[targetNftId];
     }
 
-    function _registerTarget(NftId targetNftId) internal {
+    function _registerBalanceTarget(NftId targetNftId) internal {
         if (_isRegistered[targetNftId]) {
             revert ErrorBalanceStoreTargetAlreadyRegistered(targetNftId);
         }

package/contracts/instance/base/ObjectCounter.sol

@@ -0,0 +1,21 @@
+// SPDX-License-Identifier: Apache-2.0
+pragma solidity ^0.8.20;
+
+import {Blocknumber, BlocknumberLib} from "../../type/Blocknumber.sol";
+import {NftId} from "../../type/NftId.sol";
+import {Amount} from "../../type/Amount.sol";
+import {RequestId, RequestIdLib} from "../../type/RequestId.sol";
+
+contract ObjectCounter {
+
+    // TODO refactor risk id
+    // mapping(NftId productNftId => uint64 risks) private _riskCounter;
+
+    uint256 private _requestCounter;
+
+    // TODO introduce RequestId (uint64)
+    function _createNextRequestId() internal returns (RequestId requestId) {
+        _requestCounter++;
+        requestId = RequestIdLib.toRequestId(_requestCounter);
+    }
+}