@etherisc/gif-next 0.0.2-e769e2e-077 → 0.0.2-e802d97-477
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 +2 -1
- package/artifacts/contracts/distribution/Distribution.sol/Distribution.dbg.json +1 -1
- package/artifacts/contracts/distribution/Distribution.sol/Distribution.json +19 -13
- package/artifacts/contracts/distribution/DistributionService.sol/DistributionService.dbg.json +1 -1
- package/artifacts/contracts/distribution/DistributionService.sol/DistributionService.json +79 -73
- package/artifacts/contracts/distribution/DistributionServiceManager.sol/DistributionServiceManager.dbg.json +1 -1
- package/artifacts/contracts/distribution/DistributionServiceManager.sol/DistributionServiceManager.json +114 -56
- package/artifacts/contracts/distribution/IDistributionComponent.sol/IDistributionComponent.dbg.json +1 -1
- package/artifacts/contracts/distribution/IDistributionComponent.sol/IDistributionComponent.json +11 -5
- package/artifacts/contracts/distribution/IDistributionService.sol/IDistributionService.dbg.json +1 -1
- package/artifacts/contracts/distribution/IDistributionService.sol/IDistributionService.json +7 -1
- package/artifacts/contracts/instance/BundleManager.sol/BundleManager.dbg.json +1 -1
- package/artifacts/contracts/instance/BundleManager.sol/BundleManager.json +2 -2
- package/artifacts/contracts/instance/IInstance.sol/IInstance.dbg.json +1 -1
- package/artifacts/contracts/instance/IInstance.sol/IInstance.json +25 -6
- package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.dbg.json +1 -1
- package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.json +12 -22
- package/artifacts/contracts/instance/Instance.sol/Instance.dbg.json +1 -1
- package/artifacts/contracts/instance/Instance.sol/Instance.json +47 -20
- package/artifacts/contracts/instance/InstanceAdmin.sol/InstanceAdmin.dbg.json +4 -0
- package/artifacts/contracts/instance/InstanceAdmin.sol/InstanceAdmin.json +708 -0
- package/artifacts/contracts/instance/InstanceAuthorizationsLib.sol/InstanceAuthorizationsLib.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceAuthorizationsLib.sol/InstanceAuthorizationsLib.json +126 -30
- package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.json +195 -64
- package/artifacts/contracts/instance/InstanceService.sol/InstanceService.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceService.sol/InstanceService.json +77 -63
- package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.json +104 -34
- package/artifacts/contracts/instance/InstanceStore.sol/InstanceStore.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceStore.sol/InstanceStore.json +246 -104
- 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 +4 -0
- package/artifacts/contracts/instance/base/ObjectCounter.sol/ObjectCounter.json +10 -0
- package/artifacts/contracts/instance/base/ObjectManager.sol/ObjectManager.dbg.json +1 -1
- package/artifacts/contracts/instance/base/ObjectManager.sol/ObjectManager.json +2 -2
- package/artifacts/contracts/instance/module/IAccess.sol/IAccess.dbg.json +1 -1
- package/artifacts/contracts/instance/module/IAccess.sol/IAccess.json +8 -116
- package/artifacts/contracts/instance/module/IBundle.sol/IBundle.dbg.json +1 -1
- package/artifacts/contracts/instance/module/IComponents.sol/IComponents.dbg.json +1 -1
- package/artifacts/contracts/instance/module/IDistribution.sol/IDistribution.dbg.json +1 -1
- package/artifacts/contracts/instance/module/IPolicy.sol/IPolicy.dbg.json +1 -1
- package/artifacts/contracts/instance/module/IRisk.sol/IRisk.dbg.json +1 -1
- package/artifacts/contracts/mock/Dip.sol/Dip.dbg.json +4 -0
- package/artifacts/contracts/mock/Dip.sol/Dip.json +376 -0
- package/artifacts/contracts/oracle/IOracle.sol/IOracle.dbg.json +4 -0
- package/artifacts/contracts/oracle/IOracle.sol/IOracle.json +10 -0
- package/artifacts/contracts/oracle/IOracleComponent.sol/IOracleComponent.dbg.json +4 -0
- package/artifacts/contracts/oracle/IOracleComponent.sol/IOracleComponent.json +759 -0
- package/artifacts/contracts/oracle/IOracleService.sol/IOracleService.dbg.json +4 -0
- package/artifacts/contracts/oracle/IOracleService.sol/IOracleService.json +662 -0
- package/artifacts/contracts/oracle/Oracle.sol/Oracle.dbg.json +4 -0
- package/artifacts/contracts/oracle/Oracle.sol/Oracle.json +1146 -0
- package/artifacts/contracts/oracle/OracleService.sol/OracleService.dbg.json +4 -0
- package/artifacts/contracts/oracle/OracleService.sol/OracleService.json +997 -0
- package/artifacts/contracts/oracle/OracleServiceManager.sol/OracleServiceManager.dbg.json +4 -0
- package/artifacts/contracts/oracle/OracleServiceManager.sol/OracleServiceManager.json +718 -0
- package/artifacts/contracts/pool/BundleService.sol/BundleService.dbg.json +1 -1
- package/artifacts/contracts/pool/BundleService.sol/BundleService.json +55 -41
- package/artifacts/contracts/pool/BundleServiceManager.sol/BundleServiceManager.dbg.json +1 -1
- package/artifacts/contracts/pool/BundleServiceManager.sol/BundleServiceManager.json +102 -40
- package/artifacts/contracts/pool/IBundleService.sol/IBundleService.dbg.json +1 -1
- package/artifacts/contracts/pool/IBundleService.sol/IBundleService.json +7 -1
- package/artifacts/contracts/pool/IPoolComponent.sol/IPoolComponent.dbg.json +1 -1
- package/artifacts/contracts/pool/IPoolComponent.sol/IPoolComponent.json +11 -5
- package/artifacts/contracts/pool/IPoolService.sol/IPoolService.dbg.json +1 -1
- package/artifacts/contracts/pool/IPoolService.sol/IPoolService.json +22 -1
- package/artifacts/contracts/pool/Pool.sol/Pool.dbg.json +1 -1
- package/artifacts/contracts/pool/Pool.sol/Pool.json +18 -12
- package/artifacts/contracts/pool/PoolService.sol/PoolService.dbg.json +1 -1
- package/artifacts/contracts/pool/PoolService.sol/PoolService.json +56 -35
- package/artifacts/contracts/pool/PoolServiceManager.sol/PoolServiceManager.dbg.json +1 -1
- package/artifacts/contracts/pool/PoolServiceManager.sol/PoolServiceManager.json +95 -37
- package/artifacts/contracts/product/ApplicationService.sol/ApplicationService.dbg.json +1 -1
- package/artifacts/contracts/product/ApplicationService.sol/ApplicationService.json +39 -25
- package/artifacts/contracts/product/ApplicationServiceManager.sol/ApplicationServiceManager.dbg.json +1 -1
- package/artifacts/contracts/product/ApplicationServiceManager.sol/ApplicationServiceManager.json +96 -34
- package/artifacts/contracts/product/ClaimService.sol/ClaimService.dbg.json +1 -1
- package/artifacts/contracts/product/ClaimService.sol/ClaimService.json +81 -67
- package/artifacts/contracts/product/ClaimServiceManager.sol/ClaimServiceManager.dbg.json +1 -1
- package/artifacts/contracts/product/ClaimServiceManager.sol/ClaimServiceManager.json +115 -53
- package/artifacts/contracts/product/IApplicationService.sol/IApplicationService.dbg.json +1 -1
- package/artifacts/contracts/product/IApplicationService.sol/IApplicationService.json +7 -1
- package/artifacts/contracts/product/IClaimService.sol/IClaimService.dbg.json +1 -1
- package/artifacts/contracts/product/IClaimService.sol/IClaimService.json +7 -1
- package/artifacts/contracts/product/IPolicyService.sol/IPolicyService.dbg.json +1 -1
- package/artifacts/contracts/product/IPolicyService.sol/IPolicyService.json +7 -1
- package/artifacts/contracts/product/IPricingService.sol/IPricingService.dbg.json +1 -1
- package/artifacts/contracts/product/IPricingService.sol/IPricingService.json +7 -1
- package/artifacts/contracts/product/IProductComponent.sol/IProductComponent.dbg.json +1 -1
- package/artifacts/contracts/product/IProductComponent.sol/IProductComponent.json +11 -5
- package/artifacts/contracts/product/IProductService.sol/IProductService.dbg.json +1 -1
- package/artifacts/contracts/product/IProductService.sol/IProductService.json +7 -1
- package/artifacts/contracts/product/PolicyService.sol/PolicyService.dbg.json +1 -1
- package/artifacts/contracts/product/PolicyService.sol/PolicyService.json +59 -45
- package/artifacts/contracts/product/PolicyServiceManager.sol/PolicyServiceManager.dbg.json +1 -1
- package/artifacts/contracts/product/PolicyServiceManager.sol/PolicyServiceManager.json +104 -42
- package/artifacts/contracts/product/PricingService.sol/PricingService.dbg.json +1 -1
- package/artifacts/contracts/product/PricingService.sol/PricingService.json +69 -55
- package/artifacts/contracts/product/PricingServiceManager.sol/PricingServiceManager.dbg.json +1 -1
- package/artifacts/contracts/product/PricingServiceManager.sol/PricingServiceManager.json +109 -47
- package/artifacts/contracts/product/Product.sol/Product.dbg.json +1 -1
- package/artifacts/contracts/product/Product.sol/Product.json +18 -12
- package/artifacts/contracts/product/ProductService.sol/ProductService.dbg.json +1 -1
- package/artifacts/contracts/product/ProductService.sol/ProductService.json +25 -19
- package/artifacts/contracts/product/ProductServiceManager.sol/ProductServiceManager.dbg.json +1 -1
- package/artifacts/contracts/product/ProductServiceManager.sol/ProductServiceManager.json +87 -29
- package/artifacts/contracts/registry/ChainNft.sol/ChainNft.dbg.json +1 -1
- package/artifacts/contracts/registry/ChainNft.sol/ChainNft.json +2 -2
- package/artifacts/contracts/registry/IRegistry.sol/IRegistry.dbg.json +1 -1
- package/artifacts/contracts/registry/IRegistry.sol/IRegistry.json +150 -53
- package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.dbg.json +1 -1
- package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.json +187 -67
- 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 +328 -103
- package/artifacts/contracts/registry/RegistryAdmin.sol/RegistryAdmin.dbg.json +4 -0
- package/artifacts/contracts/registry/RegistryAdmin.sol/RegistryAdmin.json +407 -0
- package/artifacts/contracts/registry/RegistryService.sol/RegistryService.dbg.json +1 -1
- package/artifacts/contracts/registry/RegistryService.sol/RegistryService.json +197 -72
- package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.dbg.json +1 -1
- package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.json +87 -39
- package/artifacts/contracts/registry/ReleaseManager.sol/ReleaseManager.dbg.json +1 -1
- package/artifacts/contracts/registry/ReleaseManager.sol/ReleaseManager.json +752 -148
- package/artifacts/contracts/registry/ServiceAuthorizationsLib.sol/ServiceAuthorizationsLib.dbg.json +1 -1
- package/artifacts/contracts/registry/ServiceAuthorizationsLib.sol/ServiceAuthorizationsLib.json +2 -2
- package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.dbg.json +1 -1
- package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.json +185 -135
- package/artifacts/contracts/shared/AccessManagerCustom.sol/AccessManagerCustom.dbg.json +4 -0
- package/artifacts/contracts/shared/AccessManagerCustom.sol/AccessManagerCustom.json +1193 -0
- package/artifacts/contracts/shared/AccessManagerExtended.sol/AccessManagerExtended.dbg.json +4 -0
- package/artifacts/contracts/shared/AccessManagerExtended.sol/AccessManagerExtended.json +1715 -0
- package/artifacts/contracts/shared/AccessManagerExtendedInitializeable.sol/AccessManagerExtendedInitializeable.dbg.json +4 -0
- package/artifacts/contracts/shared/AccessManagerExtendedInitializeable.sol/AccessManagerExtendedInitializeable.json +1728 -0
- package/artifacts/contracts/shared/AccessManagerExtendedWithDisable.sol/AccessManagerExtendedWithDisable.dbg.json +4 -0
- package/artifacts/contracts/shared/AccessManagerExtendedWithDisable.sol/AccessManagerExtendedWithDisable.json +1806 -0
- package/artifacts/contracts/shared/AccessManagerExtendedWithDisableInitializeable.sol/AccessManagerExtendedWithDisableInitializeable.dbg.json +4 -0
- package/artifacts/contracts/shared/AccessManagerExtendedWithDisableInitializeable.sol/AccessManagerExtendedWithDisableInitializeable.json +1824 -0
- package/artifacts/contracts/shared/Component.sol/Component.dbg.json +1 -1
- package/artifacts/contracts/shared/Component.sol/Component.json +18 -12
- package/artifacts/contracts/shared/ComponentService.sol/ComponentService.dbg.json +1 -1
- package/artifacts/contracts/shared/ComponentService.sol/ComponentService.json +92 -63
- package/artifacts/contracts/shared/ComponentServiceManager.sol/ComponentServiceManager.dbg.json +1 -1
- package/artifacts/contracts/shared/ComponentServiceManager.sol/ComponentServiceManager.json +102 -46
- package/artifacts/contracts/shared/ComponentVerifyingService.sol/ComponentVerifyingService.dbg.json +1 -1
- package/artifacts/contracts/shared/ComponentVerifyingService.sol/ComponentVerifyingService.json +7 -1
- package/artifacts/contracts/shared/ERC165.sol/ERC165.dbg.json +1 -1
- package/artifacts/contracts/shared/ERC165.sol/ERC165.json +2 -2
- package/artifacts/contracts/shared/IAccessManagerExtended.sol/IAccessManagerExtended.dbg.json +4 -0
- package/artifacts/contracts/shared/IAccessManagerExtended.sol/IAccessManagerExtended.json +1562 -0
- package/artifacts/contracts/shared/IAccessManagerExtendedWithDisable.sol/IAccessManagerExtendedWithDisable.dbg.json +4 -0
- package/artifacts/contracts/shared/IAccessManagerExtendedWithDisable.sol/IAccessManagerExtendedWithDisable.json +1600 -0
- package/artifacts/contracts/shared/IComponent.sol/IComponent.dbg.json +1 -1
- package/artifacts/contracts/shared/IComponent.sol/IComponent.json +11 -5
- package/artifacts/contracts/shared/IComponentService.sol/IComponentService.dbg.json +1 -1
- package/artifacts/contracts/shared/IComponentService.sol/IComponentService.json +14 -1
- package/artifacts/contracts/shared/IInstanceLinkedComponent.sol/IInstanceLinkedComponent.dbg.json +1 -1
- package/artifacts/contracts/shared/IInstanceLinkedComponent.sol/IInstanceLinkedComponent.json +11 -5
- package/artifacts/contracts/shared/IKeyValueStore.sol/IKeyValueStore.dbg.json +1 -1
- package/artifacts/contracts/shared/IKeyValueStore.sol/IKeyValueStore.json +0 -10
- package/artifacts/contracts/shared/ILifecycle.sol/ILifecycle.dbg.json +1 -1
- package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.dbg.json +1 -1
- package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.json +7 -1
- package/artifacts/contracts/shared/IPolicyHolder.sol/IPolicyHolder.dbg.json +1 -1
- package/artifacts/contracts/shared/IPolicyHolder.sol/IPolicyHolder.json +21 -3
- package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.dbg.json +1 -1
- package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.json +7 -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 +7 -1
- package/artifacts/contracts/shared/IVersionable.sol/IVersionable.dbg.json +1 -1
- package/artifacts/contracts/shared/InitializableCustom.sol/InitializableCustom.dbg.json +4 -0
- package/artifacts/contracts/shared/InitializableCustom.sol/InitializableCustom.json +39 -0
- package/artifacts/contracts/shared/InstanceLinkedComponent.sol/InstanceLinkedComponent.dbg.json +1 -1
- package/artifacts/contracts/shared/InstanceLinkedComponent.sol/InstanceLinkedComponent.json +18 -12
- package/artifacts/contracts/shared/KeyValueStore.sol/KeyValueStore.dbg.json +1 -1
- package/artifacts/contracts/shared/KeyValueStore.sol/KeyValueStore.json +10 -20
- package/artifacts/contracts/shared/Lifecycle.sol/Lifecycle.dbg.json +1 -1
- package/artifacts/contracts/shared/Lifecycle.sol/Lifecycle.json +6 -6
- package/artifacts/contracts/shared/NftIdSetManager.sol/NftIdSetManager.dbg.json +4 -0
- package/artifacts/contracts/shared/NftIdSetManager.sol/NftIdSetManager.json +306 -0
- package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.dbg.json +1 -1
- package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.json +13 -7
- package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.dbg.json +1 -1
- package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.json +31 -13
- package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.dbg.json +1 -1
- package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.json +64 -16
- package/artifacts/contracts/shared/Registerable.sol/Registerable.dbg.json +1 -1
- package/artifacts/contracts/shared/Registerable.sol/Registerable.json +15 -9
- 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 +7 -1
- package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.dbg.json +1 -1
- package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.json +2 -2
- 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/IStaking.sol/IStaking.dbg.json +1 -1
- package/artifacts/contracts/staking/IStaking.sol/IStaking.json +424 -593
- package/artifacts/contracts/staking/IStakingService.sol/IStakingService.dbg.json +1 -1
- package/artifacts/contracts/staking/IStakingService.sol/IStakingService.json +497 -49
- package/artifacts/contracts/staking/StakeManagerLib.sol/StakeManagerLib.dbg.json +4 -0
- package/artifacts/contracts/staking/StakeManagerLib.sol/StakeManagerLib.json +444 -0
- package/artifacts/contracts/staking/Staking.sol/Staking.dbg.json +1 -1
- package/artifacts/contracts/staking/Staking.sol/Staking.json +598 -627
- package/artifacts/contracts/staking/StakingManager.sol/StakingManager.dbg.json +1 -1
- package/artifacts/contracts/staking/StakingManager.sol/StakingManager.json +149 -48
- package/artifacts/contracts/staking/StakingReader.sol/StakingReader.dbg.json +4 -0
- package/artifacts/contracts/staking/StakingReader.sol/StakingReader.json +592 -0
- package/artifacts/contracts/staking/StakingService.sol/StakingService.dbg.json +1 -1
- package/artifacts/contracts/staking/StakingService.sol/StakingService.json +593 -74
- package/artifacts/contracts/staking/StakingServiceManager.sol/StakingServiceManager.dbg.json +1 -1
- package/artifacts/contracts/staking/StakingServiceManager.sol/StakingServiceManager.json +119 -29
- package/artifacts/contracts/staking/StakingStore.sol/StakingStore.dbg.json +4 -0
- package/artifacts/contracts/staking/StakingStore.sol/StakingStore.json +2189 -0
- package/artifacts/contracts/staking/TargetManagerLib.sol/TargetManagerLib.dbg.json +4 -0
- package/artifacts/contracts/staking/TargetManagerLib.sol/TargetManagerLib.json +571 -0
- package/artifacts/contracts/type/AddressSet.sol/LibAddressSet.dbg.json +1 -1
- package/artifacts/contracts/type/AddressSet.sol/LibAddressSet.json +2 -2
- package/artifacts/contracts/type/Amount.sol/AmountLib.dbg.json +1 -1
- package/artifacts/contracts/type/Amount.sol/AmountLib.json +68 -4
- package/artifacts/contracts/type/Blocknumber.sol/BlocknumberLib.dbg.json +1 -1
- package/artifacts/contracts/type/Blocknumber.sol/BlocknumberLib.json +40 -2
- package/artifacts/contracts/type/ClaimId.sol/ClaimIdLib.dbg.json +1 -1
- package/artifacts/contracts/type/ClaimId.sol/ClaimIdLib.json +2 -2
- package/artifacts/contracts/type/DistributorType.sol/DistributorTypeLib.dbg.json +1 -1
- package/artifacts/contracts/type/DistributorType.sol/DistributorTypeLib.json +2 -2
- package/artifacts/contracts/type/Fee.sol/FeeLib.dbg.json +1 -1
- package/artifacts/contracts/type/Fee.sol/FeeLib.json +2 -2
- 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/NftId.sol/NftIdLib.dbg.json +1 -1
- package/artifacts/contracts/type/NftId.sol/NftIdLib.json +28 -4
- package/artifacts/contracts/type/NftIdSet.sol/LibNftIdSet.dbg.json +1 -1
- package/artifacts/contracts/type/NftIdSet.sol/LibNftIdSet.json +2 -2
- package/artifacts/contracts/type/ObjectType.sol/ObjectTypeLib.dbg.json +1 -1
- package/artifacts/contracts/type/ObjectType.sol/ObjectTypeLib.json +15 -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 +4 -0
- package/artifacts/contracts/type/RequestId.sol/RequestIdLib.json +204 -0
- package/artifacts/contracts/type/RiskId.sol/RiskIdLib.dbg.json +1 -1
- package/artifacts/contracts/type/RiskId.sol/RiskIdLib.json +2 -2
- package/artifacts/contracts/type/RoleId.sol/RoleIdLib.dbg.json +1 -1
- package/artifacts/contracts/type/RoleId.sol/RoleIdLib.json +2 -2
- package/artifacts/contracts/type/Seconds.sol/SecondsLib.dbg.json +1 -1
- package/artifacts/contracts/type/Seconds.sol/SecondsLib.json +76 -2
- package/artifacts/contracts/type/StateId.sol/StateIdLib.dbg.json +1 -1
- package/artifacts/contracts/type/StateId.sol/StateIdLib.json +2 -2
- package/artifacts/contracts/type/Timestamp.sol/TimestampLib.dbg.json +1 -1
- package/artifacts/contracts/type/Timestamp.sol/TimestampLib.json +17 -4
- package/artifacts/contracts/type/UFixed.sol/MathLib.dbg.json +1 -1
- 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 -2
- package/artifacts/contracts/type/Version.sol/VersionPartLib.dbg.json +1 -1
- package/artifacts/contracts/type/Version.sol/VersionPartLib.json +2 -2
- package/contracts/distribution/Distribution.sol +2 -4
- package/contracts/distribution/DistributionService.sol +3 -2
- package/contracts/distribution/DistributionServiceManager.sol +9 -18
- package/contracts/distribution/IDistributionComponent.sol +1 -1
- package/contracts/distribution/IDistributionService.sol +1 -1
- package/contracts/instance/IInstance.sol +11 -6
- package/contracts/instance/IInstanceService.sol +3 -5
- package/contracts/instance/Instance.sol +29 -21
- package/contracts/instance/InstanceAdmin.sol +331 -0
- package/contracts/instance/InstanceAuthorizationsLib.sol +192 -151
- package/contracts/instance/InstanceReader.sol +30 -6
- package/contracts/instance/InstanceService.sol +69 -55
- package/contracts/instance/InstanceServiceManager.sol +10 -20
- package/contracts/instance/InstanceStore.sol +64 -42
- package/contracts/instance/base/BalanceStore.sol +1 -1
- package/contracts/instance/base/ObjectCounter.sol +21 -0
- package/contracts/instance/module/IAccess.sol +2 -10
- package/contracts/mock/Dip.sol +26 -0
- package/contracts/oracle/IOracle.sol +20 -0
- package/contracts/oracle/IOracleComponent.sol +32 -0
- package/contracts/oracle/IOracleService.sol +65 -0
- package/contracts/oracle/Oracle.sol +145 -0
- package/contracts/oracle/OracleService.sol +277 -0
- package/contracts/oracle/OracleServiceManager.sol +42 -0
- package/contracts/pool/BundleService.sol +6 -23
- package/contracts/pool/BundleServiceManager.sol +9 -18
- package/contracts/pool/IBundleService.sol +1 -1
- package/contracts/pool/IPoolService.sol +4 -1
- package/contracts/pool/PoolService.sol +45 -13
- package/contracts/pool/PoolServiceManager.sol +9 -18
- package/contracts/product/ApplicationService.sol +6 -5
- package/contracts/product/ApplicationServiceManager.sol +9 -6
- package/contracts/product/ClaimService.sol +13 -7
- package/contracts/product/ClaimServiceManager.sol +9 -6
- package/contracts/product/IApplicationService.sol +1 -1
- package/contracts/product/IClaimService.sol +7 -1
- package/contracts/product/IPolicyService.sol +1 -1
- package/contracts/product/IPricingService.sol +1 -1
- package/contracts/product/IProductService.sol +1 -1
- package/contracts/product/PolicyService.sol +10 -6
- package/contracts/product/PolicyServiceManager.sol +9 -21
- package/contracts/product/PricingService.sol +10 -9
- package/contracts/product/PricingServiceManager.sol +9 -18
- package/contracts/product/Product.sol +1 -1
- package/contracts/product/ProductService.sol +7 -5
- package/contracts/product/ProductServiceManager.sol +9 -21
- package/contracts/registry/ChainNft.sol +1 -0
- package/contracts/registry/IRegistry.sol +37 -24
- package/contracts/registry/IRegistryService.sol +26 -36
- package/contracts/registry/Registry.sol +164 -117
- package/contracts/registry/RegistryAdmin.sol +237 -0
- package/contracts/registry/RegistryService.sol +22 -83
- package/contracts/registry/RegistryServiceManager.sol +21 -23
- package/contracts/registry/ReleaseManager.sol +448 -223
- package/contracts/registry/TokenRegistry.sol +187 -59
- package/contracts/shared/AccessManagerCustom.sol +736 -0
- package/contracts/shared/AccessManagerExtended.sol +470 -0
- package/contracts/shared/AccessManagerExtendedInitializeable.sol +13 -0
- package/contracts/shared/AccessManagerExtendedWithDisable.sol +137 -0
- package/contracts/shared/AccessManagerExtendedWithDisableInitializeable.sol +14 -0
- package/contracts/shared/Component.sol +8 -13
- package/contracts/shared/ComponentService.sol +35 -13
- package/contracts/shared/ComponentVerifyingService.sol +13 -7
- package/contracts/shared/ERC165.sol +1 -1
- package/contracts/shared/IAccessManagerExtended.sol +74 -0
- package/contracts/shared/IAccessManagerExtendedWithDisable.sol +18 -0
- package/contracts/shared/IComponent.sol +3 -7
- package/contracts/shared/IComponentService.sol +11 -0
- package/contracts/shared/IKeyValueStore.sol +1 -1
- package/contracts/shared/INftOwnable.sol +1 -1
- package/contracts/shared/IPolicyHolder.sol +6 -1
- package/contracts/shared/IService.sol +1 -1
- package/contracts/shared/InitializableCustom.sol +177 -0
- package/contracts/shared/InstanceLinkedComponent.sol +1 -2
- package/contracts/shared/KeyValueStore.sol +24 -66
- package/contracts/shared/Lifecycle.sol +11 -2
- package/contracts/shared/NftIdSetManager.sol +65 -0
- package/contracts/shared/NftOwnable.sol +2 -13
- package/contracts/shared/PolicyHolder.sol +21 -13
- package/contracts/shared/ProxyManager.sol +31 -1
- package/contracts/shared/Service.sol +1 -1
- package/contracts/staking/IStaking.sol +127 -36
- package/contracts/staking/IStakingService.sol +83 -39
- package/contracts/staking/StakeManagerLib.sol +179 -0
- package/contracts/staking/Staking.sol +432 -93
- package/contracts/staking/StakingManager.sol +22 -14
- package/contracts/staking/StakingReader.sol +187 -0
- package/contracts/staking/StakingService.sol +245 -39
- package/contracts/staking/StakingServiceManager.sol +8 -4
- package/contracts/staking/StakingStore.sol +572 -0
- package/contracts/staking/TargetManagerLib.sol +207 -0
- package/contracts/type/AddressSet.sol +1 -1
- package/contracts/type/Amount.sol +15 -1
- package/contracts/type/Blocknumber.sol +14 -2
- package/contracts/type/Fee.sol +1 -1
- package/contracts/type/NftId.sol +9 -4
- package/contracts/type/NftIdSet.sol +1 -1
- package/contracts/type/ObjectType.sol +12 -9
- package/contracts/type/Referral.sol +1 -1
- package/contracts/type/RequestId.sol +75 -0
- package/contracts/type/RiskId.sol +1 -1
- package/contracts/type/RoleId.sol +16 -8
- package/contracts/type/Seconds.sol +27 -0
- package/contracts/type/StateId.sol +27 -2
- package/contracts/type/Timestamp.sol +6 -2
- package/contracts/type/Version.sol +1 -1
- package/package.json +3 -3
- package/artifacts/contracts/instance/InstanceAccessManager.sol/InstanceAccessManager.dbg.json +0 -4
- package/artifacts/contracts/instance/InstanceAccessManager.sol/InstanceAccessManager.json +0 -1348
- package/artifacts/contracts/registry/RegistryAccessManager.sol/RegistryAccessManager.dbg.json +0 -4
- package/artifacts/contracts/registry/RegistryAccessManager.sol/RegistryAccessManager.json +0 -308
- package/artifacts/contracts/shared/AccessManagerUpgradeableInitializeable.sol/AccessManagerUpgradeableInitializeable.dbg.json +0 -4
- package/artifacts/contracts/shared/AccessManagerUpgradeableInitializeable.sol/AccessManagerUpgradeableInitializeable.json +0 -1206
- package/contracts/instance/InstanceAccessManager.sol +0 -543
- package/contracts/registry/RegistryAccessManager.sol +0 -213
- package/contracts/shared/AccessManagerUpgradeableInitializeable.sol +0 -13
@@ -14,11 +14,12 @@ import {VersionPart} from "../type/Version.sol";
|
|
14
14
|
import {Key32} from "../type/Key32.sol";
|
15
15
|
import {RoleId} from "../type/RoleId.sol";
|
16
16
|
|
17
|
+
import {AccessManagerExtendedInitializeable} from "../shared/AccessManagerExtendedInitializeable.sol";
|
17
18
|
import {IRegisterable} from "../shared/IRegisterable.sol";
|
18
19
|
|
19
20
|
import {ITransferInterceptor} from "../registry/ITransferInterceptor.sol";
|
20
21
|
|
21
|
-
import {
|
22
|
+
import {InstanceAdmin} from "./InstanceAdmin.sol";
|
22
23
|
import {BundleManager} from "./BundleManager.sol";
|
23
24
|
import {InstanceReader} from "./InstanceReader.sol";
|
24
25
|
import {InstanceStore} from "./InstanceStore.sol";
|
@@ -36,15 +37,14 @@ import {IPolicyService} from "../product/IPolicyService.sol";
|
|
36
37
|
import {IBundleService} from "../pool/IBundleService.sol";
|
37
38
|
|
38
39
|
|
39
|
-
|
40
40
|
interface IInstance is
|
41
41
|
IRegisterable,
|
42
42
|
ITransferInterceptor,
|
43
43
|
IAccessManaged
|
44
44
|
{
|
45
|
-
error
|
46
|
-
error
|
47
|
-
error
|
45
|
+
error ErrorInstanceInstanceAdminZero();
|
46
|
+
error ErrorInstanceInstanceAdminAlreadySet(address InstanceAdmin);
|
47
|
+
error ErrorInstanceInstanceAdminAuthorityMismatch(address instanceAuthority);
|
48
48
|
|
49
49
|
error ErrorInstanceBundleManagerAlreadySet(address instanceBundleManager);
|
50
50
|
error ErrorInstanceBundleManagerInstanceMismatch(address instance);
|
@@ -55,6 +55,10 @@ interface IInstance is
|
|
55
55
|
error ErrorInstanceInstanceStoreAlreadySet(address instanceStore);
|
56
56
|
error ErrorInstanceInstanceStoreAuthorityMismatch(address instanceAuthority);
|
57
57
|
|
58
|
+
struct InstanceInfo {
|
59
|
+
uint64 requestsCount;
|
60
|
+
}
|
61
|
+
|
58
62
|
function createRole(string memory roleName, string memory adminName) external returns (RoleId roleId, RoleId admin);
|
59
63
|
function grantRole(RoleId roleId, address account) external;
|
60
64
|
function revokeRole(RoleId roleId, address account) external;
|
@@ -72,6 +76,7 @@ interface IInstance is
|
|
72
76
|
function getMajorVersion() external pure returns (VersionPart majorVersion);
|
73
77
|
function getInstanceReader() external view returns (InstanceReader);
|
74
78
|
function getBundleManager() external view returns (BundleManager);
|
75
|
-
function
|
79
|
+
function getInstanceAdmin() external view returns (InstanceAdmin);
|
76
80
|
function getInstanceStore() external view returns (InstanceStore);
|
81
|
+
function getInstanceAccessManager() external view returns (AccessManagerExtendedInitializeable);
|
77
82
|
}
|
@@ -6,8 +6,7 @@ import {ObjectType} from "../type/ObjectType.sol";
|
|
6
6
|
import {RoleId} from "../type/RoleId.sol";
|
7
7
|
import {IService} from "../shared/IService.sol";
|
8
8
|
|
9
|
-
import {
|
10
|
-
import {InstanceAccessManager} from "./InstanceAccessManager.sol";
|
9
|
+
import {InstanceAdmin} from "./InstanceAdmin.sol";
|
11
10
|
import {Instance} from "./Instance.sol";
|
12
11
|
import {InstanceReader} from "./InstanceReader.sol";
|
13
12
|
import {BundleManager} from "./BundleManager.sol";
|
@@ -18,8 +17,8 @@ interface IInstanceService is IService {
|
|
18
17
|
error ErrorInstanceServiceComponentNotInstanceLinked(address component);
|
19
18
|
|
20
19
|
error ErrorInstanceServiceMasterInstanceAlreadySet();
|
21
|
-
error ErrorInstanceServiceMasterOzAccessManagerAlreadySet();
|
22
20
|
error ErrorInstanceServiceMasterInstanceAccessManagerAlreadySet();
|
21
|
+
error ErrorInstanceServiceMasterInstanceAdminAlreadySet();
|
23
22
|
error ErrorInstanceServiceMasterBundleManagerAlreadySet();
|
24
23
|
error ErrorInstanceServiceInstanceAddressZero();
|
25
24
|
|
@@ -28,7 +27,7 @@ interface IInstanceService is IService {
|
|
28
27
|
error ErrorInstanceServiceInstanceReaderSameAsMasterInstanceReader();
|
29
28
|
error ErrorInstanceServiceInstanceReaderInstanceMismatch();
|
30
29
|
|
31
|
-
error
|
30
|
+
error ErrorInstanceServiceInstanceAdminZero();
|
32
31
|
error ErrorInstanceServiceInstanceReaderZero();
|
33
32
|
error ErrorInstanceServiceBundleManagerZero();
|
34
33
|
error ErrorInstanceServiceInstanceStoreZero();
|
@@ -40,7 +39,6 @@ interface IInstanceService is IService {
|
|
40
39
|
error ErrorInstanceServiceInstanceStoreAuthorityMismatch();
|
41
40
|
|
42
41
|
error ErrorInstanceServiceRequestUnauhorized(address caller);
|
43
|
-
error ErrorInstanceServiceNotInstanceOwner(address caller, NftId instanceNftId);
|
44
42
|
error ErrorInstanceServiceNotInstance(NftId nftId);
|
45
43
|
error ErrorInstanceServiceComponentNotRegistered(address componentAddress);
|
46
44
|
error ErrorInstanceServiceInstanceComponentMismatch(NftId instanceNftId, NftId componentNftId);
|
@@ -16,12 +16,13 @@ import {DistributorType} from "../type/DistributorType.sol";
|
|
16
16
|
|
17
17
|
import {Registerable} from "../shared/Registerable.sol";
|
18
18
|
import {TokenHandler} from "../shared/TokenHandler.sol";
|
19
|
+
import {AccessManagerExtendedInitializeable} from "../shared/AccessManagerExtendedInitializeable.sol";
|
19
20
|
|
20
21
|
import {IRegistry} from "../registry/IRegistry.sol";
|
21
22
|
|
22
23
|
import {IInstance} from "./IInstance.sol";
|
23
24
|
import {InstanceReader} from "./InstanceReader.sol";
|
24
|
-
import {
|
25
|
+
import {InstanceAdmin} from "./InstanceAdmin.sol";
|
25
26
|
import {BundleManager} from "./BundleManager.sol";
|
26
27
|
import {InstanceStore} from "./InstanceStore.sol";
|
27
28
|
|
@@ -48,7 +49,7 @@ contract Instance is
|
|
48
49
|
|
49
50
|
bool private _initialized;
|
50
51
|
|
51
|
-
|
52
|
+
InstanceAdmin internal _instanceAdmin;
|
52
53
|
InstanceReader internal _instanceReader;
|
53
54
|
BundleManager internal _bundleManager;
|
54
55
|
InstanceStore internal _instanceStore;
|
@@ -65,7 +66,7 @@ contract Instance is
|
|
65
66
|
initializer()
|
66
67
|
{
|
67
68
|
if(authority == address(0)) {
|
68
|
-
revert
|
69
|
+
revert ErrorInstanceInstanceAdminZero();
|
69
70
|
}
|
70
71
|
|
71
72
|
__AccessManaged_init(authority);
|
@@ -83,21 +84,21 @@ contract Instance is
|
|
83
84
|
restricted // INSTANCE_OWNER_ROLE
|
84
85
|
returns (RoleId roleId, RoleId admin)
|
85
86
|
{
|
86
|
-
(roleId, admin) =
|
87
|
+
(roleId, admin) = _instanceAdmin.createRole(roleName, adminName);
|
87
88
|
}
|
88
89
|
|
89
90
|
function grantRole(RoleId roleId, address account)
|
90
91
|
external
|
91
92
|
restricted // INSTANCE_OWNER_ROLE
|
92
93
|
{
|
93
|
-
|
94
|
+
AccessManagerExtendedInitializeable(authority()).grantRole(roleId.toInt(), account, 0);
|
94
95
|
}
|
95
96
|
|
96
97
|
function revokeRole(RoleId roleId, address account)
|
97
98
|
external
|
98
99
|
restricted // INSTANCE_OWNER_ROLE
|
99
100
|
{
|
100
|
-
|
101
|
+
AccessManagerExtendedInitializeable(authority()).revokeRole(roleId.toInt(), account);
|
101
102
|
}
|
102
103
|
|
103
104
|
//--- Targets ------------------------------------------------------------//
|
@@ -106,7 +107,7 @@ contract Instance is
|
|
106
107
|
external
|
107
108
|
restricted // INSTANCE_OWNER_ROLE
|
108
109
|
{
|
109
|
-
|
110
|
+
_instanceAdmin.createTarget(target, name);
|
110
111
|
}
|
111
112
|
|
112
113
|
function setTargetFunctionRole(
|
@@ -117,38 +118,41 @@ contract Instance is
|
|
117
118
|
external
|
118
119
|
restricted // INSTANCE_OWNER_ROLE
|
119
120
|
{
|
120
|
-
|
121
|
+
_instanceAdmin.setTargetFunctionRoleByInstance(targetName, selectors, roleId);
|
121
122
|
}
|
122
123
|
|
123
124
|
function setTargetLocked(address target, bool locked)
|
124
125
|
external
|
125
126
|
restricted // INSTANCE_OWNER_ROLE
|
126
127
|
{
|
127
|
-
|
128
|
+
_instanceAdmin.setTargetLockedByInstance(target, locked);
|
128
129
|
}
|
129
130
|
|
130
|
-
//--- ITransferInterceptor
|
131
|
+
//--- ITransferInterceptor ----------------------------------------------//
|
131
132
|
|
133
|
+
// TODO interception of child components nfts
|
132
134
|
function nftMint(address to, uint256 tokenId) external onlyChainNft {
|
133
|
-
|
134
|
-
assert(_accessManager.grantRole(INSTANCE_OWNER_ROLE(), to) == true);
|
135
|
+
_instanceAdmin.transferInstanceOwnerRole(address(0), to);
|
135
136
|
}
|
136
137
|
|
137
138
|
function nftTransferFrom(address from, address to, uint256 tokenId) external onlyChainNft {
|
138
|
-
|
139
|
-
assert(_accessManager.grantRole(INSTANCE_OWNER_ROLE(), to) == true);
|
139
|
+
_instanceAdmin.transferInstanceOwnerRole(from, to);
|
140
140
|
}
|
141
141
|
|
142
|
+
//function nftBurn(address from, uint256 tokenId) external onlyChainNft {
|
143
|
+
//_instanceAdmin.transferInstanceOwnerRole(from, address(0));
|
144
|
+
//}
|
145
|
+
|
142
146
|
//--- initial setup functions -------------------------------------------//
|
143
147
|
|
144
|
-
function
|
145
|
-
if(address(
|
146
|
-
revert
|
148
|
+
function setInstanceAdmin(InstanceAdmin accessManager) external restricted {
|
149
|
+
if(address(_instanceAdmin) != address(0)) {
|
150
|
+
revert ErrorInstanceInstanceAdminAlreadySet(address(_instanceAdmin));
|
147
151
|
}
|
148
152
|
if(accessManager.authority() != authority()) {
|
149
|
-
revert
|
153
|
+
revert ErrorInstanceInstanceAdminAuthorityMismatch(authority());
|
150
154
|
}
|
151
|
-
|
155
|
+
_instanceAdmin = accessManager;
|
152
156
|
}
|
153
157
|
|
154
158
|
function setBundleManager(BundleManager bundleManager) external restricted() {
|
@@ -182,8 +186,12 @@ contract Instance is
|
|
182
186
|
return _bundleManager;
|
183
187
|
}
|
184
188
|
|
185
|
-
function
|
186
|
-
return
|
189
|
+
function getInstanceAdmin() external view returns (InstanceAdmin) {
|
190
|
+
return _instanceAdmin;
|
191
|
+
}
|
192
|
+
|
193
|
+
function getInstanceAccessManager() external view returns (AccessManagerExtendedInitializeable) {
|
194
|
+
return AccessManagerExtendedInitializeable(authority());
|
187
195
|
}
|
188
196
|
|
189
197
|
function setInstanceStore(InstanceStore instanceStore) external restricted {
|
@@ -0,0 +1,331 @@
|
|
1
|
+
// SPDX-License-Identifier: Apache-2.0
|
2
|
+
pragma solidity ^0.8.20;
|
3
|
+
|
4
|
+
import {AccessManagedUpgradeable} from "@openzeppelin/contracts-upgradeable/access/manager/AccessManagedUpgradeable.sol";
|
5
|
+
import {EnumerableSet} from "@openzeppelin/contracts/utils/structs/EnumerableSet.sol";
|
6
|
+
|
7
|
+
import {RoleId, RoleIdLib, ADMIN_ROLE, PUBLIC_ROLE, INSTANCE_SERVICE_ROLE, INSTANCE_OWNER_ROLE, INSTANCE_ROLE} from "../type/RoleId.sol";
|
8
|
+
import {TimestampLib} from "../type/Timestamp.sol";
|
9
|
+
import {NftId} from "../type/NftId.sol";
|
10
|
+
|
11
|
+
import {AccessManagerExtendedInitializeable} from "../shared/AccessManagerExtendedInitializeable.sol";
|
12
|
+
|
13
|
+
import {IRegistry} from "../registry/IRegistry.sol";
|
14
|
+
|
15
|
+
import {IInstance} from "./IInstance.sol";
|
16
|
+
import {IAccess} from "./module/IAccess.sol";
|
17
|
+
|
18
|
+
contract InstanceAdmin is
|
19
|
+
AccessManagedUpgradeable
|
20
|
+
{
|
21
|
+
using RoleIdLib for RoleId;
|
22
|
+
|
23
|
+
string public constant INSTANCE_ROLE_NAME = "InstanceRole";
|
24
|
+
string public constant INSTANCE_OWNER_ROLE_NAME = "InstanceOwnerRole";
|
25
|
+
|
26
|
+
string public constant INSTANCE_ADMIN_TARGET_NAME = "InstanceAdmin";
|
27
|
+
|
28
|
+
uint64 public constant CUSTOM_ROLE_ID_MIN = 10000; // MUST be even
|
29
|
+
uint32 public constant EXECUTION_DELAY = 0;
|
30
|
+
|
31
|
+
mapping(address target => IAccess.Type) _targetType;
|
32
|
+
mapping(RoleId roleId => IAccess.Type) _roleType;
|
33
|
+
uint64 _idNext;
|
34
|
+
|
35
|
+
AccessManagerExtendedInitializeable internal _accessManager;
|
36
|
+
address _instance;
|
37
|
+
IRegistry internal _registry;
|
38
|
+
|
39
|
+
// instance owner role is granted upon instance nft minting in callback function
|
40
|
+
// assume this contract is already a member of ADMIN_ROLE, the only member
|
41
|
+
function initialize(address instanceAddress) external initializer
|
42
|
+
{
|
43
|
+
IInstance instance = IInstance(instanceAddress);
|
44
|
+
IRegistry registry = instance.getRegistry();
|
45
|
+
address authority = instance.authority();
|
46
|
+
|
47
|
+
__AccessManaged_init(authority);
|
48
|
+
|
49
|
+
_accessManager = AccessManagerExtendedInitializeable(authority);
|
50
|
+
_instance = instanceAddress;
|
51
|
+
_registry = registry;
|
52
|
+
_idNext = CUSTOM_ROLE_ID_MIN;
|
53
|
+
|
54
|
+
// minimum configuration required for nft interception
|
55
|
+
_createRole(INSTANCE_ROLE(), INSTANCE_ROLE_NAME, IAccess.Type.Core);
|
56
|
+
_createRole(INSTANCE_OWNER_ROLE(), INSTANCE_OWNER_ROLE_NAME, IAccess.Type.Core);
|
57
|
+
_grantRole(INSTANCE_ROLE(), address(instance));
|
58
|
+
|
59
|
+
_createTarget(address(this), INSTANCE_ADMIN_TARGET_NAME, IAccess.Type.Core);
|
60
|
+
bytes4[] memory instanceAdminInstanceSelectors = new bytes4[](1);
|
61
|
+
instanceAdminInstanceSelectors[0] = this.transferInstanceOwnerRole.selector;
|
62
|
+
_setTargetFunctionRole(address(this), instanceAdminInstanceSelectors, INSTANCE_ROLE());
|
63
|
+
}
|
64
|
+
|
65
|
+
//--- Role ------------------------------------------------------//
|
66
|
+
// ADMIN_ROLE
|
67
|
+
// assume all core roles are known at deployment time
|
68
|
+
// assume core roles are set and granted only during instance cloning
|
69
|
+
// assume core roles are never revoked -> core roles admin is never active after intialization
|
70
|
+
function createCoreRole(RoleId roleId, string memory name) external restricted() {
|
71
|
+
_createRole(roleId, name, IAccess.Type.Core);
|
72
|
+
}
|
73
|
+
|
74
|
+
// ADMIN_ROLE
|
75
|
+
// assume gif roles can be revoked
|
76
|
+
// assume admin is INSTANCE_OWNER_ROLE or INSTANCE_ROLE
|
77
|
+
function createGifRole(RoleId roleId, string memory name, RoleId admin) external restricted() {
|
78
|
+
_createRole(roleId, name, IAccess.Type.Gif);
|
79
|
+
_setRoleAdmin(roleId, admin);
|
80
|
+
}
|
81
|
+
|
82
|
+
// INSTANCE_ROLE
|
83
|
+
// TODO specify how many owners role can have -> many roles MUST have exactly 1 member?
|
84
|
+
function createRole(string memory roleName, string memory adminName)
|
85
|
+
external
|
86
|
+
restricted()
|
87
|
+
returns(RoleId roleId, RoleId admin)
|
88
|
+
{
|
89
|
+
(roleId, admin) = _getNextCustomRoleId();
|
90
|
+
|
91
|
+
_createRole(roleId, roleName, IAccess.Type.Custom);
|
92
|
+
_createRole(admin, adminName, IAccess.Type.Custom);
|
93
|
+
|
94
|
+
_setRoleAdmin(roleId, admin);
|
95
|
+
_setRoleAdmin(admin, INSTANCE_OWNER_ROLE());
|
96
|
+
}
|
97
|
+
|
98
|
+
// ADMIN_ROLE
|
99
|
+
// assume used by instance service only during instance cloning
|
100
|
+
// assume used only by this.createRole(), this.createGifRole() afterwards
|
101
|
+
function setRoleAdmin(RoleId roleId, RoleId admin) public restricted() {
|
102
|
+
_setRoleAdmin(roleId, admin);
|
103
|
+
}
|
104
|
+
|
105
|
+
// INSTANCE_ROLE
|
106
|
+
function transferInstanceOwnerRole(address from, address to) external restricted() {
|
107
|
+
// temp pre transfer checks
|
108
|
+
assert(_getRoleMembers(INSTANCE_ROLE()) == 1);
|
109
|
+
assert(_hasRole(INSTANCE_ROLE(), _instance));
|
110
|
+
assert(_getRoleAdmin(INSTANCE_OWNER_ROLE()).toInt() == ADMIN_ROLE().toInt());
|
111
|
+
if(from != address(0)) { // nft transfer
|
112
|
+
assert(_getRoleMembers(INSTANCE_OWNER_ROLE()) == 1);
|
113
|
+
} else { // nft minting
|
114
|
+
assert(_getRoleMembers(INSTANCE_OWNER_ROLE()) == 0);
|
115
|
+
}
|
116
|
+
|
117
|
+
// transfer
|
118
|
+
assert(from != to);
|
119
|
+
_grantRole(INSTANCE_OWNER_ROLE(), to);
|
120
|
+
if(from != address(0)) { // nft transfer
|
121
|
+
_revokeRole(INSTANCE_OWNER_ROLE(), from);
|
122
|
+
}
|
123
|
+
|
124
|
+
// temp post transfer checks
|
125
|
+
assert(_getRoleMembers(INSTANCE_OWNER_ROLE()) == 1);// temp
|
126
|
+
assert(_hasRole(INSTANCE_OWNER_ROLE(), to));
|
127
|
+
}
|
128
|
+
|
129
|
+
//--- Target ------------------------------------------------------//
|
130
|
+
// ADMIN_ROLE
|
131
|
+
// assume some core targets are registred (instance) while others are not (instance accesss manager, instance reader, bundle manager)
|
132
|
+
function createCoreTarget(address target, string memory name) external restricted() {
|
133
|
+
_createTarget(target, name, IAccess.Type.Core);
|
134
|
+
}
|
135
|
+
|
136
|
+
// INSTANCE_SERVICE_ROLE
|
137
|
+
function createGifTarget(address target, string memory name) external restricted()
|
138
|
+
{
|
139
|
+
if(!_registry.isRegistered(target)) {
|
140
|
+
revert IAccess.ErrorIAccessTargetNotRegistered(target);
|
141
|
+
}
|
142
|
+
|
143
|
+
NftId targetParentNftId = _registry.getObjectInfo(target).parentNftId;
|
144
|
+
NftId instanceNftId = _registry.getObjectInfo(_instance).nftId;
|
145
|
+
if(targetParentNftId != instanceNftId) {
|
146
|
+
revert IAccess.ErrorIAccessTargetInstanceMismatch(target, targetParentNftId, instanceNftId);
|
147
|
+
}
|
148
|
+
|
149
|
+
_createTarget(target, name, IAccess.Type.Gif);
|
150
|
+
}
|
151
|
+
|
152
|
+
// INSTANCE_ROLE
|
153
|
+
// assume custom target.authority() is constant -> target MUST not be used with different instance access manager
|
154
|
+
// assume custom target can not be registered as component -> each service which is doing component registration MUST register a gif target
|
155
|
+
// assume custom target can not be registered as instance or service -> why?
|
156
|
+
// TODO check target associated with instance owner or instance or instance components or components helpers
|
157
|
+
function createTarget(address target, string memory name) external restricted() {
|
158
|
+
_createTarget(target, name, IAccess.Type.Custom);
|
159
|
+
}
|
160
|
+
|
161
|
+
// TODO instance owner locks component instead of revoking it access to the instance...
|
162
|
+
// INSTANCE_SERVICE_ROLE
|
163
|
+
function setTargetLockedByService(address target, bool locked) external restricted {
|
164
|
+
_setTargetLocked(target, locked);
|
165
|
+
}
|
166
|
+
|
167
|
+
// INSTANCE_ROLE
|
168
|
+
function setTargetLockedByInstance(address target, bool locked) external restricted {
|
169
|
+
_setTargetLocked(target, locked);
|
170
|
+
}
|
171
|
+
|
172
|
+
|
173
|
+
// allowed combinations of roles and targets:
|
174
|
+
//1) set core role for core target
|
175
|
+
//2) set gif role for gif target
|
176
|
+
//3) set custom role for gif target
|
177
|
+
//4) set custom role for custom target
|
178
|
+
|
179
|
+
// ADMIN_ROLE if used only during initialization, works with:
|
180
|
+
// any roles for any targets
|
181
|
+
// INSTANCE_SERVICE_ROLE if used not only during initilization, works with:
|
182
|
+
// core roles for core targets
|
183
|
+
// gif roles for gif targets
|
184
|
+
function setTargetFunctionRoleByService(
|
185
|
+
string memory targetName,
|
186
|
+
bytes4[] calldata selectors,
|
187
|
+
RoleId roleId
|
188
|
+
)
|
189
|
+
public
|
190
|
+
virtual
|
191
|
+
restricted
|
192
|
+
{
|
193
|
+
address target = _accessManager.getTargetAddress(targetName);
|
194
|
+
// not custom target
|
195
|
+
if(_targetType[target] == IAccess.Type.Custom) {
|
196
|
+
revert IAccess.ErrorIAccessTargetTypeInvalid(target, IAccess.Type.Custom);
|
197
|
+
}
|
198
|
+
|
199
|
+
// not custom role
|
200
|
+
if(_roleType[roleId] == IAccess.Type.Custom) {
|
201
|
+
revert IAccess.ErrorIAccessRoleTypeInvalid(roleId, IAccess.Type.Custom);
|
202
|
+
}
|
203
|
+
|
204
|
+
_setTargetFunctionRole(target, selectors, roleId);
|
205
|
+
}
|
206
|
+
|
207
|
+
// INSTANCE_ROLE
|
208
|
+
// gif role for gif target
|
209
|
+
// gif role for custom target
|
210
|
+
// custom role for gif target -> need to prohibit
|
211
|
+
// custom role for custom target
|
212
|
+
// TODO instance owner can mess with gif target (component) -> e.g. set custom role for function intendent to work with gif role
|
213
|
+
function setTargetFunctionRoleByInstance(
|
214
|
+
string memory targetName,
|
215
|
+
bytes4[] calldata selectors,
|
216
|
+
RoleId roleId// string memory roleName
|
217
|
+
)
|
218
|
+
public
|
219
|
+
virtual
|
220
|
+
restricted()
|
221
|
+
{
|
222
|
+
address target = _accessManager.getTargetAddress(targetName);
|
223
|
+
|
224
|
+
// not core target
|
225
|
+
if(_targetType[target] == IAccess.Type.Core) {
|
226
|
+
revert IAccess.ErrorIAccessTargetTypeInvalid(target, IAccess.Type.Core);
|
227
|
+
}
|
228
|
+
|
229
|
+
// not core role
|
230
|
+
if(_roleType[roleId] == IAccess.Type.Core) {
|
231
|
+
revert IAccess.ErrorIAccessRoleTypeInvalid(roleId, IAccess.Type.Core);
|
232
|
+
}
|
233
|
+
|
234
|
+
_setTargetFunctionRole(target, selectors, roleId);
|
235
|
+
}
|
236
|
+
|
237
|
+
//--- Role internal view/pure functions --------------------------------------//
|
238
|
+
function _createRole(RoleId roleId, string memory name, IAccess.Type rtype) internal {
|
239
|
+
_validateRole(roleId, rtype);
|
240
|
+
|
241
|
+
_roleType[roleId] = rtype;
|
242
|
+
_accessManager.createRole(roleId.toInt(), name);
|
243
|
+
}
|
244
|
+
|
245
|
+
function _validateRole(RoleId roleId, IAccess.Type rtype) internal pure
|
246
|
+
{
|
247
|
+
uint roleIdInt = roleId.toInt();
|
248
|
+
if(rtype == IAccess.Type.Custom && roleIdInt < CUSTOM_ROLE_ID_MIN) {
|
249
|
+
revert IAccess.ErrorIAccessRoleIdTooSmall(roleId);
|
250
|
+
}
|
251
|
+
|
252
|
+
if(
|
253
|
+
rtype != IAccess.Type.Custom &&
|
254
|
+
roleIdInt >= CUSTOM_ROLE_ID_MIN &&
|
255
|
+
roleIdInt != PUBLIC_ROLE().toInt())
|
256
|
+
{
|
257
|
+
revert IAccess.ErrorIAccessRoleIdTooBig(roleId);
|
258
|
+
}
|
259
|
+
}
|
260
|
+
|
261
|
+
function _grantRole(RoleId roleId, address account) internal {
|
262
|
+
_accessManager.grantRole(roleId.toInt(), account, EXECUTION_DELAY);
|
263
|
+
}
|
264
|
+
|
265
|
+
function _revokeRole(RoleId roleId, address member) internal {
|
266
|
+
_accessManager.revokeRole(roleId.toInt(), member);
|
267
|
+
}
|
268
|
+
|
269
|
+
function _setRoleAdmin(RoleId roleId, RoleId admin) internal {
|
270
|
+
if(_roleType[roleId] == IAccess.Type.Core) {
|
271
|
+
revert IAccess.ErrorIAccessRoleTypeInvalid(roleId, IAccess.Type.Core);
|
272
|
+
}
|
273
|
+
|
274
|
+
_accessManager.setRoleAdmin(roleId.toInt(), admin.toInt());
|
275
|
+
}
|
276
|
+
|
277
|
+
function _getRoleAdmin(RoleId roleId) internal view returns (RoleId admin) {
|
278
|
+
return RoleIdLib.toRoleId(_accessManager.getRoleAdmin(roleId.toInt()));
|
279
|
+
}
|
280
|
+
|
281
|
+
function _hasRole(RoleId roleId, address account) internal view returns (bool accountHasRole) {
|
282
|
+
uint32 executionDelay;
|
283
|
+
(accountHasRole, executionDelay) = _accessManager.hasRole(roleId.toInt(), account);
|
284
|
+
assert(executionDelay == 0);
|
285
|
+
}
|
286
|
+
|
287
|
+
function _getRoleMembers(RoleId roleId) internal view returns (uint) {
|
288
|
+
return _accessManager.getRoleMembers(roleId.toInt());
|
289
|
+
}
|
290
|
+
|
291
|
+
function _getNextCustomRoleId() internal returns(RoleId roleId, RoleId admin) {
|
292
|
+
uint64 roleIdInt = _idNext;
|
293
|
+
uint64 adminInt = roleIdInt + 1;
|
294
|
+
|
295
|
+
_idNext = roleIdInt + 2;
|
296
|
+
|
297
|
+
roleId = RoleIdLib.toRoleId(roleIdInt);
|
298
|
+
admin = RoleIdLib.toRoleId(adminInt);
|
299
|
+
}
|
300
|
+
|
301
|
+
//--- Target internal view/pure functions --------------------------------------//
|
302
|
+
function _createTarget(address target, string memory name, IAccess.Type ttype)
|
303
|
+
internal
|
304
|
+
{
|
305
|
+
_validateTarget(target, ttype);
|
306
|
+
_targetType[target] = ttype;
|
307
|
+
_accessManager.createTarget(target, name);
|
308
|
+
}
|
309
|
+
|
310
|
+
function _validateTarget(address target, IAccess.Type ttype)
|
311
|
+
internal
|
312
|
+
view
|
313
|
+
{}
|
314
|
+
|
315
|
+
// IMPORTANT: instance admin MUST be of Core type -> otherwise can be locked forever
|
316
|
+
// TODO: consider locking gif targets in a separate function?
|
317
|
+
function _setTargetLocked(address target, bool locked) internal
|
318
|
+
{
|
319
|
+
IAccess.Type targetType = _targetType[target];
|
320
|
+
|
321
|
+
if(targetType == IAccess.Type.Core) {
|
322
|
+
revert IAccess.ErrorIAccessTargetTypeInvalid(target, targetType);
|
323
|
+
}
|
324
|
+
|
325
|
+
_accessManager.setTargetClosed(target, locked);
|
326
|
+
}
|
327
|
+
|
328
|
+
function _setTargetFunctionRole(address target, bytes4[] memory selectors, RoleId roleId) internal {
|
329
|
+
_accessManager.setTargetFunctionRole(target, selectors, roleId.toInt());
|
330
|
+
}
|
331
|
+
}
|