@etherisc/gif-next 3.0.0-2c4b8cb-070 → 3.0.0-2e16ebd-614
Sign up to get free protection for your applications and to get access to all the features.
- package/README.md +0 -1
- package/artifacts/contracts/accounting/AccountingService.sol/AccountingService.dbg.json +1 -1
- package/artifacts/contracts/accounting/AccountingService.sol/AccountingService.json +139 -72
- package/artifacts/contracts/accounting/AccountingServiceManager.sol/AccountingServiceManager.dbg.json +1 -1
- package/artifacts/contracts/accounting/AccountingServiceManager.sol/AccountingServiceManager.json +110 -116
- package/artifacts/contracts/accounting/IAccountingService.sol/IAccountingService.dbg.json +1 -1
- package/artifacts/contracts/accounting/IAccountingService.sol/IAccountingService.json +72 -33
- package/artifacts/contracts/authorization/AccessAdmin.sol/AccessAdmin.dbg.json +1 -1
- package/artifacts/contracts/authorization/AccessAdmin.sol/AccessAdmin.json +89 -66
- package/artifacts/contracts/authorization/AccessAdminLib.sol/AccessAdminLib.dbg.json +1 -1
- package/artifacts/contracts/authorization/AccessAdminLib.sol/AccessAdminLib.json +122 -101
- package/artifacts/contracts/authorization/AccessManagerCloneable.sol/AccessManagerCloneable.dbg.json +1 -1
- package/artifacts/contracts/authorization/AccessManagerCloneable.sol/AccessManagerCloneable.json +20 -65
- package/artifacts/contracts/authorization/Authorization.sol/Authorization.dbg.json +1 -1
- package/artifacts/contracts/authorization/Authorization.sol/Authorization.json +31 -55
- 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 +20 -10
- package/artifacts/contracts/authorization/IAuthorization.sol/IAuthorization.dbg.json +1 -1
- package/artifacts/contracts/authorization/IAuthorization.sol/IAuthorization.json +1 -1
- package/artifacts/contracts/authorization/IServiceAuthorization.sol/IServiceAuthorization.dbg.json +1 -1
- package/artifacts/contracts/authorization/IServiceAuthorization.sol/IServiceAuthorization.json +1 -1
- package/artifacts/contracts/authorization/ServiceAuthorization.sol/ServiceAuthorization.dbg.json +1 -1
- package/artifacts/contracts/authorization/ServiceAuthorization.sol/ServiceAuthorization.json +18 -42
- package/artifacts/contracts/distribution/BasicDistribution.sol/BasicDistribution.dbg.json +1 -1
- package/artifacts/contracts/distribution/BasicDistribution.sol/BasicDistribution.json +126 -75
- package/artifacts/contracts/distribution/BasicDistributionAuthorization.sol/BasicDistributionAuthorization.dbg.json +1 -1
- package/artifacts/contracts/distribution/BasicDistributionAuthorization.sol/BasicDistributionAuthorization.json +41 -65
- package/artifacts/contracts/distribution/Distribution.sol/Distribution.dbg.json +1 -1
- package/artifacts/contracts/distribution/Distribution.sol/Distribution.json +72 -57
- package/artifacts/contracts/distribution/DistributionService.sol/DistributionService.dbg.json +1 -1
- package/artifacts/contracts/distribution/DistributionService.sol/DistributionService.json +198 -139
- package/artifacts/contracts/distribution/DistributionServiceManager.sol/DistributionServiceManager.dbg.json +1 -1
- package/artifacts/contracts/distribution/DistributionServiceManager.sol/DistributionServiceManager.json +140 -150
- package/artifacts/contracts/distribution/IDistributionComponent.sol/IDistributionComponent.dbg.json +1 -1
- package/artifacts/contracts/distribution/IDistributionComponent.sol/IDistributionComponent.json +84 -56
- package/artifacts/contracts/distribution/IDistributionService.sol/IDistributionService.dbg.json +1 -1
- package/artifacts/contracts/distribution/IDistributionService.sol/IDistributionService.json +71 -32
- package/artifacts/contracts/examples/fire/DamageLevel.sol/DamageLevelLib.dbg.json +1 -1
- package/artifacts/contracts/examples/fire/FirePool.sol/FirePool.dbg.json +1 -1
- package/artifacts/contracts/examples/fire/FirePool.sol/FirePool.json +166 -104
- package/artifacts/contracts/examples/fire/FirePoolAuthorization.sol/FirePoolAuthorization.dbg.json +1 -1
- package/artifacts/contracts/examples/fire/FirePoolAuthorization.sol/FirePoolAuthorization.json +41 -65
- package/artifacts/contracts/examples/fire/FireProduct.sol/FireProduct.dbg.json +1 -1
- package/artifacts/contracts/examples/fire/FireProduct.sol/FireProduct.json +200 -138
- package/artifacts/contracts/examples/fire/FireProductAuthorization.sol/FireProductAuthorization.dbg.json +1 -1
- package/artifacts/contracts/examples/fire/FireProductAuthorization.sol/FireProductAuthorization.json +41 -65
- package/artifacts/contracts/examples/fire/FireUSD.sol/FireUSD.dbg.json +1 -1
- package/artifacts/contracts/examples/unpermissioned/SimpleDistribution.sol/SimpleDistribution.dbg.json +1 -1
- package/artifacts/contracts/examples/unpermissioned/SimpleDistribution.sol/SimpleDistribution.json +159 -102
- package/artifacts/contracts/examples/unpermissioned/SimpleDistributionAuthorization.sol/SimpleDistributionAuthorization.dbg.json +1 -1
- package/artifacts/contracts/examples/unpermissioned/SimpleDistributionAuthorization.sol/SimpleDistributionAuthorization.json +41 -65
- package/artifacts/contracts/examples/unpermissioned/SimpleOracle.sol/SimpleOracle.dbg.json +1 -1
- package/artifacts/contracts/examples/unpermissioned/SimpleOracle.sol/SimpleOracle.json +163 -106
- package/artifacts/contracts/examples/unpermissioned/SimplePool.sol/SimplePool.dbg.json +1 -1
- package/artifacts/contracts/examples/unpermissioned/SimplePool.sol/SimplePool.json +177 -120
- package/artifacts/contracts/examples/unpermissioned/SimplePoolAuthorization.sol/SimplePoolAuthorization.dbg.json +1 -1
- package/artifacts/contracts/examples/unpermissioned/SimplePoolAuthorization.sol/SimplePoolAuthorization.json +41 -65
- package/artifacts/contracts/examples/unpermissioned/SimpleProduct.sol/SimpleProduct.dbg.json +1 -1
- package/artifacts/contracts/examples/unpermissioned/SimpleProduct.sol/SimpleProduct.json +171 -114
- package/artifacts/contracts/examples/unpermissioned/SimpleProductAuthorization.sol/SimpleProductAuthorization.dbg.json +1 -1
- package/artifacts/contracts/examples/unpermissioned/SimpleProductAuthorization.sol/SimpleProductAuthorization.json +41 -65
- package/artifacts/contracts/instance/BaseStore.sol/BaseStore.dbg.json +1 -1
- package/artifacts/contracts/instance/BundleSet.sol/BundleSet.dbg.json +1 -1
- package/artifacts/contracts/instance/BundleSet.sol/BundleSet.json +49 -54
- package/artifacts/contracts/instance/IBaseStore.sol/IBaseStore.dbg.json +1 -1
- package/artifacts/contracts/instance/IInstance.sol/IInstance.dbg.json +1 -1
- package/artifacts/contracts/instance/IInstance.sol/IInstance.json +78 -26
- package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.dbg.json +1 -1
- package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.json +83 -44
- package/artifacts/contracts/instance/Instance.sol/Instance.dbg.json +1 -1
- package/artifacts/contracts/instance/Instance.sol/Instance.json +145 -51
- package/artifacts/contracts/instance/InstanceAdmin.sol/InstanceAdmin.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceAdmin.sol/InstanceAdmin.json +169 -147
- package/artifacts/contracts/instance/InstanceAuthorizationV3.sol/InstanceAuthorizationV3.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceAuthorizationV3.sol/InstanceAuthorizationV3.json +43 -67
- package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.json +77 -179
- package/artifacts/contracts/instance/InstanceService.sol/InstanceService.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceService.sol/InstanceService.json +138 -75
- package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.json +104 -112
- package/artifacts/contracts/instance/InstanceStore.sol/InstanceStore.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceStore.sol/InstanceStore.json +2 -2
- package/artifacts/contracts/instance/ProductStore.sol/ProductStore.dbg.json +1 -1
- package/artifacts/contracts/instance/ProductStore.sol/ProductStore.json +2 -2
- package/artifacts/contracts/instance/RiskSet.sol/RiskSet.dbg.json +1 -1
- package/artifacts/contracts/instance/RiskSet.sol/RiskSet.json +53 -58
- 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/Cloneable.sol/Cloneable.json +1 -1
- package/artifacts/contracts/instance/base/ObjectCounter.sol/ObjectCounter.dbg.json +1 -1
- package/artifacts/contracts/instance/base/ObjectCounter.sol/ObjectCounter.json +2 -2
- package/artifacts/contracts/instance/base/ObjectLifecycle.sol/ObjectLifecycle.dbg.json +1 -1
- package/artifacts/contracts/instance/base/ObjectLifecycle.sol/ObjectLifecycle.json +2 -2
- package/artifacts/contracts/instance/base/ObjectSet.sol/ObjectSet.dbg.json +1 -1
- package/artifacts/contracts/instance/base/ObjectSet.sol/ObjectSet.json +3 -8
- package/artifacts/contracts/instance/base/ObjectSetHelperLib.sol/ObjectSetHelperLib.dbg.json +1 -1
- package/artifacts/contracts/instance/base/ObjectSetHelperLib.sol/ObjectSetHelperLib.json +2 -2
- package/artifacts/contracts/instance/module/IBundle.sol/IBundle.dbg.json +1 -1
- package/artifacts/contracts/instance/module/IComponents.sol/IComponents.dbg.json +1 -1
- package/artifacts/contracts/instance/module/IDistribution.sol/IDistribution.dbg.json +1 -1
- package/artifacts/contracts/instance/module/IPolicy.sol/IPolicy.dbg.json +1 -1
- package/artifacts/contracts/instance/module/IRisk.sol/IRisk.dbg.json +1 -1
- package/artifacts/contracts/mock/Dip.sol/Dip.dbg.json +1 -1
- package/artifacts/contracts/oracle/BasicOracle.sol/BasicOracle.dbg.json +1 -1
- package/artifacts/contracts/oracle/BasicOracle.sol/BasicOracle.json +132 -81
- package/artifacts/contracts/oracle/BasicOracleAuthorization.sol/BasicOracleAuthorization.dbg.json +1 -1
- package/artifacts/contracts/oracle/BasicOracleAuthorization.sol/BasicOracleAuthorization.json +41 -65
- 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 +94 -66
- package/artifacts/contracts/oracle/IOracleService.sol/IOracleService.dbg.json +1 -1
- package/artifacts/contracts/oracle/IOracleService.sol/IOracleService.json +80 -83
- package/artifacts/contracts/oracle/Oracle.sol/Oracle.dbg.json +1 -1
- package/artifacts/contracts/oracle/Oracle.sol/Oracle.json +82 -67
- package/artifacts/contracts/oracle/OracleService.sol/OracleService.dbg.json +1 -1
- package/artifacts/contracts/oracle/OracleService.sol/OracleService.json +149 -148
- package/artifacts/contracts/oracle/OracleServiceManager.sol/OracleServiceManager.dbg.json +1 -1
- package/artifacts/contracts/oracle/OracleServiceManager.sol/OracleServiceManager.json +111 -129
- package/artifacts/contracts/pool/BasicPool.sol/BasicPool.dbg.json +1 -1
- package/artifacts/contracts/pool/BasicPool.sol/BasicPool.json +88 -73
- package/artifacts/contracts/pool/BasicPoolAuthorization.sol/BasicPoolAuthorization.dbg.json +1 -1
- package/artifacts/contracts/pool/BasicPoolAuthorization.sol/BasicPoolAuthorization.json +41 -65
- package/artifacts/contracts/pool/BundleService.sol/BundleService.dbg.json +1 -1
- package/artifacts/contracts/pool/BundleService.sol/BundleService.json +176 -117
- package/artifacts/contracts/pool/BundleServiceManager.sol/BundleServiceManager.dbg.json +1 -1
- package/artifacts/contracts/pool/BundleServiceManager.sol/BundleServiceManager.json +129 -139
- package/artifacts/contracts/pool/IBundleService.sol/IBundleService.dbg.json +1 -1
- package/artifacts/contracts/pool/IBundleService.sol/IBundleService.json +71 -32
- package/artifacts/contracts/pool/IPoolComponent.sol/IPoolComponent.dbg.json +1 -1
- package/artifacts/contracts/pool/IPoolComponent.sol/IPoolComponent.json +100 -72
- package/artifacts/contracts/pool/IPoolService.sol/IPoolService.dbg.json +1 -1
- package/artifacts/contracts/pool/IPoolService.sol/IPoolService.json +94 -86
- package/artifacts/contracts/pool/Pool.sol/Pool.dbg.json +1 -1
- package/artifacts/contracts/pool/Pool.sol/Pool.json +88 -73
- package/artifacts/contracts/pool/PoolLib.sol/PoolLib.dbg.json +1 -1
- package/artifacts/contracts/pool/PoolLib.sol/PoolLib.json +24 -247
- package/artifacts/contracts/pool/PoolService.sol/PoolService.dbg.json +1 -1
- package/artifacts/contracts/pool/PoolService.sol/PoolService.json +233 -165
- package/artifacts/contracts/pool/PoolServiceManager.sol/PoolServiceManager.dbg.json +1 -1
- package/artifacts/contracts/pool/PoolServiceManager.sol/PoolServiceManager.json +140 -130
- package/artifacts/contracts/product/ApplicationService.sol/ApplicationService.dbg.json +1 -1
- package/artifacts/contracts/product/ApplicationService.sol/ApplicationService.json +138 -63
- package/artifacts/contracts/product/ApplicationServiceManager.sol/ApplicationServiceManager.dbg.json +1 -1
- package/artifacts/contracts/product/ApplicationServiceManager.sol/ApplicationServiceManager.json +110 -112
- package/artifacts/contracts/product/BasicProduct.sol/BasicProduct.dbg.json +1 -1
- package/artifacts/contracts/product/BasicProduct.sol/BasicProduct.json +72 -57
- package/artifacts/contracts/product/BasicProductAuthorization.sol/BasicProductAuthorization.dbg.json +1 -1
- package/artifacts/contracts/product/BasicProductAuthorization.sol/BasicProductAuthorization.json +41 -65
- package/artifacts/contracts/product/ClaimService.sol/ClaimService.dbg.json +1 -1
- package/artifacts/contracts/product/ClaimService.sol/ClaimService.json +182 -115
- package/artifacts/contracts/product/ClaimServiceManager.sol/ClaimServiceManager.dbg.json +1 -1
- package/artifacts/contracts/product/ClaimServiceManager.sol/ClaimServiceManager.json +132 -138
- package/artifacts/contracts/product/IApplicationService.sol/IApplicationService.dbg.json +1 -1
- package/artifacts/contracts/product/IApplicationService.sol/IApplicationService.json +71 -32
- package/artifacts/contracts/product/IClaimService.sol/IClaimService.dbg.json +1 -1
- package/artifacts/contracts/product/IClaimService.sol/IClaimService.json +71 -32
- package/artifacts/contracts/product/IPolicyService.sol/IPolicyService.dbg.json +1 -1
- package/artifacts/contracts/product/IPolicyService.sol/IPolicyService.json +82 -64
- package/artifacts/contracts/product/IPricingService.sol/IPricingService.dbg.json +1 -1
- package/artifacts/contracts/product/IPricingService.sol/IPricingService.json +82 -43
- package/artifacts/contracts/product/IProductComponent.sol/IProductComponent.dbg.json +1 -1
- package/artifacts/contracts/product/IProductComponent.sol/IProductComponent.json +84 -56
- package/artifacts/contracts/product/IRiskService.sol/IRiskService.dbg.json +1 -1
- package/artifacts/contracts/product/IRiskService.sol/IRiskService.json +75 -36
- package/artifacts/contracts/product/PolicyService.sol/PolicyService.dbg.json +1 -1
- package/artifacts/contracts/product/PolicyService.sol/PolicyService.json +173 -127
- package/artifacts/contracts/product/PolicyServiceLib.sol/PolicyServiceLib.dbg.json +1 -1
- package/artifacts/contracts/product/PolicyServiceLib.sol/PolicyServiceLib.json +2 -2
- package/artifacts/contracts/product/PolicyServiceManager.sol/PolicyServiceManager.dbg.json +1 -1
- package/artifacts/contracts/product/PolicyServiceManager.sol/PolicyServiceManager.json +122 -128
- package/artifacts/contracts/product/PricingService.sol/PricingService.dbg.json +1 -1
- package/artifacts/contracts/product/PricingService.sol/PricingService.json +161 -94
- package/artifacts/contracts/product/PricingServiceManager.sol/PricingServiceManager.dbg.json +1 -1
- package/artifacts/contracts/product/PricingServiceManager.sol/PricingServiceManager.json +116 -122
- package/artifacts/contracts/product/Product.sol/Product.dbg.json +1 -1
- package/artifacts/contracts/product/Product.sol/Product.json +72 -57
- package/artifacts/contracts/product/RiskService.sol/RiskService.dbg.json +1 -1
- package/artifacts/contracts/product/RiskService.sol/RiskService.json +146 -63
- package/artifacts/contracts/product/RiskServiceManager.sol/RiskServiceManager.dbg.json +1 -1
- package/artifacts/contracts/product/RiskServiceManager.sol/RiskServiceManager.json +109 -107
- package/artifacts/contracts/registry/ChainNft.sol/ChainNft.dbg.json +1 -1
- package/artifacts/contracts/registry/IRegistry.sol/IRegistry.dbg.json +1 -1
- package/artifacts/contracts/registry/IRegistry.sol/IRegistry.json +155 -56
- package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.dbg.json +1 -1
- package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.json +202 -216
- package/artifacts/contracts/registry/IRelease.sol/IRelease.dbg.json +1 -1
- package/artifacts/contracts/registry/IRelease.sol/IRelease.json +1 -15
- package/artifacts/contracts/registry/ITransferInterceptor.sol/ITransferInterceptor.dbg.json +1 -1
- package/artifacts/contracts/registry/Registry.sol/Registry.dbg.json +1 -1
- package/artifacts/contracts/registry/Registry.sol/Registry.json +314 -96
- package/artifacts/contracts/registry/RegistryAdmin.sol/RegistryAdmin.dbg.json +1 -1
- package/artifacts/contracts/registry/RegistryAdmin.sol/RegistryAdmin.json +163 -142
- package/artifacts/contracts/registry/RegistryAuthorization.sol/RegistryAuthorization.dbg.json +1 -1
- package/artifacts/contracts/registry/RegistryAuthorization.sol/RegistryAuthorization.json +57 -77
- package/artifacts/contracts/registry/RegistryService.sol/RegistryService.dbg.json +1 -1
- package/artifacts/contracts/registry/RegistryService.sol/RegistryService.json +285 -244
- package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.dbg.json +1 -1
- package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.json +115 -110
- package/artifacts/contracts/registry/ReleaseAdmin.sol/ReleaseAdmin.dbg.json +1 -1
- package/artifacts/contracts/registry/ReleaseAdmin.sol/ReleaseAdmin.json +159 -150
- package/artifacts/contracts/registry/ReleaseLifecycle.sol/ReleaseLifecycle.dbg.json +1 -1
- package/artifacts/contracts/registry/ReleaseLifecycle.sol/ReleaseLifecycle.json +2 -2
- package/artifacts/contracts/registry/ReleaseRegistry.sol/ReleaseRegistry.dbg.json +1 -1
- package/artifacts/contracts/registry/ReleaseRegistry.sol/ReleaseRegistry.json +127 -185
- package/artifacts/contracts/registry/ServiceAuthorizationV3.sol/ServiceAuthorizationV3.dbg.json +1 -1
- package/artifacts/contracts/registry/ServiceAuthorizationV3.sol/ServiceAuthorizationV3.json +32 -56
- package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.dbg.json +1 -1
- package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.json +13 -29
- package/artifacts/contracts/shared/Component.sol/Component.dbg.json +1 -1
- package/artifacts/contracts/shared/Component.sol/Component.json +84 -39
- package/artifacts/contracts/shared/ComponentService.sol/ComponentService.dbg.json +1 -1
- package/artifacts/contracts/shared/ComponentService.sol/ComponentService.json +164 -320
- package/artifacts/contracts/shared/ComponentServiceManager.sol/ComponentServiceManager.dbg.json +1 -1
- package/artifacts/contracts/shared/ComponentServiceManager.sol/ComponentServiceManager.json +115 -141
- package/artifacts/contracts/shared/ContractLib.sol/ContractLib.dbg.json +1 -1
- package/artifacts/contracts/shared/ContractLib.sol/ContractLib.json +421 -169
- package/artifacts/contracts/shared/ContractLib.sol/ITargetHelper.dbg.json +1 -1
- package/artifacts/contracts/shared/IComponent.sol/IComponent.dbg.json +1 -1
- package/artifacts/contracts/shared/IComponent.sol/IComponent.json +96 -38
- package/artifacts/contracts/shared/IComponentService.sol/IComponentService.dbg.json +1 -1
- package/artifacts/contracts/shared/IComponentService.sol/IComponentService.json +82 -226
- package/artifacts/contracts/shared/IInstanceLinkedComponent.sol/IInstanceLinkedComponent.dbg.json +1 -1
- package/artifacts/contracts/shared/IInstanceLinkedComponent.sol/IInstanceLinkedComponent.json +84 -56
- package/artifacts/contracts/shared/ILifecycle.sol/ILifecycle.dbg.json +1 -1
- package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.dbg.json +1 -1
- package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.json +1 -28
- package/artifacts/contracts/shared/IPolicyHolder.sol/IPolicyHolder.dbg.json +1 -1
- package/artifacts/contracts/shared/IPolicyHolder.sol/IPolicyHolder.json +1 -12
- package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.dbg.json +1 -1
- package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.json +77 -25
- package/artifacts/contracts/shared/IRegistryLinked.sol/IRegistryLinked.dbg.json +1 -1
- package/artifacts/contracts/shared/IRegistryLinked.sol/IRegistryLinked.json +1 -12
- package/artifacts/contracts/shared/IService.sol/IService.dbg.json +1 -1
- package/artifacts/contracts/shared/IService.sol/IService.json +71 -32
- package/artifacts/contracts/shared/IVersionable.sol/IVersionable.dbg.json +4 -0
- package/artifacts/contracts/shared/IVersionable.sol/IVersionable.json +74 -0
- package/artifacts/contracts/shared/InitializableERC165.sol/InitializableERC165.dbg.json +1 -1
- package/artifacts/contracts/shared/InstanceLinkedComponent.sol/InstanceLinkedComponent.dbg.json +1 -1
- package/artifacts/contracts/shared/InstanceLinkedComponent.sol/InstanceLinkedComponent.json +72 -57
- package/artifacts/contracts/shared/Lifecycle.sol/Lifecycle.dbg.json +1 -1
- package/artifacts/contracts/shared/NftIdSet.sol/NftIdSet.dbg.json +1 -1
- package/artifacts/contracts/shared/NftIdSet.sol/NftIdSet.json +2 -2
- package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.dbg.json +1 -1
- package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.json +15 -34
- package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.dbg.json +1 -1
- package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.json +3 -14
- package/artifacts/contracts/shared/Registerable.sol/Registerable.dbg.json +1 -1
- package/artifacts/contracts/shared/Registerable.sol/Registerable.json +76 -24
- package/artifacts/contracts/shared/RegistryLinked.sol/RegistryLinked.dbg.json +1 -1
- package/artifacts/contracts/shared/RegistryLinked.sol/RegistryLinked.json +3 -37
- package/artifacts/contracts/shared/Service.sol/Service.dbg.json +1 -1
- package/artifacts/contracts/shared/Service.sol/Service.json +70 -31
- package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.dbg.json +1 -1
- package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.json +42 -29
- package/artifacts/contracts/shared/TokenHandler.sol/TokenHandlerBase.dbg.json +1 -1
- package/artifacts/contracts/shared/TokenHandler.sol/TokenHandlerBase.json +30 -17
- package/artifacts/contracts/shared/TokenHandlerDeployerLib.sol/TokenHandlerDeployerLib.dbg.json +1 -1
- package/artifacts/contracts/shared/TokenHandlerDeployerLib.sol/TokenHandlerDeployerLib.json +34 -34
- package/artifacts/contracts/shared/Versionable.sol/Versionable.dbg.json +4 -0
- package/artifacts/contracts/shared/Versionable.sol/Versionable.json +74 -0
- package/artifacts/contracts/staking/IStaking.sol/IStaking.dbg.json +1 -1
- package/artifacts/contracts/staking/IStaking.sol/IStaking.json +101 -56
- package/artifacts/contracts/staking/IStakingService.sol/IStakingService.dbg.json +1 -1
- package/artifacts/contracts/staking/IStakingService.sol/IStakingService.json +75 -36
- package/artifacts/contracts/staking/ITargetLimitHandler.sol/ITargetLimitHandler.dbg.json +1 -1
- package/artifacts/contracts/staking/Staking.sol/Staking.dbg.json +1 -1
- package/artifacts/contracts/staking/Staking.sol/Staking.json +170 -109
- package/artifacts/contracts/staking/StakingLib.sol/StakingLib.dbg.json +1 -1
- package/artifacts/contracts/staking/StakingLib.sol/StakingLib.json +26 -31
- package/artifacts/contracts/staking/StakingManager.sol/StakingManager.dbg.json +1 -1
- package/artifacts/contracts/staking/StakingManager.sol/StakingManager.json +112 -124
- package/artifacts/contracts/staking/StakingReader.sol/StakingReader.dbg.json +1 -1
- package/artifacts/contracts/staking/StakingReader.sol/StakingReader.json +5 -22
- package/artifacts/contracts/staking/StakingService.sol/StakingService.dbg.json +1 -1
- package/artifacts/contracts/staking/StakingService.sol/StakingService.json +132 -65
- package/artifacts/contracts/staking/StakingServiceManager.sol/StakingServiceManager.dbg.json +1 -1
- package/artifacts/contracts/staking/StakingServiceManager.sol/StakingServiceManager.json +105 -111
- package/artifacts/contracts/staking/StakingStore.sol/StakingStore.dbg.json +1 -1
- package/artifacts/contracts/staking/StakingStore.sol/StakingStore.json +212 -204
- package/artifacts/contracts/staking/TargetHandler.sol/TargetHandler.dbg.json +1 -1
- package/artifacts/contracts/staking/TargetHandler.sol/TargetHandler.json +27 -19
- package/artifacts/contracts/staking/TargetManagerLib.sol/TargetManagerLib.dbg.json +1 -1
- package/artifacts/contracts/staking/TargetManagerLib.sol/TargetManagerLib.json +16 -16
- package/artifacts/contracts/type/AddressSet.sol/LibAddressSet.dbg.json +1 -1
- package/artifacts/contracts/type/Amount.sol/AmountLib.dbg.json +1 -1
- package/artifacts/contracts/type/Blocknumber.sol/BlocknumberLib.dbg.json +1 -1
- package/artifacts/contracts/type/ChainId.sol/ChainIdLib.dbg.json +1 -1
- package/artifacts/contracts/type/ChainId.sol/ChainIdLib.json +2 -2
- package/artifacts/contracts/type/ClaimId.sol/ClaimIdLib.dbg.json +1 -1
- package/artifacts/contracts/type/ClaimId.sol/ClaimIdLib.json +2 -2
- package/artifacts/contracts/type/DistributorType.sol/DistributorTypeLib.dbg.json +1 -1
- package/artifacts/contracts/type/DistributorType.sol/DistributorTypeLib.json +2 -2
- package/artifacts/contracts/type/Fee.sol/FeeLib.dbg.json +1 -1
- package/artifacts/contracts/type/Key32.sol/Key32Lib.dbg.json +1 -1
- package/artifacts/contracts/type/Key32.sol/Key32Lib.json +2 -2
- package/artifacts/contracts/type/Key32Set.sol/LibKey32Set.dbg.json +1 -1
- package/artifacts/contracts/type/Key32Set.sol/LibKey32Set.json +2 -2
- package/artifacts/contracts/type/NftId.sol/NftIdLib.dbg.json +1 -1
- package/artifacts/contracts/type/NftId.sol/NftIdLib.json +2 -2
- 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 +25 -22
- package/artifacts/contracts/type/PayoutId.sol/PayoutIdLib.dbg.json +1 -1
- package/artifacts/contracts/type/PayoutId.sol/PayoutIdLib.json +2 -2
- package/artifacts/contracts/type/Referral.sol/ReferralLib.dbg.json +1 -1
- package/artifacts/contracts/type/Referral.sol/ReferralLib.json +4 -23
- package/artifacts/contracts/type/RequestId.sol/RequestIdLib.dbg.json +1 -1
- package/artifacts/contracts/type/RequestId.sol/RequestIdLib.json +2 -2
- package/artifacts/contracts/type/RiskId.sol/RiskIdLib.dbg.json +1 -1
- package/artifacts/contracts/type/RiskId.sol/RiskIdLib.json +2 -2
- package/artifacts/contracts/type/RoleId.sol/RoleIdLib.dbg.json +1 -1
- package/artifacts/contracts/type/RoleId.sol/RoleIdLib.json +4 -4
- package/artifacts/contracts/type/Seconds.sol/SecondsLib.dbg.json +1 -1
- package/artifacts/contracts/type/Seconds.sol/SecondsLib.json +2 -21
- package/artifacts/contracts/type/Selector.sol/SelectorLib.dbg.json +1 -1
- package/artifacts/contracts/type/Selector.sol/SelectorSetLib.dbg.json +1 -1
- package/artifacts/contracts/type/StateId.sol/StateIdLib.dbg.json +1 -1
- package/artifacts/contracts/type/String.sol/StrLib.dbg.json +1 -1
- package/artifacts/contracts/type/String.sol/StrLib.json +2 -21
- package/artifacts/contracts/type/Timestamp.sol/TimestampLib.dbg.json +1 -1
- package/artifacts/contracts/type/Timestamp.sol/TimestampLib.json +4 -36
- package/artifacts/contracts/type/UFixed.sol/UFixedLib.dbg.json +1 -1
- package/artifacts/contracts/type/Version.sol/VersionLib.dbg.json +1 -1
- package/artifacts/contracts/type/Version.sol/VersionLib.json +10 -10
- package/artifacts/contracts/type/Version.sol/VersionPartLib.dbg.json +1 -1
- package/artifacts/contracts/type/Version.sol/VersionPartLib.json +19 -6
- package/artifacts/contracts/upgradeability/IUpgradeable.sol/IUpgradeable.dbg.json +4 -0
- package/artifacts/contracts/upgradeability/{IVersionable.sol/IVersionable.json → IUpgradeable.sol/IUpgradeable.json} +54 -4
- package/artifacts/contracts/upgradeability/ProxyManager.sol/ProxyManager.dbg.json +1 -1
- package/artifacts/contracts/upgradeability/ProxyManager.sol/ProxyManager.json +63 -86
- package/artifacts/contracts/upgradeability/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.dbg.json +1 -1
- package/artifacts/contracts/upgradeability/Upgradeable.sol/Upgradeable.dbg.json +4 -0
- package/artifacts/contracts/upgradeability/{Versionable.sol/Versionable.json → Upgradeable.sol/Upgradeable.json} +54 -4
- package/contracts/accounting/AccountingService.sol +5 -6
- package/contracts/accounting/AccountingServiceManager.sol +4 -6
- package/contracts/accounting/IAccountingService.sol +1 -1
- package/contracts/authorization/AccessAdmin.sol +22 -18
- package/contracts/authorization/AccessAdminLib.sol +12 -9
- package/contracts/authorization/AccessManagerCloneable.sol +24 -48
- package/contracts/authorization/Authorization.sol +2 -2
- package/contracts/authorization/IAccessAdmin.sol +3 -3
- package/contracts/authorization/IServiceAuthorization.sol +1 -1
- package/contracts/authorization/ServiceAuthorization.sol +4 -4
- package/contracts/distribution/BasicDistribution.sol +0 -2
- package/contracts/distribution/BasicDistributionAuthorization.sol +5 -4
- package/contracts/distribution/Distribution.sol +0 -2
- package/contracts/distribution/DistributionService.sol +24 -20
- package/contracts/distribution/DistributionServiceManager.sol +4 -6
- package/contracts/examples/fire/FirePool.sol +0 -4
- package/contracts/examples/fire/FireProduct.sol +0 -4
- package/contracts/examples/unpermissioned/SimpleDistribution.sol +0 -4
- package/contracts/examples/unpermissioned/SimpleOracle.sol +0 -4
- package/contracts/examples/unpermissioned/SimplePool.sol +0 -4
- package/contracts/examples/unpermissioned/SimpleProduct.sol +0 -4
- package/contracts/instance/IInstance.sol +1 -1
- package/contracts/instance/Instance.sol +8 -12
- package/contracts/instance/InstanceAdmin.sol +10 -17
- package/contracts/instance/InstanceAuthorizationV3.sol +4 -2
- package/contracts/instance/InstanceReader.sol +18 -40
- package/contracts/instance/InstanceService.sol +18 -20
- package/contracts/instance/InstanceServiceManager.sol +4 -6
- package/contracts/instance/base/Cloneable.sol +4 -10
- package/contracts/instance/base/ObjectSet.sol +2 -2
- package/contracts/oracle/BasicOracle.sol +0 -2
- package/contracts/oracle/BasicOracleAuthorization.sol +3 -1
- package/contracts/oracle/IOracleService.sol +12 -16
- package/contracts/oracle/Oracle.sol +3 -4
- package/contracts/oracle/OracleService.sol +37 -67
- package/contracts/oracle/OracleServiceManager.sol +4 -6
- package/contracts/pool/BasicPool.sol +2 -4
- package/contracts/pool/BasicPoolAuthorization.sol +5 -4
- package/contracts/pool/BundleService.sol +25 -19
- package/contracts/pool/BundleServiceManager.sol +5 -7
- package/contracts/pool/IPoolService.sol +5 -6
- package/contracts/pool/Pool.sol +1 -3
- package/contracts/pool/PoolLib.sol +5 -102
- package/contracts/pool/PoolService.sol +67 -101
- package/contracts/pool/PoolServiceManager.sol +4 -6
- package/contracts/product/ApplicationService.sol +13 -34
- package/contracts/product/ApplicationServiceManager.sol +4 -6
- package/contracts/product/BasicProduct.sol +0 -2
- package/contracts/product/BasicProductAuthorization.sol +7 -7
- package/contracts/product/ClaimService.sol +10 -34
- package/contracts/product/ClaimServiceManager.sol +5 -7
- package/contracts/product/IPolicyService.sol +0 -1
- package/contracts/product/PolicyService.sol +44 -57
- package/contracts/product/PolicyServiceManager.sol +4 -6
- package/contracts/product/PricingService.sol +7 -8
- package/contracts/product/PricingServiceManager.sol +4 -6
- package/contracts/product/Product.sol +0 -2
- package/contracts/product/RiskService.sol +8 -40
- package/contracts/product/RiskServiceManager.sol +4 -6
- package/contracts/registry/IRegistry.sol +20 -14
- package/contracts/registry/IRegistryService.sol +10 -14
- package/contracts/registry/IRelease.sol +0 -3
- package/contracts/registry/Registry.sol +124 -78
- package/contracts/registry/RegistryAdmin.sol +11 -22
- package/contracts/registry/RegistryAuthorization.sol +4 -3
- package/contracts/registry/RegistryService.sol +99 -82
- package/contracts/registry/RegistryServiceManager.sol +4 -11
- package/contracts/registry/ReleaseAdmin.sol +9 -16
- package/contracts/registry/ReleaseRegistry.sol +64 -74
- package/contracts/registry/ServiceAuthorizationV3.sol +4 -3
- package/contracts/registry/TokenRegistry.sol +6 -15
- package/contracts/shared/Component.sol +27 -22
- package/contracts/shared/ComponentService.sol +45 -130
- package/contracts/shared/ComponentServiceManager.sol +5 -7
- package/contracts/shared/ContractLib.sol +359 -93
- package/contracts/shared/IComponent.sol +5 -3
- package/contracts/shared/IComponentService.sol +0 -14
- package/contracts/shared/IInstanceLinkedComponent.sol +4 -7
- package/contracts/shared/INftOwnable.sol +0 -2
- package/contracts/shared/IRegisterable.sol +14 -3
- package/contracts/shared/IRegistryLinked.sol +1 -3
- package/contracts/shared/IService.sol +2 -2
- package/contracts/shared/IVersionable.sol +19 -0
- package/contracts/shared/InstanceLinkedComponent.sol +38 -128
- package/contracts/shared/NftOwnable.sol +9 -22
- package/contracts/shared/PolicyHolder.sol +2 -4
- package/contracts/shared/Registerable.sol +37 -20
- package/contracts/shared/RegistryLinked.sol +4 -23
- package/contracts/shared/Service.sol +8 -9
- package/contracts/shared/TokenHandler.sol +4 -1
- package/contracts/shared/Versionable.sol +47 -0
- package/contracts/staking/IStaking.sol +2 -2
- package/contracts/staking/Staking.sol +28 -33
- package/contracts/staking/StakingLib.sol +3 -1
- package/contracts/staking/StakingManager.sol +3 -6
- package/contracts/staking/StakingReader.sol +9 -17
- package/contracts/staking/StakingService.sol +16 -13
- package/contracts/staking/StakingServiceManager.sol +4 -8
- package/contracts/staking/StakingStore.sol +8 -8
- package/contracts/staking/TargetHandler.sol +4 -5
- package/contracts/type/ObjectType.sol +31 -2
- package/contracts/type/Referral.sol +0 -6
- package/contracts/type/Seconds.sol +0 -4
- package/contracts/type/String.sol +0 -30
- package/contracts/type/Timestamp.sol +1 -10
- package/contracts/type/Version.sol +15 -16
- package/contracts/upgradeability/{IVersionable.sol → IUpgradeable.sol} +13 -19
- package/contracts/upgradeability/ProxyManager.sol +46 -54
- package/contracts/upgradeability/{Versionable.sol → Upgradeable.sol} +25 -14
- package/package.json +1 -2
- package/artifacts/contracts/examples/flight/FlightLib.sol/FlightLib.dbg.json +0 -4
- package/artifacts/contracts/examples/flight/FlightLib.sol/FlightLib.json +0 -635
- package/artifacts/contracts/examples/flight/FlightMessageVerifier.sol/FlightMessageVerifier.dbg.json +0 -4
- package/artifacts/contracts/examples/flight/FlightMessageVerifier.sol/FlightMessageVerifier.json +0 -229
- package/artifacts/contracts/examples/flight/FlightOracle.sol/FlightOracle.dbg.json +0 -4
- package/artifacts/contracts/examples/flight/FlightOracle.sol/FlightOracle.json +0 -1198
- package/artifacts/contracts/examples/flight/FlightOracleAuthorization.sol/FlightOracleAuthorization.dbg.json +0 -4
- package/artifacts/contracts/examples/flight/FlightOracleAuthorization.sol/FlightOracleAuthorization.json +0 -849
- package/artifacts/contracts/examples/flight/FlightPool.sol/FlightPool.dbg.json +0 -4
- package/artifacts/contracts/examples/flight/FlightPool.sol/FlightPool.json +0 -1466
- package/artifacts/contracts/examples/flight/FlightPoolAuthorization.sol/FlightPoolAuthorization.dbg.json +0 -4
- package/artifacts/contracts/examples/flight/FlightPoolAuthorization.sol/FlightPoolAuthorization.json +0 -844
- package/artifacts/contracts/examples/flight/FlightProduct.sol/FlightProduct.dbg.json +0 -4
- package/artifacts/contracts/examples/flight/FlightProduct.sol/FlightProduct.json +0 -2514
- package/artifacts/contracts/examples/flight/FlightProductAuthorization.sol/FlightProductAuthorization.dbg.json +0 -4
- package/artifacts/contracts/examples/flight/FlightProductAuthorization.sol/FlightProductAuthorization.json +0 -844
- package/artifacts/contracts/examples/flight/FlightUSD.sol/FlightUSD.dbg.json +0 -4
- package/artifacts/contracts/examples/flight/FlightUSD.sol/FlightUSD.json +0 -586
- package/artifacts/contracts/examples/flight/originalV1.sol/FlightDelayChainlink.dbg.json +0 -4
- package/artifacts/contracts/examples/flight/originalV1.sol/FlightDelayChainlink.json +0 -901
- package/artifacts/contracts/shared/ContractLib.sol/IInstanceAdminHelper.dbg.json +0 -4
- package/artifacts/contracts/shared/ContractLib.sol/IInstanceAdminHelper.json +0 -24
- package/artifacts/contracts/shared/ContractLib.sol/ITokenRegistryHelper.dbg.json +0 -4
- package/artifacts/contracts/shared/ContractLib.sol/ITokenRegistryHelper.json +0 -40
- package/artifacts/contracts/type/RequestIdSet.sol/LibRequestIdSet.dbg.json +0 -4
- package/artifacts/contracts/type/RequestIdSet.sol/LibRequestIdSet.json +0 -33
- package/artifacts/contracts/upgradeability/IVersionable.sol/IVersionable.dbg.json +0 -4
- package/artifacts/contracts/upgradeability/Versionable.sol/Versionable.dbg.json +0 -4
- package/contracts/examples/flight/FlightLib.sol +0 -322
- package/contracts/examples/flight/FlightMessageVerifier.sol +0 -128
- package/contracts/examples/flight/FlightOracle.sol +0 -167
- package/contracts/examples/flight/FlightOracleAuthorization.sol +0 -34
- package/contracts/examples/flight/FlightPool.sol +0 -89
- package/contracts/examples/flight/FlightPoolAuthorization.sol +0 -37
- package/contracts/examples/flight/FlightProduct.sol +0 -651
- package/contracts/examples/flight/FlightProductAuthorization.sol +0 -45
- package/contracts/examples/flight/FlightUSD.sol +0 -28
- package/contracts/examples/flight/originalV1.sol +0 -396
- package/contracts/shared/EcdsaChecker.sol +0 -5
- package/contracts/type/RequestIdSet.sol +0 -62
@@ -18,6 +18,7 @@ import {PROTOCOL, INSTANCE} from "../type/ObjectType.sol";
|
|
18
18
|
import {Seconds, SecondsLib} from "../type/Seconds.sol";
|
19
19
|
import {StakingLib} from "./StakingLib.sol";
|
20
20
|
import {StakingReader} from "./StakingReader.sol";
|
21
|
+
import {RegistryLinked} from "../shared/RegistryLinked.sol";
|
21
22
|
import {TargetManagerLib} from "./TargetManagerLib.sol";
|
22
23
|
import {Timestamp, TimestampLib} from "../type/Timestamp.sol";
|
23
24
|
import {UFixed, UFixedLib} from "../type/UFixed.sol";
|
@@ -25,7 +26,8 @@ import {UFixed, UFixedLib} from "../type/UFixed.sol";
|
|
25
26
|
|
26
27
|
contract StakingStore is
|
27
28
|
Initializable,
|
28
|
-
AccessManaged
|
29
|
+
AccessManaged,
|
30
|
+
RegistryLinked
|
29
31
|
{
|
30
32
|
|
31
33
|
// token
|
@@ -53,7 +55,6 @@ contract StakingStore is
|
|
53
55
|
error ErrorStakingStoreTvlBalanceAlreadyInitialized(NftId nftId, address token);
|
54
56
|
error ErrorStakingStoreTvlBalanceNotInitialized(NftId nftId, address token);
|
55
57
|
|
56
|
-
IRegistry private _registry;
|
57
58
|
ITargetLimitHandler private _targetLimitHandler;
|
58
59
|
StakingReader private _reader;
|
59
60
|
NftIdSet private _targetNftIdSet;
|
@@ -75,16 +76,15 @@ contract StakingStore is
|
|
75
76
|
|
76
77
|
|
77
78
|
constructor(
|
78
|
-
IRegistry registry,
|
79
79
|
StakingReader reader
|
80
80
|
)
|
81
81
|
AccessManaged(msg.sender)
|
82
82
|
{
|
83
|
+
|
83
84
|
// set final authority
|
84
|
-
setAuthority(
|
85
|
+
setAuthority(_getRegistry().getAuthority());
|
85
86
|
|
86
87
|
// set internal variables
|
87
|
-
_registry = registry;
|
88
88
|
_reader = reader;
|
89
89
|
_targetNftIdSet = new NftIdSet();
|
90
90
|
|
@@ -495,7 +495,7 @@ contract StakingStore is
|
|
495
495
|
emit IStaking.LogStakingRewardReservesRefilled(
|
496
496
|
targetNftId,
|
497
497
|
dipAmount,
|
498
|
-
|
498
|
+
_getRegistry().ownerOf(targetNftId),
|
499
499
|
newReserveBalance,
|
500
500
|
lastUpdateIn);
|
501
501
|
}
|
@@ -520,7 +520,7 @@ contract StakingStore is
|
|
520
520
|
emit IStaking.LogStakingRewardReservesWithdrawn(
|
521
521
|
targetNftId,
|
522
522
|
dipAmount,
|
523
|
-
|
523
|
+
_getRegistry().ownerOf(targetNftId),
|
524
524
|
newReserveBalance,
|
525
525
|
lastUpdateIn);
|
526
526
|
}
|
@@ -929,7 +929,7 @@ contract StakingStore is
|
|
929
929
|
// checks
|
930
930
|
if (checkParameters) {
|
931
931
|
TargetManagerLib.checkTargetParameters(
|
932
|
-
|
932
|
+
_getRegistry(),
|
933
933
|
_reader,
|
934
934
|
targetNftId,
|
935
935
|
objectType,
|
@@ -10,6 +10,7 @@ import {ITargetLimitHandler} from "./ITargetLimitHandler.sol";
|
|
10
10
|
import {Amount, AmountLib} from "../type/Amount.sol";
|
11
11
|
import {Blocknumber, BlocknumberLib} from "../type/Blocknumber.sol";
|
12
12
|
import {NftId} from "../type/NftId.sol";
|
13
|
+
import {RegistryLinked} from "../shared/RegistryLinked.sol";
|
13
14
|
import {StakingStore} from "./StakingStore.sol";
|
14
15
|
import {UFixed, UFixedLib} from "../type/UFixed.sol";
|
15
16
|
|
@@ -17,12 +18,12 @@ import {UFixed, UFixedLib} from "../type/UFixed.sol";
|
|
17
18
|
contract TargetHandler is
|
18
19
|
Initializable,
|
19
20
|
AccessManaged,
|
20
|
-
ITargetLimitHandler
|
21
|
+
ITargetLimitHandler,
|
22
|
+
RegistryLinked
|
21
23
|
{
|
22
24
|
|
23
25
|
event LogTargetHandlerUpdateTriggersSet(uint16 tvlUpdatesTrigger, UFixed minTvlRatioTrigger, Blocknumber lastUpdateIn);
|
24
26
|
|
25
|
-
IRegistry private _registry;
|
26
27
|
StakingStore private _store;
|
27
28
|
|
28
29
|
/// @dev Update trigger value: Number of TVL updates below which limit updates are suppressed
|
@@ -33,14 +34,12 @@ contract TargetHandler is
|
|
33
34
|
|
34
35
|
|
35
36
|
constructor (
|
36
|
-
IRegistry registry,
|
37
37
|
StakingStore stakingStore
|
38
38
|
)
|
39
39
|
AccessManaged(msg.sender)
|
40
40
|
{
|
41
41
|
// set final authority and registry
|
42
|
-
setAuthority(
|
43
|
-
_registry = registry;
|
42
|
+
setAuthority(_getRegistry().getAuthority());
|
44
43
|
_store = stakingStore;
|
45
44
|
|
46
45
|
// set default trigger values
|
@@ -1,7 +1,6 @@
|
|
1
1
|
// SPDX-License-Identifier: Apache-2.0
|
2
2
|
pragma solidity ^0.8.20;
|
3
3
|
|
4
|
-
import {StrLib} from "./String.sol";
|
5
4
|
import {VersionPart} from "./Version.sol";
|
6
5
|
|
7
6
|
type ObjectType is uint8;
|
@@ -248,7 +247,7 @@ library ObjectTypeLib {
|
|
248
247
|
return string(
|
249
248
|
abi.encodePacked(
|
250
249
|
"ObjectType",
|
251
|
-
|
250
|
+
toString(
|
252
251
|
toInt(objectType))));
|
253
252
|
}
|
254
253
|
|
@@ -275,4 +274,34 @@ library ObjectTypeLib {
|
|
275
274
|
versionName,
|
276
275
|
release.toString()));
|
277
276
|
}
|
277
|
+
|
278
|
+
/// @dev returns the provied int as a string
|
279
|
+
function toString(uint256 value) public pure returns (string memory name) {
|
280
|
+
|
281
|
+
if (value == 0) {
|
282
|
+
return "0";
|
283
|
+
}
|
284
|
+
|
285
|
+
uint256 temp = value;
|
286
|
+
uint256 digits = 0;
|
287
|
+
while (temp != 0) {
|
288
|
+
digits++;
|
289
|
+
temp /= 10;
|
290
|
+
}
|
291
|
+
|
292
|
+
bytes memory buffer = new bytes(digits);
|
293
|
+
uint256 index = digits - 1;
|
294
|
+
|
295
|
+
temp = value;
|
296
|
+
while (temp != 0) {
|
297
|
+
buffer[index] = bytes1(uint8(48 + temp % 10));
|
298
|
+
temp /= 10;
|
299
|
+
|
300
|
+
if (index > 0) {
|
301
|
+
index--;
|
302
|
+
}
|
303
|
+
}
|
304
|
+
|
305
|
+
return string(buffer);
|
306
|
+
}
|
278
307
|
}
|
@@ -13,7 +13,6 @@ using {
|
|
13
13
|
eqReferralId as ==,
|
14
14
|
neReferralId as !=,
|
15
15
|
ReferralLib.eqz,
|
16
|
-
ReferralLib.toInt,
|
17
16
|
ReferralLib.toKey32
|
18
17
|
} for ReferralId global;
|
19
18
|
|
@@ -75,11 +74,6 @@ library ReferralLib {
|
|
75
74
|
return ReferralStatus.wrap(status);
|
76
75
|
}
|
77
76
|
|
78
|
-
/// @dev Converts a referral id into a uint256.
|
79
|
-
function toInt(ReferralId referralId) public pure returns (uint256) {
|
80
|
-
return uint64(ReferralId.unwrap(referralId));
|
81
|
-
}
|
82
|
-
|
83
77
|
/// @dev Returns the key32 value for the specified nft id and object type.
|
84
78
|
function toKey32(ReferralId id) public pure returns (Key32 key) {
|
85
79
|
return Key32Lib.toKey32(REFERRAL(), toKeyId(id));
|
@@ -47,10 +47,6 @@ library SecondsLib {
|
|
47
47
|
return Seconds.wrap(_max());
|
48
48
|
}
|
49
49
|
|
50
|
-
function fromHours(uint32 numberOfHours) public pure returns (Seconds duration) {
|
51
|
-
return Seconds.wrap(numberOfHours * 3600);
|
52
|
-
}
|
53
|
-
|
54
50
|
function oneDay() public pure returns (Seconds duration) {
|
55
51
|
return Seconds.wrap(24 * 3600);
|
56
52
|
}
|
@@ -62,34 +62,4 @@ library StrLib {
|
|
62
62
|
function length(Str str) public pure returns (uint256 byteLength) {
|
63
63
|
return ShortStrings.byteLength(ShortString.wrap(Str.unwrap(str)));
|
64
64
|
}
|
65
|
-
|
66
|
-
/// @dev Returns the provied int as a string
|
67
|
-
function uintToString(uint256 value) public pure returns (string memory name) {
|
68
|
-
|
69
|
-
if (value == 0) {
|
70
|
-
return "0";
|
71
|
-
}
|
72
|
-
|
73
|
-
uint256 temp = value;
|
74
|
-
uint256 digits = 0;
|
75
|
-
while (temp != 0) {
|
76
|
-
digits++;
|
77
|
-
temp /= 10;
|
78
|
-
}
|
79
|
-
|
80
|
-
bytes memory buffer = new bytes(digits);
|
81
|
-
uint256 index = digits - 1;
|
82
|
-
|
83
|
-
temp = value;
|
84
|
-
while (temp != 0) {
|
85
|
-
buffer[index] = bytes1(uint8(48 + temp % 10));
|
86
|
-
temp /= 10;
|
87
|
-
|
88
|
-
if (index > 0) {
|
89
|
-
index--;
|
90
|
-
}
|
91
|
-
}
|
92
|
-
|
93
|
-
return string(buffer);
|
94
|
-
}
|
95
65
|
}
|
@@ -23,7 +23,6 @@ using {
|
|
23
23
|
TimestampLib.gtz,
|
24
24
|
TimestampLib.eqz,
|
25
25
|
TimestampLib.addSeconds,
|
26
|
-
TimestampLib.subtractSeconds,
|
27
26
|
TimestampLib.toInt
|
28
27
|
} for Timestamp global;
|
29
28
|
|
@@ -130,7 +129,7 @@ library TimestampLib {
|
|
130
129
|
return Timestamp.unwrap(timestamp) > 0;
|
131
130
|
}
|
132
131
|
|
133
|
-
/// @dev return
|
132
|
+
/// @dev return true if Timestamp a is not equal to Timestamp b
|
134
133
|
function addSeconds(
|
135
134
|
Timestamp timestamp,
|
136
135
|
Seconds duration
|
@@ -138,14 +137,6 @@ library TimestampLib {
|
|
138
137
|
return toTimestamp(Timestamp.unwrap(timestamp) + duration.toInt());
|
139
138
|
}
|
140
139
|
|
141
|
-
/// @dev return a new timestamp that is duration seconds earlier than the provided timestamp.
|
142
|
-
function subtractSeconds(
|
143
|
-
Timestamp timestamp,
|
144
|
-
Seconds duration
|
145
|
-
) public pure returns (Timestamp) {
|
146
|
-
return toTimestamp(Timestamp.unwrap(timestamp) - duration.toInt());
|
147
|
-
}
|
148
|
-
|
149
140
|
function toInt(Timestamp timestamp) public pure returns (uint256) {
|
150
141
|
return uint256(uint40(Timestamp.unwrap(timestamp)));
|
151
142
|
}
|
@@ -5,6 +5,9 @@ type VersionPart is uint8;
|
|
5
5
|
|
6
6
|
using {
|
7
7
|
versionPartGt as >,
|
8
|
+
versionPartGte as >=,
|
9
|
+
versionPartLt as <,
|
10
|
+
versionPartLte as <=,
|
8
11
|
versionPartEq as ==,
|
9
12
|
versionPartNe as !=,
|
10
13
|
VersionPartLib.eqz,
|
@@ -16,6 +19,9 @@ using {
|
|
16
19
|
for VersionPart global;
|
17
20
|
|
18
21
|
function versionPartGt(VersionPart a, VersionPart b) pure returns(bool isGreaterThan) { return VersionPart.unwrap(a) > VersionPart.unwrap(b); }
|
22
|
+
function versionPartGte(VersionPart a, VersionPart b) pure returns(bool isGreaterThan) { return VersionPart.unwrap(a) >= VersionPart.unwrap(b); }
|
23
|
+
function versionPartLt(VersionPart a, VersionPart b) pure returns(bool isLessThan) { return VersionPart.unwrap(a) < VersionPart.unwrap(b); }
|
24
|
+
function versionPartLte(VersionPart a, VersionPart b) pure returns(bool isLessThan) { return VersionPart.unwrap(a) <= VersionPart.unwrap(b); }
|
19
25
|
function versionPartEq(VersionPart a, VersionPart b) pure returns(bool isSame) { return VersionPart.unwrap(a) == VersionPart.unwrap(b); }
|
20
26
|
function versionPartNe(VersionPart a, VersionPart b) pure returns(bool isSame) { return VersionPart.unwrap(a) != VersionPart.unwrap(b); }
|
21
27
|
|
@@ -27,8 +33,7 @@ library VersionPartLib {
|
|
27
33
|
function releaseMax() public pure returns (VersionPart) { return toVersionPart(99); }
|
28
34
|
|
29
35
|
function isValidRelease(VersionPart release) external pure returns(bool) {
|
30
|
-
|
31
|
-
return 3 <= releaseInt && releaseInt <= 99;
|
36
|
+
return releaseMin() <= release && release <= releaseMax();
|
32
37
|
}
|
33
38
|
|
34
39
|
function toString(VersionPart a) external pure returns (string memory) {
|
@@ -66,8 +71,9 @@ library VersionPartLib {
|
|
66
71
|
|
67
72
|
function eqz(VersionPart a) external pure returns(bool) { return VersionPart.unwrap(a) == 0; }
|
68
73
|
function gtz(VersionPart a) external pure returns(bool) { return VersionPart.unwrap(a) > 0; }
|
69
|
-
function toInt(VersionPart a) external pure returns(
|
70
|
-
function toVersionPart(
|
74
|
+
function toInt(VersionPart a) external pure returns(uint8) { return VersionPart.unwrap(a); }
|
75
|
+
function toVersionPart(uint8 a) public pure returns(VersionPart) { return VersionPart.wrap(uint8(a)); }
|
76
|
+
function zero() external pure returns(VersionPart) { return VersionPart.wrap(0); }
|
71
77
|
}
|
72
78
|
|
73
79
|
type Version is uint24; // contains major,minor,patch version parts
|
@@ -87,7 +93,7 @@ function versionEq(Version a, Version b) pure returns(bool isSame) { return Vers
|
|
87
93
|
|
88
94
|
library VersionLib {
|
89
95
|
|
90
|
-
function toInt(Version version) external pure returns(
|
96
|
+
function toInt(Version version) external pure returns(uint24) { return Version.unwrap(version); }
|
91
97
|
|
92
98
|
function toUint64(Version version) external pure returns(uint64) { return Version.unwrap(version); }
|
93
99
|
|
@@ -124,26 +130,19 @@ library VersionLib {
|
|
124
130
|
);
|
125
131
|
}
|
126
132
|
|
127
|
-
// function toVersionPart(uint256 versionPart) public pure returns(VersionPart) {
|
128
|
-
// return VersionPart.wrap(uint8(versionPart));
|
129
|
-
// }
|
130
|
-
|
131
133
|
function toVersion(
|
132
|
-
|
133
|
-
|
134
|
-
|
134
|
+
uint8 major,
|
135
|
+
uint8 minor,
|
136
|
+
uint8 patch
|
135
137
|
)
|
136
138
|
external
|
137
139
|
pure
|
138
140
|
returns(Version)
|
139
141
|
{
|
140
|
-
require(
|
141
|
-
major < 256 && minor < 256 && patch < 256,
|
142
|
-
"ERROR:VRS-010:VERSION_PART_TOO_BIG");
|
143
142
|
|
144
143
|
return Version.wrap(
|
145
144
|
uint24(
|
146
|
-
(major << 16) + (minor << 8) + patch));
|
145
|
+
(uint24(major) << 16) + (uint24(minor) << 8) + patch));
|
147
146
|
}
|
148
147
|
|
149
148
|
// TODO check for overflow?
|
@@ -1,21 +1,21 @@
|
|
1
1
|
// SPDX-License-Identifier: Apache-2.0
|
2
2
|
pragma solidity ^0.8.20;
|
3
3
|
|
4
|
-
import {
|
4
|
+
import {IVersionable} from "../shared/IVersionable.sol";
|
5
5
|
|
6
6
|
/// IMPORTANT
|
7
7
|
// Upgradeable contract MUST:
|
8
|
-
// 1) inherit
|
9
|
-
// 2) implement
|
8
|
+
// 1) inherit Upgradeable
|
9
|
+
// 2) implement getVersion() function
|
10
10
|
// 3) implement internal _initialize() function with onlyInitializing modifier
|
11
11
|
// 4) implement internal _upgrade() function with onlyInitializing modifier (1st version MUST revert)
|
12
|
-
// 5) have onlyInitialising modifier for each function callable inside _initialize()/_upgrade()
|
13
|
-
// 6) use
|
14
|
-
// 7) use
|
15
|
-
// 8)
|
12
|
+
// 5) have onlyInitialising modifier for each function callable inside _initialize()/_upgrade()
|
13
|
+
// 6) use different functions for initialization, upgrade and normal operations
|
14
|
+
// 7) use default empty constructor -> _disableInitializer() is called from Upgradeable contructor
|
15
|
+
// 8) use namespace storage (should storage be needed)
|
16
16
|
// Upgradeable contract SHOULD:
|
17
17
|
// 9) define all non private methods as virtual (in order to be able to upgrade them latter)
|
18
|
-
// otherwise, it is still possible to upgrade contract, but everyone who is using it will have to switch to a new
|
18
|
+
// otherwise, it is still possible to upgrade contract, but everyone who is using it will have to switch to a new functions
|
19
19
|
// in some cases this ok but not in the others...
|
20
20
|
//
|
21
21
|
// IMPORTANT
|
@@ -26,31 +26,25 @@ import {Version} from "../type/Version.sol";
|
|
26
26
|
// 2) ALWAYS define private getter if accessing storage
|
27
27
|
// - MUST use default implementation, CAN change ONLY return type
|
28
28
|
|
29
|
-
interface IVersionable {
|
29
|
+
interface IUpgradeable is IVersionable {
|
30
30
|
|
31
31
|
error ErrorVersionableInitializeNotImplemented();
|
32
32
|
error ErrorVersionableUpgradeNotImplemented();
|
33
33
|
|
34
34
|
/**
|
35
35
|
* @dev IMPORTANT
|
36
|
+
* top level initializer for each upgradeable
|
36
37
|
* implementation MUST be guarded by initializer modifier
|
37
38
|
* new version MUST inherit from previous version
|
38
39
|
*/
|
39
|
-
function
|
40
|
+
function initialize(address activatedBy, bytes memory activationData) external;
|
40
41
|
|
41
42
|
/**
|
42
43
|
* @dev
|
44
|
+
* top level reinitializer for each upgradeable
|
43
45
|
* implementation MUST be guarded by reinitializer(version().toUint64()) modifier
|
44
46
|
* new version MUST inherit from previous version
|
45
47
|
* the first verion MUST revert
|
46
48
|
*/
|
47
|
-
function
|
48
|
-
|
49
|
-
/**
|
50
|
-
* @dev returns version of this contract
|
51
|
-
* each new implementation MUST implement this function
|
52
|
-
* version number MUST increase
|
53
|
-
*/
|
54
|
-
function getVersion() external pure returns(Version);
|
55
|
-
|
49
|
+
function upgrade(bytes memory upgradeData) external;
|
56
50
|
}
|
@@ -5,14 +5,14 @@ import {ProxyAdmin} from "@openzeppelin/contracts/proxy/transparent/ProxyAdmin.s
|
|
5
5
|
import {ITransparentUpgradeableProxy} from "@openzeppelin/contracts/proxy/transparent/TransparentUpgradeableProxy.sol";
|
6
6
|
|
7
7
|
import {Blocknumber, BlocknumberLib} from "../type/Blocknumber.sol";
|
8
|
-
import {
|
8
|
+
import {IUpgradeable} from "./IUpgradeable.sol";
|
9
9
|
import {NftId} from "../type/NftId.sol";
|
10
10
|
import {NftOwnable} from "../shared/NftOwnable.sol";
|
11
11
|
import {Timestamp, TimestampLib} from "../type/Timestamp.sol";
|
12
12
|
import {UpgradableProxyWithAdmin} from "./UpgradableProxyWithAdmin.sol";
|
13
|
-
import {Version, VersionLib} from "../type/Version.sol";
|
13
|
+
import {Version, VersionPart, VersionLib} from "../type/Version.sol";
|
14
14
|
|
15
|
-
/// @dev manages proxy deployments for upgradable contracs of type
|
15
|
+
/// @dev manages proxy deployments for upgradable contracs of type IUpgradeable
|
16
16
|
contract ProxyManager is
|
17
17
|
NftOwnable
|
18
18
|
{
|
@@ -27,14 +27,15 @@ contract ProxyManager is
|
|
27
27
|
address activatedBy;
|
28
28
|
}
|
29
29
|
|
30
|
-
event
|
31
|
-
event
|
30
|
+
event LogProxyManagerProxyDeployed(address indexed proxy, address initialImplementation);
|
31
|
+
event LogProxyManagerProxyUpgraded(address indexed proxy, address upgradedImplementation);
|
32
32
|
|
33
33
|
error ErrorProxyManagerAlreadyDeployed();
|
34
34
|
error ErrorProxyManagerNotYetDeployed();
|
35
35
|
|
36
36
|
error ErrorProxyManagerZeroVersion();
|
37
37
|
error ErrorProxyManagerNextVersionNotIncreasing(Version nextVersion);
|
38
|
+
error ErrorProxyManagerNextVersionReleaseInvalid(Version nextVersion);
|
38
39
|
|
39
40
|
UpgradableProxyWithAdmin internal _proxy;
|
40
41
|
|
@@ -44,17 +45,19 @@ contract ProxyManager is
|
|
44
45
|
|
45
46
|
/// @dev convencience initializer
|
46
47
|
function initialize(
|
47
|
-
address registry,
|
48
48
|
address implementation,
|
49
49
|
bytes memory data,
|
50
50
|
bytes32 salt
|
51
51
|
)
|
52
52
|
public
|
53
53
|
initializer()
|
54
|
-
returns (
|
54
|
+
returns (IUpgradeable upgradeable)
|
55
55
|
{
|
56
|
-
|
57
|
-
|
56
|
+
address initialOwner = msg.sender;
|
57
|
+
|
58
|
+
__NftOwnable_init(initialOwner);
|
59
|
+
|
60
|
+
upgradeable = deployDetermenistic(
|
58
61
|
implementation,
|
59
62
|
data,
|
60
63
|
salt);
|
@@ -62,19 +65,20 @@ contract ProxyManager is
|
|
62
65
|
|
63
66
|
/// @dev deploy initial contract
|
64
67
|
function deploy(
|
65
|
-
address registry,
|
66
68
|
address initialImplementation,
|
67
69
|
bytes memory initializationData
|
68
70
|
)
|
69
71
|
public
|
70
72
|
virtual
|
71
73
|
onlyInitializing()
|
72
|
-
returns (
|
74
|
+
returns (IUpgradeable upgradeable)
|
73
75
|
{
|
74
|
-
(
|
75
|
-
|
76
|
-
|
77
|
-
|
76
|
+
if (_versions.length > 0) {
|
77
|
+
revert ErrorProxyManagerAlreadyDeployed();
|
78
|
+
}
|
79
|
+
|
80
|
+
address currentProxyOwner = getOwner(); // used by implementation
|
81
|
+
address initialProxyAdminOwner = address(this); // used by proxy
|
78
82
|
|
79
83
|
_proxy = new UpgradableProxyWithAdmin(
|
80
84
|
initialImplementation,
|
@@ -82,15 +86,14 @@ contract ProxyManager is
|
|
82
86
|
getDeployData(currentProxyOwner, initializationData)
|
83
87
|
);
|
84
88
|
|
85
|
-
|
89
|
+
upgradeable = _updateVersionHistory(
|
86
90
|
initialImplementation,
|
87
91
|
currentProxyOwner);
|
88
92
|
|
89
|
-
emit
|
93
|
+
emit LogProxyManagerProxyDeployed(address(upgradeable), initialImplementation);
|
90
94
|
}
|
91
95
|
|
92
96
|
function deployDetermenistic(
|
93
|
-
address registry,
|
94
97
|
address initialImplementation,
|
95
98
|
bytes memory initializationData,
|
96
99
|
bytes32 salt
|
@@ -98,12 +101,14 @@ contract ProxyManager is
|
|
98
101
|
public
|
99
102
|
virtual
|
100
103
|
onlyInitializing()
|
101
|
-
returns (
|
104
|
+
returns (IUpgradeable upgradeable)
|
102
105
|
{
|
103
|
-
(
|
104
|
-
|
105
|
-
|
106
|
-
|
106
|
+
if (_versions.length > 0) {
|
107
|
+
revert ErrorProxyManagerAlreadyDeployed();
|
108
|
+
}
|
109
|
+
|
110
|
+
address currentProxyOwner = getOwner(); // used by implementation
|
111
|
+
address initialProxyAdminOwner = address(this); // used by proxy
|
107
112
|
|
108
113
|
_proxy = new UpgradableProxyWithAdmin{salt: salt}(
|
109
114
|
initialImplementation,
|
@@ -111,11 +116,11 @@ contract ProxyManager is
|
|
111
116
|
getDeployData(currentProxyOwner, initializationData)
|
112
117
|
);
|
113
118
|
|
114
|
-
|
119
|
+
upgradeable = _updateVersionHistory(
|
115
120
|
initialImplementation,
|
116
121
|
currentProxyOwner);
|
117
122
|
|
118
|
-
emit
|
123
|
+
emit LogProxyManagerProxyDeployed(address(upgradeable), initialImplementation);
|
119
124
|
}
|
120
125
|
|
121
126
|
/// @dev upgrade existing contract.
|
@@ -124,7 +129,7 @@ contract ProxyManager is
|
|
124
129
|
public
|
125
130
|
virtual
|
126
131
|
onlyOwner()
|
127
|
-
returns (
|
132
|
+
returns (IUpgradeable upgradeable)
|
128
133
|
{
|
129
134
|
bytes memory emptyUpgradeData;
|
130
135
|
return upgrade(newImplementation, emptyUpgradeData);
|
@@ -135,7 +140,7 @@ contract ProxyManager is
|
|
135
140
|
public
|
136
141
|
virtual
|
137
142
|
onlyOwner()
|
138
|
-
returns (
|
143
|
+
returns (IUpgradeable upgradeable)
|
139
144
|
{
|
140
145
|
if (_versions.length == 0) {
|
141
146
|
revert ErrorProxyManagerNotYetDeployed();
|
@@ -150,11 +155,11 @@ contract ProxyManager is
|
|
150
155
|
newImplementation,
|
151
156
|
getUpgradeData(upgradeData));
|
152
157
|
|
153
|
-
|
158
|
+
upgradeable = _updateVersionHistory(
|
154
159
|
newImplementation,
|
155
160
|
currentProxyOwner);
|
156
161
|
|
157
|
-
emit
|
162
|
+
emit LogProxyManagerProxyUpgraded(address(upgradeable), newImplementation);
|
158
163
|
|
159
164
|
}
|
160
165
|
|
@@ -164,14 +169,14 @@ contract ProxyManager is
|
|
164
169
|
|
165
170
|
function getDeployData(address proxyOwner, bytes memory deployData) public pure returns (bytes memory data) {
|
166
171
|
return abi.encodeWithSelector(
|
167
|
-
|
172
|
+
IUpgradeable.initialize.selector,
|
168
173
|
proxyOwner,
|
169
174
|
deployData);
|
170
175
|
}
|
171
176
|
|
172
177
|
function getUpgradeData(bytes memory upgradeData) public pure returns (bytes memory data) {
|
173
178
|
return abi.encodeWithSelector(
|
174
|
-
|
179
|
+
IUpgradeable.upgrade.selector,
|
175
180
|
upgradeData);
|
176
181
|
}
|
177
182
|
|
@@ -180,7 +185,7 @@ contract ProxyManager is
|
|
180
185
|
}
|
181
186
|
|
182
187
|
function getVersion() external view virtual returns(Version) {
|
183
|
-
return
|
188
|
+
return _versionHistory[_versions[_versions.length]].version;
|
184
189
|
}
|
185
190
|
|
186
191
|
function getVersionCount() external view returns(uint256) {
|
@@ -195,42 +200,29 @@ contract ProxyManager is
|
|
195
200
|
return _versionHistory[_version];
|
196
201
|
}
|
197
202
|
|
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
|
-
|
216
203
|
function _updateVersionHistory(
|
217
204
|
address implementation,
|
218
205
|
address activatedBy
|
219
206
|
)
|
220
207
|
private
|
221
|
-
returns (
|
208
|
+
returns (IUpgradeable upgradeable)
|
222
209
|
{
|
223
|
-
|
224
|
-
Version newVersion =
|
210
|
+
upgradeable = IUpgradeable(address(_proxy));
|
211
|
+
Version newVersion = upgradeable.getVersion();
|
225
212
|
|
226
213
|
if(newVersion == VersionLib.zeroVersion()) {
|
227
214
|
revert ErrorProxyManagerZeroVersion();
|
228
215
|
}
|
229
216
|
|
230
217
|
if(_versions.length > 0) {
|
231
|
-
|
218
|
+
Version version = _versions[_versions.length-1];
|
219
|
+
if(newVersion.toInt() <= version.toInt()) {
|
232
220
|
revert ErrorProxyManagerNextVersionNotIncreasing(newVersion);
|
233
221
|
}
|
222
|
+
|
223
|
+
if(newVersion.toMajorPart() != version.toMajorPart()) {
|
224
|
+
revert ErrorProxyManagerNextVersionReleaseInvalid(newVersion);
|
225
|
+
}
|
234
226
|
}
|
235
227
|
|
236
228
|
// update version history
|