@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
@@ -1,43 +1,60 @@
|
|
1
1
|
// SPDX-License-Identifier: Apache-2.0
|
2
2
|
pragma solidity ^0.8.20;
|
3
3
|
|
4
|
-
import {
|
4
|
+
import {IAccessManaged} from "@openzeppelin/contracts/access/manager/IAccessManaged.sol";
|
5
5
|
|
6
|
+
import {ClaimId} from "../types/ClaimId.sol";
|
7
|
+
import {DistributorType} from "../types/DistributorType.sol";
|
8
|
+
import {PayoutId} from "../types/PayoutId.sol";
|
9
|
+
import {NftId} from "../types/NftId.sol";
|
10
|
+
import {StateId} from "../types/StateId.sol";
|
11
|
+
import {ReferralId} from "../types/Referral.sol";
|
12
|
+
import {RiskId} from "../types/RiskId.sol";
|
13
|
+
import {VersionPart} from "../types/Version.sol";
|
14
|
+
import {Key32} from "../types/Key32.sol";
|
15
|
+
|
16
|
+
import {IRegisterable} from "../shared/IRegisterable.sol";
|
17
|
+
|
18
|
+
import {ITransferInterceptor} from "../registry/ITransferInterceptor.sol";
|
19
|
+
|
20
|
+
import {InstanceAccessManager} from "./InstanceAccessManager.sol";
|
6
21
|
import {BundleManager} from "./BundleManager.sol";
|
7
22
|
import {InstanceReader} from "./InstanceReader.sol";
|
8
23
|
|
9
|
-
import {InstanceAccessManager} from "./InstanceAccessManager.sol";
|
10
|
-
import {IComponentOwnerService} from "./service/IComponentOwnerService.sol";
|
11
|
-
import {IDistributionService} from "./service/IDistributionService.sol";
|
12
|
-
import {IPoolService} from "./service/IPoolService.sol";
|
13
|
-
import {IProductService} from "./service/IProductService.sol";
|
14
|
-
import {IPolicyService} from "./service/IPolicyService.sol";
|
15
|
-
import {IBundleService} from "./service/IBundleService.sol";
|
16
24
|
import {IBundle} from "./module/IBundle.sol";
|
17
|
-
import {
|
18
|
-
import {
|
19
|
-
import {
|
20
|
-
import {RiskId} from "../types/RiskId.sol";
|
21
|
-
import {IRisk} from "./module/IRisk.sol";
|
22
|
-
import {IPolicy} from "./module/IPolicy.sol";
|
25
|
+
import {IBundleService} from "./service/IBundleService.sol";
|
26
|
+
import {IComponents} from "./module/IComponents.sol";
|
27
|
+
import {InstanceAccessManager} from "./InstanceAccessManager.sol";
|
23
28
|
import {IKeyValueStore} from "./base/IKeyValueStore.sol";
|
29
|
+
import {IPolicy} from "./module/IPolicy.sol";
|
30
|
+
import {IDistribution} from "./module/IDistribution.sol";
|
31
|
+
import {IRisk} from "./module/IRisk.sol";
|
32
|
+
import {ISetup} from "./module/ISetup.sol";
|
33
|
+
|
24
34
|
|
25
35
|
|
26
|
-
interface IInstance is
|
36
|
+
interface IInstance is
|
37
|
+
IRegisterable,
|
38
|
+
ITransferInterceptor,
|
39
|
+
IAccessManaged,
|
40
|
+
IKeyValueStore
|
41
|
+
{
|
42
|
+
error ErrorInstanceInstanceAccessManagerZero();
|
43
|
+
error ErrorInstanceInstanceAccessManagerAlreadySet(address instanceAccessManager);
|
44
|
+
error ErrorInstanceInstanceAccessManagerAuthorityMismatch(address instanceAuthority);
|
27
45
|
|
28
|
-
|
29
|
-
|
30
|
-
|
31
|
-
|
32
|
-
|
33
|
-
function getBundleService() external view returns (IBundleService);
|
46
|
+
error ErrorInstanceBundleManagerAlreadySet(address instanceBundleManager);
|
47
|
+
error ErrorInstanceBundleManagerInstanceMismatch(address instance);
|
48
|
+
error ErrorInstanceBundleManagerAuthorityMismatch(address instanceAuthority);
|
49
|
+
|
50
|
+
error ErrorInstanceInstanceReaderInstanceMismatch(address instanceAuthority);
|
34
51
|
|
35
52
|
function createDistributionSetup(NftId distributionNftId, ISetup.DistributionSetupInfo memory setup) external;
|
36
53
|
function updateDistributionSetup(NftId distributionNftId, ISetup.DistributionSetupInfo memory setup, StateId newState) external;
|
37
54
|
function updateDistributionSetupState(NftId distributionNftId, StateId newState) external;
|
38
55
|
|
39
|
-
function createPoolSetup(NftId poolNftId,
|
40
|
-
function updatePoolSetup(NftId poolNftId,
|
56
|
+
function createPoolSetup(NftId poolNftId, IComponents.ComponentInfo memory info) external;
|
57
|
+
function updatePoolSetup(NftId poolNftId, IComponents.ComponentInfo memory info, StateId newState) external;
|
41
58
|
function updatePoolSetupState(NftId poolNftId, StateId newState) external;
|
42
59
|
|
43
60
|
function createBundle(NftId bundleNftId, IBundle.BundleInfo memory bundle) external;
|
@@ -48,15 +65,40 @@ interface IInstance is IERC165, IKeyValueStore {
|
|
48
65
|
function updateProductSetup(NftId productNftId, ISetup.ProductSetupInfo memory setup, StateId newState) external;
|
49
66
|
function updateProductSetupState(NftId productNftId, StateId newState) external;
|
50
67
|
|
68
|
+
function createDistributorType(DistributorType distributorType, IDistribution.DistributorTypeInfo memory info) external;
|
69
|
+
function updateDistributorType(DistributorType distributorType, IDistribution.DistributorTypeInfo memory info, StateId newState) external;
|
70
|
+
function updateDistributorTypeState(DistributorType distributorType, StateId newState) external;
|
71
|
+
|
72
|
+
function createDistributor(NftId nftId, IDistribution.DistributorInfo memory info) external;
|
73
|
+
function updateDistributor(NftId nftId, IDistribution.DistributorInfo memory info, StateId newState) external;
|
74
|
+
function updateDistributorState(NftId nftId, StateId newState) external;
|
75
|
+
|
76
|
+
function createReferral(ReferralId referralId, IDistribution.ReferralInfo memory referralInfo) external;
|
77
|
+
function updateReferral(ReferralId referralId, IDistribution.ReferralInfo memory referralInfo, StateId newState) external;
|
78
|
+
function updateReferralState(ReferralId referralId, StateId newState) external;
|
79
|
+
|
51
80
|
function createRisk(RiskId riskId, IRisk.RiskInfo memory risk) external;
|
52
81
|
function updateRisk(RiskId riskId, IRisk.RiskInfo memory risk, StateId newState) external;
|
53
82
|
function updateRiskState(RiskId riskId, StateId newState) external;
|
54
83
|
|
55
|
-
function
|
84
|
+
function createApplication(NftId applicationNftId, IPolicy.PolicyInfo memory policy) external;
|
85
|
+
function updateApplication(NftId applicationNftId, IPolicy.PolicyInfo memory policy, StateId newState) external;
|
86
|
+
function updateApplicationState(NftId applicationNftId, StateId newState) external;
|
87
|
+
|
56
88
|
function updatePolicy(NftId policyNftId, IPolicy.PolicyInfo memory policy, StateId newState) external;
|
89
|
+
function updatePolicyClaims(NftId policyNftId, IPolicy.PolicyInfo memory policy, StateId newState) external;
|
57
90
|
function updatePolicyState(NftId policyNftId, StateId newState) external;
|
58
91
|
|
59
|
-
function
|
92
|
+
function createClaim(NftId policyNftId, ClaimId claimId, IPolicy.ClaimInfo memory claim) external;
|
93
|
+
function updateClaim(NftId policyNftId, ClaimId claimId, IPolicy.ClaimInfo memory claim, StateId newState) external;
|
94
|
+
function updateClaimState(NftId policyNftId, ClaimId claimId, StateId newState) external;
|
95
|
+
|
96
|
+
function createPayout(NftId policyNftId, PayoutId payoutId, IPolicy.PayoutInfo memory claim) external;
|
97
|
+
function updatePayout(NftId policyNftId, PayoutId payoutId, IPolicy.PayoutInfo memory claim, StateId newState) external;
|
98
|
+
function updatePayoutState(NftId policyNftId, PayoutId payoutId, StateId newState) external;
|
99
|
+
|
100
|
+
function getMajorVersion() external pure returns (VersionPart majorVersion);
|
60
101
|
function getInstanceReader() external view returns (InstanceReader);
|
61
102
|
function getBundleManager() external view returns (BundleManager);
|
103
|
+
function getInstanceAccessManager() external view returns (InstanceAccessManager);
|
62
104
|
}
|
@@ -5,11 +5,8 @@ import {NftId} from "../types/NftId.sol";
|
|
5
5
|
import {ObjectType} from "../types/ObjectType.sol";
|
6
6
|
import {RoleId} from "../types/RoleId.sol";
|
7
7
|
import {IService} from "../shared/IService.sol";
|
8
|
-
import {IRegistry} from "../registry/IRegistry.sol";
|
9
|
-
|
10
|
-
import {IRegisterable} from "../shared/IRegisterable.sol";
|
11
|
-
import {IBaseComponent} from "../components/IBaseComponent.sol";
|
12
8
|
|
9
|
+
import {AccessManagerUpgradeableInitializeable} from "./AccessManagerUpgradeableInitializeable.sol";
|
13
10
|
import {InstanceAccessManager} from "./InstanceAccessManager.sol";
|
14
11
|
import {Instance} from "./Instance.sol";
|
15
12
|
import {InstanceReader} from "./InstanceReader.sol";
|
@@ -17,24 +14,50 @@ import {BundleManager} from "./BundleManager.sol";
|
|
17
14
|
|
18
15
|
interface IInstanceService is IService {
|
19
16
|
|
17
|
+
error ErrorInstanceServiceMasterInstanceAlreadySet();
|
18
|
+
error ErrorInstanceServiceMasterOzAccessManagerAlreadySet();
|
19
|
+
error ErrorInstanceServiceMasterInstanceAccessManagerAlreadySet();
|
20
|
+
error ErrorInstanceServiceMasterBundleManagerAlreadySet();
|
21
|
+
error ErrorInstanceServiceInstanceAddressZero();
|
22
|
+
|
23
|
+
error ErrorInstanceServiceMasterInstanceReaderNotSet();
|
24
|
+
error ErrorInstanceServiceInstanceReaderAddressZero();
|
25
|
+
error ErrorInstanceServiceInstanceReaderSameAsMasterInstanceReader();
|
26
|
+
error ErrorInstanceServiceInstanceReaderInstanceMismatch();
|
27
|
+
|
28
|
+
error ErrorInstanceServiceInstanceAccessManagerZero();
|
29
|
+
error ErrorInstanceServiceInstanceReaderZero();
|
30
|
+
error ErrorInstanceServiceBundleManagerZero();
|
31
|
+
|
32
|
+
error ErrorInstanceServiceInstanceAuthorityMismatch();
|
33
|
+
error ErrorInstanceServiceBundleManagerAuthorityMismatch();
|
34
|
+
error ErrorInstanceServiceInstanceReaderInstanceMismatch2();
|
35
|
+
error ErrorInstanceServiceBundleMangerInstanceMismatch();
|
36
|
+
|
20
37
|
error ErrorInstanceServiceRequestUnauhorized(address caller);
|
21
38
|
error ErrorInstanceServiceNotInstanceOwner(address caller, NftId instanceNftId);
|
39
|
+
error ErrorInstanceServiceNotInstance(NftId nftId);
|
22
40
|
error ErrorInstanceServiceComponentNotRegistered(address componentAddress);
|
41
|
+
error ErrorInstanceServiceInstanceComponentMismatch(NftId instanceNftId, NftId componentNftId);
|
42
|
+
error ErrorInstanceServiceInvalidComponentType(address componentAddress, ObjectType expectedType, ObjectType componentType);
|
23
43
|
|
24
|
-
event LogInstanceCloned(address
|
44
|
+
event LogInstanceCloned(address clonedOzAccessManager, address clonedInstanceAccessManager, address clonedInstance, address clonedBundleManager, address clonedInstanceReader, NftId clonedInstanceNftId);
|
25
45
|
|
26
46
|
function createInstanceClone()
|
27
47
|
external
|
28
48
|
returns (
|
29
|
-
InstanceAccessManager clonedAccessManager,
|
30
49
|
Instance clonedInstance,
|
31
|
-
NftId instanceNftId
|
32
|
-
InstanceReader clonedInstanceReader,
|
33
|
-
BundleManager clonedBundleManager
|
50
|
+
NftId instanceNftId
|
34
51
|
);
|
35
52
|
|
36
|
-
function
|
37
|
-
|
53
|
+
function createGifTarget(
|
54
|
+
NftId instanceNftId,
|
55
|
+
address targetAddress,
|
56
|
+
string memory targetName,
|
57
|
+
bytes4[][] memory selectors,
|
58
|
+
RoleId[] memory roles
|
59
|
+
) external;
|
38
60
|
|
61
|
+
function setComponentLocked(bool locked) external;
|
39
62
|
}
|
40
63
|
|
@@ -1,48 +1,49 @@
|
|
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
|
-
import {ShortString, ShortStrings} from "@openzeppelin/contracts/utils/ShortStrings.sol";
|
6
|
-
import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";
|
7
4
|
import {AccessManagedUpgradeable} from "@openzeppelin/contracts-upgradeable/access/manager/AccessManagedUpgradeable.sol";
|
8
5
|
|
9
|
-
import {
|
10
|
-
import {
|
11
|
-
import {
|
12
|
-
import {
|
13
|
-
import {
|
14
|
-
import {
|
15
|
-
import {
|
6
|
+
import {Key32} from "../types/Key32.sol";
|
7
|
+
import {NftId} from "../types/NftId.sol";
|
8
|
+
import {ClaimId} from "../types/ClaimId.sol";
|
9
|
+
import {DistributorType} from "../types/DistributorType.sol";
|
10
|
+
import {PayoutId} from "../types/PayoutId.sol";
|
11
|
+
import {ObjectType, BUNDLE, DISTRIBUTION, INSTANCE, POLICY, POOL, PRODUCT, DISTRIBUTOR} from "../types/ObjectType.sol";
|
12
|
+
import {ReferralId} from "../types/Referral.sol";
|
13
|
+
import {RiskId} from "../types/RiskId.sol";
|
14
|
+
import {INSTANCE_OWNER_ROLE} from "../types/RoleId.sol";
|
15
|
+
import {StateId} from "../types/StateId.sol";
|
16
|
+
import {VersionPart, VersionPartLib} from "../types/Version.sol";
|
17
|
+
|
18
|
+
import {Registerable} from "../shared/Registerable.sol";
|
19
|
+
|
20
|
+
import {IRegistry} from "../registry/IRegistry.sol";
|
21
|
+
|
16
22
|
import {IInstance} from "./IInstance.sol";
|
17
23
|
import {InstanceReader} from "./InstanceReader.sol";
|
18
24
|
import {InstanceAccessManager} from "./InstanceAccessManager.sol";
|
19
25
|
import {BundleManager} from "./BundleManager.sol";
|
20
|
-
|
21
|
-
import {
|
22
|
-
|
23
|
-
import {
|
24
|
-
import {
|
25
|
-
import {
|
26
|
-
import {
|
27
|
-
import {
|
28
|
-
import {
|
29
|
-
|
30
|
-
import {
|
31
|
-
import {IDistributionService} from "./service/IDistributionService.sol";
|
32
|
-
import {IPoolService} from "./service/IPoolService.sol";
|
33
|
-
import {IProductService} from "./service/IProductService.sol";
|
34
|
-
import {IPolicyService} from "./service/IPolicyService.sol";
|
35
|
-
import {IBundleService} from "./service/IBundleService.sol";
|
36
|
-
import {VersionPart} from "../types/Version.sol";
|
37
|
-
import {InstanceBase} from "./InstanceBase.sol";
|
26
|
+
|
27
|
+
import {KeyValueStore} from "./base/KeyValueStore.sol";
|
28
|
+
|
29
|
+
import {IBundle} from "./module/IBundle.sol";
|
30
|
+
import {IComponents} from "./module/IComponents.sol";
|
31
|
+
import {IDistribution} from "./module/IDistribution.sol";
|
32
|
+
import {IPolicy} from "./module/IPolicy.sol";
|
33
|
+
import {IRisk} from "./module/IRisk.sol";
|
34
|
+
import {ISetup} from "./module/ISetup.sol";
|
35
|
+
|
36
|
+
import {VersionPart, VersionPartLib} from "../types/Version.sol";
|
38
37
|
|
39
38
|
contract Instance is
|
40
|
-
AccessManagedUpgradeable,
|
41
39
|
IInstance,
|
42
|
-
|
43
|
-
|
40
|
+
AccessManagedUpgradeable,
|
41
|
+
Registerable,
|
42
|
+
KeyValueStore
|
44
43
|
{
|
45
44
|
|
45
|
+
uint256 public constant GIF_MAJOR_VERSION = 3;
|
46
|
+
|
46
47
|
uint64 public constant ADMIN_ROLE = type(uint64).min;
|
47
48
|
uint64 public constant PUBLIC_ROLE = type(uint64).max;
|
48
49
|
uint64 public constant CUSTOM_ROLE_ID_MIN = 10000;
|
@@ -55,20 +56,28 @@ contract Instance is
|
|
55
56
|
InstanceReader internal _instanceReader;
|
56
57
|
BundleManager internal _bundleManager;
|
57
58
|
|
58
|
-
|
59
|
+
modifier onlyChainNft() {
|
60
|
+
if(msg.sender != getRegistry().getChainNftAddress()) {
|
61
|
+
revert();
|
62
|
+
}
|
63
|
+
_;
|
64
|
+
}
|
65
|
+
|
66
|
+
function initialize(address authority, address registryAddress, address initialOwner)
|
59
67
|
public
|
60
|
-
initializer
|
68
|
+
initializer()
|
61
69
|
{
|
62
|
-
|
70
|
+
if(authority == address(0)) {
|
71
|
+
revert ErrorInstanceInstanceAccessManagerZero();
|
72
|
+
}
|
63
73
|
|
64
|
-
__AccessManaged_init(
|
65
|
-
|
66
|
-
_accessManager = InstanceAccessManager(accessManagerAddress);
|
74
|
+
__AccessManaged_init(authority);
|
67
75
|
|
68
|
-
|
76
|
+
IRegistry registry = IRegistry(registryAddress);
|
77
|
+
initializeRegisterable(registryAddress, registry.getNftId(), INSTANCE(), true, initialOwner, "");
|
78
|
+
initializeLifecycle();
|
69
79
|
|
70
|
-
|
71
|
-
_initialized = true;
|
80
|
+
registerInterface(type(IInstance).interfaceId);
|
72
81
|
}
|
73
82
|
|
74
83
|
//--- ProductSetup ------------------------------------------------------//
|
@@ -98,68 +107,68 @@ contract Instance is
|
|
98
107
|
}
|
99
108
|
|
100
109
|
//--- PoolSetup ------------------------------------------------------//
|
101
|
-
function createPoolSetup(NftId poolNftId,
|
102
|
-
create(_toNftKey32(poolNftId, POOL()), abi.encode(
|
110
|
+
function createPoolSetup(NftId poolNftId, IComponents.ComponentInfo memory info) external restricted() {
|
111
|
+
create(_toNftKey32(poolNftId, POOL()), abi.encode(info));
|
103
112
|
}
|
104
113
|
|
105
|
-
function updatePoolSetup(NftId poolNftId,
|
106
|
-
update(_toNftKey32(poolNftId, POOL()), abi.encode(
|
114
|
+
function updatePoolSetup(NftId poolNftId, IComponents.ComponentInfo memory info, StateId newState) external restricted() {
|
115
|
+
update(_toNftKey32(poolNftId, POOL()), abi.encode(info), newState);
|
107
116
|
}
|
108
117
|
|
109
118
|
function updatePoolSetupState(NftId poolNftId, StateId newState) external restricted() {
|
110
119
|
updateState(_toNftKey32(poolNftId, POOL()), newState);
|
111
120
|
}
|
112
121
|
|
113
|
-
//--- DistributorType
|
114
|
-
function createDistributorType(
|
115
|
-
create(
|
122
|
+
//--- DistributorType -------------------------------------------------------//
|
123
|
+
function createDistributorType(DistributorType distributorType, IDistribution.DistributorTypeInfo memory info) external restricted() {
|
124
|
+
create(distributorType.toKey32(), abi.encode(info));
|
116
125
|
}
|
117
126
|
|
118
|
-
function updateDistributorType(
|
119
|
-
update(
|
127
|
+
function updateDistributorType(DistributorType distributorType, IDistribution.DistributorTypeInfo memory info, StateId newState) external restricted() {
|
128
|
+
update(distributorType.toKey32(), abi.encode(info), newState);
|
120
129
|
}
|
121
130
|
|
122
|
-
function updateDistributorTypeState(
|
123
|
-
updateState(
|
131
|
+
function updateDistributorTypeState(DistributorType distributorType, StateId newState) external restricted() {
|
132
|
+
updateState(distributorType.toKey32(), newState);
|
124
133
|
}
|
125
134
|
|
126
135
|
//--- Distributor -------------------------------------------------------//
|
127
|
-
function createDistributor(NftId
|
128
|
-
create(
|
136
|
+
function createDistributor(NftId distributorNftId, IDistribution.DistributorInfo memory info) external restricted() {
|
137
|
+
create(_toNftKey32(distributorNftId, DISTRIBUTOR()), abi.encode(info));
|
129
138
|
}
|
130
139
|
|
131
|
-
function updateDistributor(NftId
|
132
|
-
update(
|
140
|
+
function updateDistributor(NftId distributorNftId, IDistribution.DistributorInfo memory info, StateId newState) external restricted() {
|
141
|
+
update(_toNftKey32(distributorNftId, DISTRIBUTOR()), abi.encode(info), newState);
|
133
142
|
}
|
134
143
|
|
135
|
-
function updateDistributorState(NftId
|
136
|
-
updateState(
|
144
|
+
function updateDistributorState(NftId distributorNftId, StateId newState) external restricted() {
|
145
|
+
updateState(_toNftKey32(distributorNftId, DISTRIBUTOR()), newState);
|
137
146
|
}
|
138
147
|
|
139
148
|
//--- Referral ----------------------------------------------------------//
|
140
|
-
function createReferral(
|
141
|
-
create(
|
149
|
+
function createReferral(ReferralId referralId, IDistribution.ReferralInfo memory referralInfo) external restricted() {
|
150
|
+
create(referralId.toKey32(), abi.encode(referralInfo));
|
142
151
|
}
|
143
152
|
|
144
|
-
function updateReferral(
|
145
|
-
update(
|
153
|
+
function updateReferral(ReferralId referralId, IDistribution.ReferralInfo memory referralInfo, StateId newState) external restricted() {
|
154
|
+
update(referralId.toKey32(), abi.encode(referralInfo), newState);
|
146
155
|
}
|
147
156
|
|
148
|
-
function updateReferralState(
|
149
|
-
updateState(
|
157
|
+
function updateReferralState(ReferralId referralId, StateId newState) external restricted() {
|
158
|
+
updateState(referralId.toKey32(), newState);
|
150
159
|
}
|
151
160
|
|
152
161
|
//--- Bundle ------------------------------------------------------------//
|
153
162
|
function createBundle(NftId bundleNftId, IBundle.BundleInfo memory bundle) external restricted() {
|
154
|
-
create(
|
163
|
+
create(_toNftKey32(bundleNftId, BUNDLE()), abi.encode(bundle));
|
155
164
|
}
|
156
165
|
|
157
166
|
function updateBundle(NftId bundleNftId, IBundle.BundleInfo memory bundle, StateId newState) external restricted() {
|
158
|
-
update(
|
167
|
+
update(_toNftKey32(bundleNftId, BUNDLE()), abi.encode(bundle), newState);
|
159
168
|
}
|
160
169
|
|
161
170
|
function updateBundleState(NftId bundleNftId, StateId newState) external restricted() {
|
162
|
-
updateState(
|
171
|
+
updateState(_toNftKey32(bundleNftId, BUNDLE()), newState);
|
163
172
|
}
|
164
173
|
|
165
174
|
//--- Risk --------------------------------------------------------------//
|
@@ -175,102 +184,135 @@ contract Instance is
|
|
175
184
|
updateState(riskId.toKey32(), newState);
|
176
185
|
}
|
177
186
|
|
178
|
-
//--- Policy
|
179
|
-
function
|
180
|
-
create(
|
187
|
+
//--- Application (Policy) ----------------------------------------------//
|
188
|
+
function createApplication(NftId applicationNftId, IPolicy.PolicyInfo memory policy) external restricted() {
|
189
|
+
create(_toNftKey32(applicationNftId, POLICY()), abi.encode(policy));
|
190
|
+
}
|
191
|
+
|
192
|
+
function updateApplication(NftId applicationNftId, IPolicy.PolicyInfo memory policy, StateId newState) external restricted() {
|
193
|
+
update(_toNftKey32(applicationNftId, POLICY()), abi.encode(policy), newState);
|
181
194
|
}
|
182
195
|
|
196
|
+
function updateApplicationState(NftId applicationNftId, StateId newState) external restricted() {
|
197
|
+
updateState(_toNftKey32(applicationNftId, POLICY()), newState);
|
198
|
+
}
|
199
|
+
|
200
|
+
//--- Policy ------------------------------------------------------------//
|
183
201
|
function updatePolicy(NftId policyNftId, IPolicy.PolicyInfo memory policy, StateId newState) external restricted() {
|
184
|
-
update(
|
202
|
+
update(_toNftKey32(policyNftId, POLICY()), abi.encode(policy), newState);
|
203
|
+
}
|
204
|
+
|
205
|
+
function updatePolicyClaims(NftId policyNftId, IPolicy.PolicyInfo memory policy, StateId newState) external restricted() {
|
206
|
+
update(_toNftKey32(policyNftId, POLICY()), abi.encode(policy), newState);
|
185
207
|
}
|
186
208
|
|
187
209
|
function updatePolicyState(NftId policyNftId, StateId newState) external restricted() {
|
188
|
-
updateState(
|
210
|
+
updateState(_toNftKey32(policyNftId, POLICY()), newState);
|
189
211
|
}
|
190
212
|
|
191
213
|
//--- Claim -------------------------------------------------------------//
|
192
|
-
function createClaim(NftId policyNftId,
|
193
|
-
create(
|
214
|
+
function createClaim(NftId policyNftId, ClaimId claimId, IPolicy.ClaimInfo memory claim) external restricted() {
|
215
|
+
create(_toClaimKey32(policyNftId, claimId), abi.encode(claim));
|
194
216
|
}
|
195
217
|
|
196
|
-
function updateClaim(NftId policyNftId,
|
197
|
-
update(
|
218
|
+
function updateClaim(NftId policyNftId, ClaimId claimId, IPolicy.ClaimInfo memory claim, StateId newState) external restricted() {
|
219
|
+
update(_toClaimKey32(policyNftId, claimId), abi.encode(claim), newState);
|
198
220
|
}
|
199
221
|
|
200
|
-
function updateClaimState(NftId policyNftId, StateId newState) external restricted() {
|
201
|
-
updateState(
|
222
|
+
function updateClaimState(NftId policyNftId, ClaimId claimId, StateId newState) external restricted() {
|
223
|
+
updateState(_toClaimKey32(policyNftId, claimId), newState);
|
202
224
|
}
|
203
225
|
|
204
226
|
//--- Payout ------------------------------------------------------------//
|
205
|
-
function createPayout(NftId policyNftId,
|
206
|
-
create(
|
227
|
+
function createPayout(NftId policyNftId, PayoutId payoutId, IPolicy.PayoutInfo memory payout) external restricted() {
|
228
|
+
create(_toPayoutKey32(policyNftId, payoutId), abi.encode(payout));
|
207
229
|
}
|
208
230
|
|
209
|
-
function
|
210
|
-
update(
|
231
|
+
function updatePayout(NftId policyNftId, PayoutId payoutId, IPolicy.PayoutInfo memory payout, StateId newState) external restricted() {
|
232
|
+
update(_toPayoutKey32(policyNftId, payoutId), abi.encode(payout), newState);
|
211
233
|
}
|
212
234
|
|
213
|
-
function updatePayoutState(NftId policyNftId, StateId newState) external restricted() {
|
214
|
-
updateState(
|
235
|
+
function updatePayoutState(NftId policyNftId, PayoutId payoutId, StateId newState) external restricted() {
|
236
|
+
updateState(_toPayoutKey32(policyNftId, payoutId), newState);
|
215
237
|
}
|
216
238
|
|
217
|
-
//---
|
218
|
-
function
|
219
|
-
|
239
|
+
//--- ITransferInterceptor ------------------------------------------------------------//
|
240
|
+
function nftMint(address to, uint256 tokenId) external onlyChainNft {
|
241
|
+
assert(_accessManager.roleMembers(INSTANCE_OWNER_ROLE()) == 0);// temp
|
242
|
+
assert(_accessManager.grantRole(INSTANCE_OWNER_ROLE(), to) == true);
|
220
243
|
}
|
221
244
|
|
222
|
-
function
|
223
|
-
|
245
|
+
function nftTransferFrom(address from, address to, uint256 tokenId) external onlyChainNft {
|
246
|
+
assert(_accessManager.revokeRole(INSTANCE_OWNER_ROLE(), from) == true);
|
247
|
+
assert(_accessManager.grantRole(INSTANCE_OWNER_ROLE(), to) == true);
|
224
248
|
}
|
225
249
|
|
226
|
-
|
227
|
-
return policyNftId.toKey32(POLICY());
|
228
|
-
}
|
250
|
+
//--- initial setup functions -------------------------------------------//
|
229
251
|
|
230
|
-
function
|
231
|
-
|
232
|
-
|
252
|
+
function setInstanceAccessManager(InstanceAccessManager accessManager) external restricted {
|
253
|
+
if(address(_accessManager) != address(0)) {
|
254
|
+
revert ErrorInstanceInstanceAccessManagerAlreadySet(address(_accessManager));
|
255
|
+
}
|
233
256
|
|
234
|
-
|
235
|
-
|
257
|
+
if(accessManager.authority() != authority()) {
|
258
|
+
revert ErrorInstanceInstanceAccessManagerAuthorityMismatch(authority());
|
259
|
+
}
|
260
|
+
|
261
|
+
_accessManager = accessManager;
|
236
262
|
}
|
237
263
|
|
238
|
-
function
|
239
|
-
|
264
|
+
function setBundleManager(BundleManager bundleManager) external restricted() {
|
265
|
+
if(address(_bundleManager) != address(0)) {
|
266
|
+
revert ErrorInstanceBundleManagerAlreadySet(address(_bundleManager));
|
267
|
+
}
|
268
|
+
|
269
|
+
if(bundleManager.getInstance() != Instance(this)) {
|
270
|
+
revert ErrorInstanceBundleManagerInstanceMismatch(address(this));
|
271
|
+
}
|
272
|
+
|
273
|
+
if(bundleManager.authority() != authority()) {
|
274
|
+
revert ErrorInstanceBundleManagerAuthorityMismatch(authority());
|
275
|
+
}
|
276
|
+
|
277
|
+
_bundleManager = bundleManager;
|
240
278
|
}
|
241
279
|
|
242
|
-
function
|
243
|
-
|
280
|
+
function setInstanceReader(InstanceReader instanceReader) external restricted() {
|
281
|
+
if(instanceReader.getInstance() != Instance(this)) {
|
282
|
+
revert ErrorInstanceInstanceReaderInstanceMismatch(address(this));
|
283
|
+
}
|
284
|
+
|
285
|
+
_instanceReader = instanceReader;
|
244
286
|
}
|
245
287
|
|
246
|
-
|
247
|
-
|
288
|
+
//--- external view functions -------------------------------------------//
|
289
|
+
|
290
|
+
function getInstanceReader() external view returns (InstanceReader) {
|
291
|
+
return _instanceReader;
|
248
292
|
}
|
249
293
|
|
250
|
-
function
|
251
|
-
return
|
294
|
+
function getBundleManager() external view returns (BundleManager) {
|
295
|
+
return _bundleManager;
|
252
296
|
}
|
253
297
|
|
254
298
|
function getInstanceAccessManager() external view returns (InstanceAccessManager) {
|
255
299
|
return _accessManager;
|
256
300
|
}
|
257
301
|
|
258
|
-
function
|
259
|
-
|
260
|
-
_instanceReader = instanceReader;
|
302
|
+
function getMajorVersion() external pure returns (VersionPart majorVersion) {
|
303
|
+
return VersionPartLib.toVersionPart(GIF_MAJOR_VERSION);
|
261
304
|
}
|
262
305
|
|
263
|
-
|
264
|
-
|
306
|
+
//--- internal view/pure functions --------------------------------------//
|
307
|
+
function _toNftKey32(NftId nftId, ObjectType objectType) private pure returns (Key32) {
|
308
|
+
return nftId.toKey32(objectType);
|
265
309
|
}
|
266
|
-
|
267
|
-
function
|
268
|
-
|
269
|
-
require(bundleManager.getInstanceNftId() == getNftId(), "NFT ID of BundleManager does not match");
|
270
|
-
_bundleManager = bundleManager;
|
310
|
+
|
311
|
+
function _toClaimKey32(NftId policyNftId, ClaimId claimId) private pure returns (Key32) {
|
312
|
+
return claimId.toKey32(policyNftId);
|
271
313
|
}
|
272
314
|
|
273
|
-
function
|
274
|
-
return
|
315
|
+
function _toPayoutKey32(NftId policyNftId, PayoutId payoutId) private pure returns (Key32) {
|
316
|
+
return payoutId.toKey32(policyNftId);
|
275
317
|
}
|
276
318
|
}
|