@etherisc/gif-next 0.0.2-e9148e0-933 → 0.0.2-e9a637d-547
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 +65 -2
- 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 +941 -230
- 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 +825 -231
- package/artifacts/contracts/components/Product.sol/Product.dbg.json +1 -1
- package/artifacts/contracts/components/Product.sol/Product.json +638 -190
- package/artifacts/contracts/instance/AccessManagerUpgradeableInitializeable.sol/AccessManagerUpgradeableInitializeable.dbg.json +4 -0
- package/artifacts/contracts/instance/AccessManagerUpgradeableInitializeable.sol/AccessManagerUpgradeableInitializeable.json +1206 -0
- package/artifacts/contracts/instance/BundleManager.sol/BundleManager.dbg.json +4 -0
- package/artifacts/contracts/instance/BundleManager.sol/BundleManager.json +778 -0
- package/artifacts/contracts/instance/Cloneable.sol/Cloneable.dbg.json +4 -0
- package/artifacts/contracts/instance/{AccessManagedSimple.sol/AccessManagedSimple.json → Cloneable.sol/Cloneable.json} +91 -2
- package/artifacts/contracts/instance/IInstance.sol/IInstance.dbg.json +1 -1
- package/artifacts/contracts/instance/IInstance.sol/IInstance.json +346 -704
- package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.dbg.json +1 -1
- package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.json +342 -168
- package/artifacts/contracts/instance/Instance.sol/Instance.dbg.json +1 -1
- package/artifacts/contracts/instance/Instance.sol/Instance.json +405 -3100
- package/artifacts/contracts/instance/InstanceAccessManager.sol/InstanceAccessManager.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceAccessManager.sol/InstanceAccessManager.json +609 -178
- package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.json +148 -247
- package/artifacts/contracts/instance/InstanceService.sol/InstanceService.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceService.sol/InstanceService.json +536 -259
- package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.json +335 -98
- package/artifacts/contracts/instance/InstanceStore.sol/InstanceStore.dbg.json +4 -0
- package/artifacts/contracts/instance/InstanceStore.sol/InstanceStore.json +2677 -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/{ComponentServiceBase.sol/ComponentServiceBase.json → ComponentService.sol/ComponentService.json} +247 -180
- package/artifacts/contracts/instance/base/IKeyValueStore.sol/IKeyValueStore.dbg.json +1 -1
- package/artifacts/contracts/instance/base/ILifecycle.sol/ILifecycle.dbg.json +1 -1
- package/artifacts/contracts/instance/base/KeyValueStore.sol/KeyValueStore.dbg.json +1 -1
- package/artifacts/contracts/instance/base/KeyValueStore.sol/KeyValueStore.json +40 -10
- package/artifacts/contracts/instance/base/Lifecycle.sol/Lifecycle.dbg.json +1 -1
- package/artifacts/contracts/instance/base/Lifecycle.sol/Lifecycle.json +36 -11
- package/artifacts/contracts/instance/module/IAccess.sol/IAccess.dbg.json +1 -1
- package/artifacts/contracts/instance/module/IAccess.sol/IAccess.json +71 -45
- package/artifacts/contracts/instance/module/IBundle.sol/IBundle.dbg.json +1 -1
- package/artifacts/contracts/instance/module/IComponents.sol/IComponents.dbg.json +4 -0
- package/artifacts/contracts/instance/module/IComponents.sol/IComponents.json +10 -0
- package/artifacts/contracts/instance/module/IDistribution.sol/IDistribution.dbg.json +1 -1
- package/artifacts/contracts/instance/module/IPolicy.sol/IPolicy.dbg.json +1 -1
- package/artifacts/contracts/instance/module/IRisk.sol/IRisk.dbg.json +1 -1
- package/artifacts/contracts/instance/module/ISetup.sol/ISetup.dbg.json +1 -1
- package/artifacts/contracts/instance/module/ITreasury.sol/ITreasury.dbg.json +1 -1
- package/artifacts/contracts/instance/service/ApplicationService.sol/ApplicationService.dbg.json +4 -0
- package/artifacts/contracts/instance/service/ApplicationService.sol/ApplicationService.json +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 +1 -1
- package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.json +1341 -259
- package/artifacts/contracts/instance/service/DistributionServiceManager.sol/DistributionServiceManager.dbg.json +1 -1
- package/artifacts/contracts/instance/service/DistributionServiceManager.sol/DistributionServiceManager.json +440 -79
- 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 +1 -1
- package/artifacts/contracts/instance/service/PoolService.sol/PoolService.json +649 -251
- package/artifacts/contracts/instance/service/PoolServiceManager.sol/PoolServiceManager.dbg.json +1 -1
- package/artifacts/contracts/instance/service/PoolServiceManager.sol/PoolServiceManager.json +305 -92
- package/artifacts/contracts/instance/service/ProductService.sol/ProductService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/ProductService.sol/ProductService.json +284 -502
- package/artifacts/contracts/instance/service/ProductServiceManager.sol/ProductServiceManager.dbg.json +1 -1
- package/artifacts/contracts/instance/service/ProductServiceManager.sol/ProductServiceManager.json +304 -99
- 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 +261 -131
- package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.dbg.json +1 -1
- package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.json +149 -230
- package/artifacts/contracts/registry/ITransferInterceptor.sol/ITransferInterceptor.dbg.json +1 -1
- package/artifacts/contracts/registry/ITransferInterceptor.sol/ITransferInterceptor.json +18 -0
- package/artifacts/contracts/registry/Registry.sol/Registry.dbg.json +1 -1
- package/artifacts/contracts/registry/Registry.sol/Registry.json +275 -226
- package/artifacts/contracts/registry/RegistryAccessManager.sol/RegistryAccessManager.dbg.json +4 -0
- package/artifacts/contracts/registry/RegistryAccessManager.sol/RegistryAccessManager.json +285 -0
- package/artifacts/contracts/registry/RegistryService.sol/RegistryService.dbg.json +1 -1
- package/artifacts/contracts/registry/RegistryService.sol/RegistryService.json +200 -335
- package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.dbg.json +1 -1
- package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.json +298 -141
- package/artifacts/contracts/registry/ReleaseManager.sol/ReleaseManager.dbg.json +4 -0
- package/artifacts/contracts/registry/ReleaseManager.sol/ReleaseManager.json +559 -0
- package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.dbg.json +1 -1
- package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.json +141 -53
- package/artifacts/contracts/shared/ContractDeployerLib.sol/ContractDeployerLib.dbg.json +1 -1
- package/artifacts/contracts/shared/ERC165.sol/ERC165.dbg.json +1 -1
- package/artifacts/contracts/shared/ERC165.sol/ERC165.json +41 -3
- package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.dbg.json +1 -1
- package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.json +40 -29
- package/artifacts/contracts/shared/IPolicyHolder.sol/IPolicyHolder.dbg.json +4 -0
- package/artifacts/contracts/shared/IPolicyHolder.sol/IPolicyHolder.json +129 -0
- package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.dbg.json +1 -1
- package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.json +21 -34
- package/artifacts/contracts/shared/IRegistryLinked.sol/IRegistryLinked.dbg.json +4 -0
- package/artifacts/contracts/{experiment/inheritance/IB.sol/IB.json → shared/IRegistryLinked.sol/IRegistryLinked.json} +18 -20
- package/artifacts/contracts/shared/IService.sol/IService.dbg.json +1 -1
- package/artifacts/contracts/shared/IService.sol/IService.json +86 -172
- package/artifacts/contracts/shared/IVersionable.sol/IVersionable.dbg.json +1 -1
- package/artifacts/contracts/shared/IVersionable.sol/IVersionable.json +2 -152
- package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.dbg.json +1 -1
- package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.json +120 -27
- package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.dbg.json +4 -0
- package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.json +248 -0
- package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.dbg.json +1 -1
- package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.json +294 -61
- package/artifacts/contracts/shared/Registerable.sol/Registerable.dbg.json +1 -1
- package/artifacts/contracts/shared/Registerable.sol/Registerable.json +129 -51
- package/artifacts/contracts/shared/RegistryLinked.sol/RegistryLinked.dbg.json +4 -0
- package/artifacts/contracts/shared/RegistryLinked.sol/RegistryLinked.json +84 -0
- package/artifacts/contracts/shared/Service.sol/Service.dbg.json +1 -1
- package/artifacts/contracts/shared/Service.sol/Service.json +191 -163
- package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.dbg.json +1 -1
- package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.json +2 -2
- package/artifacts/contracts/shared/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.dbg.json +1 -1
- package/artifacts/contracts/shared/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.json +2 -2
- package/artifacts/contracts/shared/Versionable.sol/Versionable.dbg.json +1 -1
- package/artifacts/contracts/shared/Versionable.sol/Versionable.json +2 -152
- package/artifacts/contracts/test/TestFee.sol/TestFee.dbg.json +1 -1
- package/artifacts/contracts/test/TestFee.sol/TestFee.json +2 -2
- package/artifacts/contracts/test/TestRegisterable.sol/TestRegisterable.dbg.json +1 -1
- package/artifacts/contracts/test/TestRegisterable.sol/TestRegisterable.json +129 -51
- package/artifacts/contracts/test/TestRoleId.sol/TestRoleId.dbg.json +1 -1
- package/artifacts/contracts/test/TestRoleId.sol/TestRoleId.json +6 -6
- package/artifacts/contracts/test/TestService.sol/TestService.dbg.json +1 -1
- package/artifacts/contracts/test/TestService.sol/TestService.json +210 -214
- package/artifacts/contracts/test/TestToken.sol/TestUsdc.dbg.json +1 -1
- package/artifacts/contracts/test/TestVersion.sol/TestVersion.dbg.json +1 -1
- package/artifacts/contracts/test/TestVersion.sol/TestVersion.json +2 -2
- package/artifacts/contracts/test/TestVersionable.sol/TestVersionable.dbg.json +1 -1
- package/artifacts/contracts/test/TestVersionable.sol/TestVersionable.json +8 -190
- package/artifacts/contracts/test/Usdc.sol/USDC.dbg.json +1 -1
- package/artifacts/contracts/types/AddressSet.sol/LibAddressSet.dbg.json +1 -1
- package/artifacts/contracts/types/Amount.sol/AmountLib.dbg.json +4 -0
- package/artifacts/contracts/types/Amount.sol/AmountLib.json +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 +2 -2
- package/contracts/components/Component.sol +253 -0
- package/contracts/components/Distribution.sol +200 -79
- package/contracts/components/IComponent.sol +76 -0
- package/contracts/components/IDistributionComponent.sol +44 -17
- package/contracts/components/IPoolComponent.sol +88 -37
- package/contracts/components/IProductComponent.sol +10 -5
- package/contracts/components/Pool.sol +221 -160
- package/contracts/components/Product.sol +128 -119
- 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 +43 -24
- package/contracts/instance/IInstanceService.sol +59 -5
- package/contracts/instance/Instance.sol +125 -369
- package/contracts/instance/InstanceAccessManager.sol +428 -176
- package/contracts/instance/InstanceReader.sol +21 -34
- package/contracts/instance/InstanceService.sol +466 -128
- package/contracts/instance/InstanceServiceManager.sol +6 -9
- package/contracts/instance/InstanceStore.sol +219 -0
- 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 -5
- 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 -20
- package/contracts/instance/service/ApplicationService.sol +351 -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 +382 -33
- package/contracts/instance/service/DistributionServiceManager.sol +7 -10
- 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 +217 -108
- package/contracts/instance/service/PoolServiceManager.sol +6 -9
- package/contracts/instance/service/ProductService.sol +114 -453
- package/contracts/instance/service/ProductServiceManager.sol +2 -2
- package/contracts/registry/ChainNft.sol +9 -1
- package/contracts/registry/IRegistry.sol +41 -19
- package/contracts/registry/IRegistryService.sol +31 -13
- package/contracts/registry/ITransferInterceptor.sol +1 -0
- package/contracts/registry/Registry.sol +245 -222
- package/contracts/registry/RegistryAccessManager.sol +216 -0
- package/contracts/registry/RegistryService.sol +97 -173
- package/contracts/registry/RegistryServiceManager.sol +21 -39
- package/contracts/registry/ReleaseManager.sol +324 -0
- package/contracts/registry/TokenRegistry.sol +22 -17
- package/contracts/shared/ERC165.sol +14 -12
- package/contracts/shared/INftOwnable.sol +11 -10
- package/contracts/shared/IPolicyHolder.sol +26 -0
- package/contracts/shared/IRegisterable.sol +4 -6
- package/contracts/shared/IRegistryLinked.sol +12 -0
- package/contracts/shared/IService.sol +5 -4
- package/contracts/shared/IVersionable.sol +4 -47
- package/contracts/shared/NftOwnable.sol +66 -80
- package/contracts/shared/PolicyHolder.sol +81 -0
- package/contracts/shared/ProxyManager.sol +100 -25
- package/contracts/shared/Registerable.sol +16 -32
- package/contracts/shared/RegistryLinked.sol +48 -0
- package/contracts/shared/Service.sol +41 -24
- package/contracts/shared/TokenHandler.sol +11 -5
- package/contracts/shared/Versionable.sol +4 -92
- package/contracts/test/TestRegisterable.sol +1 -1
- package/contracts/test/TestService.sol +4 -3
- package/contracts/types/Amount.sol +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 -19
- package/contracts/types/Seconds.sol +54 -0
- package/contracts/types/StateId.sol +1 -0
- package/contracts/types/Timestamp.sol +13 -13
- package/contracts/types/UFixed.sol +1 -0
- package/contracts/types/Version.sol +1 -0
- package/package.json +3 -3
- package/artifacts/contracts/components/BaseComponent.sol/BaseComponent.dbg.json +0 -4
- package/artifacts/contracts/components/BaseComponent.sol/BaseComponent.json +0 -327
- package/artifacts/contracts/components/IBaseComponent.sol/IBaseComponent.dbg.json +0 -4
- package/artifacts/contracts/components/IBaseComponent.sol/IBaseComponent.json +0 -280
- package/artifacts/contracts/experiment/cloning/Cloner.sol/Cloner.dbg.json +0 -4
- package/artifacts/contracts/experiment/cloning/Cloner.sol/Cloner.json +0 -66
- package/artifacts/contracts/experiment/cloning/Cloner.sol/Mock1.dbg.json +0 -4
- package/artifacts/contracts/experiment/cloning/Cloner.sol/Mock1.json +0 -24
- package/artifacts/contracts/experiment/cloning/Cloner.sol/Mock2.dbg.json +0 -4
- package/artifacts/contracts/experiment/cloning/Cloner.sol/Mock2.json +0 -42
- package/artifacts/contracts/experiment/errors/Require.sol/Require.dbg.json +0 -4
- package/artifacts/contracts/experiment/errors/Require.sol/Require.json +0 -105
- package/artifacts/contracts/experiment/errors/Revert.sol/Revert.dbg.json +0 -4
- package/artifacts/contracts/experiment/errors/Revert.sol/Revert.json +0 -105
- package/artifacts/contracts/experiment/inheritance/A.sol/A.dbg.json +0 -4
- package/artifacts/contracts/experiment/inheritance/A.sol/A.json +0 -128
- package/artifacts/contracts/experiment/inheritance/A.sol/AShared.dbg.json +0 -4
- package/artifacts/contracts/experiment/inheritance/A.sol/AShared.json +0 -42
- package/artifacts/contracts/experiment/inheritance/B.sol/B.dbg.json +0 -4
- package/artifacts/contracts/experiment/inheritance/B.sol/B.json +0 -76
- package/artifacts/contracts/experiment/inheritance/C.sol/C.dbg.json +0 -4
- package/artifacts/contracts/experiment/inheritance/C.sol/C.json +0 -89
- package/artifacts/contracts/experiment/inheritance/IA.sol/IA.dbg.json +0 -4
- package/artifacts/contracts/experiment/inheritance/IA.sol/IA.json +0 -128
- package/artifacts/contracts/experiment/inheritance/IA.sol/ISharedA.dbg.json +0 -4
- package/artifacts/contracts/experiment/inheritance/IA.sol/ISharedA.json +0 -37
- package/artifacts/contracts/experiment/inheritance/IB.sol/IB.dbg.json +0 -4
- package/artifacts/contracts/experiment/inheritance/IC.sol/IC.dbg.json +0 -4
- package/artifacts/contracts/experiment/inheritance/IC.sol/IC.json +0 -63
- package/artifacts/contracts/experiment/statemachine/Dummy.sol/LifeCycleModule.dbg.json +0 -4
- package/artifacts/contracts/experiment/statemachine/Dummy.sol/LifeCycleModule.json +0 -59
- package/artifacts/contracts/experiment/statemachine/ISM.sol/ISM.dbg.json +0 -4
- package/artifacts/contracts/experiment/statemachine/ISM.sol/ISM.json +0 -124
- package/artifacts/contracts/experiment/statemachine/ISM.sol/ISMEE.dbg.json +0 -4
- package/artifacts/contracts/experiment/statemachine/ISM.sol/ISMEE.json +0 -74
- package/artifacts/contracts/experiment/statemachine/SM.sol/SM.dbg.json +0 -4
- package/artifacts/contracts/experiment/statemachine/SM.sol/SM.json +0 -124
- package/artifacts/contracts/experiment/statemachine/SimpleStateMachine.sol/SimpleStateMachine.dbg.json +0 -4
- package/artifacts/contracts/experiment/statemachine/SimpleStateMachine.sol/SimpleStateMachine.json +0 -207
- package/artifacts/contracts/experiment/types/TypeA.sol/TypeALib.dbg.json +0 -4
- package/artifacts/contracts/experiment/types/TypeA.sol/TypeALib.json +0 -10
- package/artifacts/contracts/experiment/types/TypeB.sol/TypeBLib.dbg.json +0 -4
- package/artifacts/contracts/experiment/types/TypeB.sol/TypeBLib.json +0 -10
- package/artifacts/contracts/instance/AccessManagedSimple.sol/AccessManagedSimple.dbg.json +0 -4
- package/artifacts/contracts/instance/AccessManagerSimple.sol/AccessManagerSimple.dbg.json +0 -4
- package/artifacts/contracts/instance/AccessManagerSimple.sol/AccessManagerSimple.json +0 -1132
- package/artifacts/contracts/instance/IAccessManagerSimple.sol/IAccessManagerSimple.dbg.json +0 -4
- package/artifacts/contracts/instance/IAccessManagerSimple.sol/IAccessManagerSimple.json +0 -1082
- package/artifacts/contracts/instance/base/ComponentServiceBase.sol/ComponentServiceBase.dbg.json +0 -4
- package/artifacts/contracts/instance/base/IInstanceBase.sol/IInstanceBase.dbg.json +0 -4
- package/artifacts/contracts/instance/base/IInstanceBase.sol/IInstanceBase.json +0 -113
- package/artifacts/contracts/instance/service/ComponentOwnerService.sol/ComponentOwnerService.dbg.json +0 -4
- package/artifacts/contracts/instance/service/ComponentOwnerService.sol/ComponentOwnerService.json +0 -827
- package/artifacts/contracts/instance/service/IComponentOwnerService.sol/IComponentOwnerService.dbg.json +0 -4
- package/artifacts/contracts/shared/RegisterableUpgradable.sol/RegisterableUpgradable.dbg.json +0 -4
- package/contracts/components/BaseComponent.sol +0 -91
- package/contracts/components/IBaseComponent.sol +0 -25
- package/contracts/experiment/cloning/Cloner.sol +0 -47
- package/contracts/experiment/errors/Require.sol +0 -38
- package/contracts/experiment/errors/Revert.sol +0 -44
- package/contracts/experiment/inheritance/A.sol +0 -53
- package/contracts/experiment/inheritance/B.sol +0 -28
- package/contracts/experiment/inheritance/C.sol +0 -34
- package/contracts/experiment/inheritance/IA.sol +0 -13
- package/contracts/experiment/inheritance/IB.sol +0 -10
- package/contracts/experiment/inheritance/IC.sol +0 -12
- package/contracts/experiment/statemachine/Dummy.sol +0 -27
- package/contracts/experiment/statemachine/ISM.sol +0 -25
- package/contracts/experiment/statemachine/SM.sol +0 -57
- package/contracts/experiment/statemachine/SimpleStateMachine.sol +0 -31
- package/contracts/experiment/types/TypeA.sol +0 -47
- package/contracts/experiment/types/TypeB.sol +0 -29
- package/contracts/instance/AccessManagedSimple.sol +0 -115
- package/contracts/instance/AccessManagerSimple.sol +0 -692
- package/contracts/instance/IAccessManagerSimple.sol +0 -391
- package/contracts/instance/base/ComponentServiceBase.sol +0 -124
- 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
@@ -7,7 +7,7 @@ import {ProxyManager} from "../shared/ProxyManager.sol";
|
|
7
7
|
import {InstanceService} from "./InstanceService.sol";
|
8
8
|
import {Registry} from "../registry/Registry.sol";
|
9
9
|
import {RegistryService} from "../registry/RegistryService.sol";
|
10
|
-
import {
|
10
|
+
import {REGISTRY} from "../types/ObjectType.sol";
|
11
11
|
|
12
12
|
contract InstanceServiceManager is ProxyManager {
|
13
13
|
|
@@ -17,7 +17,7 @@ contract InstanceServiceManager is ProxyManager {
|
|
17
17
|
constructor(
|
18
18
|
address registryAddress
|
19
19
|
)
|
20
|
-
ProxyManager()
|
20
|
+
ProxyManager(registryAddress)
|
21
21
|
{
|
22
22
|
InstanceService instSrv = new InstanceService();
|
23
23
|
// bytes memory initCode = type(InstanceService).creationCode;
|
@@ -28,10 +28,10 @@ contract InstanceServiceManager is ProxyManager {
|
|
28
28
|
|
29
29
|
_instanceService = InstanceService(address(versionable));
|
30
30
|
|
31
|
-
|
32
|
-
|
33
|
-
|
34
|
-
//
|
31
|
+
// TODO `this` must have a role or own nft to register service
|
32
|
+
//Registry registry = Registry(registryAddress);
|
33
|
+
//address registryServiceAddress = registry.getServiceAddress(REGISTRY(), _instanceService.getMajorVersion());
|
34
|
+
//RegistryService registryService = RegistryService(registryServiceAddress);
|
35
35
|
//registryService.registerService(_instanceService);
|
36
36
|
// RegistryService registryService = _instanceService.getRegistryService();
|
37
37
|
|
@@ -40,9 +40,6 @@ contract InstanceServiceManager is ProxyManager {
|
|
40
40
|
//_linkToNftOwnable(
|
41
41
|
// address(registryAddress),
|
42
42
|
// address(_instanceService));
|
43
|
-
|
44
|
-
// implies that after this constructor call only upgrade functionality is available
|
45
|
-
_isDeployed = true;
|
46
43
|
}
|
47
44
|
|
48
45
|
//--- view functions ----------------------------------------------------//
|
@@ -0,0 +1,219 @@
|
|
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
|
+
|
17
|
+
//import {IRegistry} from "../registry/IRegistry.sol";
|
18
|
+
|
19
|
+
import {IInstance} from "./IInstance.sol";
|
20
|
+
import {KeyValueStore} from "./base/KeyValueStore.sol";
|
21
|
+
import {IKeyValueStore} from "./base/KeyValueStore.sol";
|
22
|
+
|
23
|
+
import {IBundle} from "./module/IBundle.sol";
|
24
|
+
import {IComponents} from "./module/IComponents.sol";
|
25
|
+
import {IDistribution} from "./module/IDistribution.sol";
|
26
|
+
import {IPolicy} from "./module/IPolicy.sol";
|
27
|
+
import {IRisk} from "./module/IRisk.sol";
|
28
|
+
import {ISetup} from "./module/ISetup.sol";
|
29
|
+
|
30
|
+
|
31
|
+
// TODO combine with instance reader?
|
32
|
+
contract InstanceStore is AccessManagedUpgradeable, KeyValueStore
|
33
|
+
{
|
34
|
+
function initialize(address instance)
|
35
|
+
public
|
36
|
+
initializer()
|
37
|
+
{
|
38
|
+
address authority = IInstance(instance).authority();
|
39
|
+
__AccessManaged_init(authority);
|
40
|
+
initializeLifecycle();
|
41
|
+
}
|
42
|
+
|
43
|
+
//--- ProductSetup ------------------------------------------------------//
|
44
|
+
function createProductSetup(NftId productNftId, ISetup.ProductSetupInfo memory setup) external restricted() {
|
45
|
+
create(_toNftKey32(productNftId, PRODUCT()), abi.encode(setup));
|
46
|
+
}
|
47
|
+
|
48
|
+
function updateProductSetup(NftId productNftId, ISetup.ProductSetupInfo memory setup, StateId newState) external restricted() {
|
49
|
+
update(_toNftKey32(productNftId, PRODUCT()), abi.encode(setup), newState);
|
50
|
+
}
|
51
|
+
|
52
|
+
function updateProductSetupState(NftId productNftId, StateId newState) external restricted() {
|
53
|
+
updateState(_toNftKey32(productNftId, PRODUCT()), newState);
|
54
|
+
}
|
55
|
+
|
56
|
+
//--- DistributionSetup ------------------------------------------------------//
|
57
|
+
function createDistributionSetup(NftId distributionNftId, ISetup.DistributionSetupInfo memory setup) external restricted() {
|
58
|
+
create(_toNftKey32(distributionNftId, DISTRIBUTION()), abi.encode(setup));
|
59
|
+
}
|
60
|
+
|
61
|
+
function updateDistributionSetup(NftId distributionNftId, ISetup.DistributionSetupInfo memory setup, StateId newState) external restricted() {
|
62
|
+
update(_toNftKey32(distributionNftId, DISTRIBUTION()), abi.encode(setup), newState);
|
63
|
+
}
|
64
|
+
|
65
|
+
function updateDistributionSetupState(NftId distributionNftId, StateId newState) external restricted() {
|
66
|
+
updateState(_toNftKey32(distributionNftId, DISTRIBUTION()), newState);
|
67
|
+
}
|
68
|
+
|
69
|
+
//--- PoolSetup ------------------------------------------------------//
|
70
|
+
function createPoolSetup(NftId poolNftId, IComponents.ComponentInfo memory info) external restricted() {
|
71
|
+
create(_toNftKey32(poolNftId, POOL()), abi.encode(info));
|
72
|
+
}
|
73
|
+
|
74
|
+
function updatePoolSetup(NftId poolNftId, IComponents.ComponentInfo memory info, StateId newState) external restricted() {
|
75
|
+
update(_toNftKey32(poolNftId, POOL()), abi.encode(info), newState);
|
76
|
+
}
|
77
|
+
|
78
|
+
function updatePoolSetupState(NftId poolNftId, StateId newState) external restricted() {
|
79
|
+
updateState(_toNftKey32(poolNftId, POOL()), newState);
|
80
|
+
}
|
81
|
+
|
82
|
+
//--- DistributorType -------------------------------------------------------//
|
83
|
+
function createDistributorType(Key32 distributorKey, IDistribution.DistributorTypeInfo memory info) external restricted() {
|
84
|
+
create(distributorKey, abi.encode(info));
|
85
|
+
}
|
86
|
+
|
87
|
+
function updateDistributorType(Key32 distributorKey, IDistribution.DistributorTypeInfo memory info, StateId newState) external restricted() {
|
88
|
+
update(distributorKey, abi.encode(info), newState);
|
89
|
+
}
|
90
|
+
|
91
|
+
function updateDistributorTypeState(Key32 distributorKey, StateId newState) external restricted() {
|
92
|
+
updateState(distributorKey, newState);
|
93
|
+
}
|
94
|
+
|
95
|
+
//--- Distributor -------------------------------------------------------//
|
96
|
+
function createDistributor(NftId nftId, IDistribution.DistributorInfo memory info) external restricted() {
|
97
|
+
create(toDistributorKey32(nftId), abi.encode(info));
|
98
|
+
}
|
99
|
+
|
100
|
+
function updateDistributor(NftId nftId, IDistribution.DistributorInfo memory info, StateId newState) external restricted() {
|
101
|
+
update(toDistributorKey32(nftId), abi.encode(info), newState);
|
102
|
+
}
|
103
|
+
|
104
|
+
function updateDistributorState(NftId nftId, StateId newState) external restricted() {
|
105
|
+
updateState(toDistributorKey32(nftId), newState);
|
106
|
+
}
|
107
|
+
|
108
|
+
//--- Referral ----------------------------------------------------------//
|
109
|
+
function createReferral(Key32 referralKey, IDistribution.ReferralInfo memory referralInfo) external restricted() {
|
110
|
+
create(referralKey, abi.encode(referralInfo));
|
111
|
+
}
|
112
|
+
|
113
|
+
function updateReferral(Key32 referralKey, IDistribution.ReferralInfo memory referralInfo, StateId newState) external restricted() {
|
114
|
+
update(referralKey, abi.encode(referralInfo), newState);
|
115
|
+
}
|
116
|
+
|
117
|
+
function updateReferralState(Key32 referralKey, StateId newState) external restricted() {
|
118
|
+
updateState(referralKey, newState);
|
119
|
+
}
|
120
|
+
|
121
|
+
//--- Bundle ------------------------------------------------------------//
|
122
|
+
function createBundle(NftId bundleNftId, IBundle.BundleInfo memory bundle) external restricted() {
|
123
|
+
create(toBundleKey32(bundleNftId), abi.encode(bundle));
|
124
|
+
}
|
125
|
+
|
126
|
+
function updateBundle(NftId bundleNftId, IBundle.BundleInfo memory bundle, StateId newState) external restricted() {
|
127
|
+
update(toBundleKey32(bundleNftId), abi.encode(bundle), newState);
|
128
|
+
}
|
129
|
+
|
130
|
+
function updateBundleState(NftId bundleNftId, StateId newState) external restricted() {
|
131
|
+
updateState(toBundleKey32(bundleNftId), newState);
|
132
|
+
}
|
133
|
+
|
134
|
+
//--- Risk --------------------------------------------------------------//
|
135
|
+
function createRisk(RiskId riskId, IRisk.RiskInfo memory risk) external restricted() {
|
136
|
+
create(riskId.toKey32(), abi.encode(risk));
|
137
|
+
}
|
138
|
+
|
139
|
+
function updateRisk(RiskId riskId, IRisk.RiskInfo memory risk, StateId newState) external restricted() {
|
140
|
+
update(riskId.toKey32(), abi.encode(risk), newState);
|
141
|
+
}
|
142
|
+
|
143
|
+
function updateRiskState(RiskId riskId, StateId newState) external restricted() {
|
144
|
+
updateState(riskId.toKey32(), newState);
|
145
|
+
}
|
146
|
+
|
147
|
+
//--- Application (Policy) ----------------------------------------------//
|
148
|
+
function createApplication(NftId applicationNftId, IPolicy.PolicyInfo memory policy) external restricted() {
|
149
|
+
create(toPolicyKey32(applicationNftId), abi.encode(policy));
|
150
|
+
}
|
151
|
+
|
152
|
+
function updateApplication(NftId applicationNftId, IPolicy.PolicyInfo memory policy, StateId newState) external restricted() {
|
153
|
+
update(toPolicyKey32(applicationNftId), abi.encode(policy), newState);
|
154
|
+
}
|
155
|
+
|
156
|
+
function updateApplicationState(NftId applicationNftId, StateId newState) external restricted() {
|
157
|
+
updateState(toPolicyKey32(applicationNftId), newState);
|
158
|
+
}
|
159
|
+
|
160
|
+
//--- Policy ------------------------------------------------------------//
|
161
|
+
function updatePolicy(NftId policyNftId, IPolicy.PolicyInfo memory policy, StateId newState) external restricted() {
|
162
|
+
update(toPolicyKey32(policyNftId), abi.encode(policy), newState);
|
163
|
+
}
|
164
|
+
|
165
|
+
function updatePolicyState(NftId policyNftId, StateId newState) external restricted() {
|
166
|
+
updateState(toPolicyKey32(policyNftId), newState);
|
167
|
+
}
|
168
|
+
|
169
|
+
//--- Claim -------------------------------------------------------------//
|
170
|
+
function createClaim(NftId policyNftId, ClaimId claimId, IPolicy.ClaimInfo memory claim) external restricted() {
|
171
|
+
create(toPolicyKey32(policyNftId), abi.encode(claim));
|
172
|
+
}
|
173
|
+
|
174
|
+
function updateClaim(NftId policyNftId, ClaimId claimId, IPolicy.ClaimInfo memory claim, StateId newState) external restricted() {
|
175
|
+
update(toPolicyKey32(policyNftId), abi.encode(claim), newState);
|
176
|
+
}
|
177
|
+
|
178
|
+
function updateClaimState(NftId policyNftId, ClaimId claimId, StateId newState) external restricted() {
|
179
|
+
updateState(toPolicyKey32(policyNftId), newState);
|
180
|
+
}
|
181
|
+
|
182
|
+
//--- Payout ------------------------------------------------------------//
|
183
|
+
function createPayout(NftId policyNftId, NumberId payoutId, IPolicy.PayoutInfo memory payout) external restricted() {
|
184
|
+
create(toPolicyKey32(policyNftId), abi.encode(payout));
|
185
|
+
}
|
186
|
+
|
187
|
+
function updatePayout(NftId policyNftId, NumberId payoutId, IPolicy.PayoutInfo memory payout, StateId newState) external restricted() {
|
188
|
+
update(toPolicyKey32(policyNftId), abi.encode(payout), newState);
|
189
|
+
}
|
190
|
+
|
191
|
+
function updatePayoutState(NftId policyNftId, StateId newState) external restricted() {
|
192
|
+
updateState(toPolicyKey32(policyNftId), newState);
|
193
|
+
}
|
194
|
+
|
195
|
+
//--- internal view/pure functions --------------------------------------//
|
196
|
+
function _toNftKey32(NftId nftId, ObjectType objectType) internal pure returns (Key32) {
|
197
|
+
return nftId.toKey32(objectType);
|
198
|
+
}
|
199
|
+
|
200
|
+
function toBundleKey32(NftId bundleNftId) public pure returns (Key32) {
|
201
|
+
return bundleNftId.toKey32(BUNDLE());
|
202
|
+
}
|
203
|
+
|
204
|
+
function toPolicyKey32(NftId policyNftId) public pure returns (Key32) {
|
205
|
+
return policyNftId.toKey32(POLICY());
|
206
|
+
}
|
207
|
+
|
208
|
+
function toDistributionKey32(NftId distNftId) public pure returns (Key32) {
|
209
|
+
return distNftId.toKey32(DISTRIBUTION());
|
210
|
+
}
|
211
|
+
|
212
|
+
function toDistributorTypeKey32(NftId distNftId) public pure returns (Key32) {
|
213
|
+
return distNftId.toKey32(DISTRIBUTOR_TYPE());
|
214
|
+
}
|
215
|
+
|
216
|
+
function toDistributorKey32(NftId distNftId) public pure returns (Key32) {
|
217
|
+
return distNftId.toKey32(DISTRIBUTOR());
|
218
|
+
}
|
219
|
+
}
|
@@ -0,0 +1,82 @@
|
|
1
|
+
// SPDX-License-Identifier: Apache-2.0
|
2
|
+
pragma solidity ^0.8.20;
|
3
|
+
|
4
|
+
import {Cloneable} from "./Cloneable.sol";
|
5
|
+
|
6
|
+
import {IInstance} from "./IInstance.sol";
|
7
|
+
import {INSTANCE} from "../types/ObjectType.sol";
|
8
|
+
import {InstanceReader} from "./InstanceReader.sol";
|
9
|
+
import {IRegistry} from "../registry/IRegistry.sol";
|
10
|
+
import {LibNftIdSet} from "../types/NftIdSet.sol";
|
11
|
+
import {NftId} from "../types/NftId.sol";
|
12
|
+
|
13
|
+
contract ObjectManager is
|
14
|
+
Cloneable
|
15
|
+
{
|
16
|
+
|
17
|
+
event LogObjectManagerInitialized(address instance);
|
18
|
+
|
19
|
+
error ErrorObjectManagerNftIdInvalid(NftId instanceNftId);
|
20
|
+
error ErrorObjectManagerAlreadyAdded(NftId componentNftId, NftId objectNftId);
|
21
|
+
|
22
|
+
mapping(NftId compnentNftId => LibNftIdSet.Set objects) internal _activeObjects;
|
23
|
+
mapping(NftId compnentNftId => LibNftIdSet.Set objects) internal _allObjects;
|
24
|
+
IInstance internal _instance; // store instance address -> more flexible, instance may not be registered during ObjectManager initialization
|
25
|
+
|
26
|
+
/// @dev call to initialize MUST be made in the same transaction as cloning of the contract
|
27
|
+
function initialize(address instanceAddress)
|
28
|
+
initializer
|
29
|
+
external
|
30
|
+
{
|
31
|
+
IInstance instance = IInstance(instanceAddress);
|
32
|
+
initialize(instance.authority(), instance.getRegistryAddress());
|
33
|
+
|
34
|
+
_instance = instance;
|
35
|
+
|
36
|
+
emit LogObjectManagerInitialized(instanceAddress);
|
37
|
+
}
|
38
|
+
|
39
|
+
function getInstance() external view returns (IInstance) {
|
40
|
+
return _instance;
|
41
|
+
}
|
42
|
+
|
43
|
+
function _add(NftId componentNftId, NftId objectNftId) internal {
|
44
|
+
LibNftIdSet.Set storage allSet = _allObjects[componentNftId];
|
45
|
+
LibNftIdSet.Set storage activeSet = _activeObjects[componentNftId];
|
46
|
+
|
47
|
+
LibNftIdSet.add(allSet, objectNftId);
|
48
|
+
LibNftIdSet.add(activeSet, objectNftId);
|
49
|
+
}
|
50
|
+
|
51
|
+
function _activate(NftId componentNftId, NftId objectNftId) internal {
|
52
|
+
LibNftIdSet.add(_activeObjects[componentNftId], objectNftId);
|
53
|
+
}
|
54
|
+
|
55
|
+
function _deactivate(NftId componentNftId, NftId objectNftId) internal {
|
56
|
+
LibNftIdSet.remove(_activeObjects[componentNftId], objectNftId);
|
57
|
+
}
|
58
|
+
|
59
|
+
function _objects(NftId componentNftId) internal view returns (uint256) {
|
60
|
+
return LibNftIdSet.size(_allObjects[componentNftId]);
|
61
|
+
}
|
62
|
+
|
63
|
+
function _contains(NftId componentNftId, NftId objectNftId) internal view returns (bool) {
|
64
|
+
return LibNftIdSet.contains(_allObjects[componentNftId], objectNftId);
|
65
|
+
}
|
66
|
+
|
67
|
+
function _getObject(NftId componentNftId, uint256 idx) internal view returns (NftId) {
|
68
|
+
return LibNftIdSet.getElementAt(_allObjects[componentNftId], idx);
|
69
|
+
}
|
70
|
+
|
71
|
+
function _activeObjs(NftId componentNftId) internal view returns (uint256) {
|
72
|
+
return LibNftIdSet.size(_activeObjects[componentNftId]);
|
73
|
+
}
|
74
|
+
|
75
|
+
function _isActive(NftId componentNftId, NftId objectNftId) internal view returns (bool) {
|
76
|
+
return LibNftIdSet.contains(_activeObjects[componentNftId], objectNftId);
|
77
|
+
}
|
78
|
+
|
79
|
+
function _getActiveObject(NftId componentNftId, uint256 idx) internal view returns (NftId) {
|
80
|
+
return LibNftIdSet.getElementAt(_activeObjects[componentNftId], idx);
|
81
|
+
}
|
82
|
+
}
|
@@ -0,0 +1,121 @@
|
|
1
|
+
// SPDX-License-Identifier: Apache-2.0
|
2
|
+
pragma solidity ^0.8.19;
|
3
|
+
|
4
|
+
import {IComponent} from "../../components/IComponent.sol";
|
5
|
+
import {IRegistry} from "../../registry/IRegistry.sol";
|
6
|
+
import {IRegistryService} from "../../registry/IRegistryService.sol";
|
7
|
+
import {IInstance} from "../../instance/IInstance.sol";
|
8
|
+
import {IAccess} from "../module/IAccess.sol";
|
9
|
+
import {ObjectType, INSTANCE, REGISTRY} from "../../types/ObjectType.sol";
|
10
|
+
import {NftId} from "../../types/NftId.sol";
|
11
|
+
import {RoleId} from "../../types/RoleId.sol";
|
12
|
+
|
13
|
+
import {Service} from "../../shared/Service.sol";
|
14
|
+
import {InstanceService} from "../InstanceService.sol";
|
15
|
+
import {InstanceAccessManager} from "../InstanceAccessManager.sol";
|
16
|
+
|
17
|
+
abstract contract ComponentService is Service {
|
18
|
+
|
19
|
+
error ErrorComponentServiceNotComponent(address component);
|
20
|
+
error ErrorComponentServiceInvalidType(address component, ObjectType requiredType, ObjectType componentType);
|
21
|
+
error ErrorComponentServiceSenderNotOwner(address component, address initialOwner, address sender);
|
22
|
+
error ErrorComponentServiceExpectedRoleMissing(NftId instanceNftId, RoleId requiredRole, address sender);
|
23
|
+
error ErrorComponentServiceComponentLocked(address component);
|
24
|
+
|
25
|
+
/// @dev modifier to check if caller is a registered service
|
26
|
+
modifier onlyService() {
|
27
|
+
address caller = msg.sender;
|
28
|
+
require(getRegistry().isRegisteredService(caller), "ERROR_NOT_SERVICE");
|
29
|
+
_;
|
30
|
+
}
|
31
|
+
|
32
|
+
// view functions
|
33
|
+
|
34
|
+
function getRegistryService() public view virtual returns (IRegistryService) {
|
35
|
+
return IRegistryService(_getServiceAddress(REGISTRY()));
|
36
|
+
}
|
37
|
+
|
38
|
+
function getInstanceService() public view returns (InstanceService) {
|
39
|
+
return InstanceService(_getServiceAddress(INSTANCE()));
|
40
|
+
}
|
41
|
+
|
42
|
+
function _getServiceAddress(ObjectType domain) internal view returns (address) {
|
43
|
+
return getRegistry().getServiceAddress(domain, getVersion().toMajorPart());
|
44
|
+
}
|
45
|
+
|
46
|
+
// internal functions
|
47
|
+
function _checkComponentForRegistration(
|
48
|
+
address componentAddress,
|
49
|
+
ObjectType requiredType,
|
50
|
+
RoleId requiredRole
|
51
|
+
)
|
52
|
+
internal
|
53
|
+
view
|
54
|
+
returns (
|
55
|
+
IComponent component,
|
56
|
+
address owner,
|
57
|
+
IInstance instance,
|
58
|
+
NftId instanceNftId
|
59
|
+
)
|
60
|
+
{
|
61
|
+
// component may only be registerd by initial owner of component
|
62
|
+
owner = msg.sender;
|
63
|
+
|
64
|
+
// check this is a component
|
65
|
+
component = IComponent(componentAddress);
|
66
|
+
if(!component.supportsInterface(type(IComponent).interfaceId)) {
|
67
|
+
revert ErrorComponentServiceNotComponent(componentAddress);
|
68
|
+
}
|
69
|
+
|
70
|
+
// check component is of required type
|
71
|
+
IRegistry.ObjectInfo memory componentInfo = component.getInitialInfo();
|
72
|
+
if(componentInfo.objectType != requiredType) {
|
73
|
+
revert ErrorComponentServiceInvalidType(componentAddress, requiredType, componentInfo.objectType);
|
74
|
+
}
|
75
|
+
|
76
|
+
// check msg.sender is component owner
|
77
|
+
address initialOwner = componentInfo.initialOwner;
|
78
|
+
if(owner != initialOwner) {
|
79
|
+
revert ErrorComponentServiceSenderNotOwner(componentAddress, componentInfo.initialOwner, owner);
|
80
|
+
}
|
81
|
+
|
82
|
+
// check instance has assigned required role to owner
|
83
|
+
instanceNftId = componentInfo.parentNftId;
|
84
|
+
instance = _getInstance(instanceNftId);
|
85
|
+
if(!instance.getInstanceAccessManager().hasRole(requiredRole, owner)) {
|
86
|
+
revert ErrorComponentServiceExpectedRoleMissing(instanceNftId, requiredRole, owner);
|
87
|
+
}
|
88
|
+
}
|
89
|
+
|
90
|
+
// internal view functions
|
91
|
+
|
92
|
+
function _getAndVerifyComponentInfoAndInstance(
|
93
|
+
ObjectType expectedType
|
94
|
+
)
|
95
|
+
internal
|
96
|
+
view
|
97
|
+
returns(
|
98
|
+
NftId nftId,
|
99
|
+
IRegistry.ObjectInfo memory info,
|
100
|
+
IInstance instance
|
101
|
+
)
|
102
|
+
{
|
103
|
+
IRegistry registry = getRegistry();
|
104
|
+
|
105
|
+
info = registry.getObjectInfo(msg.sender);
|
106
|
+
require(info.objectType == expectedType, "OBJECT_TYPE_INVALID");
|
107
|
+
|
108
|
+
nftId = info.nftId;
|
109
|
+
instance = _getInstance(info.parentNftId);
|
110
|
+
|
111
|
+
if (instance.getInstanceAccessManager().isTargetLocked(info.objectAddress)) {
|
112
|
+
revert IAccess.ErrorIAccessTargetLocked(info.objectAddress);
|
113
|
+
}
|
114
|
+
}
|
115
|
+
|
116
|
+
function _getInstance(NftId instanceNftId) internal view returns (IInstance) {
|
117
|
+
return IInstance(
|
118
|
+
getRegistry().getObjectInfo(
|
119
|
+
instanceNftId).objectAddress);
|
120
|
+
}
|
121
|
+
}
|
@@ -5,7 +5,7 @@ import {Blocknumber, blockBlocknumber, zeroBlocknumber} from "../../types/Blockn
|
|
5
5
|
import {Key32, KeyId, Key32Lib} from "../../types/Key32.sol";
|
6
6
|
import {NftId} from "../../types/NftId.sol";
|
7
7
|
import {ObjectType} from "../../types/ObjectType.sol";
|
8
|
-
import {StateId, ACTIVE} from "../../types/StateId.sol";
|
8
|
+
import {StateId, ACTIVE, KEEP_STATE} from "../../types/StateId.sol";
|
9
9
|
import {Timestamp, TimestampLib} from "../../types/Timestamp.sol";
|
10
10
|
|
11
11
|
import {Lifecycle} from "./Lifecycle.sol";
|
@@ -79,16 +79,21 @@ contract KeyValueStore is Lifecycle, IKeyValueStore {
|
|
79
79
|
// update data
|
80
80
|
_value[key32].data = data;
|
81
81
|
|
82
|
-
// update
|
82
|
+
// update state
|
83
|
+
if(state != KEEP_STATE()) {
|
84
|
+
metadata.state = state;
|
85
|
+
}
|
86
|
+
|
87
|
+
// update reest of metadata
|
83
88
|
address updatedBy = msg.sender;
|
84
89
|
Blocknumber lastUpdatedIn = metadata.updatedIn;
|
85
|
-
|
90
|
+
|
86
91
|
metadata.updatedBy = updatedBy;
|
87
92
|
metadata.updatedIn = blockBlocknumber();
|
88
93
|
|
89
94
|
// create log entries
|
90
95
|
// solhint-disable avoid-tx-origin
|
91
|
-
emit LogStateUpdated(key32.toObjectType(), key32.toKeyId(),
|
96
|
+
emit LogStateUpdated(key32.toObjectType(), key32.toKeyId(), stateOld, state, updatedBy, tx.origin, lastUpdatedIn);
|
92
97
|
emit LogInfoUpdated(key32.toObjectType(), key32.toKeyId(), state, updatedBy, tx.origin, lastUpdatedIn);
|
93
98
|
// solhing-enable
|
94
99
|
}
|
@@ -134,6 +139,9 @@ contract KeyValueStore is Lifecycle, IKeyValueStore {
|
|
134
139
|
StateId stateOld = metadata.state;
|
135
140
|
require(stateOld.gtz(), "ERROR:KVS-041:NOT_EXISTING");
|
136
141
|
|
142
|
+
// ensure state transistion is valid
|
143
|
+
checkTransition(metadata.objectType, stateOld, state);
|
144
|
+
|
137
145
|
// update metadata (and state)
|
138
146
|
address updatedBy = msg.sender;
|
139
147
|
Blocknumber lastUpdatedIn = metadata.updatedIn;
|
@@ -143,7 +151,7 @@ contract KeyValueStore is Lifecycle, IKeyValueStore {
|
|
143
151
|
|
144
152
|
// create log entry
|
145
153
|
// solhint-disable-next-line avoid-tx-origin
|
146
|
-
emit LogStateUpdated(key32.toObjectType(), key32.toKeyId(),
|
154
|
+
emit LogStateUpdated(key32.toObjectType(), key32.toKeyId(), stateOld, state, updatedBy, tx.origin, lastUpdatedIn);
|
147
155
|
}
|
148
156
|
|
149
157
|
function exists(Key32 key32) public view returns (bool) {
|
@@ -1,19 +1,27 @@
|
|
1
1
|
// SPDX-License-Identifier: Apache-2.0
|
2
2
|
pragma solidity ^0.8.20;
|
3
3
|
|
4
|
+
import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
|
5
|
+
|
4
6
|
import {NftId} from "../../types/NftId.sol";
|
5
7
|
import {ObjectType, COMPONENT, BUNDLE, POLICY, RISK} from "../../types/ObjectType.sol";
|
6
8
|
import {StateId, ACTIVE, PAUSED, ARCHIVED, CLOSED, APPLIED, UNDERWRITTEN, REVOKED, DECLINED} from "../../types/StateId.sol";
|
7
9
|
import {ILifecycle} from "./ILifecycle.sol";
|
8
10
|
|
9
|
-
contract Lifecycle is
|
11
|
+
contract Lifecycle is
|
12
|
+
Initializable,
|
13
|
+
ILifecycle
|
14
|
+
{
|
10
15
|
mapping(ObjectType objectType => StateId initialState)
|
11
16
|
private _initialState;
|
12
17
|
|
13
18
|
mapping(ObjectType objectType => mapping(StateId stateFrom => mapping(StateId stateTo => bool isValid)))
|
14
19
|
private _isValidTransition;
|
15
20
|
|
16
|
-
|
21
|
+
function initializeLifecycle()
|
22
|
+
public
|
23
|
+
onlyInitializing
|
24
|
+
{
|
17
25
|
_setupBundleLifecycle();
|
18
26
|
_setupComponentLifecycle();
|
19
27
|
_setupPolicyLifecycle();
|
@@ -78,6 +86,7 @@ contract Lifecycle is ILifecycle {
|
|
78
86
|
function _setupBundleLifecycle() internal {
|
79
87
|
_initialState[BUNDLE()] = ACTIVE();
|
80
88
|
_isValidTransition[BUNDLE()][ACTIVE()][PAUSED()] = true;
|
89
|
+
_isValidTransition[BUNDLE()][ACTIVE()][CLOSED()] = true;
|
81
90
|
_isValidTransition[BUNDLE()][PAUSED()][ACTIVE()] = true;
|
82
91
|
_isValidTransition[BUNDLE()][PAUSED()][CLOSED()] = true;
|
83
92
|
}
|
@@ -1,38 +1,54 @@
|
|
1
1
|
// SPDX-License-Identifier: Apache-2.0
|
2
2
|
pragma solidity ^0.8.20;
|
3
3
|
|
4
|
-
import {EnumerableSet} from "@openzeppelin/contracts/utils/structs/EnumerableSet.sol";
|
5
4
|
import {ShortString, ShortStrings} from "@openzeppelin/contracts/utils/ShortStrings.sol";
|
6
5
|
|
7
6
|
import {RoleId} from "../../types/RoleId.sol";
|
7
|
+
import {Timestamp} from "../../types/Timestamp.sol";
|
8
8
|
|
9
9
|
interface IAccess {
|
10
|
+
|
11
|
+
enum Type {
|
12
|
+
NotInitialized,
|
13
|
+
Core,
|
14
|
+
Gif,
|
15
|
+
Custom
|
16
|
+
}
|
17
|
+
|
10
18
|
struct RoleInfo {
|
11
19
|
ShortString name;
|
12
|
-
|
20
|
+
Type rtype;
|
21
|
+
//bool isLocked;
|
22
|
+
RoleId admin;
|
23
|
+
Timestamp createdAt;
|
24
|
+
Timestamp updatedAt;
|
13
25
|
}
|
14
26
|
|
15
27
|
struct TargetInfo {
|
16
28
|
ShortString name;
|
17
|
-
|
29
|
+
Type ttype;
|
30
|
+
bool isLocked;
|
31
|
+
Timestamp createdAt;
|
32
|
+
Timestamp updatedAt;
|
18
33
|
}
|
19
34
|
|
20
|
-
error
|
21
|
-
|
22
|
-
error
|
23
|
-
error
|
24
|
-
error
|
25
|
-
|
26
|
-
error
|
27
|
-
error
|
28
|
-
error
|
29
|
-
error ErrorRoleIdAlreadyExists(RoleId roleId, ShortString name);
|
30
|
-
error ErrorRoleIdNotActive(RoleId roleId);
|
31
|
-
error ErrorRoleNameEmpty(RoleId roleId);
|
32
|
-
error ErrorRoleNameNotUnique(RoleId roleId, ShortString name);
|
33
|
-
error ErrorRoleInvalidUpdate(RoleId roleId, bool isCustom);
|
34
|
-
error ErrorGrantNonexstentRole(RoleId roleId);
|
35
|
-
error ErrorRevokeNonexstentRole(RoleId roleId);
|
36
|
-
error ErrorRenounceNonexstentRole(RoleId roleId);
|
35
|
+
error ErrorIAccessCallerIsNotRoleAdmin(address caller, RoleId roleId);
|
36
|
+
|
37
|
+
error ErrorIAccessRoleIdDoesNotExist(RoleId roleId);
|
38
|
+
error ErrorIAccessRoleIdTooBig(RoleId roleId);
|
39
|
+
error ErrorIAccessRoleIdTooSmall(RoleId roleId);
|
40
|
+
error ErrorIAccessRoleIdExists(RoleId roleId);
|
41
|
+
error ErrorIAccessRoleNameEmpty(RoleId roleId);
|
42
|
+
error ErrorIAccessRoleNameExists(RoleId roleId, RoleId existingRoleId, ShortString name);
|
43
|
+
error ErrorIAccessRoleTypeInvalid(RoleId roleId, Type rtype);
|
37
44
|
|
45
|
+
error ErrorIAccessTargetAddressZero();
|
46
|
+
error ErrorIAccessTargetDoesNotExist(address target);
|
47
|
+
error ErrorIAccessTargetExists(address target, ShortString name);
|
48
|
+
error ErrorIAccessTargetTypeInvalid(address target, Type ttype);
|
49
|
+
error ErrorIAccessTargetNameEmpty(address target);
|
50
|
+
error ErrorIAccessTargetNameExists(address target, address existingTarget, ShortString name);
|
51
|
+
error ErrorIAccessTargetLocked(address target);
|
52
|
+
error ErrorIAccessTargetNotRegistered(address target);
|
53
|
+
error ErrorIAccessTargetAuthorityInvalid(address target, address targetAuthority);
|
38
54
|
}
|
@@ -1,20 +1,23 @@
|
|
1
1
|
// SPDX-License-Identifier: Apache-2.0
|
2
2
|
pragma solidity ^0.8.20;
|
3
3
|
|
4
|
+
import {Amount} from "../../types/Amount.sol";
|
4
5
|
import {NftId} from "../../types/NftId.sol";
|
5
6
|
import {Fee} from "../../types/Fee.sol";
|
7
|
+
import {Seconds} from "../../types/Seconds.sol";
|
6
8
|
import {Timestamp} from "../../types/Timestamp.sol";
|
7
9
|
|
8
10
|
interface IBundle {
|
11
|
+
|
9
12
|
struct BundleInfo {
|
10
13
|
NftId poolNftId;
|
11
14
|
Fee fee; // bundle fee on net premium amounts
|
12
15
|
bytes filter; // required conditions for applications to be considered for collateralization by this bundle
|
13
|
-
|
14
|
-
|
15
|
-
|
16
|
-
|
17
|
-
Timestamp expiredAt; // no new policies
|
16
|
+
Amount capitalAmount; // net stakings + net premiums - payouts
|
17
|
+
Amount lockedAmount; // capital amount linked to collateralizaion of non-closed policies (<= capital amount)
|
18
|
+
Amount feeAmount; // accumulated fee amount
|
19
|
+
Seconds lifetime;
|
20
|
+
Timestamp expiredAt; // no new policies starting with this timestamp
|
18
21
|
Timestamp closedAt; // no open policies, locked amount = 0
|
19
22
|
}
|
20
23
|
}
|