@etherisc/gif-next 0.0.2-f1b01e0-214 → 0.0.2-f1e6957-384

package/contracts/instance/InstanceAuthorizationV3.sol

@@ -2,14 +2,17 @@
 pragma solidity ^0.8.20;
 
 import {IAccess} from "../authorization/IAccess.sol";
+import {IInstance} from "../instance/Instance.sol";
 
+import {AccessAdminLib} from "../authorization/AccessAdminLib.sol";
 import {Authorization} from "../authorization/Authorization.sol";
 import {ACCOUNTING, ORACLE, POOL, INSTANCE, COMPONENT, DISTRIBUTION, APPLICATION, POLICY, CLAIM, BUNDLE, RISK} from "../../contracts/type/ObjectType.sol";
 import {BundleSet} from "../instance/BundleSet.sol";
-import {Instance} from "../instance/Instance.sol";
 import {InstanceAdmin} from "../instance/InstanceAdmin.sol";
 import {InstanceStore} from "../instance/InstanceStore.sol";
-import {PUBLIC_ROLE} from "../type/RoleId.sol";
+import {INSTANCE_TARGET_NAME, INSTANCE_ADMIN_TARGET_NAME, INSTANCE_STORE_TARGET_NAME, PRODUCT_STORE_TARGET_NAME, BUNDLE_SET_TARGET_NAME, RISK_SET_TARGET_NAME} from "./TargetNames.sol";
+import {ProductStore} from "../instance/ProductStore.sol";
+import {ADMIN_ROLE, INSTANCE_OWNER_ROLE, PUBLIC_ROLE} from "../type/RoleId.sol";
 import {RiskSet} from "../instance/RiskSet.sol"; 
 
 
@@ -18,30 +21,44 @@ contract InstanceAuthorizationV3
 {
 
      string public constant INSTANCE_ROLE_NAME = "InstanceRole";
-
-     string public constant INSTANCE_TARGET_NAME = "Instance";
-     string public constant INSTANCE_STORE_TARGET_NAME = "InstanceStore";
-     string public constant INSTANCE_ADMIN_TARGET_NAME = "InstanceAdmin";
-     string public constant BUNDLE_SET_TARGET_NAME = "BundleSet";
-     string public constant RISK_SET_TARGET_NAME = "RiskSet";
+     string public constant INSTANCE_OWNER_ROLE_NAME = "InstanceOwnerRole";
 
      constructor()
-          Authorization(INSTANCE_TARGET_NAME, INSTANCE(), false, false)
+          Authorization(
+               INSTANCE_TARGET_NAME, 
+               INSTANCE(), 
+               3, 
+               COMMIT_HASH,
+               TargetType.Instance, 
+               false)
      { }
 
      function _setupServiceTargets() internal virtual override {
           // service targets relevant to instance
-          _addServiceTargetWithRole(INSTANCE());
-          _addServiceTargetWithRole(ACCOUNTING());
-          _addServiceTargetWithRole(COMPONENT());
-          _addServiceTargetWithRole(DISTRIBUTION());
-          _addServiceTargetWithRole(ORACLE());
-          _addServiceTargetWithRole(POOL());
-          _addServiceTargetWithRole(BUNDLE());
-          _addServiceTargetWithRole(RISK());
-          _addServiceTargetWithRole(APPLICATION());
-          _addServiceTargetWithRole(POLICY());
-          _addServiceTargetWithRole(CLAIM());
+          _authorizeServiceDomain(INSTANCE(), address(10));
+          _authorizeServiceDomain(ACCOUNTING(), address(11));
+          _authorizeServiceDomain(COMPONENT(), address(12));
+          _authorizeServiceDomain(DISTRIBUTION(), address(13));
+          _authorizeServiceDomain(ORACLE(), address(14));
+          _authorizeServiceDomain(POOL(), address(15));
+          _authorizeServiceDomain(BUNDLE(), address(16));
+          _authorizeServiceDomain(RISK(), address(17));
+          _authorizeServiceDomain(APPLICATION(), address(18));
+          _authorizeServiceDomain(POLICY(), address(19));
+          _authorizeServiceDomain(CLAIM(), address(20));
+     }
+
+     function _setupRoles()
+          internal
+          override
+     {
+          _addRole(
+               INSTANCE_OWNER_ROLE(),
+               AccessAdminLib.roleInfo(
+                    ADMIN_ROLE(),
+                    TargetType.Custom,
+                    0, // max member count special case: instance nft owner is sole role owner
+                    INSTANCE_OWNER_ROLE_NAME));
      }
 
      function _setupTargets()
@@ -49,12 +66,11 @@ contract InstanceAuthorizationV3
           override
      {
           // instance supporting targets
-          // _addGifContractTarget(INSTANCE_ADMIN_TARGET_NAME);
-          _addTarget(INSTANCE_ADMIN_TARGET_NAME);
-          _addTarget(INSTANCE_STORE_TARGET_NAME);
-          _addTarget(BUNDLE_SET_TARGET_NAME);
-          _addTarget(RISK_SET_TARGET_NAME);
-
+          _addInstanceTarget(INSTANCE_ADMIN_TARGET_NAME);
+          _addInstanceTarget(INSTANCE_STORE_TARGET_NAME);
+          _addInstanceTarget(PRODUCT_STORE_TARGET_NAME);
+          _addInstanceTarget(BUNDLE_SET_TARGET_NAME);
+          _addInstanceTarget(RISK_SET_TARGET_NAME);
      }
 
 
@@ -65,6 +81,7 @@ contract InstanceAuthorizationV3
           _setupInstanceAuthorization();
           _setupInstanceAdminAuthorization();
           _setupInstanceStoreAuthorization();
+          _setupProductStoreAuthorization();
           _setupBundleSetAuthorization();
           _setUpRiskSetAuthorization();
      }
@@ -95,7 +112,7 @@ contract InstanceAuthorizationV3
           // authorize risk service role
           functions = _authorizeForTarget(RISK_SET_TARGET_NAME, getServiceRole(RISK()));
           _authorize(functions, RiskSet.add.selector, "add");
-          _authorize(functions, RiskSet.pause.selector, "pause");
+          _authorize(functions, RiskSet.deactivate.selector, "deactivate");
           _authorize(functions, RiskSet.activate.selector, "activate");
 
           // authorize policy service role
@@ -112,25 +129,28 @@ contract InstanceAuthorizationV3
 
           // authorize instance service role
           functions = _authorizeForTarget(INSTANCE_TARGET_NAME, PUBLIC_ROLE());
-          _authorize(functions, Instance.registerProduct.selector, "registerProduct");
-          _authorize(functions, Instance.upgradeInstanceReader.selector, "upgradeInstanceReader");
+          _authorize(functions, IInstance.registerProduct.selector, "registerProduct");
+          _authorize(functions, IInstance.upgradeInstanceReader.selector, "upgradeInstanceReader");
 
           // staking
-          _authorize(functions, Instance.setStakingLockingPeriod.selector, "setStakingLockingPeriod");
-          _authorize(functions, Instance.setStakingRewardRate.selector, "setStakingRewardRate");
-          _authorize(functions, Instance.refillStakingRewardReserves.selector, "refillStakingRewardReserves");
-          _authorize(functions, Instance.withdrawStakingRewardReserves.selector, "withdrawStakingRewardReserves");
+          _authorize(functions, IInstance.setStakingLockingPeriod.selector, "setStakingLockingPeriod");
+          _authorize(functions, IInstance.setStakingRewardRate.selector, "setStakingRewardRate");
+          _authorize(functions, IInstance.setStakingMaxAmount.selector, "setStakingMaxAmount");
+          _authorize(functions, IInstance.refillStakingRewardReserves.selector, "refillStakingRewardReserves");
+          _authorize(functions, IInstance.withdrawStakingRewardReserves.selector, "withdrawStakingRewardReserves");
 
           // custom authz
-          _authorize(functions, Instance.createRole.selector, "createRole");
-          _authorize(functions, Instance.grantRole.selector, "grantRole");
-          _authorize(functions, Instance.revokeRole.selector, "revokeRole");
-          _authorize(functions, Instance.createTarget.selector, "createTarget");
-          _authorize(functions, Instance.setTargetFunctionRole.selector, "setTargetFunctionRole");
+          _authorize(functions, IInstance.createRole.selector, "createRole");
+          _authorize(functions, IInstance.setRoleActive.selector, "setRoleActive");
+          _authorize(functions, IInstance.grantRole.selector, "grantRole");
+          _authorize(functions, IInstance.revokeRole.selector, "revokeRole");
+          _authorize(functions, IInstance.createTarget.selector, "createTarget");
+          _authorize(functions, IInstance.authorizeFunctions.selector, "authorizeFunctions");
+          _authorize(functions, IInstance.unauthorizeFunctions.selector, "unauthorizeFunctions");
 
           // authorize instance service role
           functions = _authorizeForTarget(INSTANCE_TARGET_NAME, getServiceRole(INSTANCE()));
-          _authorize(functions, Instance.setInstanceReader.selector, "setInstanceReader");
+          _authorize(functions, IInstance.setInstanceReader.selector, "setInstanceReader");
      }
 
 
@@ -141,13 +161,21 @@ contract InstanceAuthorizationV3
 
           // authorize component service role
           functions = _authorizeForTarget(INSTANCE_ADMIN_TARGET_NAME, getServiceRole(INSTANCE()));
-          _authorize(functions, InstanceAdmin.setInstanceLocked.selector, "setInstanceLocked");
+          _authorize(functions, InstanceAdmin.createRole.selector, "createRole");
+          _authorize(functions, InstanceAdmin.setRoleActive.selector, "setRoleActive");
+          _authorize(functions, InstanceAdmin.grantRole.selector, "grantRole");
+          _authorize(functions, InstanceAdmin.revokeRole.selector, "revokeRole");
+
+          _authorize(functions, InstanceAdmin.createTarget.selector, "createTarget");
+          _authorize(functions, InstanceAdmin.authorizeFunctions.selector, "authorizeFunctions");
+          _authorize(functions, InstanceAdmin.unauthorizeFunctions.selector, "unauthorizeFunctions");
           _authorize(functions, InstanceAdmin.setTargetLocked.selector, "setTargetLocked");
+          _authorize(functions, InstanceAdmin.setInstanceLocked.selector, "setInstanceLocked");
 
           // authorize component service role
           functions = _authorizeForTarget(INSTANCE_ADMIN_TARGET_NAME, getServiceRole(COMPONENT()));
           _authorize(functions, InstanceAdmin.initializeComponentAuthorization.selector, "initializeComponentAuthoriz");
-          _authorize(functions, InstanceAdmin.setComponentLocked.selector, "setComponentLocked");
+          _authorize(functions, InstanceAdmin.setContractLocked.selector, "setContractLocked");
      }
 
 
@@ -168,10 +196,6 @@ contract InstanceAuthorizationV3
           _authorize(functions, InstanceStore.createComponent.selector, "createComponent");
           _authorize(functions, InstanceStore.updateComponent.selector, "updateComponent");
           _authorize(functions, InstanceStore.createPool.selector, "createPool");
-          _authorize(functions, InstanceStore.createProduct.selector, "createProduct");
-          _authorize(functions, InstanceStore.updateProduct.selector, "updateProduct");
-          _authorize(functions, InstanceStore.createFee.selector, "createFee");
-          _authorize(functions, InstanceStore.updateFee.selector, "updateFee");
           
           // authorize distribution service role
           functions = _authorizeForTarget(INSTANCE_STORE_TARGET_NAME, getServiceRole(DISTRIBUTION()));
@@ -203,33 +227,49 @@ contract InstanceAuthorizationV3
           _authorize(functions, InstanceStore.increaseLocked.selector, "increaseLocked");
           _authorize(functions, InstanceStore.decreaseLocked.selector, "decreaseLocked");
 
-          // authorize product service role
-          functions = _authorizeForTarget(INSTANCE_STORE_TARGET_NAME, getServiceRole(RISK()));
-          _authorize(functions, InstanceStore.createRisk.selector, "createRisk");
-          _authorize(functions, InstanceStore.updateRisk.selector, "updateRisk");
-          _authorize(functions, InstanceStore.updateRiskState.selector, "updateRiskState");
+     }
+
+     function _setupProductStoreAuthorization()
+          internal
+     {
+          IAccess.FunctionInfo[] storage functions;
+
+          functions = _authorizeForTarget(PRODUCT_STORE_TARGET_NAME, getServiceRole(COMPONENT()));
+          _authorize(functions, ProductStore.createProduct.selector, "createProduct");
+          _authorize(functions, ProductStore.updateProduct.selector, "updateProduct");
+          _authorize(functions, ProductStore.createFee.selector, "createFee");
+          _authorize(functions, ProductStore.updateFee.selector, "updateFee");
 
           // authorize application service role
-          functions = _authorizeForTarget(INSTANCE_STORE_TARGET_NAME, getServiceRole(APPLICATION()));
-          _authorize(functions, InstanceStore.createApplication.selector, "createApplication");
-          _authorize(functions, InstanceStore.updateApplication.selector, "updateApplication");
-          _authorize(functions, InstanceStore.updateApplicationState.selector, "updateApplicationState");
+          functions = _authorizeForTarget(PRODUCT_STORE_TARGET_NAME, getServiceRole(APPLICATION()));
+          _authorize(functions, ProductStore.createApplication.selector, "createApplication");
+          _authorize(functions, ProductStore.updateApplication.selector, "updateApplication");
+          _authorize(functions, ProductStore.updateApplicationState.selector, "updateApplicationState");
 
           // authorize policy service role
-          functions = _authorizeForTarget(INSTANCE_STORE_TARGET_NAME, getServiceRole(POLICY()));
-          _authorize(functions, InstanceStore.updatePolicy.selector, "updatePolicy");
-          _authorize(functions, InstanceStore.updatePolicyState.selector, "updatePolicyState");
-          _authorize(functions, InstanceStore.createPremium.selector, "createPremium");
-          _authorize(functions, InstanceStore.updatePremiumState.selector, "updatePremiumState");
+          functions = _authorizeForTarget(PRODUCT_STORE_TARGET_NAME, getServiceRole(POLICY()));
+          _authorize(functions, ProductStore.updatePolicy.selector, "updatePolicy");
+          _authorize(functions, ProductStore.updatePolicyState.selector, "updatePolicyState");
+
+          // authorize policy service role
+          functions = _authorizeForTarget(PRODUCT_STORE_TARGET_NAME, getServiceRole(POLICY()));
+          _authorize(functions, ProductStore.createPremium.selector, "createPremium");
+          _authorize(functions, ProductStore.updatePremiumState.selector, "updatePremiumState");
+
+          // authorize risk service role
+          functions = _authorizeForTarget(PRODUCT_STORE_TARGET_NAME, getServiceRole(RISK()));
+          _authorize(functions, ProductStore.createRisk.selector, "createRisk");
+          _authorize(functions, ProductStore.updateRisk.selector, "updateRisk");
+          _authorize(functions, ProductStore.updateRiskState.selector, "updateRiskState");
 
           // authorize claim service role
-          functions = _authorizeForTarget(INSTANCE_STORE_TARGET_NAME, getServiceRole(CLAIM()));
-          _authorize(functions, InstanceStore.updatePolicyClaims.selector, "updatePolicyClaims");
-          _authorize(functions, InstanceStore.createClaim.selector, "createClaim");
-          _authorize(functions, InstanceStore.updateClaim.selector, "updateClaim");
-          _authorize(functions, InstanceStore.createPayout.selector, "createPayout");
-          _authorize(functions, InstanceStore.updatePayout.selector, "updatePayout");
-          _authorize(functions, InstanceStore.updatePayoutState.selector, "updatePayoutState");
+          functions = _authorizeForTarget(PRODUCT_STORE_TARGET_NAME, getServiceRole(CLAIM()));
+          _authorize(functions, ProductStore.updatePolicyClaims.selector, "updatePolicyClaims");
+          _authorize(functions, ProductStore.createClaim.selector, "createClaim");
+          _authorize(functions, ProductStore.updateClaim.selector, "updateClaim");
+          _authorize(functions, ProductStore.createPayout.selector, "createPayout");
+          _authorize(functions, ProductStore.updatePayout.selector, "updatePayout");
+          _authorize(functions, ProductStore.updatePayoutState.selector, "updatePayoutState");
      }
 }