@etherisc/gif-next 0.0.2-fe88ad7-208 → 0.0.2-ff8087d-237
Sign up to get free protection for your applications and to get access to all the features.
- package/README.md +8 -13
- package/artifacts/contracts/components/Component.sol/Component.dbg.json +4 -0
- package/artifacts/contracts/components/Component.sol/Component.json +873 -0
- package/artifacts/contracts/components/Distribution.sol/Distribution.dbg.json +1 -1
- package/artifacts/contracts/components/Distribution.sol/Distribution.json +903 -202
- package/artifacts/contracts/components/IComponent.sol/IComponent.dbg.json +4 -0
- package/artifacts/contracts/components/{BaseComponent.sol/BaseComponent.json → IComponent.sol/IComponent.json} +237 -83
- package/artifacts/contracts/components/IDistributionComponent.sol/IDistributionComponent.dbg.json +1 -1
- package/artifacts/contracts/components/IDistributionComponent.sol/IDistributionComponent.json +879 -31
- package/artifacts/contracts/components/IPoolComponent.sol/IPoolComponent.dbg.json +1 -1
- package/artifacts/contracts/components/IPoolComponent.sol/IPoolComponent.json +879 -59
- package/artifacts/contracts/components/IProductComponent.sol/IProductComponent.dbg.json +1 -1
- package/artifacts/contracts/components/IProductComponent.sol/IProductComponent.json +720 -16
- package/artifacts/contracts/components/Pool.sol/Pool.dbg.json +1 -1
- package/artifacts/contracts/components/Pool.sol/Pool.json +760 -195
- package/artifacts/contracts/components/Product.sol/Product.dbg.json +1 -1
- package/artifacts/contracts/components/Product.sol/Product.json +564 -141
- package/artifacts/contracts/instance/AccessManagerUpgradeableInitializeable.sol/AccessManagerUpgradeableInitializeable.dbg.json +1 -1
- package/artifacts/contracts/instance/AccessManagerUpgradeableInitializeable.sol/AccessManagerUpgradeableInitializeable.json +15 -15
- package/artifacts/contracts/instance/BundleManager.sol/BundleManager.dbg.json +1 -1
- package/artifacts/contracts/instance/BundleManager.sol/BundleManager.json +69 -79
- package/artifacts/contracts/instance/Cloneable.sol/Cloneable.dbg.json +1 -1
- package/artifacts/contracts/instance/Cloneable.sol/Cloneable.json +5 -0
- package/artifacts/contracts/instance/IInstance.sol/IInstance.dbg.json +1 -1
- package/artifacts/contracts/instance/IInstance.sol/IInstance.json +1474 -483
- package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.dbg.json +1 -1
- package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.json +248 -218
- package/artifacts/contracts/instance/Instance.sol/Instance.dbg.json +1 -1
- package/artifacts/contracts/instance/Instance.sol/Instance.json +1152 -794
- package/artifacts/contracts/instance/InstanceAccessManager.sol/InstanceAccessManager.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceAccessManager.sol/InstanceAccessManager.json +462 -179
- package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.json +414 -267
- package/artifacts/contracts/instance/InstanceService.sol/InstanceService.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceService.sol/InstanceService.json +482 -346
- package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.json +355 -91
- package/artifacts/contracts/instance/ObjectManager.sol/ObjectManager.dbg.json +1 -1
- package/artifacts/contracts/instance/ObjectManager.sol/ObjectManager.json +11 -40
- 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} +263 -164
- 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 +58 -75
- 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 +1124 -0
- package/artifacts/contracts/instance/service/ApplicationServiceManager.sol/ApplicationServiceManager.dbg.json +4 -0
- package/artifacts/contracts/instance/service/ApplicationServiceManager.sol/ApplicationServiceManager.json +688 -0
- package/artifacts/contracts/instance/service/BundleService.sol/BundleService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/BundleService.sol/BundleService.json +641 -303
- package/artifacts/contracts/instance/service/BundleServiceManager.sol/BundleServiceManager.dbg.json +1 -1
- package/artifacts/contracts/instance/service/BundleServiceManager.sol/BundleServiceManager.json +343 -79
- package/artifacts/contracts/instance/service/ClaimService.sol/ClaimService.dbg.json +4 -0
- package/artifacts/contracts/instance/service/ClaimService.sol/ClaimService.json +1384 -0
- package/artifacts/contracts/instance/service/ClaimServiceManager.sol/ClaimServiceManager.dbg.json +4 -0
- package/artifacts/contracts/instance/service/ClaimServiceManager.sol/ClaimServiceManager.json +752 -0
- package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.json +1434 -280
- package/artifacts/contracts/instance/service/DistributionServiceManager.sol/DistributionServiceManager.dbg.json +1 -1
- package/artifacts/contracts/instance/service/DistributionServiceManager.sol/DistributionServiceManager.json +469 -73
- package/artifacts/contracts/instance/service/IApplicationService.sol/IApplicationService.dbg.json +4 -0
- package/artifacts/contracts/instance/service/{IComponentOwnerService.sol/IComponentOwnerService.json → IApplicationService.sol/IApplicationService.json} +342 -189
- package/artifacts/contracts/instance/service/IBundleService.sol/IBundleService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/IBundleService.sol/IBundleService.json +310 -249
- package/artifacts/contracts/instance/service/IClaimService.sol/IClaimService.dbg.json +4 -0
- package/artifacts/contracts/instance/service/IClaimService.sol/IClaimService.json +743 -0
- package/artifacts/contracts/instance/service/IDistributionService.sol/IDistributionService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/IDistributionService.sol/IDistributionService.json +757 -144
- package/artifacts/contracts/instance/service/IPolicyService.sol/IPolicyService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/IPolicyService.sol/IPolicyService.json +262 -275
- package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.json +703 -125
- package/artifacts/contracts/instance/service/IProductService.sol/IProductService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/IProductService.sol/IProductService.json +71 -165
- package/artifacts/contracts/instance/service/PolicyService.sol/PolicyService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/PolicyService.sol/PolicyService.json +632 -344
- package/artifacts/contracts/instance/service/PolicyServiceManager.sol/PolicyServiceManager.dbg.json +1 -1
- package/artifacts/contracts/instance/service/PolicyServiceManager.sol/PolicyServiceManager.json +367 -91
- package/artifacts/contracts/instance/service/PoolService.sol/PoolService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/PoolService.sol/PoolService.json +1119 -224
- package/artifacts/contracts/instance/service/PoolServiceManager.sol/PoolServiceManager.dbg.json +1 -1
- package/artifacts/contracts/instance/service/PoolServiceManager.sol/PoolServiceManager.json +361 -73
- package/artifacts/contracts/instance/service/ProductService.sol/ProductService.dbg.json +1 -1
- package/artifacts/contracts/instance/service/ProductService.sol/ProductService.json +297 -210
- package/artifacts/contracts/instance/service/ProductServiceManager.sol/ProductServiceManager.dbg.json +1 -1
- package/artifacts/contracts/instance/service/ProductServiceManager.sol/ProductServiceManager.json +298 -78
- 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 +117 -5
- package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.dbg.json +1 -1
- package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.json +99 -217
- 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 +131 -27
- package/artifacts/contracts/registry/RegistryAccessManager.sol/RegistryAccessManager.dbg.json +1 -1
- package/artifacts/contracts/registry/RegistryAccessManager.sol/RegistryAccessManager.json +18 -18
- package/artifacts/contracts/registry/RegistryService.sol/RegistryService.dbg.json +1 -1
- package/artifacts/contracts/registry/RegistryService.sol/RegistryService.json +205 -250
- package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.dbg.json +1 -1
- package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.json +287 -81
- package/artifacts/contracts/registry/ReleaseManager.sol/ReleaseManager.dbg.json +1 -1
- package/artifacts/contracts/registry/ReleaseManager.sol/ReleaseManager.json +81 -68
- package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.dbg.json +1 -1
- package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.json +138 -50
- 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 +27 -29
- package/artifacts/contracts/shared/IPolicyHolder.sol/IPolicyHolder.dbg.json +4 -0
- package/artifacts/contracts/shared/IPolicyHolder.sol/IPolicyHolder.json +189 -0
- package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.dbg.json +1 -1
- package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.json +8 -34
- package/artifacts/contracts/shared/IRegistryLinked.sol/IRegistryLinked.dbg.json +4 -0
- package/artifacts/contracts/{experiment/inheritance/IA.sol/ISharedA.json → shared/IRegistryLinked.sol/IRegistryLinked.json} +15 -17
- package/artifacts/contracts/shared/IService.sol/IService.dbg.json +1 -1
- package/artifacts/contracts/shared/IService.sol/IService.json +71 -165
- 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 +107 -27
- package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.dbg.json +4 -0
- package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.json +302 -0
- package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.dbg.json +1 -1
- package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.json +283 -63
- package/artifacts/contracts/shared/Registerable.sol/Registerable.dbg.json +1 -1
- package/artifacts/contracts/shared/Registerable.sol/Registerable.json +116 -51
- package/artifacts/contracts/shared/RegistryLinked.sol/RegistryLinked.dbg.json +4 -0
- package/artifacts/contracts/shared/RegistryLinked.sol/RegistryLinked.json +71 -0
- package/artifacts/contracts/shared/Service.sol/Service.dbg.json +1 -1
- package/artifacts/contracts/shared/Service.sol/Service.json +173 -153
- package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.dbg.json +1 -1
- package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.json +24 -6
- 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 +116 -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 +191 -203
- 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 +281 -0
- package/artifacts/contracts/types/Blocknumber.sol/BlocknumberLib.dbg.json +1 -1
- package/artifacts/contracts/types/Blocknumber.sol/BlocknumberLib.json +2 -2
- package/artifacts/contracts/types/ChainId.sol/ChainIdLib.dbg.json +1 -1
- package/artifacts/contracts/types/ClaimId.sol/ClaimIdLib.dbg.json +4 -0
- package/artifacts/contracts/types/ClaimId.sol/ClaimIdLib.json +179 -0
- package/artifacts/contracts/types/DistributorType.sol/DistributorTypeLib.dbg.json +1 -1
- package/artifacts/contracts/types/DistributorType.sol/DistributorTypeLib.json +2 -2
- package/artifacts/contracts/types/Fee.sol/FeeLib.dbg.json +1 -1
- package/artifacts/contracts/types/Fee.sol/FeeLib.json +74 -19
- 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 +2 -2
- package/artifacts/contracts/types/NumberId.sol/NumberIdLib.dbg.json +1 -1
- package/artifacts/contracts/types/ObjectType.sol/ObjectTypeLib.dbg.json +1 -1
- package/artifacts/contracts/types/ObjectType.sol/ObjectTypeLib.json +2 -2
- package/artifacts/contracts/types/PayoutId.sol/PayoutIdLib.dbg.json +4 -0
- package/artifacts/contracts/types/PayoutId.sol/PayoutIdLib.json +209 -0
- package/artifacts/contracts/types/Referral.sol/ReferralLib.dbg.json +1 -1
- package/artifacts/contracts/types/Referral.sol/ReferralLib.json +23 -4
- package/artifacts/contracts/types/RiskId.sol/RiskIdLib.dbg.json +1 -1
- package/artifacts/contracts/types/RiskId.sol/RiskIdLib.json +2 -2
- package/artifacts/contracts/types/RoleId.sol/RoleIdLib.dbg.json +1 -1
- package/artifacts/contracts/types/RoleId.sol/RoleIdLib.json +2 -2
- package/artifacts/contracts/types/Seconds.sol/SecondsLib.dbg.json +4 -0
- package/artifacts/contracts/types/Seconds.sol/SecondsLib.json +124 -0
- package/artifacts/contracts/types/StateId.sol/StateIdLib.dbg.json +1 -1
- package/artifacts/contracts/types/StateId.sol/StateIdLib.json +2 -2
- package/artifacts/contracts/types/Timestamp.sol/TimestampLib.dbg.json +1 -1
- package/artifacts/contracts/types/Timestamp.sol/TimestampLib.json +38 -7
- package/artifacts/contracts/types/UFixed.sol/MathLib.dbg.json +1 -1
- package/artifacts/contracts/types/UFixed.sol/MathLib.json +2 -2
- package/artifacts/contracts/types/UFixed.sol/UFixedLib.dbg.json +1 -1
- package/artifacts/contracts/types/UFixed.sol/UFixedLib.json +2 -2
- package/artifacts/contracts/types/Version.sol/VersionLib.dbg.json +1 -1
- package/artifacts/contracts/types/Version.sol/VersionLib.json +2 -2
- package/artifacts/contracts/types/Version.sol/VersionPartLib.dbg.json +1 -1
- package/artifacts/contracts/types/Version.sol/VersionPartLib.json +2 -2
- package/contracts/components/Component.sol +272 -0
- package/contracts/components/Distribution.sol +204 -82
- package/contracts/components/IComponent.sol +90 -0
- package/contracts/components/IDistributionComponent.sol +44 -17
- package/contracts/components/IPoolComponent.sol +90 -42
- package/contracts/components/IProductComponent.sol +15 -9
- package/contracts/components/Pool.sol +217 -186
- package/contracts/components/Product.sol +246 -166
- package/contracts/instance/AccessManagerUpgradeableInitializeable.sol +2 -12
- package/contracts/instance/BundleManager.sol +17 -20
- package/contracts/instance/Cloneable.sol +7 -2
- package/contracts/instance/IInstance.sol +67 -25
- package/contracts/instance/IInstanceService.sol +34 -11
- package/contracts/instance/Instance.sol +158 -116
- package/contracts/instance/InstanceAccessManager.sol +389 -165
- package/contracts/instance/InstanceReader.sol +87 -36
- package/contracts/instance/InstanceService.sol +295 -161
- package/contracts/instance/InstanceServiceManager.sol +1 -1
- package/contracts/instance/ObjectManager.sol +10 -29
- package/contracts/instance/base/ComponentService.sol +130 -0
- package/contracts/instance/base/KeyValueStore.sol +13 -36
- package/contracts/instance/base/Lifecycle.sol +26 -6
- package/contracts/instance/module/IAccess.sol +22 -16
- package/contracts/instance/module/IBundle.sol +8 -5
- package/contracts/instance/module/IComponents.sol +41 -0
- package/contracts/instance/module/IDistribution.sol +3 -0
- package/contracts/instance/module/IPolicy.sol +43 -11
- package/contracts/instance/module/ISetup.sol +7 -20
- package/contracts/instance/service/ApplicationService.sol +356 -0
- package/contracts/instance/service/ApplicationServiceManager.sol +35 -0
- package/contracts/instance/service/BundleService.sol +244 -119
- package/contracts/instance/service/BundleServiceManager.sol +1 -1
- package/contracts/instance/service/ClaimService.sol +443 -0
- package/contracts/instance/service/ClaimServiceManager.sol +35 -0
- package/contracts/instance/service/DistributionService.sol +360 -41
- package/contracts/instance/service/DistributionServiceManager.sol +1 -1
- package/contracts/instance/service/IApplicationService.sol +79 -0
- package/contracts/instance/service/IBundleService.sol +93 -20
- package/contracts/instance/service/IClaimService.sol +90 -0
- package/contracts/instance/service/IDistributionService.sol +89 -0
- package/contracts/instance/service/IPolicyService.sol +44 -51
- package/contracts/instance/service/IPoolService.sol +97 -3
- package/contracts/instance/service/PolicyService.sol +233 -364
- package/contracts/instance/service/PolicyServiceManager.sol +2 -2
- package/contracts/instance/service/PoolService.sol +319 -40
- package/contracts/instance/service/PoolServiceManager.sol +1 -1
- package/contracts/instance/service/ProductService.sol +90 -50
- package/contracts/instance/service/ProductServiceManager.sol +2 -2
- package/contracts/registry/ChainNft.sol +8 -0
- package/contracts/registry/IRegistry.sol +18 -8
- package/contracts/registry/IRegistryService.sol +21 -13
- package/contracts/registry/ITransferInterceptor.sol +1 -0
- package/contracts/registry/Registry.sol +142 -71
- package/contracts/registry/RegistryAccessManager.sol +31 -25
- package/contracts/registry/RegistryService.sol +93 -134
- package/contracts/registry/RegistryServiceManager.sol +13 -13
- package/contracts/registry/ReleaseManager.sol +103 -127
- package/contracts/registry/TokenRegistry.sol +19 -13
- package/contracts/shared/ERC165.sol +14 -12
- package/contracts/shared/INftOwnable.sol +11 -10
- package/contracts/shared/IPolicyHolder.sol +40 -0
- package/contracts/shared/IRegisterable.sol +4 -6
- package/contracts/shared/IRegistryLinked.sol +11 -0
- package/contracts/shared/IService.sol +6 -4
- package/contracts/shared/IVersionable.sol +4 -47
- package/contracts/shared/NftOwnable.sol +64 -80
- package/contracts/shared/PolicyHolder.sol +94 -0
- package/contracts/shared/ProxyManager.sol +100 -25
- package/contracts/shared/Registerable.sol +24 -39
- package/contracts/shared/RegistryLinked.sol +43 -0
- package/contracts/shared/Service.sol +36 -22
- package/contracts/shared/TokenHandler.sol +14 -6
- package/contracts/shared/Versionable.sol +4 -92
- package/contracts/test/TestRegisterable.sol +1 -1
- package/contracts/test/TestService.sol +1 -1
- package/contracts/types/Amount.sol +109 -0
- package/contracts/types/Blocknumber.sol +1 -0
- package/contracts/types/ClaimId.sol +75 -0
- package/contracts/types/DistributorType.sol +2 -2
- package/contracts/types/Fee.sol +17 -8
- package/contracts/types/NftId.sol +8 -0
- package/contracts/types/ObjectType.sol +11 -6
- package/contracts/types/PayoutId.sol +82 -0
- package/contracts/types/Referral.sol +4 -0
- package/contracts/types/RoleId.sol +18 -11
- package/contracts/types/Seconds.sol +54 -0
- package/contracts/types/StateId.sol +7 -2
- package/contracts/types/Timestamp.sol +18 -13
- package/contracts/types/UFixed.sol +1 -0
- package/contracts/types/Version.sol +1 -0
- package/package.json +3 -3
- package/artifacts/contracts/components/BaseComponent.sol/BaseComponent.dbg.json +0 -4
- package/artifacts/contracts/components/IBaseComponent.sol/IBaseComponent.dbg.json +0 -4
- package/artifacts/contracts/components/IBaseComponent.sol/IBaseComponent.json +0 -397
- 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/IB.sol/IB.dbg.json +0 -4
- package/artifacts/contracts/experiment/inheritance/IB.sol/IB.json +0 -50
- 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/IInstanceBase.sol/IInstanceBase.dbg.json +0 -4
- package/artifacts/contracts/instance/IInstanceBase.sol/IInstanceBase.json +0 -448
- package/artifacts/contracts/instance/InstanceBase.sol/InstanceBase.dbg.json +0 -4
- package/artifacts/contracts/instance/InstanceBase.sol/InstanceBase.json +0 -763
- 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 -814
- package/artifacts/contracts/instance/service/IComponentOwnerService.sol/IComponentOwnerService.dbg.json +0 -4
- package/artifacts/contracts/shared/RegisterableUpgradable.sol/RegisterableUpgradable.dbg.json +0 -4
- package/artifacts/contracts/shared/RegisterableUpgradable.sol/RegisterableUpgradable.json +0 -442
- package/contracts/components/BaseComponent.sol +0 -159
- package/contracts/components/IBaseComponent.sol +0 -34
- 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/IInstanceBase.sol +0 -26
- package/contracts/instance/InstanceBase.sol +0 -41
- package/contracts/instance/base/ComponentServiceBase.sol +0 -82
- package/contracts/instance/base/IInstanceBase.sol +0 -23
- package/contracts/instance/service/ComponentOwnerService.sol +0 -315
- package/contracts/instance/service/IComponentOwnerService.sol +0 -20
- package/contracts/shared/RegisterableUpgradable.sol +0 -16
@@ -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;
|
@@ -14,49 +14,30 @@ contract ObjectManager is
|
|
14
14
|
Cloneable
|
15
15
|
{
|
16
16
|
|
17
|
-
event LogObjectManagerInitialized(
|
17
|
+
event LogObjectManagerInitialized(address instance);
|
18
18
|
|
19
19
|
error ErrorObjectManagerNftIdInvalid(NftId instanceNftId);
|
20
20
|
error ErrorObjectManagerAlreadyAdded(NftId componentNftId, NftId objectNftId);
|
21
21
|
|
22
22
|
mapping(NftId compnentNftId => LibNftIdSet.Set objects) internal _activeObjects;
|
23
23
|
mapping(NftId compnentNftId => LibNftIdSet.Set objects) internal _allObjects;
|
24
|
-
|
25
|
-
InstanceReader internal _instanceReader;
|
26
|
-
|
27
|
-
constructor() Cloneable() {
|
28
|
-
_instanceReader = InstanceReader(address(0));
|
29
|
-
}
|
24
|
+
IInstance internal _instance; // store instance address -> more flexible, instance may not be registered during ObjectManager initialization
|
30
25
|
|
31
26
|
/// @dev call to initialize MUST be made in the same transaction as cloning of the contract
|
32
|
-
function initialize(
|
33
|
-
|
34
|
-
address registry,
|
35
|
-
NftId instanceNftId
|
36
|
-
)
|
27
|
+
function initialize(address instanceAddress)
|
28
|
+
initializer
|
37
29
|
external
|
38
30
|
{
|
39
|
-
|
40
|
-
|
41
|
-
// check/handle instance nft id/instance reader
|
42
|
-
IRegistry.ObjectInfo memory instanceInfo = _registry.getObjectInfo(instanceNftId);
|
43
|
-
if (instanceInfo.objectType != INSTANCE()) {
|
44
|
-
revert ErrorObjectManagerNftIdInvalid(instanceNftId);
|
45
|
-
}
|
31
|
+
IInstance instance = IInstance(instanceAddress);
|
32
|
+
initialize(instance.authority(), address(instance.getRegistry()));
|
46
33
|
|
47
|
-
|
48
|
-
_instanceReader = instance.getInstanceReader();
|
49
|
-
_instanceNftId = instanceNftId;
|
34
|
+
_instance = instance;
|
50
35
|
|
51
|
-
emit LogObjectManagerInitialized(
|
52
|
-
}
|
53
|
-
|
54
|
-
function getInstanceReader() external view returns (InstanceReader) {
|
55
|
-
return _instanceReader;
|
36
|
+
emit LogObjectManagerInitialized(instanceAddress);
|
56
37
|
}
|
57
38
|
|
58
|
-
function
|
59
|
-
return
|
39
|
+
function getInstance() external view returns (IInstance) {
|
40
|
+
return _instance;
|
60
41
|
}
|
61
42
|
|
62
43
|
function _add(NftId componentNftId, NftId objectNftId) internal {
|
@@ -0,0 +1,130 @@
|
|
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
|
+
error ErrorComponentServiceSenderNotService(address sender);
|
25
|
+
error ErrorComponentServiceComponentTypeInvalid(address component, ObjectType expectedType, ObjectType foundType);
|
26
|
+
|
27
|
+
/// @dev modifier to check if caller is a registered service
|
28
|
+
modifier onlyService() {
|
29
|
+
address caller = msg.sender;
|
30
|
+
if(!getRegistry().isRegisteredService(caller)) {
|
31
|
+
revert ErrorComponentServiceSenderNotService(caller);
|
32
|
+
}
|
33
|
+
_;
|
34
|
+
}
|
35
|
+
|
36
|
+
// view functions
|
37
|
+
|
38
|
+
function getRegistryService() public view virtual returns (IRegistryService) {
|
39
|
+
return IRegistryService(_getServiceAddress(REGISTRY()));
|
40
|
+
}
|
41
|
+
|
42
|
+
function getInstanceService() public view returns (InstanceService) {
|
43
|
+
return InstanceService(_getServiceAddress(INSTANCE()));
|
44
|
+
}
|
45
|
+
|
46
|
+
function _getServiceAddress(ObjectType domain) internal view returns (address) {
|
47
|
+
return getRegistry().getServiceAddress(domain, getVersion().toMajorPart());
|
48
|
+
}
|
49
|
+
|
50
|
+
// internal functions
|
51
|
+
function _checkComponentForRegistration(
|
52
|
+
address componentAddress,
|
53
|
+
ObjectType requiredType,
|
54
|
+
RoleId requiredRole
|
55
|
+
)
|
56
|
+
internal
|
57
|
+
view
|
58
|
+
returns (
|
59
|
+
IComponent component,
|
60
|
+
address owner,
|
61
|
+
IInstance instance,
|
62
|
+
NftId instanceNftId
|
63
|
+
)
|
64
|
+
{
|
65
|
+
// component may only be registerd by initial owner of component
|
66
|
+
owner = msg.sender;
|
67
|
+
|
68
|
+
// check this is a component
|
69
|
+
component = IComponent(componentAddress);
|
70
|
+
if(!component.supportsInterface(type(IComponent).interfaceId)) {
|
71
|
+
revert ErrorComponentServiceNotComponent(componentAddress);
|
72
|
+
}
|
73
|
+
|
74
|
+
// check component is of required type
|
75
|
+
IRegistry.ObjectInfo memory componentInfo = component.getInitialInfo();
|
76
|
+
if(componentInfo.objectType != requiredType) {
|
77
|
+
revert ErrorComponentServiceInvalidType(componentAddress, requiredType, componentInfo.objectType);
|
78
|
+
}
|
79
|
+
|
80
|
+
// check msg.sender is component owner
|
81
|
+
address initialOwner = componentInfo.initialOwner;
|
82
|
+
if(owner != initialOwner) {
|
83
|
+
revert ErrorComponentServiceSenderNotOwner(componentAddress, componentInfo.initialOwner, owner);
|
84
|
+
}
|
85
|
+
|
86
|
+
// check instance has assigned required role to owner
|
87
|
+
instanceNftId = componentInfo.parentNftId;
|
88
|
+
instance = _getInstance(instanceNftId);
|
89
|
+
if(!instance.getInstanceAccessManager().hasRole(requiredRole, owner)) {
|
90
|
+
revert ErrorComponentServiceExpectedRoleMissing(instanceNftId, requiredRole, owner);
|
91
|
+
}
|
92
|
+
}
|
93
|
+
|
94
|
+
// internal view functions
|
95
|
+
|
96
|
+
function _getAndVerifyComponentInfoAndInstance(
|
97
|
+
ObjectType expectedType
|
98
|
+
)
|
99
|
+
internal
|
100
|
+
view
|
101
|
+
returns(
|
102
|
+
NftId nftId,
|
103
|
+
IRegistry.ObjectInfo memory info,
|
104
|
+
IInstance instance
|
105
|
+
)
|
106
|
+
{
|
107
|
+
IRegistry registry = getRegistry();
|
108
|
+
|
109
|
+
info = registry.getObjectInfo(msg.sender);
|
110
|
+
if(info.objectType != expectedType) {
|
111
|
+
revert ErrorComponentServiceComponentTypeInvalid(
|
112
|
+
info.objectAddress,
|
113
|
+
expectedType,
|
114
|
+
info.objectType);
|
115
|
+
}
|
116
|
+
|
117
|
+
nftId = info.nftId;
|
118
|
+
instance = _getInstance(info.parentNftId);
|
119
|
+
|
120
|
+
if (instance.getInstanceAccessManager().isTargetLocked(info.objectAddress)) {
|
121
|
+
revert IAccess.ErrorIAccessTargetLocked(info.objectAddress);
|
122
|
+
}
|
123
|
+
}
|
124
|
+
|
125
|
+
function _getInstance(NftId instanceNftId) internal view returns (IInstance) {
|
126
|
+
return IInstance(
|
127
|
+
getRegistry().getObjectInfo(
|
128
|
+
instanceNftId).objectAddress);
|
129
|
+
}
|
130
|
+
}
|
@@ -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";
|
@@ -20,15 +20,6 @@ contract KeyValueStore is Lifecycle, IKeyValueStore {
|
|
20
20
|
bytes memory data
|
21
21
|
)
|
22
22
|
internal
|
23
|
-
{
|
24
|
-
_create(key32, data);
|
25
|
-
}
|
26
|
-
|
27
|
-
function _create(
|
28
|
-
Key32 key32,
|
29
|
-
bytes memory data
|
30
|
-
)
|
31
|
-
internal
|
32
23
|
{
|
33
24
|
ObjectType objectType = key32.toObjectType();
|
34
25
|
require(objectType.gtz(), "ERROR:KVS-010:TYPE_UNDEFINED");
|
@@ -60,16 +51,6 @@ contract KeyValueStore is Lifecycle, IKeyValueStore {
|
|
60
51
|
StateId state
|
61
52
|
)
|
62
53
|
internal
|
63
|
-
{
|
64
|
-
_update(key32, data, state);
|
65
|
-
}
|
66
|
-
|
67
|
-
function _update(
|
68
|
-
Key32 key32,
|
69
|
-
bytes memory data,
|
70
|
-
StateId state
|
71
|
-
)
|
72
|
-
internal
|
73
54
|
{
|
74
55
|
require(state.gtz(), "ERROR:KVS-020:STATE_UNDEFINED");
|
75
56
|
Metadata storage metadata = _value[key32].metadata;
|
@@ -79,28 +60,27 @@ contract KeyValueStore is Lifecycle, IKeyValueStore {
|
|
79
60
|
// update data
|
80
61
|
_value[key32].data = data;
|
81
62
|
|
82
|
-
// update
|
63
|
+
// update state
|
64
|
+
if(state != KEEP_STATE()) {
|
65
|
+
metadata.state = state;
|
66
|
+
}
|
67
|
+
|
68
|
+
// update reest of metadata
|
83
69
|
address updatedBy = msg.sender;
|
84
70
|
Blocknumber lastUpdatedIn = metadata.updatedIn;
|
85
|
-
|
71
|
+
|
86
72
|
metadata.updatedBy = updatedBy;
|
87
73
|
metadata.updatedIn = blockBlocknumber();
|
88
74
|
|
89
75
|
// create log entries
|
90
76
|
// solhint-disable avoid-tx-origin
|
91
|
-
emit LogStateUpdated(key32.toObjectType(), key32.toKeyId(),
|
77
|
+
emit LogStateUpdated(key32.toObjectType(), key32.toKeyId(), stateOld, state, updatedBy, tx.origin, lastUpdatedIn);
|
92
78
|
emit LogInfoUpdated(key32.toObjectType(), key32.toKeyId(), state, updatedBy, tx.origin, lastUpdatedIn);
|
93
79
|
// solhing-enable
|
94
80
|
}
|
95
81
|
|
96
82
|
function updateData(Key32 key32, bytes memory data)
|
97
83
|
internal
|
98
|
-
{
|
99
|
-
_updateData(key32, data);
|
100
|
-
}
|
101
|
-
|
102
|
-
function _updateData(Key32 key32, bytes memory data)
|
103
|
-
internal
|
104
84
|
{
|
105
85
|
Metadata storage metadata = _value[key32].metadata;
|
106
86
|
StateId state = metadata.state;
|
@@ -122,18 +102,15 @@ contract KeyValueStore is Lifecycle, IKeyValueStore {
|
|
122
102
|
|
123
103
|
function updateState(Key32 key32, StateId state)
|
124
104
|
internal
|
125
|
-
{
|
126
|
-
_updateState(key32, state);
|
127
|
-
}
|
128
|
-
|
129
|
-
function _updateState(Key32 key32, StateId state)
|
130
|
-
internal
|
131
105
|
{
|
132
106
|
require(state.gtz(), "ERROR:KVS-040:STATE_UNDEFINED");
|
133
107
|
Metadata storage metadata = _value[key32].metadata;
|
134
108
|
StateId stateOld = metadata.state;
|
135
109
|
require(stateOld.gtz(), "ERROR:KVS-041:NOT_EXISTING");
|
136
110
|
|
111
|
+
// ensure state transistion is valid
|
112
|
+
checkTransition(metadata.objectType, stateOld, state);
|
113
|
+
|
137
114
|
// update metadata (and state)
|
138
115
|
address updatedBy = msg.sender;
|
139
116
|
Blocknumber lastUpdatedIn = metadata.updatedIn;
|
@@ -143,7 +120,7 @@ contract KeyValueStore is Lifecycle, IKeyValueStore {
|
|
143
120
|
|
144
121
|
// create log entry
|
145
122
|
// solhint-disable-next-line avoid-tx-origin
|
146
|
-
emit LogStateUpdated(key32.toObjectType(), key32.toKeyId(),
|
123
|
+
emit LogStateUpdated(key32.toObjectType(), key32.toKeyId(), stateOld, state, updatedBy, tx.origin, lastUpdatedIn);
|
147
124
|
}
|
148
125
|
|
149
126
|
function exists(Key32 key32) public view returns (bool) {
|
@@ -1,22 +1,31 @@
|
|
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
|
-
import {ObjectType, COMPONENT, BUNDLE, POLICY, RISK} from "../../types/ObjectType.sol";
|
6
|
-
import {StateId, ACTIVE, PAUSED, ARCHIVED, CLOSED, APPLIED,
|
7
|
+
import {ObjectType, COMPONENT, BUNDLE, POLICY, RISK, CLAIM, PAYOUT} from "../../types/ObjectType.sol";
|
8
|
+
import {StateId, ACTIVE, PAUSED, ARCHIVED, CLOSED, APPLIED, COLLATERALIZED, REVOKED, SUBMITTED, CONFIRMED, DECLINED, EXPECTED, PAID} 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();
|
28
|
+
_setupClaimAndPayoutLifecycle();
|
20
29
|
_setupRiskLifecycle();
|
21
30
|
}
|
22
31
|
|
@@ -78,6 +87,7 @@ contract Lifecycle is ILifecycle {
|
|
78
87
|
function _setupBundleLifecycle() internal {
|
79
88
|
_initialState[BUNDLE()] = ACTIVE();
|
80
89
|
_isValidTransition[BUNDLE()][ACTIVE()][PAUSED()] = true;
|
90
|
+
_isValidTransition[BUNDLE()][ACTIVE()][CLOSED()] = true;
|
81
91
|
_isValidTransition[BUNDLE()][PAUSED()][ACTIVE()] = true;
|
82
92
|
_isValidTransition[BUNDLE()][PAUSED()][CLOSED()] = true;
|
83
93
|
}
|
@@ -86,11 +96,21 @@ contract Lifecycle is ILifecycle {
|
|
86
96
|
_initialState[POLICY()] = APPLIED();
|
87
97
|
_isValidTransition[POLICY()][APPLIED()][REVOKED()] = true;
|
88
98
|
_isValidTransition[POLICY()][APPLIED()][DECLINED()] = true;
|
89
|
-
_isValidTransition[POLICY()][APPLIED()][
|
90
|
-
_isValidTransition[POLICY()][
|
99
|
+
_isValidTransition[POLICY()][APPLIED()][COLLATERALIZED()] = true;
|
100
|
+
_isValidTransition[POLICY()][COLLATERALIZED()][ACTIVE()] = true;
|
91
101
|
_isValidTransition[POLICY()][ACTIVE()][CLOSED()] = true;
|
92
102
|
}
|
93
103
|
|
104
|
+
function _setupClaimAndPayoutLifecycle() internal {
|
105
|
+
_initialState[CLAIM()] = SUBMITTED();
|
106
|
+
_isValidTransition[CLAIM()][SUBMITTED()][CONFIRMED()] = true;
|
107
|
+
_isValidTransition[CLAIM()][SUBMITTED()][DECLINED()] = true;
|
108
|
+
_isValidTransition[CLAIM()][CONFIRMED()][CLOSED()] = true;
|
109
|
+
|
110
|
+
_initialState[PAYOUT()] = EXPECTED();
|
111
|
+
_isValidTransition[PAYOUT()][EXPECTED()][PAID()] = true;
|
112
|
+
}
|
113
|
+
|
94
114
|
function _setupRiskLifecycle() internal {
|
95
115
|
_initialState[RISK()] = ACTIVE();
|
96
116
|
_isValidTransition[RISK()][ACTIVE()][PAUSED()] = true;
|
@@ -1,7 +1,6 @@
|
|
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";
|
@@ -9,40 +8,47 @@ import {Timestamp} from "../../types/Timestamp.sol";
|
|
9
8
|
|
10
9
|
interface IAccess {
|
11
10
|
|
11
|
+
enum Type {
|
12
|
+
NotInitialized,
|
13
|
+
Core,
|
14
|
+
Gif,
|
15
|
+
Custom
|
16
|
+
}
|
17
|
+
|
12
18
|
struct RoleInfo {
|
13
19
|
ShortString name;
|
14
|
-
|
15
|
-
bool isLocked;
|
20
|
+
Type rtype;
|
21
|
+
//bool isLocked;
|
22
|
+
RoleId admin;
|
16
23
|
Timestamp createdAt;
|
17
24
|
Timestamp updatedAt;
|
18
25
|
}
|
19
26
|
|
20
27
|
struct TargetInfo {
|
21
28
|
ShortString name;
|
22
|
-
|
29
|
+
Type ttype;
|
23
30
|
bool isLocked;
|
24
31
|
Timestamp createdAt;
|
25
32
|
Timestamp updatedAt;
|
26
33
|
}
|
27
34
|
|
28
|
-
error
|
35
|
+
error ErrorIAccessCallerIsNotRoleAdmin(address caller, RoleId roleId);
|
36
|
+
|
37
|
+
error ErrorIAccessRoleIdDoesNotExist(RoleId roleId);
|
29
38
|
error ErrorIAccessRoleIdTooBig(RoleId roleId);
|
30
39
|
error ErrorIAccessRoleIdTooSmall(RoleId roleId);
|
31
|
-
error
|
32
|
-
error ErrorIAccessRoleIdNotActive(RoleId roleId);
|
40
|
+
error ErrorIAccessRoleIdExists(RoleId roleId);
|
33
41
|
error ErrorIAccessRoleNameEmpty(RoleId roleId);
|
34
|
-
error
|
35
|
-
error
|
36
|
-
error ErrorIAccessRoleIsCustomIsImmutable(RoleId roleId, bool isCustom, bool isCustomExisting);
|
37
|
-
error ErrorIAccessSetLockedForNonexstentRole(RoleId roleId);
|
38
|
-
error ErrorIAccessGrantNonexstentRole(RoleId roleId);
|
39
|
-
error ErrorIAccessRevokeNonexstentRole(RoleId roleId);
|
40
|
-
error ErrorIAccessRenounceNonexstentRole(RoleId roleId);
|
42
|
+
error ErrorIAccessRoleNameExists(RoleId roleId, RoleId existingRoleId, ShortString name);
|
43
|
+
error ErrorIAccessRoleTypeInvalid(RoleId roleId, Type rtype);
|
41
44
|
|
42
45
|
error ErrorIAccessTargetAddressZero();
|
43
|
-
error
|
46
|
+
error ErrorIAccessTargetDoesNotExist(address target);
|
47
|
+
error ErrorIAccessTargetExists(address target, ShortString name);
|
48
|
+
error ErrorIAccessTargetTypeInvalid(address target, Type ttype);
|
44
49
|
error ErrorIAccessTargetNameEmpty(address target);
|
45
50
|
error ErrorIAccessTargetNameExists(address target, address existingTarget, ShortString name);
|
46
|
-
error ErrorIAccessSetLockedForNonexstentTarget(address target);
|
47
51
|
error ErrorIAccessTargetLocked(address target);
|
52
|
+
error ErrorIAccessTargetNotRegistered(address target);
|
53
|
+
error ErrorIAccessTargetAuthorityInvalid(address target, address targetAuthority);
|
48
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
|
}
|
@@ -0,0 +1,41 @@
|
|
1
|
+
// SPDX-License-Identifier: Apache-2.0
|
2
|
+
pragma solidity ^0.8.20;
|
3
|
+
|
4
|
+
import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
|
5
|
+
|
6
|
+
import {Amount} from "../../types/Amount.sol";
|
7
|
+
import {Fee} from "../../types/Fee.sol";
|
8
|
+
import {NftId} from "../../types/NftId.sol";
|
9
|
+
import {RoleId} from "../../types/RoleId.sol";
|
10
|
+
import {TokenHandler} from "../../shared/TokenHandler.sol";
|
11
|
+
import {UFixed} from "../../types/UFixed.sol";
|
12
|
+
|
13
|
+
interface IComponents {
|
14
|
+
|
15
|
+
struct ComponentInfo {
|
16
|
+
string name; // component name (needs to be unique per instance)
|
17
|
+
IERC20Metadata token;
|
18
|
+
TokenHandler tokenHandler;
|
19
|
+
address wallet;
|
20
|
+
Amount balanceAmount; // calculated balance (may not necessarily match withg wallet balance)
|
21
|
+
Amount feeAmount; // accumulated fees belonging to component owner
|
22
|
+
bytes data; // will hold component type specific additional info (eg encoded pool info)
|
23
|
+
}
|
24
|
+
|
25
|
+
struct PoolInfo {
|
26
|
+
NftId productNftId; // the nft of the product this pool is linked to
|
27
|
+
RoleId bundleOwnerRole; // the required role for bundle owners
|
28
|
+
// TODO maxCapitalAmount -> maxBalanceAmount
|
29
|
+
Amount maxCapitalAmount; // max capital amount allowed for pool
|
30
|
+
Amount balanceAmount; // current pool balance (accounting view)
|
31
|
+
Amount feeAmount; // accumulated fee amount
|
32
|
+
bool isInterceptingBundleTransfers; // intercepts nft transfers for bundles
|
33
|
+
bool isExternallyManaged; // funding bundles is restricted to book keeping, actual funds may be provided as needed to support payouts
|
34
|
+
bool isVerifyingApplications; // underwriting requires the pool component checks/confirms the applications
|
35
|
+
UFixed collateralizationLevel; // factor to calculate collateral for sum insurance (default 100%)
|
36
|
+
UFixed retentionLevel; // amount of collateral held in pool (default 100%)
|
37
|
+
Fee poolFee; // pool fee on net premium
|
38
|
+
Fee stakingFee; // pool fee on staked capital from investor
|
39
|
+
Fee performanceFee; // pool fee on profits from capital investors
|
40
|
+
}
|
41
|
+
}
|
@@ -1,6 +1,7 @@
|
|
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 {DistributorType} from "../../types/DistributorType.sol";
|
5
6
|
import {NftId} from "../../types/NftId.sol";
|
6
7
|
import {Timestamp} from "../../types/Timestamp.sol";
|
@@ -24,6 +25,8 @@ interface IDistribution {
|
|
24
25
|
DistributorType distributorType;
|
25
26
|
bool active;
|
26
27
|
bytes data;
|
28
|
+
Amount commissionAmount;
|
29
|
+
uint32 numPoliciesSold;
|
27
30
|
}
|
28
31
|
|
29
32
|
struct ReferralInfo {
|
@@ -1,27 +1,56 @@
|
|
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
|
-
import {
|
6
|
+
import {ClaimId} from "../../types/ClaimId.sol";
|
6
7
|
import {ReferralId} from "../../types/Referral.sol";
|
7
8
|
import {RiskId} from "../../types/RiskId.sol";
|
9
|
+
import {Seconds} from "../../types/Seconds.sol";
|
8
10
|
import {Timestamp} from "../../types/Timestamp.sol";
|
9
11
|
|
10
12
|
interface IPolicy {
|
13
|
+
|
14
|
+
struct Premium {
|
15
|
+
// this is the net premium calculated by the product
|
16
|
+
uint256 netPremiumAmount;
|
17
|
+
// fullPremium = netPremium + all fixed amounts + all variable amounts (excl commission and minDistribtuionOwnerFee variable part)
|
18
|
+
uint256 fullPremiumAmount;
|
19
|
+
// premium = fullPremium - discount
|
20
|
+
uint256 premiumAmount;
|
21
|
+
uint256 productFeeFixAmount;
|
22
|
+
uint256 poolFeeFixAmount;
|
23
|
+
uint256 bundleFeeFixAmount;
|
24
|
+
uint256 distributionFeeFixAmount;
|
25
|
+
uint256 productFeeVarAmount;
|
26
|
+
uint256 poolFeeVarAmount;
|
27
|
+
uint256 bundleFeeVarAmount;
|
28
|
+
uint256 distributionFeeVarAmount;
|
29
|
+
uint256 distributionOwnerFeeFixAmount;
|
30
|
+
// this is the remaining amount when the commission and discount are subtracted from the distribution fee variable part (must be at least the minDistributionOwnerFee)
|
31
|
+
uint256 distributionOwnerFeeVarAmount;
|
32
|
+
// this value is based on distributor type referenced in the referral
|
33
|
+
uint256 commissionAmount;
|
34
|
+
// this is based on referral used
|
35
|
+
uint256 discountAmount;
|
36
|
+
}
|
37
|
+
|
38
|
+
/// @dev policy data for the full policy lifecycle
|
11
39
|
struct PolicyInfo {
|
12
40
|
NftId productNftId;
|
13
41
|
NftId bundleNftId;
|
14
42
|
ReferralId referralId;
|
15
43
|
RiskId riskId;
|
16
|
-
|
17
|
-
|
18
|
-
|
19
|
-
|
44
|
+
Amount sumInsuredAmount;
|
45
|
+
Amount premiumAmount;
|
46
|
+
Amount premiumPaidAmount; // when lower than premium amount: max payout decreased accordingly
|
47
|
+
Seconds lifetime;
|
20
48
|
bytes applicationData;
|
21
49
|
bytes policyData;
|
22
50
|
uint16 claimsCount;
|
23
51
|
uint16 openClaimsCount;
|
24
|
-
|
52
|
+
Amount claimAmount; // sum of confirmed claim amounts (max = sum insured amount)
|
53
|
+
Amount payoutAmount; // sum of payouts (max = sum confirmed claim amountst)
|
25
54
|
Timestamp activatedAt; // time of underwriting
|
26
55
|
Timestamp expiredAt; // no new claims (activatedAt + lifetime)
|
27
56
|
Timestamp closedAt; // no locked capital (or declinedAt)
|
@@ -29,16 +58,19 @@ interface IPolicy {
|
|
29
58
|
|
30
59
|
// claimId neeeds to be encoded policyNftId:claimId combination
|
31
60
|
struct ClaimInfo {
|
32
|
-
|
33
|
-
|
61
|
+
Amount claimAmount;
|
62
|
+
Amount paidAmount;
|
63
|
+
uint8 payoutsCount;
|
64
|
+
uint8 openPayoutsCount;
|
34
65
|
bytes data;
|
35
|
-
|
66
|
+
// TODO consider to add processData that may include information supporting confirm or decline
|
67
|
+
Timestamp closedAt; // payment of confirmed claim amount (or declinedAt)
|
36
68
|
}
|
37
69
|
|
38
70
|
// claimId neeeds to be encoded policyNftId:claimId combination
|
39
71
|
struct PayoutInfo {
|
40
|
-
|
41
|
-
|
72
|
+
ClaimId claimId;
|
73
|
+
Amount amount;
|
42
74
|
bytes data;
|
43
75
|
Timestamp paidAt; // payoment of confirmed claim amount (or declinedAt)
|
44
76
|
}
|