@etherisc/gif-next 3.0.0-a511887-523 → 3.0.0-aa7237e-773

package/contracts/product/BasicProductAuthorization.sol

@@ -2,16 +2,15 @@
 pragma solidity ^0.8.20;
 
 import {IAccess} from "../authorization/IAccess.sol";
-import {IComponent} from "../shared/IInstanceLinkedComponent.sol";
+import {IInstanceLinkedComponent} from "../shared/IInstanceLinkedComponent.sol";
 import {IProductComponent} from "./IProductComponent.sol";
 
 import {Authorization} from "../authorization/Authorization.sol";
 import {BasicProduct} from "./BasicProduct.sol"; 
-import {COMPONENT, PRODUCT, POLICY} from "../type/ObjectType.sol";
+import {COMPONENT, ORACLE, PRODUCT, POLICY} from "../type/ObjectType.sol";
 import {RoleId, PUBLIC_ROLE} from "../type/RoleId.sol";
-import {GIF_INITIAL_RELEASE} from "../registry/Registry.sol";
 import {TokenHandler} from "../shared/TokenHandler.sol";
-import {VersionPartLib} from "../type/Version.sol";
+
 
 contract BasicProductAuthorization
      is Authorization
@@ -20,7 +19,7 @@ contract BasicProductAuthorization
           Authorization(
                componentName, 
                PRODUCT(), 
-               GIF_INITIAL_RELEASE(),
+               3,
                COMMIT_HASH,
                TargetType.Component, 
                true)
@@ -31,7 +30,8 @@ contract BasicProductAuthorization
           virtual override
      {
           _authorizeServiceDomain(COMPONENT(), address(10));
-          _authorizeServiceDomain(POLICY(), address(11));
+          _authorizeServiceDomain(ORACLE(), address(11));
+          _authorizeServiceDomain(POLICY(), address(12));
      }
 
      function _setupTokenHandlerAuthorizations() internal virtual override {
@@ -58,7 +58,7 @@ contract BasicProductAuthorization
           functions = _authorizeForTarget(getMainTargetName(), PUBLIC_ROLE());
           _authorize(functions, BasicProduct.setFees.selector, "setFees");
           _authorize(functions, IProductComponent.registerComponent.selector, "registerComponent");
-          _authorize(functions, IComponent.withdrawFees.selector, "withdrawFees");
+          _authorize(functions, IInstanceLinkedComponent.withdrawFees.selector, "withdrawFees");
      }
 }
 

package/contracts/product/ClaimService.sol

@@ -39,7 +39,7 @@ contract ClaimService is
     )
         internal
         virtual override
-        onlyInitializing()
+        initializer()
     {
         (
             address authority,

package/contracts/product/ClaimServiceManager.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.20;
 
-import {IUpgradeable} from "../upgradeability/IUpgradeable.sol";
+import {IVersionable} from "../upgradeability/IVersionable.sol";
 import {ProxyManager} from "../upgradeability/ProxyManager.sol";
 import {ClaimService} from "./ClaimService.sol";
 
@@ -18,13 +18,13 @@ contract ClaimServiceManager is ProxyManager {
     {
         ClaimService svc = new ClaimService{salt: salt}();
         bytes memory data = abi.encode(authority, registry);
-        IUpgradeable upgradeable = initialize(
+        IVersionable versionable = initialize(
             registry,
             address(svc), 
             data,
             salt);
 
-        _claimService = ClaimService(address(upgradeable));
+        _claimService = ClaimService(address(versionable));
     }
 
     //--- view functions ----------------------------------------------------//

package/contracts/product/PolicyService.sol

@@ -45,7 +45,7 @@ contract PolicyService is
     )
         internal
         virtual override
-        onlyInitializing()
+        initializer
     {
         (
             address authority,

package/contracts/product/PolicyServiceLib.sol

@@ -95,13 +95,14 @@ library PolicyServiceLib {
     {
         if (policyState != COLLATERALIZED()) { 
             revert IPolicyService.ErrorPolicyServicePolicyNotActive(policyNftId, policyState);
-        } 
-        if (TimestampLib.current() < policyInfo.activatedAt) { 
+        }
+
+        if (policyInfo.activatedAt.eqz() || TimestampLib.current() < policyInfo.activatedAt) { 
             revert IPolicyService.ErrorPolicyServicePolicyNotActive(policyNftId, policyState);
         } 
 
         // check expiredAt represents a valid expiry time
-        if (newExpiredAt >= policyInfo.expiredAt) {
+        if (newExpiredAt > policyInfo.expiredAt) {
             revert IPolicyService.ErrorPolicyServicePolicyExpirationTooLate(policyNftId, policyInfo.expiredAt, newExpiredAt);
         }
 
@@ -110,6 +111,7 @@ library PolicyServiceLib {
         }
     }
 
+
     function policyIsCloseable(InstanceReader instanceReader, NftId policyNftId)
         external 
         view

package/contracts/product/PolicyServiceManager.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.20;
 
-import {IUpgradeable} from "../upgradeability/IUpgradeable.sol";
+import {IVersionable} from "../upgradeability/IVersionable.sol";
 import {ProxyManager} from "../upgradeability/ProxyManager.sol";
 import {PolicyService} from "./PolicyService.sol";
 
@@ -18,13 +18,13 @@ contract PolicyServiceManager is ProxyManager {
     {
         PolicyService svc = new PolicyService{salt: salt}();
         bytes memory data = abi.encode(authority, registry);
-        IUpgradeable upgradeable = initialize(
+        IVersionable versionable = initialize(
             registry,
             address(svc), 
             data,
             salt);
 
-        _policyService = PolicyService(address(upgradeable));
+        _policyService = PolicyService(address(versionable));
     }
 
     //--- view functions ----------------------------------------------------//

package/contracts/product/PricingService.sol

@@ -36,7 +36,7 @@ contract PricingService is
     )
         internal
         virtual override
-        onlyInitializing()
+        initializer()
     {
         (
             address authority,

package/contracts/product/PricingServiceManager.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.20;
 
-import {IUpgradeable} from "../upgradeability/IUpgradeable.sol";
+import {IVersionable} from "../upgradeability/IVersionable.sol";
 import {ProxyManager} from "../upgradeability/ProxyManager.sol";
 import {PricingService} from "./PricingService.sol";
 
@@ -18,13 +18,13 @@ contract PricingServiceManager is ProxyManager {
     {
         PricingService pricingSrv = new PricingService{salt: salt}();
         bytes memory data = abi.encode(authority, registry);
-        IUpgradeable upgradeable = initialize(
+        IVersionable versionable = initialize(
             registry,
             address(pricingSrv), 
             data,
             salt);
 
-        _pricingService = PricingService(address(upgradeable));
+        _pricingService = PricingService(address(versionable));
     }
 
     //--- view functions ----------------------------------------------------//

package/contracts/product/RiskService.sol

@@ -26,8 +26,8 @@ contract RiskService is
         bytes memory data
     )
         internal
+        initializer
         virtual override
-        onlyInitializing()
     {
         (
             address authority,

package/contracts/product/RiskServiceManager.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.20;
 
-import {IUpgradeable} from "../upgradeability/IUpgradeable.sol";
+import {IVersionable} from "../upgradeability/IVersionable.sol";
 import {ProxyManager} from "../upgradeability/ProxyManager.sol";
 import {RiskService} from "./RiskService.sol";
 
@@ -18,13 +18,13 @@ contract RiskServiceManager is ProxyManager {
     {
         RiskService svc = new RiskService{salt: salt}();
         bytes memory data = abi.encode(authority, registry);
-        IUpgradeable upgradeable = initialize(
+        IVersionable versionable = initialize(
             registry,
             address(svc), 
             data,
             salt);
 
-        _riskService = RiskService(address(upgradeable));
+        _riskService = RiskService(address(versionable));
     }
 
     //--- view functions ----------------------------------------------------//

package/contracts/registry/ChainNft.sol

@@ -11,7 +11,7 @@ contract ChainNft is ERC721Enumerable {
     event LogTokenInterceptorAddress(uint256 tokenId, address interceptor);
 
     // constants
-    string public constant NAME = "Dezentralized Insurance Protocol NFT";
+    string public constant NAME = "Decentralized Insurance Protocol NFT";
     string public constant SYMBOL = "DIPNFT";
 
     uint256 public constant PROTOCOL_NFT_ID = 1101;

package/contracts/registry/IRegistry.sol

@@ -19,8 +19,8 @@ interface IRegistry is
     IERC165
 {
 
-    event LogRegistryObjectRegistered(NftId nftId, NftId parentNftId, ObjectType objectType, VersionPart objectVersion, bool isInterceptor, address objectAddress, address initialOwner);
-    event LogRegistryServiceRegistered(VersionPart release, ObjectType domain);
+    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
@@ -49,7 +49,6 @@ interface IRegistry is
     error ErrorRegistryCoreTypeRegistration();
 
     // _register()
-    error ErrorRegistryReleaseMismatch(VersionPart objectrelease, VersionPart parentRelease, VersionPart senderRelease);
     error ErrorRegistryGlobalRegistryAsParent(address objectAddress, ObjectType objectType);
     error ErrorRegistryTypeCombinationInvalid(address objectAddress, ObjectType objectType, ObjectType parentType);
     error ErrorRegistryContractAlreadyRegistered(address objectAddress);
@@ -59,10 +58,13 @@ interface IRegistry is
         NftId nftId;
         NftId parentNftId;
         ObjectType objectType;
-        VersionPart release;
         bool isInterceptor;
         // slot 1
         address objectAddress;
+        // slot 2
+        address initialOwner;
+        // slot 3
+        bytes data;
     }
 
     /// @dev Registers a registry contract for a specified chain.
@@ -70,30 +72,28 @@ interface IRegistry is
     function registerRegistry(
         NftId nftId, 
         uint256 chainId, 
-        address chainRegistryAddress,
-        VersionPart release
+        address chainRegistryAddress
     ) external;
 
     /// @dev Register a service with using the provided domain and version.
     /// The function returns a newly minted service NFT ID.
     /// May only be used to register services.
     function registerService(
-        ObjectInfo memory info,
-        address initialOwner,
-        ObjectType domain,
-        bytes memory data
+        ObjectInfo memory serviceInfo, 
+        VersionPart serviceVersion, 
+        ObjectType serviceDomain
     ) external returns(NftId nftId);
 
     /// @dev Register an object with a known core type.
     /// The function returns a newly minted object NFT ID.
     /// May not be used to register services.
-    function register(ObjectInfo memory info, address initialOwner, bytes memory data) external returns (NftId nftId);
+    function register(ObjectInfo memory info) external returns (NftId nftId);
 
     /// @dev Register an object with a custom type.
     /// The function returns a newly minted object NFT ID.
     /// This function is reserved for GIF releases > 3.
     /// May not be used to register known core types.
-    function registerWithCustomType(ObjectInfo memory info, address initialOwner, bytes memory data) external returns (NftId nftId);
+    function registerWithCustomType(ObjectInfo memory info) external returns (NftId nftId);
 
     function getInitialRelease() external view returns (VersionPart);
 
@@ -126,15 +126,9 @@ interface IRegistry is
 
     function getParentNftId(NftId nftId) external view returns (NftId parentNftId);
 
-    function getObjectData(NftId nftId) external view returns (bytes memory data);
+    function isObjectType(NftId nftId, ObjectType expectedObjectType) external view returns (bool);
 
-    function getObjectData(address objectAddress) external view returns (bytes memory data);
-
-    function isObjectType(NftId nftId, ObjectType expectedObjectType, VersionPart expectedRelease) external view returns (bool);
-
-    function isObjectType(address contractAddress, ObjectType expectedObjectType, VersionPart expectedRelease) external view returns (bool);
-
-    function getObjectRelease(NftId nftId) external view returns (VersionPart release);
+    function isObjectType(address contractAddress, ObjectType expectedObjectType) external view returns (bool);
 
     function getObjectAddress(NftId nftId) external view returns (address objectAddress);
 

package/contracts/registry/IRegistryService.sol

@@ -19,12 +19,13 @@ interface IRegistryService is
 {
      error ErrorRegistryServiceNotRegistryOwner();
 
-     // _checkInterface()
-     error ErrorRegistryServiceNotContract(address notContract);
-     error ErrorRegistryServiceInterfaceNotSupported(address registerable, bytes4 interfaceId);
+     error ErrorRegistryServiceNotService(address notService);
+     error ErrorRegistryServiceNotInstance(address notInstance);
+     error ErrorRegistryServiceNotProduct(address notProduct);
+     error ErrorRegistryServiceNotComponent(address notComponent);
+     error ErrorRegistryServiceNotProductLinkedComponent(address notProductLinkedComponent);
 
      error ErrorRegistryServiceRegisterableAddressInvalid(IRegisterable registerable, address found);
-     error ErrorRegistryServiceRegisterableParentInvalid(IRegisterable registerable, NftId expected, NftId found);
      error ErrorRegistryServiceRegisterableTypeInvalid(IRegisterable registerable, ObjectType expected, ObjectType found);
      error ErrorRegistryServiceRegisterableOwnerInvalid(IRegisterable registerable, address expected, address found);
      error ErrorRegistryServiceRegisterableOwnerZero(IRegisterable registerable);   
@@ -39,20 +40,23 @@ interface IRegistryService is
      error ErrorRegistryServiceInvalidInitialOwner(address initialOwner);
      error ErrorRegistryServiceInvalidAddress(address registerableAddress);
 
-     function registerStake(IRegistry.ObjectInfo memory info, address initialOwner, bytes memory data)
+     function registerStake(IRegistry.ObjectInfo memory info)
           external returns(NftId nftId); 
 
-     function registerInstance(IRegisterable instance, address initialOwner)
+     function registerInstance(IRegisterable instance, address owner)
           external returns(IRegistry.ObjectInfo memory info); 
 
-     function registerComponent(IRegisterable component, NftId parenNftId, ObjectType componentType, address initialOwner)
+     function registerProduct(IComponent product, address owner)
           external returns(IRegistry.ObjectInfo memory info);
 
-     function registerDistributor(IRegistry.ObjectInfo memory info, address initialOwner, bytes memory data) external returns(NftId nftId);
+     function registerProductLinkedComponent(IComponent component, ObjectType objectType, address owner)
+          external returns(IRegistry.ObjectInfo memory info);
+
+     function registerDistributor(IRegistry.ObjectInfo memory info) external returns(NftId nftId);
 
-     function registerPolicy(IRegistry.ObjectInfo memory info, address initialOwner, bytes memory data) external returns(NftId nftId);
+     function registerPolicy(IRegistry.ObjectInfo memory info) external returns(NftId nftId);
 
-     function registerBundle(IRegistry.ObjectInfo memory info, address initialOwner, bytes memory data) external returns(NftId nftId); 
+     function registerBundle(IRegistry.ObjectInfo memory info) external returns(NftId nftId); 
 
 }
 

package/contracts/registry/IRelease.sol

@@ -23,4 +23,7 @@ interface IRelease {
         bytes32 salt;
     }
 
+    /// @dev Registers a registry contract for a specified chain.
+    /// Only one chain registry may be registered per chain
+    function getRelease() external view returns (VersionPart release);
 }