@etherisc/gif-next 0.0.2-df73b56-462 → 0.0.2-dfb8aa3-070
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/artifacts/contracts/authorization/AccessAdmin.sol/AccessAdmin.dbg.json +1 -1
- package/artifacts/contracts/authorization/AccessAdmin.sol/AccessAdmin.json +96 -37
- package/artifacts/contracts/authorization/AccessManagerCloneable.sol/AccessManagerCloneable.dbg.json +1 -1
- package/artifacts/contracts/authorization/Authorization.sol/Authorization.dbg.json +1 -1
- package/artifacts/contracts/authorization/Authorization.sol/Authorization.json +67 -11
- package/artifacts/contracts/authorization/IAccess.sol/IAccess.dbg.json +1 -1
- package/artifacts/contracts/authorization/IAccessAdmin.sol/IAccessAdmin.dbg.json +1 -1
- package/artifacts/contracts/authorization/IAccessAdmin.sol/IAccessAdmin.json +60 -13
- package/artifacts/contracts/authorization/IAuthorization.sol/IAuthorization.dbg.json +1 -1
- package/artifacts/contracts/authorization/IAuthorization.sol/IAuthorization.json +40 -3
- package/artifacts/contracts/authorization/IServiceAuthorization.sol/IServiceAuthorization.dbg.json +1 -1
- package/artifacts/contracts/authorization/IServiceAuthorization.sol/IServiceAuthorization.json +19 -0
- package/artifacts/contracts/authorization/ReleaseAccessManager.sol/ReleaseAccessManager.dbg.json +4 -0
- package/artifacts/contracts/authorization/ReleaseAccessManager.sol/ReleaseAccessManager.json +1196 -0
- package/artifacts/contracts/authorization/ServiceAuthorization.sol/ServiceAuthorization.dbg.json +1 -1
- package/artifacts/contracts/authorization/ServiceAuthorization.sol/ServiceAuthorization.json +68 -5
- package/artifacts/contracts/distribution/BasicDistribution.sol/BasicDistribution.dbg.json +1 -1
- package/artifacts/contracts/distribution/BasicDistribution.sol/BasicDistribution.json +154 -94
- package/artifacts/contracts/distribution/BasicDistributionAuthorization.sol/BasicDistributionAuthorization.dbg.json +1 -1
- package/artifacts/contracts/distribution/BasicDistributionAuthorization.sol/BasicDistributionAuthorization.json +82 -22
- package/artifacts/contracts/distribution/Distribution.sol/Distribution.dbg.json +1 -1
- package/artifacts/contracts/distribution/Distribution.sol/Distribution.json +94 -58
- package/artifacts/contracts/distribution/DistributionService.sol/DistributionService.dbg.json +1 -1
- package/artifacts/contracts/distribution/DistributionService.sol/DistributionService.json +136 -86
- package/artifacts/contracts/distribution/DistributionServiceManager.sol/DistributionServiceManager.dbg.json +1 -1
- package/artifacts/contracts/distribution/DistributionServiceManager.sol/DistributionServiceManager.json +80 -60
- package/artifacts/contracts/distribution/IDistributionComponent.sol/IDistributionComponent.dbg.json +1 -1
- package/artifacts/contracts/distribution/IDistributionComponent.sol/IDistributionComponent.json +81 -58
- package/artifacts/contracts/distribution/IDistributionService.sol/IDistributionService.dbg.json +1 -1
- package/artifacts/contracts/distribution/IDistributionService.sol/IDistributionService.json +29 -0
- package/artifacts/contracts/examples/fire/DamageLevel.sol/DamageLevelLib.dbg.json +4 -0
- package/artifacts/contracts/examples/fire/DamageLevel.sol/DamageLevelLib.json +22 -0
- package/artifacts/contracts/examples/fire/FirePool.sol/FirePool.dbg.json +4 -0
- package/artifacts/contracts/examples/fire/FirePool.sol/FirePool.json +1538 -0
- package/artifacts/contracts/examples/fire/FirePoolAuthorization.sol/FirePoolAuthorization.dbg.json +4 -0
- package/artifacts/contracts/examples/fire/FirePoolAuthorization.sol/FirePoolAuthorization.json +470 -0
- package/artifacts/contracts/examples/fire/FireProduct.sol/FireProduct.dbg.json +4 -0
- package/artifacts/contracts/examples/fire/FireProduct.sol/FireProduct.json +2072 -0
- package/artifacts/contracts/examples/fire/FireProductAuthorization.sol/FireProductAuthorization.dbg.json +4 -0
- package/artifacts/contracts/examples/fire/FireProductAuthorization.sol/FireProductAuthorization.json +470 -0
- package/artifacts/contracts/examples/fire/FireUSD.sol/FireUSD.dbg.json +4 -0
- package/artifacts/contracts/examples/fire/FireUSD.sol/FireUSD.json +376 -0
- package/artifacts/contracts/examples/unpermissioned/SimpleDistribution.sol/SimpleDistribution.dbg.json +1 -1
- package/artifacts/contracts/examples/unpermissioned/SimpleDistribution.sol/SimpleDistribution.json +156 -96
- package/artifacts/contracts/examples/unpermissioned/SimpleOracle.sol/SimpleOracle.dbg.json +1 -1
- package/artifacts/contracts/examples/unpermissioned/SimpleOracle.sol/SimpleOracle.json +137 -77
- package/artifacts/contracts/examples/unpermissioned/SimplePool.sol/SimplePool.dbg.json +1 -1
- package/artifacts/contracts/examples/unpermissioned/SimplePool.sol/SimplePool.json +153 -106
- package/artifacts/contracts/examples/unpermissioned/SimpleProduct.sol/SimpleProduct.dbg.json +1 -1
- package/artifacts/contracts/examples/unpermissioned/SimpleProduct.sol/SimpleProduct.json +241 -129
- package/artifacts/contracts/instance/BundleSet.sol/BundleSet.dbg.json +1 -1
- package/artifacts/contracts/instance/BundleSet.sol/BundleSet.json +2 -2
- package/artifacts/contracts/instance/IInstance.sol/IInstance.dbg.json +1 -1
- package/artifacts/contracts/instance/IInstance.sol/IInstance.json +53 -31
- package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.dbg.json +1 -1
- package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.json +29 -84
- package/artifacts/contracts/instance/Instance.sol/Instance.dbg.json +1 -1
- package/artifacts/contracts/instance/Instance.sol/Instance.json +62 -40
- package/artifacts/contracts/instance/InstanceAdmin.sol/InstanceAdmin.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceAdmin.sol/InstanceAdmin.json +148 -118
- package/artifacts/contracts/instance/InstanceAuthorizationV3.sol/InstanceAuthorizationV3.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceAuthorizationV3.sol/InstanceAuthorizationV3.json +57 -97
- package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.json +275 -77
- package/artifacts/contracts/instance/InstanceService.sol/InstanceService.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceService.sol/InstanceService.json +72 -130
- package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.json +48 -40
- package/artifacts/contracts/instance/InstanceStore.sol/InstanceStore.dbg.json +1 -1
- package/artifacts/contracts/instance/InstanceStore.sol/InstanceStore.json +175 -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 +1 -1
- package/artifacts/contracts/instance/base/ObjectCounter.sol/ObjectCounter.json +2 -2
- package/artifacts/contracts/instance/base/ObjectLifecycle.sol/ObjectLifecycle.dbg.json +1 -1
- package/artifacts/contracts/instance/base/ObjectLifecycle.sol/ObjectLifecycle.json +46 -5
- package/artifacts/contracts/instance/base/ObjectSet.sol/ObjectSet.dbg.json +1 -1
- package/artifacts/contracts/instance/base/ObjectSet.sol/ObjectSet.json +2 -2
- package/artifacts/contracts/instance/module/IAccess.sol/IAccess.dbg.json +1 -1
- package/artifacts/contracts/instance/module/IBundle.sol/IBundle.dbg.json +1 -1
- package/artifacts/contracts/instance/module/IComponents.sol/IComponents.dbg.json +1 -1
- package/artifacts/contracts/instance/module/IDistribution.sol/IDistribution.dbg.json +1 -1
- package/artifacts/contracts/instance/module/IPolicy.sol/IPolicy.dbg.json +1 -1
- package/artifacts/contracts/instance/module/IRisk.sol/IRisk.dbg.json +1 -1
- package/artifacts/contracts/mock/Dip.sol/Dip.dbg.json +1 -1
- package/artifacts/contracts/oracle/BasicOracle.sol/BasicOracle.dbg.json +1 -1
- package/artifacts/contracts/oracle/BasicOracle.sol/BasicOracle.json +135 -75
- package/artifacts/contracts/oracle/BasicOracleAuthorization.sol/BasicOracleAuthorization.dbg.json +1 -1
- package/artifacts/contracts/oracle/BasicOracleAuthorization.sol/BasicOracleAuthorization.json +84 -24
- package/artifacts/contracts/oracle/IOracle.sol/IOracle.dbg.json +1 -1
- package/artifacts/contracts/oracle/IOracleComponent.sol/IOracleComponent.dbg.json +1 -1
- package/artifacts/contracts/oracle/IOracleComponent.sol/IOracleComponent.json +76 -53
- package/artifacts/contracts/oracle/IOracleService.sol/IOracleService.dbg.json +1 -1
- package/artifacts/contracts/oracle/IOracleService.sol/IOracleService.json +43 -9
- package/artifacts/contracts/oracle/Oracle.sol/Oracle.dbg.json +1 -1
- package/artifacts/contracts/oracle/Oracle.sol/Oracle.json +89 -53
- package/artifacts/contracts/oracle/OracleService.sol/OracleService.dbg.json +1 -1
- package/artifacts/contracts/oracle/OracleService.sol/OracleService.json +86 -47
- package/artifacts/contracts/oracle/OracleServiceManager.sol/OracleServiceManager.dbg.json +1 -1
- package/artifacts/contracts/oracle/OracleServiceManager.sol/OracleServiceManager.json +48 -36
- package/artifacts/contracts/pool/BasicPool.sol/BasicPool.dbg.json +1 -1
- package/artifacts/contracts/pool/BasicPool.sol/BasicPool.json +89 -66
- package/artifacts/contracts/pool/BasicPoolAuthorization.sol/BasicPoolAuthorization.dbg.json +1 -1
- package/artifacts/contracts/pool/BasicPoolAuthorization.sol/BasicPoolAuthorization.json +82 -22
- package/artifacts/contracts/pool/BundleService.sol/BundleService.dbg.json +1 -1
- package/artifacts/contracts/pool/BundleService.sol/BundleService.json +180 -82
- package/artifacts/contracts/pool/BundleServiceManager.sol/BundleServiceManager.dbg.json +1 -1
- package/artifacts/contracts/pool/BundleServiceManager.sol/BundleServiceManager.json +90 -58
- package/artifacts/contracts/pool/IBundleService.sol/IBundleService.dbg.json +1 -1
- package/artifacts/contracts/pool/IBundleService.sol/IBundleService.json +53 -0
- package/artifacts/contracts/pool/IPoolComponent.sol/IPoolComponent.dbg.json +1 -1
- package/artifacts/contracts/pool/IPoolComponent.sol/IPoolComponent.json +76 -53
- package/artifacts/contracts/pool/IPoolService.sol/IPoolService.dbg.json +1 -1
- package/artifacts/contracts/pool/IPoolService.sol/IPoolService.json +200 -115
- package/artifacts/contracts/pool/Pool.sol/Pool.dbg.json +1 -1
- package/artifacts/contracts/pool/Pool.sol/Pool.json +89 -53
- package/artifacts/contracts/pool/PoolService.sol/PoolService.dbg.json +1 -1
- package/artifacts/contracts/pool/PoolService.sol/PoolService.json +312 -161
- package/artifacts/contracts/pool/PoolServiceManager.sol/PoolServiceManager.dbg.json +1 -1
- package/artifacts/contracts/pool/PoolServiceManager.sol/PoolServiceManager.json +81 -41
- package/artifacts/contracts/product/ApplicationService.sol/ApplicationService.dbg.json +1 -1
- package/artifacts/contracts/product/ApplicationService.sol/ApplicationService.json +66 -32
- package/artifacts/contracts/product/ApplicationServiceManager.sol/ApplicationServiceManager.dbg.json +1 -1
- package/artifacts/contracts/product/ApplicationServiceManager.sol/ApplicationServiceManager.json +45 -33
- package/artifacts/contracts/product/BasicProduct.sol/BasicProduct.dbg.json +1 -1
- package/artifacts/contracts/product/BasicProduct.sol/BasicProduct.json +145 -73
- package/artifacts/contracts/product/BasicProductAuthorization.sol/BasicProductAuthorization.dbg.json +1 -1
- package/artifacts/contracts/product/BasicProductAuthorization.sol/BasicProductAuthorization.json +82 -22
- package/artifacts/contracts/product/ClaimService.sol/ClaimService.dbg.json +1 -1
- package/artifacts/contracts/product/ClaimService.sol/ClaimService.json +175 -90
- package/artifacts/contracts/product/ClaimServiceManager.sol/ClaimServiceManager.dbg.json +1 -1
- package/artifacts/contracts/product/ClaimServiceManager.sol/ClaimServiceManager.json +82 -58
- package/artifacts/contracts/product/IApplicationService.sol/IApplicationService.dbg.json +1 -1
- package/artifacts/contracts/product/IApplicationService.sol/IApplicationService.json +29 -0
- package/artifacts/contracts/product/IClaimService.sol/IClaimService.dbg.json +1 -1
- package/artifacts/contracts/product/IClaimService.sol/IClaimService.json +64 -8
- package/artifacts/contracts/product/IPolicyService.sol/IPolicyService.dbg.json +1 -1
- package/artifacts/contracts/product/IPolicyService.sol/IPolicyService.json +58 -0
- package/artifacts/contracts/product/IPricingService.sol/IPricingService.dbg.json +1 -1
- package/artifacts/contracts/product/IPricingService.sol/IPricingService.json +80 -51
- package/artifacts/contracts/product/IProductComponent.sol/IProductComponent.dbg.json +1 -1
- package/artifacts/contracts/product/IProductComponent.sol/IProductComponent.json +132 -73
- package/artifacts/contracts/product/IRiskService.sol/IRiskService.dbg.json +1 -1
- package/artifacts/contracts/product/IRiskService.sol/IRiskService.json +29 -0
- package/artifacts/contracts/product/PolicyService.sol/PolicyService.dbg.json +1 -1
- package/artifacts/contracts/product/PolicyService.sol/PolicyService.json +139 -60
- package/artifacts/contracts/product/PolicyServiceManager.sol/PolicyServiceManager.dbg.json +1 -1
- package/artifacts/contracts/product/PolicyServiceManager.sol/PolicyServiceManager.json +67 -47
- package/artifacts/contracts/product/PricingService.sol/PricingService.dbg.json +1 -1
- package/artifacts/contracts/product/PricingService.sol/PricingService.json +149 -107
- package/artifacts/contracts/product/PricingServiceManager.sol/PricingServiceManager.dbg.json +1 -1
- package/artifacts/contracts/product/PricingServiceManager.sol/PricingServiceManager.json +61 -45
- package/artifacts/contracts/product/Product.sol/Product.dbg.json +1 -1
- package/artifacts/contracts/product/Product.sol/Product.json +145 -73
- package/artifacts/contracts/product/RiskService.sol/RiskService.dbg.json +1 -1
- package/artifacts/contracts/product/RiskService.sol/RiskService.json +60 -26
- package/artifacts/contracts/product/RiskServiceManager.sol/RiskServiceManager.dbg.json +1 -1
- package/artifacts/contracts/product/RiskServiceManager.sol/RiskServiceManager.json +42 -30
- 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 +67 -15
- package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.dbg.json +1 -1
- package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.json +114 -35
- package/artifacts/contracts/registry/ITransferInterceptor.sol/ITransferInterceptor.dbg.json +1 -1
- package/artifacts/contracts/registry/ITransferInterceptor.sol/ITransferInterceptor.json +5 -18
- package/artifacts/contracts/registry/Registry.sol/Registry.dbg.json +1 -1
- package/artifacts/contracts/registry/Registry.sol/Registry.json +111 -51
- package/artifacts/contracts/registry/RegistryAdmin.sol/RegistryAdmin.dbg.json +1 -1
- package/artifacts/contracts/registry/RegistryAdmin.sol/RegistryAdmin.json +193 -165
- package/artifacts/contracts/registry/RegistryService.sol/RegistryService.dbg.json +1 -1
- package/artifacts/contracts/registry/RegistryService.sol/RegistryService.json +73 -172
- package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.dbg.json +1 -1
- package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.json +41 -29
- package/artifacts/contracts/registry/ReleaseLifecycle.sol/ReleaseLifecycle.dbg.json +1 -1
- package/artifacts/contracts/registry/ReleaseLifecycle.sol/ReleaseLifecycle.json +47 -6
- package/artifacts/contracts/registry/ReleaseRegistry.sol/ReleaseRegistry.dbg.json +1 -1
- package/artifacts/contracts/registry/ReleaseRegistry.sol/ReleaseRegistry.json +121 -223
- package/artifacts/contracts/registry/ServiceAuthorizationV3.sol/ServiceAuthorizationV3.dbg.json +1 -1
- package/artifacts/contracts/registry/ServiceAuthorizationV3.sol/ServiceAuthorizationV3.json +66 -8
- package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.dbg.json +1 -1
- package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.json +2 -2
- package/artifacts/contracts/shared/Component.sol/Component.dbg.json +1 -1
- package/artifacts/contracts/shared/Component.sol/Component.json +68 -28
- package/artifacts/contracts/shared/ComponentService.sol/ComponentService.dbg.json +1 -1
- package/artifacts/contracts/shared/ComponentService.sol/ComponentService.json +350 -155
- package/artifacts/contracts/shared/ComponentServiceManager.sol/ComponentServiceManager.dbg.json +1 -1
- package/artifacts/contracts/shared/ComponentServiceManager.sol/ComponentServiceManager.json +83 -63
- package/artifacts/contracts/shared/ComponentVerifyingService.sol/ComponentVerifyingService.dbg.json +1 -1
- package/artifacts/contracts/shared/ComponentVerifyingService.sol/ComponentVerifyingService.json +42 -0
- package/artifacts/contracts/shared/ContractLib.sol/ContractLib.dbg.json +1 -1
- package/artifacts/contracts/shared/ContractLib.sol/ContractLib.json +2 -2
- package/artifacts/contracts/shared/IComponent.sol/IComponent.dbg.json +1 -1
- package/artifacts/contracts/shared/IComponent.sol/IComponent.json +55 -28
- package/artifacts/contracts/shared/IComponentService.sol/IComponentService.dbg.json +1 -1
- package/artifacts/contracts/shared/IComponentService.sol/IComponentService.json +321 -19
- package/artifacts/contracts/shared/IInstanceLinkedComponent.sol/IInstanceLinkedComponent.dbg.json +1 -1
- package/artifacts/contracts/shared/IInstanceLinkedComponent.sol/IInstanceLinkedComponent.json +76 -53
- package/artifacts/contracts/shared/IKeyValueStore.sol/IKeyValueStore.dbg.json +1 -1
- package/artifacts/contracts/shared/IKeyValueStore.sol/IKeyValueStore.json +36 -0
- package/artifacts/contracts/shared/ILifecycle.sol/ILifecycle.dbg.json +1 -1
- package/artifacts/contracts/shared/ILifecycle.sol/ILifecycle.json +36 -0
- package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.dbg.json +1 -1
- package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.json +16 -0
- package/artifacts/contracts/shared/IPolicyHolder.sol/IPolicyHolder.dbg.json +1 -1
- package/artifacts/contracts/shared/IPolicyHolder.sol/IPolicyHolder.json +1 -1
- package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.dbg.json +1 -1
- package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.json +29 -0
- package/artifacts/contracts/shared/IRegistryLinked.sol/IRegistryLinked.dbg.json +1 -1
- package/artifacts/contracts/shared/IService.sol/IService.dbg.json +1 -1
- package/artifacts/contracts/shared/IService.sol/IService.json +29 -0
- package/artifacts/contracts/shared/InitializableERC165.sol/InitializableERC165.dbg.json +1 -1
- package/artifacts/contracts/shared/InstanceLinkedComponent.sol/InstanceLinkedComponent.dbg.json +1 -1
- package/artifacts/contracts/shared/InstanceLinkedComponent.sol/InstanceLinkedComponent.json +89 -53
- package/artifacts/contracts/shared/KeyValueStore.sol/KeyValueStore.dbg.json +1 -1
- package/artifacts/contracts/shared/KeyValueStore.sol/KeyValueStore.json +42 -1
- package/artifacts/contracts/shared/Lifecycle.sol/Lifecycle.dbg.json +1 -1
- package/artifacts/contracts/shared/Lifecycle.sol/Lifecycle.json +42 -1
- package/artifacts/contracts/shared/NftIdSet.sol/NftIdSet.dbg.json +1 -1
- package/artifacts/contracts/shared/NftIdSet.sol/NftIdSet.json +2 -2
- package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.dbg.json +1 -1
- package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.json +18 -2
- package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.dbg.json +1 -1
- package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.json +3 -3
- package/artifacts/contracts/shared/Registerable.sol/Registerable.dbg.json +1 -1
- package/artifacts/contracts/shared/Registerable.sol/Registerable.json +66 -8
- 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 +42 -0
- 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/TokenHandlerDeployerLib.sol/TokenHandlerDeployerLib.dbg.json +1 -1
- package/artifacts/contracts/shared/TokenHandlerDeployerLib.sol/TokenHandlerDeployerLib.json +2 -2
- package/artifacts/contracts/staking/IStaking.sol/IStaking.dbg.json +1 -1
- package/artifacts/contracts/staking/IStaking.sol/IStaking.json +55 -28
- package/artifacts/contracts/staking/IStakingService.sol/IStakingService.dbg.json +1 -1
- package/artifacts/contracts/staking/IStakingService.sol/IStakingService.json +29 -21
- package/artifacts/contracts/staking/StakeManagerLib.sol/StakeManagerLib.dbg.json +1 -1
- package/artifacts/contracts/staking/StakeManagerLib.sol/StakeManagerLib.json +2 -2
- package/artifacts/contracts/staking/Staking.sol/Staking.dbg.json +1 -1
- package/artifacts/contracts/staking/Staking.sol/Staking.json +138 -78
- package/artifacts/contracts/staking/StakingLifecycle.sol/StakingLifecycle.dbg.json +1 -1
- package/artifacts/contracts/staking/StakingLifecycle.sol/StakingLifecycle.json +46 -5
- package/artifacts/contracts/staking/StakingManager.sol/StakingManager.dbg.json +1 -1
- package/artifacts/contracts/staking/StakingManager.sol/StakingManager.json +68 -42
- package/artifacts/contracts/staking/StakingReader.sol/StakingReader.dbg.json +1 -1
- package/artifacts/contracts/staking/StakingReader.sol/StakingReader.json +7 -12
- package/artifacts/contracts/staking/StakingService.sol/StakingService.dbg.json +1 -1
- package/artifacts/contracts/staking/StakingService.sol/StakingService.json +66 -53
- package/artifacts/contracts/staking/StakingServiceManager.sol/StakingServiceManager.dbg.json +1 -1
- package/artifacts/contracts/staking/StakingServiceManager.sol/StakingServiceManager.json +45 -33
- package/artifacts/contracts/staking/StakingStore.sol/StakingStore.dbg.json +1 -1
- package/artifacts/contracts/staking/StakingStore.sol/StakingStore.json +144 -103
- package/artifacts/contracts/staking/TargetManagerLib.sol/TargetManagerLib.dbg.json +1 -1
- package/artifacts/contracts/staking/TargetManagerLib.sol/TargetManagerLib.json +2 -2
- package/artifacts/contracts/type/AddressSet.sol/LibAddressSet.dbg.json +1 -1
- package/artifacts/contracts/type/Amount.sol/AmountLib.dbg.json +1 -1
- package/artifacts/contracts/type/Amount.sol/AmountLib.json +32 -8
- package/artifacts/contracts/type/Blocknumber.sol/BlocknumberLib.dbg.json +1 -1
- package/artifacts/contracts/type/ClaimId.sol/ClaimIdLib.dbg.json +1 -1
- package/artifacts/contracts/type/ClaimId.sol/ClaimIdLib.json +28 -4
- 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 +2 -2
- package/artifacts/contracts/type/NftIdSet.sol/LibNftIdSet.dbg.json +1 -1
- package/artifacts/contracts/type/NftIdSet.sol/LibNftIdSet.json +2 -2
- package/artifacts/contracts/type/ObjectType.sol/ObjectTypeLib.dbg.json +1 -1
- package/artifacts/contracts/type/ObjectType.sol/ObjectTypeLib.json +2 -2
- package/artifacts/contracts/type/PayoutId.sol/PayoutIdLib.dbg.json +1 -1
- package/artifacts/contracts/type/PayoutId.sol/PayoutIdLib.json +19 -19
- package/artifacts/contracts/type/Referral.sol/ReferralLib.dbg.json +1 -1
- package/artifacts/contracts/type/Referral.sol/ReferralLib.json +2 -2
- package/artifacts/contracts/type/RequestId.sol/RequestIdLib.dbg.json +1 -1
- package/artifacts/contracts/type/RequestId.sol/RequestIdLib.json +2 -2
- package/artifacts/contracts/type/RiskId.sol/RiskIdLib.dbg.json +1 -1
- package/artifacts/contracts/type/RiskId.sol/RiskIdLib.json +60 -4
- 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/Selector.sol/SelectorLib.dbg.json +1 -1
- package/artifacts/contracts/type/Selector.sol/SelectorSetLib.dbg.json +1 -1
- package/artifacts/contracts/type/StateId.sol/StateIdLib.dbg.json +1 -1
- package/artifacts/contracts/type/StateId.sol/StateIdLib.json +15 -2
- package/artifacts/contracts/type/String.sol/StrLib.dbg.json +1 -1
- package/artifacts/contracts/type/Timestamp.sol/TimestampLib.dbg.json +1 -1
- package/artifacts/contracts/type/UFixed.sol/MathLib.dbg.json +1 -1
- package/artifacts/contracts/type/UFixed.sol/MathLib.json +2 -2
- package/artifacts/contracts/type/UFixed.sol/UFixedLib.dbg.json +1 -1
- package/artifacts/contracts/type/UFixed.sol/UFixedLib.json +15 -2
- package/artifacts/contracts/type/Version.sol/VersionLib.dbg.json +1 -1
- package/artifacts/contracts/type/Version.sol/VersionPartLib.dbg.json +1 -1
- package/artifacts/contracts/upgradeability/IVersionable.sol/IVersionable.dbg.json +1 -1
- package/artifacts/contracts/upgradeability/ProxyManager.sol/ProxyManager.dbg.json +1 -1
- package/artifacts/contracts/upgradeability/ProxyManager.sol/ProxyManager.json +28 -12
- package/artifacts/contracts/upgradeability/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.dbg.json +1 -1
- package/artifacts/contracts/upgradeability/Versionable.sol/Versionable.dbg.json +1 -1
- package/contracts/authorization/AccessAdmin.sol +65 -61
- package/contracts/authorization/Authorization.sol +111 -39
- package/contracts/authorization/IAccess.sol +1 -0
- package/contracts/authorization/IAccessAdmin.sol +4 -2
- package/contracts/authorization/IAuthorization.sol +13 -7
- package/contracts/authorization/IServiceAuthorization.sol +3 -1
- package/contracts/authorization/ReleaseAccessManager.sol +38 -0
- package/contracts/authorization/ServiceAuthorization.sol +26 -10
- package/contracts/distribution/BasicDistribution.sol +2 -1
- package/contracts/distribution/Distribution.sol +6 -16
- package/contracts/distribution/DistributionService.sol +55 -36
- package/contracts/distribution/IDistributionComponent.sol +1 -1
- package/contracts/examples/fire/DamageLevel.sol +59 -0
- package/contracts/examples/fire/FirePool.sol +73 -0
- package/contracts/examples/fire/FirePoolAuthorization.sol +34 -0
- package/contracts/examples/fire/FireProduct.sol +415 -0
- package/contracts/examples/fire/FireProductAuthorization.sol +44 -0
- package/contracts/examples/fire/FireUSD.sol +26 -0
- package/contracts/examples/unpermissioned/SimpleDistribution.sol +4 -4
- package/contracts/examples/unpermissioned/SimpleOracle.sol +4 -4
- package/contracts/examples/unpermissioned/SimplePool.sol +4 -4
- package/contracts/examples/unpermissioned/SimpleProduct.sol +10 -10
- package/contracts/instance/IInstance.sol +4 -1
- package/contracts/instance/IInstanceService.sol +0 -20
- package/contracts/instance/Instance.sol +20 -17
- package/contracts/instance/InstanceAdmin.sol +22 -30
- package/contracts/instance/InstanceAuthorizationV3.sol +9 -19
- package/contracts/instance/InstanceReader.sol +83 -18
- package/contracts/instance/InstanceService.sol +15 -70
- package/contracts/instance/module/IComponents.sol +6 -3
- package/contracts/instance/module/IPolicy.sol +2 -2
- package/contracts/oracle/BasicOracle.sol +0 -1
- package/contracts/oracle/IOracleService.sol +2 -1
- package/contracts/oracle/Oracle.sol +4 -15
- package/contracts/oracle/OracleService.sol +39 -29
- package/contracts/pool/BasicPool.sol +14 -26
- package/contracts/pool/BasicPoolAuthorization.sol +0 -1
- package/contracts/pool/BundleService.sol +75 -20
- package/contracts/pool/IBundleService.sol +9 -0
- package/contracts/pool/IPoolService.sol +21 -14
- package/contracts/pool/Pool.sol +22 -29
- package/contracts/pool/PoolService.sol +116 -80
- package/contracts/product/ApplicationService.sol +16 -4
- package/contracts/product/BasicProduct.sol +6 -6
- package/contracts/product/BasicProductAuthorization.sol +0 -1
- package/contracts/product/ClaimService.sol +108 -69
- package/contracts/product/IClaimService.sol +3 -2
- package/contracts/product/IPolicyService.sol +3 -0
- package/contracts/product/IPricingService.sol +9 -9
- package/contracts/product/IProductComponent.sol +23 -3
- package/contracts/product/PolicyService.sol +66 -21
- package/contracts/product/PricingService.sol +8 -8
- package/contracts/product/Product.sol +81 -52
- package/contracts/registry/ChainNft.sol +6 -9
- package/contracts/registry/IRegistry.sol +6 -3
- package/contracts/registry/IRegistryService.sol +5 -12
- package/contracts/registry/ITransferInterceptor.sol +1 -2
- package/contracts/registry/Registry.sol +21 -6
- package/contracts/registry/RegistryAdmin.sol +7 -23
- package/contracts/registry/RegistryService.sol +33 -44
- package/contracts/registry/ReleaseLifecycle.sol +6 -3
- package/contracts/registry/ReleaseRegistry.sol +201 -191
- package/contracts/registry/ServiceAuthorizationV3.sol +14 -19
- package/contracts/shared/Component.sol +25 -28
- package/contracts/shared/ComponentService.sol +235 -131
- package/contracts/shared/ComponentVerifyingService.sol +22 -13
- package/contracts/shared/IComponent.sol +6 -2
- package/contracts/shared/IComponentService.sol +25 -13
- package/contracts/shared/IInstanceLinkedComponent.sol +3 -11
- package/contracts/shared/ILifecycle.sol +3 -1
- package/contracts/shared/INftOwnable.sol +2 -0
- package/contracts/shared/IRegisterable.sol +11 -0
- package/contracts/shared/InstanceLinkedComponent.sol +68 -27
- package/contracts/shared/KeyValueStore.sol +1 -1
- package/contracts/shared/Lifecycle.sol +15 -4
- package/contracts/shared/NftOwnable.sol +23 -3
- package/contracts/shared/PolicyHolder.sol +4 -0
- package/contracts/shared/Registerable.sol +15 -5
- package/contracts/shared/Service.sol +4 -7
- package/contracts/staking/IStakingService.sol +0 -3
- package/contracts/staking/Staking.sol +2 -3
- package/contracts/staking/StakingReader.sol +12 -5
- package/contracts/staking/StakingService.sol +15 -15
- package/contracts/type/Amount.sol +15 -0
- package/contracts/type/ClaimId.sol +6 -1
- package/contracts/type/NftId.sol +1 -0
- package/contracts/type/ObjectType.sol +1 -0
- package/contracts/type/PayoutId.sol +10 -10
- package/contracts/type/RiskId.sol +15 -1
- package/contracts/type/RoleId.sol +0 -12
- package/contracts/type/StateId.sol +14 -1
- package/contracts/type/UFixed.sol +4 -0
- package/contracts/upgradeability/ProxyManager.sol +2 -1
- package/package.json +2 -1
- package/artifacts/contracts/authorization/IModuleAuthorization.sol/IModuleAuthorization.dbg.json +0 -4
- package/artifacts/contracts/authorization/IModuleAuthorization.sol/IModuleAuthorization.json +0 -290
- package/artifacts/contracts/authorization/ModuleAuthorization.sol/ModuleAuthorization.dbg.json +0 -4
- package/artifacts/contracts/authorization/ModuleAuthorization.sol/ModuleAuthorization.json +0 -390
- package/artifacts/contracts/shared/InitializableCustom.sol/InitializableCustom.dbg.json +0 -4
- package/artifacts/contracts/shared/InitializableCustom.sol/InitializableCustom.json +0 -39
- package/contracts/authorization/IModuleAuthorization.sol +0 -21
- package/contracts/authorization/ModuleAuthorization.sol +0 -78
- package/contracts/shared/InitializableCustom.sol +0 -177
@@ -11,60 +11,74 @@ import {TimestampLib} from "../type/Timestamp.sol";
|
|
11
11
|
import {VersionPart, VersionPartLib} from "../type/Version.sol";
|
12
12
|
|
13
13
|
contract Authorization
|
14
|
-
|
14
|
+
is IAuthorization
|
15
15
|
{
|
16
|
-
|
17
|
-
string public constant ROLE_NAME_SUFFIX = "Role";
|
18
|
-
string public constant SERVICE_ROLE_NAME_SUFFIX = "ServiceRole";
|
16
|
+
uint256 public constant GIF_RELEASE = 3;
|
19
17
|
|
20
|
-
|
21
|
-
|
18
|
+
string public constant ROLE_NAME_SUFFIX = "Role";
|
19
|
+
string public constant SERVICE_ROLE_NAME_SUFFIX = "ServiceRole";
|
22
20
|
|
23
|
-
|
24
|
-
|
21
|
+
ObjectType[] internal _serviceDomains;
|
22
|
+
mapping(ObjectType domain => Str target) internal _serviceTarget;
|
25
23
|
|
26
|
-
|
27
|
-
|
24
|
+
string internal _mainTargetName = "Component";
|
25
|
+
Str[] internal _targets;
|
28
26
|
|
29
|
-
|
30
|
-
|
27
|
+
mapping(Str target => RoleId roleid) internal _targetRole;
|
28
|
+
mapping(Str target => bool exists) internal _targetExists;
|
31
29
|
|
30
|
+
RoleId[] internal _roles;
|
31
|
+
mapping(RoleId role => RoleInfo info) internal _roleInfo;
|
32
32
|
|
33
|
-
|
34
|
-
|
33
|
+
mapping(Str target => RoleId[] authorizedRoles) internal _authorizedRoles;
|
34
|
+
mapping(Str target => mapping(RoleId authorizedRole => IAccess.FunctionInfo[] functions)) internal _authorizedFunctions;
|
35
35
|
|
36
|
-
|
37
|
-
|
38
|
-
|
36
|
+
|
37
|
+
constructor(string memory mainTargetName) {
|
38
|
+
_mainTargetName = mainTargetName;
|
39
|
+
|
40
|
+
_setupServiceTargets();
|
41
|
+
_setupRoles();
|
42
|
+
_setupTargets();
|
43
|
+
_setupTargetAuthorizations();
|
44
|
+
}
|
45
|
+
|
46
|
+
function getServiceDomains() external view returns(ObjectType[] memory serviceDomains) {
|
47
|
+
return _serviceDomains;
|
48
|
+
}
|
49
|
+
|
50
|
+
function getServiceRole(ObjectType serviceDomain) public virtual pure returns (RoleId serviceRoleId) {
|
51
|
+
return RoleIdLib.roleForTypeAndVersion(
|
52
|
+
serviceDomain,
|
53
|
+
getRelease());
|
39
54
|
}
|
40
55
|
|
41
|
-
function
|
42
|
-
return
|
56
|
+
function getServiceTarget(ObjectType serviceDomain) external view returns(Str serviceTarget) {
|
57
|
+
return _serviceTarget[serviceDomain];
|
43
58
|
}
|
44
59
|
|
45
60
|
function getRoles() external view returns(RoleId[] memory roles) {
|
46
61
|
return _roles;
|
47
62
|
}
|
48
63
|
|
49
|
-
function
|
50
|
-
return
|
51
|
-
serviceDomain, getRelease());
|
64
|
+
function roleExists(RoleId roleId) public view returns(bool exists) {
|
65
|
+
return _roleInfo[roleId].roleType != RoleType.Undefined;
|
52
66
|
}
|
53
67
|
|
54
68
|
function getRoleInfo(RoleId roleId) external view returns (RoleInfo memory info) {
|
55
69
|
return _roleInfo[roleId];
|
56
70
|
}
|
57
71
|
|
58
|
-
function
|
59
|
-
return
|
72
|
+
function getTargetName() public virtual view returns (string memory name) {
|
73
|
+
return _mainTargetName;
|
60
74
|
}
|
61
75
|
|
62
|
-
function
|
63
|
-
|
64
|
-
|
65
|
-
}
|
76
|
+
function getMainTarget() public view returns(Str) {
|
77
|
+
return getTarget(_mainTargetName);
|
78
|
+
}
|
66
79
|
|
67
|
-
|
80
|
+
function getTarget(string memory targetName) public view returns(Str target) {
|
81
|
+
return StrLib.toStr(targetName);
|
68
82
|
}
|
69
83
|
|
70
84
|
function getTargets() external view returns(Str[] memory targets) {
|
@@ -87,26 +101,60 @@ contract Authorization
|
|
87
101
|
return _authorizedFunctions[target][roleId];
|
88
102
|
}
|
89
103
|
|
90
|
-
|
91
|
-
|
92
|
-
|
104
|
+
function getRelease() public virtual pure returns(VersionPart release) {
|
105
|
+
return VersionPartLib.toVersionPart(GIF_RELEASE);
|
106
|
+
}
|
107
|
+
|
108
|
+
/// @dev Sets up the relevant service targets for the component.
|
109
|
+
/// Overwrite this function for a specific component.
|
110
|
+
function _setupServiceTargets() internal virtual { }
|
93
111
|
|
94
|
-
/// @dev
|
95
|
-
///
|
112
|
+
/// @dev Sets up the relevant (non-service) targets for the component.
|
113
|
+
/// Overwrite this function for a specific component.
|
96
114
|
function _setupTargets() internal virtual { }
|
97
115
|
|
98
|
-
/// @dev
|
116
|
+
/// @dev Sets up the relevant roles for the component.
|
117
|
+
/// Overwrite this function for a specific component.
|
99
118
|
function _setupRoles() internal virtual {}
|
100
119
|
|
101
|
-
/// @dev
|
120
|
+
/// @dev Sets up the relevant target authorizations for the component.
|
121
|
+
/// Overwrite this function for a specific realease.
|
102
122
|
function _setupTargetAuthorizations() internal virtual {}
|
103
123
|
|
124
|
+
|
125
|
+
/// @dev Add the service target role for the specified service domain
|
126
|
+
function _addServiceTargetWithRole(ObjectType serviceDomain) internal {
|
127
|
+
// add service domain
|
128
|
+
_serviceDomains.push(serviceDomain);
|
129
|
+
|
130
|
+
// get versioned target name
|
131
|
+
string memory serviceTargetName = ObjectTypeLib.toVersionedName(
|
132
|
+
ObjectTypeLib.toName(serviceDomain),
|
133
|
+
"Service",
|
134
|
+
getRelease().toInt());
|
135
|
+
|
136
|
+
_serviceTarget[serviceDomain] = StrLib.toStr(serviceTargetName);
|
137
|
+
|
138
|
+
RoleId serviceRoleId = getServiceRole(serviceDomain);
|
139
|
+
string memory serviceRoleName = ObjectTypeLib.toVersionedName(
|
140
|
+
ObjectTypeLib.toName(serviceDomain),
|
141
|
+
"ServiceRole",
|
142
|
+
getRelease().toInt());
|
143
|
+
|
144
|
+
_addTargetWithRole(
|
145
|
+
serviceTargetName,
|
146
|
+
serviceRoleId,
|
147
|
+
serviceRoleName);
|
148
|
+
}
|
149
|
+
|
150
|
+
|
104
151
|
/// @dev Use this method to to add an authorized role.
|
105
152
|
function _addRole(RoleId roleId, RoleInfo memory info) internal {
|
106
153
|
_roles.push(roleId);
|
107
154
|
_roleInfo[roleId] = info;
|
108
155
|
}
|
109
156
|
|
157
|
+
|
110
158
|
/// @dev Add a contract role for the provided role id and name.
|
111
159
|
function _addContractRole(RoleId roleId, string memory name) internal {
|
112
160
|
_addRole(
|
@@ -118,6 +166,7 @@ contract Authorization
|
|
118
166
|
name));
|
119
167
|
}
|
120
168
|
|
169
|
+
|
121
170
|
/// @dev Add the versioned service role for the specified service domain
|
122
171
|
function _addServiceRole(ObjectType serviceDomain) internal {
|
123
172
|
_addContractRole(
|
@@ -128,14 +177,21 @@ contract Authorization
|
|
128
177
|
getRelease().toInt()));
|
129
178
|
}
|
130
179
|
|
180
|
+
|
131
181
|
function _addComponentTargetWithRole(ObjectType componentType) internal {
|
182
|
+
_addComponentTargetWithRole(componentType, 0);
|
183
|
+
}
|
184
|
+
|
185
|
+
|
186
|
+
function _addComponentTargetWithRole(ObjectType componentType, uint64 index) internal {
|
132
187
|
_addTargetWithRole(
|
133
188
|
getTargetName(),
|
134
|
-
RoleIdLib.toComponentRoleId(componentType,
|
189
|
+
RoleIdLib.toComponentRoleId(componentType, index),
|
135
190
|
_toTargetRoleName(
|
136
191
|
getTargetName()));
|
137
192
|
}
|
138
193
|
|
194
|
+
|
139
195
|
/// @dev Add a contract role for the provided role id and name.
|
140
196
|
function _addCustomRole(RoleId roleId, RoleId adminRoleId, uint32 maxMemberCount, string memory name) internal {
|
141
197
|
_addRole(
|
@@ -173,11 +229,13 @@ contract Authorization
|
|
173
229
|
}
|
174
230
|
}
|
175
231
|
|
232
|
+
|
176
233
|
/// @dev Use this method to to add an authorized target.
|
177
234
|
function _addTarget(string memory name) internal {
|
178
235
|
_addTargetWithRole(name, RoleIdLib.zero(), "");
|
179
236
|
}
|
180
237
|
|
238
|
+
|
181
239
|
/// @dev Use this method to authorize the specified role to access the target.
|
182
240
|
function _authorizeForTarget(string memory target, RoleId authorizedRoleId)
|
183
241
|
internal
|
@@ -188,6 +246,7 @@ contract Authorization
|
|
188
246
|
return _authorizedFunctions[targetStr][authorizedRoleId];
|
189
247
|
}
|
190
248
|
|
249
|
+
|
191
250
|
/// @dev Use this method to authorize a specific function authorization
|
192
251
|
function _authorize(IAccess.FunctionInfo[] storage functions, bytes4 selector, string memory name) internal {
|
193
252
|
functions.push(
|
@@ -197,13 +256,25 @@ contract Authorization
|
|
197
256
|
createdAt: TimestampLib.blockTimestamp()}));
|
198
257
|
}
|
199
258
|
|
200
|
-
|
259
|
+
|
260
|
+
/// @dev role id for targets registry, staking and instance
|
261
|
+
function _toTargetRoleId(ObjectType targetDomain)
|
262
|
+
internal
|
263
|
+
pure
|
264
|
+
returns (RoleId targetRoleId)
|
265
|
+
{
|
266
|
+
return RoleIdLib.roleForType(targetDomain);
|
267
|
+
}
|
268
|
+
|
269
|
+
|
270
|
+
function _toTargetRoleName(string memory targetName) internal pure returns (string memory) {
|
201
271
|
return string(
|
202
272
|
abi.encodePacked(
|
203
273
|
targetName,
|
204
274
|
ROLE_NAME_SUFFIX));
|
205
275
|
}
|
206
276
|
|
277
|
+
|
207
278
|
/// @dev creates a role info object from the provided parameters
|
208
279
|
function _toRoleInfo(RoleId adminRoleId, RoleType roleType, uint32 maxMemberCount, string memory name) internal view returns (RoleInfo memory info) {
|
209
280
|
return RoleInfo({
|
@@ -211,7 +282,8 @@ contract Authorization
|
|
211
282
|
adminRoleId: adminRoleId,
|
212
283
|
roleType: roleType,
|
213
284
|
maxMemberCount: maxMemberCount,
|
214
|
-
createdAt: TimestampLib.blockTimestamp()
|
285
|
+
createdAt: TimestampLib.blockTimestamp(),
|
286
|
+
pausedAt: TimestampLib.max()});
|
215
287
|
}
|
216
288
|
}
|
217
289
|
|
@@ -41,9 +41,10 @@ interface IAccessAdmin is
|
|
41
41
|
// grant/revoke/renounce role
|
42
42
|
error ErrorRoleUnknown(RoleId roleId);
|
43
43
|
error ErrorRoleIsLocked(RoleId roleId);
|
44
|
-
error
|
44
|
+
error ErrorRoleIsPaused(RoleId roleId);
|
45
45
|
error ErrorRoleMembersLimitReached(RoleId roleId, uint256 memberCountLimit);
|
46
|
-
error
|
46
|
+
error ErrorRoleMemberNotContract(RoleId roleId, address notContract);
|
47
|
+
error ErrorRoleMemberRemovalDisabled(RoleId roleId, address expectedMember);
|
47
48
|
|
48
49
|
// create target
|
49
50
|
error ErrorTargetAlreadyCreated(address target, string name);
|
@@ -54,6 +55,7 @@ interface IAccessAdmin is
|
|
54
55
|
|
55
56
|
// lock target
|
56
57
|
error ErrorTagetNotLockable();
|
58
|
+
error ErrorTargetAlreadyLocked(address target, bool isLocked);
|
57
59
|
|
58
60
|
// authorize target functions
|
59
61
|
error ErrorAuthorizeForAdminRoleInvalid(address target);
|
@@ -11,16 +11,18 @@ interface IAuthorization is
|
|
11
11
|
IAccess
|
12
12
|
{
|
13
13
|
|
14
|
-
/// @dev Returns the
|
15
|
-
|
16
|
-
function getRelease() external view returns(VersionPart release);
|
17
|
-
|
18
|
-
/// @dev Returns the list of involved roles.
|
19
|
-
function getRoles() external view returns(RoleId[] memory roles);
|
14
|
+
/// @dev Returns the list of service targets.
|
15
|
+
function getServiceDomains() external view returns(ObjectType[] memory serviceDomains);
|
20
16
|
|
21
17
|
/// @dev Returns the service role for the specified service domain.
|
22
18
|
function getServiceRole(ObjectType serviceDomain) external pure returns (RoleId serviceRoleId);
|
23
19
|
|
20
|
+
/// @dev Returns the service target for the specified domain.
|
21
|
+
function getServiceTarget(ObjectType serviceDomain) external view returns(Str serviceTarget);
|
22
|
+
|
23
|
+
/// @dev Returns the list of involved roles.
|
24
|
+
function getRoles() external view returns(RoleId[] memory roles);
|
25
|
+
|
24
26
|
/// @dev Returns the name for the provided role id.
|
25
27
|
function getRoleInfo(RoleId roleId) external view returns (RoleInfo memory roleInfo);
|
26
28
|
|
@@ -33,7 +35,7 @@ interface IAuthorization is
|
|
33
35
|
function getTargetName() external view returns (string memory name);
|
34
36
|
|
35
37
|
/// @dev Returns the main target.
|
36
|
-
function
|
38
|
+
function getMainTarget() external view returns(Str target);
|
37
39
|
|
38
40
|
/// @dev Returns the complete list of targets.
|
39
41
|
function getTargets() external view returns(Str[] memory targets);
|
@@ -50,5 +52,9 @@ interface IAuthorization is
|
|
50
52
|
|
51
53
|
/// @dev For the given target and role id the list of authorized functions is returned
|
52
54
|
function getAuthorizedFunctions(Str target, RoleId roleId) external view returns(FunctionInfo[] memory authorizatedFunctions);
|
55
|
+
|
56
|
+
/// @dev Returns the release (VersionPart) for which the authorizations are defined by this contract.
|
57
|
+
/// Matches with the release returned by the linked service authorization.
|
58
|
+
function getRelease() external view returns(VersionPart release);
|
53
59
|
}
|
54
60
|
|
@@ -1,11 +1,13 @@
|
|
1
1
|
// SPDX-License-Identifier: Apache-2.0
|
2
2
|
pragma solidity ^0.8.20;
|
3
3
|
|
4
|
+
import {IERC165} from "@openzeppelin/contracts/utils/introspection/IERC165.sol";
|
5
|
+
|
4
6
|
import {IAccess} from "../authorization/IAccess.sol";
|
5
7
|
import {ObjectType} from "../type/ObjectType.sol";
|
6
8
|
import {VersionPart} from "../type/Version.sol";
|
7
9
|
|
8
|
-
interface IServiceAuthorization {
|
10
|
+
interface IServiceAuthorization is IERC165 {
|
9
11
|
|
10
12
|
/// @dev Returns the commit hash representing the deployed release
|
11
13
|
function getCommitHash()
|
@@ -0,0 +1,38 @@
|
|
1
|
+
// SPDX-License-Identifier: UNLICENSED
|
2
|
+
pragma solidity ^0.8.20;
|
3
|
+
|
4
|
+
import {AccessManager} from "@openzeppelin/contracts/access/manager/AccessManager.sol";
|
5
|
+
|
6
|
+
abstract contract ReleaseAccessManager is
|
7
|
+
AccessManager
|
8
|
+
{
|
9
|
+
bool private _releaseIsLocked;
|
10
|
+
|
11
|
+
function setReleaseLocked(bool locked)
|
12
|
+
external
|
13
|
+
onlyAuthorized()
|
14
|
+
{
|
15
|
+
_releaseIsLocked = locked;
|
16
|
+
}
|
17
|
+
|
18
|
+
function isReleaseLocked()
|
19
|
+
external
|
20
|
+
view
|
21
|
+
returns (bool isLocked)
|
22
|
+
{
|
23
|
+
return _releaseIsLocked;
|
24
|
+
}
|
25
|
+
|
26
|
+
function isTargetClosed(address target)
|
27
|
+
public
|
28
|
+
virtual override
|
29
|
+
view
|
30
|
+
returns (bool)
|
31
|
+
{
|
32
|
+
if (_releaseIsLocked) {
|
33
|
+
return true;
|
34
|
+
}
|
35
|
+
|
36
|
+
return super.isTargetClosed(target);
|
37
|
+
}
|
38
|
+
}
|
@@ -1,6 +1,8 @@
|
|
1
1
|
// SPDX-License-Identifier: Apache-2.0
|
2
2
|
pragma solidity ^0.8.20;
|
3
3
|
|
4
|
+
import {IERC165} from "@openzeppelin/contracts/utils/introspection/IERC165.sol";
|
5
|
+
|
4
6
|
import {IAccess} from "../authorization/IAccess.sol";
|
5
7
|
import {ObjectType} from "../type/ObjectType.sol";
|
6
8
|
import {IServiceAuthorization} from "./IServiceAuthorization.sol";
|
@@ -10,30 +12,36 @@ import {TimestampLib} from "../type/Timestamp.sol";
|
|
10
12
|
import {VersionPart, VersionPartLib} from "../type/Version.sol";
|
11
13
|
|
12
14
|
/// @dev Base contract for release specific service authorization contracts.
|
13
|
-
contract ServiceAuthorization
|
14
|
-
|
15
|
+
contract ServiceAuthorization is
|
16
|
+
IServiceAuthorization
|
15
17
|
{
|
16
|
-
uint256 public constant
|
18
|
+
uint256 public constant COMMIT_HASH_LENGTH = 40;
|
19
|
+
uint256 public constant GIF_INITIAL_VERSION = 3;
|
17
20
|
|
18
|
-
|
21
|
+
uint256 public immutable VERSION;
|
22
|
+
string public COMMIT_HASH;
|
19
23
|
|
20
24
|
ObjectType[] internal _serviceDomains;
|
21
25
|
mapping(ObjectType domain => address service) internal _serviceAddress;
|
22
26
|
mapping(ObjectType domain => ObjectType[] authorizedDomains) internal _authorizedDomains;
|
23
27
|
mapping(ObjectType domain => mapping(ObjectType authorizedDomain => IAccess.FunctionInfo[] functions)) internal _authorizedFunctions;
|
24
28
|
|
25
|
-
constructor(string memory commitHash) {
|
26
|
-
|
29
|
+
constructor(string memory commitHash, uint256 version) {
|
30
|
+
assert(bytes(commitHash).length == COMMIT_HASH_LENGTH);
|
31
|
+
assert(version >= GIF_INITIAL_VERSION);
|
32
|
+
|
33
|
+
COMMIT_HASH = commitHash;
|
34
|
+
VERSION = version;
|
27
35
|
_setupDomains();
|
28
36
|
_setupDomainAuthorizations();
|
29
37
|
}
|
30
38
|
|
31
39
|
function getCommitHash() external view returns(string memory commitHash) {
|
32
|
-
return
|
40
|
+
return COMMIT_HASH;
|
33
41
|
}
|
34
42
|
|
35
43
|
function getRelease() external view returns(VersionPart release) {
|
36
|
-
return VersionPartLib.toVersionPart(
|
44
|
+
return VersionPartLib.toVersionPart(VERSION);
|
37
45
|
}
|
38
46
|
|
39
47
|
function getServiceDomains() external view returns(ObjectType[] memory serviceDomains) {
|
@@ -56,6 +64,15 @@ contract ServiceAuthorization
|
|
56
64
|
return _authorizedFunctions[serviceDomain][authorizedDomain];
|
57
65
|
}
|
58
66
|
|
67
|
+
// ERC165
|
68
|
+
function supportsInterface(bytes4 interfaceId) public pure returns (bool) {
|
69
|
+
return (
|
70
|
+
interfaceId == type(IServiceAuthorization).interfaceId ||
|
71
|
+
interfaceId == type(IERC165).interfaceId
|
72
|
+
);
|
73
|
+
}
|
74
|
+
|
75
|
+
|
59
76
|
/// @dev Overwrite this function for a specific realease.
|
60
77
|
function _setupDomains() internal virtual {}
|
61
78
|
|
@@ -86,5 +103,4 @@ contract ServiceAuthorization
|
|
86
103
|
name: StrLib.toStr(name),
|
87
104
|
createdAt: TimestampLib.blockTimestamp()}));
|
88
105
|
}
|
89
|
-
}
|
90
|
-
|
106
|
+
}
|
@@ -2,6 +2,7 @@
|
|
2
2
|
pragma solidity ^0.8.20;
|
3
3
|
|
4
4
|
import {Distribution} from "./Distribution.sol";
|
5
|
+
import {DISTRIBUTOR} from "../type/ObjectType.sol";
|
5
6
|
import {IAuthorization} from "../authorization/IAuthorization.sol";
|
6
7
|
import {NftId} from "../type/NftId.sol";
|
7
8
|
import {ReferralId} from "../type/Referral.sol";
|
@@ -81,6 +82,7 @@ contract BasicDistribution is
|
|
81
82
|
external
|
82
83
|
virtual
|
83
84
|
onlyOwner()
|
85
|
+
onlyNftOfType(distributorNftId, DISTRIBUTOR())
|
84
86
|
restricted()
|
85
87
|
{
|
86
88
|
_updateDistributorType(distributorNftId, distributorType, data);
|
@@ -132,7 +134,6 @@ contract BasicDistribution is
|
|
132
134
|
initialOwner,
|
133
135
|
name,
|
134
136
|
token,
|
135
|
-
"", // registry data
|
136
137
|
""); // component specifc data
|
137
138
|
}
|
138
139
|
}
|
@@ -2,7 +2,7 @@
|
|
2
2
|
pragma solidity ^0.8.20;
|
3
3
|
|
4
4
|
import {Amount} from "../type/Amount.sol";
|
5
|
-
import {COMPONENT, DISTRIBUTION} from "../type/ObjectType.sol";
|
5
|
+
import {COMPONENT, DISTRIBUTION, DISTRIBUTOR} from "../type/ObjectType.sol";
|
6
6
|
import {IAuthorization} from "../authorization/IAuthorization.sol";
|
7
7
|
import {IDistributionService} from "./IDistributionService.sol";
|
8
8
|
import {NftId, NftIdLib} from "../type/NftId.sol";
|
@@ -36,15 +36,6 @@ abstract contract Distribution is
|
|
36
36
|
_;
|
37
37
|
}
|
38
38
|
|
39
|
-
function register()
|
40
|
-
external
|
41
|
-
virtual
|
42
|
-
onlyOwner()
|
43
|
-
{
|
44
|
-
_getDistributionStorage()._componentService.registerDistribution();
|
45
|
-
_approveTokenHandler(type(uint256).max);
|
46
|
-
}
|
47
|
-
|
48
39
|
|
49
40
|
function isDistributor(address candidate)
|
50
41
|
public
|
@@ -128,6 +119,7 @@ abstract contract Distribution is
|
|
128
119
|
virtual
|
129
120
|
restricted()
|
130
121
|
onlyDistributor()
|
122
|
+
onlyNftOfType(distributorNftId, DISTRIBUTOR())
|
131
123
|
onlyNftOwner(distributorNftId)
|
132
124
|
returns (Amount withdrawnAmount)
|
133
125
|
{
|
@@ -136,12 +128,11 @@ abstract contract Distribution is
|
|
136
128
|
|
137
129
|
function _initializeDistribution(
|
138
130
|
address registry,
|
139
|
-
NftId
|
131
|
+
NftId productNftId,
|
140
132
|
IAuthorization authorization,
|
141
133
|
address initialOwner,
|
142
134
|
string memory name,
|
143
135
|
address token,
|
144
|
-
bytes memory registryData, // writeonly data that will saved in the object info record of the registry
|
145
136
|
bytes memory componentData // component specifidc data
|
146
137
|
)
|
147
138
|
internal
|
@@ -150,14 +141,13 @@ abstract contract Distribution is
|
|
150
141
|
{
|
151
142
|
_initializeInstanceLinkedComponent(
|
152
143
|
registry,
|
153
|
-
|
144
|
+
productNftId,
|
154
145
|
name,
|
155
146
|
token,
|
156
147
|
DISTRIBUTION(),
|
157
148
|
authorization,
|
158
149
|
true,
|
159
150
|
initialOwner,
|
160
|
-
registryData,
|
161
151
|
componentData);
|
162
152
|
|
163
153
|
DistributionStorage storage $ = _getDistributionStorage();
|
@@ -279,9 +269,9 @@ abstract contract Distribution is
|
|
279
269
|
return _getDistributionStorage()._distributionService.withdrawCommission(distributorNftId, amount);
|
280
270
|
}
|
281
271
|
|
282
|
-
function _nftTransferFrom(address from, address to, uint256 tokenId) internal virtual override {
|
272
|
+
function _nftTransferFrom(address from, address to, uint256 tokenId, address operator) internal virtual override {
|
283
273
|
// keep track of distributor nft owner
|
284
|
-
emit LogDistributorUpdated(to,
|
274
|
+
emit LogDistributorUpdated(to, operator);
|
285
275
|
DistributionStorage storage $ = _getDistributionStorage();
|
286
276
|
$._distributorNftId[from] = NftIdLib.zero();
|
287
277
|
$._distributorNftId[to] = NftIdLib.toNftId(tokenId);
|