@etherisc/gif-next 0.0.2-bb3faee-097 → 0.0.2-bb9ecaf-723

package/contracts/product/ClaimService.sol

@@ -18,6 +18,7 @@ import {InstanceStore} from "../instance/InstanceStore.sol";
 import {NftId} from "../type/NftId.sol";
 import {ObjectType, CLAIM, POLICY, POOL, PRODUCT} from "../type/ObjectType.sol";
 import {PayoutId, PayoutIdLib} from "../type/PayoutId.sol";
+import {ProductStore} from "../instance/ProductStore.sol";
 import {Service} from "../shared/Service.sol";
 import {StateId} from "../type/StateId.sol";
 import {SUBMITTED, KEEP_STATE, DECLINED, REVOKED, CANCELLED, CONFIRMED, CLOSED, EXPECTED, PAID} from "../type/StateId.sol";
@@ -66,8 +67,8 @@ contract ClaimService is
     {
         // checks
         (
-            ,,,
-            InstanceStore instanceStore,
+            ,,
+            IInstance.InstanceContracts memory instanceContracts,
             IPolicy.PolicyInfo memory policyInfo
         ) = _verifyCallerWithPolicy(policyNftId);
 
@@ -81,7 +82,7 @@ contract ClaimService is
         // effects
         // create new claim
         claimId = ClaimIdLib.toClaimId(policyInfo.claimsCount + 1);
-        instanceStore.createClaim(
+        instanceContracts.productStore.createClaim(
             policyNftId, 
             claimId, 
             IPolicy.ClaimInfo({
@@ -97,7 +98,7 @@ contract ClaimService is
         // policy claim amount is only updated when claim is confirmed
         policyInfo.claimsCount += 1;
         policyInfo.openClaimsCount += 1;
-        instanceStore.updatePolicyClaims(policyNftId, policyInfo, KEEP_STATE());
+        instanceContracts.productStore.updatePolicyClaims(policyNftId, policyInfo, KEEP_STATE());
 
         emit LogClaimServiceClaimSubmitted(policyNftId, claimId, claimAmount);
     }
@@ -120,8 +121,7 @@ contract ClaimService is
         (
             NftId productNftId,
             IInstance instance,
-            InstanceReader instanceReader,
-            InstanceStore instanceStore,
+            IInstance.InstanceContracts memory instanceContracts,
             IPolicy.PolicyInfo memory policyInfo
         ) = _verifyCallerWithPolicy(policyNftId);
 
@@ -129,14 +129,14 @@ contract ClaimService is
 
         // effects
         // check/update claim info
-        IPolicy.ClaimInfo memory claimInfo = _verifyClaim(instanceReader, policyNftId, claimId, SUBMITTED());
+        IPolicy.ClaimInfo memory claimInfo = _verifyClaim(instanceContracts.instanceReader, policyNftId, claimId, SUBMITTED());
         claimInfo.claimAmount = confirmedAmount;
         claimInfo.processData = data;
-        instanceStore.updateClaim(policyNftId, claimId, claimInfo, CONFIRMED());
+        instanceContracts.productStore.updateClaim(policyNftId, claimId, claimInfo, CONFIRMED());
 
         // update and save policy info with instance
         policyInfo.claimAmount = policyInfo.claimAmount + confirmedAmount;
-        instanceStore.updatePolicyClaims(policyNftId, policyInfo, KEEP_STATE());
+        instanceContracts.productStore.updatePolicyClaims(policyNftId, policyInfo, KEEP_STATE());
 
         // should policy still be active it needs to become expired
         if (policyInfo.claimAmount >= policyInfo.sumInsuredAmount) {
@@ -147,7 +147,7 @@ contract ClaimService is
 
         // interactions
         // callback to pool if applicable
-        _processConfirmedClaimByPool(instanceReader, productNftId, policyNftId, claimId, confirmedAmount);
+        _processConfirmedClaimByPool(instanceContracts.instanceReader, productNftId, policyNftId, claimId, confirmedAmount);
 
         // callback to policy holder if applicable
         _policyHolderClaimConfirmed(policyNftId, claimId, confirmedAmount);
@@ -168,20 +168,19 @@ contract ClaimService is
 
         (
             ,,
-            InstanceReader instanceReader,
-            InstanceStore instanceStore,
+            IInstance.InstanceContracts memory instanceContracts,
             IPolicy.PolicyInfo memory policyInfo
         ) = _verifyCallerWithPolicy(policyNftId);
 
         // check/update claim info
-        IPolicy.ClaimInfo memory claimInfo = _verifyClaim(instanceReader, policyNftId, claimId, SUBMITTED());
+        IPolicy.ClaimInfo memory claimInfo = _verifyClaim(instanceContracts.instanceReader, policyNftId, claimId, SUBMITTED());
         claimInfo.processData = data;
         claimInfo.closedAt = TimestampLib.current();
-        instanceStore.updateClaim(policyNftId, claimId, claimInfo, DECLINED());
+        instanceContracts.productStore.updateClaim(policyNftId, claimId, claimInfo, DECLINED());
 
         // update and save policy info with instance
         policyInfo.openClaimsCount -= 1;
-        instanceStore.updatePolicyClaims(policyNftId, policyInfo, KEEP_STATE());
+        instanceContracts.productStore.updatePolicyClaims(policyNftId, policyInfo, KEEP_STATE());
 
         emit LogClaimServiceClaimDeclined(policyNftId, claimId);
     }
@@ -198,19 +197,18 @@ contract ClaimService is
     {        
         (
             ,,
-            InstanceReader instanceReader,
-            InstanceStore instanceStore,
+            IInstance.InstanceContracts memory instanceContracts,
             IPolicy.PolicyInfo memory policyInfo
         ) = _verifyCallerWithPolicy(policyNftId);
 
         // check/update claim info
-        IPolicy.ClaimInfo memory claimInfo = _verifyClaim(instanceReader, policyNftId, claimId, SUBMITTED());
+        IPolicy.ClaimInfo memory claimInfo = _verifyClaim(instanceContracts.instanceReader, policyNftId, claimId, SUBMITTED());
         claimInfo.closedAt = TimestampLib.current();
-        instanceStore.updateClaim(policyNftId, claimId, claimInfo, REVOKED());
+        instanceContracts.productStore.updateClaim(policyNftId, claimId, claimInfo, REVOKED());
 
         // update and save policy info with instance
         policyInfo.openClaimsCount -= 1;
-        instanceStore.updatePolicyClaims(policyNftId, policyInfo, KEEP_STATE());
+        instanceContracts.productStore.updatePolicyClaims(policyNftId, policyInfo, KEEP_STATE());
 
         emit LogClaimServiceClaimRevoked(policyNftId, claimId);
     }
@@ -229,12 +227,11 @@ contract ClaimService is
         
         (
             ,,
-            InstanceReader instanceReader,
-            InstanceStore instanceStore,
+            IInstance.InstanceContracts memory instanceContracts,
         ) = _verifyCallerWithPolicy(policyNftId);
 
         // check/update claim info
-        IPolicy.ClaimInfo memory claimInfo = _verifyClaim(instanceReader, policyNftId, claimId, CONFIRMED());
+        IPolicy.ClaimInfo memory claimInfo = _verifyClaim(instanceContracts.instanceReader, policyNftId, claimId, CONFIRMED());
 
         // check claim has no open payouts
         if(claimInfo.openPayoutsCount > 0) {
@@ -245,7 +242,7 @@ contract ClaimService is
         }
 
         claimInfo.closedAt = TimestampLib.current();
-        instanceStore.updateClaim(policyNftId, claimId, claimInfo, CANCELLED());
+        instanceContracts.productStore.updateClaim(policyNftId, claimId, claimInfo, CANCELLED());
 
         emit LogClaimServiceClaimCancelled(policyNftId, claimId);
     }
@@ -313,8 +310,7 @@ contract ClaimService is
         // checks
         (
             ,,
-            InstanceReader instanceReader,
-            InstanceStore instanceStore,
+            IInstance.InstanceContracts memory instanceContracts,
             IPolicy.PolicyInfo memory policyInfo
         ) = _verifyCallerWithPolicy(policyNftId);
 
@@ -324,16 +320,16 @@ contract ClaimService is
         
         {
             // check that payout exists and is open
-            IPolicy.PayoutInfo memory payoutInfo = instanceReader.getPayoutInfo(policyNftId, payoutId);
+            IPolicy.PayoutInfo memory payoutInfo = instanceContracts.instanceReader.getPayoutInfo(policyNftId, payoutId);
             payoutBeneficiary = payoutInfo.beneficiary;
             payoutAmount = payoutInfo.amount;
-            StateId payoutState = instanceReader.getPayoutState(policyNftId, payoutId);
+            StateId payoutState = instanceContracts.instanceReader.getPayoutState(policyNftId, payoutId);
             if(payoutState != EXPECTED()) {
                 revert ErrorClaimServicePayoutNotExpected(policyNftId, payoutId, payoutState);
             }
 
             // check that payout amount does not violate claim amount
-            claimInfo = instanceReader.getClaimInfo(policyNftId, payoutId.toClaimId());
+            claimInfo = instanceContracts.instanceReader.getClaimInfo(policyNftId, payoutId.toClaimId());
             if(claimInfo.paidAmount + payoutInfo.amount > claimInfo.claimAmount) {
                 revert ErrorClaimServicePayoutExceedsClaimAmount(
                     policyNftId, 
@@ -345,7 +341,7 @@ contract ClaimService is
             // effects
             // update and save payout info with instance
             payoutInfo.paidAt = TimestampLib.current();
-            instanceStore.updatePayout(policyNftId, payoutId, payoutInfo, PAID());
+            instanceContracts.productStore.updatePayout(policyNftId, payoutId, payoutInfo, PAID());
         }
 
         // update and save claim info with instance
@@ -358,25 +354,25 @@ contract ClaimService is
             // update claim and policy info accordingly
             if(claimInfo.openPayoutsCount == 0 && claimInfo.paidAmount == claimInfo.claimAmount) {
                 claimInfo.closedAt = TimestampLib.current();
-                instanceStore.updateClaim(policyNftId, claimId, claimInfo, CLOSED());
+                instanceContracts.productStore.updateClaim(policyNftId, claimId, claimInfo, CLOSED());
 
                 policyInfo.openClaimsCount -= 1;
             } else {
-                instanceStore.updateClaim(policyNftId, claimId, claimInfo, KEEP_STATE());
+                instanceContracts.productStore.updateClaim(policyNftId, claimId, claimInfo, KEEP_STATE());
             }
         }
 
         // update and save policy info with instance
         policyInfo.payoutAmount = policyInfo.payoutAmount + payoutAmount;
-        instanceStore.updatePolicyClaims(policyNftId, policyInfo, KEEP_STATE());
+        instanceContracts.productStore.updatePolicyClaims(policyNftId, policyInfo, KEEP_STATE());
 
         emit LogClaimServicePayoutProcessed(policyNftId, payoutId, payoutAmount);
 
         // effects + interactions (push tokens to beneficiary, product)
         // delegate to pool to update book keeping and moving tokens payout
         (netPayoutAmount, processingFeeAmount) = _poolService.processPayout(
-            instanceReader,
-            instanceStore, 
+            instanceContracts.instanceReader,
+            instanceContracts.instanceStore, 
             policyInfo.productNftId, // product nft id 
             policyNftId, 
             policyInfo.bundleNftId, 
@@ -396,24 +392,23 @@ contract ClaimService is
         // checks
         (
             ,,
-            InstanceReader instanceReader,
-            InstanceStore instanceStore,
+            IInstance.InstanceContracts memory instanceContracts,
         ) = _verifyCallerWithPolicy(policyNftId);
 
-        StateId payoutState = instanceReader.getPayoutState(policyNftId, payoutId);
+        StateId payoutState = instanceContracts.instanceReader.getPayoutState(policyNftId, payoutId);
         if (payoutState != EXPECTED()) {
             revert ErrorClaimServicePayoutNotExpected(policyNftId, payoutId, payoutState);
         }
 
         // effects
         // update and save payout info with instance
-        instanceStore.updatePayoutState(policyNftId, payoutId, CANCELLED());
+        instanceContracts.productStore.updatePayoutState(policyNftId, payoutId, CANCELLED());
 
         {
             ClaimId claimId = payoutId.toClaimId();
-            IPolicy.ClaimInfo memory claimInfo = instanceReader.getClaimInfo(policyNftId, claimId);
+            IPolicy.ClaimInfo memory claimInfo = instanceContracts.instanceReader.getClaimInfo(policyNftId, claimId);
             claimInfo.openPayoutsCount -= 1;
-            instanceStore.updateClaim(policyNftId, claimId, claimInfo, KEEP_STATE());
+            instanceContracts.productStore.updateClaim(policyNftId, claimId, claimInfo, KEEP_STATE());
         }
 
         emit LogClaimServicePayoutCancelled(policyNftId, payoutId);
@@ -457,16 +452,15 @@ contract ClaimService is
         // checks
         (
             ,,
-            InstanceReader instanceReader,
-            InstanceStore instanceStore,
+            IInstance.InstanceContracts memory instanceContracts,
             // IPolicy.PolicyInfo memory policyInfo
         ) = _verifyCallerWithPolicy(policyNftId);
 
-        IPolicy.ClaimInfo memory claimInfo = instanceReader.getClaimInfo(policyNftId, claimId);
+        IPolicy.ClaimInfo memory claimInfo = instanceContracts.instanceReader.getClaimInfo(policyNftId, claimId);
 
         {
             // check claim state
-            StateId claimState = instanceReader.getClaimState(policyNftId, claimId);
+            StateId claimState = instanceContracts.instanceReader.getClaimState(policyNftId, claimId);
             if (claimState != CONFIRMED()) {
                 revert ErrorClaimServiceClaimNotConfirmed(policyNftId, claimId, claimState);
             }
@@ -487,7 +481,7 @@ contract ClaimService is
             beneficiary = getRegistry().ownerOf(policyNftId);
         }
 
-        instanceStore.createPayout(
+        instanceContracts.productStore.createPayout(
             policyNftId, 
             payoutId, 
             IPolicy.PayoutInfo({
@@ -500,12 +494,14 @@ contract ClaimService is
         // update and save claim info with instance
         claimInfo.payoutsCount += 1;
         claimInfo.openPayoutsCount += 1;
-        instanceStore.updateClaim(policyNftId, claimId, claimInfo, KEEP_STATE());
+        instanceContracts.productStore.updateClaim(policyNftId, claimId, claimInfo, KEEP_STATE());
 
         emit LogClaimServicePayoutCreated(policyNftId, payoutId, amount, beneficiary);
     }
 
-
+    /// @dev Verifies the caller is a product and the policy is active. 
+    /// Returns the product nft id, instance, instance contracts and policy info.
+    /// in InstanceContracts only the contracts instanceReader, instanceStore and productStore are set.
     function _verifyCallerWithPolicy(
         NftId policyNftId
     )
@@ -515,17 +511,17 @@ contract ClaimService is
         returns (
             NftId productNftId,
             IInstance instance,
-            InstanceReader instanceReader,
-            InstanceStore instanceStore,
+            IInstance.InstanceContracts memory instanceContracts,
             IPolicy.PolicyInfo memory policyInfo
         )
     {
         (productNftId, instance) = _getAndVerifyActiveProduct();
-        instanceReader = instance.getInstanceReader();
-        instanceStore = instance.getInstanceStore();
+        instanceContracts.instanceReader = InstanceReader(instance.getInstanceReader());
+        instanceContracts.instanceStore = InstanceStore(instance.getInstanceStore());
+        instanceContracts.productStore = ProductStore(instance.getProductStore());
 
         // check caller(product) policy match
-        policyInfo = instanceReader.getPolicyInfo(policyNftId);
+        policyInfo = instanceContracts.instanceReader.getPolicyInfo(policyNftId);
         if(policyInfo.productNftId != productNftId) {
             revert ErrorClaimServicePolicyProductMismatch(policyNftId, 
             policyInfo.productNftId, 

package/contracts/product/PolicyService.sol

@@ -83,7 +83,7 @@ contract PolicyService is
 
         // effects
         // store updated policy info
-        instance.getInstanceStore().updatePolicyState(
+        instance.getProductStore().updatePolicyState(
             applicationNftId, 
             DECLINED());
 
@@ -132,7 +132,7 @@ contract PolicyService is
         }
 
         // update policy and set state to collateralized
-        instance.getInstanceStore().updatePolicy(
+        instance.getProductStore().updatePolicy(
             applicationNftId, 
             applicationInfo, 
             COLLATERALIZED());
@@ -158,7 +158,7 @@ contract PolicyService is
         }
 
         premiumAmount = premium.premiumAmount;
-        instance.getInstanceStore().createPremium(
+        instance.getProductStore().createPremium(
             applicationNftId,
             premium);
 
@@ -243,8 +243,8 @@ contract PolicyService is
             policyInfo = PolicyServiceLib.activate(policyNftId, policyInfo, activateAt);
         }
 
-        instance.getInstanceStore().updatePolicy(policyNftId, policyInfo, KEEP_STATE());
-        instance.getInstanceStore().updatePremiumState(policyNftId, PAID());
+        instance.getProductStore().updatePolicy(policyNftId, policyInfo, KEEP_STATE());
+        instance.getProductStore().updatePremiumState(policyNftId, PAID());
 
         // log premium collection before interactions with token
         emit LogPolicyServicePolicyPremiumCollected(policyNftId, premium.premiumAmount);
@@ -269,7 +269,7 @@ contract PolicyService is
 
         // effects
         policyInfo = PolicyServiceLib.activate(policyNftId, policyInfo, activateAt);
-        instance.getInstanceStore().updatePolicy(policyNftId, policyInfo, KEEP_STATE());
+        instance.getProductStore().updatePolicy(policyNftId, policyInfo, KEEP_STATE());
 
         // log policy activation before interactions with policy holder
         emit LogPolicyServicePolicyActivated(policyNftId, activateAt);
@@ -309,7 +309,7 @@ contract PolicyService is
 
         // effects
         policyInfo.activatedAt = newActivateAt;
-        instance.getInstanceStore().updatePolicy(policyNftId, policyInfo, KEEP_STATE());
+        instance.getProductStore().updatePolicy(policyNftId, policyInfo, KEEP_STATE());
 
         // log policy activation before interactions with policy holder
         emit LogPolicyServicePolicyActivatedUpdated(policyNftId, newActivateAt);
@@ -415,7 +415,7 @@ contract PolicyService is
 
         // update policy state to closed
         policyInfo.closedAt = TimestampLib.current();
-        instance.getInstanceStore().updatePolicy(policyNftId, policyInfo, CLOSED());
+        instance.getProductStore().updatePolicy(policyNftId, policyInfo, CLOSED());
 
         // unlink policy from risk and bundle
         NftId poolNftId = getRegistry().getParentNftId(bundleNftId);
@@ -442,7 +442,7 @@ contract PolicyService is
             policyInfo,
             expireAt);
 
-        instance.getInstanceStore().updatePolicy(policyNftId, policyInfo, KEEP_STATE());
+        instance.getProductStore().updatePolicy(policyNftId, policyInfo, KEEP_STATE());
 
         emit LogPolicyServicePolicyExpirationUpdated(policyNftId, policyInfo.expiredAt);
 

package/contracts/product/Product.sol

@@ -140,8 +140,7 @@ abstract contract Product is
         IComponents.ProductInfo memory productInfo,
         IComponents.FeeInfo memory feeInfo,
         IAuthorization authorization,
-        address initialOwner,
-        bytes memory componentData // writeonly data that will saved in the object info record of the registry
+        address initialOwner
     )
         internal
         virtual
@@ -154,8 +153,7 @@ abstract contract Product is
             PRODUCT(), 
             authorization, 
             productInfo.isInterceptingPolicyTransfers, 
-            initialOwner, 
-            componentData);
+            initialOwner);
 
         ProductStorage storage $ = _getProductStorage();
         $._productInfo = productInfo;

package/contracts/product/RiskService.sol

@@ -12,7 +12,6 @@ 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, RiskIdLib} from "../type/RiskId.sol";
-import {StateId} from "../type/StateId.sol";
 import {RiskSet} from "../instance/RiskSet.sol";
 import {Service} from "../shared/Service.sol";
 import {TimestampLib} from "../type/Timestamp.sol";
@@ -59,7 +58,7 @@ contract RiskService is
             createdAt: TimestampLib.current(),
             data: data});
 
-        instance.getInstanceStore().createRisk(
+        instance.getProductStore().createRisk(
             riskId,
             riskInfo
         );
@@ -92,7 +91,7 @@ contract RiskService is
         }
 
         riskInfo.data = data;
-        instance.getInstanceStore().updateRisk(riskId, riskInfo, KEEP_STATE());
+        instance.getProductStore().updateRisk(riskId, riskInfo, KEEP_STATE());
 
         emit LogRiskServiceRiskUpdated(productNftId, riskId);
     }
@@ -148,7 +147,7 @@ contract RiskService is
         }
 
         // effects
-        instance.getInstanceStore().updateRiskState(riskId, CLOSED());
+        instance.getProductStore().updateRiskState(riskId, CLOSED());
 
         emit LogRiskServiceRiskClosed(productNftId, riskId);
     }

package/contracts/registry/RegistryAdmin.sol

@@ -76,7 +76,6 @@ contract RegistryAdmin is
         public
         virtual
         reinitializer(type(uint8).max)
-        onlyDeployer()
     {
         // checks
         AccessAdminLib.checkRegistry(registry);
@@ -101,11 +100,12 @@ contract RegistryAdmin is
         // link nft ownability to registry
         _linkToNftOwnable(_registry);
 
+        _createRoles(_authorization);
+
         // setup registry core targets
         _createCoreTargets(_authorization.getMainTargetName());
 
         // setup non-contract roles
-        _createRoles(_authorization);
         _grantRoleToAccount(GIF_ADMIN_ROLE(), gifAdmin);
         _grantRoleToAccount(GIF_MANAGER_ROLE(), gifManager);
 
@@ -138,38 +138,20 @@ contract RegistryAdmin is
 
     //--- private initialization functions -------------------------------------------//
 
-    function _createRoles(IAuthorization authorization)
-        internal
-    {
-        RoleId[] memory roles = authorization.getRoles();
-
-        for(uint256 i = 0; i < roles.length; i++) {
-            RoleId roleId = roles[i];
-            RoleInfo memory roleInfo = authorization.getRoleInfo(roleId);
-
-            // create role if not exists
-            if (!roleExists(roleInfo.name.toString())) {
-                _createRole(
-                    roleId,
-                    roleInfo);
-            }
-        }
-    }
-
 
     function _createCoreTargets(string memory registryTargetName)
         internal
     {
-        // registry
-        _createUncheckedTarget(_registry, registryTargetName, TargetType.Core);
-        _createUncheckedTarget(address(this), REGISTRY_ADMIN_TARGET_NAME, TargetType.Core);
-        _createUncheckedTarget(_releaseRegistry, RELEASE_REGISTRY_TARGET_NAME, TargetType.Core);
-        _createUncheckedTarget(_tokenRegistry, TOKEN_REGISTRY_TARGET_NAME, TargetType.Core);
-
-        // staking
-        _createUncheckedTarget(_staking, STAKING_TARGET_NAME, TargetType.Core);
-        _createUncheckedTarget(_stakingTargetHandler, STAKING_TARGET_HANDLER_NAME, TargetType.Core);
-        _createUncheckedTarget(_stakingStore, STAKING_STORE_TARGET_NAME, TargetType.Core);
+        // create unchecked registry targets
+        _createTarget(_registry, registryTargetName, TargetType.Core, false);
+        _createTarget(address(this), REGISTRY_ADMIN_TARGET_NAME, TargetType.Core, false);
+        _createTarget(_releaseRegistry, RELEASE_REGISTRY_TARGET_NAME, TargetType.Core, false);
+        _createTarget(_tokenRegistry, TOKEN_REGISTRY_TARGET_NAME, TargetType.Core, false);
+
+        // create unchecked staking targets
+        _createTarget(_staking, STAKING_TARGET_NAME, TargetType.Core, false);
+        _createTarget(_stakingTargetHandler, STAKING_TARGET_HANDLER_NAME, TargetType.Core, false);
+        _createTarget(_stakingStore, STAKING_STORE_TARGET_NAME, TargetType.Core, false);
     }
 
 

package/contracts/registry/RegistryAuthorization.sol

@@ -5,6 +5,7 @@ import {IAccess} from "../authorization/IAccess.sol";
 import {IRegistry} from "../registry/IRegistry.sol";
 import {IStaking} from "../staking/IStaking.sol";
 
+import {AccessAdminLib} from "../authorization/AccessAdminLib.sol";
 import {Authorization} from "../authorization/Authorization.sol";
 import {COMPONENT, POOL, REGISTRY, STAKING} from "../../contracts/type/ObjectType.sol";
 import {PUBLIC_ROLE} from "../type/RoleId.sol";
@@ -50,7 +51,7 @@ contract RegistryAuthorization
                REGISTRY(), 
                3, 
                commitHash, 
-               false, // isComponent
+               TargetType.Core,
                false) // includeTokenHandler
      { }
 
@@ -63,53 +64,53 @@ contract RegistryAuthorization
           // service roles (for all releases)
           _addRole(
                RoleIdLib.toGenericServiceRoleId(REGISTRY()), 
-               _toRoleInfo({
-                    adminRoleId: ADMIN_ROLE(),
-                    roleType: RoleType.Core,
-                    maxMemberCount: maxReleases, 
-                    name: REGISTRY_SERVICE_ROLE_NAME}));
+               AccessAdminLib.roleInfo(
+                    ADMIN_ROLE(),
+                    TargetType.Core,
+                    maxReleases, 
+                    REGISTRY_SERVICE_ROLE_NAME));
 
           _addRole(
                RoleIdLib.toGenericServiceRoleId(STAKING()), 
-               _toRoleInfo({
-                    adminRoleId: ADMIN_ROLE(),
-                    roleType: RoleType.Core,
-                    maxMemberCount: maxReleases, 
-                    name: STAKING_SERVICE_ROLE_NAME}));
+               AccessAdminLib.roleInfo(
+                    ADMIN_ROLE(),
+                    TargetType.Core,
+                    maxReleases, 
+                    STAKING_SERVICE_ROLE_NAME));
 
           _addRole(
                RoleIdLib.toGenericServiceRoleId(COMPONENT()), 
-               _toRoleInfo({
-                    adminRoleId: ADMIN_ROLE(),
-                    roleType: RoleType.Core,
-                    maxMemberCount: maxReleases, 
-                    name: COMPONENT_SERVICE_ROLE_NAME}));
+               AccessAdminLib.roleInfo(
+                    ADMIN_ROLE(),
+                    TargetType.Core,
+                    maxReleases, 
+                    COMPONENT_SERVICE_ROLE_NAME));
 
           _addRole(
                RoleIdLib.toGenericServiceRoleId(POOL()), 
-               _toRoleInfo({
-                    adminRoleId: ADMIN_ROLE(),
-                    roleType: RoleType.Core,
-                    maxMemberCount: maxReleases, 
-                    name: POOL_SERVICE_ROLE_NAME}));
+               AccessAdminLib.roleInfo(
+                    ADMIN_ROLE(),
+                    TargetType.Core,
+                    maxReleases, 
+                    POOL_SERVICE_ROLE_NAME));
 
           // gif admin role
           _addRole(
                GIF_ADMIN_ROLE(),
-               _toRoleInfo({
-                    adminRoleId: ADMIN_ROLE(),
-                    roleType: RoleType.Core,
-                    maxMemberCount: 2, // TODO decide on max member count
-                    name: GIF_ADMIN_ROLE_NAME}));
+               AccessAdminLib.roleInfo(
+                    ADMIN_ROLE(),
+                    TargetType.Custom, // custom is only type that allows role removal
+                    2, // TODO decide on max member count
+                    GIF_ADMIN_ROLE_NAME));
 
           // gif manager role
           _addRole(
                GIF_MANAGER_ROLE(), 
-               _toRoleInfo({
-                    adminRoleId: ADMIN_ROLE(),
-                    roleType: RoleType.Core,
-                    maxMemberCount: 1, // TODO decide on max member count
-                    name: GIF_MANAGER_ROLE_NAME}));
+               AccessAdminLib.roleInfo(
+                    ADMIN_ROLE(),
+                    TargetType.Custom, // custom is only type that allows role removal
+                    1, // TODO decide on max member count
+                    GIF_MANAGER_ROLE_NAME));
 
      }
 

package/contracts/registry/ReleaseAdmin.sol

@@ -63,7 +63,6 @@ contract ReleaseAdmin is
         external
         reinitializer(uint64(release.toInt()))
     {
-
         // checks
         AccessAdminLib.checkRegistry(registry);
 
@@ -79,6 +78,8 @@ contract ReleaseAdmin is
         // link nft ownability to registry
         _linkToNftOwnable(registry);
 
+        _createRoles(_serviceAuthorization);
+
         // setup release contract
         _setupReleaseRegistry(releaseRegistry);
 
@@ -165,7 +166,8 @@ contract ReleaseAdmin is
         string memory serviceTargetName = ObjectTypeLib.toVersionedName(
             baseName, "Service", release);
 
-        _createUncheckedTarget(address(service), serviceTargetName, TargetType.Service);
+        // create unchecked target
+        _createTarget(address(service), serviceTargetName, TargetType.Service, false);
     }
 
     //--- private initialization functions -------------------------------------------//
@@ -174,21 +176,23 @@ contract ReleaseAdmin is
         private 
         onlyInitializing()
     {
-        _createManagedTarget(address(this), RELEASE_ADMIN_TARGET_NAME, IAccess.TargetType.Core);
 
         _createRole(
             RELEASE_REGISTRY_ROLE(), 
-            AccessAdminLib.toRole({
-                adminRoleId: ADMIN_ROLE(),
-                roleType: RoleType.Contract,
-                maxMemberCount: 1,
-                name: RELEASE_REGISTRY_ROLE_NAME}));
+            AccessAdminLib.coreRoleInfo(RELEASE_REGISTRY_ROLE_NAME),
+            true); // revets on existing role
+
+        _createTarget(
+            address(this), 
+            RELEASE_ADMIN_TARGET_NAME,
+            IAccess.TargetType.Core, 
+            true); // check authority maches
 
         FunctionInfo[] memory functions;
         functions = new FunctionInfo[](2);
         functions[0] = AccessAdminLib.toFunction(ReleaseAdmin.authorizeService.selector, "authorizeService");
         functions[1] = AccessAdminLib.toFunction(ReleaseAdmin.setServiceLocked.selector, "setServiceLocked");
-        _authorizeTargetFunctions(address(this), RELEASE_REGISTRY_ROLE(), functions, true);
+        _authorizeTargetFunctions(address(this), RELEASE_REGISTRY_ROLE(), functions, false, true);
 
         _grantRoleToAccount(RELEASE_REGISTRY_ROLE(), releaseRegistry);
     }