@etherisc/gif-next 0.0.2-e922e07-736 → 0.0.2-e964d24-516
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +6 -83
- package/artifacts/contracts/distribution/Distribution.sol/Distribution.dbg.json +4 -0
- package/artifacts/contracts/{components → distribution}/Distribution.sol/Distribution.json +129 -14
- package/artifacts/contracts/distribution/DistributionService.sol/DistributionService.dbg.json +4 -0
- package/artifacts/contracts/distribution/DistributionService.sol/DistributionService.json +1556 -0
- package/artifacts/contracts/distribution/DistributionServiceManager.sol/DistributionServiceManager.dbg.json +4 -0
- package/artifacts/contracts/distribution/DistributionServiceManager.sol/DistributionServiceManager.json +780 -0
- package/artifacts/contracts/distribution/IDistributionComponent.sol/IDistributionComponent.dbg.json +4 -0
- package/artifacts/contracts/{components → distribution}/IDistributionComponent.sol/IDistributionComponent.json +203 -14
- package/artifacts/contracts/distribution/IDistributionService.sol/IDistributionService.dbg.json +4 -0
- package/artifacts/contracts/{instance/service → distribution}/IDistributionService.sol/IDistributionService.json +110 -283
- package/artifacts/contracts/instance/BundleManager.sol/BundleManager.dbg.json +1 -1
- package/artifacts/contracts/instance/BundleManager.sol/BundleManager.json +68 -54
- package/artifacts/contracts/instance/Cloneable.sol/Cloneable.dbg.json +1 -1
- package/artifacts/contracts/instance/Cloneable.sol/Cloneable.json +5 -0
- package/artifacts/contracts/instance/IInstance.sol/IInstance.dbg.json +1 -1
- package/artifacts/contracts/instance/IInstance.sol/IInstance.json +309 -2078
- package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.dbg.json +1 -1
- package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.json +183 -76
- package/artifacts/contracts/instance/Instance.sol/Instance.dbg.json +1 -1
- package/artifacts/contracts/instance/Instance.sol/Instance.json +434 -2823
- package/artifacts/contracts/instance/InstanceAccessManager.sol/InstanceAccessManager.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceAccessManager.sol/InstanceAccessManager.json +493 -129
- package/artifacts/contracts/instance/InstanceAuthorizationsLib.sol/InstanceAuthorizationsLib.dbg.json +4 -0
- package/artifacts/contracts/instance/InstanceAuthorizationsLib.sol/InstanceAuthorizationsLib.json +124 -0
- package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.json +406 -192
- package/artifacts/contracts/instance/InstanceService.sol/InstanceService.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceService.sol/InstanceService.json +224 -291
- package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.json +45 -82
- package/artifacts/contracts/instance/InstanceStore.sol/InstanceStore.dbg.json +4 -0
- package/artifacts/contracts/instance/InstanceStore.sol/InstanceStore.json +2788 -0
- package/artifacts/contracts/instance/ObjectManager.sol/ObjectManager.dbg.json +1 -1
- package/artifacts/contracts/instance/ObjectManager.sol/ObjectManager.json +8 -13
- package/artifacts/contracts/instance/base/IKeyValueStore.sol/IKeyValueStore.dbg.json +1 -1
- package/artifacts/contracts/instance/base/ILifecycle.sol/ILifecycle.dbg.json +1 -1
- package/artifacts/contracts/instance/base/KeyValueStore.sol/KeyValueStore.dbg.json +1 -1
- package/artifacts/contracts/instance/base/KeyValueStore.sol/KeyValueStore.json +44 -14
- package/artifacts/contracts/instance/base/Lifecycle.sol/Lifecycle.dbg.json +1 -1
- package/artifacts/contracts/instance/base/Lifecycle.sol/Lifecycle.json +38 -13
- package/artifacts/contracts/instance/module/IAccess.sol/IAccess.dbg.json +1 -1
- package/artifacts/contracts/instance/module/IAccess.sol/IAccess.json +56 -73
- package/artifacts/contracts/instance/module/IBundle.sol/IBundle.dbg.json +1 -1
- package/artifacts/contracts/instance/module/IComponents.sol/IComponents.dbg.json +4 -0
- package/artifacts/contracts/instance/module/IComponents.sol/IComponents.json +10 -0
- 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/instance/module/ISetup.sol/ISetup.dbg.json +1 -1
- package/artifacts/contracts/instance/module/ITreasury.sol/ITreasury.dbg.json +1 -1
- package/artifacts/contracts/pool/BundleService.sol/BundleService.dbg.json +4 -0
- package/artifacts/contracts/pool/BundleService.sol/BundleService.json +1288 -0
- package/artifacts/contracts/pool/BundleServiceManager.sol/BundleServiceManager.dbg.json +4 -0
- package/artifacts/contracts/pool/BundleServiceManager.sol/BundleServiceManager.json +696 -0
- package/artifacts/contracts/pool/IBundleService.sol/IBundleService.dbg.json +4 -0
- package/artifacts/contracts/{instance/service → pool}/IBundleService.sol/IBundleService.json +291 -189
- package/artifacts/contracts/pool/IPoolComponent.sol/IPoolComponent.dbg.json +4 -0
- package/artifacts/contracts/{components → pool}/IPoolComponent.sol/IPoolComponent.json +231 -165
- package/artifacts/contracts/pool/IPoolService.sol/IPoolService.dbg.json +4 -0
- package/artifacts/contracts/pool/IPoolService.sol/IPoolService.json +1077 -0
- package/artifacts/contracts/pool/Pool.sol/Pool.dbg.json +4 -0
- package/artifacts/contracts/{components → pool}/Pool.sol/Pool.json +160 -204
- package/artifacts/contracts/pool/PoolService.sol/PoolService.dbg.json +4 -0
- package/artifacts/contracts/pool/PoolService.sol/PoolService.json +1622 -0
- package/artifacts/contracts/pool/PoolServiceManager.sol/PoolServiceManager.dbg.json +4 -0
- package/artifacts/contracts/pool/PoolServiceManager.sol/PoolServiceManager.json +708 -0
- package/artifacts/contracts/product/ApplicationService.sol/ApplicationService.dbg.json +4 -0
- package/artifacts/contracts/product/ApplicationService.sol/ApplicationService.json +918 -0
- package/artifacts/contracts/product/ApplicationServiceManager.sol/ApplicationServiceManager.dbg.json +4 -0
- package/artifacts/contracts/product/ApplicationServiceManager.sol/ApplicationServiceManager.json +648 -0
- package/artifacts/contracts/product/ClaimService.sol/ClaimService.dbg.json +4 -0
- package/artifacts/contracts/product/ClaimService.sol/ClaimService.json +1376 -0
- package/artifacts/contracts/product/ClaimServiceManager.sol/ClaimServiceManager.dbg.json +4 -0
- package/artifacts/contracts/product/ClaimServiceManager.sol/ClaimServiceManager.json +748 -0
- package/artifacts/contracts/product/IApplicationService.sol/IApplicationService.dbg.json +4 -0
- package/artifacts/contracts/{instance/service/IClaimService.sol/IClaimService.json → product/IApplicationService.sol/IApplicationService.json} +184 -100
- package/artifacts/contracts/product/IClaimService.sol/IClaimService.dbg.json +4 -0
- package/artifacts/contracts/product/IClaimService.sol/IClaimService.json +743 -0
- package/artifacts/contracts/product/IPolicyService.sol/IPolicyService.dbg.json +4 -0
- package/artifacts/contracts/{instance/service → product}/IPolicyService.sol/IPolicyService.json +211 -100
- package/artifacts/contracts/product/IPricingService.sol/IPricingService.dbg.json +4 -0
- package/artifacts/contracts/{instance/service/IApplicationService.sol/IApplicationService.json → product/IPricingService.sol/IPricingService.json} +120 -166
- package/artifacts/contracts/product/IProductComponent.sol/IProductComponent.dbg.json +4 -0
- package/artifacts/contracts/{components → product}/IProductComponent.sol/IProductComponent.json +210 -21
- package/artifacts/contracts/product/IProductService.sol/IProductService.dbg.json +4 -0
- package/artifacts/contracts/{instance/service → product}/IProductService.sol/IProductService.json +86 -28
- package/artifacts/contracts/product/PolicyService.sol/PolicyService.dbg.json +4 -0
- package/artifacts/contracts/product/PolicyService.sol/PolicyService.json +1281 -0
- package/artifacts/contracts/product/PolicyServiceManager.sol/PolicyServiceManager.dbg.json +4 -0
- package/artifacts/contracts/product/PolicyServiceManager.sol/PolicyServiceManager.json +740 -0
- package/artifacts/contracts/product/PricingService.sol/PricingService.dbg.json +4 -0
- package/artifacts/contracts/product/PricingService.sol/PricingService.json +1004 -0
- package/artifacts/contracts/product/PricingServiceManager.sol/PricingServiceManager.dbg.json +4 -0
- package/artifacts/contracts/product/PricingServiceManager.sol/PricingServiceManager.json +688 -0
- package/artifacts/contracts/product/Product.sol/Product.dbg.json +4 -0
- package/artifacts/contracts/{components → product}/Product.sol/Product.json +121 -22
- package/artifacts/contracts/product/ProductService.sol/ProductService.dbg.json +4 -0
- package/artifacts/contracts/product/ProductService.sol/ProductService.json +864 -0
- package/artifacts/contracts/product/ProductServiceManager.sol/ProductServiceManager.dbg.json +4 -0
- package/artifacts/contracts/product/ProductServiceManager.sol/ProductServiceManager.json +640 -0
- package/artifacts/contracts/registry/ChainNft.sol/ChainNft.dbg.json +1 -1
- package/artifacts/contracts/registry/ChainNft.sol/ChainNft.json +15 -2
- package/artifacts/contracts/registry/IRegistry.sol/IRegistry.dbg.json +1 -1
- package/artifacts/contracts/registry/IRegistry.sol/IRegistry.json +19 -0
- package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.dbg.json +1 -1
- package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.json +5 -37
- package/artifacts/contracts/registry/ITransferInterceptor.sol/ITransferInterceptor.dbg.json +1 -1
- package/artifacts/contracts/registry/ITransferInterceptor.sol/ITransferInterceptor.json +18 -0
- package/artifacts/contracts/registry/Registry.sol/Registry.dbg.json +1 -1
- package/artifacts/contracts/registry/Registry.sol/Registry.json +35 -16
- package/artifacts/contracts/registry/RegistryAccessManager.sol/RegistryAccessManager.dbg.json +1 -1
- package/artifacts/contracts/registry/RegistryAccessManager.sol/RegistryAccessManager.json +4 -4
- package/artifacts/contracts/registry/RegistryService.sol/RegistryService.dbg.json +1 -1
- package/artifacts/contracts/registry/RegistryService.sol/RegistryService.json +26 -53
- package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.dbg.json +1 -1
- package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.json +27 -40
- package/artifacts/contracts/registry/ReleaseManager.sol/ReleaseManager.dbg.json +1 -1
- package/artifacts/contracts/registry/ReleaseManager.sol/ReleaseManager.json +30 -18
- package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.dbg.json +1 -1
- package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.json +14 -27
- package/artifacts/contracts/shared/AccessManagerUpgradeableInitializeable.sol/AccessManagerUpgradeableInitializeable.dbg.json +4 -0
- package/artifacts/contracts/shared/AccessManagerUpgradeableInitializeable.sol/AccessManagerUpgradeableInitializeable.json +1206 -0
- package/artifacts/contracts/shared/Component.sol/Component.dbg.json +4 -0
- package/artifacts/contracts/{components → shared}/Component.sol/Component.json +106 -7
- package/artifacts/contracts/shared/ComponentService.sol/ComponentService.dbg.json +4 -0
- package/artifacts/contracts/{instance/base → shared}/ComponentService.sol/ComponentService.json +114 -35
- package/artifacts/contracts/shared/ERC165.sol/ERC165.dbg.json +1 -1
- package/artifacts/contracts/shared/IComponent.sol/IComponent.dbg.json +4 -0
- package/artifacts/contracts/{components → shared}/IComponent.sol/IComponent.json +196 -7
- package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.dbg.json +1 -1
- package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.json +0 -13
- package/artifacts/contracts/shared/IPolicyHolder.sol/IPolicyHolder.dbg.json +1 -1
- package/artifacts/contracts/shared/IPolicyHolder.sol/IPolicyHolder.json +69 -9
- package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.dbg.json +1 -1
- package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.json +0 -13
- package/artifacts/contracts/shared/IRegistryLinked.sol/IRegistryLinked.dbg.json +1 -1
- package/artifacts/contracts/shared/IRegistryLinked.sol/IRegistryLinked.json +0 -13
- package/artifacts/contracts/shared/IService.sol/IService.dbg.json +1 -1
- package/artifacts/contracts/shared/IService.sol/IService.json +85 -27
- package/artifacts/contracts/shared/IVersionable.sol/IVersionable.dbg.json +1 -1
- package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.dbg.json +1 -1
- package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.json +8 -21
- package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.dbg.json +1 -1
- package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.json +80 -26
- package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.dbg.json +1 -1
- package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.json +20 -33
- package/artifacts/contracts/shared/Registerable.sol/Registerable.dbg.json +1 -1
- package/artifacts/contracts/shared/Registerable.sol/Registerable.json +8 -21
- package/artifacts/contracts/shared/RegistryLinked.sol/RegistryLinked.dbg.json +1 -1
- package/artifacts/contracts/shared/RegistryLinked.sol/RegistryLinked.json +2 -15
- package/artifacts/contracts/shared/Service.sol/Service.dbg.json +1 -1
- package/artifacts/contracts/shared/Service.sol/Service.json +91 -28
- package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.dbg.json +1 -1
- package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.json +24 -6
- package/artifacts/contracts/shared/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.dbg.json +1 -1
- package/artifacts/contracts/shared/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.json +2 -2
- package/artifacts/contracts/shared/Versionable.sol/Versionable.dbg.json +1 -1
- package/artifacts/contracts/staking/IStakingService.sol/IStakingService.dbg.json +4 -0
- package/artifacts/contracts/staking/IStakingService.sol/IStakingService.json +523 -0
- package/artifacts/contracts/staking/StakeingServiceManager.sol/StakingServiceManager.dbg.json +4 -0
- package/artifacts/contracts/staking/StakeingServiceManager.sol/StakingServiceManager.json +628 -0
- package/artifacts/contracts/staking/StakingService.sol/StakingService.dbg.json +4 -0
- package/artifacts/contracts/staking/StakingService.sol/StakingService.json +767 -0
- package/artifacts/contracts/type/AddressSet.sol/LibAddressSet.dbg.json +4 -0
- package/artifacts/contracts/{types → type}/AddressSet.sol/LibAddressSet.json +3 -3
- package/artifacts/contracts/type/Amount.sol/AmountLib.dbg.json +4 -0
- package/artifacts/contracts/type/Amount.sol/AmountLib.json +281 -0
- package/artifacts/contracts/type/Blocknumber.sol/BlocknumberLib.dbg.json +4 -0
- package/artifacts/contracts/{types → type}/Blocknumber.sol/BlocknumberLib.json +3 -3
- package/artifacts/contracts/type/ClaimId.sol/ClaimIdLib.dbg.json +4 -0
- package/artifacts/contracts/type/ClaimId.sol/ClaimIdLib.json +179 -0
- package/artifacts/contracts/type/DistributorType.sol/DistributorTypeLib.dbg.json +4 -0
- package/artifacts/contracts/{types → type}/DistributorType.sol/DistributorTypeLib.json +5 -5
- package/artifacts/contracts/type/Fee.sol/FeeLib.dbg.json +4 -0
- package/artifacts/contracts/type/Fee.sol/FeeLib.json +312 -0
- package/artifacts/contracts/type/Key32.sol/Key32Lib.dbg.json +4 -0
- package/artifacts/contracts/{types → type}/Key32.sol/Key32Lib.json +3 -3
- package/artifacts/contracts/type/NftId.sol/NftIdLib.dbg.json +4 -0
- package/artifacts/contracts/type/NftId.sol/NftIdLib.json +166 -0
- package/artifacts/contracts/type/NftIdSet.sol/LibNftIdSet.dbg.json +4 -0
- package/artifacts/contracts/{types → type}/NftIdSet.sol/LibNftIdSet.json +3 -3
- package/artifacts/contracts/type/ObjectType.sol/ObjectTypeLib.dbg.json +4 -0
- package/artifacts/contracts/{types → type}/ObjectType.sol/ObjectTypeLib.json +3 -3
- package/artifacts/contracts/type/PayoutId.sol/PayoutIdLib.dbg.json +4 -0
- package/artifacts/contracts/type/PayoutId.sol/PayoutIdLib.json +209 -0
- package/artifacts/contracts/type/Referral.sol/ReferralLib.dbg.json +4 -0
- package/artifacts/contracts/{types → type}/Referral.sol/ReferralLib.json +5 -5
- package/artifacts/contracts/type/RiskId.sol/RiskIdLib.dbg.json +4 -0
- package/artifacts/contracts/{types → type}/RiskId.sol/RiskIdLib.json +5 -5
- package/artifacts/contracts/type/RoleId.sol/RoleIdLib.dbg.json +4 -0
- package/artifacts/contracts/{types → type}/RoleId.sol/RoleIdLib.json +5 -5
- package/artifacts/contracts/type/Seconds.sol/SecondsLib.dbg.json +4 -0
- package/artifacts/contracts/{types → type}/Seconds.sol/SecondsLib.json +3 -3
- package/artifacts/contracts/type/StateId.sol/StateIdLib.dbg.json +4 -0
- package/artifacts/contracts/{types → type}/StateId.sol/StateIdLib.json +3 -3
- package/artifacts/contracts/type/Timestamp.sol/TimestampLib.dbg.json +4 -0
- package/artifacts/contracts/{types → type}/Timestamp.sol/TimestampLib.json +20 -7
- package/artifacts/contracts/type/UFixed.sol/MathLib.dbg.json +4 -0
- package/artifacts/contracts/{types → type}/UFixed.sol/MathLib.json +3 -3
- package/artifacts/contracts/type/UFixed.sol/UFixedLib.dbg.json +4 -0
- package/artifacts/contracts/{types → type}/UFixed.sol/UFixedLib.json +3 -3
- package/artifacts/contracts/type/Version.sol/VersionLib.dbg.json +4 -0
- package/artifacts/contracts/{types → type}/Version.sol/VersionLib.json +3 -3
- package/artifacts/contracts/type/Version.sol/VersionPartLib.dbg.json +4 -0
- package/artifacts/contracts/{types → type}/Version.sol/VersionPartLib.json +3 -3
- package/contracts/{components → distribution}/Distribution.sol +21 -16
- package/contracts/distribution/DistributionService.sol +348 -0
- package/contracts/{instance/service → distribution}/DistributionServiceManager.sol +5 -5
- package/contracts/{components → distribution}/IDistributionComponent.sol +7 -7
- package/contracts/{instance/service → distribution}/IDistributionService.sol +19 -30
- package/contracts/instance/BundleManager.sol +13 -12
- package/contracts/instance/Cloneable.sol +7 -2
- package/contracts/instance/IInstance.sol +48 -63
- package/contracts/instance/IInstanceService.sol +31 -17
- package/contracts/instance/Instance.sol +131 -193
- package/contracts/instance/InstanceAccessManager.sol +405 -161
- package/contracts/instance/InstanceAuthorizationsLib.sol +308 -0
- package/contracts/instance/InstanceReader.sol +101 -26
- package/contracts/instance/InstanceService.sol +173 -354
- package/contracts/instance/InstanceServiceManager.sol +1 -1
- package/contracts/instance/InstanceStore.sol +211 -0
- package/contracts/instance/ObjectManager.sol +9 -11
- package/contracts/instance/base/IKeyValueStore.sol +5 -5
- package/contracts/instance/base/ILifecycle.sol +3 -3
- package/contracts/instance/base/KeyValueStore.sol +18 -41
- package/contracts/instance/base/Lifecycle.sol +27 -7
- package/contracts/instance/module/IAccess.sol +23 -16
- package/contracts/instance/module/IBundle.sol +10 -8
- package/contracts/instance/module/IComponents.sol +41 -0
- package/contracts/instance/module/IDistribution.sol +7 -6
- package/contracts/instance/module/IPolicy.sol +19 -14
- package/contracts/instance/module/IRisk.sol +1 -1
- package/contracts/instance/module/ISetup.sol +5 -18
- package/contracts/instance/module/ITreasury.sol +2 -2
- package/contracts/pool/BundleService.sol +382 -0
- package/contracts/{instance/service → pool}/BundleServiceManager.sol +5 -5
- package/contracts/pool/IBundleService.sol +118 -0
- package/contracts/{components → pool}/IPoolComponent.sol +19 -56
- package/contracts/pool/IPoolService.sol +114 -0
- package/contracts/{components → pool}/Pool.sol +62 -138
- package/contracts/pool/PoolService.sol +403 -0
- package/contracts/{instance/service → pool}/PoolServiceManager.sol +5 -5
- package/contracts/product/ApplicationService.sol +186 -0
- package/contracts/{instance/service → product}/ApplicationServiceManager.sol +2 -2
- package/contracts/product/ClaimService.sol +437 -0
- package/contracts/{instance/service → product}/ClaimServiceManager.sol +2 -2
- package/contracts/{instance/service → product}/IApplicationService.sol +14 -34
- package/contracts/product/IClaimService.sol +90 -0
- package/contracts/{instance/service → product}/IPolicyService.sol +34 -26
- package/contracts/product/IPricingService.sol +37 -0
- package/contracts/{components → product}/IProductComponent.sol +11 -10
- package/contracts/{instance/service → product}/IProductService.sol +10 -10
- package/contracts/product/PolicyService.sol +376 -0
- package/contracts/{instance/service → product}/PolicyServiceManager.sol +5 -5
- package/contracts/product/PricingService.sol +275 -0
- package/contracts/product/PricingServiceManager.sol +51 -0
- package/contracts/{components → product}/Product.sol +160 -74
- package/contracts/product/ProductService.sol +210 -0
- package/contracts/{instance/service → product}/ProductServiceManager.sol +5 -5
- package/contracts/registry/ChainNft.sol +8 -0
- package/contracts/registry/IRegistry.sol +6 -4
- package/contracts/registry/IRegistryService.sol +6 -7
- package/contracts/registry/ITransferInterceptor.sol +1 -0
- package/contracts/registry/Registry.sol +26 -23
- package/contracts/registry/RegistryAccessManager.sol +1 -1
- package/contracts/registry/RegistryService.sol +33 -31
- package/contracts/registry/RegistryServiceManager.sol +0 -2
- package/contracts/registry/ReleaseManager.sol +24 -22
- package/contracts/registry/TokenRegistry.sol +2 -2
- package/contracts/shared/AccessManagerUpgradeableInitializeable.sol +13 -0
- package/contracts/{components → shared}/Component.sol +68 -18
- package/contracts/shared/ComponentService.sol +150 -0
- package/contracts/{components → shared}/IComponent.sol +28 -6
- package/contracts/shared/INftOwnable.sol +1 -1
- package/contracts/shared/IPolicyHolder.sol +24 -10
- package/contracts/shared/IRegistryLinked.sol +0 -1
- package/contracts/shared/IService.sol +6 -6
- package/contracts/shared/IVersionable.sol +1 -1
- package/contracts/shared/NftOwnable.sol +1 -3
- package/contracts/shared/PolicyHolder.sol +31 -18
- package/contracts/shared/ProxyManager.sol +3 -3
- package/contracts/shared/Registerable.sol +12 -11
- package/contracts/shared/RegistryLinked.sol +0 -5
- package/contracts/shared/Service.sol +23 -9
- package/contracts/shared/TokenHandler.sol +14 -6
- package/contracts/shared/Versionable.sol +1 -1
- package/contracts/staking/IStakingService.sol +102 -0
- package/contracts/staking/StakeingServiceManager.sol +37 -0
- package/contracts/staking/StakingService.sol +166 -0
- package/contracts/type/Amount.sol +109 -0
- package/contracts/{types → type}/Blocknumber.sol +1 -0
- package/contracts/{types → type}/ClaimId.sol +25 -2
- package/contracts/{types → type}/Fee.sol +17 -8
- package/contracts/{types → type}/NftId.sol +8 -0
- package/contracts/{types → type}/NftIdSet.sol +1 -1
- package/contracts/{types → type}/ObjectType.sol +10 -5
- package/contracts/{types → type}/PayoutId.sol +33 -5
- package/contracts/{types → type}/RoleId.sol +6 -4
- package/contracts/{types → type}/StateId.sol +7 -2
- package/contracts/{types → type}/Timestamp.sol +6 -0
- package/contracts/{types → type}/UFixed.sol +1 -0
- package/contracts/{types → type}/Version.sol +1 -0
- package/package.json +1 -1
- package/artifacts/contracts/components/Component.sol/Component.dbg.json +0 -4
- package/artifacts/contracts/components/Distribution.sol/Distribution.dbg.json +0 -4
- package/artifacts/contracts/components/IComponent.sol/IComponent.dbg.json +0 -4
- package/artifacts/contracts/components/IDistributionComponent.sol/IDistributionComponent.dbg.json +0 -4
- package/artifacts/contracts/components/IPoolComponent.sol/IPoolComponent.dbg.json +0 -4
- package/artifacts/contracts/components/IProductComponent.sol/IProductComponent.dbg.json +0 -4
- package/artifacts/contracts/components/Pool.sol/Pool.dbg.json +0 -4
- package/artifacts/contracts/components/Product.sol/Product.dbg.json +0 -4
- package/artifacts/contracts/instance/base/ComponentService.sol/ComponentService.dbg.json +0 -4
- package/artifacts/contracts/instance/service/ApplicationService.sol/ApplicationService.dbg.json +0 -4
- package/artifacts/contracts/instance/service/ApplicationService.sol/ApplicationService.json +0 -968
- package/artifacts/contracts/instance/service/ApplicationServiceManager.sol/ApplicationServiceManager.dbg.json +0 -4
- package/artifacts/contracts/instance/service/ApplicationServiceManager.sol/ApplicationServiceManager.json +0 -665
- package/artifacts/contracts/instance/service/BundleService.sol/BundleService.dbg.json +0 -4
- package/artifacts/contracts/instance/service/BundleService.sol/BundleService.json +0 -1096
- package/artifacts/contracts/instance/service/BundleServiceManager.sol/BundleServiceManager.dbg.json +0 -4
- package/artifacts/contracts/instance/service/BundleServiceManager.sol/BundleServiceManager.json +0 -661
- package/artifacts/contracts/instance/service/ClaimService.sol/ClaimService.dbg.json +0 -4
- package/artifacts/contracts/instance/service/ClaimService.sol/ClaimService.json +0 -754
- package/artifacts/contracts/instance/service/ClaimServiceManager.sol/ClaimServiceManager.dbg.json +0 -4
- package/artifacts/contracts/instance/service/ClaimServiceManager.sol/ClaimServiceManager.json +0 -637
- package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.dbg.json +0 -4
- package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.json +0 -1724
- package/artifacts/contracts/instance/service/DistributionServiceManager.sol/DistributionServiceManager.dbg.json +0 -4
- package/artifacts/contracts/instance/service/DistributionServiceManager.sol/DistributionServiceManager.json +0 -801
- package/artifacts/contracts/instance/service/IApplicationService.sol/IApplicationService.dbg.json +0 -4
- package/artifacts/contracts/instance/service/IBundleService.sol/IBundleService.dbg.json +0 -4
- package/artifacts/contracts/instance/service/IClaimService.sol/IClaimService.dbg.json +0 -4
- package/artifacts/contracts/instance/service/IDistributionService.sol/IDistributionService.dbg.json +0 -4
- package/artifacts/contracts/instance/service/IPolicyService.sol/IPolicyService.dbg.json +0 -4
- package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.dbg.json +0 -4
- package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.json +0 -347
- package/artifacts/contracts/instance/service/IProductService.sol/IProductService.dbg.json +0 -4
- package/artifacts/contracts/instance/service/PolicyService.sol/PolicyService.dbg.json +0 -4
- package/artifacts/contracts/instance/service/PolicyService.sol/PolicyService.json +0 -1021
- package/artifacts/contracts/instance/service/PolicyServiceManager.sol/PolicyServiceManager.dbg.json +0 -4
- package/artifacts/contracts/instance/service/PolicyServiceManager.sol/PolicyServiceManager.json +0 -689
- package/artifacts/contracts/instance/service/PoolService.sol/PoolService.dbg.json +0 -4
- package/artifacts/contracts/instance/service/PoolService.sol/PoolService.json +0 -727
- package/artifacts/contracts/instance/service/PoolServiceManager.sol/PoolServiceManager.dbg.json +0 -4
- package/artifacts/contracts/instance/service/PoolServiceManager.sol/PoolServiceManager.json +0 -649
- package/artifacts/contracts/instance/service/ProductService.sol/ProductService.dbg.json +0 -4
- package/artifacts/contracts/instance/service/ProductService.sol/ProductService.json +0 -777
- package/artifacts/contracts/instance/service/ProductServiceManager.sol/ProductServiceManager.dbg.json +0 -4
- package/artifacts/contracts/instance/service/ProductServiceManager.sol/ProductServiceManager.json +0 -649
- package/artifacts/contracts/shared/ContractDeployerLib.sol/ContractDeployerLib.dbg.json +0 -4
- package/artifacts/contracts/shared/ContractDeployerLib.sol/ContractDeployerLib.json +0 -107
- package/artifacts/contracts/test/TestFee.sol/TestFee.dbg.json +0 -4
- package/artifacts/contracts/test/TestFee.sol/TestFee.json +0 -119
- package/artifacts/contracts/test/TestRegisterable.sol/TestRegisterable.dbg.json +0 -4
- package/artifacts/contracts/test/TestRegisterable.sol/TestRegisterable.json +0 -383
- package/artifacts/contracts/test/TestRoleId.sol/TestRoleId.dbg.json +0 -4
- package/artifacts/contracts/test/TestRoleId.sol/TestRoleId.json +0 -116
- package/artifacts/contracts/test/TestService.sol/TestService.dbg.json +0 -4
- package/artifacts/contracts/test/TestService.sol/TestService.json +0 -521
- package/artifacts/contracts/test/TestToken.sol/TestUsdc.dbg.json +0 -4
- package/artifacts/contracts/test/TestToken.sol/TestUsdc.json +0 -376
- package/artifacts/contracts/test/TestVersion.sol/TestVersion.dbg.json +0 -4
- package/artifacts/contracts/test/TestVersion.sol/TestVersion.json +0 -218
- package/artifacts/contracts/test/TestVersionable.sol/TestVersionable.dbg.json +0 -4
- package/artifacts/contracts/test/TestVersionable.sol/TestVersionable.json +0 -104
- package/artifacts/contracts/test/Usdc.sol/USDC.dbg.json +0 -4
- package/artifacts/contracts/test/Usdc.sol/USDC.json +0 -376
- package/artifacts/contracts/types/AddressSet.sol/LibAddressSet.dbg.json +0 -4
- package/artifacts/contracts/types/Blocknumber.sol/BlocknumberLib.dbg.json +0 -4
- package/artifacts/contracts/types/ChainId.sol/ChainIdLib.dbg.json +0 -4
- package/artifacts/contracts/types/ChainId.sol/ChainIdLib.json +0 -10
- package/artifacts/contracts/types/ClaimId.sol/ClaimIdLib.dbg.json +0 -4
- package/artifacts/contracts/types/ClaimId.sol/ClaimIdLib.json +0 -100
- package/artifacts/contracts/types/DistributorType.sol/DistributorTypeLib.dbg.json +0 -4
- package/artifacts/contracts/types/Fee.sol/FeeLib.dbg.json +0 -4
- package/artifacts/contracts/types/Fee.sol/FeeLib.json +0 -257
- package/artifacts/contracts/types/Key32.sol/Key32Lib.dbg.json +0 -4
- package/artifacts/contracts/types/NftId.sol/NftIdLib.dbg.json +0 -4
- package/artifacts/contracts/types/NftId.sol/NftIdLib.json +0 -153
- package/artifacts/contracts/types/NftIdSet.sol/LibNftIdSet.dbg.json +0 -4
- package/artifacts/contracts/types/NumberId.sol/NumberIdLib.dbg.json +0 -4
- package/artifacts/contracts/types/NumberId.sol/NumberIdLib.json +0 -100
- package/artifacts/contracts/types/ObjectType.sol/ObjectTypeLib.dbg.json +0 -4
- package/artifacts/contracts/types/PayoutId.sol/PayoutIdLib.dbg.json +0 -4
- package/artifacts/contracts/types/PayoutId.sol/PayoutIdLib.json +0 -100
- package/artifacts/contracts/types/Referral.sol/ReferralLib.dbg.json +0 -4
- package/artifacts/contracts/types/RiskId.sol/RiskIdLib.dbg.json +0 -4
- package/artifacts/contracts/types/RoleId.sol/RoleIdLib.dbg.json +0 -4
- package/artifacts/contracts/types/Seconds.sol/SecondsLib.dbg.json +0 -4
- package/artifacts/contracts/types/StateId.sol/StateIdLib.dbg.json +0 -4
- package/artifacts/contracts/types/Timestamp.sol/TimestampLib.dbg.json +0 -4
- package/artifacts/contracts/types/UFixed.sol/MathLib.dbg.json +0 -4
- package/artifacts/contracts/types/UFixed.sol/UFixedLib.dbg.json +0 -4
- package/artifacts/contracts/types/Version.sol/VersionLib.dbg.json +0 -4
- package/artifacts/contracts/types/Version.sol/VersionPartLib.dbg.json +0 -4
- package/contracts/instance/base/ComponentService.sol +0 -134
- package/contracts/instance/service/ApplicationService.sol +0 -349
- package/contracts/instance/service/BundleService.sol +0 -299
- package/contracts/instance/service/ClaimService.sol +0 -151
- package/contracts/instance/service/DistributionService.sol +0 -450
- package/contracts/instance/service/IBundleService.sol +0 -55
- package/contracts/instance/service/IClaimService.sol +0 -61
- package/contracts/instance/service/IPoolService.sol +0 -20
- package/contracts/instance/service/PolicyService.sol +0 -394
- package/contracts/instance/service/PoolService.sol +0 -109
- package/contracts/instance/service/ProductService.sol +0 -233
- package/contracts/shared/ContractDeployerLib.sol +0 -72
- package/contracts/test/TestFee.sol +0 -25
- package/contracts/test/TestRegisterable.sol +0 -18
- package/contracts/test/TestRoleId.sol +0 -14
- package/contracts/test/TestService.sol +0 -25
- package/contracts/test/TestToken.sol +0 -26
- package/contracts/test/TestVersion.sol +0 -44
- package/contracts/test/TestVersionable.sol +0 -17
- package/contracts/test/Usdc.sol +0 -26
- package/contracts/types/ChainId.sol +0 -38
- package/contracts/types/NumberId.sol +0 -52
- /package/contracts/{types → type}/AddressSet.sol +0 -0
- /package/contracts/{types → type}/DistributorType.sol +0 -0
- /package/contracts/{types → type}/Key32.sol +0 -0
- /package/contracts/{types → type}/Referral.sol +0 -0
- /package/contracts/{types → type}/RiskId.sol +0 -0
- /package/contracts/{types → type}/Seconds.sol +0 -0
@@ -1,290 +1,534 @@
|
|
1
1
|
// SPDX-License-Identifier: Apache-2.0
|
2
2
|
pragma solidity ^0.8.20;
|
3
3
|
|
4
|
-
import {AccessManager} from "@openzeppelin/contracts/access/manager/AccessManager.sol";
|
5
4
|
import {AccessManagedUpgradeable} from "@openzeppelin/contracts-upgradeable/access/manager/AccessManagedUpgradeable.sol";
|
6
5
|
import {EnumerableSet} from "@openzeppelin/contracts/utils/structs/EnumerableSet.sol";
|
7
6
|
import {ShortString, ShortStrings} from "@openzeppelin/contracts/utils/ShortStrings.sol";
|
8
7
|
|
9
|
-
import {RoleId, RoleIdLib } from "../
|
10
|
-
import {TimestampLib} from "../
|
8
|
+
import {RoleId, RoleIdLib, ADMIN_ROLE, PUBLIC_ROLE, INSTANCE_SERVICE_ROLE, INSTANCE_OWNER_ROLE, INSTANCE_ROLE} from "../type/RoleId.sol";
|
9
|
+
import {TimestampLib} from "../type/Timestamp.sol";
|
10
|
+
import {NftId} from "../type/NftId.sol";
|
11
|
+
|
12
|
+
import {AccessManagerUpgradeableInitializeable} from "../shared/AccessManagerUpgradeableInitializeable.sol";
|
13
|
+
|
14
|
+
import {IRegistry} from "../registry/IRegistry.sol";
|
15
|
+
|
16
|
+
import {IInstance} from "./IInstance.sol";
|
11
17
|
import {IAccess} from "./module/IAccess.sol";
|
12
18
|
|
13
19
|
contract InstanceAccessManager is
|
14
20
|
AccessManagedUpgradeable
|
15
21
|
{
|
22
|
+
event LogRoleCreation(RoleId roleId, ShortString name, IAccess.Type rtype);
|
23
|
+
event LogTargetCreation(address target, ShortString name, IAccess.Type ttype, bool isLocked);
|
24
|
+
|
16
25
|
using RoleIdLib for RoleId;
|
17
26
|
|
18
27
|
string public constant ADMIN_ROLE_NAME = "AdminRole";
|
19
28
|
string public constant PUBLIC_ROLE_NAME = "PublicRole";
|
29
|
+
string public constant INSTANCE_ROLE_NAME = "InstanceRole";
|
30
|
+
string public constant INSTANCE_OWNER_ROLE_NAME = "InstanceOwnerRole";
|
20
31
|
|
21
|
-
uint64 public constant CUSTOM_ROLE_ID_MIN = 10000;
|
32
|
+
uint64 public constant CUSTOM_ROLE_ID_MIN = 10000; // MUST be even
|
22
33
|
uint32 public constant EXECUTION_DELAY = 0;
|
23
34
|
|
24
35
|
// role specific state
|
25
|
-
mapping(RoleId roleId => IAccess.RoleInfo info) internal
|
36
|
+
mapping(RoleId roleId => IAccess.RoleInfo info) internal _roleInfo;
|
26
37
|
mapping(RoleId roleId => EnumerableSet.AddressSet roleMembers) internal _roleMembers;
|
27
|
-
mapping(ShortString name => RoleId roleId) internal
|
28
|
-
RoleId [] internal
|
38
|
+
mapping(ShortString name => RoleId roleId) internal _roleIdForName;
|
39
|
+
RoleId [] internal _roleIds;
|
40
|
+
uint64 _idNext;
|
29
41
|
|
30
42
|
// target specific state
|
31
|
-
mapping(address target => IAccess.TargetInfo info) internal
|
32
|
-
mapping(ShortString name => address target) internal
|
43
|
+
mapping(address target => IAccess.TargetInfo info) internal _targetInfo;
|
44
|
+
mapping(ShortString name => address target) internal _targetAddressForName;
|
33
45
|
address [] internal _targets;
|
34
46
|
|
35
|
-
|
47
|
+
AccessManagerUpgradeableInitializeable internal _accessManager;
|
48
|
+
IRegistry internal _registry;
|
49
|
+
|
50
|
+
modifier restrictedToRoleAdmin(RoleId roleId) {
|
51
|
+
RoleId admin = getRoleAdmin(roleId);
|
52
|
+
(bool inRole, uint32 executionDelay) = _accessManager.hasRole(admin.toInt(), _msgSender());
|
53
|
+
assert(executionDelay == 0); // to be sure no delayed execution functionality is used
|
54
|
+
if (!inRole) {
|
55
|
+
revert IAccess.ErrorIAccessCallerIsNotRoleAdmin(_msgSender(), roleId);
|
56
|
+
}
|
57
|
+
_;
|
58
|
+
}
|
36
59
|
|
37
|
-
|
60
|
+
// instance owner is granted upon instance nft minting in callback function
|
61
|
+
function initialize(address instanceAddress) external initializer
|
38
62
|
{
|
39
|
-
|
40
|
-
|
41
|
-
|
42
|
-
|
63
|
+
IInstance instance = IInstance(instanceAddress);
|
64
|
+
IRegistry registry = instance.getRegistry();
|
65
|
+
address authority = instance.authority();
|
66
|
+
|
67
|
+
__AccessManaged_init(authority);
|
68
|
+
|
69
|
+
_accessManager = AccessManagerUpgradeableInitializeable(authority);
|
70
|
+
_registry = registry;
|
71
|
+
_idNext = CUSTOM_ROLE_ID_MIN;
|
72
|
+
|
73
|
+
_createRole(ADMIN_ROLE(), ADMIN_ROLE_NAME, IAccess.Type.Core);
|
74
|
+
_createRole(PUBLIC_ROLE(), PUBLIC_ROLE_NAME, IAccess.Type.Core);
|
75
|
+
_createRole(INSTANCE_ROLE(), INSTANCE_ROLE_NAME, IAccess.Type.Core);
|
76
|
+
_createRole(INSTANCE_OWNER_ROLE(), INSTANCE_OWNER_ROLE_NAME, IAccess.Type.Gif);// TODO should be of core type
|
43
77
|
|
44
|
-
|
78
|
+
// assume `this` is already a member of ADMIN_ROLE
|
79
|
+
EnumerableSet.add(_roleMembers[ADMIN_ROLE()], address(this));
|
45
80
|
|
46
|
-
|
47
|
-
|
81
|
+
grantRole(INSTANCE_ROLE(), instanceAddress);
|
82
|
+
setRoleAdmin(INSTANCE_OWNER_ROLE(), INSTANCE_ROLE());
|
48
83
|
}
|
49
84
|
|
50
85
|
//--- Role ------------------------------------------------------//
|
51
|
-
|
52
|
-
|
86
|
+
// ADMIN_ROLE
|
87
|
+
// assume all core roles are know at deployment time
|
88
|
+
// assume core roles are set and granted only during instance cloning
|
89
|
+
// assume core roles are never revoked -> core roles admin is never active after intialization
|
90
|
+
function createCoreRole(RoleId roleId, string memory name)
|
91
|
+
external
|
92
|
+
restricted()
|
93
|
+
{
|
94
|
+
_createRole(roleId, name, IAccess.Type.Core);
|
53
95
|
}
|
54
|
-
|
55
|
-
|
56
|
-
|
96
|
+
// ADMIN_ROLE
|
97
|
+
// assume gif roles can be revoked
|
98
|
+
// assume admin is INSTANCE_OWNER_ROLE or INSTANCE_ROLE
|
99
|
+
function createGifRole(RoleId roleId, string memory name, RoleId admin)
|
100
|
+
external
|
101
|
+
restricted()
|
102
|
+
{
|
103
|
+
_createRole(roleId, name, IAccess.Type.Gif);
|
104
|
+
setRoleAdmin(roleId, admin);
|
57
105
|
}
|
58
106
|
|
59
|
-
|
60
|
-
|
61
|
-
|
62
|
-
|
107
|
+
// INSTANCE_OWNER_ROLE
|
108
|
+
// TODO specify how many owners role can have -> many roles MUST have exactly 1 member?
|
109
|
+
function createRole(string memory roleName, string memory adminName)
|
110
|
+
external
|
111
|
+
restricted()
|
112
|
+
returns(RoleId roleId, RoleId admin)
|
113
|
+
{
|
114
|
+
(roleId, admin) = _getNextCustomRoleId();
|
63
115
|
|
64
|
-
|
65
|
-
|
66
|
-
}
|
116
|
+
_createRole(roleId, roleName, IAccess.Type.Custom);
|
117
|
+
_createRole(admin, adminName, IAccess.Type.Custom);
|
67
118
|
|
68
|
-
|
69
|
-
|
119
|
+
// TODO works without this -> why?
|
120
|
+
setRoleAdmin(roleId, admin);
|
121
|
+
setRoleAdmin(admin, INSTANCE_OWNER_ROLE());
|
70
122
|
}
|
71
123
|
|
72
|
-
|
124
|
+
// ADMIN_ROLE
|
125
|
+
// assume used by instance service only during instance cloning
|
126
|
+
// assume used only by this.createRole(), this.createGifRole() afterwards
|
127
|
+
function setRoleAdmin(RoleId roleId, RoleId admin)
|
128
|
+
public
|
129
|
+
restricted()
|
130
|
+
{
|
73
131
|
if (!roleExists(roleId)) {
|
74
|
-
revert IAccess.
|
132
|
+
revert IAccess.ErrorIAccessRoleIdDoesNotExist(roleId);
|
75
133
|
}
|
76
134
|
|
77
|
-
if
|
78
|
-
revert IAccess.
|
135
|
+
if(_roleInfo[roleId].rtype == IAccess.Type.Core) {
|
136
|
+
revert IAccess.ErrorIAccessRoleTypeInvalid(roleId, IAccess.Type.Core);
|
79
137
|
}
|
80
138
|
|
81
|
-
if (!
|
82
|
-
|
83
|
-
|
84
|
-
return true;
|
85
|
-
}
|
139
|
+
if (!roleExists(admin)) {
|
140
|
+
revert IAccess.ErrorIAccessRoleIdDoesNotExist(admin);
|
141
|
+
}
|
86
142
|
|
87
|
-
|
143
|
+
_roleInfo[roleId].admin = admin;
|
88
144
|
}
|
89
145
|
|
90
|
-
|
146
|
+
// TODO core role can be granted only to 1 member
|
147
|
+
function grantRole(RoleId roleId, address member)
|
148
|
+
public
|
149
|
+
restrictedToRoleAdmin(roleId)
|
150
|
+
returns (bool granted)
|
151
|
+
{
|
91
152
|
if (!roleExists(roleId)) {
|
92
|
-
revert IAccess.
|
153
|
+
revert IAccess.ErrorIAccessRoleIdDoesNotExist(roleId);
|
93
154
|
}
|
94
155
|
|
95
|
-
|
96
|
-
|
97
|
-
|
98
|
-
|
99
|
-
}
|
100
|
-
|
101
|
-
return false;
|
156
|
+
granted = EnumerableSet.add(_roleMembers[roleId], member);
|
157
|
+
if(granted) {
|
158
|
+
_accessManager.grantRole(roleId.toInt(), member, EXECUTION_DELAY);
|
159
|
+
}
|
102
160
|
}
|
103
161
|
|
104
|
-
|
105
|
-
|
106
|
-
|
107
|
-
|
162
|
+
function revokeRole(RoleId roleId, address member)
|
163
|
+
external
|
164
|
+
restrictedToRoleAdmin(roleId)
|
165
|
+
returns (bool)
|
166
|
+
{
|
167
|
+
return _revokeRole(roleId, member);
|
168
|
+
}
|
108
169
|
|
170
|
+
// INSTANCE_OWNER_ROLE
|
171
|
+
// IMPORTANT: unbounded function, revoke all or revert
|
172
|
+
// Instance owner role decides what to do in case of custom role admin bening revoked, e.g.:
|
173
|
+
// 1) revoke custom role from ALL members
|
174
|
+
// 2) revoke custom role admin from ALL members
|
175
|
+
// 3) 1) + 2)
|
176
|
+
// 4) revoke only 1 member of custom role admin
|
177
|
+
function revokeRoleAllMembers(RoleId roleId)
|
178
|
+
external
|
179
|
+
restrictedToRoleAdmin(roleId)
|
180
|
+
returns (bool revoked)
|
181
|
+
{
|
109
182
|
if (!roleExists(roleId)) {
|
110
|
-
revert IAccess.
|
183
|
+
revert IAccess.ErrorIAccessRoleIdDoesNotExist(roleId);
|
111
184
|
}
|
112
185
|
|
113
|
-
|
114
|
-
|
115
|
-
|
186
|
+
uint memberCount = EnumerableSet.length(_roleMembers[roleId]);
|
187
|
+
for(uint memberIdx = 0; memberIdx < memberCount; memberIdx++)
|
188
|
+
{
|
189
|
+
address member = EnumerableSet.at(_roleMembers[roleId], memberIdx);
|
116
190
|
EnumerableSet.remove(_roleMembers[roleId], member);
|
117
|
-
|
191
|
+
_accessManager.revokeRole(roleId.toInt(), member);
|
192
|
+
}
|
193
|
+
}
|
194
|
+
|
195
|
+
/// @dev not restricted function by intention
|
196
|
+
/// the restriction to role members is already enforced by the call to the access manager
|
197
|
+
function renounceRole(RoleId roleId)
|
198
|
+
external
|
199
|
+
returns (bool)
|
200
|
+
{
|
201
|
+
IAccess.Type rtype = _roleInfo[roleId].rtype;
|
202
|
+
if(rtype == IAccess.Type.Core || rtype == IAccess.Type.Gif) {
|
203
|
+
revert IAccess.ErrorIAccessRoleTypeInvalid(roleId, rtype);
|
118
204
|
}
|
119
205
|
|
120
|
-
|
206
|
+
address member = msg.sender;
|
207
|
+
// cannot use accessManger.renounce as it directly checks against msg.sender
|
208
|
+
return _revokeRole(roleId, member);
|
121
209
|
}
|
122
210
|
|
123
|
-
function
|
124
|
-
return
|
211
|
+
function roleExists(RoleId roleId) public view returns (bool exists) {
|
212
|
+
return _roleInfo[roleId].createdAt.gtz();
|
213
|
+
}
|
214
|
+
// TODO returns ADMIN_ROLE id for non existent roleId
|
215
|
+
function getRoleAdmin(RoleId roleId) public view returns(RoleId admin) {
|
216
|
+
return _roleInfo[roleId].admin;
|
217
|
+
}
|
218
|
+
|
219
|
+
function getRoleInfo(RoleId roleId) external view returns (IAccess.RoleInfo memory info) {
|
220
|
+
return _roleInfo[roleId];
|
221
|
+
}
|
222
|
+
|
223
|
+
function roleMembers(RoleId roleId) public view returns (uint256 numberOfMembers) {
|
224
|
+
return EnumerableSet.length(_roleMembers[roleId]);
|
125
225
|
}
|
126
226
|
|
127
227
|
function getRoleId(uint256 idx) external view returns (RoleId roleId) {
|
128
|
-
return
|
228
|
+
return _roleIds[idx];
|
129
229
|
}
|
130
230
|
|
231
|
+
// TODO returns ADMIN_ROLE id for non existent name
|
131
232
|
function getRoleIdForName(string memory name) external view returns (RoleId roleId) {
|
132
|
-
return
|
233
|
+
return _roleIdForName[ShortStrings.toShortString(name)];
|
133
234
|
}
|
134
235
|
|
135
|
-
function
|
136
|
-
return
|
236
|
+
function roleMember(RoleId roleId, uint256 idx) external view returns (address member) {
|
237
|
+
return EnumerableSet.at(_roleMembers[roleId], idx);
|
137
238
|
}
|
138
239
|
|
139
240
|
function hasRole(RoleId roleId, address account) external view returns (bool accountHasRole) {
|
140
241
|
(accountHasRole, ) = _accessManager.hasRole(roleId.toInt(), account);
|
141
242
|
}
|
142
243
|
|
143
|
-
function
|
144
|
-
return
|
244
|
+
function roles() external view returns (uint256 numberOfRoles) {
|
245
|
+
return _roleIds.length;
|
145
246
|
}
|
146
247
|
|
147
|
-
|
148
|
-
|
248
|
+
//--- Target ------------------------------------------------------//
|
249
|
+
// ADMIN_ROLE
|
250
|
+
// assume some core targets are registred (instance) while others are not (instance accesss manager, instance reader, bundle manager)
|
251
|
+
function createCoreTarget(address target, string memory name) external restricted() {
|
252
|
+
_createTarget(target, name, IAccess.Type.Core);
|
149
253
|
}
|
254
|
+
// INSTANCE_SERVICE_ROLE
|
255
|
+
// TODO check for instance mismatch?
|
256
|
+
function createGifTarget(address target, string memory name) external restricted()
|
257
|
+
{
|
258
|
+
if(!_registry.isRegistered(target)) {
|
259
|
+
revert IAccess.ErrorIAccessTargetNotRegistered(target);
|
260
|
+
}
|
150
261
|
|
151
|
-
|
152
|
-
|
153
|
-
|
262
|
+
_createTarget(target, name, IAccess.Type.Gif);
|
263
|
+
}
|
264
|
+
// INSTANCE_OWNER_ROLE
|
265
|
+
// assume custom target.authority() is constant -> target MUST not be used with different instance access manager
|
266
|
+
// assume custom target can not be registered as component -> each service which is doing component registration MUST register a gif target
|
267
|
+
// assume custom target can not be registered as instance or service -> why?
|
268
|
+
// TODO check target associated with instance owner or instance or instance components or components helpers
|
269
|
+
function createTarget(address target, string memory name) external restricted()
|
270
|
+
{
|
271
|
+
_createTarget(target, name, IAccess.Type.Custom);
|
154
272
|
}
|
155
273
|
|
156
|
-
|
157
|
-
|
274
|
+
// TODO instance owner locks component instead of revoking it access to the instance...
|
275
|
+
function setTargetLockedByService(address target, bool locked)
|
276
|
+
external
|
277
|
+
restricted // INSTANCE_SERVICE_ROLE
|
278
|
+
{
|
279
|
+
_setTargetLocked(target, locked);
|
158
280
|
}
|
159
281
|
|
160
|
-
function
|
161
|
-
|
162
|
-
|
163
|
-
|
164
|
-
|
282
|
+
function setTargetLockedByInstance(address target, bool locked)
|
283
|
+
external
|
284
|
+
restricted // INSTANCE_ROLE
|
285
|
+
{
|
286
|
+
_setTargetLocked(target, locked);
|
287
|
+
}
|
288
|
+
|
289
|
+
|
290
|
+
// allowed combinations of roles and targets:
|
291
|
+
//1) set core role for core target
|
292
|
+
//2) set gif role for gif target
|
293
|
+
//3) set custom role for gif target
|
294
|
+
//4) set custom role for custom target
|
295
|
+
|
296
|
+
// ADMIN_ROLE if used only during initialization, works with:
|
297
|
+
// any roles for any targets
|
298
|
+
// INSTANCE_SERVICE_ROLE if used not only during initilization, works with:
|
299
|
+
// core roles for core targets
|
300
|
+
// gif roles for gif targets
|
301
|
+
function setCoreTargetFunctionRole(
|
302
|
+
string memory targetName,
|
303
|
+
bytes4[] calldata selectors,
|
304
|
+
RoleId roleId
|
305
|
+
)
|
306
|
+
public
|
307
|
+
virtual
|
308
|
+
restricted()
|
309
|
+
{
|
310
|
+
ShortString nameShort = ShortStrings.toShortString(targetName);
|
311
|
+
address target = _targetAddressForName[nameShort];
|
312
|
+
|
313
|
+
// not custom target
|
314
|
+
if(_targetInfo[target].ttype == IAccess.Type.Custom) {
|
315
|
+
revert IAccess.ErrorIAccessTargetTypeInvalid(target, IAccess.Type.Custom);
|
165
316
|
}
|
166
317
|
|
167
|
-
|
168
|
-
|
169
|
-
|
318
|
+
// not custom role
|
319
|
+
if(_roleInfo[roleId].rtype == IAccess.Type.Custom) {
|
320
|
+
revert IAccess.ErrorIAccessRoleTypeInvalid(roleId, IAccess.Type.Custom);
|
321
|
+
}
|
170
322
|
|
171
|
-
|
172
|
-
return _target[target].createdAt.gtz();
|
323
|
+
_setTargetFunctionRole(target, nameShort, selectors, roleId);
|
173
324
|
}
|
174
325
|
|
175
|
-
|
326
|
+
// INSTANCE_OWNER_ROLE
|
327
|
+
// gif role for gif target
|
328
|
+
// gif role for custom target
|
329
|
+
// custom role for gif target
|
330
|
+
// custom role for custom target
|
331
|
+
// TODO instance owner can mess with gif target (component) -> e.g. set custom role for function intendent to work with gif role
|
332
|
+
function setTargetFunctionRole(
|
333
|
+
string memory targetName,
|
334
|
+
bytes4[] calldata selectors,
|
335
|
+
RoleId roleId
|
336
|
+
)
|
337
|
+
public
|
338
|
+
virtual
|
339
|
+
restricted()
|
340
|
+
{
|
341
|
+
ShortString nameShort = ShortStrings.toShortString(targetName);
|
342
|
+
address target = _targetAddressForName[nameShort];
|
176
343
|
|
177
|
-
|
178
|
-
if
|
179
|
-
|
344
|
+
// not core target
|
345
|
+
if(_targetInfo[target].ttype == IAccess.Type.Core) {
|
346
|
+
revert IAccess.ErrorIAccessTargetTypeInvalid(target, IAccess.Type.Core);
|
180
347
|
}
|
181
348
|
|
182
|
-
|
183
|
-
|
184
|
-
|
185
|
-
|
186
|
-
|
187
|
-
|
349
|
+
// not core role
|
350
|
+
if(_roleInfo[roleId].rtype == IAccess.Type.Core) {
|
351
|
+
revert IAccess.ErrorIAccessRoleTypeInvalid(roleId, IAccess.Type.Core);
|
352
|
+
}
|
353
|
+
|
354
|
+
_setTargetFunctionRole(target, nameShort, selectors, roleId);
|
355
|
+
}
|
188
356
|
|
189
|
-
|
190
|
-
|
191
|
-
|
357
|
+
function getTargetAddress(string memory targetName) public view returns(address targetAddress) {
|
358
|
+
ShortString nameShort = ShortStrings.toShortString(targetName);
|
359
|
+
return _targetAddressForName[nameShort];
|
192
360
|
}
|
193
361
|
|
194
|
-
function
|
195
|
-
|
196
|
-
|
197
|
-
|
198
|
-
)
|
362
|
+
function isTargetLocked(address target) public view returns (bool locked) {
|
363
|
+
return _targetInfo[target].isLocked;
|
364
|
+
}
|
365
|
+
|
366
|
+
function targetExists(address target) public view returns (bool exists) {
|
367
|
+
return _targetInfo[target].createdAt.gtz();
|
368
|
+
}
|
369
|
+
|
370
|
+
function getTargetInfo(address target) public view returns (IAccess.TargetInfo memory) {
|
371
|
+
return _targetInfo[target];
|
372
|
+
}
|
373
|
+
|
374
|
+
//--- Role internal view/pure functions --------------------------------------//
|
375
|
+
function _createRole(RoleId roleId, string memory roleName, IAccess.Type rtype)
|
199
376
|
internal
|
200
|
-
view
|
201
|
-
returns (IAccess.RoleInfo memory existingRole)
|
202
377
|
{
|
203
|
-
|
204
|
-
|
205
|
-
|
206
|
-
|
378
|
+
ShortString name = ShortStrings.toShortString(roleName);
|
379
|
+
_validateRole(roleId, name, rtype);
|
380
|
+
|
381
|
+
if(roleExists(roleId)) {
|
382
|
+
revert IAccess.ErrorIAccessRoleIdExists(roleId);
|
207
383
|
}
|
208
384
|
|
209
|
-
|
210
|
-
|
385
|
+
if (_roleIdForName[name].gtz()) {
|
386
|
+
revert IAccess.ErrorIAccessRoleNameExists(roleId, _roleIdForName[name], name);
|
387
|
+
}
|
388
|
+
|
389
|
+
_roleInfo[roleId] = IAccess.RoleInfo(
|
390
|
+
name,
|
391
|
+
rtype,
|
392
|
+
ADMIN_ROLE(),
|
393
|
+
TimestampLib.blockTimestamp(),
|
394
|
+
TimestampLib.blockTimestamp()
|
395
|
+
);
|
396
|
+
_roleIdForName[name] = roleId;
|
397
|
+
_roleIds.push(roleId);
|
211
398
|
|
212
|
-
|
213
|
-
|
399
|
+
emit LogRoleCreation(roleId, name, rtype);
|
400
|
+
}
|
401
|
+
|
402
|
+
function _validateRole(RoleId roleId, ShortString name, IAccess.Type rtype)
|
403
|
+
internal
|
404
|
+
view
|
405
|
+
{
|
406
|
+
uint roleIdInt = roleId.toInt();
|
407
|
+
if(rtype == IAccess.Type.Custom && roleIdInt < CUSTOM_ROLE_ID_MIN) {
|
408
|
+
revert IAccess.ErrorIAccessRoleIdTooSmall(roleId);
|
214
409
|
}
|
215
410
|
|
216
|
-
if
|
217
|
-
|
218
|
-
|
219
|
-
|
411
|
+
if(
|
412
|
+
rtype != IAccess.Type.Custom &&
|
413
|
+
roleIdInt >= CUSTOM_ROLE_ID_MIN &&
|
414
|
+
roleIdInt != PUBLIC_ROLE().toInt())
|
415
|
+
{
|
416
|
+
revert IAccess.ErrorIAccessRoleIdTooBig(roleId);
|
220
417
|
}
|
221
418
|
|
222
419
|
// role name checks
|
223
|
-
|
224
|
-
if (ShortStrings.byteLength(nameShort) == 0) {
|
420
|
+
if (ShortStrings.byteLength(name) == 0) {
|
225
421
|
revert IAccess.ErrorIAccessRoleNameEmpty(roleId);
|
226
422
|
}
|
423
|
+
}
|
227
424
|
|
228
|
-
|
229
|
-
|
425
|
+
function _revokeRole(RoleId roleId, address member)
|
426
|
+
internal
|
427
|
+
returns(bool revoked)
|
428
|
+
{
|
429
|
+
if (!roleExists(roleId)) {
|
430
|
+
revert IAccess.ErrorIAccessRoleIdDoesNotExist(roleId);
|
230
431
|
}
|
231
|
-
}
|
232
432
|
|
233
|
-
|
234
|
-
if
|
235
|
-
|
433
|
+
revoked = EnumerableSet.remove(_roleMembers[roleId], member);
|
434
|
+
if(revoked) {
|
435
|
+
_accessManager.revokeRole(roleId.toInt(), member);
|
236
436
|
}
|
437
|
+
}
|
438
|
+
|
439
|
+
function _getNextCustomRoleId()
|
440
|
+
internal
|
441
|
+
returns(RoleId roleId, RoleId admin)
|
442
|
+
{
|
443
|
+
uint64 roleIdInt = _idNext;
|
444
|
+
uint64 adminInt = roleIdInt + 1;
|
237
445
|
|
238
|
-
|
239
|
-
|
446
|
+
_idNext = roleIdInt + 2;
|
447
|
+
|
448
|
+
roleId = RoleIdLib.toRoleId(roleIdInt);
|
449
|
+
admin = RoleIdLib.toRoleId(adminInt);
|
450
|
+
}
|
451
|
+
|
452
|
+
//--- Target internal view/pure functions --------------------------------------//
|
453
|
+
function _createTarget(address target, string memory targetName, IAccess.Type ttype)
|
454
|
+
internal
|
455
|
+
{
|
456
|
+
ShortString name = ShortStrings.toShortString(targetName);
|
457
|
+
_validateTarget(target, name, ttype);
|
458
|
+
|
459
|
+
if (_targetInfo[target].createdAt.gtz()) {
|
460
|
+
revert IAccess.ErrorIAccessTargetExists(target, _targetInfo[target].name);
|
240
461
|
}
|
241
|
-
|
242
|
-
|
462
|
+
|
463
|
+
if (_targetAddressForName[name] != address(0)) {
|
464
|
+
revert IAccess.ErrorIAccessTargetNameExists(
|
465
|
+
target,
|
466
|
+
_targetAddressForName[name],
|
467
|
+
name);
|
243
468
|
}
|
244
469
|
|
245
|
-
|
246
|
-
|
247
|
-
|
248
|
-
|
470
|
+
bool isLocked = _accessManager.isTargetClosed(target);// sync with state in access manager
|
471
|
+
_targetInfo[target] = IAccess.TargetInfo(
|
472
|
+
name,
|
473
|
+
ttype,
|
474
|
+
isLocked,
|
249
475
|
TimestampLib.blockTimestamp(),
|
250
|
-
TimestampLib.blockTimestamp()
|
251
|
-
|
252
|
-
|
253
|
-
_targetForName[info.name] = target;
|
476
|
+
TimestampLib.blockTimestamp()
|
477
|
+
);
|
478
|
+
_targetAddressForName[name] = target;
|
254
479
|
_targets.push(target);
|
480
|
+
|
481
|
+
emit LogTargetCreation(target, name, ttype, isLocked);
|
255
482
|
}
|
256
483
|
|
257
|
-
function
|
258
|
-
|
484
|
+
function _validateTarget(address target, ShortString name, IAccess.Type ttype)
|
485
|
+
internal
|
486
|
+
view
|
487
|
+
{
|
488
|
+
address targetAuthority = AccessManagedUpgradeable(target).authority();
|
489
|
+
if(targetAuthority != authority()) {
|
490
|
+
revert IAccess.ErrorIAccessTargetAuthorityInvalid(target, targetAuthority);
|
491
|
+
}
|
492
|
+
|
493
|
+
if (ShortStrings.byteLength(name) == 0) {
|
494
|
+
revert IAccess.ErrorIAccessTargetNameEmpty(target);
|
495
|
+
}
|
259
496
|
}
|
260
497
|
|
261
|
-
|
262
|
-
|
263
|
-
|
264
|
-
|
265
|
-
|
266
|
-
|
267
|
-
|
268
|
-
if (target == address(0)) {
|
269
|
-
revert IAccess.ErrorIAccessTargetDoesNotExist(ShortStrings.toShortString(targetName));
|
498
|
+
// IMPORTANT: instance access manager MUST be of Core type -> otherwise can be locked forever
|
499
|
+
function _setTargetLocked(address target, bool locked) internal
|
500
|
+
{
|
501
|
+
IAccess.Type targetType = _targetInfo[target].ttype;
|
502
|
+
if(target == address(0) || targetType == IAccess.Type.NotInitialized) {
|
503
|
+
revert IAccess.ErrorIAccessTargetDoesNotExist(target);
|
270
504
|
}
|
271
|
-
|
272
|
-
|
505
|
+
|
506
|
+
if(targetType == IAccess.Type.Core) {
|
507
|
+
revert IAccess.ErrorIAccessTargetTypeInvalid(target, targetType);
|
273
508
|
}
|
274
|
-
|
275
|
-
|
509
|
+
|
510
|
+
_targetInfo[target].isLocked = locked;
|
511
|
+
_accessManager.setTargetClosed(target, locked);
|
276
512
|
}
|
277
513
|
|
278
|
-
function
|
279
|
-
address target
|
514
|
+
function _setTargetFunctionRole(
|
515
|
+
address target,
|
516
|
+
ShortString name,
|
517
|
+
bytes4[] calldata selectors,
|
518
|
+
RoleId roleId
|
519
|
+
)
|
520
|
+
internal
|
521
|
+
{
|
280
522
|
if (target == address(0)) {
|
281
|
-
revert IAccess.ErrorIAccessTargetDoesNotExist(
|
523
|
+
revert IAccess.ErrorIAccessTargetDoesNotExist(target);
|
282
524
|
}
|
283
|
-
_accessManager.setTargetClosed(target, closed);
|
284
|
-
}
|
285
525
|
|
286
|
-
|
287
|
-
|
526
|
+
if (!roleExists(roleId)) {
|
527
|
+
revert IAccess.ErrorIAccessRoleIdDoesNotExist(roleId);
|
528
|
+
}
|
529
|
+
|
530
|
+
uint64 roleIdInt = RoleId.unwrap(roleId);
|
531
|
+
_accessManager.setTargetFunctionRole(target, selectors, roleIdInt);
|
288
532
|
}
|
289
533
|
|
290
534
|
function canCall(
|
@@ -294,4 +538,4 @@ contract InstanceAccessManager is
|
|
294
538
|
) public view virtual returns (bool immediate, uint32 delay) {
|
295
539
|
return _accessManager.canCall(caller, target, selector);
|
296
540
|
}
|
297
|
-
}
|
541
|
+
}
|