@etherisc/gif-next 0.0.2-dfb8aa3-070 → 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 +2 -2
- 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 +2 -2
- 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/IAuthorization.sol/IAuthorization.dbg.json +1 -1
- package/artifacts/contracts/authorization/IServiceAuthorization.sol/IServiceAuthorization.dbg.json +1 -1
- package/artifacts/contracts/authorization/ReleaseAccessManager.sol/ReleaseAccessManager.dbg.json +1 -1
- package/artifacts/contracts/authorization/ServiceAuthorization.sol/ServiceAuthorization.dbg.json +1 -1
- package/artifacts/contracts/authorization/ServiceAuthorization.sol/ServiceAuthorization.json +2 -2
- package/artifacts/contracts/distribution/BasicDistribution.sol/BasicDistribution.dbg.json +1 -1
- package/artifacts/contracts/distribution/BasicDistribution.sol/BasicDistribution.json +53 -163
- package/artifacts/contracts/distribution/BasicDistributionAuthorization.sol/BasicDistributionAuthorization.dbg.json +1 -1
- package/artifacts/contracts/distribution/BasicDistributionAuthorization.sol/BasicDistributionAuthorization.json +2 -2
- package/artifacts/contracts/distribution/Distribution.sol/Distribution.dbg.json +1 -1
- package/artifacts/contracts/distribution/Distribution.sol/Distribution.json +6 -68
- package/artifacts/contracts/distribution/DistributionService.sol/DistributionService.dbg.json +1 -1
- package/artifacts/contracts/distribution/DistributionService.sol/DistributionService.json +121 -82
- package/artifacts/contracts/distribution/DistributionServiceManager.sol/DistributionServiceManager.dbg.json +1 -1
- package/artifacts/contracts/distribution/DistributionServiceManager.sol/DistributionServiceManager.json +72 -48
- package/artifacts/contracts/distribution/IDistributionComponent.sol/IDistributionComponent.dbg.json +1 -1
- package/artifacts/contracts/distribution/IDistributionComponent.sol/IDistributionComponent.json +6 -50
- package/artifacts/contracts/distribution/IDistributionService.sol/IDistributionService.dbg.json +1 -1
- package/artifacts/contracts/distribution/IDistributionService.sol/IDistributionService.json +23 -0
- package/artifacts/contracts/examples/fire/DamageLevel.sol/DamageLevelLib.dbg.json +1 -1
- package/artifacts/contracts/examples/fire/FirePool.sol/FirePool.dbg.json +1 -1
- package/artifacts/contracts/examples/fire/FirePool.sol/FirePool.json +50 -147
- package/artifacts/contracts/examples/fire/FirePoolAuthorization.sol/FirePoolAuthorization.dbg.json +1 -1
- package/artifacts/contracts/examples/fire/FirePoolAuthorization.sol/FirePoolAuthorization.json +49 -17
- package/artifacts/contracts/examples/fire/FireProduct.sol/FireProduct.dbg.json +1 -1
- package/artifacts/contracts/examples/fire/FireProduct.sol/FireProduct.json +105 -186
- package/artifacts/contracts/examples/fire/FireProductAuthorization.sol/FireProductAuthorization.dbg.json +1 -1
- package/artifacts/contracts/examples/fire/FireProductAuthorization.sol/FireProductAuthorization.json +17 -17
- package/artifacts/contracts/examples/fire/FireUSD.sol/FireUSD.dbg.json +1 -1
- package/artifacts/contracts/examples/unpermissioned/SimpleDistribution.sol/SimpleDistribution.dbg.json +1 -1
- package/artifacts/contracts/examples/unpermissioned/SimpleDistribution.sol/SimpleDistribution.json +79 -121
- 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 +31 -117
- package/artifacts/contracts/examples/unpermissioned/SimplePool.sol/SimplePool.dbg.json +1 -1
- package/artifacts/contracts/examples/unpermissioned/SimplePool.sol/SimplePool.json +168 -155
- 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 +403 -205
- 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 +64 -18
- package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.dbg.json +1 -1
- package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.json +24 -17
- package/artifacts/contracts/instance/Instance.sol/Instance.dbg.json +1 -1
- package/artifacts/contracts/instance/Instance.sol/Instance.json +96 -29
- package/artifacts/contracts/instance/InstanceAdmin.sol/InstanceAdmin.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceAdmin.sol/InstanceAdmin.json +103 -72
- package/artifacts/contracts/instance/InstanceAuthorizationV3.sol/InstanceAuthorizationV3.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceAuthorizationV3.sol/InstanceAuthorizationV3.json +40 -27
- package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.json +303 -75
- package/artifacts/contracts/instance/InstanceService.sol/InstanceService.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceService.sol/InstanceService.json +71 -48
- package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.json +46 -22
- package/artifacts/contracts/instance/InstanceStore.sol/InstanceStore.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceStore.sol/InstanceStore.json +36 -46
- 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 +2 -2
- 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 +20 -130
- package/artifacts/contracts/oracle/BasicOracleAuthorization.sol/BasicOracleAuthorization.dbg.json +1 -1
- package/artifacts/contracts/oracle/BasicOracleAuthorization.sol/BasicOracleAuthorization.json +2 -2
- 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 +6 -50
- package/artifacts/contracts/oracle/IOracleService.sol/IOracleService.dbg.json +1 -1
- package/artifacts/contracts/oracle/Oracle.sol/Oracle.dbg.json +1 -1
- package/artifacts/contracts/oracle/Oracle.sol/Oracle.json +6 -68
- package/artifacts/contracts/oracle/OracleService.sol/OracleService.dbg.json +1 -1
- package/artifacts/contracts/oracle/OracleService.sol/OracleService.json +84 -60
- package/artifacts/contracts/oracle/OracleServiceManager.sol/OracleServiceManager.dbg.json +1 -1
- package/artifacts/contracts/oracle/OracleServiceManager.sol/OracleServiceManager.json +66 -22
- package/artifacts/contracts/pool/BasicPool.sol/BasicPool.dbg.json +1 -1
- package/artifacts/contracts/pool/BasicPool.sol/BasicPool.json +6 -83
- package/artifacts/contracts/pool/BasicPoolAuthorization.sol/BasicPoolAuthorization.dbg.json +1 -1
- package/artifacts/contracts/pool/BasicPoolAuthorization.sol/BasicPoolAuthorization.json +49 -17
- package/artifacts/contracts/pool/BundleService.sol/BundleService.dbg.json +1 -1
- package/artifacts/contracts/pool/BundleService.sol/BundleService.json +101 -206
- package/artifacts/contracts/pool/BundleServiceManager.sol/BundleServiceManager.dbg.json +1 -1
- package/artifacts/contracts/pool/BundleServiceManager.sol/BundleServiceManager.json +58 -70
- package/artifacts/contracts/pool/IBundleService.sol/IBundleService.dbg.json +1 -1
- package/artifacts/contracts/pool/IBundleService.sol/IBundleService.json +19 -57
- package/artifacts/contracts/pool/IPoolComponent.sol/IPoolComponent.dbg.json +1 -1
- package/artifacts/contracts/pool/IPoolComponent.sol/IPoolComponent.json +6 -89
- package/artifacts/contracts/pool/IPoolService.sol/IPoolService.dbg.json +1 -1
- package/artifacts/contracts/pool/IPoolService.sol/IPoolService.json +77 -75
- package/artifacts/contracts/pool/Pool.sol/Pool.dbg.json +1 -1
- package/artifacts/contracts/pool/Pool.sol/Pool.json +6 -107
- package/artifacts/contracts/pool/PoolService.sol/PoolService.dbg.json +1 -1
- package/artifacts/contracts/pool/PoolService.sol/PoolService.json +153 -159
- package/artifacts/contracts/pool/PoolServiceManager.sol/PoolServiceManager.dbg.json +1 -1
- package/artifacts/contracts/pool/PoolServiceManager.sol/PoolServiceManager.json +61 -33
- package/artifacts/contracts/product/ApplicationService.sol/ApplicationService.dbg.json +1 -1
- package/artifacts/contracts/product/ApplicationService.sol/ApplicationService.json +58 -23
- package/artifacts/contracts/product/ApplicationServiceManager.sol/ApplicationServiceManager.dbg.json +1 -1
- package/artifacts/contracts/product/ApplicationServiceManager.sol/ApplicationServiceManager.json +42 -22
- package/artifacts/contracts/product/BasicProduct.sol/BasicProduct.dbg.json +1 -1
- package/artifacts/contracts/product/BasicProduct.sol/BasicProduct.json +11 -68
- package/artifacts/contracts/product/BasicProductAuthorization.sol/BasicProductAuthorization.dbg.json +1 -1
- package/artifacts/contracts/product/BasicProductAuthorization.sol/BasicProductAuthorization.json +2 -2
- package/artifacts/contracts/product/ClaimService.sol/ClaimService.dbg.json +1 -1
- package/artifacts/contracts/product/ClaimService.sol/ClaimService.json +74 -66
- package/artifacts/contracts/product/ClaimServiceManager.sol/ClaimServiceManager.dbg.json +1 -1
- package/artifacts/contracts/product/ClaimServiceManager.sol/ClaimServiceManager.json +67 -47
- package/artifacts/contracts/product/IApplicationService.sol/IApplicationService.dbg.json +1 -1
- package/artifacts/contracts/product/IApplicationService.sol/IApplicationService.json +34 -7
- package/artifacts/contracts/product/IClaimService.sol/IClaimService.dbg.json +1 -1
- package/artifacts/contracts/product/IPolicyService.sol/IPolicyService.dbg.json +1 -1
- package/artifacts/contracts/product/IPolicyService.sol/IPolicyService.json +38 -19
- package/artifacts/contracts/product/IPricingService.sol/IPricingService.dbg.json +1 -1
- package/artifacts/contracts/product/IProductComponent.sol/IProductComponent.dbg.json +1 -1
- package/artifacts/contracts/product/IProductComponent.sol/IProductComponent.json +11 -50
- package/artifacts/contracts/product/IRiskService.sol/IRiskService.dbg.json +1 -1
- package/artifacts/contracts/product/PolicyService.sol/PolicyService.dbg.json +1 -1
- package/artifacts/contracts/product/PolicyService.sol/PolicyService.json +132 -121
- package/artifacts/contracts/product/PolicyServiceManager.sol/PolicyServiceManager.dbg.json +1 -1
- package/artifacts/contracts/product/PolicyServiceManager.sol/PolicyServiceManager.json +70 -42
- package/artifacts/contracts/product/PricingService.sol/PricingService.dbg.json +1 -1
- package/artifacts/contracts/product/PricingService.sol/PricingService.json +50 -34
- package/artifacts/contracts/product/PricingServiceManager.sol/PricingServiceManager.dbg.json +1 -1
- package/artifacts/contracts/product/PricingServiceManager.sol/PricingServiceManager.json +56 -32
- package/artifacts/contracts/product/Product.sol/Product.dbg.json +1 -1
- package/artifacts/contracts/product/Product.sol/Product.json +11 -68
- package/artifacts/contracts/product/RiskService.sol/RiskService.dbg.json +1 -1
- package/artifacts/contracts/product/RiskService.sol/RiskService.json +34 -18
- package/artifacts/contracts/product/RiskServiceManager.sol/RiskServiceManager.dbg.json +1 -1
- package/artifacts/contracts/product/RiskServiceManager.sol/RiskServiceManager.json +40 -16
- package/artifacts/contracts/registry/ChainNft.sol/ChainNft.dbg.json +1 -1
- package/artifacts/contracts/registry/IRegistry.sol/IRegistry.dbg.json +1 -1
- package/artifacts/contracts/registry/IRegistry.sol/IRegistry.json +24 -0
- package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.dbg.json +1 -1
- package/artifacts/contracts/registry/ITransferInterceptor.sol/ITransferInterceptor.dbg.json +1 -1
- package/artifacts/contracts/registry/Registry.sol/Registry.dbg.json +1 -1
- package/artifacts/contracts/registry/Registry.sol/Registry.json +62 -38
- package/artifacts/contracts/registry/RegistryAdmin.sol/RegistryAdmin.dbg.json +1 -1
- package/artifacts/contracts/registry/RegistryAdmin.sol/RegistryAdmin.json +107 -94
- package/artifacts/contracts/registry/RegistryService.sol/RegistryService.dbg.json +1 -1
- package/artifacts/contracts/registry/RegistryService.sol/RegistryService.json +32 -16
- package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.dbg.json +1 -1
- package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.json +39 -15
- package/artifacts/contracts/registry/ReleaseLifecycle.sol/ReleaseLifecycle.dbg.json +1 -1
- package/artifacts/contracts/registry/ReleaseLifecycle.sol/ReleaseLifecycle.json +2 -2
- package/artifacts/contracts/registry/ReleaseRegistry.sol/ReleaseRegistry.dbg.json +1 -1
- package/artifacts/contracts/registry/ReleaseRegistry.sol/ReleaseRegistry.json +12 -12
- package/artifacts/contracts/registry/ServiceAuthorizationV3.sol/ServiceAuthorizationV3.dbg.json +1 -1
- package/artifacts/contracts/registry/ServiceAuthorizationV3.sol/ServiceAuthorizationV3.json +6 -6
- 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 +6 -54
- package/artifacts/contracts/shared/ComponentService.sol/ComponentService.dbg.json +1 -1
- package/artifacts/contracts/shared/ComponentService.sol/ComponentService.json +216 -410
- package/artifacts/contracts/shared/ComponentServiceManager.sol/ComponentServiceManager.dbg.json +1 -1
- package/artifacts/contracts/shared/ComponentServiceManager.sol/ComponentServiceManager.json +65 -61
- package/artifacts/contracts/shared/ComponentVerifyingService.sol/ComponentVerifyingService.dbg.json +1 -1
- 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 +6 -36
- package/artifacts/contracts/shared/IComponentService.sol/IComponentService.dbg.json +1 -1
- package/artifacts/contracts/shared/IComponentService.sol/IComponentService.json +107 -245
- package/artifacts/contracts/shared/IInstanceLinkedComponent.sol/IInstanceLinkedComponent.dbg.json +1 -1
- package/artifacts/contracts/shared/IInstanceLinkedComponent.sol/IInstanceLinkedComponent.json +6 -50
- package/artifacts/contracts/shared/IKeyValueStore.sol/IKeyValueStore.dbg.json +1 -1
- package/artifacts/contracts/shared/ILifecycle.sol/ILifecycle.dbg.json +1 -1
- package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.dbg.json +1 -1
- package/artifacts/contracts/shared/IPolicyHolder.sol/IPolicyHolder.dbg.json +1 -1
- package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.dbg.json +1 -1
- 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/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 +6 -68
- package/artifacts/contracts/shared/KeyValueStore.sol/KeyValueStore.dbg.json +1 -1
- package/artifacts/contracts/shared/Lifecycle.sol/Lifecycle.dbg.json +1 -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 +2 -2
- package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.dbg.json +1 -1
- package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.json +2 -2
- package/artifacts/contracts/shared/Registerable.sol/Registerable.dbg.json +1 -1
- package/artifacts/contracts/shared/Registerable.sol/Registerable.json +2 -2
- 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/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 +24 -72
- package/artifacts/contracts/staking/IStakingService.sol/IStakingService.dbg.json +1 -1
- 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 +80 -152
- package/artifacts/contracts/staking/StakingLifecycle.sol/StakingLifecycle.dbg.json +1 -1
- package/artifacts/contracts/staking/StakingLifecycle.sol/StakingLifecycle.json +2 -2
- package/artifacts/contracts/staking/StakingManager.sol/StakingManager.dbg.json +1 -1
- package/artifacts/contracts/staking/StakingManager.sol/StakingManager.json +50 -46
- package/artifacts/contracts/staking/StakingReader.sol/StakingReader.dbg.json +1 -1
- package/artifacts/contracts/staking/StakingReader.sol/StakingReader.json +2 -2
- package/artifacts/contracts/staking/StakingService.sol/StakingService.dbg.json +1 -1
- package/artifacts/contracts/staking/StakingService.sol/StakingService.json +36 -20
- package/artifacts/contracts/staking/StakingServiceManager.sol/StakingServiceManager.dbg.json +1 -1
- package/artifacts/contracts/staking/StakingServiceManager.sol/StakingServiceManager.json +43 -19
- package/artifacts/contracts/staking/StakingStore.sol/StakingStore.dbg.json +1 -1
- package/artifacts/contracts/staking/StakingStore.sol/StakingStore.json +2 -2
- 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/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 +2 -2
- 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/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 +2 -2
- 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 +43 -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/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/UFixedLib.dbg.json +1 -1
- 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 +18 -2
- 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 +21 -1
- package/contracts/distribution/BasicDistribution.sol +6 -6
- package/contracts/distribution/BasicDistributionAuthorization.sol +1 -1
- package/contracts/distribution/Distribution.sol +32 -30
- package/contracts/distribution/DistributionService.sol +28 -26
- package/contracts/distribution/IDistributionService.sol +5 -6
- package/contracts/examples/fire/FirePool.sol +22 -5
- package/contracts/examples/fire/FirePoolAuthorization.sol +1 -0
- package/contracts/examples/fire/FireProduct.sol +29 -8
- package/contracts/examples/fire/FireProductAuthorization.sol +1 -0
- package/contracts/examples/unpermissioned/SimpleDistribution.sol +7 -0
- package/contracts/examples/unpermissioned/SimpleDistributionAuthorization.sol +28 -0
- package/contracts/examples/unpermissioned/SimplePool.sol +33 -2
- package/contracts/examples/unpermissioned/SimplePoolAuthorization.sol +28 -0
- package/contracts/examples/unpermissioned/SimpleProduct.sol +22 -21
- package/contracts/examples/unpermissioned/SimpleProductAuthorization.sol +28 -0
- package/contracts/instance/BundleSet.sol +38 -34
- package/contracts/instance/IInstance.sol +7 -2
- package/contracts/instance/IInstanceService.sol +7 -9
- package/contracts/instance/Instance.sol +16 -9
- package/contracts/instance/InstanceAdmin.sol +20 -12
- package/contracts/instance/InstanceAuthorizationV3.sol +42 -14
- package/contracts/instance/InstanceReader.sol +86 -2
- package/contracts/instance/InstanceService.sol +38 -58
- package/contracts/instance/RiskSet.sol +119 -0
- package/contracts/instance/base/ObjectSet.sol +24 -25
- package/contracts/instance/module/IComponents.sol +1 -2
- package/contracts/instance/module/IPolicy.sol +2 -1
- package/contracts/instance/module/IRisk.sol +1 -0
- package/contracts/oracle/OracleService.sol +87 -69
- package/contracts/pool/BasicPool.sol +24 -3
- package/contracts/pool/BasicPoolAuthorization.sol +12 -1
- package/contracts/pool/BundleService.sol +23 -91
- package/contracts/pool/IBundleService.sol +2 -23
- package/contracts/pool/IPoolComponent.sol +1 -7
- package/contracts/pool/IPoolService.sol +12 -26
- package/contracts/pool/Pool.sol +112 -102
- package/contracts/pool/PoolService.sol +167 -96
- package/contracts/product/ApplicationService.sol +12 -12
- package/contracts/product/BasicProduct.sol +7 -11
- package/contracts/product/BasicProductAuthorization.sol +1 -2
- package/contracts/product/ClaimService.sol +3 -1
- package/contracts/product/IApplicationService.sol +5 -2
- package/contracts/product/IPolicyService.sol +17 -7
- package/contracts/product/PolicyService.sol +241 -196
- package/contracts/product/Product.sol +12 -40
- package/contracts/product/RiskService.sol +14 -3
- package/contracts/registry/IRegistry.sol +2 -0
- package/contracts/registry/Registry.sol +9 -1
- package/contracts/registry/RegistryAdmin.sol +21 -12
- package/contracts/registry/ReleaseRegistry.sol +2 -18
- package/contracts/registry/ServiceAuthorizationV3.sol +22 -41
- package/contracts/shared/Component.sol +44 -90
- package/contracts/shared/ComponentService.sol +160 -212
- package/contracts/shared/ComponentVerifyingService.sol +15 -13
- package/contracts/shared/ContractLib.sol +196 -10
- package/contracts/shared/IComponent.sol +1 -13
- package/contracts/shared/IComponentService.sol +20 -24
- package/contracts/shared/IInstanceLinkedComponent.sol +0 -11
- package/contracts/shared/InstanceLinkedComponent.sol +2 -18
- package/contracts/shared/Registerable.sol +0 -2
- package/contracts/shared/RegistryLinked.sol +6 -12
- package/contracts/shared/TokenHandler.sol +316 -66
- package/contracts/shared/TokenHandlerDeployerLib.sol +10 -2
- package/contracts/staking/IStaking.sol +9 -4
- package/contracts/staking/Staking.sol +39 -21
- package/contracts/staking/StakingService.sol +41 -8
- package/contracts/type/Key32.sol +2 -2
- package/contracts/type/Key32Set.sol +62 -0
- package/contracts/type/NftId.sol +6 -0
- package/contracts/type/ObjectType.sol +10 -0
- package/contracts/type/RiskId.sol +18 -6
- package/package.json +3 -3
@@ -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,6 +5,7 @@ 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";
|
@@ -14,7 +15,6 @@ import {NftId} from "../type/NftId.sol";
|
|
14
15
|
import {RoleId} from "../type/RoleId.sol";
|
15
16
|
import {Seconds} from "../type/Seconds.sol";
|
16
17
|
import {UFixed} from "../type/UFixed.sol";
|
17
|
-
import {VersionPart} from "../type/Version.sol";
|
18
18
|
|
19
19
|
|
20
20
|
interface IInstance is
|
@@ -30,6 +30,10 @@ interface IInstance is
|
|
30
30
|
error ErrorInstanceBundleSetInstanceMismatch(address instance);
|
31
31
|
error ErrorInstanceBundleSetAuthorityMismatch(address instanceAuthority);
|
32
32
|
|
33
|
+
error ErrorInstanceRiskSetAlreadySet(address instanceRiskSet);
|
34
|
+
error ErrorInstanceRiskSetInstanceMismatch(address instance);
|
35
|
+
error ErrorInstanceRiskSetAuthorityMismatch(address instanceAuthority);
|
36
|
+
|
33
37
|
error ErrorInstanceInstanceReaderInstanceMismatch(address instanceAuthority);
|
34
38
|
|
35
39
|
error ErrorInstanceInstanceStoreAlreadySet(address instanceStore);
|
@@ -48,7 +52,7 @@ interface IInstance is
|
|
48
52
|
|
49
53
|
function createTarget(address target, string memory name) external;
|
50
54
|
function setTargetFunctionRole(string memory targetName, bytes4[] calldata selectors, RoleId roleId) external;
|
51
|
-
function
|
55
|
+
function setLocked(address target, bool locked) external;
|
52
56
|
|
53
57
|
function setStakingLockingPeriod(Seconds stakeLockingPeriod) external;
|
54
58
|
function setStakingRewardRate(UFixed rewardRate) external;
|
@@ -61,6 +65,7 @@ interface IInstance is
|
|
61
65
|
// get instance release and supporting contracts
|
62
66
|
function getInstanceReader() external view returns (InstanceReader);
|
63
67
|
function getBundleSet() external view returns (BundleSet);
|
68
|
+
function getRiskSet() external view returns (RiskSet);
|
64
69
|
function getInstanceAdmin() external view returns (InstanceAdmin);
|
65
70
|
function getInstanceStore() external view returns (InstanceStore);
|
66
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,6 +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
|
-
function setComponentLocked(bool locked) external;
|
72
70
|
}
|
@@ -5,6 +5,7 @@ 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";
|
8
9
|
import {COMPONENT, INSTANCE} from "../type/ObjectType.sol";
|
9
10
|
import {IInstance} from "./IInstance.sol";
|
10
11
|
import {IComponentService} from "../shared/IComponentService.sol";
|
@@ -18,7 +19,6 @@ import {Registerable} from "../shared/Registerable.sol";
|
|
18
19
|
import {RoleId} from "../type/RoleId.sol";
|
19
20
|
import {Seconds} from "../type/Seconds.sol";
|
20
21
|
import {UFixed} from "../type/UFixed.sol";
|
21
|
-
import {VersionPart, VersionPartLib} from "../type/Version.sol";
|
22
22
|
|
23
23
|
contract Instance is
|
24
24
|
IInstance,
|
@@ -31,7 +31,8 @@ contract Instance is
|
|
31
31
|
IInstanceService internal _instanceService;
|
32
32
|
InstanceAdmin internal _instanceAdmin;
|
33
33
|
InstanceReader internal _instanceReader;
|
34
|
-
BundleSet internal
|
34
|
+
BundleSet internal _bundleSet;
|
35
|
+
RiskSet internal _riskSet;
|
35
36
|
InstanceStore internal _instanceStore;
|
36
37
|
|
37
38
|
modifier onlyChainNft() {
|
@@ -44,7 +45,8 @@ contract Instance is
|
|
44
45
|
function initialize(
|
45
46
|
InstanceAdmin instanceAdmin,
|
46
47
|
InstanceStore instanceStore,
|
47
|
-
BundleSet
|
48
|
+
BundleSet bundleSet,
|
49
|
+
RiskSet riskSet,
|
48
50
|
InstanceReader instanceReader,
|
49
51
|
IRegistry registry,
|
50
52
|
address initialOwner
|
@@ -71,12 +73,14 @@ 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
|
|
82
86
|
_componentService = IComponentService(
|
@@ -181,12 +185,11 @@ contract Instance is
|
|
181
185
|
// _instanceAdmin.setTargetFunctionRoleByInstance(targetName, selectors, roleId);
|
182
186
|
}
|
183
187
|
|
184
|
-
function
|
188
|
+
function setLocked(address target, bool locked)
|
185
189
|
external
|
186
190
|
onlyOwner()
|
187
191
|
{
|
188
|
-
|
189
|
-
// _instanceAdmin.setTargetLockedByInstance(target, locked);
|
192
|
+
_componentService.setLockedFromInstance(target, locked);
|
190
193
|
}
|
191
194
|
|
192
195
|
//--- ITransferInterceptor ----------------------------------------------//
|
@@ -217,7 +220,11 @@ contract Instance is
|
|
217
220
|
}
|
218
221
|
|
219
222
|
function getBundleSet() external view returns (BundleSet) {
|
220
|
-
return
|
223
|
+
return _bundleSet;
|
224
|
+
}
|
225
|
+
|
226
|
+
function getRiskSet() external view returns (RiskSet) {
|
227
|
+
return _riskSet;
|
221
228
|
}
|
222
229
|
|
223
230
|
function getInstanceAdmin() external view returns (InstanceAdmin) {
|
@@ -1,19 +1,16 @@
|
|
1
1
|
// SPDX-License-Identifier: UNLICENSED
|
2
2
|
pragma solidity ^0.8.20;
|
3
3
|
|
4
|
-
import {AccessManager} from "@openzeppelin/contracts/access/manager/AccessManager.sol";
|
5
4
|
|
6
5
|
import {AccessAdmin} from "../authorization/AccessAdmin.sol";
|
7
6
|
import {AccessManagerCloneable} from "../authorization/AccessManagerCloneable.sol";
|
8
|
-
import {IAccessAdmin} from "../authorization/IAccessAdmin.sol";
|
9
7
|
import {IAuthorization} from "../authorization/IAuthorization.sol";
|
10
8
|
import {IInstanceLinkedComponent} from "../shared/IInstanceLinkedComponent.sol";
|
11
9
|
import {IAuthorization} from "../authorization/IAuthorization.sol";
|
12
10
|
import {IRegistry} from "../registry/IRegistry.sol";
|
13
11
|
import {IInstance} from "./IInstance.sol";
|
14
|
-
import {
|
15
|
-
import {
|
16
|
-
import {RoleId, RoleIdLib, ADMIN_ROLE, PUBLIC_ROLE} from "../type/RoleId.sol";
|
12
|
+
import {ObjectType} from "../type/ObjectType.sol";
|
13
|
+
import {RoleId, RoleIdLib} from "../type/RoleId.sol";
|
17
14
|
import {Str, StrLib} from "../type/String.sol";
|
18
15
|
import {TokenHandler} from "../shared/TokenHandler.sol";
|
19
16
|
import {VersionPart} from "../type/Version.sol";
|
@@ -26,6 +23,7 @@ contract InstanceAdmin is
|
|
26
23
|
string public constant INSTANCE_STORE_TARGET_NAME = "InstanceStore";
|
27
24
|
string public constant INSTANCE_ADMIN_TARGET_NAME = "InstanceAdmin";
|
28
25
|
string public constant BUNDLE_SET_TARGET_NAME = "BundleSet";
|
26
|
+
string public constant RISK_SET_TAGET_NAME = "RiskSet";
|
29
27
|
|
30
28
|
uint64 public constant CUSTOM_ROLE_ID_MIN = 10000; // MUST be even
|
31
29
|
|
@@ -34,20 +32,20 @@ contract InstanceAdmin is
|
|
34
32
|
error ErrorInstanceAdminReleaseMismatch();
|
35
33
|
error ErrorInstanceAdminExpectedTargetMissing(string targetName);
|
36
34
|
|
37
|
-
IInstance _instance;
|
35
|
+
IInstance internal _instance;
|
38
36
|
IRegistry internal _registry;
|
39
|
-
uint64 _idNext;
|
37
|
+
uint64 internal _idNext;
|
40
38
|
|
41
|
-
IAuthorization _instanceAuthorization;
|
39
|
+
IAuthorization internal _instanceAuthorization;
|
42
40
|
|
43
41
|
/// @dev Only used for master instance admin.
|
44
42
|
/// Contracts created via constructor come with disabled initializers.
|
45
43
|
constructor(
|
46
|
-
|
44
|
+
address instanceAuthorization
|
47
45
|
)
|
48
46
|
AccessAdmin()
|
49
47
|
{
|
50
|
-
_instanceAuthorization = instanceAuthorization;
|
48
|
+
_instanceAuthorization = IAuthorization(instanceAuthorization);
|
51
49
|
}
|
52
50
|
|
53
51
|
/// @dev Initializes this instance admin with the provided instances authorization specification.
|
@@ -56,7 +54,7 @@ contract InstanceAdmin is
|
|
56
54
|
/// Important: Initialization of this instance admin is only complete after calling function initializeInstance.
|
57
55
|
function initialize(
|
58
56
|
AccessManagerCloneable accessManager,
|
59
|
-
|
57
|
+
address instanceAuthorization
|
60
58
|
)
|
61
59
|
external
|
62
60
|
initializer()
|
@@ -173,6 +171,15 @@ contract InstanceAdmin is
|
|
173
171
|
_grantRoleToAccount(roleId, account);
|
174
172
|
}
|
175
173
|
|
174
|
+
function setTargetLocked(address target, bool locked)
|
175
|
+
external
|
176
|
+
restricted()
|
177
|
+
{
|
178
|
+
_setTargetClosed(target, locked);
|
179
|
+
}
|
180
|
+
|
181
|
+
|
182
|
+
|
176
183
|
/// @dev Returns the instance authorization specification used to set up this instance admin.
|
177
184
|
function getInstanceAuthorization()
|
178
185
|
external
|
@@ -242,7 +249,7 @@ contract InstanceAdmin is
|
|
242
249
|
_createTarget(
|
243
250
|
target,
|
244
251
|
targetName,
|
245
|
-
false, // check authority TODO check normal targets, don't check service targets (they share authority with
|
252
|
+
false, // check authority TODO check normal targets, don't check service targets (they share authority with release admin)
|
246
253
|
false);
|
247
254
|
|
248
255
|
// assign target role if defined
|
@@ -260,6 +267,7 @@ contract InstanceAdmin is
|
|
260
267
|
_checkAndCreateTargetWithRole(address(_instance.getInstanceStore()), INSTANCE_STORE_TARGET_NAME);
|
261
268
|
_checkAndCreateTargetWithRole(address(_instance.getInstanceAdmin()), INSTANCE_ADMIN_TARGET_NAME);
|
262
269
|
_checkAndCreateTargetWithRole(address(_instance.getBundleSet()), BUNDLE_SET_TARGET_NAME);
|
270
|
+
_checkAndCreateTargetWithRole(address(_instance.getRiskSet()), RISK_SET_TAGET_NAME);
|
263
271
|
|
264
272
|
// create targets for services that need to access the module targets
|
265
273
|
ObjectType[] memory serviceDomains = _instanceAuthorization.getServiceDomains();
|
@@ -2,10 +2,11 @@
|
|
2
2
|
pragma solidity ^0.8.20;
|
3
3
|
|
4
4
|
import {
|
5
|
-
|
5
|
+
ACCOUNTING, ORACLE, POOL, INSTANCE, COMPONENT, DISTRIBUTION, APPLICATION, POLICY, CLAIM, BUNDLE, RISK
|
6
6
|
} from "../../contracts/type/ObjectType.sol";
|
7
7
|
|
8
|
-
import {BundleSet} from "../instance/BundleSet.sol";
|
8
|
+
import {BundleSet} from "../instance/BundleSet.sol";
|
9
|
+
import {RiskSet} from "../instance/RiskSet.sol";
|
9
10
|
import {IAccess} from "../authorization/IAccess.sol";
|
10
11
|
import {Instance} from "../instance/Instance.sol";
|
11
12
|
import {InstanceAdmin} from "../instance/InstanceAdmin.sol";
|
@@ -23,6 +24,7 @@ contract InstanceAuthorizationV3
|
|
23
24
|
string public constant INSTANCE_STORE_TARGET_NAME = "InstanceStore";
|
24
25
|
string public constant INSTANCE_ADMIN_TARGET_NAME = "InstanceAdmin";
|
25
26
|
string public constant BUNDLE_SET_TARGET_NAME = "BundleSet";
|
27
|
+
string public constant RISK_SET_TARGET_NAME = "RiskSet";
|
26
28
|
|
27
29
|
constructor() Authorization(INSTANCE_TARGET_NAME) {}
|
28
30
|
|
@@ -49,15 +51,17 @@ contract InstanceAuthorizationV3
|
|
49
51
|
_addTarget(INSTANCE_STORE_TARGET_NAME);
|
50
52
|
_addTarget(INSTANCE_ADMIN_TARGET_NAME);
|
51
53
|
_addTarget(BUNDLE_SET_TARGET_NAME);
|
54
|
+
_addTarget(RISK_SET_TARGET_NAME);
|
52
55
|
|
53
56
|
// service targets relevant to instance
|
54
57
|
_addServiceTargetWithRole(INSTANCE());
|
58
|
+
_addServiceTargetWithRole(ACCOUNTING());
|
55
59
|
_addServiceTargetWithRole(COMPONENT());
|
56
60
|
_addServiceTargetWithRole(DISTRIBUTION());
|
57
61
|
_addServiceTargetWithRole(ORACLE());
|
58
62
|
_addServiceTargetWithRole(POOL());
|
59
63
|
_addServiceTargetWithRole(BUNDLE());
|
60
|
-
_addServiceTargetWithRole(
|
64
|
+
_addServiceTargetWithRole(RISK());
|
61
65
|
_addServiceTargetWithRole(APPLICATION());
|
62
66
|
_addServiceTargetWithRole(POLICY());
|
63
67
|
_addServiceTargetWithRole(CLAIM());
|
@@ -72,7 +76,7 @@ contract InstanceAuthorizationV3
|
|
72
76
|
_setupInstanceAdminAuthorization();
|
73
77
|
_setupInstanceStoreAuthorization();
|
74
78
|
_setupBundleSetAuthorization();
|
75
|
-
|
79
|
+
_setUpRiskSetAuthorization();
|
76
80
|
}
|
77
81
|
|
78
82
|
|
@@ -83,11 +87,31 @@ contract InstanceAuthorizationV3
|
|
83
87
|
|
84
88
|
// authorize bundle service role
|
85
89
|
functions = _authorizeForTarget(BUNDLE_SET_TARGET_NAME, getServiceRole(BUNDLE()));
|
86
|
-
_authorize(functions, BundleSet.linkPolicy.selector, "linkPolicy");
|
87
|
-
_authorize(functions, BundleSet.unlinkPolicy.selector, "unlinkPolicy");
|
88
90
|
_authorize(functions, BundleSet.add.selector, "add");
|
89
91
|
_authorize(functions, BundleSet.lock.selector, "lock");
|
90
92
|
_authorize(functions, BundleSet.unlock.selector, "unlock");
|
93
|
+
|
94
|
+
// authorize bundle service role
|
95
|
+
functions = _authorizeForTarget(BUNDLE_SET_TARGET_NAME, getServiceRole(POLICY()));
|
96
|
+
_authorize(functions, BundleSet.linkPolicy.selector, "linkPolicy");
|
97
|
+
_authorize(functions, BundleSet.unlinkPolicy.selector, "unlinkPolicy");
|
98
|
+
}
|
99
|
+
|
100
|
+
function _setUpRiskSetAuthorization()
|
101
|
+
internal
|
102
|
+
{
|
103
|
+
IAccess.FunctionInfo[] storage functions;
|
104
|
+
|
105
|
+
// authorize risk service role
|
106
|
+
functions = _authorizeForTarget(RISK_SET_TARGET_NAME, getServiceRole(RISK()));
|
107
|
+
_authorize(functions, RiskSet.add.selector, "add");
|
108
|
+
_authorize(functions, RiskSet.pause.selector, "pause");
|
109
|
+
_authorize(functions, RiskSet.activate.selector, "activate");
|
110
|
+
|
111
|
+
// authorize policy service role
|
112
|
+
functions = _authorizeForTarget(RISK_SET_TARGET_NAME, getServiceRole(POLICY()));
|
113
|
+
_authorize(functions, RiskSet.linkPolicy.selector, "linkPolicy");
|
114
|
+
_authorize(functions, RiskSet.unlinkPolicy.selector, "unlinkPolicy");
|
91
115
|
}
|
92
116
|
|
93
117
|
|
@@ -111,8 +135,9 @@ contract InstanceAuthorizationV3
|
|
111
135
|
functions = _authorizeForTarget(INSTANCE_ADMIN_TARGET_NAME, _toTargetRoleId(INSTANCE()));
|
112
136
|
_authorize(functions, InstanceAdmin.grantRole.selector, "grantRole");
|
113
137
|
|
114
|
-
// authorize
|
115
|
-
|
138
|
+
// authorize component service role
|
139
|
+
functions = _authorizeForTarget(INSTANCE_ADMIN_TARGET_NAME, getServiceRole(COMPONENT()));
|
140
|
+
_authorize(functions, InstanceAdmin.setTargetLocked.selector, "setTargetLocked");
|
116
141
|
}
|
117
142
|
|
118
143
|
|
@@ -121,6 +146,13 @@ contract InstanceAuthorizationV3
|
|
121
146
|
{
|
122
147
|
IAccess.FunctionInfo[] storage functions;
|
123
148
|
|
149
|
+
// authorize accounting service role
|
150
|
+
functions = _authorizeForTarget(INSTANCE_STORE_TARGET_NAME, getServiceRole(ACCOUNTING()));
|
151
|
+
_authorize(functions, InstanceStore.increaseBalance.selector, "increaseBalance");
|
152
|
+
_authorize(functions, InstanceStore.decreaseBalance.selector, "decreaseBalance");
|
153
|
+
_authorize(functions, InstanceStore.increaseFees.selector, "increaseFees");
|
154
|
+
_authorize(functions, InstanceStore.decreaseFees.selector, "decreaseFees");
|
155
|
+
|
124
156
|
// authorize component service role
|
125
157
|
functions = _authorizeForTarget(INSTANCE_STORE_TARGET_NAME, getServiceRole(COMPONENT()));
|
126
158
|
_authorize(functions, InstanceStore.createComponent.selector, "createComponent");
|
@@ -128,11 +160,7 @@ contract InstanceAuthorizationV3
|
|
128
160
|
_authorize(functions, InstanceStore.createPool.selector, "createPool");
|
129
161
|
_authorize(functions, InstanceStore.createProduct.selector, "createProduct");
|
130
162
|
_authorize(functions, InstanceStore.updateProduct.selector, "updateProduct");
|
131
|
-
|
132
|
-
_authorize(functions, InstanceStore.decreaseBalance.selector, "decreaseBalance");
|
133
|
-
_authorize(functions, InstanceStore.increaseFees.selector, "increaseFees");
|
134
|
-
_authorize(functions, InstanceStore.decreaseFees.selector, "decreaseFees");
|
135
|
-
|
163
|
+
|
136
164
|
// authorize distribution service role
|
137
165
|
functions = _authorizeForTarget(INSTANCE_STORE_TARGET_NAME, getServiceRole(DISTRIBUTION()));
|
138
166
|
_authorize(functions, InstanceStore.createDistributorType.selector, "createDistributorType");
|
@@ -164,7 +192,7 @@ contract InstanceAuthorizationV3
|
|
164
192
|
_authorize(functions, InstanceStore.decreaseLocked.selector, "decreaseLocked");
|
165
193
|
|
166
194
|
// authorize product service role
|
167
|
-
functions = _authorizeForTarget(INSTANCE_STORE_TARGET_NAME, getServiceRole(
|
195
|
+
functions = _authorizeForTarget(INSTANCE_STORE_TARGET_NAME, getServiceRole(RISK()));
|
168
196
|
_authorize(functions, InstanceStore.createRisk.selector, "createRisk");
|
169
197
|
_authorize(functions, InstanceStore.updateRisk.selector, "updateRisk");
|
170
198
|
_authorize(functions, InstanceStore.updateRiskState.selector, "updateRiskState");
|