@etherisc/gif-next 3.0.0-1b49bd6-565 → 3.0.0-1c2086e-623

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/Cloneable.sol

@@ -4,19 +4,25 @@ pragma solidity ^0.8.20;
 import {AccessManagedUpgradeable} from "@openzeppelin/contracts-upgradeable/access/manager/AccessManagedUpgradeable.sol";
 
 import {IRegistry} from "../../registry/IRegistry.sol";
-import {RegistryLinked} from "../../shared/RegistryLinked.sol";
 
 abstract contract Cloneable is 
-    AccessManagedUpgradeable,
-    RegistryLinked
+    AccessManagedUpgradeable
 {
+    IRegistry internal _registry;
+
     /// @dev call to initialize MUST be made in the same transaction as cloning of the contract
     function __Cloneable_init(
-        address authority
+        address authority,
+        address registry
     )
         internal 
         onlyInitializing
     {
         __AccessManaged_init(authority);
+        _registry = IRegistry(registry);
+    }
+
+    function getRegistry() external view returns (IRegistry) {
+        return _registry;
     }
 }

package/contracts/instance/base/ObjectCounter.sol

@@ -1,20 +1,22 @@
 // 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";
+import {RiskId, RiskIdLib} from "../../type/RiskId.sol";
 
 contract ObjectCounter {
 
-    // TODO refactor risk id
-    // mapping(NftId productNftId => uint64 risks) private _riskCounter;
-
+    uint64 private _riskCounter = 0;
     uint256 private _requestCounter = 0;
 
     function _createNextRequestId() internal returns (RequestId requestId) {
         _requestCounter++;
         requestId = RequestIdLib.toRequestId(_requestCounter);
     }
+
+    function _createNextRiskId() internal returns (RiskId riskId) {
+        _riskCounter++;
+        riskId = RiskIdLib.toRiskId(_riskCounter);
+    }
 }

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);
 
@@ -21,12 +21,12 @@ contract ObjectSet is
     address internal _instanceAddress;
 
     /// @dev This initializer needs to be called from the instance itself.
-    function initialize(address authority) 
+    function initialize(address authority, address registry) 
         external
         initializer()
     {
         _instanceAddress = msg.sender;
-        __Cloneable_init(authority);
+        __Cloneable_init(authority, registry);
         
         emit LogObjectSetInitialized(address(_instanceAddress));
     }
@@ -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/BasicOracle.sol

@@ -22,7 +22,9 @@ contract BasicOracle is
         _respond(requestId, responseData);
     }
 
+
     function _initializeBasicOracle(
+        address registry,
         NftId instanceNftId,
         IAuthorization authorization,
         address initialOwner,
@@ -34,6 +36,7 @@ contract BasicOracle is
     {
 
         __Oracle_init(
+            registry,
             instanceNftId,
             authorization,
             initialOwner,

package/contracts/oracle/BasicOracleAuthorization.sol

@@ -8,8 +8,6 @@ import {IAccess} from "../authorization/IAccess.sol";
 import {IOracle} from "./IOracle.sol"; 
 import {PUBLIC_ROLE} from "../../contracts/type/RoleId.sol";
 import {RoleId} from "../type/RoleId.sol";
-import {GIF_INITIAL_RELEASE} from "../registry/Registry.sol";
-import {VersionPartLib} from "../type/Version.sol";
 
 
 contract BasicOracleAuthorization
@@ -23,7 +21,7 @@ contract BasicOracleAuthorization
           Authorization(
                componentName, 
                ORACLE(), 
-               GIF_INITIAL_RELEASE(),
+               3, 
                commitHash, 
                TargetType.Component, 
                false)

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,16 +11,20 @@ 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);
     error ErrorOracleServiceExpiryInThePast(Timestamp blockTimestamp, Timestamp expiryAt);
     error ErrorOracleServiceCallbackMethodNameEmpty();
 
+    // respond
+    error ErrorOracleServiceNotResponsibleOracle(RequestId requestId, NftId expectedOracleNftId, NftId oracleNftId);
+
     // get request info
     error ErrorOracleServiceRequestStateNotActive(RequestId requestId, StateId state);
     error ErrorOracleServiceCallerNotResponsibleOracle(RequestId requestId, NftId oracleNftId, NftId callerNftId);

package/contracts/oracle/Oracle.sol

@@ -2,14 +2,13 @@
 pragma solidity ^0.8.20;
 
 import {Amount} from "../type/Amount.sol";
-import {COMPONENT, PRODUCT, ORACLE} from "../type/ObjectType.sol";
+import {COMPONENT, ORACLE} from "../type/ObjectType.sol";
 import {IAuthorization} from "../authorization/IAuthorization.sol";
 import {IComponentService} from "../shared/IComponentService.sol";
-import {IComponent} from "../shared/IComponent.sol";
+import {IInstanceLinkedComponent} from "../shared/IInstanceLinkedComponent.sol";
 import {IOracleComponent} from "./IOracleComponent.sol";
 import {IOracleService} from "./IOracleService.sol";
 import {NftId} from "../type/NftId.sol";
-import {Component} from "../shared/Component.sol";
 import {InstanceLinkedComponent} from "../shared/InstanceLinkedComponent.sol";
 import {RequestId} from "../type/RequestId.sol";
 import {Timestamp} from "../type/Timestamp.sol";
@@ -64,10 +63,10 @@ abstract contract Oracle is
     }
 
     /// @dev Not relevant for oracle components
-    function withdrawFees(Amount amount)
+    function withdrawFees(Amount)
         external
         virtual
-        override(IComponent, Component)
+        override(IInstanceLinkedComponent, InstanceLinkedComponent)
         onlyOwner()
         restricted()
         returns (Amount)
@@ -75,8 +74,34 @@ abstract contract Oracle is
         revert ErrorOracleNotImplemented("withdrawFees");
     }
 
+    function activeRequests()
+        external
+        view
+        returns(uint256 numberOfRequests)
+    {
+        return _getInstanceReader().getActiveRequests(getNftId());
+    }
 
+
+    function getActiveRequest(uint256 idx)
+        external
+        view
+        returns(RequestId requestId)
+    {
+        return _getInstanceReader().getActiveRequestAt(getNftId(), idx);
+    }
+
+    function isActiveRequest(RequestId requestId)
+        external
+        view
+        returns(bool isActive)
+    {
+        return _getInstanceReader().isRequestActive(getNftId(), requestId);
+    }
+
+    // solhint-disable-next-line func-name-mixedcase
     function __Oracle_init(
+        address registry,
         NftId productNftId,
         IAuthorization authorization,
         address initialOwner,
@@ -87,6 +112,7 @@ abstract contract Oracle is
         onlyInitializing()
     {
         __InstanceLinkedComponent_init(
+            registry, 
             productNftId, 
             name, 
             ORACLE(), 
@@ -101,49 +127,48 @@ abstract contract Oracle is
         _registerInterface(type(IOracleComponent).interfaceId);
     }
 
-
-    /// @dev Internal function for handling requests.
-    /// Empty implementation.
-    /// Overwrite this function to implement use case specific handling for oracle calls.
-    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
+        bytes memory responseData
     )
         internal
         virtual
     {
+        _getOracleStorage()._oracleService.respond(requestId, responseData);
     }
 
-
-    /// @dev Internal function for cancelling requests.
-    /// Empty implementation.
-    /// Overwrite this function to implement use case specific cancelling.
-    function _cancel(
-        RequestId 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,
+        Timestamp
     )
         internal
-        virtual
+        virtual 
     {
+        emit LogOracleRequestReceived(requestId, requesterId);
     }
 
 
-    /// @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,
-        bytes memory responseData
+    /// @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
+        virtual 
     {
-        _getOracleStorage()._oracleService.respond(
-            requestId, responseData);
+        emit LogOracleRequestCancelled(requestId);
     }
 
+
     function _getOracleStorage() private pure returns (OracleStorage storage $) {
+        // solhint-disable-next-line no-inline-assembly
         assembly {
             $.slot := ORACLE_STORAGE_LOCATION_V1
         }