@etherisc/gif-next 0.0.2-f2b0fa2-473 → 0.0.2-f4f2d93-430
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 +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 +948 -229
- package/artifacts/contracts/components/IComponent.sol/IComponent.dbg.json +4 -0
- package/artifacts/contracts/{shared/RegisterableUpgradable.sol/RegisterableUpgradable.json → components/IComponent.sol/IComponent.json} +295 -132
- 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} +91 -2
- package/artifacts/contracts/instance/IInstance.sol/IInstance.dbg.json +1 -1
- package/artifacts/contracts/instance/IInstance.sol/IInstance.json +2200 -184
- package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.dbg.json +1 -1
- package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.json +368 -156
- package/artifacts/contracts/instance/Instance.sol/Instance.dbg.json +1 -1
- package/artifacts/contracts/instance/Instance.sol/Instance.json +1005 -1175
- 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 +242 -210
- package/artifacts/contracts/instance/InstanceService.sol/InstanceService.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceService.sol/InstanceService.json +666 -190
- package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.json +392 -75
- 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} +276 -150
- 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 +1039 -0
- package/artifacts/contracts/instance/service/ApplicationServiceManager.sol/ApplicationServiceManager.dbg.json +4 -0
- package/artifacts/contracts/instance/service/ApplicationServiceManager.sol/ApplicationServiceManager.json +673 -0
- package/artifacts/contracts/instance/service/BundleService.sol/BundleService.dbg.json +4 -0
- package/artifacts/contracts/instance/service/BundleService.sol/BundleService.json +1231 -0
- package/artifacts/contracts/instance/service/BundleServiceManager.sol/BundleServiceManager.dbg.json +4 -0
- package/artifacts/contracts/instance/service/BundleServiceManager.sol/BundleServiceManager.json +721 -0
- package/artifacts/contracts/instance/service/ClaimService.sol/ClaimService.dbg.json +4 -0
- package/artifacts/contracts/instance/service/ClaimService.sol/ClaimService.json +817 -0
- package/artifacts/contracts/instance/service/ClaimServiceManager.sol/ClaimServiceManager.dbg.json +4 -0
- package/artifacts/contracts/instance/service/ClaimServiceManager.sol/ClaimServiceManager.json +641 -0
- package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.dbg.json +4 -0
- package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.json +1798 -0
- package/artifacts/contracts/instance/service/DistributionServiceManager.sol/DistributionServiceManager.dbg.json +4 -0
- package/artifacts/contracts/instance/service/DistributionServiceManager.sol/DistributionServiceManager.json +805 -0
- package/artifacts/contracts/instance/service/IApplicationService.sol/IApplicationService.dbg.json +4 -0
- package/artifacts/contracts/instance/service/IApplicationService.sol/IApplicationService.json +622 -0
- package/artifacts/contracts/instance/service/IBundleService.sol/IBundleService.dbg.json +4 -0
- package/artifacts/contracts/instance/service/IBundleService.sol/IBundleService.json +659 -0
- package/artifacts/contracts/instance/service/IClaimService.sol/IClaimService.dbg.json +4 -0
- package/artifacts/contracts/instance/service/{IComponentOwnerService.sol/IComponentOwnerService.json → IClaimService.sol/IClaimService.json} +217 -208
- 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 +606 -0
- package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.json +437 -154
- 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 +1092 -0
- package/artifacts/contracts/instance/service/PolicyServiceManager.sol/PolicyServiceManager.dbg.json +4 -0
- package/artifacts/contracts/instance/service/PolicyServiceManager.sol/PolicyServiceManager.json +697 -0
- package/artifacts/contracts/instance/service/PoolService.sol/PoolService.dbg.json +4 -0
- package/artifacts/contracts/instance/service/PoolService.sol/PoolService.json +1237 -0
- package/artifacts/contracts/instance/service/PoolServiceManager.sol/PoolServiceManager.dbg.json +4 -0
- package/artifacts/contracts/instance/service/PoolServiceManager.sol/PoolServiceManager.json +661 -0
- package/artifacts/contracts/instance/service/ProductService.sol/ProductService.dbg.json +4 -0
- package/artifacts/contracts/instance/service/ProductService.sol/ProductService.json +840 -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 +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 +161 -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 +100 -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 +100 -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 +25 -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 +200 -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 +225 -181
- package/contracts/components/Product.sol +130 -134
- package/contracts/instance/AccessManagerUpgradeableInitializeable.sol +13 -0
- package/contracts/instance/BundleManager.sol +127 -0
- package/contracts/instance/Cloneable.sol +51 -0
- package/contracts/instance/IInstance.sol +81 -11
- package/contracts/instance/IInstanceService.sol +56 -1
- package/contracts/instance/Instance.sol +157 -265
- package/contracts/instance/InstanceAccessManager.sol +414 -175
- package/contracts/instance/InstanceReader.sol +40 -29
- package/contracts/instance/InstanceService.sol +447 -54
- package/contracts/instance/InstanceServiceManager.sol +11 -13
- 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 +11 -2
- 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 +30 -3
- package/contracts/instance/module/ISetup.sol +9 -19
- package/contracts/instance/service/ApplicationService.sol +350 -0
- package/contracts/instance/service/ApplicationServiceManager.sol +35 -0
- package/contracts/instance/service/BundleService.sol +431 -0
- package/contracts/instance/service/BundleServiceManager.sol +51 -0
- package/contracts/instance/service/ClaimService.sol +151 -0
- package/contracts/instance/service/ClaimServiceManager.sol +35 -0
- package/contracts/instance/service/DistributionService.sol +435 -0
- package/contracts/instance/service/DistributionServiceManager.sol +51 -0
- package/contracts/instance/service/IApplicationService.sol +82 -0
- package/contracts/instance/service/IBundleService.sol +93 -0
- package/contracts/instance/service/IClaimService.sol +61 -0
- package/contracts/instance/service/IDistributionService.sol +87 -0
- package/contracts/instance/service/IPolicyService.sol +72 -0
- package/contracts/instance/service/IPoolService.sol +79 -17
- package/contracts/instance/service/IProductService.sol +6 -73
- package/contracts/instance/service/PolicyService.sol +362 -0
- package/contracts/instance/service/PolicyServiceManager.sol +54 -0
- package/contracts/instance/service/PoolService.sol +303 -0
- package/contracts/instance/service/PoolServiceManager.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 +47 -14
- 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 +111 -268
- 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 +5 -4
- 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 +42 -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 +60 -0
- package/contracts/types/Blocknumber.sol +1 -0
- package/contracts/types/ClaimId.sol +52 -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 +10 -5
- package/contracts/types/PayoutId.sol +54 -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 +5 -0
- package/contracts/types/Timestamp.sol +13 -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/BaseComponent.sol/BaseComponent.json +0 -314
- 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 -1119
- 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/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 -114
- package/contracts/instance/AccessManagerSimple.sol +0 -682
- 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/service/ComponentOwnerService.sol +0 -317
- package/contracts/instance/service/IComponentOwnerService.sol +0 -20
- package/contracts/shared/RegisterableUpgradable.sol +0 -16
| @@ -1,186 +1,86 @@ | |
| 1 1 | 
             
            // SPDX-License-Identifier: Apache-2.0
         | 
| 2 2 | 
             
            pragma solidity ^0.8.20;
         | 
| 3 3 |  | 
| 4 | 
            -
            import { | 
| 5 | 
            -
            import {ShortString, ShortStrings} from "@openzeppelin/contracts/utils/ShortStrings.sol";
         | 
| 4 | 
            +
            import {AccessManagedUpgradeable} from "@openzeppelin/contracts-upgradeable/access/manager/AccessManagedUpgradeable.sol";
         | 
| 6 5 |  | 
| 7 | 
            -
            import {AccessManagedSimple} from "./AccessManagedSimple.sol";
         | 
| 8 | 
            -
            import {AccessManagerSimple} from "./AccessManagerSimple.sol";
         | 
| 9 | 
            -
            import {IAccess} from "./module/IAccess.sol";
         | 
| 10 | 
            -
            import {IBundle} from "./module/IBundle.sol";
         | 
| 11 | 
            -
            import {IPolicy} from "./module/IPolicy.sol";
         | 
| 12 | 
            -
            import {IRisk} from "./module/IRisk.sol";
         | 
| 13 | 
            -
            import {ISetup} from "./module/ISetup.sol";
         | 
| 14 6 | 
             
            import {Key32, KeyId, Key32Lib} from "../types/Key32.sol";
         | 
| 15 | 
            -
            import {KeyValueStore} from "./base/KeyValueStore.sol";
         | 
| 16 | 
            -
            import {IInstance} from "./IInstance.sol";
         | 
| 17 | 
            -
            import {InstanceReader} from "./InstanceReader.sol";
         | 
| 18 7 | 
             
            import {NftId} from "../types/NftId.sol";
         | 
| 8 | 
            +
            import {ClaimId} from "../types/ClaimId.sol";
         | 
| 19 9 | 
             
            import {NumberId} from "../types/NumberId.sol";
         | 
| 20 | 
            -
            import {ObjectType, BUNDLE, DISTRIBUTION, INSTANCE, POLICY, POOL, ROLE, PRODUCT, TARGET} from "../types/ObjectType.sol";
         | 
| 10 | 
            +
            import {ObjectType, BUNDLE, DISTRIBUTION, INSTANCE, POLICY, POOL, ROLE, PRODUCT, TARGET, COMPONENT, DISTRIBUTOR, DISTRIBUTOR_TYPE} from "../types/ObjectType.sol";
         | 
| 21 11 | 
             
            import {RiskId, RiskIdLib} from "../types/RiskId.sol";
         | 
| 22 | 
            -
            import {RoleId, RoleIdLib} from "../types/RoleId.sol";
         | 
| 12 | 
            +
            import {RoleId, RoleIdLib, INSTANCE_ROLE, INSTANCE_OWNER_ROLE} from "../types/RoleId.sol";
         | 
| 23 13 | 
             
            import {StateId, ACTIVE} from "../types/StateId.sol";
         | 
| 14 | 
            +
            import {TimestampLib} from "../types/Timestamp.sol";
         | 
| 15 | 
            +
            import {VersionPart, VersionPartLib} from "../types/Version.sol";
         | 
| 16 | 
            +
             | 
| 24 17 | 
             
            import {ERC165} from "../shared/ERC165.sol";
         | 
| 25 18 | 
             
            import {Registerable} from "../shared/Registerable.sol";
         | 
| 26 | 
            -
             | 
| 27 | 
            -
            import { | 
| 28 | 
            -
             | 
| 19 | 
            +
             | 
| 20 | 
            +
            import {IRegistry} from "../registry/IRegistry.sol";
         | 
| 21 | 
            +
             | 
| 22 | 
            +
            import {IInstance} from "./IInstance.sol";
         | 
| 23 | 
            +
            import {InstanceReader} from "./InstanceReader.sol";
         | 
| 24 | 
            +
            import {InstanceAccessManager} from "./InstanceAccessManager.sol";
         | 
| 25 | 
            +
            import {BundleManager} from "./BundleManager.sol";
         | 
| 26 | 
            +
             | 
| 27 | 
            +
            import {KeyValueStore} from "./base/KeyValueStore.sol";
         | 
| 28 | 
            +
             | 
| 29 | 
            +
            import {IAccess} from "./module/IAccess.sol";
         | 
| 30 | 
            +
            import {IBundle} from "./module/IBundle.sol";
         | 
| 31 | 
            +
            import {IComponents} from "./module/IComponents.sol";
         | 
| 32 | 
            +
            import {IDistribution} from "./module/IDistribution.sol";
         | 
| 33 | 
            +
            import {IPolicy} from "./module/IPolicy.sol";
         | 
| 34 | 
            +
            import {IRisk} from "./module/IRisk.sol";
         | 
| 35 | 
            +
            import {ISetup} from "./module/ISetup.sol";
         | 
| 36 | 
            +
             | 
| 37 | 
            +
            import {IDistributionService} from "./service/IDistributionService.sol";
         | 
| 38 | 
            +
            import {IPoolService} from "./service/IPoolService.sol";
         | 
| 39 | 
            +
            import {IProductService} from "./service/IProductService.sol";
         | 
| 40 | 
            +
            import {IPolicyService} from "./service/IPolicyService.sol";
         | 
| 41 | 
            +
            import {IBundleService} from "./service/IBundleService.sol";
         | 
| 42 | 
            +
            import {TokenHandler} from "../shared/TokenHandler.sol";
         | 
| 43 | 
            +
            import {VersionPart, VersionPartLib} from "../types/Version.sol";
         | 
| 29 44 |  | 
| 30 45 | 
             
            contract Instance is
         | 
| 31 | 
            -
                AccessManagedSimple,
         | 
| 32 | 
            -
                KeyValueStore,
         | 
| 33 46 | 
             
                IInstance,
         | 
| 34 | 
            -
                 | 
| 35 | 
            -
                Registerable
         | 
| 47 | 
            +
                AccessManagedUpgradeable,
         | 
| 48 | 
            +
                Registerable,
         | 
| 49 | 
            +
                KeyValueStore
         | 
| 36 50 | 
             
            {
         | 
| 37 51 |  | 
| 52 | 
            +
                uint256 public constant GIF_MAJOR_VERSION = 3;
         | 
| 53 | 
            +
             | 
| 38 54 | 
             
                uint64 public constant ADMIN_ROLE = type(uint64).min;
         | 
| 39 55 | 
             
                uint64 public constant PUBLIC_ROLE = type(uint64).max;
         | 
| 40 56 | 
             
                uint64 public constant CUSTOM_ROLE_ID_MIN = 10000;
         | 
| 41 57 |  | 
| 42 58 | 
             
                uint32 public constant EXECUTION_DELAY = 0;
         | 
| 43 59 |  | 
| 44 | 
            -
                 | 
| 45 | 
            -
                mapping(RoleId roleId => EnumerableSet.AddressSet roleMembers) internal _roleMembers; 
         | 
| 46 | 
            -
                RoleId [] internal _roles;
         | 
| 60 | 
            +
                bool private _initialized;
         | 
| 47 61 |  | 
| 48 | 
            -
                 | 
| 49 | 
            -
             | 
| 50 | 
            -
                AccessManagerSimple internal _accessManager;
         | 
| 62 | 
            +
                InstanceAccessManager internal _accessManager;
         | 
| 51 63 | 
             
                InstanceReader internal _instanceReader;
         | 
| 64 | 
            +
                BundleManager internal _bundleManager;
         | 
| 52 65 |  | 
| 53 | 
            -
                 | 
| 54 | 
            -
                     | 
| 55 | 
            -
             | 
| 56 | 
            -
                    // TODO move to initializer method and remove constructor - required for the instance to be cloneable
         | 
| 57 | 
            -
                    _accessManager = AccessManagerSimple(accessManagerAddress);
         | 
| 58 | 
            -
                    _createRole(RoleIdLib.toRoleId(ADMIN_ROLE), "AdminRole", false, false);
         | 
| 59 | 
            -
                    _createRole(RoleIdLib.toRoleId(PUBLIC_ROLE), "PublicRole", false, false);
         | 
| 60 | 
            -
             | 
| 61 | 
            -
                    _initializeRegisterable(registryAddress, registryNftId, INSTANCE(), false, msg.sender, "");
         | 
| 62 | 
            -
             | 
| 63 | 
            -
                    _registerInterface(type(IInstance).interfaceId);
         | 
| 64 | 
            -
                }
         | 
| 65 | 
            -
             | 
| 66 | 
            -
                //--- Role ------------------------------------------------------//
         | 
| 67 | 
            -
                function createStandardRole(RoleId roleId, string memory name) external restricted() {
         | 
| 68 | 
            -
                    _createRole(roleId, name, false, true);
         | 
| 69 | 
            -
                }
         | 
| 70 | 
            -
             | 
| 71 | 
            -
                function createCustomRole(RoleId roleId, string memory name) external restricted() {
         | 
| 72 | 
            -
                    _createRole(roleId, name, true, true);
         | 
| 73 | 
            -
                }
         | 
| 74 | 
            -
             | 
| 75 | 
            -
                function updateRole(RoleId roleId, string memory name, StateId newState) external restricted() {
         | 
| 76 | 
            -
                    (bool isCustom,) = _validateRoleParameters(roleId, name, false);
         | 
| 77 | 
            -
                    IAccess.RoleInfo memory role = _toRole(roleId, name, isCustom);
         | 
| 78 | 
            -
                    update(toRoleKey32(roleId), abi.encode(role), newState);
         | 
| 79 | 
            -
                }
         | 
| 80 | 
            -
             | 
| 81 | 
            -
                function updateRoleState(RoleId roleId, StateId newState) external restricted() {
         | 
| 82 | 
            -
                    updateState(toRoleKey32(roleId), newState);
         | 
| 83 | 
            -
                }
         | 
| 84 | 
            -
             | 
| 85 | 
            -
                function grantRole(RoleId roleId, address member) external restricted() returns (bool granted) {
         | 
| 86 | 
            -
                    Key32 roleKey = toRoleKey32(roleId);
         | 
| 87 | 
            -
             | 
| 88 | 
            -
                    if (!exists(roleKey)) {
         | 
| 89 | 
            -
                        revert IAccess.ErrorGrantNonexstentRole(roleId);
         | 
| 90 | 
            -
                    }
         | 
| 91 | 
            -
             | 
| 92 | 
            -
                    if (getState(roleKey) != ACTIVE()) {
         | 
| 93 | 
            -
                        revert IAccess.ErrorRoleIdNotActive(roleId);
         | 
| 94 | 
            -
                    }
         | 
| 95 | 
            -
             | 
| 96 | 
            -
                    if (!EnumerableSet.contains(_roleMembers[roleId], member)) {
         | 
| 97 | 
            -
                        _accessManager.grantRole(roleId.toInt(), member, EXECUTION_DELAY);
         | 
| 98 | 
            -
                        EnumerableSet.add(_roleMembers[roleId], member);
         | 
| 99 | 
            -
                        return true;
         | 
| 100 | 
            -
                    }
         | 
| 101 | 
            -
             | 
| 102 | 
            -
                    return false;
         | 
| 103 | 
            -
                }
         | 
| 104 | 
            -
             | 
| 105 | 
            -
                function revokeRole(RoleId roleId, address member) external restricted() returns (bool revoked) {
         | 
| 106 | 
            -
                    Key32 roleKey = toRoleKey32(roleId);
         | 
| 107 | 
            -
             | 
| 108 | 
            -
                    if (!exists(roleKey)) {
         | 
| 109 | 
            -
                        revert IAccess.ErrorRevokeNonexstentRole(roleId);
         | 
| 110 | 
            -
                    }
         | 
| 111 | 
            -
             | 
| 112 | 
            -
                    if (EnumerableSet.contains(_roleMembers[roleId], member)) {
         | 
| 113 | 
            -
                        _accessManager.revokeRole(roleId.toInt(), member);
         | 
| 114 | 
            -
                        EnumerableSet.remove(_roleMembers[roleId], member);
         | 
| 115 | 
            -
                        return true;
         | 
| 66 | 
            +
                modifier onlyChainNft() {
         | 
| 67 | 
            +
                    if(msg.sender != getRegistry().getChainNftAddress()) {
         | 
| 68 | 
            +
                        revert();
         | 
| 116 69 | 
             
                    }
         | 
| 117 | 
            -
             | 
| 118 | 
            -
                    return false;
         | 
| 119 | 
            -
                }
         | 
| 120 | 
            -
             | 
| 121 | 
            -
                /// @dev not restricted function by intention
         | 
| 122 | 
            -
                /// the restriction to role members is already enforced by the call to the access manger
         | 
| 123 | 
            -
                function renounceRole(RoleId roleId) external returns (bool revoked) {
         | 
| 124 | 
            -
                    address member = msg.sender;
         | 
| 125 | 
            -
                    Key32 roleKey = toRoleKey32(roleId);
         | 
| 126 | 
            -
             | 
| 127 | 
            -
                    if (!exists(roleKey)) {
         | 
| 128 | 
            -
                        revert IAccess.ErrorRenounceNonexstentRole(roleId);
         | 
| 129 | 
            -
                    }
         | 
| 130 | 
            -
             | 
| 131 | 
            -
                    if (EnumerableSet.contains(_roleMembers[roleId], member)) {
         | 
| 132 | 
            -
                        _accessManager.renounceRole(roleId.toInt(), member);
         | 
| 133 | 
            -
                        EnumerableSet.remove(_roleMembers[roleId], member);
         | 
| 134 | 
            -
                        return true;
         | 
| 135 | 
            -
                    }
         | 
| 136 | 
            -
             | 
| 137 | 
            -
                    return false;
         | 
| 138 | 
            -
                }
         | 
| 139 | 
            -
             | 
| 140 | 
            -
                function roles() external view returns (uint256 numberOfRoles) {
         | 
| 141 | 
            -
                    return _roles.length;
         | 
| 142 | 
            -
                }
         | 
| 143 | 
            -
             | 
| 144 | 
            -
                function getRoleId(uint256 idx) external view returns (RoleId roleId) {
         | 
| 145 | 
            -
                    return _roles[idx];
         | 
| 146 | 
            -
                }
         | 
| 147 | 
            -
             | 
| 148 | 
            -
                function getRole(RoleId roleId) external view returns (IAccess.RoleInfo memory role) {
         | 
| 149 | 
            -
                    return abi.decode(getData(roleId.toKey32()), (IAccess.RoleInfo));
         | 
| 150 | 
            -
                }
         | 
| 151 | 
            -
             | 
| 152 | 
            -
                function roleMembers(RoleId roleId) external view returns (uint256 numberOfMembers) {
         | 
| 153 | 
            -
                    return EnumerableSet.length(_roleMembers[roleId]);
         | 
| 70 | 
            +
                    _;
         | 
| 154 71 | 
             
                }
         | 
| 155 72 |  | 
| 156 | 
            -
                function  | 
| 157 | 
            -
                     | 
| 158 | 
            -
             | 
| 159 | 
            -
             | 
| 160 | 
            -
             | 
| 161 | 
            -
                     | 
| 162 | 
            -
             | 
| 163 | 
            -
                     | 
| 164 | 
            -
             | 
| 165 | 
            -
                    IAccess.RoleInfo memory role = _toRole(roleId, name, isCustom);
         | 
| 166 | 
            -
                    _role[role.name] = roleId;
         | 
| 167 | 
            -
                    _roles.push(roleId);
         | 
| 168 | 
            -
             | 
| 169 | 
            -
                    create(toRoleKey32(roleId), abi.encode(role));
         | 
| 170 | 
            -
                }
         | 
| 171 | 
            -
             | 
| 172 | 
            -
                //--- Target ------------------------------------------------------//
         | 
| 173 | 
            -
                function createTarget(address target, IAccess.TargetInfo memory targetInfo) external restricted() {
         | 
| 174 | 
            -
                    _validateTargetParameters(target, targetInfo);
         | 
| 175 | 
            -
                    create(toTargetKey32(target), abi.encode(targetInfo));
         | 
| 176 | 
            -
                }
         | 
| 177 | 
            -
             | 
| 178 | 
            -
                function setTargetClosed(address target, bool closed) external restricted() {
         | 
| 179 | 
            -
                    if (!exists(toTargetKey32(target))) {
         | 
| 180 | 
            -
                        revert IAccess.ErrorTargetDoesNotExist(target);
         | 
| 181 | 
            -
                    }
         | 
| 73 | 
            +
                function initialize(address authority, address registryAddress, address initialOwner) 
         | 
| 74 | 
            +
                    public 
         | 
| 75 | 
            +
                    initializer()
         | 
| 76 | 
            +
                {
         | 
| 77 | 
            +
                    __AccessManaged_init(authority);
         | 
| 78 | 
            +
                    
         | 
| 79 | 
            +
                    IRegistry registry = IRegistry(registryAddress);
         | 
| 80 | 
            +
                    initializeRegisterable(registryAddress, registry.getNftId(), INSTANCE(), true, initialOwner, "");
         | 
| 81 | 
            +
                    initializeLifecycle();
         | 
| 182 82 |  | 
| 183 | 
            -
                     | 
| 83 | 
            +
                    registerInterface(type(IInstance).interfaceId);    
         | 
| 184 84 | 
             
                }
         | 
| 185 85 |  | 
| 186 86 | 
             
                //--- ProductSetup ------------------------------------------------------//
         | 
| @@ -210,55 +110,55 @@ contract Instance is | |
| 210 110 | 
             
                }
         | 
| 211 111 |  | 
| 212 112 | 
             
                //--- PoolSetup ------------------------------------------------------//
         | 
| 213 | 
            -
                function createPoolSetup(NftId  | 
| 214 | 
            -
                    create(_toNftKey32( | 
| 113 | 
            +
                function createPoolSetup(NftId poolNftId, IComponents.ComponentInfo memory info) external restricted() {
         | 
| 114 | 
            +
                    create(_toNftKey32(poolNftId, POOL()), abi.encode(info));
         | 
| 215 115 | 
             
                }
         | 
| 216 116 |  | 
| 217 | 
            -
                function updatePoolSetup(NftId  | 
| 218 | 
            -
                    update(_toNftKey32( | 
| 117 | 
            +
                function updatePoolSetup(NftId poolNftId, IComponents.ComponentInfo memory info, StateId newState) external restricted() {
         | 
| 118 | 
            +
                    update(_toNftKey32(poolNftId, POOL()), abi.encode(info), newState);
         | 
| 219 119 | 
             
                }
         | 
| 220 120 |  | 
| 221 | 
            -
                function updatePoolSetupState(NftId  | 
| 222 | 
            -
                    updateState(_toNftKey32( | 
| 121 | 
            +
                function updatePoolSetupState(NftId poolNftId, StateId newState) external restricted() {
         | 
| 122 | 
            +
                    updateState(_toNftKey32(poolNftId, POOL()), newState);
         | 
| 223 123 | 
             
                }
         | 
| 224 124 |  | 
| 225 | 
            -
                //--- DistributorType  | 
| 226 | 
            -
                function createDistributorType( | 
| 227 | 
            -
                    create( | 
| 125 | 
            +
                //--- DistributorType -------------------------------------------------------//
         | 
| 126 | 
            +
                function createDistributorType(Key32 distributorKey, IDistribution.DistributorTypeInfo memory info) external restricted() {
         | 
| 127 | 
            +
                    create(distributorKey, abi.encode(info));
         | 
| 228 128 | 
             
                }
         | 
| 229 129 |  | 
| 230 | 
            -
                function updateDistributorType( | 
| 231 | 
            -
                    update( | 
| 130 | 
            +
                function updateDistributorType(Key32 distributorKey, IDistribution.DistributorTypeInfo memory info, StateId newState) external restricted() {
         | 
| 131 | 
            +
                    update(distributorKey, abi.encode(info), newState);
         | 
| 232 132 | 
             
                }
         | 
| 233 133 |  | 
| 234 | 
            -
                function updateDistributorTypeState( | 
| 235 | 
            -
                    updateState( | 
| 134 | 
            +
                function updateDistributorTypeState(Key32 distributorKey, StateId newState) external restricted() {
         | 
| 135 | 
            +
                    updateState(distributorKey, newState);
         | 
| 236 136 | 
             
                }
         | 
| 237 137 |  | 
| 238 138 | 
             
                //--- Distributor -------------------------------------------------------//
         | 
| 239 | 
            -
                function createDistributor(NftId  | 
| 240 | 
            -
                    create( | 
| 139 | 
            +
                function createDistributor(NftId nftId, IDistribution.DistributorInfo memory info) external restricted() {
         | 
| 140 | 
            +
                    create(toDistributorKey32(nftId), abi.encode(info));
         | 
| 241 141 | 
             
                }
         | 
| 242 142 |  | 
| 243 | 
            -
                function updateDistributor(NftId  | 
| 244 | 
            -
                    update( | 
| 143 | 
            +
                function updateDistributor(NftId nftId, IDistribution.DistributorInfo memory info, StateId newState) external restricted() {
         | 
| 144 | 
            +
                    update(toDistributorKey32(nftId), abi.encode(info), newState);
         | 
| 245 145 | 
             
                }
         | 
| 246 146 |  | 
| 247 | 
            -
                function updateDistributorState(NftId  | 
| 248 | 
            -
                    updateState( | 
| 147 | 
            +
                function updateDistributorState(NftId nftId, StateId newState) external restricted() {
         | 
| 148 | 
            +
                    updateState(toDistributorKey32(nftId), newState);
         | 
| 249 149 | 
             
                }
         | 
| 250 150 |  | 
| 251 151 | 
             
                //--- Referral ----------------------------------------------------------//
         | 
| 252 | 
            -
                function createReferral( | 
| 253 | 
            -
                    create( | 
| 152 | 
            +
                function createReferral(Key32 referralKey, IDistribution.ReferralInfo memory referralInfo) external restricted() {
         | 
| 153 | 
            +
                    create(referralKey, abi.encode(referralInfo));
         | 
| 254 154 | 
             
                }
         | 
| 255 155 |  | 
| 256 | 
            -
                function updateReferral( | 
| 257 | 
            -
                    update( | 
| 156 | 
            +
                function updateReferral(Key32 referralKey, IDistribution.ReferralInfo memory referralInfo, StateId newState) external restricted() {
         | 
| 157 | 
            +
                    update(referralKey, abi.encode(referralInfo), newState);
         | 
| 258 158 | 
             
                }
         | 
| 259 159 |  | 
| 260 | 
            -
                function updateReferralState( | 
| 261 | 
            -
                    updateState( | 
| 160 | 
            +
                function updateReferralState(Key32 referralKey, StateId newState) external restricted() {
         | 
| 161 | 
            +
                    updateState(referralKey, newState);
         | 
| 262 162 | 
             
                }
         | 
| 263 163 |  | 
| 264 164 | 
             
                //--- Bundle ------------------------------------------------------------//
         | 
| @@ -287,11 +187,20 @@ contract Instance is | |
| 287 187 | 
             
                    updateState(riskId.toKey32(), newState);
         | 
| 288 188 | 
             
                }
         | 
| 289 189 |  | 
| 290 | 
            -
                //--- Policy  | 
| 291 | 
            -
                function  | 
| 292 | 
            -
                    create(toPolicyKey32( | 
| 190 | 
            +
                //--- Application (Policy) ----------------------------------------------//
         | 
| 191 | 
            +
                function createApplication(NftId applicationNftId, IPolicy.PolicyInfo memory policy) external restricted() {
         | 
| 192 | 
            +
                    create(toPolicyKey32(applicationNftId), abi.encode(policy));
         | 
| 193 | 
            +
                }
         | 
| 194 | 
            +
             | 
| 195 | 
            +
                function updateApplication(NftId applicationNftId, IPolicy.PolicyInfo memory policy, StateId newState) external restricted() {
         | 
| 196 | 
            +
                    update(toPolicyKey32(applicationNftId), abi.encode(policy), newState);
         | 
| 197 | 
            +
                }
         | 
| 198 | 
            +
             | 
| 199 | 
            +
                function updateApplicationState(NftId applicationNftId, StateId newState) external restricted() {
         | 
| 200 | 
            +
                    updateState(toPolicyKey32(applicationNftId), newState);
         | 
| 293 201 | 
             
                }
         | 
| 294 202 |  | 
| 203 | 
            +
                //--- Policy ------------------------------------------------------------//
         | 
| 295 204 | 
             
                function updatePolicy(NftId policyNftId, IPolicy.PolicyInfo memory policy, StateId newState) external restricted() {
         | 
| 296 205 | 
             
                    update(toPolicyKey32(policyNftId), abi.encode(policy), newState);
         | 
| 297 206 | 
             
                }
         | 
| @@ -301,15 +210,15 @@ contract Instance is | |
| 301 210 | 
             
                }
         | 
| 302 211 |  | 
| 303 212 | 
             
                //--- Claim -------------------------------------------------------------//
         | 
| 304 | 
            -
                function createClaim(NftId policyNftId,  | 
| 213 | 
            +
                function createClaim(NftId policyNftId, ClaimId claimId, IPolicy.ClaimInfo memory claim) external restricted() {
         | 
| 305 214 | 
             
                    create(toPolicyKey32(policyNftId), abi.encode(claim));
         | 
| 306 215 | 
             
                }
         | 
| 307 216 |  | 
| 308 | 
            -
                function updateClaim(NftId policyNftId,  | 
| 217 | 
            +
                function updateClaim(NftId policyNftId, ClaimId claimId, IPolicy.ClaimInfo memory claim, StateId newState) external restricted() {
         | 
| 309 218 | 
             
                    update(toPolicyKey32(policyNftId), abi.encode(claim), newState);
         | 
| 310 219 | 
             
                }
         | 
| 311 220 |  | 
| 312 | 
            -
                function updateClaimState(NftId policyNftId, StateId newState) external restricted() {
         | 
| 221 | 
            +
                function updateClaimState(NftId policyNftId, ClaimId claimId, StateId newState) external restricted() {
         | 
| 313 222 | 
             
                    updateState(toPolicyKey32(policyNftId), newState);
         | 
| 314 223 | 
             
                }
         | 
| 315 224 |  | 
| @@ -318,7 +227,7 @@ contract Instance is | |
| 318 227 | 
             
                    create(toPolicyKey32(policyNftId), abi.encode(payout));
         | 
| 319 228 | 
             
                }
         | 
| 320 229 |  | 
| 321 | 
            -
                function  | 
| 230 | 
            +
                function updatePayout(NftId policyNftId, NumberId payoutId, IPolicy.PayoutInfo memory payout, StateId newState) external restricted() {
         | 
| 322 231 | 
             
                    update(toPolicyKey32(policyNftId), abi.encode(payout), newState);
         | 
| 323 232 | 
             
                }
         | 
| 324 233 |  | 
| @@ -326,72 +235,18 @@ contract Instance is | |
| 326 235 | 
             
                    updateState(toPolicyKey32(policyNftId), newState);
         | 
| 327 236 | 
             
                }
         | 
| 328 237 |  | 
| 329 | 
            -
                //---  | 
| 330 | 
            -
                function  | 
| 331 | 
            -
                     | 
| 332 | 
            -
                     | 
| 333 | 
            -
                    returns (IAccess.RoleInfo memory role)
         | 
| 334 | 
            -
                {
         | 
| 335 | 
            -
                    return IAccess.RoleInfo(
         | 
| 336 | 
            -
                        ShortStrings.toShortString(name), 
         | 
| 337 | 
            -
                        isCustom);
         | 
| 338 | 
            -
                }
         | 
| 339 | 
            -
             | 
| 340 | 
            -
                function _validateRoleParameters(
         | 
| 341 | 
            -
                    RoleId roleId, 
         | 
| 342 | 
            -
                    string memory name, 
         | 
| 343 | 
            -
                    bool isCustom
         | 
| 344 | 
            -
                )
         | 
| 345 | 
            -
                    internal
         | 
| 346 | 
            -
                    view 
         | 
| 347 | 
            -
                    returns (
         | 
| 348 | 
            -
                        bool roleExists,
         | 
| 349 | 
            -
                        bool roleIsCustom
         | 
| 350 | 
            -
                    )
         | 
| 351 | 
            -
                {
         | 
| 352 | 
            -
                    Key32 roleKey = toRoleKey32(roleId);
         | 
| 353 | 
            -
                    roleExists = exists(roleKey);
         | 
| 354 | 
            -
                    if (roleExists) {
         | 
| 355 | 
            -
                        roleIsCustom = abi.decode(getData(roleKey), (IAccess.RoleInfo)).isCustom;
         | 
| 356 | 
            -
                    } else {
         | 
| 357 | 
            -
                        roleIsCustom = isCustom;
         | 
| 358 | 
            -
                    }
         | 
| 359 | 
            -
             | 
| 360 | 
            -
                    // check role id
         | 
| 361 | 
            -
                    uint64 roleIdInt = RoleId.unwrap(roleId);
         | 
| 362 | 
            -
                    if(roleIdInt == ADMIN_ROLE || roleIdInt == PUBLIC_ROLE) {
         | 
| 363 | 
            -
                        revert IAccess.ErrorRoleIdInvalid(roleId); 
         | 
| 364 | 
            -
                    }
         | 
| 365 | 
            -
             | 
| 366 | 
            -
                    if (roleIsCustom && roleIdInt < CUSTOM_ROLE_ID_MIN) {
         | 
| 367 | 
            -
                        revert IAccess.ErrorRoleIdTooSmall(roleId); 
         | 
| 368 | 
            -
                    } else if (roleIsCustom && roleIdInt >= CUSTOM_ROLE_ID_MIN) {
         | 
| 369 | 
            -
                        revert IAccess.ErrorRoleIdTooBig(roleId); 
         | 
| 370 | 
            -
                    }
         | 
| 371 | 
            -
             | 
| 372 | 
            -
                    // role name checks
         | 
| 373 | 
            -
                    ShortString nameShort = ShortStrings.toShortString(name);
         | 
| 374 | 
            -
                    if (ShortStrings.byteLength(nameShort) == 0) {
         | 
| 375 | 
            -
                        revert IAccess.ErrorRoleNameEmpty(roleId);
         | 
| 376 | 
            -
                    }
         | 
| 377 | 
            -
             | 
| 378 | 
            -
                    if (_role[nameShort] != RoleIdLib.zero() && _role[nameShort] != roleId) {
         | 
| 379 | 
            -
                        revert IAccess.ErrorRoleNameNotUnique(_role[nameShort], nameShort);
         | 
| 380 | 
            -
                    }
         | 
| 381 | 
            -
                }
         | 
| 382 | 
            -
             | 
| 383 | 
            -
                function _validateTargetParameters(address target, IAccess.TargetInfo memory targetInfo) internal view {
         | 
| 384 | 
            -
             | 
| 385 | 
            -
                }
         | 
| 386 | 
            -
             | 
| 387 | 
            -
                function toRoleKey32(RoleId roleId) public pure returns (Key32) {
         | 
| 388 | 
            -
                    return roleId.toKey32();
         | 
| 238 | 
            +
                //--- ITransferInterceptor ------------------------------------------------------------//
         | 
| 239 | 
            +
                function nftMint(address to, uint256 tokenId) external onlyChainNft {
         | 
| 240 | 
            +
                    assert(_accessManager.roleMembers(INSTANCE_OWNER_ROLE()) == 0);// temp
         | 
| 241 | 
            +
                    assert(_accessManager.grantRole(INSTANCE_OWNER_ROLE(), to) == true);
         | 
| 389 242 | 
             
                }
         | 
| 390 243 |  | 
| 391 | 
            -
                function  | 
| 392 | 
            -
                     | 
| 244 | 
            +
                function nftTransferFrom(address from, address to, uint256 tokenId) external onlyChainNft {
         | 
| 245 | 
            +
                    assert(_accessManager.revokeRole(INSTANCE_OWNER_ROLE(), from) == true);
         | 
| 246 | 
            +
                    assert(_accessManager.grantRole(INSTANCE_OWNER_ROLE(), to) == true);
         | 
| 393 247 | 
             
                }
         | 
| 394 248 |  | 
| 249 | 
            +
                //--- internal view/pure functions --------------------------------------//
         | 
| 395 250 | 
             
                function _toNftKey32(NftId nftId, ObjectType objectType) internal pure returns (Key32) {
         | 
| 396 251 | 
             
                    return nftId.toKey32(objectType);
         | 
| 397 252 | 
             
                }
         | 
| @@ -404,33 +259,70 @@ contract Instance is | |
| 404 259 | 
             
                    return policyNftId.toKey32(POLICY());
         | 
| 405 260 | 
             
                }
         | 
| 406 261 |  | 
| 407 | 
            -
                function  | 
| 408 | 
            -
                    return  | 
| 262 | 
            +
                function toDistributionKey32(NftId distNftId) public pure returns (Key32) {
         | 
| 263 | 
            +
                    return distNftId.toKey32(DISTRIBUTION());
         | 
| 264 | 
            +
                }
         | 
| 265 | 
            +
             | 
| 266 | 
            +
                function toDistributorTypeKey32(NftId distNftId) public pure returns (Key32) {
         | 
| 267 | 
            +
                    return distNftId.toKey32(DISTRIBUTOR_TYPE());
         | 
| 268 | 
            +
                }
         | 
| 269 | 
            +
             | 
| 270 | 
            +
                function toDistributorKey32(NftId distNftId) public pure returns (Key32) {
         | 
| 271 | 
            +
                    return distNftId.toKey32(DISTRIBUTOR());
         | 
| 272 | 
            +
                }
         | 
| 273 | 
            +
                
         | 
| 274 | 
            +
                function getDistributionService() external view returns (IDistributionService) {
         | 
| 275 | 
            +
                    return IDistributionService(getRegistry().getServiceAddress(DISTRIBUTION(), VersionPart.wrap(3)));
         | 
| 276 | 
            +
                }
         | 
| 277 | 
            +
             | 
| 278 | 
            +
                function getProductService() external view returns (IProductService) {
         | 
| 279 | 
            +
                    return IProductService(getRegistry().getServiceAddress(PRODUCT(), VersionPart.wrap(3)));
         | 
| 409 280 | 
             
                }
         | 
| 410 281 |  | 
| 411 | 
            -
                 | 
| 412 | 
            -
             | 
| 413 | 
            -
                 | 
| 414 | 
            -
                // }
         | 
| 282 | 
            +
                function getPoolService() external view returns (IPoolService) {
         | 
| 283 | 
            +
                    return IPoolService(getRegistry().getServiceAddress(POOL(), VersionPart.wrap(3)));
         | 
| 284 | 
            +
                }
         | 
| 415 285 |  | 
| 416 | 
            -
                 | 
| 417 | 
            -
             | 
| 418 | 
            -
                 | 
| 419 | 
            -
                // }
         | 
| 286 | 
            +
                function getPolicyService() external view returns (IPolicyService) {
         | 
| 287 | 
            +
                    return IPolicyService(getRegistry().getServiceAddress(POLICY(), VersionPart.wrap(3)));
         | 
| 288 | 
            +
                }
         | 
| 420 289 |  | 
| 421 | 
            -
                 | 
| 422 | 
            -
             | 
| 423 | 
            -
                 | 
| 424 | 
            -
                // }
         | 
| 290 | 
            +
                function getBundleService() external view returns (IBundleService) {
         | 
| 291 | 
            +
                    return IBundleService(getRegistry().getServiceAddress(BUNDLE(), VersionPart.wrap(3)));
         | 
| 292 | 
            +
                }
         | 
| 425 293 |  | 
| 426 294 | 
             
                function setInstanceReader(InstanceReader instanceReader) external restricted() {
         | 
| 427 | 
            -
                     | 
| 428 | 
            -
                        revert("InstanceReader is set");
         | 
| 429 | 
            -
                    }
         | 
| 295 | 
            +
                    require(instanceReader.getInstance() == Instance(this), "InstanceReader instance mismatch");
         | 
| 430 296 | 
             
                    _instanceReader = instanceReader;
         | 
| 431 297 | 
             
                }
         | 
| 432 298 |  | 
| 299 | 
            +
                function getMajorVersion() external pure returns (VersionPart majorVersion) {
         | 
| 300 | 
            +
                    return VersionPartLib.toVersionPart(GIF_MAJOR_VERSION);
         | 
| 301 | 
            +
                }
         | 
| 302 | 
            +
             | 
| 433 303 | 
             
                function getInstanceReader() external view returns (InstanceReader) {
         | 
| 434 304 | 
             
                    return _instanceReader;
         | 
| 435 305 | 
             
                }
         | 
| 306 | 
            +
                
         | 
| 307 | 
            +
                function setBundleManager(BundleManager bundleManager) external restricted() {
         | 
| 308 | 
            +
                    require(address(_bundleManager) == address(0), "BundleManager is set");
         | 
| 309 | 
            +
                    require(bundleManager.getInstance() == Instance(this), "BundleManager instance mismatch");
         | 
| 310 | 
            +
                    require(bundleManager.authority() == authority(), "BundleManager authority mismatch");
         | 
| 311 | 
            +
                    _bundleManager = bundleManager;
         | 
| 312 | 
            +
                }
         | 
| 313 | 
            +
             | 
| 314 | 
            +
                function getBundleManager() external view returns (BundleManager) {
         | 
| 315 | 
            +
                    return _bundleManager;
         | 
| 316 | 
            +
                }
         | 
| 317 | 
            +
             | 
| 318 | 
            +
                function setInstanceAccessManager(InstanceAccessManager accessManager) external restricted {
         | 
| 319 | 
            +
                    require(address(_accessManager) == address(0), "InstanceAccessManager is set");
         | 
| 320 | 
            +
                    require(accessManager.authority() == authority(), "InstanceAccessManager authority mismatch");  
         | 
| 321 | 
            +
                    _accessManager = accessManager;      
         | 
| 322 | 
            +
                }
         | 
| 323 | 
            +
             | 
| 324 | 
            +
                function getInstanceAccessManager() external view returns (InstanceAccessManager) {
         | 
| 325 | 
            +
                    return _accessManager;
         | 
| 326 | 
            +
                }
         | 
| 327 | 
            +
                
         | 
| 436 328 | 
             
            }
         |