@etherisc/gif-next 0.0.2-ffa91a6-022 → 3.0.0-0fefe0d-162

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (501) hide show
  1. package/README.md +123 -332
  2. package/artifacts/contracts/accounting/AccountingService.sol/AccountingService.dbg.json +1 -1
  3. package/artifacts/contracts/accounting/AccountingService.sol/AccountingService.json +106 -38
  4. package/artifacts/contracts/accounting/AccountingServiceManager.sol/AccountingServiceManager.dbg.json +1 -1
  5. package/artifacts/contracts/accounting/AccountingServiceManager.sol/AccountingServiceManager.json +111 -45
  6. package/artifacts/contracts/accounting/IAccountingService.sol/IAccountingService.dbg.json +1 -1
  7. package/artifacts/contracts/accounting/IAccountingService.sol/IAccountingService.json +58 -6
  8. package/artifacts/contracts/authorization/AccessAdmin.sol/AccessAdmin.dbg.json +1 -1
  9. package/artifacts/contracts/authorization/AccessAdmin.sol/AccessAdmin.json +372 -131
  10. package/artifacts/contracts/authorization/AccessAdminLib.sol/AccessAdminLib.dbg.json +1 -1
  11. package/artifacts/contracts/authorization/AccessAdminLib.sol/AccessAdminLib.json +1509 -174
  12. package/artifacts/contracts/authorization/AccessManagerCloneable.sol/AccessManagerCloneable.dbg.json +1 -1
  13. package/artifacts/contracts/authorization/AccessManagerCloneable.sol/AccessManagerCloneable.json +2 -2
  14. package/artifacts/contracts/authorization/Authorization.sol/Authorization.dbg.json +1 -1
  15. package/artifacts/contracts/authorization/Authorization.sol/Authorization.json +266 -64
  16. package/artifacts/contracts/authorization/IAccess.sol/IAccess.dbg.json +1 -1
  17. package/artifacts/contracts/authorization/IAccessAdmin.sol/IAccessAdmin.dbg.json +1 -1
  18. package/artifacts/contracts/authorization/IAccessAdmin.sol/IAccessAdmin.json +263 -87
  19. package/artifacts/contracts/authorization/IAuthorization.sol/IAuthorization.dbg.json +1 -1
  20. package/artifacts/contracts/authorization/IAuthorization.sol/IAuthorization.json +102 -19
  21. package/artifacts/contracts/authorization/IServiceAuthorization.sol/IServiceAuthorization.dbg.json +1 -1
  22. package/artifacts/contracts/authorization/IServiceAuthorization.sol/IServiceAuthorization.json +256 -16
  23. package/artifacts/contracts/authorization/ServiceAuthorization.sol/ServiceAuthorization.dbg.json +1 -1
  24. package/artifacts/contracts/authorization/ServiceAuthorization.sol/ServiceAuthorization.json +426 -27
  25. package/artifacts/contracts/distribution/BasicDistribution.sol/BasicDistribution.dbg.json +1 -1
  26. package/artifacts/contracts/distribution/BasicDistribution.sol/BasicDistribution.json +63 -38
  27. package/artifacts/contracts/distribution/BasicDistributionAuthorization.sol/BasicDistributionAuthorization.dbg.json +1 -1
  28. package/artifacts/contracts/distribution/BasicDistributionAuthorization.sol/BasicDistributionAuthorization.json +269 -69
  29. package/artifacts/contracts/distribution/Distribution.sol/Distribution.dbg.json +1 -1
  30. package/artifacts/contracts/distribution/Distribution.sol/Distribution.json +21 -12
  31. package/artifacts/contracts/distribution/DistributionService.sol/DistributionService.dbg.json +1 -1
  32. package/artifacts/contracts/distribution/DistributionService.sol/DistributionService.json +376 -147
  33. package/artifacts/contracts/distribution/DistributionServiceManager.sol/DistributionServiceManager.dbg.json +1 -1
  34. package/artifacts/contracts/distribution/DistributionServiceManager.sol/DistributionServiceManager.json +160 -78
  35. package/artifacts/contracts/distribution/IDistributionComponent.sol/IDistributionComponent.dbg.json +1 -1
  36. package/artifacts/contracts/distribution/IDistributionComponent.sol/IDistributionComponent.json +20 -11
  37. package/artifacts/contracts/distribution/IDistributionService.sol/IDistributionService.dbg.json +1 -1
  38. package/artifacts/contracts/distribution/IDistributionService.sol/IDistributionService.json +232 -19
  39. package/artifacts/contracts/examples/fire/DamageLevel.sol/DamageLevelLib.dbg.json +1 -1
  40. package/artifacts/contracts/examples/fire/FirePool.sol/FirePool.dbg.json +1 -1
  41. package/artifacts/contracts/examples/fire/FirePool.sol/FirePool.json +108 -79
  42. package/artifacts/contracts/examples/fire/FirePoolAuthorization.sol/FirePoolAuthorization.dbg.json +1 -1
  43. package/artifacts/contracts/examples/fire/FirePoolAuthorization.sol/FirePoolAuthorization.json +268 -68
  44. package/artifacts/contracts/examples/fire/FireProduct.sol/FireProduct.dbg.json +1 -1
  45. package/artifacts/contracts/examples/fire/FireProduct.sol/FireProduct.json +136 -95
  46. package/artifacts/contracts/examples/fire/FireProductAuthorization.sol/FireProductAuthorization.dbg.json +1 -1
  47. package/artifacts/contracts/examples/fire/FireProductAuthorization.sol/FireProductAuthorization.json +268 -68
  48. package/artifacts/contracts/examples/fire/FireUSD.sol/FireUSD.dbg.json +1 -1
  49. package/artifacts/contracts/examples/flight/FlightLib.sol/FlightLib.dbg.json +4 -0
  50. package/artifacts/contracts/examples/flight/FlightLib.sol/FlightLib.json +500 -0
  51. package/artifacts/contracts/examples/flight/FlightMessageVerifier.sol/FlightMessageVerifier.dbg.json +4 -0
  52. package/artifacts/contracts/examples/flight/FlightMessageVerifier.sol/FlightMessageVerifier.json +229 -0
  53. package/artifacts/contracts/examples/flight/FlightOracle.sol/FlightOracle.dbg.json +4 -0
  54. package/artifacts/contracts/examples/flight/FlightOracle.sol/FlightOracle.json +1198 -0
  55. package/artifacts/contracts/examples/flight/FlightOracleAuthorization.sol/FlightOracleAuthorization.dbg.json +4 -0
  56. package/artifacts/contracts/examples/flight/FlightOracleAuthorization.sol/FlightOracleAuthorization.json +849 -0
  57. package/artifacts/contracts/examples/flight/FlightPool.sol/FlightPool.dbg.json +4 -0
  58. package/artifacts/contracts/examples/flight/FlightPool.sol/FlightPool.json +1466 -0
  59. package/artifacts/contracts/examples/flight/FlightPoolAuthorization.sol/FlightPoolAuthorization.dbg.json +4 -0
  60. package/artifacts/contracts/examples/flight/FlightPoolAuthorization.sol/FlightPoolAuthorization.json +844 -0
  61. package/artifacts/contracts/examples/flight/FlightProduct.sol/FlightProduct.dbg.json +4 -0
  62. package/artifacts/contracts/examples/flight/FlightProduct.sol/FlightProduct.json +2347 -0
  63. package/artifacts/contracts/examples/flight/FlightProductAuthorization.sol/FlightProductAuthorization.dbg.json +4 -0
  64. package/artifacts/contracts/examples/flight/FlightProductAuthorization.sol/FlightProductAuthorization.json +844 -0
  65. package/artifacts/contracts/examples/flight/FlightUSD.sol/FlightUSD.dbg.json +4 -0
  66. package/artifacts/contracts/examples/flight/FlightUSD.sol/FlightUSD.json +586 -0
  67. package/artifacts/contracts/examples/flight/originalV1.sol/FlightDelayChainlink.dbg.json +4 -0
  68. package/artifacts/contracts/examples/flight/originalV1.sol/FlightDelayChainlink.json +901 -0
  69. package/artifacts/contracts/examples/unpermissioned/SimpleDistribution.sol/SimpleDistribution.dbg.json +1 -1
  70. package/artifacts/contracts/examples/unpermissioned/SimpleDistribution.sol/SimpleDistribution.json +86 -45
  71. package/artifacts/contracts/examples/unpermissioned/SimpleDistributionAuthorization.sol/SimpleDistributionAuthorization.dbg.json +1 -1
  72. package/artifacts/contracts/examples/unpermissioned/SimpleDistributionAuthorization.sol/SimpleDistributionAuthorization.json +268 -68
  73. package/artifacts/contracts/examples/unpermissioned/SimpleOracle.sol/SimpleOracle.dbg.json +1 -1
  74. package/artifacts/contracts/examples/unpermissioned/SimpleOracle.sol/SimpleOracle.json +35 -26
  75. package/artifacts/contracts/examples/unpermissioned/SimplePool.sol/SimplePool.dbg.json +1 -1
  76. package/artifacts/contracts/examples/unpermissioned/SimplePool.sol/SimplePool.json +130 -105
  77. package/artifacts/contracts/examples/unpermissioned/SimplePoolAuthorization.sol/SimplePoolAuthorization.dbg.json +1 -1
  78. package/artifacts/contracts/examples/unpermissioned/SimplePoolAuthorization.sol/SimplePoolAuthorization.json +268 -68
  79. package/artifacts/contracts/examples/unpermissioned/SimpleProduct.sol/SimpleProduct.dbg.json +1 -1
  80. package/artifacts/contracts/examples/unpermissioned/SimpleProduct.sol/SimpleProduct.json +333 -147
  81. package/artifacts/contracts/examples/unpermissioned/SimpleProductAuthorization.sol/SimpleProductAuthorization.dbg.json +1 -1
  82. package/artifacts/contracts/examples/unpermissioned/SimpleProductAuthorization.sol/SimpleProductAuthorization.json +268 -68
  83. package/artifacts/contracts/instance/BaseStore.sol/BaseStore.dbg.json +4 -0
  84. package/artifacts/contracts/{shared/IKeyValueStore.sol/IKeyValueStore.json → instance/BaseStore.sol/BaseStore.json} +51 -229
  85. package/artifacts/contracts/instance/BundleSet.sol/BundleSet.dbg.json +1 -1
  86. package/artifacts/contracts/instance/BundleSet.sol/BundleSet.json +2 -2
  87. package/artifacts/contracts/instance/IBaseStore.sol/IBaseStore.dbg.json +4 -0
  88. package/artifacts/contracts/instance/IBaseStore.sol/IBaseStore.json +304 -0
  89. package/artifacts/contracts/instance/IInstance.sol/IInstance.dbg.json +1 -1
  90. package/artifacts/contracts/instance/IInstance.sol/IInstance.json +374 -35
  91. package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.dbg.json +1 -1
  92. package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.json +305 -5
  93. package/artifacts/contracts/instance/Instance.sol/Instance.dbg.json +1 -1
  94. package/artifacts/contracts/instance/Instance.sol/Instance.json +425 -97
  95. package/artifacts/contracts/instance/InstanceAdmin.sol/InstanceAdmin.dbg.json +1 -1
  96. package/artifacts/contracts/instance/InstanceAdmin.sol/InstanceAdmin.json +757 -393
  97. package/artifacts/contracts/instance/InstanceAuthorizationV3.sol/InstanceAuthorizationV3.dbg.json +1 -1
  98. package/artifacts/contracts/instance/InstanceAuthorizationV3.sol/InstanceAuthorizationV3.json +236 -80
  99. package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.dbg.json +1 -1
  100. package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.json +723 -553
  101. package/artifacts/contracts/instance/InstanceService.sol/InstanceService.dbg.json +1 -1
  102. package/artifacts/contracts/instance/InstanceService.sol/InstanceService.json +331 -31
  103. package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.dbg.json +1 -1
  104. package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.json +100 -42
  105. package/artifacts/contracts/instance/InstanceStore.sol/InstanceStore.dbg.json +1 -1
  106. package/artifacts/contracts/instance/InstanceStore.sol/InstanceStore.json +1323 -2012
  107. package/artifacts/contracts/instance/ProductStore.sol/ProductStore.dbg.json +4 -0
  108. package/artifacts/contracts/instance/ProductStore.sol/ProductStore.json +3427 -0
  109. package/artifacts/contracts/instance/RiskSet.sol/RiskSet.dbg.json +1 -1
  110. package/artifacts/contracts/instance/RiskSet.sol/RiskSet.json +101 -88
  111. package/artifacts/contracts/instance/base/BalanceStore.sol/BalanceStore.dbg.json +1 -1
  112. package/artifacts/contracts/instance/base/BalanceStore.sol/BalanceStore.json +8 -8
  113. package/artifacts/contracts/instance/base/Cloneable.sol/Cloneable.dbg.json +1 -1
  114. package/artifacts/contracts/instance/base/ObjectCounter.sol/ObjectCounter.dbg.json +1 -1
  115. package/artifacts/contracts/instance/base/ObjectCounter.sol/ObjectCounter.json +2 -2
  116. package/artifacts/contracts/instance/base/ObjectLifecycle.sol/ObjectLifecycle.dbg.json +1 -1
  117. package/artifacts/contracts/instance/base/ObjectLifecycle.sol/ObjectLifecycle.json +2 -2
  118. package/artifacts/contracts/instance/base/ObjectSet.sol/ObjectSet.dbg.json +1 -1
  119. package/artifacts/contracts/instance/base/ObjectSet.sol/ObjectSet.json +2 -2
  120. package/artifacts/contracts/instance/base/ObjectSetHelperLib.sol/ObjectSetHelperLib.dbg.json +1 -1
  121. package/artifacts/contracts/instance/base/ObjectSetHelperLib.sol/ObjectSetHelperLib.json +20 -20
  122. package/artifacts/contracts/instance/module/IBundle.sol/IBundle.dbg.json +1 -1
  123. package/artifacts/contracts/instance/module/IComponents.sol/IComponents.dbg.json +1 -1
  124. package/artifacts/contracts/instance/module/IDistribution.sol/IDistribution.dbg.json +1 -1
  125. package/artifacts/contracts/instance/module/IPolicy.sol/IPolicy.dbg.json +1 -1
  126. package/artifacts/contracts/instance/module/IRisk.sol/IRisk.dbg.json +1 -1
  127. package/artifacts/contracts/mock/Dip.sol/Dip.dbg.json +1 -1
  128. package/artifacts/contracts/oracle/BasicOracle.sol/BasicOracle.dbg.json +1 -1
  129. package/artifacts/contracts/oracle/BasicOracle.sol/BasicOracle.json +25 -16
  130. package/artifacts/contracts/oracle/BasicOracleAuthorization.sol/BasicOracleAuthorization.dbg.json +1 -1
  131. package/artifacts/contracts/oracle/BasicOracleAuthorization.sol/BasicOracleAuthorization.json +282 -65
  132. package/artifacts/contracts/oracle/IOracle.sol/IOracle.dbg.json +1 -1
  133. package/artifacts/contracts/oracle/IOracleComponent.sol/IOracleComponent.dbg.json +1 -1
  134. package/artifacts/contracts/oracle/IOracleComponent.sol/IOracleComponent.json +19 -10
  135. package/artifacts/contracts/oracle/IOracleService.sol/IOracleService.dbg.json +1 -1
  136. package/artifacts/contracts/oracle/IOracleService.sol/IOracleService.json +29 -0
  137. package/artifacts/contracts/oracle/Oracle.sol/Oracle.dbg.json +1 -1
  138. package/artifacts/contracts/oracle/Oracle.sol/Oracle.json +19 -10
  139. package/artifacts/contracts/oracle/OracleService.sol/OracleService.dbg.json +1 -1
  140. package/artifacts/contracts/oracle/OracleService.sol/OracleService.json +83 -38
  141. package/artifacts/contracts/oracle/OracleServiceManager.sol/OracleServiceManager.dbg.json +1 -1
  142. package/artifacts/contracts/oracle/OracleServiceManager.sol/OracleServiceManager.json +116 -50
  143. package/artifacts/contracts/pool/BasicPool.sol/BasicPool.dbg.json +1 -1
  144. package/artifacts/contracts/pool/BasicPool.sol/BasicPool.json +59 -58
  145. package/artifacts/contracts/pool/BasicPoolAuthorization.sol/BasicPoolAuthorization.dbg.json +1 -1
  146. package/artifacts/contracts/pool/BasicPoolAuthorization.sol/BasicPoolAuthorization.json +268 -68
  147. package/artifacts/contracts/pool/BundleService.sol/BundleService.dbg.json +1 -1
  148. package/artifacts/contracts/pool/BundleService.sol/BundleService.json +300 -123
  149. package/artifacts/contracts/pool/BundleServiceManager.sol/BundleServiceManager.dbg.json +1 -1
  150. package/artifacts/contracts/pool/BundleServiceManager.sol/BundleServiceManager.json +144 -58
  151. package/artifacts/contracts/pool/IBundleService.sol/IBundleService.dbg.json +1 -1
  152. package/artifacts/contracts/pool/IBundleService.sol/IBundleService.json +186 -33
  153. package/artifacts/contracts/pool/IPoolComponent.sol/IPoolComponent.dbg.json +1 -1
  154. package/artifacts/contracts/pool/IPoolComponent.sol/IPoolComponent.json +29 -20
  155. package/artifacts/contracts/pool/IPoolService.sol/IPoolService.dbg.json +1 -1
  156. package/artifacts/contracts/pool/IPoolService.sol/IPoolService.json +238 -19
  157. package/artifacts/contracts/pool/Pool.sol/Pool.dbg.json +1 -1
  158. package/artifacts/contracts/pool/Pool.sol/Pool.json +29 -20
  159. package/artifacts/contracts/pool/PoolLib.sol/PoolLib.dbg.json +1 -1
  160. package/artifacts/contracts/pool/PoolLib.sol/PoolLib.json +100 -34
  161. package/artifacts/contracts/pool/PoolService.sol/PoolService.dbg.json +1 -1
  162. package/artifacts/contracts/pool/PoolService.sol/PoolService.json +338 -79
  163. package/artifacts/contracts/pool/PoolServiceManager.sol/PoolServiceManager.dbg.json +1 -1
  164. package/artifacts/contracts/pool/PoolServiceManager.sol/PoolServiceManager.json +141 -63
  165. package/artifacts/contracts/product/ApplicationService.sol/ApplicationService.dbg.json +1 -1
  166. package/artifacts/contracts/product/ApplicationService.sol/ApplicationService.json +216 -59
  167. package/artifacts/contracts/product/ApplicationServiceManager.sol/ApplicationServiceManager.dbg.json +1 -1
  168. package/artifacts/contracts/product/ApplicationServiceManager.sol/ApplicationServiceManager.json +113 -43
  169. package/artifacts/contracts/product/BasicProduct.sol/BasicProduct.dbg.json +1 -1
  170. package/artifacts/contracts/product/BasicProduct.sol/BasicProduct.json +46 -37
  171. package/artifacts/contracts/product/BasicProductAuthorization.sol/BasicProductAuthorization.dbg.json +1 -1
  172. package/artifacts/contracts/product/BasicProductAuthorization.sol/BasicProductAuthorization.json +268 -68
  173. package/artifacts/contracts/product/ClaimService.sol/ClaimService.dbg.json +1 -1
  174. package/artifacts/contracts/product/ClaimService.sol/ClaimService.json +142 -102
  175. package/artifacts/contracts/product/ClaimServiceManager.sol/ClaimServiceManager.dbg.json +1 -1
  176. package/artifacts/contracts/product/ClaimServiceManager.sol/ClaimServiceManager.json +128 -70
  177. package/artifacts/contracts/product/IApplicationService.sol/IApplicationService.dbg.json +1 -1
  178. package/artifacts/contracts/product/IApplicationService.sol/IApplicationService.json +166 -1
  179. package/artifacts/contracts/product/IClaimService.sol/IClaimService.dbg.json +1 -1
  180. package/artifacts/contracts/product/IClaimService.sol/IClaimService.json +50 -10
  181. package/artifacts/contracts/product/IPolicyService.sol/IPolicyService.dbg.json +1 -1
  182. package/artifacts/contracts/product/IPolicyService.sol/IPolicyService.json +55 -0
  183. package/artifacts/contracts/product/IPricingService.sol/IPricingService.dbg.json +1 -1
  184. package/artifacts/contracts/product/IPricingService.sol/IPricingService.json +29 -0
  185. package/artifacts/contracts/product/IProductComponent.sol/IProductComponent.dbg.json +1 -1
  186. package/artifacts/contracts/product/IProductComponent.sol/IProductComponent.json +40 -31
  187. package/artifacts/contracts/product/IRiskService.sol/IRiskService.dbg.json +1 -1
  188. package/artifacts/contracts/product/IRiskService.sol/IRiskService.json +203 -18
  189. package/artifacts/contracts/product/PolicyService.sol/PolicyService.dbg.json +1 -1
  190. package/artifacts/contracts/product/PolicyService.sol/PolicyService.json +157 -86
  191. package/artifacts/contracts/product/PolicyServiceLib.sol/PolicyServiceLib.dbg.json +1 -1
  192. package/artifacts/contracts/product/PolicyServiceLib.sol/PolicyServiceLib.json +511 -21
  193. package/artifacts/contracts/product/PolicyServiceManager.sol/PolicyServiceManager.dbg.json +1 -1
  194. package/artifacts/contracts/product/PolicyServiceManager.sol/PolicyServiceManager.json +138 -72
  195. package/artifacts/contracts/product/PricingService.sol/PricingService.dbg.json +1 -1
  196. package/artifacts/contracts/product/PricingService.sol/PricingService.json +93 -112
  197. package/artifacts/contracts/product/PricingServiceManager.sol/PricingServiceManager.dbg.json +1 -1
  198. package/artifacts/contracts/product/PricingServiceManager.sol/PricingServiceManager.json +115 -65
  199. package/artifacts/contracts/product/Product.sol/Product.dbg.json +1 -1
  200. package/artifacts/contracts/product/Product.sol/Product.json +40 -31
  201. package/artifacts/contracts/product/RiskService.sol/RiskService.dbg.json +1 -1
  202. package/artifacts/contracts/product/RiskService.sol/RiskService.json +231 -46
  203. package/artifacts/contracts/product/RiskServiceManager.sol/RiskServiceManager.dbg.json +1 -1
  204. package/artifacts/contracts/product/RiskServiceManager.sol/RiskServiceManager.json +101 -43
  205. package/artifacts/contracts/registry/ChainNft.sol/ChainNft.dbg.json +1 -1
  206. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.dbg.json +1 -1
  207. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.json +33 -22
  208. package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.dbg.json +1 -1
  209. package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.json +29 -0
  210. package/artifacts/contracts/registry/IRelease.sol/IRelease.dbg.json +1 -1
  211. package/artifacts/contracts/registry/ITransferInterceptor.sol/ITransferInterceptor.dbg.json +1 -1
  212. package/artifacts/contracts/registry/Registry.sol/Registry.dbg.json +1 -1
  213. package/artifacts/contracts/registry/Registry.sol/Registry.json +71 -60
  214. package/artifacts/contracts/registry/RegistryAdmin.sol/RegistryAdmin.dbg.json +1 -1
  215. package/artifacts/contracts/registry/RegistryAdmin.sol/RegistryAdmin.json +542 -305
  216. package/artifacts/contracts/registry/RegistryAuthorization.sol/RegistryAuthorization.dbg.json +1 -1
  217. package/artifacts/contracts/registry/RegistryAuthorization.sol/RegistryAuthorization.json +335 -76
  218. package/artifacts/contracts/registry/RegistryService.sol/RegistryService.dbg.json +1 -1
  219. package/artifacts/contracts/registry/RegistryService.sol/RegistryService.json +41 -12
  220. package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.dbg.json +1 -1
  221. package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.json +96 -38
  222. package/artifacts/contracts/registry/ReleaseAdmin.sol/ReleaseAdmin.dbg.json +1 -1
  223. package/artifacts/contracts/registry/ReleaseAdmin.sol/ReleaseAdmin.json +548 -231
  224. package/artifacts/contracts/registry/ReleaseLifecycle.sol/ReleaseLifecycle.dbg.json +1 -1
  225. package/artifacts/contracts/registry/ReleaseLifecycle.sol/ReleaseLifecycle.json +2 -2
  226. package/artifacts/contracts/registry/ReleaseRegistry.sol/ReleaseRegistry.dbg.json +1 -1
  227. package/artifacts/contracts/registry/ReleaseRegistry.sol/ReleaseRegistry.json +167 -103
  228. package/artifacts/contracts/registry/ServiceAuthorizationV3.sol/ServiceAuthorizationV3.dbg.json +1 -1
  229. package/artifacts/contracts/registry/ServiceAuthorizationV3.sol/ServiceAuthorizationV3.json +459 -26
  230. package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.dbg.json +1 -1
  231. package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.json +119 -59
  232. package/artifacts/contracts/shared/Component.sol/Component.dbg.json +1 -1
  233. package/artifacts/contracts/shared/Component.sol/Component.json +19 -10
  234. package/artifacts/contracts/shared/ComponentService.sol/ComponentService.dbg.json +1 -1
  235. package/artifacts/contracts/shared/ComponentService.sol/ComponentService.json +196 -201
  236. package/artifacts/contracts/shared/ComponentServiceManager.sol/ComponentServiceManager.dbg.json +1 -1
  237. package/artifacts/contracts/shared/ComponentServiceManager.sol/ComponentServiceManager.json +130 -64
  238. package/artifacts/contracts/shared/ContractLib.sol/ContractLib.dbg.json +1 -1
  239. package/artifacts/contracts/shared/ContractLib.sol/ContractLib.json +76 -41
  240. package/artifacts/contracts/shared/ContractLib.sol/IInstanceAdminHelper.dbg.json +1 -1
  241. package/artifacts/contracts/shared/ContractLib.sol/ITargetHelper.dbg.json +1 -1
  242. package/artifacts/contracts/shared/ContractLib.sol/ITokenRegistryHelper.dbg.json +1 -1
  243. package/artifacts/contracts/shared/ContractLib.sol/ITokenRegistryHelper.json +2 -2
  244. package/artifacts/contracts/shared/IComponent.sol/IComponent.dbg.json +1 -1
  245. package/artifacts/contracts/shared/IComponent.sol/IComponent.json +19 -10
  246. package/artifacts/contracts/shared/IComponentService.sol/IComponentService.dbg.json +1 -1
  247. package/artifacts/contracts/shared/IComponentService.sol/IComponentService.json +111 -132
  248. package/artifacts/contracts/shared/IInstanceLinkedComponent.sol/IInstanceLinkedComponent.dbg.json +1 -1
  249. package/artifacts/contracts/shared/IInstanceLinkedComponent.sol/IInstanceLinkedComponent.json +19 -10
  250. package/artifacts/contracts/shared/ILifecycle.sol/ILifecycle.dbg.json +1 -1
  251. package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.dbg.json +1 -1
  252. package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.json +19 -0
  253. package/artifacts/contracts/shared/IPolicyHolder.sol/IPolicyHolder.dbg.json +1 -1
  254. package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.dbg.json +1 -1
  255. package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.json +19 -0
  256. package/artifacts/contracts/shared/IRegistryLinked.sol/IRegistryLinked.dbg.json +1 -1
  257. package/artifacts/contracts/shared/IService.sol/IService.dbg.json +1 -1
  258. package/artifacts/contracts/shared/IService.sol/IService.json +29 -0
  259. package/artifacts/contracts/shared/InitializableERC165.sol/InitializableERC165.dbg.json +1 -1
  260. package/artifacts/contracts/shared/InstanceLinkedComponent.sol/InstanceLinkedComponent.dbg.json +1 -1
  261. package/artifacts/contracts/shared/InstanceLinkedComponent.sol/InstanceLinkedComponent.json +19 -10
  262. package/artifacts/contracts/shared/Lifecycle.sol/Lifecycle.dbg.json +1 -1
  263. package/artifacts/contracts/shared/NftIdSet.sol/NftIdSet.dbg.json +1 -1
  264. package/artifacts/contracts/shared/NftIdSet.sol/NftIdSet.json +2 -2
  265. package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.dbg.json +1 -1
  266. package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.json +21 -2
  267. package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.dbg.json +1 -1
  268. package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.json +2 -2
  269. package/artifacts/contracts/shared/Registerable.sol/Registerable.dbg.json +1 -1
  270. package/artifacts/contracts/shared/Registerable.sol/Registerable.json +19 -0
  271. package/artifacts/contracts/shared/RegistryLinked.sol/RegistryLinked.dbg.json +1 -1
  272. package/artifacts/contracts/shared/RegistryLinked.sol/RegistryLinked.json +2 -2
  273. package/artifacts/contracts/shared/Service.sol/Service.dbg.json +1 -1
  274. package/artifacts/contracts/shared/Service.sol/Service.json +29 -0
  275. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.dbg.json +1 -1
  276. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.json +2 -2
  277. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandlerBase.dbg.json +1 -1
  278. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandlerBase.json +2 -2
  279. package/artifacts/contracts/shared/TokenHandlerDeployerLib.sol/TokenHandlerDeployerLib.dbg.json +1 -1
  280. package/artifacts/contracts/shared/TokenHandlerDeployerLib.sol/TokenHandlerDeployerLib.json +2 -2
  281. package/artifacts/contracts/staking/IStaking.sol/IStaking.dbg.json +1 -1
  282. package/artifacts/contracts/staking/IStaking.sol/IStaking.json +1390 -134
  283. package/artifacts/contracts/staking/IStakingService.sol/IStakingService.dbg.json +1 -1
  284. package/artifacts/contracts/staking/IStakingService.sol/IStakingService.json +97 -117
  285. package/artifacts/contracts/staking/ITargetLimitHandler.sol/ITargetLimitHandler.dbg.json +4 -0
  286. package/artifacts/contracts/staking/ITargetLimitHandler.sol/ITargetLimitHandler.json +50 -0
  287. package/artifacts/contracts/staking/Staking.sol/Staking.dbg.json +1 -1
  288. package/artifacts/contracts/staking/Staking.sol/Staking.json +1479 -192
  289. package/artifacts/contracts/staking/StakingLib.sol/StakingLib.dbg.json +1 -1
  290. package/artifacts/contracts/staking/StakingLib.sol/StakingLib.json +77 -76
  291. package/artifacts/contracts/staking/StakingManager.sol/StakingManager.dbg.json +1 -1
  292. package/artifacts/contracts/staking/StakingManager.sol/StakingManager.json +139 -64
  293. package/artifacts/contracts/staking/StakingReader.sol/StakingReader.dbg.json +1 -1
  294. package/artifacts/contracts/staking/StakingReader.sol/StakingReader.json +296 -152
  295. package/artifacts/contracts/staking/StakingService.sol/StakingService.dbg.json +1 -1
  296. package/artifacts/contracts/staking/StakingService.sol/StakingService.json +131 -167
  297. package/artifacts/contracts/staking/StakingServiceManager.sol/StakingServiceManager.dbg.json +1 -1
  298. package/artifacts/contracts/staking/StakingServiceManager.sol/StakingServiceManager.json +96 -46
  299. package/artifacts/contracts/staking/StakingStore.sol/StakingStore.dbg.json +1 -1
  300. package/artifacts/contracts/staking/StakingStore.sol/StakingStore.json +1615 -815
  301. package/artifacts/contracts/staking/TargetHandler.sol/TargetHandler.dbg.json +4 -0
  302. package/artifacts/contracts/staking/TargetHandler.sol/TargetHandler.json +309 -0
  303. package/artifacts/contracts/staking/TargetManagerLib.sol/TargetManagerLib.dbg.json +1 -1
  304. package/artifacts/contracts/staking/TargetManagerLib.sol/TargetManagerLib.json +153 -91
  305. package/artifacts/contracts/type/AddressSet.sol/LibAddressSet.dbg.json +1 -1
  306. package/artifacts/contracts/type/Amount.sol/AmountLib.dbg.json +1 -1
  307. package/artifacts/contracts/type/Amount.sol/AmountLib.json +10 -10
  308. package/artifacts/contracts/type/Blocknumber.sol/BlocknumberLib.dbg.json +1 -1
  309. package/artifacts/contracts/type/Blocknumber.sol/BlocknumberLib.json +64 -19
  310. package/artifacts/contracts/type/ChainId.sol/ChainIdLib.dbg.json +4 -0
  311. package/artifacts/contracts/type/ChainId.sol/ChainIdLib.json +193 -0
  312. package/artifacts/contracts/type/ClaimId.sol/ClaimIdLib.dbg.json +1 -1
  313. package/artifacts/contracts/type/ClaimId.sol/ClaimIdLib.json +2 -2
  314. package/artifacts/contracts/type/DistributorType.sol/DistributorTypeLib.dbg.json +1 -1
  315. package/artifacts/contracts/type/DistributorType.sol/DistributorTypeLib.json +2 -2
  316. package/artifacts/contracts/type/Fee.sol/FeeLib.dbg.json +1 -1
  317. package/artifacts/contracts/type/Fee.sol/FeeLib.json +93 -37
  318. package/artifacts/contracts/type/Key32.sol/Key32Lib.dbg.json +1 -1
  319. package/artifacts/contracts/type/Key32.sol/Key32Lib.json +2 -2
  320. package/artifacts/contracts/type/Key32Set.sol/LibKey32Set.dbg.json +1 -1
  321. package/artifacts/contracts/type/Key32Set.sol/LibKey32Set.json +2 -2
  322. package/artifacts/contracts/type/NftId.sol/NftIdLib.dbg.json +1 -1
  323. package/artifacts/contracts/type/NftId.sol/NftIdLib.json +2 -2
  324. package/artifacts/contracts/type/NftIdSet.sol/LibNftIdSet.dbg.json +1 -1
  325. package/artifacts/contracts/type/NftIdSet.sol/LibNftIdSet.json +2 -2
  326. package/artifacts/contracts/type/ObjectType.sol/ObjectTypeLib.dbg.json +1 -1
  327. package/artifacts/contracts/type/ObjectType.sol/ObjectTypeLib.json +22 -25
  328. package/artifacts/contracts/type/PayoutId.sol/PayoutIdLib.dbg.json +1 -1
  329. package/artifacts/contracts/type/PayoutId.sol/PayoutIdLib.json +2 -2
  330. package/artifacts/contracts/type/Referral.sol/ReferralLib.dbg.json +1 -1
  331. package/artifacts/contracts/type/Referral.sol/ReferralLib.json +23 -4
  332. package/artifacts/contracts/type/RequestId.sol/RequestIdLib.dbg.json +1 -1
  333. package/artifacts/contracts/type/RequestId.sol/RequestIdLib.json +2 -2
  334. package/artifacts/contracts/type/RequestIdSet.sol/LibRequestIdSet.dbg.json +4 -0
  335. package/artifacts/contracts/type/RequestIdSet.sol/LibRequestIdSet.json +33 -0
  336. package/artifacts/contracts/type/RiskId.sol/RiskIdLib.dbg.json +1 -1
  337. package/artifacts/contracts/type/RiskId.sol/RiskIdLib.json +2 -2
  338. package/artifacts/contracts/type/RoleId.sol/RoleIdLib.dbg.json +1 -1
  339. package/artifacts/contracts/type/RoleId.sol/RoleIdLib.json +39 -218
  340. package/artifacts/contracts/type/Seconds.sol/SecondsLib.dbg.json +1 -1
  341. package/artifacts/contracts/type/Seconds.sol/SecondsLib.json +64 -2
  342. package/artifacts/contracts/type/Selector.sol/SelectorLib.dbg.json +1 -1
  343. package/artifacts/contracts/type/Selector.sol/SelectorSetLib.dbg.json +1 -1
  344. package/artifacts/contracts/type/StateId.sol/StateIdLib.dbg.json +1 -1
  345. package/artifacts/contracts/type/String.sol/StrLib.dbg.json +1 -1
  346. package/artifacts/contracts/type/String.sol/StrLib.json +69 -2
  347. package/artifacts/contracts/type/Timestamp.sol/TimestampLib.dbg.json +1 -1
  348. package/artifacts/contracts/type/Timestamp.sol/TimestampLib.json +37 -5
  349. package/artifacts/contracts/type/UFixed.sol/UFixedLib.dbg.json +1 -1
  350. package/artifacts/contracts/type/UFixed.sol/UFixedLib.json +60 -36
  351. package/artifacts/contracts/type/Version.sol/VersionLib.dbg.json +1 -1
  352. package/artifacts/contracts/type/Version.sol/VersionPartLib.dbg.json +1 -1
  353. package/artifacts/contracts/upgradeability/IVersionable.sol/IVersionable.dbg.json +1 -1
  354. package/artifacts/contracts/upgradeability/IVersionable.sol/IVersionable.json +10 -0
  355. package/artifacts/contracts/upgradeability/ProxyManager.sol/ProxyManager.dbg.json +1 -1
  356. package/artifacts/contracts/upgradeability/ProxyManager.sol/ProxyManager.json +81 -27
  357. package/artifacts/contracts/upgradeability/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.dbg.json +1 -1
  358. package/artifacts/contracts/upgradeability/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.json +15 -2
  359. package/artifacts/contracts/upgradeability/Versionable.sol/Versionable.dbg.json +1 -1
  360. package/artifacts/contracts/upgradeability/Versionable.sol/Versionable.json +10 -0
  361. package/contracts/accounting/AccountingService.sol +15 -3
  362. package/contracts/accounting/IAccountingService.sol +4 -2
  363. package/contracts/authorization/AccessAdmin.sol +292 -317
  364. package/contracts/authorization/AccessAdminLib.sol +517 -22
  365. package/contracts/authorization/AccessManagerCloneable.sol +0 -18
  366. package/contracts/authorization/Authorization.sol +64 -239
  367. package/contracts/authorization/IAccess.sol +29 -12
  368. package/contracts/authorization/IAccessAdmin.sol +25 -53
  369. package/contracts/authorization/IAuthorization.sol +3 -57
  370. package/contracts/authorization/IServiceAuthorization.sol +55 -17
  371. package/contracts/authorization/ServiceAuthorization.sol +228 -34
  372. package/contracts/distribution/BasicDistribution.sol +3 -4
  373. package/contracts/distribution/BasicDistributionAuthorization.sol +11 -4
  374. package/contracts/distribution/Distribution.sol +9 -8
  375. package/contracts/distribution/DistributionService.sol +125 -62
  376. package/contracts/distribution/IDistributionComponent.sol +3 -1
  377. package/contracts/distribution/IDistributionService.sol +20 -8
  378. package/contracts/examples/fire/FireProduct.sol +6 -6
  379. package/contracts/examples/flight/FlightLib.sol +311 -0
  380. package/contracts/examples/flight/FlightMessageVerifier.sol +128 -0
  381. package/contracts/examples/flight/FlightOracle.sol +167 -0
  382. package/contracts/examples/flight/FlightOracleAuthorization.sol +34 -0
  383. package/contracts/examples/flight/FlightPool.sol +89 -0
  384. package/contracts/examples/flight/FlightPoolAuthorization.sol +37 -0
  385. package/contracts/examples/flight/FlightProduct.sol +625 -0
  386. package/contracts/examples/flight/FlightProductAuthorization.sol +44 -0
  387. package/contracts/examples/flight/FlightUSD.sol +28 -0
  388. package/contracts/examples/flight/originalV1.sol +396 -0
  389. package/contracts/examples/unpermissioned/SimpleProduct.sol +83 -19
  390. package/contracts/instance/BaseStore.sol +93 -0
  391. package/contracts/instance/IBaseStore.sol +37 -0
  392. package/contracts/instance/IInstance.sol +57 -6
  393. package/contracts/instance/IInstanceService.sol +42 -7
  394. package/contracts/instance/Instance.sol +111 -56
  395. package/contracts/instance/InstanceAdmin.sol +151 -294
  396. package/contracts/instance/InstanceAuthorizationV3.sol +106 -66
  397. package/contracts/instance/InstanceReader.sol +370 -392
  398. package/contracts/instance/InstanceService.sol +186 -134
  399. package/contracts/instance/InstanceStore.sol +153 -128
  400. package/contracts/instance/ProductStore.sol +290 -0
  401. package/contracts/instance/RiskSet.sol +10 -2
  402. package/contracts/instance/TargetNames.sol +10 -0
  403. package/contracts/instance/base/BalanceStore.sol +4 -6
  404. package/contracts/instance/base/ObjectLifecycle.sol +2 -6
  405. package/contracts/instance/module/IBundle.sol +6 -5
  406. package/contracts/instance/module/IComponents.sol +15 -5
  407. package/contracts/instance/module/IDistribution.sol +17 -7
  408. package/contracts/instance/module/IPolicy.sol +28 -8
  409. package/contracts/instance/module/IRisk.sol +2 -0
  410. package/contracts/oracle/BasicOracle.sol +2 -3
  411. package/contracts/oracle/BasicOracleAuthorization.sol +18 -2
  412. package/contracts/oracle/IOracle.sol +9 -4
  413. package/contracts/oracle/IOracleService.sol +12 -12
  414. package/contracts/oracle/Oracle.sol +4 -6
  415. package/contracts/oracle/OracleService.sol +8 -8
  416. package/contracts/pool/BasicPool.sol +4 -16
  417. package/contracts/pool/BasicPoolAuthorization.sol +10 -5
  418. package/contracts/pool/BundleService.sol +34 -43
  419. package/contracts/pool/IBundleService.sol +14 -13
  420. package/contracts/pool/IPoolService.sol +7 -2
  421. package/contracts/pool/Pool.sol +6 -18
  422. package/contracts/pool/PoolLib.sol +127 -2
  423. package/contracts/pool/PoolService.sol +40 -181
  424. package/contracts/product/ApplicationService.sol +64 -11
  425. package/contracts/product/BasicProduct.sol +2 -3
  426. package/contracts/product/BasicProductAuthorization.sol +13 -5
  427. package/contracts/product/ClaimService.sol +99 -105
  428. package/contracts/product/IApplicationService.sol +21 -2
  429. package/contracts/product/IClaimService.sol +5 -4
  430. package/contracts/product/IPolicyService.sol +9 -2
  431. package/contracts/product/IRiskService.sol +18 -3
  432. package/contracts/product/PolicyService.sol +40 -59
  433. package/contracts/product/PolicyServiceLib.sol +79 -5
  434. package/contracts/product/PricingService.sol +28 -31
  435. package/contracts/product/Product.sol +40 -16
  436. package/contracts/product/RiskService.sol +50 -15
  437. package/contracts/registry/IRegistry.sol +15 -9
  438. package/contracts/registry/IRelease.sol +6 -3
  439. package/contracts/registry/Registry.sol +15 -9
  440. package/contracts/registry/RegistryAdmin.sol +33 -118
  441. package/contracts/registry/RegistryAuthorization.sol +139 -69
  442. package/contracts/registry/RegistryService.sol +1 -1
  443. package/contracts/registry/ReleaseAdmin.sol +52 -106
  444. package/contracts/registry/ReleaseRegistry.sol +20 -12
  445. package/contracts/registry/ServiceAuthorizationV3.sol +43 -32
  446. package/contracts/registry/TokenRegistry.sol +56 -52
  447. package/contracts/shared/Component.sol +8 -8
  448. package/contracts/shared/ComponentService.sol +245 -262
  449. package/contracts/shared/ContractLib.sol +106 -75
  450. package/contracts/shared/EcdsaChecker.sol +5 -0
  451. package/contracts/shared/IComponent.sol +1 -1
  452. package/contracts/shared/IComponentService.sol +14 -15
  453. package/contracts/shared/INftOwnable.sol +2 -0
  454. package/contracts/shared/IRegisterable.sol +0 -1
  455. package/contracts/shared/InstanceLinkedComponent.sol +63 -26
  456. package/contracts/shared/NftOwnable.sol +3 -1
  457. package/contracts/shared/PolicyHolder.sol +3 -2
  458. package/contracts/shared/Service.sol +6 -4
  459. package/contracts/staking/IStaking.sol +261 -70
  460. package/contracts/staking/IStakingService.sol +39 -84
  461. package/contracts/staking/ITargetLimitHandler.sol +17 -0
  462. package/contracts/staking/Staking.sol +468 -217
  463. package/contracts/staking/StakingLib.sol +38 -124
  464. package/contracts/staking/StakingManager.sol +4 -3
  465. package/contracts/staking/StakingReader.sol +62 -71
  466. package/contracts/staking/StakingService.sol +42 -185
  467. package/contracts/staking/StakingServiceManager.sol +1 -0
  468. package/contracts/staking/StakingStore.sol +1093 -331
  469. package/contracts/staking/TargetHandler.sol +132 -0
  470. package/contracts/staking/TargetManagerLib.sol +69 -46
  471. package/contracts/type/Amount.sol +4 -0
  472. package/contracts/type/Blocknumber.sol +17 -22
  473. package/contracts/type/ChainId.sol +101 -0
  474. package/contracts/type/Fee.sol +8 -8
  475. package/contracts/type/NftId.sol +3 -3
  476. package/contracts/type/ObjectType.sol +17 -33
  477. package/contracts/type/Referral.sol +6 -0
  478. package/contracts/type/RequestIdSet.sol +62 -0
  479. package/contracts/type/RoleId.sol +57 -59
  480. package/contracts/type/Seconds.sol +23 -0
  481. package/contracts/type/String.sol +42 -0
  482. package/contracts/type/Timestamp.sol +14 -3
  483. package/contracts/type/UFixed.sol +28 -10
  484. package/contracts/upgradeability/IVersionable.sol +3 -0
  485. package/contracts/upgradeability/ProxyManager.sol +26 -12
  486. package/contracts/upgradeability/UpgradableProxyWithAdmin.sol +12 -2
  487. package/contracts/upgradeability/Versionable.sol +6 -3
  488. package/package.json +2 -1
  489. package/artifacts/contracts/authorization/AccessAdmin.sol/IAccessManagedChecker.dbg.json +0 -4
  490. package/artifacts/contracts/authorization/AccessAdmin.sol/IAccessManagedChecker.json +0 -24
  491. package/artifacts/contracts/shared/ComponentVerifyingService.sol/ComponentVerifyingService.dbg.json +0 -4
  492. package/artifacts/contracts/shared/ComponentVerifyingService.sol/ComponentVerifyingService.json +0 -485
  493. package/artifacts/contracts/shared/IKeyValueStore.sol/IKeyValueStore.dbg.json +0 -4
  494. package/artifacts/contracts/shared/KeyValueStore.sol/KeyValueStore.dbg.json +0 -4
  495. package/artifacts/contracts/shared/KeyValueStore.sol/KeyValueStore.json +0 -538
  496. package/artifacts/contracts/staking/StakingLifecycle.sol/StakingLifecycle.dbg.json +0 -4
  497. package/artifacts/contracts/staking/StakingLifecycle.sol/StakingLifecycle.json +0 -205
  498. package/contracts/shared/ComponentVerifyingService.sol +0 -128
  499. package/contracts/shared/IKeyValueStore.sol +0 -54
  500. package/contracts/shared/KeyValueStore.sol +0 -131
  501. package/contracts/staking/StakingLifecycle.sol +0 -23
@@ -5,11 +5,13 @@ import {ERC165Checker} from "@openzeppelin/contracts/utils/introspection/ERC165C
5
5
  import {IAccessManager} from "@openzeppelin/contracts/access/manager/IAccessManager.sol";
6
6
  import {IAccessManaged} from "@openzeppelin/contracts/access/manager/IAccessManaged.sol";
7
7
 
8
- // import {InstanceAdmin} from "../instance/InstanceAdmin.sol";
9
- import {IRegistry} from "../registry/IRegistry.sol";
10
8
  import {IPolicyHolder} from "../shared/IPolicyHolder.sol";
9
+ import {IRegistry} from "../registry/IRegistry.sol";
10
+ import {IService} from "../shared/IService.sol";
11
+
12
+ import {ChainId} from "../type/ChainId.sol";
11
13
  import {NftId} from "../type/NftId.sol";
12
- import {ObjectType, PRODUCT, DISTRIBUTION, ORACLE, POOL, STAKING} from "../type/ObjectType.sol";
14
+ import {ObjectType, INSTANCE, PRODUCT, DISTRIBUTION, ORACLE, POOL} from "../type/ObjectType.sol";
13
15
  import {VersionPart} from "../type/Version.sol";
14
16
 
15
17
  interface ITargetHelper {
@@ -21,44 +23,18 @@ interface IInstanceAdminHelper {
21
23
  }
22
24
 
23
25
  interface ITokenRegistryHelper {
24
- function isActive(uint256 chainId, address token, VersionPart release) external view returns (bool);
26
+ function isActive(ChainId chainId, address token, VersionPart release) external view returns (bool);
25
27
  }
26
28
 
27
29
  library ContractLib {
28
30
 
29
- error ErrorContractLibNotRegistered(address target);
30
- error ErrorContractLibNotComponent(NftId componentNftId, ObjectType objectType);
31
- error ErrorContractLibNotStaking(NftId componentNftId, ObjectType objectType);
31
+ error ErrorContractLibCallerNotRegistered(address target);
32
+ error ErrorContractLibCallerNotComponent(NftId componentNftId, ObjectType objectType);
33
+ error ErrorContractLibParentNotInstance(NftId componentNftId, NftId parentNftId);
34
+ error ErrorContractLibParentNotProduct(NftId componentNftId, NftId parentNftId);
32
35
  error ErrorContractLibComponentTypeMismatch(NftId componentNftId, ObjectType expectedType, ObjectType actualType);
33
36
  error ErrorContractLibComponentInactive(NftId componentNftId);
34
37
 
35
- function getAndVerifyComponent(
36
- IRegistry registry,
37
- address target,
38
- ObjectType expectedType,
39
- bool onlyActive
40
- )
41
- external
42
- view
43
- returns (
44
- IRegistry.ObjectInfo memory info,
45
- address instance
46
- )
47
- {
48
- // check target is component
49
- info = _getObjectInfo(registry, target);
50
- if(info.objectType != expectedType) {
51
- revert ErrorContractLibComponentTypeMismatch(
52
- info.nftId,
53
- expectedType,
54
- info.objectType);
55
- }
56
-
57
- // get instance and check component is active
58
- instance = _getInstance(registry, info);
59
- _checkComponentActive(instance, target, info.nftId, onlyActive);
60
- }
61
-
62
38
 
63
39
  function getInfoAndInstance(
64
40
  IRegistry registry,
@@ -73,34 +49,42 @@ library ContractLib {
73
49
  )
74
50
  {
75
51
  info = registry.getObjectInfo(componentNftId);
76
- instance = _getInstance(registry, info);
77
- _checkComponentActive(instance, info.objectAddress, info.nftId, onlyActive);
52
+ return _getAndVerifyComponentAndInstance(registry, info, info.objectType, onlyActive);
78
53
  }
79
54
 
80
55
 
81
- function getAndVerifyStaking(
56
+ function getAndVerifyAnyComponent(
82
57
  IRegistry registry,
83
- address target
58
+ address caller,
59
+ bool onlyActive
84
60
  )
85
61
  external
86
62
  view
87
63
  returns (
88
- IRegistry.ObjectInfo memory info
64
+ IRegistry.ObjectInfo memory callerInfo,
65
+ address instance
89
66
  )
90
67
  {
91
- // check target is component
92
- info = _getObjectInfo(registry, target);
93
- if(info.objectType != STAKING()) {
94
- revert ErrorContractLibNotStaking(
95
- info.nftId,
96
- info.objectType);
68
+ // check caller is component
69
+ callerInfo = _getAndVerifyObjectInfo(registry, caller);
70
+ if(!(callerInfo.objectType == PRODUCT()
71
+ || callerInfo.objectType == POOL()
72
+ || callerInfo.objectType == DISTRIBUTION()
73
+ || callerInfo.objectType == ORACLE())
74
+ ) {
75
+ revert ErrorContractLibCallerNotComponent(
76
+ callerInfo.nftId,
77
+ callerInfo.objectType);
97
78
  }
79
+
80
+ return _getAndVerifyComponentAndInstance(registry, callerInfo, callerInfo.objectType, onlyActive);
98
81
  }
99
82
 
100
83
 
101
- function getAndVerifyAnyComponent(
84
+ function getAndVerifyComponent(
102
85
  IRegistry registry,
103
- address target,
86
+ address caller,
87
+ ObjectType expectedType,
104
88
  bool onlyActive
105
89
  )
106
90
  external
@@ -110,21 +94,8 @@ library ContractLib {
110
94
  address instance
111
95
  )
112
96
  {
113
- // check target is component
114
- info = _getObjectInfo(registry, target);
115
- if(!(info.objectType == PRODUCT()
116
- || info.objectType == POOL()
117
- || info.objectType == DISTRIBUTION()
118
- || info.objectType == ORACLE())
119
- ) {
120
- revert ErrorContractLibNotComponent(
121
- info.nftId,
122
- info.objectType);
123
- }
124
-
125
- // get instance and check component is active
126
- instance = _getInstance(registry, info);
127
- _checkComponentActive(instance, target, info.nftId, onlyActive);
97
+ info = _getAndVerifyObjectInfo(registry, caller);
98
+ return _getAndVerifyComponentAndInstance(registry, info, expectedType, onlyActive);
128
99
  }
129
100
 
130
101
 
@@ -144,8 +115,8 @@ library ContractLib {
144
115
 
145
116
  function isActiveToken(
146
117
  address tokenRegistryAddress,
118
+ ChainId chainId,
147
119
  address token,
148
- uint256 chainId,
149
120
  VersionPart release
150
121
  )
151
122
  external
@@ -157,6 +128,7 @@ library ContractLib {
157
128
  chainId, token, release);
158
129
  }
159
130
 
131
+
160
132
  function isPolicyHolder(address target) external view returns (bool) {
161
133
  return ERC165Checker.supportsInterface(target, type(IPolicyHolder).interfaceId);
162
134
  }
@@ -198,6 +170,15 @@ library ContractLib {
198
170
  }
199
171
 
200
172
 
173
+ function isService(address service) public view returns (bool) {
174
+ if (!isContract(service)) {
175
+ return false;
176
+ }
177
+
178
+ return supportsInterface(service, type(IService).interfaceId);
179
+ }
180
+
181
+
201
182
  function isRegistry(address registry) public view returns (bool) {
202
183
  if (!isContract(registry)) {
203
184
  return false;
@@ -224,6 +205,37 @@ library ContractLib {
224
205
  }
225
206
 
226
207
 
208
+ function _getAndVerifyComponentAndInstance(
209
+ IRegistry registry,
210
+ IRegistry.ObjectInfo memory info,
211
+ ObjectType expectedType,
212
+ bool onlyActive
213
+ )
214
+ internal
215
+ view
216
+ returns (
217
+ IRegistry.ObjectInfo memory,
218
+ address instance
219
+ )
220
+ {
221
+ if(info.objectType != expectedType) {
222
+ revert ErrorContractLibComponentTypeMismatch(
223
+ info.nftId,
224
+ expectedType,
225
+ info.objectType);
226
+ }
227
+
228
+ // get instance and check component is active
229
+ instance = getAndVerifyInstance(registry, info);
230
+ _checkComponentActive(instance, info.objectAddress, info.nftId, onlyActive);
231
+
232
+ return (
233
+ info,
234
+ instance
235
+ );
236
+ }
237
+
238
+
227
239
  function _checkComponentActive(
228
240
  address instance,
229
241
  address target,
@@ -244,36 +256,55 @@ library ContractLib {
244
256
  }
245
257
 
246
258
 
247
- function _getInstance(
259
+ /// @dev Given an object info the function returns the instance address.
260
+ /// The info may represent a product or any other component.
261
+ /// If the parent of the provided info is not registered with the correct type, the function reverts.
262
+ function getAndVerifyInstance(
248
263
  IRegistry registry,
249
264
  IRegistry.ObjectInfo memory info
250
265
  )
251
- internal
266
+ public
252
267
  view
253
268
  returns (address instance)
254
269
  {
270
+ // get instance for product case
255
271
  if (info.objectType == PRODUCT()) {
256
- return registry.getObjectAddress(
272
+ // verify that parent of product is registered instance
273
+ IRegistry.ObjectInfo memory instanceInfo = registry.getObjectInfo(info.parentNftId);
274
+ if (instanceInfo.objectType != INSTANCE()) {
275
+ revert ErrorContractLibParentNotInstance(
276
+ info.nftId,
277
+ info.parentNftId);
278
+ }
279
+
280
+ // we have verified that parent object is a registerd instance -> we return the instance address
281
+ return instanceInfo.objectAddress;
282
+ }
283
+
284
+ // not product: verify parent is registered product
285
+ info = registry.getObjectInfo(info.parentNftId);
286
+ if (info.objectType != PRODUCT()) {
287
+ revert ErrorContractLibParentNotProduct(
288
+ info.nftId,
257
289
  info.parentNftId);
258
- }
259
-
260
- return registry.getObjectAddress(
261
- registry.getObjectInfo(
262
- info.parentNftId).parentNftId);
290
+ }
291
+
292
+ // we have verified that parent is registerd product -> we can rely on registry that its parent is an instance
293
+ return registry.getObjectAddress(info.parentNftId);
263
294
  }
264
295
 
265
296
 
266
- function _getObjectInfo(
297
+ function _getAndVerifyObjectInfo(
267
298
  IRegistry registry,
268
- address target
299
+ address caller
269
300
  )
270
301
  internal
271
302
  view
272
303
  returns (IRegistry.ObjectInfo memory info)
273
304
  {
274
- NftId componentNftId = registry.getNftIdForAddress(target);
305
+ NftId componentNftId = registry.getNftIdForAddress(caller);
275
306
  if (componentNftId.eqz()) {
276
- revert ErrorContractLibNotRegistered(target);
307
+ revert ErrorContractLibCallerNotRegistered(caller);
277
308
  }
278
309
 
279
310
  info = registry.getObjectInfo(componentNftId);
@@ -0,0 +1,5 @@
1
+ // SPDX-License-Identifier: Apache-2.0
2
+ pragma solidity ^0.8.20;
3
+
4
+ import {MessageHashUtils} from "@openzeppelin/contracts/utils/cryptography/MessageHashUtils.sol";
5
+ import {SignatureChecker} from "@openzeppelin/contracts/utils/cryptography/SignatureChecker.sol";
@@ -40,7 +40,7 @@ interface IComponent is
40
40
  function getTokenHandler() external view returns (TokenHandler tokenHandler);
41
41
 
42
42
  /// @dev defines the wallet address used to hold the ERC20 tokens related to this component
43
- /// the default address is the component token address
43
+ /// the default address is the token handler address
44
44
  function getWallet() external view returns (address walletAddress);
45
45
 
46
46
  /// @dev returns true iff this compoent intercepts nft minting and transfers for objects registered by this component
@@ -16,22 +16,20 @@ import {VersionPart} from "../type/Version.sol";
16
16
  interface IComponentService is
17
17
  IService
18
18
  {
19
+ // registerProduct
20
+ error ErrorComponentServiceCallerNotInstance(address caller);
21
+ error ErrorComponentServiceNotProduct(address product);
19
22
  error ErrorComponentServiceTokenInvalid(address token);
20
23
 
21
- error ErrorComponentServiceNotInstanceLinkedComponent(address component);
22
- error ErrorComponentServiceSenderNotRegistered(address sender);
24
+ // registerComponent
25
+ error ErrorComponentServiceCallerNotProduct(address caller);
23
26
  error ErrorComponentServiceNotComponent(address component);
24
- error ErrorComponentServiceTypeNotSupported(address component, ObjectType invalidType);
25
- error ErrorComponentServiceInvalidType(address component, ObjectType requiredType, ObjectType componentType);
26
- error ErrorComponentServiceAlreadyRegistered(address component);
27
- error ErrorComponentServiceReleaseMismatch(address component, VersionPart componentRelease, VersionPart parentRelease);
28
- error ErrorComponentServiceSenderNotComponentParent(NftId senderNftId, NftId compnentParentNftId);
29
- error ErrorComponentServiceParentNotInstance(NftId nftId, ObjectType objectType);
30
- error ErrorComponentServiceParentNotProduct(NftId nftId, ObjectType objectType);
31
-
32
- error ErrorComponentServiceNotRegistered(address instanceAddress);
33
- error ErrorComponentServiceNotInstance(address instanceAddress, ObjectType objectType);
34
- error ErrorComponentServiceInstanceVersionMismatch(address instanceAddress, VersionPart instanceVersion);
27
+
28
+ error ErrorComponentServiceNotInstanceLinkedComponent(address component);
29
+ error ErrorComponentServiceComponentTypeNotSupported(address component, ObjectType invalid);
30
+ error ErrorComponentServiceComponentParentInvalid(address component, NftId required, NftId actual);
31
+ error ErrorComponentServiceComponentReleaseMismatch(address component, VersionPart serviceRelease, VersionPart componentRelease);
32
+ error ErrorComponentServiceComponentAlreadyRegistered(address component);
35
33
 
36
34
  error ErrorProductServiceNoDistributionExpected(NftId productNftId);
37
35
  error ErrorProductServiceDistributionAlreadyRegistered(NftId productNftId, NftId distributionNftId);
@@ -47,6 +45,7 @@ interface IComponentService is
47
45
  error ErrorComponentServiceWithdrawAmountExceedsLimit(Amount withdrawnAmount, Amount withdrawLimit);
48
46
  error ErrorComponentServiceWalletAllowanceTooSmall(address wallet, address spender, uint256 allowance, uint256 amount);
49
47
 
48
+ event LogComponentServiceComponentLocked(address component, bool locked);
50
49
  event LogComponentServiceRegistered(NftId instanceNftId, NftId componentNftId, ObjectType componentType, address component, address token, address initialOwner);
51
50
  event LogComponentServiceWalletAddressChanged(NftId componentNftId, address currentWallet, address newWallet);
52
51
  event LogComponentServiceWalletTokensTransferred(NftId componentNftId, address currentWallet, address newWallet, uint256 currentBalance);
@@ -58,9 +57,9 @@ interface IComponentService is
58
57
  NftId nftId,
59
58
  string feeName,
60
59
  UFixed previousFractionalFee,
61
- uint256 previousFixedFee,
60
+ Amount previousFixedFee,
62
61
  UFixed newFractionalFee,
63
- uint256 newFixedFee
62
+ Amount newFixedFee
64
63
  );
65
64
 
66
65
  //-------- component ----------------------------------------------------//
@@ -11,6 +11,8 @@ interface INftOwnable is
11
11
  IERC165,
12
12
  IRegistryLinked
13
13
  {
14
+ event LogNftOwnableNftLinkedToAddress(NftId nftId, address owner);
15
+
14
16
  error ErrorNftOwnableInitialOwnerZero();
15
17
  error ErrorNftOwnableNotOwner(address account);
16
18
  error ErrorNftOwnableInvalidType(NftId nftId, ObjectType expectedObjectType);
@@ -6,7 +6,6 @@ import {IAccessManaged} from "@openzeppelin/contracts/access/manager/IAccessMana
6
6
  import {INftOwnable} from "./INftOwnable.sol";
7
7
  import {IRelease} from "../registry/IRelease.sol";
8
8
  import {IRegistry} from "../registry/IRegistry.sol";
9
- import {VersionPart} from "../type/Version.sol";
10
9
 
11
10
  /// @title IRegisterable
12
11
  /// @dev Marks contracts that are intended to be registered in the registry.
@@ -1,27 +1,24 @@
1
1
  // SPDX-License-Identifier: Apache-2.0
2
2
  pragma solidity ^0.8.20;
3
3
 
4
- import {AccessManagedUpgradeable} from "@openzeppelin/contracts-upgradeable/access/manager/AccessManagedUpgradeable.sol";
5
- import {IAccessManaged} from "@openzeppelin/contracts/access/manager/IAccessManaged.sol";
6
- import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
7
- import {SafeERC20} from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
8
-
9
- import {Amount} from "../type/Amount.sol";
10
- import {Component} from "./Component.sol";
11
- import {IComponentService} from "./IComponentService.sol";
12
- import {IInstanceLinkedComponent} from "./IInstanceLinkedComponent.sol";
13
4
  import {IAuthorization} from "../authorization/IAuthorization.sol";
14
5
  import {IComponents} from "../instance/module/IComponents.sol";
15
- import {IInstanceService} from "../instance/IInstanceService.sol";
6
+ import {IComponentService} from "./IComponentService.sol";
16
7
  import {IInstance} from "../instance/IInstance.sol";
8
+ import {IInstanceLinkedComponent} from "./IInstanceLinkedComponent.sol";
9
+ import {IInstanceService} from "../instance/IInstanceService.sol";
10
+ import {IOracleService} from "../oracle/IOracleService.sol";
11
+
12
+ import {Amount} from "../type/Amount.sol";
13
+ import {Component} from "./Component.sol";
17
14
  import {InstanceReader} from "../instance/InstanceReader.sol";
18
15
  import {IRegistry} from "../registry/IRegistry.sol";
19
16
  import {NftId} from "../type/NftId.sol";
20
- import {ObjectType, COMPONENT, INSTANCE, PRODUCT} from "../type/ObjectType.sol";
21
- import {VersionPart} from "../type/Version.sol";
17
+ import {ObjectType, COMPONENT, INSTANCE, ORACLE, PRODUCT} from "../type/ObjectType.sol";
18
+ import {RequestId} from "../type/RequestId.sol";
22
19
  import {RoleId, RoleIdLib} from "../type/RoleId.sol";
23
- import {IAccess} from "../authorization/IAccess.sol";
24
20
  import {TokenHandler} from "../shared/TokenHandler.sol";
21
+ import {Timestamp} from "../type/Timestamp.sol";
25
22
  import {VersionPart} from "../type/Version.sol";
26
23
 
27
24
  // then add (Distribution|Pool|Product)Upradeable that also intherit from Versionable
@@ -38,8 +35,23 @@ abstract contract InstanceLinkedComponent is
38
35
  InstanceReader _instanceReader; // instance reader for this component
39
36
  IAuthorization _initialAuthorization;
40
37
  IComponentService _componentService;
38
+ IOracleService _oracleService;
41
39
  }
42
40
 
41
+ //--- view functions ----------------------------------------------------//
42
+
43
+ /// @inheritdoc IInstanceLinkedComponent
44
+ function getInstance() public view virtual override returns (IInstance instance) {
45
+ return _getInstanceLinkedComponentStorage()._instance;
46
+ }
47
+
48
+
49
+ /// @inheritdoc IInstanceLinkedComponent
50
+ function getAuthorization() external view virtual returns (IAuthorization authorization) {
51
+ return _getInstanceLinkedComponentStorage()._initialAuthorization;
52
+ }
53
+
54
+
43
55
  /// @inheritdoc IInstanceLinkedComponent
44
56
  function withdrawFees(Amount amount)
45
57
  external
@@ -51,31 +63,57 @@ abstract contract InstanceLinkedComponent is
51
63
  return _withdrawFees(amount);
52
64
  }
53
65
 
54
- /// @inheritdoc IInstanceLinkedComponent
55
- function getInstance() public view override returns (IInstance instance) {
56
- return _getInstanceLinkedComponentStorage()._instance;
66
+ //--- internal functions ------------------------------------------------//
67
+
68
+ function _sendRequest(
69
+ NftId oracleNftId,
70
+ bytes memory requestData,
71
+ Timestamp expiryAt,
72
+ string memory callbackMethod
73
+ )
74
+ internal
75
+ virtual
76
+ returns (RequestId requestId)
77
+ {
78
+ return _getInstanceLinkedComponentStorage()._oracleService.request(
79
+ oracleNftId,
80
+ requestData,
81
+ expiryAt,
82
+ callbackMethod);
57
83
  }
58
84
 
59
- /// @inheritdoc IInstanceLinkedComponent
60
- function getAuthorization() external view returns (IAuthorization authorization) {
61
- return _getInstanceLinkedComponentStorage()._initialAuthorization;
85
+
86
+ function _cancelRequest(RequestId requestId)
87
+ internal
88
+ virtual
89
+ {
90
+ _getInstanceLinkedComponentStorage()._oracleService.cancel(requestId);
62
91
  }
63
92
 
93
+
94
+ function _resendRequest(RequestId requestId)
95
+ internal
96
+ virtual
97
+ {
98
+ _getInstanceLinkedComponentStorage()._oracleService.resend(requestId);
99
+ }
100
+
101
+
64
102
  function _getInstanceLinkedComponentStorage() private pure returns (InstanceLinkedComponentStorage storage $) {
65
103
  assembly {
66
104
  $.slot := INSTANCE_LINKED_COMPONENT_LOCATION_V1
67
105
  }
68
106
  }
69
107
 
70
- function _initializeInstanceLinkedComponent(
108
+
109
+ function __InstanceLinkedComponent_init(
71
110
  address registry,
72
111
  NftId parentNftId,
73
112
  string memory name,
74
113
  ObjectType componentType,
75
114
  IAuthorization authorization,
76
115
  bool isInterceptor,
77
- address initialOwner,
78
- bytes memory componentData // data that will saved with the component info in the instance store
116
+ address initialOwner
79
117
  )
80
118
  internal
81
119
  virtual
@@ -93,7 +131,7 @@ abstract contract InstanceLinkedComponent is
93
131
  IRegistry(registry).getObjectAddress(instanceNftId));
94
132
 
95
133
  // set component specific parameters
96
- _initializeComponent(
134
+ __Component_init(
97
135
  $._instance.authority(), // instance linked components need to point to instance admin
98
136
  registry,
99
137
  parentNftId,
@@ -101,16 +139,15 @@ abstract contract InstanceLinkedComponent is
101
139
  componentType,
102
140
  isInterceptor,
103
141
  initialOwner,
104
- "", // registry data
105
- componentData);
142
+ ""); // registry data
106
143
 
107
144
  // set instance linked specific parameters
108
145
  $._instanceReader = $._instance.getInstanceReader();
109
146
  $._initialAuthorization = authorization;
110
147
  $._componentService = IComponentService(_getServiceAddress(COMPONENT()));
148
+ $._oracleService = IOracleService(_getServiceAddress(ORACLE()));
111
149
 
112
150
  // register interfaces
113
- _registerInterface(type(IAccessManaged).interfaceId);
114
151
  _registerInterface(type(IInstanceLinkedComponent).interfaceId);
115
152
  }
116
153
 
@@ -41,7 +41,7 @@ contract NftOwnable is
41
41
  }
42
42
 
43
43
  function _checkNftType(NftId nftId, ObjectType expectedObjectType) internal view {
44
- if(!getRegistry().isObjectType(nftId, expectedObjectType)) {
44
+ if(expectedObjectType.eqz() || !getRegistry().isObjectType(nftId, expectedObjectType)) {
45
45
  revert ErrorNftOwnableInvalidType(nftId, expectedObjectType);
46
46
  }
47
47
  }
@@ -114,6 +114,8 @@ contract NftOwnable is
114
114
 
115
115
  $._nftId = getRegistry().getNftIdForAddress(nftOwnableAddress);
116
116
 
117
+ emit LogNftOwnableNftLinkedToAddress($._nftId, getOwner());
118
+
117
119
  return $._nftId;
118
120
  }
119
121
 
@@ -3,12 +3,13 @@ pragma solidity ^0.8.20;
3
3
 
4
4
  import {IERC721Receiver} from "@openzeppelin/contracts/token/ERC721/IERC721Receiver.sol";
5
5
 
6
+ import {IPolicyHolder} from "./IPolicyHolder.sol";
7
+
6
8
  import {Amount} from "../type/Amount.sol";
7
9
  import {ClaimId} from "../type/ClaimId.sol";
8
10
  import {InitializableERC165} from "./InitializableERC165.sol";
9
- import {IPolicyHolder} from "./IPolicyHolder.sol";
10
11
  import {NftId} from "../type/NftId.sol";
11
- import {PayoutId, PayoutIdLib} from "../type/PayoutId.sol";
12
+ import {PayoutId} from "../type/PayoutId.sol";
12
13
  import {RegistryLinked} from "./RegistryLinked.sol";
13
14
  import {Timestamp} from "../type/Timestamp.sol";
14
15
 
@@ -1,16 +1,15 @@
1
1
  // SPDX-License-Identifier: Apache-2.0
2
2
  pragma solidity ^0.8.20;
3
3
 
4
- import {IAccessManaged} from "@openzeppelin/contracts/access/manager/IAccessManaged.sol";
5
4
  import {ReentrancyGuardUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/ReentrancyGuardUpgradeable.sol";
6
5
 
7
6
  import {IRegistry} from "../registry/IRegistry.sol";
8
7
  import {IService} from "./IService.sol";
9
8
  import {IVersionable} from "../upgradeability/IVersionable.sol";
10
- import {ObjectType, REGISTRY, SERVICE} from "../type/ObjectType.sol";
9
+ import {ObjectType, SERVICE} from "../type/ObjectType.sol";
11
10
  import {Registerable} from "./Registerable.sol";
12
11
  import {RoleId, RoleIdLib} from "../type/RoleId.sol";
13
- import {Version, VersionLib, VersionPartLib} from "../type/Version.sol";
12
+ import {Version, VersionLib} from "../type/Version.sol";
14
13
  import {Versionable} from "../upgradeability/Versionable.sol";
15
14
 
16
15
 
@@ -53,12 +52,15 @@ abstract contract Service is
53
52
  return VersionLib.toVersion(3, 0, 0);
54
53
  }
55
54
 
55
+
56
56
  function getRoleId() external virtual view returns(RoleId serviceRoleId) {
57
- return RoleIdLib.roleForTypeAndVersion(_getDomain(), getRelease());
57
+ return RoleIdLib.toServiceRoleId(_getDomain(), getRelease());
58
58
  }
59
59
 
60
+ //--- internal functions --------------------------------------------------------//
60
61
  function _getDomain() internal virtual pure returns (ObjectType);
61
62
 
63
+
62
64
  function _getServiceAddress(ObjectType domain) internal view returns (address) {
63
65
  return getRegistry().getServiceAddress(domain, getRelease());
64
66
  }