@etherisc/gif-next 0.0.2-f1fe735-758 → 0.0.2-f2a5ca7-763

Sign up to get free protection for your applications and to get access to all the features.
Files changed (406) hide show
  1. package/README.md +13 -1
  2. package/artifacts/contracts/authorization/AccessAdmin.sol/AccessAdmin.dbg.json +4 -0
  3. package/artifacts/contracts/authorization/AccessAdmin.sol/AccessAdmin.json +1253 -0
  4. package/artifacts/contracts/authorization/AccessManagerCloneable.sol/AccessManagerCloneable.dbg.json +4 -0
  5. package/artifacts/contracts/authorization/AccessManagerCloneable.sol/AccessManagerCloneable.json +1206 -0
  6. package/artifacts/contracts/authorization/Authorization.sol/Authorization.dbg.json +4 -0
  7. package/artifacts/contracts/authorization/Authorization.sol/Authorization.json +358 -0
  8. package/artifacts/contracts/authorization/IAccess.sol/IAccess.dbg.json +4 -0
  9. package/artifacts/contracts/authorization/IAccess.sol/IAccess.json +10 -0
  10. package/artifacts/contracts/authorization/IAccessAdmin.sol/IAccessAdmin.dbg.json +4 -0
  11. package/artifacts/contracts/{shared → authorization}/IAccessAdmin.sol/IAccessAdmin.json +95 -252
  12. package/artifacts/contracts/authorization/IAuthorization.sol/IAuthorization.dbg.json +4 -0
  13. package/artifacts/contracts/authorization/IAuthorization.sol/IAuthorization.json +258 -0
  14. package/artifacts/contracts/authorization/IModuleAuthorization.sol/IModuleAuthorization.dbg.json +4 -0
  15. package/artifacts/contracts/authorization/IModuleAuthorization.sol/IModuleAuthorization.json +290 -0
  16. package/artifacts/contracts/authorization/IServiceAuthorization.sol/IServiceAuthorization.dbg.json +4 -0
  17. package/artifacts/contracts/{registry → authorization}/IServiceAuthorization.sol/IServiceAuthorization.json +10 -10
  18. package/artifacts/contracts/authorization/ModuleAuthorization.sol/ModuleAuthorization.dbg.json +4 -0
  19. package/artifacts/contracts/authorization/ModuleAuthorization.sol/ModuleAuthorization.json +390 -0
  20. package/artifacts/contracts/authorization/ServiceAuthorization.sol/ServiceAuthorization.dbg.json +4 -0
  21. package/artifacts/contracts/authorization/ServiceAuthorization.sol/ServiceAuthorization.json +190 -0
  22. package/artifacts/contracts/distribution/BasicDistribution.sol/BasicDistribution.dbg.json +4 -0
  23. package/artifacts/contracts/distribution/BasicDistribution.sol/BasicDistribution.json +1505 -0
  24. package/artifacts/contracts/distribution/BasicDistributionAuthorization.sol/BasicDistributionAuthorization.dbg.json +4 -0
  25. package/artifacts/contracts/distribution/BasicDistributionAuthorization.sol/BasicDistributionAuthorization.json +410 -0
  26. package/artifacts/contracts/distribution/Distribution.sol/Distribution.dbg.json +1 -1
  27. package/artifacts/contracts/distribution/Distribution.sol/Distribution.json +17 -242
  28. package/artifacts/contracts/distribution/DistributionService.sol/DistributionService.dbg.json +1 -1
  29. package/artifacts/contracts/distribution/DistributionService.sol/DistributionService.json +106 -90
  30. package/artifacts/contracts/distribution/DistributionServiceManager.sol/DistributionServiceManager.dbg.json +1 -1
  31. package/artifacts/contracts/distribution/DistributionServiceManager.sol/DistributionServiceManager.json +55 -55
  32. package/artifacts/contracts/distribution/IDistributionComponent.sol/IDistributionComponent.dbg.json +1 -1
  33. package/artifacts/contracts/distribution/IDistributionComponent.sol/IDistributionComponent.json +71 -146
  34. package/artifacts/contracts/distribution/IDistributionService.sol/IDistributionService.dbg.json +1 -1
  35. package/artifacts/contracts/distribution/IDistributionService.sol/IDistributionService.json +32 -16
  36. package/artifacts/contracts/instance/BundleSet.sol/BundleSet.dbg.json +4 -0
  37. package/artifacts/contracts/instance/BundleSet.sol/BundleSet.json +703 -0
  38. package/artifacts/contracts/instance/IInstance.sol/IInstance.dbg.json +1 -1
  39. package/artifacts/contracts/instance/IInstance.sol/IInstance.json +6 -19
  40. package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.dbg.json +1 -1
  41. package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.json +32 -44
  42. package/artifacts/contracts/instance/Instance.sol/Instance.dbg.json +1 -1
  43. package/artifacts/contracts/instance/Instance.sol/Instance.json +35 -96
  44. package/artifacts/contracts/instance/InstanceAdmin.sol/InstanceAdmin.dbg.json +1 -1
  45. package/artifacts/contracts/instance/InstanceAdmin.sol/InstanceAdmin.json +1208 -290
  46. package/artifacts/contracts/instance/InstanceAuthorizationV3.sol/InstanceAuthorizationV3.dbg.json +4 -0
  47. package/artifacts/contracts/instance/InstanceAuthorizationV3.sol/InstanceAuthorizationV3.json +601 -0
  48. package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.dbg.json +1 -1
  49. package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.json +110 -76
  50. package/artifacts/contracts/instance/InstanceService.sol/InstanceService.dbg.json +1 -1
  51. package/artifacts/contracts/instance/InstanceService.sol/InstanceService.json +65 -125
  52. package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.dbg.json +1 -1
  53. package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.json +35 -59
  54. package/artifacts/contracts/instance/InstanceStore.sol/InstanceStore.dbg.json +1 -1
  55. package/artifacts/contracts/instance/InstanceStore.sol/InstanceStore.json +73 -79
  56. package/artifacts/contracts/instance/base/BalanceStore.sol/BalanceStore.dbg.json +1 -1
  57. package/artifacts/contracts/instance/base/BalanceStore.sol/BalanceStore.json +2 -2
  58. package/artifacts/contracts/instance/base/Cloneable.sol/Cloneable.dbg.json +1 -1
  59. package/artifacts/contracts/instance/base/ObjectCounter.sol/ObjectCounter.dbg.json +1 -1
  60. package/artifacts/contracts/instance/base/ObjectCounter.sol/ObjectCounter.json +2 -2
  61. package/artifacts/contracts/instance/base/ObjectLifecycle.sol/ObjectLifecycle.dbg.json +1 -1
  62. package/artifacts/contracts/instance/base/ObjectLifecycle.sol/ObjectLifecycle.json +6 -6
  63. package/artifacts/contracts/instance/base/ObjectSet.sol/ObjectSet.dbg.json +4 -0
  64. package/artifacts/contracts/instance/base/ObjectSet.sol/ObjectSet.json +181 -0
  65. package/artifacts/contracts/instance/module/IAccess.sol/IAccess.dbg.json +1 -1
  66. package/artifacts/contracts/instance/module/IBundle.sol/IBundle.dbg.json +1 -1
  67. package/artifacts/contracts/instance/module/IComponents.sol/IComponents.dbg.json +1 -1
  68. package/artifacts/contracts/instance/module/IDistribution.sol/IDistribution.dbg.json +1 -1
  69. package/artifacts/contracts/instance/module/IPolicy.sol/IPolicy.dbg.json +1 -1
  70. package/artifacts/contracts/instance/module/IRisk.sol/IRisk.dbg.json +1 -1
  71. package/artifacts/contracts/mock/Dip.sol/Dip.dbg.json +1 -1
  72. package/artifacts/contracts/mock/Dip.sol/Dip.json +2 -2
  73. package/artifacts/contracts/oracle/BasicOracle.sol/BasicOracle.dbg.json +4 -0
  74. package/artifacts/contracts/oracle/BasicOracle.sol/BasicOracle.json +1155 -0
  75. package/artifacts/contracts/oracle/BasicOracleAuthorization.sol/BasicOracleAuthorization.dbg.json +4 -0
  76. package/artifacts/contracts/oracle/BasicOracleAuthorization.sol/BasicOracleAuthorization.json +418 -0
  77. package/artifacts/contracts/oracle/IOracle.sol/IOracle.dbg.json +1 -1
  78. package/artifacts/contracts/oracle/IOracle.sol/IOracle.json +43 -1
  79. package/artifacts/contracts/oracle/IOracleComponent.sol/IOracleComponent.dbg.json +1 -1
  80. package/artifacts/contracts/oracle/IOracleComponent.sol/IOracleComponent.json +13 -0
  81. package/artifacts/contracts/oracle/IOracleService.sol/IOracleService.dbg.json +1 -1
  82. package/artifacts/contracts/oracle/Oracle.sol/Oracle.dbg.json +1 -1
  83. package/artifacts/contracts/oracle/Oracle.sol/Oracle.json +13 -96
  84. package/artifacts/contracts/oracle/OracleService.sol/OracleService.dbg.json +1 -1
  85. package/artifacts/contracts/oracle/OracleService.sol/OracleService.json +32 -32
  86. package/artifacts/contracts/oracle/OracleServiceManager.sol/OracleServiceManager.dbg.json +1 -1
  87. package/artifacts/contracts/oracle/OracleServiceManager.sol/OracleServiceManager.json +34 -34
  88. package/artifacts/contracts/pool/BasicPool.sol/BasicPool.dbg.json +4 -0
  89. package/artifacts/contracts/pool/BasicPool.sol/BasicPool.json +1477 -0
  90. package/artifacts/contracts/pool/BasicPoolAuthorization.sol/BasicPoolAuthorization.dbg.json +4 -0
  91. package/artifacts/contracts/pool/BasicPoolAuthorization.sol/BasicPoolAuthorization.json +410 -0
  92. package/artifacts/contracts/pool/BundleService.sol/BundleService.dbg.json +1 -1
  93. package/artifacts/contracts/pool/BundleService.sol/BundleService.json +55 -55
  94. package/artifacts/contracts/pool/BundleServiceManager.sol/BundleServiceManager.dbg.json +1 -1
  95. package/artifacts/contracts/pool/BundleServiceManager.sol/BundleServiceManager.json +40 -40
  96. package/artifacts/contracts/pool/IBundleService.sol/IBundleService.dbg.json +1 -1
  97. package/artifacts/contracts/pool/IPoolComponent.sol/IPoolComponent.dbg.json +1 -1
  98. package/artifacts/contracts/pool/IPoolComponent.sol/IPoolComponent.json +7 -202
  99. package/artifacts/contracts/pool/IPoolService.sol/IPoolService.dbg.json +1 -1
  100. package/artifacts/contracts/pool/Pool.sol/Pool.dbg.json +1 -1
  101. package/artifacts/contracts/pool/Pool.sol/Pool.json +7 -303
  102. package/artifacts/contracts/pool/PoolService.sol/PoolService.dbg.json +1 -1
  103. package/artifacts/contracts/pool/PoolService.sol/PoolService.json +36 -36
  104. package/artifacts/contracts/pool/PoolServiceManager.sol/PoolServiceManager.dbg.json +1 -1
  105. package/artifacts/contracts/pool/PoolServiceManager.sol/PoolServiceManager.json +36 -36
  106. package/artifacts/contracts/product/ApplicationService.sol/ApplicationService.dbg.json +1 -1
  107. package/artifacts/contracts/product/ApplicationService.sol/ApplicationService.json +32 -32
  108. package/artifacts/contracts/product/ApplicationServiceManager.sol/ApplicationServiceManager.dbg.json +1 -1
  109. package/artifacts/contracts/product/ApplicationServiceManager.sol/ApplicationServiceManager.json +34 -34
  110. package/artifacts/contracts/product/BasicProduct.sol/BasicProduct.dbg.json +4 -0
  111. package/artifacts/contracts/product/BasicProduct.sol/BasicProduct.json +1299 -0
  112. package/artifacts/contracts/product/BasicProductAuthorization.sol/BasicProductAuthorization.dbg.json +4 -0
  113. package/artifacts/contracts/product/BasicProductAuthorization.sol/BasicProductAuthorization.json +410 -0
  114. package/artifacts/contracts/product/ClaimService.sol/ClaimService.dbg.json +1 -1
  115. package/artifacts/contracts/product/ClaimService.sol/ClaimService.json +72 -72
  116. package/artifacts/contracts/product/ClaimServiceManager.sol/ClaimServiceManager.dbg.json +1 -1
  117. package/artifacts/contracts/product/ClaimServiceManager.sol/ClaimServiceManager.json +54 -54
  118. package/artifacts/contracts/product/IApplicationService.sol/IApplicationService.dbg.json +1 -1
  119. package/artifacts/contracts/product/IClaimService.sol/IClaimService.dbg.json +1 -1
  120. package/artifacts/contracts/product/IPolicyService.sol/IPolicyService.dbg.json +1 -1
  121. package/artifacts/contracts/product/IPricingService.sol/IPricingService.dbg.json +1 -1
  122. package/artifacts/contracts/product/IProductComponent.sol/IProductComponent.dbg.json +1 -1
  123. package/artifacts/contracts/product/IProductComponent.sol/IProductComponent.json +13 -42
  124. package/artifacts/contracts/product/IProductService.sol/IProductService.dbg.json +1 -1
  125. package/artifacts/contracts/product/PolicyService.sol/PolicyService.dbg.json +1 -1
  126. package/artifacts/contracts/product/PolicyService.sol/PolicyService.json +50 -50
  127. package/artifacts/contracts/product/PolicyServiceManager.sol/PolicyServiceManager.dbg.json +1 -1
  128. package/artifacts/contracts/product/PolicyServiceManager.sol/PolicyServiceManager.json +43 -43
  129. package/artifacts/contracts/product/PricingService.sol/PricingService.dbg.json +1 -1
  130. package/artifacts/contracts/product/PricingService.sol/PricingService.json +58 -58
  131. package/artifacts/contracts/product/PricingServiceManager.sol/PricingServiceManager.dbg.json +1 -1
  132. package/artifacts/contracts/product/PricingServiceManager.sol/PricingServiceManager.json +47 -47
  133. package/artifacts/contracts/product/Product.sol/Product.dbg.json +1 -1
  134. package/artifacts/contracts/product/Product.sol/Product.json +13 -153
  135. package/artifacts/contracts/product/ProductService.sol/ProductService.dbg.json +1 -1
  136. package/artifacts/contracts/product/ProductService.sol/ProductService.json +20 -20
  137. package/artifacts/contracts/product/ProductServiceManager.sol/ProductServiceManager.dbg.json +1 -1
  138. package/artifacts/contracts/product/ProductServiceManager.sol/ProductServiceManager.json +28 -28
  139. package/artifacts/contracts/registry/ChainNft.sol/ChainNft.dbg.json +1 -1
  140. package/artifacts/contracts/registry/ChainNft.sol/ChainNft.json +2 -2
  141. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.dbg.json +1 -1
  142. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.json +50 -46
  143. package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.dbg.json +1 -1
  144. package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.json +0 -183
  145. package/artifacts/contracts/registry/ITransferInterceptor.sol/ITransferInterceptor.dbg.json +1 -1
  146. package/artifacts/contracts/registry/Registry.sol/Registry.dbg.json +1 -1
  147. package/artifacts/contracts/registry/Registry.sol/Registry.json +101 -73
  148. package/artifacts/contracts/registry/RegistryAdmin.sol/RegistryAdmin.dbg.json +1 -1
  149. package/artifacts/contracts/registry/RegistryAdmin.sol/RegistryAdmin.json +234 -389
  150. package/artifacts/contracts/registry/RegistryService.sol/RegistryService.dbg.json +1 -1
  151. package/artifacts/contracts/registry/RegistryService.sol/RegistryService.json +18 -18
  152. package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.dbg.json +1 -1
  153. package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.json +27 -27
  154. package/artifacts/contracts/registry/ReleaseLifecycle.sol/ReleaseLifecycle.dbg.json +1 -1
  155. package/artifacts/contracts/registry/ReleaseLifecycle.sol/ReleaseLifecycle.json +6 -6
  156. package/artifacts/contracts/registry/ReleaseRegistry.sol/ReleaseRegistry.dbg.json +4 -0
  157. package/artifacts/contracts/registry/ReleaseRegistry.sol/ReleaseRegistry.json +1159 -0
  158. package/artifacts/contracts/registry/ServiceAuthorizationV3.sol/ServiceAuthorizationV3.dbg.json +1 -1
  159. package/artifacts/contracts/registry/ServiceAuthorizationV3.sol/ServiceAuthorizationV3.json +24 -16
  160. package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.dbg.json +1 -1
  161. package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.json +4 -4
  162. package/artifacts/contracts/shared/Component.sol/Component.dbg.json +1 -1
  163. package/artifacts/contracts/shared/ComponentService.sol/ComponentService.dbg.json +1 -1
  164. package/artifacts/contracts/shared/ComponentService.sol/ComponentService.json +62 -86
  165. package/artifacts/contracts/shared/ComponentServiceManager.sol/ComponentServiceManager.dbg.json +1 -1
  166. package/artifacts/contracts/shared/ComponentServiceManager.sol/ComponentServiceManager.json +49 -61
  167. package/artifacts/contracts/shared/ComponentVerifyingService.sol/ComponentVerifyingService.dbg.json +1 -1
  168. package/artifacts/contracts/shared/ERC165.sol/ERC165.dbg.json +1 -1
  169. package/artifacts/contracts/shared/ERC165.sol/ERC165.json +2 -2
  170. package/artifacts/contracts/shared/IComponent.sol/IComponent.dbg.json +1 -1
  171. package/artifacts/contracts/shared/IComponentService.sol/IComponentService.dbg.json +1 -1
  172. package/artifacts/contracts/shared/IInstanceLinkedComponent.sol/IInstanceLinkedComponent.dbg.json +1 -1
  173. package/artifacts/contracts/shared/IInstanceLinkedComponent.sol/IInstanceLinkedComponent.json +13 -0
  174. package/artifacts/contracts/shared/IKeyValueStore.sol/IKeyValueStore.dbg.json +1 -1
  175. package/artifacts/contracts/shared/ILifecycle.sol/ILifecycle.dbg.json +1 -1
  176. package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.dbg.json +1 -1
  177. package/artifacts/contracts/shared/IPolicyHolder.sol/IPolicyHolder.dbg.json +1 -1
  178. package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.dbg.json +1 -1
  179. package/artifacts/contracts/shared/IRegistryLinked.sol/IRegistryLinked.dbg.json +1 -1
  180. package/artifacts/contracts/shared/IService.sol/IService.dbg.json +1 -1
  181. package/artifacts/contracts/shared/InitializableCustom.sol/InitializableCustom.dbg.json +1 -1
  182. package/artifacts/contracts/shared/InstanceLinkedComponent.sol/InstanceLinkedComponent.dbg.json +1 -1
  183. package/artifacts/contracts/shared/InstanceLinkedComponent.sol/InstanceLinkedComponent.json +13 -53
  184. package/artifacts/contracts/shared/KeyValueStore.sol/KeyValueStore.dbg.json +1 -1
  185. package/artifacts/contracts/shared/Lifecycle.sol/Lifecycle.dbg.json +1 -1
  186. package/artifacts/contracts/shared/NftIdSet.sol/NftIdSet.dbg.json +4 -0
  187. package/artifacts/contracts/shared/NftIdSet.sol/NftIdSet.json +306 -0
  188. package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.dbg.json +1 -1
  189. package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.json +6 -6
  190. package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.dbg.json +1 -1
  191. package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.json +6 -6
  192. package/artifacts/contracts/shared/Registerable.sol/Registerable.dbg.json +1 -1
  193. package/artifacts/contracts/shared/Registerable.sol/Registerable.json +8 -8
  194. package/artifacts/contracts/shared/RegistryLinked.sol/RegistryLinked.dbg.json +1 -1
  195. package/artifacts/contracts/shared/RegistryLinked.sol/RegistryLinked.json +2 -2
  196. package/artifacts/contracts/shared/Service.sol/Service.dbg.json +1 -1
  197. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.dbg.json +1 -1
  198. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.json +6 -6
  199. package/artifacts/contracts/staking/IStaking.sol/IStaking.dbg.json +1 -1
  200. package/artifacts/contracts/staking/IStakingService.sol/IStakingService.dbg.json +1 -1
  201. package/artifacts/contracts/staking/StakeManagerLib.sol/StakeManagerLib.dbg.json +1 -1
  202. package/artifacts/contracts/staking/StakeManagerLib.sol/StakeManagerLib.json +32 -32
  203. package/artifacts/contracts/staking/Staking.sol/Staking.dbg.json +1 -1
  204. package/artifacts/contracts/staking/Staking.sol/Staking.json +44 -44
  205. package/artifacts/contracts/staking/StakingLifecycle.sol/StakingLifecycle.dbg.json +1 -1
  206. package/artifacts/contracts/staking/StakingLifecycle.sol/StakingLifecycle.json +6 -6
  207. package/artifacts/contracts/staking/StakingManager.sol/StakingManager.dbg.json +1 -1
  208. package/artifacts/contracts/staking/StakingManager.sol/StakingManager.json +40 -40
  209. package/artifacts/contracts/staking/StakingReader.sol/StakingReader.dbg.json +1 -1
  210. package/artifacts/contracts/staking/StakingReader.sol/StakingReader.json +6 -6
  211. package/artifacts/contracts/staking/StakingService.sol/StakingService.dbg.json +1 -1
  212. package/artifacts/contracts/staking/StakingService.sol/StakingService.json +26 -26
  213. package/artifacts/contracts/staking/StakingServiceManager.sol/StakingServiceManager.dbg.json +1 -1
  214. package/artifacts/contracts/staking/StakingServiceManager.sol/StakingServiceManager.json +31 -31
  215. package/artifacts/contracts/staking/StakingStore.sol/StakingStore.dbg.json +1 -1
  216. package/artifacts/contracts/staking/StakingStore.sol/StakingStore.json +134 -134
  217. package/artifacts/contracts/staking/TargetManagerLib.sol/TargetManagerLib.dbg.json +1 -1
  218. package/artifacts/contracts/staking/TargetManagerLib.sol/TargetManagerLib.json +22 -22
  219. package/artifacts/contracts/type/AddressSet.sol/LibAddressSet.dbg.json +1 -1
  220. package/artifacts/contracts/type/AddressSet.sol/LibAddressSet.json +2 -2
  221. package/artifacts/contracts/type/Amount.sol/AmountLib.dbg.json +1 -1
  222. package/artifacts/contracts/type/Amount.sol/AmountLib.json +8 -8
  223. package/artifacts/contracts/type/Blocknumber.sol/BlocknumberLib.dbg.json +1 -1
  224. package/artifacts/contracts/type/Blocknumber.sol/BlocknumberLib.json +2 -2
  225. package/artifacts/contracts/type/ClaimId.sol/ClaimIdLib.dbg.json +1 -1
  226. package/artifacts/contracts/type/ClaimId.sol/ClaimIdLib.json +4 -4
  227. package/artifacts/contracts/type/DistributorType.sol/DistributorTypeLib.dbg.json +1 -1
  228. package/artifacts/contracts/type/DistributorType.sol/DistributorTypeLib.json +4 -4
  229. package/artifacts/contracts/type/Fee.sol/FeeLib.dbg.json +1 -1
  230. package/artifacts/contracts/type/Fee.sol/FeeLib.json +12 -12
  231. package/artifacts/contracts/type/Key32.sol/Key32Lib.dbg.json +1 -1
  232. package/artifacts/contracts/type/Key32.sol/Key32Lib.json +2 -2
  233. package/artifacts/contracts/type/NftId.sol/NftIdLib.dbg.json +1 -1
  234. package/artifacts/contracts/type/NftId.sol/NftIdLib.json +4 -4
  235. package/artifacts/contracts/type/NftIdSet.sol/LibNftIdSet.dbg.json +1 -1
  236. package/artifacts/contracts/type/NftIdSet.sol/LibNftIdSet.json +2 -2
  237. package/artifacts/contracts/type/ObjectType.sol/ObjectTypeLib.dbg.json +1 -1
  238. package/artifacts/contracts/type/ObjectType.sol/ObjectTypeLib.json +55 -2
  239. package/artifacts/contracts/type/PayoutId.sol/PayoutIdLib.dbg.json +1 -1
  240. package/artifacts/contracts/type/PayoutId.sol/PayoutIdLib.json +4 -4
  241. package/artifacts/contracts/type/Referral.sol/ReferralLib.dbg.json +1 -1
  242. package/artifacts/contracts/type/Referral.sol/ReferralLib.json +4 -4
  243. package/artifacts/contracts/type/RequestId.sol/RequestIdLib.dbg.json +1 -1
  244. package/artifacts/contracts/type/RequestId.sol/RequestIdLib.json +4 -4
  245. package/artifacts/contracts/type/RiskId.sol/RiskIdLib.dbg.json +1 -1
  246. package/artifacts/contracts/type/RiskId.sol/RiskIdLib.json +4 -4
  247. package/artifacts/contracts/type/RoleId.sol/RoleIdLib.dbg.json +1 -1
  248. package/artifacts/contracts/type/RoleId.sol/RoleIdLib.json +117 -14
  249. package/artifacts/contracts/type/Seconds.sol/SecondsLib.dbg.json +1 -1
  250. package/artifacts/contracts/type/Seconds.sol/SecondsLib.json +2 -2
  251. package/artifacts/contracts/type/Selector.sol/SelectorLib.dbg.json +1 -1
  252. package/artifacts/contracts/type/Selector.sol/SelectorLib.json +2 -2
  253. package/artifacts/contracts/type/Selector.sol/SelectorSetLib.dbg.json +1 -1
  254. package/artifacts/contracts/type/Selector.sol/SelectorSetLib.json +2 -2
  255. package/artifacts/contracts/type/StateId.sol/StateIdLib.dbg.json +1 -1
  256. package/artifacts/contracts/type/StateId.sol/StateIdLib.json +2 -2
  257. package/artifacts/contracts/type/String.sol/StrLib.dbg.json +1 -1
  258. package/artifacts/contracts/type/String.sol/StrLib.json +2 -2
  259. package/artifacts/contracts/type/Timestamp.sol/TimestampLib.dbg.json +1 -1
  260. package/artifacts/contracts/type/Timestamp.sol/TimestampLib.json +4 -4
  261. package/artifacts/contracts/type/UFixed.sol/MathLib.dbg.json +1 -1
  262. package/artifacts/contracts/type/UFixed.sol/MathLib.json +2 -2
  263. package/artifacts/contracts/type/UFixed.sol/UFixedLib.dbg.json +1 -1
  264. package/artifacts/contracts/type/UFixed.sol/UFixedLib.json +21 -2
  265. package/artifacts/contracts/type/Version.sol/VersionLib.dbg.json +1 -1
  266. package/artifacts/contracts/type/Version.sol/VersionLib.json +2 -2
  267. package/artifacts/contracts/type/Version.sol/VersionPartLib.dbg.json +1 -1
  268. package/artifacts/contracts/type/Version.sol/VersionPartLib.json +21 -2
  269. package/artifacts/contracts/upgradeability/IVersionable.sol/IVersionable.dbg.json +4 -0
  270. package/artifacts/contracts/{shared → upgradeability}/IVersionable.sol/IVersionable.json +1 -1
  271. package/artifacts/contracts/upgradeability/ProxyManager.sol/ProxyManager.dbg.json +4 -0
  272. package/artifacts/contracts/upgradeability/ProxyManager.sol/ProxyManager.json +617 -0
  273. package/artifacts/contracts/upgradeability/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.dbg.json +4 -0
  274. package/artifacts/contracts/upgradeability/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.json +129 -0
  275. package/artifacts/contracts/upgradeability/Versionable.sol/Versionable.dbg.json +4 -0
  276. package/artifacts/contracts/{shared → upgradeability}/Versionable.sol/Versionable.json +1 -1
  277. package/contracts/{shared → authorization}/AccessAdmin.sol +135 -303
  278. package/contracts/authorization/AccessManagerCloneable.sol +16 -0
  279. package/contracts/authorization/Authorization.sol +218 -0
  280. package/contracts/authorization/IAccess.sol +48 -0
  281. package/contracts/{shared → authorization}/IAccessAdmin.sol +22 -54
  282. package/contracts/authorization/IAuthorization.sol +54 -0
  283. package/contracts/authorization/IModuleAuthorization.sol +21 -0
  284. package/contracts/{registry → authorization}/IServiceAuthorization.sol +5 -5
  285. package/contracts/authorization/ModuleAuthorization.sol +78 -0
  286. package/contracts/{registry → authorization}/ServiceAuthorization.sol +17 -17
  287. package/contracts/distribution/BasicDistribution.sol +149 -0
  288. package/contracts/distribution/BasicDistributionAuthorization.sol +43 -0
  289. package/contracts/distribution/Distribution.sol +126 -104
  290. package/contracts/distribution/DistributionService.sol +12 -21
  291. package/contracts/distribution/DistributionServiceManager.sol +2 -5
  292. package/contracts/distribution/IDistributionComponent.sol +17 -35
  293. package/contracts/distribution/IDistributionService.sol +5 -1
  294. package/contracts/instance/{BundleManager.sol → BundleSet.sol} +23 -23
  295. package/contracts/instance/IInstance.sol +8 -9
  296. package/contracts/instance/IInstanceService.sol +13 -18
  297. package/contracts/instance/Instance.sol +61 -70
  298. package/contracts/instance/InstanceAdmin.sol +202 -267
  299. package/contracts/instance/InstanceAuthorizationV3.sol +202 -0
  300. package/contracts/instance/InstanceReader.sol +22 -9
  301. package/contracts/instance/InstanceService.sol +74 -70
  302. package/contracts/instance/InstanceServiceManager.sol +2 -6
  303. package/contracts/instance/InstanceStore.sol +5 -1
  304. package/contracts/instance/base/{ObjectManager.sol → ObjectSet.sol} +11 -12
  305. package/contracts/oracle/BasicOracle.sol +48 -0
  306. package/contracts/oracle/BasicOracleAuthorization.sol +46 -0
  307. package/contracts/oracle/IOracle.sol +16 -0
  308. package/contracts/oracle/Oracle.sol +61 -49
  309. package/contracts/oracle/OracleServiceManager.sol +2 -5
  310. package/contracts/pool/BasicPool.sol +164 -0
  311. package/contracts/pool/BasicPoolAuthorization.sol +49 -0
  312. package/contracts/pool/BundleService.sol +14 -26
  313. package/contracts/pool/BundleServiceManager.sol +2 -5
  314. package/contracts/pool/IPoolComponent.sol +0 -60
  315. package/contracts/pool/Pool.sol +143 -131
  316. package/contracts/pool/PoolService.sol +11 -27
  317. package/contracts/pool/PoolServiceManager.sol +2 -5
  318. package/contracts/product/ApplicationService.sol +12 -36
  319. package/contracts/product/ApplicationServiceManager.sol +2 -2
  320. package/contracts/product/BasicProduct.sol +82 -0
  321. package/contracts/product/BasicProductAuthorization.sol +40 -0
  322. package/contracts/product/ClaimService.sol +5 -31
  323. package/contracts/product/ClaimServiceManager.sol +2 -2
  324. package/contracts/product/IProductComponent.sol +6 -9
  325. package/contracts/product/PolicyServiceManager.sol +2 -5
  326. package/contracts/product/PricingServiceManager.sol +2 -5
  327. package/contracts/product/Product.sol +103 -88
  328. package/contracts/product/ProductService.sol +7 -32
  329. package/contracts/product/ProductServiceManager.sol +2 -5
  330. package/contracts/registry/IRegistry.sol +26 -16
  331. package/contracts/registry/IRegistryService.sol +6 -6
  332. package/contracts/registry/Registry.sol +81 -87
  333. package/contracts/registry/RegistryAdmin.sol +118 -88
  334. package/contracts/registry/RegistryService.sol +4 -18
  335. package/contracts/registry/RegistryServiceManager.sol +2 -2
  336. package/contracts/registry/{ReleaseManager.sol → ReleaseRegistry.sol} +97 -113
  337. package/contracts/registry/ServiceAuthorizationV3.sol +14 -14
  338. package/contracts/registry/TokenRegistry.sol +2 -2
  339. package/contracts/shared/ComponentService.sol +19 -58
  340. package/contracts/shared/ComponentServiceManager.sol +2 -2
  341. package/contracts/shared/ComponentVerifyingService.sol +1 -1
  342. package/contracts/shared/IInstanceLinkedComponent.sol +4 -0
  343. package/contracts/shared/IService.sol +1 -1
  344. package/contracts/shared/InstanceLinkedComponent.sol +26 -19
  345. package/contracts/shared/{NftIdSetManager.sol → NftIdSet.sol} +1 -1
  346. package/contracts/shared/Service.sol +3 -4
  347. package/contracts/staking/IStaking.sol +1 -2
  348. package/contracts/staking/IStakingService.sol +12 -5
  349. package/contracts/staking/Staking.sol +11 -14
  350. package/contracts/staking/StakingManager.sol +2 -6
  351. package/contracts/staking/StakingReader.sol +12 -16
  352. package/contracts/staking/StakingServiceManager.sol +2 -2
  353. package/contracts/staking/StakingStore.sol +12 -22
  354. package/contracts/type/ObjectType.sol +37 -7
  355. package/contracts/type/RoleId.sol +55 -82
  356. package/contracts/type/UFixed.sol +6 -0
  357. package/contracts/type/Version.sol +3 -1
  358. package/contracts/{shared → upgradeability}/ProxyManager.sol +3 -4
  359. package/contracts/{shared → upgradeability}/UpgradableProxyWithAdmin.sol +1 -3
  360. package/package.json +3 -3
  361. package/artifacts/contracts/instance/BundleManager.sol/BundleManager.dbg.json +0 -4
  362. package/artifacts/contracts/instance/BundleManager.sol/BundleManager.json +0 -709
  363. package/artifacts/contracts/instance/InstanceAuthorizationsLib.sol/InstanceAuthorizationsLib.dbg.json +0 -4
  364. package/artifacts/contracts/instance/InstanceAuthorizationsLib.sol/InstanceAuthorizationsLib.json +0 -228
  365. package/artifacts/contracts/instance/base/ObjectManager.sol/ObjectManager.dbg.json +0 -4
  366. package/artifacts/contracts/instance/base/ObjectManager.sol/ObjectManager.json +0 -187
  367. package/artifacts/contracts/registry/IServiceAuthorization.sol/IServiceAuthorization.dbg.json +0 -4
  368. package/artifacts/contracts/registry/ReleaseManager.sol/ReleaseManager.dbg.json +0 -4
  369. package/artifacts/contracts/registry/ReleaseManager.sol/ReleaseManager.json +0 -1177
  370. package/artifacts/contracts/registry/ServiceAuthorization.sol/ServiceAuthorization.dbg.json +0 -4
  371. package/artifacts/contracts/registry/ServiceAuthorization.sol/ServiceAuthorization.json +0 -190
  372. package/artifacts/contracts/shared/AccessAdmin.sol/AccessAdmin.dbg.json +0 -4
  373. package/artifacts/contracts/shared/AccessAdmin.sol/AccessAdmin.json +0 -1559
  374. package/artifacts/contracts/shared/AccessManagerCustom.sol/AccessManagerCustom.dbg.json +0 -4
  375. package/artifacts/contracts/shared/AccessManagerCustom.sol/AccessManagerCustom.json +0 -1193
  376. package/artifacts/contracts/shared/AccessManagerExtended.sol/AccessManagerExtended.dbg.json +0 -4
  377. package/artifacts/contracts/shared/AccessManagerExtended.sol/AccessManagerExtended.json +0 -1747
  378. package/artifacts/contracts/shared/AccessManagerExtendedInitializeable.sol/AccessManagerExtendedInitializeable.dbg.json +0 -4
  379. package/artifacts/contracts/shared/AccessManagerExtendedInitializeable.sol/AccessManagerExtendedInitializeable.json +0 -1760
  380. package/artifacts/contracts/shared/AccessManagerExtendedWithDisable.sol/AccessManagerExtendedWithDisable.dbg.json +0 -4
  381. package/artifacts/contracts/shared/AccessManagerExtendedWithDisable.sol/AccessManagerExtendedWithDisable.json +0 -1838
  382. package/artifacts/contracts/shared/AccessManagerExtendedWithDisableInitializeable.sol/AccessManagerExtendedWithDisableInitializeable.dbg.json +0 -4
  383. package/artifacts/contracts/shared/AccessManagerExtendedWithDisableInitializeable.sol/AccessManagerExtendedWithDisableInitializeable.json +0 -1856
  384. package/artifacts/contracts/shared/IAccessAdmin.sol/IAccessAdmin.dbg.json +0 -4
  385. package/artifacts/contracts/shared/IAccessManagerExtended.sol/IAccessManagerExtended.dbg.json +0 -4
  386. package/artifacts/contracts/shared/IAccessManagerExtended.sol/IAccessManagerExtended.json +0 -1562
  387. package/artifacts/contracts/shared/IAccessManagerExtendedWithDisable.sol/IAccessManagerExtendedWithDisable.dbg.json +0 -4
  388. package/artifacts/contracts/shared/IAccessManagerExtendedWithDisable.sol/IAccessManagerExtendedWithDisable.json +0 -1600
  389. package/artifacts/contracts/shared/IVersionable.sol/IVersionable.dbg.json +0 -4
  390. package/artifacts/contracts/shared/NftIdSetManager.sol/NftIdSetManager.dbg.json +0 -4
  391. package/artifacts/contracts/shared/NftIdSetManager.sol/NftIdSetManager.json +0 -306
  392. package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.dbg.json +0 -4
  393. package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.json +0 -617
  394. package/artifacts/contracts/shared/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.dbg.json +0 -4
  395. package/artifacts/contracts/shared/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.json +0 -129
  396. package/artifacts/contracts/shared/Versionable.sol/Versionable.dbg.json +0 -4
  397. package/contracts/instance/InstanceAuthorizationsLib.sol +0 -377
  398. package/contracts/shared/AccessManagerCustom.sol +0 -741
  399. package/contracts/shared/AccessManagerExtended.sol +0 -481
  400. package/contracts/shared/AccessManagerExtendedInitializeable.sol +0 -13
  401. package/contracts/shared/AccessManagerExtendedWithDisable.sol +0 -137
  402. package/contracts/shared/AccessManagerExtendedWithDisableInitializeable.sol +0 -14
  403. package/contracts/shared/IAccessManagerExtended.sol +0 -74
  404. package/contracts/shared/IAccessManagerExtendedWithDisable.sol +0 -18
  405. /package/contracts/{shared → upgradeability}/IVersionable.sol +0 -0
  406. /package/contracts/{shared → upgradeability}/Versionable.sol +0 -0
@@ -1,481 +0,0 @@
1
- // SPDX-License-Identifier: MIT
2
- pragma solidity ^0.8.20;
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
- }
@@ -1,13 +0,0 @@
1
- // SPDX-License-Identifier: Apache-2.0
2
- pragma solidity ^0.8.20;
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
- }
@@ -1,137 +0,0 @@
1
- // SPDX-License-Identifier: MIT
2
- // OpenZeppelin Contracts (last updated v5.0.0) (access/manager/AccessManager.sol)
3
-
4
- pragma solidity ^0.8.20;
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
- }
@@ -1,14 +0,0 @@
1
- // SPDX-License-Identifier: Apache-2.0
2
- pragma solidity ^0.8.20;
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
- }