@etherisc/gif-next 0.0.2-fbe6493-116 → 0.0.2-fc41a4e-906
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +86 -9
- package/artifacts/contracts/accounting/AccountingService.sol/AccountingService.dbg.json +4 -0
- package/artifacts/contracts/accounting/AccountingService.sol/AccountingService.json +1023 -0
- package/artifacts/contracts/accounting/AccountingServiceManager.sol/AccountingServiceManager.dbg.json +4 -0
- package/artifacts/contracts/accounting/AccountingServiceManager.sol/AccountingServiceManager.json +752 -0
- package/artifacts/contracts/accounting/IAccountingService.sol/IAccountingService.dbg.json +4 -0
- package/artifacts/contracts/{shared/ComponentVerifyingService.sol/ComponentVerifyingService.json → accounting/IAccountingService.sol/IAccountingService.json} +365 -113
- package/artifacts/contracts/authorization/AccessAdmin.sol/AccessAdmin.dbg.json +1 -1
- package/artifacts/contracts/authorization/AccessAdmin.sol/AccessAdmin.json +673 -262
- package/artifacts/contracts/authorization/AccessAdminLib.sol/AccessAdminLib.dbg.json +4 -0
- package/artifacts/contracts/authorization/AccessAdminLib.sol/AccessAdminLib.json +1289 -0
- package/artifacts/contracts/authorization/AccessManagerCloneable.sol/AccessManagerCloneable.dbg.json +1 -1
- package/artifacts/contracts/authorization/AccessManagerCloneable.sol/AccessManagerCloneable.json +202 -5
- package/artifacts/contracts/authorization/Authorization.sol/Authorization.dbg.json +1 -1
- package/artifacts/contracts/authorization/Authorization.sol/Authorization.json +456 -24
- package/artifacts/contracts/authorization/IAccess.sol/IAccess.dbg.json +1 -1
- package/artifacts/contracts/authorization/IAccessAdmin.sol/IAccessAdmin.dbg.json +1 -1
- package/artifacts/contracts/authorization/IAccessAdmin.sol/IAccessAdmin.json +549 -209
- package/artifacts/contracts/authorization/IAuthorization.sol/IAuthorization.dbg.json +1 -1
- package/artifacts/contracts/authorization/IAuthorization.sol/IAuthorization.json +215 -18
- package/artifacts/contracts/authorization/IServiceAuthorization.sol/IServiceAuthorization.dbg.json +1 -1
- package/artifacts/contracts/authorization/IServiceAuthorization.sol/IServiceAuthorization.json +265 -16
- package/artifacts/contracts/authorization/ServiceAuthorization.sol/ServiceAuthorization.dbg.json +1 -1
- package/artifacts/contracts/authorization/ServiceAuthorization.sol/ServiceAuthorization.json +473 -17
- package/artifacts/contracts/distribution/BasicDistribution.sol/BasicDistribution.dbg.json +1 -1
- package/artifacts/contracts/distribution/BasicDistribution.sol/BasicDistribution.json +171 -464
- package/artifacts/contracts/distribution/BasicDistributionAuthorization.sol/BasicDistributionAuthorization.dbg.json +1 -1
- package/artifacts/contracts/distribution/BasicDistributionAuthorization.sol/BasicDistributionAuthorization.json +431 -36
- package/artifacts/contracts/distribution/Distribution.sol/Distribution.dbg.json +1 -1
- package/artifacts/contracts/distribution/Distribution.sol/Distribution.json +90 -356
- package/artifacts/contracts/distribution/DistributionService.sol/DistributionService.dbg.json +1 -1
- package/artifacts/contracts/distribution/DistributionService.sol/DistributionService.json +472 -364
- package/artifacts/contracts/distribution/DistributionServiceManager.sol/DistributionServiceManager.dbg.json +1 -1
- package/artifacts/contracts/distribution/DistributionServiceManager.sol/DistributionServiceManager.json +186 -128
- package/artifacts/contracts/distribution/IDistributionComponent.sol/IDistributionComponent.dbg.json +1 -1
- package/artifacts/contracts/distribution/IDistributionComponent.sol/IDistributionComponent.json +84 -198
- package/artifacts/contracts/distribution/IDistributionService.sol/IDistributionService.dbg.json +1 -1
- package/artifacts/contracts/distribution/IDistributionService.sol/IDistributionService.json +287 -101
- package/artifacts/contracts/examples/fire/DamageLevel.sol/DamageLevelLib.dbg.json +4 -0
- package/artifacts/contracts/examples/fire/DamageLevel.sol/DamageLevelLib.json +22 -0
- package/artifacts/contracts/examples/fire/FirePool.sol/FirePool.dbg.json +4 -0
- package/artifacts/contracts/examples/fire/FirePool.sol/FirePool.json +1461 -0
- package/artifacts/contracts/examples/fire/FirePoolAuthorization.sol/FirePoolAuthorization.dbg.json +4 -0
- package/artifacts/contracts/examples/fire/FirePoolAuthorization.sol/FirePoolAuthorization.json +805 -0
- package/artifacts/contracts/examples/fire/FireProduct.sol/FireProduct.dbg.json +4 -0
- package/artifacts/contracts/examples/fire/FireProduct.sol/FireProduct.json +2018 -0
- package/artifacts/contracts/examples/fire/FireProductAuthorization.sol/FireProductAuthorization.dbg.json +4 -0
- package/artifacts/contracts/examples/fire/FireProductAuthorization.sol/FireProductAuthorization.json +805 -0
- package/artifacts/contracts/examples/fire/FireUSD.sol/FireUSD.dbg.json +4 -0
- package/artifacts/contracts/examples/fire/FireUSD.sol/FireUSD.json +376 -0
- package/artifacts/contracts/examples/unpermissioned/SimpleDistribution.sol/SimpleDistribution.dbg.json +4 -0
- package/artifacts/contracts/examples/unpermissioned/SimpleDistribution.sol/SimpleDistribution.json +1404 -0
- package/artifacts/contracts/examples/unpermissioned/SimpleDistributionAuthorization.sol/SimpleDistributionAuthorization.dbg.json +4 -0
- package/artifacts/contracts/examples/unpermissioned/SimpleDistributionAuthorization.sol/SimpleDistributionAuthorization.json +805 -0
- package/artifacts/contracts/examples/unpermissioned/SimpleOracle.sol/SimpleOracle.dbg.json +4 -0
- package/artifacts/contracts/examples/unpermissioned/SimpleOracle.sol/SimpleOracle.json +1152 -0
- package/artifacts/contracts/examples/unpermissioned/SimplePool.sol/SimplePool.dbg.json +4 -0
- package/artifacts/contracts/examples/unpermissioned/SimplePool.sol/SimplePool.json +1628 -0
- package/artifacts/contracts/examples/unpermissioned/SimplePoolAuthorization.sol/SimplePoolAuthorization.dbg.json +4 -0
- package/artifacts/contracts/examples/unpermissioned/SimplePoolAuthorization.sol/SimplePoolAuthorization.json +805 -0
- package/artifacts/contracts/examples/unpermissioned/SimpleProduct.sol/SimpleProduct.dbg.json +4 -0
- package/artifacts/contracts/examples/unpermissioned/SimpleProduct.sol/SimpleProduct.json +2405 -0
- package/artifacts/contracts/examples/unpermissioned/SimpleProductAuthorization.sol/SimpleProductAuthorization.dbg.json +4 -0
- package/artifacts/contracts/examples/unpermissioned/SimpleProductAuthorization.sol/SimpleProductAuthorization.json +805 -0
- package/artifacts/contracts/instance/BundleSet.sol/BundleSet.dbg.json +1 -1
- package/artifacts/contracts/instance/BundleSet.sol/BundleSet.json +193 -45
- package/artifacts/contracts/instance/IInstance.sol/IInstance.dbg.json +1 -1
- package/artifacts/contracts/instance/IInstance.sol/IInstance.json +540 -65
- package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.dbg.json +1 -1
- package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.json +290 -57
- package/artifacts/contracts/instance/Instance.sol/Instance.dbg.json +1 -1
- package/artifacts/contracts/instance/Instance.sol/Instance.json +549 -166
- package/artifacts/contracts/instance/InstanceAdmin.sol/InstanceAdmin.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceAdmin.sol/InstanceAdmin.json +1034 -311
- package/artifacts/contracts/instance/InstanceAuthorizationV3.sol/InstanceAuthorizationV3.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceAuthorizationV3.sol/InstanceAuthorizationV3.json +369 -68
- package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.json +1688 -735
- package/artifacts/contracts/instance/InstanceService.sol/InstanceService.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceService.sol/InstanceService.json +303 -227
- package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.json +106 -106
- package/artifacts/contracts/instance/InstanceStore.sol/InstanceStore.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceStore.sol/InstanceStore.json +955 -640
- package/artifacts/contracts/instance/RiskSet.sol/RiskSet.dbg.json +4 -0
- package/artifacts/contracts/instance/RiskSet.sol/RiskSet.json +853 -0
- package/artifacts/contracts/instance/base/BalanceStore.sol/BalanceStore.dbg.json +1 -1
- package/artifacts/contracts/instance/base/BalanceStore.sol/BalanceStore.json +2 -2
- package/artifacts/contracts/instance/base/Cloneable.sol/Cloneable.dbg.json +1 -1
- package/artifacts/contracts/instance/base/ObjectCounter.sol/ObjectCounter.dbg.json +1 -1
- package/artifacts/contracts/instance/base/ObjectCounter.sol/ObjectCounter.json +2 -2
- package/artifacts/contracts/instance/base/ObjectLifecycle.sol/ObjectLifecycle.dbg.json +1 -1
- package/artifacts/contracts/instance/base/ObjectLifecycle.sol/ObjectLifecycle.json +46 -5
- package/artifacts/contracts/instance/base/ObjectSet.sol/ObjectSet.dbg.json +1 -1
- package/artifacts/contracts/instance/base/ObjectSet.sol/ObjectSet.json +16 -5
- package/artifacts/contracts/instance/base/ObjectSetHelperLib.sol/ObjectSetHelperLib.dbg.json +4 -0
- package/artifacts/contracts/instance/base/ObjectSetHelperLib.sol/ObjectSetHelperLib.json +168 -0
- package/artifacts/contracts/instance/module/IBundle.sol/IBundle.dbg.json +1 -1
- package/artifacts/contracts/instance/module/IComponents.sol/IComponents.dbg.json +1 -1
- 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/mock/Dip.sol/Dip.dbg.json +1 -1
- package/artifacts/contracts/oracle/BasicOracle.sol/BasicOracle.dbg.json +1 -1
- package/artifacts/contracts/oracle/BasicOracle.sol/BasicOracle.json +116 -333
- package/artifacts/contracts/oracle/BasicOracleAuthorization.sol/BasicOracleAuthorization.dbg.json +1 -1
- package/artifacts/contracts/oracle/BasicOracleAuthorization.sol/BasicOracleAuthorization.json +429 -37
- package/artifacts/contracts/oracle/IOracle.sol/IOracle.dbg.json +1 -1
- package/artifacts/contracts/oracle/IOracleComponent.sol/IOracleComponent.dbg.json +1 -1
- package/artifacts/contracts/oracle/IOracleComponent.sol/IOracleComponent.json +91 -140
- package/artifacts/contracts/oracle/IOracleService.sol/IOracleService.dbg.json +1 -1
- package/artifacts/contracts/oracle/IOracleService.sol/IOracleService.json +69 -11
- package/artifacts/contracts/oracle/Oracle.sol/Oracle.dbg.json +1 -1
- package/artifacts/contracts/oracle/Oracle.sol/Oracle.json +92 -293
- package/artifacts/contracts/oracle/OracleService.sol/OracleService.dbg.json +1 -1
- package/artifacts/contracts/oracle/OracleService.sol/OracleService.json +169 -190
- package/artifacts/contracts/oracle/OracleServiceManager.sol/OracleServiceManager.dbg.json +1 -1
- package/artifacts/contracts/oracle/OracleServiceManager.sol/OracleServiceManager.json +140 -98
- package/artifacts/contracts/pool/BasicPool.sol/BasicPool.dbg.json +1 -1
- package/artifacts/contracts/pool/BasicPool.sol/BasicPool.json +132 -333
- package/artifacts/contracts/pool/BasicPoolAuthorization.sol/BasicPoolAuthorization.dbg.json +1 -1
- package/artifacts/contracts/pool/BasicPoolAuthorization.sol/BasicPoolAuthorization.json +430 -35
- package/artifacts/contracts/pool/BundleService.sol/BundleService.dbg.json +1 -1
- package/artifacts/contracts/pool/BundleService.sol/BundleService.json +195 -423
- package/artifacts/contracts/pool/BundleServiceManager.sol/BundleServiceManager.dbg.json +1 -1
- package/artifacts/contracts/pool/BundleServiceManager.sol/BundleServiceManager.json +134 -132
- package/artifacts/contracts/pool/IBundleService.sol/IBundleService.dbg.json +1 -1
- package/artifacts/contracts/pool/IBundleService.sol/IBundleService.json +90 -117
- package/artifacts/contracts/pool/IPoolComponent.sol/IPoolComponent.dbg.json +1 -1
- package/artifacts/contracts/pool/IPoolComponent.sol/IPoolComponent.json +122 -182
- package/artifacts/contracts/pool/IPoolService.sol/IPoolService.dbg.json +1 -1
- package/artifacts/contracts/pool/IPoolService.sol/IPoolService.json +317 -300
- package/artifacts/contracts/pool/Pool.sol/Pool.dbg.json +1 -1
- package/artifacts/contracts/pool/Pool.sol/Pool.json +120 -332
- package/artifacts/contracts/pool/PoolLib.sol/PoolLib.dbg.json +4 -0
- package/artifacts/contracts/pool/PoolLib.sol/PoolLib.json +538 -0
- package/artifacts/contracts/pool/PoolService.sol/PoolService.dbg.json +1 -1
- package/artifacts/contracts/pool/PoolService.sol/PoolService.json +506 -583
- package/artifacts/contracts/pool/PoolServiceManager.sol/PoolServiceManager.dbg.json +1 -1
- package/artifacts/contracts/pool/PoolServiceManager.sol/PoolServiceManager.json +165 -115
- package/artifacts/contracts/product/ApplicationService.sol/ApplicationService.dbg.json +1 -1
- package/artifacts/contracts/product/ApplicationService.sol/ApplicationService.json +192 -173
- package/artifacts/contracts/product/ApplicationServiceManager.sol/ApplicationServiceManager.dbg.json +1 -1
- package/artifacts/contracts/product/ApplicationServiceManager.sol/ApplicationServiceManager.json +128 -98
- package/artifacts/contracts/product/BasicProduct.sol/BasicProduct.dbg.json +1 -1
- package/artifacts/contracts/product/BasicProduct.sol/BasicProduct.json +254 -394
- package/artifacts/contracts/product/BasicProductAuthorization.sol/BasicProductAuthorization.dbg.json +1 -1
- package/artifacts/contracts/product/BasicProductAuthorization.sol/BasicProductAuthorization.json +430 -35
- package/artifacts/contracts/product/ClaimService.sol/ClaimService.dbg.json +1 -1
- package/artifacts/contracts/product/ClaimService.sol/ClaimService.json +416 -290
- package/artifacts/contracts/product/ClaimServiceManager.sol/ClaimServiceManager.dbg.json +1 -1
- package/artifacts/contracts/product/ClaimServiceManager.sol/ClaimServiceManager.json +150 -128
- package/artifacts/contracts/product/IApplicationService.sol/IApplicationService.dbg.json +1 -1
- package/artifacts/contracts/product/IApplicationService.sol/IApplicationService.json +131 -9
- package/artifacts/contracts/product/IClaimService.sol/IClaimService.dbg.json +1 -1
- package/artifacts/contracts/product/IClaimService.sol/IClaimService.json +293 -17
- package/artifacts/contracts/product/IPolicyService.sol/IPolicyService.dbg.json +1 -1
- package/artifacts/contracts/product/IPolicyService.sol/IPolicyService.json +245 -64
- package/artifacts/contracts/product/IPricingService.sol/IPricingService.dbg.json +1 -1
- package/artifacts/contracts/product/IPricingService.sol/IPricingService.json +157 -83
- package/artifacts/contracts/product/IProductComponent.sol/IProductComponent.dbg.json +1 -1
- package/artifacts/contracts/product/IProductComponent.sol/IProductComponent.json +245 -233
- package/artifacts/contracts/product/IRiskService.sol/IRiskService.dbg.json +4 -0
- package/artifacts/contracts/product/{IProductService.sol/IProductService.json → IRiskService.sol/IRiskService.json} +88 -8
- package/artifacts/contracts/product/PolicyService.sol/PolicyService.dbg.json +1 -1
- package/artifacts/contracts/product/PolicyService.sol/PolicyService.json +335 -349
- package/artifacts/contracts/product/PolicyServiceLib.sol/PolicyServiceLib.dbg.json +4 -0
- package/artifacts/contracts/product/PolicyServiceLib.sol/PolicyServiceLib.json +783 -0
- package/artifacts/contracts/product/PolicyServiceManager.sol/PolicyServiceManager.dbg.json +1 -1
- package/artifacts/contracts/product/PolicyServiceManager.sol/PolicyServiceManager.json +135 -129
- package/artifacts/contracts/product/PricingService.sol/PricingService.dbg.json +1 -1
- package/artifacts/contracts/product/PricingService.sol/PricingService.json +224 -338
- package/artifacts/contracts/product/PricingServiceManager.sol/PricingServiceManager.dbg.json +1 -1
- package/artifacts/contracts/product/PricingServiceManager.sol/PricingServiceManager.json +128 -138
- package/artifacts/contracts/product/Product.sol/Product.dbg.json +1 -1
- package/artifacts/contracts/product/Product.sol/Product.json +246 -386
- package/artifacts/contracts/product/RiskService.sol/RiskService.dbg.json +4 -0
- package/artifacts/contracts/product/RiskService.sol/RiskService.json +688 -0
- package/artifacts/contracts/product/RiskServiceManager.sol/RiskServiceManager.dbg.json +4 -0
- package/artifacts/contracts/product/RiskServiceManager.sol/RiskServiceManager.json +736 -0
- package/artifacts/contracts/registry/ChainNft.sol/ChainNft.dbg.json +1 -1
- package/artifacts/contracts/registry/ChainNft.sol/ChainNft.json +59 -16
- package/artifacts/contracts/registry/IRegistry.sol/IRegistry.dbg.json +1 -1
- package/artifacts/contracts/registry/IRegistry.sol/IRegistry.json +342 -42
- package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.dbg.json +1 -1
- package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.json +144 -41
- package/artifacts/contracts/registry/IRelease.sol/IRelease.dbg.json +4 -0
- package/artifacts/contracts/registry/IRelease.sol/IRelease.json +24 -0
- package/artifacts/contracts/registry/ITransferInterceptor.sol/ITransferInterceptor.dbg.json +1 -1
- package/artifacts/contracts/registry/ITransferInterceptor.sol/ITransferInterceptor.json +5 -18
- package/artifacts/contracts/registry/Registry.sol/Registry.dbg.json +1 -1
- package/artifacts/contracts/registry/Registry.sol/Registry.json +548 -103
- package/artifacts/contracts/registry/RegistryAdmin.sol/RegistryAdmin.dbg.json +1 -1
- package/artifacts/contracts/registry/RegistryAdmin.sol/RegistryAdmin.json +795 -394
- package/artifacts/contracts/registry/RegistryAuthorization.sol/RegistryAuthorization.dbg.json +4 -0
- package/artifacts/contracts/registry/RegistryAuthorization.sol/RegistryAuthorization.json +1053 -0
- package/artifacts/contracts/registry/RegistryService.sol/RegistryService.dbg.json +1 -1
- package/artifacts/contracts/registry/RegistryService.sol/RegistryService.json +109 -292
- package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.dbg.json +1 -1
- package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.json +104 -90
- package/artifacts/contracts/registry/ReleaseAdmin.sol/ReleaseAdmin.dbg.json +4 -0
- package/artifacts/contracts/registry/ReleaseAdmin.sol/ReleaseAdmin.json +2152 -0
- package/artifacts/contracts/registry/ReleaseLifecycle.sol/ReleaseLifecycle.dbg.json +1 -1
- package/artifacts/contracts/registry/ReleaseLifecycle.sol/ReleaseLifecycle.json +47 -6
- package/artifacts/contracts/registry/ReleaseRegistry.sol/ReleaseRegistry.dbg.json +1 -1
- package/artifacts/contracts/registry/ReleaseRegistry.sol/ReleaseRegistry.json +483 -253
- package/artifacts/contracts/registry/ServiceAuthorizationV3.sol/ServiceAuthorizationV3.dbg.json +1 -1
- package/artifacts/contracts/registry/ServiceAuthorizationV3.sol/ServiceAuthorizationV3.json +489 -20
- package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.dbg.json +1 -1
- package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.json +15 -15
- package/artifacts/contracts/shared/Component.sol/Component.dbg.json +1 -1
- package/artifacts/contracts/shared/Component.sol/Component.json +80 -252
- package/artifacts/contracts/shared/ComponentService.sol/ComponentService.dbg.json +1 -1
- package/artifacts/contracts/shared/ComponentService.sol/ComponentService.json +433 -697
- package/artifacts/contracts/shared/ComponentServiceManager.sol/ComponentServiceManager.dbg.json +1 -1
- package/artifacts/contracts/shared/ComponentServiceManager.sol/ComponentServiceManager.json +140 -148
- package/artifacts/contracts/shared/ContractLib.sol/ContractLib.dbg.json +4 -0
- package/artifacts/contracts/shared/ContractLib.sol/ContractLib.json +632 -0
- package/artifacts/contracts/shared/ContractLib.sol/IInstanceAdminHelper.dbg.json +4 -0
- package/artifacts/contracts/shared/ContractLib.sol/IInstanceAdminHelper.json +24 -0
- package/artifacts/contracts/shared/ContractLib.sol/ITargetHelper.dbg.json +4 -0
- package/artifacts/contracts/shared/ContractLib.sol/ITargetHelper.json +30 -0
- package/artifacts/contracts/shared/ContractLib.sol/ITokenRegistryHelper.dbg.json +4 -0
- package/artifacts/contracts/shared/ContractLib.sol/ITokenRegistryHelper.json +40 -0
- package/artifacts/contracts/shared/IComponent.sol/IComponent.dbg.json +1 -1
- package/artifacts/contracts/shared/IComponent.sol/IComponent.json +80 -100
- package/artifacts/contracts/shared/IComponentService.sol/IComponentService.dbg.json +1 -1
- package/artifacts/contracts/shared/IComponentService.sol/IComponentService.json +394 -300
- package/artifacts/contracts/shared/IInstanceLinkedComponent.sol/IInstanceLinkedComponent.dbg.json +1 -1
- package/artifacts/contracts/shared/IInstanceLinkedComponent.sol/IInstanceLinkedComponent.json +91 -140
- package/artifacts/contracts/shared/IKeyValueStore.sol/IKeyValueStore.dbg.json +1 -1
- package/artifacts/contracts/shared/IKeyValueStore.sol/IKeyValueStore.json +36 -0
- package/artifacts/contracts/shared/ILifecycle.sol/ILifecycle.dbg.json +1 -1
- package/artifacts/contracts/shared/ILifecycle.sol/ILifecycle.json +36 -0
- package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.dbg.json +1 -1
- package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.json +16 -0
- package/artifacts/contracts/shared/IPolicyHolder.sol/IPolicyHolder.dbg.json +1 -1
- package/artifacts/contracts/shared/IPolicyHolder.sol/IPolicyHolder.json +15 -47
- package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.dbg.json +1 -1
- package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.json +148 -0
- package/artifacts/contracts/shared/IRegistryLinked.sol/IRegistryLinked.dbg.json +1 -1
- package/artifacts/contracts/shared/IService.sol/IService.dbg.json +1 -1
- package/artifacts/contracts/shared/IService.sol/IService.json +55 -2
- package/artifacts/contracts/shared/InitializableERC165.sol/InitializableERC165.dbg.json +1 -1
- package/artifacts/contracts/shared/InitializableERC165.sol/InitializableERC165.json +2 -22
- package/artifacts/contracts/shared/InstanceLinkedComponent.sol/InstanceLinkedComponent.dbg.json +1 -1
- package/artifacts/contracts/shared/InstanceLinkedComponent.sol/InstanceLinkedComponent.json +91 -292
- package/artifacts/contracts/shared/KeyValueStore.sol/KeyValueStore.dbg.json +1 -1
- package/artifacts/contracts/shared/KeyValueStore.sol/KeyValueStore.json +42 -1
- package/artifacts/contracts/shared/Lifecycle.sol/Lifecycle.dbg.json +1 -1
- package/artifacts/contracts/shared/Lifecycle.sol/Lifecycle.json +42 -1
- package/artifacts/contracts/shared/NftIdSet.sol/NftIdSet.dbg.json +1 -1
- package/artifacts/contracts/shared/NftIdSet.sol/NftIdSet.json +2 -2
- package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.dbg.json +1 -1
- package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.json +22 -57
- package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.dbg.json +1 -1
- package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.json +19 -141
- package/artifacts/contracts/shared/Registerable.sol/Registerable.dbg.json +1 -1
- package/artifacts/contracts/shared/Registerable.sol/Registerable.json +122 -97
- package/artifacts/contracts/shared/RegistryLinked.sol/RegistryLinked.dbg.json +1 -1
- package/artifacts/contracts/shared/RegistryLinked.sol/RegistryLinked.json +2 -15
- package/artifacts/contracts/shared/Service.sol/Service.dbg.json +1 -1
- package/artifacts/contracts/shared/Service.sol/Service.json +57 -111
- package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.dbg.json +1 -1
- package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.json +544 -18
- package/artifacts/contracts/shared/TokenHandler.sol/TokenHandlerBase.dbg.json +4 -0
- package/artifacts/contracts/shared/TokenHandler.sol/TokenHandlerBase.json +484 -0
- package/artifacts/contracts/shared/TokenHandlerDeployerLib.sol/TokenHandlerDeployerLib.dbg.json +4 -0
- package/artifacts/contracts/shared/TokenHandlerDeployerLib.sol/TokenHandlerDeployerLib.json +172 -0
- package/artifacts/contracts/staking/IStaking.sol/IStaking.dbg.json +1 -1
- package/artifacts/contracts/staking/IStaking.sol/IStaking.json +312 -133
- package/artifacts/contracts/staking/IStakingService.sol/IStakingService.dbg.json +1 -1
- package/artifacts/contracts/staking/IStakingService.sol/IStakingService.json +155 -23
- package/artifacts/contracts/staking/Staking.sol/Staking.dbg.json +1 -1
- package/artifacts/contracts/staking/Staking.sol/Staking.json +418 -384
- package/artifacts/contracts/staking/StakingLib.sol/StakingLib.dbg.json +4 -0
- package/artifacts/contracts/staking/StakingLib.sol/StakingLib.json +469 -0
- package/artifacts/contracts/staking/StakingLifecycle.sol/StakingLifecycle.dbg.json +1 -1
- package/artifacts/contracts/staking/StakingLifecycle.sol/StakingLifecycle.json +46 -5
- package/artifacts/contracts/staking/StakingManager.sol/StakingManager.dbg.json +1 -1
- package/artifacts/contracts/staking/StakingManager.sol/StakingManager.json +141 -110
- package/artifacts/contracts/staking/StakingReader.sol/StakingReader.dbg.json +1 -1
- package/artifacts/contracts/staking/StakingReader.sol/StakingReader.json +91 -67
- package/artifacts/contracts/staking/StakingService.sol/StakingService.dbg.json +1 -1
- package/artifacts/contracts/staking/StakingService.sol/StakingService.json +224 -171
- package/artifacts/contracts/staking/StakingServiceManager.sol/StakingServiceManager.dbg.json +1 -1
- package/artifacts/contracts/staking/StakingServiceManager.sol/StakingServiceManager.json +121 -95
- package/artifacts/contracts/staking/StakingStore.sol/StakingStore.dbg.json +1 -1
- package/artifacts/contracts/staking/StakingStore.sol/StakingStore.json +205 -150
- package/artifacts/contracts/staking/TargetManagerLib.sol/TargetManagerLib.dbg.json +1 -1
- package/artifacts/contracts/staking/TargetManagerLib.sol/TargetManagerLib.json +91 -50
- package/artifacts/contracts/type/AddressSet.sol/LibAddressSet.dbg.json +1 -1
- package/artifacts/contracts/type/Amount.sol/AmountLib.dbg.json +1 -1
- package/artifacts/contracts/type/Amount.sol/AmountLib.json +35 -11
- package/artifacts/contracts/type/Blocknumber.sol/BlocknumberLib.dbg.json +1 -1
- package/artifacts/contracts/type/ClaimId.sol/ClaimIdLib.dbg.json +1 -1
- package/artifacts/contracts/type/ClaimId.sol/ClaimIdLib.json +28 -4
- package/artifacts/contracts/type/DistributorType.sol/DistributorTypeLib.dbg.json +1 -1
- package/artifacts/contracts/type/DistributorType.sol/DistributorTypeLib.json +2 -2
- package/artifacts/contracts/type/Fee.sol/FeeLib.dbg.json +1 -1
- package/artifacts/contracts/type/Fee.sol/FeeLib.json +94 -38
- package/artifacts/contracts/type/Key32.sol/Key32Lib.dbg.json +1 -1
- package/artifacts/contracts/type/Key32.sol/Key32Lib.json +2 -2
- package/artifacts/contracts/type/Key32Set.sol/LibKey32Set.dbg.json +4 -0
- package/artifacts/contracts/type/Key32Set.sol/LibKey32Set.json +33 -0
- package/artifacts/contracts/type/NftId.sol/NftIdLib.dbg.json +1 -1
- package/artifacts/contracts/type/NftId.sol/NftIdLib.json +23 -4
- package/artifacts/contracts/type/NftIdSet.sol/LibNftIdSet.dbg.json +1 -1
- package/artifacts/contracts/type/NftIdSet.sol/LibNftIdSet.json +2 -2
- package/artifacts/contracts/type/ObjectType.sol/ObjectTypeLib.dbg.json +1 -1
- package/artifacts/contracts/type/ObjectType.sol/ObjectTypeLib.json +33 -31
- package/artifacts/contracts/type/PayoutId.sol/PayoutIdLib.dbg.json +1 -1
- package/artifacts/contracts/type/PayoutId.sol/PayoutIdLib.json +19 -19
- package/artifacts/contracts/type/Referral.sol/ReferralLib.dbg.json +1 -1
- package/artifacts/contracts/type/Referral.sol/ReferralLib.json +2 -2
- package/artifacts/contracts/type/RequestId.sol/RequestIdLib.dbg.json +1 -1
- package/artifacts/contracts/type/RequestId.sol/RequestIdLib.json +2 -2
- package/artifacts/contracts/type/RiskId.sol/RiskIdLib.dbg.json +1 -1
- package/artifacts/contracts/type/RiskId.sol/RiskIdLib.json +125 -7
- package/artifacts/contracts/type/RoleId.sol/RoleIdLib.dbg.json +1 -1
- package/artifacts/contracts/type/RoleId.sol/RoleIdLib.json +42 -157
- package/artifacts/contracts/type/Seconds.sol/SecondsLib.dbg.json +1 -1
- package/artifacts/contracts/type/Seconds.sol/SecondsLib.json +45 -2
- package/artifacts/contracts/type/Selector.sol/SelectorLib.dbg.json +1 -1
- package/artifacts/contracts/type/Selector.sol/SelectorLib.json +21 -2
- package/artifacts/contracts/type/Selector.sol/SelectorSetLib.dbg.json +1 -1
- package/artifacts/contracts/type/Selector.sol/SelectorSetLib.json +2 -2
- package/artifacts/contracts/type/StateId.sol/StateIdLib.dbg.json +1 -1
- package/artifacts/contracts/type/StateId.sol/StateIdLib.json +15 -2
- package/artifacts/contracts/type/String.sol/StrLib.dbg.json +1 -1
- package/artifacts/contracts/type/String.sol/StrLib.json +50 -2
- package/artifacts/contracts/type/Timestamp.sol/TimestampLib.dbg.json +1 -1
- package/artifacts/contracts/type/Timestamp.sol/TimestampLib.json +2 -2
- package/artifacts/contracts/type/UFixed.sol/UFixedLib.dbg.json +1 -1
- package/artifacts/contracts/type/UFixed.sol/UFixedLib.json +73 -36
- package/artifacts/contracts/type/Version.sol/VersionLib.dbg.json +1 -1
- package/artifacts/contracts/type/Version.sol/VersionLib.json +2 -21
- package/artifacts/contracts/type/Version.sol/VersionPartLib.dbg.json +1 -1
- package/artifacts/contracts/type/Version.sol/VersionPartLib.json +101 -2
- package/artifacts/contracts/upgradeability/IVersionable.sol/IVersionable.dbg.json +1 -1
- package/artifacts/contracts/upgradeability/ProxyManager.sol/ProxyManager.dbg.json +1 -1
- package/artifacts/contracts/upgradeability/ProxyManager.sol/ProxyManager.json +81 -80
- package/artifacts/contracts/upgradeability/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.dbg.json +1 -1
- package/artifacts/contracts/upgradeability/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.json +15 -2
- package/artifacts/contracts/upgradeability/Versionable.sol/Versionable.dbg.json +1 -1
- package/contracts/accounting/AccountingService.sol +261 -0
- package/contracts/accounting/AccountingServiceManager.sol +38 -0
- package/contracts/accounting/IAccountingService.sol +45 -0
- package/contracts/authorization/AccessAdmin.sol +456 -267
- package/contracts/authorization/AccessAdminLib.sol +396 -0
- package/contracts/authorization/AccessManagerCloneable.sol +146 -4
- package/contracts/authorization/Authorization.sol +159 -203
- package/contracts/authorization/IAccess.sol +25 -6
- package/contracts/authorization/IAccessAdmin.sol +87 -79
- package/contracts/authorization/IAuthorization.sol +9 -36
- package/contracts/authorization/IServiceAuthorization.sol +57 -17
- package/contracts/authorization/ServiceAuthorization.sol +254 -24
- package/contracts/distribution/BasicDistribution.sol +20 -17
- package/contracts/distribution/BasicDistributionAuthorization.sol +30 -10
- package/contracts/distribution/Distribution.sol +42 -90
- package/contracts/distribution/DistributionService.sol +229 -117
- package/contracts/distribution/DistributionServiceManager.sol +6 -6
- package/contracts/distribution/IDistributionComponent.sol +4 -11
- package/contracts/distribution/IDistributionService.sol +40 -26
- package/contracts/examples/fire/DamageLevel.sol +59 -0
- package/contracts/examples/fire/FirePool.sol +86 -0
- package/contracts/examples/fire/FirePoolAuthorization.sol +35 -0
- package/contracts/examples/fire/FireProduct.sol +433 -0
- package/contracts/examples/fire/FireProductAuthorization.sol +45 -0
- package/contracts/examples/fire/FireUSD.sol +26 -0
- package/contracts/examples/unpermissioned/SimpleDistribution.sol +81 -0
- package/contracts/examples/unpermissioned/SimpleDistributionAuthorization.sol +28 -0
- package/contracts/examples/unpermissioned/SimpleOracle.sol +133 -0
- package/contracts/examples/unpermissioned/SimplePool.sol +102 -0
- package/contracts/examples/unpermissioned/SimplePoolAuthorization.sol +28 -0
- package/contracts/examples/unpermissioned/SimpleProduct.sol +373 -0
- package/contracts/examples/unpermissioned/SimpleProductAuthorization.sol +28 -0
- package/contracts/instance/BundleSet.sol +42 -38
- package/contracts/instance/IInstance.sol +101 -42
- package/contracts/instance/IInstanceService.sol +52 -31
- package/contracts/instance/Instance.sol +189 -97
- package/contracts/instance/InstanceAdmin.sol +275 -158
- package/contracts/instance/InstanceAuthorizationV3.sol +120 -58
- package/contracts/instance/InstanceReader.sol +477 -253
- package/contracts/instance/InstanceService.sol +284 -239
- package/contracts/instance/InstanceServiceManager.sol +6 -7
- package/contracts/instance/InstanceStore.sol +23 -2
- package/contracts/instance/RiskSet.sol +118 -0
- package/contracts/instance/base/BalanceStore.sol +3 -5
- package/contracts/instance/base/ObjectCounter.sol +1 -2
- package/contracts/instance/base/ObjectLifecycle.sol +10 -2
- package/contracts/instance/base/ObjectSet.sol +31 -33
- package/contracts/instance/base/ObjectSetHelperLib.sol +30 -0
- package/contracts/instance/module/IBundle.sol +6 -5
- package/contracts/instance/module/IComponents.sol +29 -13
- package/contracts/instance/module/IDistribution.sol +21 -8
- package/contracts/instance/module/IPolicy.sol +49 -28
- package/contracts/instance/module/IRisk.sol +5 -0
- package/contracts/oracle/BasicOracle.sol +1 -4
- package/contracts/oracle/BasicOracleAuthorization.sol +15 -8
- package/contracts/oracle/IOracle.sol +9 -4
- package/contracts/oracle/IOracleService.sol +2 -1
- package/contracts/oracle/Oracle.sol +7 -19
- package/contracts/oracle/OracleService.sol +117 -85
- package/contracts/oracle/OracleServiceManager.sol +6 -6
- package/contracts/pool/BasicPool.sol +32 -25
- package/contracts/pool/BasicPoolAuthorization.sol +33 -9
- package/contracts/pool/BundleService.sol +101 -144
- package/contracts/pool/BundleServiceManager.sol +6 -6
- package/contracts/pool/IBundleService.sol +15 -33
- package/contracts/pool/IPoolComponent.sol +19 -15
- package/contracts/pool/IPoolService.sol +86 -71
- package/contracts/pool/Pool.sol +139 -124
- package/contracts/pool/PoolLib.sol +353 -0
- package/contracts/pool/PoolService.sol +346 -292
- package/contracts/pool/PoolServiceManager.sol +4 -4
- package/contracts/product/ApplicationService.sol +80 -31
- package/contracts/product/ApplicationServiceManager.sol +4 -4
- package/contracts/product/BasicProduct.sol +10 -13
- package/contracts/product/BasicProductAuthorization.sol +32 -12
- package/contracts/product/ClaimService.sol +368 -154
- package/contracts/product/ClaimServiceManager.sol +4 -4
- package/contracts/product/IApplicationService.sol +8 -2
- package/contracts/product/IClaimService.sol +43 -8
- package/contracts/product/IPolicyService.sol +38 -28
- package/contracts/product/IPricingService.sol +11 -10
- package/contracts/product/IProductComponent.sol +27 -5
- package/contracts/product/{IProductService.sol → IRiskService.sol} +8 -8
- package/contracts/product/PolicyService.sol +365 -323
- package/contracts/product/PolicyServiceLib.sol +139 -0
- package/contracts/product/PolicyServiceManager.sol +4 -4
- package/contracts/product/PricingService.sol +85 -83
- package/contracts/product/PricingServiceManager.sol +4 -4
- package/contracts/product/Product.sol +147 -91
- package/contracts/product/RiskService.sol +157 -0
- package/contracts/product/RiskServiceManager.sol +39 -0
- package/contracts/registry/ChainNft.sol +72 -40
- package/contracts/registry/IRegistry.sol +64 -28
- package/contracts/registry/IRegistryService.sol +5 -12
- package/contracts/registry/IRelease.sol +29 -0
- package/contracts/registry/ITransferInterceptor.sol +1 -2
- package/contracts/registry/Registry.sol +357 -203
- package/contracts/registry/RegistryAdmin.sol +110 -287
- package/contracts/registry/RegistryAuthorization.sol +284 -0
- package/contracts/registry/RegistryService.sol +37 -48
- package/contracts/registry/RegistryServiceManager.sol +3 -3
- package/contracts/registry/ReleaseAdmin.sol +195 -0
- package/contracts/registry/ReleaseLifecycle.sol +8 -3
- package/contracts/registry/ReleaseRegistry.sol +275 -240
- package/contracts/registry/ServiceAuthorizationV3.sol +201 -57
- package/contracts/registry/TokenRegistry.sol +12 -13
- package/contracts/shared/Component.sol +66 -137
- package/contracts/shared/ComponentService.sol +414 -376
- package/contracts/shared/ComponentServiceManager.sol +8 -5
- package/contracts/shared/ContractLib.sol +311 -0
- package/contracts/shared/IComponent.sol +6 -19
- package/contracts/shared/IComponentService.sol +42 -40
- package/contracts/shared/IInstanceLinkedComponent.sol +2 -28
- package/contracts/shared/ILifecycle.sol +3 -1
- package/contracts/shared/INftOwnable.sol +2 -0
- package/contracts/shared/IPolicyHolder.sol +12 -22
- package/contracts/shared/IRegisterable.sol +22 -1
- package/contracts/shared/IService.sol +3 -5
- package/contracts/shared/InitializableERC165.sol +10 -2
- package/contracts/shared/InstanceLinkedComponent.sol +72 -50
- package/contracts/shared/KeyValueStore.sol +1 -1
- package/contracts/shared/Lifecycle.sol +15 -4
- package/contracts/shared/NftOwnable.sol +29 -9
- package/contracts/shared/PolicyHolder.sol +18 -54
- package/contracts/shared/Registerable.sol +52 -21
- package/contracts/shared/RegistryLinked.sol +9 -14
- package/contracts/shared/Service.sol +20 -35
- package/contracts/shared/TokenHandler.sol +309 -29
- package/contracts/shared/TokenHandlerDeployerLib.sol +20 -0
- package/contracts/staking/IStaking.sol +48 -20
- package/contracts/staking/IStakingService.sol +21 -11
- package/contracts/staking/Staking.sol +198 -109
- package/contracts/staking/{StakeManagerLib.sol → StakingLib.sol} +95 -45
- package/contracts/staking/StakingManager.sol +8 -6
- package/contracts/staking/StakingReader.sol +40 -24
- package/contracts/staking/StakingService.sol +88 -27
- package/contracts/staking/StakingServiceManager.sol +6 -5
- package/contracts/staking/StakingStore.sol +3 -2
- package/contracts/staking/TargetManagerLib.sol +8 -4
- package/contracts/type/Amount.sol +15 -0
- package/contracts/type/ClaimId.sol +6 -1
- package/contracts/type/Fee.sol +8 -8
- package/contracts/type/Key32.sol +2 -2
- package/contracts/type/Key32Set.sol +62 -0
- package/contracts/type/NftId.sol +7 -0
- package/contracts/type/ObjectType.sol +73 -37
- package/contracts/type/PayoutId.sol +10 -10
- package/contracts/type/RiskId.sol +38 -6
- package/contracts/type/RoleId.sol +61 -55
- package/contracts/type/Seconds.sol +12 -0
- package/contracts/type/Selector.sol +5 -0
- package/contracts/type/StateId.sol +15 -1
- package/contracts/type/String.sol +12 -0
- package/contracts/type/Timestamp.sol +0 -5
- package/contracts/type/UFixed.sol +37 -126
- package/contracts/type/Version.sol +54 -5
- package/contracts/upgradeability/ProxyManager.sol +81 -45
- package/contracts/upgradeability/UpgradableProxyWithAdmin.sol +7 -1
- package/contracts/upgradeability/Versionable.sol +6 -3
- package/package.json +5 -4
- package/artifacts/contracts/authorization/IModuleAuthorization.sol/IModuleAuthorization.dbg.json +0 -4
- package/artifacts/contracts/authorization/IModuleAuthorization.sol/IModuleAuthorization.json +0 -290
- package/artifacts/contracts/authorization/ModuleAuthorization.sol/ModuleAuthorization.dbg.json +0 -4
- package/artifacts/contracts/authorization/ModuleAuthorization.sol/ModuleAuthorization.json +0 -390
- package/artifacts/contracts/instance/module/IAccess.sol/IAccess.dbg.json +0 -4
- package/artifacts/contracts/instance/module/IAccess.sol/IAccess.json +0 -129
- package/artifacts/contracts/product/IProductService.sol/IProductService.dbg.json +0 -4
- package/artifacts/contracts/product/ProductService.sol/ProductService.dbg.json +0 -4
- package/artifacts/contracts/product/ProductService.sol/ProductService.json +0 -708
- package/artifacts/contracts/product/ProductServiceManager.sol/ProductServiceManager.dbg.json +0 -4
- package/artifacts/contracts/product/ProductServiceManager.sol/ProductServiceManager.json +0 -702
- package/artifacts/contracts/shared/ComponentVerifyingService.sol/ComponentVerifyingService.dbg.json +0 -4
- package/artifacts/contracts/shared/InitializableCustom.sol/InitializableCustom.dbg.json +0 -4
- package/artifacts/contracts/shared/InitializableCustom.sol/InitializableCustom.json +0 -39
- package/artifacts/contracts/shared/TokenTransferLib.sol/TokenTransferLib.dbg.json +0 -4
- package/artifacts/contracts/shared/TokenTransferLib.sol/TokenTransferLib.json +0 -42
- package/artifacts/contracts/staking/StakeManagerLib.sol/StakeManagerLib.dbg.json +0 -4
- package/artifacts/contracts/staking/StakeManagerLib.sol/StakeManagerLib.json +0 -470
- package/artifacts/contracts/type/UFixed.sol/MathLib.dbg.json +0 -4
- package/artifacts/contracts/type/UFixed.sol/MathLib.json +0 -16
- package/contracts/authorization/IModuleAuthorization.sol +0 -21
- package/contracts/authorization/ModuleAuthorization.sol +0 -78
- package/contracts/instance/module/IAccess.sol +0 -46
- package/contracts/product/ProductService.sol +0 -99
- package/contracts/product/ProductServiceManager.sol +0 -39
- package/contracts/shared/ComponentVerifyingService.sol +0 -117
- package/contracts/shared/InitializableCustom.sol +0 -177
- package/contracts/shared/TokenTransferLib.sol +0 -60
@@ -1,13 +1,14 @@
|
|
1
1
|
// SPDX-License-Identifier: Apache-2.0
|
2
2
|
pragma solidity ^0.8.20;
|
3
3
|
|
4
|
-
import {
|
5
|
-
|
6
|
-
import {
|
4
|
+
import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
|
5
|
+
|
6
|
+
import {IAccountingService} from "../accounting/IAccountingService.sol";
|
7
7
|
import {IComponents} from "../instance/module/IComponents.sol";
|
8
8
|
import {IComponentService} from "./IComponentService.sol";
|
9
9
|
import {IInstance} from "../instance/IInstance.sol";
|
10
10
|
import {IInstanceLinkedComponent} from "./IInstanceLinkedComponent.sol";
|
11
|
+
import {InstanceAdmin} from "../instance/InstanceAdmin.sol";
|
11
12
|
import {InstanceReader} from "../instance/InstanceReader.sol";
|
12
13
|
import {InstanceStore} from "../instance/InstanceStore.sol";
|
13
14
|
import {IInstanceService} from "../instance/IInstanceService.sol";
|
@@ -15,29 +16,27 @@ import {IPoolComponent} from "../pool/IPoolComponent.sol";
|
|
15
16
|
import {IProductComponent} from "../product/IProductComponent.sol";
|
16
17
|
import {IRegistry} from "../registry/IRegistry.sol";
|
17
18
|
import {IRegistryService} from "../registry/IRegistryService.sol";
|
19
|
+
|
20
|
+
import {AccessManagerCloneable} from "../authorization/AccessManagerCloneable.sol";
|
21
|
+
import {Amount, AmountLib} from "../type/Amount.sol";
|
22
|
+
import {ContractLib} from "../shared/ContractLib.sol";
|
23
|
+
import {Fee, FeeLib} from "../type/Fee.sol";
|
18
24
|
import {KEEP_STATE} from "../type/StateId.sol";
|
19
|
-
import {NftId} from "../type/NftId.sol";
|
20
|
-
import {ObjectType, REGISTRY, COMPONENT, DISTRIBUTION, INSTANCE, ORACLE, POOL, PRODUCT} from "../type/ObjectType.sol";
|
21
|
-
import {
|
22
|
-
import {TokenHandler} from "
|
23
|
-
import {
|
25
|
+
import {NftId, NftIdLib} from "../type/NftId.sol";
|
26
|
+
import {ObjectType, ACCOUNTING, REGISTRY, COMPONENT, DISTRIBUTION, INSTANCE, ORACLE, POOL, PRODUCT} from "../type/ObjectType.sol";
|
27
|
+
import {Service} from "../shared/Service.sol";
|
28
|
+
import {TokenHandler} from "../shared/TokenHandler.sol";
|
29
|
+
import {TokenHandlerDeployerLib} from "../shared/TokenHandlerDeployerLib.sol";
|
30
|
+
|
24
31
|
|
25
32
|
contract ComponentService is
|
26
|
-
|
33
|
+
Service,
|
27
34
|
IComponentService
|
28
35
|
{
|
29
|
-
error ErrorComponentServiceAlreadyRegistered(address component);
|
30
|
-
error ErrorComponentServiceNotComponent(address component);
|
31
|
-
error ErrorComponentServiceInvalidType(address component, ObjectType requiredType, ObjectType componentType);
|
32
|
-
error ErrorComponentServiceSenderNotOwner(address component, address initialOwner, address sender);
|
33
|
-
error ErrorComponentServiceExpectedRoleMissing(NftId instanceNftId, RoleId requiredRole, address sender);
|
34
|
-
error ErrorComponentServiceComponentLocked(address component);
|
35
|
-
error ErrorComponentServiceSenderNotService(address sender);
|
36
|
-
error ErrorComponentServiceComponentTypeInvalid(address component, ObjectType expectedType, ObjectType foundType);
|
37
|
-
|
38
36
|
bool private constant INCREASE = true;
|
39
37
|
bool private constant DECREASE = false;
|
40
38
|
|
39
|
+
IAccountingService private _accountingService;
|
41
40
|
IRegistryService private _registryService;
|
42
41
|
IInstanceService private _instanceService;
|
43
42
|
|
@@ -49,177 +48,289 @@ contract ComponentService is
|
|
49
48
|
virtual override
|
50
49
|
initializer()
|
51
50
|
{
|
52
|
-
|
53
|
-
|
54
|
-
|
55
|
-
|
51
|
+
(
|
52
|
+
address authority,
|
53
|
+
address registry
|
54
|
+
) = abi.decode(data, (address, address));
|
56
55
|
|
57
|
-
|
56
|
+
__Service_init(authority, registry, owner);
|
58
57
|
|
58
|
+
_accountingService = IAccountingService(_getServiceAddress(ACCOUNTING()));
|
59
59
|
_registryService = IRegistryService(_getServiceAddress(REGISTRY()));
|
60
60
|
_instanceService = IInstanceService(_getServiceAddress(INSTANCE()));
|
61
61
|
|
62
|
-
|
62
|
+
_registerInterface(type(IComponentService).interfaceId);
|
63
63
|
}
|
64
64
|
|
65
65
|
//-------- component ----------------------------------------------------//
|
66
66
|
|
67
|
-
|
68
|
-
|
69
|
-
|
70
|
-
|
71
|
-
|
72
|
-
|
73
|
-
|
67
|
+
/// @inheritdoc IComponentService
|
68
|
+
function registerComponent(address componentAddress)
|
69
|
+
external
|
70
|
+
virtual
|
71
|
+
restricted()
|
72
|
+
returns (NftId componentNftId)
|
73
|
+
{
|
74
|
+
// checks
|
75
|
+
// check sender is registered product
|
76
|
+
IRegistry registry = getRegistry();
|
77
|
+
if (!registry.isObjectType(msg.sender, PRODUCT())) {
|
78
|
+
revert ErrorComponentServiceCallerNotProduct(msg.sender);
|
74
79
|
}
|
75
80
|
|
76
|
-
|
77
|
-
|
81
|
+
// check provided address is product contract
|
82
|
+
if (!_isInstanceLinkedComponent(componentAddress)) {
|
83
|
+
revert ErrorComponentServiceNotComponent(componentAddress);
|
78
84
|
}
|
79
85
|
|
80
|
-
|
81
|
-
|
82
|
-
|
86
|
+
NftId productNftId = registry.getNftIdForAddress(msg.sender);
|
87
|
+
IInstance instance = IInstance(
|
88
|
+
registry.getObjectAddress(
|
89
|
+
registry.getParentNftId(productNftId)));
|
90
|
+
|
91
|
+
componentNftId = _verifyAndRegister(
|
92
|
+
instance,
|
93
|
+
componentAddress,
|
94
|
+
productNftId, // product is parent of component to be registered
|
95
|
+
address(0)); // token will be inhereited from product
|
96
|
+
}
|
97
|
+
|
98
|
+
|
99
|
+
/// @inheritdoc IComponentService
|
100
|
+
function approveTokenHandler(
|
101
|
+
IERC20Metadata token,
|
102
|
+
Amount amount
|
103
|
+
)
|
104
|
+
external
|
105
|
+
virtual
|
106
|
+
restricted()
|
107
|
+
{
|
108
|
+
// checks
|
109
|
+
(NftId componentNftId, IInstance instance) = _getAndVerifyComponent(COMPONENT(), true);
|
110
|
+
TokenHandler tokenHandler = instance.getInstanceReader().getTokenHandler(
|
111
|
+
componentNftId);
|
112
|
+
|
113
|
+
// effects
|
114
|
+
tokenHandler.approve(token, amount);
|
115
|
+
}
|
116
|
+
|
117
|
+
|
118
|
+
/// @inheritdoc IComponentService
|
119
|
+
function setWallet(address newWallet)
|
120
|
+
external
|
121
|
+
virtual
|
122
|
+
restricted()
|
123
|
+
{
|
124
|
+
// checks
|
125
|
+
(NftId componentNftId, IInstance instance) = _getAndVerifyComponent(COMPONENT(), true);
|
126
|
+
TokenHandler tokenHandler = instance.getInstanceReader().getTokenHandler(
|
127
|
+
componentNftId);
|
83
128
|
|
84
|
-
|
85
|
-
|
86
|
-
emit LogComponentServiceWalletAddressChanged(componentNftId, currentWallet, newWallet);
|
129
|
+
// effects
|
130
|
+
tokenHandler.setWallet(newWallet);
|
87
131
|
}
|
88
132
|
|
89
|
-
|
90
|
-
function
|
133
|
+
/// @inheritdoc IComponentService
|
134
|
+
function setLocked(bool locked)
|
135
|
+
external
|
136
|
+
virtual
|
137
|
+
restricted()
|
138
|
+
{
|
139
|
+
(, IInstance instance) = _getAndVerifyComponent(COMPONENT(), false);
|
140
|
+
|
141
|
+
address component = msg.sender;
|
142
|
+
instance.getInstanceAdmin().setComponentLocked(
|
143
|
+
component,
|
144
|
+
locked);
|
145
|
+
}
|
91
146
|
|
92
|
-
// TODO implement
|
93
|
-
function unlock() external virtual {}
|
94
147
|
|
148
|
+
/// @inheritdoc IComponentService
|
95
149
|
function withdrawFees(Amount amount)
|
96
150
|
external
|
97
151
|
virtual
|
152
|
+
restricted()
|
98
153
|
returns (Amount withdrawnAmount)
|
99
154
|
{
|
100
|
-
|
101
|
-
|
102
|
-
|
155
|
+
// checks
|
156
|
+
(NftId componentNftId, IInstance instance) = _getAndVerifyComponent(COMPONENT(), true);
|
157
|
+
InstanceReader instanceReader = instance.getInstanceReader();
|
103
158
|
|
104
159
|
// determine withdrawn amount
|
160
|
+
Amount maxAvailableAmount = instanceReader.getFeeAmount(componentNftId);
|
105
161
|
withdrawnAmount = amount;
|
106
|
-
|
107
|
-
|
108
|
-
|
162
|
+
|
163
|
+
// max amount -> withraw all available fees
|
164
|
+
if (amount == AmountLib.max()) {
|
165
|
+
withdrawnAmount = maxAvailableAmount;
|
166
|
+
}
|
167
|
+
|
168
|
+
// check modified withdrawn amount
|
169
|
+
if (withdrawnAmount.eqz()) {
|
109
170
|
revert ErrorComponentServiceWithdrawAmountIsZero();
|
110
|
-
} else {
|
111
|
-
|
112
|
-
if (withdrawnAmount.gt(withdrawLimit)) {
|
113
|
-
revert ErrorComponentServiceWithdrawAmountExceedsLimit(withdrawnAmount, withdrawLimit);
|
114
|
-
}
|
171
|
+
} else if (withdrawnAmount > maxAvailableAmount) {
|
172
|
+
revert ErrorComponentServiceWithdrawAmountExceedsLimit(withdrawnAmount, maxAvailableAmount);
|
115
173
|
}
|
116
174
|
|
175
|
+
// effects
|
117
176
|
// decrease fee counters by withdrawnAmount
|
118
|
-
|
177
|
+
_accountingService.decreaseComponentFees(
|
178
|
+
instance.getInstanceStore(),
|
179
|
+
componentNftId,
|
180
|
+
withdrawnAmount);
|
119
181
|
|
120
182
|
// transfer amount to component owner
|
121
183
|
address componentOwner = getRegistry().ownerOf(componentNftId);
|
122
|
-
|
123
|
-
|
184
|
+
TokenHandler tokenHandler = instanceReader.getTokenHandler(componentNftId);
|
185
|
+
emit LogComponentServiceComponentFeesWithdrawn(
|
186
|
+
componentNftId,
|
187
|
+
componentOwner,
|
188
|
+
address(tokenHandler.TOKEN()),
|
189
|
+
withdrawnAmount);
|
190
|
+
|
191
|
+
// interactions
|
192
|
+
// transfer amount to component owner
|
193
|
+
tokenHandler.pushFeeToken(
|
194
|
+
componentOwner,
|
195
|
+
withdrawnAmount);
|
124
196
|
}
|
125
197
|
|
126
198
|
|
127
199
|
//-------- product ------------------------------------------------------//
|
128
200
|
|
129
|
-
|
201
|
+
/// @inheritdoc IComponentService
|
202
|
+
function registerProduct(address productAddress, address token)
|
130
203
|
external
|
131
204
|
virtual
|
205
|
+
restricted()
|
206
|
+
nonReentrant()
|
207
|
+
returns (NftId productNftId)
|
132
208
|
{
|
133
|
-
|
209
|
+
// checks
|
210
|
+
// check sender is registered instance
|
211
|
+
IRegistry registry = getRegistry();
|
212
|
+
if (!registry.isObjectType(msg.sender, INSTANCE())) {
|
213
|
+
revert ErrorComponentServiceCallerNotInstance(msg.sender);
|
214
|
+
}
|
134
215
|
|
135
|
-
//
|
136
|
-
(
|
137
|
-
|
138
|
-
|
139
|
-
|
140
|
-
|
141
|
-
|
142
|
-
|
143
|
-
|
144
|
-
|
145
|
-
|
146
|
-
|
147
|
-
|
216
|
+
// check provided address is product contract
|
217
|
+
if (!_isProduct(productAddress)) {
|
218
|
+
revert ErrorComponentServiceNotProduct(productAddress);
|
219
|
+
}
|
220
|
+
|
221
|
+
IInstance instance = IInstance(msg.sender);
|
222
|
+
productNftId = _verifyAndRegister(
|
223
|
+
instance,
|
224
|
+
productAddress,
|
225
|
+
instance.getNftId(), // instance is parent of product to be registered
|
226
|
+
token);
|
227
|
+
}
|
228
|
+
|
229
|
+
|
230
|
+
function _isProduct(address target) internal view virtual returns (bool) {
|
231
|
+
if (!_isInstanceLinkedComponent(target)) {
|
232
|
+
return false;
|
233
|
+
}
|
148
234
|
|
149
|
-
|
150
|
-
_linkToProduct(instanceReader, instanceStore, productInfo.distributionNftId, productNftId);
|
151
|
-
_linkToProduct(instanceReader, instanceStore, productInfo.poolNftId, productNftId);
|
235
|
+
return IInstanceLinkedComponent(target).getInitialInfo().objectType == PRODUCT();
|
152
236
|
}
|
153
237
|
|
154
238
|
|
239
|
+
function _isInstanceLinkedComponent(address target) internal view virtual returns (bool) {
|
240
|
+
if (!ContractLib.isContract(target)) {
|
241
|
+
return false;
|
242
|
+
}
|
243
|
+
|
244
|
+
return ContractLib.supportsInterface(target, type(IInstanceLinkedComponent).interfaceId);
|
245
|
+
}
|
246
|
+
|
247
|
+
|
248
|
+
/// @inheritdoc IComponentService
|
155
249
|
function setProductFees(
|
156
250
|
Fee memory productFee, // product fee on net premium
|
157
251
|
Fee memory processingFee // product fee on payout amounts
|
158
252
|
)
|
159
253
|
external
|
160
254
|
virtual
|
255
|
+
restricted()
|
256
|
+
nonReentrant()
|
161
257
|
{
|
162
|
-
(NftId productNftId
|
163
|
-
IComponents.
|
258
|
+
(NftId productNftId, IInstance instance) = _getAndVerifyComponent(PRODUCT(), true);
|
259
|
+
IComponents.FeeInfo memory feeInfo = instance.getInstanceReader().getFeeInfo(productNftId);
|
164
260
|
bool feesChanged = false;
|
165
261
|
|
166
262
|
// update product fee if required
|
167
|
-
if(!FeeLib.eq(
|
168
|
-
_logUpdateFee(productNftId, "ProductFee",
|
169
|
-
|
263
|
+
if(!FeeLib.eq(feeInfo.productFee, productFee)) {
|
264
|
+
_logUpdateFee(productNftId, "ProductFee", feeInfo.productFee, productFee);
|
265
|
+
feeInfo.productFee = productFee;
|
170
266
|
feesChanged = true;
|
171
267
|
}
|
172
268
|
|
173
269
|
// update processing fee if required
|
174
|
-
if(!FeeLib.eq(
|
175
|
-
_logUpdateFee(productNftId, "ProcessingFee",
|
176
|
-
|
270
|
+
if(!FeeLib.eq(feeInfo.processingFee, processingFee)) {
|
271
|
+
_logUpdateFee(productNftId, "ProcessingFee", feeInfo.processingFee, processingFee);
|
272
|
+
feeInfo.processingFee = processingFee;
|
177
273
|
feesChanged = true;
|
178
274
|
}
|
179
275
|
|
180
276
|
if(feesChanged) {
|
181
|
-
instance.getInstanceStore().
|
277
|
+
instance.getInstanceStore().updateFee(productNftId, feeInfo);
|
182
278
|
emit LogComponentServiceProductFeesUpdated(productNftId);
|
183
279
|
}
|
184
280
|
}
|
185
281
|
|
186
|
-
|
282
|
+
|
283
|
+
function _createProduct(
|
187
284
|
InstanceStore instanceStore,
|
188
|
-
NftId productNftId,
|
189
|
-
|
190
|
-
)
|
191
|
-
|
192
|
-
virtual
|
193
|
-
// TODO re-enable once role granting is stable and fixed
|
194
|
-
// restricted()
|
285
|
+
NftId productNftId,
|
286
|
+
address productAddress
|
287
|
+
)
|
288
|
+
internal
|
289
|
+
virtual
|
195
290
|
{
|
196
|
-
|
197
|
-
|
291
|
+
// create product in instance instanceStore
|
292
|
+
IProductComponent product = IProductComponent(productAddress);
|
293
|
+
IComponents.ProductInfo memory initialProductInfo = product.getInitialProductInfo();
|
294
|
+
// force initialization of linked components with empty values to
|
295
|
+
// ensure no components are linked upon initialization of the product
|
296
|
+
initialProductInfo.poolNftId = NftIdLib.zero();
|
297
|
+
initialProductInfo.distributionNftId = NftIdLib.zero();
|
298
|
+
initialProductInfo.oracleNftId = new NftId[](initialProductInfo.expectedNumberOfOracles);
|
198
299
|
|
300
|
+
// create info
|
301
|
+
instanceStore.createProduct(
|
302
|
+
productNftId,
|
303
|
+
initialProductInfo);
|
199
304
|
|
200
|
-
|
201
|
-
|
202
|
-
|
203
|
-
// TODO re-enable once role granting is stable and fixed
|
204
|
-
// restricted()
|
205
|
-
{
|
206
|
-
_changeTargetBalance(DECREASE, instanceStore, productNftId, AmountLib.zero(), feeAmount);
|
305
|
+
instanceStore.createFee(
|
306
|
+
productNftId,
|
307
|
+
product.getInitialFeeInfo());
|
207
308
|
}
|
208
309
|
|
209
310
|
//-------- distribution -------------------------------------------------//
|
210
311
|
|
211
312
|
/// @dev registers the sending component as a distribution component
|
212
|
-
function
|
213
|
-
|
313
|
+
function _createDistribution(
|
314
|
+
InstanceStore instanceStore,
|
315
|
+
NftId productNftId,
|
316
|
+
NftId distributionNftId,
|
317
|
+
IComponents.ProductInfo memory productInfo
|
318
|
+
)
|
319
|
+
internal
|
214
320
|
virtual
|
321
|
+
nonReentrant()
|
215
322
|
{
|
216
|
-
|
323
|
+
// check product is still expecting a distribution registration
|
324
|
+
if (!productInfo.hasDistribution) {
|
325
|
+
revert ErrorProductServiceNoDistributionExpected(productNftId);
|
326
|
+
}
|
327
|
+
if (productInfo.distributionNftId.gtz()) {
|
328
|
+
revert ErrorProductServiceDistributionAlreadyRegistered(productNftId, productInfo.distributionNftId);
|
329
|
+
}
|
217
330
|
|
218
|
-
//
|
219
|
-
|
220
|
-
|
221
|
-
DISTRIBUTION(),
|
222
|
-
DISTRIBUTION_OWNER_ROLE());
|
331
|
+
// set distribution in product info
|
332
|
+
productInfo.distributionNftId = distributionNftId;
|
333
|
+
instanceStore.updateProduct(productNftId, productInfo, KEEP_STATE());
|
223
334
|
}
|
224
335
|
|
225
336
|
|
@@ -229,133 +340,85 @@ contract ComponentService is
|
|
229
340
|
)
|
230
341
|
external
|
231
342
|
virtual
|
343
|
+
restricted()
|
232
344
|
{
|
233
|
-
(NftId distributionNftId
|
234
|
-
(NftId productNftId, IComponents.
|
345
|
+
(NftId distributionNftId, IInstance instance) = _getAndVerifyComponent(DISTRIBUTION(), true);
|
346
|
+
(NftId productNftId, IComponents.FeeInfo memory feeInfo) = _getLinkedFeeInfo(
|
235
347
|
instance.getInstanceReader(), distributionNftId);
|
236
348
|
bool feesChanged = false;
|
237
349
|
|
238
350
|
// update distributino fee if required
|
239
|
-
if(!FeeLib.eq(
|
240
|
-
_logUpdateFee(productNftId, "DistributionFee",
|
241
|
-
|
351
|
+
if(!FeeLib.eq(feeInfo.distributionFee, distributionFee)) {
|
352
|
+
_logUpdateFee(productNftId, "DistributionFee", feeInfo.distributionFee, distributionFee);
|
353
|
+
feeInfo.distributionFee = distributionFee;
|
242
354
|
feesChanged = true;
|
243
355
|
}
|
244
356
|
|
245
357
|
// update min distribution owner fee if required
|
246
|
-
if(!FeeLib.eq(
|
247
|
-
_logUpdateFee(productNftId, "MinDistributionOwnerFee",
|
248
|
-
|
358
|
+
if(!FeeLib.eq(feeInfo.minDistributionOwnerFee, minDistributionOwnerFee)) {
|
359
|
+
_logUpdateFee(productNftId, "MinDistributionOwnerFee", feeInfo.minDistributionOwnerFee, minDistributionOwnerFee);
|
360
|
+
feeInfo.minDistributionOwnerFee = minDistributionOwnerFee;
|
249
361
|
feesChanged = true;
|
250
362
|
}
|
251
363
|
|
252
364
|
if(feesChanged) {
|
253
|
-
instance.getInstanceStore().
|
365
|
+
instance.getInstanceStore().updateFee(productNftId, feeInfo);
|
254
366
|
emit LogComponentServiceDistributionFeesUpdated(distributionNftId);
|
255
367
|
}
|
256
368
|
}
|
257
369
|
|
258
|
-
function increaseDistributionBalance(
|
259
|
-
InstanceStore instanceStore,
|
260
|
-
NftId distributionNftId,
|
261
|
-
Amount amount,
|
262
|
-
Amount feeAmount
|
263
|
-
)
|
264
|
-
external
|
265
|
-
virtual
|
266
|
-
// TODO re-enable once role granting is stable and fixed
|
267
|
-
// restricted()
|
268
|
-
{
|
269
|
-
_changeTargetBalance(INCREASE, instanceStore, distributionNftId, amount, feeAmount);
|
270
|
-
}
|
271
|
-
|
272
|
-
|
273
|
-
function decreaseDistributionBalance(
|
274
|
-
InstanceStore instanceStore,
|
275
|
-
NftId distributionNftId,
|
276
|
-
Amount amount,
|
277
|
-
Amount feeAmount
|
278
|
-
)
|
279
|
-
external
|
280
|
-
virtual
|
281
|
-
// TODO re-enable once role granting is stable and fixed
|
282
|
-
// restricted()
|
283
|
-
{
|
284
|
-
_changeTargetBalance(DECREASE, instanceStore, distributionNftId, amount, feeAmount);
|
285
|
-
}
|
286
|
-
|
287
|
-
//-------- distributor -------------------------------------------------------//
|
288
|
-
|
289
|
-
function increaseDistributorBalance(
|
290
|
-
InstanceStore instanceStore,
|
291
|
-
NftId distributorNftId,
|
292
|
-
Amount amount,
|
293
|
-
Amount feeAmount
|
294
|
-
)
|
295
|
-
external
|
296
|
-
virtual
|
297
|
-
// TODO re-enable once role granting is stable and fixed
|
298
|
-
// restricted()
|
299
|
-
{
|
300
|
-
_changeTargetBalance(INCREASE, instanceStore, distributorNftId, amount, feeAmount);
|
301
|
-
}
|
302
|
-
|
303
|
-
function decreaseDistributorBalance(
|
304
|
-
InstanceStore instanceStore,
|
305
|
-
NftId distributorNftId,
|
306
|
-
Amount amount,
|
307
|
-
Amount feeAmount
|
308
|
-
)
|
309
|
-
external
|
310
|
-
virtual
|
311
|
-
// TODO re-enable once role granting is stable and fixed
|
312
|
-
// restricted()
|
313
|
-
{
|
314
|
-
_changeTargetBalance(DECREASE, instanceStore, distributorNftId, amount, feeAmount);
|
315
|
-
}
|
316
|
-
|
317
370
|
//-------- oracle -------------------------------------------------------//
|
318
371
|
|
319
|
-
function
|
320
|
-
|
372
|
+
function _createOracle(
|
373
|
+
InstanceStore instanceStore,
|
374
|
+
NftId productNftId,
|
375
|
+
NftId oracleNftId,
|
376
|
+
IComponents.ProductInfo memory productInfo
|
377
|
+
)
|
378
|
+
internal
|
321
379
|
virtual
|
322
380
|
{
|
323
|
-
|
381
|
+
// check product is still expecting an oracle registration
|
382
|
+
if (productInfo.expectedNumberOfOracles == 0) {
|
383
|
+
revert ErrorProductServiceNoOraclesExpected(productNftId);
|
384
|
+
}
|
385
|
+
if (productInfo.numberOfOracles == productInfo.expectedNumberOfOracles) {
|
386
|
+
revert ErrorProductServiceOraclesAlreadyRegistered(productNftId, productInfo.expectedNumberOfOracles);
|
387
|
+
}
|
324
388
|
|
325
|
-
//
|
326
|
-
|
327
|
-
|
328
|
-
|
329
|
-
NftId componentNftId
|
330
|
-
) = _register(
|
331
|
-
contractAddress,
|
332
|
-
ORACLE(),
|
333
|
-
ORACLE_OWNER_ROLE());
|
389
|
+
// update/add oracle to product info
|
390
|
+
productInfo.oracleNftId[productInfo.numberOfOracles] = oracleNftId;
|
391
|
+
productInfo.numberOfOracles++;
|
392
|
+
instanceStore.updateProduct(productNftId, productInfo, KEEP_STATE());
|
334
393
|
}
|
335
394
|
|
336
395
|
//-------- pool ---------------------------------------------------------//
|
337
396
|
|
338
|
-
function
|
339
|
-
|
397
|
+
function _createPool(
|
398
|
+
InstanceStore instanceStore,
|
399
|
+
NftId productNftId,
|
400
|
+
NftId poolNftId,
|
401
|
+
address componentAddress,
|
402
|
+
IComponents.ProductInfo memory productInfo
|
403
|
+
)
|
404
|
+
internal
|
340
405
|
virtual
|
341
406
|
{
|
342
|
-
|
343
|
-
|
344
|
-
|
345
|
-
|
346
|
-
|
347
|
-
InstanceStore instanceStore,
|
348
|
-
NftId componentNftId
|
349
|
-
) = _register(
|
350
|
-
contractAddress,
|
351
|
-
POOL(),
|
352
|
-
POOL_OWNER_ROLE());
|
407
|
+
// check product is still expecting a pool registration
|
408
|
+
//IComponents.ProductInfo memory productInfo = instanceReader.getProductInfo(productNftId);
|
409
|
+
if (productInfo.poolNftId.gtz()) {
|
410
|
+
revert ErrorProductServicePoolAlreadyRegistered(productNftId, productInfo.poolNftId);
|
411
|
+
}
|
353
412
|
|
354
413
|
// create info
|
414
|
+
IPoolComponent pool = IPoolComponent(componentAddress);
|
355
415
|
instanceStore.createPool(
|
356
|
-
|
357
|
-
|
358
|
-
|
416
|
+
poolNftId,
|
417
|
+
pool.getInitialPoolInfo());
|
418
|
+
|
419
|
+
// update pool in product info
|
420
|
+
productInfo.poolNftId = poolNftId;
|
421
|
+
instanceStore.updateProduct(productNftId, productInfo, KEEP_STATE());
|
359
422
|
}
|
360
423
|
|
361
424
|
|
@@ -366,189 +429,144 @@ contract ComponentService is
|
|
366
429
|
)
|
367
430
|
external
|
368
431
|
virtual
|
432
|
+
restricted()
|
369
433
|
{
|
370
|
-
(NftId poolNftId
|
371
|
-
|
434
|
+
(NftId poolNftId, IInstance instance) = _getAndVerifyComponent(POOL(), true);
|
435
|
+
|
436
|
+
(NftId productNftId, IComponents.FeeInfo memory feeInfo) = _getLinkedFeeInfo(
|
372
437
|
instance.getInstanceReader(), poolNftId);
|
373
438
|
bool feesChanged = false;
|
374
439
|
|
375
440
|
// update pool fee if required
|
376
|
-
if(!FeeLib.eq(
|
377
|
-
_logUpdateFee(productNftId, "PoolFee",
|
378
|
-
|
441
|
+
if(!FeeLib.eq(feeInfo.poolFee, poolFee)) {
|
442
|
+
_logUpdateFee(productNftId, "PoolFee", feeInfo.poolFee, poolFee);
|
443
|
+
feeInfo.poolFee = poolFee;
|
379
444
|
feesChanged = true;
|
380
445
|
}
|
381
446
|
|
382
447
|
// update staking fee if required
|
383
|
-
if(!FeeLib.eq(
|
384
|
-
_logUpdateFee(productNftId, "StakingFee",
|
385
|
-
|
448
|
+
if(!FeeLib.eq(feeInfo.stakingFee, stakingFee)) {
|
449
|
+
_logUpdateFee(productNftId, "StakingFee", feeInfo.stakingFee, stakingFee);
|
450
|
+
feeInfo.stakingFee = stakingFee;
|
386
451
|
feesChanged = true;
|
387
452
|
}
|
388
453
|
|
389
454
|
// update performance fee if required
|
390
|
-
if(!FeeLib.eq(
|
391
|
-
_logUpdateFee(productNftId, "PerformanceFee",
|
392
|
-
|
455
|
+
if(!FeeLib.eq(feeInfo.performanceFee, performanceFee)) {
|
456
|
+
_logUpdateFee(productNftId, "PerformanceFee", feeInfo.performanceFee, performanceFee);
|
457
|
+
feeInfo.performanceFee = performanceFee;
|
393
458
|
feesChanged = true;
|
394
459
|
}
|
395
460
|
|
396
461
|
if(feesChanged) {
|
397
|
-
instance.getInstanceStore().
|
462
|
+
instance.getInstanceStore().updateFee(productNftId, feeInfo);
|
398
463
|
emit LogComponentServicePoolFeesUpdated(poolNftId);
|
399
464
|
}
|
400
465
|
}
|
401
466
|
|
402
|
-
function increasePoolBalance(
|
403
|
-
InstanceStore instanceStore,
|
404
|
-
NftId poolNftId,
|
405
|
-
Amount amount,
|
406
|
-
Amount feeAmount
|
407
|
-
)
|
408
|
-
public
|
409
|
-
virtual
|
410
|
-
// TODO re-enable once role granting is stable and fixed
|
411
|
-
// restricted()
|
412
|
-
{
|
413
|
-
_changeTargetBalance(INCREASE, instanceStore, poolNftId, amount, feeAmount);
|
414
|
-
}
|
415
|
-
|
416
|
-
function decreasePoolBalance(
|
417
|
-
InstanceStore instanceStore,
|
418
|
-
NftId poolNftId,
|
419
|
-
Amount amount,
|
420
|
-
Amount feeAmount
|
421
|
-
)
|
422
|
-
public
|
423
|
-
virtual
|
424
|
-
// TODO re-enable once role granting is stable and fixed
|
425
|
-
// restricted()
|
426
|
-
{
|
427
|
-
_changeTargetBalance(DECREASE, instanceStore, poolNftId, amount, feeAmount);
|
428
|
-
}
|
429
|
-
|
430
|
-
//-------- bundle -------------------------------------------------------//
|
431
|
-
|
432
|
-
function increaseBundleBalance(
|
433
|
-
InstanceStore instanceStore,
|
434
|
-
NftId bundleNftId,
|
435
|
-
Amount amount,
|
436
|
-
Amount feeAmount
|
437
|
-
)
|
438
|
-
external
|
439
|
-
virtual
|
440
|
-
// TODO re-enable once role granting is stable and fixed
|
441
|
-
// restricted()
|
442
|
-
{
|
443
|
-
_changeTargetBalance(INCREASE, instanceStore, bundleNftId, amount, feeAmount);
|
444
|
-
}
|
445
|
-
|
446
|
-
function decreaseBundleBalance(
|
447
|
-
InstanceStore instanceStore,
|
448
|
-
NftId bundleNftId,
|
449
|
-
Amount amount,
|
450
|
-
Amount feeAmount
|
451
|
-
)
|
452
|
-
external
|
453
|
-
virtual
|
454
|
-
// TODO re-enable once role granting is stable and fixed
|
455
|
-
// restricted()
|
456
|
-
{
|
457
|
-
_changeTargetBalance(DECREASE, instanceStore, bundleNftId, amount, feeAmount);
|
458
|
-
}
|
459
|
-
|
460
|
-
|
461
|
-
//-------- internal functions ------------------------------------------//
|
462
467
|
|
463
|
-
|
464
|
-
|
465
|
-
|
466
|
-
|
467
|
-
|
468
|
-
|
469
|
-
|
470
|
-
internal
|
471
|
-
virtual
|
472
|
-
{
|
473
|
-
Amount totalAmount = amount + feeAmount;
|
474
|
-
|
475
|
-
if(increase) {
|
476
|
-
if(totalAmount.gtz()) { instanceStore.increaseBalance(targetNftId, totalAmount); }
|
477
|
-
if(feeAmount.gtz()) { instanceStore.increaseFees(targetNftId, feeAmount); }
|
478
|
-
} else {
|
479
|
-
if(totalAmount.gtz()) { instanceStore.decreaseBalance(targetNftId, totalAmount); }
|
480
|
-
if(feeAmount.gtz()) { instanceStore.decreaseFees(targetNftId, feeAmount); }
|
481
|
-
}
|
482
|
-
}
|
483
|
-
|
484
|
-
/// @dev registers the component represented by the provided address
|
485
|
-
function _register(
|
486
|
-
address componentAddress, // address of component to register
|
487
|
-
ObjectType requiredType, // required type for component for registration
|
488
|
-
RoleId requiredRole // role required for comonent owner for registration
|
468
|
+
/// @dev Registers the component represented by the provided address.
|
469
|
+
/// The caller must ensure componentAddress is IInstanceLinkedComponent.
|
470
|
+
function _verifyAndRegister(
|
471
|
+
IInstance instance,
|
472
|
+
address componentAddress,
|
473
|
+
NftId parentNftId,
|
474
|
+
address token
|
489
475
|
)
|
490
476
|
internal
|
491
477
|
virtual
|
492
|
-
returns (
|
493
|
-
InstanceReader instanceReader,
|
494
|
-
InstanceStore instanceStore,
|
495
|
-
NftId componentNftId
|
496
|
-
)
|
478
|
+
returns (NftId componentNftId)
|
497
479
|
{
|
498
480
|
(
|
499
|
-
IInstance instance,
|
500
481
|
IInstanceLinkedComponent component,
|
501
|
-
|
482
|
+
IRegistry.ObjectInfo memory objectInfo // initial component info
|
502
483
|
) = _getAndVerifyRegisterableComponent(
|
503
484
|
componentAddress,
|
504
|
-
|
505
|
-
requiredRole);
|
485
|
+
parentNftId);
|
506
486
|
|
507
|
-
|
508
|
-
|
509
|
-
|
510
|
-
|
511
|
-
owner).nftId;
|
487
|
+
InstanceAdmin instanceAdmin = instance.getInstanceAdmin();
|
488
|
+
InstanceStore instanceStore = instance.getInstanceStore();
|
489
|
+
InstanceReader instanceReader = instance.getInstanceReader();
|
490
|
+
ObjectType componentType = objectInfo.objectType;
|
512
491
|
|
513
|
-
|
492
|
+
if(componentType == PRODUCT()) {
|
493
|
+
// register product with registry
|
494
|
+
componentNftId = _registryService.registerProduct(
|
495
|
+
component,
|
496
|
+
objectInfo.initialOwner).nftId;
|
514
497
|
|
515
|
-
|
516
|
-
|
517
|
-
|
518
|
-
component
|
498
|
+
// create product info in instance store
|
499
|
+
_createProduct(instanceStore, componentNftId, componentAddress);
|
500
|
+
} else {
|
501
|
+
// register non product component with registry
|
502
|
+
componentNftId = _registryService.registerProductLinkedComponent(
|
503
|
+
component,
|
504
|
+
objectInfo.objectType,
|
505
|
+
objectInfo.initialOwner).nftId;
|
506
|
+
|
507
|
+
// create non product component info in instance store
|
508
|
+
NftId productNftId = parentNftId;
|
509
|
+
IComponents.ProductInfo memory productInfo = instanceReader.getProductInfo(productNftId);
|
510
|
+
if(componentType == POOL()) {
|
511
|
+
_createPool(instanceStore, productNftId, componentNftId, componentAddress, productInfo);
|
512
|
+
} else if(componentType == DISTRIBUTION()) {
|
513
|
+
_createDistribution(instanceStore, productNftId, componentNftId, productInfo);
|
514
|
+
} else if(componentType == ORACLE()) {
|
515
|
+
_createOracle(instanceStore, productNftId, componentNftId, productInfo);
|
516
|
+
} else {
|
517
|
+
revert ErrorComponentServiceComponentTypeNotSupported(componentAddress, componentType);
|
518
|
+
}
|
519
519
|
|
520
|
-
|
521
|
-
|
522
|
-
|
520
|
+
// get product's token
|
521
|
+
token = address(instanceReader.getTokenHandler(productNftId).TOKEN());
|
522
|
+
}
|
523
523
|
|
524
|
-
|
525
|
-
componentInfo.tokenHandler = new TokenHandler(address(componentInfo.token));
|
524
|
+
_checkToken(instance, token);
|
526
525
|
|
526
|
+
// deploy and wire token handler
|
527
|
+
IComponents.ComponentInfo memory componentInfo = component.getInitialComponentInfo();
|
528
|
+
componentInfo.tokenHandler = TokenHandlerDeployerLib.deployTokenHandler(
|
529
|
+
address(getRegistry()),
|
530
|
+
address(component), // initially, component is its own wallet
|
531
|
+
token,
|
532
|
+
instanceAdmin.authority());
|
533
|
+
|
534
|
+
// register component with instance
|
527
535
|
instanceStore.createComponent(
|
528
|
-
|
536
|
+
componentNftId,
|
529
537
|
componentInfo);
|
530
538
|
|
531
|
-
//
|
539
|
+
// link component contract to nft id
|
540
|
+
component.linkToRegisteredNftId();
|
541
|
+
|
542
|
+
// authorize
|
543
|
+
instanceAdmin.initializeComponentAuthorization(componentAddress, componentType);
|
544
|
+
|
545
|
+
emit LogComponentServiceRegistered(
|
546
|
+
instance.getNftId(),
|
547
|
+
componentNftId,
|
548
|
+
componentType,
|
549
|
+
address(component),
|
550
|
+
token,
|
551
|
+
objectInfo.initialOwner);
|
532
552
|
}
|
533
553
|
|
534
554
|
|
535
|
-
|
536
|
-
function _linkToProduct(
|
537
|
-
InstanceReader instanceReader,
|
538
|
-
InstanceStore instanceStore,
|
539
|
-
NftId componentNftId,
|
540
|
-
NftId productNftId
|
541
|
-
)
|
555
|
+
function _checkToken(IInstance instance, address token)
|
542
556
|
internal
|
557
|
+
view
|
543
558
|
{
|
544
|
-
|
545
|
-
|
546
|
-
|
559
|
+
if (! instance.isTokenRegistryDisabled()) {
|
560
|
+
// check if provided token is whitelisted and active
|
561
|
+
if (!ContractLib.isActiveToken(
|
562
|
+
getRegistry().getTokenRegistryAddress(),
|
563
|
+
token,
|
564
|
+
block.chainid,
|
565
|
+
AccessManagerCloneable(authority()).getRelease())
|
566
|
+
) {
|
567
|
+
revert ErrorComponentServiceTokenInvalid(token);
|
568
|
+
}
|
547
569
|
}
|
548
|
-
|
549
|
-
IComponents.ComponentInfo memory componentInfo = instanceReader.getComponentInfo(componentNftId);
|
550
|
-
componentInfo.productNftId = productNftId;
|
551
|
-
instanceStore.updateComponent(componentNftId, componentInfo, KEEP_STATE());
|
552
570
|
}
|
553
571
|
|
554
572
|
|
@@ -567,13 +585,7 @@ contract ComponentService is
|
|
567
585
|
}
|
568
586
|
|
569
587
|
|
570
|
-
function
|
571
|
-
selectors = new bytes4[](1);
|
572
|
-
selectors[0] = selector;
|
573
|
-
}
|
574
|
-
|
575
|
-
|
576
|
-
function _getLinkedProductInfo(
|
588
|
+
function _getLinkedFeeInfo(
|
577
589
|
InstanceReader instanceReader,
|
578
590
|
NftId componentNftId
|
579
591
|
)
|
@@ -581,59 +593,85 @@ contract ComponentService is
|
|
581
593
|
view
|
582
594
|
returns(
|
583
595
|
NftId productNftId,
|
584
|
-
IComponents.
|
596
|
+
IComponents.FeeInfo memory info
|
585
597
|
)
|
586
598
|
{
|
587
|
-
productNftId =
|
588
|
-
info = instanceReader.
|
599
|
+
productNftId = getRegistry().getParentNftId(componentNftId);
|
600
|
+
info = instanceReader.getFeeInfo(productNftId);
|
589
601
|
}
|
590
602
|
|
591
603
|
|
592
|
-
/// @dev
|
593
|
-
///
|
604
|
+
/// @dev Based on the provided component address required type the component
|
605
|
+
/// and related instance contract this function reverts iff:
|
606
|
+
/// - the component parent does not match with the required parent
|
607
|
+
/// - the component release does not match with the service release
|
594
608
|
/// - the component has already been registered
|
595
|
-
/// - the component contract does not support IInstanceLinkedComponent
|
596
|
-
/// - the component type does not match with the required type
|
597
|
-
/// - the initial component owner misses the required role (with the instance access manager)
|
598
609
|
function _getAndVerifyRegisterableComponent(
|
599
610
|
address componentAddress,
|
600
|
-
|
601
|
-
RoleId requiredRole
|
611
|
+
NftId requiredParent
|
602
612
|
)
|
603
613
|
internal
|
604
614
|
view
|
605
615
|
returns (
|
606
|
-
IInstance instance,
|
607
616
|
IInstanceLinkedComponent component,
|
608
|
-
|
617
|
+
IRegistry.ObjectInfo memory info
|
609
618
|
)
|
610
619
|
{
|
611
|
-
// check this is a component
|
612
620
|
component = IInstanceLinkedComponent(componentAddress);
|
613
|
-
|
614
|
-
|
621
|
+
info = component.getInitialInfo();
|
622
|
+
|
623
|
+
// check component parent
|
624
|
+
if(info.parentNftId != requiredParent) {
|
625
|
+
revert ErrorComponentServiceComponentParentInvalid(componentAddress, requiredParent, info.parentNftId);
|
615
626
|
}
|
616
627
|
|
617
|
-
// check component
|
618
|
-
|
619
|
-
|
620
|
-
revert ErrorComponentServiceInvalidType(componentAddress, requiredType, info.objectType);
|
628
|
+
// check component release (must match with service release)
|
629
|
+
if(component.getRelease() != getRelease()) {
|
630
|
+
revert ErrorComponentServiceComponentReleaseMismatch(componentAddress, getRelease(), component.getRelease());
|
621
631
|
}
|
622
632
|
|
623
633
|
// check component has not already been registered
|
624
|
-
if (getRegistry().
|
625
|
-
revert
|
634
|
+
if (getRegistry().getNftIdForAddress(componentAddress).gtz()) {
|
635
|
+
revert ErrorComponentServiceComponentAlreadyRegistered(componentAddress);
|
626
636
|
}
|
637
|
+
}
|
638
|
+
|
639
|
+
|
640
|
+
function _setLocked(InstanceAdmin instanceAdmin, address componentAddress, bool locked) internal {
|
641
|
+
instanceAdmin.setTargetLocked(componentAddress, locked);
|
642
|
+
}
|
627
643
|
|
628
|
-
// check instance has assigned required role to inital owner
|
629
|
-
instance = _getInstance(info.parentNftId);
|
630
|
-
owner = info.initialOwner;
|
631
644
|
|
632
|
-
|
633
|
-
|
645
|
+
function _getAndVerifyComponent(ObjectType expectedType, bool isActive)
|
646
|
+
internal
|
647
|
+
view
|
648
|
+
returns (
|
649
|
+
NftId componentNftId,
|
650
|
+
IInstance instance
|
651
|
+
)
|
652
|
+
{
|
653
|
+
IRegistry.ObjectInfo memory info;
|
654
|
+
address instanceAddress;
|
655
|
+
|
656
|
+
if (expectedType != COMPONENT()) {
|
657
|
+
(info, instanceAddress) = ContractLib.getAndVerifyComponent(
|
658
|
+
getRegistry(),
|
659
|
+
msg.sender, // caller
|
660
|
+
expectedType,
|
661
|
+
isActive);
|
662
|
+
} else {
|
663
|
+
(info, instanceAddress) = ContractLib.getAndVerifyAnyComponent(
|
664
|
+
getRegistry(),
|
665
|
+
msg.sender,
|
666
|
+
isActive);
|
634
667
|
}
|
668
|
+
|
669
|
+
// get component nft id and instance
|
670
|
+
componentNftId = info.nftId;
|
671
|
+
instance = IInstance(instanceAddress);
|
635
672
|
}
|
636
673
|
|
674
|
+
|
637
675
|
function _getDomain() internal pure virtual override returns(ObjectType) {
|
638
676
|
return COMPONENT();
|
639
677
|
}
|