@etherisc/gif-next 3.0.0-ee35efe-784 → 3.0.0-f060b81-534

package/contracts/examples/flight/FlightOracle.sol

@@ -7,6 +7,7 @@ import {ACTIVE, FULFILLED, FAILED} from "../../type/StateId.sol";
 import {NftId} from "../../type/NftId.sol";
 import {BasicOracle} from "../../oracle/BasicOracle.sol";
 import {RequestId} from "../../type/RequestId.sol";
+import {LibRequestIdSet} from "../../type/RequestIdSet.sol";
 import {RiskId} from "../../type/RiskId.sol";
 import {StateId} from "../../type/StateId.sol";
 import {Str} from "../../type/String.sol";
@@ -32,6 +33,9 @@ contract FlightOracle is
     event LogFlightOracleResponseSent(RequestId requestId, bytes1 status, int256 delay);
     event LogFlightOracleRequestCancelled(RequestId requestId);
 
+    // TODO decide if this variable should be moved to instance store
+    // if so it need to manage active requests by requestor nft id
+    LibRequestIdSet.Set internal _activeRequests;
 
 
     constructor(
@@ -96,6 +100,7 @@ contract FlightOracle is
         // effects + interaction (via framework to receiving component)
         _respond(requestId, responseData);
 
+        // TODO decide if the code below should be moved to GIF
         _updateRequestState(requestId);
     }
 
@@ -111,6 +116,35 @@ contract FlightOracle is
 
     //--- view functions ----------------------------------------------------//
 
+    // TODO decide if the code below should be moved to GIF
+    function activeRequests()
+        external
+        view
+        returns(uint256 numberOfRequests)
+    {
+        return LibRequestIdSet.size(_activeRequests);
+    }
+
+
+    // TODO decide if the code below should be moved to GIF
+    function getActiveRequest(uint256 idx)
+        external
+        view
+        returns(RequestId requestId)
+    {
+        return LibRequestIdSet.getElementAt(_activeRequests, idx);
+    }
+
+
+    function isActiveRequest(RequestId requestId)
+        external
+        view
+        returns(bool isActive)
+    {
+        return LibRequestIdSet.contains(_activeRequests, requestId);
+    }
+
+
     function getRequestState(RequestId requestId)
         external
         view
@@ -138,4 +172,55 @@ contract FlightOracle is
         return abi.decode(data, (FlightStatusRequest));
     }
 
+    //--- internal functions ------------------------------------------------//
+
+
+    // TODO decide if the code below should be moved to GIF
+    // check callback result
+    function _updateRequestState(
+        RequestId requestId
+    )
+        internal
+    {
+        bool requestFulfilled = _getInstanceReader().getRequestState(
+            requestId) == FULFILLED();
+
+        // remove from active requests when successful
+        if (requestFulfilled && LibRequestIdSet.contains(_activeRequests, requestId)) {
+            LibRequestIdSet.remove(_activeRequests, requestId);
+        } 
+    }
+
+
+    /// @dev use case specific handling of oracle requests
+    /// for now only log is emitted to verify that request has been received by oracle component 
+    function _request(
+        RequestId requestId,
+        NftId requesterId,
+        bytes calldata requestData,
+        Timestamp expiryAt
+    )
+        internal
+        virtual override
+    {
+        FlightStatusRequest memory request = abi.decode(requestData, (FlightStatusRequest));
+
+        // TODO decide if the line below should be moved to GIF
+        LibRequestIdSet.add(_activeRequests, requestId);
+        emit LogFlightOracleRequestReceived(requestId, requesterId);
+    }
+
+
+    /// @dev use case specific handling of oracle requests
+    /// for now only log is emitted to verify that cancelling has been received by oracle component 
+    function _cancel(
+        RequestId requestId
+    )
+        internal
+        virtual override
+    {
+        // TODO decide if the line below should be moved to GIF
+        LibRequestIdSet.remove(_activeRequests, requestId);
+        emit LogFlightOracleRequestCancelled(requestId);
+    }
 }

package/contracts/instance/IInstance.sol

@@ -12,7 +12,6 @@ import {InstanceReader} from "./InstanceReader.sol";
 import {InstanceStore} from "./InstanceStore.sol";
 import {NftId} from "../type/NftId.sol";
 import {ProductStore} from "./ProductStore.sol";
-import {RequestSet} from "./RequestSet.sol";
 import {RoleId} from "../type/RoleId.sol";
 import {Seconds} from "../type/Seconds.sol";
 import {UFixed} from "../type/UFixed.sol";
@@ -59,7 +58,6 @@ interface IInstance is
         ProductStore productStore;
         BundleSet bundleSet;
         RiskSet riskSet;
-        RequestSet requestSet;
         InstanceReader instanceReader;
     }
 
@@ -151,7 +149,6 @@ interface IInstance is
     function getInstanceReader() external view returns (InstanceReader);
     function getBundleSet() external view returns (BundleSet);
     function getRiskSet() external view returns (RiskSet);
-    function getRequestSet() external view returns (RequestSet);
     function getInstanceAdmin() external view returns (InstanceAdmin);
     function getInstanceStore() external view returns (InstanceStore);
     function getProductStore() external view returns (ProductStore);

package/contracts/instance/IInstanceService.sol

@@ -26,7 +26,6 @@ interface IInstanceService is IService {
     error ErrorInstanceServiceMasterInstanceAdminAlreadySet();
     error ErrorInstanceServiceMasterBundleSetAlreadySet();
     error ErrorInstanceServiceMasterRiskSetAlreadySet();
-    error ErrorInstanceServiceMasterRequestSetAlreadySet();
     error ErrorInstanceServiceInstanceAddressZero();
 
     error ErrorInstanceServiceMasterInstanceReaderNotSet();
@@ -39,18 +38,15 @@ interface IInstanceService is IService {
     error ErrorInstanceServiceInstanceReaderZero();
     error ErrorInstanceServiceBundleSetZero();
     error ErrorInstanceServiceRiskSetZero();
-    error ErrorInstanceServiceRequestSetZero();
     error ErrorInstanceServiceInstanceStoreZero();
     error ErrorInstanceServiceProductStoreZero();
 
     error ErrorInstanceServiceInstanceAuthorityMismatch();
     error ErrorInstanceServiceBundleSetAuthorityMismatch();
     error ErrorInstanceServiceRiskSetAuthorityMismatch();
-    error ErrorInstanceServiceRequestSetAuthorityMismatch();
     error ErrorInstanceServiceInstanceReaderInstanceMismatch2();
     error ErrorInstanceServiceBundleSetInstanceMismatch();
     error ErrorInstanceServiceRiskSetInstanceMismatch();
-    error ErrorInstanceServiceRequestSetInstanceMismatch();
     error ErrorInstanceServiceInstanceStoreAuthorityMismatch();
     error ErrorInstanceServiceProductStoreAuthorityMismatch();
 
@@ -63,7 +59,7 @@ interface IInstanceService is IService {
     event LogInstanceServiceInstanceLocked(NftId instanceNftId, bool locked);
     event LogInstanceServiceInstanceCreated(NftId instanceNftId, address instance);
     event LogInstanceServiceMasterInstanceRegistered(NftId masterInstanceNftId, address masterInstance, address masterInstanceAdmin, address masterAccessManager, 
-                address masterInstanceReader, address masterInstanceBundleSet, address masterInstanceRiskSet, address masterInstanceRequestSet, address masterInstanceStore, address masterProductStore);
+                address masterInstanceReader, address masterInstanceBundleSet, address masterInstanceRiskSet, address masterInstanceStore, address masterProductStore);
     event LogInstanceServiceMasterInstanceReaderUpgraded(NftId instanceNfId, address newInstanceReader);
     event LogInstanceServiceInstanceReaderUpgraded(NftId instanceNfId, address newInstanceReader);
 

package/contracts/instance/Instance.sol

@@ -17,7 +17,6 @@ import {InstanceStore} from "./InstanceStore.sol";
 import {NftId} from "../type/NftId.sol";
 import {ProductStore} from "./ProductStore.sol";
 import {Registerable} from "../shared/Registerable.sol";
-import {RequestSet} from "./RequestSet.sol";
 import {RoleId} from "../type/RoleId.sol";
 import {Seconds} from "../type/Seconds.sol";
 import {UFixed} from "../type/UFixed.sol";
@@ -36,7 +35,6 @@ contract Instance is
     InstanceReader internal _instanceReader;
     BundleSet internal _bundleSet;
     RiskSet internal _riskSet;
-    RequestSet internal _requestSet;
     InstanceStore internal _instanceStore;
     ProductStore internal _productStore;
     NftId [] internal _products;
@@ -90,7 +88,6 @@ contract Instance is
         _productStore = instanceContracts.productStore;
         _bundleSet = instanceContracts.bundleSet;
         _riskSet = instanceContracts.riskSet;
-        _requestSet = instanceContracts.requestSet;
         _instanceReader = instanceContracts.instanceReader;
 
         // initialize instance supporting contracts
@@ -98,7 +95,6 @@ contract Instance is
         _productStore.initialize();
         _bundleSet.initialize(instanceContracts.instanceAdmin.authority(), address(registry));
         _riskSet.initialize(instanceContracts.instanceAdmin.authority(), address(registry));
-        _requestSet.initialize(instanceContracts.instanceAdmin.authority(), address(registry));
         _instanceReader.initialize();
 
         _componentService = IComponentService(
@@ -337,10 +333,6 @@ contract Instance is
         return _riskSet;
     }
 
-    function getRequestSet() external view returns (RequestSet) {
-        return _requestSet;
-    }
-
     function getInstanceAdmin() external view returns (InstanceAdmin) {
         return _instanceAdmin;
     }

package/contracts/instance/InstanceAdmin.sol

@@ -13,7 +13,7 @@ import {ObjectType, INSTANCE} from "../type/ObjectType.sol";
 import {RoleId, ADMIN_ROLE} from "../type/RoleId.sol";
 import {Str} from "../type/String.sol";
 import {VersionPart} from "../type/Version.sol";
-import {INSTANCE_TARGET_NAME, INSTANCE_ADMIN_TARGET_NAME, INSTANCE_STORE_TARGET_NAME, PRODUCT_STORE_TARGET_NAME, BUNDLE_SET_TARGET_NAME, RISK_SET_TARGET_NAME, REQUEST_SET_TARGET_NAME} from "./TargetNames.sol";
+import {INSTANCE_TARGET_NAME, INSTANCE_ADMIN_TARGET_NAME, INSTANCE_STORE_TARGET_NAME, PRODUCT_STORE_TARGET_NAME, BUNDLE_SET_TARGET_NAME, RISK_SET_TARGET_NAME} from "./TargetNames.sol";
 
 
 contract InstanceAdmin is
@@ -123,7 +123,6 @@ contract InstanceAdmin is
         _createInstanceTarget(address(_instance.getProductStore()), PRODUCT_STORE_TARGET_NAME); 
         _createInstanceTarget(address(_instance.getBundleSet()), BUNDLE_SET_TARGET_NAME); 
         _createInstanceTarget(address(_instance.getRiskSet()), RISK_SET_TARGET_NAME); 
-        _createInstanceTarget(address(_instance.getRequestSet()), REQUEST_SET_TARGET_NAME); 
     }
 
 

package/contracts/instance/InstanceAuthorizationV3.sol

@@ -10,10 +10,9 @@ import {ACCOUNTING, ORACLE, POOL, INSTANCE, COMPONENT, DISTRIBUTION, APPLICATION
 import {BundleSet} from "../instance/BundleSet.sol";
 import {InstanceAdmin} from "../instance/InstanceAdmin.sol";
 import {InstanceStore} from "../instance/InstanceStore.sol";
-import {INSTANCE_TARGET_NAME, INSTANCE_ADMIN_TARGET_NAME, INSTANCE_STORE_TARGET_NAME, PRODUCT_STORE_TARGET_NAME, BUNDLE_SET_TARGET_NAME, RISK_SET_TARGET_NAME, REQUEST_SET_TARGET_NAME} from "./TargetNames.sol";
+import {INSTANCE_TARGET_NAME, INSTANCE_ADMIN_TARGET_NAME, INSTANCE_STORE_TARGET_NAME, PRODUCT_STORE_TARGET_NAME, BUNDLE_SET_TARGET_NAME, RISK_SET_TARGET_NAME} from "./TargetNames.sol";
 import {ProductStore} from "../instance/ProductStore.sol";
 import {ADMIN_ROLE, INSTANCE_OWNER_ROLE, PUBLIC_ROLE} from "../type/RoleId.sol";
-import {RequestSet} from "../instance/RequestSet.sol";
 import {RiskSet} from "../instance/RiskSet.sol"; 
 
 
@@ -72,7 +71,6 @@ contract InstanceAuthorizationV3
           _addInstanceTarget(PRODUCT_STORE_TARGET_NAME);
           _addInstanceTarget(BUNDLE_SET_TARGET_NAME);
           _addInstanceTarget(RISK_SET_TARGET_NAME);
-          _addInstanceTarget(REQUEST_SET_TARGET_NAME);
      }
 
 
@@ -86,18 +84,6 @@ contract InstanceAuthorizationV3
           _setupProductStoreAuthorization();
           _setupBundleSetAuthorization();
           _setUpRiskSetAuthorization();
-          _setUpRequestIdSetAuthorization();
-     }
-
-     function _setUpRequestIdSetAuthorization()
-          internal
-     {
-          IAccess.FunctionInfo[] storage functions;
-
-          // authorize oracle service role
-          functions = _authorizeForTarget(REQUEST_SET_TARGET_NAME, getServiceRole(ORACLE()));
-          _authorize(functions, RequestSet.add.selector, "add");
-          _authorize(functions, RequestSet.remove.selector, "remove");
      }
 
 

package/contracts/instance/InstanceService.sol

@@ -22,7 +22,6 @@ 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";
@@ -50,7 +49,6 @@ contract InstanceService is
     address internal _masterInstanceReader;
     address internal _masterInstanceBundleSet;
     address internal _masterInstanceRiskSet;
-    address internal _masterInstanceRequestSet;
     address internal _masterInstanceStore;
     address internal _masterProductStore;
 
@@ -325,70 +323,49 @@ 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
             
-            {
-                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;
-            }
+            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;
         }
         
         {
@@ -398,7 +375,7 @@ contract InstanceService is
             
             emit LogInstanceServiceMasterInstanceRegistered(
                 masterInstanceNftId, _masterInstance, _masterInstanceAdmin, _masterAccessManager, 
-                _masterInstanceReader, _masterInstanceBundleSet, _masterInstanceRiskSet, _masterInstanceRequestSet, _masterInstanceStore, _masterProductStore);
+                _masterInstanceReader, _masterInstanceBundleSet, _masterInstanceRiskSet, _masterInstanceStore, _masterProductStore);
         }
     }
 
@@ -470,7 +447,6 @@ 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/TargetNames.sol

@@ -7,5 +7,4 @@ 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/ObjectSet.sol

@@ -43,14 +43,6 @@ 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,7 +2,6 @@
 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";
@@ -12,6 +11,7 @@ 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,8 +27,4 @@ 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,10 +13,6 @@ 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,
@@ -34,10 +30,4 @@ 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

@@ -63,19 +63,4 @@ interface IOracleService is IService {
     /// Permissioned: only the requester may cancel a request
     function cancel(RequestId requestId) external;
 
-    // FIXME: this should be done by request
-    function addRequest(RequestId requestId) external;
-
-    // FIXME: this could be done by respond, resend, cancel
-    function removeRequest(RequestId requestId) external;
-
-    // FIXME: move to instance reader
-    function activeRequests() external view returns(uint256 numberOfRequests);
-
-    // FIXME: move to instance reader
-    function activeRequestAt(uint256 idx) external view returns(RequestId requestId);
-
-    // FIXME: move to instance reader
-    function isActiveRequest(RequestId requestId) external view returns(bool isActive);
-
 }

package/contracts/oracle/Oracle.sol

@@ -2,7 +2,7 @@
 pragma solidity ^0.8.20;
 
 import {Amount} from "../type/Amount.sol";
-import {COMPONENT, ORACLE} from "../type/ObjectType.sol";
+import {COMPONENT, PRODUCT, ORACLE} from "../type/ObjectType.sol";
 import {IAuthorization} from "../authorization/IAuthorization.sol";
 import {IComponentService} from "../shared/IComponentService.sol";
 import {IInstanceLinkedComponent} from "../shared/IInstanceLinkedComponent.sol";
@@ -11,7 +11,6 @@ import {IOracleService} from "./IOracleService.sol";
 import {NftId} from "../type/NftId.sol";
 import {InstanceLinkedComponent} from "../shared/InstanceLinkedComponent.sol";
 import {RequestId} from "../type/RequestId.sol";
-import {FULFILLED} from "../type/StateId.sol";
 import {Timestamp} from "../type/Timestamp.sol";
 
 
@@ -75,33 +74,6 @@ abstract contract Oracle is
         revert ErrorOracleNotImplemented("withdrawFees");
     }
 
-    function activeRequests()
-        external
-        view
-        returns(uint256 numberOfRequests)
-    {
-        OracleStorage storage $ = _getOracleStorage();
-        return $._oracleService.activeRequests();
-    }
-
-
-    function getActiveRequest(uint256 idx)
-        external
-        view
-        returns(RequestId requestId)
-    {
-        OracleStorage storage $ = _getOracleStorage();
-        return $._oracleService.activeRequestAt(idx);
-    }
-
-    function isActiveRequest(RequestId requestId)
-        external
-        view
-        returns(bool isActive)
-    {
-        OracleStorage storage $ = _getOracleStorage();
-        return $._oracleService.isActiveRequest(requestId);
-    }
 
     function __Oracle_init(
         address registry,
@@ -130,64 +102,45 @@ abstract contract Oracle is
         _registerInterface(type(IOracleComponent).interfaceId);
     }
 
-    /// @dev Internal function for handling oracle responses.
-    /// Default implementation sends response back to oracle service.
-    /// Use this function in use case specific external/public functions to handle use case specific response handling.
-    function _respond(
+
+    /// @dev Internal function for handling requests.
+    /// Empty implementation.
+    /// Overwrite this function to implement use case specific handling for oracle calls.
+    function _request(
         RequestId requestId,
-        bytes memory responseData
+        NftId requesterId,
+        bytes calldata requestData,
+        Timestamp expiryAt
     )
         internal
         virtual
     {
-        _getOracleStorage()._oracleService.respond(requestId, responseData);
     }
 
-    // check callback result
-    function _updateRequestState(
+
+    /// @dev Internal function for cancelling requests.
+    /// Empty implementation.
+    /// Overwrite this function to implement use case specific cancelling.
+    function _cancel(
         RequestId requestId
     )
         internal
+        virtual
     {
-        bool requestFulfilled = _getInstanceReader().getRequestState(
-            requestId) == FULFILLED();
-        OracleStorage storage $ = _getOracleStorage();
-
-        // remove from active requests when successful
-        if (requestFulfilled && $._oracleService.isActiveRequest(requestId)) {
-            $._oracleService.removeRequest(requestId);
-        } 
     }
 
 
-    /// @dev use case specific handling of oracle requests
-    /// for now only log is emitted to verify that request has been received by oracle component 
-    function _request(
+    /// @dev Internal function for handling oracle responses.
+    /// Default implementation sends response back to oracle service.
+    /// Use this function in use case specific external/public functions to handle use case specific response handling.
+    function _respond(
         RequestId requestId,
-        NftId requesterId,
-        bytes calldata requestData,
-        Timestamp expiryAt
-    )
-        internal
-        virtual 
-    {
-        OracleStorage storage $ = _getOracleStorage();
-        $._oracleService.addRequest(requestId);
-        emit LogOracleRequestReceived(requestId, requesterId);
-    }
-
-
-    /// @dev use case specific handling of oracle requests
-    /// for now only log is emitted to verify that cancelling has been received by oracle component 
-    function _cancel(
-        RequestId requestId
+        bytes memory responseData
     )
         internal
-        virtual 
+        virtual
     {
-        OracleStorage storage $ = _getOracleStorage();
-        $._oracleService.removeRequest(requestId);
-        emit LogOracleRequestCancelled(requestId);
+        _getOracleStorage()._oracleService.respond(requestId, responseData);
     }