@etherisc/gif-next 0.0.2-de9ede4-391 → 0.0.2-df69269-973
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/artifacts/contracts/accounting/AccountingService.sol/AccountingService.dbg.json +1 -1
- package/artifacts/contracts/accounting/AccountingService.sol/AccountingService.json +65 -58
- package/artifacts/contracts/accounting/AccountingServiceManager.sol/AccountingServiceManager.dbg.json +1 -1
- package/artifacts/contracts/accounting/AccountingServiceManager.sol/AccountingServiceManager.json +20 -22
- package/artifacts/contracts/accounting/IAccountingService.sol/IAccountingService.dbg.json +1 -1
- package/artifacts/contracts/accounting/IAccountingService.sol/IAccountingService.json +27 -3
- package/artifacts/contracts/authorization/AccessAdmin.sol/AccessAdmin.dbg.json +1 -1
- package/artifacts/contracts/authorization/AccessAdmin.sol/AccessAdmin.json +103 -55
- package/artifacts/contracts/authorization/AccessAdmin.sol/IAccessManagedChecker.dbg.json +1 -1
- package/artifacts/contracts/authorization/AccessManagerCloneable.sol/AccessManagerCloneable.dbg.json +1 -1
- package/artifacts/contracts/authorization/AccessManagerCloneable.sol/AccessManagerCloneable.json +233 -5
- package/artifacts/contracts/authorization/Authorization.sol/Authorization.dbg.json +1 -1
- package/artifacts/contracts/authorization/Authorization.sol/Authorization.json +115 -21
- 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 +37 -5
- package/artifacts/contracts/authorization/IAuthorization.sol/IAuthorization.dbg.json +1 -1
- package/artifacts/contracts/authorization/IAuthorization.sol/IAuthorization.json +42 -13
- package/artifacts/contracts/authorization/IServiceAuthorization.sol/IServiceAuthorization.dbg.json +1 -1
- package/artifacts/contracts/authorization/ServiceAuthorization.sol/ServiceAuthorization.dbg.json +1 -1
- package/artifacts/contracts/authorization/ServiceAuthorization.sol/ServiceAuthorization.json +2 -2
- package/artifacts/contracts/distribution/BasicDistribution.sol/BasicDistribution.dbg.json +1 -1
- package/artifacts/contracts/distribution/BasicDistribution.sol/BasicDistribution.json +77 -47
- package/artifacts/contracts/distribution/BasicDistributionAuthorization.sol/BasicDistributionAuthorization.dbg.json +1 -1
- package/artifacts/contracts/distribution/BasicDistributionAuthorization.sol/BasicDistributionAuthorization.json +90 -33
- package/artifacts/contracts/distribution/Distribution.sol/Distribution.dbg.json +1 -1
- package/artifacts/contracts/distribution/Distribution.sol/Distribution.json +51 -21
- package/artifacts/contracts/distribution/DistributionService.sol/DistributionService.dbg.json +1 -1
- package/artifacts/contracts/distribution/DistributionService.sol/DistributionService.json +117 -110
- package/artifacts/contracts/distribution/DistributionServiceManager.sol/DistributionServiceManager.dbg.json +1 -1
- package/artifacts/contracts/distribution/DistributionServiceManager.sol/DistributionServiceManager.json +46 -48
- package/artifacts/contracts/distribution/IDistributionComponent.sol/IDistributionComponent.dbg.json +1 -1
- package/artifacts/contracts/distribution/IDistributionComponent.sol/IDistributionComponent.json +38 -8
- package/artifacts/contracts/distribution/IDistributionService.sol/IDistributionService.dbg.json +1 -1
- package/artifacts/contracts/distribution/IDistributionService.sol/IDistributionService.json +27 -3
- 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 +76 -42
- package/artifacts/contracts/examples/fire/FirePoolAuthorization.sol/FirePoolAuthorization.dbg.json +1 -1
- package/artifacts/contracts/examples/fire/FirePoolAuthorization.sol/FirePoolAuthorization.json +93 -40
- package/artifacts/contracts/examples/fire/FireProduct.sol/FireProduct.dbg.json +1 -1
- package/artifacts/contracts/examples/fire/FireProduct.sol/FireProduct.json +233 -184
- package/artifacts/contracts/examples/fire/FireProductAuthorization.sol/FireProductAuthorization.dbg.json +1 -1
- package/artifacts/contracts/examples/fire/FireProductAuthorization.sol/FireProductAuthorization.json +90 -33
- 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 +104 -54
- package/artifacts/contracts/examples/unpermissioned/SimpleDistributionAuthorization.sol/SimpleDistributionAuthorization.dbg.json +1 -1
- package/artifacts/contracts/examples/unpermissioned/SimpleDistributionAuthorization.sol/SimpleDistributionAuthorization.json +90 -33
- package/artifacts/contracts/examples/unpermissioned/SimpleOracle.sol/SimpleOracle.dbg.json +1 -1
- package/artifacts/contracts/examples/unpermissioned/SimpleOracle.sol/SimpleOracle.json +95 -45
- package/artifacts/contracts/examples/unpermissioned/SimplePool.sol/SimplePool.dbg.json +1 -1
- package/artifacts/contracts/examples/unpermissioned/SimplePool.sol/SimplePool.json +98 -48
- package/artifacts/contracts/examples/unpermissioned/SimplePoolAuthorization.sol/SimplePoolAuthorization.dbg.json +1 -1
- package/artifacts/contracts/examples/unpermissioned/SimplePoolAuthorization.sol/SimplePoolAuthorization.json +93 -40
- package/artifacts/contracts/examples/unpermissioned/SimpleProduct.sol/SimpleProduct.dbg.json +1 -1
- package/artifacts/contracts/examples/unpermissioned/SimpleProduct.sol/SimpleProduct.json +262 -147
- package/artifacts/contracts/examples/unpermissioned/SimpleProductAuthorization.sol/SimpleProductAuthorization.dbg.json +1 -1
- package/artifacts/contracts/examples/unpermissioned/SimpleProductAuthorization.sol/SimpleProductAuthorization.json +90 -33
- package/artifacts/contracts/instance/BundleSet.sol/BundleSet.dbg.json +1 -1
- package/artifacts/contracts/instance/BundleSet.sol/BundleSet.json +2 -2
- package/artifacts/contracts/instance/IInstance.sol/IInstance.dbg.json +1 -1
- package/artifacts/contracts/instance/IInstance.sol/IInstance.json +54 -21
- package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.dbg.json +1 -1
- package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.json +53 -3
- package/artifacts/contracts/instance/Instance.sol/Instance.dbg.json +1 -1
- package/artifacts/contracts/instance/Instance.sol/Instance.json +80 -40
- package/artifacts/contracts/instance/InstanceAdmin.sol/InstanceAdmin.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceAdmin.sol/InstanceAdmin.json +289 -92
- package/artifacts/contracts/instance/InstanceAuthorizationV3.sol/InstanceAuthorizationV3.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceAuthorizationV3.sol/InstanceAuthorizationV3.json +97 -40
- package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.json +81 -195
- package/artifacts/contracts/instance/InstanceService.sol/InstanceService.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceService.sol/InstanceService.json +65 -58
- package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.json +20 -22
- package/artifacts/contracts/instance/InstanceStore.sol/InstanceStore.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceStore.sol/InstanceStore.json +40 -268
- package/artifacts/contracts/instance/RiskSet.sol/RiskSet.dbg.json +1 -1
- package/artifacts/contracts/instance/RiskSet.sol/RiskSet.json +2 -2
- package/artifacts/contracts/instance/base/BalanceStore.sol/BalanceStore.dbg.json +1 -1
- package/artifacts/contracts/instance/base/BalanceStore.sol/BalanceStore.json +2 -2
- package/artifacts/contracts/instance/base/Cloneable.sol/Cloneable.dbg.json +1 -1
- package/artifacts/contracts/instance/base/ObjectCounter.sol/ObjectCounter.dbg.json +1 -1
- package/artifacts/contracts/instance/base/ObjectCounter.sol/ObjectCounter.json +2 -2
- package/artifacts/contracts/instance/base/ObjectLifecycle.sol/ObjectLifecycle.dbg.json +1 -1
- package/artifacts/contracts/instance/base/ObjectLifecycle.sol/ObjectLifecycle.json +2 -2
- package/artifacts/contracts/instance/base/ObjectSet.sol/ObjectSet.dbg.json +1 -1
- package/artifacts/contracts/instance/base/ObjectSet.sol/ObjectSet.json +2 -2
- package/artifacts/contracts/instance/module/IAccess.sol/IAccess.dbg.json +1 -1
- package/artifacts/contracts/instance/module/IBundle.sol/IBundle.dbg.json +1 -1
- package/artifacts/contracts/instance/module/IComponents.sol/IComponents.dbg.json +1 -1
- package/artifacts/contracts/instance/module/IDistribution.sol/IDistribution.dbg.json +1 -1
- package/artifacts/contracts/instance/module/IPolicy.sol/IPolicy.dbg.json +1 -1
- package/artifacts/contracts/instance/module/IRisk.sol/IRisk.dbg.json +1 -1
- package/artifacts/contracts/mock/Dip.sol/Dip.dbg.json +1 -1
- package/artifacts/contracts/oracle/BasicOracle.sol/BasicOracle.dbg.json +1 -1
- package/artifacts/contracts/oracle/BasicOracle.sol/BasicOracle.json +68 -38
- package/artifacts/contracts/oracle/BasicOracleAuthorization.sol/BasicOracleAuthorization.dbg.json +1 -1
- package/artifacts/contracts/oracle/BasicOracleAuthorization.sol/BasicOracleAuthorization.json +92 -35
- 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 +38 -8
- package/artifacts/contracts/oracle/IOracleService.sol/IOracleService.dbg.json +1 -1
- package/artifacts/contracts/oracle/IOracleService.sol/IOracleService.json +27 -3
- package/artifacts/contracts/oracle/Oracle.sol/Oracle.dbg.json +1 -1
- package/artifacts/contracts/oracle/Oracle.sol/Oracle.json +52 -22
- package/artifacts/contracts/oracle/OracleService.sol/OracleService.dbg.json +1 -1
- package/artifacts/contracts/oracle/OracleService.sol/OracleService.json +75 -68
- package/artifacts/contracts/oracle/OracleServiceManager.sol/OracleServiceManager.dbg.json +1 -1
- package/artifacts/contracts/oracle/OracleServiceManager.sol/OracleServiceManager.json +25 -27
- package/artifacts/contracts/pool/BasicPool.sol/BasicPool.dbg.json +1 -1
- package/artifacts/contracts/pool/BasicPool.sol/BasicPool.json +51 -21
- package/artifacts/contracts/pool/BasicPoolAuthorization.sol/BasicPoolAuthorization.dbg.json +1 -1
- package/artifacts/contracts/pool/BasicPoolAuthorization.sol/BasicPoolAuthorization.json +93 -40
- package/artifacts/contracts/pool/BundleService.sol/BundleService.dbg.json +1 -1
- package/artifacts/contracts/pool/BundleService.sol/BundleService.json +101 -94
- package/artifacts/contracts/pool/BundleServiceManager.sol/BundleServiceManager.dbg.json +1 -1
- package/artifacts/contracts/pool/BundleServiceManager.sol/BundleServiceManager.json +38 -40
- package/artifacts/contracts/pool/IBundleService.sol/IBundleService.dbg.json +1 -1
- package/artifacts/contracts/pool/IBundleService.sol/IBundleService.json +27 -3
- package/artifacts/contracts/pool/IPoolComponent.sol/IPoolComponent.dbg.json +1 -1
- package/artifacts/contracts/pool/IPoolComponent.sol/IPoolComponent.json +38 -8
- package/artifacts/contracts/pool/IPoolService.sol/IPoolService.dbg.json +1 -1
- package/artifacts/contracts/pool/IPoolService.sol/IPoolService.json +27 -3
- package/artifacts/contracts/pool/Pool.sol/Pool.dbg.json +1 -1
- package/artifacts/contracts/pool/Pool.sol/Pool.json +51 -21
- package/artifacts/contracts/pool/PoolService.sol/PoolService.dbg.json +1 -1
- package/artifacts/contracts/pool/PoolService.sol/PoolService.json +85 -78
- package/artifacts/contracts/pool/PoolServiceManager.sol/PoolServiceManager.dbg.json +1 -1
- package/artifacts/contracts/pool/PoolServiceManager.sol/PoolServiceManager.json +30 -32
- package/artifacts/contracts/product/ApplicationService.sol/ApplicationService.dbg.json +1 -1
- package/artifacts/contracts/product/ApplicationService.sol/ApplicationService.json +57 -50
- package/artifacts/contracts/product/ApplicationServiceManager.sol/ApplicationServiceManager.dbg.json +1 -1
- package/artifacts/contracts/product/ApplicationServiceManager.sol/ApplicationServiceManager.json +16 -18
- package/artifacts/contracts/product/BasicProduct.sol/BasicProduct.dbg.json +1 -1
- package/artifacts/contracts/product/BasicProduct.sol/BasicProduct.json +157 -112
- package/artifacts/contracts/product/BasicProductAuthorization.sol/BasicProductAuthorization.dbg.json +1 -1
- package/artifacts/contracts/product/BasicProductAuthorization.sol/BasicProductAuthorization.json +90 -33
- package/artifacts/contracts/product/ClaimService.sol/ClaimService.dbg.json +1 -1
- package/artifacts/contracts/product/ClaimService.sol/ClaimService.json +249 -150
- package/artifacts/contracts/product/ClaimServiceManager.sol/ClaimServiceManager.dbg.json +1 -1
- package/artifacts/contracts/product/ClaimServiceManager.sol/ClaimServiceManager.json +57 -55
- package/artifacts/contracts/product/IApplicationService.sol/IApplicationService.dbg.json +1 -1
- package/artifacts/contracts/product/IApplicationService.sol/IApplicationService.json +27 -3
- package/artifacts/contracts/product/IClaimService.sol/IClaimService.dbg.json +1 -1
- package/artifacts/contracts/product/IClaimService.sol/IClaimService.json +143 -3
- package/artifacts/contracts/product/IPolicyService.sol/IPolicyService.dbg.json +1 -1
- package/artifacts/contracts/product/IPolicyService.sol/IPolicyService.json +27 -3
- package/artifacts/contracts/product/IPricingService.sol/IPricingService.dbg.json +1 -1
- package/artifacts/contracts/product/IPricingService.sol/IPricingService.json +27 -3
- package/artifacts/contracts/product/IProductComponent.sol/IProductComponent.dbg.json +1 -1
- package/artifacts/contracts/product/IProductComponent.sol/IProductComponent.json +144 -99
- package/artifacts/contracts/product/IRiskService.sol/IRiskService.dbg.json +1 -1
- package/artifacts/contracts/product/IRiskService.sol/IRiskService.json +27 -3
- package/artifacts/contracts/product/PolicyService.sol/PolicyService.dbg.json +1 -1
- package/artifacts/contracts/product/PolicyService.sol/PolicyService.json +95 -88
- package/artifacts/contracts/product/PolicyServiceManager.sol/PolicyServiceManager.dbg.json +1 -1
- package/artifacts/contracts/product/PolicyServiceManager.sol/PolicyServiceManager.json +35 -37
- package/artifacts/contracts/product/PricingService.sol/PricingService.dbg.json +1 -1
- package/artifacts/contracts/product/PricingService.sol/PricingService.json +85 -78
- package/artifacts/contracts/product/PricingServiceManager.sol/PricingServiceManager.dbg.json +1 -1
- package/artifacts/contracts/product/PricingServiceManager.sol/PricingServiceManager.json +31 -33
- package/artifacts/contracts/product/Product.sol/Product.dbg.json +1 -1
- package/artifacts/contracts/product/Product.sol/Product.json +157 -112
- package/artifacts/contracts/product/RiskService.sol/RiskService.dbg.json +1 -1
- package/artifacts/contracts/product/RiskService.sol/RiskService.json +76 -77
- package/artifacts/contracts/product/RiskServiceManager.sol/RiskServiceManager.dbg.json +1 -1
- package/artifacts/contracts/product/RiskServiceManager.sol/RiskServiceManager.json +25 -19
- 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 +7 -2
- package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.dbg.json +1 -1
- package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.json +31 -7
- 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/Registry.sol/Registry.dbg.json +1 -1
- package/artifacts/contracts/registry/Registry.sol/Registry.json +45 -40
- package/artifacts/contracts/registry/RegistryAdmin.sol/RegistryAdmin.dbg.json +1 -1
- package/artifacts/contracts/registry/RegistryAdmin.sol/RegistryAdmin.json +176 -214
- package/artifacts/contracts/registry/RegistryService.sol/RegistryService.dbg.json +1 -1
- package/artifacts/contracts/registry/RegistryService.sol/RegistryService.json +51 -44
- package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.dbg.json +1 -1
- package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.json +11 -13
- package/artifacts/contracts/registry/ReleaseAdmin.sol/ReleaseAdmin.dbg.json +4 -0
- package/artifacts/contracts/registry/ReleaseAdmin.sol/ReleaseAdmin.json +1795 -0
- 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 +307 -49
- package/artifacts/contracts/registry/ServiceAuthorizationV3.sol/ServiceAuthorizationV3.dbg.json +1 -1
- package/artifacts/contracts/registry/ServiceAuthorizationV3.sol/ServiceAuthorizationV3.json +6 -6
- package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.dbg.json +1 -1
- package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.json +4 -4
- package/artifacts/contracts/shared/Component.sol/Component.dbg.json +1 -1
- package/artifacts/contracts/shared/Component.sol/Component.json +51 -21
- package/artifacts/contracts/shared/ComponentService.sol/ComponentService.dbg.json +1 -1
- package/artifacts/contracts/shared/ComponentService.sol/ComponentService.json +113 -90
- package/artifacts/contracts/shared/ComponentServiceManager.sol/ComponentServiceManager.dbg.json +1 -1
- package/artifacts/contracts/shared/ComponentServiceManager.sol/ComponentServiceManager.json +44 -38
- package/artifacts/contracts/shared/ComponentVerifyingService.sol/ComponentVerifyingService.dbg.json +1 -1
- package/artifacts/contracts/shared/ComponentVerifyingService.sol/ComponentVerifyingService.json +27 -16
- package/artifacts/contracts/shared/ContractLib.sol/ContractLib.dbg.json +1 -1
- package/artifacts/contracts/shared/ContractLib.sol/ContractLib.json +57 -4
- package/artifacts/contracts/shared/ContractLib.sol/IInstanceAdminHelper.dbg.json +1 -1
- package/artifacts/contracts/shared/ContractLib.sol/ITargetHelper.dbg.json +1 -1
- 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 +38 -8
- package/artifacts/contracts/shared/IComponentService.sol/IComponentService.dbg.json +1 -1
- package/artifacts/contracts/shared/IComponentService.sol/IComponentService.json +27 -3
- package/artifacts/contracts/shared/IInstanceLinkedComponent.sol/IInstanceLinkedComponent.dbg.json +1 -1
- package/artifacts/contracts/shared/IInstanceLinkedComponent.sol/IInstanceLinkedComponent.json +38 -8
- package/artifacts/contracts/shared/IKeyValueStore.sol/IKeyValueStore.dbg.json +1 -1
- package/artifacts/contracts/shared/ILifecycle.sol/ILifecycle.dbg.json +1 -1
- package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.dbg.json +1 -1
- package/artifacts/contracts/shared/IPolicyHolder.sol/IPolicyHolder.dbg.json +1 -1
- package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.dbg.json +1 -1
- package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.json +120 -1
- package/artifacts/contracts/shared/IRegistryLinked.sol/IRegistryLinked.dbg.json +1 -1
- package/artifacts/contracts/shared/IService.sol/IService.dbg.json +1 -1
- package/artifacts/contracts/shared/IService.sol/IService.json +27 -3
- 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 +51 -21
- package/artifacts/contracts/shared/KeyValueStore.sol/KeyValueStore.dbg.json +1 -1
- package/artifacts/contracts/shared/Lifecycle.sol/Lifecycle.dbg.json +1 -1
- package/artifacts/contracts/shared/NftIdSet.sol/NftIdSet.dbg.json +1 -1
- package/artifacts/contracts/shared/NftIdSet.sol/NftIdSet.json +2 -2
- package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.dbg.json +1 -1
- package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.json +2 -2
- package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.dbg.json +1 -1
- package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.json +2 -2
- package/artifacts/contracts/shared/Registerable.sol/Registerable.dbg.json +1 -1
- package/artifacts/contracts/shared/Registerable.sol/Registerable.json +118 -62
- package/artifacts/contracts/shared/RegistryLinked.sol/RegistryLinked.dbg.json +1 -1
- package/artifacts/contracts/shared/RegistryLinked.sol/RegistryLinked.json +2 -2
- package/artifacts/contracts/shared/Service.sol/Service.dbg.json +1 -1
- package/artifacts/contracts/shared/Service.sol/Service.json +27 -16
- package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.dbg.json +1 -1
- package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.json +3 -3
- package/artifacts/contracts/shared/TokenHandler.sol/TokenHandlerBase.dbg.json +1 -1
- package/artifacts/contracts/shared/TokenHandler.sol/TokenHandlerBase.json +2 -2
- package/artifacts/contracts/shared/TokenHandlerDeployerLib.sol/TokenHandlerDeployerLib.dbg.json +1 -1
- package/artifacts/contracts/shared/TokenHandlerDeployerLib.sol/TokenHandlerDeployerLib.json +2 -2
- package/artifacts/contracts/staking/IStaking.sol/IStaking.dbg.json +1 -1
- package/artifacts/contracts/staking/IStaking.sol/IStaking.json +38 -8
- package/artifacts/contracts/staking/IStakingService.sol/IStakingService.dbg.json +1 -1
- package/artifacts/contracts/staking/IStakingService.sol/IStakingService.json +27 -3
- package/artifacts/contracts/staking/StakeManagerLib.sol/StakeManagerLib.dbg.json +1 -1
- package/artifacts/contracts/staking/StakeManagerLib.sol/StakeManagerLib.json +2 -2
- package/artifacts/contracts/staking/Staking.sol/Staking.dbg.json +1 -1
- package/artifacts/contracts/staking/Staking.sol/Staking.json +90 -57
- package/artifacts/contracts/staking/StakingLifecycle.sol/StakingLifecycle.dbg.json +1 -1
- package/artifacts/contracts/staking/StakingLifecycle.sol/StakingLifecycle.json +2 -2
- package/artifacts/contracts/staking/StakingManager.sol/StakingManager.dbg.json +1 -1
- package/artifacts/contracts/staking/StakingManager.sol/StakingManager.json +27 -19
- package/artifacts/contracts/staking/StakingReader.sol/StakingReader.dbg.json +1 -1
- package/artifacts/contracts/staking/StakingReader.sol/StakingReader.json +2 -2
- package/artifacts/contracts/staking/StakingService.sol/StakingService.dbg.json +1 -1
- package/artifacts/contracts/staking/StakingService.sol/StakingService.json +59 -52
- package/artifacts/contracts/staking/StakingServiceManager.sol/StakingServiceManager.dbg.json +1 -1
- package/artifacts/contracts/staking/StakingServiceManager.sol/StakingServiceManager.json +17 -19
- package/artifacts/contracts/staking/StakingStore.sol/StakingStore.dbg.json +1 -1
- package/artifacts/contracts/staking/StakingStore.sol/StakingStore.json +128 -128
- package/artifacts/contracts/staking/TargetManagerLib.sol/TargetManagerLib.dbg.json +1 -1
- package/artifacts/contracts/staking/TargetManagerLib.sol/TargetManagerLib.json +22 -22
- package/artifacts/contracts/type/AddressSet.sol/LibAddressSet.dbg.json +1 -1
- package/artifacts/contracts/type/Amount.sol/AmountLib.dbg.json +1 -1
- package/artifacts/contracts/type/Blocknumber.sol/BlocknumberLib.dbg.json +1 -1
- package/artifacts/contracts/type/ClaimId.sol/ClaimIdLib.dbg.json +1 -1
- package/artifacts/contracts/type/ClaimId.sol/ClaimIdLib.json +2 -2
- package/artifacts/contracts/type/DistributorType.sol/DistributorTypeLib.dbg.json +1 -1
- package/artifacts/contracts/type/DistributorType.sol/DistributorTypeLib.json +2 -2
- package/artifacts/contracts/type/Fee.sol/FeeLib.dbg.json +1 -1
- package/artifacts/contracts/type/Key32.sol/Key32Lib.dbg.json +1 -1
- package/artifacts/contracts/type/Key32.sol/Key32Lib.json +2 -2
- package/artifacts/contracts/type/Key32Set.sol/LibKey32Set.dbg.json +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 +2 -2
- package/artifacts/contracts/type/PayoutId.sol/PayoutIdLib.dbg.json +1 -1
- package/artifacts/contracts/type/PayoutId.sol/PayoutIdLib.json +2 -2
- package/artifacts/contracts/type/Referral.sol/ReferralLib.dbg.json +1 -1
- package/artifacts/contracts/type/Referral.sol/ReferralLib.json +2 -2
- package/artifacts/contracts/type/RequestId.sol/RequestIdLib.dbg.json +1 -1
- package/artifacts/contracts/type/RequestId.sol/RequestIdLib.json +2 -2
- package/artifacts/contracts/type/RiskId.sol/RiskIdLib.dbg.json +1 -1
- package/artifacts/contracts/type/RiskId.sol/RiskIdLib.json +23 -4
- package/artifacts/contracts/type/RoleId.sol/RoleIdLib.dbg.json +1 -1
- package/artifacts/contracts/type/RoleId.sol/RoleIdLib.json +79 -15
- package/artifacts/contracts/type/Seconds.sol/SecondsLib.dbg.json +1 -1
- package/artifacts/contracts/type/Selector.sol/SelectorLib.dbg.json +1 -1
- package/artifacts/contracts/type/Selector.sol/SelectorSetLib.dbg.json +1 -1
- package/artifacts/contracts/type/StateId.sol/StateIdLib.dbg.json +1 -1
- package/artifacts/contracts/type/String.sol/StrLib.dbg.json +1 -1
- package/artifacts/contracts/type/Timestamp.sol/TimestampLib.dbg.json +1 -1
- package/artifacts/contracts/type/Timestamp.sol/TimestampLib.json +2 -2
- 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 +2 -21
- package/artifacts/contracts/type/Version.sol/VersionPartLib.dbg.json +1 -1
- package/artifacts/contracts/type/Version.sol/VersionPartLib.json +47 -2
- package/artifacts/contracts/upgradeability/IVersionable.sol/IVersionable.dbg.json +1 -1
- package/artifacts/contracts/upgradeability/ProxyManager.sol/ProxyManager.dbg.json +1 -1
- package/artifacts/contracts/upgradeability/ProxyManager.sol/ProxyManager.json +2 -2
- package/artifacts/contracts/upgradeability/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.dbg.json +1 -1
- package/artifacts/contracts/upgradeability/Versionable.sol/Versionable.dbg.json +1 -1
- package/contracts/accounting/AccountingService.sol +3 -4
- package/contracts/accounting/AccountingServiceManager.sol +1 -1
- package/contracts/authorization/AccessAdmin.sol +115 -71
- package/contracts/authorization/AccessManagerCloneable.sol +136 -3
- package/contracts/authorization/Authorization.sol +268 -227
- package/contracts/authorization/IAccessAdmin.sol +6 -3
- package/contracts/authorization/IAuthorization.sol +7 -1
- package/contracts/distribution/BasicDistributionAuthorization.sol +9 -8
- package/contracts/distribution/DistributionService.sol +6 -6
- package/contracts/distribution/DistributionServiceManager.sol +1 -1
- package/contracts/examples/fire/FirePoolAuthorization.sol +1 -1
- package/contracts/examples/fire/FireProduct.sol +3 -1
- package/contracts/examples/fire/FireProductAuthorization.sol +1 -1
- package/contracts/examples/unpermissioned/SimpleDistributionAuthorization.sol +1 -1
- package/contracts/examples/unpermissioned/SimplePoolAuthorization.sol +1 -1
- package/contracts/examples/unpermissioned/SimpleProduct.sol +18 -0
- package/contracts/examples/unpermissioned/SimpleProductAuthorization.sol +1 -1
- package/contracts/instance/BundleSet.sol +0 -1
- package/contracts/instance/IInstance.sol +6 -7
- package/contracts/instance/IInstanceService.sol +2 -0
- package/contracts/instance/Instance.sol +17 -9
- package/contracts/instance/InstanceAdmin.sol +227 -53
- package/contracts/instance/InstanceAuthorizationV3.sol +14 -8
- package/contracts/instance/InstanceReader.sol +6 -6
- package/contracts/instance/InstanceService.sol +41 -29
- package/contracts/instance/InstanceServiceManager.sol +1 -1
- package/contracts/instance/InstanceStore.sol +1 -0
- package/contracts/instance/RiskSet.sol +7 -9
- package/contracts/instance/base/ObjectLifecycle.sol +2 -1
- package/contracts/instance/module/IComponents.sol +0 -8
- package/contracts/instance/module/IRisk.sol +2 -0
- package/contracts/oracle/BasicOracleAuthorization.sol +11 -10
- package/contracts/oracle/Oracle.sol +1 -1
- package/contracts/oracle/OracleService.sol +16 -15
- package/contracts/oracle/OracleServiceManager.sol +1 -1
- package/contracts/pool/BasicPoolAuthorization.sol +10 -9
- package/contracts/pool/BundleService.sol +3 -3
- package/contracts/pool/BundleServiceManager.sol +1 -1
- package/contracts/pool/PoolService.sol +4 -4
- package/contracts/pool/PoolServiceManager.sol +1 -1
- package/contracts/product/ApplicationService.sol +3 -3
- package/contracts/product/ApplicationServiceManager.sol +1 -1
- package/contracts/product/BasicProduct.sol +2 -0
- package/contracts/product/BasicProductAuthorization.sol +10 -9
- package/contracts/product/ClaimService.sol +144 -50
- package/contracts/product/ClaimServiceManager.sol +1 -1
- package/contracts/product/IClaimService.sol +13 -0
- package/contracts/product/IProductComponent.sol +4 -1
- package/contracts/product/PolicyService.sol +3 -3
- package/contracts/product/PolicyServiceManager.sol +1 -1
- package/contracts/product/PricingService.sol +23 -19
- package/contracts/product/PricingServiceManager.sol +3 -3
- package/contracts/product/Product.sol +36 -0
- package/contracts/product/RiskService.sol +65 -21
- package/contracts/product/RiskServiceManager.sol +1 -1
- package/contracts/registry/IRegistry.sol +6 -15
- package/contracts/registry/IRelease.sol +26 -0
- package/contracts/registry/Registry.sol +3 -2
- package/contracts/registry/RegistryAdmin.sol +117 -230
- package/contracts/registry/RegistryService.sol +3 -3
- package/contracts/registry/RegistryServiceManager.sol +1 -1
- package/contracts/registry/ReleaseAdmin.sol +245 -0
- package/contracts/registry/ReleaseLifecycle.sol +2 -0
- package/contracts/registry/ReleaseRegistry.sol +124 -99
- package/contracts/registry/ServiceAuthorizationV3.sol +36 -1
- package/contracts/registry/TokenRegistry.sol +6 -8
- package/contracts/shared/Component.sol +24 -17
- package/contracts/shared/ComponentService.sol +63 -51
- package/contracts/shared/ComponentServiceManager.sol +1 -1
- package/contracts/shared/ContractLib.sol +29 -1
- package/contracts/shared/IComponent.sol +3 -4
- package/contracts/shared/IRegisterable.sol +15 -4
- package/contracts/shared/IService.sol +3 -5
- package/contracts/shared/NftOwnable.sol +4 -4
- package/contracts/shared/PolicyHolder.sol +1 -1
- package/contracts/shared/Registerable.sol +45 -19
- package/contracts/shared/RegistryLinked.sol +1 -1
- package/contracts/shared/Service.sol +8 -27
- package/contracts/shared/TokenHandler.sol +2 -2
- package/contracts/staking/Staking.sol +23 -12
- package/contracts/staking/StakingService.sol +2 -3
- package/contracts/type/ObjectType.sol +41 -27
- package/contracts/type/RiskId.sol +5 -0
- package/contracts/type/RoleId.sol +24 -4
- package/contracts/type/Timestamp.sol +0 -5
- package/contracts/type/Version.sol +15 -5
- package/contracts/upgradeability/ProxyManager.sol +1 -1
- package/package.json +1 -1
- package/artifacts/contracts/authorization/ReleaseAccessManager.sol/ReleaseAccessManager.dbg.json +0 -4
- package/artifacts/contracts/authorization/ReleaseAccessManager.sol/ReleaseAccessManager.json +0 -1196
- package/contracts/authorization/ReleaseAccessManager.sol +0 -38
@@ -1,6 +1,11 @@
|
|
1
1
|
// SPDX-License-Identifier: Apache-2.0
|
2
2
|
pragma solidity ^0.8.20;
|
3
3
|
|
4
|
+
import {AccessManagedUpgradeable} from "@openzeppelin/contracts-upgradeable/access/manager/AccessManagedUpgradeable.sol";
|
5
|
+
import {IAccessManaged} from "@openzeppelin/contracts/access/manager/IAccessManaged.sol";
|
6
|
+
|
7
|
+
import {AccessManagerCloneable} from "../authorization/AccessManagerCloneable.sol";
|
8
|
+
import {ContractLib} from "../shared/ContractLib.sol";
|
4
9
|
import {NftId, NftIdLib} from "../type/NftId.sol";
|
5
10
|
import {NftOwnable} from "../shared/NftOwnable.sol";
|
6
11
|
import {ObjectType} from "../type/ObjectType.sol";
|
@@ -8,24 +13,33 @@ import {VersionPart, VersionPartLib} from "../type/Version.sol";
|
|
8
13
|
|
9
14
|
import {IRegistry} from "../registry/IRegistry.sol";
|
10
15
|
import {IRegisterable} from "./IRegisterable.sol";
|
16
|
+
import {IRelease} from "../registry/IRelease.sol";
|
11
17
|
|
12
|
-
contract Registerable is
|
18
|
+
abstract contract Registerable is
|
19
|
+
AccessManagedUpgradeable,
|
13
20
|
NftOwnable,
|
14
21
|
IRegisterable
|
15
22
|
{
|
16
|
-
uint256 public constant GIF_RELEASE = 3;
|
17
|
-
|
18
23
|
// keccak256(abi.encode(uint256(keccak256("gif-next.contracts.shared.Registerable.sol")) - 1)) & ~bytes32(uint256(0xff));
|
19
24
|
bytes32 public constant REGISTERABLE_LOCATION_V1 = 0x6548007c3f4340f82f348c576c0ff69f4f529cadd5ad41f96aae61abceeaa300;
|
20
25
|
|
21
26
|
struct RegisterableStorage {
|
22
27
|
NftId _parentNftId;
|
23
28
|
ObjectType _objectType;
|
29
|
+
VersionPart _release;
|
24
30
|
bool _isInterceptor;
|
25
31
|
bytes _data;
|
26
32
|
}
|
27
33
|
|
28
|
-
|
34
|
+
modifier onlyActive() {
|
35
|
+
if (!isActive()) {
|
36
|
+
revert ErrorRegisterableNotActive();
|
37
|
+
}
|
38
|
+
_;
|
39
|
+
}
|
40
|
+
|
41
|
+
function __Registerable_init(
|
42
|
+
address authority,
|
29
43
|
address registry,
|
30
44
|
NftId parentNftId,
|
31
45
|
ObjectType objectType,
|
@@ -37,25 +51,34 @@ contract Registerable is
|
|
37
51
|
virtual
|
38
52
|
onlyInitializing()
|
39
53
|
{
|
40
|
-
|
41
|
-
|
42
|
-
initialOwner);
|
43
|
-
|
44
|
-
RegisterableStorage storage $;
|
45
|
-
assembly {
|
46
|
-
$.slot := REGISTERABLE_LOCATION_V1
|
54
|
+
if (!ContractLib.isAuthority(authority)) {
|
55
|
+
revert ErrorAuthorityInvalid(authority);
|
47
56
|
}
|
48
57
|
|
58
|
+
__AccessManaged_init(authority);
|
59
|
+
__NftOwnable_init(registry, initialOwner);
|
60
|
+
|
61
|
+
RegisterableStorage storage $ = _getRegisterableStorage();
|
49
62
|
$._parentNftId = parentNftId;
|
50
63
|
$._objectType = objectType;
|
64
|
+
$._release = AccessManagerCloneable(authority).getRelease();
|
51
65
|
$._isInterceptor = isInterceptor;
|
52
66
|
$._data = data;
|
67
|
+
|
68
|
+
_registerInterface(type(IAccessManaged).interfaceId);
|
53
69
|
}
|
54
70
|
|
55
71
|
|
56
72
|
/// @inheritdoc IRegisterable
|
57
|
-
function
|
58
|
-
return
|
73
|
+
function isActive() public virtual view returns (bool active) {
|
74
|
+
return !AccessManagerCloneable(authority()).isTargetClosed(address(this));
|
75
|
+
}
|
76
|
+
|
77
|
+
|
78
|
+
/// @inheritdoc IRelease
|
79
|
+
function getRelease() public virtual view returns (VersionPart release) {
|
80
|
+
RegisterableStorage storage $ = _getRegisterableStorage();
|
81
|
+
return $._release;
|
59
82
|
}
|
60
83
|
|
61
84
|
|
@@ -66,12 +89,8 @@ contract Registerable is
|
|
66
89
|
virtual
|
67
90
|
returns (IRegistry.ObjectInfo memory info)
|
68
91
|
{
|
69
|
-
RegisterableStorage storage
|
70
|
-
|
71
|
-
$.slot := REGISTERABLE_LOCATION_V1
|
72
|
-
}
|
73
|
-
|
74
|
-
info = IRegistry.ObjectInfo(
|
92
|
+
RegisterableStorage storage $ = _getRegisterableStorage();
|
93
|
+
return IRegistry.ObjectInfo(
|
75
94
|
NftIdLib.zero(),
|
76
95
|
$._parentNftId,
|
77
96
|
$._objectType,
|
@@ -80,4 +99,11 @@ contract Registerable is
|
|
80
99
|
getOwner(),
|
81
100
|
$._data);
|
82
101
|
}
|
102
|
+
|
103
|
+
|
104
|
+
function _getRegisterableStorage() private pure returns (RegisterableStorage storage $) {
|
105
|
+
assembly {
|
106
|
+
$.slot := REGISTERABLE_LOCATION_V1
|
107
|
+
}
|
108
|
+
}
|
83
109
|
}
|
@@ -1,7 +1,6 @@
|
|
1
1
|
// SPDX-License-Identifier: Apache-2.0
|
2
2
|
pragma solidity ^0.8.20;
|
3
3
|
|
4
|
-
import {AccessManagedUpgradeable} from "@openzeppelin/contracts-upgradeable/access/manager/AccessManagedUpgradeable.sol";
|
5
4
|
import {IAccessManaged} from "@openzeppelin/contracts/access/manager/IAccessManaged.sol";
|
6
5
|
import {ReentrancyGuardUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/ReentrancyGuardUpgradeable.sol";
|
7
6
|
|
@@ -19,14 +18,13 @@ import {Versionable} from "../upgradeability/Versionable.sol";
|
|
19
18
|
abstract contract Service is
|
20
19
|
Registerable,
|
21
20
|
Versionable,
|
22
|
-
AccessManagedUpgradeable,
|
23
21
|
ReentrancyGuardUpgradeable,
|
24
22
|
IService
|
25
23
|
{
|
26
24
|
|
27
|
-
function
|
28
|
-
address registry,
|
25
|
+
function __Service_init(
|
29
26
|
address authority, // real authority for registry service adress(0) for other services
|
27
|
+
address registry,
|
30
28
|
address initialOwner
|
31
29
|
)
|
32
30
|
internal
|
@@ -35,17 +33,8 @@ abstract contract Service is
|
|
35
33
|
{
|
36
34
|
__ReentrancyGuard_init();
|
37
35
|
|
38
|
-
|
39
|
-
|
40
|
-
__AccessManaged_init(authority);
|
41
|
-
} else {
|
42
|
-
address registryServiceAddress = _getServiceAddress(REGISTRY());
|
43
|
-
|
44
|
-
// copy authority from already registered registry services
|
45
|
-
__AccessManaged_init(IAccessManaged(registryServiceAddress).authority());
|
46
|
-
}
|
47
|
-
|
48
|
-
_initializeRegisterable(
|
36
|
+
__Registerable_init(
|
37
|
+
authority,
|
49
38
|
registry,
|
50
39
|
IRegistry(registry).getNftId(),
|
51
40
|
SERVICE(),
|
@@ -53,8 +42,6 @@ abstract contract Service is
|
|
53
42
|
initialOwner,
|
54
43
|
""); // data
|
55
44
|
|
56
|
-
|
57
|
-
_registerInterface(type(IAccessManaged).interfaceId);
|
58
45
|
_registerInterface(type(IService).interfaceId);
|
59
46
|
}
|
60
47
|
|
@@ -62,18 +49,12 @@ abstract contract Service is
|
|
62
49
|
return _getDomain();
|
63
50
|
}
|
64
51
|
|
65
|
-
function
|
66
|
-
return
|
52
|
+
function getVersion() public pure virtual override (IVersionable, Versionable) returns(Version) {
|
53
|
+
return VersionLib.toVersion(3, 0, 0);
|
67
54
|
}
|
68
55
|
|
69
|
-
|
70
|
-
|
71
|
-
public
|
72
|
-
pure
|
73
|
-
virtual override (IVersionable, Versionable)
|
74
|
-
returns(Version)
|
75
|
-
{
|
76
|
-
return VersionLib.toVersion(GIF_RELEASE,0,0);
|
56
|
+
function getRoleId() external virtual view returns(RoleId serviceRoleId) {
|
57
|
+
return RoleIdLib.roleForTypeAndVersion(_getDomain(), getRelease());
|
77
58
|
}
|
78
59
|
|
79
60
|
function _getDomain() internal virtual pure returns (ObjectType);
|
@@ -328,14 +328,14 @@ contract TokenHandler is
|
|
328
328
|
/// @dev Collect tokens from outside of GIF and transfer them to the wallet.
|
329
329
|
/// This method also checks balance and allowance and makes sure the amount is greater than zero.
|
330
330
|
function pushToken(
|
331
|
-
address
|
331
|
+
address to,
|
332
332
|
Amount amount
|
333
333
|
)
|
334
334
|
external
|
335
335
|
// restricted() // TODO re-activate
|
336
336
|
onlyService()
|
337
337
|
{
|
338
|
-
_pushToken(
|
338
|
+
_pushToken(to, amount);
|
339
339
|
}
|
340
340
|
|
341
341
|
|
@@ -5,6 +5,7 @@ import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IER
|
|
5
5
|
|
6
6
|
import {IRegistry} from "../registry/IRegistry.sol";
|
7
7
|
import {IRegistryService} from "../registry/IRegistryService.sol";
|
8
|
+
import {IRelease} from "../registry/IRelease.sol";
|
8
9
|
import {IStaking} from "./IStaking.sol";
|
9
10
|
import {IVersionable} from "../upgradeability/IVersionable.sol";
|
10
11
|
|
@@ -15,6 +16,7 @@ import {IComponentService} from "../shared/IComponentService.sol";
|
|
15
16
|
import {NftId} from "../type/NftId.sol";
|
16
17
|
import {ObjectType, COMPONENT, STAKING} from "../type/ObjectType.sol";
|
17
18
|
import {Seconds} from "../type/Seconds.sol";
|
19
|
+
import {Registerable} from "../shared/Registerable.sol";
|
18
20
|
import {StakeManagerLib} from "./StakeManagerLib.sol";
|
19
21
|
import {StakingReader} from "./StakingReader.sol";
|
20
22
|
import {StakingStore} from "./StakingStore.sol";
|
@@ -24,7 +26,7 @@ import {TokenHandler} from "../shared/TokenHandler.sol";
|
|
24
26
|
import {TokenHandlerDeployerLib} from "../shared/TokenHandlerDeployerLib.sol";
|
25
27
|
import {TokenRegistry} from "../registry/TokenRegistry.sol";
|
26
28
|
import {UFixed} from "../type/UFixed.sol";
|
27
|
-
import {Version, VersionLib} from "../type/Version.sol";
|
29
|
+
import {Version, VersionLib, VersionPart, VersionPartLib} from "../type/Version.sol";
|
28
30
|
import {Versionable} from "../upgradeability/Versionable.sol";
|
29
31
|
|
30
32
|
contract Staking is
|
@@ -38,7 +40,6 @@ contract Staking is
|
|
38
40
|
bytes32 public constant STAKING_LOCATION_V1 = 0xafe8d4462b2ed26a47154f4b8f6d1497d2f772496965791d25bd456e342b7f00;
|
39
41
|
|
40
42
|
struct StakingStorage {
|
41
|
-
IRegistryService _registryService;
|
42
43
|
TokenRegistry _tokenRegistry;
|
43
44
|
TokenHandler _tokenHandler;
|
44
45
|
StakingStore _store;
|
@@ -417,14 +418,24 @@ contract Staking is
|
|
417
418
|
return _getStakingStorage()._tokenHandler;
|
418
419
|
}
|
419
420
|
|
420
|
-
// from
|
421
|
+
// from IRegisterable
|
422
|
+
function getRelease()
|
423
|
+
public
|
424
|
+
pure
|
425
|
+
virtual override (IRelease, Registerable)
|
426
|
+
returns(VersionPart)
|
427
|
+
{
|
428
|
+
return VersionPartLib.toVersionPart(3);
|
429
|
+
}
|
430
|
+
|
431
|
+
// from IVersionable
|
421
432
|
function getVersion()
|
422
433
|
public
|
423
434
|
pure
|
424
|
-
virtual override (IVersionable, Versionable)
|
435
|
+
virtual override (Component, IVersionable, Versionable)
|
425
436
|
returns(Version)
|
426
437
|
{
|
427
|
-
return VersionLib.toVersion(
|
438
|
+
return VersionLib.toVersion(3,0,0);
|
428
439
|
}
|
429
440
|
|
430
441
|
//--- internal functions ------------------------------------------------//
|
@@ -484,6 +495,13 @@ contract Staking is
|
|
484
495
|
TokenRegistry tokenRegistry = TokenRegistry(tokenRegistryAddress);
|
485
496
|
address dipTokenAddress = tokenRegistry.getDipTokenAddress();
|
486
497
|
|
498
|
+
// wiring to external contracts
|
499
|
+
StakingStorage storage $ = _getStakingStorage();
|
500
|
+
$._protocolNftId = registry.getProtocolNftId();
|
501
|
+
$._store = StakingStore(stakingStoreAddress);
|
502
|
+
$._reader = StakingStore(stakingStoreAddress).getStakingReader();
|
503
|
+
$._tokenRegistry = TokenRegistry(tokenRegistryAddress);
|
504
|
+
|
487
505
|
_initializeComponent(
|
488
506
|
authority,
|
489
507
|
registryAddress,
|
@@ -496,13 +514,6 @@ contract Staking is
|
|
496
514
|
"", // registry data
|
497
515
|
""); // component data
|
498
516
|
|
499
|
-
// wiring to external contracts
|
500
|
-
StakingStorage storage $ = _getStakingStorage();
|
501
|
-
$._protocolNftId = getRegistry().getProtocolNftId();
|
502
|
-
$._store = StakingStore(stakingStoreAddress);
|
503
|
-
$._reader = StakingStore(stakingStoreAddress).getStakingReader();
|
504
|
-
$._tokenRegistry = TokenRegistry(tokenRegistryAddress);
|
505
|
-
|
506
517
|
_registerInterface(type(IStaking).interfaceId);
|
507
518
|
}
|
508
519
|
|
@@ -189,8 +189,7 @@ contract StakingService is
|
|
189
189
|
internal
|
190
190
|
virtual
|
191
191
|
{
|
192
|
-
tokenHandler.
|
193
|
-
tokenHandler.getWallet(),
|
192
|
+
tokenHandler.pushToken(
|
194
193
|
to,
|
195
194
|
amount);
|
196
195
|
}
|
@@ -363,7 +362,7 @@ contract StakingService is
|
|
363
362
|
address stakingAddress
|
364
363
|
) = abi.decode(data, (address, address, address));
|
365
364
|
|
366
|
-
|
365
|
+
__Service_init(authority, registryAddress, owner);
|
367
366
|
|
368
367
|
StakingServiceStorage storage $ = _getStakingServiceStorage();
|
369
368
|
$._registryService = RegistryService(_getServiceAddress(REGISTRY()));
|
@@ -44,10 +44,16 @@ function INSTANCE() pure returns (ObjectType) {
|
|
44
44
|
return ObjectType.wrap(10);
|
45
45
|
}
|
46
46
|
|
47
|
+
/// @dev Generic component object type.
|
48
|
+
/// Component role id range is 11-19.
|
49
|
+
/// Stick to this range for new component object types.
|
47
50
|
function COMPONENT() pure returns (ObjectType) {
|
48
51
|
return ObjectType.wrap(11);
|
49
52
|
}
|
50
53
|
|
54
|
+
/// @dev Product object type.
|
55
|
+
/// IMPORTANT the actual value has an influence on the corresponding role id (RoleIdLib.sol).
|
56
|
+
/// Do not change this value without updating the corresponding role id calculation.
|
51
57
|
function PRODUCT() pure returns (ObjectType) {
|
52
58
|
return ObjectType.wrap(12);
|
53
59
|
}
|
@@ -64,6 +70,8 @@ function POOL() pure returns (ObjectType) {
|
|
64
70
|
return ObjectType.wrap(15);
|
65
71
|
}
|
66
72
|
|
73
|
+
/// @dev Application object type.
|
74
|
+
/// Range for NFT objects created thorugh components is 20-29.
|
67
75
|
function APPLICATION() pure returns (ObjectType) {
|
68
76
|
return ObjectType.wrap(20);
|
69
77
|
}
|
@@ -72,63 +80,69 @@ function POLICY() pure returns (ObjectType) {
|
|
72
80
|
return ObjectType.wrap(21);
|
73
81
|
}
|
74
82
|
|
75
|
-
function
|
83
|
+
function BUNDLE() pure returns (ObjectType) {
|
76
84
|
return ObjectType.wrap(22);
|
77
85
|
}
|
78
86
|
|
79
|
-
function
|
87
|
+
function DISTRIBUTOR() pure returns (ObjectType) {
|
80
88
|
return ObjectType.wrap(23);
|
81
89
|
}
|
82
90
|
|
83
|
-
|
84
|
-
|
91
|
+
/// @dev Stake object type.
|
92
|
+
/// NFT object type is 30
|
93
|
+
function STAKE() pure returns (ObjectType) {
|
94
|
+
return ObjectType.wrap(30);
|
85
95
|
}
|
86
96
|
|
87
|
-
|
88
|
-
|
97
|
+
/// @dev Staking target object type.
|
98
|
+
function TARGET() pure returns (ObjectType) {
|
99
|
+
return ObjectType.wrap(31);
|
89
100
|
}
|
90
101
|
|
91
|
-
|
92
|
-
|
102
|
+
/// @dev Accounting object type.
|
103
|
+
/// Range for non-NFT types created through components is 40+
|
104
|
+
function ACCOUNTING() pure returns (ObjectType) {
|
105
|
+
return ObjectType.wrap(40);
|
93
106
|
}
|
94
107
|
|
95
|
-
function
|
96
|
-
return ObjectType.wrap(
|
108
|
+
function FEE() pure returns (ObjectType) {
|
109
|
+
return ObjectType.wrap(41);
|
97
110
|
}
|
98
111
|
|
99
|
-
function
|
100
|
-
return ObjectType.wrap(
|
112
|
+
function PRICE() pure returns (ObjectType) {
|
113
|
+
return ObjectType.wrap(42);
|
101
114
|
}
|
102
115
|
|
103
|
-
function
|
104
|
-
return ObjectType.wrap(
|
116
|
+
function PREMIUM() pure returns (ObjectType) {
|
117
|
+
return ObjectType.wrap(43);
|
105
118
|
}
|
106
119
|
|
107
|
-
function
|
108
|
-
return ObjectType.wrap(
|
120
|
+
function RISK() pure returns (ObjectType) {
|
121
|
+
return ObjectType.wrap(44);
|
109
122
|
}
|
110
123
|
|
111
|
-
function
|
112
|
-
return ObjectType.wrap(
|
124
|
+
function CLAIM() pure returns (ObjectType) {
|
125
|
+
return ObjectType.wrap(45);
|
113
126
|
}
|
114
127
|
|
115
|
-
function
|
116
|
-
return ObjectType.wrap(
|
128
|
+
function PAYOUT() pure returns (ObjectType) {
|
129
|
+
return ObjectType.wrap(46);
|
117
130
|
}
|
118
131
|
|
119
|
-
function
|
120
|
-
return ObjectType.wrap(
|
132
|
+
function REQUEST() pure returns (ObjectType) {
|
133
|
+
return ObjectType.wrap(47);
|
121
134
|
}
|
122
135
|
|
123
|
-
|
124
|
-
|
125
|
-
return ObjectType.wrap(34);
|
136
|
+
function DISTRIBUTOR_TYPE() pure returns (ObjectType) {
|
137
|
+
return ObjectType.wrap(48);
|
126
138
|
}
|
127
139
|
|
128
|
-
function
|
129
|
-
return ObjectType.wrap(
|
140
|
+
function REFERRAL() pure returns (ObjectType) {
|
141
|
+
return ObjectType.wrap(49);
|
130
142
|
}
|
131
143
|
|
144
|
+
|
145
|
+
|
132
146
|
/// @dev Object type that includes any other object type.
|
133
147
|
/// Note that eq()/'==' does not take this property into account.
|
134
148
|
function ALL() pure returns (ObjectType) {
|
@@ -12,6 +12,7 @@ using {
|
|
12
12
|
neRiskId as !=,
|
13
13
|
RiskIdLib.eq,
|
14
14
|
RiskIdLib.eqz,
|
15
|
+
RiskIdLib.gtz,
|
15
16
|
RiskIdLib.toInt,
|
16
17
|
RiskIdLib.toKeyId,
|
17
18
|
RiskIdLib.toKey32
|
@@ -66,4 +67,8 @@ library RiskIdLib {
|
|
66
67
|
function eqz(RiskId a) public pure returns (bool isZero) {
|
67
68
|
return eqRiskId(a, zero());
|
68
69
|
}
|
70
|
+
|
71
|
+
function gtz(RiskId a) public pure returns (bool isZero) {
|
72
|
+
return uint64(RiskId.unwrap(a)) > 0;
|
73
|
+
}
|
69
74
|
}
|
@@ -11,9 +11,11 @@ type RoleId is uint64;
|
|
11
11
|
using {
|
12
12
|
eqRoleId as ==,
|
13
13
|
neRoleId as !=,
|
14
|
+
RoleIdLib.toInt,
|
14
15
|
RoleIdLib.eqz,
|
15
16
|
RoleIdLib.gtz,
|
16
|
-
RoleIdLib.
|
17
|
+
RoleIdLib.isComponentRole,
|
18
|
+
RoleIdLib.isCustomRole
|
17
19
|
// RoleIdLib.toKey32
|
18
20
|
} for RoleId global;
|
19
21
|
|
@@ -54,6 +56,9 @@ function GIF_MANAGER_ROLE() pure returns (RoleId) { return RoleIdLib.toRoleId(2)
|
|
54
56
|
/// @dev role for registering remote staking targets and reporting remote total value locked amounts.
|
55
57
|
function GIF_REMOTE_MANAGER_ROLE() pure returns (RoleId) { return RoleIdLib.toRoleId(3); }
|
56
58
|
|
59
|
+
/// @dev role assigned to release registry, release specfic to lock/unlock a release
|
60
|
+
function RELEASE_REGISTRY_ROLE() pure returns (RoleId) { return RoleIdLib.toRoleId(4); }
|
61
|
+
|
57
62
|
//--- GIF core contract roles (range: 200 - 9'900) --------------------------//
|
58
63
|
// created and assigned during initial deployment for registry and staking
|
59
64
|
// granting for instances and components in instance service
|
@@ -72,6 +77,8 @@ function GIF_REMOTE_MANAGER_ROLE() pure returns (RoleId) { return RoleIdLib.toRo
|
|
72
77
|
// - application service role (version 3): 2003
|
73
78
|
|
74
79
|
//--- GIF component contract roles (range 12'001 - 19'099) ------------------//
|
80
|
+
// the min value of 12'001 is based on the following calculation:
|
81
|
+
// object type * 1000 + 1 where the lowest object type is 12 (product)
|
75
82
|
// assigned at component registration time
|
76
83
|
// object type * 1000 + instane specific component counter
|
77
84
|
// on any instance a maximum number of 999 components may be deployed
|
@@ -92,8 +99,10 @@ library RoleIdLib {
|
|
92
99
|
|
93
100
|
uint64 public constant ALL_VERSIONS = 99;
|
94
101
|
uint64 public constant SERVICE_DOMAIN_ROLE_FACTOR = 100;
|
95
|
-
uint64 public constant COMPONENT_ROLE_FACTOR =
|
96
|
-
uint64 public constant
|
102
|
+
uint64 public constant COMPONENT_ROLE_FACTOR = 1000;
|
103
|
+
uint64 public constant COMPONENT_ROLE_MIN_INT = 12000;
|
104
|
+
uint64 public constant COMPONENT_ROLE_MAX_INT = 19000;
|
105
|
+
uint64 public constant CUSTOM_ROLE_MIN_INT = 1000000;
|
97
106
|
|
98
107
|
/// @dev Converts the RoleId to a uint.
|
99
108
|
function zero() public pure returns (RoleId) {
|
@@ -112,7 +121,7 @@ library RoleIdLib {
|
|
112
121
|
|
113
122
|
/// @dev Converts an uint into a custom role id.
|
114
123
|
function toCustomRoleId(uint64 index) public pure returns (RoleId) {
|
115
|
-
return toRoleId(
|
124
|
+
return toRoleId(CUSTOM_ROLE_MIN_INT + index);
|
116
125
|
}
|
117
126
|
|
118
127
|
/// @dev Converts the role id to a uint.
|
@@ -150,6 +159,17 @@ library RoleIdLib {
|
|
150
159
|
return RoleId.unwrap(a) == 0;
|
151
160
|
}
|
152
161
|
|
162
|
+
/// @dev Returns true iff the role id is a component role.
|
163
|
+
function isComponentRole(RoleId roleId) public pure returns (bool) {
|
164
|
+
uint64 roleIdInt = RoleId.unwrap(roleId);
|
165
|
+
return roleIdInt >= COMPONENT_ROLE_MIN_INT && roleIdInt <= COMPONENT_ROLE_MAX_INT;
|
166
|
+
}
|
167
|
+
|
168
|
+
/// @dev Returns true iff the role id is a custom role.
|
169
|
+
function isCustomRole(RoleId roleId) public pure returns (bool) {
|
170
|
+
return RoleId.unwrap(roleId) >= CUSTOM_ROLE_MIN_INT;
|
171
|
+
}
|
172
|
+
|
153
173
|
/// @dev Returns the key32 value for the specified id and object type.
|
154
174
|
function toKey32(RoleId a) public pure returns (Key32 key) {
|
155
175
|
return Key32Lib.toKey32(ROLE(), toKeyId(a));
|
@@ -54,11 +54,6 @@ function neTimestamp(Timestamp a, Timestamp b) pure returns (bool) {
|
|
54
54
|
return Timestamp.unwrap(a) != Timestamp.unwrap(b);
|
55
55
|
}
|
56
56
|
|
57
|
-
/// @dev Converts the uint256 to a Timestamp.
|
58
|
-
function toTimestamp(uint256 timestamp) pure returns (Timestamp) {
|
59
|
-
return TimestampLib.toTimestamp(timestamp);
|
60
|
-
}
|
61
|
-
|
62
57
|
// TODO move to TimestampLib and rename to zero()
|
63
58
|
/// @dev Return the Timestamp zero (0)
|
64
59
|
function zeroTimestamp() pure returns (Timestamp) {
|
@@ -8,7 +8,8 @@ using {
|
|
8
8
|
versionPartEq as ==,
|
9
9
|
versionPartNe as !=,
|
10
10
|
VersionPartLib.eqz,
|
11
|
-
VersionPartLib.toInt
|
11
|
+
VersionPartLib.toInt,
|
12
|
+
VersionPartLib.isValidRelease
|
12
13
|
}
|
13
14
|
for VersionPart global;
|
14
15
|
|
@@ -17,9 +18,17 @@ function versionPartEq(VersionPart a, VersionPart b) pure returns(bool isSame) {
|
|
17
18
|
function versionPartNe(VersionPart a, VersionPart b) pure returns(bool isSame) { return VersionPart.unwrap(a) != VersionPart.unwrap(b); }
|
18
19
|
|
19
20
|
library VersionPartLib {
|
21
|
+
function releaseMin() public pure returns (VersionPart) { return toVersionPart(3); }
|
22
|
+
function releaseMax() public pure returns (VersionPart) { return toVersionPart(99); }
|
23
|
+
|
24
|
+
function isValidRelease(VersionPart release) external pure returns(bool) {
|
25
|
+
uint256 releaseInt = VersionPart.unwrap(release);
|
26
|
+
return 3 <= releaseInt && releaseInt <= 99;
|
27
|
+
}
|
28
|
+
|
20
29
|
function eqz(VersionPart a) external pure returns(bool) { return VersionPart.unwrap(a) == 0; }
|
21
30
|
function toInt(VersionPart a) external pure returns(uint256) { return VersionPart.unwrap(a); }
|
22
|
-
function toVersionPart(uint256 a)
|
31
|
+
function toVersionPart(uint256 a) public pure returns(VersionPart) { return VersionPart.wrap(uint8(a)); }
|
23
32
|
}
|
24
33
|
|
25
34
|
type Version is uint24; // contains major,minor,patch version parts
|
@@ -38,6 +47,7 @@ function versionGt(Version a, Version b) pure returns(bool isGreaterThan) { retu
|
|
38
47
|
function versionEq(Version a, Version b) pure returns(bool isSame) { return Version.unwrap(a) == Version.unwrap(b); }
|
39
48
|
|
40
49
|
library VersionLib {
|
50
|
+
|
41
51
|
function toInt(Version version) external pure returns(uint) { return Version.unwrap(version); }
|
42
52
|
|
43
53
|
function toUint64(Version version) external pure returns(uint64) { return Version.unwrap(version); }
|
@@ -75,9 +85,9 @@ library VersionLib {
|
|
75
85
|
);
|
76
86
|
}
|
77
87
|
|
78
|
-
function toVersionPart(uint256 versionPart)
|
79
|
-
|
80
|
-
}
|
88
|
+
// function toVersionPart(uint256 versionPart) public pure returns(VersionPart) {
|
89
|
+
// return VersionPart.wrap(uint8(versionPart));
|
90
|
+
// }
|
81
91
|
|
82
92
|
function toVersion(
|
83
93
|
uint256 major,
|
@@ -193,7 +193,7 @@ contract ProxyManager is
|
|
193
193
|
}
|
194
194
|
|
195
195
|
address initialOwner = msg.sender;
|
196
|
-
|
196
|
+
__NftOwnable_init(registry, initialOwner);
|
197
197
|
|
198
198
|
currentProxyOwner = getOwner(); // used by implementation
|
199
199
|
initialProxyAdminOwner = address(this); // used by proxy
|
package/package.json
CHANGED