@etherisc/gif-next 0.0.2-b2e620f-736 → 0.0.2-b37fa8b-169

package/contracts/product/Product.sol

@@ -3,34 +3,28 @@ pragma solidity ^0.8.20;
 
 import {Amount, AmountLib} from "../type/Amount.sol";
 import {ClaimId} from "../type/ClaimId.sol";
-import {IComponent} from "../shared/IComponent.sol";
-import {Fee, FeeLib} from "../type/Fee.sol";
-import {IRisk} from "../instance/module/IRisk.sol";
+import {Fee} from "../type/Fee.sol";
 import {IApplicationService} from "./IApplicationService.sol";
 import {IAuthorization} from "../authorization/IAuthorization.sol";
 import {IComponentService} from "../shared/IComponentService.sol";
 import {InstanceLinkedComponent} from "../shared/InstanceLinkedComponent.sol";
-import {IInstanceLinkedComponent} from "../shared/IInstanceLinkedComponent.sol";
 import {IPolicyService} from "./IPolicyService.sol";
 import {IRiskService} from "./IRiskService.sol";
 import {IClaimService} from "./IClaimService.sol";
 import {IPricingService} from "./IPricingService.sol";
 import {IProductComponent} from "./IProductComponent.sol";
-import {NftId, NftIdLib} from "../type/NftId.sol";
-import {ObjectType, COMPONENT, DISTRIBUTION, ORACLE, POOL, PRODUCT, BUNDLE, APPLICATION, POLICY, CLAIM, PRICE } from "../type/ObjectType.sol";
+import {NftId} from "../type/NftId.sol";
+import {COMPONENT, PRODUCT, BUNDLE, APPLICATION, POLICY, CLAIM, PRICE } from "../type/ObjectType.sol";
 import {PayoutId} from "../type/PayoutId.sol";
 import {COMPONENT, PRODUCT, APPLICATION, POLICY, CLAIM, PRICE, BUNDLE, RISK } from "../type/ObjectType.sol";
 import {ReferralId} from "../type/Referral.sol";
-import {RiskId, RiskIdLib} from "../type/RiskId.sol";
+import {RiskId} from "../type/RiskId.sol";
 import {Seconds} from "../type/Seconds.sol";
 import {StateId} from "../type/StateId.sol";
 import {Timestamp} from "../type/Timestamp.sol";
 
 import {IPolicy} from "../instance/module/IPolicy.sol";
 import {IComponents} from "../instance/module/IComponents.sol";
-import {IDistributionComponent} from "../distribution/IDistributionComponent.sol";
-import {IOracleComponent} from "../oracle/IOracleComponent.sol";
-import {IPoolComponent} from "../pool/IPoolComponent.sol";
 
 abstract contract Product is
     InstanceLinkedComponent, 
@@ -54,6 +48,7 @@ abstract contract Product is
     function registerComponent(address component)
         external
         virtual
+        restricted()
         onlyOwner()
         returns (NftId componentNftId)
     {
@@ -85,6 +80,7 @@ abstract contract Product is
     )
         public 
         view 
+        virtual
         override 
         onlyNftOfType(bundleNftId, BUNDLE())
         returns (Amount premiumAmount)
@@ -137,11 +133,10 @@ abstract contract Product is
     }
 
 
-    function _initializeProduct(
+    function __Product_init(
         address registry,
         NftId instanceNftId,
         string memory name,
-        address token,
         IComponents.ProductInfo memory productInfo,
         IComponents.FeeInfo memory feeInfo,
         IAuthorization authorization,
@@ -152,11 +147,10 @@ abstract contract Product is
         virtual
         onlyInitializing()
     {
-        _initializeInstanceLinkedComponent(
+        __InstanceLinkedComponent_init(
             registry, 
             instanceNftId, 
             name, 
-            token, 
             PRODUCT(), 
             authorization, 
             productInfo.isInterceptingPolicyTransfers, 
@@ -189,13 +183,14 @@ abstract contract Product is
 
 
     function _createRisk(
-        RiskId id,
+        bytes32 id,
         bytes memory data
     )
         internal
         virtual
+        returns (RiskId riskId)
     {
-        _getProductStorage()._riskService.createRisk(
+        return _getProductStorage()._riskService.createRisk(
             id,
             data
         );
@@ -214,16 +209,27 @@ abstract contract Product is
         );
     }
 
-    function _updateRiskState(
+    function _setRiskLocked(
         RiskId id,
-        StateId state
+        bool locked
     )
         internal
         virtual
     {
-        _getProductStorage()._riskService.updateRiskState(
+        _getProductStorage()._riskService.setRiskLocked(
             id,
-            state
+            locked
+        );
+    }
+
+    function _closeRisk(
+        RiskId id
+    )
+        internal
+        virtual
+    {
+        _getProductStorage()._riskService.closeRisk(
+            id
         );
     }
 
@@ -254,9 +260,20 @@ abstract contract Product is
         );
     }
 
+    function _revoke(
+        NftId applicationNftId
+    )
+        internal
+        virtual
+    {
+        _getProductStorage()._applicationService.revoke(
+            applicationNftId);
+    }
+
     function _createPolicy(
         NftId applicationNftId,
-        Timestamp activateAt
+        Timestamp activateAt,
+        Amount maxPremiumAmount
     )
         internal
         virtual
@@ -264,7 +281,8 @@ abstract contract Product is
     {
         premiumAmount = _getProductStorage()._policyService.createPolicy(
             applicationNftId, 
-            activateAt);
+            activateAt,
+            maxPremiumAmount);
     }
 
     function _decline(
@@ -394,14 +412,14 @@ abstract contract Product is
             data);
     }
 
-    function _closeClaim(
+    function _cancelConfirmedClaim(
         NftId policyNftId,
         ClaimId claimId
     )
         internal
         virtual
     {
-        _getProductStorage()._claimService.close(
+        _getProductStorage()._claimService.cancelConfirmedClaim(
             policyNftId,
             claimId);
     }
@@ -448,8 +466,9 @@ abstract contract Product is
     )
         internal
         virtual
+        returns (Amount netPayoutAmount, Amount processingFeeAmount)
     {
-        _getProductStorage()._claimService.processPayout(
+        (netPayoutAmount, processingFeeAmount) = _getProductStorage()._claimService.processPayout(
             policyNftId,
             payoutId);
     }
@@ -466,10 +485,6 @@ abstract contract Product is
             payoutId);
     }
 
-    function _toRiskId(string memory riskName) internal virtual pure returns (RiskId riskId) {
-        return RiskIdLib.toRiskId(riskName);
-    }
-
     function _getProductStorage() internal virtual pure returns (ProductStorage storage $) {
         assembly {
             $.slot := PRODUCT_STORAGE_LOCATION_V1

package/contracts/product/RiskService.sol

@@ -2,19 +2,16 @@
 pragma solidity ^0.8.20;
 
 import {IInstance} from "../instance/IInstance.sol";
-import {IInstanceService} from "../instance/IInstanceService.sol";
-import {IPoolService} from "../pool/PoolService.sol";
 import {IRegistry} from "../registry/IRegistry.sol";
-import {IRegistryService} from "../registry/IRegistryService.sol";
 import {IRisk} from "../instance/module/IRisk.sol";
 import {IRiskService} from "./IRiskService.sol";
 
 import {ContractLib} from "../shared/ContractLib.sol";
 import {InstanceReader} from "../instance/InstanceReader.sol";
-import {ObjectType, COMPONENT, INSTANCE, PRODUCT, POOL, POLICY, REGISTRY, RISK} from "../type/ObjectType.sol";
-import {ACTIVE, PAUSED, KEEP_STATE} from "../type/StateId.sol";
+import {ObjectType, COMPONENT, PRODUCT, RISK} from "../type/ObjectType.sol";
+import {ACTIVE, KEEP_STATE, CLOSED} from "../type/StateId.sol";
 import {NftId} from "../type/NftId.sol";
-import {RiskId} from "../type/RiskId.sol";
+import {RiskId, RiskIdLib} from "../type/RiskId.sol";
 import {StateId} from "../type/StateId.sol";
 import {RiskSet} from "../instance/RiskSet.sol";
 import {Service} from "../shared/Service.sol";
@@ -42,24 +39,27 @@ contract RiskService is
         _registerInterface(type(IRiskService).interfaceId);
     }
 
-
+    /// @inheritdoc IRiskService
     function createRisk(
-        RiskId riskId,
+        bytes32 id,
         bytes memory data
     )
         external 
+        virtual
         restricted()
+        returns (RiskId riskId)
     {
         // checks
         (NftId productNftId, IInstance instance) = _getAndVerifyActiveComponent(PRODUCT());
 
         // effects
+        riskId = RiskIdLib.toRiskId(productNftId, id);
         IRisk.RiskInfo memory riskInfo = IRisk.RiskInfo({
             productNftId: productNftId, 
-            createdAt: TimestampLib.blockTimestamp(),
+            createdAt: TimestampLib.current(),
             data: data});
 
-        instance.getInstanceStore().createRisk(
+        instance.getProductStore().createRisk(
             riskId,
             riskInfo
         );
@@ -67,6 +67,8 @@ contract RiskService is
         // add risk to RiskSet
         RiskSet riskSet = instance.getRiskSet();
         riskSet.add(riskId);
+
+        emit LogRiskServiceRiskCreated(productNftId, riskId);
     }
 
 
@@ -75,6 +77,7 @@ contract RiskService is
         bytes memory data
     )
         external 
+        virtual
         restricted()
     {
         // checks
@@ -83,31 +86,73 @@ contract RiskService is
         // effects
         InstanceReader instanceReader = instance.getInstanceReader();
         IRisk.RiskInfo memory riskInfo = instanceReader.getRiskInfo(riskId);
+
+        if (riskInfo.productNftId != productNftId) {
+            revert ErrorRiskServiceRiskProductMismatch(riskId, riskInfo.productNftId, productNftId);
+        }
+
         riskInfo.data = data;
-        instance.getInstanceStore().updateRisk(riskId, riskInfo, KEEP_STATE());
+        instance.getProductStore().updateRisk(riskId, riskInfo, KEEP_STATE());
+
+        emit LogRiskServiceRiskUpdated(productNftId, riskId);
     }
 
 
-    function updateRiskState(
+    /// @inheritdoc IRiskService
+    function setRiskLocked(
         RiskId riskId,
-        StateId state
+        bool locked
     )
         external 
+        virtual
         restricted()
     {
         // checks
         (NftId productNftId, IInstance instance) = _getAndVerifyActiveComponent(PRODUCT());
 
-        // effects
-        instance.getInstanceStore().updateRiskState(riskId, state);
+        if (!instance.getRiskSet().hasRisk(productNftId, riskId)) {
+            revert ErrorRiskServiceUnknownRisk(productNftId, riskId);
+        }
+
+        if (instance.getInstanceReader().getRiskState(riskId) != ACTIVE()) {
+            revert ErrorRiskServiceRiskNotActive(productNftId, riskId);
+        }
 
-        if (state == ACTIVE()) {
+        if (locked) {
+            instance.getRiskSet().deactivate(riskId);
+            emit LogRiskServiceRiskLocked(productNftId, riskId);
+        } else {
             instance.getRiskSet().activate(riskId);
-        } else if (state == PAUSED()) {
-            instance.getRiskSet().pause(riskId);
+            emit LogRiskServiceRiskUnlocked(productNftId, riskId);
         }
     }
 
+    /// @inheritdoc IRiskService
+    function closeRisk(
+        RiskId riskId
+    )
+        external 
+        virtual
+        restricted()
+    {
+        // checks
+        (NftId productNftId, IInstance instance) = _getAndVerifyActiveComponent(PRODUCT());
+        (bool exists, bool active) = instance.getRiskSet().checkRisk(productNftId, riskId);
+
+        if (!exists) {
+            revert ErrorRiskServiceUnknownRisk(productNftId, riskId);
+        }
+
+        if (active) {
+            revert ErrorRiskServiceRiskNotLocked(productNftId, riskId);
+        }
+
+        // effects
+        instance.getProductStore().updateRiskState(riskId, CLOSED());
+
+        emit LogRiskServiceRiskClosed(productNftId, riskId);
+    }
+
     function _getAndVerifyActiveComponent(ObjectType expectedType) 
         internal 
         view 

package/contracts/registry/IRegistry.sol

@@ -19,13 +19,16 @@ interface IRegistry is
     IERC165
 {
 
-    event LogRegistration(NftId nftId, NftId parentNftId, ObjectType objectType, bool isInterceptor, address objectAddress, address initialOwner);
-    event LogServiceRegistration(VersionPart majorVersion, ObjectType domain);
-    event LogChainRegistryRegistration(NftId nftId, uint256 chainId, address chainRegistryAddress);
+    event LogRegistryObjectRegistered(NftId nftId, NftId parentNftId, ObjectType objectType, bool isInterceptor, address objectAddress, address initialOwner);
+    event LogRegistryServiceRegistered(VersionPart majorVersion, ObjectType domain);
+    event LogRegistryChainRegistryRegistered(NftId nftId, uint256 chainId, address chainRegistryAddress);
 
     // initialize
     error ErrorRegistryCallerNotDeployer();
 
+    // register()
+    error ErrorRegistryObjectTypeNotSupported(ObjectType objectType);
+
     // registerRegistry()
     error ErrorRegistryNotOnMainnet(uint256 chainId);
     error ErrorRegistryChainRegistryChainIdZero(NftId nftId);
@@ -36,8 +39,7 @@ interface IRegistry is
     // registerService()
     error ErrorRegistryServiceAddressZero(); 
     error ErrorRegistryServiceVersionZero(address service);
-    //error ErrorRegistryServiceVersionMismatch(address service, VersionPart serviceVersion, VersionPart releaseVersion);
-    //error ErrorRegistryServiceVersionNotDeploying(address service, VersionPart version);
+
     error ErrorRegistryServiceDomainZero(address service, VersionPart version);
     error ErrorRegistryNotService(address service, ObjectType objectType);
     error ErrorRegistryServiceParentNotRegistry(address service, VersionPart version, NftId parentNftId);
@@ -48,16 +50,20 @@ interface IRegistry is
 
     // _register()
     error ErrorRegistryGlobalRegistryAsParent(address objectAddress, ObjectType objectType);
-    error ErrorRegistryTypesCombinationInvalid(address objectAddress, ObjectType objectType, ObjectType parentType);
+    error ErrorRegistryTypeCombinationInvalid(address objectAddress, ObjectType objectType, ObjectType parentType);
     error ErrorRegistryContractAlreadyRegistered(address objectAddress);
 
     struct ObjectInfo {
+        // slot 0
         NftId nftId;
         NftId parentNftId;
         ObjectType objectType;
         bool isInterceptor;
+        // slot 1
         address objectAddress;
+        // slot 2
         address initialOwner;
+        // slot 3
         bytes data;
     }
 
@@ -89,11 +95,11 @@ interface IRegistry is
     /// May not be used to register known core types.
     function registerWithCustomType(ObjectInfo memory info) external returns (NftId nftId);
 
-    function getInitialVersion() external view returns (VersionPart);
+    function getInitialRelease() external view returns (VersionPart);
 
-    function getNextVersion() external view returns (VersionPart);
+    function getNextRelease() external view returns (VersionPart);
 
-    function getLatestVersion() external view returns (VersionPart);
+    function getLatestRelease() external view returns (VersionPart);
 
     function getReleaseInfo(VersionPart release) external view returns (IRelease.ReleaseInfo memory);
 

package/contracts/registry/IRelease.sol

@@ -11,13 +11,16 @@ import {VersionPart} from "../type/Version.sol";
 interface IRelease {
 
     struct ReleaseInfo {
+        // slot 0
+        address releaseAdmin;
         StateId state;
         VersionPart version;
-        bytes32 salt;
-        IServiceAuthorization auth;
-        address releaseAdmin;
         Timestamp activatedAt;
         Timestamp disabledAt;
+        // slot 1
+        IServiceAuthorization auth;
+        // slot 2
+        bytes32 salt;
     }
 
     /// @dev Registers a registry contract for a specified chain.

package/contracts/registry/Registry.sol

@@ -172,7 +172,7 @@ contract Registry is
             revert ErrorRegistryChainRegistryNftIdInvalid(nftId, chainId);
         }
 
-        emit LogChainRegistryRegistration(nftId, chainId, registryAddress);
+        emit LogRegistryChainRegistryRegistered(nftId, chainId, registryAddress);
 
         _registerRegistryForNft(
             chainId,
@@ -231,7 +231,7 @@ contract Registry is
 
         _service[version][domain] = service;
 
-        emit LogServiceRegistration(version, domain);
+        emit LogRegistryServiceRegistered(version, domain);
 
         nftId = _register(info);
     }
@@ -246,6 +246,11 @@ contract Registry is
         address objectAddress = info.objectAddress;
         ObjectType objectType = info.objectType;
 
+        // specialized functions have to be used to register registries and services
+        if(objectType == REGISTRY() || objectType == STAKING() || objectType == SERVICE()) {
+            revert ErrorRegistryObjectTypeNotSupported(objectType);
+        }
+
         // this indidirectly enforces that the parent is registered
         // parentType would be zero for a non-registered parent which is never a valid type combination
         ObjectType parentType = _info[info.parentNftId].objectType;
@@ -253,13 +258,13 @@ contract Registry is
         // check type combinations for core objects
         if(objectAddress == address(0)) {
             if(_coreObjectCombinations[objectType][parentType] == false) {
-                revert ErrorRegistryTypesCombinationInvalid(objectAddress, objectType, parentType);
+                revert ErrorRegistryTypeCombinationInvalid(objectAddress, objectType, parentType);
             }
         }
         // check type combinations for contract objects
         else {
             if(_coreContractCombinations[objectType][parentType] == false) {
-                revert ErrorRegistryTypesCombinationInvalid(objectAddress, objectType, parentType);
+                revert ErrorRegistryTypeCombinationInvalid(objectAddress, objectType, parentType);
             }
         }
 
@@ -284,9 +289,10 @@ contract Registry is
             objectType == ObjectTypeLib.zero() ||
             parentType == ObjectTypeLib.zero() ||
             parentType == PROTOCOL() ||
+            parentType == STAKING() ||
             parentType == SERVICE()
         ) {
-            revert ErrorRegistryTypesCombinationInvalid(info.objectAddress, objectType, parentType);
+            revert ErrorRegistryTypeCombinationInvalid(info.objectAddress, objectType, parentType);
         }
 
         nftId = _register(info);
@@ -294,17 +300,17 @@ contract Registry is
 
 
     /// @dev earliest GIF major version 
-    function getInitialVersion() external view returns (VersionPart) {
+    function getInitialRelease() external view returns (VersionPart) {
         return VersionPartLib.toVersionPart(_releaseRegistry.INITIAL_GIF_VERSION());
     }
 
     /// @dev next GIF release version to be released
-    function getNextVersion() external view returns (VersionPart) {
+    function getNextRelease() external view returns (VersionPart) {
         return _releaseRegistry.getNextVersion();
     }
 
     /// @dev latest active GIF release version 
-    function getLatestVersion() external view returns (VersionPart) { 
+    function getLatestRelease() external view returns (VersionPart) { 
         return _releaseRegistry.getLatestVersion();
     }
 
@@ -495,7 +501,7 @@ contract Registry is
         _info[nftId] = info;
         _setAddressForNftId(nftId, objectAddress);
 
-        emit LogRegistration(nftId, parentNftId, objectType, isInterceptor, objectAddress, owner);
+        emit LogRegistryObjectRegistered(nftId, parentNftId, objectType, isInterceptor, objectAddress, owner);
 
         // calls nft receiver(1) and interceptor(2)
         uint256 mintedTokenId = CHAIN_NFT.mint(