@etherisc/gif-next 0.0.2-e1f23dc-329 → 0.0.2-e20063b-144
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +71 -14
- package/artifacts/contracts/components/Component.sol/Component.dbg.json +4 -0
- package/artifacts/contracts/components/Component.sol/Component.json +842 -0
- package/artifacts/contracts/components/Distribution.sol/Distribution.dbg.json +1 -1
- package/artifacts/contracts/components/Distribution.sol/Distribution.json +946 -219
- package/artifacts/contracts/components/IComponent.sol/IComponent.dbg.json +4 -0
- package/artifacts/contracts/{instance/service/IComponentOwnerService.sol/IComponentOwnerService.json → components/IComponent.sol/IComponent.json} +303 -164
- package/artifacts/contracts/components/IDistributionComponent.sol/IDistributionComponent.dbg.json +1 -1
- package/artifacts/contracts/components/IDistributionComponent.sol/IDistributionComponent.json +848 -31
- package/artifacts/contracts/components/IPoolComponent.sol/IPoolComponent.dbg.json +1 -1
- package/artifacts/contracts/components/IPoolComponent.sol/IPoolComponent.json +864 -49
- package/artifacts/contracts/components/IProductComponent.sol/IProductComponent.dbg.json +1 -1
- package/artifacts/contracts/components/IProductComponent.sol/IProductComponent.json +682 -9
- package/artifacts/contracts/components/Pool.sol/Pool.dbg.json +1 -1
- package/artifacts/contracts/components/Pool.sol/Pool.json +825 -231
- package/artifacts/contracts/components/Product.sol/Product.dbg.json +1 -1
- package/artifacts/contracts/components/Product.sol/Product.json +638 -190
- package/artifacts/contracts/instance/AccessManagerUpgradeableInitializeable.sol/AccessManagerUpgradeableInitializeable.dbg.json +4 -0
- package/artifacts/contracts/instance/AccessManagerUpgradeableInitializeable.sol/AccessManagerUpgradeableInitializeable.json +1206 -0
- package/artifacts/contracts/instance/BundleManager.sol/BundleManager.dbg.json +4 -0
- package/artifacts/contracts/instance/BundleManager.sol/BundleManager.json +778 -0
- package/artifacts/contracts/instance/Cloneable.sol/Cloneable.dbg.json +4 -0
- package/artifacts/contracts/instance/{AccessManagedSimple.sol/AccessManagedSimple.json → Cloneable.sol/Cloneable.json} +91 -2
- package/artifacts/contracts/instance/IInstance.sol/IInstance.dbg.json +1 -1
- package/artifacts/contracts/instance/IInstance.sol/IInstance.json +1612 -656
- package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.dbg.json +1 -1
- package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.json +321 -168
- package/artifacts/contracts/instance/Instance.sol/Instance.dbg.json +1 -1
- package/artifacts/contracts/instance/Instance.sol/Instance.json +1002 -1278
- package/artifacts/contracts/instance/InstanceAccessManager.sol/InstanceAccessManager.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceAccessManager.sol/InstanceAccessManager.json +593 -180
- package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.json +257 -261
- package/artifacts/contracts/instance/InstanceService.sol/InstanceService.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceService.sol/InstanceService.json +501 -292
- package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.json +331 -98
- package/artifacts/contracts/instance/ObjectManager.sol/ObjectManager.dbg.json +4 -0
- package/artifacts/contracts/instance/ObjectManager.sol/ObjectManager.json +256 -0
- package/artifacts/contracts/instance/base/ComponentService.sol/ComponentService.dbg.json +4 -0
- package/artifacts/contracts/instance/base/{ComponentServiceBase.sol/ComponentServiceBase.json → ComponentService.sol/ComponentService.json} +247 -180
- package/artifacts/contracts/instance/base/IKeyValueStore.sol/IKeyValueStore.dbg.json +1 -1
- package/artifacts/contracts/instance/base/ILifecycle.sol/ILifecycle.dbg.json +1 -1
- package/artifacts/contracts/instance/base/KeyValueStore.sol/KeyValueStore.dbg.json +1 -1
- package/artifacts/contracts/instance/base/KeyValueStore.sol/KeyValueStore.json +40 -10
- package/artifacts/contracts/instance/base/Lifecycle.sol/Lifecycle.dbg.json +1 -1
- package/artifacts/contracts/instance/base/Lifecycle.sol/Lifecycle.json +36 -11
- package/artifacts/contracts/instance/module/IAccess.sol/IAccess.dbg.json +1 -1
- package/artifacts/contracts/instance/module/IAccess.sol/IAccess.json +71 -45
- package/artifacts/contracts/instance/module/IBundle.sol/IBundle.dbg.json +1 -1
- package/artifacts/contracts/instance/module/IComponents.sol/IComponents.dbg.json +4 -0
- package/artifacts/contracts/instance/module/IComponents.sol/IComponents.json +10 -0
- package/artifacts/contracts/instance/module/IDistribution.sol/IDistribution.dbg.json +1 -1
- package/artifacts/contracts/instance/module/IPolicy.sol/IPolicy.dbg.json +1 -1
- package/artifacts/contracts/instance/module/IRisk.sol/IRisk.dbg.json +1 -1
- package/artifacts/contracts/instance/module/ISetup.sol/ISetup.dbg.json +1 -1
- package/artifacts/contracts/instance/module/ITreasury.sol/ITreasury.dbg.json +1 -1
- package/artifacts/contracts/instance/service/ApplicationService.sol/ApplicationService.dbg.json +4 -0
- package/artifacts/contracts/instance/service/ApplicationService.sol/ApplicationService.json +1060 -0
- package/artifacts/contracts/instance/service/ApplicationServiceManager.sol/ApplicationServiceManager.dbg.json +4 -0
- package/artifacts/contracts/instance/service/ApplicationServiceManager.sol/ApplicationServiceManager.json +681 -0
- package/artifacts/contracts/instance/service/BundleService.sol/BundleService.dbg.json +4 -0
- package/artifacts/contracts/instance/service/BundleService.sol/BundleService.json +1266 -0
- package/artifacts/contracts/instance/service/BundleServiceManager.sol/BundleServiceManager.dbg.json +4 -0
- package/artifacts/contracts/instance/service/BundleServiceManager.sol/BundleServiceManager.json +725 -0
- package/artifacts/contracts/instance/service/ClaimService.sol/ClaimService.dbg.json +4 -0
- package/artifacts/contracts/instance/service/ClaimService.sol/ClaimService.json +1040 -0
- package/artifacts/contracts/instance/service/ClaimServiceManager.sol/ClaimServiceManager.dbg.json +4 -0
- package/artifacts/contracts/instance/service/ClaimServiceManager.sol/ClaimServiceManager.json +685 -0
- package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.json +1273 -215
- package/artifacts/contracts/instance/service/DistributionServiceManager.sol/DistributionServiceManager.dbg.json +1 -1
- package/artifacts/contracts/instance/service/DistributionServiceManager.sol/DistributionServiceManager.json +428 -79
- package/artifacts/contracts/instance/service/IApplicationService.sol/IApplicationService.dbg.json +4 -0
- package/artifacts/contracts/instance/service/IApplicationService.sol/IApplicationService.json +627 -0
- package/artifacts/contracts/instance/service/IBundleService.sol/IBundleService.dbg.json +4 -0
- package/artifacts/contracts/instance/service/IBundleService.sol/IBundleService.json +686 -0
- package/artifacts/contracts/instance/service/IClaimService.sol/IClaimService.dbg.json +4 -0
- package/artifacts/contracts/instance/service/IClaimService.sol/IClaimService.json +602 -0
- package/artifacts/contracts/instance/service/IDistributionService.sol/IDistributionService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/IDistributionService.sol/IDistributionService.json +804 -160
- package/artifacts/contracts/instance/service/IPolicyService.sol/IPolicyService.dbg.json +4 -0
- package/artifacts/contracts/instance/service/IPolicyService.sol/IPolicyService.json +937 -0
- package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.json +437 -241
- package/artifacts/contracts/instance/service/IProductService.sol/IProductService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/IProductService.sol/IProductService.json +82 -371
- package/artifacts/contracts/instance/service/PolicyService.sol/PolicyService.dbg.json +4 -0
- package/artifacts/contracts/instance/service/PolicyService.sol/PolicyService.json +1511 -0
- package/artifacts/contracts/instance/service/PolicyServiceManager.sol/PolicyServiceManager.dbg.json +4 -0
- package/artifacts/contracts/instance/service/PolicyServiceManager.sol/PolicyServiceManager.json +741 -0
- package/artifacts/contracts/instance/service/PoolService.sol/PoolService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/PoolService.sol/PoolService.json +649 -338
- package/artifacts/contracts/instance/service/PoolServiceManager.sol/PoolServiceManager.dbg.json +1 -1
- package/artifacts/contracts/instance/service/PoolServiceManager.sol/PoolServiceManager.json +305 -92
- package/artifacts/contracts/instance/service/ProductService.sol/ProductService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/ProductService.sol/ProductService.json +268 -522
- package/artifacts/contracts/instance/service/ProductServiceManager.sol/ProductServiceManager.dbg.json +1 -1
- package/artifacts/contracts/instance/service/ProductServiceManager.sol/ProductServiceManager.json +295 -114
- package/artifacts/contracts/registry/ChainNft.sol/ChainNft.dbg.json +1 -1
- package/artifacts/contracts/registry/ChainNft.sol/ChainNft.json +15 -2
- package/artifacts/contracts/registry/IRegistry.sol/IRegistry.dbg.json +1 -1
- package/artifacts/contracts/registry/IRegistry.sol/IRegistry.json +244 -133
- package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.dbg.json +1 -1
- package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.json +149 -230
- package/artifacts/contracts/registry/ITransferInterceptor.sol/ITransferInterceptor.dbg.json +1 -1
- package/artifacts/contracts/registry/ITransferInterceptor.sol/ITransferInterceptor.json +18 -0
- package/artifacts/contracts/registry/Registry.sol/Registry.dbg.json +1 -1
- package/artifacts/contracts/registry/Registry.sol/Registry.json +257 -235
- package/artifacts/contracts/registry/RegistryAccessManager.sol/RegistryAccessManager.dbg.json +4 -0
- package/artifacts/contracts/registry/RegistryAccessManager.sol/RegistryAccessManager.json +285 -0
- package/artifacts/contracts/registry/RegistryService.sol/RegistryService.dbg.json +1 -1
- package/artifacts/contracts/registry/RegistryService.sol/RegistryService.json +200 -335
- package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.dbg.json +1 -1
- package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.json +298 -145
- package/artifacts/contracts/registry/ReleaseManager.sol/ReleaseManager.dbg.json +4 -0
- package/artifacts/contracts/registry/ReleaseManager.sol/ReleaseManager.json +559 -0
- package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.dbg.json +1 -1
- package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.json +141 -53
- package/artifacts/contracts/shared/ContractDeployerLib.sol/ContractDeployerLib.dbg.json +1 -1
- package/artifacts/contracts/shared/ERC165.sol/ERC165.dbg.json +1 -1
- package/artifacts/contracts/shared/ERC165.sol/ERC165.json +41 -3
- package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.dbg.json +1 -1
- package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.json +40 -29
- package/artifacts/contracts/shared/IPolicyHolder.sol/IPolicyHolder.dbg.json +4 -0
- package/artifacts/contracts/shared/IPolicyHolder.sol/IPolicyHolder.json +129 -0
- package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.dbg.json +1 -1
- package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.json +21 -34
- package/artifacts/contracts/shared/IRegistryLinked.sol/IRegistryLinked.dbg.json +4 -0
- package/artifacts/contracts/{experiment/inheritance/IB.sol/IB.json → shared/IRegistryLinked.sol/IRegistryLinked.json} +18 -20
- package/artifacts/contracts/shared/IService.sol/IService.dbg.json +1 -1
- package/artifacts/contracts/shared/IService.sol/IService.json +86 -172
- package/artifacts/contracts/shared/IVersionable.sol/IVersionable.dbg.json +1 -1
- package/artifacts/contracts/shared/IVersionable.sol/IVersionable.json +2 -152
- package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.dbg.json +1 -1
- package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.json +120 -27
- package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.dbg.json +4 -0
- package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.json +248 -0
- package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.dbg.json +1 -1
- package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.json +294 -61
- package/artifacts/contracts/shared/Registerable.sol/Registerable.dbg.json +1 -1
- package/artifacts/contracts/shared/Registerable.sol/Registerable.json +129 -51
- package/artifacts/contracts/shared/RegistryLinked.sol/RegistryLinked.dbg.json +4 -0
- package/artifacts/contracts/shared/RegistryLinked.sol/RegistryLinked.json +84 -0
- package/artifacts/contracts/shared/Service.sol/Service.dbg.json +1 -1
- package/artifacts/contracts/shared/Service.sol/Service.json +191 -163
- package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.dbg.json +1 -1
- package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.json +2 -2
- package/artifacts/contracts/shared/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.dbg.json +1 -1
- package/artifacts/contracts/shared/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.json +2 -2
- package/artifacts/contracts/shared/Versionable.sol/Versionable.dbg.json +1 -1
- package/artifacts/contracts/shared/Versionable.sol/Versionable.json +2 -152
- package/artifacts/contracts/test/TestFee.sol/TestFee.dbg.json +1 -1
- package/artifacts/contracts/test/TestFee.sol/TestFee.json +2 -2
- package/artifacts/contracts/test/TestRegisterable.sol/TestRegisterable.dbg.json +1 -1
- package/artifacts/contracts/test/TestRegisterable.sol/TestRegisterable.json +129 -51
- package/artifacts/contracts/test/TestRoleId.sol/TestRoleId.dbg.json +1 -1
- package/artifacts/contracts/test/TestRoleId.sol/TestRoleId.json +6 -6
- package/artifacts/contracts/test/TestService.sol/TestService.dbg.json +1 -1
- package/artifacts/contracts/test/TestService.sol/TestService.json +210 -214
- package/artifacts/contracts/test/TestToken.sol/TestUsdc.dbg.json +1 -1
- package/artifacts/contracts/test/TestVersion.sol/TestVersion.dbg.json +1 -1
- package/artifacts/contracts/test/TestVersion.sol/TestVersion.json +2 -2
- package/artifacts/contracts/test/TestVersionable.sol/TestVersionable.dbg.json +1 -1
- package/artifacts/contracts/test/TestVersionable.sol/TestVersionable.json +8 -190
- package/artifacts/contracts/test/Usdc.sol/USDC.dbg.json +1 -1
- package/artifacts/contracts/types/AddressSet.sol/LibAddressSet.dbg.json +1 -1
- package/artifacts/contracts/types/Amount.sol/AmountLib.dbg.json +4 -0
- package/artifacts/contracts/types/Amount.sol/AmountLib.json +185 -0
- package/artifacts/contracts/types/Blocknumber.sol/BlocknumberLib.dbg.json +1 -1
- package/artifacts/contracts/types/Blocknumber.sol/BlocknumberLib.json +2 -2
- package/artifacts/contracts/types/ChainId.sol/ChainIdLib.dbg.json +1 -1
- package/artifacts/contracts/types/ClaimId.sol/ClaimIdLib.dbg.json +4 -0
- package/artifacts/contracts/types/ClaimId.sol/ClaimIdLib.json +179 -0
- package/artifacts/contracts/types/DistributorType.sol/DistributorTypeLib.dbg.json +1 -1
- package/artifacts/contracts/types/DistributorType.sol/DistributorTypeLib.json +2 -2
- package/artifacts/contracts/types/Fee.sol/FeeLib.dbg.json +1 -1
- package/artifacts/contracts/types/Fee.sol/FeeLib.json +40 -9
- package/artifacts/contracts/types/Key32.sol/Key32Lib.dbg.json +1 -1
- package/artifacts/contracts/types/Key32.sol/Key32Lib.json +2 -2
- package/artifacts/contracts/types/NftId.sol/NftIdLib.dbg.json +1 -1
- package/artifacts/contracts/types/NftId.sol/NftIdLib.json +17 -4
- package/artifacts/contracts/types/NftIdSet.sol/LibNftIdSet.dbg.json +1 -1
- package/artifacts/contracts/types/NftIdSet.sol/LibNftIdSet.json +26 -3
- package/artifacts/contracts/types/NumberId.sol/NumberIdLib.dbg.json +1 -1
- package/artifacts/contracts/types/ObjectType.sol/ObjectTypeLib.dbg.json +1 -1
- package/artifacts/contracts/types/ObjectType.sol/ObjectTypeLib.json +2 -2
- package/artifacts/contracts/types/PayoutId.sol/PayoutIdLib.dbg.json +4 -0
- package/artifacts/contracts/types/PayoutId.sol/PayoutIdLib.json +209 -0
- package/artifacts/contracts/types/Referral.sol/ReferralLib.dbg.json +1 -1
- package/artifacts/contracts/types/Referral.sol/ReferralLib.json +23 -4
- package/artifacts/contracts/types/RiskId.sol/RiskIdLib.dbg.json +1 -1
- package/artifacts/contracts/types/RiskId.sol/RiskIdLib.json +2 -2
- package/artifacts/contracts/types/RoleId.sol/RoleIdLib.dbg.json +1 -1
- package/artifacts/contracts/types/RoleId.sol/RoleIdLib.json +2 -2
- package/artifacts/contracts/types/Seconds.sol/SecondsLib.dbg.json +4 -0
- package/artifacts/contracts/types/Seconds.sol/SecondsLib.json +124 -0
- package/artifacts/contracts/types/StateId.sol/StateIdLib.dbg.json +1 -1
- package/artifacts/contracts/types/StateId.sol/StateIdLib.json +2 -2
- package/artifacts/contracts/types/Timestamp.sol/TimestampLib.dbg.json +1 -1
- package/artifacts/contracts/types/Timestamp.sol/TimestampLib.json +38 -7
- package/artifacts/contracts/types/UFixed.sol/MathLib.dbg.json +1 -1
- package/artifacts/contracts/types/UFixed.sol/MathLib.json +2 -2
- package/artifacts/contracts/types/UFixed.sol/UFixedLib.dbg.json +1 -1
- package/artifacts/contracts/types/UFixed.sol/UFixedLib.json +2 -2
- package/artifacts/contracts/types/Version.sol/VersionLib.dbg.json +1 -1
- package/artifacts/contracts/types/Version.sol/VersionLib.json +2 -2
- package/artifacts/contracts/types/Version.sol/VersionPartLib.dbg.json +1 -1
- package/artifacts/contracts/types/Version.sol/VersionPartLib.json +2 -2
- package/contracts/components/Component.sol +253 -0
- package/contracts/components/Distribution.sol +204 -79
- package/contracts/components/IComponent.sol +76 -0
- package/contracts/components/IDistributionComponent.sol +44 -17
- package/contracts/components/IPoolComponent.sol +88 -37
- package/contracts/components/IProductComponent.sol +10 -5
- package/contracts/components/Pool.sol +220 -160
- package/contracts/components/Product.sol +244 -157
- package/contracts/instance/AccessManagerUpgradeableInitializeable.sol +13 -0
- package/contracts/instance/BundleManager.sol +126 -0
- package/contracts/instance/Cloneable.sol +51 -0
- package/contracts/instance/IInstance.sol +67 -19
- package/contracts/instance/IInstanceService.sol +46 -8
- package/contracts/instance/Instance.sol +151 -284
- package/contracts/instance/InstanceAccessManager.sol +414 -175
- package/contracts/instance/InstanceReader.sol +38 -36
- package/contracts/instance/InstanceService.sol +402 -122
- package/contracts/instance/InstanceServiceManager.sol +6 -9
- package/contracts/instance/ObjectManager.sol +82 -0
- package/contracts/instance/base/ComponentService.sol +121 -0
- package/contracts/instance/base/KeyValueStore.sol +13 -5
- package/contracts/instance/base/Lifecycle.sol +23 -6
- package/contracts/instance/module/IAccess.sol +36 -20
- package/contracts/instance/module/IBundle.sol +8 -5
- package/contracts/instance/module/IComponents.sol +41 -0
- package/contracts/instance/module/IDistribution.sol +2 -0
- package/contracts/instance/module/IPolicy.sol +41 -9
- package/contracts/instance/module/ISetup.sol +9 -20
- package/contracts/instance/service/ApplicationService.sol +355 -0
- package/contracts/instance/service/ApplicationServiceManager.sol +35 -0
- package/contracts/instance/service/BundleService.sol +436 -0
- package/contracts/instance/service/BundleServiceManager.sol +51 -0
- package/contracts/instance/service/ClaimService.sol +239 -0
- package/contracts/instance/service/ClaimServiceManager.sol +35 -0
- package/contracts/instance/service/DistributionService.sol +374 -31
- package/contracts/instance/service/DistributionServiceManager.sol +7 -10
- package/contracts/instance/service/IApplicationService.sol +78 -0
- package/contracts/instance/service/IBundleService.sol +96 -0
- package/contracts/instance/service/IClaimService.sol +92 -0
- package/contracts/instance/service/IDistributionService.sol +87 -0
- package/contracts/instance/service/IPolicyService.sol +137 -0
- package/contracts/instance/service/IPoolService.sol +78 -20
- package/contracts/instance/service/IProductService.sol +3 -70
- package/contracts/instance/service/PolicyService.sol +541 -0
- package/contracts/instance/service/PolicyServiceManager.sol +54 -0
- package/contracts/instance/service/PoolService.sol +216 -114
- package/contracts/instance/service/PoolServiceManager.sol +6 -9
- package/contracts/instance/service/ProductService.sol +105 -459
- package/contracts/instance/service/ProductServiceManager.sol +2 -2
- package/contracts/registry/ChainNft.sol +9 -1
- package/contracts/registry/IRegistry.sol +39 -19
- package/contracts/registry/IRegistryService.sol +31 -13
- package/contracts/registry/ITransferInterceptor.sol +1 -0
- package/contracts/registry/Registry.sol +243 -224
- package/contracts/registry/RegistryAccessManager.sol +216 -0
- package/contracts/registry/RegistryService.sol +97 -173
- package/contracts/registry/RegistryServiceManager.sol +21 -39
- package/contracts/registry/ReleaseManager.sol +324 -0
- package/contracts/registry/TokenRegistry.sol +22 -17
- package/contracts/shared/ERC165.sol +14 -12
- package/contracts/shared/INftOwnable.sol +11 -10
- package/contracts/shared/IPolicyHolder.sol +26 -0
- package/contracts/shared/IRegisterable.sol +4 -6
- package/contracts/shared/IRegistryLinked.sol +12 -0
- package/contracts/shared/IService.sol +5 -4
- package/contracts/shared/IVersionable.sol +4 -47
- package/contracts/shared/NftOwnable.sol +66 -80
- package/contracts/shared/PolicyHolder.sol +81 -0
- package/contracts/shared/ProxyManager.sol +100 -25
- package/contracts/shared/Registerable.sol +16 -32
- package/contracts/shared/RegistryLinked.sol +48 -0
- package/contracts/shared/Service.sol +41 -24
- package/contracts/shared/TokenHandler.sol +11 -5
- package/contracts/shared/Versionable.sol +4 -92
- package/contracts/test/TestRegisterable.sol +1 -1
- package/contracts/test/TestService.sol +4 -3
- package/contracts/types/Amount.sol +65 -0
- package/contracts/types/Blocknumber.sol +1 -0
- package/contracts/types/ClaimId.sol +75 -0
- package/contracts/types/DistributorType.sol +2 -2
- package/contracts/types/Fee.sol +13 -5
- package/contracts/types/NftId.sol +8 -0
- package/contracts/types/NftIdSet.sol +26 -24
- package/contracts/types/ObjectType.sol +11 -6
- package/contracts/types/PayoutId.sol +82 -0
- package/contracts/types/Referral.sol +4 -0
- package/contracts/types/RoleId.sol +26 -19
- package/contracts/types/Seconds.sol +54 -0
- package/contracts/types/StateId.sol +7 -2
- package/contracts/types/Timestamp.sol +18 -13
- package/contracts/types/UFixed.sol +1 -0
- package/contracts/types/Version.sol +1 -0
- package/package.json +3 -3
- package/artifacts/contracts/components/BaseComponent.sol/BaseComponent.dbg.json +0 -4
- package/artifacts/contracts/components/BaseComponent.sol/BaseComponent.json +0 -327
- package/artifacts/contracts/components/IBaseComponent.sol/IBaseComponent.dbg.json +0 -4
- package/artifacts/contracts/components/IBaseComponent.sol/IBaseComponent.json +0 -280
- package/artifacts/contracts/experiment/cloning/Cloner.sol/Cloner.dbg.json +0 -4
- package/artifacts/contracts/experiment/cloning/Cloner.sol/Cloner.json +0 -66
- package/artifacts/contracts/experiment/cloning/Cloner.sol/Mock1.dbg.json +0 -4
- package/artifacts/contracts/experiment/cloning/Cloner.sol/Mock1.json +0 -24
- package/artifacts/contracts/experiment/cloning/Cloner.sol/Mock2.dbg.json +0 -4
- package/artifacts/contracts/experiment/cloning/Cloner.sol/Mock2.json +0 -42
- package/artifacts/contracts/experiment/errors/Require.sol/Require.dbg.json +0 -4
- package/artifacts/contracts/experiment/errors/Require.sol/Require.json +0 -105
- package/artifacts/contracts/experiment/errors/Revert.sol/Revert.dbg.json +0 -4
- package/artifacts/contracts/experiment/errors/Revert.sol/Revert.json +0 -105
- package/artifacts/contracts/experiment/inheritance/A.sol/A.dbg.json +0 -4
- package/artifacts/contracts/experiment/inheritance/A.sol/A.json +0 -128
- package/artifacts/contracts/experiment/inheritance/A.sol/AShared.dbg.json +0 -4
- package/artifacts/contracts/experiment/inheritance/A.sol/AShared.json +0 -42
- package/artifacts/contracts/experiment/inheritance/B.sol/B.dbg.json +0 -4
- package/artifacts/contracts/experiment/inheritance/B.sol/B.json +0 -76
- package/artifacts/contracts/experiment/inheritance/C.sol/C.dbg.json +0 -4
- package/artifacts/contracts/experiment/inheritance/C.sol/C.json +0 -89
- package/artifacts/contracts/experiment/inheritance/IA.sol/IA.dbg.json +0 -4
- package/artifacts/contracts/experiment/inheritance/IA.sol/IA.json +0 -128
- package/artifacts/contracts/experiment/inheritance/IA.sol/ISharedA.dbg.json +0 -4
- package/artifacts/contracts/experiment/inheritance/IA.sol/ISharedA.json +0 -37
- package/artifacts/contracts/experiment/inheritance/IB.sol/IB.dbg.json +0 -4
- package/artifacts/contracts/experiment/inheritance/IC.sol/IC.dbg.json +0 -4
- package/artifacts/contracts/experiment/inheritance/IC.sol/IC.json +0 -63
- package/artifacts/contracts/experiment/statemachine/Dummy.sol/LifeCycleModule.dbg.json +0 -4
- package/artifacts/contracts/experiment/statemachine/Dummy.sol/LifeCycleModule.json +0 -59
- package/artifacts/contracts/experiment/statemachine/ISM.sol/ISM.dbg.json +0 -4
- package/artifacts/contracts/experiment/statemachine/ISM.sol/ISM.json +0 -124
- package/artifacts/contracts/experiment/statemachine/ISM.sol/ISMEE.dbg.json +0 -4
- package/artifacts/contracts/experiment/statemachine/ISM.sol/ISMEE.json +0 -74
- package/artifacts/contracts/experiment/statemachine/SM.sol/SM.dbg.json +0 -4
- package/artifacts/contracts/experiment/statemachine/SM.sol/SM.json +0 -124
- package/artifacts/contracts/experiment/statemachine/SimpleStateMachine.sol/SimpleStateMachine.dbg.json +0 -4
- package/artifacts/contracts/experiment/statemachine/SimpleStateMachine.sol/SimpleStateMachine.json +0 -207
- package/artifacts/contracts/experiment/types/TypeA.sol/TypeALib.dbg.json +0 -4
- package/artifacts/contracts/experiment/types/TypeA.sol/TypeALib.json +0 -10
- package/artifacts/contracts/experiment/types/TypeB.sol/TypeBLib.dbg.json +0 -4
- package/artifacts/contracts/experiment/types/TypeB.sol/TypeBLib.json +0 -10
- package/artifacts/contracts/instance/AccessManagedSimple.sol/AccessManagedSimple.dbg.json +0 -4
- package/artifacts/contracts/instance/AccessManagerSimple.sol/AccessManagerSimple.dbg.json +0 -4
- package/artifacts/contracts/instance/AccessManagerSimple.sol/AccessManagerSimple.json +0 -1132
- package/artifacts/contracts/instance/IAccessManagerSimple.sol/IAccessManagerSimple.dbg.json +0 -4
- package/artifacts/contracts/instance/IAccessManagerSimple.sol/IAccessManagerSimple.json +0 -1082
- package/artifacts/contracts/instance/base/ComponentServiceBase.sol/ComponentServiceBase.dbg.json +0 -4
- package/artifacts/contracts/instance/base/IInstanceBase.sol/IInstanceBase.dbg.json +0 -4
- package/artifacts/contracts/instance/base/IInstanceBase.sol/IInstanceBase.json +0 -113
- package/artifacts/contracts/instance/service/ComponentOwnerService.sol/ComponentOwnerService.dbg.json +0 -4
- package/artifacts/contracts/instance/service/ComponentOwnerService.sol/ComponentOwnerService.json +0 -827
- package/artifacts/contracts/instance/service/IComponentOwnerService.sol/IComponentOwnerService.dbg.json +0 -4
- package/artifacts/contracts/shared/RegisterableUpgradable.sol/RegisterableUpgradable.dbg.json +0 -4
- package/artifacts/contracts/shared/RegisterableUpgradable.sol/RegisterableUpgradable.json +0 -442
- package/contracts/components/BaseComponent.sol +0 -91
- package/contracts/components/IBaseComponent.sol +0 -25
- package/contracts/experiment/cloning/Cloner.sol +0 -47
- package/contracts/experiment/errors/Require.sol +0 -38
- package/contracts/experiment/errors/Revert.sol +0 -44
- package/contracts/experiment/inheritance/A.sol +0 -53
- package/contracts/experiment/inheritance/B.sol +0 -28
- package/contracts/experiment/inheritance/C.sol +0 -34
- package/contracts/experiment/inheritance/IA.sol +0 -13
- package/contracts/experiment/inheritance/IB.sol +0 -10
- package/contracts/experiment/inheritance/IC.sol +0 -12
- package/contracts/experiment/statemachine/Dummy.sol +0 -27
- package/contracts/experiment/statemachine/ISM.sol +0 -25
- package/contracts/experiment/statemachine/SM.sol +0 -57
- package/contracts/experiment/statemachine/SimpleStateMachine.sol +0 -31
- package/contracts/experiment/types/TypeA.sol +0 -47
- package/contracts/experiment/types/TypeB.sol +0 -29
- package/contracts/instance/AccessManagedSimple.sol +0 -115
- package/contracts/instance/AccessManagerSimple.sol +0 -692
- package/contracts/instance/IAccessManagerSimple.sol +0 -391
- package/contracts/instance/base/ComponentServiceBase.sol +0 -134
- package/contracts/instance/base/IInstanceBase.sol +0 -23
- package/contracts/instance/service/ComponentOwnerService.sol +0 -317
- package/contracts/instance/service/IComponentOwnerService.sol +0 -20
- package/contracts/shared/RegisterableUpgradable.sol +0 -16
@@ -2,158 +2,399 @@
|
|
2
2
|
pragma solidity ^0.8.20;
|
3
3
|
|
4
4
|
import {Clones} from "@openzeppelin/contracts/proxy/Clones.sol";
|
5
|
+
import {ShortString, ShortStrings} from "@openzeppelin/contracts/utils/ShortStrings.sol";
|
5
6
|
|
6
|
-
import {AccessManagerSimple} from "./AccessManagerSimple.sol";
|
7
|
-
import {InstanceAccessManager} from "./InstanceAccessManager.sol";
|
8
7
|
import {Instance} from "./Instance.sol";
|
8
|
+
import {IInstance} from "./IInstance.sol";
|
9
|
+
import {InstanceAccessManager} from "./InstanceAccessManager.sol";
|
9
10
|
import {IInstanceService} from "./IInstanceService.sol";
|
10
11
|
import {InstanceReader} from "./InstanceReader.sol";
|
12
|
+
import {BundleManager} from "./BundleManager.sol";
|
13
|
+
import {AccessManagerUpgradeableInitializeable} from "./AccessManagerUpgradeableInitializeable.sol";
|
11
14
|
import {IRegistry} from "../registry/IRegistry.sol";
|
12
|
-
import {
|
13
|
-
import {RegistryService} from "../registry/RegistryService.sol";
|
15
|
+
import {IRegistryService} from "../registry/IRegistryService.sol";
|
14
16
|
import {Service} from "../../contracts/shared/Service.sol";
|
15
|
-
import {
|
16
|
-
import {ContractDeployerLib} from "../shared/ContractDeployerLib.sol";
|
17
|
-
import {NftId, NftIdLib, zeroNftId} from "../../contracts/types/NftId.sol";
|
17
|
+
import {NftId} from "../../contracts/types/NftId.sol";
|
18
18
|
import {RoleId} from "../types/RoleId.sol";
|
19
|
-
import {
|
20
|
-
import {
|
21
|
-
|
22
|
-
contract InstanceService is Service, IInstanceService {
|
19
|
+
import {ADMIN_ROLE, INSTANCE_OWNER_ROLE, DISTRIBUTION_OWNER_ROLE, POOL_OWNER_ROLE, PRODUCT_OWNER_ROLE, INSTANCE_SERVICE_ROLE, DISTRIBUTION_SERVICE_ROLE, POOL_SERVICE_ROLE, PRODUCT_SERVICE_ROLE, APPLICATION_SERVICE_ROLE, POLICY_SERVICE_ROLE, CLAIM_SERVICE_ROLE, BUNDLE_SERVICE_ROLE, INSTANCE_ROLE} from "../types/RoleId.sol";
|
20
|
+
import {ObjectType, INSTANCE, BUNDLE, APPLICATION, POLICY, CLAIM, PRODUCT, DISTRIBUTION, REGISTRY, POOL} from "../types/ObjectType.sol";
|
23
21
|
|
24
|
-
|
25
|
-
|
26
|
-
|
27
|
-
|
22
|
+
contract InstanceService is
|
23
|
+
Service,
|
24
|
+
IInstanceService
|
25
|
+
{
|
26
|
+
address internal _masterOzAccessManager;
|
27
|
+
address internal _masterInstanceAccessManager;
|
28
|
+
address internal _masterInstance;
|
29
|
+
address internal _masterInstanceReader;
|
30
|
+
address internal _masterInstanceBundleManager;
|
28
31
|
|
29
32
|
// TODO update to real hash when instance is stable
|
30
33
|
bytes32 public constant INSTANCE_CREATION_CODE_HASH = bytes32(0);
|
31
|
-
|
34
|
+
|
35
|
+
modifier onlyInstanceOwner(NftId instanceNftId) {
|
36
|
+
if(msg.sender != getRegistry().ownerOf(instanceNftId)) {
|
37
|
+
revert ErrorInstanceServiceRequestUnauhorized(msg.sender);
|
38
|
+
}
|
39
|
+
_;
|
40
|
+
}
|
41
|
+
// TODO check service domain?
|
42
|
+
// TODO check release version?
|
43
|
+
modifier onlyRegisteredService() {
|
44
|
+
if (! getRegistry().isRegisteredService(msg.sender)) {
|
45
|
+
revert ErrorInstanceServiceRequestUnauhorized(msg.sender);
|
46
|
+
}
|
47
|
+
_;
|
48
|
+
}
|
49
|
+
// TODO check release version?
|
50
|
+
modifier onlyComponent() {
|
51
|
+
if (! getRegistry().isRegisteredComponent(msg.sender)) {
|
52
|
+
revert ErrorInstanceServiceRequestUnauhorized(msg.sender);
|
53
|
+
}
|
54
|
+
_;
|
55
|
+
}
|
32
56
|
|
33
57
|
function createInstanceClone()
|
34
58
|
external
|
35
59
|
returns (
|
36
|
-
|
60
|
+
AccessManagerUpgradeableInitializeable clonedOzAccessManager,
|
61
|
+
InstanceAccessManager clonedInstanceAccessManager,
|
37
62
|
Instance clonedInstance,
|
38
|
-
NftId
|
39
|
-
InstanceReader clonedInstanceReader
|
63
|
+
NftId clonedInstanceNftId,
|
64
|
+
InstanceReader clonedInstanceReader,
|
65
|
+
BundleManager clonedBundleManager
|
40
66
|
)
|
41
67
|
{
|
42
68
|
address instanceOwner = msg.sender;
|
43
|
-
|
44
|
-
|
45
|
-
|
46
|
-
|
47
|
-
|
48
|
-
// initially set the authority of the access managar to this (being the instance service).
|
49
|
-
// This will allow the instance service to bootstrap the authorizations of the instance
|
50
|
-
// and then transfer the ownership of the access manager to the instance owner once everything is setup
|
51
|
-
clonedAccessManager = AccessManagerSimple(Clones.clone(_accessManagerMaster));
|
52
|
-
clonedAccessManager.initialize(address(this));
|
53
|
-
|
54
|
-
clonedInstance = Instance(Clones.clone(_instanceMaster));
|
55
|
-
clonedInstance.initialize(address(clonedAccessManager), _registryAddress, registryNftId, msg.sender);
|
56
|
-
( IRegistry.ObjectInfo memory info, ) = registryService.registerInstance(clonedInstance);
|
57
|
-
instanceNftId = info.nftId;
|
58
|
-
|
59
|
-
clonedInstanceReader = InstanceReader(Clones.clone(address(_instanceReaderMaster)));
|
60
|
-
clonedInstanceReader.initialize(_registryAddress, instanceNftId);
|
69
|
+
IRegistry registry = getRegistry();
|
70
|
+
IRegistryService registryService = IRegistryService(
|
71
|
+
registry.getServiceAddress(
|
72
|
+
REGISTRY(), getVersion().toMajorPart()));
|
61
73
|
|
62
|
-
|
74
|
+
clonedOzAccessManager = AccessManagerUpgradeableInitializeable(
|
75
|
+
Clones.clone(_masterOzAccessManager));
|
63
76
|
|
64
|
-
|
77
|
+
// initially grants ADMIN_ROLE to this (being the instance service).
|
78
|
+
// This will allow the instance service to bootstrap the authorizations of the instance.
|
79
|
+
// Instance service will not use oz access manager directlly but through instance access manager instead
|
80
|
+
// Instance service will renounce ADMIN_ROLE when bootstraping is finished
|
81
|
+
clonedOzAccessManager.initialize(address(this));
|
82
|
+
|
83
|
+
clonedInstance = Instance(Clones.clone(_masterInstance));
|
84
|
+
clonedInstance.initialize(
|
85
|
+
address(clonedOzAccessManager),
|
86
|
+
address(registry),
|
87
|
+
instanceOwner);
|
65
88
|
|
66
|
-
|
67
|
-
|
68
|
-
|
69
|
-
|
89
|
+
clonedInstanceReader = InstanceReader(Clones.clone(address(_masterInstanceReader)));
|
90
|
+
clonedInstanceReader.initialize(address(clonedInstance));
|
91
|
+
clonedInstance.setInstanceReader(clonedInstanceReader);
|
92
|
+
|
93
|
+
clonedBundleManager = BundleManager(Clones.clone(_masterInstanceBundleManager));
|
94
|
+
clonedBundleManager.initialize(address(clonedInstance));
|
95
|
+
clonedInstance.setBundleManager(clonedBundleManager);
|
96
|
+
|
97
|
+
clonedInstanceAccessManager = InstanceAccessManager(Clones.clone(_masterInstanceAccessManager));
|
98
|
+
clonedOzAccessManager.grantRole(ADMIN_ROLE().toInt(), address(clonedInstanceAccessManager), 0);
|
99
|
+
clonedInstanceAccessManager.initialize(address(clonedInstance));
|
100
|
+
clonedInstance.setInstanceAccessManager(clonedInstanceAccessManager);
|
101
|
+
|
102
|
+
// TODO amend setters with instance specific , policy manager ...
|
103
|
+
|
104
|
+
_grantInitialAuthorizations(clonedInstanceAccessManager, clonedInstance, clonedBundleManager, instanceOwner);
|
105
|
+
|
106
|
+
clonedOzAccessManager.renounceRole(ADMIN_ROLE().toInt(), address(this));
|
107
|
+
|
108
|
+
IRegistry.ObjectInfo memory info = registryService.registerInstance(clonedInstance, instanceOwner);
|
109
|
+
clonedInstanceNftId = info.nftId;
|
70
110
|
|
71
|
-
emit LogInstanceCloned(
|
111
|
+
emit LogInstanceCloned(
|
112
|
+
address(clonedOzAccessManager),
|
113
|
+
address(clonedInstanceAccessManager),
|
114
|
+
address(clonedInstance),
|
115
|
+
address(clonedBundleManager),
|
116
|
+
address(clonedInstanceReader),
|
117
|
+
clonedInstanceNftId);
|
72
118
|
}
|
73
119
|
|
74
|
-
function _grantInitialAuthorizations(
|
75
|
-
|
76
|
-
|
77
|
-
|
120
|
+
function _grantInitialAuthorizations(
|
121
|
+
InstanceAccessManager clonedAccessManager,
|
122
|
+
Instance clonedInstance,
|
123
|
+
BundleManager clonedBundleManager,
|
124
|
+
address instanceOwner)
|
125
|
+
internal
|
126
|
+
{
|
127
|
+
_createCoreAndGifRoles(clonedAccessManager);
|
128
|
+
_createCoreTargets(clonedAccessManager, clonedInstance, clonedBundleManager);
|
129
|
+
_grantDistributionServiceAuthorizations(clonedAccessManager, clonedInstance);
|
130
|
+
_grantPoolServiceAuthorizations(clonedAccessManager, clonedInstance);
|
131
|
+
_grantProductServiceAuthorizations(clonedAccessManager, clonedInstance);
|
132
|
+
_grantApplicationServiceAuthorizations(clonedAccessManager, clonedInstance);
|
133
|
+
_grantPolicyServiceAuthorizations(clonedAccessManager, clonedInstance);
|
134
|
+
_grantClaimServiceAuthorizations(clonedAccessManager, clonedInstance);
|
135
|
+
_grantBundleServiceAuthorizations(clonedAccessManager, clonedInstance, clonedBundleManager);
|
136
|
+
_grantInstanceServiceAuthorizations(clonedAccessManager, clonedInstance);
|
137
|
+
_grantInstanceOwnerAuthorizations(clonedAccessManager, instanceOwner);
|
138
|
+
}
|
139
|
+
|
140
|
+
function _createCoreAndGifRoles(InstanceAccessManager clonedAccessManager) internal {
|
141
|
+
// default roles controlled by ADMIN_ROLE -> core roles
|
142
|
+
// all set/granted only once during cloning (the only exception is INSTANCE_OWNER_ROLE, hooked to instance nft)
|
143
|
+
clonedAccessManager.createCoreRole(INSTANCE_SERVICE_ROLE(), "InstanceServiceRole");
|
144
|
+
clonedAccessManager.createCoreRole(DISTRIBUTION_SERVICE_ROLE(), "DistributionServiceRole");
|
145
|
+
clonedAccessManager.createCoreRole(POOL_SERVICE_ROLE(), "PoolServiceRole");
|
146
|
+
clonedAccessManager.createCoreRole(APPLICATION_SERVICE_ROLE(), "ApplicationServiceRole");
|
147
|
+
clonedAccessManager.createCoreRole(PRODUCT_SERVICE_ROLE(), "ProductServiceRole");
|
148
|
+
clonedAccessManager.createCoreRole(CLAIM_SERVICE_ROLE(), "ClaimServiceRole");
|
149
|
+
clonedAccessManager.createCoreRole(POLICY_SERVICE_ROLE(), "PolicyServiceRole");
|
150
|
+
clonedAccessManager.createCoreRole(BUNDLE_SERVICE_ROLE(), "BundleServiceRole");
|
151
|
+
// default roles controlled by INSTANCE_OWNER_ROLE -> gif roles
|
152
|
+
clonedAccessManager.createGifRole(DISTRIBUTION_OWNER_ROLE(), "DistributionOwnerRole", INSTANCE_OWNER_ROLE());
|
153
|
+
clonedAccessManager.createGifRole(POOL_OWNER_ROLE(), "PoolOwnerRole", INSTANCE_OWNER_ROLE());
|
154
|
+
clonedAccessManager.createGifRole(PRODUCT_OWNER_ROLE(), "ProductOwnerRole", INSTANCE_OWNER_ROLE());
|
155
|
+
}
|
156
|
+
|
157
|
+
function _createCoreTargets(InstanceAccessManager clonedAccessManager, Instance clonedInstance, BundleManager clonedBundleManager) internal {
|
158
|
+
clonedAccessManager.createCoreTarget(address(clonedAccessManager), "InstanceAccessManager");
|
159
|
+
clonedAccessManager.createCoreTarget(address(clonedInstance), "Instance");
|
160
|
+
clonedAccessManager.createCoreTarget(address(clonedBundleManager), "BundleManager");
|
161
|
+
}
|
162
|
+
|
163
|
+
function _grantDistributionServiceAuthorizations(InstanceAccessManager clonedAccessManager, Instance clonedInstance) internal {
|
164
|
+
// configure authorization for distribution service on instance
|
165
|
+
address distributionServiceAddress = getRegistry().getServiceAddress(DISTRIBUTION(), getVersion().toMajorPart());
|
166
|
+
clonedAccessManager.grantRole(DISTRIBUTION_SERVICE_ROLE(), distributionServiceAddress);
|
167
|
+
bytes4[] memory instanceDistributionServiceSelectors = new bytes4[](11);
|
78
168
|
instanceDistributionServiceSelectors[0] = clonedInstance.createDistributionSetup.selector;
|
79
169
|
instanceDistributionServiceSelectors[1] = clonedInstance.updateDistributionSetup.selector;
|
80
|
-
|
81
|
-
|
170
|
+
instanceDistributionServiceSelectors[2] = clonedInstance.createDistributorType.selector;
|
171
|
+
instanceDistributionServiceSelectors[3] = clonedInstance.updateDistributorType.selector;
|
172
|
+
instanceDistributionServiceSelectors[4] = clonedInstance.updateDistributorTypeState.selector;
|
173
|
+
instanceDistributionServiceSelectors[5] = clonedInstance.createDistributor.selector;
|
174
|
+
instanceDistributionServiceSelectors[6] = clonedInstance.updateDistributor.selector;
|
175
|
+
instanceDistributionServiceSelectors[7] = clonedInstance.updateDistributorState.selector;
|
176
|
+
instanceDistributionServiceSelectors[8] = clonedInstance.createReferral.selector;
|
177
|
+
instanceDistributionServiceSelectors[9] = clonedInstance.updateReferral.selector;
|
178
|
+
instanceDistributionServiceSelectors[10] = clonedInstance.updateReferralState.selector;
|
179
|
+
clonedAccessManager.setCoreTargetFunctionRole(
|
180
|
+
"Instance",
|
82
181
|
instanceDistributionServiceSelectors,
|
83
|
-
DISTRIBUTION_SERVICE_ROLE()
|
182
|
+
DISTRIBUTION_SERVICE_ROLE());
|
183
|
+
}
|
84
184
|
|
85
|
-
|
86
|
-
|
185
|
+
function _grantPoolServiceAuthorizations(InstanceAccessManager clonedAccessManager, Instance clonedInstance) internal {
|
186
|
+
// configure authorization for pool service on instance
|
187
|
+
address poolServiceAddress = getRegistry().getServiceAddress(POOL(), getVersion().toMajorPart());
|
188
|
+
clonedAccessManager.grantRole(POOL_SERVICE_ROLE(), address(poolServiceAddress));
|
87
189
|
bytes4[] memory instancePoolServiceSelectors = new bytes4[](4);
|
88
190
|
instancePoolServiceSelectors[0] = clonedInstance.createPoolSetup.selector;
|
89
191
|
instancePoolServiceSelectors[1] = clonedInstance.updatePoolSetup.selector;
|
90
|
-
|
91
|
-
|
92
|
-
clonedAccessManager.setTargetFunctionRole(
|
93
|
-
address(clonedInstance),
|
192
|
+
clonedAccessManager.setCoreTargetFunctionRole(
|
193
|
+
"Instance",
|
94
194
|
instancePoolServiceSelectors,
|
95
|
-
POOL_SERVICE_ROLE()
|
195
|
+
POOL_SERVICE_ROLE());
|
196
|
+
}
|
96
197
|
|
97
|
-
|
98
|
-
|
99
|
-
|
198
|
+
function _grantProductServiceAuthorizations(InstanceAccessManager clonedAccessManager, Instance clonedInstance) internal {
|
199
|
+
// configure authorization for product service on instance
|
200
|
+
address productServiceAddress = getRegistry().getServiceAddress(PRODUCT(), getVersion().toMajorPart());
|
201
|
+
clonedAccessManager.grantRole(PRODUCT_SERVICE_ROLE(), address(productServiceAddress));
|
202
|
+
bytes4[] memory instanceProductServiceSelectors = new bytes4[](5);
|
100
203
|
instanceProductServiceSelectors[0] = clonedInstance.createProductSetup.selector;
|
101
204
|
instanceProductServiceSelectors[1] = clonedInstance.updateProductSetup.selector;
|
102
205
|
instanceProductServiceSelectors[2] = clonedInstance.createRisk.selector;
|
103
206
|
instanceProductServiceSelectors[3] = clonedInstance.updateRisk.selector;
|
104
207
|
instanceProductServiceSelectors[4] = clonedInstance.updateRiskState.selector;
|
105
|
-
|
106
|
-
|
107
|
-
instanceProductServiceSelectors[7] = clonedInstance.updatePolicyState.selector;
|
108
|
-
clonedAccessManager.setTargetFunctionRole(
|
109
|
-
address(clonedInstance),
|
208
|
+
clonedAccessManager.setCoreTargetFunctionRole(
|
209
|
+
"Instance",
|
110
210
|
instanceProductServiceSelectors,
|
111
|
-
PRODUCT_SERVICE_ROLE()
|
211
|
+
PRODUCT_SERVICE_ROLE());
|
212
|
+
}
|
213
|
+
|
214
|
+
function _grantApplicationServiceAuthorizations(InstanceAccessManager clonedAccessManager, Instance clonedInstance) internal {
|
215
|
+
// configure authorization for application services on instance
|
216
|
+
address applicationServiceAddress = getRegistry().getServiceAddress(APPLICATION(), getVersion().toMajorPart());
|
217
|
+
clonedAccessManager.grantRole(APPLICATION_SERVICE_ROLE(), applicationServiceAddress);
|
218
|
+
bytes4[] memory instanceApplicationServiceSelectors = new bytes4[](3);
|
219
|
+
instanceApplicationServiceSelectors[0] = clonedInstance.createApplication.selector;
|
220
|
+
instanceApplicationServiceSelectors[1] = clonedInstance.updateApplication.selector;
|
221
|
+
instanceApplicationServiceSelectors[2] = clonedInstance.updateApplicationState.selector;
|
222
|
+
clonedAccessManager.setCoreTargetFunctionRole(
|
223
|
+
"Instance",
|
224
|
+
instanceApplicationServiceSelectors,
|
225
|
+
APPLICATION_SERVICE_ROLE());
|
226
|
+
}
|
227
|
+
|
228
|
+
function _grantPolicyServiceAuthorizations(InstanceAccessManager clonedAccessManager, Instance clonedInstance) internal {
|
229
|
+
// configure authorization for policy services on instance
|
230
|
+
address policyServiceAddress = getRegistry().getServiceAddress(POLICY(), getVersion().toMajorPart());
|
231
|
+
clonedAccessManager.grantRole(POLICY_SERVICE_ROLE(), policyServiceAddress);
|
232
|
+
bytes4[] memory instancePolicyServiceSelectors = new bytes4[](2);
|
233
|
+
instancePolicyServiceSelectors[0] = clonedInstance.updatePolicy.selector;
|
234
|
+
instancePolicyServiceSelectors[1] = clonedInstance.updatePolicyState.selector;
|
235
|
+
clonedAccessManager.setCoreTargetFunctionRole(
|
236
|
+
"Instance",
|
237
|
+
instancePolicyServiceSelectors,
|
238
|
+
POLICY_SERVICE_ROLE());
|
239
|
+
}
|
240
|
+
|
241
|
+
function _grantClaimServiceAuthorizations(InstanceAccessManager clonedAccessManager, Instance clonedInstance) internal {
|
242
|
+
// configure authorization for claim/payout services on instance
|
243
|
+
address claimServiceAddress = getRegistry().getServiceAddress(CLAIM(), getVersion().toMajorPart());
|
244
|
+
clonedAccessManager.grantRole(CLAIM_SERVICE_ROLE(), claimServiceAddress);
|
245
|
+
bytes4[] memory instanceClaimServiceSelectors = new bytes4[](4);
|
246
|
+
instanceClaimServiceSelectors[0] = clonedInstance.createClaim.selector;
|
247
|
+
instanceClaimServiceSelectors[1] = clonedInstance.updateClaim.selector;
|
248
|
+
instanceClaimServiceSelectors[2] = clonedInstance.createPayout.selector;
|
249
|
+
instanceClaimServiceSelectors[3] = clonedInstance.updatePayout.selector;
|
250
|
+
clonedAccessManager.setCoreTargetFunctionRole(
|
251
|
+
"Instance",
|
252
|
+
instanceClaimServiceSelectors,
|
253
|
+
CLAIM_SERVICE_ROLE());
|
254
|
+
}
|
255
|
+
|
256
|
+
function _grantBundleServiceAuthorizations(InstanceAccessManager clonedAccessManager, Instance clonedInstance, BundleManager clonedBundleManager) internal {
|
257
|
+
// configure authorization for bundle service on instance
|
258
|
+
address bundleServiceAddress = getRegistry().getServiceAddress(BUNDLE(), getVersion().toMajorPart());
|
259
|
+
clonedAccessManager.grantRole(BUNDLE_SERVICE_ROLE(), address(bundleServiceAddress));
|
260
|
+
bytes4[] memory instanceBundleServiceSelectors = new bytes4[](3);
|
261
|
+
instanceBundleServiceSelectors[0] = clonedInstance.createBundle.selector;
|
262
|
+
instanceBundleServiceSelectors[1] = clonedInstance.updateBundle.selector;
|
263
|
+
instanceBundleServiceSelectors[2] = clonedInstance.updateBundleState.selector;
|
264
|
+
clonedAccessManager.setCoreTargetFunctionRole(
|
265
|
+
"Instance",
|
266
|
+
instanceBundleServiceSelectors,
|
267
|
+
BUNDLE_SERVICE_ROLE());
|
268
|
+
|
269
|
+
// configure authorization for bundle service on bundle manager
|
270
|
+
bytes4[] memory bundleManagerBundleServiceSelectors = new bytes4[](5);
|
271
|
+
bundleManagerBundleServiceSelectors[0] = clonedBundleManager.linkPolicy.selector;
|
272
|
+
bundleManagerBundleServiceSelectors[1] = clonedBundleManager.unlinkPolicy.selector;
|
273
|
+
bundleManagerBundleServiceSelectors[2] = clonedBundleManager.add.selector;
|
274
|
+
bundleManagerBundleServiceSelectors[3] = clonedBundleManager.lock.selector;
|
275
|
+
bundleManagerBundleServiceSelectors[4] = clonedBundleManager.unlock.selector;
|
276
|
+
clonedAccessManager.setCoreTargetFunctionRole(
|
277
|
+
"BundleManager",
|
278
|
+
bundleManagerBundleServiceSelectors,
|
279
|
+
BUNDLE_SERVICE_ROLE());
|
112
280
|
}
|
113
281
|
|
114
|
-
function
|
115
|
-
|
116
|
-
|
117
|
-
|
118
|
-
|
282
|
+
function _grantInstanceServiceAuthorizations(InstanceAccessManager clonedAccessManager, Instance clonedInstance) internal {
|
283
|
+
// configure authorization for instance service on instance
|
284
|
+
address instanceServiceAddress = getRegistry().getServiceAddress(INSTANCE(), getVersion().toMajorPart());
|
285
|
+
clonedAccessManager.grantRole(INSTANCE_SERVICE_ROLE(), instanceServiceAddress);
|
286
|
+
bytes4[] memory instanceInstanceServiceSelectors = new bytes4[](1);
|
287
|
+
instanceInstanceServiceSelectors[0] = clonedInstance.setInstanceReader.selector;
|
288
|
+
clonedAccessManager.setCoreTargetFunctionRole(
|
289
|
+
"Instance",
|
290
|
+
instanceInstanceServiceSelectors,
|
291
|
+
INSTANCE_SERVICE_ROLE());
|
292
|
+
|
293
|
+
// configure authorizations for instance service on instance access manager
|
294
|
+
bytes4[] memory accessManagerInstanceServiceSelectors = new bytes4[](3);
|
295
|
+
accessManagerInstanceServiceSelectors[0] = clonedAccessManager.createGifTarget.selector;
|
296
|
+
accessManagerInstanceServiceSelectors[1] = clonedAccessManager.setTargetLocked.selector;
|
297
|
+
accessManagerInstanceServiceSelectors[2] = clonedAccessManager.setCoreTargetFunctionRole.selector;
|
298
|
+
clonedAccessManager.setCoreTargetFunctionRole(
|
299
|
+
"InstanceAccessManager",
|
300
|
+
accessManagerInstanceServiceSelectors,
|
301
|
+
INSTANCE_SERVICE_ROLE());
|
119
302
|
}
|
120
303
|
|
121
|
-
function
|
122
|
-
|
123
|
-
|
124
|
-
|
125
|
-
|
304
|
+
function _grantInstanceOwnerAuthorizations(InstanceAccessManager clonedAccessManager, address instanceOwner) internal {
|
305
|
+
// configure authorization for instance owner on instance access manager
|
306
|
+
// instance owner role is granted/revoked ONLY by INSTANCE_ROLE
|
307
|
+
bytes4[] memory accessManagerInstanceOwnerSelectors = new bytes4[](3);
|
308
|
+
accessManagerInstanceOwnerSelectors[0] = clonedAccessManager.createRole.selector;
|
309
|
+
accessManagerInstanceOwnerSelectors[1] = clonedAccessManager.createTarget.selector;
|
310
|
+
accessManagerInstanceOwnerSelectors[2] = clonedAccessManager.setTargetFunctionRole.selector;
|
311
|
+
clonedAccessManager.setCoreTargetFunctionRole(
|
312
|
+
"InstanceAccessManager",
|
313
|
+
accessManagerInstanceOwnerSelectors,
|
314
|
+
INSTANCE_OWNER_ROLE());
|
126
315
|
}
|
127
316
|
|
128
|
-
|
129
|
-
|
130
|
-
|
131
|
-
|
132
|
-
|
317
|
+
|
318
|
+
function setAndRegisterMasterInstance(address instanceAddress)
|
319
|
+
external
|
320
|
+
onlyOwner
|
321
|
+
returns(NftId masterInstanceNftId)
|
322
|
+
{
|
323
|
+
if(_masterInstance != address(0)) { revert ErrorInstanceServiceMasterInstanceAlreadySet(); }
|
324
|
+
if(_masterOzAccessManager != address(0)) { revert ErrorInstanceServiceMasterOzAccessManagerAlreadySet(); }
|
325
|
+
if(_masterInstanceAccessManager != address(0)) { revert ErrorInstanceServiceMasterInstanceAccessManagerAlreadySet(); }
|
326
|
+
if(_masterInstanceBundleManager != address(0)) { revert ErrorInstanceServiceMasterBundleManagerAlreadySet(); }
|
327
|
+
|
328
|
+
if(instanceAddress == address(0)) { revert ErrorInstanceServiceInstanceAddressZero(); }
|
329
|
+
|
330
|
+
IInstance instance = IInstance(instanceAddress);
|
331
|
+
AccessManagerUpgradeableInitializeable ozAccessManager = AccessManagerUpgradeableInitializeable(instance.authority());
|
332
|
+
address ozAccessManagerAddress = address(ozAccessManager);
|
333
|
+
InstanceAccessManager instanceAccessManager = instance.getInstanceAccessManager();
|
334
|
+
address instanceAccessManagerAddress = address(instanceAccessManager);
|
335
|
+
InstanceReader instanceReader = instance.getInstanceReader();
|
336
|
+
address instanceReaderAddress = address(instanceReader);
|
337
|
+
BundleManager bundleManager = instance.getBundleManager();
|
338
|
+
address bundleManagerAddress = address(bundleManager);
|
339
|
+
|
340
|
+
if(ozAccessManagerAddress == address(0)) { revert ErrorInstanceServiceOzAccessManagerZero();}
|
341
|
+
if(instanceAccessManagerAddress == address(0)) { revert ErrorInstanceServiceInstanceAccessManagerZero(); }
|
342
|
+
if(instanceReaderAddress == address(0)) { revert ErrorInstanceServiceInstanceReaderZero(); }
|
343
|
+
if(bundleManagerAddress == address(0)) { revert ErrorInstanceServiceBundleManagerZero(); }
|
344
|
+
|
345
|
+
if(instance.authority() != instanceAccessManager.authority()) { revert ErrorInstanceServiceInstanceAuthorityMismatch(); }
|
346
|
+
if(bundleManager.authority() != instanceAccessManager.authority()) { revert ErrorInstanceServiceBundleManagerAuthorityMismatch(); }
|
347
|
+
if(instanceReader.getInstance() != instance) { revert ErrorInstanceServiceInstanceReaderInstanceMismatch2(); }
|
348
|
+
if(bundleManager.getInstance() != instance) { revert ErrorInstanceServiceBundleMangerInstanceMismatch(); }
|
349
|
+
|
350
|
+
_masterOzAccessManager = ozAccessManagerAddress;
|
351
|
+
_masterInstanceAccessManager = instanceAccessManagerAddress;
|
352
|
+
_masterInstance = instanceAddress;
|
353
|
+
_masterInstanceReader = instanceReaderAddress;
|
354
|
+
_masterInstanceBundleManager = bundleManagerAddress;
|
355
|
+
|
356
|
+
IRegistryService registryService = IRegistryService(getRegistry().getServiceAddress(REGISTRY(), getVersion().toMajorPart()));
|
357
|
+
IInstance masterInstance = IInstance(_masterInstance);
|
358
|
+
IRegistry.ObjectInfo memory info = registryService.registerInstance(masterInstance, getOwner());
|
359
|
+
masterInstanceNftId = info.nftId;
|
360
|
+
|
361
|
+
// masterInstance.linkToRegisteredNftId();
|
133
362
|
}
|
134
363
|
|
135
|
-
function
|
136
|
-
|
364
|
+
function setMasterInstanceReader(address instanceReaderAddress) external onlyOwner {
|
365
|
+
if(_masterInstanceReader == address(0)) { revert ErrorInstanceServiceMasterInstanceReaderNotSet(); }
|
366
|
+
if(instanceReaderAddress == address(0)) { revert ErrorInstanceServiceInstanceReaderAddressZero(); }
|
367
|
+
if(instanceReaderAddress == _masterInstanceReader) { revert ErrorInstanceServiceInstanceReaderSameAsMasterInstanceReader(); }
|
368
|
+
|
369
|
+
InstanceReader instanceReader = InstanceReader(instanceReaderAddress);
|
370
|
+
if(instanceReader.getInstance() != IInstance(_masterInstance)) { revert ErrorInstanceServiceInstanceReaderInstanceMismatch(); }
|
371
|
+
|
372
|
+
_masterInstanceReader = instanceReaderAddress;
|
137
373
|
}
|
138
374
|
|
139
|
-
function
|
140
|
-
|
375
|
+
function upgradeInstanceReader(NftId instanceNftId)
|
376
|
+
external
|
377
|
+
onlyInstanceOwner(instanceNftId)
|
378
|
+
{
|
379
|
+
IRegistry registry = getRegistry();
|
380
|
+
IRegistry.ObjectInfo memory instanceInfo = registry.getObjectInfo(instanceNftId);
|
381
|
+
Instance instance = Instance(instanceInfo.objectAddress);
|
382
|
+
|
383
|
+
InstanceReader upgradedInstanceReaderClone = InstanceReader(Clones.clone(address(_masterInstanceReader)));
|
384
|
+
upgradedInstanceReaderClone.initialize(address(instance));
|
385
|
+
instance.setInstanceReader(upgradedInstanceReaderClone);
|
141
386
|
}
|
142
387
|
|
143
|
-
function
|
144
|
-
return
|
388
|
+
function getMasterInstanceReader() external view returns (address) {
|
389
|
+
return _masterInstanceReader;
|
145
390
|
}
|
146
391
|
|
147
392
|
// From IService
|
148
|
-
function
|
149
|
-
return
|
393
|
+
function getDomain() public pure override returns(ObjectType) {
|
394
|
+
return INSTANCE();
|
150
395
|
}
|
151
396
|
|
152
397
|
/// @dev top level initializer
|
153
|
-
// 1) registry is non upgradeable -> don't need a proxy and uses constructor !
|
154
|
-
// 2) deploy registry service first -> from its initialization func it is easier to deploy registry then vice versa
|
155
|
-
// 3) deploy registry -> pass registry service address as constructor argument
|
156
|
-
// registry is getting instantiated and locked to registry service address forever
|
157
398
|
function _initialize(
|
158
399
|
address owner,
|
159
400
|
bytes memory data
|
@@ -162,37 +403,76 @@ contract InstanceService is Service, IInstanceService {
|
|
162
403
|
initializer
|
163
404
|
virtual override
|
164
405
|
{
|
165
|
-
|
166
|
-
|
167
|
-
|
168
|
-
// bytes memory instanceCreationCode = ContractDeployerLib.getCreationCode(
|
169
|
-
// instanceByteCodeWithInitCode,
|
170
|
-
// encodedConstructorArguments);
|
171
|
-
|
172
|
-
// address instanceAddress = ContractDeployerLib.deploy(
|
173
|
-
// instanceCreationCode,
|
174
|
-
// INSTANCE_CREATION_CODE_HASH);
|
175
|
-
|
176
|
-
address initialOwner = address(0);
|
177
|
-
(_registryAddress, initialOwner) = abi.decode(data, (address, address));
|
406
|
+
address initialOwner;
|
407
|
+
address registryAddress;
|
408
|
+
(registryAddress, initialOwner) = abi.decode(data, (address, address));
|
178
409
|
// TODO while InstanceService is not deployed in InstanceServiceManager constructor
|
179
410
|
// owner is InstanceServiceManager deployer
|
180
|
-
|
181
|
-
|
182
|
-
|
183
|
-
|
411
|
+
initializeService(registryAddress, address(0), owner);
|
412
|
+
registerInterface(type(IInstanceService).interfaceId);
|
413
|
+
}
|
414
|
+
|
415
|
+
// all gif targets MUST be childs of instanceNftId
|
416
|
+
function createGifTarget(
|
417
|
+
NftId instanceNftId,
|
418
|
+
address targetAddress,
|
419
|
+
string memory targetName,
|
420
|
+
bytes4[][] memory selectors,
|
421
|
+
RoleId[] memory roles
|
422
|
+
)
|
423
|
+
external
|
424
|
+
onlyRegisteredService
|
425
|
+
{
|
426
|
+
(
|
427
|
+
IInstance instance, // or instanceInfo
|
428
|
+
NftId targetNftId // or targetInfo
|
429
|
+
) = _validateInstanceAndComponent(instanceNftId, targetAddress);
|
430
|
+
|
431
|
+
InstanceAccessManager accessManager = instance.getInstanceAccessManager();
|
432
|
+
accessManager.createGifTarget(targetAddress, targetName);
|
433
|
+
// set proposed target config
|
434
|
+
// TODO restriction: for gif targets can set only once and only here?
|
435
|
+
// assume config is a mix of gif and custom roles and no further configuration by INSTANCE_OWNER_ROLE is ever needed?
|
436
|
+
for(uint roleIdx = 0; roleIdx < roles.length; roleIdx++)
|
437
|
+
{
|
438
|
+
accessManager.setCoreTargetFunctionRole(targetName, selectors[roleIdx], roles[roleIdx]);
|
439
|
+
}
|
184
440
|
}
|
185
441
|
|
186
|
-
|
187
|
-
|
188
|
-
|
189
|
-
|
190
|
-
|
191
|
-
|
192
|
-
|
193
|
-
|
194
|
-
|
195
|
-
|
442
|
+
// TODO called by component, but target can be component helper...so needs target name
|
443
|
+
// TODO check that targetName associated with component...how???
|
444
|
+
function setComponentLocked(bool locked) onlyComponent external {
|
445
|
+
|
446
|
+
address componentAddress = msg.sender;
|
447
|
+
IRegistry registry = getRegistry();
|
448
|
+
NftId instanceNftId = registry.getObjectInfo(componentAddress).parentNftId;
|
449
|
+
|
450
|
+
IInstance instance = IInstance(
|
451
|
+
registry.getObjectInfo(
|
452
|
+
instanceNftId).objectAddress);
|
453
|
+
|
454
|
+
instance.getInstanceAccessManager().setTargetLocked(
|
455
|
+
componentAddress,
|
456
|
+
locked);
|
196
457
|
}
|
197
|
-
}
|
198
458
|
|
459
|
+
function _validateInstanceAndComponent(NftId instanceNftId, address componentAddress)
|
460
|
+
internal
|
461
|
+
view
|
462
|
+
returns (IInstance instance, NftId componentNftId)
|
463
|
+
{
|
464
|
+
IRegistry registry = getRegistry();
|
465
|
+
IRegistry.ObjectInfo memory instanceInfo = registry.getObjectInfo(instanceNftId);
|
466
|
+
if(instanceInfo.objectType != INSTANCE()) {
|
467
|
+
revert ErrorInstanceServiceNotInstance(instanceNftId);
|
468
|
+
}
|
469
|
+
|
470
|
+
IRegistry.ObjectInfo memory componentInfo = registry.getObjectInfo(componentAddress);
|
471
|
+
if(componentInfo.parentNftId != instanceNftId) {
|
472
|
+
revert ErrorInstanceServiceInstanceComponentMismatch(instanceNftId, componentInfo.nftId);
|
473
|
+
}
|
474
|
+
|
475
|
+
instance = Instance(instanceInfo.objectAddress);
|
476
|
+
componentNftId = componentInfo.nftId;
|
477
|
+
}
|
478
|
+
}
|
@@ -7,7 +7,7 @@ import {ProxyManager} from "../shared/ProxyManager.sol";
|
|
7
7
|
import {InstanceService} from "./InstanceService.sol";
|
8
8
|
import {Registry} from "../registry/Registry.sol";
|
9
9
|
import {RegistryService} from "../registry/RegistryService.sol";
|
10
|
-
import {
|
10
|
+
import {REGISTRY} from "../types/ObjectType.sol";
|
11
11
|
|
12
12
|
contract InstanceServiceManager is ProxyManager {
|
13
13
|
|
@@ -17,7 +17,7 @@ contract InstanceServiceManager is ProxyManager {
|
|
17
17
|
constructor(
|
18
18
|
address registryAddress
|
19
19
|
)
|
20
|
-
ProxyManager()
|
20
|
+
ProxyManager(registryAddress)
|
21
21
|
{
|
22
22
|
InstanceService instSrv = new InstanceService();
|
23
23
|
// bytes memory initCode = type(InstanceService).creationCode;
|
@@ -28,10 +28,10 @@ contract InstanceServiceManager is ProxyManager {
|
|
28
28
|
|
29
29
|
_instanceService = InstanceService(address(versionable));
|
30
30
|
|
31
|
-
|
32
|
-
|
33
|
-
|
34
|
-
//
|
31
|
+
// TODO `this` must have a role or own nft to register service
|
32
|
+
//Registry registry = Registry(registryAddress);
|
33
|
+
//address registryServiceAddress = registry.getServiceAddress(REGISTRY(), _instanceService.getMajorVersion());
|
34
|
+
//RegistryService registryService = RegistryService(registryServiceAddress);
|
35
35
|
//registryService.registerService(_instanceService);
|
36
36
|
// RegistryService registryService = _instanceService.getRegistryService();
|
37
37
|
|
@@ -40,9 +40,6 @@ contract InstanceServiceManager is ProxyManager {
|
|
40
40
|
//_linkToNftOwnable(
|
41
41
|
// address(registryAddress),
|
42
42
|
// address(_instanceService));
|
43
|
-
|
44
|
-
// implies that after this constructor call only upgrade functionality is available
|
45
|
-
_isDeployed = true;
|
46
43
|
}
|
47
44
|
|
48
45
|
//--- view functions ----------------------------------------------------//
|