@etherisc/gif-next 3.0.0-fc7e513-722 → 3.0.0-fe24052-863

package/contracts/oracle/Oracle.sol

@@ -2,7 +2,7 @@
 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 {IInstanceLinkedComponent} from "../shared/IInstanceLinkedComponent.sol";
@@ -74,7 +74,35 @@ 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);
+    }
+
+    // solhint-disable-next-line func-name-mixedcase
     function __Oracle_init(
         address registry,
         NftId productNftId,
@@ -102,10 +130,21 @@ 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(
+        RequestId requestId,
+        bytes memory responseData
+    )
+        internal
+        virtual
+    {
+        _getOracleStorage()._oracleService.respond(requestId, responseData);
+    }
 
-    /// @dev Internal function for handling requests.
-    /// Empty implementation.
-    /// Overwrite this function to implement use case specific handling for oracle calls.
+    /// @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,
@@ -113,38 +152,26 @@ abstract contract Oracle is
         Timestamp expiryAt
     )
         internal
-        virtual
+        virtual 
     {
+        emit LogOracleRequestReceived(requestId, requesterId);
     }
 
 
-    /// @dev Internal function for cancelling requests.
-    /// Empty implementation.
-    /// Overwrite this function to implement use case specific cancelling.
+    /// @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
-    {
-    }
-
-
-    /// @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
-    )
-        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
         }

package/contracts/oracle/OracleService.sol

@@ -2,16 +2,14 @@
 pragma solidity ^0.8.20;
 
 import {ContractLib} from "../shared/ContractLib.sol";
-import {IComponent} from "../shared/IComponent.sol";
 import {IInstance} from "../instance/IInstance.sol";
-import {IInstanceService} from "../instance/IInstanceService.sol";
 import {InstanceReader} from "../instance/InstanceReader.sol";
 import {IOracle} from "./IOracle.sol";
 import {IOracleComponent} from "./IOracleComponent.sol";
 import {IOracleService} from "./IOracleService.sol";
 import {IRegistry} from "../registry/IRegistry.sol";
 import {NftId} from "../type/NftId.sol";
-import {ObjectType, COMPONENT, ORACLE, PRODUCT} from "../type/ObjectType.sol";
+import {ObjectType, ORACLE, PRODUCT} from "../type/ObjectType.sol";
 import {RequestId} from "../type/RequestId.sol";
 import {Service} from "../shared/Service.sol";
 import {StateId, ACTIVE, KEEP_STATE, FULFILLED, FAILED, CANCELLED} from "../type/StateId.sol";
@@ -56,7 +54,7 @@ contract OracleService is
         // get and check active caller
         (
             IRegistry.ObjectInfo memory requesterInfo, 
-            address instance
+            address instanceAddress
         ) = ContractLib.getAndVerifyAnyComponent(
             getRegistry(), msg.sender, true);
 
@@ -69,7 +67,7 @@ contract OracleService is
         // effects
         {
             // create request info
-            IOracle.RequestInfo memory request = IOracle.RequestInfo({
+            IOracle.RequestInfo memory requestInfo = IOracle.RequestInfo({
                 requesterNftId: requesterNftId,
                 callbackMethodName: callbackMethodName,
                 oracleNftId: oracleNftId,
@@ -80,8 +78,9 @@ contract OracleService is
                 isCancelled: false
             });
 
-            // store request with instance
-            requestId = IInstance(instance).getInstanceStore().createRequest(request);
+            // store request with instance 
+            requestId = IInstance(instanceAddress).getInstanceStore().createRequest(requestInfo);
+            IInstance(instanceAddress).getRequestSet().add(oracleNftId, requestId);
         }
 
         emit LogOracleServiceRequestCreated(requestId, requesterNftId, oracleNftId, expiryAt);
@@ -116,22 +115,23 @@ contract OracleService is
         NftId oracleNftId = info.nftId;
         IInstance instance = IInstance(instanceAddress);
         bool callerIsOracle = true;
-        IOracle.RequestInfo memory request = _checkAndGetRequestInfo(instance, requestId, oracleNftId, callerIsOracle);
-        request.responseData = responseData;
-        request.respondedAt = TimestampLib.current();
+        IOracle.RequestInfo memory requestInfo = _checkAndGetRequestInfo(instance, requestId, oracleNftId, callerIsOracle);
+        requestInfo.responseData = responseData;
+        requestInfo.respondedAt = TimestampLib.current();
 
         instance.getInstanceStore().updateRequest(
-            requestId, request, KEEP_STATE());
+            requestId, requestInfo, KEEP_STATE());
 
         IRegistry.ObjectInfo memory requesterInfo = getRegistry().getObjectInfo(
-            request.requesterNftId);
+            requestInfo.requesterNftId);
 
         string memory functionSignature = string(
             abi.encodePacked(
-                request.callbackMethodName,
+                requestInfo.callbackMethodName,
                 "(uint64,bytes)"
             ));
 
+        // solhint-disable-next-line avoid-low-level-calls
         (success, ) = requesterInfo.objectAddress.call(
             abi.encodeWithSignature(
                 functionSignature, 
@@ -141,6 +141,7 @@ contract OracleService is
         // check that calling requestor was successful
         if (success) {
             instance.getInstanceStore().updateRequestState(requestId, FULFILLED());
+            instance.getRequestSet().remove(oracleNftId, requestId);
         } else {
             instance.getInstanceStore().updateRequestState(requestId, FAILED());
             emit LogOracleServiceDeliveryFailed(requestId, requesterInfo.objectAddress, functionSignature);
@@ -164,24 +165,26 @@ contract OracleService is
         NftId requesterNftId = info.nftId;
         IInstance instance = IInstance(instanceAddress);
         bool callerIsOracle = false;
-        IOracle.RequestInfo memory request = _checkAndGetRequestInfo(instance, requestId, requesterNftId, callerIsOracle);
+        IOracle.RequestInfo memory requestInfo = _checkAndGetRequestInfo(instance, requestId, requesterNftId, callerIsOracle);
 
         // attempt to deliver response to requester
         string memory functionSignature = string(
             abi.encodePacked(
-                request.callbackMethodName,
+                requestInfo.callbackMethodName,
                 "(uint64,bytes)"
             ));
 
+        // solhint-disable-next-line avoid-low-level-calls
         (bool success, ) = info.objectAddress.call(
             abi.encodeWithSignature(
                 functionSignature, 
                 requestId,
-                request.responseData));
+                requestInfo.responseData));
 
         // check that calling requestor was successful
         if (success) {
             instance.getInstanceStore().updateRequestState(requestId, FULFILLED());
+            instance.getRequestSet().remove(requestInfo.oracleNftId, requestId);
             emit LogOracleServiceResponseResent(requestId, requesterNftId);
         } else {
             emit LogOracleServiceDeliveryFailed(requestId, info.objectAddress, functionSignature);
@@ -204,19 +207,68 @@ contract OracleService is
         IInstance instance = IInstance(instanceAddress);
         bool callerIsOracle = false;
         // TODO property isCancelled and state update to CANCELLED are redundant, get rid of isCancelled
-        IOracle.RequestInfo memory request = _checkAndGetRequestInfo(instance, requestId, requesterNftId, callerIsOracle);
-        request.isCancelled = true;
+        IOracle.RequestInfo memory requestInfo = _checkAndGetRequestInfo(instance, requestId, requesterNftId, callerIsOracle);
+        requestInfo.isCancelled = true;
 
-        instance.getInstanceStore().updateRequest(requestId, request, CANCELLED());
+        instance.getInstanceStore().updateRequest(requestId, requestInfo, CANCELLED());
+        instance.getRequestSet().remove(requestInfo.oracleNftId, requestId);
 
         // call oracle component
         // TODO add check that oracle is active?
-        address oracleAddress = getRegistry().getObjectAddress(request.oracleNftId);
+        address oracleAddress = getRegistry().getObjectAddress(requestInfo.oracleNftId);
         IOracleComponent(oracleAddress).cancel(requestId);
 
         emit LogOracleServiceRequestCancelled(requestId, requesterNftId);
     }
 
+    function activeRequests() 
+        external 
+        view 
+        virtual 
+        returns(uint256 numberOfRequests) 
+    {
+        (
+            IRegistry.ObjectInfo memory info, 
+            address instanceAddress
+        ) = ContractLib.getAndVerifyAnyComponent(
+            getRegistry(), msg.sender, true);
+        IInstance instance = IInstance(instanceAddress);
+
+
+        return instance.getRequestSet().activeRequests(info.nftId);
+    }
+
+    function activeRequestAt(uint256 idx) 
+        external 
+        view 
+        virtual 
+        returns(RequestId requestId) 
+    {
+        (
+            IRegistry.ObjectInfo memory info, 
+            address instanceAddress
+        ) = ContractLib.getAndVerifyAnyComponent(
+            getRegistry(), msg.sender, true);
+        IInstance instance = IInstance(instanceAddress);
+
+        return instance.getRequestSet().activeRequestAt(info.nftId, idx);
+    }
+
+    function isActiveRequest(RequestId requestId) 
+        external 
+        view 
+        virtual 
+        returns(bool isActive) 
+    {
+        (
+            IRegistry.ObjectInfo memory info, 
+            address instanceAddress
+        ) = ContractLib.getAndVerifyAnyComponent(
+            getRegistry(), msg.sender, true);
+        IInstance instance = IInstance(instanceAddress);
+
+        return instance.getRequestSet().contains(info.nftId, requestId);
+    }
 
     function _checkRequestParams(
         IRegistry registry,

package/contracts/pool/BundleService.sol

@@ -130,7 +130,7 @@ contract BundleService is
         BundleSet bundleManager = instance.getBundleSet();
         bundleManager.add(bundleNftId);
 
-        emit LogBundleServiceBundleCreated(bundleNftId, poolNftId, lifetime);
+        emit LogBundleServiceBundleCreated(bundleNftId, poolNftId, lifetime, bundleFee.fixedFee, bundleFee.fractionalFee);
     }
 
 

package/contracts/pool/IBundleService.sol

@@ -30,7 +30,7 @@ interface IBundleService is IService {
 
     error ErrorBundleServiceExtensionLifetimeIsZero();
 
-    event LogBundleServiceBundleCreated(NftId bundleNftId, NftId poolNftId, Seconds lifetime);
+    event LogBundleServiceBundleCreated(NftId bundleNftId, NftId poolNftId, Seconds lifetime, Amount fixedFee, UFixed fractionalFee);
     event LogBundleServiceBundleClosed(NftId bundleNftId);
     event LogBundleServiceBundleLocked(NftId bundleNftId);
     event LogBundleServiceBundleUnlocked(NftId bundleNftId);

package/contracts/pool/IPoolService.sol

@@ -19,7 +19,7 @@ interface IPoolService is IService {
     event LogPoolServiceWalletDefunded(NftId poolNftId, address poolOwner, Amount amount);
 
     event LogPoolServiceBundleCreated(NftId instanceNftId, NftId poolNftId, NftId bundleNftId);
-    event LogPoolServiceBundleClosed(NftId instanceNftId, NftId poolNftId, NftId bundleNftId);
+    event LogPoolServiceBundleClosed(NftId instanceNftId, NftId poolNftId, NftId bundleNftId, Amount balanceAmount, Amount feeAmount);
 
     event LogPoolServiceBundleStaked(NftId instanceNftId, NftId poolNftId, NftId bundleNftId, Amount amount, Amount netAmount);
     event LogPoolServiceBundleUnstaked(NftId instanceNftId, NftId poolNftId, NftId bundleNftId, Amount amount, Amount netAmount);

package/contracts/pool/PoolService.sol

@@ -98,7 +98,7 @@ contract PoolService is
             unstakedAmount +  feeAmount, 
             AmountLib.zero());
         
-        emit LogPoolServiceBundleClosed(instance.getNftId(), poolNftId, bundleNftId);
+        emit LogPoolServiceBundleClosed(instance.getNftId(), poolNftId, bundleNftId, unstakedAmount, feeAmount);
 
         if ((unstakedAmount + feeAmount).gtz()){
             IComponents.ComponentInfo memory poolComponentInfo = instance.getInstanceReader().getComponentInfo(poolNftId);

package/contracts/product/IPolicyService.sol

@@ -13,7 +13,7 @@ interface IPolicyService is IService {
 
     event LogPolicyServicePolicyCreated(NftId policyNftId, Amount premiumAmount, Timestamp activatedAt);
     event LogPolicyServicePolicyDeclined(NftId policyNftId);
-    event LogPolicyServicePolicyPremiumCollected(NftId policyNftId, Amount premiumAmount);
+    event LogPolicyServicePolicyPremiumCollected(NftId policyNftId, NftId productNftId, Amount premiumAmount, Timestamp activateAt);
     event LogPolicyServicePolicyActivated(NftId policyNftId, Timestamp activatedAt);
     event LogPolicyServicePolicyActivatedUpdated(NftId policyNftId, Timestamp activatedAt);
     event LogPolicyServicePolicyExpirationUpdated(NftId policyNftId, Timestamp expiredAt);

package/contracts/product/PolicyService.sol

@@ -247,7 +247,7 @@ contract PolicyService is
         instance.getProductStore().updatePremiumState(policyNftId, PAID());
 
         // log premium collection before interactions with token
-        emit LogPolicyServicePolicyPremiumCollected(policyNftId, premium.premiumAmount);
+        emit LogPolicyServicePolicyPremiumCollected(policyNftId, policyInfo.productNftId, premium.premiumAmount, activateAt);
 
         // interactions
         _transferPremiumAmounts(instanceReader, policyNftId, policyInfo.productNftId, premium);

package/contracts/registry/IRegistry.sol

@@ -20,7 +20,7 @@ interface IRegistry is
 {
 
     event LogRegistryObjectRegistered(NftId nftId, NftId parentNftId, ObjectType objectType, bool isInterceptor, address objectAddress, address initialOwner);
-    event LogRegistryServiceRegistered(VersionPart majorVersion, ObjectType domain);
+    event LogRegistryServiceRegistered(NftId nftId, VersionPart majorVersion, ObjectType domain);
     event LogRegistryChainRegistryRegistered(NftId nftId, uint256 chainId, address chainRegistryAddress);
 
     // initialize

package/contracts/registry/Registry.sol

@@ -2,7 +2,6 @@
 pragma solidity ^0.8.20;
 
 import {IERC165} from "@openzeppelin/contracts/utils/introspection/IERC165.sol";
-import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
 import {AccessManaged} from "@openzeppelin/contracts/access/manager/AccessManaged.sol";
 import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";
 
@@ -16,7 +15,6 @@ import {IRelease} from "./IRelease.sol";
 import {IRegisterable} from "../shared/IRegisterable.sol";
 import {IStaking} from "../staking/IStaking.sol";
 import {ReleaseRegistry} from "./ReleaseRegistry.sol";
-import {TokenRegistry} from "./TokenRegistry.sol";
 import {RegistryAdmin} from "./RegistryAdmin.sol";
 
 /// @dev IMPORTANT
@@ -231,7 +229,7 @@ contract Registry is
 
         _service[version][domain] = service;
 
-        emit LogRegistryServiceRegistered(version, domain);
+        emit LogRegistryServiceRegistered(info.nftId,version, domain);
 
         nftId = _register(info);
     }
@@ -566,6 +564,8 @@ contract Registry is
                 initialOwner: NFT_LOCK_ADDRESS,
                 data: ""}),
             true);
+
+        emit LogRegistryObjectRegistered(protocolNftId, NftIdLib.zero(), PROTOCOL(), false, address(0), NFT_LOCK_ADDRESS);
     }
 
     /// @dev register this registry
@@ -671,6 +671,8 @@ contract Registry is
 
         // calls nft receiver
         CHAIN_NFT.mint(info.initialOwner, info.nftId.toInt());
+
+        emit LogRegistryObjectRegistered(info.nftId, info.parentNftId, info.objectType, info.isInterceptor, info.objectAddress, info.initialOwner);
     }
 
     function _setAddressForNftId(NftId nftId, address objectAddress)

package/contracts/registry/RegistryAuthorization.sol

@@ -144,8 +144,6 @@ contract RegistryAuthorization
           _setupStakingThAuthorization();
      }
 
-     event LogAccessAdminDebug(string message, string custom, uint256 value);
-
      function _setupRegistryAuthorization() internal {
           IAccess.FunctionInfo[] storage functions;
 

package/contracts/shared/ComponentService.sol

@@ -312,9 +312,27 @@ contract ComponentService is
             productNftId, 
             initialProductInfo);
 
+        emit LogComponentServiceProductCreated(productNftId, productAddress, initialProductInfo.hasDistribution, initialProductInfo.expectedNumberOfOracles);
+
+        IComponents.FeeInfo memory initialFeeInfo = product.getInitialFeeInfo();
+        
         productStore.createFee(
             productNftId, 
-            product.getInitialFeeInfo());
+            initialFeeInfo);
+
+        emit LogComponentServiceProductInitialProductFeesSet(
+            productNftId, 
+            initialFeeInfo.productFee.fixedFee, initialFeeInfo.productFee.fractionalFee,
+            initialFeeInfo.processingFee.fixedFee, initialFeeInfo.processingFee.fractionalFee);
+        emit LogComponentServiceProductInitialDistributionFeesSet(
+            productNftId, 
+            initialFeeInfo.distributionFee.fixedFee, initialFeeInfo.distributionFee.fractionalFee,
+            initialFeeInfo.minDistributionOwnerFee.fixedFee, initialFeeInfo.minDistributionOwnerFee.fractionalFee);
+        emit LogComponentServiceProductInitialPoolFeesSet(
+            productNftId, 
+            initialFeeInfo.poolFee.fixedFee, initialFeeInfo.poolFee.fractionalFee,
+            initialFeeInfo.stakingFee.fixedFee, initialFeeInfo.stakingFee.fractionalFee,
+            initialFeeInfo.performanceFee.fixedFee, initialFeeInfo.performanceFee.fractionalFee);
     }
 
     //-------- distribution -------------------------------------------------//
@@ -341,6 +359,8 @@ contract ComponentService is
         // set distribution in product info
         productInfo.distributionNftId = distributionNftId;
         productStore.updateProduct(productNftId, productInfo, KEEP_STATE());
+
+        emit LogComponentServiceDistributionCreated(distributionNftId, productNftId);
     }
 
 
@@ -400,6 +420,8 @@ contract ComponentService is
         productInfo.oracleNftId[productInfo.numberOfOracles] = oracleNftId;
         productInfo.numberOfOracles++;
         productStore.updateProduct(productNftId, productInfo, KEEP_STATE());
+
+        emit LogComponentServiceOracleCreated(oracleNftId, productNftId);
     }
 
     //-------- pool ---------------------------------------------------------//
@@ -423,13 +445,20 @@ contract ComponentService is
 
         // create info
         IPoolComponent pool = IPoolComponent(componentAddress);
+        IComponents.PoolInfo memory initialPoolInfo = pool.getInitialPoolInfo();
         instanceStore.createPool(
             poolNftId, 
-            pool.getInitialPoolInfo());
+            initialPoolInfo);
 
         // update pool in product info
         productInfo.poolNftId = poolNftId;
         productStore.updateProduct(productNftId, productInfo, KEEP_STATE());
+
+        emit LogComponentServicePoolCreated(
+            poolNftId, productNftId, componentAddress, 
+            initialPoolInfo.maxBalanceAmount, initialPoolInfo.collateralizationLevel, 
+            initialPoolInfo.retentionLevel, initialPoolInfo.isExternallyManaged, 
+            initialPoolInfo.isVerifyingApplications);
     }
 
 

package/contracts/shared/IComponent.sol

@@ -25,10 +25,6 @@ interface IComponent is
     error ErrorComponentWalletAddressIsSameAsCurrent();
     error ErrorComponentWalletNotComponent();
 
-    event LogComponentWalletAddressChanged(address oldWallet, address newWallet);
-    event LogComponentWalletTokensTransferred(address from, address to, uint256 amount);
-    event LogComponentTokenHandlerApproved(address tokenHandler, address token, Amount limit, bool isMaxAmount);
-
     /// @dev returns the name of this component
     /// to successfully register the component with an instance the name MUST be unique in the linked instance
     function getName() external view returns (string memory name);

package/contracts/shared/IComponentService.sol

@@ -48,8 +48,6 @@ interface IComponentService is
     event LogComponentServiceComponentLocked(address component, bool locked);
     event LogComponentServiceTokenHandlerDeployed(NftId componentNftId, address tokenHandler, address token);
     event LogComponentServiceRegistered(NftId instanceNftId, NftId componentNftId, ObjectType componentType, address component, address token, address initialOwner); 
-    event LogComponentServiceWalletAddressChanged(NftId componentNftId, address currentWallet, address newWallet);
-    event LogComponentServiceWalletTokensTransferred(NftId componentNftId, address currentWallet, address newWallet, uint256 currentBalance);
     event LogComponentServiceComponentFeesWithdrawn(NftId componentNftId, address recipient, address token, Amount withdrawnAmount);
     event LogComponentServiceProductFeesUpdated(NftId productNftId);
     event LogComponentServiceDistributionFeesUpdated(NftId distributionNftId);
@@ -62,6 +60,29 @@ interface IComponentService is
         UFixed newFractionalFee, 
         Amount newFixedFee
     );
+    event LogComponentServiceProductCreated(
+        NftId indexed productNftId, address indexed productAddress, bool indexed hasDistribution, uint8 expectedNumberOfOracles);
+    event LogComponentServiceProductInitialProductFeesSet(
+        NftId indexed productNftId, 
+        Amount indexed productFeeFixed, UFixed indexed productFeeFractional,
+        Amount processingFeeFixed, UFixed processingFeeFractional);
+    event LogComponentServiceProductInitialDistributionFeesSet(
+        NftId indexed productNftId, 
+        Amount indexed distributionFeeFixed, UFixed indexed distributionFeeFractional,
+        Amount minDistributionOwnerFeeFixed, UFixed minDistributionOwnerFeeFractional);
+    event LogComponentServiceProductInitialPoolFeesSet(
+        NftId indexed productNftId, 
+        Amount indexed poolFeeFixed, UFixed indexed poolFeeFractional,
+        Amount stakingFeeFixed, UFixed stakingFeeFractional,
+        Amount performanceFeeFixed, UFixed performanceFeeFractional);
+    event LogComponentServicePoolCreated(
+        NftId indexed poolNftId, NftId indexed productNftId, address indexed componentAddress, 
+        Amount maxBalanceAmount, UFixed collateralizationLevel, UFixed retentionLevel, 
+        bool isExternallyManaged, bool isVerifyingApplications);
+    event LogComponentServiceDistributionCreated(
+        NftId indexed distributionNftId, NftId indexed productNftId);
+    event LogComponentServiceOracleCreated(
+        NftId indexed oracleNftId, NftId indexed productNftId);
     
     //-------- component ----------------------------------------------------//
 

package/contracts/shared/InstanceLinkedComponent.sol

@@ -92,7 +92,7 @@ abstract contract InstanceLinkedComponent is
     }
 
 
-    function _resendRequest(RequestId requestId)
+    function _resendResponse(RequestId requestId)
         internal
         virtual
     {

package/contracts/staking/IStakingService.sol

@@ -18,20 +18,11 @@ interface IStakingService is IService
 
     event LogStakingServiceProtocolTargetRegistered(NftId protocolNftId);
     event LogStakingServiceInstanceTargetRegistered(NftId instanceNftId, uint256 chainId, Seconds initialLockingPeriod, UFixed initialRewardRate);
-    event LogStakingServiceLockingPeriodSet(NftId targetNftId, Seconds oldLockingDuration, Seconds lockingDuration);
-    event LogStakingServiceRewardRateSet(NftId targetNftId, UFixed oldRewardRate, UFixed rewardRate);
 
     event LogStakingServiceRewardReservesIncreased(NftId targetNftId, address rewardProvider, Amount dipAmount, Amount newBalance);
     event LogStakingServiceRewardReservesDecreased(NftId targetNftId, address targetOwner, Amount dipAmount, Amount newBalance);
 
     event LogStakingServiceStakeObjectCreated(NftId stakeNftId, NftId targetNftId, address stakeOwner);
-    event LogStakingServiceStakeCreated(NftId stakeNftId, NftId targetNftId, address owner, Amount stakedAmount);
-    event LogStakingServiceStakeIncreased(NftId stakeNftId, address owner, Amount stakedAmount, Amount stakeBalance);
-    event LogStakingServiceUnstaked(NftId stakeNftId, address stakeOwner, Amount totalAmount);
-    event LogStakingServiceStakeRestaked(address stakeOwner, NftId indexed stakeNftId, NftId newStakeNftId, NftId indexed newTargetNftId, Amount indexed newStakeBalance);
-
-    event LogStakingServiceRewardsUpdated(NftId stakeNftId);
-    event LogStakingServiceRewardsClaimed(NftId stakeNftId, address stakeOwner, Amount rewardsClaimedAmount);
 
     // modifiers
     error ErrorStakingServiceNotStakingOwner(address account);

package/contracts/type/RequestId.sol

@@ -72,4 +72,10 @@ library RequestIdLib {
     function toKeyId(RequestId id) public pure returns (KeyId keyId) {
         return KeyId.wrap(bytes31(uint248(RequestId.unwrap(id))));
     }
+
+    function toRequestId(KeyId keyId) public pure returns (RequestId requestId) {
+        uint248 keyIdInt = uint248(bytes31(KeyId.unwrap(keyId)));
+        assert(keyIdInt < type(uint64).max);
+        return RequestId.wrap(uint64(keyIdInt));
+    }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@etherisc/gif-next",
-  "version": "3.0.0-fc7e513-722",
+  "version": "3.0.0-fe24052-863",
   "description": "This is the repository for the next version of the Generic Insurance Framework (GIF) smart contracts. ",
   "main": "index.js",
   "scripts": {
@@ -43,8 +43,8 @@
     "typescript": "^5"
   },
   "dependencies": {
-    "@openzeppelin/contracts": "5.0.2",
-    "@openzeppelin/contracts-upgradeable": "5.0.2",
+    "@openzeppelin/contracts": "5.1.0",
+    "@openzeppelin/contracts-upgradeable": "5.1.0",
     "@openzeppelin/upgrades-core": "^1.34.1",
     "abi-coder": "^5.0.0",
     "antlr4ng": "^3.0.4",