@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
@@ -1,11 +1,14 @@
|
|
1
1
|
// SPDX-License-Identifier: Apache-2.0
|
2
2
|
pragma solidity ^0.8.20;
|
3
3
|
|
4
|
+
import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
|
5
|
+
|
4
6
|
import {Amount, AmountLib} from "../../type/Amount.sol";
|
5
7
|
import {BasicPool} from "../../pool/BasicPool.sol";
|
6
8
|
import {BasicPoolAuthorization} from "../../pool/BasicPoolAuthorization.sol";
|
7
9
|
import {Fee} from "../../type/Fee.sol";
|
8
10
|
import {IAuthorization} from "../../authorization/IAuthorization.sol";
|
11
|
+
import {IComponents} from "../../instance/module/IComponents.sol";
|
9
12
|
import {NftId} from "../../type/NftId.sol";
|
10
13
|
import {Seconds} from "../../type/Timestamp.sol";
|
11
14
|
import {UFixed} from "../../type/UFixed.sol";
|
@@ -16,25 +19,29 @@ contract SimplePool is
|
|
16
19
|
|
17
20
|
constructor(
|
18
21
|
address registry,
|
19
|
-
NftId
|
22
|
+
NftId productNftId,
|
20
23
|
address token,
|
24
|
+
IComponents.PoolInfo memory poolInfo,
|
21
25
|
IAuthorization authorization,
|
22
26
|
address initialOwner
|
23
27
|
)
|
24
28
|
{
|
25
29
|
initialize(
|
26
30
|
registry,
|
27
|
-
|
31
|
+
productNftId,
|
28
32
|
token,
|
33
|
+
poolInfo,
|
29
34
|
authorization,
|
30
35
|
initialOwner
|
31
36
|
);
|
32
37
|
}
|
33
38
|
|
39
|
+
|
34
40
|
function initialize(
|
35
41
|
address registry,
|
36
|
-
NftId
|
42
|
+
NftId productNftId,
|
37
43
|
address token,
|
44
|
+
IComponents.PoolInfo memory poolInfo,
|
38
45
|
IAuthorization authorization,
|
39
46
|
address initialOwner
|
40
47
|
)
|
@@ -44,13 +51,15 @@ contract SimplePool is
|
|
44
51
|
{
|
45
52
|
_initializeBasicPool(
|
46
53
|
registry,
|
47
|
-
|
48
|
-
authorization,
|
49
|
-
token,
|
54
|
+
productNftId,
|
50
55
|
"SimplePool",
|
56
|
+
token,
|
57
|
+
poolInfo,
|
58
|
+
authorization,
|
51
59
|
initialOwner);
|
52
60
|
}
|
53
61
|
|
62
|
+
|
54
63
|
function createBundle(
|
55
64
|
Fee memory fee,
|
56
65
|
uint256 initialAmount,
|
@@ -73,4 +82,26 @@ contract SimplePool is
|
|
73
82
|
netStakedAmountInt = netStakedAmount.toInt();
|
74
83
|
}
|
75
84
|
|
85
|
+
|
86
|
+
function fundPoolWallet(
|
87
|
+
Amount amount
|
88
|
+
)
|
89
|
+
external
|
90
|
+
{
|
91
|
+
_fundPoolWallet(amount);
|
92
|
+
}
|
93
|
+
|
94
|
+
|
95
|
+
function defundPoolWallet(
|
96
|
+
Amount amount
|
97
|
+
)
|
98
|
+
external
|
99
|
+
{
|
100
|
+
_defundPoolWallet(amount);
|
101
|
+
}
|
102
|
+
|
103
|
+
|
104
|
+
function approveTokenHandler(IERC20Metadata token, Amount amount) external restricted() onlyOwner() { _approveTokenHandler(token, amount); }
|
105
|
+
function setLocked(bool locked) external onlyOwner() { _setLocked(locked); }
|
106
|
+
function setWallet(address newWallet) external restricted() onlyOwner() { _setWallet(newWallet); }
|
76
107
|
}
|
@@ -0,0 +1,28 @@
|
|
1
|
+
// SPDX-License-Identifier: Apache-2.0
|
2
|
+
pragma solidity ^0.8.20;
|
3
|
+
|
4
|
+
import {BasicPoolAuthorization} from "../../pool/BasicPoolAuthorization.sol";
|
5
|
+
import {IAccess} from "../../authorization/IAccess.sol";
|
6
|
+
import {PUBLIC_ROLE} from "../../type/RoleId.sol";
|
7
|
+
import {SimplePool} from "./SimplePool.sol";
|
8
|
+
|
9
|
+
contract SimplePoolAuthorization
|
10
|
+
is BasicPoolAuthorization
|
11
|
+
{
|
12
|
+
constructor(string memory poolName)
|
13
|
+
BasicPoolAuthorization(poolName)
|
14
|
+
{}
|
15
|
+
|
16
|
+
function _setupTargetAuthorizations()
|
17
|
+
internal
|
18
|
+
virtual override
|
19
|
+
{
|
20
|
+
super._setupTargetAuthorizations();
|
21
|
+
|
22
|
+
// authorize public role (open access to any account, only allows to lock target)
|
23
|
+
IAccess.FunctionInfo[] storage functions;
|
24
|
+
functions = _authorizeForTarget(getTargetName(), PUBLIC_ROLE());
|
25
|
+
_authorize(functions, SimplePool.approveTokenHandler.selector, "approveTokenHandler");
|
26
|
+
_authorize(functions, SimplePool.setWallet.selector, "setWallet");
|
27
|
+
}
|
28
|
+
}
|
@@ -1,10 +1,13 @@
|
|
1
1
|
// SPDX-License-Identifier: Apache-2.0
|
2
2
|
pragma solidity ^0.8.20;
|
3
3
|
|
4
|
+
import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
|
5
|
+
|
4
6
|
import {Amount, AmountLib} from "../../type/Amount.sol";
|
5
7
|
import {BasicProduct} from "../../product/BasicProduct.sol";
|
6
8
|
import {ClaimId} from "../../type/ClaimId.sol";
|
7
9
|
import {IAuthorization} from "../../authorization/IAuthorization.sol";
|
10
|
+
import {IComponents} from "../../instance/module/IComponents.sol";
|
8
11
|
import {IOracleService} from "../../oracle/IOracleService.sol";
|
9
12
|
import {ORACLE} from "../../type/ObjectType.sol";
|
10
13
|
import {NftId} from "../../type/NftId.sol";
|
@@ -32,38 +35,33 @@ contract SimpleProduct is
|
|
32
35
|
|
33
36
|
constructor(
|
34
37
|
address registry,
|
35
|
-
NftId
|
36
|
-
|
37
|
-
address initialOwner,
|
38
|
+
NftId instanceNftId,
|
39
|
+
string memory name,
|
38
40
|
address token,
|
39
|
-
|
40
|
-
|
41
|
-
address
|
41
|
+
IComponents.ProductInfo memory productInfo,
|
42
|
+
IAuthorization authorization,
|
43
|
+
address initialOwner
|
42
44
|
)
|
43
45
|
{
|
44
46
|
initialize(
|
45
47
|
registry,
|
46
|
-
|
47
|
-
|
48
|
-
initialOwner,
|
49
|
-
"SimpleProduct",
|
48
|
+
instanceNftId,
|
49
|
+
name,
|
50
50
|
token,
|
51
|
-
|
52
|
-
|
53
|
-
|
51
|
+
productInfo,
|
52
|
+
authorization,
|
53
|
+
initialOwner);
|
54
54
|
}
|
55
55
|
|
56
56
|
|
57
57
|
function initialize(
|
58
58
|
address registry,
|
59
59
|
NftId instanceNftid,
|
60
|
-
IAuthorization authorization,
|
61
|
-
address initialOwner,
|
62
60
|
string memory name,
|
63
61
|
address token,
|
64
|
-
|
65
|
-
|
66
|
-
address
|
62
|
+
IComponents.ProductInfo memory productInfo,
|
63
|
+
IAuthorization authorization,
|
64
|
+
address initialOwner
|
67
65
|
)
|
68
66
|
public
|
69
67
|
virtual
|
@@ -72,17 +70,16 @@ contract SimpleProduct is
|
|
72
70
|
_initializeBasicProduct(
|
73
71
|
registry,
|
74
72
|
instanceNftid,
|
75
|
-
authorization,
|
76
|
-
initialOwner,
|
77
73
|
name,
|
78
74
|
token,
|
79
|
-
|
80
|
-
|
81
|
-
|
75
|
+
productInfo,
|
76
|
+
authorization,
|
77
|
+
initialOwner);
|
82
78
|
|
83
79
|
_oracleService = IOracleService(_getServiceAddress(ORACLE()));
|
84
80
|
}
|
85
81
|
|
82
|
+
|
86
83
|
function createRisk(
|
87
84
|
RiskId id,
|
88
85
|
bytes memory data
|
@@ -348,4 +345,8 @@ contract SimpleProduct is
|
|
348
345
|
function getOracleService() public view returns (IOracleService) {
|
349
346
|
return _oracleService;
|
350
347
|
}
|
348
|
+
|
349
|
+
function approveTokenHandler(IERC20Metadata token, Amount amount) external restricted() onlyOwner() { _approveTokenHandler(token, amount); }
|
350
|
+
function setLocked(bool locked) external onlyOwner() { _setLocked(locked); }
|
351
|
+
function setWallet(address newWallet) external restricted() onlyOwner() { _setWallet(newWallet); }
|
351
352
|
}
|
@@ -0,0 +1,28 @@
|
|
1
|
+
// SPDX-License-Identifier: Apache-2.0
|
2
|
+
pragma solidity ^0.8.20;
|
3
|
+
|
4
|
+
import {BasicProductAuthorization} from "../../product/BasicProductAuthorization.sol";
|
5
|
+
import {IAccess} from "../../authorization/IAccess.sol";
|
6
|
+
import {PUBLIC_ROLE} from "../../type/RoleId.sol";
|
7
|
+
import {SimpleProduct} from "./SimpleProduct.sol";
|
8
|
+
|
9
|
+
contract SimpleProductAuthorization
|
10
|
+
is BasicProductAuthorization
|
11
|
+
{
|
12
|
+
constructor(string memory componentName)
|
13
|
+
BasicProductAuthorization(componentName)
|
14
|
+
{}
|
15
|
+
|
16
|
+
function _setupTargetAuthorizations()
|
17
|
+
internal
|
18
|
+
virtual override
|
19
|
+
{
|
20
|
+
super._setupTargetAuthorizations();
|
21
|
+
|
22
|
+
// authorize public role (open access to any account, only allows to lock target)
|
23
|
+
IAccess.FunctionInfo[] storage functions;
|
24
|
+
functions = _authorizeForTarget(getTargetName(), PUBLIC_ROLE());
|
25
|
+
_authorize(functions, SimpleProduct.approveTokenHandler.selector, "approveTokenHandler");
|
26
|
+
_authorize(functions, SimpleProduct.setWallet.selector, "setWallet");
|
27
|
+
}
|
28
|
+
}
|
@@ -1,20 +1,18 @@
|
|
1
1
|
// SPDX-License-Identifier: Apache-2.0
|
2
2
|
pragma solidity ^0.8.20;
|
3
3
|
|
4
|
-
import {IInstance} from "./IInstance.sol";
|
5
|
-
import {INSTANCE} from "../type/ObjectType.sol";
|
6
|
-
import {InstanceReader} from "./InstanceReader.sol";
|
7
4
|
import {IPolicy} from "../instance/module/IPolicy.sol";
|
8
|
-
import {IRegistry} from "../registry/IRegistry.sol";
|
9
5
|
import {LibNftIdSet} from "../type/NftIdSet.sol";
|
10
|
-
import {NftId} from "../type/NftId.sol";
|
11
|
-
import {
|
6
|
+
import {NftId, NftIdLib} from "../type/NftId.sol";
|
7
|
+
import {Key32} from "../type/Key32.sol";
|
8
|
+
import {BUNDLE} from "../type/ObjectType.sol";
|
12
9
|
|
13
10
|
import {ObjectSet} from "./base/ObjectSet.sol";
|
14
11
|
|
15
12
|
contract BundleSet is
|
16
13
|
ObjectSet
|
17
14
|
{
|
15
|
+
using LibNftIdSet for LibNftIdSet.Set;
|
18
16
|
|
19
17
|
event LogBundleSetPolicyLinked(NftId bundleNftId, NftId policyNftId);
|
20
18
|
event LogBundleSetPolicyUnlinked(NftId bundleNftId, NftId policyNftId);
|
@@ -34,40 +32,28 @@ contract BundleSet is
|
|
34
32
|
mapping(NftId bundleNftId => LibNftIdSet.Set policies) internal _activePolicies;
|
35
33
|
|
36
34
|
/// @dev links a policy to its bundle
|
37
|
-
|
38
|
-
function linkPolicy(NftId policyNftId) external restricted() {
|
39
|
-
NftId bundleNftId = _instance.getInstanceReader().getPolicyInfo(policyNftId).bundleNftId;
|
40
|
-
// decision will likely depend on the decision what to check here and what in the service
|
41
|
-
NftId poolNftId = _instance.getInstanceReader().getBundleInfo(bundleNftId).poolNftId;
|
35
|
+
function linkPolicy(NftId poolNftId, NftId bundleNftId, NftId policyNftId) external restricted() {
|
42
36
|
|
43
37
|
// ensure bundle is unlocked (in active set) and registered with this instance
|
44
|
-
if (!_isActive(poolNftId, bundleNftId)) {
|
38
|
+
if (!_isActive(poolNftId, _toBundleKey32(bundleNftId))) {
|
45
39
|
revert ErrorBundleSetBundleLocked(bundleNftId, policyNftId);
|
46
40
|
}
|
47
41
|
|
48
|
-
|
42
|
+
_activePolicies[bundleNftId].add(policyNftId);
|
49
43
|
emit LogBundleSetPolicyLinked(bundleNftId, policyNftId);
|
50
44
|
}
|
51
45
|
|
52
46
|
|
53
47
|
/// @dev unlinks a policy from its bundle
|
54
|
-
|
55
|
-
// - the policy MUST be past its expiry period and it MUST NOT have any open claims
|
56
|
-
// - the policy's payoutAmount MUST be equal to its sumInsuredAmount and MUST NOT have any open claims
|
57
|
-
function unlinkPolicy(NftId policyNftId) external restricted() {
|
58
|
-
IPolicy.PolicyInfo memory policyInfo = _instance.getInstanceReader().getPolicyInfo(policyNftId);
|
59
|
-
|
60
|
-
NftId bundleNftId = policyInfo.bundleNftId;
|
61
|
-
// decision will likely depend on the decision what to check here and what in the service
|
62
|
-
NftId poolNftId = _instance.getInstanceReader().getBundleInfo(bundleNftId).poolNftId;
|
48
|
+
function unlinkPolicy(NftId poolNftId, NftId bundleNftId, NftId policyNftId) external restricted() {
|
63
49
|
|
64
50
|
// ensure bundle is registered with this instance
|
65
|
-
if (!_contains(poolNftId, bundleNftId)) {
|
51
|
+
if (!_contains(poolNftId, _toBundleKey32(bundleNftId))) {
|
66
52
|
revert ErrorBundleSetBundleUnknown(bundleNftId);
|
67
53
|
}
|
68
54
|
|
69
|
-
|
70
|
-
emit LogBundleSetPolicyUnlinked(
|
55
|
+
_activePolicies[bundleNftId].remove(policyNftId);
|
56
|
+
emit LogBundleSetPolicyUnlinked(bundleNftId, policyNftId);
|
71
57
|
}
|
72
58
|
|
73
59
|
|
@@ -81,7 +67,7 @@ contract BundleSet is
|
|
81
67
|
revert ErrorBundleSetBundleNotRegistered(bundleNftId);
|
82
68
|
}
|
83
69
|
|
84
|
-
_add(poolNftId, bundleNftId);
|
70
|
+
_add(poolNftId, _toBundleKey32(bundleNftId));
|
85
71
|
emit LogBundleSetBundleAdded(poolNftId, bundleNftId);
|
86
72
|
}
|
87
73
|
|
@@ -89,38 +75,56 @@ contract BundleSet is
|
|
89
75
|
/// @dev unlocked (active) bundles are available to collateralize new policies
|
90
76
|
function unlock(NftId bundleNftId) external restricted() {
|
91
77
|
NftId poolNftId = _instance.getInstanceReader().getBundleInfo(bundleNftId).poolNftId;
|
92
|
-
_activate(poolNftId, bundleNftId);
|
78
|
+
_activate(poolNftId, _toBundleKey32(bundleNftId));
|
93
79
|
emit LogBundleSetBundleUnlocked(poolNftId, bundleNftId);
|
94
80
|
}
|
95
81
|
|
96
82
|
/// @dev locked (deactivated) bundles may not collateralize any new policies
|
97
83
|
function lock(NftId bundleNftId) external restricted() {
|
98
84
|
NftId poolNftId = _instance.getInstanceReader().getBundleInfo(bundleNftId).poolNftId;
|
99
|
-
_deactivate(poolNftId, bundleNftId);
|
85
|
+
_deactivate(poolNftId, _toBundleKey32(bundleNftId));
|
100
86
|
emit LogBundleSetBundleLocked(poolNftId, bundleNftId);
|
101
87
|
}
|
102
88
|
|
89
|
+
|
90
|
+
function checkBundle(NftId productNftId, NftId bundleId)
|
91
|
+
public
|
92
|
+
view
|
93
|
+
returns (bool exists, bool active)
|
94
|
+
{
|
95
|
+
Key32 bundleKey32 = bundleId.toKey32(BUNDLE());
|
96
|
+
exists = _contains(productNftId, bundleKey32);
|
97
|
+
|
98
|
+
if (exists) {
|
99
|
+
active = _isActive(productNftId, bundleKey32);
|
100
|
+
}
|
101
|
+
}
|
102
|
+
|
103
103
|
function bundles(NftId poolNftId) external view returns(uint256) {
|
104
104
|
return _objects(poolNftId);
|
105
105
|
}
|
106
106
|
|
107
|
-
function getBundleNftId(NftId poolNftId, uint256 idx) external view returns(NftId
|
108
|
-
return _getObject(poolNftId, idx);
|
107
|
+
function getBundleNftId(NftId poolNftId, uint256 idx) external view returns(NftId) {
|
108
|
+
return NftIdLib.toNftId(_getObject(poolNftId, idx).toKeyId());
|
109
109
|
}
|
110
110
|
|
111
111
|
function activeBundles(NftId poolNftId) external view returns(uint256) {
|
112
112
|
return _activeObjs(poolNftId);
|
113
113
|
}
|
114
114
|
|
115
|
-
function getActiveBundleNftId(NftId poolNftId, uint256 idx) external view returns(NftId
|
116
|
-
return _getActiveObject(poolNftId, idx);
|
115
|
+
function getActiveBundleNftId(NftId poolNftId, uint256 idx) external view returns(NftId) {
|
116
|
+
return NftIdLib.toNftId(_getActiveObject(poolNftId, idx).toKeyId());
|
117
117
|
}
|
118
118
|
|
119
119
|
function activePolicies(NftId bundleNftId) external view returns(uint256) {
|
120
|
-
return
|
120
|
+
return _activePolicies[bundleNftId].size();
|
121
121
|
}
|
122
122
|
|
123
123
|
function getActivePolicy(NftId bundleNftId, uint256 idx) external view returns(NftId policyNftId) {
|
124
|
-
return
|
124
|
+
return _activePolicies[bundleNftId].getElementAt(idx);
|
125
|
+
}
|
126
|
+
|
127
|
+
function _toBundleKey32(NftId nftId) private pure returns (Key32) {
|
128
|
+
return nftId.toKey32(BUNDLE());
|
125
129
|
}
|
126
130
|
}
|
@@ -5,15 +5,16 @@ import {IAccessManaged} from "@openzeppelin/contracts/access/manager/IAccessMana
|
|
5
5
|
|
6
6
|
import {Amount} from "../type/Amount.sol";
|
7
7
|
import {BundleSet} from "./BundleSet.sol";
|
8
|
+
import {RiskSet} from "./RiskSet.sol";
|
8
9
|
import {InstanceAdmin} from "./InstanceAdmin.sol";
|
9
10
|
import {InstanceReader} from "./InstanceReader.sol";
|
10
11
|
import {InstanceStore} from "./InstanceStore.sol";
|
11
12
|
import {IRegisterable} from "../shared/IRegisterable.sol";
|
12
13
|
import {ITransferInterceptor} from "../registry/ITransferInterceptor.sol";
|
14
|
+
import {NftId} from "../type/NftId.sol";
|
13
15
|
import {RoleId} from "../type/RoleId.sol";
|
14
16
|
import {Seconds} from "../type/Seconds.sol";
|
15
17
|
import {UFixed} from "../type/UFixed.sol";
|
16
|
-
import {VersionPart} from "../type/Version.sol";
|
17
18
|
|
18
19
|
|
19
20
|
interface IInstance is
|
@@ -29,6 +30,10 @@ interface IInstance is
|
|
29
30
|
error ErrorInstanceBundleSetInstanceMismatch(address instance);
|
30
31
|
error ErrorInstanceBundleSetAuthorityMismatch(address instanceAuthority);
|
31
32
|
|
33
|
+
error ErrorInstanceRiskSetAlreadySet(address instanceRiskSet);
|
34
|
+
error ErrorInstanceRiskSetInstanceMismatch(address instance);
|
35
|
+
error ErrorInstanceRiskSetAuthorityMismatch(address instanceAuthority);
|
36
|
+
|
32
37
|
error ErrorInstanceInstanceReaderInstanceMismatch(address instanceAuthority);
|
33
38
|
|
34
39
|
error ErrorInstanceInstanceStoreAlreadySet(address instanceStore);
|
@@ -38,13 +43,16 @@ interface IInstance is
|
|
38
43
|
uint64 requestsCount;
|
39
44
|
}
|
40
45
|
|
46
|
+
/// @dev Register a product with the instance.
|
47
|
+
function registerProduct(address product) external returns (NftId productNftId);
|
48
|
+
|
41
49
|
function createRole(string memory roleName, string memory adminName) external returns (RoleId roleId, RoleId admin);
|
42
50
|
function grantRole(RoleId roleId, address account) external;
|
43
51
|
function revokeRole(RoleId roleId, address account) external;
|
44
52
|
|
45
53
|
function createTarget(address target, string memory name) external;
|
46
54
|
function setTargetFunctionRole(string memory targetName, bytes4[] calldata selectors, RoleId roleId) external;
|
47
|
-
function
|
55
|
+
function setLocked(address target, bool locked) external;
|
48
56
|
|
49
57
|
function setStakingLockingPeriod(Seconds stakeLockingPeriod) external;
|
50
58
|
function setStakingRewardRate(UFixed rewardRate) external;
|
@@ -55,9 +63,9 @@ interface IInstance is
|
|
55
63
|
function withdrawStakingRewardReserves(Amount dipAmount) external returns (Amount newBalance);
|
56
64
|
|
57
65
|
// get instance release and supporting contracts
|
58
|
-
function getMajorVersion() external pure returns (VersionPart majorVersion);
|
59
66
|
function getInstanceReader() external view returns (InstanceReader);
|
60
67
|
function getBundleSet() external view returns (BundleSet);
|
68
|
+
function getRiskSet() external view returns (RiskSet);
|
61
69
|
function getInstanceAdmin() external view returns (InstanceAdmin);
|
62
70
|
function getInstanceStore() external view returns (InstanceStore);
|
63
71
|
}
|
@@ -2,13 +2,10 @@
|
|
2
2
|
pragma solidity ^0.8.20;
|
3
3
|
|
4
4
|
import {Amount} from "../type/Amount.sol";
|
5
|
-
import {
|
6
|
-
import {Instance} from "./Instance.sol";
|
7
|
-
import {IInstanceLinkedComponent} from "../shared/IInstanceLinkedComponent.sol";
|
5
|
+
import {IInstance} from "./IInstance.sol";
|
8
6
|
import {IService} from "../shared/IService.sol";
|
9
7
|
import {NftId} from "../type/NftId.sol";
|
10
8
|
import {ObjectType} from "../type/ObjectType.sol";
|
11
|
-
import {RoleId} from "../type/RoleId.sol";
|
12
9
|
import {Seconds} from "../type/Seconds.sol";
|
13
10
|
import {UFixed} from "../type/UFixed.sol";
|
14
11
|
import {VersionPart} from "../type/Version.sol";
|
@@ -25,6 +22,7 @@ interface IInstanceService is IService {
|
|
25
22
|
error ErrorInstanceServiceMasterInstanceAlreadySet();
|
26
23
|
error ErrorInstanceServiceMasterInstanceAdminAlreadySet();
|
27
24
|
error ErrorInstanceServiceMasterBundleSetAlreadySet();
|
25
|
+
error ErrorInstanceServiceMasterRiskSetAlreadySet();
|
28
26
|
error ErrorInstanceServiceInstanceAddressZero();
|
29
27
|
|
30
28
|
error ErrorInstanceServiceMasterInstanceReaderNotSet();
|
@@ -36,12 +34,15 @@ interface IInstanceService is IService {
|
|
36
34
|
error ErrorInstanceServiceInstanceAdminZero();
|
37
35
|
error ErrorInstanceServiceInstanceReaderZero();
|
38
36
|
error ErrorInstanceServiceBundleSetZero();
|
37
|
+
error ErrorInstanceServiceRiskSetZero();
|
39
38
|
error ErrorInstanceServiceInstanceStoreZero();
|
40
39
|
|
41
40
|
error ErrorInstanceServiceInstanceAuthorityMismatch();
|
42
41
|
error ErrorInstanceServiceBundleSetAuthorityMismatch();
|
42
|
+
error ErrorInstanceServiceRiskSetAuthorityMismatch();
|
43
43
|
error ErrorInstanceServiceInstanceReaderInstanceMismatch2();
|
44
|
-
error
|
44
|
+
error ErrorInstanceServiceBundleSetInstanceMismatch();
|
45
|
+
error ErrorInstanceServiceRiskSetInstanceMismatch();
|
45
46
|
error ErrorInstanceServiceInstanceStoreAuthorityMismatch();
|
46
47
|
|
47
48
|
error ErrorInstanceServiceRequestUnauhorized(address caller);
|
@@ -55,8 +56,7 @@ interface IInstanceService is IService {
|
|
55
56
|
function createInstance()
|
56
57
|
external
|
57
58
|
returns (
|
58
|
-
|
59
|
-
Instance clonedInstance,
|
59
|
+
IInstance instance,
|
60
60
|
NftId instanceNftId
|
61
61
|
);
|
62
62
|
|
@@ -67,26 +67,4 @@ interface IInstanceService is IService {
|
|
67
67
|
|
68
68
|
/// @dev Defunds the staking reward reserves for the specified target.
|
69
69
|
function withdrawStakingRewardReserves(Amount dipAmount) external returns (Amount newBalance);
|
70
|
-
|
71
|
-
/// @dev Sets up the component authorization for the specified instance.
|
72
|
-
/// The authorization is based on the authz specification provided by the component via getAuthorization.
|
73
|
-
function initializeAuthorization(NftId instanceNftId, IInstanceLinkedComponent component) external;
|
74
|
-
|
75
|
-
function createComponentTarget(
|
76
|
-
NftId instanceNftId,
|
77
|
-
address targetAddress,
|
78
|
-
string memory targetName,
|
79
|
-
bytes4[][] memory selectors,
|
80
|
-
RoleId[] memory roles
|
81
|
-
) external;
|
82
|
-
|
83
|
-
function createGifTarget(
|
84
|
-
NftId instanceNftId,
|
85
|
-
address targetAddress,
|
86
|
-
string memory targetName,
|
87
|
-
bytes4[][] memory selectors,
|
88
|
-
RoleId[] memory roles
|
89
|
-
) external;
|
90
|
-
|
91
|
-
function setComponentLocked(bool locked) external;
|
92
70
|
}
|
@@ -5,32 +5,34 @@ import {AccessManagedUpgradeable} from "@openzeppelin/contracts-upgradeable/acce
|
|
5
5
|
|
6
6
|
import {Amount} from "../type/Amount.sol";
|
7
7
|
import {BundleSet} from "./BundleSet.sol";
|
8
|
+
import {RiskSet} from "./RiskSet.sol";
|
9
|
+
import {COMPONENT, INSTANCE} from "../type/ObjectType.sol";
|
8
10
|
import {IInstance} from "./IInstance.sol";
|
11
|
+
import {IComponentService} from "../shared/IComponentService.sol";
|
9
12
|
import {IInstanceService} from "./IInstanceService.sol";
|
10
13
|
import {InstanceReader} from "./InstanceReader.sol";
|
11
14
|
import {InstanceAdmin} from "./InstanceAdmin.sol";
|
12
15
|
import {InstanceStore} from "./InstanceStore.sol";
|
13
|
-
import {INSTANCE} from "../type/ObjectType.sol";
|
14
16
|
import {IRegistry} from "../registry/IRegistry.sol";
|
17
|
+
import {NftId} from "../type/NftId.sol";
|
15
18
|
import {Registerable} from "../shared/Registerable.sol";
|
16
19
|
import {RoleId} from "../type/RoleId.sol";
|
17
20
|
import {Seconds} from "../type/Seconds.sol";
|
18
21
|
import {UFixed} from "../type/UFixed.sol";
|
19
|
-
import {VersionPart, VersionPartLib} from "../type/Version.sol";
|
20
22
|
|
21
23
|
contract Instance is
|
22
24
|
IInstance,
|
23
25
|
AccessManagedUpgradeable,
|
24
26
|
Registerable
|
25
27
|
{
|
26
|
-
uint256 public constant GIF_MAJOR_VERSION = 3;
|
27
|
-
|
28
28
|
bool private _initialized;
|
29
29
|
|
30
|
+
IComponentService internal _componentService;
|
30
31
|
IInstanceService internal _instanceService;
|
31
32
|
InstanceAdmin internal _instanceAdmin;
|
32
33
|
InstanceReader internal _instanceReader;
|
33
|
-
BundleSet internal
|
34
|
+
BundleSet internal _bundleSet;
|
35
|
+
RiskSet internal _riskSet;
|
34
36
|
InstanceStore internal _instanceStore;
|
35
37
|
|
36
38
|
modifier onlyChainNft() {
|
@@ -43,7 +45,8 @@ contract Instance is
|
|
43
45
|
function initialize(
|
44
46
|
InstanceAdmin instanceAdmin,
|
45
47
|
InstanceStore instanceStore,
|
46
|
-
BundleSet
|
48
|
+
BundleSet bundleSet,
|
49
|
+
RiskSet riskSet,
|
47
50
|
InstanceReader instanceReader,
|
48
51
|
IRegistry registry,
|
49
52
|
address initialOwner
|
@@ -53,7 +56,6 @@ contract Instance is
|
|
53
56
|
{
|
54
57
|
_instanceAdmin = instanceAdmin;
|
55
58
|
if(_instanceAdmin.authority() == address(0)) {
|
56
|
-
// TODO rename error
|
57
59
|
revert ErrorInstanceInstanceAdminZero();
|
58
60
|
}
|
59
61
|
|
@@ -71,27 +73,42 @@ contract Instance is
|
|
71
73
|
|
72
74
|
// store instance supporting contracts
|
73
75
|
_instanceStore = instanceStore;
|
74
|
-
|
76
|
+
_bundleSet = bundleSet;
|
77
|
+
_riskSet = riskSet;
|
75
78
|
_instanceReader = instanceReader;
|
76
79
|
|
77
80
|
// initialize instance supporting contracts
|
78
81
|
_instanceStore.initialize();
|
79
|
-
|
82
|
+
_bundleSet.initialize();
|
83
|
+
_riskSet.initialize();
|
80
84
|
_instanceReader.initialize();
|
81
85
|
|
86
|
+
_componentService = IComponentService(
|
87
|
+
getRegistry().getServiceAddress(
|
88
|
+
COMPONENT(),
|
89
|
+
getRelease()));
|
90
|
+
|
82
91
|
_instanceService = IInstanceService(
|
83
92
|
getRegistry().getServiceAddress(
|
84
93
|
INSTANCE(),
|
85
|
-
|
94
|
+
getRelease()));
|
86
95
|
|
87
96
|
_registerInterface(type(IInstance).interfaceId);
|
88
97
|
}
|
89
98
|
|
99
|
+
//--- ProductRegistration ----------------------------------------------//
|
100
|
+
function registerProduct(address product)
|
101
|
+
external
|
102
|
+
onlyOwner()
|
103
|
+
returns (NftId productNftId)
|
104
|
+
{
|
105
|
+
return _componentService.registerProduct(product);
|
106
|
+
}
|
107
|
+
|
90
108
|
//--- Staking ----------------------------------------------------------//
|
91
109
|
|
92
110
|
function setStakingLockingPeriod(Seconds stakeLockingPeriod)
|
93
111
|
external
|
94
|
-
// TODO decide if onlyOwner or restricted to instance owner role is better
|
95
112
|
onlyOwner()
|
96
113
|
{
|
97
114
|
_instanceService.setStakingLockingPeriod(stakeLockingPeriod);
|
@@ -168,23 +185,16 @@ contract Instance is
|
|
168
185
|
// _instanceAdmin.setTargetFunctionRoleByInstance(targetName, selectors, roleId);
|
169
186
|
}
|
170
187
|
|
171
|
-
function
|
188
|
+
function setLocked(address target, bool locked)
|
172
189
|
external
|
173
190
|
onlyOwner()
|
174
191
|
{
|
175
|
-
|
176
|
-
// _instanceAdmin.setTargetLockedByInstance(target, locked);
|
192
|
+
_componentService.setLockedFromInstance(target, locked);
|
177
193
|
}
|
178
194
|
|
179
195
|
//--- ITransferInterceptor ----------------------------------------------//
|
180
196
|
|
181
|
-
|
182
|
-
function nftMint(address to, uint256 tokenId) external onlyChainNft {
|
183
|
-
// TODO refactor
|
184
|
-
// _instanceAdmin.transferInstanceOwnerRole(address(0), to);
|
185
|
-
}
|
186
|
-
|
187
|
-
function nftTransferFrom(address from, address to, uint256 tokenId) external onlyChainNft {
|
197
|
+
function nftTransferFrom(address from, address to, uint256 tokenId, address operator) external onlyChainNft {
|
188
198
|
// TODO refactor
|
189
199
|
// _instanceAdmin.transferInstanceOwnerRole(from, to);
|
190
200
|
}
|
@@ -210,7 +220,11 @@ contract Instance is
|
|
210
220
|
}
|
211
221
|
|
212
222
|
function getBundleSet() external view returns (BundleSet) {
|
213
|
-
return
|
223
|
+
return _bundleSet;
|
224
|
+
}
|
225
|
+
|
226
|
+
function getRiskSet() external view returns (RiskSet) {
|
227
|
+
return _riskSet;
|
214
228
|
}
|
215
229
|
|
216
230
|
function getInstanceAdmin() external view returns (InstanceAdmin) {
|
@@ -221,9 +235,5 @@ contract Instance is
|
|
221
235
|
return _instanceStore;
|
222
236
|
}
|
223
237
|
|
224
|
-
function getMajorVersion() public pure returns (VersionPart majorVersion) {
|
225
|
-
return VersionPartLib.toVersionPart(GIF_MAJOR_VERSION);
|
226
|
-
}
|
227
|
-
|
228
238
|
//--- internal view/pure functions --------------------------------------//
|
229
239
|
}
|