@etherisc/gif-next 0.0.2-d288ca9-933 → 0.0.2-d30275e-758
Sign up to get free protection for your applications and to get access to all the features.
- package/README.md +75 -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 +954 -219
- package/artifacts/contracts/components/IComponent.sol/IComponent.dbg.json +4 -0
- package/artifacts/contracts/{instance/base/IService.sol/IService.json → components/IComponent.sol/IComponent.json} +317 -133
- 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 +849 -247
- package/artifacts/contracts/components/Product.sol/Product.dbg.json +1 -1
- package/artifacts/contracts/components/Product.sol/Product.json +637 -224
- 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} +79 -3
- package/artifacts/contracts/instance/IInstance.sol/IInstance.dbg.json +1 -1
- package/artifacts/contracts/instance/IInstance.sol/IInstance.json +556 -246
- package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.dbg.json +1 -1
- package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.json +389 -156
- package/artifacts/contracts/instance/Instance.sol/Instance.dbg.json +1 -1
- package/artifacts/contracts/instance/Instance.sol/Instance.json +451 -3017
- package/artifacts/contracts/instance/InstanceAccessManager.sol/InstanceAccessManager.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceAccessManager.sol/InstanceAccessManager.json +597 -179
- package/artifacts/contracts/instance/InstanceAuthorizationsLib.sol/InstanceAuthorizationsLib.dbg.json +4 -0
- package/artifacts/contracts/instance/InstanceAuthorizationsLib.sol/InstanceAuthorizationsLib.json +124 -0
- package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.json +342 -222
- package/artifacts/contracts/instance/InstanceService.sol/InstanceService.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceService.sol/InstanceService.json +510 -209
- package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.json +316 -75
- package/artifacts/contracts/instance/InstanceStore.sol/InstanceStore.dbg.json +4 -0
- package/artifacts/contracts/instance/InstanceStore.sol/InstanceStore.json +2663 -0
- 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/ComponentService.sol/ComponentService.json +639 -0
- 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 +902 -0
- package/artifacts/contracts/instance/service/ApplicationServiceManager.sol/ApplicationServiceManager.dbg.json +4 -0
- package/artifacts/contracts/instance/service/ApplicationServiceManager.sol/ApplicationServiceManager.json +649 -0
- package/artifacts/contracts/instance/service/BundleService.sol/BundleService.dbg.json +4 -0
- package/artifacts/contracts/instance/service/BundleService.sol/BundleService.json +1326 -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 +1072 -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 +4 -0
- package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.json +1515 -0
- package/artifacts/contracts/instance/service/DistributionServiceManager.sol/DistributionServiceManager.dbg.json +4 -0
- package/artifacts/contracts/instance/service/DistributionServiceManager.sol/DistributionServiceManager.json +757 -0
- package/artifacts/contracts/instance/service/IApplicationService.sol/IApplicationService.dbg.json +4 -0
- package/artifacts/contracts/instance/service/{IComponentOwnerService.sol/IComponentOwnerService.json → IApplicationService.sol/IApplicationService.json} +235 -200
- package/artifacts/contracts/instance/service/IBundleService.sol/IBundleService.dbg.json +4 -0
- package/artifacts/contracts/instance/service/IBundleService.sol/IBundleService.json +714 -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 +585 -160
- package/artifacts/contracts/instance/service/IPolicyService.sol/IPolicyService.dbg.json +4 -0
- package/artifacts/contracts/instance/service/IPolicyService.sol/IPolicyService.json +969 -0
- package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.json +544 -145
- package/artifacts/contracts/instance/service/IPricingService.sol/IPricingService.dbg.json +4 -0
- package/artifacts/contracts/instance/{base/ServiceBase.sol/ServiceBase.json → service/IPricingService.sol/IPricingService.json} +248 -198
- package/artifacts/contracts/instance/service/IProductService.sol/IProductService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/IProductService.sol/IProductService.json +90 -391
- package/artifacts/contracts/instance/service/PolicyService.sol/PolicyService.dbg.json +4 -0
- package/artifacts/contracts/instance/service/PolicyService.sol/PolicyService.json +1575 -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 +4 -0
- package/artifacts/contracts/instance/service/PoolService.sol/PoolService.json +1481 -0
- package/artifacts/contracts/instance/service/PoolServiceManager.sol/PoolServiceManager.dbg.json +4 -0
- package/artifacts/contracts/instance/service/PoolServiceManager.sol/PoolServiceManager.json +709 -0
- package/artifacts/contracts/instance/service/PricingService.sol/PricingService.dbg.json +4 -0
- package/artifacts/contracts/instance/service/PricingService.sol/PricingService.json +988 -0
- package/artifacts/contracts/instance/service/PricingServiceManager.sol/PricingServiceManager.dbg.json +4 -0
- package/artifacts/contracts/instance/service/PricingServiceManager.sol/PricingServiceManager.json +689 -0
- package/artifacts/contracts/instance/service/ProductService.sol/ProductService.dbg.json +4 -0
- package/artifacts/contracts/instance/service/ProductService.sol/ProductService.json +872 -0
- package/artifacts/contracts/instance/service/ProductServiceManager.sol/ProductServiceManager.dbg.json +4 -0
- package/artifacts/contracts/instance/service/ProductServiceManager.sol/ProductServiceManager.json +653 -0
- 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 +373 -61
- package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.dbg.json +1 -1
- package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.json +223 -229
- 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 +333 -188
- 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 +227 -330
- package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.dbg.json +1 -1
- package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.json +304 -138
- 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 +4 -0
- package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.json +498 -0
- 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 +4 -0
- package/artifacts/contracts/{components/BaseComponent.sol/BaseComponent.json → shared/IService.sol/IService.json} +98 -77
- 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 +4 -0
- package/artifacts/contracts/{instance/base/ComponentServiceBase.sol/ComponentServiceBase.json → shared/Service.sol/Service.json} +185 -170
- 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 +209 -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 +22 -3
- package/contracts/components/Component.sol +253 -0
- package/contracts/components/Distribution.sol +204 -86
- package/contracts/components/IComponent.sol +76 -0
- package/contracts/components/IDistributionComponent.sol +44 -16
- package/contracts/components/IPoolComponent.sol +88 -37
- package/contracts/components/IProductComponent.sol +10 -5
- package/contracts/components/Pool.sol +224 -181
- package/contracts/components/Product.sol +253 -176
- 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 +65 -13
- package/contracts/instance/IInstanceService.sol +70 -8
- package/contracts/instance/Instance.sol +158 -363
- package/contracts/instance/InstanceAccessManager.sol +430 -177
- package/contracts/instance/InstanceAuthorizationsLib.sol +300 -0
- package/contracts/instance/InstanceReader.sol +69 -39
- package/contracts/instance/InstanceService.sol +257 -84
- package/contracts/instance/InstanceServiceManager.sol +11 -13
- package/contracts/instance/InstanceStore.sol +208 -0
- package/contracts/instance/ObjectManager.sol +82 -0
- package/contracts/instance/base/ComponentService.sol +148 -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 -4
- 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 -19
- package/contracts/instance/service/ApplicationService.sol +185 -0
- package/contracts/instance/service/ApplicationServiceManager.sol +35 -0
- package/contracts/instance/service/BundleService.sol +440 -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 +342 -0
- package/contracts/instance/service/DistributionServiceManager.sol +51 -0
- package/contracts/instance/service/IApplicationService.sol +61 -0
- package/contracts/instance/service/IBundleService.sol +102 -0
- package/contracts/instance/service/IClaimService.sol +92 -0
- package/contracts/instance/service/IDistributionService.sol +75 -2
- package/contracts/instance/service/IPolicyService.sol +139 -0
- package/contracts/instance/service/IPoolService.sol +83 -18
- package/contracts/instance/service/IPricingService.sol +36 -0
- package/contracts/instance/service/IProductService.sol +7 -74
- package/contracts/instance/service/PolicyService.sol +577 -0
- package/contracts/instance/service/PolicyServiceManager.sol +54 -0
- package/contracts/instance/service/PoolService.sol +336 -0
- package/contracts/instance/service/PoolServiceManager.sol +51 -0
- package/contracts/instance/service/PricingService.sol +275 -0
- package/contracts/instance/service/PricingServiceManager.sol +51 -0
- package/contracts/instance/service/ProductService.sol +210 -0
- package/contracts/instance/service/ProductServiceManager.sol +54 -0
- package/contracts/registry/ChainNft.sol +9 -1
- package/contracts/registry/IRegistry.sol +52 -8
- package/contracts/registry/IRegistryService.sol +53 -20
- package/contracts/registry/ITransferInterceptor.sol +1 -0
- package/contracts/registry/Registry.sol +270 -226
- package/contracts/registry/RegistryAccessManager.sol +216 -0
- package/contracts/registry/RegistryService.sol +118 -271
- package/contracts/registry/RegistryServiceManager.sol +24 -26
- package/contracts/registry/ReleaseManager.sol +324 -0
- package/contracts/registry/TokenRegistry.sol +116 -0
- package/contracts/shared/ERC165.sol +14 -8
- 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 +16 -0
- package/contracts/shared/IVersionable.sol +4 -47
- package/contracts/shared/NftOwnable.sol +67 -83
- package/contracts/shared/PolicyHolder.sol +81 -0
- package/contracts/shared/ProxyManager.sol +100 -25
- package/contracts/shared/Registerable.sol +16 -31
- package/contracts/shared/RegistryLinked.sol +48 -0
- package/contracts/shared/Service.sol +72 -0
- 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 +6 -7
- package/contracts/types/Amount.sol +70 -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 +16 -7
- package/contracts/types/PayoutId.sol +82 -0
- package/contracts/types/Referral.sol +4 -0
- package/contracts/types/RoleId.sol +26 -11
- package/contracts/types/Seconds.sol +54 -0
- package/contracts/types/StateId.sol +11 -2
- package/contracts/types/Timestamp.sol +18 -13
- package/contracts/types/UFixed.sol +1 -0
- package/contracts/types/Version.sol +5 -1
- package/package.json +3 -3
- package/artifacts/contracts/components/BaseComponent.sol/BaseComponent.dbg.json +0 -4
- package/artifacts/contracts/components/IBaseComponent.sol/IBaseComponent.dbg.json +0 -4
- package/artifacts/contracts/components/IBaseComponent.sol/IBaseComponent.json +0 -267
- 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/base/IService.sol/IService.dbg.json +0 -4
- package/artifacts/contracts/instance/base/ServiceBase.sol/ServiceBase.dbg.json +0 -4
- 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/contracts/components/BaseComponent.sol +0 -86
- package/contracts/components/IBaseComponent.sol +0 -24
- 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 -122
- package/contracts/instance/AccessManagerSimple.sol +0 -692
- package/contracts/instance/IAccessManagerSimple.sol +0 -391
- package/contracts/instance/base/ComponentServiceBase.sol +0 -49
- package/contracts/instance/base/IInstanceBase.sol +0 -23
- package/contracts/instance/base/IService.sol +0 -15
- package/contracts/instance/base/ServiceBase.sol +0 -44
- package/contracts/instance/service/ComponentOwnerService.sol +0 -317
- package/contracts/instance/service/IComponentOwnerService.sol +0 -20
@@ -2,101 +2,230 @@
|
|
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";
|
6
|
+
|
7
|
+
import {NftId} from "../../contracts/types/NftId.sol";
|
8
|
+
import {RoleId} from "../types/RoleId.sol";
|
9
|
+
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";
|
10
|
+
import {ObjectType, INSTANCE, BUNDLE, APPLICATION, POLICY, CLAIM, PRODUCT, DISTRIBUTION, REGISTRY, POOL} from "../types/ObjectType.sol";
|
11
|
+
|
12
|
+
import {Service} from "../shared/Service.sol";
|
13
|
+
import {IService} from "../shared/IService.sol";
|
14
|
+
|
15
|
+
import {IDistributionComponent} from "../components/IDistributionComponent.sol";
|
16
|
+
import {IPoolComponent} from "../components/IPoolComponent.sol";
|
17
|
+
import {IProductComponent} from "../components/IProductComponent.sol";
|
18
|
+
|
19
|
+
import {IRegistry} from "../registry/IRegistry.sol";
|
20
|
+
import {IRegistryService} from "../registry/IRegistryService.sol";
|
21
|
+
import {ChainNft} from "../registry/ChainNft.sol";
|
5
22
|
|
6
|
-
import {AccessManagerSimple} from "./AccessManagerSimple.sol";
|
7
|
-
import {InstanceAccessManager} from "./InstanceAccessManager.sol";
|
8
23
|
import {Instance} from "./Instance.sol";
|
24
|
+
import {IInstance} from "./IInstance.sol";
|
25
|
+
import {InstanceAccessManager} from "./InstanceAccessManager.sol";
|
9
26
|
import {IInstanceService} from "./IInstanceService.sol";
|
10
27
|
import {InstanceReader} from "./InstanceReader.sol";
|
11
|
-
import {
|
12
|
-
import {
|
13
|
-
import {
|
14
|
-
import {
|
15
|
-
import {IService} from "../../contracts/instance/base/IService.sol";
|
16
|
-
import {ContractDeployerLib} from "../shared/ContractDeployerLib.sol";
|
17
|
-
import {NftId, NftIdLib, zeroNftId} from "../../contracts/types/NftId.sol";
|
18
|
-
import {VersionLib} from "../types/Version.sol";
|
19
|
-
|
20
|
-
contract InstanceService is ServiceBase, IInstanceService {
|
28
|
+
import {BundleManager} from "./BundleManager.sol";
|
29
|
+
import {AccessManagerUpgradeableInitializeable} from "./AccessManagerUpgradeableInitializeable.sol";
|
30
|
+
import {InstanceStore} from "./InstanceStore.sol";
|
31
|
+
import {InstanceAuthorizationsLib} from "./InstanceAuthorizationsLib.sol";
|
21
32
|
|
22
|
-
|
23
|
-
|
24
|
-
|
25
|
-
|
33
|
+
contract InstanceService is
|
34
|
+
Service,
|
35
|
+
IInstanceService
|
36
|
+
{
|
37
|
+
address internal _masterOzAccessManager;
|
38
|
+
address internal _masterInstanceAccessManager;
|
39
|
+
address internal _masterInstance;
|
40
|
+
address internal _masterInstanceReader;
|
41
|
+
address internal _masterInstanceBundleManager;
|
42
|
+
address internal _masterInstanceStore;
|
26
43
|
|
27
44
|
// TODO update to real hash when instance is stable
|
28
45
|
bytes32 public constant INSTANCE_CREATION_CODE_HASH = bytes32(0);
|
29
|
-
|
46
|
+
|
47
|
+
modifier onlyInstanceOwner(NftId instanceNftId) {
|
48
|
+
if(msg.sender != getRegistry().ownerOf(instanceNftId)) {
|
49
|
+
revert ErrorInstanceServiceRequestUnauhorized(msg.sender);
|
50
|
+
}
|
51
|
+
_;
|
52
|
+
}
|
53
|
+
// TODO check service domain?
|
54
|
+
// TODO check release version?
|
55
|
+
modifier onlyRegisteredService() {
|
56
|
+
if (! getRegistry().isRegisteredService(msg.sender)) {
|
57
|
+
revert ErrorInstanceServiceRequestUnauhorized(msg.sender);
|
58
|
+
}
|
59
|
+
_;
|
60
|
+
}
|
61
|
+
// TODO check release version?
|
62
|
+
modifier onlyComponent() {
|
63
|
+
if (! getRegistry().isRegisteredComponent(msg.sender)) {
|
64
|
+
revert ErrorInstanceServiceRequestUnauhorized(msg.sender);
|
65
|
+
}
|
66
|
+
_;
|
67
|
+
}
|
30
68
|
|
31
69
|
function createInstanceClone()
|
32
70
|
external
|
33
71
|
returns (
|
34
|
-
|
72
|
+
AccessManagerUpgradeableInitializeable clonedOzAccessManager,
|
73
|
+
InstanceAccessManager clonedInstanceAccessManager,
|
35
74
|
Instance clonedInstance,
|
36
|
-
NftId
|
37
|
-
InstanceReader clonedInstanceReader
|
75
|
+
NftId clonedInstanceNftId,
|
76
|
+
InstanceReader clonedInstanceReader,
|
77
|
+
BundleManager clonedBundleManager,
|
78
|
+
InstanceStore clonedInstanceStore
|
38
79
|
)
|
39
80
|
{
|
40
|
-
|
41
|
-
|
42
|
-
|
43
|
-
|
44
|
-
|
45
|
-
|
46
|
-
|
47
|
-
|
48
|
-
|
49
|
-
|
50
|
-
|
51
|
-
|
81
|
+
address instanceOwner = msg.sender;
|
82
|
+
IRegistry registry = getRegistry();
|
83
|
+
NftId registryNftId = registry.getNftId(address(registry));
|
84
|
+
IRegistryService registryService = IRegistryService(
|
85
|
+
registry.getServiceAddress(REGISTRY(), getVersion().toMajorPart())
|
86
|
+
);
|
87
|
+
|
88
|
+
clonedOzAccessManager = AccessManagerUpgradeableInitializeable(Clones.clone(_masterOzAccessManager));
|
89
|
+
|
90
|
+
// initially grants ADMIN_ROLE to this (being the instance service).
|
91
|
+
// This will allow the instance service to bootstrap the authorizations of the instance.
|
92
|
+
// Instance service will not use oz access manager directlly but through instance access manager instead
|
93
|
+
// Instance service will renounce ADMIN_ROLE when bootstraping is finished
|
94
|
+
clonedOzAccessManager.initialize(address(this));
|
95
|
+
|
96
|
+
clonedInstance = Instance(Clones.clone(_masterInstance));
|
97
|
+
clonedInstance.initialize(
|
98
|
+
address(clonedOzAccessManager),
|
99
|
+
address(registry),
|
100
|
+
instanceOwner);
|
101
|
+
// initialize and set before instance reader
|
102
|
+
clonedInstanceStore = InstanceStore(Clones.clone(address(_masterInstanceStore)));
|
103
|
+
clonedInstanceStore.initialize(address(clonedInstance));
|
104
|
+
clonedInstance.setInstanceStore(clonedInstanceStore);
|
52
105
|
|
53
|
-
clonedInstanceReader = InstanceReader(Clones.clone(address(
|
54
|
-
clonedInstanceReader.initialize(
|
55
|
-
|
106
|
+
clonedInstanceReader = InstanceReader(Clones.clone(address(_masterInstanceReader)));
|
107
|
+
clonedInstanceReader.initialize(address(clonedInstance));
|
108
|
+
clonedInstance.setInstanceReader(clonedInstanceReader);
|
56
109
|
|
57
|
-
|
58
|
-
|
59
|
-
|
60
|
-
|
61
|
-
|
62
|
-
|
110
|
+
clonedBundleManager = BundleManager(Clones.clone(_masterInstanceBundleManager));
|
111
|
+
clonedBundleManager.initialize(address(clonedInstance));
|
112
|
+
clonedInstance.setBundleManager(clonedBundleManager);
|
113
|
+
|
114
|
+
clonedInstanceAccessManager = InstanceAccessManager(Clones.clone(_masterInstanceAccessManager));
|
115
|
+
clonedOzAccessManager.grantRole(ADMIN_ROLE().toInt(), address(clonedInstanceAccessManager), 0);
|
116
|
+
clonedInstanceAccessManager.initialize(address(clonedInstance));
|
117
|
+
clonedInstance.setInstanceAccessManager(clonedInstanceAccessManager);
|
118
|
+
|
119
|
+
// TODO amend setters with instance specific , policy manager ...
|
120
|
+
|
121
|
+
// TODO library does external calls -> but it is registry and access manager -> find out is it best practice
|
122
|
+
InstanceAuthorizationsLib.grantInitialAuthorizations(
|
123
|
+
clonedInstanceAccessManager,
|
124
|
+
clonedInstance,
|
125
|
+
clonedBundleManager,
|
126
|
+
clonedInstanceStore,
|
127
|
+
instanceOwner,
|
128
|
+
getRegistry(),
|
129
|
+
getVersion().toMajorPart());
|
130
|
+
|
131
|
+
clonedOzAccessManager.renounceRole(ADMIN_ROLE().toInt(), address(this));
|
132
|
+
|
133
|
+
IRegistry.ObjectInfo memory info = registryService.registerInstance(clonedInstance, instanceOwner);
|
134
|
+
clonedInstanceNftId = info.nftId;
|
63
135
|
|
64
|
-
|
65
|
-
|
66
|
-
|
67
|
-
|
68
|
-
|
136
|
+
emit LogInstanceCloned(
|
137
|
+
address(clonedOzAccessManager),
|
138
|
+
address(clonedInstanceAccessManager),
|
139
|
+
address(clonedInstance),
|
140
|
+
address(clonedInstanceStore),
|
141
|
+
address(clonedBundleManager),
|
142
|
+
address(clonedInstanceReader),
|
143
|
+
clonedInstanceNftId);
|
69
144
|
}
|
70
145
|
|
71
|
-
function
|
72
|
-
|
73
|
-
|
74
|
-
|
75
|
-
|
146
|
+
function setAndRegisterMasterInstance(address instanceAddress)
|
147
|
+
external
|
148
|
+
onlyOwner
|
149
|
+
returns(NftId masterInstanceNftId)
|
150
|
+
{
|
151
|
+
if(_masterInstance != address(0)) { revert ErrorInstanceServiceMasterInstanceAlreadySet(); }
|
152
|
+
if(_masterOzAccessManager != address(0)) { revert ErrorInstanceServiceMasterOzAccessManagerAlreadySet(); }
|
153
|
+
if(_masterInstanceAccessManager != address(0)) { revert ErrorInstanceServiceMasterInstanceAccessManagerAlreadySet(); }
|
154
|
+
if(_masterInstanceBundleManager != address(0)) { revert ErrorInstanceServiceMasterBundleManagerAlreadySet(); }
|
155
|
+
|
156
|
+
if(instanceAddress == address(0)) { revert ErrorInstanceServiceInstanceAddressZero(); }
|
157
|
+
|
158
|
+
IInstance instance = IInstance(instanceAddress);
|
159
|
+
AccessManagerUpgradeableInitializeable ozAccessManager = AccessManagerUpgradeableInitializeable(instance.authority());
|
160
|
+
address ozAccessManagerAddress = address(ozAccessManager);
|
161
|
+
InstanceAccessManager instanceAccessManager = instance.getInstanceAccessManager();
|
162
|
+
address instanceAccessManagerAddress = address(instanceAccessManager);
|
163
|
+
InstanceReader instanceReader = instance.getInstanceReader();
|
164
|
+
address instanceReaderAddress = address(instanceReader);
|
165
|
+
BundleManager bundleManager = instance.getBundleManager();
|
166
|
+
address bundleManagerAddress = address(bundleManager);
|
167
|
+
InstanceStore instanceStore = instance.getInstanceStore();
|
168
|
+
address instanceStoreAddress = address(instanceStore);
|
169
|
+
|
170
|
+
if(ozAccessManagerAddress == address(0)) { revert ErrorInstanceServiceOzAccessManagerZero();}
|
171
|
+
if(instanceAccessManagerAddress == address(0)) { revert ErrorInstanceServiceInstanceAccessManagerZero(); }
|
172
|
+
if(instanceReaderAddress == address(0)) { revert ErrorInstanceServiceInstanceReaderZero(); }
|
173
|
+
if(bundleManagerAddress == address(0)) { revert ErrorInstanceServiceBundleManagerZero(); }
|
174
|
+
if(instanceStoreAddress == address(0)) { revert ErrorInstanceServiceInstanceStoreZero(); }
|
175
|
+
|
176
|
+
if(instance.authority() != instanceAccessManager.authority()) { revert ErrorInstanceServiceInstanceAuthorityMismatch(); }
|
177
|
+
if(bundleManager.authority() != instanceAccessManager.authority()) { revert ErrorInstanceServiceBundleManagerAuthorityMismatch(); }
|
178
|
+
if(instanceStore.authority() != instanceAccessManager.authority()) { revert ErrorInstanceServiceInstanceStoreAuthorityMismatch(); }
|
179
|
+
if(instanceReader.getInstance() != instance) { revert ErrorInstanceServiceInstanceReaderInstanceMismatch2(); }
|
180
|
+
if(bundleManager.getInstance() != instance) { revert ErrorInstanceServiceBundleMangerInstanceMismatch(); }
|
181
|
+
|
182
|
+
_masterOzAccessManager = ozAccessManagerAddress;
|
183
|
+
_masterInstanceAccessManager = instanceAccessManagerAddress;
|
184
|
+
_masterInstance = instanceAddress;
|
185
|
+
_masterInstanceReader = instanceReaderAddress;
|
186
|
+
_masterInstanceBundleManager = bundleManagerAddress;
|
187
|
+
_masterInstanceStore = instanceStoreAddress;
|
188
|
+
|
189
|
+
IRegistryService registryService = IRegistryService(getRegistry().getServiceAddress(REGISTRY(), getVersion().toMajorPart()));
|
190
|
+
IInstance masterInstance = IInstance(_masterInstance);
|
191
|
+
IRegistry.ObjectInfo memory info = registryService.registerInstance(masterInstance, getOwner());
|
192
|
+
masterInstanceNftId = info.nftId;
|
76
193
|
}
|
77
194
|
|
78
|
-
function
|
79
|
-
|
195
|
+
function setMasterInstanceReader(address instanceReaderAddress) external onlyOwner {
|
196
|
+
if(_masterInstanceReader == address(0)) { revert ErrorInstanceServiceMasterInstanceReaderNotSet(); }
|
197
|
+
if(instanceReaderAddress == address(0)) { revert ErrorInstanceServiceInstanceReaderAddressZero(); }
|
198
|
+
if(instanceReaderAddress == _masterInstanceReader) { revert ErrorInstanceServiceInstanceReaderSameAsMasterInstanceReader(); }
|
199
|
+
|
200
|
+
InstanceReader instanceReader = InstanceReader(instanceReaderAddress);
|
201
|
+
if(instanceReader.getInstance() != IInstance(_masterInstance)) { revert ErrorInstanceServiceInstanceReaderInstanceMismatch(); }
|
202
|
+
|
203
|
+
_masterInstanceReader = instanceReaderAddress;
|
80
204
|
}
|
81
205
|
|
82
|
-
function
|
83
|
-
|
206
|
+
function upgradeInstanceReader(NftId instanceNftId)
|
207
|
+
external
|
208
|
+
onlyInstanceOwner(instanceNftId)
|
209
|
+
{
|
210
|
+
IRegistry registry = getRegistry();
|
211
|
+
IRegistry.ObjectInfo memory instanceInfo = registry.getObjectInfo(instanceNftId);
|
212
|
+
Instance instance = Instance(instanceInfo.objectAddress);
|
213
|
+
|
214
|
+
InstanceReader upgradedInstanceReaderClone = InstanceReader(Clones.clone(address(_masterInstanceReader)));
|
215
|
+
upgradedInstanceReaderClone.initialize(address(instance));
|
216
|
+
instance.setInstanceReader(upgradedInstanceReaderClone);
|
84
217
|
}
|
85
218
|
|
86
|
-
function
|
87
|
-
return
|
219
|
+
function getMasterInstanceReader() external view returns (address) {
|
220
|
+
return _masterInstanceReader;
|
88
221
|
}
|
89
222
|
|
90
223
|
// From IService
|
91
|
-
function
|
92
|
-
return
|
224
|
+
function getDomain() public pure override returns(ObjectType) {
|
225
|
+
return INSTANCE();
|
93
226
|
}
|
94
227
|
|
95
228
|
/// @dev top level initializer
|
96
|
-
// 1) registry is non upgradeable -> don't need a proxy and uses constructor !
|
97
|
-
// 2) deploy registry service first -> from its initialization func it is easier to deploy registry then vice versa
|
98
|
-
// 3) deploy registry -> pass registry service address as constructor argument
|
99
|
-
// registry is getting instantiated and locked to registry service address forever
|
100
229
|
function _initialize(
|
101
230
|
address owner,
|
102
231
|
bytes memory data
|
@@ -105,32 +234,76 @@ contract InstanceService is ServiceBase, IInstanceService {
|
|
105
234
|
initializer
|
106
235
|
virtual override
|
107
236
|
{
|
108
|
-
|
109
|
-
|
237
|
+
address initialOwner;
|
238
|
+
address registryAddress;
|
239
|
+
(registryAddress, initialOwner) = abi.decode(data, (address, address));
|
240
|
+
// TODO while InstanceService is not deployed in InstanceServiceManager constructor
|
241
|
+
// owner is InstanceServiceManager deployer
|
242
|
+
initializeService(registryAddress, address(0), owner);
|
243
|
+
registerInterface(type(IInstanceService).interfaceId);
|
244
|
+
}
|
110
245
|
|
111
|
-
|
112
|
-
|
113
|
-
|
246
|
+
// all gif targets MUST be childs of instanceNftId
|
247
|
+
function createGifTarget(
|
248
|
+
NftId instanceNftId,
|
249
|
+
address targetAddress,
|
250
|
+
string memory targetName,
|
251
|
+
bytes4[][] memory selectors,
|
252
|
+
RoleId[] memory roles
|
253
|
+
)
|
254
|
+
external
|
255
|
+
onlyRegisteredService
|
256
|
+
{
|
257
|
+
(
|
258
|
+
IInstance instance, // or instanceInfo
|
259
|
+
NftId targetNftId // or targetInfo
|
260
|
+
) = _validateInstanceAndComponent(instanceNftId, targetAddress);
|
114
261
|
|
115
|
-
|
116
|
-
|
117
|
-
//
|
262
|
+
InstanceAccessManager accessManager = instance.getInstanceAccessManager();
|
263
|
+
accessManager.createGifTarget(targetAddress, targetName);
|
264
|
+
// set proposed target config
|
265
|
+
// TODO restriction: gif targets are set only once and only here?
|
266
|
+
// assume config is a mix of gif and custom roles and no further configuration by INSTANCE_OWNER_ROLE is ever needed?
|
267
|
+
for(uint roleIdx = 0; roleIdx < roles.length; roleIdx++)
|
268
|
+
{
|
269
|
+
accessManager.setCoreTargetFunctionRole(targetName, selectors[roleIdx], roles[roleIdx]);
|
270
|
+
}
|
271
|
+
}
|
118
272
|
|
119
|
-
|
120
|
-
|
273
|
+
// TODO called by component, but target can be component helper...so needs target name
|
274
|
+
// TODO check that targetName associated with component...how???
|
275
|
+
function setComponentLocked(bool locked) onlyComponent external {
|
121
276
|
|
122
|
-
|
123
|
-
IRegistry registry =
|
124
|
-
NftId
|
277
|
+
address componentAddress = msg.sender;
|
278
|
+
IRegistry registry = getRegistry();
|
279
|
+
NftId instanceNftId = registry.getObjectInfo(componentAddress).parentNftId;
|
125
280
|
|
126
|
-
|
127
|
-
|
128
|
-
|
129
|
-
_registerInterface(type(IInstanceService).interfaceId);
|
130
|
-
}
|
281
|
+
IInstance instance = IInstance(
|
282
|
+
registry.getObjectInfo(
|
283
|
+
instanceNftId).objectAddress);
|
131
284
|
|
132
|
-
|
133
|
-
|
285
|
+
instance.getInstanceAccessManager().setTargetLockedByService(
|
286
|
+
componentAddress,
|
287
|
+
locked);
|
134
288
|
}
|
135
|
-
}
|
136
289
|
|
290
|
+
function _validateInstanceAndComponent(NftId instanceNftId, address componentAddress)
|
291
|
+
internal
|
292
|
+
view
|
293
|
+
returns (IInstance instance, NftId componentNftId)
|
294
|
+
{
|
295
|
+
IRegistry registry = getRegistry();
|
296
|
+
IRegistry.ObjectInfo memory instanceInfo = registry.getObjectInfo(instanceNftId);
|
297
|
+
if(instanceInfo.objectType != INSTANCE()) {
|
298
|
+
revert ErrorInstanceServiceNotInstance(instanceNftId);
|
299
|
+
}
|
300
|
+
|
301
|
+
IRegistry.ObjectInfo memory componentInfo = registry.getObjectInfo(componentAddress);
|
302
|
+
if(componentInfo.parentNftId != instanceNftId) {
|
303
|
+
revert ErrorInstanceServiceInstanceComponentMismatch(instanceNftId, componentInfo.nftId);
|
304
|
+
}
|
305
|
+
|
306
|
+
instance = Instance(instanceInfo.objectAddress);
|
307
|
+
componentNftId = componentInfo.nftId;
|
308
|
+
}
|
309
|
+
}
|
@@ -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,20 +28,18 @@ contract InstanceServiceManager is ProxyManager {
|
|
28
28
|
|
29
29
|
_instanceService = InstanceService(address(versionable));
|
30
30
|
|
31
|
-
|
32
|
-
|
33
|
-
|
34
|
-
|
35
|
-
registryService.registerService(_instanceService);
|
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
|
+
//registryService.registerService(_instanceService);
|
36
36
|
// RegistryService registryService = _instanceService.getRegistryService();
|
37
37
|
|
38
|
+
// TODO no nft to link yet
|
38
39
|
// link ownership of instance service manager ot nft owner of instance service
|
39
|
-
_linkToNftOwnable(
|
40
|
-
|
41
|
-
|
42
|
-
|
43
|
-
// implies that after this constructor call only upgrade functionality is available
|
44
|
-
_isDeployed = true;
|
40
|
+
//_linkToNftOwnable(
|
41
|
+
// address(registryAddress),
|
42
|
+
// address(_instanceService));
|
45
43
|
}
|
46
44
|
|
47
45
|
//--- view functions ----------------------------------------------------//
|
@@ -0,0 +1,208 @@
|
|
1
|
+
// SPDX-License-Identifier: Apache-2.0
|
2
|
+
pragma solidity ^0.8.20;
|
3
|
+
|
4
|
+
import {AccessManagedUpgradeable} from "@openzeppelin/contracts-upgradeable/access/manager/AccessManagedUpgradeable.sol";
|
5
|
+
|
6
|
+
import {Key32, KeyId, Key32Lib} from "../types/Key32.sol";
|
7
|
+
import {NftId} from "../types/NftId.sol";
|
8
|
+
import {ClaimId} from "../types/ClaimId.sol";
|
9
|
+
import {NumberId} from "../types/NumberId.sol";
|
10
|
+
import {ObjectType, BUNDLE, DISTRIBUTION, INSTANCE, POLICY, POOL, ROLE, PRODUCT, TARGET, COMPONENT, DISTRIBUTOR, DISTRIBUTOR_TYPE} from "../types/ObjectType.sol";
|
11
|
+
import {RiskId, RiskIdLib} from "../types/RiskId.sol";
|
12
|
+
import {RoleId, RoleIdLib, INSTANCE_ROLE, INSTANCE_OWNER_ROLE} from "../types/RoleId.sol";
|
13
|
+
import {StateId, ACTIVE} from "../types/StateId.sol";
|
14
|
+
import {TimestampLib} from "../types/Timestamp.sol";
|
15
|
+
import {VersionPart, VersionPartLib} from "../types/Version.sol";
|
16
|
+
import {ReferralId} from "../types/Referral.sol";
|
17
|
+
import {DistributorType} from "../types/DistributorType.sol";
|
18
|
+
import {PayoutId} from "../types/PayoutId.sol";
|
19
|
+
|
20
|
+
import {IInstance} from "./IInstance.sol";
|
21
|
+
import {KeyValueStore} from "./base/KeyValueStore.sol";
|
22
|
+
import {IKeyValueStore} from "./base/KeyValueStore.sol";
|
23
|
+
|
24
|
+
import {IBundle} from "./module/IBundle.sol";
|
25
|
+
import {IComponents} from "./module/IComponents.sol";
|
26
|
+
import {IDistribution} from "./module/IDistribution.sol";
|
27
|
+
import {IPolicy} from "./module/IPolicy.sol";
|
28
|
+
import {IRisk} from "./module/IRisk.sol";
|
29
|
+
import {ISetup} from "./module/ISetup.sol";
|
30
|
+
|
31
|
+
|
32
|
+
// TODO combine with instance reader?
|
33
|
+
contract InstanceStore is AccessManagedUpgradeable, KeyValueStore
|
34
|
+
{
|
35
|
+
function initialize(address instance)
|
36
|
+
public
|
37
|
+
initializer()
|
38
|
+
{
|
39
|
+
address authority = IInstance(instance).authority();
|
40
|
+
__AccessManaged_init(authority);
|
41
|
+
initializeLifecycle();
|
42
|
+
}
|
43
|
+
|
44
|
+
//--- ProductSetup ------------------------------------------------------//
|
45
|
+
function createProductSetup(NftId productNftId, ISetup.ProductSetupInfo memory setup) external restricted() {
|
46
|
+
create(_toNftKey32(productNftId, PRODUCT()), abi.encode(setup));
|
47
|
+
}
|
48
|
+
|
49
|
+
function updateProductSetup(NftId productNftId, ISetup.ProductSetupInfo memory setup, StateId newState) external restricted() {
|
50
|
+
update(_toNftKey32(productNftId, PRODUCT()), abi.encode(setup), newState);
|
51
|
+
}
|
52
|
+
|
53
|
+
function updateProductSetupState(NftId productNftId, StateId newState) external restricted() {
|
54
|
+
updateState(_toNftKey32(productNftId, PRODUCT()), newState);
|
55
|
+
}
|
56
|
+
|
57
|
+
//--- DistributionSetup ------------------------------------------------------//
|
58
|
+
function createDistributionSetup(NftId distributionNftId, ISetup.DistributionSetupInfo memory setup) external restricted() {
|
59
|
+
create(_toNftKey32(distributionNftId, DISTRIBUTION()), abi.encode(setup));
|
60
|
+
}
|
61
|
+
|
62
|
+
function updateDistributionSetup(NftId distributionNftId, ISetup.DistributionSetupInfo memory setup, StateId newState) external restricted() {
|
63
|
+
update(_toNftKey32(distributionNftId, DISTRIBUTION()), abi.encode(setup), newState);
|
64
|
+
}
|
65
|
+
|
66
|
+
function updateDistributionSetupState(NftId distributionNftId, StateId newState) external restricted() {
|
67
|
+
updateState(_toNftKey32(distributionNftId, DISTRIBUTION()), newState);
|
68
|
+
}
|
69
|
+
|
70
|
+
//--- PoolSetup ------------------------------------------------------//
|
71
|
+
function createPoolSetup(NftId poolNftId, IComponents.ComponentInfo memory info) external restricted() {
|
72
|
+
create(_toNftKey32(poolNftId, POOL()), abi.encode(info));
|
73
|
+
}
|
74
|
+
|
75
|
+
function updatePoolSetup(NftId poolNftId, IComponents.ComponentInfo memory info, StateId newState) external restricted() {
|
76
|
+
update(_toNftKey32(poolNftId, POOL()), abi.encode(info), newState);
|
77
|
+
}
|
78
|
+
|
79
|
+
function updatePoolSetupState(NftId poolNftId, StateId newState) external restricted() {
|
80
|
+
updateState(_toNftKey32(poolNftId, POOL()), newState);
|
81
|
+
}
|
82
|
+
|
83
|
+
//--- DistributorType -------------------------------------------------------//
|
84
|
+
function createDistributorType(DistributorType distributorType, IDistribution.DistributorTypeInfo memory info) external restricted() {
|
85
|
+
create(distributorType.toKey32(), abi.encode(info));
|
86
|
+
}
|
87
|
+
|
88
|
+
function updateDistributorType(DistributorType distributorType, IDistribution.DistributorTypeInfo memory info, StateId newState) external restricted() {
|
89
|
+
update(distributorType.toKey32(), abi.encode(info), newState);
|
90
|
+
}
|
91
|
+
|
92
|
+
function updateDistributorTypeState(DistributorType distributorType, StateId newState) external restricted() {
|
93
|
+
updateState(distributorType.toKey32(), newState);
|
94
|
+
}
|
95
|
+
|
96
|
+
//--- Distributor -------------------------------------------------------//
|
97
|
+
function createDistributor(NftId distributorNftId, IDistribution.DistributorInfo memory info) external restricted() {
|
98
|
+
create(_toNftKey32(distributorNftId, DISTRIBUTOR()), abi.encode(info));
|
99
|
+
}
|
100
|
+
|
101
|
+
function updateDistributor(NftId distributorNftId, IDistribution.DistributorInfo memory info, StateId newState) external restricted() {
|
102
|
+
update(_toNftKey32(distributorNftId, DISTRIBUTOR()), abi.encode(info), newState);
|
103
|
+
}
|
104
|
+
|
105
|
+
function updateDistributorState(NftId distributorNftId, StateId newState) external restricted() {
|
106
|
+
updateState(_toNftKey32(distributorNftId, DISTRIBUTOR()), newState);
|
107
|
+
}
|
108
|
+
|
109
|
+
//--- Referral ----------------------------------------------------------//
|
110
|
+
function createReferral(ReferralId referralId, IDistribution.ReferralInfo memory referralInfo) external restricted() {
|
111
|
+
create(referralId.toKey32(), abi.encode(referralInfo));
|
112
|
+
}
|
113
|
+
|
114
|
+
function updateReferral(ReferralId referralId, IDistribution.ReferralInfo memory referralInfo, StateId newState) external restricted() {
|
115
|
+
update(referralId.toKey32(), abi.encode(referralInfo), newState);
|
116
|
+
}
|
117
|
+
|
118
|
+
function updateReferralState(ReferralId referralId, StateId newState) external restricted() {
|
119
|
+
updateState(referralId.toKey32(), newState);
|
120
|
+
}
|
121
|
+
|
122
|
+
//--- Bundle ------------------------------------------------------------//
|
123
|
+
function createBundle(NftId bundleNftId, IBundle.BundleInfo memory bundle) external restricted() {
|
124
|
+
create(_toNftKey32(bundleNftId, BUNDLE()), abi.encode(bundle));
|
125
|
+
}
|
126
|
+
|
127
|
+
function updateBundle(NftId bundleNftId, IBundle.BundleInfo memory bundle, StateId newState) external restricted() {
|
128
|
+
update(_toNftKey32(bundleNftId, BUNDLE()), abi.encode(bundle), newState);
|
129
|
+
}
|
130
|
+
|
131
|
+
function updateBundleState(NftId bundleNftId, StateId newState) external restricted() {
|
132
|
+
updateState(_toNftKey32(bundleNftId, BUNDLE()), newState);
|
133
|
+
}
|
134
|
+
|
135
|
+
//--- Risk --------------------------------------------------------------//
|
136
|
+
function createRisk(RiskId riskId, IRisk.RiskInfo memory risk) external restricted() {
|
137
|
+
create(riskId.toKey32(), abi.encode(risk));
|
138
|
+
}
|
139
|
+
|
140
|
+
function updateRisk(RiskId riskId, IRisk.RiskInfo memory risk, StateId newState) external restricted() {
|
141
|
+
update(riskId.toKey32(), abi.encode(risk), newState);
|
142
|
+
}
|
143
|
+
|
144
|
+
function updateRiskState(RiskId riskId, StateId newState) external restricted() {
|
145
|
+
updateState(riskId.toKey32(), newState);
|
146
|
+
}
|
147
|
+
|
148
|
+
//--- Application (Policy) ----------------------------------------------//
|
149
|
+
function createApplication(NftId applicationNftId, IPolicy.PolicyInfo memory policy) external restricted() {
|
150
|
+
create(_toNftKey32(applicationNftId, POLICY()), abi.encode(policy));
|
151
|
+
}
|
152
|
+
|
153
|
+
function updateApplication(NftId applicationNftId, IPolicy.PolicyInfo memory policy, StateId newState) external restricted() {
|
154
|
+
update(_toNftKey32(applicationNftId, POLICY()), abi.encode(policy), newState);
|
155
|
+
}
|
156
|
+
|
157
|
+
function updateApplicationState(NftId applicationNftId, StateId newState) external restricted() {
|
158
|
+
updateState(_toNftKey32(applicationNftId, POLICY()), newState);
|
159
|
+
}
|
160
|
+
|
161
|
+
//--- Policy ------------------------------------------------------------//
|
162
|
+
function updatePolicy(NftId policyNftId, IPolicy.PolicyInfo memory policy, StateId newState) external restricted() {
|
163
|
+
update(_toNftKey32(policyNftId, POLICY()), abi.encode(policy), newState);
|
164
|
+
}
|
165
|
+
|
166
|
+
function updatePolicyState(NftId policyNftId, StateId newState) external restricted() {
|
167
|
+
updateState(_toNftKey32(policyNftId, POLICY()), newState);
|
168
|
+
}
|
169
|
+
|
170
|
+
//--- Claim -------------------------------------------------------------//
|
171
|
+
function createClaim(NftId policyNftId, ClaimId claimId, IPolicy.ClaimInfo memory claim) external restricted() {
|
172
|
+
create(_toClaimKey32(policyNftId, claimId), abi.encode(claim));
|
173
|
+
}
|
174
|
+
|
175
|
+
function updateClaim(NftId policyNftId, ClaimId claimId, IPolicy.ClaimInfo memory claim, StateId newState) external restricted() {
|
176
|
+
update(_toClaimKey32(policyNftId, claimId), abi.encode(claim), newState);
|
177
|
+
}
|
178
|
+
|
179
|
+
function updateClaimState(NftId policyNftId, ClaimId claimId, StateId newState) external restricted() {
|
180
|
+
updateState(_toClaimKey32(policyNftId, claimId), newState);
|
181
|
+
}
|
182
|
+
|
183
|
+
//--- Payout ------------------------------------------------------------//
|
184
|
+
function createPayout(NftId policyNftId, PayoutId payoutId, IPolicy.PayoutInfo memory payout) external restricted() {
|
185
|
+
create(_toPayoutKey32(policyNftId, payoutId), abi.encode(payout));
|
186
|
+
}
|
187
|
+
|
188
|
+
function updatePayout(NftId policyNftId, PayoutId payoutId, IPolicy.PayoutInfo memory payout, StateId newState) external restricted() {
|
189
|
+
update(_toPayoutKey32(policyNftId, payoutId), abi.encode(payout), newState);
|
190
|
+
}
|
191
|
+
|
192
|
+
function updatePayoutState(NftId policyNftId, PayoutId payoutId, StateId newState) external restricted() {
|
193
|
+
updateState(_toPayoutKey32(policyNftId, payoutId), newState);
|
194
|
+
}
|
195
|
+
|
196
|
+
//--- internal view/pure functions --------------------------------------//
|
197
|
+
function _toNftKey32(NftId nftId, ObjectType objectType) private pure returns (Key32) {
|
198
|
+
return nftId.toKey32(objectType);
|
199
|
+
}
|
200
|
+
|
201
|
+
function _toClaimKey32(NftId policyNftId, ClaimId claimId) private pure returns (Key32) {
|
202
|
+
return claimId.toKey32(policyNftId);
|
203
|
+
}
|
204
|
+
|
205
|
+
function _toPayoutKey32(NftId policyNftId, PayoutId payoutId) private pure returns (Key32) {
|
206
|
+
return payoutId.toKey32(policyNftId);
|
207
|
+
}
|
208
|
+
}
|