@etherisc/gif-next 3.0.0-db9ffbc-172 → 3.0.0-dcde6c5-844

package/contracts/instance/InstanceReader.sol

@@ -18,18 +18,19 @@ import {IRisk} from "../instance/module/IRisk.sol";
 import {AccessAdminLib} from "../authorization/AccessAdminLib.sol";
 import {Amount} from "../type/Amount.sol";
 import {BundleSet} from "./BundleSet.sol";
-import {BUNDLE, COMPONENT, DISTRIBUTION, PREMIUM, POLICY} from "../type/ObjectType.sol";
+import {BUNDLE, COMPONENT, DISTRIBUTION, PREMIUM, POLICY, PRODUCT, FEE, RISK, CLAIM, PAYOUT, ObjectType} from "../type/ObjectType.sol";
 import {ClaimId, ClaimIdLib} from "../type/ClaimId.sol";
 import {DistributorType} from "../type/DistributorType.sol";
 import {InstanceAdmin} from "./InstanceAdmin.sol";
 import {InstanceStore} from "./InstanceStore.sol";
-import {Key32} from "../type/Key32.sol";
+import {Key32, Key32Lib} from "../type/Key32.sol";
 import {NftId} from "../type/NftId.sol";
 import {PayoutId, PayoutIdLib} from "../type/PayoutId.sol";
 import {PolicyServiceLib} from "../product/PolicyServiceLib.sol";
 import {ProductStore} from "./ProductStore.sol";
 import {ReferralId, ReferralStatus, ReferralLib} from "../type/Referral.sol";
 import {RequestId} from "../type/RequestId.sol";
+import {RequestSet} from "./RequestSet.sol";
 import {RiskId} from "../type/RiskId.sol";
 import {RiskSet} from "./RiskSet.sol";
 import {RoleId, INSTANCE_OWNER_ROLE} from "../type/RoleId.sol";
@@ -56,6 +57,7 @@ contract InstanceReader {
     ProductStore internal _productStore;
     BundleSet internal _bundleSet;
     RiskSet internal _riskSet;
+    RequestSet internal _requestSet;
     IDistributionService internal _distributionService;
 
     /// @dev This initializer needs to be called from the instance itself.
@@ -85,6 +87,7 @@ contract InstanceReader {
         _productStore = _instance.getProductStore();
         _bundleSet = _instance.getBundleSet();
         _riskSet = _instance.getRiskSet();
+        _requestSet = _instance.getRequestSet();
         _distributionService = IDistributionService(_registry.getServiceAddress(DISTRIBUTION(), _instance.getRelease()));
     }
 
@@ -164,7 +167,9 @@ contract InstanceReader {
 
 
     /// @dev Returns the currently locked amount for the given NFT ID.
-    /// The target NFT ID may reference a pool or a bundle.
+    /// Locked amounts are only tracked for bundles, not for pool. To get the 
+    /// pool locked amount, then locked amounts of the bundles contained in the 
+    /// pool must be summed up. The target NFT ID may only a bundle. 
     function getLockedAmount(NftId targetNftId) external view returns (Amount) { 
         return _store.getLockedAmount(targetNftId);
     }
@@ -364,6 +369,18 @@ contract InstanceReader {
         return getState(requestId.toKey32());
     }
 
+    function getActiveRequests(NftId oracleNftId) external view returns(uint256 numberOfRequests) {
+        return _requestSet.activeRequests(oracleNftId);
+    }
+
+    function getActiveRequestAt(NftId oracleNftId, uint256 idx) external view returns(RequestId requestId) {
+        return _requestSet.activeRequestAt(oracleNftId, idx);
+    }
+
+    function isRequestActive(NftId oracleNftId, RequestId requestId) external view returns(bool isActive) {
+        return _requestSet.contains(oracleNftId, requestId);
+    }
+
     //--- pool functions -----------------------------------------------------------//
 
     /// @dev Returns the pool info for the given pool NFT ID.
@@ -571,10 +588,10 @@ contract InstanceReader {
     }
 
 
-    /// @dev Returns a function info for the given function signature and function name.
-    /// The function signature must not be zero and the function name must not be empty.
-    function toFunction(bytes4 signature, string memory name) public view returns (IAccess.FunctionInfo memory) {
-        return AccessAdminLib.toFunction(signature, name);
+    /// @dev Returns a function info for the given function selector and function name.
+    /// The function selector must not be zero and the function name must not be empty.
+    function toFunction(bytes4 selector, string memory name) public view returns (IAccess.FunctionInfo memory) {
+        return AccessAdminLib.toFunction(selector, name);
     }
 
     //--- low level function ----------------------------------------------------//
@@ -593,7 +610,25 @@ contract InstanceReader {
 
 
     function getMetadata(Key32 key) public view returns (IBaseStore.Metadata memory metadata) {
-        return _store.getMetadata(key);
+        ObjectType objectType = Key32Lib.toObjectType(key);
+
+        if (objectType == PRODUCT()) {
+            return _productStore.getMetadata(key);
+        } else if (objectType == FEE()) {
+            return _productStore.getMetadata(key);
+        } else if (objectType == RISK()) {
+            return _productStore.getMetadata(key);
+        } else if (objectType == POLICY()) {
+            return _productStore.getMetadata(key);
+        } else if (objectType == PREMIUM()) {
+            return _productStore.getMetadata(key);
+        } else if (objectType == CLAIM()) {
+            return _productStore.getMetadata(key);
+        } else if (objectType == PAYOUT()) {
+            return _productStore.getMetadata(key);
+        } else {
+            return _store.getMetadata(key);        
+        }
     }
 
 

package/contracts/instance/InstanceService.sol

@@ -22,6 +22,7 @@ import {InstanceStore} from "./InstanceStore.sol";
 import {NftId} from "../type/NftId.sol";
 import {ObjectType, INSTANCE, COMPONENT, INSTANCE, REGISTRY, STAKING} from "../type/ObjectType.sol";
 import {ProductStore} from "./ProductStore.sol";
+import {RequestSet} from "./RequestSet.sol";
 import {RiskSet} from "./RiskSet.sol";
 import {RoleId} from "../type/RoleId.sol";
 import {Seconds} from "../type/Seconds.sol";
@@ -49,6 +50,7 @@ contract InstanceService is
     address internal _masterInstanceReader;
     address internal _masterInstanceBundleSet;
     address internal _masterInstanceRiskSet;
+    address internal _masterInstanceRequestSet;
     address internal _masterInstanceStore;
     address internal _masterProductStore;
 
@@ -304,11 +306,13 @@ contract InstanceService is
         InstanceReader upgradedInstanceReaderClone = InstanceReader(
             Clones.clone(address(_masterInstanceReader)));
 
+        address oldInstanceReaderAddress = address(instance.getInstanceReader());
         upgradedInstanceReaderClone.initializeWithInstance(instanceAddress);
         instance.setInstanceReader(upgradedInstanceReaderClone);
 
         emit LogInstanceServiceInstanceReaderUpgraded(
             getRegistry().getNftIdForAddress(instanceAddress),
+            oldInstanceReaderAddress,
             address(upgradedInstanceReaderClone));
     }
 
@@ -323,55 +327,80 @@ contract InstanceService is
         if(_masterInstanceAdmin != address(0)) { revert ErrorInstanceServiceMasterInstanceAdminAlreadySet(); }
         if(_masterInstanceBundleSet != address(0)) { revert ErrorInstanceServiceMasterBundleSetAlreadySet(); }
         if(_masterInstanceRiskSet != address(0)) { revert ErrorInstanceServiceMasterRiskSetAlreadySet(); }
+        if(_masterInstanceRequestSet != address(0)) { revert ErrorInstanceServiceMasterRequestSetAlreadySet(); }
         if(instanceAddress == address(0)) { revert ErrorInstanceServiceInstanceAddressZero(); }
 
         {
             IInstance instance = IInstance(instanceAddress);
             address accessManagerAddress = instance.authority();
             InstanceAdmin instanceAdmin = instance.getInstanceAdmin();
-            address instanceAdminAddress = address(instanceAdmin);
-            InstanceReader instanceReader = instance.getInstanceReader();
-            address instanceReaderAddress = address(instanceReader);
-            BundleSet bundleSet = instance.getBundleSet();
-            address bundleSetAddress = address(bundleSet);
-            RiskSet riskSet = instance.getRiskSet();
-            address riskSetAddress = address(riskSet);
-            InstanceStore instanceStore = instance.getInstanceStore();
-            address instanceStoreAddress = address(instanceStore);
-            ProductStore productStore = instance.getProductStore();
-            address productStoreAddress = address(productStore);
-
-            if(accessManagerAddress == address(0)) { revert ErrorInstanceServiceAccessManagerZero(); }
-            if(instanceAdminAddress == address(0)) { revert ErrorInstanceServiceInstanceAdminZero(); }
-            if(instanceReaderAddress == address(0)) { revert ErrorInstanceServiceInstanceReaderZero(); }
-            if(bundleSetAddress == address(0)) { revert ErrorInstanceServiceBundleSetZero(); }
-            if(riskSetAddress == address(0)) { revert ErrorInstanceServiceRiskSetZero(); }
-            if(instanceStoreAddress == address(0)) { revert ErrorInstanceServiceInstanceStoreZero(); }
-            if(productStoreAddress == address(0)) { revert ErrorInstanceServiceProductStoreZero(); } // TODO: rename exception
             
-            if(instance.authority() != instanceAdmin.authority()) { revert ErrorInstanceServiceInstanceAuthorityMismatch(); }
-            if(bundleSet.authority() != instanceAdmin.authority()) { revert ErrorInstanceServiceBundleSetAuthorityMismatch(); }
-            if(riskSet.authority() != instanceAdmin.authority()) { revert ErrorInstanceServiceRiskSetAuthorityMismatch(); }
-            if(instanceStore.authority() != instanceAdmin.authority()) { revert ErrorInstanceServiceInstanceStoreAuthorityMismatch(); }
-            if(productStore.authority() != instanceAdmin.authority()) { revert ErrorInstanceServiceProductStoreAuthorityMismatch(); } 
-            if(bundleSet.getInstanceAddress() != address(instance)) { revert ErrorInstanceServiceBundleSetInstanceMismatch(); }
-            if(riskSet.getInstanceAddress() != address(instance)) { revert ErrorInstanceServiceRiskSetInstanceMismatch(); }
-            if(instanceReader.getInstance() != instance) { revert ErrorInstanceServiceInstanceReaderInstanceMismatch2(); }
-
-            _masterAccessManager = accessManagerAddress;
-            _masterInstanceAdmin = instanceAdminAddress;
-            _masterInstance = instanceAddress;
-            _masterInstanceReader = instanceReaderAddress;
-            _masterInstanceBundleSet = bundleSetAddress;
-            _masterInstanceRiskSet = riskSetAddress;
-            _masterInstanceStore = instanceStoreAddress;
-            _masterProductStore = productStoreAddress;
+            {
+                address instanceAdminAddress = address(instanceAdmin);
+                InstanceReader instanceReader = instance.getInstanceReader();
+                address instanceReaderAddress = address(instanceReader);
+
+                if(accessManagerAddress == address(0)) { revert ErrorInstanceServiceAccessManagerZero(); }
+                if(instanceAdminAddress == address(0)) { revert ErrorInstanceServiceInstanceAdminZero(); }
+                if(instanceReaderAddress == address(0)) { revert ErrorInstanceServiceInstanceReaderZero(); }
+
+                if(instance.authority() != instanceAdmin.authority()) { revert ErrorInstanceServiceInstanceAuthorityMismatch(); }
+                if(instanceReader.getInstance() != instance) { revert ErrorInstanceServiceInstanceReaderInstanceMismatch2(); }
+        
+                _masterAccessManager = accessManagerAddress;
+                _masterInstanceAdmin = instanceAdminAddress;
+                _masterInstance = instanceAddress;
+                _masterInstanceReader = instanceReaderAddress;
+            }
+
+            {
+                BundleSet bundleSet = instance.getBundleSet();
+                address bundleSetAddress = address(bundleSet);
+                RiskSet riskSet = instance.getRiskSet();
+                address riskSetAddress = address(riskSet);
+                RequestSet requestSet = instance.getRequestSet();
+                address requestSetAddress = address(requestSet);
+            
+                if(bundleSetAddress == address(0)) { revert ErrorInstanceServiceBundleSetZero(); }
+                if(riskSetAddress == address(0)) { revert ErrorInstanceServiceRiskSetZero(); }
+                if(requestSetAddress == address(0)) { revert ErrorInstanceServiceRequestSetZero(); }
+                if(bundleSet.authority() != instanceAdmin.authority()) { revert ErrorInstanceServiceBundleSetAuthorityMismatch(); }
+                if(riskSet.authority() != instanceAdmin.authority()) { revert ErrorInstanceServiceRiskSetAuthorityMismatch(); }
+                if(requestSet.authority() != instanceAdmin.authority()) { revert ErrorInstanceServiceRequestSetAuthorityMismatch(); }
+                if(bundleSet.getInstanceAddress() != address(instance)) { revert ErrorInstanceServiceBundleSetInstanceMismatch(); }
+                if(riskSet.getInstanceAddress() != address(instance)) { revert ErrorInstanceServiceRiskSetInstanceMismatch(); }
+                if(requestSet.getInstanceAddress() != address(instance)) { revert ErrorInstanceServiceRequestSetInstanceMismatch(); }
+
+                _masterInstanceBundleSet = bundleSetAddress;
+                _masterInstanceRiskSet = riskSetAddress;
+                _masterInstanceRequestSet = requestSetAddress;
+            }
+
+            {
+                InstanceStore instanceStore = instance.getInstanceStore();
+                address instanceStoreAddress = address(instanceStore);
+                ProductStore productStore = instance.getProductStore();
+                address productStoreAddress = address(productStore);
+
+                if(instanceStoreAddress == address(0)) { revert ErrorInstanceServiceInstanceStoreZero(); }
+                if(productStoreAddress == address(0)) { revert ErrorInstanceServiceProductStoreZero(); } // TODO: rename exception
+                
+                if(instanceStore.authority() != instanceAdmin.authority()) { revert ErrorInstanceServiceInstanceStoreAuthorityMismatch(); }
+                if(productStore.authority() != instanceAdmin.authority()) { revert ErrorInstanceServiceProductStoreAuthorityMismatch(); } 
+                
+                _masterInstanceStore = instanceStoreAddress;
+                _masterProductStore = productStoreAddress;
+            }
         }
         
         {
             IInstance masterInstance = IInstance(_masterInstance);
             IRegistry.ObjectInfo memory info = _registryService.registerInstance(masterInstance, getOwner());
             masterInstanceNftId = info.nftId;
+            
+            emit LogInstanceServiceMasterInstanceRegistered(
+                masterInstanceNftId, _masterInstance, _masterInstanceAdmin, _masterAccessManager, 
+                _masterInstanceReader, _masterInstanceBundleSet, _masterInstanceRiskSet, _masterInstanceRequestSet, _masterInstanceStore, _masterProductStore);
         }
     }
 
@@ -388,10 +417,12 @@ contract InstanceService is
         InstanceReader instanceReader = InstanceReader(instanceReaderAddress);
         if(instanceReader.getInstance() != IInstance(_masterInstance)) { revert ErrorInstanceServiceInstanceReaderInstanceMismatch(); }
 
+        address oldMasterInstanceReaderAddress = _masterInstanceReader;
         _masterInstanceReader = instanceReaderAddress;
 
         emit LogInstanceServiceMasterInstanceReaderUpgraded(
             getRegistry().getNftIdForAddress(_masterInstance),
+            oldMasterInstanceReaderAddress,
             instanceReaderAddress);
     }
 
@@ -443,6 +474,7 @@ contract InstanceService is
                 productStore: ProductStore(Clones.clone(address(_masterProductStore))),
                 bundleSet: BundleSet(Clones.clone(_masterInstanceBundleSet)),
                 riskSet: RiskSet(Clones.clone(_masterInstanceRiskSet)),
+                requestSet: RequestSet(Clones.clone(address(_masterInstanceRequestSet))),
                 instanceReader: InstanceReader(Clones.clone(address(_masterInstanceReader)))
             }),
             getRegistry(),

package/contracts/instance/InstanceStore.sol

@@ -34,20 +34,20 @@ contract InstanceStore is
     BaseStore
 {
 
-    event LogProductStoreComponentInfoCreated(NftId componentNftId, StateId state, address createdby, address txOrigin);
-    event LogProductStoreComponentInfoUpdated(NftId componentNftId, StateId oldState, StateId newState, address updatedBy, address txOrigin, Blocknumber lastUpdatedIn);
-    event LogProductStorePoolInfoCreated(NftId poolNftId, StateId state, address createdBy, address txOrigin);
-    event LogProductStorePoolInfoUpdated(NftId poolNftId, StateId oldState, StateId newState, address updatedBy, address txOrigin, Blocknumber lastUpdatedIn);
-    event LogProductStoreDistributorTypeInfoCreated(DistributorType distributorType, StateId state, address createdBy, address txOrigin);
-    event LogProductStoreDistributorTypeInfoUpdated(DistributorType distributorType, StateId oldState, StateId newState, address updatedBy, address txOrigin, Blocknumber lastUpdatedIn);
-    event LogProductStoreDistributorInfoCreated(NftId distributorNftId, StateId state, address createdBy, address txOrigin);
-    event LogProductStoreDistributorInfoUpdated(NftId distributorNftId, StateId oldState, StateId newState, address updatedBy, address txOrigin, Blocknumber lastUpdatedIn);
-    event LogProductStoreReferralInfoCreated(ReferralId referralId, StateId state, address createdBy, address txOrigin);
-    event LogProductStoreReferralInfoUpdated(ReferralId referralId, StateId oldState, StateId newState, address updatedBy, address txOrigin, Blocknumber lastUpdatedIn);
-    event LogProductStoreBundleInfoCreated(NftId bundleNftId, StateId state, address createdBy, address txOrigin);
-    event LogProductStoreBundleInfoUpdated(NftId bundleNftId, StateId oldState, StateId newState, address updatedBy, address txOrigin, Blocknumber lastUpdatedIn);
-    event LogProductStoreRequestInfoCreated(RequestId requestId, StateId state, address createdBy, address txOrigin);
-    event LogProductStoreRequestInfoUpdated(RequestId requestId, StateId oldState, StateId newState, address updatedBy, address txOrigin, Blocknumber lastUpdatedIn);
+    event LogProductStoreComponentInfoCreated(NftId indexed componentNftId, StateId indexed state, address indexed createdby, address txOrigin);
+    event LogProductStoreComponentInfoUpdated(NftId indexed componentNftId, StateId indexed oldState, StateId indexed newState, address updatedBy, address txOrigin, Blocknumber lastUpdatedIn);
+    event LogProductStorePoolInfoCreated(NftId indexed poolNftId, StateId indexed state, address indexed createdBy, address txOrigin);
+    event LogProductStorePoolInfoUpdated(NftId indexed poolNftId, StateId indexed oldState, StateId indexed newState, address updatedBy, address txOrigin, Blocknumber lastUpdatedIn);
+    event LogProductStoreDistributorTypeInfoCreated(DistributorType indexed distributorType, StateId indexed state, address indexed createdBy, address txOrigin);
+    event LogProductStoreDistributorTypeInfoUpdated(DistributorType indexed distributorType, StateId indexed oldState, StateId indexed newState, address updatedBy, address txOrigin, Blocknumber lastUpdatedIn);
+    event LogProductStoreDistributorInfoCreated(NftId indexed distributorNftId, StateId indexed state, address indexed createdBy, address txOrigin);
+    event LogProductStoreDistributorInfoUpdated(NftId indexed distributorNftId, StateId indexed oldState, StateId indexed newState, address updatedBy, address txOrigin, Blocknumber lastUpdatedIn);
+    event LogProductStoreReferralInfoCreated(ReferralId indexed referralId, StateId indexed state, address indexed createdBy, address txOrigin);
+    event LogProductStoreReferralInfoUpdated(ReferralId indexed referralId, StateId indexed oldState, StateId indexed newState, address updatedBy, address txOrigin, Blocknumber lastUpdatedIn);
+    event LogProductStoreBundleInfoCreated(NftId indexed bundleNftId, StateId indexed state, address indexed createdBy, address txOrigin);
+    event LogProductStoreBundleInfoUpdated(NftId indexed bundleNftId, StateId indexed oldState, StateId indexed newState, address updatedBy, address txOrigin, Blocknumber lastUpdatedIn);
+    event LogProductStoreRequestInfoCreated(RequestId indexed requestId, StateId indexed state, address indexed createdBy, address txOrigin);
+    event LogProductStoreRequestInfoUpdated(RequestId indexed requestId, StateId indexed oldState, StateId indexed newState, address updatedBy, address txOrigin, Blocknumber lastUpdatedIn);
 
 
     mapping(Key32 => IComponents.ComponentInfo) private _components;

package/contracts/instance/ProductStore.sol

@@ -29,20 +29,20 @@ contract ProductStore is
     ObjectCounter,
     ObjectLifecycle
 {
-    event LogProductStoreProductInfoCreated(NftId productNftId, StateId state, address createdBy, address txOrigin);
-    event LogProductStoreProductInfoUpdated(NftId productNftId, StateId oldState, StateId newState, address updatedBy, address txOrigin, Blocknumber lastUpdatedIn);
-    event LogProductStoreFeeInfoCreated(NftId productNftId, StateId state, address createdBy, address txOrigin);
-    event LogProductStoreFeeInfoUpdated(NftId productNftId, address updatedBy, address txOrigin, Blocknumber lastUpdatedIn);
-    event LogProductStoreRiskInfoCreated(RiskId riskId, StateId state, address createdBy, address txOrigin);
-    event LogProductStoreRiskInfoUpdated(RiskId riskId, StateId oldState, StateId newState, address updatedBy, address txOrigin, Blocknumber lastUpdatedIn);
-    event LogProductStorePolicyInfoCreated(NftId policyNftId, StateId state, address createdBy, address txOrigin);
-    event LogProductStorePolicyInfoUpdated(NftId policyNftId, StateId oldState, StateId newState, address updatedBy, address txOrigin, Blocknumber lastUpdatedIn);
-    event LogProductStorePremiumInfoCreated(NftId policyNftId, StateId state, address createdBy, address txOrigin);
-    event LogProductStorePremiumInfoUpdated(NftId policyNftId, StateId oldState, StateId newState, address updatedBy, address txOrigin, Blocknumber lastUpdatedIn);
-    event LogProductStoreClaimInfoCreated(NftId policyNftId, ClaimId claimId, StateId state, address createdBy, address txOrigin);
-    event LogProductStoreClaimInfoUpdated(NftId policyNftId, ClaimId claimId, StateId oldState, StateId newState, address updatedBy, address txOrigin, Blocknumber lastUpdatedIn);
-    event LogProductStorePayoutInfoCreated(NftId policyNftId, PayoutId payoutId, StateId state, address createdBy, address txOrigin);
-    event LogProductStorePayoutInfoUpdated(NftId policyNftId, PayoutId payoutId, StateId oldState, StateId newState, address updatedBy, address txOrigin, Blocknumber lastUpdatedIn);
+    event LogProductStoreProductInfoCreated(NftId indexed productNftId, StateId indexed state, address indexed createdBy, address txOrigin);
+    event LogProductStoreProductInfoUpdated(NftId indexed productNftId, StateId indexed oldState, StateId indexed newState, address updatedBy, address txOrigin, Blocknumber lastUpdatedIn);
+    event LogProductStoreFeeInfoCreated(NftId indexed productNftId, StateId indexed state, address indexed createdBy, address txOrigin);
+    event LogProductStoreFeeInfoUpdated(NftId indexed productNftId, address indexed updatedBy, address indexed txOrigin, Blocknumber lastUpdatedIn);
+    event LogProductStoreRiskInfoCreated(RiskId indexed riskId, StateId indexed state, address indexed createdBy, address txOrigin);
+    event LogProductStoreRiskInfoUpdated(RiskId indexed riskId, StateId indexed oldState, StateId indexed newState, address updatedBy, address txOrigin, Blocknumber lastUpdatedIn);
+    event LogProductStorePolicyInfoCreated(NftId indexed policyNftId, StateId indexed state, address indexed createdBy, address txOrigin);
+    event LogProductStorePolicyInfoUpdated(NftId indexed policyNftId, StateId indexed oldState, StateId indexed newState, address updatedBy, address txOrigin, Blocknumber lastUpdatedIn);
+    event LogProductStorePremiumInfoCreated(NftId indexed policyNftId, StateId indexed state, address indexed createdBy, address txOrigin);
+    event LogProductStorePremiumInfoUpdated(NftId indexed policyNftId, StateId indexed oldState, StateId indexed newState, address updatedBy, address txOrigin, Blocknumber lastUpdatedIn);
+    event LogProductStoreClaimInfoCreated(NftId indexed policyNftId, ClaimId indexed claimId, StateId indexed state, address createdBy, address txOrigin);
+    event LogProductStoreClaimInfoUpdated(NftId indexed policyNftId, ClaimId indexed claimId, StateId indexed oldState, StateId newState, address updatedBy, address txOrigin, Blocknumber lastUpdatedIn);
+    event LogProductStorePayoutInfoCreated(NftId indexed policyNftId, PayoutId indexed payoutId, StateId indexed state, address createdBy, address txOrigin);
+    event LogProductStorePayoutInfoUpdated(NftId indexed policyNftId, PayoutId indexed payoutId, StateId indexed oldState, StateId newState, address updatedBy, address txOrigin, Blocknumber lastUpdatedIn);
 
     mapping(Key32 key32 => IComponents.ProductInfo) private _products;
     mapping(Key32 key32 => IComponents.FeeInfo) private _fees;

package/contracts/instance/RequestSet.sol

@@ -0,0 +1,63 @@
+// SPDX-License-Identifier: Apache-2.0
+pragma solidity ^0.8.20;
+
+import {IComponents} from "./module/IComponents.sol";
+
+import {Key32} from "../type/Key32.sol";
+import {LibNftIdSet} from "../type/NftIdSet.sol";
+import {LibRequestIdSet} from "../type/RequestIdSet.sol";
+import {NftId} from "../type/NftId.sol";
+import {ObjectSet} from "./base/ObjectSet.sol";
+import {ObjectSetHelperLib} from "./base/ObjectSetHelperLib.sol";
+import {RequestId, RequestIdLib} from "../type/RequestId.sol";
+
+contract RequestSet is 
+    ObjectSet
+{
+    using LibNftIdSet for LibNftIdSet.Set;
+    using LibRequestIdSet for LibRequestIdSet.Set;
+
+    event LogRequestSetRequestAdded(NftId indexed oracleNftId, RequestId indexed requestId);
+    event LogRequestSetRequestRemoved(NftId indexed oracleNftId, RequestId indexed requestId);
+
+    error ErrorRequestSetOracleNotRegistered(NftId oracleNftId);
+
+    /// @dev add a new request to a oracle registerd with this instance
+    // the corresponding oracles existence is checked via instance reader
+    function add(NftId oracleNftId, RequestId requestId) external restricted() {
+        IComponents.ComponentInfo memory componentInfo = ObjectSetHelperLib.getComponentInfo(_instanceAddress, oracleNftId);
+
+        // ensure pool is registered with instance
+        if (bytes(componentInfo.name).length == 0) {
+            revert ErrorRequestSetOracleNotRegistered(oracleNftId);
+        }
+
+        _add(oracleNftId, _toRequestKey32(requestId));
+        emit LogRequestSetRequestAdded(oracleNftId, requestId);
+    }
+
+    function remove(NftId oracleNftId, RequestId requestId) external restricted() {
+        _remove(oracleNftId, _toRequestKey32(requestId));
+        emit LogRequestSetRequestRemoved(oracleNftId, requestId);
+    }
+
+    function _toRequestKey32(RequestId requestId) private pure returns (Key32) {
+        return requestId.toKey32();
+    }
+
+    function activeRequests(NftId oracleNftId) external view returns (uint256 numberOfRequests) {
+        return _objects(oracleNftId);
+    }
+
+    function activeRequestAt(NftId oracleNftId, uint256 idx) external view returns (RequestId requestId) {
+        return _toRequestId(_getActiveObject(oracleNftId, idx));
+    }
+
+    function contains(NftId oracleNftId, RequestId requestId) external view returns (bool) {
+        return _contains(oracleNftId, _toRequestKey32(requestId));
+    }
+
+    function _toRequestId(Key32 key) private pure returns (RequestId) {
+        return RequestIdLib.toRequestId(key.toKeyId());
+    }
+}

package/contracts/instance/RiskSet.sol

@@ -13,12 +13,11 @@ contract RiskSet is
     ObjectSet
 {
 
-    event LogRiskSetPolicyLinked(RiskId riskId, NftId policyNftId);
-    event LogRiskSetPolicyUnlinked(RiskId riskId, NftId policyNftId);
+    event LogRiskSetPolicyLinked(RiskId indexed riskId, NftId indexed policyNftId);
+    event LogRiskSetPolicyUnlinked(RiskId indexed riskId, NftId indexed policyNftId);
 
-    event LogRiskSetRiskAdded(NftId productNftId, RiskId riskId);
-    event LogRiskSetRiskActive(NftId poolNftId,  RiskId riskId);
-    event LogRiskSetRiskPaused(NftId poolNftId,  RiskId riskId);
+    event LogRiskSetRiskAdded(NftId indexed productNftId, RiskId indexed riskId);
+    event LogRiskSetRiskActivated(NftId indexed poolNftId,  RiskId indexed riskId, bool indexed active);
 
     error ErrorRiskSetRiskLocked(RiskId riskId, NftId policyNftId); 
     error ErrorRiskSetRiskUnknown(RiskId riskId);
@@ -68,14 +67,14 @@ contract RiskSet is
     function activate(RiskId riskId) external restricted() {
         NftId productNftId = ObjectSetHelperLib.getProductNftId(_instanceAddress, riskId);
         _activate(productNftId, riskId.toKey32());
-        emit LogRiskSetRiskActive(productNftId, riskId);
+        emit LogRiskSetRiskActivated(productNftId, riskId, true);
     }
 
     /// @dev Applications linked to paused/archived risks may not be underwritten
     function deactivate(RiskId riskId) external restricted() {
         NftId productNftId = ObjectSetHelperLib.getProductNftId(_instanceAddress, riskId);
         _deactivate(productNftId, riskId.toKey32());
-        emit LogRiskSetRiskPaused(productNftId, riskId);
+        emit LogRiskSetRiskActivated(productNftId, riskId, false);
     }
 
     function checkRisk(NftId productNftId, RiskId riskId)

package/contracts/instance/TargetNames.sol

@@ -7,4 +7,5 @@ string constant INSTANCE_STORE_TARGET_NAME = "InstanceStore";
 string constant PRODUCT_STORE_TARGET_NAME = "ProductStore";
 string constant BUNDLE_SET_TARGET_NAME = "BundleSet";
 string constant RISK_SET_TARGET_NAME = "RiskSet";
+string constant REQUEST_SET_TARGET_NAME = "RequestSet";
 

package/contracts/instance/base/BalanceStore.sol

@@ -10,16 +10,16 @@ contract BalanceStore {
     error ErrorBalanceStoreTargetAlreadyRegistered(NftId targetNftId);
     error ErrorBalanceStoreTargetNotRegistered(NftId targetNftId);
 
-    event LogBalanceStoreTargetRegistered(NftId targetNftId);
+    event LogBalanceStoreTargetRegistered(NftId indexed targetNftId);
 
-    event LogBalanceStoreFeesIncreased(NftId targetNftId, Amount addedAmount, Amount newBalance, Blocknumber lastUpdatedIn);
-    event LogBalanceStoreFeesDecreased(NftId targetNftId, Amount addedAmount, Amount newBalance, Blocknumber lastUpdatedIn);
+    event LogBalanceStoreFeesIncreased(NftId indexed targetNftId, Amount addedAmount, Amount newBalance, Blocknumber lastUpdatedIn);
+    event LogBalanceStoreFeesDecreased(NftId indexed targetNftId, Amount addedAmount, Amount newBalance, Blocknumber lastUpdatedIn);
 
-    event LogBalanceStoreLockedIncreased(NftId targetNftId, Amount addedAmount, Amount newBalance, Blocknumber lastUpdatedIn);
-    event LogBalanceStoreLockedDecreased(NftId targetNftId, Amount addedAmount, Amount newBalance, Blocknumber lastUpdatedIn);
+    event LogBalanceStoreLockedIncreased(NftId indexed targetNftId, Amount addedAmount, Amount newBalance, Blocknumber lastUpdatedIn);
+    event LogBalanceStoreLockedDecreased(NftId indexed targetNftId, Amount addedAmount, Amount newBalance, Blocknumber lastUpdatedIn);
 
-    event LogBalanceStoreBalanceIncreased(NftId targetNftId, Amount addedAmount, Amount newBalance, Blocknumber lastUpdatedIn);
-    event LogBalanceStoreBalanceDecreased(NftId targetNftId, Amount addedAmount, Amount newBalance, Blocknumber lastUpdatedIn);
+    event LogBalanceStoreBalanceIncreased(NftId indexed targetNftId, Amount addedAmount, Amount newBalance, Blocknumber lastUpdatedIn);
+    event LogBalanceStoreBalanceDecreased(NftId indexed targetNftId, Amount addedAmount, Amount newBalance, Blocknumber lastUpdatedIn);
 
     mapping(NftId nftId => Amount balance) private _balanceAmount;
     mapping(NftId nftId => Amount locked) private _lockedAmount;

package/contracts/instance/base/ObjectSet.sol

@@ -12,7 +12,7 @@ contract ObjectSet is
 {
     using LibKey32Set for LibKey32Set.Set;
 
-    event LogObjectSetInitialized(address instance);
+    event LogObjectSetInitialized(address indexed instance);
 
     error ErrorObjectSetNftIdInvalid(NftId instanceNftId);
 
@@ -43,6 +43,14 @@ contract ObjectSet is
         activeSet.add(key);
     }
 
+    function _remove(NftId componentNftId, Key32 key) internal {
+        LibKey32Set.Set storage allSet = _allObjects[componentNftId];
+        LibKey32Set.Set storage activeSet = _activeObjects[componentNftId];
+
+        allSet.remove(key);
+        activeSet.remove(key);
+    }
+
     function _activate(NftId componentNftId, Key32 key) internal {
         _activeObjects[componentNftId].add(key);
     }

package/contracts/instance/base/ObjectSetHelperLib.sol

@@ -2,6 +2,7 @@
 pragma solidity ^0.8.20;
 
 import {IBundle} from "../module/IBundle.sol";
+import {IComponents} from "../module/IComponents.sol";
 import {IInstance} from "../IInstance.sol";
 import {IRisk} from "../module/IRisk.sol";
 import {NftId} from "../../type/NftId.sol";
@@ -11,7 +12,6 @@ import {RiskId} from "../../type/RiskId.sol";
 library ObjectSetHelperLib {
 
     function getRiskInfo(address instanceAddress, RiskId riskId) public view returns (IRisk.RiskInfo memory) {
-
         return IInstance(instanceAddress).getInstanceReader().getRiskInfo(riskId);
     }
 
@@ -27,4 +27,8 @@ library ObjectSetHelperLib {
         return getBundleInfo(instanceAddress, bundleNftId).poolNftId;
     }
 
+    function getComponentInfo(address instanceAddress, NftId componentNftId) public view returns (IComponents.ComponentInfo memory) {
+        return IInstance(instanceAddress).getInstanceReader().getComponentInfo(componentNftId);
+    }
+
 }

package/contracts/oracle/IOracleComponent.sol

@@ -13,6 +13,10 @@ import {Timestamp} from "../type/Timestamp.sol";
 interface IOracleComponent is IInstanceLinkedComponent {
     error ErrorOracleNotImplemented(string methodName);
     
+    event LogOracleRequestReceived(RequestId indexed requestId, NftId indexed requesterId);
+    event LogOracleRequestCancelled(RequestId indexed requestId);
+
+
     /// @dev callback method for requesting some data from the oracle
     function request(
         RequestId requestId,
@@ -30,4 +34,10 @@ interface IOracleComponent is IInstanceLinkedComponent {
 
     /// @dev returns true iff the component needs to be called when selling/renewing policis
     function isVerifying() external view returns (bool verifying);
+
+    function activeRequests() external view returns(uint256 numberOfRequests);
+    
+    function getActiveRequest(uint256 idx) external view returns(RequestId requestId);
+
+    function isActiveRequest(RequestId requestId) external view returns(bool isActive);
 }

package/contracts/oracle/IOracleService.sol

@@ -11,11 +11,11 @@ import {Timestamp} from "../type/Timestamp.sol";
 
 interface IOracleService is IService {
 
-    event LogOracleServiceRequestCreated(RequestId requestId, NftId requesterNftId, NftId oracleNftId, Timestamp expiryAt);
-    event LogOracleServiceResponseProcessed(RequestId requestId, NftId oracleNftId);
-    event LogOracleServiceDeliveryFailed(RequestId requestId, address requesterAddress, string functionSignature);
-    event LogOracleServiceResponseResent(RequestId requestId, NftId requesterNftId);
-    event LogOracleServiceRequestCancelled(RequestId requestId, NftId requesterNftId);
+    event LogOracleServiceRequestCreated(RequestId indexed requestId, NftId indexed requesterNftId, NftId indexed oracleNftId, Timestamp expiryAt);
+    event LogOracleServiceResponseProcessed(RequestId indexed requestId, NftId indexed requesterNftId, NftId indexed oracleNftId);
+    event LogOracleServiceDeliveryFailed(RequestId indexed requestId, address indexed requesterAddress, string functionSignature);
+    event LogOracleServiceResponseResent(RequestId indexed requestId, NftId indexed requesterNftId);
+    event LogOracleServiceRequestCancelled(RequestId indexed requestId, NftId indexed requesterNftId);
 
     // create request
     error ErrorOracleServiceProductMismatch(ObjectType callerObjectType, NftId productNft, NftId oracleParentNftId);