@etherisc/gif-next 0.0.2-df73b56-462 → 0.0.2-e016345-525
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 +27 -6
- package/artifacts/contracts/accounting/AccountingService.sol/AccountingService.dbg.json +4 -0
- package/artifacts/contracts/accounting/AccountingService.sol/AccountingService.json +944 -0
- package/artifacts/contracts/accounting/AccountingServiceManager.sol/AccountingServiceManager.dbg.json +4 -0
- package/artifacts/contracts/accounting/AccountingServiceManager.sol/AccountingServiceManager.json +746 -0
- package/artifacts/contracts/accounting/IAccountingService.sol/IAccountingService.dbg.json +4 -0
- package/artifacts/contracts/accounting/IAccountingService.sol/IAccountingService.json +711 -0
- package/artifacts/contracts/authorization/AccessAdmin.sol/AccessAdmin.dbg.json +1 -1
- package/artifacts/contracts/authorization/AccessAdmin.sol/AccessAdmin.json +96 -37
- package/artifacts/contracts/authorization/AccessAdmin.sol/IAccessManagedChecker.dbg.json +4 -0
- package/artifacts/contracts/authorization/AccessAdmin.sol/IAccessManagedChecker.json +24 -0
- package/artifacts/contracts/authorization/AccessManagerCloneable.sol/AccessManagerCloneable.dbg.json +1 -1
- package/artifacts/contracts/authorization/Authorization.sol/Authorization.dbg.json +1 -1
- package/artifacts/contracts/authorization/Authorization.sol/Authorization.json +67 -11
- 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 +60 -13
- package/artifacts/contracts/authorization/IAuthorization.sol/IAuthorization.dbg.json +1 -1
- package/artifacts/contracts/authorization/IAuthorization.sol/IAuthorization.json +40 -3
- package/artifacts/contracts/authorization/IServiceAuthorization.sol/IServiceAuthorization.dbg.json +1 -1
- package/artifacts/contracts/authorization/IServiceAuthorization.sol/IServiceAuthorization.json +19 -0
- package/artifacts/contracts/authorization/ReleaseAccessManager.sol/ReleaseAccessManager.dbg.json +4 -0
- package/artifacts/contracts/authorization/ReleaseAccessManager.sol/ReleaseAccessManager.json +1196 -0
- package/artifacts/contracts/authorization/ServiceAuthorization.sol/ServiceAuthorization.dbg.json +1 -1
- package/artifacts/contracts/authorization/ServiceAuthorization.sol/ServiceAuthorization.json +68 -5
- package/artifacts/contracts/distribution/BasicDistribution.sol/BasicDistribution.dbg.json +1 -1
- package/artifacts/contracts/distribution/BasicDistribution.sol/BasicDistribution.json +159 -209
- package/artifacts/contracts/distribution/BasicDistributionAuthorization.sol/BasicDistributionAuthorization.dbg.json +1 -1
- package/artifacts/contracts/distribution/BasicDistributionAuthorization.sol/BasicDistributionAuthorization.json +82 -22
- package/artifacts/contracts/distribution/Distribution.sol/Distribution.dbg.json +1 -1
- package/artifacts/contracts/distribution/Distribution.sol/Distribution.json +99 -125
- package/artifacts/contracts/distribution/DistributionService.sol/DistributionService.dbg.json +1 -1
- package/artifacts/contracts/distribution/DistributionService.sol/DistributionService.json +175 -86
- package/artifacts/contracts/distribution/DistributionServiceManager.sol/DistributionServiceManager.dbg.json +1 -1
- package/artifacts/contracts/distribution/DistributionServiceManager.sol/DistributionServiceManager.json +104 -60
- package/artifacts/contracts/distribution/IDistributionComponent.sol/IDistributionComponent.dbg.json +1 -1
- package/artifacts/contracts/distribution/IDistributionComponent.sol/IDistributionComponent.json +87 -108
- package/artifacts/contracts/distribution/IDistributionService.sol/IDistributionService.dbg.json +1 -1
- package/artifacts/contracts/distribution/IDistributionService.sol/IDistributionService.json +52 -0
- 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 +1441 -0
- package/artifacts/contracts/examples/fire/FirePoolAuthorization.sol/FirePoolAuthorization.dbg.json +4 -0
- package/artifacts/contracts/examples/fire/FirePoolAuthorization.sol/FirePoolAuthorization.json +502 -0
- package/artifacts/contracts/examples/fire/FireProduct.sol/FireProduct.dbg.json +4 -0
- package/artifacts/contracts/examples/fire/FireProduct.sol/FireProduct.json +1991 -0
- package/artifacts/contracts/examples/fire/FireProductAuthorization.sol/FireProductAuthorization.dbg.json +4 -0
- package/artifacts/contracts/examples/fire/FireProductAuthorization.sol/FireProductAuthorization.json +470 -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 +1 -1
- package/artifacts/contracts/examples/unpermissioned/SimpleDistribution.sol/SimpleDistribution.json +187 -169
- package/artifacts/contracts/examples/unpermissioned/SimpleDistributionAuthorization.sol/SimpleDistributionAuthorization.dbg.json +4 -0
- package/artifacts/contracts/examples/unpermissioned/SimpleDistributionAuthorization.sol/SimpleDistributionAuthorization.json +470 -0
- package/artifacts/contracts/examples/unpermissioned/SimpleOracle.sol/SimpleOracle.dbg.json +1 -1
- package/artifacts/contracts/examples/unpermissioned/SimpleOracle.sol/SimpleOracle.json +131 -157
- package/artifacts/contracts/examples/unpermissioned/SimplePool.sol/SimplePool.dbg.json +1 -1
- package/artifacts/contracts/examples/unpermissioned/SimplePool.sol/SimplePool.json +262 -202
- package/artifacts/contracts/examples/unpermissioned/SimplePoolAuthorization.sol/SimplePoolAuthorization.dbg.json +4 -0
- package/artifacts/contracts/examples/unpermissioned/SimplePoolAuthorization.sol/SimplePoolAuthorization.json +502 -0
- package/artifacts/contracts/examples/unpermissioned/SimpleProduct.sol/SimpleProduct.dbg.json +1 -1
- package/artifacts/contracts/examples/unpermissioned/SimpleProduct.sol/SimpleProduct.json +562 -252
- package/artifacts/contracts/examples/unpermissioned/SimpleProductAuthorization.sol/SimpleProductAuthorization.dbg.json +4 -0
- package/artifacts/contracts/examples/unpermissioned/SimpleProductAuthorization.sol/SimpleProductAuthorization.json +470 -0
- package/artifacts/contracts/instance/BundleSet.sol/BundleSet.dbg.json +1 -1
- package/artifacts/contracts/instance/BundleSet.sol/BundleSet.json +147 -42
- package/artifacts/contracts/instance/IInstance.sol/IInstance.dbg.json +1 -1
- package/artifacts/contracts/instance/IInstance.sol/IInstance.json +116 -48
- package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.dbg.json +1 -1
- package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.json +53 -101
- package/artifacts/contracts/instance/Instance.sol/Instance.dbg.json +1 -1
- package/artifacts/contracts/instance/Instance.sol/Instance.json +149 -60
- package/artifacts/contracts/instance/InstanceAdmin.sol/InstanceAdmin.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceAdmin.sol/InstanceAdmin.json +186 -125
- package/artifacts/contracts/instance/InstanceAuthorizationV3.sol/InstanceAuthorizationV3.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceAuthorizationV3.sol/InstanceAuthorizationV3.json +58 -85
- package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.json +514 -88
- package/artifacts/contracts/instance/InstanceService.sol/InstanceService.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceService.sol/InstanceService.json +113 -148
- package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.json +72 -40
- package/artifacts/contracts/instance/InstanceStore.sol/InstanceStore.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceStore.sol/InstanceStore.json +185 -124
- package/artifacts/contracts/instance/RiskSet.sol/RiskSet.dbg.json +4 -0
- package/artifacts/contracts/instance/RiskSet.sol/RiskSet.json +810 -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 +2 -2
- package/artifacts/contracts/instance/module/IAccess.sol/IAccess.dbg.json +1 -1
- 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 +119 -169
- package/artifacts/contracts/oracle/BasicOracleAuthorization.sol/BasicOracleAuthorization.dbg.json +1 -1
- package/artifacts/contracts/oracle/BasicOracleAuthorization.sol/BasicOracleAuthorization.json +84 -24
- 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 +82 -103
- package/artifacts/contracts/oracle/IOracleService.sol/IOracleService.dbg.json +1 -1
- package/artifacts/contracts/oracle/IOracleService.sol/IOracleService.json +43 -9
- package/artifacts/contracts/oracle/Oracle.sol/Oracle.dbg.json +1 -1
- package/artifacts/contracts/oracle/Oracle.sol/Oracle.json +95 -121
- package/artifacts/contracts/oracle/OracleService.sol/OracleService.dbg.json +1 -1
- package/artifacts/contracts/oracle/OracleService.sol/OracleService.json +142 -79
- package/artifacts/contracts/oracle/OracleServiceManager.sol/OracleServiceManager.dbg.json +1 -1
- package/artifacts/contracts/oracle/OracleServiceManager.sol/OracleServiceManager.json +92 -36
- package/artifacts/contracts/pool/BasicPool.sol/BasicPool.dbg.json +1 -1
- package/artifacts/contracts/pool/BasicPool.sol/BasicPool.json +95 -149
- package/artifacts/contracts/pool/BasicPoolAuthorization.sol/BasicPoolAuthorization.dbg.json +1 -1
- package/artifacts/contracts/pool/BasicPoolAuthorization.sol/BasicPoolAuthorization.json +114 -22
- package/artifacts/contracts/pool/BundleService.sol/BundleService.dbg.json +1 -1
- package/artifacts/contracts/pool/BundleService.sol/BundleService.json +143 -150
- package/artifacts/contracts/pool/BundleServiceManager.sol/BundleServiceManager.dbg.json +1 -1
- package/artifacts/contracts/pool/BundleServiceManager.sol/BundleServiceManager.json +86 -66
- package/artifacts/contracts/pool/IBundleService.sol/IBundleService.dbg.json +1 -1
- package/artifacts/contracts/pool/IBundleService.sol/IBundleService.json +48 -33
- package/artifacts/contracts/pool/IPoolComponent.sol/IPoolComponent.dbg.json +1 -1
- package/artifacts/contracts/pool/IPoolComponent.sol/IPoolComponent.json +82 -142
- package/artifacts/contracts/pool/IPoolService.sol/IPoolService.dbg.json +1 -1
- package/artifacts/contracts/pool/IPoolService.sol/IPoolService.json +272 -185
- package/artifacts/contracts/pool/Pool.sol/Pool.dbg.json +1 -1
- package/artifacts/contracts/pool/Pool.sol/Pool.json +95 -160
- package/artifacts/contracts/pool/PoolService.sol/PoolService.dbg.json +1 -1
- package/artifacts/contracts/pool/PoolService.sol/PoolService.json +408 -263
- package/artifacts/contracts/pool/PoolServiceManager.sol/PoolServiceManager.dbg.json +1 -1
- package/artifacts/contracts/pool/PoolServiceManager.sol/PoolServiceManager.json +109 -41
- package/artifacts/contracts/product/ApplicationService.sol/ApplicationService.dbg.json +1 -1
- package/artifacts/contracts/product/ApplicationService.sol/ApplicationService.json +114 -45
- package/artifacts/contracts/product/ApplicationServiceManager.sol/ApplicationServiceManager.dbg.json +1 -1
- package/artifacts/contracts/product/ApplicationServiceManager.sol/ApplicationServiceManager.json +68 -36
- package/artifacts/contracts/product/BasicProduct.sol/BasicProduct.dbg.json +1 -1
- package/artifacts/contracts/product/BasicProduct.sol/BasicProduct.json +156 -141
- package/artifacts/contracts/product/BasicProductAuthorization.sol/BasicProductAuthorization.dbg.json +1 -1
- package/artifacts/contracts/product/BasicProductAuthorization.sol/BasicProductAuthorization.json +82 -22
- package/artifacts/contracts/product/ClaimService.sol/ClaimService.dbg.json +1 -1
- package/artifacts/contracts/product/ClaimService.sol/ClaimService.json +183 -90
- package/artifacts/contracts/product/ClaimServiceManager.sol/ClaimServiceManager.dbg.json +1 -1
- package/artifacts/contracts/product/ClaimServiceManager.sol/ClaimServiceManager.json +102 -58
- package/artifacts/contracts/product/IApplicationService.sol/IApplicationService.dbg.json +1 -1
- package/artifacts/contracts/product/IApplicationService.sol/IApplicationService.json +63 -7
- package/artifacts/contracts/product/IClaimService.sol/IClaimService.dbg.json +1 -1
- package/artifacts/contracts/product/IClaimService.sol/IClaimService.json +64 -8
- package/artifacts/contracts/product/IPolicyService.sol/IPolicyService.dbg.json +1 -1
- package/artifacts/contracts/product/IPolicyService.sol/IPolicyService.json +96 -19
- package/artifacts/contracts/product/IPricingService.sol/IPricingService.dbg.json +1 -1
- package/artifacts/contracts/product/IPricingService.sol/IPricingService.json +80 -51
- package/artifacts/contracts/product/IProductComponent.sol/IProductComponent.dbg.json +1 -1
- package/artifacts/contracts/product/IProductComponent.sol/IProductComponent.json +139 -119
- package/artifacts/contracts/product/IRiskService.sol/IRiskService.dbg.json +1 -1
- package/artifacts/contracts/product/IRiskService.sol/IRiskService.json +29 -0
- package/artifacts/contracts/product/PolicyService.sol/PolicyService.dbg.json +1 -1
- package/artifacts/contracts/product/PolicyService.sol/PolicyService.json +215 -125
- package/artifacts/contracts/product/PolicyServiceManager.sol/PolicyServiceManager.dbg.json +1 -1
- package/artifacts/contracts/product/PolicyServiceManager.sol/PolicyServiceManager.json +102 -54
- package/artifacts/contracts/product/PricingService.sol/PricingService.dbg.json +1 -1
- package/artifacts/contracts/product/PricingService.sol/PricingService.json +165 -107
- package/artifacts/contracts/product/PricingServiceManager.sol/PricingServiceManager.dbg.json +1 -1
- package/artifacts/contracts/product/PricingServiceManager.sol/PricingServiceManager.json +85 -45
- package/artifacts/contracts/product/Product.sol/Product.dbg.json +1 -1
- package/artifacts/contracts/product/Product.sol/Product.json +152 -137
- package/artifacts/contracts/product/RiskService.sol/RiskService.dbg.json +1 -1
- package/artifacts/contracts/product/RiskService.sol/RiskService.json +76 -26
- package/artifacts/contracts/product/RiskServiceManager.sol/RiskServiceManager.dbg.json +1 -1
- package/artifacts/contracts/product/RiskServiceManager.sol/RiskServiceManager.json +66 -30
- package/artifacts/contracts/registry/ChainNft.sol/ChainNft.dbg.json +1 -1
- package/artifacts/contracts/registry/ChainNft.sol/ChainNft.json +2 -2
- package/artifacts/contracts/registry/IRegistry.sol/IRegistry.dbg.json +1 -1
- package/artifacts/contracts/registry/IRegistry.sol/IRegistry.json +91 -15
- package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.dbg.json +1 -1
- package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.json +114 -35
- 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 +135 -51
- package/artifacts/contracts/registry/RegistryAdmin.sol/RegistryAdmin.dbg.json +1 -1
- package/artifacts/contracts/registry/RegistryAdmin.sol/RegistryAdmin.json +203 -162
- package/artifacts/contracts/registry/RegistryService.sol/RegistryService.dbg.json +1 -1
- package/artifacts/contracts/registry/RegistryService.sol/RegistryService.json +89 -172
- package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.dbg.json +1 -1
- package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.json +65 -29
- 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 +123 -225
- package/artifacts/contracts/registry/ServiceAuthorizationV3.sol/ServiceAuthorizationV3.dbg.json +1 -1
- package/artifacts/contracts/registry/ServiceAuthorizationV3.sol/ServiceAuthorizationV3.json +66 -8
- package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.dbg.json +1 -1
- package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.json +2 -2
- package/artifacts/contracts/shared/Component.sol/Component.dbg.json +1 -1
- package/artifacts/contracts/shared/Component.sol/Component.json +72 -80
- package/artifacts/contracts/shared/ComponentService.sol/ComponentService.dbg.json +1 -1
- package/artifacts/contracts/shared/ComponentService.sol/ComponentService.json +478 -477
- package/artifacts/contracts/shared/ComponentServiceManager.sol/ComponentServiceManager.dbg.json +1 -1
- package/artifacts/contracts/shared/ComponentServiceManager.sol/ComponentServiceManager.json +96 -72
- package/artifacts/contracts/shared/ComponentVerifyingService.sol/ComponentVerifyingService.dbg.json +1 -1
- package/artifacts/contracts/shared/ComponentVerifyingService.sol/ComponentVerifyingService.json +42 -0
- package/artifacts/contracts/shared/ContractLib.sol/ContractLib.dbg.json +1 -1
- package/artifacts/contracts/shared/ContractLib.sol/ContractLib.json +402 -6
- 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/IComponent.sol/IComponent.dbg.json +1 -1
- package/artifacts/contracts/shared/IComponent.sol/IComponent.json +61 -64
- package/artifacts/contracts/shared/IComponentService.sol/IComponentService.dbg.json +1 -1
- package/artifacts/contracts/shared/IComponentService.sol/IComponentService.json +425 -261
- package/artifacts/contracts/shared/IInstanceLinkedComponent.sol/IInstanceLinkedComponent.dbg.json +1 -1
- package/artifacts/contracts/shared/IInstanceLinkedComponent.sol/IInstanceLinkedComponent.json +82 -103
- 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 +1 -1
- package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.dbg.json +1 -1
- package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.json +29 -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 +29 -0
- package/artifacts/contracts/shared/InitializableERC165.sol/InitializableERC165.dbg.json +1 -1
- package/artifacts/contracts/shared/InstanceLinkedComponent.sol/InstanceLinkedComponent.dbg.json +1 -1
- package/artifacts/contracts/shared/InstanceLinkedComponent.sol/InstanceLinkedComponent.json +94 -120
- 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 +18 -2
- package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.dbg.json +1 -1
- package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.json +3 -3
- package/artifacts/contracts/shared/Registerable.sol/Registerable.dbg.json +1 -1
- package/artifacts/contracts/shared/Registerable.sol/Registerable.json +66 -8
- package/artifacts/contracts/shared/RegistryLinked.sol/RegistryLinked.dbg.json +1 -1
- package/artifacts/contracts/shared/RegistryLinked.sol/RegistryLinked.json +2 -2
- package/artifacts/contracts/shared/Service.sol/Service.dbg.json +1 -1
- package/artifacts/contracts/shared/Service.sol/Service.json +42 -0
- package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.dbg.json +1 -1
- package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.json +388 -35
- package/artifacts/contracts/shared/TokenHandler.sol/TokenHandlerBase.dbg.json +4 -0
- package/artifacts/contracts/shared/TokenHandler.sol/TokenHandlerBase.json +395 -0
- package/artifacts/contracts/shared/TokenHandlerDeployerLib.sol/TokenHandlerDeployerLib.dbg.json +1 -1
- package/artifacts/contracts/shared/TokenHandlerDeployerLib.sol/TokenHandlerDeployerLib.json +88 -24
- package/artifacts/contracts/staking/IStaking.sol/IStaking.dbg.json +1 -1
- package/artifacts/contracts/staking/IStaking.sol/IStaking.json +79 -100
- package/artifacts/contracts/staking/IStakingService.sol/IStakingService.dbg.json +1 -1
- package/artifacts/contracts/staking/IStakingService.sol/IStakingService.json +29 -21
- package/artifacts/contracts/staking/StakeManagerLib.sol/StakeManagerLib.dbg.json +1 -1
- package/artifacts/contracts/staking/StakeManagerLib.sol/StakeManagerLib.json +2 -2
- package/artifacts/contracts/staking/Staking.sol/Staking.dbg.json +1 -1
- package/artifacts/contracts/staking/Staking.sol/Staking.json +158 -170
- 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 +81 -51
- package/artifacts/contracts/staking/StakingReader.sol/StakingReader.dbg.json +1 -1
- package/artifacts/contracts/staking/StakingReader.sol/StakingReader.json +7 -12
- package/artifacts/contracts/staking/StakingService.sol/StakingService.dbg.json +1 -1
- package/artifacts/contracts/staking/StakingService.sol/StakingService.json +82 -53
- package/artifacts/contracts/staking/StakingServiceManager.sol/StakingServiceManager.dbg.json +1 -1
- package/artifacts/contracts/staking/StakingServiceManager.sol/StakingServiceManager.json +69 -33
- package/artifacts/contracts/staking/StakingStore.sol/StakingStore.dbg.json +1 -1
- package/artifacts/contracts/staking/StakingStore.sol/StakingStore.json +144 -103
- package/artifacts/contracts/staking/TargetManagerLib.sol/TargetManagerLib.dbg.json +1 -1
- package/artifacts/contracts/staking/TargetManagerLib.sol/TargetManagerLib.json +2 -2
- 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 +32 -8
- 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 +2 -2
- 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 +2 -2
- 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 +99 -5
- package/artifacts/contracts/type/RoleId.sol/RoleIdLib.dbg.json +1 -1
- package/artifacts/contracts/type/RoleId.sol/RoleIdLib.json +2 -2
- package/artifacts/contracts/type/Seconds.sol/SecondsLib.dbg.json +1 -1
- package/artifacts/contracts/type/Selector.sol/SelectorLib.dbg.json +1 -1
- package/artifacts/contracts/type/Selector.sol/SelectorSetLib.dbg.json +1 -1
- 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/Timestamp.sol/TimestampLib.dbg.json +1 -1
- package/artifacts/contracts/type/UFixed.sol/MathLib.dbg.json +1 -1
- package/artifacts/contracts/type/UFixed.sol/MathLib.json +2 -2
- package/artifacts/contracts/type/UFixed.sol/UFixedLib.dbg.json +1 -1
- package/artifacts/contracts/type/UFixed.sol/UFixedLib.json +15 -2
- package/artifacts/contracts/type/Version.sol/VersionLib.dbg.json +1 -1
- package/artifacts/contracts/type/Version.sol/VersionPartLib.dbg.json +1 -1
- 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 +44 -12
- package/artifacts/contracts/upgradeability/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.dbg.json +1 -1
- package/artifacts/contracts/upgradeability/Versionable.sol/Versionable.dbg.json +1 -1
- package/contracts/accounting/AccountingService.sol +244 -0
- package/contracts/accounting/AccountingServiceManager.sol +38 -0
- package/contracts/accounting/IAccountingService.sol +42 -0
- package/contracts/authorization/AccessAdmin.sol +86 -62
- package/contracts/authorization/Authorization.sol +111 -39
- package/contracts/authorization/IAccess.sol +1 -0
- package/contracts/authorization/IAccessAdmin.sol +4 -2
- package/contracts/authorization/IAuthorization.sol +13 -7
- package/contracts/authorization/IServiceAuthorization.sol +3 -1
- package/contracts/authorization/ReleaseAccessManager.sol +38 -0
- package/contracts/authorization/ServiceAuthorization.sol +26 -10
- package/contracts/distribution/BasicDistribution.sol +8 -7
- package/contracts/distribution/BasicDistributionAuthorization.sol +1 -1
- package/contracts/distribution/Distribution.sol +32 -40
- package/contracts/distribution/DistributionService.sol +80 -59
- package/contracts/distribution/IDistributionComponent.sol +1 -1
- package/contracts/distribution/IDistributionService.sol +5 -6
- package/contracts/examples/fire/DamageLevel.sol +59 -0
- package/contracts/examples/fire/FirePool.sol +90 -0
- package/contracts/examples/fire/FirePoolAuthorization.sol +35 -0
- package/contracts/examples/fire/FireProduct.sol +436 -0
- package/contracts/examples/fire/FireProductAuthorization.sol +45 -0
- package/contracts/examples/fire/FireUSD.sol +26 -0
- package/contracts/examples/unpermissioned/SimpleDistribution.sol +11 -4
- package/contracts/examples/unpermissioned/SimpleDistributionAuthorization.sol +28 -0
- package/contracts/examples/unpermissioned/SimpleOracle.sol +4 -4
- package/contracts/examples/unpermissioned/SimplePool.sol +37 -6
- package/contracts/examples/unpermissioned/SimplePoolAuthorization.sol +28 -0
- package/contracts/examples/unpermissioned/SimpleProduct.sol +24 -23
- package/contracts/examples/unpermissioned/SimpleProductAuthorization.sol +28 -0
- package/contracts/instance/BundleSet.sol +38 -34
- package/contracts/instance/IInstance.sol +11 -3
- package/contracts/instance/IInstanceService.sol +7 -29
- package/contracts/instance/Instance.sol +36 -26
- package/contracts/instance/InstanceAdmin.sol +38 -38
- package/contracts/instance/InstanceAuthorizationV3.sol +50 -32
- package/contracts/instance/InstanceReader.sol +168 -19
- package/contracts/instance/InstanceService.sol +51 -126
- package/contracts/instance/RiskSet.sol +119 -0
- package/contracts/instance/base/ObjectSet.sol +24 -25
- package/contracts/instance/module/IComponents.sol +7 -5
- package/contracts/instance/module/IPolicy.sol +4 -3
- package/contracts/instance/module/IRisk.sol +1 -0
- package/contracts/oracle/BasicOracle.sol +0 -1
- package/contracts/oracle/IOracleService.sol +2 -1
- package/contracts/oracle/Oracle.sol +4 -15
- package/contracts/oracle/OracleService.sol +104 -76
- package/contracts/pool/BasicPool.sol +33 -24
- package/contracts/pool/BasicPoolAuthorization.sol +12 -2
- package/contracts/pool/BundleService.sol +68 -81
- package/contracts/pool/IBundleService.sol +2 -14
- package/contracts/pool/IPoolComponent.sol +1 -7
- package/contracts/pool/IPoolService.sol +30 -37
- package/contracts/pool/Pool.sol +123 -120
- package/contracts/pool/PoolService.sol +261 -154
- package/contracts/product/ApplicationService.sol +28 -16
- package/contracts/product/BasicProduct.sol +8 -12
- package/contracts/product/BasicProductAuthorization.sol +1 -3
- package/contracts/product/ClaimService.sol +110 -69
- package/contracts/product/IApplicationService.sol +5 -2
- package/contracts/product/IClaimService.sol +3 -2
- package/contracts/product/IPolicyService.sol +18 -5
- package/contracts/product/IPricingService.sol +9 -9
- package/contracts/product/IProductComponent.sol +23 -3
- package/contracts/product/PolicyService.sol +277 -187
- package/contracts/product/PricingService.sol +8 -8
- package/contracts/product/Product.sol +76 -75
- package/contracts/product/RiskService.sol +14 -3
- package/contracts/registry/ChainNft.sol +6 -9
- package/contracts/registry/IRegistry.sol +8 -3
- package/contracts/registry/IRegistryService.sol +5 -12
- package/contracts/registry/ITransferInterceptor.sol +1 -2
- package/contracts/registry/Registry.sol +29 -6
- package/contracts/registry/RegistryAdmin.sol +28 -35
- package/contracts/registry/RegistryService.sol +33 -44
- package/contracts/registry/ReleaseLifecycle.sol +6 -3
- package/contracts/registry/ReleaseRegistry.sol +202 -208
- package/contracts/registry/ServiceAuthorizationV3.sol +28 -52
- package/contracts/shared/Component.sol +56 -105
- package/contracts/shared/ComponentService.sol +376 -324
- package/contracts/shared/ComponentVerifyingService.sol +27 -16
- package/contracts/shared/ContractLib.sol +196 -10
- package/contracts/shared/IComponent.sol +6 -14
- package/contracts/shared/IComponentService.sol +45 -37
- package/contracts/shared/IInstanceLinkedComponent.sol +3 -22
- package/contracts/shared/ILifecycle.sol +3 -1
- package/contracts/shared/INftOwnable.sol +2 -0
- package/contracts/shared/IRegisterable.sol +11 -0
- package/contracts/shared/InstanceLinkedComponent.sol +68 -43
- package/contracts/shared/KeyValueStore.sol +1 -1
- package/contracts/shared/Lifecycle.sol +15 -4
- package/contracts/shared/NftOwnable.sol +23 -3
- package/contracts/shared/PolicyHolder.sol +4 -0
- package/contracts/shared/Registerable.sol +15 -7
- package/contracts/shared/RegistryLinked.sol +6 -12
- package/contracts/shared/Service.sol +4 -7
- package/contracts/shared/TokenHandler.sol +316 -66
- package/contracts/shared/TokenHandlerDeployerLib.sol +10 -2
- package/contracts/staking/IStaking.sol +9 -4
- package/contracts/staking/IStakingService.sol +0 -3
- package/contracts/staking/Staking.sol +41 -24
- package/contracts/staking/StakingReader.sol +12 -5
- package/contracts/staking/StakingService.sol +56 -23
- package/contracts/type/Amount.sol +15 -0
- package/contracts/type/ClaimId.sol +6 -1
- 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 +11 -0
- package/contracts/type/PayoutId.sol +10 -10
- package/contracts/type/RiskId.sol +30 -4
- package/contracts/type/RoleId.sol +0 -12
- package/contracts/type/StateId.sol +14 -1
- package/contracts/type/UFixed.sol +4 -0
- package/contracts/upgradeability/ProxyManager.sol +2 -1
- package/package.json +4 -3
- 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/shared/InitializableCustom.sol/InitializableCustom.dbg.json +0 -4
- package/artifacts/contracts/shared/InitializableCustom.sol/InitializableCustom.json +0 -39
- package/contracts/authorization/IModuleAuthorization.sol +0 -21
- package/contracts/authorization/ModuleAuthorization.sol +0 -78
- package/contracts/shared/InitializableCustom.sol +0 -177
@@ -9,7 +9,7 @@ import {NftId} from "../type/NftId.sol";
|
|
9
9
|
import {Fee} from "../type/Fee.sol";
|
10
10
|
import {ReferralId} from "../type/Referral.sol";
|
11
11
|
import {RiskId} from "../type/RiskId.sol";
|
12
|
-
import {PRODUCT, DISTRIBUTION, PRICE} from "../type/ObjectType.sol";
|
12
|
+
import {PRODUCT, BUNDLE, DISTRIBUTION, PRICE} from "../type/ObjectType.sol";
|
13
13
|
import {IRegistry} from "../registry/IRegistry.sol";
|
14
14
|
|
15
15
|
import {IProductComponent} from "./IProductComponent.sol";
|
@@ -31,11 +31,8 @@ contract PricingService is
|
|
31
31
|
ComponentVerifyingService,
|
32
32
|
IPricingService
|
33
33
|
{
|
34
|
-
using UFixedLib for UFixed;
|
35
|
-
|
36
34
|
IDistributionService internal _distributionService;
|
37
35
|
|
38
|
-
|
39
36
|
function _initialize(
|
40
37
|
address owner,
|
41
38
|
bytes memory data
|
@@ -73,6 +70,9 @@ contract PricingService is
|
|
73
70
|
IPolicy.PremiumInfo memory premium
|
74
71
|
)
|
75
72
|
{
|
73
|
+
_checkNftType(productNftId, PRODUCT());
|
74
|
+
_checkNftType(bundleNftId, BUNDLE());
|
75
|
+
|
76
76
|
InstanceReader reader;
|
77
77
|
Amount netPremiumAmount;
|
78
78
|
|
@@ -101,7 +101,7 @@ contract PricingService is
|
|
101
101
|
|
102
102
|
IBundle.BundleInfo memory bundleInfo = reader.getBundleInfo(bundleNftId);
|
103
103
|
if(bundleInfo.poolNftId != productInfo.poolNftId) {
|
104
|
-
revert
|
104
|
+
revert ErrorPricingServiceBundlePoolMismatch(bundleNftId, bundleInfo.poolNftId, productInfo.poolNftId);
|
105
105
|
}
|
106
106
|
|
107
107
|
// calculate fixed fees for product, pool, bundle
|
@@ -138,7 +138,7 @@ contract PricingService is
|
|
138
138
|
}
|
139
139
|
|
140
140
|
if (premium.distributionOwnerFeeFixAmount.toInt() < productInfo.minDistributionOwnerFee.fixedFee) {
|
141
|
-
revert
|
141
|
+
revert ErrorPricingServiceFeeCalculationMismatch(
|
142
142
|
premium.distributionFeeFixAmount,
|
143
143
|
premium.distributionFeeVarAmount,
|
144
144
|
premium.distributionOwnerFeeFixAmount,
|
@@ -149,7 +149,7 @@ contract PricingService is
|
|
149
149
|
}
|
150
150
|
|
151
151
|
if ((premium.distributionFeeVarAmount) != (premium.discountAmount + premium.distributionOwnerFeeVarAmount + premium.commissionAmount)) {
|
152
|
-
revert
|
152
|
+
revert ErrorPricingServiceFeeCalculationMismatch(
|
153
153
|
premium.distributionFeeFixAmount,
|
154
154
|
premium.distributionFeeVarAmount,
|
155
155
|
premium.distributionOwnerFeeFixAmount,
|
@@ -239,7 +239,7 @@ contract PricingService is
|
|
239
239
|
{
|
240
240
|
|
241
241
|
// if the referral is not valid, then the distribution owner gets everything
|
242
|
-
if (! _distributionService.referralIsValid(productInfo.distributionNftId, referralId)) {
|
242
|
+
if (productInfo.distributionNftId.eqz() || ! _distributionService.referralIsValid(productInfo.distributionNftId, referralId)) {
|
243
243
|
premium.distributionOwnerFeeFixAmount = premium.distributionFeeFixAmount;
|
244
244
|
premium.distributionOwnerFeeVarAmount = premium.distributionFeeVarAmount;
|
245
245
|
premium.premiumAmount = premium.fullPremiumAmount;
|
@@ -3,20 +3,23 @@ pragma solidity ^0.8.20;
|
|
3
3
|
|
4
4
|
import {Amount, AmountLib} from "../type/Amount.sol";
|
5
5
|
import {ClaimId} from "../type/ClaimId.sol";
|
6
|
-
import {
|
6
|
+
import {IComponent} from "../shared/IComponent.sol";
|
7
7
|
import {Fee, FeeLib} from "../type/Fee.sol";
|
8
8
|
import {IRisk} from "../instance/module/IRisk.sol";
|
9
9
|
import {IApplicationService} from "./IApplicationService.sol";
|
10
10
|
import {IAuthorization} from "../authorization/IAuthorization.sol";
|
11
11
|
import {IComponentService} from "../shared/IComponentService.sol";
|
12
|
+
import {InstanceLinkedComponent} from "../shared/InstanceLinkedComponent.sol";
|
13
|
+
import {IInstanceLinkedComponent} from "../shared/IInstanceLinkedComponent.sol";
|
12
14
|
import {IPolicyService} from "./IPolicyService.sol";
|
13
15
|
import {IRiskService} from "./IRiskService.sol";
|
14
16
|
import {IClaimService} from "./IClaimService.sol";
|
15
17
|
import {IPricingService} from "./IPricingService.sol";
|
16
18
|
import {IProductComponent} from "./IProductComponent.sol";
|
17
|
-
import {NftId} from "../type/NftId.sol";
|
19
|
+
import {NftId, NftIdLib} from "../type/NftId.sol";
|
20
|
+
import {ObjectType, COMPONENT, DISTRIBUTION, ORACLE, POOL, PRODUCT, BUNDLE, APPLICATION, POLICY, CLAIM, PRICE } from "../type/ObjectType.sol";
|
18
21
|
import {PayoutId} from "../type/PayoutId.sol";
|
19
|
-
import {COMPONENT, PRODUCT, APPLICATION, POLICY, CLAIM, PRICE } from "../type/ObjectType.sol";
|
22
|
+
import {COMPONENT, PRODUCT, APPLICATION, POLICY, CLAIM, PRICE, BUNDLE, RISK } from "../type/ObjectType.sol";
|
20
23
|
import {ReferralId} from "../type/Referral.sol";
|
21
24
|
import {RiskId, RiskIdLib} from "../type/RiskId.sol";
|
22
25
|
import {Seconds} from "../type/Seconds.sol";
|
@@ -25,8 +28,9 @@ import {Timestamp} from "../type/Timestamp.sol";
|
|
25
28
|
|
26
29
|
import {IPolicy} from "../instance/module/IPolicy.sol";
|
27
30
|
import {IComponents} from "../instance/module/IComponents.sol";
|
28
|
-
import {
|
29
|
-
import {
|
31
|
+
import {IDistributionComponent} from "../distribution/IDistributionComponent.sol";
|
32
|
+
import {IOracleComponent} from "../oracle/IOracleComponent.sol";
|
33
|
+
import {IPoolComponent} from "../pool/IPoolComponent.sol";
|
30
34
|
|
31
35
|
abstract contract Product is
|
32
36
|
InstanceLinkedComponent,
|
@@ -36,16 +40,37 @@ abstract contract Product is
|
|
36
40
|
bytes32 public constant PRODUCT_STORAGE_LOCATION_V1 = 0x0bb7aafdb8e380f81267337bc5b5dfdf76e6d3a380ecadb51ec665246d9d6800;
|
37
41
|
|
38
42
|
struct ProductStorage {
|
43
|
+
IComponents.ProductInfo _productInfo;
|
44
|
+
IComponentService _componentService;
|
39
45
|
IRiskService _riskService;
|
40
46
|
IApplicationService _applicationService;
|
41
47
|
IPolicyService _policyService;
|
42
48
|
IClaimService _claimService;
|
43
49
|
IPricingService _pricingService;
|
44
|
-
|
45
|
-
|
46
|
-
|
47
|
-
|
48
|
-
|
50
|
+
}
|
51
|
+
|
52
|
+
|
53
|
+
function registerComponent(address component)
|
54
|
+
external
|
55
|
+
virtual
|
56
|
+
onlyOwner()
|
57
|
+
returns (NftId componentNftId)
|
58
|
+
{
|
59
|
+
return _getProductStorage()._componentService.registerComponent(component);
|
60
|
+
}
|
61
|
+
|
62
|
+
|
63
|
+
function processFundedClaim(
|
64
|
+
NftId policyNftId,
|
65
|
+
ClaimId claimId,
|
66
|
+
Amount availableAmount
|
67
|
+
)
|
68
|
+
external
|
69
|
+
virtual
|
70
|
+
restricted() // pool service role
|
71
|
+
onlyNftOfType(policyNftId, POLICY())
|
72
|
+
{
|
73
|
+
// default implementation does nothing
|
49
74
|
}
|
50
75
|
|
51
76
|
|
@@ -60,6 +85,7 @@ abstract contract Product is
|
|
60
85
|
public
|
61
86
|
view
|
62
87
|
override
|
88
|
+
onlyNftOfType(bundleNftId, BUNDLE())
|
63
89
|
returns (Amount premiumAmount)
|
64
90
|
{
|
65
91
|
IPolicy.PremiumInfo memory premium = _getProductStorage()._pricingService.calculatePremium(
|
@@ -91,58 +117,24 @@ abstract contract Product is
|
|
91
117
|
}
|
92
118
|
|
93
119
|
|
94
|
-
function register()
|
95
|
-
external
|
96
|
-
virtual
|
97
|
-
onlyOwner()
|
98
|
-
{
|
99
|
-
_getProductStorage()._componentService.registerProduct();
|
100
|
-
_approveTokenHandler(type(uint256).max);
|
101
|
-
}
|
102
|
-
|
103
|
-
|
104
120
|
function getInitialProductInfo()
|
105
121
|
public
|
106
122
|
virtual
|
107
123
|
view
|
108
124
|
returns (IComponents.ProductInfo memory poolInfo)
|
109
125
|
{
|
110
|
-
|
111
|
-
|
112
|
-
return IComponents.ProductInfo({
|
113
|
-
distributionNftId: $._distributionNftId,
|
114
|
-
poolNftId: $._poolNftId,
|
115
|
-
isProcessingFundedClaims: false,
|
116
|
-
productFee: FeeLib.zero(),
|
117
|
-
processingFee: FeeLib.zero(),
|
118
|
-
distributionFee: FeeLib.zero(),
|
119
|
-
minDistributionOwnerFee: FeeLib.zero(),
|
120
|
-
poolFee: FeeLib.zero(),
|
121
|
-
stakingFee: FeeLib.zero(),
|
122
|
-
performanceFee: FeeLib.zero()
|
123
|
-
});
|
124
|
-
}
|
125
|
-
|
126
|
-
function getPoolNftId() external view override returns (NftId poolNftId) {
|
127
|
-
return getRegistry().getNftIdForAddress(address(_getProductStorage()._pool));
|
126
|
+
return _getProductStorage()._productInfo;
|
128
127
|
}
|
129
128
|
|
130
|
-
function getDistributionNftId() external view override returns (NftId distributionNftId) {
|
131
|
-
return getRegistry().getNftIdForAddress(address(_getProductStorage()._distribution));
|
132
|
-
}
|
133
129
|
|
134
130
|
function _initializeProduct(
|
135
131
|
address registry,
|
136
132
|
NftId instanceNftId,
|
137
|
-
IAuthorization authorization,
|
138
|
-
address initialOwner,
|
139
133
|
string memory name,
|
140
134
|
address token,
|
141
|
-
|
142
|
-
|
143
|
-
address
|
144
|
-
// add NftId [] oracleNftIds (#527)
|
145
|
-
bytes memory registryData, // writeonly data that will saved in the object info record of the registry
|
135
|
+
IComponents.ProductInfo memory productInfo,
|
136
|
+
IAuthorization authorization,
|
137
|
+
address initialOwner,
|
146
138
|
bytes memory componentData // writeonly data that will saved in the object info record of the registry
|
147
139
|
)
|
148
140
|
internal
|
@@ -156,24 +148,18 @@ abstract contract Product is
|
|
156
148
|
token,
|
157
149
|
PRODUCT(),
|
158
150
|
authorization,
|
159
|
-
|
151
|
+
productInfo.isInterceptingPolicyTransfers,
|
160
152
|
initialOwner,
|
161
|
-
registryData,
|
162
153
|
componentData);
|
163
154
|
|
164
155
|
ProductStorage storage $ = _getProductStorage();
|
165
|
-
|
166
|
-
|
167
|
-
$._riskService = IRiskService(_getServiceAddress(PRODUCT()));
|
156
|
+
$._productInfo = productInfo;
|
157
|
+
$._riskService = IRiskService(_getServiceAddress(RISK()));
|
168
158
|
$._applicationService = IApplicationService(_getServiceAddress(APPLICATION()));
|
169
159
|
$._policyService = IPolicyService(_getServiceAddress(POLICY()));
|
170
160
|
$._claimService = IClaimService(_getServiceAddress(CLAIM()));
|
171
161
|
$._pricingService = IPricingService(_getServiceAddress(PRICE()));
|
172
162
|
$._componentService = IComponentService(_getServiceAddress(COMPONENT()));
|
173
|
-
$._pool = Pool(pool);
|
174
|
-
$._distribution = Distribution(distribution);
|
175
|
-
$._poolNftId = getRegistry().getNftIdForAddress(pool);
|
176
|
-
$._distributionNftId = getRegistry().getNftIdForAddress(distribution);
|
177
163
|
|
178
164
|
_registerInterface(type(IProductComponent).interfaceId);
|
179
165
|
}
|
@@ -193,8 +179,11 @@ abstract contract Product is
|
|
193
179
|
function _createRisk(
|
194
180
|
RiskId id,
|
195
181
|
bytes memory data
|
196
|
-
)
|
197
|
-
|
182
|
+
)
|
183
|
+
internal
|
184
|
+
virtual
|
185
|
+
{
|
186
|
+
_getProductStorage()._riskService.createRisk(
|
198
187
|
id,
|
199
188
|
data
|
200
189
|
);
|
@@ -203,8 +192,11 @@ abstract contract Product is
|
|
203
192
|
function _updateRisk(
|
204
193
|
RiskId id,
|
205
194
|
bytes memory data
|
206
|
-
)
|
207
|
-
|
195
|
+
)
|
196
|
+
internal
|
197
|
+
virtual
|
198
|
+
{
|
199
|
+
_getProductStorage()._riskService.updateRisk(
|
208
200
|
id,
|
209
201
|
data
|
210
202
|
);
|
@@ -213,19 +205,17 @@ abstract contract Product is
|
|
213
205
|
function _updateRiskState(
|
214
206
|
RiskId id,
|
215
207
|
StateId state
|
216
|
-
)
|
217
|
-
|
208
|
+
)
|
209
|
+
internal
|
210
|
+
virtual
|
211
|
+
{
|
212
|
+
_getProductStorage()._riskService.updateRiskState(
|
218
213
|
id,
|
219
214
|
state
|
220
215
|
);
|
221
216
|
}
|
222
217
|
|
223
218
|
|
224
|
-
function _getRiskInfo(RiskId id) internal view returns (IRisk.RiskInfo memory info) {
|
225
|
-
return getInstance().getInstanceReader().getRiskInfo(id);
|
226
|
-
}
|
227
|
-
|
228
|
-
|
229
219
|
function _createApplication(
|
230
220
|
address applicationOwner,
|
231
221
|
RiskId riskId,
|
@@ -237,6 +227,7 @@ abstract contract Product is
|
|
237
227
|
bytes memory applicationData
|
238
228
|
)
|
239
229
|
internal
|
230
|
+
virtual
|
240
231
|
returns (NftId applicationNftId)
|
241
232
|
{
|
242
233
|
return _getProductStorage()._applicationService.create(
|
@@ -256,8 +247,10 @@ abstract contract Product is
|
|
256
247
|
Timestamp activateAt
|
257
248
|
)
|
258
249
|
internal
|
250
|
+
virtual
|
251
|
+
returns (Amount premiumAmount)
|
259
252
|
{
|
260
|
-
_getProductStorage()._policyService.createPolicy(
|
253
|
+
premiumAmount = _getProductStorage()._policyService.createPolicy(
|
261
254
|
applicationNftId,
|
262
255
|
activateAt);
|
263
256
|
}
|
@@ -266,6 +259,7 @@ abstract contract Product is
|
|
266
259
|
NftId policyNftId
|
267
260
|
)
|
268
261
|
internal
|
262
|
+
virtual
|
269
263
|
{
|
270
264
|
_getProductStorage()._policyService.decline(
|
271
265
|
policyNftId);
|
@@ -276,6 +270,7 @@ abstract contract Product is
|
|
276
270
|
Timestamp expireAt
|
277
271
|
)
|
278
272
|
internal
|
273
|
+
virtual
|
279
274
|
returns (Timestamp expiredAt)
|
280
275
|
{
|
281
276
|
expiredAt = _getProductStorage()._policyService.expire(policyNftId, expireAt);
|
@@ -286,6 +281,7 @@ abstract contract Product is
|
|
286
281
|
Timestamp activateAt
|
287
282
|
)
|
288
283
|
internal
|
284
|
+
virtual
|
289
285
|
{
|
290
286
|
_getProductStorage()._policyService.collectPremium(
|
291
287
|
policyNftId,
|
@@ -297,6 +293,7 @@ abstract contract Product is
|
|
297
293
|
Timestamp activateAt
|
298
294
|
)
|
299
295
|
internal
|
296
|
+
virtual
|
300
297
|
{
|
301
298
|
_getProductStorage()._policyService.activate(
|
302
299
|
policyNftId,
|
@@ -307,6 +304,7 @@ abstract contract Product is
|
|
307
304
|
NftId policyNftId
|
308
305
|
)
|
309
306
|
internal
|
307
|
+
virtual
|
310
308
|
{
|
311
309
|
_getProductStorage()._policyService.close(
|
312
310
|
policyNftId);
|
@@ -318,6 +316,7 @@ abstract contract Product is
|
|
318
316
|
bytes memory claimData
|
319
317
|
)
|
320
318
|
internal
|
319
|
+
virtual
|
321
320
|
returns(ClaimId)
|
322
321
|
{
|
323
322
|
return _getProductStorage()._claimService.submit(
|
@@ -333,6 +332,7 @@ abstract contract Product is
|
|
333
332
|
bytes memory data
|
334
333
|
)
|
335
334
|
internal
|
335
|
+
virtual
|
336
336
|
{
|
337
337
|
_getProductStorage()._claimService.confirm(
|
338
338
|
policyNftId,
|
@@ -347,6 +347,7 @@ abstract contract Product is
|
|
347
347
|
bytes memory data
|
348
348
|
)
|
349
349
|
internal
|
350
|
+
virtual
|
350
351
|
{
|
351
352
|
_getProductStorage()._claimService.decline(
|
352
353
|
policyNftId,
|
@@ -359,6 +360,7 @@ abstract contract Product is
|
|
359
360
|
ClaimId claimId
|
360
361
|
)
|
361
362
|
internal
|
363
|
+
virtual
|
362
364
|
{
|
363
365
|
_getProductStorage()._claimService.close(
|
364
366
|
policyNftId,
|
@@ -372,6 +374,7 @@ abstract contract Product is
|
|
372
374
|
bytes memory data
|
373
375
|
)
|
374
376
|
internal
|
377
|
+
virtual
|
375
378
|
returns (PayoutId)
|
376
379
|
{
|
377
380
|
return _getProductStorage()._claimService.createPayout(
|
@@ -389,6 +392,7 @@ abstract contract Product is
|
|
389
392
|
bytes memory data
|
390
393
|
)
|
391
394
|
internal
|
395
|
+
virtual
|
392
396
|
returns (PayoutId)
|
393
397
|
{
|
394
398
|
return _getProductStorage()._claimService.createPayoutForBeneficiary(
|
@@ -404,23 +408,20 @@ abstract contract Product is
|
|
404
408
|
PayoutId payoutId
|
405
409
|
)
|
406
410
|
internal
|
411
|
+
virtual
|
407
412
|
{
|
408
413
|
_getProductStorage()._claimService.processPayout(
|
409
414
|
policyNftId,
|
410
415
|
payoutId);
|
411
416
|
}
|
412
417
|
|
413
|
-
function _toRiskId(string memory riskName) internal pure returns (RiskId riskId) {
|
418
|
+
function _toRiskId(string memory riskName) internal virtual pure returns (RiskId riskId) {
|
414
419
|
return RiskIdLib.toRiskId(riskName);
|
415
420
|
}
|
416
421
|
|
417
|
-
function _getProductStorage()
|
422
|
+
function _getProductStorage() internal virtual pure returns (ProductStorage storage $) {
|
418
423
|
assembly {
|
419
424
|
$.slot := PRODUCT_STORAGE_LOCATION_V1
|
420
425
|
}
|
421
426
|
}
|
422
|
-
|
423
|
-
function _getRiskService() internal view returns (IRiskService) {
|
424
|
-
return _getProductStorage()._riskService;
|
425
|
-
}
|
426
427
|
}
|
@@ -9,11 +9,12 @@ import {IRegistryService} from "../registry/IRegistryService.sol";
|
|
9
9
|
import {IRisk} from "../instance/module/IRisk.sol";
|
10
10
|
|
11
11
|
import {InstanceReader} from "../instance/InstanceReader.sol";
|
12
|
-
import {ObjectType, INSTANCE, PRODUCT, POOL, POLICY, REGISTRY} from "../type/ObjectType.sol";
|
13
|
-
import {KEEP_STATE} from "../type/StateId.sol";
|
12
|
+
import {ObjectType, INSTANCE, PRODUCT, POOL, POLICY, REGISTRY, RISK} from "../type/ObjectType.sol";
|
13
|
+
import {ACTIVE, PAUSED, KEEP_STATE} from "../type/StateId.sol";
|
14
14
|
import {NftId} from "../type/NftId.sol";
|
15
15
|
import {RiskId} from "../type/RiskId.sol";
|
16
16
|
import {StateId} from "../type/StateId.sol";
|
17
|
+
import {RiskSet} from "../instance/RiskSet.sol";
|
17
18
|
import {ComponentVerifyingService} from "../shared/ComponentVerifyingService.sol";
|
18
19
|
|
19
20
|
contract RiskService is
|
@@ -61,6 +62,10 @@ contract RiskService is
|
|
61
62
|
riskId,
|
62
63
|
riskInfo
|
63
64
|
);
|
65
|
+
|
66
|
+
// add risk to RiskSet
|
67
|
+
RiskSet riskSet = instance.getRiskSet();
|
68
|
+
riskSet.add(riskId);
|
64
69
|
}
|
65
70
|
|
66
71
|
|
@@ -87,10 +92,16 @@ contract RiskService is
|
|
87
92
|
{
|
88
93
|
(,, IInstance instance) = _getAndVerifyActiveComponent(PRODUCT());
|
89
94
|
instance.getInstanceStore().updateRiskState(riskId, state);
|
95
|
+
|
96
|
+
if (state == ACTIVE()) {
|
97
|
+
instance.getRiskSet().activate(riskId);
|
98
|
+
} else if (state == PAUSED()) {
|
99
|
+
instance.getRiskSet().pause(riskId);
|
100
|
+
}
|
90
101
|
}
|
91
102
|
|
92
103
|
|
93
104
|
function _getDomain() internal pure override returns(ObjectType) {
|
94
|
-
return
|
105
|
+
return RISK();
|
95
106
|
}
|
96
107
|
}
|
@@ -104,10 +104,6 @@ contract ChainNft is ERC721Enumerable {
|
|
104
104
|
}
|
105
105
|
|
106
106
|
_safeMintWithInterceptorAddress(to, tokenId, interceptor);
|
107
|
-
|
108
|
-
if(interceptor != address(0)) {
|
109
|
-
ITransferInterceptor(interceptor).nftMint(to, tokenId);
|
110
|
-
}
|
111
107
|
}
|
112
108
|
|
113
109
|
|
@@ -115,11 +111,12 @@ contract ChainNft is ERC721Enumerable {
|
|
115
111
|
* @dev amend the open zeppelin transferFrom function by an interceptor call if such an interceptor is defined for the nft token id
|
116
112
|
* this allows distribution, product and pool components to be notified when distributors, policies and bundles are transferred.
|
117
113
|
*/
|
118
|
-
function transferFrom(address from, address to, uint256 tokenId) public override (
|
114
|
+
function transferFrom(address from, address to, uint256 tokenId) public override (IERC721, ERC721) {
|
119
115
|
super.transferFrom(from, to, tokenId);
|
120
116
|
|
121
117
|
if (_interceptor[tokenId] != address(0)) {
|
122
|
-
|
118
|
+
address operator = msg.sender;
|
119
|
+
ITransferInterceptor(_interceptor[tokenId]).nftTransferFrom(from, to, tokenId, operator);
|
123
120
|
}
|
124
121
|
}
|
125
122
|
|
@@ -241,10 +238,10 @@ contract ChainNft is ERC721Enumerable {
|
|
241
238
|
address interceptor
|
242
239
|
)
|
243
240
|
private
|
244
|
-
{
|
245
|
-
emit LogTokenInterceptorAddress(tokenId, interceptor);
|
246
|
-
|
241
|
+
{
|
247
242
|
_totalMinted++;
|
248
243
|
_safeMint(to, tokenId);
|
244
|
+
|
245
|
+
emit LogTokenInterceptorAddress(tokenId, interceptor);
|
249
246
|
}
|
250
247
|
}
|
@@ -65,9 +65,6 @@ interface IRegistry is IERC165 {
|
|
65
65
|
StateId state;
|
66
66
|
VersionPart version;
|
67
67
|
bytes32 salt;
|
68
|
-
address[] addresses;
|
69
|
-
string[] names;
|
70
|
-
ObjectType[] domains;
|
71
68
|
IServiceAuthorization auth;
|
72
69
|
Timestamp activatedAt;
|
73
70
|
Timestamp disabledAt;
|
@@ -124,10 +121,18 @@ interface IRegistry is IERC165 {
|
|
124
121
|
|
125
122
|
function ownerOf(NftId nftId) external view returns (address);
|
126
123
|
|
124
|
+
function isOwnerOf(NftId nftId, address expectedOwner) external view returns (bool);
|
125
|
+
|
127
126
|
function ownerOf(address contractAddress) external view returns (address);
|
128
127
|
|
129
128
|
function getObjectInfo(NftId nftId) external view returns (ObjectInfo memory info);
|
130
129
|
|
130
|
+
function isObjectType(NftId nftId, ObjectType expectedObjectType) external view returns (bool);
|
131
|
+
|
132
|
+
function isObjectType(address contractAddress, ObjectType expectedObjectType) external view returns (bool);
|
133
|
+
|
134
|
+
function getObjectAddress(NftId nftId) external view returns (address objectAddress);
|
135
|
+
|
131
136
|
/// @dev Returns the object info for the specified object address.
|
132
137
|
// MUST not be used with chain registry address (resides on different chan id)
|
133
138
|
function getObjectInfo(address object) external view returns (ObjectInfo memory info);
|
@@ -21,10 +21,9 @@ interface IRegistryService is
|
|
21
21
|
|
22
22
|
error ErrorRegistryServiceNotService(address notService);
|
23
23
|
error ErrorRegistryServiceNotInstance(address notInstance);
|
24
|
-
error ErrorRegistryServiceNotComponent(address notComponent);
|
25
24
|
error ErrorRegistryServiceNotProduct(address notProduct);
|
26
|
-
error
|
27
|
-
error
|
25
|
+
error ErrorRegistryServiceNotComponent(address notComponent);
|
26
|
+
error ErrorRegistryServiceNotProductLinkedComponent(address notProductLinkedComponent);
|
28
27
|
|
29
28
|
error ErrorRegistryServiceRegisterableAddressInvalid(IRegisterable registerable, address found);
|
30
29
|
error ErrorRegistryServiceRegisterableTypeInvalid(IRegisterable registerable, ObjectType expected, ObjectType found);
|
@@ -47,17 +46,11 @@ interface IRegistryService is
|
|
47
46
|
function registerInstance(IRegisterable instance, address owner)
|
48
47
|
external returns(IRegistry.ObjectInfo memory info);
|
49
48
|
|
50
|
-
function
|
49
|
+
function registerProduct(IComponent product, address owner)
|
51
50
|
external returns(IRegistry.ObjectInfo memory info);
|
52
51
|
|
53
|
-
|
54
|
-
|
55
|
-
|
56
|
-
// function registerPool(IComponent pool, address owner)
|
57
|
-
// external returns(IRegistry.ObjectInfo memory info);
|
58
|
-
|
59
|
-
// function registerDistribution(IComponent distribution, address owner)
|
60
|
-
// external returns(IRegistry.ObjectInfo memory info);
|
52
|
+
function registerProductLinkedComponent(IComponent component, ObjectType objectType, address owner)
|
53
|
+
external returns(IRegistry.ObjectInfo memory info);
|
61
54
|
|
62
55
|
function registerDistributor(IRegistry.ObjectInfo memory info) external returns(NftId nftId);
|
63
56
|
|
@@ -2,6 +2,5 @@
|
|
2
2
|
pragma solidity ^0.8.20;
|
3
3
|
|
4
4
|
interface ITransferInterceptor {
|
5
|
-
function
|
6
|
-
function nftTransferFrom(address from, address to, uint256 tokenId) external;
|
5
|
+
function nftTransferFrom(address from, address to, uint256 tokenId, address operator) external;
|
7
6
|
}
|
@@ -13,6 +13,7 @@ import {ObjectType, ObjectTypeLib, PROTOCOL, REGISTRY, SERVICE, INSTANCE, STAKE,
|
|
13
13
|
import {ChainNft} from "./ChainNft.sol";
|
14
14
|
import {IRegistry} from "./IRegistry.sol";
|
15
15
|
import {IRegisterable} from "../shared/IRegisterable.sol";
|
16
|
+
import {IStaking} from "../staking/IStaking.sol";
|
16
17
|
import {ReleaseRegistry} from "./ReleaseRegistry.sol";
|
17
18
|
import {TokenRegistry} from "./TokenRegistry.sol";
|
18
19
|
import {RegistryAdmin} from "./RegistryAdmin.sol";
|
@@ -243,6 +244,9 @@ contract Registry is
|
|
243
244
|
{
|
244
245
|
address objectAddress = info.objectAddress;
|
245
246
|
ObjectType objectType = info.objectType;
|
247
|
+
|
248
|
+
// this indidirectly enforces that the parent is registered
|
249
|
+
// parentType would be zero for a non-registered parent which is never a valid type combination
|
246
250
|
ObjectType parentType = _info[info.parentNftId].objectType;
|
247
251
|
|
248
252
|
// check type combinations for core objects
|
@@ -339,6 +343,10 @@ contract Registry is
|
|
339
343
|
return CHAIN_NFT.ownerOf(nftId.toInt());
|
340
344
|
}
|
341
345
|
|
346
|
+
function isOwnerOf(NftId nftId, address expectedOwner) public view returns (bool) {
|
347
|
+
return CHAIN_NFT.ownerOf(nftId.toInt()) == expectedOwner;
|
348
|
+
}
|
349
|
+
|
342
350
|
function ownerOf(address contractAddress) public view returns (address) {
|
343
351
|
return CHAIN_NFT.ownerOf(_nftIdByAddress[contractAddress].toInt());
|
344
352
|
}
|
@@ -347,6 +355,19 @@ contract Registry is
|
|
347
355
|
return _info[nftId];
|
348
356
|
}
|
349
357
|
|
358
|
+
function isObjectType(address contractAddress, ObjectType expectedObjectType) external view returns (bool) {
|
359
|
+
NftId nftId = _nftIdByAddress[contractAddress];
|
360
|
+
return isObjectType(nftId, expectedObjectType);
|
361
|
+
}
|
362
|
+
|
363
|
+
function isObjectType(NftId nftId, ObjectType expectedObjectType) public view returns (bool) {
|
364
|
+
return _info[nftId].objectType == expectedObjectType;
|
365
|
+
}
|
366
|
+
|
367
|
+
function getObjectAddress(NftId nftId) external view returns (address) {
|
368
|
+
return _info[nftId].objectAddress;
|
369
|
+
}
|
370
|
+
|
350
371
|
function getObjectInfo(address object) external view returns (ObjectInfo memory) {
|
351
372
|
return _info[_nftIdByAddress[object]];
|
352
373
|
}
|
@@ -374,8 +395,6 @@ contract Registry is
|
|
374
395
|
}
|
375
396
|
|
376
397
|
function getStakingAddress() external view returns (address staking) {
|
377
|
-
//return getObjectInfo(_stakingNftId).objectAddress;
|
378
|
-
//return _info[_stakingNftId].objectAddress;
|
379
398
|
return _stakingAddress;
|
380
399
|
}
|
381
400
|
|
@@ -622,6 +641,8 @@ contract Registry is
|
|
622
641
|
initialOwner: stakingOwner,
|
623
642
|
data: ""}),
|
624
643
|
true);
|
644
|
+
|
645
|
+
IStaking(_stakingAddress).initializeTokenHandler();
|
625
646
|
}
|
626
647
|
|
627
648
|
/// @dev Register the provided object info for the specified NFT ID.
|
@@ -686,13 +707,15 @@ contract Registry is
|
|
686
707
|
|
687
708
|
// components with instance parent
|
688
709
|
_coreContractCombinations[PRODUCT()][INSTANCE()] = true;
|
689
|
-
|
690
|
-
|
691
|
-
_coreContractCombinations[
|
710
|
+
|
711
|
+
// components with product parent
|
712
|
+
_coreContractCombinations[DISTRIBUTION()][PRODUCT()] = true;
|
713
|
+
_coreContractCombinations[ORACLE()][PRODUCT()] = true;
|
714
|
+
_coreContractCombinations[POOL()][PRODUCT()] = true;
|
692
715
|
|
693
716
|
// objects with component parents
|
694
|
-
_coreObjectCombinations[DISTRIBUTOR()][DISTRIBUTION()] = true;
|
695
717
|
_coreObjectCombinations[POLICY()][PRODUCT()] = true;
|
718
|
+
_coreObjectCombinations[DISTRIBUTOR()][DISTRIBUTION()] = true;
|
696
719
|
_coreObjectCombinations[BUNDLE()][POOL()] = true;
|
697
720
|
|
698
721
|
// staking
|