@etherisc/gif-next 0.0.2-8d9d4d6-542 → 0.0.2-8daf0fe-431

package/contracts/product/Product.sol

@@ -9,6 +9,7 @@ import {InstanceLinkedComponent} from "../shared/InstanceLinkedComponent.sol";
 import {Fee, FeeLib} from "../type/Fee.sol";
 import {IRisk} from "../instance/module/IRisk.sol";
 import {IApplicationService} from "./IApplicationService.sol";
+import {IAuthorization} from "../authorization/IAuthorization.sol";
 import {IComponentService} from "../shared/IComponentService.sol";
 import {IPolicyService} from "./IPolicyService.sol";
 import {IProductService} from "./IProductService.sol";
@@ -52,9 +53,92 @@ abstract contract Product is
         Distribution _distribution;
     }
 
-    function initializeProduct(
+
+    function calculatePremium(
+        Amount sumInsuredAmount,
+        RiskId riskId,
+        Seconds lifetime,
+        bytes memory applicationData,
+        NftId bundleNftId,
+        ReferralId referralId
+    )
+        external 
+        view 
+        override 
+        returns (Amount premiumAmount)
+    {
+        IPolicy.Premium memory premium = _getProductStorage()._pricingService.calculatePremium(
+            getNftId(),
+            riskId,
+            sumInsuredAmount,
+            lifetime,
+            applicationData,
+            bundleNftId,
+            referralId
+        );
+
+        return AmountLib.toAmount(premium.premiumAmount);
+    }
+
+    function calculateNetPremium(
+        Amount sumInsuredAmount,
+        RiskId riskId,
+        Seconds lifetime,
+        bytes memory applicationData
+    )
+        external
+        view
+        virtual override
+        returns (Amount netPremiumAmount)
+    {
+        // default 10% of sum insured
+        return AmountLib.toAmount(sumInsuredAmount.toInt() / 10);
+    }
+
+
+    function register()
+        external
+        virtual
+        onlyOwner()
+    {
+        _getProductStorage()._componentService.registerProduct();
+    }
+
+
+    function getInitialProductInfo()
+        public 
+        virtual 
+        view 
+        returns (IComponents.ProductInfo memory poolInfo)
+    {
+        ProductStorage storage $ = _getProductStorage();
+
+        return IComponents.ProductInfo({
+            distributionNftId: $._distributionNftId,
+            poolNftId: $._poolNftId,
+            productFee: FeeLib.zero(),
+            processingFee: FeeLib.zero(),
+            distributionFee: FeeLib.zero(),
+            minDistributionOwnerFee: FeeLib.zero(),
+            poolFee: FeeLib.zero(),
+            stakingFee: FeeLib.zero(),
+            performanceFee: FeeLib.zero()
+        });
+    }
+
+    function getPoolNftId() external view override returns (NftId poolNftId) {
+        return getRegistry().getNftId(address(_getProductStorage()._pool));
+    }
+
+    function getDistributionNftId() external view override returns (NftId distributionNftId) {
+        return getRegistry().getNftId(address(_getProductStorage()._distribution));
+    }
+
+
+    function _initializeProduct(
         address registry,
         NftId instanceNftId,
+        IAuthorization authorization,
         address initialOwner,
         string memory name,
         address token,
@@ -64,11 +148,21 @@ abstract contract Product is
         bytes memory registryData, // writeonly data that will saved in the object info record of the registry
         bytes memory componentData // writeonly data that will saved in the object info record of the registry
     )
-        public
+        internal
         virtual
         onlyInitializing()
     {
-        initializeInstanceLinkedComponent(registry, instanceNftId, name, token, PRODUCT(), isInterceptor, initialOwner, registryData, componentData);
+        _initializeInstanceLinkedComponent(
+            registry, 
+            instanceNftId, 
+            name, 
+            token, 
+            PRODUCT(), 
+            authorization, 
+            isInterceptor, 
+            initialOwner, 
+            registryData, 
+            componentData);
 
         ProductStorage storage $ = _getProductStorage();
         // TODO add validation
@@ -88,27 +182,17 @@ abstract contract Product is
     }
 
 
-    function register()
-        external
-        virtual
-        onlyOwner()
-    {
-        _getProductStorage()._componentService.registerProduct();
-    }
-
-
-    function setFees(
+    function _setFees(
         Fee memory productFee,
         Fee memory processingFee
     )
-        external
-        onlyOwner
-        restricted()
-        override
+        internal
+        virtual
     {
         _getProductStorage()._componentService.setProductFees(productFee, processingFee);
     }
 
+
     function _createRisk(
         RiskId id,
         bytes memory data
@@ -139,10 +223,12 @@ abstract contract Product is
         );
     }
 
+
     function _getRiskInfo(RiskId id) internal view returns (IRisk.RiskInfo memory info) {
         return getInstance().getInstanceReader().getRiskInfo(id);
     }
 
+
     function _createApplication(
         address applicationOwner,
         RiskId riskId,
@@ -290,77 +376,6 @@ abstract contract Product is
             payoutId);
     }
 
-    function calculatePremium(
-        Amount sumInsuredAmount,
-        RiskId riskId,
-        Seconds lifetime,
-        bytes memory applicationData,
-        NftId bundleNftId,
-        ReferralId referralId
-    )
-        external 
-        view 
-        override 
-        returns (Amount premiumAmount)
-    {
-        IPolicy.Premium memory premium = _getProductStorage()._pricingService.calculatePremium(
-            getNftId(),
-            riskId,
-            sumInsuredAmount,
-            lifetime,
-            applicationData,
-            bundleNftId,
-            referralId
-        );
-
-        return AmountLib.toAmount(premium.premiumAmount);
-    }
-
-    function calculateNetPremium(
-        Amount sumInsuredAmount,
-        RiskId riskId,
-        Seconds lifetime,
-        bytes memory applicationData
-    )
-        external
-        view
-        virtual override
-        returns (Amount netPremiumAmount)
-    {
-        // default 10% of sum insured
-        return AmountLib.toAmount(sumInsuredAmount.toInt() / 10);
-    }
-
-
-    function getInitialProductInfo()
-        public 
-        virtual 
-        view 
-        returns (IComponents.ProductInfo memory poolInfo)
-    {
-        ProductStorage storage $ = _getProductStorage();
-
-        return IComponents.ProductInfo({
-            distributionNftId: $._distributionNftId,
-            poolNftId: $._poolNftId,
-            productFee: FeeLib.zero(),
-            processingFee: FeeLib.zero(),
-            distributionFee: FeeLib.zero(),
-            minDistributionOwnerFee: FeeLib.zero(),
-            poolFee: FeeLib.zero(),
-            stakingFee: FeeLib.zero(),
-            performanceFee: FeeLib.zero()
-        });
-    }
-
-    function getPoolNftId() external view override returns (NftId poolNftId) {
-        return getRegistry().getNftId(address(_getProductStorage()._pool));
-    }
-
-    function getDistributionNftId() external view override returns (NftId distributionNftId) {
-        return getRegistry().getNftId(address(_getProductStorage()._distribution));
-    }
-
     function _toRiskId(string memory riskName) internal pure returns (RiskId riskId) {
         return RiskIdLib.toRiskId(riskName);
     }

package/contracts/registry/IRegistry.sol

@@ -40,17 +40,16 @@ interface IRegistry is IERC165 {
         bytes data;
     }
 
-    // TODO cleanup
     struct ReleaseInfo {
         VersionPart version;
         bytes32 salt;
         address[] addresses;
         string[] names;
-        RoleId[][] serviceRoles;
-        string[][] serviceRoleNames;
-        RoleId[][] functionRoles;
-        string[][] functionRoleNames;
-        bytes4[][][] selectors;
+        // RoleId[][] serviceRoles;
+        // string[][] serviceRoleNames;
+        // RoleId[][] functionRoles;
+        // string[][] functionRoleNames;
+        // bytes4[][][] selectors;
         ObjectType[] domains;
         Timestamp activatedAt;
         Timestamp disabledAt;
@@ -112,8 +111,6 @@ interface IRegistry is IERC165 {
 
     function getReleaseManagerAddress() external view returns (address);
 
-    function getReleaseAccessManagerAddress(VersionPart version) external view returns (address);
-
     function getStakingAddress() external view returns (address);
 
     function getTokenRegistryAddress() external view returns (address);

package/contracts/registry/Registry.sol

@@ -64,7 +64,7 @@ contract Registry is
     // 1). Registry and ReleaseManager must be treated as whole single entity. 
     //     But current limitations of EVM does not allow it -> require it to be splitted
     // 2). Keep onlyReleaseManager modifier
-    // 3). Delete onlyRegistryService in favor of restricted, introduce aditional "domain role", REGISTRY_SERVICE_ROLE
+    // 3). Delete onlyRegistryService in favor of restricted
     // 4). (For GlobalRegistry ONLY) make registerChainRegistry() restricted to GIF_ADMIN_ROLE
     modifier onlyRegistryService() {
         if(!_releaseManager.isActiveRegistryService(msg.sender)) {
@@ -298,10 +298,6 @@ contract Registry is
         service =  _service[releaseVersion][serviceDomain]; 
     }
 
-    function getReleaseAccessManagerAddress(VersionPart version) external view returns (address) {
-        return address(_releaseManager.getReleaseAccessManager(version));
-    }
-
     function getReleaseManagerAddress() external view returns (address) {
         return address(_releaseManager);
     }

package/contracts/registry/RegistryAdmin.sol

@@ -38,13 +38,17 @@ contract RegistryAdmin is
 
     string public constant GIF_ADMIN_ROLE_NAME = "GifAdminRole";
     string public constant GIF_MANAGER_ROLE_NAME = "GifManagerRole";
-    string public constant STAKING_SERVICE_ROLE_NAME = "StakingServiceRole";
     string public constant POOL_SERVICE_ROLE_NAME = "PoolServiceRole";
+    string public constant RELEASE_MANAGER_ROLE_NAME = "ReleaseManagerRole";
+    string public constant STAKING_SERVICE_ROLE_NAME = "StakingServiceRole";
+    string public constant STAKING_ROLE_NAME = "StakingRole";
+
+    string public constant RELEASE_MANAGER_TARGET_NAME = "ReleaseManager";
+    string public constant TOKEN_REGISTRY_TARGET_NAME = "TokenRegistry";
+    string public constant STAKING_TARGET_NAME = "Staking";
+    string public constant STAKING_STORE_TARGET_NAME = "StakingStore";
 
-    string public constant RELEASE_MANAGER_TARGET_NAME = "ReleaseManagerTarget";
-    string public constant TOKEN_REGISTRY_TARGET_NAME = "TokenRegistryTarget";
-    string public constant STAKING_TARGET_NAME = "StakingTarget";
-    string public constant STAKING_STORE_TARGET_NAME = "StakingStoreTarget";
+    uint8 public constant MAX_NUM_RELEASES = 99;
 
     mapping(address service => VersionPart majorVersion) private _ServiceRelease;
 
@@ -74,7 +78,7 @@ contract RegistryAdmin is
             IStaking(_staking).getStakingStore());
 
         // at this moment all registry contracts are deployed and fully intialized
-        _createTarget(_tokenRegistry, TOKEN_REGISTRY_TARGET_NAME);
+        _createTarget(_tokenRegistry, TOKEN_REGISTRY_TARGET_NAME, true, false);
 
         _setupGifAdminRole(gifAdmin);
         _setupGifManagerRole(gifManager);
@@ -112,8 +116,8 @@ contract RegistryAdmin is
     function _createServiceTargetAndRole(IService service)
         private
     {
-        ObjectType domain = service.getDomain();
-        string memory baseName = ObjectTypeLib.toName(domain);
+        ObjectType serviceDomain = service.getDomain();
+        string memory baseName = ObjectTypeLib.toName(serviceDomain);
         VersionPart version = service.getVersion().toMajorPart();
         uint256 versionInt = version.toInt();
 
@@ -123,27 +127,28 @@ contract RegistryAdmin is
 
         _createTarget(
             address(service), 
-            serviceTargetName);
+            serviceTargetName,
+            true,
+            false);
 
         // create service role
-        RoleId roleId = RoleIdLib.roleForTypeAndVersion(
-            domain,  version);
-        string memory serviceRoleName = ObjectTypeLib.toVersionedName(
-            baseName, "ServiceRole", versionInt);
-        bool isCustom = false; // service roles are never custom roles
-        uint256 maxRoleMembers = 1; // service roles must only be given to this unique service
-        bool memberRemovalDisabled = true; // it must not be possible to remove this role once granted 
+        RoleId serviceRoleId = RoleIdLib.roleForTypeAndVersion(
+            serviceDomain, 
+            version);
 
         _createRole(
-            roleId, 
-            ADMIN_ROLE(), 
-            serviceRoleName,
-            isCustom,
-            maxRoleMembers, 
-            memberRemovalDisabled); 
+            serviceRoleId, 
+            toRole({
+                adminRoleId: ADMIN_ROLE(),
+                roleType: RoleType.Contract,
+                maxMemberCount: 1,
+                name: ObjectTypeLib.toVersionedName(
+                    baseName, 
+                    "ServiceRole", 
+                    versionInt)}));
 
         _grantRoleToAccount( 
-            roleId,
+            serviceRoleId,
             address(service)); 
     }
 
@@ -206,10 +211,14 @@ contract RegistryAdmin is
     //--- private functions -------------------------------------------------//
 
     function _setupGifAdminRole(address gifAdmin) private {
-        // TODO decide on max member count
-        bool isCustom = false;
-        _createRole(GIF_ADMIN_ROLE(), getAdminRole(), GIF_ADMIN_ROLE_NAME, isCustom, 2, false);
-        _grantRoleToAccount(GIF_ADMIN_ROLE(), gifAdmin);
+        
+        _createRole(
+            GIF_ADMIN_ROLE(), 
+            toRole({
+                adminRoleId: ADMIN_ROLE(),
+                roleType: RoleType.Gif,
+                maxMemberCount: 2, // TODO decide on max member count
+                name: GIF_ADMIN_ROLE_NAME}));
 
         // for ReleaseManager
         FunctionInfo[] memory functions;
@@ -218,14 +227,18 @@ contract RegistryAdmin is
         functions[1] = toFunction(ReleaseManager.activateNextRelease.selector, "activateNextRelease");
         _authorizeTargetFunctions(_releaseManager, GIF_ADMIN_ROLE(), functions);
 
-        // for Staking
+        _grantRoleToAccount(GIF_ADMIN_ROLE(), gifAdmin);
     }
     
     function _setupGifManagerRole(address gifManager) private {
 
-        bool isCustom = false;
-        _createRole(GIF_MANAGER_ROLE(), GIF_ADMIN_ROLE(), GIF_MANAGER_ROLE_NAME, isCustom, 1, false);
-        _grantRoleToAccount(GIF_MANAGER_ROLE(), gifManager);
+        _createRole(
+            GIF_MANAGER_ROLE(), 
+            toRole({
+                adminRoleId: ADMIN_ROLE(),
+                roleType: RoleType.Gif,
+                maxMemberCount: 1,
+                name: GIF_MANAGER_ROLE_NAME}));
 
         // for TokenRegistry
         FunctionInfo[] memory functions;
@@ -244,34 +257,46 @@ contract RegistryAdmin is
         functions[1] = toFunction(ReleaseManager.registerService.selector, "registerService");
         _authorizeTargetFunctions(_releaseManager, GIF_MANAGER_ROLE(), functions);
 
-        // for Staking
+        _grantRoleToAccount(GIF_MANAGER_ROLE(), gifManager);
     }
 
 
     function _setupReleaseManager() private {
-        _createTarget(_releaseManager, RELEASE_MANAGER_TARGET_NAME);
 
-        bool isCustom = false;
+        _createTarget(_releaseManager, RELEASE_MANAGER_TARGET_NAME, true, false);
+
         RoleId releaseManagerRoleId = RoleIdLib.roleForType(RELEASE());
-        _createRole(releaseManagerRoleId, ADMIN_ROLE(), RELEASE_MANAGER_TARGET_NAME, isCustom, 1, true);
-        _grantRoleToAccount(releaseManagerRoleId, _releaseManager);
+        _createRole(
+            releaseManagerRoleId, 
+            toRole({
+                adminRoleId: ADMIN_ROLE(),
+                roleType: RoleType.Contract,
+                maxMemberCount: 1,
+                name: RELEASE_MANAGER_ROLE_NAME}));
 
         FunctionInfo[] memory functions;
         functions = new FunctionInfo[](2);
         functions[0] = toFunction(RegistryAdmin.authorizeService.selector, "authorizeService");
         functions[1] = toFunction(RegistryAdmin.grantServiceRoleForAllVersions.selector, "grantServiceRoleForAllVersions");
         _authorizeTargetFunctions(address(this), releaseManagerRoleId, functions);
+
+        _grantRoleToAccount(releaseManagerRoleId, _releaseManager);
     }
 
 
     function _setupStaking() private {
-        _createTarget(_staking, STAKING_TARGET_NAME);
-        _createTarget(_stakingStore, STAKING_STORE_TARGET_NAME);
+        _createTarget(_staking, STAKING_TARGET_NAME, true, false);
+        _createTarget(_stakingStore, STAKING_STORE_TARGET_NAME, true, false);
 
         // staking function authorization for staking service
-        bool isCustom = false;
         RoleId stakingServiceRoleId = RoleIdLib.roleForTypeAndAllVersions(STAKING());
-        _createRole(stakingServiceRoleId, ADMIN_ROLE(), STAKING_SERVICE_ROLE_NAME, isCustom, 1, true);
+        _createRole(
+            stakingServiceRoleId, 
+            toRole({
+                adminRoleId: ADMIN_ROLE(),
+                roleType: RoleType.Contract,
+                maxMemberCount: MAX_NUM_RELEASES,
+                name: STAKING_SERVICE_ROLE_NAME}));
 
         FunctionInfo[] memory functions;
         functions = new FunctionInfo[](13);
@@ -292,7 +317,13 @@ contract RegistryAdmin is
 
         // staking function authorization for pool service
         RoleId poolServiceRoleId = RoleIdLib.roleForTypeAndAllVersions(POOL());
-        _createRole(poolServiceRoleId, ADMIN_ROLE(), POOL_SERVICE_ROLE_NAME, isCustom, 1, true);
+        _createRole(
+            poolServiceRoleId, 
+            toRole({
+                adminRoleId: ADMIN_ROLE(),
+                roleType: RoleType.Contract,
+                maxMemberCount: MAX_NUM_RELEASES,
+                name: POOL_SERVICE_ROLE_NAME}));
 
         // staking function authorizations
         functions = new FunctionInfo[](2);
@@ -302,8 +333,13 @@ contract RegistryAdmin is
 
         // staking store function authorizations
         RoleId stakingRoleId = RoleIdLib.roleForType(STAKING());
-        _createRole(stakingRoleId, ADMIN_ROLE(), STAKING_TARGET_NAME, isCustom, 1, true);
-        _grantRoleToAccount(stakingRoleId, _staking);
+        _createRole(
+            stakingRoleId, 
+            toRole({
+                adminRoleId: ADMIN_ROLE(),
+                roleType: RoleType.Contract,
+                maxMemberCount: 1,
+                name: STAKING_ROLE_NAME}));
 
         functions = new FunctionInfo[](14);
         functions[0] = toFunction(StakingStore.setStakingRate.selector, "setStakingRate");
@@ -321,5 +357,7 @@ contract RegistryAdmin is
         functions[12] = toFunction(StakingStore.claimUpTo.selector, "claimUpTo");
         functions[13] = toFunction(StakingStore.unstakeUpTo.selector, "unstakeUpTo");
         _authorizeTargetFunctions(_stakingStore, stakingRoleId, functions);
+
+        _grantRoleToAccount(stakingRoleId, _staking);
     }
 }

package/contracts/registry/ReleaseManager.sol

@@ -18,7 +18,6 @@ import {StateId, INITIAL, SCHEDULED, DEPLOYING, ACTIVE} from "../type/StateId.so
 import {Version, VersionLib, VersionPart, VersionPartLib} from "../type/Version.sol";
 
 import {IService} from "../shared/IService.sol";
-import {AccessManagerExtendedWithDisableInitializeable} from "../shared/AccessManagerExtendedWithDisableInitializeable.sol";
 import {ILifecycle} from "../shared/ILifecycle.sol";
 import {INftOwnable} from "../shared/INftOwnable.sol";
 import {IRegisterable} from "../shared/IRegisterable.sol";
@@ -32,7 +31,8 @@ import {RegistryAdmin} from "./RegistryAdmin.sol";
 import {Registry} from "./Registry.sol";
 import {TokenRegistry} from "./TokenRegistry.sol";
 
-
+// TODO rename to something that does not end with 'Manager' 
+// everywhere else *Manager points to an upgradeable contract
 contract ReleaseManager is 
     AccessManaged, 
     ILifecycle, 
@@ -92,17 +92,19 @@ contract ReleaseManager is
     Seconds public constant MIN_DISABLE_DELAY = Seconds.wrap(60 * 24 * 365); // 1 year
 
     RegistryAdmin public immutable _admin;
-    address public immutable _releaseAccessManagerCodeAddress;
     Registry public immutable _registry;
     IRegisterable private _staking;
     address private _stakingOwner;
 
-    // TODO remove once it's clear that release authority will always be registry authority
-    mapping(VersionPart version => address authority) internal _releaseAccessManager;
     mapping(VersionPart version => IRegistry.ReleaseInfo info) internal _releaseInfo;
+    mapping(VersionPart version => IServiceAuthorization authz) internal _serviceAuthorization;
+
+    // TODO check where/why this is used
     mapping(address registryService => VersionPart version) _releaseVersionByAddress;
 
-    mapping(VersionPart version => IServiceAuthorization authz) internal _serviceAuthorization;
+    // TODO remove once it's clear that release authority will always be registry authority
+    mapping(VersionPart version => address authority) internal _releaseAccessManager;
+
 
     VersionPart immutable internal _initial;// first active version    
     VersionPart internal _latest; // latest active version
@@ -128,11 +130,6 @@ contract ReleaseManager is
         _initial = VersionPartLib.toVersionPart(INITIAL_GIF_VERSION);
         _next = VersionPartLib.toVersionPart(INITIAL_GIF_VERSION - 1);
         _state = getInitialState(RELEASE());
-        
-        AccessManagerExtendedWithDisableInitializeable masterReleaseAccessManager = new AccessManagerExtendedWithDisableInitializeable();
-        masterReleaseAccessManager.initialize(_registry.NFT_LOCK_ADDRESS(), VersionLib.toVersionPart(0));
-        //masterReleaseAccessManager.disable();
-        _releaseAccessManagerCodeAddress = address(masterReleaseAccessManager);
     }
 
     /// @dev skips previous release if was not activated
@@ -232,9 +229,6 @@ contract ReleaseManager is
             revert ErrorReleaseManagerServiceDomainMismatch(expectedDomain, service.getDomain());
         }
 
-        // checked in registry
-        _releaseInfo[version].domains.push(domain);
-
         // register service with registry
         nftId = _registry.registerService(info, version, domain);
         _registeredServices++;
@@ -377,11 +371,6 @@ contract ReleaseManager is
         return _servicesToRegister - _registeredServices;
     }
 
-    // TODO cleanup
-    function getReleaseAccessManager(VersionPart version) external view returns(AccessManagerExtendedWithDisableInitializeable) {
-        // return _releaseAccessManager[version];
-    }
-
     function getServiceAuthorization(VersionPart version)
         external
         view

package/contracts/registry/ServiceAuthorizationV3.sol

@@ -124,7 +124,7 @@ contract ServiceAuthorizationV3
           IAccess.FunctionInfo[] storage functions;
 
           functions = _authorizeForService(INSTANCE(), COMPONENT());
-          _authorize(functions, IInstanceService.createComponentTarget.selector, "createComponentTarget");
+          _authorize(functions, IInstanceService.initializeAuthorization.selector, "initializeAuthorization");
      }