@etherisc/gif-next 0.0.2-df73b56-462 → 0.0.2-e016345-525

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 (453) hide show
  1. package/README.md +27 -6
  2. package/artifacts/contracts/accounting/AccountingService.sol/AccountingService.dbg.json +4 -0
  3. package/artifacts/contracts/accounting/AccountingService.sol/AccountingService.json +944 -0
  4. package/artifacts/contracts/accounting/AccountingServiceManager.sol/AccountingServiceManager.dbg.json +4 -0
  5. package/artifacts/contracts/accounting/AccountingServiceManager.sol/AccountingServiceManager.json +746 -0
  6. package/artifacts/contracts/accounting/IAccountingService.sol/IAccountingService.dbg.json +4 -0
  7. package/artifacts/contracts/accounting/IAccountingService.sol/IAccountingService.json +711 -0
  8. package/artifacts/contracts/authorization/AccessAdmin.sol/AccessAdmin.dbg.json +1 -1
  9. package/artifacts/contracts/authorization/AccessAdmin.sol/AccessAdmin.json +96 -37
  10. package/artifacts/contracts/authorization/AccessAdmin.sol/IAccessManagedChecker.dbg.json +4 -0
  11. package/artifacts/contracts/authorization/AccessAdmin.sol/IAccessManagedChecker.json +24 -0
  12. package/artifacts/contracts/authorization/AccessManagerCloneable.sol/AccessManagerCloneable.dbg.json +1 -1
  13. package/artifacts/contracts/authorization/Authorization.sol/Authorization.dbg.json +1 -1
  14. package/artifacts/contracts/authorization/Authorization.sol/Authorization.json +67 -11
  15. package/artifacts/contracts/authorization/IAccess.sol/IAccess.dbg.json +1 -1
  16. package/artifacts/contracts/authorization/IAccessAdmin.sol/IAccessAdmin.dbg.json +1 -1
  17. package/artifacts/contracts/authorization/IAccessAdmin.sol/IAccessAdmin.json +60 -13
  18. package/artifacts/contracts/authorization/IAuthorization.sol/IAuthorization.dbg.json +1 -1
  19. package/artifacts/contracts/authorization/IAuthorization.sol/IAuthorization.json +40 -3
  20. package/artifacts/contracts/authorization/IServiceAuthorization.sol/IServiceAuthorization.dbg.json +1 -1
  21. package/artifacts/contracts/authorization/IServiceAuthorization.sol/IServiceAuthorization.json +19 -0
  22. package/artifacts/contracts/authorization/ReleaseAccessManager.sol/ReleaseAccessManager.dbg.json +4 -0
  23. package/artifacts/contracts/authorization/ReleaseAccessManager.sol/ReleaseAccessManager.json +1196 -0
  24. package/artifacts/contracts/authorization/ServiceAuthorization.sol/ServiceAuthorization.dbg.json +1 -1
  25. package/artifacts/contracts/authorization/ServiceAuthorization.sol/ServiceAuthorization.json +68 -5
  26. package/artifacts/contracts/distribution/BasicDistribution.sol/BasicDistribution.dbg.json +1 -1
  27. package/artifacts/contracts/distribution/BasicDistribution.sol/BasicDistribution.json +159 -209
  28. package/artifacts/contracts/distribution/BasicDistributionAuthorization.sol/BasicDistributionAuthorization.dbg.json +1 -1
  29. package/artifacts/contracts/distribution/BasicDistributionAuthorization.sol/BasicDistributionAuthorization.json +82 -22
  30. package/artifacts/contracts/distribution/Distribution.sol/Distribution.dbg.json +1 -1
  31. package/artifacts/contracts/distribution/Distribution.sol/Distribution.json +99 -125
  32. package/artifacts/contracts/distribution/DistributionService.sol/DistributionService.dbg.json +1 -1
  33. package/artifacts/contracts/distribution/DistributionService.sol/DistributionService.json +175 -86
  34. package/artifacts/contracts/distribution/DistributionServiceManager.sol/DistributionServiceManager.dbg.json +1 -1
  35. package/artifacts/contracts/distribution/DistributionServiceManager.sol/DistributionServiceManager.json +104 -60
  36. package/artifacts/contracts/distribution/IDistributionComponent.sol/IDistributionComponent.dbg.json +1 -1
  37. package/artifacts/contracts/distribution/IDistributionComponent.sol/IDistributionComponent.json +87 -108
  38. package/artifacts/contracts/distribution/IDistributionService.sol/IDistributionService.dbg.json +1 -1
  39. package/artifacts/contracts/distribution/IDistributionService.sol/IDistributionService.json +52 -0
  40. package/artifacts/contracts/examples/fire/DamageLevel.sol/DamageLevelLib.dbg.json +4 -0
  41. package/artifacts/contracts/examples/fire/DamageLevel.sol/DamageLevelLib.json +22 -0
  42. package/artifacts/contracts/examples/fire/FirePool.sol/FirePool.dbg.json +4 -0
  43. package/artifacts/contracts/examples/fire/FirePool.sol/FirePool.json +1441 -0
  44. package/artifacts/contracts/examples/fire/FirePoolAuthorization.sol/FirePoolAuthorization.dbg.json +4 -0
  45. package/artifacts/contracts/examples/fire/FirePoolAuthorization.sol/FirePoolAuthorization.json +502 -0
  46. package/artifacts/contracts/examples/fire/FireProduct.sol/FireProduct.dbg.json +4 -0
  47. package/artifacts/contracts/examples/fire/FireProduct.sol/FireProduct.json +1991 -0
  48. package/artifacts/contracts/examples/fire/FireProductAuthorization.sol/FireProductAuthorization.dbg.json +4 -0
  49. package/artifacts/contracts/examples/fire/FireProductAuthorization.sol/FireProductAuthorization.json +470 -0
  50. package/artifacts/contracts/examples/fire/FireUSD.sol/FireUSD.dbg.json +4 -0
  51. package/artifacts/contracts/examples/fire/FireUSD.sol/FireUSD.json +376 -0
  52. package/artifacts/contracts/examples/unpermissioned/SimpleDistribution.sol/SimpleDistribution.dbg.json +1 -1
  53. package/artifacts/contracts/examples/unpermissioned/SimpleDistribution.sol/SimpleDistribution.json +187 -169
  54. package/artifacts/contracts/examples/unpermissioned/SimpleDistributionAuthorization.sol/SimpleDistributionAuthorization.dbg.json +4 -0
  55. package/artifacts/contracts/examples/unpermissioned/SimpleDistributionAuthorization.sol/SimpleDistributionAuthorization.json +470 -0
  56. package/artifacts/contracts/examples/unpermissioned/SimpleOracle.sol/SimpleOracle.dbg.json +1 -1
  57. package/artifacts/contracts/examples/unpermissioned/SimpleOracle.sol/SimpleOracle.json +131 -157
  58. package/artifacts/contracts/examples/unpermissioned/SimplePool.sol/SimplePool.dbg.json +1 -1
  59. package/artifacts/contracts/examples/unpermissioned/SimplePool.sol/SimplePool.json +262 -202
  60. package/artifacts/contracts/examples/unpermissioned/SimplePoolAuthorization.sol/SimplePoolAuthorization.dbg.json +4 -0
  61. package/artifacts/contracts/examples/unpermissioned/SimplePoolAuthorization.sol/SimplePoolAuthorization.json +502 -0
  62. package/artifacts/contracts/examples/unpermissioned/SimpleProduct.sol/SimpleProduct.dbg.json +1 -1
  63. package/artifacts/contracts/examples/unpermissioned/SimpleProduct.sol/SimpleProduct.json +562 -252
  64. package/artifacts/contracts/examples/unpermissioned/SimpleProductAuthorization.sol/SimpleProductAuthorization.dbg.json +4 -0
  65. package/artifacts/contracts/examples/unpermissioned/SimpleProductAuthorization.sol/SimpleProductAuthorization.json +470 -0
  66. package/artifacts/contracts/instance/BundleSet.sol/BundleSet.dbg.json +1 -1
  67. package/artifacts/contracts/instance/BundleSet.sol/BundleSet.json +147 -42
  68. package/artifacts/contracts/instance/IInstance.sol/IInstance.dbg.json +1 -1
  69. package/artifacts/contracts/instance/IInstance.sol/IInstance.json +116 -48
  70. package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.dbg.json +1 -1
  71. package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.json +53 -101
  72. package/artifacts/contracts/instance/Instance.sol/Instance.dbg.json +1 -1
  73. package/artifacts/contracts/instance/Instance.sol/Instance.json +149 -60
  74. package/artifacts/contracts/instance/InstanceAdmin.sol/InstanceAdmin.dbg.json +1 -1
  75. package/artifacts/contracts/instance/InstanceAdmin.sol/InstanceAdmin.json +186 -125
  76. package/artifacts/contracts/instance/InstanceAuthorizationV3.sol/InstanceAuthorizationV3.dbg.json +1 -1
  77. package/artifacts/contracts/instance/InstanceAuthorizationV3.sol/InstanceAuthorizationV3.json +58 -85
  78. package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.dbg.json +1 -1
  79. package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.json +514 -88
  80. package/artifacts/contracts/instance/InstanceService.sol/InstanceService.dbg.json +1 -1
  81. package/artifacts/contracts/instance/InstanceService.sol/InstanceService.json +113 -148
  82. package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.dbg.json +1 -1
  83. package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.json +72 -40
  84. package/artifacts/contracts/instance/InstanceStore.sol/InstanceStore.dbg.json +1 -1
  85. package/artifacts/contracts/instance/InstanceStore.sol/InstanceStore.json +185 -124
  86. package/artifacts/contracts/instance/RiskSet.sol/RiskSet.dbg.json +4 -0
  87. package/artifacts/contracts/instance/RiskSet.sol/RiskSet.json +810 -0
  88. package/artifacts/contracts/instance/base/BalanceStore.sol/BalanceStore.dbg.json +1 -1
  89. package/artifacts/contracts/instance/base/BalanceStore.sol/BalanceStore.json +2 -2
  90. package/artifacts/contracts/instance/base/Cloneable.sol/Cloneable.dbg.json +1 -1
  91. package/artifacts/contracts/instance/base/ObjectCounter.sol/ObjectCounter.dbg.json +1 -1
  92. package/artifacts/contracts/instance/base/ObjectCounter.sol/ObjectCounter.json +2 -2
  93. package/artifacts/contracts/instance/base/ObjectLifecycle.sol/ObjectLifecycle.dbg.json +1 -1
  94. package/artifacts/contracts/instance/base/ObjectLifecycle.sol/ObjectLifecycle.json +46 -5
  95. package/artifacts/contracts/instance/base/ObjectSet.sol/ObjectSet.dbg.json +1 -1
  96. package/artifacts/contracts/instance/base/ObjectSet.sol/ObjectSet.json +2 -2
  97. package/artifacts/contracts/instance/module/IAccess.sol/IAccess.dbg.json +1 -1
  98. package/artifacts/contracts/instance/module/IBundle.sol/IBundle.dbg.json +1 -1
  99. package/artifacts/contracts/instance/module/IComponents.sol/IComponents.dbg.json +1 -1
  100. package/artifacts/contracts/instance/module/IDistribution.sol/IDistribution.dbg.json +1 -1
  101. package/artifacts/contracts/instance/module/IPolicy.sol/IPolicy.dbg.json +1 -1
  102. package/artifacts/contracts/instance/module/IRisk.sol/IRisk.dbg.json +1 -1
  103. package/artifacts/contracts/mock/Dip.sol/Dip.dbg.json +1 -1
  104. package/artifacts/contracts/oracle/BasicOracle.sol/BasicOracle.dbg.json +1 -1
  105. package/artifacts/contracts/oracle/BasicOracle.sol/BasicOracle.json +119 -169
  106. package/artifacts/contracts/oracle/BasicOracleAuthorization.sol/BasicOracleAuthorization.dbg.json +1 -1
  107. package/artifacts/contracts/oracle/BasicOracleAuthorization.sol/BasicOracleAuthorization.json +84 -24
  108. package/artifacts/contracts/oracle/IOracle.sol/IOracle.dbg.json +1 -1
  109. package/artifacts/contracts/oracle/IOracleComponent.sol/IOracleComponent.dbg.json +1 -1
  110. package/artifacts/contracts/oracle/IOracleComponent.sol/IOracleComponent.json +82 -103
  111. package/artifacts/contracts/oracle/IOracleService.sol/IOracleService.dbg.json +1 -1
  112. package/artifacts/contracts/oracle/IOracleService.sol/IOracleService.json +43 -9
  113. package/artifacts/contracts/oracle/Oracle.sol/Oracle.dbg.json +1 -1
  114. package/artifacts/contracts/oracle/Oracle.sol/Oracle.json +95 -121
  115. package/artifacts/contracts/oracle/OracleService.sol/OracleService.dbg.json +1 -1
  116. package/artifacts/contracts/oracle/OracleService.sol/OracleService.json +142 -79
  117. package/artifacts/contracts/oracle/OracleServiceManager.sol/OracleServiceManager.dbg.json +1 -1
  118. package/artifacts/contracts/oracle/OracleServiceManager.sol/OracleServiceManager.json +92 -36
  119. package/artifacts/contracts/pool/BasicPool.sol/BasicPool.dbg.json +1 -1
  120. package/artifacts/contracts/pool/BasicPool.sol/BasicPool.json +95 -149
  121. package/artifacts/contracts/pool/BasicPoolAuthorization.sol/BasicPoolAuthorization.dbg.json +1 -1
  122. package/artifacts/contracts/pool/BasicPoolAuthorization.sol/BasicPoolAuthorization.json +114 -22
  123. package/artifacts/contracts/pool/BundleService.sol/BundleService.dbg.json +1 -1
  124. package/artifacts/contracts/pool/BundleService.sol/BundleService.json +143 -150
  125. package/artifacts/contracts/pool/BundleServiceManager.sol/BundleServiceManager.dbg.json +1 -1
  126. package/artifacts/contracts/pool/BundleServiceManager.sol/BundleServiceManager.json +86 -66
  127. package/artifacts/contracts/pool/IBundleService.sol/IBundleService.dbg.json +1 -1
  128. package/artifacts/contracts/pool/IBundleService.sol/IBundleService.json +48 -33
  129. package/artifacts/contracts/pool/IPoolComponent.sol/IPoolComponent.dbg.json +1 -1
  130. package/artifacts/contracts/pool/IPoolComponent.sol/IPoolComponent.json +82 -142
  131. package/artifacts/contracts/pool/IPoolService.sol/IPoolService.dbg.json +1 -1
  132. package/artifacts/contracts/pool/IPoolService.sol/IPoolService.json +272 -185
  133. package/artifacts/contracts/pool/Pool.sol/Pool.dbg.json +1 -1
  134. package/artifacts/contracts/pool/Pool.sol/Pool.json +95 -160
  135. package/artifacts/contracts/pool/PoolService.sol/PoolService.dbg.json +1 -1
  136. package/artifacts/contracts/pool/PoolService.sol/PoolService.json +408 -263
  137. package/artifacts/contracts/pool/PoolServiceManager.sol/PoolServiceManager.dbg.json +1 -1
  138. package/artifacts/contracts/pool/PoolServiceManager.sol/PoolServiceManager.json +109 -41
  139. package/artifacts/contracts/product/ApplicationService.sol/ApplicationService.dbg.json +1 -1
  140. package/artifacts/contracts/product/ApplicationService.sol/ApplicationService.json +114 -45
  141. package/artifacts/contracts/product/ApplicationServiceManager.sol/ApplicationServiceManager.dbg.json +1 -1
  142. package/artifacts/contracts/product/ApplicationServiceManager.sol/ApplicationServiceManager.json +68 -36
  143. package/artifacts/contracts/product/BasicProduct.sol/BasicProduct.dbg.json +1 -1
  144. package/artifacts/contracts/product/BasicProduct.sol/BasicProduct.json +156 -141
  145. package/artifacts/contracts/product/BasicProductAuthorization.sol/BasicProductAuthorization.dbg.json +1 -1
  146. package/artifacts/contracts/product/BasicProductAuthorization.sol/BasicProductAuthorization.json +82 -22
  147. package/artifacts/contracts/product/ClaimService.sol/ClaimService.dbg.json +1 -1
  148. package/artifacts/contracts/product/ClaimService.sol/ClaimService.json +183 -90
  149. package/artifacts/contracts/product/ClaimServiceManager.sol/ClaimServiceManager.dbg.json +1 -1
  150. package/artifacts/contracts/product/ClaimServiceManager.sol/ClaimServiceManager.json +102 -58
  151. package/artifacts/contracts/product/IApplicationService.sol/IApplicationService.dbg.json +1 -1
  152. package/artifacts/contracts/product/IApplicationService.sol/IApplicationService.json +63 -7
  153. package/artifacts/contracts/product/IClaimService.sol/IClaimService.dbg.json +1 -1
  154. package/artifacts/contracts/product/IClaimService.sol/IClaimService.json +64 -8
  155. package/artifacts/contracts/product/IPolicyService.sol/IPolicyService.dbg.json +1 -1
  156. package/artifacts/contracts/product/IPolicyService.sol/IPolicyService.json +96 -19
  157. package/artifacts/contracts/product/IPricingService.sol/IPricingService.dbg.json +1 -1
  158. package/artifacts/contracts/product/IPricingService.sol/IPricingService.json +80 -51
  159. package/artifacts/contracts/product/IProductComponent.sol/IProductComponent.dbg.json +1 -1
  160. package/artifacts/contracts/product/IProductComponent.sol/IProductComponent.json +139 -119
  161. package/artifacts/contracts/product/IRiskService.sol/IRiskService.dbg.json +1 -1
  162. package/artifacts/contracts/product/IRiskService.sol/IRiskService.json +29 -0
  163. package/artifacts/contracts/product/PolicyService.sol/PolicyService.dbg.json +1 -1
  164. package/artifacts/contracts/product/PolicyService.sol/PolicyService.json +215 -125
  165. package/artifacts/contracts/product/PolicyServiceManager.sol/PolicyServiceManager.dbg.json +1 -1
  166. package/artifacts/contracts/product/PolicyServiceManager.sol/PolicyServiceManager.json +102 -54
  167. package/artifacts/contracts/product/PricingService.sol/PricingService.dbg.json +1 -1
  168. package/artifacts/contracts/product/PricingService.sol/PricingService.json +165 -107
  169. package/artifacts/contracts/product/PricingServiceManager.sol/PricingServiceManager.dbg.json +1 -1
  170. package/artifacts/contracts/product/PricingServiceManager.sol/PricingServiceManager.json +85 -45
  171. package/artifacts/contracts/product/Product.sol/Product.dbg.json +1 -1
  172. package/artifacts/contracts/product/Product.sol/Product.json +152 -137
  173. package/artifacts/contracts/product/RiskService.sol/RiskService.dbg.json +1 -1
  174. package/artifacts/contracts/product/RiskService.sol/RiskService.json +76 -26
  175. package/artifacts/contracts/product/RiskServiceManager.sol/RiskServiceManager.dbg.json +1 -1
  176. package/artifacts/contracts/product/RiskServiceManager.sol/RiskServiceManager.json +66 -30
  177. package/artifacts/contracts/registry/ChainNft.sol/ChainNft.dbg.json +1 -1
  178. package/artifacts/contracts/registry/ChainNft.sol/ChainNft.json +2 -2
  179. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.dbg.json +1 -1
  180. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.json +91 -15
  181. package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.dbg.json +1 -1
  182. package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.json +114 -35
  183. package/artifacts/contracts/registry/ITransferInterceptor.sol/ITransferInterceptor.dbg.json +1 -1
  184. package/artifacts/contracts/registry/ITransferInterceptor.sol/ITransferInterceptor.json +5 -18
  185. package/artifacts/contracts/registry/Registry.sol/Registry.dbg.json +1 -1
  186. package/artifacts/contracts/registry/Registry.sol/Registry.json +135 -51
  187. package/artifacts/contracts/registry/RegistryAdmin.sol/RegistryAdmin.dbg.json +1 -1
  188. package/artifacts/contracts/registry/RegistryAdmin.sol/RegistryAdmin.json +203 -162
  189. package/artifacts/contracts/registry/RegistryService.sol/RegistryService.dbg.json +1 -1
  190. package/artifacts/contracts/registry/RegistryService.sol/RegistryService.json +89 -172
  191. package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.dbg.json +1 -1
  192. package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.json +65 -29
  193. package/artifacts/contracts/registry/ReleaseLifecycle.sol/ReleaseLifecycle.dbg.json +1 -1
  194. package/artifacts/contracts/registry/ReleaseLifecycle.sol/ReleaseLifecycle.json +47 -6
  195. package/artifacts/contracts/registry/ReleaseRegistry.sol/ReleaseRegistry.dbg.json +1 -1
  196. package/artifacts/contracts/registry/ReleaseRegistry.sol/ReleaseRegistry.json +123 -225
  197. package/artifacts/contracts/registry/ServiceAuthorizationV3.sol/ServiceAuthorizationV3.dbg.json +1 -1
  198. package/artifacts/contracts/registry/ServiceAuthorizationV3.sol/ServiceAuthorizationV3.json +66 -8
  199. package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.dbg.json +1 -1
  200. package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.json +2 -2
  201. package/artifacts/contracts/shared/Component.sol/Component.dbg.json +1 -1
  202. package/artifacts/contracts/shared/Component.sol/Component.json +72 -80
  203. package/artifacts/contracts/shared/ComponentService.sol/ComponentService.dbg.json +1 -1
  204. package/artifacts/contracts/shared/ComponentService.sol/ComponentService.json +478 -477
  205. package/artifacts/contracts/shared/ComponentServiceManager.sol/ComponentServiceManager.dbg.json +1 -1
  206. package/artifacts/contracts/shared/ComponentServiceManager.sol/ComponentServiceManager.json +96 -72
  207. package/artifacts/contracts/shared/ComponentVerifyingService.sol/ComponentVerifyingService.dbg.json +1 -1
  208. package/artifacts/contracts/shared/ComponentVerifyingService.sol/ComponentVerifyingService.json +42 -0
  209. package/artifacts/contracts/shared/ContractLib.sol/ContractLib.dbg.json +1 -1
  210. package/artifacts/contracts/shared/ContractLib.sol/ContractLib.json +402 -6
  211. package/artifacts/contracts/shared/ContractLib.sol/IInstanceAdminHelper.dbg.json +4 -0
  212. package/artifacts/contracts/shared/ContractLib.sol/IInstanceAdminHelper.json +24 -0
  213. package/artifacts/contracts/shared/ContractLib.sol/ITargetHelper.dbg.json +4 -0
  214. package/artifacts/contracts/shared/ContractLib.sol/ITargetHelper.json +30 -0
  215. package/artifacts/contracts/shared/IComponent.sol/IComponent.dbg.json +1 -1
  216. package/artifacts/contracts/shared/IComponent.sol/IComponent.json +61 -64
  217. package/artifacts/contracts/shared/IComponentService.sol/IComponentService.dbg.json +1 -1
  218. package/artifacts/contracts/shared/IComponentService.sol/IComponentService.json +425 -261
  219. package/artifacts/contracts/shared/IInstanceLinkedComponent.sol/IInstanceLinkedComponent.dbg.json +1 -1
  220. package/artifacts/contracts/shared/IInstanceLinkedComponent.sol/IInstanceLinkedComponent.json +82 -103
  221. package/artifacts/contracts/shared/IKeyValueStore.sol/IKeyValueStore.dbg.json +1 -1
  222. package/artifacts/contracts/shared/IKeyValueStore.sol/IKeyValueStore.json +36 -0
  223. package/artifacts/contracts/shared/ILifecycle.sol/ILifecycle.dbg.json +1 -1
  224. package/artifacts/contracts/shared/ILifecycle.sol/ILifecycle.json +36 -0
  225. package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.dbg.json +1 -1
  226. package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.json +16 -0
  227. package/artifacts/contracts/shared/IPolicyHolder.sol/IPolicyHolder.dbg.json +1 -1
  228. package/artifacts/contracts/shared/IPolicyHolder.sol/IPolicyHolder.json +1 -1
  229. package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.dbg.json +1 -1
  230. package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.json +29 -0
  231. package/artifacts/contracts/shared/IRegistryLinked.sol/IRegistryLinked.dbg.json +1 -1
  232. package/artifacts/contracts/shared/IService.sol/IService.dbg.json +1 -1
  233. package/artifacts/contracts/shared/IService.sol/IService.json +29 -0
  234. package/artifacts/contracts/shared/InitializableERC165.sol/InitializableERC165.dbg.json +1 -1
  235. package/artifacts/contracts/shared/InstanceLinkedComponent.sol/InstanceLinkedComponent.dbg.json +1 -1
  236. package/artifacts/contracts/shared/InstanceLinkedComponent.sol/InstanceLinkedComponent.json +94 -120
  237. package/artifacts/contracts/shared/KeyValueStore.sol/KeyValueStore.dbg.json +1 -1
  238. package/artifacts/contracts/shared/KeyValueStore.sol/KeyValueStore.json +42 -1
  239. package/artifacts/contracts/shared/Lifecycle.sol/Lifecycle.dbg.json +1 -1
  240. package/artifacts/contracts/shared/Lifecycle.sol/Lifecycle.json +42 -1
  241. package/artifacts/contracts/shared/NftIdSet.sol/NftIdSet.dbg.json +1 -1
  242. package/artifacts/contracts/shared/NftIdSet.sol/NftIdSet.json +2 -2
  243. package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.dbg.json +1 -1
  244. package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.json +18 -2
  245. package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.dbg.json +1 -1
  246. package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.json +3 -3
  247. package/artifacts/contracts/shared/Registerable.sol/Registerable.dbg.json +1 -1
  248. package/artifacts/contracts/shared/Registerable.sol/Registerable.json +66 -8
  249. package/artifacts/contracts/shared/RegistryLinked.sol/RegistryLinked.dbg.json +1 -1
  250. package/artifacts/contracts/shared/RegistryLinked.sol/RegistryLinked.json +2 -2
  251. package/artifacts/contracts/shared/Service.sol/Service.dbg.json +1 -1
  252. package/artifacts/contracts/shared/Service.sol/Service.json +42 -0
  253. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.dbg.json +1 -1
  254. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.json +388 -35
  255. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandlerBase.dbg.json +4 -0
  256. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandlerBase.json +395 -0
  257. package/artifacts/contracts/shared/TokenHandlerDeployerLib.sol/TokenHandlerDeployerLib.dbg.json +1 -1
  258. package/artifacts/contracts/shared/TokenHandlerDeployerLib.sol/TokenHandlerDeployerLib.json +88 -24
  259. package/artifacts/contracts/staking/IStaking.sol/IStaking.dbg.json +1 -1
  260. package/artifacts/contracts/staking/IStaking.sol/IStaking.json +79 -100
  261. package/artifacts/contracts/staking/IStakingService.sol/IStakingService.dbg.json +1 -1
  262. package/artifacts/contracts/staking/IStakingService.sol/IStakingService.json +29 -21
  263. package/artifacts/contracts/staking/StakeManagerLib.sol/StakeManagerLib.dbg.json +1 -1
  264. package/artifacts/contracts/staking/StakeManagerLib.sol/StakeManagerLib.json +2 -2
  265. package/artifacts/contracts/staking/Staking.sol/Staking.dbg.json +1 -1
  266. package/artifacts/contracts/staking/Staking.sol/Staking.json +158 -170
  267. package/artifacts/contracts/staking/StakingLifecycle.sol/StakingLifecycle.dbg.json +1 -1
  268. package/artifacts/contracts/staking/StakingLifecycle.sol/StakingLifecycle.json +46 -5
  269. package/artifacts/contracts/staking/StakingManager.sol/StakingManager.dbg.json +1 -1
  270. package/artifacts/contracts/staking/StakingManager.sol/StakingManager.json +81 -51
  271. package/artifacts/contracts/staking/StakingReader.sol/StakingReader.dbg.json +1 -1
  272. package/artifacts/contracts/staking/StakingReader.sol/StakingReader.json +7 -12
  273. package/artifacts/contracts/staking/StakingService.sol/StakingService.dbg.json +1 -1
  274. package/artifacts/contracts/staking/StakingService.sol/StakingService.json +82 -53
  275. package/artifacts/contracts/staking/StakingServiceManager.sol/StakingServiceManager.dbg.json +1 -1
  276. package/artifacts/contracts/staking/StakingServiceManager.sol/StakingServiceManager.json +69 -33
  277. package/artifacts/contracts/staking/StakingStore.sol/StakingStore.dbg.json +1 -1
  278. package/artifacts/contracts/staking/StakingStore.sol/StakingStore.json +144 -103
  279. package/artifacts/contracts/staking/TargetManagerLib.sol/TargetManagerLib.dbg.json +1 -1
  280. package/artifacts/contracts/staking/TargetManagerLib.sol/TargetManagerLib.json +2 -2
  281. package/artifacts/contracts/type/AddressSet.sol/LibAddressSet.dbg.json +1 -1
  282. package/artifacts/contracts/type/Amount.sol/AmountLib.dbg.json +1 -1
  283. package/artifacts/contracts/type/Amount.sol/AmountLib.json +32 -8
  284. package/artifacts/contracts/type/Blocknumber.sol/BlocknumberLib.dbg.json +1 -1
  285. package/artifacts/contracts/type/ClaimId.sol/ClaimIdLib.dbg.json +1 -1
  286. package/artifacts/contracts/type/ClaimId.sol/ClaimIdLib.json +28 -4
  287. package/artifacts/contracts/type/DistributorType.sol/DistributorTypeLib.dbg.json +1 -1
  288. package/artifacts/contracts/type/DistributorType.sol/DistributorTypeLib.json +2 -2
  289. package/artifacts/contracts/type/Fee.sol/FeeLib.dbg.json +1 -1
  290. package/artifacts/contracts/type/Fee.sol/FeeLib.json +2 -2
  291. package/artifacts/contracts/type/Key32.sol/Key32Lib.dbg.json +1 -1
  292. package/artifacts/contracts/type/Key32.sol/Key32Lib.json +2 -2
  293. package/artifacts/contracts/type/Key32Set.sol/LibKey32Set.dbg.json +4 -0
  294. package/artifacts/contracts/type/Key32Set.sol/LibKey32Set.json +33 -0
  295. package/artifacts/contracts/type/NftId.sol/NftIdLib.dbg.json +1 -1
  296. package/artifacts/contracts/type/NftId.sol/NftIdLib.json +23 -4
  297. package/artifacts/contracts/type/NftIdSet.sol/LibNftIdSet.dbg.json +1 -1
  298. package/artifacts/contracts/type/NftIdSet.sol/LibNftIdSet.json +2 -2
  299. package/artifacts/contracts/type/ObjectType.sol/ObjectTypeLib.dbg.json +1 -1
  300. package/artifacts/contracts/type/ObjectType.sol/ObjectTypeLib.json +2 -2
  301. package/artifacts/contracts/type/PayoutId.sol/PayoutIdLib.dbg.json +1 -1
  302. package/artifacts/contracts/type/PayoutId.sol/PayoutIdLib.json +19 -19
  303. package/artifacts/contracts/type/Referral.sol/ReferralLib.dbg.json +1 -1
  304. package/artifacts/contracts/type/Referral.sol/ReferralLib.json +2 -2
  305. package/artifacts/contracts/type/RequestId.sol/RequestIdLib.dbg.json +1 -1
  306. package/artifacts/contracts/type/RequestId.sol/RequestIdLib.json +2 -2
  307. package/artifacts/contracts/type/RiskId.sol/RiskIdLib.dbg.json +1 -1
  308. package/artifacts/contracts/type/RiskId.sol/RiskIdLib.json +99 -5
  309. package/artifacts/contracts/type/RoleId.sol/RoleIdLib.dbg.json +1 -1
  310. package/artifacts/contracts/type/RoleId.sol/RoleIdLib.json +2 -2
  311. package/artifacts/contracts/type/Seconds.sol/SecondsLib.dbg.json +1 -1
  312. package/artifacts/contracts/type/Selector.sol/SelectorLib.dbg.json +1 -1
  313. package/artifacts/contracts/type/Selector.sol/SelectorSetLib.dbg.json +1 -1
  314. package/artifacts/contracts/type/StateId.sol/StateIdLib.dbg.json +1 -1
  315. package/artifacts/contracts/type/StateId.sol/StateIdLib.json +15 -2
  316. package/artifacts/contracts/type/String.sol/StrLib.dbg.json +1 -1
  317. package/artifacts/contracts/type/Timestamp.sol/TimestampLib.dbg.json +1 -1
  318. package/artifacts/contracts/type/UFixed.sol/MathLib.dbg.json +1 -1
  319. package/artifacts/contracts/type/UFixed.sol/MathLib.json +2 -2
  320. package/artifacts/contracts/type/UFixed.sol/UFixedLib.dbg.json +1 -1
  321. package/artifacts/contracts/type/UFixed.sol/UFixedLib.json +15 -2
  322. package/artifacts/contracts/type/Version.sol/VersionLib.dbg.json +1 -1
  323. package/artifacts/contracts/type/Version.sol/VersionPartLib.dbg.json +1 -1
  324. package/artifacts/contracts/upgradeability/IVersionable.sol/IVersionable.dbg.json +1 -1
  325. package/artifacts/contracts/upgradeability/ProxyManager.sol/ProxyManager.dbg.json +1 -1
  326. package/artifacts/contracts/upgradeability/ProxyManager.sol/ProxyManager.json +44 -12
  327. package/artifacts/contracts/upgradeability/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.dbg.json +1 -1
  328. package/artifacts/contracts/upgradeability/Versionable.sol/Versionable.dbg.json +1 -1
  329. package/contracts/accounting/AccountingService.sol +244 -0
  330. package/contracts/accounting/AccountingServiceManager.sol +38 -0
  331. package/contracts/accounting/IAccountingService.sol +42 -0
  332. package/contracts/authorization/AccessAdmin.sol +86 -62
  333. package/contracts/authorization/Authorization.sol +111 -39
  334. package/contracts/authorization/IAccess.sol +1 -0
  335. package/contracts/authorization/IAccessAdmin.sol +4 -2
  336. package/contracts/authorization/IAuthorization.sol +13 -7
  337. package/contracts/authorization/IServiceAuthorization.sol +3 -1
  338. package/contracts/authorization/ReleaseAccessManager.sol +38 -0
  339. package/contracts/authorization/ServiceAuthorization.sol +26 -10
  340. package/contracts/distribution/BasicDistribution.sol +8 -7
  341. package/contracts/distribution/BasicDistributionAuthorization.sol +1 -1
  342. package/contracts/distribution/Distribution.sol +32 -40
  343. package/contracts/distribution/DistributionService.sol +80 -59
  344. package/contracts/distribution/IDistributionComponent.sol +1 -1
  345. package/contracts/distribution/IDistributionService.sol +5 -6
  346. package/contracts/examples/fire/DamageLevel.sol +59 -0
  347. package/contracts/examples/fire/FirePool.sol +90 -0
  348. package/contracts/examples/fire/FirePoolAuthorization.sol +35 -0
  349. package/contracts/examples/fire/FireProduct.sol +436 -0
  350. package/contracts/examples/fire/FireProductAuthorization.sol +45 -0
  351. package/contracts/examples/fire/FireUSD.sol +26 -0
  352. package/contracts/examples/unpermissioned/SimpleDistribution.sol +11 -4
  353. package/contracts/examples/unpermissioned/SimpleDistributionAuthorization.sol +28 -0
  354. package/contracts/examples/unpermissioned/SimpleOracle.sol +4 -4
  355. package/contracts/examples/unpermissioned/SimplePool.sol +37 -6
  356. package/contracts/examples/unpermissioned/SimplePoolAuthorization.sol +28 -0
  357. package/contracts/examples/unpermissioned/SimpleProduct.sol +24 -23
  358. package/contracts/examples/unpermissioned/SimpleProductAuthorization.sol +28 -0
  359. package/contracts/instance/BundleSet.sol +38 -34
  360. package/contracts/instance/IInstance.sol +11 -3
  361. package/contracts/instance/IInstanceService.sol +7 -29
  362. package/contracts/instance/Instance.sol +36 -26
  363. package/contracts/instance/InstanceAdmin.sol +38 -38
  364. package/contracts/instance/InstanceAuthorizationV3.sol +50 -32
  365. package/contracts/instance/InstanceReader.sol +168 -19
  366. package/contracts/instance/InstanceService.sol +51 -126
  367. package/contracts/instance/RiskSet.sol +119 -0
  368. package/contracts/instance/base/ObjectSet.sol +24 -25
  369. package/contracts/instance/module/IComponents.sol +7 -5
  370. package/contracts/instance/module/IPolicy.sol +4 -3
  371. package/contracts/instance/module/IRisk.sol +1 -0
  372. package/contracts/oracle/BasicOracle.sol +0 -1
  373. package/contracts/oracle/IOracleService.sol +2 -1
  374. package/contracts/oracle/Oracle.sol +4 -15
  375. package/contracts/oracle/OracleService.sol +104 -76
  376. package/contracts/pool/BasicPool.sol +33 -24
  377. package/contracts/pool/BasicPoolAuthorization.sol +12 -2
  378. package/contracts/pool/BundleService.sol +68 -81
  379. package/contracts/pool/IBundleService.sol +2 -14
  380. package/contracts/pool/IPoolComponent.sol +1 -7
  381. package/contracts/pool/IPoolService.sol +30 -37
  382. package/contracts/pool/Pool.sol +123 -120
  383. package/contracts/pool/PoolService.sol +261 -154
  384. package/contracts/product/ApplicationService.sol +28 -16
  385. package/contracts/product/BasicProduct.sol +8 -12
  386. package/contracts/product/BasicProductAuthorization.sol +1 -3
  387. package/contracts/product/ClaimService.sol +110 -69
  388. package/contracts/product/IApplicationService.sol +5 -2
  389. package/contracts/product/IClaimService.sol +3 -2
  390. package/contracts/product/IPolicyService.sol +18 -5
  391. package/contracts/product/IPricingService.sol +9 -9
  392. package/contracts/product/IProductComponent.sol +23 -3
  393. package/contracts/product/PolicyService.sol +277 -187
  394. package/contracts/product/PricingService.sol +8 -8
  395. package/contracts/product/Product.sol +76 -75
  396. package/contracts/product/RiskService.sol +14 -3
  397. package/contracts/registry/ChainNft.sol +6 -9
  398. package/contracts/registry/IRegistry.sol +8 -3
  399. package/contracts/registry/IRegistryService.sol +5 -12
  400. package/contracts/registry/ITransferInterceptor.sol +1 -2
  401. package/contracts/registry/Registry.sol +29 -6
  402. package/contracts/registry/RegistryAdmin.sol +28 -35
  403. package/contracts/registry/RegistryService.sol +33 -44
  404. package/contracts/registry/ReleaseLifecycle.sol +6 -3
  405. package/contracts/registry/ReleaseRegistry.sol +202 -208
  406. package/contracts/registry/ServiceAuthorizationV3.sol +28 -52
  407. package/contracts/shared/Component.sol +56 -105
  408. package/contracts/shared/ComponentService.sol +376 -324
  409. package/contracts/shared/ComponentVerifyingService.sol +27 -16
  410. package/contracts/shared/ContractLib.sol +196 -10
  411. package/contracts/shared/IComponent.sol +6 -14
  412. package/contracts/shared/IComponentService.sol +45 -37
  413. package/contracts/shared/IInstanceLinkedComponent.sol +3 -22
  414. package/contracts/shared/ILifecycle.sol +3 -1
  415. package/contracts/shared/INftOwnable.sol +2 -0
  416. package/contracts/shared/IRegisterable.sol +11 -0
  417. package/contracts/shared/InstanceLinkedComponent.sol +68 -43
  418. package/contracts/shared/KeyValueStore.sol +1 -1
  419. package/contracts/shared/Lifecycle.sol +15 -4
  420. package/contracts/shared/NftOwnable.sol +23 -3
  421. package/contracts/shared/PolicyHolder.sol +4 -0
  422. package/contracts/shared/Registerable.sol +15 -7
  423. package/contracts/shared/RegistryLinked.sol +6 -12
  424. package/contracts/shared/Service.sol +4 -7
  425. package/contracts/shared/TokenHandler.sol +316 -66
  426. package/contracts/shared/TokenHandlerDeployerLib.sol +10 -2
  427. package/contracts/staking/IStaking.sol +9 -4
  428. package/contracts/staking/IStakingService.sol +0 -3
  429. package/contracts/staking/Staking.sol +41 -24
  430. package/contracts/staking/StakingReader.sol +12 -5
  431. package/contracts/staking/StakingService.sol +56 -23
  432. package/contracts/type/Amount.sol +15 -0
  433. package/contracts/type/ClaimId.sol +6 -1
  434. package/contracts/type/Key32.sol +2 -2
  435. package/contracts/type/Key32Set.sol +62 -0
  436. package/contracts/type/NftId.sol +7 -0
  437. package/contracts/type/ObjectType.sol +11 -0
  438. package/contracts/type/PayoutId.sol +10 -10
  439. package/contracts/type/RiskId.sol +30 -4
  440. package/contracts/type/RoleId.sol +0 -12
  441. package/contracts/type/StateId.sol +14 -1
  442. package/contracts/type/UFixed.sol +4 -0
  443. package/contracts/upgradeability/ProxyManager.sol +2 -1
  444. package/package.json +4 -3
  445. package/artifacts/contracts/authorization/IModuleAuthorization.sol/IModuleAuthorization.dbg.json +0 -4
  446. package/artifacts/contracts/authorization/IModuleAuthorization.sol/IModuleAuthorization.json +0 -290
  447. package/artifacts/contracts/authorization/ModuleAuthorization.sol/ModuleAuthorization.dbg.json +0 -4
  448. package/artifacts/contracts/authorization/ModuleAuthorization.sol/ModuleAuthorization.json +0 -390
  449. package/artifacts/contracts/shared/InitializableCustom.sol/InitializableCustom.dbg.json +0 -4
  450. package/artifacts/contracts/shared/InitializableCustom.sol/InitializableCustom.json +0 -39
  451. package/contracts/authorization/IModuleAuthorization.sol +0 -21
  452. package/contracts/authorization/ModuleAuthorization.sol +0 -78
  453. package/contracts/shared/InitializableCustom.sol +0 -177
@@ -1,45 +1,75 @@
1
1
  // SPDX-License-Identifier: Apache-2.0
2
2
  pragma solidity ^0.8.20;
3
3
 
4
+ import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
5
+
4
6
  import {Amount, AmountLib} from "../type/Amount.sol";
5
- import {ComponentVerifyingService} from "../shared/ComponentVerifyingService.sol";
7
+ import {ContractLib} from "../shared/ContractLib.sol";
6
8
  import {Fee, FeeLib} from "../type/Fee.sol";
9
+ import {IAccountingService} from "../accounting/IAccountingService.sol";
10
+ import {IComponent} from "../shared/IComponent.sol";
7
11
  import {IComponents} from "../instance/module/IComponents.sol";
8
12
  import {IComponentService} from "./IComponentService.sol";
9
13
  import {IInstance} from "../instance/IInstance.sol";
10
14
  import {IInstanceLinkedComponent} from "./IInstanceLinkedComponent.sol";
15
+ import {InstanceAdmin} from "../instance/InstanceAdmin.sol";
11
16
  import {InstanceReader} from "../instance/InstanceReader.sol";
12
17
  import {InstanceStore} from "../instance/InstanceStore.sol";
13
18
  import {IInstanceService} from "../instance/IInstanceService.sol";
14
19
  import {IPoolComponent} from "../pool/IPoolComponent.sol";
15
20
  import {IProductComponent} from "../product/IProductComponent.sol";
21
+ import {IRegisterable} from "../shared/IRegisterable.sol";
16
22
  import {IRegistry} from "../registry/IRegistry.sol";
17
23
  import {IRegistryService} from "../registry/IRegistryService.sol";
24
+
25
+ import {Amount, AmountLib} from "../type/Amount.sol";
26
+ import {ContractLib} from "../shared/ContractLib.sol";
27
+ import {Fee, FeeLib} from "../type/Fee.sol";
18
28
  import {KEEP_STATE} from "../type/StateId.sol";
19
29
  import {NftId} from "../type/NftId.sol";
20
- import {ObjectType, REGISTRY, COMPONENT, DISTRIBUTION, INSTANCE, ORACLE, POOL, PRODUCT} from "../type/ObjectType.sol";
21
- import {RoleId, DISTRIBUTION_OWNER_ROLE, ORACLE_OWNER_ROLE, POOL_OWNER_ROLE, PRODUCT_OWNER_ROLE} from "../type/RoleId.sol";
30
+ import {ObjectType, ACCOUNTING, REGISTRY, COMPONENT, DISTRIBUTION, INSTANCE, ORACLE, POOL, PRODUCT} from "../type/ObjectType.sol";
31
+ import {Service} from "../shared/Service.sol";
32
+ import {TokenHandler} from "../shared/TokenHandler.sol";
22
33
  import {TokenHandlerDeployerLib} from "../shared/TokenHandlerDeployerLib.sol";
34
+ import {VersionPart} from "../type/Version.sol";
35
+
23
36
 
24
37
  contract ComponentService is
25
- ComponentVerifyingService,
38
+ Service,
26
39
  IComponentService
27
40
  {
28
- error ErrorComponentServiceAlreadyRegistered(address component);
29
- error ErrorComponentServiceNotComponent(address component);
30
- error ErrorComponentServiceInvalidType(address component, ObjectType requiredType, ObjectType componentType);
31
- error ErrorComponentServiceSenderNotOwner(address component, address initialOwner, address sender);
32
- error ErrorComponentServiceExpectedRoleMissing(NftId instanceNftId, RoleId requiredRole, address sender);
33
- error ErrorComponentServiceComponentLocked(address component);
34
- error ErrorComponentServiceSenderNotService(address sender);
35
- error ErrorComponentServiceComponentTypeInvalid(address component, ObjectType expectedType, ObjectType foundType);
36
-
37
41
  bool private constant INCREASE = true;
38
42
  bool private constant DECREASE = false;
39
43
 
44
+ IAccountingService private _accountingService;
40
45
  IRegistryService private _registryService;
41
46
  IInstanceService private _instanceService;
42
47
 
48
+ modifier onlyComponent(address component) {
49
+ _checkSupportsInterface(component);
50
+ _;
51
+ }
52
+
53
+ modifier onlyInstance() {
54
+ NftId instanceNftId = getRegistry().getNftIdForAddress(msg.sender);
55
+ if (instanceNftId.eqz()) {
56
+ revert ErrorComponentServiceNotRegistered(msg.sender);
57
+ }
58
+
59
+ ObjectType objectType = getRegistry().getObjectInfo(instanceNftId).objectType;
60
+ if (objectType != INSTANCE()) {
61
+ revert ErrorComponentServiceNotInstance(msg.sender, objectType);
62
+ }
63
+
64
+ VersionPart instanceVersion = IInstance(msg.sender).getRelease();
65
+ if (instanceVersion != getVersion().toMajorPart()) {
66
+ revert ErrorComponentServiceInstanceVersionMismatch(msg.sender, instanceVersion);
67
+ }
68
+
69
+ _;
70
+ }
71
+
72
+
43
73
  function _initialize(
44
74
  address owner,
45
75
  bytes memory data
@@ -55,6 +85,7 @@ contract ComponentService is
55
85
 
56
86
  _initializeService(registryAddress, authority, owner);
57
87
 
88
+ _accountingService = IAccountingService(_getServiceAddress(ACCOUNTING()));
58
89
  _registryService = IRegistryService(_getServiceAddress(REGISTRY()));
59
90
  _instanceService = IInstanceService(_getServiceAddress(INSTANCE()));
60
91
 
@@ -63,42 +94,106 @@ contract ComponentService is
63
94
 
64
95
  //-------- component ----------------------------------------------------//
65
96
 
66
- function setWallet(address newWallet) external virtual {
67
- (NftId componentNftId,, IInstance instance) = _getAndVerifyActiveComponent(COMPONENT());
68
- IComponents.ComponentInfo memory info = instance.getInstanceReader().getComponentInfo(componentNftId);
69
- address currentWallet = info.wallet;
70
-
71
- if (newWallet == address(0)) {
72
- revert ErrorComponentServiceNewWalletAddressZero();
97
+ function registerComponent(address component)
98
+ external
99
+ virtual
100
+ onlyComponent(component)
101
+ returns (NftId componentNftId)
102
+ {
103
+ // type specific registration
104
+ ObjectType componentType = IInstanceLinkedComponent(component).getInitialInfo().objectType;
105
+ if (componentType == POOL()) {
106
+ return _registerPool(component);
73
107
  }
74
-
75
- if (currentWallet == address(0)) {
76
- revert ErrorComponentServiceWalletAddressZero();
108
+ if (componentType == DISTRIBUTION()) {
109
+ return _registerDistribution(component);
77
110
  }
78
-
79
- if (newWallet == currentWallet) {
80
- revert ErrorComponentServiceWalletAddressIsSameAsCurrent();
111
+ if (componentType == ORACLE()) {
112
+ return _registerOracle(component);
81
113
  }
82
114
 
83
- info.wallet = newWallet;
84
- instance.getInstanceStore().updateComponent(componentNftId, info, KEEP_STATE());
85
- emit LogComponentServiceWalletAddressChanged(componentNftId, currentWallet, newWallet);
115
+ // fail
116
+ revert ErrorComponentServiceTypeNotSupported(component, componentType);
117
+ }
118
+
119
+ function approveTokenHandler(
120
+ IERC20Metadata token,
121
+ Amount amount
122
+ )
123
+ external
124
+ virtual
125
+ {
126
+ // checks
127
+ (NftId componentNftId, IInstance instance) = _getAndVerifyActiveComponent(COMPONENT());
128
+ TokenHandler tokenHandler = instance.getInstanceReader().getComponentInfo(
129
+ componentNftId).tokenHandler;
130
+
131
+ // effects
132
+ tokenHandler.approve(token, amount);
133
+ }
134
+
135
+
136
+ function approveStakingTokenHandler(
137
+ IERC20Metadata token,
138
+ Amount amount
139
+ )
140
+ external
141
+ virtual
142
+ {
143
+ // checks
144
+ ContractLib.getAndVerifyStaking(
145
+ getRegistry(),
146
+ msg.sender); // only active
147
+
148
+ // effects
149
+ TokenHandler tokenHandler = IComponent(msg.sender).getTokenHandler();
150
+ tokenHandler.approve(token, amount);
86
151
  }
87
152
 
88
- // TODO implement
89
- function lock() external virtual {}
90
153
 
91
- // TODO implement
92
- function unlock() external virtual {}
154
+ function setWallet(address newWallet)
155
+ external
156
+ virtual
157
+ {
158
+ // checks
159
+ (NftId componentNftId, IInstance instance) = _getAndVerifyActiveComponent(COMPONENT());
160
+ TokenHandler tokenHandler = instance.getInstanceReader().getComponentInfo(
161
+ componentNftId).tokenHandler;
162
+
163
+ // effects
164
+ tokenHandler.setWallet(newWallet);
165
+ }
166
+
167
+ /// @inheritdoc IComponentService
168
+ function setLockedFromInstance(address componentAddress, bool locked)
169
+ external
170
+ virtual
171
+ onlyInstance()
172
+ {
173
+ address instanceAddress = msg.sender;
174
+ // NftId instanceNftId = getRegistry().getNftIdForAddress(msg.sender);
175
+ IInstance instance = IInstance(instanceAddress);
176
+ _setLocked(instance.getInstanceAdmin(), componentAddress, locked);
177
+ }
178
+
179
+ /// @inheritdoc IComponentService
180
+ function setLockedFromComponent(address componentAddress, bool locked)
181
+ external
182
+ virtual
183
+ onlyComponent(msg.sender)
184
+ {
185
+ (, IInstance instance) = _getAndVerifyComponent(COMPONENT(), false);
186
+ _setLocked(instance.getInstanceAdmin(), componentAddress, locked);
187
+ }
93
188
 
94
189
  function withdrawFees(Amount amount)
95
190
  external
96
191
  virtual
97
192
  returns (Amount withdrawnAmount)
98
193
  {
99
- (NftId componentNftId,, IInstance instance) = _getAndVerifyActiveComponent(COMPONENT());
194
+ (NftId componentNftId, IInstance instance) = _getAndVerifyActiveComponent(COMPONENT());
100
195
  IComponents.ComponentInfo memory info = instance.getInstanceReader().getComponentInfo(componentNftId);
101
- address componentWallet = info.wallet;
196
+ address componentWallet = info.tokenHandler.getWallet();
102
197
 
103
198
  // determine withdrawn amount
104
199
  withdrawnAmount = amount;
@@ -114,7 +209,7 @@ contract ComponentService is
114
209
  }
115
210
 
116
211
  // decrease fee counters by withdrawnAmount
117
- _changeTargetBalance(DECREASE, instance.getInstanceStore(), componentNftId, AmountLib.zero(), withdrawnAmount);
212
+ _accountingService.decreaseComponentFees(instance.getInstanceStore(), componentNftId, withdrawnAmount);
118
213
 
119
214
  // transfer amount to component owner
120
215
  address componentOwner = getRegistry().ownerOf(componentNftId);
@@ -125,29 +220,29 @@ contract ComponentService is
125
220
 
126
221
  //-------- product ------------------------------------------------------//
127
222
 
128
- function registerProduct()
223
+ function registerProduct(address productAddress)
129
224
  external
130
225
  virtual
226
+ onlyComponent(productAddress)
227
+ returns (NftId productNftId)
131
228
  {
132
- address contractAddress = msg.sender;
133
-
134
229
  // register/create component setup
135
- (
136
- InstanceReader instanceReader,
137
- InstanceStore instanceStore,
138
- NftId productNftId
139
- ) = _register(
140
- contractAddress,
141
- PRODUCT(),
142
- PRODUCT_OWNER_ROLE());
143
-
144
- // create product info
145
- IComponents.ProductInfo memory productInfo = IProductComponent(contractAddress).getInitialProductInfo();
146
- instanceStore.createProduct(productNftId, productInfo);
230
+ InstanceAdmin instanceAdmin;
231
+ InstanceStore instanceStore;
232
+ (, instanceAdmin, instanceStore,, productNftId) = _register(
233
+ productAddress,
234
+ PRODUCT());
235
+
236
+ // get product
237
+ IProductComponent product = IProductComponent(productAddress);
238
+
239
+ // create info
240
+ instanceStore.createProduct(
241
+ productNftId,
242
+ product.getInitialProductInfo());
147
243
 
148
- // link distribution and pool to product
149
- _linkToProduct(instanceReader, instanceStore, productInfo.distributionNftId, productNftId);
150
- _linkToProduct(instanceReader, instanceStore, productInfo.poolNftId, productNftId);
244
+ // authorize
245
+ instanceAdmin.initializeComponentAuthorization(product);
151
246
  }
152
247
 
153
248
 
@@ -158,7 +253,7 @@ contract ComponentService is
158
253
  external
159
254
  virtual
160
255
  {
161
- (NftId productNftId,, IInstance instance) = _getAndVerifyActiveComponent(PRODUCT());
256
+ (NftId productNftId, IInstance instance) = _getAndVerifyActiveComponent(PRODUCT());
162
257
  IComponents.ProductInfo memory productInfo = instance.getInstanceReader().getProductInfo(productNftId);
163
258
  bool feesChanged = false;
164
259
 
@@ -182,43 +277,39 @@ contract ComponentService is
182
277
  }
183
278
  }
184
279
 
185
- function increaseProductFees(
186
- InstanceStore instanceStore,
187
- NftId productNftId,
188
- Amount feeAmount
189
- )
190
- external
191
- virtual
192
- // TODO re-enable once role granting is stable and fixed
193
- // restricted()
194
- {
195
- _changeTargetBalance(INCREASE, instanceStore, productNftId, AmountLib.zero(), feeAmount);
196
- }
197
-
198
-
199
- function decreaseProductFees(InstanceStore instanceStore, NftId productNftId, Amount feeAmount)
200
- external
201
- virtual
202
- // TODO re-enable once role granting is stable and fixed
203
- // restricted()
204
- {
205
- _changeTargetBalance(DECREASE, instanceStore, productNftId, AmountLib.zero(), feeAmount);
206
- }
207
-
208
280
  //-------- distribution -------------------------------------------------//
209
281
 
210
282
  /// @dev registers the sending component as a distribution component
211
- function registerDistribution()
212
- external
283
+ function _registerDistribution(address distributioAddress)
284
+ internal
213
285
  virtual
286
+ returns (NftId distributionNftId)
214
287
  {
215
- address contractAddress = msg.sender;
216
-
217
288
  // register/create component info
218
- _register(
219
- contractAddress,
220
- DISTRIBUTION(),
221
- DISTRIBUTION_OWNER_ROLE());
289
+ InstanceReader instanceReader;
290
+ InstanceAdmin instanceAdmin;
291
+ InstanceStore instanceStore;
292
+ NftId productNftId;
293
+ (instanceReader, instanceAdmin, instanceStore, productNftId, distributionNftId) = _register(
294
+ distributioAddress,
295
+ DISTRIBUTION());
296
+
297
+ // check product is still expecting a distribution registration
298
+ IComponents.ProductInfo memory productInfo = instanceReader.getProductInfo(productNftId);
299
+ if (!productInfo.hasDistribution) {
300
+ revert ErrorProductServiceNoDistributionExpected(productNftId);
301
+ }
302
+ if (productInfo.distributionNftId.gtz()) {
303
+ revert ErrorProductServiceDistributionAlreadyRegistered(productNftId, productInfo.distributionNftId);
304
+ }
305
+
306
+ // set distribution in product info
307
+ productInfo.distributionNftId = distributionNftId;
308
+ instanceStore.updateProduct(productNftId, productInfo, KEEP_STATE());
309
+
310
+ // authorize
311
+ instanceAdmin.initializeComponentAuthorization(
312
+ IInstanceLinkedComponent(distributioAddress));
222
313
  }
223
314
 
224
315
 
@@ -229,7 +320,7 @@ contract ComponentService is
229
320
  external
230
321
  virtual
231
322
  {
232
- (NftId distributionNftId,, IInstance instance) = _getAndVerifyActiveComponent(DISTRIBUTION());
323
+ (NftId distributionNftId, IInstance instance) = _getAndVerifyActiveComponent(DISTRIBUTION());
233
324
  (NftId productNftId, IComponents.ProductInfo memory productInfo) = _getLinkedProductInfo(
234
325
  instance.getInstanceReader(), distributionNftId);
235
326
  bool feesChanged = false;
@@ -254,107 +345,77 @@ contract ComponentService is
254
345
  }
255
346
  }
256
347
 
257
- function increaseDistributionBalance(
258
- InstanceStore instanceStore,
259
- NftId distributionNftId,
260
- Amount amount,
261
- Amount feeAmount
262
- )
263
- external
264
- virtual
265
- // TODO re-enable once role granting is stable and fixed
266
- // restricted()
267
- {
268
- _changeTargetBalance(INCREASE, instanceStore, distributionNftId, amount, feeAmount);
269
- }
270
-
271
-
272
- function decreaseDistributionBalance(
273
- InstanceStore instanceStore,
274
- NftId distributionNftId,
275
- Amount amount,
276
- Amount feeAmount
277
- )
278
- external
279
- virtual
280
- // TODO re-enable once role granting is stable and fixed
281
- // restricted()
282
- {
283
- _changeTargetBalance(DECREASE, instanceStore, distributionNftId, amount, feeAmount);
284
- }
285
-
286
- //-------- distributor -------------------------------------------------------//
287
-
288
- function increaseDistributorBalance(
289
- InstanceStore instanceStore,
290
- NftId distributorNftId,
291
- Amount amount,
292
- Amount feeAmount
293
- )
294
- external
295
- virtual
296
- // TODO re-enable once role granting is stable and fixed
297
- // restricted()
298
- {
299
- _changeTargetBalance(INCREASE, instanceStore, distributorNftId, amount, feeAmount);
300
- }
301
-
302
- function decreaseDistributorBalance(
303
- InstanceStore instanceStore,
304
- NftId distributorNftId,
305
- Amount amount,
306
- Amount feeAmount
307
- )
308
- external
309
- virtual
310
- // TODO re-enable once role granting is stable and fixed
311
- // restricted()
312
- {
313
- _changeTargetBalance(DECREASE, instanceStore, distributorNftId, amount, feeAmount);
314
- }
315
-
316
348
  //-------- oracle -------------------------------------------------------//
317
349
 
318
- function registerOracle()
319
- external
350
+ function _registerOracle(address oracleAddress)
351
+ internal
320
352
  virtual
353
+ returns (NftId oracleNftId)
321
354
  {
322
- address contractAddress = msg.sender;
323
-
324
355
  // register/create component setup
325
- (
326
- , // instance reader
327
- InstanceStore instanceStore,
328
- NftId componentNftId
329
- ) = _register(
330
- contractAddress,
331
- ORACLE(),
332
- ORACLE_OWNER_ROLE());
356
+ InstanceReader instanceReader;
357
+ InstanceAdmin instanceAdmin;
358
+ InstanceStore instanceStore;
359
+ NftId productNftId;
360
+
361
+ (instanceReader, instanceAdmin, instanceStore, productNftId, oracleNftId) = _register(
362
+ oracleAddress,
363
+ ORACLE());
364
+
365
+ // check product is still expecting an oracle registration
366
+ IComponents.ProductInfo memory productInfo = instanceReader.getProductInfo(productNftId);
367
+ if (productInfo.expectedNumberOfOracles == 0) {
368
+ revert ErrorProductServiceNoOraclesExpected(productNftId);
369
+ }
370
+ if (productInfo.numberOfOracles == productInfo.expectedNumberOfOracles) {
371
+ revert ErrorProductServiceOraclesAlreadyRegistered(productNftId, productInfo.expectedNumberOfOracles);
372
+ }
373
+
374
+ // update/add oracle to product info
375
+ productInfo.oracleNftId[productInfo.numberOfOracles] = oracleNftId;
376
+ productInfo.numberOfOracles++;
377
+ instanceStore.updateProduct(productNftId, productInfo, KEEP_STATE());
378
+
379
+ // authorize
380
+ instanceAdmin.initializeComponentAuthorization(
381
+ IInstanceLinkedComponent(oracleAddress));
333
382
  }
334
383
 
335
384
  //-------- pool ---------------------------------------------------------//
336
385
 
337
- function registerPool()
338
- external
386
+ function _registerPool(address poolAddress)
387
+ internal
339
388
  virtual
389
+ returns (NftId poolNftId)
340
390
  {
341
- address contractAddress = msg.sender;
342
-
343
391
  // register/create component setup
344
- (
345
- , // instance reader
346
- InstanceStore instanceStore,
347
- NftId componentNftId
348
- ) = _register(
349
- contractAddress,
350
- POOL(),
351
- POOL_OWNER_ROLE());
392
+ InstanceReader instanceReader;
393
+ InstanceAdmin instanceAdmin;
394
+ InstanceStore instanceStore;
395
+ NftId productNftId;
396
+
397
+ (instanceReader, instanceAdmin, instanceStore, productNftId, poolNftId) = _register(
398
+ poolAddress,
399
+ POOL());
400
+
401
+ // check product is still expecting a pool registration
402
+ IComponents.ProductInfo memory productInfo = instanceReader.getProductInfo(productNftId);
403
+ if (productInfo.poolNftId.gtz()) {
404
+ revert ErrorProductServicePoolAlreadyRegistered(productNftId, productInfo.poolNftId);
405
+ }
352
406
 
353
407
  // create info
408
+ IPoolComponent pool = IPoolComponent(poolAddress);
354
409
  instanceStore.createPool(
355
- componentNftId,
356
- IPoolComponent(
357
- contractAddress).getInitialPoolInfo());
410
+ poolNftId,
411
+ pool.getInitialPoolInfo());
412
+
413
+ // update pool in product info
414
+ productInfo.poolNftId = poolNftId;
415
+ instanceStore.updateProduct(productNftId, productInfo, KEEP_STATE());
416
+
417
+ // authorize
418
+ instanceAdmin.initializeComponentAuthorization(pool);
358
419
  }
359
420
 
360
421
 
@@ -366,7 +427,8 @@ contract ComponentService is
366
427
  external
367
428
  virtual
368
429
  {
369
- (NftId poolNftId,, IInstance instance) = _getAndVerifyActiveComponent(POOL());
430
+ (NftId poolNftId, IInstance instance) = _getAndVerifyActiveComponent(POOL());
431
+
370
432
  (NftId productNftId, IComponents.ProductInfo memory productInfo) = _getLinkedProductInfo(
371
433
  instance.getInstanceReader(), poolNftId);
372
434
  bool feesChanged = false;
@@ -398,158 +460,72 @@ contract ComponentService is
398
460
  }
399
461
  }
400
462
 
401
- function increasePoolBalance(
402
- InstanceStore instanceStore,
403
- NftId poolNftId,
404
- Amount amount,
405
- Amount feeAmount
406
- )
407
- public
408
- virtual
409
- // TODO re-enable once role granting is stable and fixed
410
- // restricted()
411
- {
412
- _changeTargetBalance(INCREASE, instanceStore, poolNftId, amount, feeAmount);
413
- }
414
-
415
- function decreasePoolBalance(
416
- InstanceStore instanceStore,
417
- NftId poolNftId,
418
- Amount amount,
419
- Amount feeAmount
420
- )
421
- public
422
- virtual
423
- // TODO re-enable once role granting is stable and fixed
424
- // restricted()
425
- {
426
- _changeTargetBalance(DECREASE, instanceStore, poolNftId, amount, feeAmount);
427
- }
428
-
429
- //-------- bundle -------------------------------------------------------//
430
-
431
- function increaseBundleBalance(
432
- InstanceStore instanceStore,
433
- NftId bundleNftId,
434
- Amount amount,
435
- Amount feeAmount
436
- )
437
- external
438
- virtual
439
- // TODO re-enable once role granting is stable and fixed
440
- // restricted()
441
- {
442
- _changeTargetBalance(INCREASE, instanceStore, bundleNftId, amount, feeAmount);
443
- }
444
-
445
- function decreaseBundleBalance(
446
- InstanceStore instanceStore,
447
- NftId bundleNftId,
448
- Amount amount,
449
- Amount feeAmount
450
- )
451
- external
452
- virtual
453
- // TODO re-enable once role granting is stable and fixed
454
- // restricted()
455
- {
456
- _changeTargetBalance(DECREASE, instanceStore, bundleNftId, amount, feeAmount);
457
- }
458
-
459
-
460
- //-------- internal functions ------------------------------------------//
461
-
462
- function _changeTargetBalance(
463
- bool increase,
464
- InstanceStore instanceStore,
465
- NftId targetNftId,
466
- Amount amount,
467
- Amount feeAmount
468
- )
469
- internal
470
- virtual
471
- {
472
- Amount totalAmount = amount + feeAmount;
473
-
474
- if(increase) {
475
- if(totalAmount.gtz()) { instanceStore.increaseBalance(targetNftId, totalAmount); }
476
- if(feeAmount.gtz()) { instanceStore.increaseFees(targetNftId, feeAmount); }
477
- } else {
478
- if(totalAmount.gtz()) { instanceStore.decreaseBalance(targetNftId, totalAmount); }
479
- if(feeAmount.gtz()) { instanceStore.decreaseFees(targetNftId, feeAmount); }
480
- }
481
- }
482
-
483
- /// @dev registers the component represented by the provided address
463
+ /// @dev Registers the component represented by the provided address.
484
464
  function _register(
485
465
  address componentAddress, // address of component to register
486
- ObjectType requiredType, // required type for component for registration
487
- RoleId requiredRole // role required for comonent owner for registration
466
+ ObjectType requiredType // required type for component for registration
488
467
  )
489
468
  internal
490
469
  virtual
491
470
  returns (
492
471
  InstanceReader instanceReader,
472
+ InstanceAdmin instanceAdmin,
493
473
  InstanceStore instanceStore,
474
+ NftId parentNftId,
494
475
  NftId componentNftId
495
476
  )
496
477
  {
478
+ NftId instanceNftId;
479
+ IInstance instance;
480
+ IInstanceLinkedComponent component;
481
+ address initialOwner;
482
+
497
483
  (
498
- IInstance instance,
499
- IInstanceLinkedComponent component,
500
- address owner
484
+ instanceNftId,
485
+ instance,
486
+ parentNftId,
487
+ component,
488
+ initialOwner
501
489
  ) = _getAndVerifyRegisterableComponent(
490
+ getRegistry(),
502
491
  componentAddress,
503
- requiredType,
504
- requiredRole);
505
-
506
- // register component with registry
507
- componentNftId = _registryService.registerComponent(
508
- component,
509
- requiredType,
510
- owner).nftId;
511
-
512
- component.linkToRegisteredNftId();
492
+ requiredType);
513
493
 
514
- // save amended component info with instance
494
+ // get instance supporting contracts (as function return values)
515
495
  instanceReader = instance.getInstanceReader();
496
+ instanceAdmin = instance.getInstanceAdmin();
516
497
  instanceStore = instance.getInstanceStore();
517
498
 
499
+ // register with registry
500
+ if (requiredType == PRODUCT()) {
501
+ componentNftId = _registryService.registerProduct(
502
+ component, initialOwner).nftId;
503
+ } else {
504
+ componentNftId = _registryService.registerProductLinkedComponent(
505
+ component, requiredType, initialOwner).nftId;
506
+ }
507
+
508
+ // deploy and wire token handler
518
509
  IComponents.ComponentInfo memory componentInfo = component.getInitialComponentInfo();
510
+ IERC20Metadata token = componentInfo.token;
519
511
  componentInfo.tokenHandler = TokenHandlerDeployerLib.deployTokenHandler(
520
- address(componentInfo.token),
521
- address(instance.getInstanceAdmin().authority()));
512
+ address(getRegistry()),
513
+ address(component), // initially, component is its own wallet
514
+ address(token),
515
+ address(instanceAdmin.authority()));
516
+
517
+ // set token handler allowance to max
518
+ // componentInfo.tokenHandler.approve(token, AmountLib.max());
522
519
 
520
+ // register component with instance
523
521
  instanceStore.createComponent(
524
- component.getNftId(),
522
+ componentNftId,
525
523
  componentInfo);
526
524
 
527
- // setup initial component authorization
528
- _instanceService.initializeAuthorization(
529
- instance.getNftId(),
530
- component);
525
+ // link component contract to nft id
526
+ component.linkToRegisteredNftId();
531
527
 
532
- // TODO add logging
533
- }
534
-
535
-
536
- /// @dev link the component info corresponding to the componentNftId to the provided productNftId
537
- function _linkToProduct(
538
- InstanceReader instanceReader,
539
- InstanceStore instanceStore,
540
- NftId componentNftId,
541
- NftId productNftId
542
- )
543
- internal
544
- {
545
- // only link components that are registered
546
- if(componentNftId.eqz()) {
547
- return;
548
- }
549
-
550
- IComponents.ComponentInfo memory componentInfo = instanceReader.getComponentInfo(componentNftId);
551
- componentInfo.productNftId = productNftId;
552
- instanceStore.updateComponent(componentNftId, componentInfo, KEEP_STATE());
528
+ emit LogComponentServiceRegistered(instanceNftId, componentNftId, requiredType, address(component), address(token), initialOwner);
553
529
  }
554
530
 
555
531
 
@@ -568,12 +544,6 @@ contract ComponentService is
568
544
  }
569
545
 
570
546
 
571
- function _createSelectors(bytes4 selector) internal pure returns (bytes4[] memory selectors) {
572
- selectors = new bytes4[](1);
573
- selectors[0] = selector;
574
- }
575
-
576
-
577
547
  function _getLinkedProductInfo(
578
548
  InstanceReader instanceReader,
579
549
  NftId componentNftId
@@ -585,37 +555,45 @@ contract ComponentService is
585
555
  IComponents.ProductInfo memory info
586
556
  )
587
557
  {
588
- productNftId = instanceReader.getComponentInfo(componentNftId).productNftId;
558
+ productNftId = getRegistry().getObjectInfo(componentNftId).parentNftId;
589
559
  info = instanceReader.getProductInfo(productNftId);
590
560
  }
591
561
 
592
562
 
593
- /// @dev based on the provided component address required type and role returns the component and related instance contract
594
- /// the function reverts iff:
595
- /// - the component has already been registered
563
+ /// @dev Based on the provided component address required type the component
564
+ /// and related instance contract this function reverts iff:
565
+ /// - the sender is not registered
596
566
  /// - the component contract does not support IInstanceLinkedComponent
597
567
  /// - the component type does not match with the required type
598
- /// - the initial component owner misses the required role (with the instance access manager)
568
+ /// - the component has already been registered
599
569
  function _getAndVerifyRegisterableComponent(
570
+ IRegistry registry,
600
571
  address componentAddress,
601
- ObjectType requiredType,
602
- RoleId requiredRole
572
+ ObjectType requiredType
603
573
  )
604
574
  internal
605
575
  view
606
576
  returns (
577
+ NftId instanceNftId,
607
578
  IInstance instance,
579
+ NftId parentNftId,
608
580
  IInstanceLinkedComponent component,
609
- address owner
581
+ address initialOwner
610
582
  )
611
583
  {
612
- // check this is a component
613
- component = IInstanceLinkedComponent(componentAddress);
614
- if(!component.supportsInterface(type(IInstanceLinkedComponent).interfaceId)) {
615
- revert ErrorComponentServiceNotComponent(componentAddress);
584
+ // check sender (instance or product) is registered
585
+ IRegistry.ObjectInfo memory senderInfo = registry.getObjectInfo(msg.sender);
586
+ if (senderInfo.nftId.eqz()) {
587
+ revert ErrorComponentServiceSenderNotRegistered(msg.sender);
616
588
  }
617
589
 
590
+ // the sender is the parent of the component to be registered
591
+ // an instance caller wanting to register a product - or -
592
+ // a product caller wantint go register a distribution, oracle or pool
593
+ parentNftId = senderInfo.nftId;
594
+
618
595
  // check component is of required type
596
+ component = IInstanceLinkedComponent(componentAddress);
619
597
  IRegistry.ObjectInfo memory info = component.getInitialInfo();
620
598
  if(info.objectType != requiredType) {
621
599
  revert ErrorComponentServiceInvalidType(componentAddress, requiredType, info.objectType);
@@ -626,16 +604,90 @@ contract ComponentService is
626
604
  revert ErrorComponentServiceAlreadyRegistered(componentAddress);
627
605
  }
628
606
 
629
- // check instance has assigned required role to inital owner
630
- instance = _getInstance(info.parentNftId);
631
- owner = info.initialOwner;
607
+ // check release matches
608
+ address parentAddress = registry.getObjectAddress(parentNftId);
609
+ if (component.getRelease() != IRegisterable(parentAddress).getRelease()) {
610
+ revert ErrorComponentServiceReleaseMismatch(componentAddress, component.getRelease(), IRegisterable(parentAddress).getRelease());
611
+ }
612
+
613
+ // check component belongs to same product cluster
614
+ // parent of product must be instance, parent of other componet types must be product
615
+ if (info.parentNftId != senderInfo.nftId) {
616
+ revert ErrorComponentServiceSenderNotComponentParent(senderInfo.nftId, info.parentNftId);
617
+ }
618
+
619
+ // verify parent is registered instance
620
+ if (requiredType == PRODUCT()) {
621
+ if (senderInfo.objectType != INSTANCE()) {
622
+ revert ErrorComponentServiceParentNotInstance(senderInfo.nftId, senderInfo.objectType);
623
+ }
632
624
 
633
- if(!instance.getInstanceAdmin().hasRole(owner, requiredRole)) {
634
- revert ErrorComponentServiceExpectedRoleMissing(info.parentNftId, requiredRole, owner);
625
+ instanceNftId = senderInfo.nftId;
626
+ // verify parent is registered product
627
+ } else {
628
+ if (senderInfo.objectType != PRODUCT()) {
629
+ revert ErrorComponentServiceParentNotProduct(senderInfo.nftId, senderInfo.objectType);
630
+ }
631
+
632
+ instanceNftId = senderInfo.parentNftId;
635
633
  }
634
+
635
+ // get initial owner and instance
636
+ initialOwner = info.initialOwner;
637
+ instance = IInstance(registry.getObjectAddress(instanceNftId));
638
+ }
639
+
640
+ function _setLocked(InstanceAdmin instanceAdmin, address componentAddress, bool locked) internal {
641
+ instanceAdmin.setTargetLocked(componentAddress, locked);
642
+ }
643
+
644
+ function _getAndVerifyActiveComponent(ObjectType expectedType)
645
+ internal
646
+ view
647
+ returns (
648
+ NftId componentNftId,
649
+ IInstance instance
650
+ )
651
+ {
652
+ return _getAndVerifyComponent(expectedType, true); // only active
653
+ }
654
+
655
+ function _getAndVerifyComponent(ObjectType expectedType, bool isActive)
656
+ internal
657
+ view
658
+ returns (
659
+ NftId componentNftId,
660
+ IInstance instance
661
+ )
662
+ {
663
+ IRegistry.ObjectInfo memory info;
664
+ address instanceAddress;
665
+
666
+ if (expectedType != COMPONENT()) {
667
+ (info, instanceAddress) = ContractLib.getAndVerifyComponent(
668
+ getRegistry(),
669
+ msg.sender, // caller
670
+ expectedType,
671
+ isActive);
672
+ } else {
673
+ (info, instanceAddress) = ContractLib.getAndVerifyAnyComponent(
674
+ getRegistry(),
675
+ msg.sender,
676
+ isActive);
677
+ }
678
+
679
+ // get component nft id and instance
680
+ componentNftId = info.nftId;
681
+ instance = IInstance(instanceAddress);
636
682
  }
637
683
 
638
684
  function _getDomain() internal pure virtual override returns(ObjectType) {
639
685
  return COMPONENT();
640
686
  }
687
+
688
+ function _checkSupportsInterface(address component) internal view {
689
+ if (!ContractLib.supportsInterface(component, type(IInstanceLinkedComponent).interfaceId)) {
690
+ revert ErrorComponentServiceNotInstanceLinkedComponent(component);
691
+ }
692
+ }
641
693
  }