@etherisc/gif-next 0.0.2-fd4931b-974 → 0.0.2-fd9539f-062

Sign up to get free protection for your applications and to get access to all the features.
Files changed (432) hide show
  1. package/README.md +20 -3
  2. package/artifacts/contracts/distribution/Distribution.sol/Distribution.dbg.json +1 -1
  3. package/artifacts/contracts/distribution/Distribution.sol/Distribution.json +19 -13
  4. package/artifacts/contracts/distribution/DistributionService.sol/DistributionService.dbg.json +1 -1
  5. package/artifacts/contracts/distribution/DistributionService.sol/DistributionService.json +115 -80
  6. package/artifacts/contracts/distribution/DistributionServiceManager.sol/DistributionServiceManager.dbg.json +1 -1
  7. package/artifacts/contracts/distribution/DistributionServiceManager.sol/DistributionServiceManager.json +86 -59
  8. package/artifacts/contracts/distribution/IDistributionComponent.sol/IDistributionComponent.dbg.json +1 -1
  9. package/artifacts/contracts/distribution/IDistributionComponent.sol/IDistributionComponent.json +11 -5
  10. package/artifacts/contracts/distribution/IDistributionService.sol/IDistributionService.dbg.json +1 -1
  11. package/artifacts/contracts/distribution/IDistributionService.sol/IDistributionService.json +20 -1
  12. package/artifacts/contracts/instance/BundleManager.sol/BundleManager.dbg.json +1 -1
  13. package/artifacts/contracts/instance/BundleManager.sol/BundleManager.json +32 -101
  14. package/artifacts/contracts/instance/IInstance.sol/IInstance.dbg.json +1 -1
  15. package/artifacts/contracts/instance/IInstance.sol/IInstance.json +83 -71
  16. package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.dbg.json +1 -1
  17. package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.json +121 -12
  18. package/artifacts/contracts/instance/Instance.sol/Instance.dbg.json +1 -1
  19. package/artifacts/contracts/instance/Instance.sol/Instance.json +105 -85
  20. package/artifacts/contracts/instance/InstanceAdmin.sol/InstanceAdmin.dbg.json +4 -0
  21. package/artifacts/contracts/instance/InstanceAdmin.sol/InstanceAdmin.json +708 -0
  22. package/artifacts/contracts/instance/InstanceAuthorizationsLib.sol/InstanceAuthorizationsLib.dbg.json +1 -1
  23. package/artifacts/contracts/instance/InstanceAuthorizationsLib.sol/InstanceAuthorizationsLib.json +125 -29
  24. package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.dbg.json +1 -1
  25. package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.json +195 -64
  26. package/artifacts/contracts/instance/InstanceService.sol/InstanceService.dbg.json +1 -1
  27. package/artifacts/contracts/instance/InstanceService.sol/InstanceService.json +206 -49
  28. package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.dbg.json +1 -1
  29. package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.json +79 -36
  30. package/artifacts/contracts/instance/InstanceStore.sol/InstanceStore.dbg.json +1 -1
  31. package/artifacts/contracts/instance/InstanceStore.sol/InstanceStore.json +248 -118
  32. package/artifacts/contracts/instance/base/BalanceStore.sol/BalanceStore.dbg.json +1 -1
  33. package/artifacts/contracts/instance/base/BalanceStore.sol/BalanceStore.json +2 -2
  34. package/artifacts/contracts/instance/base/Cloneable.sol/Cloneable.dbg.json +1 -1
  35. package/artifacts/contracts/instance/base/Cloneable.sol/Cloneable.json +0 -53
  36. package/artifacts/contracts/instance/base/ObjectCounter.sol/ObjectCounter.dbg.json +4 -0
  37. package/artifacts/contracts/instance/base/ObjectCounter.sol/ObjectCounter.json +10 -0
  38. package/artifacts/contracts/instance/base/ObjectManager.sol/ObjectManager.dbg.json +1 -1
  39. package/artifacts/contracts/instance/base/ObjectManager.sol/ObjectManager.json +2 -71
  40. package/artifacts/contracts/instance/module/IAccess.sol/IAccess.dbg.json +1 -1
  41. package/artifacts/contracts/instance/module/IAccess.sol/IAccess.json +8 -116
  42. package/artifacts/contracts/instance/module/IBundle.sol/IBundle.dbg.json +1 -1
  43. package/artifacts/contracts/instance/module/IComponents.sol/IComponents.dbg.json +1 -1
  44. package/artifacts/contracts/instance/module/IDistribution.sol/IDistribution.dbg.json +1 -1
  45. package/artifacts/contracts/instance/module/IPolicy.sol/IPolicy.dbg.json +1 -1
  46. package/artifacts/contracts/instance/module/IRisk.sol/IRisk.dbg.json +1 -1
  47. package/artifacts/contracts/mock/Dip.sol/Dip.dbg.json +1 -1
  48. package/artifacts/contracts/mock/Dip.sol/Dip.json +2 -2
  49. package/artifacts/contracts/oracle/IOracle.sol/IOracle.dbg.json +4 -0
  50. package/artifacts/contracts/oracle/IOracle.sol/IOracle.json +10 -0
  51. package/artifacts/contracts/oracle/IOracleComponent.sol/IOracleComponent.dbg.json +4 -0
  52. package/artifacts/contracts/oracle/IOracleComponent.sol/IOracleComponent.json +759 -0
  53. package/artifacts/contracts/oracle/IOracleService.sol/IOracleService.dbg.json +4 -0
  54. package/artifacts/contracts/oracle/IOracleService.sol/IOracleService.json +675 -0
  55. package/artifacts/contracts/oracle/Oracle.sol/Oracle.dbg.json +4 -0
  56. package/artifacts/contracts/oracle/Oracle.sol/Oracle.json +1146 -0
  57. package/artifacts/contracts/oracle/OracleService.sol/OracleService.dbg.json +4 -0
  58. package/artifacts/contracts/oracle/OracleService.sol/OracleService.json +1034 -0
  59. package/artifacts/contracts/oracle/OracleServiceManager.sol/OracleServiceManager.dbg.json +4 -0
  60. package/artifacts/contracts/oracle/OracleServiceManager.sol/OracleServiceManager.json +730 -0
  61. package/artifacts/contracts/pool/BundleService.sol/BundleService.dbg.json +1 -1
  62. package/artifacts/contracts/pool/BundleService.sol/BundleService.json +91 -48
  63. package/artifacts/contracts/pool/BundleServiceManager.sol/BundleServiceManager.dbg.json +1 -1
  64. package/artifacts/contracts/pool/BundleServiceManager.sol/BundleServiceManager.json +74 -43
  65. package/artifacts/contracts/pool/IBundleService.sol/IBundleService.dbg.json +1 -1
  66. package/artifacts/contracts/pool/IBundleService.sol/IBundleService.json +20 -1
  67. package/artifacts/contracts/pool/IPoolComponent.sol/IPoolComponent.dbg.json +1 -1
  68. package/artifacts/contracts/pool/IPoolComponent.sol/IPoolComponent.json +11 -5
  69. package/artifacts/contracts/pool/IPoolService.sol/IPoolService.dbg.json +1 -1
  70. package/artifacts/contracts/pool/IPoolService.sol/IPoolService.json +35 -1
  71. package/artifacts/contracts/pool/Pool.sol/Pool.dbg.json +1 -1
  72. package/artifacts/contracts/pool/Pool.sol/Pool.json +18 -12
  73. package/artifacts/contracts/pool/PoolService.sol/PoolService.dbg.json +1 -1
  74. package/artifacts/contracts/pool/PoolService.sol/PoolService.json +84 -42
  75. package/artifacts/contracts/pool/PoolServiceManager.sol/PoolServiceManager.dbg.json +1 -1
  76. package/artifacts/contracts/pool/PoolServiceManager.sol/PoolServiceManager.json +63 -40
  77. package/artifacts/contracts/product/ApplicationService.sol/ApplicationService.dbg.json +1 -1
  78. package/artifacts/contracts/product/ApplicationService.sol/ApplicationService.json +79 -36
  79. package/artifacts/contracts/product/ApplicationServiceManager.sol/ApplicationServiceManager.dbg.json +1 -1
  80. package/artifacts/contracts/product/ApplicationServiceManager.sol/ApplicationServiceManager.json +68 -37
  81. package/artifacts/contracts/product/ClaimService.sol/ClaimService.dbg.json +1 -1
  82. package/artifacts/contracts/product/ClaimService.sol/ClaimService.json +119 -68
  83. package/artifacts/contracts/product/ClaimServiceManager.sol/ClaimServiceManager.dbg.json +1 -1
  84. package/artifacts/contracts/product/ClaimServiceManager.sol/ClaimServiceManager.json +88 -53
  85. package/artifacts/contracts/product/IApplicationService.sol/IApplicationService.dbg.json +1 -1
  86. package/artifacts/contracts/product/IApplicationService.sol/IApplicationService.json +20 -1
  87. package/artifacts/contracts/product/IClaimService.sol/IClaimService.dbg.json +1 -1
  88. package/artifacts/contracts/product/IClaimService.sol/IClaimService.json +20 -1
  89. package/artifacts/contracts/product/IPolicyService.sol/IPolicyService.dbg.json +1 -1
  90. package/artifacts/contracts/product/IPolicyService.sol/IPolicyService.json +20 -1
  91. package/artifacts/contracts/product/IPricingService.sol/IPricingService.dbg.json +1 -1
  92. package/artifacts/contracts/product/IPricingService.sol/IPricingService.json +20 -1
  93. package/artifacts/contracts/product/IProductComponent.sol/IProductComponent.dbg.json +1 -1
  94. package/artifacts/contracts/product/IProductComponent.sol/IProductComponent.json +11 -5
  95. package/artifacts/contracts/product/IProductService.sol/IProductService.dbg.json +1 -1
  96. package/artifacts/contracts/product/IProductService.sol/IProductService.json +20 -1
  97. package/artifacts/contracts/product/PolicyService.sol/PolicyService.dbg.json +1 -1
  98. package/artifacts/contracts/product/PolicyService.sol/PolicyService.json +97 -46
  99. package/artifacts/contracts/product/PolicyServiceManager.sol/PolicyServiceManager.dbg.json +1 -1
  100. package/artifacts/contracts/product/PolicyServiceManager.sol/PolicyServiceManager.json +77 -42
  101. package/artifacts/contracts/product/PricingService.sol/PricingService.dbg.json +1 -1
  102. package/artifacts/contracts/product/PricingService.sol/PricingService.json +105 -62
  103. package/artifacts/contracts/product/PricingServiceManager.sol/PricingServiceManager.dbg.json +1 -1
  104. package/artifacts/contracts/product/PricingServiceManager.sol/PricingServiceManager.json +81 -50
  105. package/artifacts/contracts/product/Product.sol/Product.dbg.json +1 -1
  106. package/artifacts/contracts/product/Product.sol/Product.json +18 -12
  107. package/artifacts/contracts/product/ProductService.sol/ProductService.dbg.json +1 -1
  108. package/artifacts/contracts/product/ProductService.sol/ProductService.json +61 -26
  109. package/artifacts/contracts/product/ProductServiceManager.sol/ProductServiceManager.dbg.json +1 -1
  110. package/artifacts/contracts/product/ProductServiceManager.sol/ProductServiceManager.json +59 -32
  111. package/artifacts/contracts/registry/ChainNft.sol/ChainNft.dbg.json +1 -1
  112. package/artifacts/contracts/registry/ChainNft.sol/ChainNft.json +2 -2
  113. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.dbg.json +1 -1
  114. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.json +82 -45
  115. package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.dbg.json +1 -1
  116. package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.json +31 -1
  117. package/artifacts/contracts/registry/IServiceAuthorization.sol/IServiceAuthorization.dbg.json +4 -0
  118. package/artifacts/contracts/registry/IServiceAuthorization.sol/IServiceAuthorization.json +129 -0
  119. package/artifacts/contracts/registry/ITransferInterceptor.sol/ITransferInterceptor.dbg.json +1 -1
  120. package/artifacts/contracts/registry/Registry.sol/Registry.dbg.json +1 -1
  121. package/artifacts/contracts/registry/Registry.sol/Registry.json +254 -97
  122. package/artifacts/contracts/registry/RegistryAdmin.sol/RegistryAdmin.dbg.json +4 -0
  123. package/artifacts/contracts/registry/RegistryAdmin.sol/RegistryAdmin.json +1901 -0
  124. package/artifacts/contracts/registry/RegistryService.sol/RegistryService.dbg.json +1 -1
  125. package/artifacts/contracts/registry/RegistryService.sol/RegistryService.json +69 -15
  126. package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.dbg.json +1 -1
  127. package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.json +51 -35
  128. package/artifacts/contracts/registry/ReleaseManager.sol/ReleaseManager.dbg.json +1 -1
  129. package/artifacts/contracts/registry/ReleaseManager.sol/ReleaseManager.json +288 -182
  130. package/artifacts/contracts/registry/ServiceAuthorization.sol/ServiceAuthorization.dbg.json +4 -0
  131. package/artifacts/contracts/registry/ServiceAuthorization.sol/ServiceAuthorization.json +171 -0
  132. package/artifacts/contracts/registry/ServiceAuthorizationV3.sol/ServiceAuthorizationV3.dbg.json +4 -0
  133. package/artifacts/contracts/registry/ServiceAuthorizationV3.sol/ServiceAuthorizationV3.json +187 -0
  134. package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.dbg.json +1 -1
  135. package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.json +46 -177
  136. package/artifacts/contracts/shared/AccessAdmin.sol/AccessAdmin.dbg.json +4 -0
  137. package/artifacts/contracts/shared/AccessAdmin.sol/AccessAdmin.json +1559 -0
  138. package/artifacts/contracts/shared/AccessManagerCustom.sol/AccessManagerCustom.dbg.json +4 -0
  139. package/artifacts/contracts/shared/AccessManagerCustom.sol/AccessManagerCustom.json +1193 -0
  140. package/artifacts/contracts/shared/AccessManagerExtended.sol/AccessManagerExtended.dbg.json +4 -0
  141. package/artifacts/contracts/shared/AccessManagerExtended.sol/AccessManagerExtended.json +1747 -0
  142. package/artifacts/contracts/shared/AccessManagerExtendedInitializeable.sol/AccessManagerExtendedInitializeable.dbg.json +4 -0
  143. package/artifacts/contracts/shared/AccessManagerExtendedInitializeable.sol/AccessManagerExtendedInitializeable.json +1760 -0
  144. package/artifacts/contracts/shared/AccessManagerExtendedWithDisable.sol/AccessManagerExtendedWithDisable.dbg.json +4 -0
  145. package/artifacts/contracts/shared/AccessManagerExtendedWithDisable.sol/AccessManagerExtendedWithDisable.json +1838 -0
  146. package/artifacts/contracts/shared/AccessManagerExtendedWithDisableInitializeable.sol/AccessManagerExtendedWithDisableInitializeable.dbg.json +4 -0
  147. package/artifacts/contracts/shared/AccessManagerExtendedWithDisableInitializeable.sol/AccessManagerExtendedWithDisableInitializeable.json +1856 -0
  148. package/artifacts/contracts/shared/Component.sol/Component.dbg.json +1 -1
  149. package/artifacts/contracts/shared/Component.sol/Component.json +18 -12
  150. package/artifacts/contracts/shared/ComponentService.sol/ComponentService.dbg.json +1 -1
  151. package/artifacts/contracts/shared/ComponentService.sol/ComponentService.json +119 -69
  152. package/artifacts/contracts/shared/ComponentServiceManager.sol/ComponentServiceManager.dbg.json +1 -1
  153. package/artifacts/contracts/shared/ComponentServiceManager.sol/ComponentServiceManager.json +85 -54
  154. package/artifacts/contracts/shared/ComponentVerifyingService.sol/ComponentVerifyingService.dbg.json +1 -1
  155. package/artifacts/contracts/shared/ComponentVerifyingService.sol/ComponentVerifyingService.json +20 -1
  156. package/artifacts/contracts/shared/ERC165.sol/ERC165.dbg.json +1 -1
  157. package/artifacts/contracts/shared/ERC165.sol/ERC165.json +2 -2
  158. package/artifacts/contracts/shared/IAccessAdmin.sol/IAccessAdmin.dbg.json +4 -0
  159. package/artifacts/contracts/shared/IAccessAdmin.sol/IAccessAdmin.json +1189 -0
  160. package/artifacts/contracts/shared/IAccessManagerExtended.sol/IAccessManagerExtended.dbg.json +4 -0
  161. package/artifacts/contracts/shared/IAccessManagerExtended.sol/IAccessManagerExtended.json +1562 -0
  162. package/artifacts/contracts/shared/IAccessManagerExtendedWithDisable.sol/IAccessManagerExtendedWithDisable.dbg.json +4 -0
  163. package/artifacts/contracts/shared/IAccessManagerExtendedWithDisable.sol/IAccessManagerExtendedWithDisable.json +1600 -0
  164. package/artifacts/contracts/shared/IComponent.sol/IComponent.dbg.json +1 -1
  165. package/artifacts/contracts/shared/IComponent.sol/IComponent.json +11 -5
  166. package/artifacts/contracts/shared/IComponentService.sol/IComponentService.dbg.json +1 -1
  167. package/artifacts/contracts/shared/IComponentService.sol/IComponentService.json +27 -1
  168. package/artifacts/contracts/shared/IInstanceLinkedComponent.sol/IInstanceLinkedComponent.dbg.json +1 -1
  169. package/artifacts/contracts/shared/IInstanceLinkedComponent.sol/IInstanceLinkedComponent.json +11 -5
  170. package/artifacts/contracts/shared/IKeyValueStore.sol/IKeyValueStore.dbg.json +1 -1
  171. package/artifacts/contracts/shared/IKeyValueStore.sol/IKeyValueStore.json +0 -10
  172. package/artifacts/contracts/shared/ILifecycle.sol/ILifecycle.dbg.json +1 -1
  173. package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.dbg.json +1 -1
  174. package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.json +7 -1
  175. package/artifacts/contracts/shared/IPolicyHolder.sol/IPolicyHolder.dbg.json +1 -1
  176. package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.dbg.json +1 -1
  177. package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.json +7 -1
  178. package/artifacts/contracts/shared/IRegistryLinked.sol/IRegistryLinked.dbg.json +1 -1
  179. package/artifacts/contracts/shared/IService.sol/IService.dbg.json +1 -1
  180. package/artifacts/contracts/shared/IService.sol/IService.json +20 -1
  181. package/artifacts/contracts/shared/IVersionable.sol/IVersionable.dbg.json +1 -1
  182. package/artifacts/contracts/shared/InitializableCustom.sol/InitializableCustom.dbg.json +4 -0
  183. package/artifacts/contracts/shared/InitializableCustom.sol/InitializableCustom.json +39 -0
  184. package/artifacts/contracts/shared/InstanceLinkedComponent.sol/InstanceLinkedComponent.dbg.json +1 -1
  185. package/artifacts/contracts/shared/InstanceLinkedComponent.sol/InstanceLinkedComponent.json +18 -12
  186. package/artifacts/contracts/shared/KeyValueStore.sol/KeyValueStore.dbg.json +1 -1
  187. package/artifacts/contracts/shared/KeyValueStore.sol/KeyValueStore.json +10 -20
  188. package/artifacts/contracts/shared/Lifecycle.sol/Lifecycle.dbg.json +1 -1
  189. package/artifacts/contracts/shared/Lifecycle.sol/Lifecycle.json +6 -6
  190. package/artifacts/contracts/shared/NftIdSetManager.sol/NftIdSetManager.dbg.json +1 -1
  191. package/artifacts/contracts/shared/NftIdSetManager.sol/NftIdSetManager.json +27 -35
  192. package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.dbg.json +1 -1
  193. package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.json +13 -7
  194. package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.dbg.json +1 -1
  195. package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.json +6 -6
  196. package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.dbg.json +1 -1
  197. package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.json +35 -16
  198. package/artifacts/contracts/shared/Registerable.sol/Registerable.dbg.json +1 -1
  199. package/artifacts/contracts/shared/Registerable.sol/Registerable.json +15 -9
  200. package/artifacts/contracts/shared/RegistryLinked.sol/RegistryLinked.dbg.json +1 -1
  201. package/artifacts/contracts/shared/RegistryLinked.sol/RegistryLinked.json +2 -2
  202. package/artifacts/contracts/shared/Service.sol/Service.dbg.json +1 -1
  203. package/artifacts/contracts/shared/Service.sol/Service.json +20 -1
  204. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.dbg.json +1 -1
  205. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.json +6 -6
  206. package/artifacts/contracts/shared/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.dbg.json +1 -1
  207. package/artifacts/contracts/shared/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.json +2 -2
  208. package/artifacts/contracts/shared/Versionable.sol/Versionable.dbg.json +1 -1
  209. package/artifacts/contracts/staking/IStaking.sol/IStaking.dbg.json +1 -1
  210. package/artifacts/contracts/staking/IStaking.sol/IStaking.json +247 -579
  211. package/artifacts/contracts/staking/IStakingService.sol/IStakingService.dbg.json +1 -1
  212. package/artifacts/contracts/staking/IStakingService.sol/IStakingService.json +471 -62
  213. package/artifacts/contracts/staking/StakeManagerLib.sol/StakeManagerLib.dbg.json +4 -0
  214. package/artifacts/contracts/staking/StakeManagerLib.sol/StakeManagerLib.json +460 -0
  215. package/artifacts/contracts/staking/Staking.sol/Staking.dbg.json +1 -1
  216. package/artifacts/contracts/staking/Staking.sol/Staking.json +303 -798
  217. package/artifacts/contracts/staking/StakingManager.sol/StakingManager.dbg.json +1 -1
  218. package/artifacts/contracts/staking/StakingManager.sol/StakingManager.json +81 -164
  219. package/artifacts/contracts/staking/StakingReader.sol/StakingReader.dbg.json +1 -1
  220. package/artifacts/contracts/staking/StakingReader.sol/StakingReader.json +368 -39
  221. package/artifacts/contracts/staking/StakingService.sol/StakingService.dbg.json +1 -1
  222. package/artifacts/contracts/staking/StakingService.sol/StakingService.json +503 -120
  223. package/artifacts/contracts/staking/StakingServiceManager.sol/StakingServiceManager.dbg.json +1 -1
  224. package/artifacts/contracts/staking/StakingServiceManager.sol/StakingServiceManager.json +67 -43
  225. package/artifacts/contracts/staking/StakingStore.sol/StakingStore.dbg.json +4 -0
  226. package/artifacts/contracts/staking/StakingStore.sol/StakingStore.json +2261 -0
  227. package/artifacts/contracts/staking/TargetManagerLib.sol/TargetManagerLib.dbg.json +1 -1
  228. package/artifacts/contracts/staking/TargetManagerLib.sol/TargetManagerLib.json +281 -18
  229. package/artifacts/contracts/type/AddressSet.sol/LibAddressSet.dbg.json +1 -1
  230. package/artifacts/contracts/type/AddressSet.sol/LibAddressSet.json +2 -2
  231. package/artifacts/contracts/type/Amount.sol/AmountLib.dbg.json +1 -1
  232. package/artifacts/contracts/type/Amount.sol/AmountLib.json +68 -4
  233. package/artifacts/contracts/type/Blocknumber.sol/BlocknumberLib.dbg.json +1 -1
  234. package/artifacts/contracts/type/Blocknumber.sol/BlocknumberLib.json +40 -2
  235. package/artifacts/contracts/type/ClaimId.sol/ClaimIdLib.dbg.json +1 -1
  236. package/artifacts/contracts/type/ClaimId.sol/ClaimIdLib.json +4 -4
  237. package/artifacts/contracts/type/DistributorType.sol/DistributorTypeLib.dbg.json +1 -1
  238. package/artifacts/contracts/type/DistributorType.sol/DistributorTypeLib.json +4 -4
  239. package/artifacts/contracts/type/Fee.sol/FeeLib.dbg.json +1 -1
  240. package/artifacts/contracts/type/Fee.sol/FeeLib.json +12 -12
  241. package/artifacts/contracts/type/Key32.sol/Key32Lib.dbg.json +1 -1
  242. package/artifacts/contracts/type/Key32.sol/Key32Lib.json +2 -2
  243. package/artifacts/contracts/type/NftId.sol/NftIdLib.dbg.json +1 -1
  244. package/artifacts/contracts/type/NftId.sol/NftIdLib.json +28 -4
  245. package/artifacts/contracts/type/NftIdSet.sol/LibNftIdSet.dbg.json +1 -1
  246. package/artifacts/contracts/type/NftIdSet.sol/LibNftIdSet.json +2 -2
  247. package/artifacts/contracts/type/ObjectType.sol/ObjectTypeLib.dbg.json +1 -1
  248. package/artifacts/contracts/type/ObjectType.sol/ObjectTypeLib.json +96 -2
  249. package/artifacts/contracts/type/PayoutId.sol/PayoutIdLib.dbg.json +1 -1
  250. package/artifacts/contracts/type/PayoutId.sol/PayoutIdLib.json +4 -4
  251. package/artifacts/contracts/type/Referral.sol/ReferralLib.dbg.json +1 -1
  252. package/artifacts/contracts/type/Referral.sol/ReferralLib.json +4 -4
  253. package/artifacts/contracts/type/RequestId.sol/RequestIdLib.dbg.json +4 -0
  254. package/artifacts/contracts/type/RequestId.sol/RequestIdLib.json +204 -0
  255. package/artifacts/contracts/type/RiskId.sol/RiskIdLib.dbg.json +1 -1
  256. package/artifacts/contracts/type/RiskId.sol/RiskIdLib.json +4 -4
  257. package/artifacts/contracts/type/RoleId.sol/RoleIdLib.dbg.json +1 -1
  258. package/artifacts/contracts/type/RoleId.sol/RoleIdLib.json +114 -4
  259. package/artifacts/contracts/type/Seconds.sol/SecondsLib.dbg.json +1 -1
  260. package/artifacts/contracts/type/Seconds.sol/SecondsLib.json +52 -2
  261. package/artifacts/contracts/type/Selector.sol/SelectorLib.dbg.json +4 -0
  262. package/artifacts/contracts/type/Selector.sol/SelectorLib.json +129 -0
  263. package/artifacts/contracts/type/Selector.sol/SelectorSetLib.dbg.json +4 -0
  264. package/artifacts/contracts/type/Selector.sol/SelectorSetLib.json +10 -0
  265. package/artifacts/contracts/type/StateId.sol/StateIdLib.dbg.json +1 -1
  266. package/artifacts/contracts/type/StateId.sol/StateIdLib.json +2 -2
  267. package/artifacts/contracts/type/String.sol/StrLib.dbg.json +4 -0
  268. package/artifacts/contracts/type/String.sol/StrLib.json +132 -0
  269. package/artifacts/contracts/type/Timestamp.sol/TimestampLib.dbg.json +1 -1
  270. package/artifacts/contracts/type/Timestamp.sol/TimestampLib.json +17 -4
  271. package/artifacts/contracts/type/UFixed.sol/MathLib.dbg.json +1 -1
  272. package/artifacts/contracts/type/UFixed.sol/MathLib.json +2 -2
  273. package/artifacts/contracts/type/UFixed.sol/UFixedLib.dbg.json +1 -1
  274. package/artifacts/contracts/type/UFixed.sol/UFixedLib.json +2 -2
  275. package/artifacts/contracts/type/Version.sol/VersionLib.dbg.json +1 -1
  276. package/artifacts/contracts/type/Version.sol/VersionLib.json +2 -2
  277. package/artifacts/contracts/type/Version.sol/VersionPartLib.dbg.json +1 -1
  278. package/artifacts/contracts/type/Version.sol/VersionPartLib.json +2 -2
  279. package/contracts/distribution/Distribution.sol +2 -4
  280. package/contracts/distribution/DistributionService.sol +5 -6
  281. package/contracts/distribution/DistributionServiceManager.sol +1 -13
  282. package/contracts/distribution/IDistributionComponent.sol +1 -1
  283. package/contracts/distribution/IDistributionService.sol +1 -1
  284. package/contracts/instance/BundleManager.sol +1 -1
  285. package/contracts/instance/IInstance.sol +22 -12
  286. package/contracts/instance/IInstanceService.sol +27 -13
  287. package/contracts/instance/Instance.sol +85 -50
  288. package/contracts/instance/InstanceAdmin.sol +331 -0
  289. package/contracts/instance/InstanceAuthorizationsLib.sol +193 -152
  290. package/contracts/instance/InstanceReader.sol +33 -7
  291. package/contracts/instance/InstanceService.sol +120 -48
  292. package/contracts/instance/InstanceServiceManager.sol +1 -1
  293. package/contracts/instance/InstanceStore.sol +30 -21
  294. package/contracts/instance/base/BalanceStore.sol +12 -7
  295. package/contracts/instance/base/Cloneable.sol +3 -26
  296. package/contracts/instance/base/ObjectCounter.sol +21 -0
  297. package/contracts/instance/base/ObjectManager.sol +2 -4
  298. package/contracts/instance/module/IAccess.sol +3 -11
  299. package/contracts/instance/module/IBundle.sol +1 -1
  300. package/contracts/instance/module/IComponents.sol +1 -1
  301. package/contracts/instance/module/IDistribution.sol +1 -1
  302. package/contracts/instance/module/IPolicy.sol +1 -1
  303. package/contracts/instance/module/IRisk.sol +1 -1
  304. package/contracts/mock/Dip.sol +1 -1
  305. package/contracts/oracle/IOracle.sol +20 -0
  306. package/contracts/oracle/IOracleComponent.sol +32 -0
  307. package/contracts/oracle/IOracleService.sol +65 -0
  308. package/contracts/oracle/Oracle.sol +145 -0
  309. package/contracts/oracle/OracleService.sol +278 -0
  310. package/contracts/oracle/OracleServiceManager.sol +42 -0
  311. package/contracts/pool/BundleService.sol +20 -20
  312. package/contracts/pool/BundleServiceManager.sol +1 -1
  313. package/contracts/pool/IBundleService.sol +1 -1
  314. package/contracts/pool/IPoolComponent.sol +1 -1
  315. package/contracts/pool/IPoolService.sol +4 -1
  316. package/contracts/pool/Pool.sol +1 -1
  317. package/contracts/pool/PoolService.sol +38 -10
  318. package/contracts/pool/PoolServiceManager.sol +1 -1
  319. package/contracts/product/ApplicationService.sol +6 -6
  320. package/contracts/product/ApplicationServiceManager.sol +1 -1
  321. package/contracts/product/ClaimService.sol +12 -7
  322. package/contracts/product/ClaimServiceManager.sol +1 -1
  323. package/contracts/product/IApplicationService.sol +1 -1
  324. package/contracts/product/IClaimService.sol +7 -1
  325. package/contracts/product/IPolicyService.sol +1 -1
  326. package/contracts/product/IPricingService.sol +1 -1
  327. package/contracts/product/IProductComponent.sol +1 -1
  328. package/contracts/product/IProductService.sol +1 -1
  329. package/contracts/product/PolicyService.sol +9 -7
  330. package/contracts/product/PolicyServiceManager.sol +1 -1
  331. package/contracts/product/PricingService.sol +8 -9
  332. package/contracts/product/PricingServiceManager.sol +1 -1
  333. package/contracts/product/Product.sol +1 -1
  334. package/contracts/product/ProductService.sol +6 -6
  335. package/contracts/product/ProductServiceManager.sol +1 -1
  336. package/contracts/registry/ChainNft.sol +2 -1
  337. package/contracts/registry/IRegistry.sol +21 -15
  338. package/contracts/registry/IRegistryService.sol +2 -1
  339. package/contracts/registry/IServiceAuthorization.sol +35 -0
  340. package/contracts/registry/ITransferInterceptor.sol +1 -1
  341. package/contracts/registry/Registry.sol +86 -67
  342. package/contracts/registry/RegistryAdmin.sol +333 -0
  343. package/contracts/registry/RegistryService.sol +9 -71
  344. package/contracts/registry/RegistryServiceManager.sol +2 -21
  345. package/contracts/registry/ReleaseManager.sol +219 -222
  346. package/contracts/registry/ServiceAuthorization.sol +86 -0
  347. package/contracts/registry/ServiceAuthorizationV3.sol +200 -0
  348. package/contracts/registry/TokenRegistry.sol +57 -61
  349. package/contracts/shared/AccessAdmin.sol +759 -0
  350. package/contracts/shared/AccessManagerCustom.sol +741 -0
  351. package/contracts/shared/AccessManagerExtended.sol +481 -0
  352. package/contracts/shared/AccessManagerExtendedInitializeable.sol +13 -0
  353. package/contracts/shared/AccessManagerExtendedWithDisable.sol +137 -0
  354. package/contracts/shared/AccessManagerExtendedWithDisableInitializeable.sol +14 -0
  355. package/contracts/shared/Component.sol +9 -14
  356. package/contracts/shared/ComponentService.sol +40 -18
  357. package/contracts/shared/ComponentServiceManager.sol +1 -1
  358. package/contracts/shared/ComponentVerifyingService.sol +14 -8
  359. package/contracts/shared/ERC165.sol +1 -1
  360. package/contracts/shared/IAccessAdmin.sol +168 -0
  361. package/contracts/shared/IAccessManagerExtended.sol +74 -0
  362. package/contracts/shared/IAccessManagerExtendedWithDisable.sol +18 -0
  363. package/contracts/shared/IComponent.sol +4 -8
  364. package/contracts/shared/IComponentService.sol +12 -1
  365. package/contracts/shared/IInstanceLinkedComponent.sol +1 -1
  366. package/contracts/shared/IKeyValueStore.sol +2 -2
  367. package/contracts/shared/ILifecycle.sol +1 -1
  368. package/contracts/shared/INftOwnable.sol +2 -2
  369. package/contracts/shared/IPolicyHolder.sol +1 -1
  370. package/contracts/shared/IRegisterable.sol +1 -1
  371. package/contracts/shared/IRegistryLinked.sol +1 -1
  372. package/contracts/shared/IService.sol +8 -1
  373. package/contracts/shared/IVersionable.sol +1 -1
  374. package/contracts/shared/InitializableCustom.sol +177 -0
  375. package/contracts/shared/InstanceLinkedComponent.sol +2 -3
  376. package/contracts/shared/KeyValueStore.sol +2 -5
  377. package/contracts/shared/Lifecycle.sol +12 -3
  378. package/contracts/shared/NftIdSetManager.sol +3 -7
  379. package/contracts/shared/NftOwnable.sol +3 -14
  380. package/contracts/shared/PolicyHolder.sol +3 -2
  381. package/contracts/shared/ProxyManager.sol +7 -3
  382. package/contracts/shared/Registerable.sol +1 -1
  383. package/contracts/shared/RegistryLinked.sol +1 -1
  384. package/contracts/shared/Service.sol +28 -22
  385. package/contracts/shared/TokenHandler.sol +1 -1
  386. package/contracts/shared/UpgradableProxyWithAdmin.sol +1 -1
  387. package/contracts/shared/Versionable.sol +1 -1
  388. package/contracts/staking/IStaking.sol +94 -39
  389. package/contracts/staking/IStakingService.sol +71 -40
  390. package/contracts/staking/StakeManagerLib.sol +231 -0
  391. package/contracts/staking/Staking.sol +303 -138
  392. package/contracts/staking/StakingManager.sol +23 -21
  393. package/contracts/staking/StakingReader.sol +120 -25
  394. package/contracts/staking/StakingService.sol +194 -77
  395. package/contracts/staking/StakingServiceManager.sol +3 -3
  396. package/contracts/staking/StakingStore.sol +613 -0
  397. package/contracts/staking/TargetManagerLib.sol +77 -11
  398. package/contracts/type/AddressSet.sol +1 -1
  399. package/contracts/type/Amount.sol +16 -2
  400. package/contracts/type/Blocknumber.sol +14 -2
  401. package/contracts/type/ClaimId.sol +1 -1
  402. package/contracts/type/DistributorType.sol +1 -1
  403. package/contracts/type/Fee.sol +1 -1
  404. package/contracts/type/Key32.sol +1 -1
  405. package/contracts/type/NftId.sol +9 -9
  406. package/contracts/type/NftIdSet.sol +1 -1
  407. package/contracts/type/ObjectType.sol +140 -68
  408. package/contracts/type/PayoutId.sol +1 -1
  409. package/contracts/type/Referral.sol +1 -1
  410. package/contracts/type/RequestId.sol +75 -0
  411. package/contracts/type/RiskId.sol +1 -1
  412. package/contracts/type/RoleId.sol +79 -21
  413. package/contracts/type/Seconds.sol +19 -1
  414. package/contracts/type/Selector.sol +102 -0
  415. package/contracts/type/StateId.sol +13 -1
  416. package/contracts/type/String.sol +53 -0
  417. package/contracts/type/Timestamp.sol +7 -3
  418. package/contracts/type/UFixed.sol +1 -1
  419. package/contracts/type/Version.sol +1 -1
  420. package/package.json +6 -3
  421. package/artifacts/contracts/instance/InstanceAccessManager.sol/InstanceAccessManager.dbg.json +0 -4
  422. package/artifacts/contracts/instance/InstanceAccessManager.sol/InstanceAccessManager.json +0 -1348
  423. package/artifacts/contracts/registry/RegistryAccessManager.sol/RegistryAccessManager.dbg.json +0 -4
  424. package/artifacts/contracts/registry/RegistryAccessManager.sol/RegistryAccessManager.json +0 -298
  425. package/artifacts/contracts/registry/ServiceAuthorizationsLib.sol/ServiceAuthorizationsLib.dbg.json +0 -4
  426. package/artifacts/contracts/registry/ServiceAuthorizationsLib.sol/ServiceAuthorizationsLib.json +0 -137
  427. package/artifacts/contracts/shared/AccessManagerUpgradeableInitializeable.sol/AccessManagerUpgradeableInitializeable.dbg.json +0 -4
  428. package/artifacts/contracts/shared/AccessManagerUpgradeableInitializeable.sol/AccessManagerUpgradeableInitializeable.json +0 -1206
  429. package/contracts/instance/InstanceAccessManager.sol +0 -543
  430. package/contracts/registry/RegistryAccessManager.sol +0 -167
  431. package/contracts/registry/ServiceAuthorizationsLib.sol +0 -173
  432. package/contracts/shared/AccessManagerUpgradeableInitializeable.sol +0 -13
@@ -0,0 +1,481 @@
1
+ // SPDX-License-Identifier: MIT
2
+ pragma solidity ^0.8.24;
3
+
4
+
5
+ import {IAccessManager} from "@openzeppelin/contracts/access/manager/IAccessManager.sol";
6
+ import {IAccessManaged} from "@openzeppelin/contracts/access/manager/IAccessManaged.sol";
7
+ import {EnumerableSet} from "@openzeppelin/contracts/utils/structs/EnumerableSet.sol";
8
+
9
+ import {IAccessManagerExtended} from "./IAccessManagerExtended.sol";
10
+ import {AccessManagerCustom} from "./AccessManagerCustom.sol";
11
+
12
+ import {Timestamp, TimestampLib} from "../type/Timestamp.sol";
13
+
14
+
15
+ // IMPORTANT: check role/target for existance before using return value of getter
16
+ contract AccessManagerExtended is
17
+ AccessManagerCustom,
18
+ IAccessManagerExtended
19
+ {
20
+ using EnumerableSet for EnumerableSet.AddressSet;
21
+
22
+ string constant private ADMIN_ROLE_NAME = "Admin";
23
+ string constant private PUBLIC_ROLE_NAME = "Public";
24
+
25
+ /// @custom:storage-location erc7201:etherisc.storage.AccessManagerExtended
26
+ struct AccessManagerExtendedStorage {
27
+ mapping(address target => TargetInfo info) _targetInfo;
28
+ mapping(string name => address target) _targetAddressForName;
29
+ address[] _targetAddresses;
30
+
31
+ mapping(uint64 roleId => RoleInfo) _roleInfo;
32
+ mapping(uint64 roleId => EnumerableSet.AddressSet roleMembers) _roleMembers;
33
+ mapping(string => uint64) _roleIdForName;
34
+ uint64[] _roleIds;
35
+ }
36
+
37
+ // keccak256(abi.encode(uint256(keccak256("etherisc.storage.AccessManagerExtended")) - 1)) & ~bytes32(uint256(0xff));
38
+ bytes32 private constant AccessManagerExtendedStorageLocation = 0x5bf600af9ae77c7c374fa7aa6d8057fe6114c74f945a04f4a14ca05a62876900;
39
+
40
+ function _getAccessManagerExtendedStorage() private pure returns (AccessManagerExtendedStorage storage $) {
41
+ assembly {
42
+ $.slot := AccessManagerExtendedStorageLocation
43
+ }
44
+ }
45
+
46
+ modifier roleExists(uint64 roleId) {
47
+ if(!isRoleExists(roleId)) {
48
+ revert AccessManagerRoleIdNotExists(roleId);
49
+ }
50
+ _;
51
+ }
52
+
53
+ modifier targetExists(address target) {
54
+ if(!isTargetExists(target)) {
55
+ revert AccessManagerTargetNotExists(target);
56
+ }
57
+ _;
58
+ }
59
+
60
+ function __AccessManagerExtended_init(address initialAdmin) internal onlyInitializing {
61
+
62
+ _createRole(ADMIN_ROLE, ADMIN_ROLE_NAME);//, IAccess.Type.Core);
63
+ _createRole(PUBLIC_ROLE, PUBLIC_ROLE_NAME);//, IAccess.Type.Core);
64
+
65
+
66
+ // grants ADMIN role to initialAdmin
67
+ __AccessManagerCustom_init(initialAdmin);
68
+ }
69
+
70
+ // =================================================== GETTERS ====================================================
71
+
72
+ function isTargetExists(address target) public view returns (bool) {
73
+ AccessManagerExtendedStorage storage $ = _getAccessManagerExtendedStorage();
74
+ return $._targetInfo[target].createdAt.gtz();
75
+ }
76
+
77
+ function isTargetNameExists(string memory name) public view returns (bool) {
78
+ AccessManagerExtendedStorage storage $ = _getAccessManagerExtendedStorage();
79
+ return $._targetAddressForName[name] != address(0);
80
+ }
81
+
82
+ function getTargets() public view returns (uint256 numberOfTargets) {
83
+ return _getAccessManagerExtendedStorage()._targetAddresses.length;
84
+ }
85
+
86
+ function getTarget(uint256 idx) public view returns (address target) {
87
+ return _getAccessManagerExtendedStorage()._targetAddresses[idx];
88
+ }
89
+
90
+ function getTargetAddress(string memory name) public view returns(address targetAddress) {
91
+ AccessManagerExtendedStorage storage $ = _getAccessManagerExtendedStorage();
92
+ return $._targetAddressForName[name];
93
+ }
94
+
95
+ function getTargetInfo(address target) public view returns (TargetInfo memory) {
96
+ AccessManagerExtendedStorage storage $ = _getAccessManagerExtendedStorage();
97
+ return $._targetInfo[target];
98
+ }
99
+
100
+ function getRoleInfo(uint64 roleId) public view returns (RoleInfo memory) {
101
+ AccessManagerExtendedStorage storage $ = _getAccessManagerExtendedStorage();
102
+ return $._roleInfo[roleId];
103
+ }
104
+
105
+ function getRoleMembers(uint64 roleId) public view returns (uint256 numberOfMembers) {
106
+ AccessManagerExtendedStorage storage $ = _getAccessManagerExtendedStorage();
107
+ return EnumerableSet.length($._roleMembers[roleId]);
108
+ }
109
+
110
+ function getRoleMember(uint64 roleId, uint256 idx) public view returns (address member) {
111
+ AccessManagerExtendedStorage storage $ = _getAccessManagerExtendedStorage();
112
+ return EnumerableSet.at($._roleMembers[roleId], idx);
113
+ }
114
+
115
+ function getRoleId(uint256 idx) public view returns (uint64 roleId) {
116
+ AccessManagerExtendedStorage storage $ = _getAccessManagerExtendedStorage();
117
+ return $._roleIds[idx];
118
+ }
119
+
120
+ // TODO returns ADMIN_ROLE id for non existent name
121
+ function getRoleId(string memory name) public view returns (uint64 roleId) {
122
+ AccessManagerExtendedStorage storage $ = _getAccessManagerExtendedStorage();
123
+ return $._roleIdForName[name];
124
+ }
125
+
126
+ function getRoles() public view returns (uint256 numberOfRoles) {
127
+ AccessManagerExtendedStorage storage $ = _getAccessManagerExtendedStorage();
128
+ return $._roleIds.length;
129
+ }
130
+
131
+ function isRoleExists(uint64 roleId) public view returns (bool exists) {
132
+ AccessManagerExtendedStorage storage $ = _getAccessManagerExtendedStorage();
133
+ return $._roleInfo[roleId].createdAt.gtz();
134
+ }
135
+
136
+ function isRoleNameExists(string memory name) public view returns (bool exists) {
137
+ AccessManagerExtendedStorage storage $ = _getAccessManagerExtendedStorage();
138
+ return $._roleIdForName[name] != 0;
139
+ }
140
+
141
+ // =============================================== ROLE MANAGEMENT ===============================================
142
+
143
+ /// inheritdoc IAccessManagerExtended
144
+ function createRole(uint64 roleId, string memory name)//, IAccess.Type rtype)
145
+ public
146
+ onlyAuthorized
147
+ {
148
+ name = _validateRole(roleId, name);//, rtype);
149
+ _createRole(roleId, name);//, rtype);
150
+ }
151
+
152
+ function _validateRole(uint64 roleId, string memory name)//, IAccess.Type rtype)
153
+ internal
154
+ virtual
155
+ view
156
+ returns(string memory)
157
+ {
158
+ /*
159
+ if(rtype == IAccess.Type.Custom && roleId < CUSTOM_ROLE_ID_MIN) {
160
+ revert IAccess.ErrorIAccessRoleIdTooSmall(roleId);
161
+ }
162
+
163
+ if(
164
+ rtype != IAccess.Type.Custom &&
165
+ roleId >= CUSTOM_ROLE_ID_MIN &&
166
+ roleId != PUBLIC_ROLE().toInt())
167
+ {
168
+ revert AccessManagerRoleIdTooBig(roleId);
169
+ }
170
+ */
171
+
172
+ if(roleId == 0) {
173
+ revert AccessManagerRoleIdZero();
174
+ }
175
+
176
+ if(bytes(name).length == 0) {
177
+ revert AccessManagerRoleNameEmpty(roleId);
178
+ }
179
+
180
+ return name;
181
+ }
182
+
183
+ function _createRole(uint64 roleId, string memory name/*, IAccess.Type rtype*/) private
184
+ {
185
+ AccessManagerExtendedStorage storage $ = _getAccessManagerExtendedStorage();
186
+
187
+ if(isRoleExists(roleId)) {
188
+ revert AccessManagerRoleIdAlreadyExists(roleId);
189
+ }
190
+
191
+ if(isRoleNameExists(name)) {
192
+ revert AccessManagerRoleNameAlreadyExists(
193
+ roleId,
194
+ getRoleId(name),
195
+ name);
196
+ }
197
+
198
+ $._roleInfo[roleId] = RoleInfo({
199
+ id: roleId,
200
+ name: name,
201
+ //rtype: rtype,
202
+ createdAt: TimestampLib.blockTimestamp()
203
+ // disableAt: 0;
204
+ });
205
+
206
+ $._roleIdForName[name] = roleId;
207
+ $._roleIds.push(roleId);
208
+
209
+ emit LogRoleCreation(roleId, name);//, rtype);
210
+ }
211
+
212
+ /// inheritdoc IAccessManager
213
+ function labelRole(uint64 roleId, string calldata label)
214
+ public
215
+ override (AccessManagerCustom, IAccessManager)
216
+ roleExists(roleId)
217
+ {
218
+ super.labelRole(roleId, label);
219
+ }
220
+
221
+ /// inheritdoc IAccessManager
222
+ function grantRole(uint64 roleId, address account, uint32 executionDelay)
223
+ public
224
+ override (AccessManagerCustom, IAccessManager)
225
+ roleExists(roleId)
226
+ {
227
+ AccessManagerExtendedStorage storage $ = _getAccessManagerExtendedStorage();
228
+ $._roleMembers[roleId].add(account);
229
+ super.grantRole(roleId, account, executionDelay);
230
+ }
231
+
232
+ /// inheritdoc IAccessManager
233
+ function revokeRole(uint64 roleId, address account)
234
+ public
235
+ override (AccessManagerCustom, IAccessManager)
236
+ roleExists(roleId)
237
+ {
238
+ AccessManagerExtendedStorage storage $ = _getAccessManagerExtendedStorage();
239
+ $._roleMembers[roleId].remove(account);
240
+ super.revokeRole(roleId, account);
241
+ }
242
+
243
+ /// inheritdoc IAccessManager
244
+ function renounceRole(uint64 roleId, address callerConfirmation)
245
+ public
246
+ override (AccessManagerCustom, IAccessManager)
247
+ roleExists(roleId)
248
+ {
249
+ AccessManagerExtendedStorage storage $ = _getAccessManagerExtendedStorage();
250
+ $._roleMembers[roleId].remove(_msgSender());
251
+ super.renounceRole(roleId, callerConfirmation);
252
+ }
253
+
254
+ /// inheritdoc IAccessManager
255
+ function setRoleAdmin(uint64 roleId, uint64 admin)
256
+ public
257
+ override (AccessManagerCustom, IAccessManager)
258
+ roleExists(roleId)
259
+ roleExists(admin)
260
+ {
261
+ super.setRoleAdmin(roleId, admin);
262
+ }
263
+
264
+ /// inheritdoc IAccessManager
265
+ function setRoleGuardian(uint64 roleId, uint64 guardian)
266
+ public
267
+ override (AccessManagerCustom, IAccessManager)
268
+ roleExists(roleId)
269
+ {
270
+ super.setRoleGuardian(roleId, guardian);
271
+ }
272
+
273
+ /// inheritdoc IAccessManager
274
+ function setGrantDelay(uint64 roleId, uint32 newDelay)
275
+ public
276
+ override (AccessManagerCustom, IAccessManager)
277
+ roleExists(roleId)
278
+ {
279
+ super.setGrantDelay(roleId, newDelay);
280
+ }
281
+
282
+ // ============================================= TARGET MANAGEMENT ==============================================
283
+ /// inheritdoc IAccessManagerExtended
284
+ function createTarget(address target, string memory name)//, IAccess.Type.Custom)
285
+ public
286
+ onlyAuthorized
287
+ {
288
+ name = _validateTarget(target, name);
289
+ _createTarget(target, name);//, IAccess.Type.Custom);
290
+ }
291
+
292
+ /// inheritdoc IAccessManager
293
+ // TODO must not allow "target = this" -> access manager as target created at the begining
294
+ function _createTarget(address target, string memory name) private//, IAccess.Type ttype) private
295
+ {
296
+ AccessManagerExtendedStorage storage $ = _getAccessManagerExtendedStorage();
297
+
298
+ if(isTargetExists(target)) {
299
+ revert AccessManagerTargetAlreadyExists(target);
300
+ }
301
+
302
+ if(isTargetNameExists(name)) {
303
+ revert AccessManagerTargetNameAlreadyExists(
304
+ target,
305
+ $._targetAddressForName[name],
306
+ name);
307
+ }
308
+
309
+ $._targetInfo[target] = TargetInfo ({
310
+ taddress: target,
311
+ //ttype: ttype,
312
+ name: name,
313
+ createdAt: TimestampLib.blockTimestamp()
314
+ // disableAt: 0;
315
+ });
316
+
317
+ $._targetAddressForName[name] = target;
318
+ // must revert / panic on duplicate address -> -1 check then
319
+ $._targetAddresses.push(target);
320
+
321
+ emit LogTargetCreation(target, name);//, ttype);
322
+ }
323
+
324
+ /// inheritdoc IAccessManagerExtended
325
+ // panics in case interface is not supported, 0 address included
326
+ function _validateTarget(address target, string memory name)
327
+ internal
328
+ virtual
329
+ returns (string memory)
330
+ {
331
+ if(target == address(0)) {
332
+ revert AccessManagerTargetAddressZero();
333
+ }
334
+ // panic if not contract
335
+ //address authority = IAccessManaged(target).authority();
336
+
337
+ //if(authority != address(this)) {
338
+ // revert AccessManagerTargetAuthorityInvalid(target, authority);
339
+ //}
340
+
341
+ if(bytes(name).length == 0) {
342
+ revert AccessManagerTargetNameEmpty(target);
343
+ }
344
+
345
+ return name;
346
+ }
347
+
348
+ // ============================================= FUNCTION MANAGEMENT ==============================================
349
+
350
+ /// inheritdoc IAccessManager
351
+ function setTargetFunctionRole(
352
+ address target,
353
+ bytes4[] calldata selectors,
354
+ uint64 roleId
355
+ )
356
+ public
357
+ override (AccessManagerCustom, IAccessManager)
358
+ targetExists(target)
359
+ roleExists(roleId)
360
+ {
361
+ super.setTargetFunctionRole(target, selectors, roleId);
362
+ }
363
+ /// inheritdoc IAccessManager
364
+ function setTargetAdminDelay(address target, uint32 newDelay)
365
+ public
366
+ override (AccessManagerCustom, IAccessManager)
367
+ targetExists(target)
368
+ {
369
+ super.setTargetAdminDelay(target, newDelay);
370
+ }
371
+
372
+ // =============================================== MODE MANAGEMENT ================================================
373
+ /// inheritdoc IAccessManager
374
+ function setTargetClosed(address target, bool closed)
375
+ public
376
+ override (AccessManagerCustom, IAccessManager)
377
+ targetExists(target)
378
+ {
379
+ super.setTargetClosed(target, closed);
380
+ }
381
+
382
+ // ============================================== DELAYED OPERATIONS ==============================================
383
+ /// inheritdoc IAccessManager
384
+ function schedule(
385
+ address target,
386
+ bytes calldata data,
387
+ uint48 when
388
+ )
389
+ public
390
+ override (AccessManagerCustom, IAccessManager)
391
+ targetExists(target)
392
+ returns (bytes32 operationId, uint32 nonce)
393
+ {
394
+ (operationId, nonce) = super.schedule(target, data, when);
395
+ }
396
+
397
+ /// inheritdoc IAccessManager
398
+ function execute(address target, bytes calldata data)
399
+ public
400
+ payable
401
+ override (AccessManagerCustom, IAccessManager)
402
+ targetExists(target) returns (uint32)
403
+ {
404
+ return super.execute(target, data);
405
+ }
406
+
407
+ /// inheritdoc IAccessManager
408
+ function cancel(address caller, address target, bytes calldata data)
409
+ public
410
+ override (AccessManagerCustom, IAccessManager)
411
+ targetExists(target) returns (uint32)
412
+ {
413
+ return super.cancel(caller, target, data);
414
+ }
415
+
416
+ /// inheritdoc IAccessManager
417
+ function consumeScheduledOp(address caller, bytes calldata data)
418
+ public
419
+ override (AccessManagerCustom, IAccessManager)
420
+ targetExists(_msgSender())
421
+ {
422
+ super.consumeScheduledOp(caller, data);
423
+ }
424
+
425
+ // ==================================================== OTHERS ====================================================
426
+ /// inheritdoc IAccessManager
427
+ function updateAuthority(address target, address newAuthority)
428
+ public
429
+ override (AccessManagerCustom, IAccessManager)
430
+ targetExists(target)
431
+ {
432
+ super.updateAuthority(target, newAuthority);
433
+ }
434
+
435
+ // ================================================= ADMIN LOGIC ==================================================
436
+
437
+ function _getAdminRestrictions(
438
+ bytes calldata data
439
+ ) internal virtual override view returns (bool restricted, uint64 roleAdminId, uint32 executionDelay) {
440
+ if (data.length < 4) {
441
+ return (false, 0, 0);
442
+ }
443
+
444
+ bytes4 selector = _checkSelector(data);
445
+
446
+ // Restricted to ADMIN with no delay beside any execution delay the caller may have
447
+ if (
448
+ selector == this.labelRole.selector ||
449
+ selector == this.setRoleAdmin.selector ||
450
+ selector == this.setRoleGuardian.selector ||
451
+ selector == this.setGrantDelay.selector ||
452
+ selector == this.setTargetAdminDelay.selector ||
453
+ selector == this.createRole.selector ||
454
+ selector == this.createTarget.selector
455
+ ) {
456
+ return (true, ADMIN_ROLE, 0);
457
+ }
458
+
459
+ // Restricted to ADMIN with the admin delay corresponding to the target
460
+ if (
461
+ selector == this.updateAuthority.selector ||
462
+ selector == this.setTargetClosed.selector ||
463
+ selector == this.setTargetFunctionRole.selector
464
+ ) {
465
+ // First argument is a target.
466
+ address target = abi.decode(data[0x04:0x24], (address));// who is target???
467
+ uint32 delay = getTargetAdminDelay(target);
468
+ return (true, ADMIN_ROLE, delay);
469
+ }
470
+
471
+ // Restricted to that role's admin with no delay beside any execution delay the caller may have.
472
+ if (selector == this.grantRole.selector || selector == this.revokeRole.selector) {
473
+ // First argument is a roleId.
474
+ uint64 roleId = abi.decode(data[0x04:0x24], (uint64));
475
+ return (true, getRoleAdmin(roleId), 0);
476
+ }
477
+
478
+ return (false, 0, 0);
479
+ }
480
+
481
+ }
@@ -0,0 +1,13 @@
1
+ // SPDX-License-Identifier: Apache-2.0
2
+ pragma solidity ^0.8.24;
3
+
4
+ import {AccessManagerExtended} from "./AccessManagerExtended.sol";
5
+
6
+
7
+ contract AccessManagerExtendedInitializeable is AccessManagerExtended {
8
+
9
+ function initialize(address initialAdmin) initializer public {
10
+ __AccessManagerExtended_init(initialAdmin);
11
+ }
12
+
13
+ }
@@ -0,0 +1,137 @@
1
+ // SPDX-License-Identifier: MIT
2
+ // OpenZeppelin Contracts (last updated v5.0.0) (access/manager/AccessManager.sol)
3
+
4
+ pragma solidity ^0.8.24;
5
+
6
+ import {IAccessManager} from "@openzeppelin/contracts/access/manager/IAccessManager.sol";
7
+
8
+ import {VersionPart} from "../type/Version.sol";
9
+ import {Timestamp, TimestampLib, zeroTimestamp} from "../type/Timestamp.sol";
10
+ import {Seconds, SecondsLib} from "../type/Seconds.sol";
11
+
12
+ import {IAccessManagerExtendedWithDisable} from "./IAccessManagerExtendedWithDisable.sol";
13
+ import {AccessManagerExtended} from "./AccessManagerExtended.sol";
14
+ import {AccessManagerCustom} from "./AccessManagerCustom.sol";
15
+
16
+
17
+ contract AccessManagerExtendedWithDisable is AccessManagerExtended, IAccessManagerExtendedWithDisable {
18
+
19
+ /// @custom:storage-location erc7201:etherisc.storage.ReleaseAccessManager
20
+ struct AccessManagerExtendedWithDisableStorage {
21
+ VersionPart _version;
22
+ Timestamp _disabledAt;
23
+ }
24
+
25
+ // keccak256(abi.encode(uint256(keccak256("etherisc.storage.AccessManagerExtendedWithDisable")) - 1)) & ~bytes32(uint256(0xff));
26
+ bytes32 private constant AccessManagerExtendedWithDisableStorageLocation = 0x6eab09faeebddf4f4430139353ec193aaa0bd7382b47d6e52082f5add274e600;
27
+
28
+ function _getAccessManagerExtendedWithDisableStorage() private pure returns (AccessManagerExtendedWithDisableStorage storage $) {
29
+ assembly {
30
+ $.slot := AccessManagerExtendedWithDisableStorageLocation
31
+ }
32
+ }
33
+
34
+ // TODO add version
35
+ function __AccessManagerExtendedWithDisable_init(address initialAdmin, VersionPart version) internal onlyInitializing {
36
+ AccessManagerExtendedWithDisableStorage storage $ = _getAccessManagerExtendedWithDisableStorage();
37
+ $._version = version;
38
+
39
+ __AccessManagerExtended_init(initialAdmin);
40
+ }
41
+
42
+ // =================================================== GETTERS ====================================================
43
+
44
+ function canCall(
45
+ address caller,
46
+ address target,
47
+ bytes4 selector
48
+ )
49
+ public view
50
+ virtual override (AccessManagerCustom, IAccessManager)
51
+ returns (bool immediate, uint32 delay)
52
+ {
53
+ AccessManagerExtendedWithDisableStorage storage $ = _getAccessManagerExtendedWithDisableStorage();
54
+ if(isDisabled()) {
55
+ revert AccessManagerDisabled();
56
+ }
57
+ return super.canCall(caller, target, selector);
58
+ }
59
+
60
+ function getVersion() public view returns (VersionPart) {
61
+ AccessManagerExtendedWithDisableStorage storage $ = _getAccessManagerExtendedWithDisableStorage();
62
+ return $._version;
63
+ }
64
+
65
+ function isDisabled() public view returns (bool) {
66
+ AccessManagerExtendedWithDisableStorage storage $ = _getAccessManagerExtendedWithDisableStorage();
67
+ return $._disabledAt.gtz() && TimestampLib.blockTimestamp() > $._disabledAt;
68
+ }
69
+
70
+ // ===================================== ACCESS MANAGER MODE MANAGEMENT ============================================
71
+
72
+ /// inheritdoc IAccessManagerExtended
73
+ function disable(Seconds delay) external onlyAuthorized {
74
+ AccessManagerExtendedWithDisableStorage storage $ = _getAccessManagerExtendedWithDisableStorage();
75
+ if($._disabledAt.gtz()) {
76
+ revert AccessManagerDisabled();
77
+ }
78
+ $._disabledAt = TimestampLib.blockTimestamp().addSeconds(delay);
79
+ }
80
+ /// inheritdoc IAccessManagerExtended
81
+ function enable() external onlyAuthorized {
82
+ AccessManagerExtendedWithDisableStorage storage $ = _getAccessManagerExtendedWithDisableStorage();
83
+ if(isDisabled()) {
84
+ revert AccessManagerDisabled();
85
+ }
86
+ $._disabledAt = zeroTimestamp();
87
+ }
88
+
89
+
90
+ // ========================= INTERNAL ==============================
91
+
92
+ function _getAdminRestrictions(
93
+ bytes calldata data
94
+ ) internal virtual override view returns (bool restricted, uint64 roleAdminId, uint32 executionDelay) {
95
+ if (data.length < 4) {
96
+ return (false, 0, 0);
97
+ }
98
+
99
+ bytes4 selector = _checkSelector(data);
100
+
101
+ // Restricted to ADMIN with no delay beside any execution delay the caller may have
102
+ if (
103
+ selector == this.labelRole.selector ||
104
+ selector == this.setRoleAdmin.selector ||
105
+ selector == this.setRoleGuardian.selector ||
106
+ selector == this.setGrantDelay.selector ||
107
+ selector == this.setTargetAdminDelay.selector ||
108
+ selector == this.createRole.selector ||
109
+ selector == this.createTarget.selector ||
110
+ selector == this.enable.selector ||
111
+ selector == this.disable.selector
112
+ ) {
113
+ return (true, ADMIN_ROLE, 0);
114
+ }
115
+
116
+ // Restricted to ADMIN with the admin delay corresponding to the target
117
+ if (
118
+ selector == this.updateAuthority.selector ||
119
+ selector == this.setTargetClosed.selector ||
120
+ selector == this.setTargetFunctionRole.selector
121
+ ) {
122
+ // First argument is a target.
123
+ address target = abi.decode(data[0x04:0x24], (address));// who is target???
124
+ uint32 delay = getTargetAdminDelay(target);
125
+ return (true, ADMIN_ROLE, delay);
126
+ }
127
+
128
+ // Restricted to that role's admin with no delay beside any execution delay the caller may have.
129
+ if (selector == this.grantRole.selector || selector == this.revokeRole.selector) {
130
+ // First argument is a roleId.
131
+ uint64 roleId = abi.decode(data[0x04:0x24], (uint64));
132
+ return (true, getRoleAdmin(roleId), 0);
133
+ }
134
+
135
+ return (false, 0, 0);
136
+ }
137
+ }
@@ -0,0 +1,14 @@
1
+ // SPDX-License-Identifier: Apache-2.0
2
+ pragma solidity ^0.8.24;
3
+
4
+ import {VersionPart} from "../type/Version.sol";
5
+
6
+ import {AccessManagerExtendedWithDisable} from "./AccessManagerExtendedWithDisable.sol";
7
+
8
+ contract AccessManagerExtendedWithDisableInitializeable is AccessManagerExtendedWithDisable {
9
+
10
+ function initialize(address initialAdmin, VersionPart version) initializer public {
11
+ __AccessManagerExtendedWithDisable_init(initialAdmin, version);
12
+ }
13
+
14
+ }