@etherisc/gif-next 0.0.2-f08528a-758 → 0.0.2-f0ccf08-591
Sign up to get free protection for your applications and to get access to all the features.
- package/README.md +113 -10
- package/artifacts/contracts/accounting/AccountingService.sol/AccountingService.dbg.json +4 -0
- package/artifacts/contracts/accounting/AccountingService.sol/AccountingService.json +1023 -0
- package/artifacts/contracts/accounting/AccountingServiceManager.sol/AccountingServiceManager.dbg.json +4 -0
- package/artifacts/contracts/accounting/AccountingServiceManager.sol/AccountingServiceManager.json +752 -0
- package/artifacts/contracts/accounting/IAccountingService.sol/IAccountingService.dbg.json +4 -0
- package/artifacts/contracts/{shared/ComponentVerifyingService.sol/ComponentVerifyingService.json → accounting/IAccountingService.sol/IAccountingService.json} +365 -113
- package/artifacts/contracts/authorization/AccessAdmin.sol/AccessAdmin.dbg.json +1 -1
- package/artifacts/contracts/authorization/AccessAdmin.sol/AccessAdmin.json +680 -264
- package/artifacts/contracts/authorization/AccessAdminLib.sol/AccessAdminLib.dbg.json +4 -0
- package/artifacts/contracts/authorization/AccessAdminLib.sol/AccessAdminLib.json +1289 -0
- package/artifacts/contracts/authorization/AccessManagerCloneable.sol/AccessManagerCloneable.dbg.json +1 -1
- package/artifacts/contracts/authorization/AccessManagerCloneable.sol/AccessManagerCloneable.json +202 -5
- package/artifacts/contracts/authorization/Authorization.sol/Authorization.dbg.json +1 -1
- package/artifacts/contracts/authorization/Authorization.sol/Authorization.json +456 -24
- package/artifacts/contracts/authorization/IAccess.sol/IAccess.dbg.json +1 -1
- package/artifacts/contracts/authorization/IAccessAdmin.sol/IAccessAdmin.dbg.json +1 -1
- package/artifacts/contracts/authorization/IAccessAdmin.sol/IAccessAdmin.json +549 -209
- package/artifacts/contracts/authorization/IAuthorization.sol/IAuthorization.dbg.json +1 -1
- package/artifacts/contracts/authorization/IAuthorization.sol/IAuthorization.json +215 -18
- package/artifacts/contracts/authorization/IServiceAuthorization.sol/IServiceAuthorization.dbg.json +1 -1
- package/artifacts/contracts/authorization/IServiceAuthorization.sol/IServiceAuthorization.json +265 -16
- package/artifacts/contracts/authorization/ServiceAuthorization.sol/ServiceAuthorization.dbg.json +1 -1
- package/artifacts/contracts/authorization/ServiceAuthorization.sol/ServiceAuthorization.json +473 -17
- package/artifacts/contracts/distribution/BasicDistribution.sol/BasicDistribution.dbg.json +1 -1
- package/artifacts/contracts/distribution/BasicDistribution.sol/BasicDistribution.json +198 -478
- package/artifacts/contracts/distribution/BasicDistributionAuthorization.sol/BasicDistributionAuthorization.dbg.json +1 -1
- package/artifacts/contracts/distribution/BasicDistributionAuthorization.sol/BasicDistributionAuthorization.json +431 -36
- package/artifacts/contracts/distribution/Distribution.sol/Distribution.dbg.json +1 -1
- package/artifacts/contracts/distribution/Distribution.sol/Distribution.json +120 -381
- package/artifacts/contracts/distribution/DistributionService.sol/DistributionService.dbg.json +1 -1
- package/artifacts/contracts/distribution/DistributionService.sol/DistributionService.json +587 -316
- package/artifacts/contracts/distribution/DistributionServiceManager.sol/DistributionServiceManager.dbg.json +1 -1
- package/artifacts/contracts/distribution/DistributionServiceManager.sol/DistributionServiceManager.json +205 -119
- package/artifacts/contracts/distribution/IDistributionComponent.sol/IDistributionComponent.dbg.json +1 -1
- package/artifacts/contracts/distribution/IDistributionComponent.sol/IDistributionComponent.json +123 -194
- package/artifacts/contracts/distribution/IDistributionService.sol/IDistributionService.dbg.json +1 -1
- package/artifacts/contracts/distribution/IDistributionService.sol/IDistributionService.json +347 -90
- package/artifacts/contracts/examples/fire/DamageLevel.sol/DamageLevelLib.dbg.json +4 -0
- package/artifacts/contracts/examples/fire/DamageLevel.sol/DamageLevelLib.json +22 -0
- package/artifacts/contracts/examples/fire/FirePool.sol/FirePool.dbg.json +4 -0
- package/artifacts/contracts/examples/fire/FirePool.sol/FirePool.json +1461 -0
- package/artifacts/contracts/examples/fire/FirePoolAuthorization.sol/FirePoolAuthorization.dbg.json +4 -0
- package/artifacts/contracts/examples/fire/FirePoolAuthorization.sol/FirePoolAuthorization.json +805 -0
- package/artifacts/contracts/examples/fire/FireProduct.sol/FireProduct.dbg.json +4 -0
- package/artifacts/contracts/examples/fire/FireProduct.sol/FireProduct.json +2018 -0
- package/artifacts/contracts/examples/fire/FireProductAuthorization.sol/FireProductAuthorization.dbg.json +4 -0
- package/artifacts/contracts/examples/fire/FireProductAuthorization.sol/FireProductAuthorization.json +805 -0
- package/artifacts/contracts/examples/fire/FireUSD.sol/FireUSD.dbg.json +4 -0
- package/artifacts/contracts/examples/fire/FireUSD.sol/FireUSD.json +376 -0
- package/artifacts/contracts/examples/unpermissioned/SimpleDistribution.sol/SimpleDistribution.dbg.json +4 -0
- package/artifacts/contracts/examples/unpermissioned/SimpleDistribution.sol/SimpleDistribution.json +1404 -0
- package/artifacts/contracts/examples/unpermissioned/SimpleDistributionAuthorization.sol/SimpleDistributionAuthorization.dbg.json +4 -0
- package/artifacts/contracts/examples/unpermissioned/SimpleDistributionAuthorization.sol/SimpleDistributionAuthorization.json +805 -0
- package/artifacts/contracts/examples/unpermissioned/SimpleOracle.sol/SimpleOracle.dbg.json +4 -0
- package/artifacts/contracts/examples/unpermissioned/SimpleOracle.sol/SimpleOracle.json +1152 -0
- package/artifacts/contracts/examples/unpermissioned/SimplePool.sol/SimplePool.dbg.json +4 -0
- package/artifacts/contracts/examples/unpermissioned/SimplePool.sol/SimplePool.json +1628 -0
- package/artifacts/contracts/examples/unpermissioned/SimplePoolAuthorization.sol/SimplePoolAuthorization.dbg.json +4 -0
- package/artifacts/contracts/examples/unpermissioned/SimplePoolAuthorization.sol/SimplePoolAuthorization.json +805 -0
- package/artifacts/contracts/examples/unpermissioned/SimpleProduct.sol/SimpleProduct.dbg.json +4 -0
- package/artifacts/contracts/examples/unpermissioned/SimpleProduct.sol/SimpleProduct.json +2405 -0
- package/artifacts/contracts/examples/unpermissioned/SimpleProductAuthorization.sol/SimpleProductAuthorization.dbg.json +4 -0
- package/artifacts/contracts/examples/unpermissioned/SimpleProductAuthorization.sol/SimpleProductAuthorization.json +805 -0
- package/artifacts/contracts/instance/BundleSet.sol/BundleSet.dbg.json +4 -0
- package/artifacts/contracts/instance/BundleSet.sol/BundleSet.json +851 -0
- package/artifacts/contracts/instance/IInstance.sol/IInstance.dbg.json +1 -1
- package/artifacts/contracts/instance/IInstance.sol/IInstance.json +546 -71
- package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.dbg.json +1 -1
- package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.json +292 -59
- package/artifacts/contracts/instance/Instance.sol/Instance.dbg.json +1 -1
- package/artifacts/contracts/instance/Instance.sol/Instance.json +556 -173
- package/artifacts/contracts/instance/InstanceAdmin.sol/InstanceAdmin.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceAdmin.sol/InstanceAdmin.json +1042 -314
- package/artifacts/contracts/instance/InstanceAuthorizationV3.sol/InstanceAuthorizationV3.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceAuthorizationV3.sol/InstanceAuthorizationV3.json +370 -69
- package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.json +1685 -774
- package/artifacts/contracts/instance/InstanceService.sol/InstanceService.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceService.sol/InstanceService.json +305 -229
- package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.json +106 -106
- package/artifacts/contracts/instance/InstanceStore.sol/InstanceStore.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceStore.sol/InstanceStore.json +921 -728
- package/artifacts/contracts/instance/RiskSet.sol/RiskSet.dbg.json +4 -0
- package/artifacts/contracts/instance/RiskSet.sol/RiskSet.json +853 -0
- package/artifacts/contracts/instance/base/BalanceStore.sol/BalanceStore.dbg.json +1 -1
- package/artifacts/contracts/instance/base/BalanceStore.sol/BalanceStore.json +2 -2
- package/artifacts/contracts/instance/base/Cloneable.sol/Cloneable.dbg.json +1 -1
- package/artifacts/contracts/instance/base/ObjectCounter.sol/ObjectCounter.dbg.json +1 -1
- package/artifacts/contracts/instance/base/ObjectCounter.sol/ObjectCounter.json +2 -2
- package/artifacts/contracts/instance/base/ObjectLifecycle.sol/ObjectLifecycle.dbg.json +1 -1
- package/artifacts/contracts/instance/base/ObjectLifecycle.sol/ObjectLifecycle.json +48 -7
- package/artifacts/contracts/instance/base/ObjectSet.sol/ObjectSet.dbg.json +4 -0
- package/artifacts/contracts/instance/base/ObjectSet.sol/ObjectSet.json +192 -0
- package/artifacts/contracts/instance/base/ObjectSetHelperLib.sol/ObjectSetHelperLib.dbg.json +4 -0
- package/artifacts/contracts/instance/base/ObjectSetHelperLib.sol/ObjectSetHelperLib.json +168 -0
- package/artifacts/contracts/instance/module/IBundle.sol/IBundle.dbg.json +1 -1
- package/artifacts/contracts/instance/module/IComponents.sol/IComponents.dbg.json +1 -1
- package/artifacts/contracts/instance/module/IDistribution.sol/IDistribution.dbg.json +1 -1
- package/artifacts/contracts/instance/module/IPolicy.sol/IPolicy.dbg.json +1 -1
- package/artifacts/contracts/instance/module/IRisk.sol/IRisk.dbg.json +1 -1
- package/artifacts/contracts/mock/Dip.sol/Dip.dbg.json +1 -1
- package/artifacts/contracts/mock/Dip.sol/Dip.json +2 -2
- package/artifacts/contracts/oracle/BasicOracle.sol/BasicOracle.dbg.json +1 -1
- package/artifacts/contracts/oracle/BasicOracle.sol/BasicOracle.json +133 -350
- package/artifacts/contracts/oracle/BasicOracleAuthorization.sol/BasicOracleAuthorization.dbg.json +1 -1
- package/artifacts/contracts/oracle/BasicOracleAuthorization.sol/BasicOracleAuthorization.json +429 -37
- package/artifacts/contracts/oracle/IOracle.sol/IOracle.dbg.json +1 -1
- package/artifacts/contracts/oracle/IOracleComponent.sol/IOracleComponent.dbg.json +1 -1
- package/artifacts/contracts/oracle/IOracleComponent.sol/IOracleComponent.json +117 -136
- package/artifacts/contracts/oracle/IOracleService.sol/IOracleService.dbg.json +1 -1
- package/artifacts/contracts/oracle/IOracleService.sol/IOracleService.json +69 -11
- package/artifacts/contracts/oracle/Oracle.sol/Oracle.dbg.json +1 -1
- package/artifacts/contracts/oracle/Oracle.sol/Oracle.json +109 -318
- package/artifacts/contracts/oracle/OracleService.sol/OracleService.dbg.json +1 -1
- package/artifacts/contracts/oracle/OracleService.sol/OracleService.json +169 -190
- package/artifacts/contracts/oracle/OracleServiceManager.sol/OracleServiceManager.dbg.json +1 -1
- package/artifacts/contracts/oracle/OracleServiceManager.sol/OracleServiceManager.json +140 -98
- package/artifacts/contracts/pool/BasicPool.sol/BasicPool.dbg.json +1 -1
- package/artifacts/contracts/pool/BasicPool.sol/BasicPool.json +175 -421
- package/artifacts/contracts/pool/BasicPoolAuthorization.sol/BasicPoolAuthorization.dbg.json +1 -1
- package/artifacts/contracts/pool/BasicPoolAuthorization.sol/BasicPoolAuthorization.json +430 -35
- package/artifacts/contracts/pool/BundleService.sol/BundleService.dbg.json +1 -1
- package/artifacts/contracts/pool/BundleService.sol/BundleService.json +387 -228
- package/artifacts/contracts/pool/BundleServiceManager.sol/BundleServiceManager.dbg.json +1 -1
- package/artifacts/contracts/pool/BundleServiceManager.sol/BundleServiceManager.json +183 -105
- package/artifacts/contracts/pool/IBundleService.sol/IBundleService.dbg.json +1 -1
- package/artifacts/contracts/pool/IBundleService.sol/IBundleService.json +212 -35
- package/artifacts/contracts/pool/IPoolComponent.sol/IPoolComponent.dbg.json +1 -1
- package/artifacts/contracts/pool/IPoolComponent.sol/IPoolComponent.json +139 -212
- package/artifacts/contracts/pool/IPoolService.sol/IPoolService.dbg.json +1 -1
- package/artifacts/contracts/pool/IPoolService.sol/IPoolService.json +460 -308
- package/artifacts/contracts/pool/Pool.sol/Pool.dbg.json +1 -1
- package/artifacts/contracts/pool/Pool.sol/Pool.json +129 -392
- package/artifacts/contracts/pool/PoolLib.sol/PoolLib.dbg.json +4 -0
- package/artifacts/contracts/pool/PoolLib.sol/PoolLib.json +538 -0
- package/artifacts/contracts/pool/PoolService.sol/PoolService.dbg.json +1 -1
- package/artifacts/contracts/pool/PoolService.sol/PoolService.json +705 -552
- package/artifacts/contracts/pool/PoolServiceManager.sol/PoolServiceManager.dbg.json +1 -1
- package/artifacts/contracts/pool/PoolServiceManager.sol/PoolServiceManager.json +189 -107
- package/artifacts/contracts/product/ApplicationService.sol/ApplicationService.dbg.json +1 -1
- package/artifacts/contracts/product/ApplicationService.sol/ApplicationService.json +188 -180
- package/artifacts/contracts/product/ApplicationServiceManager.sol/ApplicationServiceManager.dbg.json +1 -1
- package/artifacts/contracts/product/ApplicationServiceManager.sol/ApplicationServiceManager.json +122 -100
- package/artifacts/contracts/product/BasicProduct.sol/BasicProduct.dbg.json +1 -1
- package/artifacts/contracts/product/BasicProduct.sol/BasicProduct.json +276 -435
- package/artifacts/contracts/product/BasicProductAuthorization.sol/BasicProductAuthorization.dbg.json +1 -1
- package/artifacts/contracts/product/BasicProductAuthorization.sol/BasicProductAuthorization.json +430 -35
- package/artifacts/contracts/product/ClaimService.sol/ClaimService.dbg.json +1 -1
- package/artifacts/contracts/product/ClaimService.sol/ClaimService.json +431 -234
- package/artifacts/contracts/product/ClaimServiceManager.sol/ClaimServiceManager.dbg.json +1 -1
- package/artifacts/contracts/product/ClaimServiceManager.sol/ClaimServiceManager.json +158 -124
- package/artifacts/contracts/product/IApplicationService.sol/IApplicationService.dbg.json +1 -1
- package/artifacts/contracts/product/IApplicationService.sol/IApplicationService.json +136 -9
- package/artifacts/contracts/product/IClaimService.sol/IClaimService.dbg.json +1 -1
- package/artifacts/contracts/product/IClaimService.sol/IClaimService.json +308 -16
- package/artifacts/contracts/product/IPolicyService.sol/IPolicyService.dbg.json +1 -1
- package/artifacts/contracts/product/IPolicyService.sol/IPolicyService.json +365 -104
- package/artifacts/contracts/product/IPricingService.sol/IPricingService.dbg.json +1 -1
- package/artifacts/contracts/product/IPricingService.sol/IPricingService.json +157 -83
- package/artifacts/contracts/product/IProductComponent.sol/IProductComponent.dbg.json +1 -1
- package/artifacts/contracts/product/IProductComponent.sol/IProductComponent.json +260 -229
- package/artifacts/contracts/product/IRiskService.sol/IRiskService.dbg.json +4 -0
- package/artifacts/contracts/product/{IProductService.sol/IProductService.json → IRiskService.sol/IRiskService.json} +88 -8
- package/artifacts/contracts/product/PolicyService.sol/PolicyService.dbg.json +1 -1
- package/artifacts/contracts/product/PolicyService.sol/PolicyService.json +465 -307
- package/artifacts/contracts/product/PolicyServiceLib.sol/PolicyServiceLib.dbg.json +4 -0
- package/artifacts/contracts/product/PolicyServiceLib.sol/PolicyServiceLib.json +783 -0
- package/artifacts/contracts/product/PolicyServiceManager.sol/PolicyServiceManager.dbg.json +1 -1
- package/artifacts/contracts/product/PolicyServiceManager.sol/PolicyServiceManager.json +155 -109
- package/artifacts/contracts/product/PricingService.sol/PricingService.dbg.json +1 -1
- package/artifacts/contracts/product/PricingService.sol/PricingService.json +226 -335
- package/artifacts/contracts/product/PricingServiceManager.sol/PricingServiceManager.dbg.json +1 -1
- package/artifacts/contracts/product/PricingServiceManager.sol/PricingServiceManager.json +128 -138
- package/artifacts/contracts/product/Product.sol/Product.dbg.json +1 -1
- package/artifacts/contracts/product/Product.sol/Product.json +268 -427
- package/artifacts/contracts/product/RiskService.sol/RiskService.dbg.json +4 -0
- package/artifacts/contracts/product/RiskService.sol/RiskService.json +688 -0
- package/artifacts/contracts/product/RiskServiceManager.sol/RiskServiceManager.dbg.json +4 -0
- package/artifacts/contracts/product/RiskServiceManager.sol/RiskServiceManager.json +736 -0
- package/artifacts/contracts/registry/ChainNft.sol/ChainNft.dbg.json +1 -1
- package/artifacts/contracts/registry/ChainNft.sol/ChainNft.json +59 -16
- package/artifacts/contracts/registry/IRegistry.sol/IRegistry.dbg.json +1 -1
- package/artifacts/contracts/registry/IRegistry.sol/IRegistry.json +378 -30
- package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.dbg.json +1 -1
- package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.json +72 -152
- package/artifacts/contracts/registry/IRelease.sol/IRelease.dbg.json +4 -0
- package/artifacts/contracts/registry/IRelease.sol/IRelease.json +24 -0
- package/artifacts/contracts/registry/ITransferInterceptor.sol/ITransferInterceptor.dbg.json +1 -1
- package/artifacts/contracts/registry/ITransferInterceptor.sol/ITransferInterceptor.json +5 -18
- package/artifacts/contracts/registry/Registry.sol/Registry.dbg.json +1 -1
- package/artifacts/contracts/registry/Registry.sol/Registry.json +604 -87
- package/artifacts/contracts/registry/RegistryAdmin.sol/RegistryAdmin.dbg.json +1 -1
- package/artifacts/contracts/registry/RegistryAdmin.sol/RegistryAdmin.json +801 -395
- package/artifacts/contracts/registry/RegistryAuthorization.sol/RegistryAuthorization.dbg.json +4 -0
- package/artifacts/contracts/registry/RegistryAuthorization.sol/RegistryAuthorization.json +1053 -0
- package/artifacts/contracts/registry/RegistryService.sol/RegistryService.dbg.json +1 -1
- package/artifacts/contracts/registry/RegistryService.sol/RegistryService.json +109 -292
- package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.dbg.json +1 -1
- package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.json +104 -90
- package/artifacts/contracts/registry/ReleaseAdmin.sol/ReleaseAdmin.dbg.json +4 -0
- package/artifacts/contracts/registry/ReleaseAdmin.sol/ReleaseAdmin.json +2152 -0
- package/artifacts/contracts/registry/ReleaseLifecycle.sol/ReleaseLifecycle.dbg.json +1 -1
- package/artifacts/contracts/registry/ReleaseLifecycle.sol/ReleaseLifecycle.json +48 -7
- package/artifacts/contracts/registry/ReleaseRegistry.sol/ReleaseRegistry.dbg.json +4 -0
- package/artifacts/contracts/registry/ReleaseRegistry.sol/ReleaseRegistry.json +1389 -0
- package/artifacts/contracts/registry/ServiceAuthorizationV3.sol/ServiceAuthorizationV3.dbg.json +1 -1
- package/artifacts/contracts/registry/ServiceAuthorizationV3.sol/ServiceAuthorizationV3.json +489 -20
- package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.dbg.json +1 -1
- package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.json +15 -15
- package/artifacts/contracts/shared/Component.sol/Component.dbg.json +1 -1
- package/artifacts/contracts/shared/Component.sol/Component.json +67 -277
- package/artifacts/contracts/shared/ComponentService.sol/ComponentService.dbg.json +1 -1
- package/artifacts/contracts/shared/ComponentService.sol/ComponentService.json +538 -538
- package/artifacts/contracts/shared/ComponentServiceManager.sol/ComponentServiceManager.dbg.json +1 -1
- package/artifacts/contracts/shared/ComponentServiceManager.sol/ComponentServiceManager.json +153 -121
- package/artifacts/contracts/shared/ContractLib.sol/ContractLib.dbg.json +4 -0
- package/artifacts/contracts/shared/ContractLib.sol/ContractLib.json +632 -0
- package/artifacts/contracts/shared/ContractLib.sol/IInstanceAdminHelper.dbg.json +4 -0
- package/artifacts/contracts/shared/ContractLib.sol/IInstanceAdminHelper.json +24 -0
- package/artifacts/contracts/shared/ContractLib.sol/ITargetHelper.dbg.json +4 -0
- package/artifacts/contracts/shared/ContractLib.sol/ITargetHelper.json +30 -0
- package/artifacts/contracts/shared/ContractLib.sol/ITokenRegistryHelper.dbg.json +4 -0
- package/artifacts/contracts/shared/ContractLib.sol/ITokenRegistryHelper.json +40 -0
- package/artifacts/contracts/shared/IComponent.sol/IComponent.dbg.json +1 -1
- package/artifacts/contracts/shared/IComponent.sol/IComponent.json +80 -100
- package/artifacts/contracts/shared/IComponentService.sol/IComponentService.dbg.json +1 -1
- package/artifacts/contracts/shared/IComponentService.sol/IComponentService.json +499 -252
- package/artifacts/contracts/shared/IInstanceLinkedComponent.sol/IInstanceLinkedComponent.dbg.json +1 -1
- package/artifacts/contracts/shared/IInstanceLinkedComponent.sol/IInstanceLinkedComponent.json +106 -136
- package/artifacts/contracts/shared/IKeyValueStore.sol/IKeyValueStore.dbg.json +1 -1
- package/artifacts/contracts/shared/IKeyValueStore.sol/IKeyValueStore.json +36 -0
- package/artifacts/contracts/shared/ILifecycle.sol/ILifecycle.dbg.json +1 -1
- package/artifacts/contracts/shared/ILifecycle.sol/ILifecycle.json +36 -0
- package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.dbg.json +1 -1
- package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.json +16 -0
- package/artifacts/contracts/shared/IPolicyHolder.sol/IPolicyHolder.dbg.json +1 -1
- package/artifacts/contracts/shared/IPolicyHolder.sol/IPolicyHolder.json +15 -47
- package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.dbg.json +1 -1
- package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.json +148 -0
- package/artifacts/contracts/shared/IRegistryLinked.sol/IRegistryLinked.dbg.json +1 -1
- package/artifacts/contracts/shared/IService.sol/IService.dbg.json +1 -1
- package/artifacts/contracts/shared/IService.sol/IService.json +55 -2
- package/artifacts/contracts/shared/InitializableERC165.sol/InitializableERC165.dbg.json +4 -0
- package/artifacts/contracts/shared/InitializableERC165.sol/InitializableERC165.json +53 -0
- package/artifacts/contracts/shared/InstanceLinkedComponent.sol/InstanceLinkedComponent.dbg.json +1 -1
- package/artifacts/contracts/shared/InstanceLinkedComponent.sol/InstanceLinkedComponent.json +98 -318
- 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 +4 -0
- package/artifacts/contracts/shared/NftIdSet.sol/NftIdSet.json +306 -0
- package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.dbg.json +1 -1
- package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.json +22 -57
- package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.dbg.json +1 -1
- package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.json +19 -141
- package/artifacts/contracts/shared/Registerable.sol/Registerable.dbg.json +1 -1
- package/artifacts/contracts/shared/Registerable.sol/Registerable.json +122 -97
- package/artifacts/contracts/shared/RegistryLinked.sol/RegistryLinked.dbg.json +1 -1
- package/artifacts/contracts/shared/RegistryLinked.sol/RegistryLinked.json +2 -15
- package/artifacts/contracts/shared/Service.sol/Service.dbg.json +1 -1
- package/artifacts/contracts/shared/Service.sol/Service.json +57 -111
- package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.dbg.json +1 -1
- package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.json +585 -12
- package/artifacts/contracts/shared/TokenHandler.sol/TokenHandlerBase.dbg.json +4 -0
- package/artifacts/contracts/shared/TokenHandler.sol/TokenHandlerBase.json +484 -0
- package/artifacts/contracts/shared/TokenHandlerDeployerLib.sol/TokenHandlerDeployerLib.dbg.json +4 -0
- package/artifacts/contracts/shared/TokenHandlerDeployerLib.sol/TokenHandlerDeployerLib.json +172 -0
- package/artifacts/contracts/staking/IStaking.sol/IStaking.dbg.json +1 -1
- package/artifacts/contracts/staking/IStaking.sol/IStaking.json +196 -143
- package/artifacts/contracts/staking/IStakingService.sol/IStakingService.dbg.json +1 -1
- package/artifacts/contracts/staking/IStakingService.sol/IStakingService.json +155 -23
- package/artifacts/contracts/staking/Staking.sol/Staking.dbg.json +1 -1
- package/artifacts/contracts/staking/Staking.sol/Staking.json +292 -393
- package/artifacts/contracts/staking/StakingLib.sol/StakingLib.dbg.json +4 -0
- package/artifacts/contracts/staking/StakingLib.sol/StakingLib.json +469 -0
- package/artifacts/contracts/staking/StakingLifecycle.sol/StakingLifecycle.dbg.json +1 -1
- package/artifacts/contracts/staking/StakingLifecycle.sol/StakingLifecycle.json +48 -7
- package/artifacts/contracts/staking/StakingManager.sol/StakingManager.dbg.json +1 -1
- package/artifacts/contracts/staking/StakingManager.sol/StakingManager.json +142 -103
- package/artifacts/contracts/staking/StakingReader.sol/StakingReader.dbg.json +1 -1
- package/artifacts/contracts/staking/StakingReader.sol/StakingReader.json +41 -73
- package/artifacts/contracts/staking/StakingService.sol/StakingService.dbg.json +1 -1
- package/artifacts/contracts/staking/StakingService.sol/StakingService.json +224 -171
- package/artifacts/contracts/staking/StakingServiceManager.sol/StakingServiceManager.dbg.json +1 -1
- package/artifacts/contracts/staking/StakingServiceManager.sol/StakingServiceManager.json +121 -95
- package/artifacts/contracts/staking/StakingStore.sol/StakingStore.dbg.json +1 -1
- package/artifacts/contracts/staking/StakingStore.sol/StakingStore.json +213 -153
- package/artifacts/contracts/staking/TargetManagerLib.sol/TargetManagerLib.dbg.json +1 -1
- package/artifacts/contracts/staking/TargetManagerLib.sol/TargetManagerLib.json +95 -49
- package/artifacts/contracts/type/AddressSet.sol/LibAddressSet.dbg.json +1 -1
- package/artifacts/contracts/type/AddressSet.sol/LibAddressSet.json +2 -2
- package/artifacts/contracts/type/Amount.sol/AmountLib.dbg.json +1 -1
- package/artifacts/contracts/type/Amount.sol/AmountLib.json +63 -10
- package/artifacts/contracts/type/Blocknumber.sol/BlocknumberLib.dbg.json +1 -1
- package/artifacts/contracts/type/Blocknumber.sol/BlocknumberLib.json +2 -2
- 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 +4 -4
- package/artifacts/contracts/type/Fee.sol/FeeLib.dbg.json +1 -1
- package/artifacts/contracts/type/Fee.sol/FeeLib.json +98 -37
- package/artifacts/contracts/type/Key32.sol/Key32Lib.dbg.json +1 -1
- package/artifacts/contracts/type/Key32.sol/Key32Lib.json +2 -2
- package/artifacts/contracts/type/Key32Set.sol/LibKey32Set.dbg.json +4 -0
- package/artifacts/contracts/type/Key32Set.sol/LibKey32Set.json +33 -0
- package/artifacts/contracts/type/NftId.sol/NftIdLib.dbg.json +1 -1
- package/artifacts/contracts/type/NftId.sol/NftIdLib.json +23 -4
- package/artifacts/contracts/type/NftIdSet.sol/LibNftIdSet.dbg.json +1 -1
- package/artifacts/contracts/type/NftIdSet.sol/LibNftIdSet.json +2 -2
- package/artifacts/contracts/type/ObjectType.sol/ObjectTypeLib.dbg.json +1 -1
- package/artifacts/contracts/type/ObjectType.sol/ObjectTypeLib.json +33 -31
- package/artifacts/contracts/type/PayoutId.sol/PayoutIdLib.dbg.json +1 -1
- package/artifacts/contracts/type/PayoutId.sol/PayoutIdLib.json +19 -19
- package/artifacts/contracts/type/Referral.sol/ReferralLib.dbg.json +1 -1
- package/artifacts/contracts/type/Referral.sol/ReferralLib.json +4 -4
- package/artifacts/contracts/type/RequestId.sol/RequestIdLib.dbg.json +1 -1
- package/artifacts/contracts/type/RequestId.sol/RequestIdLib.json +4 -4
- package/artifacts/contracts/type/RiskId.sol/RiskIdLib.dbg.json +1 -1
- package/artifacts/contracts/type/RiskId.sol/RiskIdLib.json +125 -7
- package/artifacts/contracts/type/RoleId.sol/RoleIdLib.dbg.json +1 -1
- package/artifacts/contracts/type/RoleId.sol/RoleIdLib.json +42 -157
- package/artifacts/contracts/type/Seconds.sol/SecondsLib.dbg.json +1 -1
- package/artifacts/contracts/type/Seconds.sol/SecondsLib.json +50 -2
- package/artifacts/contracts/type/Selector.sol/SelectorLib.dbg.json +1 -1
- package/artifacts/contracts/type/Selector.sol/SelectorLib.json +21 -2
- package/artifacts/contracts/type/Selector.sol/SelectorSetLib.dbg.json +1 -1
- package/artifacts/contracts/type/Selector.sol/SelectorSetLib.json +2 -2
- package/artifacts/contracts/type/StateId.sol/StateIdLib.dbg.json +1 -1
- package/artifacts/contracts/type/StateId.sol/StateIdLib.json +15 -2
- package/artifacts/contracts/type/String.sol/StrLib.dbg.json +1 -1
- package/artifacts/contracts/type/String.sol/StrLib.json +50 -2
- package/artifacts/contracts/type/Timestamp.sol/TimestampLib.dbg.json +1 -1
- package/artifacts/contracts/type/Timestamp.sol/TimestampLib.json +23 -4
- package/artifacts/contracts/type/UFixed.sol/UFixedLib.dbg.json +1 -1
- package/artifacts/contracts/type/UFixed.sol/UFixedLib.json +109 -35
- package/artifacts/contracts/type/Version.sol/VersionLib.dbg.json +1 -1
- package/artifacts/contracts/type/Version.sol/VersionLib.json +2 -21
- package/artifacts/contracts/type/Version.sol/VersionPartLib.dbg.json +1 -1
- package/artifacts/contracts/type/Version.sol/VersionPartLib.json +120 -2
- package/artifacts/contracts/upgradeability/IVersionable.sol/IVersionable.dbg.json +4 -0
- package/artifacts/contracts/{shared → upgradeability}/IVersionable.sol/IVersionable.json +1 -1
- package/artifacts/contracts/upgradeability/ProxyManager.sol/ProxyManager.dbg.json +4 -0
- package/artifacts/contracts/upgradeability/ProxyManager.sol/ProxyManager.json +618 -0
- package/artifacts/contracts/upgradeability/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.dbg.json +4 -0
- package/artifacts/contracts/upgradeability/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.json +142 -0
- package/artifacts/contracts/upgradeability/Versionable.sol/Versionable.dbg.json +4 -0
- package/artifacts/contracts/{shared → upgradeability}/Versionable.sol/Versionable.json +1 -1
- package/contracts/accounting/AccountingService.sol +261 -0
- package/contracts/accounting/AccountingServiceManager.sol +38 -0
- package/contracts/accounting/IAccountingService.sol +45 -0
- package/contracts/authorization/AccessAdmin.sol +458 -266
- package/contracts/authorization/AccessAdminLib.sol +396 -0
- package/contracts/authorization/AccessManagerCloneable.sol +146 -4
- package/contracts/authorization/Authorization.sol +159 -203
- package/contracts/authorization/IAccess.sol +25 -6
- package/contracts/authorization/IAccessAdmin.sol +87 -79
- package/contracts/authorization/IAuthorization.sol +9 -36
- package/contracts/authorization/IServiceAuthorization.sol +57 -17
- package/contracts/authorization/ServiceAuthorization.sol +254 -24
- package/contracts/distribution/BasicDistribution.sol +20 -28
- package/contracts/distribution/BasicDistributionAuthorization.sol +34 -10
- package/contracts/distribution/Distribution.sol +43 -81
- package/contracts/distribution/DistributionService.sol +260 -129
- package/contracts/distribution/DistributionServiceManager.sol +8 -11
- package/contracts/distribution/IDistributionComponent.sol +11 -14
- package/contracts/distribution/IDistributionService.sol +50 -26
- package/contracts/examples/fire/DamageLevel.sol +59 -0
- package/contracts/examples/fire/FirePool.sol +86 -0
- package/contracts/examples/fire/FirePoolAuthorization.sol +35 -0
- package/contracts/examples/fire/FireProduct.sol +433 -0
- package/contracts/examples/fire/FireProductAuthorization.sol +45 -0
- package/contracts/examples/fire/FireUSD.sol +26 -0
- package/contracts/examples/unpermissioned/SimpleDistribution.sol +81 -0
- package/contracts/examples/unpermissioned/SimpleDistributionAuthorization.sol +28 -0
- package/contracts/examples/unpermissioned/SimpleOracle.sol +133 -0
- package/contracts/examples/unpermissioned/SimplePool.sol +102 -0
- package/contracts/examples/unpermissioned/SimplePoolAuthorization.sol +28 -0
- package/contracts/examples/unpermissioned/SimpleProduct.sol +373 -0
- package/contracts/examples/unpermissioned/SimpleProductAuthorization.sol +28 -0
- package/contracts/instance/BundleSet.sol +130 -0
- package/contracts/instance/IInstance.sol +105 -46
- package/contracts/instance/IInstanceService.sol +55 -34
- package/contracts/instance/Instance.sol +189 -98
- package/contracts/instance/InstanceAdmin.sol +276 -159
- package/contracts/instance/InstanceAuthorizationV3.sol +127 -64
- package/contracts/instance/InstanceReader.sol +478 -251
- package/contracts/instance/InstanceService.sol +299 -231
- package/contracts/instance/InstanceServiceManager.sol +8 -13
- package/contracts/instance/InstanceStore.sol +24 -2
- package/contracts/instance/RiskSet.sol +118 -0
- package/contracts/instance/base/BalanceStore.sol +3 -5
- package/contracts/instance/base/ObjectCounter.sol +1 -2
- package/contracts/instance/base/ObjectLifecycle.sol +11 -4
- package/contracts/instance/base/ObjectSet.sol +77 -0
- package/contracts/instance/base/ObjectSetHelperLib.sol +30 -0
- package/contracts/instance/module/IBundle.sol +6 -5
- package/contracts/instance/module/IComponents.sol +30 -20
- package/contracts/instance/module/IDistribution.sol +21 -9
- package/contracts/instance/module/IPolicy.sol +50 -29
- package/contracts/instance/module/IRisk.sol +5 -0
- package/contracts/mock/Dip.sol +1 -1
- package/contracts/oracle/BasicOracle.sol +1 -4
- package/contracts/oracle/BasicOracleAuthorization.sol +15 -8
- package/contracts/oracle/IOracle.sol +9 -4
- package/contracts/oracle/IOracleComponent.sol +2 -1
- package/contracts/oracle/IOracleService.sol +2 -1
- package/contracts/oracle/Oracle.sol +21 -24
- package/contracts/oracle/OracleService.sol +117 -85
- package/contracts/oracle/OracleServiceManager.sol +8 -11
- package/contracts/pool/BasicPool.sol +37 -28
- package/contracts/pool/BasicPoolAuthorization.sol +42 -9
- package/contracts/pool/BundleService.sol +209 -109
- package/contracts/pool/BundleServiceManager.sol +8 -11
- package/contracts/pool/IBundleService.sol +31 -22
- package/contracts/pool/IPoolComponent.sol +20 -10
- package/contracts/pool/IPoolService.sol +90 -75
- package/contracts/pool/Pool.sol +145 -113
- package/contracts/pool/PoolLib.sol +353 -0
- package/contracts/pool/PoolService.sol +391 -256
- package/contracts/pool/PoolServiceManager.sol +6 -9
- package/contracts/product/ApplicationService.sol +127 -81
- package/contracts/product/ApplicationServiceManager.sol +6 -6
- package/contracts/product/BasicProduct.sol +12 -45
- package/contracts/product/BasicProductAuthorization.sol +31 -10
- package/contracts/product/ClaimService.sol +368 -179
- package/contracts/product/ClaimServiceManager.sol +6 -6
- package/contracts/product/IApplicationService.sol +9 -2
- package/contracts/product/IClaimService.sol +44 -8
- package/contracts/product/IPolicyService.sol +53 -36
- package/contracts/product/IPricingService.sol +11 -10
- package/contracts/product/IProductComponent.sol +28 -5
- package/contracts/product/{IProductService.sol → IRiskService.sol} +8 -8
- package/contracts/product/PolicyService.sol +436 -271
- package/contracts/product/PolicyServiceLib.sol +139 -0
- package/contracts/product/PolicyServiceManager.sol +6 -9
- package/contracts/product/PricingService.sol +75 -65
- package/contracts/product/PricingServiceManager.sol +6 -9
- package/contracts/product/Product.sol +168 -93
- package/contracts/product/RiskService.sol +154 -0
- package/contracts/product/RiskServiceManager.sol +39 -0
- package/contracts/registry/ChainNft.sol +72 -40
- package/contracts/registry/IRegistry.sol +78 -29
- package/contracts/registry/IRegistryService.sol +3 -10
- package/contracts/registry/IRelease.sol +29 -0
- package/contracts/registry/ITransferInterceptor.sol +1 -2
- package/contracts/registry/Registry.sol +368 -216
- package/contracts/registry/RegistryAdmin.sol +112 -289
- package/contracts/registry/RegistryAuthorization.sol +277 -0
- package/contracts/registry/RegistryService.sol +41 -66
- package/contracts/registry/RegistryServiceManager.sol +5 -5
- package/contracts/registry/ReleaseAdmin.sol +195 -0
- package/contracts/registry/ReleaseLifecycle.sol +8 -3
- package/contracts/registry/ReleaseRegistry.sol +520 -0
- package/contracts/registry/ServiceAuthorizationV3.sol +201 -57
- package/contracts/registry/TokenRegistry.sol +14 -15
- package/contracts/shared/Component.sol +65 -136
- package/contracts/shared/ComponentService.sol +440 -343
- package/contracts/shared/ComponentServiceManager.sol +10 -7
- package/contracts/shared/ContractLib.sol +311 -0
- package/contracts/shared/IComponent.sol +5 -17
- package/contracts/shared/IComponentService.sol +49 -41
- package/contracts/shared/IInstanceLinkedComponent.sol +7 -27
- package/contracts/shared/ILifecycle.sol +3 -1
- package/contracts/shared/INftOwnable.sol +2 -0
- package/contracts/shared/IPolicyHolder.sol +12 -22
- package/contracts/shared/IRegisterable.sol +22 -1
- package/contracts/shared/IService.sol +4 -6
- package/contracts/shared/{ERC165.sol → InitializableERC165.sol} +11 -3
- package/contracts/shared/InstanceLinkedComponent.sol +80 -37
- package/contracts/shared/KeyValueStore.sol +1 -1
- package/contracts/shared/Lifecycle.sol +15 -4
- package/contracts/shared/{NftIdSetManager.sol → NftIdSet.sol} +1 -1
- package/contracts/shared/NftOwnable.sol +31 -11
- package/contracts/shared/PolicyHolder.sol +17 -57
- package/contracts/shared/Registerable.sol +52 -21
- package/contracts/shared/RegistryLinked.sol +9 -14
- package/contracts/shared/Service.sol +22 -38
- package/contracts/shared/TokenHandler.sol +310 -26
- package/contracts/shared/TokenHandlerDeployerLib.sol +20 -0
- package/contracts/staking/IStaking.sol +26 -15
- package/contracts/staking/IStakingService.sol +31 -9
- package/contracts/staking/Staking.sol +122 -90
- package/contracts/staking/{StakeManagerLib.sol → StakingLib.sol} +95 -45
- package/contracts/staking/StakingManager.sol +10 -12
- package/contracts/staking/StakingReader.sol +26 -33
- package/contracts/staking/StakingService.sol +93 -37
- package/contracts/staking/StakingServiceManager.sol +8 -7
- package/contracts/staking/StakingStore.sol +14 -23
- package/contracts/staking/TargetManagerLib.sol +8 -4
- package/contracts/type/Amount.sol +27 -5
- package/contracts/type/Blocknumber.sol +7 -1
- package/contracts/type/ClaimId.sol +6 -1
- package/contracts/type/Fee.sol +8 -8
- package/contracts/type/Key32.sol +2 -2
- package/contracts/type/Key32Set.sol +62 -0
- package/contracts/type/NftId.sol +7 -0
- package/contracts/type/ObjectType.sol +76 -44
- package/contracts/type/PayoutId.sol +10 -10
- package/contracts/type/Referral.sol +1 -0
- package/contracts/type/RiskId.sol +38 -6
- package/contracts/type/RoleId.sol +61 -55
- package/contracts/type/Seconds.sol +21 -1
- package/contracts/type/Selector.sol +5 -0
- package/contracts/type/StateId.sol +15 -1
- package/contracts/type/String.sol +12 -0
- package/contracts/type/Timestamp.sol +10 -5
- package/contracts/type/UFixed.sol +56 -126
- package/contracts/type/Version.sol +57 -6
- package/contracts/{shared → upgradeability}/ProxyManager.sol +84 -49
- package/contracts/{shared → upgradeability}/UpgradableProxyWithAdmin.sol +8 -4
- package/contracts/{shared → upgradeability}/Versionable.sol +6 -3
- package/package.json +7 -6
- package/artifacts/contracts/authorization/IModuleAuthorization.sol/IModuleAuthorization.dbg.json +0 -4
- package/artifacts/contracts/authorization/IModuleAuthorization.sol/IModuleAuthorization.json +0 -290
- package/artifacts/contracts/authorization/ModuleAuthorization.sol/ModuleAuthorization.dbg.json +0 -4
- package/artifacts/contracts/authorization/ModuleAuthorization.sol/ModuleAuthorization.json +0 -390
- package/artifacts/contracts/instance/BundleManager.sol/BundleManager.dbg.json +0 -4
- package/artifacts/contracts/instance/BundleManager.sol/BundleManager.json +0 -703
- package/artifacts/contracts/instance/base/ObjectManager.sol/ObjectManager.dbg.json +0 -4
- package/artifacts/contracts/instance/base/ObjectManager.sol/ObjectManager.json +0 -181
- package/artifacts/contracts/instance/module/IAccess.sol/IAccess.dbg.json +0 -4
- package/artifacts/contracts/instance/module/IAccess.sol/IAccess.json +0 -129
- package/artifacts/contracts/product/IProductService.sol/IProductService.dbg.json +0 -4
- package/artifacts/contracts/product/ProductService.sol/ProductService.dbg.json +0 -4
- package/artifacts/contracts/product/ProductService.sol/ProductService.json +0 -708
- package/artifacts/contracts/product/ProductServiceManager.sol/ProductServiceManager.dbg.json +0 -4
- package/artifacts/contracts/product/ProductServiceManager.sol/ProductServiceManager.json +0 -702
- package/artifacts/contracts/registry/ReleaseManager.sol/ReleaseManager.dbg.json +0 -4
- package/artifacts/contracts/registry/ReleaseManager.sol/ReleaseManager.json +0 -1159
- package/artifacts/contracts/shared/ComponentVerifyingService.sol/ComponentVerifyingService.dbg.json +0 -4
- package/artifacts/contracts/shared/ERC165.sol/ERC165.dbg.json +0 -4
- package/artifacts/contracts/shared/ERC165.sol/ERC165.json +0 -73
- package/artifacts/contracts/shared/IVersionable.sol/IVersionable.dbg.json +0 -4
- package/artifacts/contracts/shared/InitializableCustom.sol/InitializableCustom.dbg.json +0 -4
- package/artifacts/contracts/shared/InitializableCustom.sol/InitializableCustom.json +0 -39
- package/artifacts/contracts/shared/NftIdSetManager.sol/NftIdSetManager.dbg.json +0 -4
- package/artifacts/contracts/shared/NftIdSetManager.sol/NftIdSetManager.json +0 -306
- package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.dbg.json +0 -4
- package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.json +0 -617
- package/artifacts/contracts/shared/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.dbg.json +0 -4
- package/artifacts/contracts/shared/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.json +0 -129
- package/artifacts/contracts/shared/Versionable.sol/Versionable.dbg.json +0 -4
- package/artifacts/contracts/staking/StakeManagerLib.sol/StakeManagerLib.dbg.json +0 -4
- package/artifacts/contracts/staking/StakeManagerLib.sol/StakeManagerLib.json +0 -460
- package/artifacts/contracts/type/UFixed.sol/MathLib.dbg.json +0 -4
- package/artifacts/contracts/type/UFixed.sol/MathLib.json +0 -10
- package/contracts/authorization/IModuleAuthorization.sol +0 -21
- package/contracts/authorization/ModuleAuthorization.sol +0 -78
- package/contracts/instance/BundleManager.sol +0 -126
- package/contracts/instance/base/ObjectManager.sol +0 -79
- package/contracts/instance/module/IAccess.sol +0 -46
- package/contracts/product/ProductService.sol +0 -124
- package/contracts/product/ProductServiceManager.sol +0 -42
- package/contracts/registry/ReleaseManager.sol +0 -487
- package/contracts/shared/ComponentVerifyingService.sol +0 -117
- package/contracts/shared/InitializableCustom.sol +0 -177
- /package/contracts/{shared → upgradeability}/IVersionable.sol +0 -0
@@ -1,8 +1,10 @@
|
|
1
1
|
// SPDX-License-Identifier: Apache-2.0
|
2
2
|
pragma solidity ^0.8.20;
|
3
3
|
|
4
|
-
|
5
|
-
|
4
|
+
import {Math} from "@openzeppelin/contracts/utils/math/Math.sol";
|
5
|
+
|
6
|
+
/// @dev UFixed is a 160-bit fixed point number with 15 decimals precision.
|
7
|
+
type UFixed is uint160;
|
6
8
|
|
7
9
|
using {
|
8
10
|
addUFixed as +,
|
@@ -15,9 +17,10 @@ using {
|
|
15
17
|
lteUFixed as <=,
|
16
18
|
eqUFixed as ==,
|
17
19
|
neUFixed as !=,
|
20
|
+
UFixedLib.gt,
|
21
|
+
UFixedLib.gtz,
|
18
22
|
UFixedLib.toInt,
|
19
|
-
UFixedLib.toInt1000
|
20
|
-
UFixedLib.gtz
|
23
|
+
UFixedLib.toInt1000
|
21
24
|
} for UFixed global;
|
22
25
|
|
23
26
|
// TODO move to UFixedLib and rename to zero()
|
@@ -30,20 +33,24 @@ function addUFixed(UFixed a, UFixed b) pure returns (UFixed) {
|
|
30
33
|
}
|
31
34
|
|
32
35
|
function subUFixed(UFixed a, UFixed b) pure returns (UFixed) {
|
33
|
-
|
36
|
+
if (a < b) {
|
37
|
+
revert UFixedLib.UFixedLibNegativeResult();
|
38
|
+
}
|
34
39
|
return UFixed.wrap(UFixed.unwrap(a) - UFixed.unwrap(b));
|
35
40
|
}
|
36
41
|
|
37
42
|
function mulUFixed(UFixed a, UFixed b) pure returns (UFixed) {
|
38
43
|
return
|
39
|
-
UFixed.wrap(
|
44
|
+
UFixed.wrap(uint160(Math.mulDiv(UFixed.unwrap(a), UFixed.unwrap(b), 10 ** 15)));
|
40
45
|
}
|
41
46
|
|
42
47
|
function divUFixed(UFixed a, UFixed b) pure returns (UFixed) {
|
43
|
-
|
44
|
-
|
48
|
+
if (UFixed.unwrap(b) == 0) {
|
49
|
+
revert UFixedLib.UFixedLibDivisionByZero();
|
50
|
+
}
|
51
|
+
|
45
52
|
return
|
46
|
-
UFixed.wrap(
|
53
|
+
UFixed.wrap(uint160(Math.mulDiv(UFixed.unwrap(a), 10 ** 15, UFixed.unwrap(b))));
|
47
54
|
}
|
48
55
|
|
49
56
|
function gtUFixed(UFixed a, UFixed b) pure returns (bool isGreaterThan) {
|
@@ -86,116 +93,16 @@ function deltaUFixed(UFixed a, UFixed b) pure returns (UFixed) {
|
|
86
93
|
return b - a;
|
87
94
|
}
|
88
95
|
|
89
|
-
|
90
|
-
|
91
|
-
|
92
|
-
enum Rounding {
|
93
|
-
Down, // Toward negative infinity
|
94
|
-
Up, // Toward infinity
|
95
|
-
Zero // Toward zero
|
96
|
-
}
|
96
|
+
library UFixedLib {
|
97
|
+
error UFixedLibNegativeResult();
|
98
|
+
error UFixedLibDivisionByZero();
|
97
99
|
|
98
|
-
|
99
|
-
|
100
|
-
* @dev Original credit to Remco Bloemen under MIT license (https://xn--2-umb.com/21/muldiv)
|
101
|
-
* with further edits by Uniswap Labs also under MIT license.
|
102
|
-
*/
|
103
|
-
function mulDiv(uint256 x, uint256 y, uint256 denominator) internal pure returns (uint256 result) {
|
104
|
-
unchecked {
|
105
|
-
// 512-bit multiply [prod1 prod0] = x * y. Compute the product mod 2^256 and mod 2^256 - 1, then use
|
106
|
-
// use the Chinese Remainder Theorem to reconstruct the 512 bit result. The result is stored in two 256
|
107
|
-
// variables such that product = prod1 * 2^256 + prod0.
|
108
|
-
uint256 prod0; // Least significant 256 bits of the product
|
109
|
-
uint256 prod1; // Most significant 256 bits of the product
|
110
|
-
assembly {
|
111
|
-
let mm := mulmod(x, y, not(0))
|
112
|
-
prod0 := mul(x, y)
|
113
|
-
prod1 := sub(sub(mm, prod0), lt(mm, prod0))
|
114
|
-
}
|
115
|
-
|
116
|
-
// Handle non-overflow cases, 256 by 256 division.
|
117
|
-
if (prod1 == 0) {
|
118
|
-
// Solidity will revert if denominator == 0, unlike the div opcode on its own.
|
119
|
-
// The surrounding unchecked block does not change this fact.
|
120
|
-
// See https://docs.soliditylang.org/en/latest/control-structures.html#checked-or-unchecked-arithmetic.
|
121
|
-
return prod0 / denominator;
|
122
|
-
}
|
123
|
-
|
124
|
-
// Make sure the result is less than 2^256. Also prevents denominator == 0.
|
125
|
-
require(denominator > prod1, "Math: mulDiv overflow");
|
126
|
-
|
127
|
-
///////////////////////////////////////////////
|
128
|
-
// 512 by 256 division.
|
129
|
-
///////////////////////////////////////////////
|
130
|
-
|
131
|
-
// Make division exact by subtracting the remainder from [prod1 prod0].
|
132
|
-
uint256 remainder;
|
133
|
-
assembly {
|
134
|
-
// Compute remainder using mulmod.
|
135
|
-
remainder := mulmod(x, y, denominator)
|
136
|
-
|
137
|
-
// Subtract 256 bit number from 512 bit number.
|
138
|
-
prod1 := sub(prod1, gt(remainder, prod0))
|
139
|
-
prod0 := sub(prod0, remainder)
|
140
|
-
}
|
141
|
-
|
142
|
-
// Factor powers of two out of denominator and compute largest power of two divisor of denominator. Always >= 1.
|
143
|
-
// See https://cs.stackexchange.com/q/138556/92363.
|
144
|
-
|
145
|
-
// Does not overflow because the denominator cannot be zero at this stage in the function.
|
146
|
-
uint256 twos = denominator & (~denominator + 1);
|
147
|
-
assembly {
|
148
|
-
// Divide denominator by twos.
|
149
|
-
denominator := div(denominator, twos)
|
150
|
-
|
151
|
-
// Divide [prod1 prod0] by twos.
|
152
|
-
prod0 := div(prod0, twos)
|
153
|
-
|
154
|
-
// Flip twos such that it is 2^256 / twos. If twos is zero, then it becomes one.
|
155
|
-
twos := add(div(sub(0, twos), twos), 1)
|
156
|
-
}
|
157
|
-
|
158
|
-
// Shift in bits from prod1 into prod0.
|
159
|
-
prod0 |= prod1 * twos;
|
160
|
-
|
161
|
-
// Invert denominator mod 2^256. Now that denominator is an odd number, it has an inverse modulo 2^256 such
|
162
|
-
// that denominator * inv = 1 mod 2^256. Compute the inverse by starting with a seed that is correct for
|
163
|
-
// four bits. That is, denominator * inv = 1 mod 2^4.
|
164
|
-
uint256 inverse = (3 * denominator) ^ 2;
|
165
|
-
|
166
|
-
// Use the Newton-Raphson iteration to improve the precision. Thanks to Hensel's lifting lemma, this also works
|
167
|
-
// in modular arithmetic, doubling the correct bits in each step.
|
168
|
-
inverse *= 2 - denominator * inverse; // inverse mod 2^8
|
169
|
-
inverse *= 2 - denominator * inverse; // inverse mod 2^16
|
170
|
-
inverse *= 2 - denominator * inverse; // inverse mod 2^32
|
171
|
-
inverse *= 2 - denominator * inverse; // inverse mod 2^64
|
172
|
-
inverse *= 2 - denominator * inverse; // inverse mod 2^128
|
173
|
-
inverse *= 2 - denominator * inverse; // inverse mod 2^256
|
174
|
-
|
175
|
-
// Because the division is now exact we can divide by multiplying with the modular inverse of denominator.
|
176
|
-
// This will give us the correct result modulo 2^256. Since the preconditions guarantee that the outcome is
|
177
|
-
// less than 2^256, this is the final result. We don't need to compute the high bits of the result and prod1
|
178
|
-
// is no longer required.
|
179
|
-
result = prod0 * inverse;
|
180
|
-
return result;
|
181
|
-
}
|
182
|
-
}
|
100
|
+
error UFixedLibExponentTooSmall(int8 exp);
|
101
|
+
error UFixedLibExponentTooLarge(int8 exp);
|
183
102
|
|
184
|
-
|
185
|
-
* @notice Calculates x * y / denominator with full precision, following the selected rounding direction.
|
186
|
-
*/
|
187
|
-
function mulDiv(uint256 x, uint256 y, uint256 denominator, Rounding rounding) internal pure returns (uint256) {
|
188
|
-
uint256 result = mulDiv(x, y, denominator);
|
189
|
-
if (rounding == Rounding.Up && mulmod(x, y, denominator) > 0) {
|
190
|
-
result += 1;
|
191
|
-
}
|
192
|
-
return result;
|
193
|
-
}
|
103
|
+
error UFixedLibNumberTooLarge(uint256 number);
|
194
104
|
|
195
|
-
|
196
|
-
|
197
|
-
library UFixedLib {
|
198
|
-
int8 public constant EXP = 18;
|
105
|
+
int8 public constant EXP = 15;
|
199
106
|
uint256 public constant MULTIPLIER = 10 ** uint256(int256(EXP));
|
200
107
|
uint256 public constant MULTIPLIER_HALF = MULTIPLIER / 2;
|
201
108
|
|
@@ -214,17 +121,32 @@ library UFixedLib {
|
|
214
121
|
return uint8(2);
|
215
122
|
}
|
216
123
|
|
217
|
-
/// @dev Converts the uint256 to a UFixed.
|
124
|
+
/// @dev Converts the uint256 to a uint160 based UFixed.
|
125
|
+
/// This method reverts if the number is too large to fit in a uint160.
|
218
126
|
function toUFixed(uint256 a) public pure returns (UFixed) {
|
219
|
-
|
127
|
+
uint256 n = a * MULTIPLIER;
|
128
|
+
if (n > type(uint160).max) {
|
129
|
+
revert UFixedLibNumberTooLarge(a);
|
130
|
+
}
|
131
|
+
return UFixed.wrap(uint160(n));
|
220
132
|
}
|
221
133
|
|
222
134
|
/// @dev Converts the uint256 to a UFixed with given exponent.
|
223
135
|
function toUFixed(uint256 a, int8 exp) public pure returns (UFixed) {
|
224
|
-
|
225
|
-
|
136
|
+
if (EXP + exp < 0) {
|
137
|
+
revert UFixedLibExponentTooSmall(exp);
|
138
|
+
}
|
139
|
+
if (EXP + exp > 48) {
|
140
|
+
revert UFixedLibExponentTooLarge(exp);
|
141
|
+
}
|
142
|
+
|
143
|
+
uint256 n = a * 10 ** uint8(EXP + exp);
|
226
144
|
|
227
|
-
|
145
|
+
if (n > type(uint160).max) {
|
146
|
+
revert UFixedLibNumberTooLarge(n);
|
147
|
+
}
|
148
|
+
|
149
|
+
return UFixed.wrap(uint160(n));
|
228
150
|
}
|
229
151
|
|
230
152
|
/// @dev returns the decimals precision of the UFixed type
|
@@ -246,23 +168,23 @@ library UFixedLib {
|
|
246
168
|
function toIntWithRounding(UFixed a, uint8 rounding) public pure returns (uint256) {
|
247
169
|
if (rounding == ROUNDING_HALF_UP()) {
|
248
170
|
return
|
249
|
-
|
171
|
+
Math.mulDiv(
|
250
172
|
UFixed.unwrap(a) + MULTIPLIER_HALF,
|
251
173
|
1,
|
252
174
|
MULTIPLIER,
|
253
|
-
|
175
|
+
Math.Rounding.Floor
|
254
176
|
);
|
255
177
|
} else if (rounding == ROUNDING_DOWN()) {
|
256
178
|
return
|
257
|
-
|
179
|
+
Math.mulDiv(
|
258
180
|
UFixed.unwrap(a),
|
259
181
|
1,
|
260
182
|
MULTIPLIER,
|
261
|
-
|
183
|
+
Math.Rounding.Floor
|
262
184
|
);
|
263
185
|
} else {
|
264
186
|
return
|
265
|
-
|
187
|
+
Math.mulDiv(UFixed.unwrap(a), 1, MULTIPLIER, Math.Rounding.Ceil);
|
266
188
|
}
|
267
189
|
}
|
268
190
|
|
@@ -325,6 +247,14 @@ library UFixedLib {
|
|
325
247
|
return UFixed.wrap(0);
|
326
248
|
}
|
327
249
|
|
250
|
+
function one() public pure returns (UFixed) {
|
251
|
+
return UFixed.wrap(uint160(MULTIPLIER));
|
252
|
+
}
|
253
|
+
|
254
|
+
function max() public pure returns (UFixed) {
|
255
|
+
return UFixed.wrap(type(uint160).max);
|
256
|
+
}
|
257
|
+
|
328
258
|
/// @dev return the absolute delta between two UFixed numbers
|
329
259
|
function delta(UFixed a, UFixed b) public pure returns (UFixed) {
|
330
260
|
return deltaUFixed(a, b);
|
@@ -7,7 +7,11 @@ using {
|
|
7
7
|
versionPartGt as >,
|
8
8
|
versionPartEq as ==,
|
9
9
|
versionPartNe as !=,
|
10
|
-
VersionPartLib.
|
10
|
+
VersionPartLib.eqz,
|
11
|
+
VersionPartLib.gtz,
|
12
|
+
VersionPartLib.toInt,
|
13
|
+
VersionPartLib.toString,
|
14
|
+
VersionPartLib.isValidRelease
|
11
15
|
}
|
12
16
|
for VersionPart global;
|
13
17
|
|
@@ -16,8 +20,54 @@ function versionPartEq(VersionPart a, VersionPart b) pure returns(bool isSame) {
|
|
16
20
|
function versionPartNe(VersionPart a, VersionPart b) pure returns(bool isSame) { return VersionPart.unwrap(a) != VersionPart.unwrap(b); }
|
17
21
|
|
18
22
|
library VersionPartLib {
|
19
|
-
|
20
|
-
|
23
|
+
|
24
|
+
error ErrorReleaseTooBig(VersionPart releaseMax, VersionPart release);
|
25
|
+
|
26
|
+
function releaseMin() public pure returns (VersionPart) { return toVersionPart(3); }
|
27
|
+
function releaseMax() public pure returns (VersionPart) { return toVersionPart(99); }
|
28
|
+
|
29
|
+
function isValidRelease(VersionPart release) external pure returns(bool) {
|
30
|
+
uint256 releaseInt = VersionPart.unwrap(release);
|
31
|
+
return 3 <= releaseInt && releaseInt <= 99;
|
32
|
+
}
|
33
|
+
|
34
|
+
function toString(VersionPart a) external pure returns (string memory) {
|
35
|
+
if (a > releaseMax()) {
|
36
|
+
revert ErrorReleaseTooBig(releaseMax(), a);
|
37
|
+
}
|
38
|
+
|
39
|
+
uint256 value = VersionPart.unwrap(a);
|
40
|
+
if (value == 0) {
|
41
|
+
return "0";
|
42
|
+
}
|
43
|
+
|
44
|
+
uint256 temp = value;
|
45
|
+
uint256 digits = 0;
|
46
|
+
while (temp != 0) {
|
47
|
+
digits++;
|
48
|
+
temp /= 10;
|
49
|
+
}
|
50
|
+
|
51
|
+
bytes memory buffer = new bytes(digits);
|
52
|
+
uint index = digits - 1;
|
53
|
+
|
54
|
+
temp = value;
|
55
|
+
while (temp != 0) {
|
56
|
+
buffer[index] = bytes1(uint8(48 + temp % 10));
|
57
|
+
temp /= 10;
|
58
|
+
|
59
|
+
if (index > 0) {
|
60
|
+
index--;
|
61
|
+
}
|
62
|
+
}
|
63
|
+
|
64
|
+
return string(buffer);
|
65
|
+
}
|
66
|
+
|
67
|
+
function eqz(VersionPart a) external pure returns(bool) { return VersionPart.unwrap(a) == 0; }
|
68
|
+
function gtz(VersionPart a) external pure returns(bool) { return VersionPart.unwrap(a) > 0; }
|
69
|
+
function toInt(VersionPart a) external pure returns(uint256) { return VersionPart.unwrap(a); }
|
70
|
+
function toVersionPart(uint256 a) public pure returns(VersionPart) { return VersionPart.wrap(uint8(a)); }
|
21
71
|
}
|
22
72
|
|
23
73
|
type Version is uint24; // contains major,minor,patch version parts
|
@@ -36,6 +86,7 @@ function versionGt(Version a, Version b) pure returns(bool isGreaterThan) { retu
|
|
36
86
|
function versionEq(Version a, Version b) pure returns(bool isSame) { return Version.unwrap(a) == Version.unwrap(b); }
|
37
87
|
|
38
88
|
library VersionLib {
|
89
|
+
|
39
90
|
function toInt(Version version) external pure returns(uint) { return Version.unwrap(version); }
|
40
91
|
|
41
92
|
function toUint64(Version version) external pure returns(uint64) { return Version.unwrap(version); }
|
@@ -73,9 +124,9 @@ library VersionLib {
|
|
73
124
|
);
|
74
125
|
}
|
75
126
|
|
76
|
-
function toVersionPart(uint256 versionPart)
|
77
|
-
|
78
|
-
}
|
127
|
+
// function toVersionPart(uint256 versionPart) public pure returns(VersionPart) {
|
128
|
+
// return VersionPart.wrap(uint8(versionPart));
|
129
|
+
// }
|
79
130
|
|
80
131
|
function toVersion(
|
81
132
|
uint256 major,
|
@@ -1,17 +1,16 @@
|
|
1
1
|
// SPDX-License-Identifier: Apache-2.0
|
2
2
|
pragma solidity ^0.8.20;
|
3
3
|
|
4
|
+
import {ProxyAdmin} from "@openzeppelin/contracts/proxy/transparent/ProxyAdmin.sol";
|
4
5
|
import {ITransparentUpgradeableProxy} from "@openzeppelin/contracts/proxy/transparent/TransparentUpgradeableProxy.sol";
|
5
6
|
|
6
7
|
import {Blocknumber, blockNumber} from "../type/Blocknumber.sol";
|
7
8
|
import {IVersionable} from "./IVersionable.sol";
|
8
|
-
import {
|
9
|
-
import {
|
10
|
-
import {ProxyAdmin} from "@openzeppelin/contracts/proxy/transparent/ProxyAdmin.sol";
|
9
|
+
import {NftId} from "../type/NftId.sol";
|
10
|
+
import {NftOwnable} from "../shared/NftOwnable.sol";
|
11
11
|
import {Timestamp, TimestampLib} from "../type/Timestamp.sol";
|
12
12
|
import {UpgradableProxyWithAdmin} from "./UpgradableProxyWithAdmin.sol";
|
13
13
|
import {Version, VersionLib} from "../type/Version.sol";
|
14
|
-
import {NftId} from "../type/NftId.sol";
|
15
14
|
|
16
15
|
/// @dev manages proxy deployments for upgradable contracs of type IVersionable
|
17
16
|
contract ProxyManager is
|
@@ -19,11 +18,13 @@ contract ProxyManager is
|
|
19
18
|
{
|
20
19
|
|
21
20
|
struct VersionInfo {
|
22
|
-
|
21
|
+
// slot 0
|
23
22
|
address implementation;
|
24
|
-
address activatedBy;
|
25
23
|
Timestamp activatedAt;
|
26
24
|
Blocknumber activatedIn;
|
25
|
+
Version version;
|
26
|
+
// slot 1
|
27
|
+
address activatedBy;
|
27
28
|
}
|
28
29
|
|
29
30
|
event LogProxyManagerVersionableDeployed(address indexed proxy, address initialImplementation);
|
@@ -38,60 +39,71 @@ contract ProxyManager is
|
|
38
39
|
UpgradableProxyWithAdmin internal _proxy;
|
39
40
|
|
40
41
|
// state to keep version history
|
41
|
-
mapping(Version version => VersionInfo info) _versionHistory;
|
42
|
-
Version [] _versions;
|
42
|
+
mapping(Version version => VersionInfo info) internal _versionHistory;
|
43
|
+
Version [] internal _versions;
|
43
44
|
|
44
|
-
/// @dev
|
45
|
-
|
46
|
-
|
47
|
-
|
48
|
-
|
49
|
-
|
50
|
-
|
45
|
+
/// @dev convencience initializer
|
46
|
+
function initialize(
|
47
|
+
address registry,
|
48
|
+
address implementation,
|
49
|
+
bytes memory data,
|
50
|
+
bytes32 salt
|
51
|
+
)
|
51
52
|
public
|
52
53
|
initializer()
|
54
|
+
returns (IVersionable versionable)
|
53
55
|
{
|
54
|
-
|
56
|
+
versionable = deployDetermenistic(
|
57
|
+
registry,
|
58
|
+
implementation,
|
59
|
+
data,
|
60
|
+
salt);
|
55
61
|
}
|
56
62
|
|
57
63
|
/// @dev deploy initial contract
|
58
|
-
function deploy(
|
64
|
+
function deploy(
|
65
|
+
address registry,
|
66
|
+
address initialImplementation,
|
67
|
+
bytes memory initializationData
|
68
|
+
)
|
59
69
|
public
|
60
70
|
virtual
|
61
|
-
|
71
|
+
onlyInitializing()
|
62
72
|
returns (IVersionable versionable)
|
63
73
|
{
|
64
|
-
|
65
|
-
|
66
|
-
|
74
|
+
(
|
75
|
+
address currentProxyOwner,
|
76
|
+
address initialProxyAdminOwner
|
77
|
+
) = _preDeployChecksAndSetup(registry);
|
67
78
|
|
68
|
-
address currentProxyOwner = getOwner(); // used by implementation
|
69
|
-
address initialProxyAdminOwner = address(this); // used by proxy
|
70
|
-
|
71
79
|
_proxy = new UpgradableProxyWithAdmin(
|
72
80
|
initialImplementation,
|
73
81
|
initialProxyAdminOwner,
|
74
82
|
getDeployData(currentProxyOwner, initializationData)
|
75
83
|
);
|
76
84
|
|
77
|
-
versionable =
|
78
|
-
|
85
|
+
versionable = _updateVersionHistory(
|
86
|
+
initialImplementation,
|
87
|
+
currentProxyOwner);
|
79
88
|
|
80
|
-
emit LogProxyManagerVersionableDeployed(address(
|
89
|
+
emit LogProxyManagerVersionableDeployed(address(versionable), initialImplementation);
|
81
90
|
}
|
82
91
|
|
83
|
-
function deployDetermenistic(
|
92
|
+
function deployDetermenistic(
|
93
|
+
address registry,
|
94
|
+
address initialImplementation,
|
95
|
+
bytes memory initializationData,
|
96
|
+
bytes32 salt
|
97
|
+
)
|
84
98
|
public
|
85
99
|
virtual
|
86
|
-
|
100
|
+
onlyInitializing()
|
87
101
|
returns (IVersionable versionable)
|
88
102
|
{
|
89
|
-
|
90
|
-
|
91
|
-
|
92
|
-
|
93
|
-
address currentProxyOwner = getOwner();
|
94
|
-
address initialProxyAdminOwner = address(this);
|
103
|
+
(
|
104
|
+
address currentProxyOwner,
|
105
|
+
address initialProxyAdminOwner
|
106
|
+
) = _preDeployChecksAndSetup(registry);
|
95
107
|
|
96
108
|
_proxy = new UpgradableProxyWithAdmin{salt: salt}(
|
97
109
|
initialImplementation,
|
@@ -99,10 +111,11 @@ contract ProxyManager is
|
|
99
111
|
getDeployData(currentProxyOwner, initializationData)
|
100
112
|
);
|
101
113
|
|
102
|
-
versionable =
|
103
|
-
|
114
|
+
versionable = _updateVersionHistory(
|
115
|
+
initialImplementation,
|
116
|
+
currentProxyOwner);
|
104
117
|
|
105
|
-
emit LogProxyManagerVersionableDeployed(address(
|
118
|
+
emit LogProxyManagerVersionableDeployed(address(versionable), initialImplementation);
|
106
119
|
}
|
107
120
|
|
108
121
|
/// @dev upgrade existing contract
|
@@ -125,10 +138,11 @@ contract ProxyManager is
|
|
125
138
|
newImplementation,
|
126
139
|
getUpgradeData(upgradeData));
|
127
140
|
|
128
|
-
versionable =
|
129
|
-
|
141
|
+
versionable = _updateVersionHistory(
|
142
|
+
newImplementation,
|
143
|
+
currentProxyOwner);
|
130
144
|
|
131
|
-
emit LogProxyManagerVersionableUpgraded(address(
|
145
|
+
emit LogProxyManagerVersionableUpgraded(address(versionable), newImplementation);
|
132
146
|
|
133
147
|
}
|
134
148
|
|
@@ -169,13 +183,34 @@ contract ProxyManager is
|
|
169
183
|
return _versionHistory[_version];
|
170
184
|
}
|
171
185
|
|
186
|
+
function _preDeployChecksAndSetup(address registry)
|
187
|
+
private
|
188
|
+
returns (
|
189
|
+
address currentProxyOwner,
|
190
|
+
address initialProxyAdminOwner
|
191
|
+
)
|
192
|
+
{
|
193
|
+
if (_versions.length > 0) {
|
194
|
+
revert ErrorProxyManagerAlreadyDeployed();
|
195
|
+
}
|
196
|
+
|
197
|
+
address initialOwner = msg.sender;
|
198
|
+
__NftOwnable_init(registry, initialOwner);
|
199
|
+
|
200
|
+
currentProxyOwner = getOwner(); // used by implementation
|
201
|
+
initialProxyAdminOwner = address(this); // used by proxy
|
202
|
+
}
|
203
|
+
|
172
204
|
function _updateVersionHistory(
|
173
|
-
Version newVersion,
|
174
205
|
address implementation,
|
175
206
|
address activatedBy
|
176
207
|
)
|
177
208
|
private
|
209
|
+
returns (IVersionable versionable)
|
178
210
|
{
|
211
|
+
versionable = IVersionable(address(_proxy));
|
212
|
+
Version newVersion = versionable.getVersion();
|
213
|
+
|
179
214
|
if(newVersion == VersionLib.zeroVersion()) {
|
180
215
|
revert ErrorProxyManagerZeroVersion();
|
181
216
|
}
|
@@ -188,12 +223,12 @@ contract ProxyManager is
|
|
188
223
|
|
189
224
|
// update version history
|
190
225
|
_versions.push(newVersion);
|
191
|
-
_versionHistory[newVersion] = VersionInfo(
|
192
|
-
newVersion,
|
193
|
-
implementation,
|
194
|
-
activatedBy,
|
195
|
-
TimestampLib.blockTimestamp(),
|
196
|
-
blockNumber()
|
197
|
-
);
|
226
|
+
_versionHistory[newVersion] = VersionInfo({
|
227
|
+
version: newVersion,
|
228
|
+
implementation: implementation,
|
229
|
+
activatedBy: activatedBy,
|
230
|
+
activatedAt: TimestampLib.blockTimestamp(),
|
231
|
+
activatedIn: blockNumber()
|
232
|
+
});
|
198
233
|
}
|
199
234
|
}
|
@@ -2,15 +2,19 @@
|
|
2
2
|
pragma solidity ^0.8.20;
|
3
3
|
|
4
4
|
import {ProxyAdmin} from "@openzeppelin/contracts/proxy/transparent/ProxyAdmin.sol";
|
5
|
-
import {TransparentUpgradeableProxy
|
6
|
-
|
7
|
-
import {IVersionable} from "./IVersionable.sol";
|
5
|
+
import {TransparentUpgradeableProxy} from "@openzeppelin/contracts/proxy/transparent/TransparentUpgradeableProxy.sol";
|
8
6
|
|
9
7
|
contract UpgradableProxyWithAdmin is TransparentUpgradeableProxy {
|
10
8
|
|
9
|
+
bytes internal _initializationData;
|
10
|
+
|
11
11
|
constructor(address implementation, address initialProxyAdminOwner, bytes memory data)
|
12
12
|
TransparentUpgradeableProxy(implementation, initialProxyAdminOwner, data)
|
13
|
-
{
|
13
|
+
{
|
14
|
+
_initializationData = data;
|
15
|
+
}
|
14
16
|
|
15
17
|
function getProxyAdmin() external returns (ProxyAdmin) { return ProxyAdmin(_proxyAdmin()); }
|
18
|
+
|
19
|
+
function getInitializationData() external view returns (bytes memory) { return _initializationData; }
|
16
20
|
}
|
@@ -20,7 +20,7 @@ abstract contract Versionable is
|
|
20
20
|
bytes memory data
|
21
21
|
)
|
22
22
|
public
|
23
|
-
initializer
|
23
|
+
initializer()
|
24
24
|
{
|
25
25
|
_initialize(activatedBy, data);
|
26
26
|
}
|
@@ -39,9 +39,12 @@ abstract contract Versionable is
|
|
39
39
|
// IMPORTANT each version must implement this function
|
40
40
|
// each implementation MUST use onlyInitialising modifier
|
41
41
|
// each implementation MUST call intializers of all base contracts...
|
42
|
-
function _initialize(
|
42
|
+
function _initialize(
|
43
|
+
address, // owner
|
44
|
+
bytes memory // data
|
45
|
+
)
|
43
46
|
internal
|
44
|
-
onlyInitializing
|
47
|
+
onlyInitializing()
|
45
48
|
virtual
|
46
49
|
{
|
47
50
|
revert();
|
package/package.json
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
{
|
2
2
|
"name": "@etherisc/gif-next",
|
3
|
-
"version": "0.0.2-
|
3
|
+
"version": "0.0.2-f0ccf08-591",
|
4
4
|
"description": "This is the repository for the next version of the Generic Insurance Framework (GIF) smart contracts. ",
|
5
5
|
"main": "index.js",
|
6
6
|
"scripts": {
|
@@ -32,23 +32,24 @@
|
|
32
32
|
"@nomicfoundation/hardhat-foundry": "^1.1.1",
|
33
33
|
"@nomicfoundation/hardhat-toolbox": "^5.0.0",
|
34
34
|
"@nomicfoundation/hardhat-verify": "^2.0.1",
|
35
|
-
"@typescript-eslint/eslint-plugin": "^
|
36
|
-
"@typescript-eslint/parser": "^
|
35
|
+
"@typescript-eslint/eslint-plugin": "^8.1.0",
|
36
|
+
"@typescript-eslint/parser": "^8.1.0",
|
37
37
|
"antlr4ng-cli": "^2.0.0",
|
38
38
|
"dotenv": "^16.3.1",
|
39
|
-
"eslint": "^
|
39
|
+
"eslint": "^9.9.1",
|
40
40
|
"hardhat": "^2.17.2",
|
41
41
|
"prettier": "^3.0.3",
|
42
42
|
"prettier-plugin-solidity": "^1.1.3",
|
43
43
|
"typescript": "^5"
|
44
44
|
},
|
45
45
|
"dependencies": {
|
46
|
-
"@openzeppelin/contracts": "5.0.
|
47
|
-
"@openzeppelin/contracts-upgradeable": "5.0.
|
46
|
+
"@openzeppelin/contracts": "5.0.2",
|
47
|
+
"@openzeppelin/contracts-upgradeable": "5.0.2",
|
48
48
|
"@openzeppelin/upgrades-core": "^1.34.1",
|
49
49
|
"abi-coder": "^5.0.0",
|
50
50
|
"antlr4ng": "^3.0.4",
|
51
51
|
"ethers": "^6.7.1",
|
52
|
+
"ethers-decode-error": "^2.1.3",
|
52
53
|
"solidity-docgen": "^0.6.0-beta.36",
|
53
54
|
"winston": "^3.10.0"
|
54
55
|
}
|