@etherisc/gif-next 0.0.2-e769e2e-077 → 0.0.2-e7a5428-226
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 +133 -10
- package/artifacts/contracts/accounting/AccountingService.sol/AccountingService.dbg.json +4 -0
- package/artifacts/contracts/accounting/AccountingService.sol/AccountingService.json +1075 -0
- package/artifacts/contracts/accounting/AccountingServiceManager.sol/AccountingServiceManager.dbg.json +4 -0
- package/artifacts/contracts/accounting/AccountingServiceManager.sol/AccountingServiceManager.json +790 -0
- package/artifacts/contracts/accounting/IAccountingService.sol/IAccountingService.dbg.json +4 -0
- package/artifacts/contracts/accounting/IAccountingService.sol/IAccountingService.json +843 -0
- package/artifacts/contracts/authorization/AccessAdmin.sol/AccessAdmin.dbg.json +4 -0
- package/artifacts/contracts/authorization/AccessAdmin.sol/AccessAdmin.json +1664 -0
- 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 +4 -0
- package/artifacts/contracts/authorization/AccessManagerCloneable.sol/AccessManagerCloneable.json +1403 -0
- package/artifacts/contracts/authorization/Authorization.sol/Authorization.dbg.json +4 -0
- package/artifacts/contracts/authorization/Authorization.sol/Authorization.json +790 -0
- package/artifacts/contracts/authorization/IAccess.sol/IAccess.dbg.json +4 -0
- package/artifacts/contracts/authorization/IAccess.sol/IAccess.json +10 -0
- package/artifacts/contracts/authorization/IAccessAdmin.sol/IAccessAdmin.dbg.json +4 -0
- package/artifacts/contracts/authorization/IAccessAdmin.sol/IAccessAdmin.json +1372 -0
- package/artifacts/contracts/authorization/IAuthorization.sol/IAuthorization.dbg.json +4 -0
- package/artifacts/contracts/authorization/IAuthorization.sol/IAuthorization.json +455 -0
- package/artifacts/contracts/authorization/IServiceAuthorization.sol/IServiceAuthorization.dbg.json +4 -0
- package/artifacts/contracts/authorization/IServiceAuthorization.sol/IServiceAuthorization.json +397 -0
- package/artifacts/contracts/authorization/ServiceAuthorization.sol/ServiceAuthorization.dbg.json +4 -0
- package/artifacts/contracts/authorization/ServiceAuthorization.sol/ServiceAuthorization.json +646 -0
- package/artifacts/contracts/distribution/BasicDistribution.sol/BasicDistribution.dbg.json +4 -0
- package/artifacts/contracts/distribution/BasicDistribution.sol/BasicDistribution.json +1244 -0
- package/artifacts/contracts/distribution/BasicDistributionAuthorization.sol/BasicDistributionAuthorization.dbg.json +4 -0
- package/artifacts/contracts/distribution/BasicDistributionAuthorization.sol/BasicDistributionAuthorization.json +805 -0
- package/artifacts/contracts/distribution/Distribution.sol/Distribution.dbg.json +1 -1
- package/artifacts/contracts/distribution/Distribution.sol/Distribution.json +146 -607
- package/artifacts/contracts/distribution/DistributionService.sol/DistributionService.dbg.json +1 -1
- package/artifacts/contracts/distribution/DistributionService.sol/DistributionService.json +767 -301
- package/artifacts/contracts/distribution/DistributionServiceManager.sol/DistributionServiceManager.dbg.json +1 -1
- package/artifacts/contracts/distribution/DistributionServiceManager.sol/DistributionServiceManager.json +288 -118
- package/artifacts/contracts/distribution/IDistributionComponent.sol/IDistributionComponent.dbg.json +1 -1
- package/artifacts/contracts/distribution/IDistributionComponent.sol/IDistributionComponent.json +152 -273
- package/artifacts/contracts/distribution/IDistributionService.sol/IDistributionService.dbg.json +1 -1
- package/artifacts/contracts/distribution/IDistributionService.sol/IDistributionService.json +553 -77
- 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 +1484 -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 +2053 -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 +1439 -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 +1171 -0
- package/artifacts/contracts/examples/unpermissioned/SimplePool.sol/SimplePool.dbg.json +4 -0
- package/artifacts/contracts/examples/unpermissioned/SimplePool.sol/SimplePool.json +1647 -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 +2585 -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 +595 -96
- package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.dbg.json +1 -1
- package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.json +497 -75
- package/artifacts/contracts/instance/Instance.sol/Instance.dbg.json +1 -1
- package/artifacts/contracts/instance/Instance.sol/Instance.json +617 -250
- package/artifacts/contracts/instance/InstanceAdmin.sol/InstanceAdmin.dbg.json +4 -0
- package/artifacts/contracts/instance/InstanceAdmin.sol/InstanceAdmin.json +2349 -0
- package/artifacts/contracts/instance/InstanceAuthorizationV3.sol/InstanceAuthorizationV3.dbg.json +4 -0
- package/artifacts/contracts/instance/InstanceAuthorizationV3.sol/InstanceAuthorizationV3.json +902 -0
- package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.json +1789 -713
- package/artifacts/contracts/instance/InstanceService.sol/InstanceService.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceService.sol/InstanceService.json +509 -220
- package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.json +204 -96
- package/artifacts/contracts/instance/InstanceStore.sol/InstanceStore.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceStore.sol/InstanceStore.json +1109 -817
- package/artifacts/contracts/instance/RiskSet.sol/RiskSet.dbg.json +4 -0
- package/artifacts/contracts/instance/RiskSet.sol/RiskSet.json +866 -0
- package/artifacts/contracts/instance/base/BalanceStore.sol/BalanceStore.dbg.json +1 -1
- package/artifacts/contracts/instance/base/BalanceStore.sol/BalanceStore.json +8 -8
- package/artifacts/contracts/instance/base/Cloneable.sol/Cloneable.dbg.json +1 -1
- package/artifacts/contracts/instance/base/Cloneable.sol/Cloneable.json +0 -53
- package/artifacts/contracts/instance/base/ObjectCounter.sol/ObjectCounter.dbg.json +4 -0
- package/artifacts/contracts/instance/base/ObjectCounter.sol/ObjectCounter.json +10 -0
- package/artifacts/contracts/instance/base/ObjectLifecycle.sol/ObjectLifecycle.dbg.json +4 -0
- package/artifacts/contracts/instance/base/ObjectLifecycle.sol/ObjectLifecycle.json +223 -0
- 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 +4 -0
- package/artifacts/contracts/mock/Dip.sol/Dip.json +376 -0
- package/artifacts/contracts/oracle/BasicOracle.sol/BasicOracle.dbg.json +4 -0
- package/artifacts/contracts/oracle/BasicOracle.sol/BasicOracle.json +957 -0
- package/artifacts/contracts/oracle/BasicOracleAuthorization.sol/BasicOracleAuthorization.dbg.json +4 -0
- package/artifacts/contracts/oracle/BasicOracleAuthorization.sol/BasicOracleAuthorization.json +810 -0
- package/artifacts/contracts/oracle/IOracle.sol/IOracle.dbg.json +4 -0
- package/artifacts/contracts/oracle/IOracle.sol/IOracle.json +52 -0
- package/artifacts/contracts/oracle/IOracleComponent.sol/IOracleComponent.dbg.json +4 -0
- package/artifacts/contracts/oracle/IOracleComponent.sol/IOracleComponent.json +772 -0
- package/artifacts/contracts/oracle/IOracleService.sol/IOracleService.dbg.json +4 -0
- package/artifacts/contracts/oracle/IOracleService.sol/IOracleService.json +762 -0
- package/artifacts/contracts/oracle/Oracle.sol/Oracle.dbg.json +4 -0
- package/artifacts/contracts/oracle/Oracle.sol/Oracle.json +873 -0
- package/artifacts/contracts/oracle/OracleService.sol/OracleService.dbg.json +4 -0
- package/artifacts/contracts/oracle/OracleService.sol/OracleService.json +1042 -0
- package/artifacts/contracts/oracle/OracleServiceManager.sol/OracleServiceManager.dbg.json +4 -0
- package/artifacts/contracts/oracle/OracleServiceManager.sol/OracleServiceManager.json +810 -0
- package/artifacts/contracts/pool/BasicPool.sol/BasicPool.dbg.json +4 -0
- package/artifacts/contracts/pool/BasicPool.sol/BasicPool.json +1242 -0
- package/artifacts/contracts/pool/BasicPoolAuthorization.sol/BasicPoolAuthorization.dbg.json +4 -0
- package/artifacts/contracts/pool/BasicPoolAuthorization.sol/BasicPoolAuthorization.json +805 -0
- package/artifacts/contracts/pool/BundleService.sol/BundleService.dbg.json +1 -1
- package/artifacts/contracts/pool/BundleService.sol/BundleService.json +582 -235
- package/artifacts/contracts/pool/BundleServiceManager.sol/BundleServiceManager.dbg.json +1 -1
- package/artifacts/contracts/pool/BundleServiceManager.sol/BundleServiceManager.json +278 -96
- package/artifacts/contracts/pool/IBundleService.sol/IBundleService.dbg.json +1 -1
- package/artifacts/contracts/pool/IBundleService.sol/IBundleService.json +398 -49
- package/artifacts/contracts/pool/IPoolComponent.sol/IPoolComponent.dbg.json +1 -1
- package/artifacts/contracts/pool/IPoolComponent.sol/IPoolComponent.json +151 -394
- package/artifacts/contracts/pool/IPoolService.sol/IPoolService.dbg.json +1 -1
- package/artifacts/contracts/pool/IPoolService.sol/IPoolService.json +770 -365
- package/artifacts/contracts/pool/Pool.sol/Pool.dbg.json +1 -1
- package/artifacts/contracts/pool/Pool.sol/Pool.json +148 -682
- package/artifacts/contracts/pool/PoolLib.sol/PoolLib.dbg.json +4 -0
- package/artifacts/contracts/pool/PoolLib.sol/PoolLib.json +522 -0
- package/artifacts/contracts/pool/PoolService.sol/PoolService.dbg.json +1 -1
- package/artifacts/contracts/pool/PoolService.sol/PoolService.json +940 -518
- package/artifacts/contracts/pool/PoolServiceManager.sol/PoolServiceManager.dbg.json +1 -1
- package/artifacts/contracts/pool/PoolServiceManager.sol/PoolServiceManager.json +283 -97
- package/artifacts/contracts/product/ApplicationService.sol/ApplicationService.dbg.json +1 -1
- package/artifacts/contracts/product/ApplicationService.sol/ApplicationService.json +382 -166
- package/artifacts/contracts/product/ApplicationServiceManager.sol/ApplicationServiceManager.dbg.json +1 -1
- package/artifacts/contracts/product/ApplicationServiceManager.sol/ApplicationServiceManager.json +222 -92
- package/artifacts/contracts/product/BasicProduct.sol/BasicProduct.dbg.json +4 -0
- package/artifacts/contracts/product/BasicProduct.sol/BasicProduct.json +1159 -0
- package/artifacts/contracts/product/BasicProductAuthorization.sol/BasicProductAuthorization.dbg.json +4 -0
- package/artifacts/contracts/product/BasicProductAuthorization.sol/BasicProductAuthorization.json +805 -0
- package/artifacts/contracts/product/ClaimService.sol/ClaimService.dbg.json +1 -1
- package/artifacts/contracts/product/ClaimService.sol/ClaimService.json +502 -230
- package/artifacts/contracts/product/ClaimServiceManager.sol/ClaimServiceManager.dbg.json +1 -1
- package/artifacts/contracts/product/ClaimServiceManager.sol/ClaimServiceManager.json +251 -113
- package/artifacts/contracts/product/IApplicationService.sol/IApplicationService.dbg.json +1 -1
- package/artifacts/contracts/product/IApplicationService.sol/IApplicationService.json +320 -9
- package/artifacts/contracts/product/IClaimService.sol/IClaimService.dbg.json +1 -1
- package/artifacts/contracts/product/IClaimService.sol/IClaimService.json +369 -18
- package/artifacts/contracts/product/IPolicyService.sol/IPolicyService.dbg.json +1 -1
- package/artifacts/contracts/product/IPolicyService.sol/IPolicyService.json +436 -101
- package/artifacts/contracts/product/IPricingService.sol/IPricingService.dbg.json +1 -1
- package/artifacts/contracts/product/IPricingService.sol/IPricingService.json +202 -80
- package/artifacts/contracts/product/IProductComponent.sol/IProductComponent.dbg.json +1 -1
- package/artifacts/contracts/product/IProductComponent.sol/IProductComponent.json +291 -264
- package/artifacts/contracts/product/IRiskService.sol/IRiskService.dbg.json +4 -0
- package/artifacts/contracts/{shared/ComponentVerifyingService.sol/ComponentVerifyingService.json → product/IRiskService.sol/IRiskService.json} +295 -150
- package/artifacts/contracts/product/PolicyService.sol/PolicyService.dbg.json +1 -1
- package/artifacts/contracts/product/PolicyService.sol/PolicyService.json +564 -292
- 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 +259 -97
- package/artifacts/contracts/product/PricingService.sol/PricingService.dbg.json +1 -1
- package/artifacts/contracts/product/PricingService.sol/PricingService.json +262 -299
- package/artifacts/contracts/product/PricingServiceManager.sol/PricingServiceManager.dbg.json +1 -1
- package/artifacts/contracts/product/PricingServiceManager.sol/PricingServiceManager.json +220 -122
- package/artifacts/contracts/product/Product.sol/Product.dbg.json +1 -1
- package/artifacts/contracts/product/Product.sol/Product.json +322 -596
- package/artifacts/contracts/product/RiskService.sol/RiskService.dbg.json +4 -0
- package/artifacts/contracts/product/RiskService.sol/RiskService.json +873 -0
- package/artifacts/contracts/product/RiskServiceManager.sol/RiskServiceManager.dbg.json +4 -0
- package/artifacts/contracts/product/RiskServiceManager.sol/RiskServiceManager.json +774 -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 +454 -42
- package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.dbg.json +1 -1
- package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.json +275 -193
- 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 +806 -97
- package/artifacts/contracts/registry/RegistryAdmin.sol/RegistryAdmin.dbg.json +4 -0
- package/artifacts/contracts/registry/RegistryAdmin.sol/RegistryAdmin.json +2147 -0
- package/artifacts/contracts/registry/RegistryAuthorization.sol/RegistryAuthorization.dbg.json +4 -0
- package/artifacts/contracts/registry/RegistryAuthorization.sol/RegistryAuthorization.json +1061 -0
- package/artifacts/contracts/registry/RegistryService.sol/RegistryService.dbg.json +1 -1
- package/artifacts/contracts/registry/RegistryService.sol/RegistryService.json +320 -312
- package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.dbg.json +1 -1
- package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.json +206 -94
- 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 +4 -0
- package/artifacts/contracts/registry/ReleaseLifecycle.sol/ReleaseLifecycle.json +205 -0
- 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 +4 -0
- package/artifacts/contracts/registry/ServiceAuthorizationV3.sol/ServiceAuthorizationV3.json +683 -0
- package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.dbg.json +1 -1
- package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.json +257 -147
- package/artifacts/contracts/shared/Component.sol/Component.dbg.json +1 -1
- package/artifacts/contracts/shared/Component.sol/Component.json +92 -277
- package/artifacts/contracts/shared/ComponentService.sol/ComponentService.dbg.json +1 -1
- package/artifacts/contracts/shared/ComponentService.sol/ComponentService.json +632 -542
- package/artifacts/contracts/shared/ComponentServiceManager.sol/ComponentServiceManager.dbg.json +1 -1
- package/artifacts/contracts/shared/ComponentServiceManager.sol/ComponentServiceManager.json +241 -115
- 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 +99 -94
- package/artifacts/contracts/shared/IComponentService.sol/IComponentService.dbg.json +1 -1
- package/artifacts/contracts/shared/IComponentService.sol/IComponentService.json +549 -228
- package/artifacts/contracts/shared/IInstanceLinkedComponent.sol/IInstanceLinkedComponent.dbg.json +1 -1
- package/artifacts/contracts/shared/IInstanceLinkedComponent.sol/IInstanceLinkedComponent.json +138 -130
- package/artifacts/contracts/shared/IKeyValueStore.sol/IKeyValueStore.dbg.json +1 -1
- package/artifacts/contracts/shared/IKeyValueStore.sol/IKeyValueStore.json +51 -19
- package/artifacts/contracts/shared/ILifecycle.sol/ILifecycle.dbg.json +1 -1
- package/artifacts/contracts/shared/ILifecycle.sol/ILifecycle.json +34 -3
- package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.dbg.json +1 -1
- package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.json +42 -1
- package/artifacts/contracts/shared/IPolicyHolder.sol/IPolicyHolder.dbg.json +1 -1
- package/artifacts/contracts/shared/IPolicyHolder.sol/IPolicyHolder.json +16 -30
- package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.dbg.json +1 -1
- package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.json +173 -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 +103 -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 +131 -366
- package/artifacts/contracts/shared/KeyValueStore.sol/KeyValueStore.dbg.json +1 -1
- package/artifacts/contracts/shared/KeyValueStore.sol/KeyValueStore.json +61 -104
- package/artifacts/contracts/shared/Lifecycle.sol/Lifecycle.dbg.json +1 -1
- package/artifacts/contracts/shared/Lifecycle.sol/Lifecycle.json +42 -62
- 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 +45 -55
- package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.dbg.json +1 -1
- package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.json +20 -124
- package/artifacts/contracts/shared/Registerable.sol/Registerable.dbg.json +1 -1
- package/artifacts/contracts/shared/Registerable.sol/Registerable.json +148 -98
- 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 +96 -102
- 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 +1388 -635
- package/artifacts/contracts/staking/IStakingService.sol/IStakingService.dbg.json +1 -1
- package/artifacts/contracts/staking/IStakingService.sol/IStakingService.json +705 -103
- package/artifacts/contracts/staking/Staking.sol/Staking.dbg.json +1 -1
- package/artifacts/contracts/staking/Staking.sol/Staking.json +1703 -957
- package/artifacts/contracts/staking/StakingLib.sol/StakingLib.dbg.json +4 -0
- package/artifacts/contracts/staking/StakingLib.sol/StakingLib.json +470 -0
- package/artifacts/contracts/staking/StakingLifecycle.sol/StakingLifecycle.dbg.json +4 -0
- package/artifacts/contracts/staking/StakingLifecycle.sol/StakingLifecycle.json +205 -0
- package/artifacts/contracts/staking/StakingManager.sol/StakingManager.dbg.json +1 -1
- package/artifacts/contracts/staking/StakingManager.sol/StakingManager.json +274 -92
- package/artifacts/contracts/staking/StakingReader.sol/StakingReader.dbg.json +4 -0
- package/artifacts/contracts/staking/StakingReader.sol/StakingReader.json +544 -0
- package/artifacts/contracts/staking/StakingService.sol/StakingService.dbg.json +1 -1
- package/artifacts/contracts/staking/StakingService.sol/StakingService.json +751 -212
- package/artifacts/contracts/staking/StakingServiceManager.sol/StakingServiceManager.dbg.json +1 -1
- package/artifacts/contracts/staking/StakingServiceManager.sol/StakingServiceManager.json +215 -85
- package/artifacts/contracts/staking/StakingStore.sol/StakingStore.dbg.json +4 -0
- package/artifacts/contracts/staking/StakingStore.sol/StakingStore.json +2637 -0
- package/artifacts/contracts/staking/TargetManagerLib.sol/TargetManagerLib.dbg.json +4 -0
- package/artifacts/contracts/staking/TargetManagerLib.sol/TargetManagerLib.json +657 -0
- 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 +122 -5
- package/artifacts/contracts/type/Blocknumber.sol/BlocknumberLib.dbg.json +1 -1
- package/artifacts/contracts/type/Blocknumber.sol/BlocknumberLib.json +81 -17
- package/artifacts/contracts/type/ChainId.sol/ChainIdLib.dbg.json +4 -0
- package/artifacts/contracts/type/ChainId.sol/ChainIdLib.json +193 -0
- 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 +47 -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 +153 -4
- 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 +4 -0
- package/artifacts/contracts/type/RequestId.sol/RequestIdLib.json +204 -0
- 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 +121 -23
- package/artifacts/contracts/type/Seconds.sol/SecondsLib.dbg.json +1 -1
- package/artifacts/contracts/type/Seconds.sol/SecondsLib.json +167 -2
- package/artifacts/contracts/type/Selector.sol/SelectorLib.dbg.json +4 -0
- package/artifacts/contracts/type/Selector.sol/SelectorLib.json +148 -0
- package/artifacts/contracts/type/Selector.sol/SelectorSetLib.dbg.json +4 -0
- package/artifacts/contracts/type/Selector.sol/SelectorSetLib.json +10 -0
- 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 +4 -0
- package/artifacts/contracts/type/String.sol/StrLib.json +180 -0
- package/artifacts/contracts/type/Timestamp.sol/TimestampLib.dbg.json +1 -1
- package/artifacts/contracts/type/Timestamp.sol/TimestampLib.json +37 -5
- package/artifacts/contracts/type/UFixed.sol/UFixedLib.dbg.json +1 -1
- package/artifacts/contracts/type/UFixed.sol/UFixedLib.json +126 -33
- 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 +11 -1
- package/artifacts/contracts/upgradeability/ProxyManager.sol/ProxyManager.dbg.json +4 -0
- package/artifacts/contracts/upgradeability/ProxyManager.sol/ProxyManager.json +656 -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 +11 -1
- package/contracts/accounting/AccountingService.sol +274 -0
- package/contracts/accounting/AccountingServiceManager.sol +38 -0
- package/contracts/accounting/IAccountingService.sol +47 -0
- package/contracts/authorization/AccessAdmin.sol +780 -0
- package/contracts/authorization/AccessAdminLib.sol +396 -0
- package/contracts/authorization/AccessManagerCloneable.sol +158 -0
- package/contracts/authorization/Authorization.sol +169 -0
- package/contracts/authorization/IAccess.sol +67 -0
- package/contracts/authorization/IAccessAdmin.sol +144 -0
- package/contracts/authorization/IAuthorization.sol +26 -0
- package/contracts/authorization/IServiceAuthorization.sol +78 -0
- package/contracts/authorization/ServiceAuthorization.sol +320 -0
- package/contracts/distribution/BasicDistribution.sol +141 -0
- package/contracts/distribution/BasicDistributionAuthorization.sol +67 -0
- package/contracts/distribution/Distribution.sol +126 -142
- package/contracts/distribution/DistributionService.sol +288 -137
- package/contracts/distribution/DistributionServiceManager.sol +13 -25
- package/contracts/distribution/IDistributionComponent.sol +22 -43
- package/contracts/distribution/IDistributionService.sol +61 -27
- 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 +437 -0
- package/contracts/examples/unpermissioned/SimpleProductAuthorization.sol +28 -0
- package/contracts/instance/BundleSet.sol +130 -0
- package/contracts/instance/IInstance.sol +117 -49
- package/contracts/instance/IInstanceService.sol +80 -46
- package/contracts/instance/Instance.sol +252 -133
- package/contracts/instance/InstanceAdmin.sol +383 -0
- package/contracts/instance/InstanceAuthorizationV3.sol +266 -0
- package/contracts/instance/InstanceReader.sol +499 -233
- package/contracts/instance/InstanceService.sol +370 -218
- package/contracts/instance/InstanceServiceManager.sol +14 -29
- package/contracts/instance/InstanceStore.sol +94 -55
- package/contracts/instance/RiskSet.sol +126 -0
- package/contracts/instance/base/BalanceStore.sol +16 -13
- package/contracts/instance/base/Cloneable.sol +2 -25
- package/contracts/instance/base/ObjectCounter.sol +20 -0
- package/contracts/instance/base/ObjectLifecycle.sol +109 -0
- 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 +26 -0
- package/contracts/oracle/BasicOracle.sol +45 -0
- package/contracts/oracle/BasicOracleAuthorization.sol +53 -0
- package/contracts/oracle/IOracle.sol +41 -0
- package/contracts/oracle/IOracleComponent.sol +33 -0
- package/contracts/oracle/IOracleService.sol +66 -0
- package/contracts/oracle/Oracle.sol +154 -0
- package/contracts/oracle/OracleService.sol +310 -0
- package/contracts/oracle/OracleServiceManager.sol +39 -0
- package/contracts/pool/BasicPool.sol +162 -0
- package/contracts/pool/BasicPoolAuthorization.sol +81 -0
- package/contracts/pool/BundleService.sol +225 -152
- package/contracts/pool/BundleServiceManager.sol +13 -25
- package/contracts/pool/IBundleService.sol +44 -34
- package/contracts/pool/IPoolComponent.sol +20 -70
- package/contracts/pool/IPoolService.sol +99 -76
- package/contracts/pool/Pool.sol +198 -164
- package/contracts/pool/PoolLib.sol +341 -0
- package/contracts/pool/PoolService.sol +448 -255
- package/contracts/pool/PoolServiceManager.sol +12 -24
- package/contracts/product/ApplicationService.sol +160 -86
- package/contracts/product/ApplicationServiceManager.sol +12 -9
- package/contracts/product/BasicProduct.sol +49 -0
- package/contracts/product/BasicProductAuthorization.sol +63 -0
- package/contracts/product/ClaimService.sol +389 -195
- package/contracts/product/ClaimServiceManager.sol +12 -9
- package/contracts/product/IApplicationService.sol +30 -4
- package/contracts/product/IClaimService.sol +52 -9
- package/contracts/product/IPolicyService.sol +62 -38
- package/contracts/product/IPricingService.sol +12 -11
- package/contracts/product/IProductComponent.sol +29 -9
- package/contracts/product/IRiskService.sol +48 -0
- package/contracts/product/PolicyService.sol +450 -276
- package/contracts/product/PolicyServiceLib.sol +139 -0
- package/contracts/product/PolicyServiceManager.sol +12 -27
- package/contracts/product/PricingService.sol +97 -91
- package/contracts/product/PricingServiceManager.sol +12 -24
- package/contracts/product/Product.sol +263 -147
- package/contracts/product/RiskService.sol +190 -0
- package/contracts/product/RiskServiceManager.sol +39 -0
- package/contracts/registry/ChainNft.sol +72 -39
- package/contracts/registry/IRegistry.sol +99 -38
- package/contracts/registry/IRegistryService.sol +26 -43
- package/contracts/registry/IRelease.sol +29 -0
- package/contracts/registry/ITransferInterceptor.sol +1 -2
- package/contracts/registry/Registry.sol +439 -232
- package/contracts/registry/RegistryAdmin.sol +188 -0
- package/contracts/registry/RegistryAuthorization.sol +309 -0
- package/contracts/registry/RegistryService.sol +66 -152
- package/contracts/registry/RegistryServiceManager.sol +23 -30
- package/contracts/registry/ReleaseAdmin.sol +195 -0
- package/contracts/registry/ReleaseLifecycle.sol +32 -0
- package/contracts/registry/ReleaseRegistry.sol +525 -0
- package/contracts/registry/ServiceAuthorizationV3.sol +342 -0
- package/contracts/registry/TokenRegistry.sol +211 -81
- package/contracts/shared/Component.sol +71 -143
- package/contracts/shared/ComponentService.sol +460 -369
- package/contracts/shared/ComponentServiceManager.sol +10 -7
- package/contracts/shared/ContractLib.sol +312 -0
- package/contracts/shared/IComponent.sol +7 -23
- package/contracts/shared/IComponentService.sol +51 -31
- package/contracts/shared/IInstanceLinkedComponent.sol +10 -26
- package/contracts/shared/IKeyValueStore.sol +3 -2
- package/contracts/shared/ILifecycle.sol +3 -2
- package/contracts/shared/INftOwnable.sol +5 -1
- package/contracts/shared/IPolicyHolder.sol +12 -17
- package/contracts/shared/IRegisterable.sol +22 -1
- package/contracts/shared/IService.sol +11 -6
- package/contracts/shared/{ERC165.sol → InitializableERC165.sol} +12 -4
- package/contracts/shared/InstanceLinkedComponent.sol +95 -46
- package/contracts/shared/KeyValueStore.sol +32 -70
- package/contracts/shared/Lifecycle.sol +30 -63
- package/contracts/shared/NftIdSet.sol +65 -0
- package/contracts/shared/NftOwnable.sol +35 -24
- package/contracts/shared/PolicyHolder.sol +19 -50
- package/contracts/shared/Registerable.sol +52 -21
- package/contracts/shared/RegistryLinked.sol +9 -14
- package/contracts/shared/Service.sol +32 -42
- package/contracts/shared/TokenHandler.sol +310 -26
- package/contracts/shared/TokenHandlerDeployerLib.sol +20 -0
- package/contracts/staking/IStaking.sol +229 -42
- package/contracts/staking/IStakingService.sol +98 -76
- package/contracts/staking/Staking.sol +633 -99
- package/contracts/staking/StakingLib.sol +195 -0
- package/contracts/staking/StakingLifecycle.sol +23 -0
- package/contracts/staking/StakingManager.sol +25 -20
- package/contracts/staking/StakingReader.sol +151 -0
- package/contracts/staking/StakingService.sol +174 -53
- package/contracts/staking/StakingServiceManager.sol +13 -8
- package/contracts/staking/StakingStore.sol +973 -0
- package/contracts/staking/TargetManagerLib.sol +211 -0
- package/contracts/type/AddressSet.sol +1 -1
- package/contracts/type/Amount.sol +43 -3
- package/contracts/type/Blocknumber.sol +34 -16
- package/contracts/type/ChainId.sol +101 -0
- package/contracts/type/ClaimId.sol +6 -1
- package/contracts/type/Fee.sol +9 -9
- package/contracts/type/Key32.sol +2 -2
- package/contracts/type/Key32Set.sol +62 -0
- package/contracts/type/NftId.sol +16 -4
- package/contracts/type/NftIdSet.sol +1 -1
- package/contracts/type/ObjectType.sol +204 -62
- package/contracts/type/PayoutId.sol +10 -10
- package/contracts/type/Referral.sol +2 -1
- package/contracts/type/RequestId.sol +75 -0
- package/contracts/type/RiskId.sol +39 -7
- package/contracts/type/RoleId.sol +122 -80
- package/contracts/type/Seconds.sol +62 -1
- package/contracts/type/Selector.sol +107 -0
- package/contracts/type/StateId.sol +41 -2
- package/contracts/type/String.sol +65 -0
- package/contracts/type/Timestamp.sol +20 -9
- package/contracts/type/UFixed.sol +62 -125
- package/contracts/type/Version.sol +58 -7
- package/contracts/{shared → upgradeability}/IVersionable.sol +3 -0
- package/contracts/{shared → upgradeability}/ProxyManager.sol +115 -38
- package/contracts/upgradeability/UpgradableProxyWithAdmin.sol +24 -0
- package/contracts/{shared → upgradeability}/Versionable.sol +8 -5
- package/package.json +12 -8
- package/artifacts/contracts/instance/BundleManager.sol/BundleManager.dbg.json +0 -4
- package/artifacts/contracts/instance/BundleManager.sol/BundleManager.json +0 -778
- package/artifacts/contracts/instance/InstanceAccessManager.sol/InstanceAccessManager.dbg.json +0 -4
- package/artifacts/contracts/instance/InstanceAccessManager.sol/InstanceAccessManager.json +0 -1348
- package/artifacts/contracts/instance/InstanceAuthorizationsLib.sol/InstanceAuthorizationsLib.dbg.json +0 -4
- package/artifacts/contracts/instance/InstanceAuthorizationsLib.sol/InstanceAuthorizationsLib.json +0 -132
- package/artifacts/contracts/instance/base/ObjectManager.sol/ObjectManager.dbg.json +0 -4
- package/artifacts/contracts/instance/base/ObjectManager.sol/ObjectManager.json +0 -256
- package/artifacts/contracts/instance/module/IAccess.sol/IAccess.dbg.json +0 -4
- package/artifacts/contracts/instance/module/IAccess.sol/IAccess.json +0 -237
- package/artifacts/contracts/product/IProductService.sol/IProductService.dbg.json +0 -4
- package/artifacts/contracts/product/IProductService.sol/IProductService.json +0 -381
- package/artifacts/contracts/product/ProductService.sol/ProductService.dbg.json +0 -4
- package/artifacts/contracts/product/ProductService.sol/ProductService.json +0 -673
- package/artifacts/contracts/product/ProductServiceManager.sol/ProductServiceManager.dbg.json +0 -4
- package/artifacts/contracts/product/ProductServiceManager.sol/ProductServiceManager.json +0 -636
- package/artifacts/contracts/registry/RegistryAccessManager.sol/RegistryAccessManager.dbg.json +0 -4
- package/artifacts/contracts/registry/RegistryAccessManager.sol/RegistryAccessManager.json +0 -308
- package/artifacts/contracts/registry/ReleaseManager.sol/ReleaseManager.dbg.json +0 -4
- package/artifacts/contracts/registry/ReleaseManager.sol/ReleaseManager.json +0 -688
- package/artifacts/contracts/registry/ServiceAuthorizationsLib.sol/ServiceAuthorizationsLib.dbg.json +0 -4
- package/artifacts/contracts/registry/ServiceAuthorizationsLib.sol/ServiceAuthorizationsLib.json +0 -137
- package/artifacts/contracts/shared/AccessManagerUpgradeableInitializeable.sol/AccessManagerUpgradeableInitializeable.dbg.json +0 -4
- package/artifacts/contracts/shared/AccessManagerUpgradeableInitializeable.sol/AccessManagerUpgradeableInitializeable.json +0 -1206
- 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/ProxyManager.sol/ProxyManager.dbg.json +0 -4
- package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.json +0 -569
- 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/type/UFixed.sol/MathLib.dbg.json +0 -4
- package/artifacts/contracts/type/UFixed.sol/MathLib.json +0 -10
- package/contracts/instance/BundleManager.sol +0 -126
- package/contracts/instance/InstanceAccessManager.sol +0 -543
- package/contracts/instance/InstanceAuthorizationsLib.sol +0 -336
- package/contracts/instance/base/ObjectManager.sol +0 -82
- package/contracts/instance/module/IAccess.sol +0 -54
- package/contracts/product/IProductService.sol +0 -33
- package/contracts/product/ProductService.sol +0 -122
- package/contracts/product/ProductServiceManager.sol +0 -54
- package/contracts/registry/RegistryAccessManager.sol +0 -213
- package/contracts/registry/ReleaseManager.sol +0 -375
- package/contracts/registry/ServiceAuthorizationsLib.sol +0 -173
- package/contracts/shared/AccessManagerUpgradeableInitializeable.sol +0 -13
- package/contracts/shared/ComponentVerifyingService.sol +0 -111
- package/contracts/shared/UpgradableProxyWithAdmin.sol +0 -16
@@ -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,8 +17,11 @@ using {
|
|
15
17
|
lteUFixed as <=,
|
16
18
|
eqUFixed as ==,
|
17
19
|
neUFixed as !=,
|
20
|
+
UFixedLib.gt,
|
21
|
+
UFixedLib.eqz,
|
22
|
+
UFixedLib.gtz,
|
18
23
|
UFixedLib.toInt,
|
19
|
-
UFixedLib.
|
24
|
+
UFixedLib.toInt1000
|
20
25
|
} for UFixed global;
|
21
26
|
|
22
27
|
// TODO move to UFixedLib and rename to zero()
|
@@ -29,20 +34,24 @@ function addUFixed(UFixed a, UFixed b) pure returns (UFixed) {
|
|
29
34
|
}
|
30
35
|
|
31
36
|
function subUFixed(UFixed a, UFixed b) pure returns (UFixed) {
|
32
|
-
|
37
|
+
if (a < b) {
|
38
|
+
revert UFixedLib.UFixedLibNegativeResult();
|
39
|
+
}
|
33
40
|
return UFixed.wrap(UFixed.unwrap(a) - UFixed.unwrap(b));
|
34
41
|
}
|
35
42
|
|
36
43
|
function mulUFixed(UFixed a, UFixed b) pure returns (UFixed) {
|
37
44
|
return
|
38
|
-
UFixed.wrap(
|
45
|
+
UFixed.wrap(uint160(Math.mulDiv(UFixed.unwrap(a), UFixed.unwrap(b), 10 ** 15)));
|
39
46
|
}
|
40
47
|
|
41
48
|
function divUFixed(UFixed a, UFixed b) pure returns (UFixed) {
|
42
|
-
|
43
|
-
|
49
|
+
if (UFixed.unwrap(b) == 0) {
|
50
|
+
revert UFixedLib.UFixedLibDivisionByZero();
|
51
|
+
}
|
52
|
+
|
44
53
|
return
|
45
|
-
UFixed.wrap(
|
54
|
+
UFixed.wrap(uint160(Math.mulDiv(UFixed.unwrap(a), 10 ** 15, UFixed.unwrap(b))));
|
46
55
|
}
|
47
56
|
|
48
57
|
function gtUFixed(UFixed a, UFixed b) pure returns (bool isGreaterThan) {
|
@@ -85,116 +94,16 @@ function deltaUFixed(UFixed a, UFixed b) pure returns (UFixed) {
|
|
85
94
|
return b - a;
|
86
95
|
}
|
87
96
|
|
88
|
-
|
89
|
-
|
90
|
-
|
91
|
-
enum Rounding {
|
92
|
-
Down, // Toward negative infinity
|
93
|
-
Up, // Toward infinity
|
94
|
-
Zero // Toward zero
|
95
|
-
}
|
96
|
-
|
97
|
-
/**
|
98
|
-
* @notice Calculates floor(x * y / denominator) with full precision. Throws if result overflows a uint256 or denominator == 0
|
99
|
-
* @dev Original credit to Remco Bloemen under MIT license (https://xn--2-umb.com/21/muldiv)
|
100
|
-
* with further edits by Uniswap Labs also under MIT license.
|
101
|
-
*/
|
102
|
-
function mulDiv(uint256 x, uint256 y, uint256 denominator) internal pure returns (uint256 result) {
|
103
|
-
unchecked {
|
104
|
-
// 512-bit multiply [prod1 prod0] = x * y. Compute the product mod 2^256 and mod 2^256 - 1, then use
|
105
|
-
// use the Chinese Remainder Theorem to reconstruct the 512 bit result. The result is stored in two 256
|
106
|
-
// variables such that product = prod1 * 2^256 + prod0.
|
107
|
-
uint256 prod0; // Least significant 256 bits of the product
|
108
|
-
uint256 prod1; // Most significant 256 bits of the product
|
109
|
-
assembly {
|
110
|
-
let mm := mulmod(x, y, not(0))
|
111
|
-
prod0 := mul(x, y)
|
112
|
-
prod1 := sub(sub(mm, prod0), lt(mm, prod0))
|
113
|
-
}
|
114
|
-
|
115
|
-
// Handle non-overflow cases, 256 by 256 division.
|
116
|
-
if (prod1 == 0) {
|
117
|
-
// Solidity will revert if denominator == 0, unlike the div opcode on its own.
|
118
|
-
// The surrounding unchecked block does not change this fact.
|
119
|
-
// See https://docs.soliditylang.org/en/latest/control-structures.html#checked-or-unchecked-arithmetic.
|
120
|
-
return prod0 / denominator;
|
121
|
-
}
|
122
|
-
|
123
|
-
// Make sure the result is less than 2^256. Also prevents denominator == 0.
|
124
|
-
require(denominator > prod1, "Math: mulDiv overflow");
|
125
|
-
|
126
|
-
///////////////////////////////////////////////
|
127
|
-
// 512 by 256 division.
|
128
|
-
///////////////////////////////////////////////
|
129
|
-
|
130
|
-
// Make division exact by subtracting the remainder from [prod1 prod0].
|
131
|
-
uint256 remainder;
|
132
|
-
assembly {
|
133
|
-
// Compute remainder using mulmod.
|
134
|
-
remainder := mulmod(x, y, denominator)
|
135
|
-
|
136
|
-
// Subtract 256 bit number from 512 bit number.
|
137
|
-
prod1 := sub(prod1, gt(remainder, prod0))
|
138
|
-
prod0 := sub(prod0, remainder)
|
139
|
-
}
|
140
|
-
|
141
|
-
// Factor powers of two out of denominator and compute largest power of two divisor of denominator. Always >= 1.
|
142
|
-
// See https://cs.stackexchange.com/q/138556/92363.
|
143
|
-
|
144
|
-
// Does not overflow because the denominator cannot be zero at this stage in the function.
|
145
|
-
uint256 twos = denominator & (~denominator + 1);
|
146
|
-
assembly {
|
147
|
-
// Divide denominator by twos.
|
148
|
-
denominator := div(denominator, twos)
|
149
|
-
|
150
|
-
// Divide [prod1 prod0] by twos.
|
151
|
-
prod0 := div(prod0, twos)
|
152
|
-
|
153
|
-
// Flip twos such that it is 2^256 / twos. If twos is zero, then it becomes one.
|
154
|
-
twos := add(div(sub(0, twos), twos), 1)
|
155
|
-
}
|
156
|
-
|
157
|
-
// Shift in bits from prod1 into prod0.
|
158
|
-
prod0 |= prod1 * twos;
|
159
|
-
|
160
|
-
// Invert denominator mod 2^256. Now that denominator is an odd number, it has an inverse modulo 2^256 such
|
161
|
-
// that denominator * inv = 1 mod 2^256. Compute the inverse by starting with a seed that is correct for
|
162
|
-
// four bits. That is, denominator * inv = 1 mod 2^4.
|
163
|
-
uint256 inverse = (3 * denominator) ^ 2;
|
164
|
-
|
165
|
-
// Use the Newton-Raphson iteration to improve the precision. Thanks to Hensel's lifting lemma, this also works
|
166
|
-
// in modular arithmetic, doubling the correct bits in each step.
|
167
|
-
inverse *= 2 - denominator * inverse; // inverse mod 2^8
|
168
|
-
inverse *= 2 - denominator * inverse; // inverse mod 2^16
|
169
|
-
inverse *= 2 - denominator * inverse; // inverse mod 2^32
|
170
|
-
inverse *= 2 - denominator * inverse; // inverse mod 2^64
|
171
|
-
inverse *= 2 - denominator * inverse; // inverse mod 2^128
|
172
|
-
inverse *= 2 - denominator * inverse; // inverse mod 2^256
|
173
|
-
|
174
|
-
// Because the division is now exact we can divide by multiplying with the modular inverse of denominator.
|
175
|
-
// This will give us the correct result modulo 2^256. Since the preconditions guarantee that the outcome is
|
176
|
-
// less than 2^256, this is the final result. We don't need to compute the high bits of the result and prod1
|
177
|
-
// is no longer required.
|
178
|
-
result = prod0 * inverse;
|
179
|
-
return result;
|
180
|
-
}
|
181
|
-
}
|
97
|
+
library UFixedLib {
|
98
|
+
error UFixedLibNegativeResult();
|
99
|
+
error UFixedLibDivisionByZero();
|
182
100
|
|
183
|
-
|
184
|
-
|
185
|
-
*/
|
186
|
-
function mulDiv(uint256 x, uint256 y, uint256 denominator, Rounding rounding) internal pure returns (uint256) {
|
187
|
-
uint256 result = mulDiv(x, y, denominator);
|
188
|
-
if (rounding == Rounding.Up && mulmod(x, y, denominator) > 0) {
|
189
|
-
result += 1;
|
190
|
-
}
|
191
|
-
return result;
|
192
|
-
}
|
101
|
+
error UFixedLibExponentTooSmall(int8 exp);
|
102
|
+
error UFixedLibExponentTooLarge(int8 exp);
|
193
103
|
|
194
|
-
|
104
|
+
error UFixedLibNumberTooLarge(uint256 number);
|
195
105
|
|
196
|
-
|
197
|
-
int8 public constant EXP = 18;
|
106
|
+
int8 public constant EXP = 15;
|
198
107
|
uint256 public constant MULTIPLIER = 10 ** uint256(int256(EXP));
|
199
108
|
uint256 public constant MULTIPLIER_HALF = MULTIPLIER / 2;
|
200
109
|
|
@@ -213,17 +122,32 @@ library UFixedLib {
|
|
213
122
|
return uint8(2);
|
214
123
|
}
|
215
124
|
|
216
|
-
/// @dev Converts the uint256 to a UFixed.
|
125
|
+
/// @dev Converts the uint256 to a uint160 based UFixed.
|
126
|
+
/// This method reverts if the number is too large to fit in a uint160.
|
217
127
|
function toUFixed(uint256 a) public pure returns (UFixed) {
|
218
|
-
|
128
|
+
uint256 n = a * MULTIPLIER;
|
129
|
+
if (n > type(uint160).max) {
|
130
|
+
revert UFixedLibNumberTooLarge(a);
|
131
|
+
}
|
132
|
+
return UFixed.wrap(uint160(n));
|
219
133
|
}
|
220
134
|
|
221
135
|
/// @dev Converts the uint256 to a UFixed with given exponent.
|
222
136
|
function toUFixed(uint256 a, int8 exp) public pure returns (UFixed) {
|
223
|
-
|
224
|
-
|
137
|
+
if (EXP + exp < 0) {
|
138
|
+
revert UFixedLibExponentTooSmall(exp);
|
139
|
+
}
|
140
|
+
if (EXP + exp > 48) {
|
141
|
+
revert UFixedLibExponentTooLarge(exp);
|
142
|
+
}
|
143
|
+
|
144
|
+
uint256 n = a * 10 ** uint8(EXP + exp);
|
225
145
|
|
226
|
-
|
146
|
+
if (n > type(uint160).max) {
|
147
|
+
revert UFixedLibNumberTooLarge(n);
|
148
|
+
}
|
149
|
+
|
150
|
+
return UFixed.wrap(uint160(n));
|
227
151
|
}
|
228
152
|
|
229
153
|
/// @dev returns the decimals precision of the UFixed type
|
@@ -236,27 +160,32 @@ library UFixedLib {
|
|
236
160
|
return toIntWithRounding(a, ROUNDING_HALF_UP());
|
237
161
|
}
|
238
162
|
|
163
|
+
/// @dev Converts a UFixed to a uint256.
|
164
|
+
function toInt1000(UFixed a) public pure returns (uint256) {
|
165
|
+
return toIntWithRounding(toUFixed(1000) * a, ROUNDING_HALF_UP());
|
166
|
+
}
|
167
|
+
|
239
168
|
/// @dev Converts a UFixed to a uint256 with given rounding mode.
|
240
169
|
function toIntWithRounding(UFixed a, uint8 rounding) public pure returns (uint256) {
|
241
170
|
if (rounding == ROUNDING_HALF_UP()) {
|
242
171
|
return
|
243
|
-
|
172
|
+
Math.mulDiv(
|
244
173
|
UFixed.unwrap(a) + MULTIPLIER_HALF,
|
245
174
|
1,
|
246
175
|
MULTIPLIER,
|
247
|
-
|
176
|
+
Math.Rounding.Floor
|
248
177
|
);
|
249
178
|
} else if (rounding == ROUNDING_DOWN()) {
|
250
179
|
return
|
251
|
-
|
180
|
+
Math.mulDiv(
|
252
181
|
UFixed.unwrap(a),
|
253
182
|
1,
|
254
183
|
MULTIPLIER,
|
255
|
-
|
184
|
+
Math.Rounding.Floor
|
256
185
|
);
|
257
186
|
} else {
|
258
187
|
return
|
259
|
-
|
188
|
+
Math.mulDiv(UFixed.unwrap(a), 1, MULTIPLIER, Math.Rounding.Ceil);
|
260
189
|
}
|
261
190
|
}
|
262
191
|
|
@@ -319,6 +248,14 @@ library UFixedLib {
|
|
319
248
|
return UFixed.wrap(0);
|
320
249
|
}
|
321
250
|
|
251
|
+
function one() public pure returns (UFixed) {
|
252
|
+
return UFixed.wrap(uint160(MULTIPLIER));
|
253
|
+
}
|
254
|
+
|
255
|
+
function max() public pure returns (UFixed) {
|
256
|
+
return UFixed.wrap(type(uint160).max);
|
257
|
+
}
|
258
|
+
|
322
259
|
/// @dev return the absolute delta between two UFixed numbers
|
323
260
|
function delta(UFixed a, UFixed b) public pure returns (UFixed) {
|
324
261
|
return deltaUFixed(a, b);
|
@@ -1,5 +1,5 @@
|
|
1
1
|
// SPDX-License-Identifier: Apache-2.0
|
2
|
-
pragma solidity ^0.8.
|
2
|
+
pragma solidity ^0.8.20;
|
3
3
|
|
4
4
|
type VersionPart is uint8;
|
5
5
|
|
@@ -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,
|
@@ -28,6 +28,9 @@ import {Version} from "../type/Version.sol";
|
|
28
28
|
|
29
29
|
interface IVersionable {
|
30
30
|
|
31
|
+
error ErrorVersionableInitializeNotImplemented();
|
32
|
+
error ErrorVersionableUpgradeNotImplemented();
|
33
|
+
|
31
34
|
/**
|
32
35
|
* @dev IMPORTANT
|
33
36
|
* implementation MUST be guarded by initializer modifier
|
@@ -1,13 +1,13 @@
|
|
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";
|
@@ -18,11 +18,13 @@ contract ProxyManager is
|
|
18
18
|
{
|
19
19
|
|
20
20
|
struct VersionInfo {
|
21
|
-
|
21
|
+
// slot 0
|
22
22
|
address implementation;
|
23
|
-
address activatedBy;
|
24
23
|
Timestamp activatedAt;
|
25
24
|
Blocknumber activatedIn;
|
25
|
+
Version version;
|
26
|
+
// slot 1
|
27
|
+
address activatedBy;
|
26
28
|
}
|
27
29
|
|
28
30
|
event LogProxyManagerVersionableDeployed(address indexed proxy, address initialImplementation);
|
@@ -37,46 +39,95 @@ contract ProxyManager is
|
|
37
39
|
UpgradableProxyWithAdmin internal _proxy;
|
38
40
|
|
39
41
|
// state to keep version history
|
40
|
-
mapping(Version version => VersionInfo info) _versionHistory;
|
41
|
-
Version [] _versions;
|
42
|
-
|
43
|
-
/// @dev only used to capture proxy owner
|
44
|
-
constructor(address registry)
|
45
|
-
{
|
46
|
-
initializeProxyManager(registry);
|
47
|
-
}
|
42
|
+
mapping(Version version => VersionInfo info) internal _versionHistory;
|
43
|
+
Version [] internal _versions;
|
48
44
|
|
49
|
-
|
45
|
+
/// @dev convencience initializer
|
46
|
+
function initialize(
|
47
|
+
address registry,
|
48
|
+
address implementation,
|
49
|
+
bytes memory data,
|
50
|
+
bytes32 salt
|
51
|
+
)
|
50
52
|
public
|
51
53
|
initializer()
|
54
|
+
returns (IVersionable versionable)
|
52
55
|
{
|
53
|
-
|
56
|
+
versionable = deployDetermenistic(
|
57
|
+
registry,
|
58
|
+
implementation,
|
59
|
+
data,
|
60
|
+
salt);
|
54
61
|
}
|
55
62
|
|
56
63
|
/// @dev deploy initial contract
|
57
|
-
function deploy(
|
64
|
+
function deploy(
|
65
|
+
address registry,
|
66
|
+
address initialImplementation,
|
67
|
+
bytes memory initializationData
|
68
|
+
)
|
58
69
|
public
|
59
70
|
virtual
|
60
|
-
|
71
|
+
onlyInitializing()
|
61
72
|
returns (IVersionable versionable)
|
62
73
|
{
|
63
|
-
|
64
|
-
|
65
|
-
|
74
|
+
(
|
75
|
+
address currentProxyOwner,
|
76
|
+
address initialProxyAdminOwner
|
77
|
+
) = _preDeployChecksAndSetup(registry);
|
66
78
|
|
67
|
-
address currentProxyOwner = getOwner(); // used by implementation
|
68
|
-
address initialProxyAdminOwner = address(this); // used by proxy
|
69
|
-
|
70
79
|
_proxy = new UpgradableProxyWithAdmin(
|
71
80
|
initialImplementation,
|
72
81
|
initialProxyAdminOwner,
|
73
82
|
getDeployData(currentProxyOwner, initializationData)
|
74
83
|
);
|
75
84
|
|
76
|
-
versionable =
|
77
|
-
|
85
|
+
versionable = _updateVersionHistory(
|
86
|
+
initialImplementation,
|
87
|
+
currentProxyOwner);
|
78
88
|
|
79
|
-
emit LogProxyManagerVersionableDeployed(address(
|
89
|
+
emit LogProxyManagerVersionableDeployed(address(versionable), initialImplementation);
|
90
|
+
}
|
91
|
+
|
92
|
+
function deployDetermenistic(
|
93
|
+
address registry,
|
94
|
+
address initialImplementation,
|
95
|
+
bytes memory initializationData,
|
96
|
+
bytes32 salt
|
97
|
+
)
|
98
|
+
public
|
99
|
+
virtual
|
100
|
+
onlyInitializing()
|
101
|
+
returns (IVersionable versionable)
|
102
|
+
{
|
103
|
+
(
|
104
|
+
address currentProxyOwner,
|
105
|
+
address initialProxyAdminOwner
|
106
|
+
) = _preDeployChecksAndSetup(registry);
|
107
|
+
|
108
|
+
_proxy = new UpgradableProxyWithAdmin{salt: salt}(
|
109
|
+
initialImplementation,
|
110
|
+
initialProxyAdminOwner,
|
111
|
+
getDeployData(currentProxyOwner, initializationData)
|
112
|
+
);
|
113
|
+
|
114
|
+
versionable = _updateVersionHistory(
|
115
|
+
initialImplementation,
|
116
|
+
currentProxyOwner);
|
117
|
+
|
118
|
+
emit LogProxyManagerVersionableDeployed(address(versionable), initialImplementation);
|
119
|
+
}
|
120
|
+
|
121
|
+
/// @dev upgrade existing contract.
|
122
|
+
/// convenience method using empty data
|
123
|
+
function upgrade(address newImplementation)
|
124
|
+
public
|
125
|
+
virtual
|
126
|
+
onlyOwner()
|
127
|
+
returns (IVersionable versionable)
|
128
|
+
{
|
129
|
+
bytes memory emptyUpgradeData;
|
130
|
+
return upgrade(newImplementation, emptyUpgradeData);
|
80
131
|
}
|
81
132
|
|
82
133
|
/// @dev upgrade existing contract
|
@@ -99,11 +150,16 @@ contract ProxyManager is
|
|
99
150
|
newImplementation,
|
100
151
|
getUpgradeData(upgradeData));
|
101
152
|
|
102
|
-
versionable =
|
103
|
-
|
153
|
+
versionable = _updateVersionHistory(
|
154
|
+
newImplementation,
|
155
|
+
currentProxyOwner);
|
156
|
+
|
157
|
+
emit LogProxyManagerVersionableUpgraded(address(versionable), newImplementation);
|
104
158
|
|
105
|
-
|
159
|
+
}
|
106
160
|
|
161
|
+
function linkToProxy() public returns (NftId) {
|
162
|
+
return _linkToNftOwnable(address(_proxy));
|
107
163
|
}
|
108
164
|
|
109
165
|
function getDeployData(address proxyOwner, bytes memory deployData) public pure returns (bytes memory data) {
|
@@ -119,7 +175,7 @@ contract ProxyManager is
|
|
119
175
|
upgradeData);
|
120
176
|
}
|
121
177
|
|
122
|
-
function getProxy() public returns (UpgradableProxyWithAdmin) {
|
178
|
+
function getProxy() public view returns (UpgradableProxyWithAdmin) {
|
123
179
|
return _proxy;
|
124
180
|
}
|
125
181
|
|
@@ -139,13 +195,34 @@ contract ProxyManager is
|
|
139
195
|
return _versionHistory[_version];
|
140
196
|
}
|
141
197
|
|
198
|
+
function _preDeployChecksAndSetup(address registry)
|
199
|
+
private
|
200
|
+
returns (
|
201
|
+
address currentProxyOwner,
|
202
|
+
address initialProxyAdminOwner
|
203
|
+
)
|
204
|
+
{
|
205
|
+
if (_versions.length > 0) {
|
206
|
+
revert ErrorProxyManagerAlreadyDeployed();
|
207
|
+
}
|
208
|
+
|
209
|
+
address initialOwner = msg.sender;
|
210
|
+
__NftOwnable_init(registry, initialOwner);
|
211
|
+
|
212
|
+
currentProxyOwner = getOwner(); // used by implementation
|
213
|
+
initialProxyAdminOwner = address(this); // used by proxy
|
214
|
+
}
|
215
|
+
|
142
216
|
function _updateVersionHistory(
|
143
|
-
Version newVersion,
|
144
217
|
address implementation,
|
145
218
|
address activatedBy
|
146
219
|
)
|
147
220
|
private
|
221
|
+
returns (IVersionable versionable)
|
148
222
|
{
|
223
|
+
versionable = IVersionable(address(_proxy));
|
224
|
+
Version newVersion = versionable.getVersion();
|
225
|
+
|
149
226
|
if(newVersion == VersionLib.zeroVersion()) {
|
150
227
|
revert ErrorProxyManagerZeroVersion();
|
151
228
|
}
|
@@ -158,12 +235,12 @@ contract ProxyManager is
|
|
158
235
|
|
159
236
|
// update version history
|
160
237
|
_versions.push(newVersion);
|
161
|
-
_versionHistory[newVersion] = VersionInfo(
|
162
|
-
newVersion,
|
163
|
-
implementation,
|
164
|
-
activatedBy,
|
165
|
-
TimestampLib.
|
166
|
-
blockNumber()
|
167
|
-
);
|
238
|
+
_versionHistory[newVersion] = VersionInfo({
|
239
|
+
version: newVersion,
|
240
|
+
implementation: implementation,
|
241
|
+
activatedBy: activatedBy,
|
242
|
+
activatedAt: TimestampLib.current(),
|
243
|
+
activatedIn: blockNumber()
|
244
|
+
});
|
168
245
|
}
|
169
246
|
}
|
@@ -0,0 +1,24 @@
|
|
1
|
+
// SPDX-License-Identifier: Apache-2.0
|
2
|
+
pragma solidity ^0.8.20;
|
3
|
+
|
4
|
+
import {ProxyAdmin} from "@openzeppelin/contracts/proxy/transparent/ProxyAdmin.sol";
|
5
|
+
import {TransparentUpgradeableProxy} from "@openzeppelin/contracts/proxy/transparent/TransparentUpgradeableProxy.sol";
|
6
|
+
|
7
|
+
contract UpgradableProxyWithAdmin is TransparentUpgradeableProxy {
|
8
|
+
|
9
|
+
bytes internal _initializationData;
|
10
|
+
|
11
|
+
constructor(address implementation, address initialProxyAdminOwner, bytes memory data)
|
12
|
+
TransparentUpgradeableProxy(implementation, initialProxyAdminOwner, data)
|
13
|
+
{
|
14
|
+
_initializationData = data;
|
15
|
+
}
|
16
|
+
|
17
|
+
function getProxyAdmin() external returns (ProxyAdmin) {
|
18
|
+
return ProxyAdmin(_proxyAdmin());
|
19
|
+
}
|
20
|
+
|
21
|
+
function getInitializationData() external view returns (bytes memory) {
|
22
|
+
return _initializationData;
|
23
|
+
}
|
24
|
+
}
|
@@ -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,12 +39,15 @@ 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
|
-
revert();
|
50
|
+
revert ErrorVersionableInitializeNotImplemented();
|
48
51
|
}
|
49
52
|
|
50
53
|
// IMPORTANT each version except version "1" must implement this function
|
@@ -54,6 +57,6 @@ abstract contract Versionable is
|
|
54
57
|
onlyInitializing
|
55
58
|
virtual
|
56
59
|
{
|
57
|
-
revert();
|
60
|
+
revert ErrorVersionableUpgradeNotImplemented();
|
58
61
|
}
|
59
62
|
}
|