@etherisc/gif-next 0.0.2-7c8d286-020 → 0.0.2-7d488b3-675

package/contracts/registry/ReleaseAdmin.sol

@@ -2,7 +2,6 @@
 pragma solidity ^0.8.20;
 
 import {AccessAdmin} from "../authorization/AccessAdmin.sol";
-import {AccessAdminLib} from "../authorization/AccessAdminLib.sol";
 import {AccessManagerCloneable} from "../authorization/AccessManagerCloneable.sol";
 import {IAccess} from "../authorization/IAccess.sol";
 import {IService} from "../shared/IService.sol";
@@ -39,14 +38,13 @@ contract ReleaseAdmin is
         _;
     }
 
-    // @dev Only used for master release admin
-    constructor(address accessManager) {
-        initialize(
-            accessManager,
-            "MasterReleaseAdmin");
+    /// @dev Only used for master release admin.
+    /// Contracts created via constructor come with disabled initializers.
+    constructor() {
+        initialize(new AccessManagerCloneable());
+        _disableInitializers();
     }
 
-
     function completeSetup(
         address registry,
         address releaseRegistry,
@@ -55,18 +53,11 @@ contract ReleaseAdmin is
         external
         reinitializer(uint64(release.toInt()))
     {
-
-        // checks
-        _checkRegistry(registry);
-
         AccessManagerCloneable(
             authority()).completeSetup(
                 registry, 
                 release); 
 
-        // link nft ownability to registry
-        _linkToNftOwnable(registry);
-
         _setupReleaseRegistry(releaseRegistry);
     }
 
@@ -77,13 +68,13 @@ contract ReleaseAdmin is
         IServiceAuthorization serviceAuthorization,
         IService service,
         ObjectType serviceDomain,
-        VersionPart release
+        VersionPart releaseVersion
     )
         external
         restricted()
     {
-        _createServiceTargetAndRole(service, serviceDomain, release);
-        _authorizeServiceFunctions(serviceAuthorization, service, serviceDomain, release);
+        _createServiceTargetAndRole(service, serviceDomain, releaseVersion);
+        _authorizeServiceFunctions(serviceAuthorization, service, serviceDomain, releaseVersion);
     }
 
     /// @dev Locks/unlocks all release targets.
@@ -118,7 +109,7 @@ contract ReleaseAdmin is
             revert ErrorReleaseAdminNotService(address(service));
         }
 
-        _setTargetLocked(address(service), locked);
+        _setTargetClosed(address(service), locked);
 
         emit LogReleaseAdminServiceLockChanged(service.getRelease(), address(service), locked);
     }
@@ -135,15 +126,16 @@ contract ReleaseAdmin is
     function _createServiceTargetAndRole(
         IService service, 
         ObjectType serviceDomain, 
-        VersionPart release
+        VersionPart releaseVersion
     )
         private
     {
         string memory baseName = ObjectTypeLib.toName(serviceDomain);
+        uint256 versionInt = releaseVersion.toInt();
 
         // create service target
         string memory serviceTargetName = ObjectTypeLib.toVersionedName(
-            baseName, "Service", release);
+            baseName, "Service", versionInt);
 
         _createTarget(
             address(service), 
@@ -154,19 +146,19 @@ contract ReleaseAdmin is
         // create service role
         RoleId serviceRoleId = RoleIdLib.roleForTypeAndVersion(
             serviceDomain, 
-            release);
+            releaseVersion);
 
         if(!roleExists(serviceRoleId)) {
             _createRole(
                 serviceRoleId, 
-                AccessAdminLib.toRole({
+                toRole({
                     adminRoleId: ADMIN_ROLE(),
                     roleType: RoleType.Contract,
                     maxMemberCount: 1,
                     name: ObjectTypeLib.toVersionedName(
                         baseName, 
                         "ServiceRole", 
-                        release)}));
+                        versionInt)}));
         }
 
         _grantRoleToAccount( 
@@ -179,7 +171,7 @@ contract ReleaseAdmin is
         IServiceAuthorization serviceAuthorization,
         IService service,
         ObjectType serviceDomain, 
-        VersionPart release
+        VersionPart releaseVersion
     )
         private
     {
@@ -197,21 +189,21 @@ contract ReleaseAdmin is
             } else {
                 authorizedRoleId = RoleIdLib.roleForTypeAndVersion(
                 authorizedDomain, 
-                release);
+                releaseVersion);
             }
 
             if(!roleExists(authorizedRoleId)) {
                 // create role for authorized domain
                 _createRole(
                     authorizedRoleId, 
-                    AccessAdminLib.toRole({
+                    toRole({
                         adminRoleId: ADMIN_ROLE(),
                         roleType: RoleType.Contract,
                         maxMemberCount: 1,
                         name: ObjectTypeLib.toVersionedName(
                             ObjectTypeLib.toName(authorizedDomain), 
                             "Role", 
-                            release)}));
+                            releaseVersion.toInt())}));
             }
 
             // get authorized functions for authorized domain
@@ -236,7 +228,7 @@ contract ReleaseAdmin is
 
         _createRole(
             RELEASE_REGISTRY_ROLE(), 
-            AccessAdminLib.toRole({
+            toRole({
                 adminRoleId: ADMIN_ROLE(),
                 roleType: RoleType.Contract,
                 maxMemberCount: 1,
@@ -244,8 +236,8 @@ contract ReleaseAdmin is
 
         FunctionInfo[] memory functions;
         functions = new FunctionInfo[](2);
-        functions[0] = AccessAdminLib.toFunction(ReleaseAdmin.authorizeService.selector, "authorizeService");
-        functions[1] = AccessAdminLib.toFunction(ReleaseAdmin.setServiceLocked.selector, "setServiceLocked");
+        functions[0] = toFunction(ReleaseAdmin.authorizeService.selector, "authorizeService");
+        functions[1] = toFunction(ReleaseAdmin.setServiceLocked.selector, "setServiceLocked");
         _authorizeTargetFunctions(address(this), RELEASE_REGISTRY_ROLE(), functions);
 
         _grantRoleToAccount(RELEASE_REGISTRY_ROLE(), releaseRegistry);

package/contracts/registry/ReleaseRegistry.sol

@@ -4,25 +4,27 @@ pragma solidity ^0.8.20;
 import {Clones} from "@openzeppelin/contracts/proxy/Clones.sol";
 import {AccessManaged} from "@openzeppelin/contracts/access/manager/AccessManaged.sol";
 
+import {ContractLib} from "../shared/ContractLib.sol";
+import {NftId} from "../type/NftId.sol";
+import {ObjectType, ObjectTypeLib, POOL, RELEASE, REGISTRY, SERVICE, STAKING} from "../type/ObjectType.sol";
+import {TimestampLib, zeroTimestamp} from "../type/Timestamp.sol";
+import {Seconds} from "../type/Seconds.sol";
+import {StateId, SCHEDULED, DEPLOYING, DEPLOYED, SKIPPED, ACTIVE, PAUSED} from "../type/StateId.sol";
+import {VersionPart, VersionPartLib} from "../type/Version.sol";
+
+import {IService} from "../shared/IService.sol";
+
 import {IAccessAdmin} from "../authorization/IAccessAdmin.sol";
 import {AccessManagerCloneable} from "../authorization/AccessManagerCloneable.sol";
+
 import {IRegistry} from "./IRegistry.sol";
 import {IRelease} from "./IRelease.sol";
 import {IRegistryLinked} from "../shared/IRegistryLinked.sol";
-import {IService} from "../shared/IService.sol";
 import {IServiceAuthorization} from "../authorization/IServiceAuthorization.sol";
-
-import {ContractLib} from "../shared/ContractLib.sol";
-import {NftId} from "../type/NftId.sol";
-import {ObjectType, ObjectTypeLib, POOL, RELEASE, REGISTRY, SERVICE, STAKING} from "../type/ObjectType.sol";
 import {RegistryAdmin} from "./RegistryAdmin.sol";
 import {Registry} from "./Registry.sol";
-import {ReleaseAdmin} from "./ReleaseAdmin.sol";
 import {ReleaseLifecycle} from "./ReleaseLifecycle.sol";
-import {Seconds} from "../type/Seconds.sol";
-import {StateId, SCHEDULED, DEPLOYING, DEPLOYED, SKIPPED, ACTIVE, PAUSED} from "../type/StateId.sol";
-import {TimestampLib, zeroTimestamp} from "../type/Timestamp.sol";
-import {VersionPart, VersionPartLib} from "../type/Version.sol";
+import {ReleaseAdmin} from "./ReleaseAdmin.sol";
 
 /// @dev The ReleaseRegistry manages the lifecycle of major GIF releases and their services.
 /// The creation of a new GIF release is a multi-step process:
@@ -71,7 +73,7 @@ contract ReleaseRegistry is
     error ErrorReleaseRegistryServiceSelfRegistration(IService service);
     error ErrorReleaseRegistryServiceOwnerRegistered(IService service, address owner);
 
-    RegistryAdmin public immutable _registryAdmin;
+    RegistryAdmin public immutable _admin;
     Registry public immutable _registry;
 
     mapping(VersionPart release => IRelease.ReleaseInfo info) internal _releaseInfo;
@@ -85,7 +87,6 @@ contract ReleaseRegistry is
     uint256 internal _registeredServices = 0;
     uint256 internal _servicesToRegister = 0;
 
-    // TODO move master relase admin outside constructor (same construction as for registry admin)
     constructor(Registry registry)
         AccessManaged(msg.sender)
     {
@@ -96,9 +97,9 @@ contract ReleaseRegistry is
         setAuthority(registry.getAuthority());
 
         _registry = registry;
-        _registryAdmin = RegistryAdmin(_registry.getRegistryAdminAddress());
-        _masterReleaseAdmin = new ReleaseAdmin(
-            _cloneNewAccessManager());
+        _admin = RegistryAdmin(_registry.getRegistryAdminAddress());
+
+        _masterReleaseAdmin = new ReleaseAdmin();
 
         _next = VersionPartLib.toVersionPart(INITIAL_GIF_VERSION - 1);
     }
@@ -252,16 +253,16 @@ contract ReleaseRegistry is
             revert ErrorReleaseRegistryRegistryServiceMissing(release);
         }
 
-        _registryAdmin.grantServiceRoleForAllVersions(IService(service), REGISTRY());
+        _admin.grantServiceRoleForAllVersions(IService(service), REGISTRY());
 
         service = _registry.getServiceAddress(STAKING(), release);
         if(service != address(0)) {
-            _registryAdmin.grantServiceRoleForAllVersions(IService(service), STAKING());
+            _admin.grantServiceRoleForAllVersions(IService(service), STAKING());
         }
 
         service = _registry.getServiceAddress(POOL(), release);
         if(service != address(0)) {
-            _registryAdmin.grantServiceRoleForAllVersions(IService(service), POOL());
+            _admin.grantServiceRoleForAllVersions(IService(service), POOL());
         }
 
         _setReleaseLocked(release, false);
@@ -349,7 +350,7 @@ contract ReleaseRegistry is
     }
 
     function getRegistryAdmin() external view returns (address) {
-        return address(_registryAdmin);
+        return address(_admin);
     }
 
     //--- IRegistryLinked ------------------------------------------------------//
@@ -367,23 +368,24 @@ contract ReleaseRegistry is
             _releaseInfo[release].releaseAdmin).setReleaseLocked(locked);
     }
 
+
     function _cloneNewReleaseAdmin(VersionPart release)
         private
         returns (ReleaseAdmin clonedAdmin)
     {
-        // clone and setup release specific release admin
-        clonedAdmin = ReleaseAdmin(
-            Clones.clone(address(_masterReleaseAdmin)));
-
-        string memory releaseAdminName = string(
-            abi.encodePacked(
-                "ReleaseAdmin_v", 
-                release.toString()));
+        AccessManagerCloneable clonedAccessManager = AccessManagerCloneable(
+            Clones.clone(
+                _masterReleaseAdmin.authority()
+            )
+        );
 
-        clonedAdmin.initialize(
-            address(_cloneNewAccessManager()),
-            releaseAdminName);
+        clonedAdmin = ReleaseAdmin(
+            Clones.clone(
+                address(_masterReleaseAdmin)
+            )
+        );
 
+        clonedAdmin.initialize(clonedAccessManager);
         clonedAdmin.completeSetup(
             address(_registry), 
             address(this), // release registry (this contract)
@@ -394,14 +396,6 @@ contract ReleaseRegistry is
     }
 
 
-    function _cloneNewAccessManager()
-        private
-        returns (address accessManager)
-    {
-        return Clones.clone(address(_registryAdmin.authority()));
-    }
-
-
     function _verifyServiceAuthorization(
         IServiceAuthorization serviceAuthorization,
         VersionPart releaseVersion,
@@ -413,7 +407,7 @@ contract ReleaseRegistry is
     {
         // authorization contract supports IServiceAuthorization interface
         if(!serviceAuthorization.supportsInterface(type(IServiceAuthorization).interfaceId)) {
-            revert ErrorReleaseRegistryNotServiceAuth(address(serviceAuthorization));
+                revert ErrorReleaseRegistryNotServiceAuth(address(serviceAuthorization));
         }
 
         // authorizaions contract version matches with release version

package/contracts/registry/ServiceAuthorizationV3.sol

@@ -7,14 +7,10 @@ import {
 
 import {IAccess} from "../authorization/IAccess.sol";
 import {IAccountingService} from "../accounting/IAccountingService.sol";
-import {IApplicationService} from "../product/IApplicationService.sol";
 import {IBundleService} from "../pool/IBundleService.sol";
 import {IClaimService} from "../product/IClaimService.sol";
-import {IComponentService} from "../shared/IComponentService.sol";
 import {IDistributionService} from "../distribution/IDistributionService.sol";
 import {IInstanceService} from "../instance/IInstanceService.sol";
-import {IOracleService} from "../oracle/IOracleService.sol";
-import {IPolicyService} from "../product/IPolicyService.sol";
 import {IPoolService} from "../pool/IPoolService.sol";
 import {IStakingService} from "../staking/IStakingService.sol";
 import {IRegistryService} from "./IRegistryService.sol";
@@ -66,9 +62,6 @@ contract ServiceAuthorizationV3
           _setupDistributionServiceAuthorization();
           _setupPoolServiceAuthorization();
           _setupBundleServiceAuthorization();
-          _setupOracleServiceAuthorization();
-          _setupApplicationServiceAuthorization();
-          _setupPolicyServiceAuthorization();
      }
 
 
@@ -111,7 +104,6 @@ contract ServiceAuthorizationV3
           _authorize(functions, IStakingService.createInstanceTarget.selector, "createInstanceTarget");
           _authorize(functions, IStakingService.setInstanceLockingPeriod.selector, "setInstanceLockingPeriod");
           _authorize(functions, IStakingService.setInstanceRewardRate.selector, "setInstanceRewardRate");
-          _authorize(functions, IStakingService.setInstanceMaxStakedAmount.selector, "setInstanceMaxStakedAmount");
           _authorize(functions, IStakingService.refillInstanceRewardReserves.selector, "refillInstanceRewardReserves");
           _authorize(functions, IStakingService.withdrawInstanceRewardReserves.selector, "withdrawInstanceRewardReserves");
 
@@ -131,16 +123,12 @@ contract ServiceAuthorizationV3
      {
           IAccess.FunctionInfo[] storage functions;
           functions = _authorizeForService(INSTANCE(), ALL());
-          _authorize(functions, IInstanceService.setInstanceLocked.selector, "setInstanceLocked");
-          _authorize(functions, IInstanceService.setTargetLocked.selector, "setTargetLocked");
-
           _authorize(functions, IInstanceService.createInstance.selector, "createInstance");
           _authorize(functions, IInstanceService.upgradeInstanceReader.selector, "upgradeInstanceReader");
           _authorize(functions, IInstanceService.upgradeMasterInstanceReader.selector, "upgradeMasterInstanceReader");
 
           _authorize(functions, IInstanceService.setStakingLockingPeriod.selector, "setStakingLockingPeriod");
           _authorize(functions, IInstanceService.setStakingRewardRate.selector, "setStakingRewardRate");
-          _authorize(functions, IInstanceService.setStakingMaxAmount.selector, "setStakingMaxAmount");
           _authorize(functions, IInstanceService.refillStakingRewardReserves.selector, "refillStakingRewardReserves");
           _authorize(functions, IInstanceService.withdrawStakingRewardReserves.selector, "withdrawStakingRewardReserves");
      }
@@ -155,6 +143,9 @@ contract ServiceAuthorizationV3
           _authorize(functions, IAccountingService.increaseBundleBalance.selector, "increaseBundleBalance");
           _authorize(functions, IAccountingService.decreaseBundleBalance.selector, "decreaseBundleBalance");
 
+          functions = _authorizeForService(ACCOUNTING(), POOL());
+          _authorize(functions, IAccountingService.decreaseBundleBalanceForPool.selector, "decreaseBundleBalanceForPool");
+
           functions = _authorizeForService(ACCOUNTING(), COMPONENT());
           _authorize(functions, IAccountingService.decreaseComponentFees.selector, "decreaseComponentFees");
 
@@ -180,19 +171,6 @@ contract ServiceAuthorizationV3
      function _setupComponentServiceAuthorization()
           internal
      {
-          IAccess.FunctionInfo[] storage functions;
-
-          functions = _authorizeForService(COMPONENT(), ALL());
-          _authorize(functions, IComponentService.registerComponent.selector, "registerComponent");
-          _authorize(functions, IComponentService.approveTokenHandler.selector, "approveTokenHandler");
-          _authorize(functions, IComponentService.setWallet.selector, "setWallet");
-          _authorize(functions, IComponentService.setLocked.selector, "setLocked");
-          _authorize(functions, IComponentService.withdrawFees.selector, "withdrawFees");
-          _authorize(functions, IComponentService.registerProduct.selector, "registerProduct");
-          _authorize(functions, IComponentService.setProductFees.selector, "setProductFees");
-          _authorize(functions, IComponentService.setDistributionFees.selector, "setDistributionFees");
-          _authorize(functions, IComponentService.setPoolFees.selector, "setPoolFees");
-
      }
 
      /// @dev Distribution service function authorization.
@@ -213,14 +191,6 @@ contract ServiceAuthorizationV3
           IAccess.FunctionInfo[] storage functions;
           functions = _authorizeForService(CLAIM(), ALL());
           _authorize(functions, IClaimService.submit.selector, "submit");
-          _authorize(functions, IClaimService.confirm.selector, "confirm");
-          _authorize(functions, IClaimService.decline.selector, "decline");
-          _authorize(functions, IClaimService.revoke.selector, "revoke");
-          _authorize(functions, IClaimService.close.selector, "close");
-          _authorize(functions, IClaimService.createPayoutForBeneficiary.selector, "createPayoutForBeneficiary");
-          _authorize(functions, IClaimService.createPayout.selector, "createPayout");
-          _authorize(functions, IClaimService.processPayout.selector, "processPayout");
-          _authorize(functions, IClaimService.cancelPayout.selector, "cancelPayout");
      }
 
      /// @dev Distribution service function authorization.
@@ -231,13 +201,6 @@ contract ServiceAuthorizationV3
           functions = _authorizeForService(DISTRIBUTION(), POLICY());
           _authorize(functions, IDistributionService.processSale.selector, "processSale");
           _authorize(functions, IDistributionService.processReferral.selector, "processReferral");
-
-          functions = _authorizeForService(DISTRIBUTION(), ALL());
-          _authorize(functions, IDistributionService.createDistributorType.selector, "createDistributorType");
-          _authorize(functions, IDistributionService.createDistributor.selector, "createDistributor");
-          _authorize(functions, IDistributionService.changeDistributorType.selector, "changeDistributorType");
-          _authorize(functions, IDistributionService.createReferral.selector, "createReferral");
-          _authorize(functions, IDistributionService.withdrawCommission.selector, "withdrawCommission");
      }
 
 
@@ -256,13 +219,6 @@ contract ServiceAuthorizationV3
           _authorize(functions, IPoolService.processPayout.selector, "processPayout");
 
           functions = _authorizeForService(POOL(), ALL());
-          _authorize(functions, IPoolService.setMaxBalanceAmount.selector, "setMaxBalanceAmount");
-          _authorize(functions, IPoolService.closeBundle.selector, "closeBundle");
-          _authorize(functions, IPoolService.processFundedClaim.selector, "processFundedClaim");
-          _authorize(functions, IPoolService.stake.selector, "stake");
-          _authorize(functions, IPoolService.unstake.selector, "unstake");
-          _authorize(functions, IPoolService.fundPoolWallet.selector, "fundPoolWallet");
-          _authorize(functions, IPoolService.defundPoolWallet.selector, "defundPoolWallet");
           _authorize(functions, IPoolService.withdrawBundleFees.selector, "withdrawBundleFees");
      }
 
@@ -287,46 +243,5 @@ contract ServiceAuthorizationV3
           _authorize(functions, IBundleService.unlock.selector, "unlock");
           _authorize(functions, IBundleService.setFee.selector, "setFee");
      }
-
-     function _setupOracleServiceAuthorization()
-          internal
-     {
-          IAccess.FunctionInfo[] storage functions;
-
-          functions = _authorizeForService(ORACLE(), ALL());
-          _authorize(functions, IOracleService.request.selector, "request");
-          _authorize(functions, IOracleService.respond.selector, "respond");
-          _authorize(functions, IOracleService.resend.selector, "resend");
-          _authorize(functions, IOracleService.cancel.selector, "cancel");
-     }
-
-     function _setupApplicationServiceAuthorization()
-          internal
-     {
-          IAccess.FunctionInfo[] storage functions;
-
-          functions = _authorizeForService(APPLICATION(), ALL());
-          _authorize(functions, IApplicationService.create.selector, "create");
-          _authorize(functions, IApplicationService.renew.selector, "renew");
-          _authorize(functions, IApplicationService.adjust.selector, "adjust");
-          _authorize(functions, IApplicationService.revoke.selector, "revoke");
-     }
-
-     function _setupPolicyServiceAuthorization()
-          internal
-     {
-          IAccess.FunctionInfo[] storage functions;
-
-          functions = _authorizeForService(POLICY(), ALL());
-          _authorize(functions, IPolicyService.decline.selector, "decline");
-          _authorize(functions, IPolicyService.createPolicy.selector, "createPolicy");
-          _authorize(functions, IPolicyService.collectPremium.selector, "collectPremium");
-          _authorize(functions, IPolicyService.activate.selector, "activate");
-          _authorize(functions, IPolicyService.adjustActivation.selector, "adjustActivation");
-          _authorize(functions, IPolicyService.expire.selector, "expire");
-          _authorize(functions, IPolicyService.expirePolicy.selector, "expirePolicy");
-          _authorize(functions, IPolicyService.close.selector, "close");
-
-     }
 }
 

package/contracts/shared/Component.sol

@@ -4,13 +4,14 @@ pragma solidity ^0.8.20;
 import {IAccessManaged} from "@openzeppelin/contracts/access/manager/IAccessManaged.sol";
 import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
 
-import {Amount} from "../type/Amount.sol";
-import {ContractLib} from "./ContractLib.sol";
 import {IComponent} from "./IComponent.sol";
 import {IComponents} from "../instance/module/IComponents.sol";
 import {IComponentService} from "./IComponentService.sol";
 import {IRegistry} from "../registry/IRegistry.sol";
 import {IRelease} from "../registry/IRelease.sol";
+
+import {Amount, AmountLib} from "../type/Amount.sol";
+import {ContractLib} from "./ContractLib.sol";
 import {NftId} from "../type/NftId.sol";
 import {ObjectType, COMPONENT, STAKING} from "../type/ObjectType.sol";
 import {Registerable} from "../shared/Registerable.sol";
@@ -110,7 +111,7 @@ abstract contract Component is
     /// override internal function _nftTransferFrom to implement custom behaviour
     function nftTransferFrom(address from, address to, uint256 tokenId, address operator)
         external
-        onlyChainNft
+        onlyChainNft()
     {
         _nftTransferFrom(from, to, tokenId, operator);
     }
@@ -186,8 +187,7 @@ abstract contract Component is
     { }
 
 
-    /// @dev Sets the components wallet to the specified address.
-    /// Depending on the source of the component information this function needs to be overwritten. 
+    /// @dev depending on the source of the component information this function needs to be overwritten. 
     /// eg for instance linked components that externally store this information with the instance store contract
     function _setWallet(
         address newWallet
@@ -202,7 +202,7 @@ abstract contract Component is
         internal
         virtual
     {
-        _getComponentStorage()._componentService.setLocked(locked);
+        _getComponentStorage()._componentService.setLockedFromComponent(address(this), locked);
     }