@etherisc/gif-next 0.0.2-de7c770-422 → 0.0.2-de9ede4-391

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 (472) hide show
  1. package/README.md +28 -7
  2. package/artifacts/contracts/accounting/AccountingService.sol/AccountingService.dbg.json +4 -0
  3. package/artifacts/contracts/accounting/AccountingService.sol/AccountingService.json +1000 -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 +767 -0
  8. package/artifacts/contracts/authorization/AccessAdmin.sol/AccessAdmin.dbg.json +1 -1
  9. package/artifacts/contracts/authorization/AccessAdmin.sol/AccessAdmin.json +103 -63
  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 -32
  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 +180 -86
  34. package/artifacts/contracts/distribution/DistributionServiceManager.sol/DistributionServiceManager.dbg.json +1 -1
  35. package/artifacts/contracts/distribution/DistributionServiceManager.sol/DistributionServiceManager.json +139 -64
  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 +282 -194
  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 +564 -249
  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 +196 -138
  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 +687 -84
  80. package/artifacts/contracts/instance/InstanceService.sol/InstanceService.dbg.json +1 -1
  81. package/artifacts/contracts/instance/InstanceService.sol/InstanceService.json +118 -148
  82. package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.dbg.json +1 -1
  83. package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.json +107 -44
  84. package/artifacts/contracts/instance/InstanceStore.sol/InstanceStore.dbg.json +1 -1
  85. package/artifacts/contracts/instance/InstanceStore.sol/InstanceStore.json +475 -116
  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 +147 -79
  117. package/artifacts/contracts/oracle/OracleServiceManager.sol/OracleServiceManager.dbg.json +1 -1
  118. package/artifacts/contracts/oracle/OracleServiceManager.sol/OracleServiceManager.json +127 -40
  119. package/artifacts/contracts/pool/BasicPool.sol/BasicPool.dbg.json +1 -1
  120. package/artifacts/contracts/pool/BasicPool.sol/BasicPool.json +115 -141
  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 +148 -150
  125. package/artifacts/contracts/pool/BundleServiceManager.sol/BundleServiceManager.dbg.json +1 -1
  126. package/artifacts/contracts/pool/BundleServiceManager.sol/BundleServiceManager.json +121 -70
  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 +102 -134
  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 +115 -152
  135. package/artifacts/contracts/pool/PoolService.sol/PoolService.dbg.json +1 -1
  136. package/artifacts/contracts/pool/PoolService.sol/PoolService.json +413 -263
  137. package/artifacts/contracts/pool/PoolServiceManager.sol/PoolServiceManager.dbg.json +1 -1
  138. package/artifacts/contracts/pool/PoolServiceManager.sol/PoolServiceManager.json +144 -45
  139. package/artifacts/contracts/product/ApplicationService.sol/ApplicationService.dbg.json +1 -1
  140. package/artifacts/contracts/product/ApplicationService.sol/ApplicationService.json +119 -45
  141. package/artifacts/contracts/product/ApplicationServiceManager.sol/ApplicationServiceManager.dbg.json +1 -1
  142. package/artifacts/contracts/product/ApplicationServiceManager.sol/ApplicationServiceManager.json +103 -40
  143. package/artifacts/contracts/product/BasicProduct.sol/BasicProduct.dbg.json +1 -1
  144. package/artifacts/contracts/product/BasicProduct.sol/BasicProduct.json +158 -138
  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 +200 -86
  149. package/artifacts/contracts/product/ClaimServiceManager.sol/ClaimServiceManager.dbg.json +1 -1
  150. package/artifacts/contracts/product/ClaimServiceManager.sol/ClaimServiceManager.json +144 -61
  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 +178 -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 +141 -116
  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 +328 -119
  165. package/artifacts/contracts/product/PolicyServiceManager.sol/PolicyServiceManager.dbg.json +1 -1
  166. package/artifacts/contracts/product/PolicyServiceManager.sol/PolicyServiceManager.json +150 -55
  167. package/artifacts/contracts/product/PricingService.sol/PricingService.dbg.json +1 -1
  168. package/artifacts/contracts/product/PricingService.sol/PricingService.json +170 -107
  169. package/artifacts/contracts/product/PricingServiceManager.sol/PricingServiceManager.dbg.json +1 -1
  170. package/artifacts/contracts/product/PricingServiceManager.sol/PricingServiceManager.json +119 -48
  171. package/artifacts/contracts/product/Product.sol/Product.dbg.json +1 -1
  172. package/artifacts/contracts/product/Product.sol/Product.json +154 -134
  173. package/artifacts/contracts/product/RiskService.sol/RiskService.dbg.json +1 -1
  174. package/artifacts/contracts/product/RiskService.sol/RiskService.json +81 -26
  175. package/artifacts/contracts/product/RiskServiceManager.sol/RiskServiceManager.dbg.json +1 -1
  176. package/artifacts/contracts/product/RiskServiceManager.sol/RiskServiceManager.json +101 -34
  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 +220 -182
  189. package/artifacts/contracts/registry/RegistryService.sol/RegistryService.dbg.json +1 -1
  190. package/artifacts/contracts/registry/RegistryService.sol/RegistryService.json +94 -172
  191. package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.dbg.json +1 -1
  192. package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.json +99 -32
  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 +483 -477
  205. package/artifacts/contracts/shared/ComponentServiceManager.sol/ComponentServiceManager.dbg.json +1 -1
  206. package/artifacts/contracts/shared/ComponentServiceManager.sol/ComponentServiceManager.json +141 -76
  207. package/artifacts/contracts/shared/ComponentVerifyingService.sol/ComponentVerifyingService.dbg.json +1 -1
  208. package/artifacts/contracts/shared/ComponentVerifyingService.sol/ComponentVerifyingService.json +47 -0
  209. package/artifacts/contracts/shared/ContractLib.sol/ContractLib.dbg.json +4 -0
  210. package/artifacts/contracts/shared/ContractLib.sol/ContractLib.json +488 -0
  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 +16 -6
  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 +18 -8
  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 +47 -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 +3 -3
  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 +120 -54
  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 +87 -53
  275. package/artifacts/contracts/staking/StakingServiceManager.sol/StakingServiceManager.dbg.json +1 -1
  276. package/artifacts/contracts/staking/StakingServiceManager.sol/StakingServiceManager.json +103 -36
  277. package/artifacts/contracts/staking/StakingStore.sol/StakingStore.dbg.json +1 -1
  278. package/artifacts/contracts/staking/StakingStore.sol/StakingStore.json +145 -104
  279. package/artifacts/contracts/staking/TargetManagerLib.sol/TargetManagerLib.dbg.json +1 -1
  280. package/artifacts/contracts/staking/TargetManagerLib.sol/TargetManagerLib.json +3 -3
  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 +33 -9
  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 +3 -3
  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/UFixedLib.dbg.json +1 -1
  319. package/artifacts/contracts/type/UFixed.sol/UFixedLib.json +16 -3
  320. package/artifacts/contracts/type/Version.sol/VersionLib.dbg.json +1 -1
  321. package/artifacts/contracts/type/Version.sol/VersionPartLib.dbg.json +1 -1
  322. package/artifacts/contracts/upgradeability/IVersionable.sol/IVersionable.dbg.json +1 -1
  323. package/artifacts/contracts/upgradeability/ProxyManager.sol/ProxyManager.dbg.json +1 -1
  324. package/artifacts/contracts/upgradeability/ProxyManager.sol/ProxyManager.json +79 -27
  325. package/artifacts/contracts/upgradeability/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.dbg.json +1 -1
  326. package/artifacts/contracts/upgradeability/Versionable.sol/Versionable.dbg.json +1 -1
  327. package/contracts/accounting/AccountingService.sol +263 -0
  328. package/contracts/accounting/AccountingServiceManager.sol +38 -0
  329. package/contracts/accounting/IAccountingService.sol +45 -0
  330. package/contracts/authorization/AccessAdmin.sol +82 -56
  331. package/contracts/authorization/Authorization.sol +111 -39
  332. package/contracts/authorization/IAccess.sol +1 -0
  333. package/contracts/authorization/IAccessAdmin.sol +4 -3
  334. package/contracts/authorization/IAuthorization.sol +13 -7
  335. package/contracts/authorization/IServiceAuthorization.sol +3 -1
  336. package/contracts/authorization/ReleaseAccessManager.sol +38 -0
  337. package/contracts/authorization/ServiceAuthorization.sol +26 -10
  338. package/contracts/distribution/BasicDistribution.sol +8 -7
  339. package/contracts/distribution/BasicDistributionAuthorization.sol +1 -1
  340. package/contracts/distribution/Distribution.sol +32 -40
  341. package/contracts/distribution/DistributionService.sol +86 -65
  342. package/contracts/distribution/DistributionServiceManager.sol +6 -6
  343. package/contracts/distribution/IDistributionComponent.sol +1 -1
  344. package/contracts/distribution/IDistributionService.sol +5 -6
  345. package/contracts/examples/fire/DamageLevel.sol +59 -0
  346. package/contracts/examples/fire/FirePool.sol +90 -0
  347. package/contracts/examples/fire/FirePoolAuthorization.sol +35 -0
  348. package/contracts/examples/fire/FireProduct.sol +436 -0
  349. package/contracts/examples/fire/FireProductAuthorization.sol +45 -0
  350. package/contracts/examples/fire/FireUSD.sol +26 -0
  351. package/contracts/examples/unpermissioned/SimpleDistribution.sol +11 -4
  352. package/contracts/examples/unpermissioned/SimpleDistributionAuthorization.sol +28 -0
  353. package/contracts/examples/unpermissioned/SimpleOracle.sol +4 -4
  354. package/contracts/examples/unpermissioned/SimplePool.sol +37 -6
  355. package/contracts/examples/unpermissioned/SimplePoolAuthorization.sol +28 -0
  356. package/contracts/examples/unpermissioned/SimpleProduct.sol +24 -23
  357. package/contracts/examples/unpermissioned/SimpleProductAuthorization.sol +28 -0
  358. package/contracts/instance/BundleSet.sol +38 -34
  359. package/contracts/instance/IInstance.sol +11 -3
  360. package/contracts/instance/IInstanceService.sol +7 -29
  361. package/contracts/instance/Instance.sol +36 -26
  362. package/contracts/instance/InstanceAdmin.sol +57 -54
  363. package/contracts/instance/InstanceAuthorizationV3.sol +50 -32
  364. package/contracts/instance/InstanceReader.sol +187 -21
  365. package/contracts/instance/InstanceService.sol +54 -129
  366. package/contracts/instance/InstanceServiceManager.sol +6 -7
  367. package/contracts/instance/InstanceStore.sol +12 -2
  368. package/contracts/instance/RiskSet.sol +119 -0
  369. package/contracts/instance/base/ObjectCounter.sol +1 -2
  370. package/contracts/instance/base/ObjectLifecycle.sol +2 -1
  371. package/contracts/instance/base/ObjectSet.sol +24 -25
  372. package/contracts/instance/module/IComponents.sol +20 -7
  373. package/contracts/instance/module/IPolicy.sol +4 -3
  374. package/contracts/instance/module/IRisk.sol +1 -0
  375. package/contracts/oracle/BasicOracle.sol +0 -1
  376. package/contracts/oracle/IOracleService.sol +2 -1
  377. package/contracts/oracle/Oracle.sol +4 -15
  378. package/contracts/oracle/OracleService.sol +110 -80
  379. package/contracts/oracle/OracleServiceManager.sol +6 -6
  380. package/contracts/pool/BasicPool.sol +33 -24
  381. package/contracts/pool/BasicPoolAuthorization.sol +12 -2
  382. package/contracts/pool/BundleService.sol +74 -87
  383. package/contracts/pool/BundleServiceManager.sol +6 -6
  384. package/contracts/pool/IBundleService.sol +2 -15
  385. package/contracts/pool/IPoolComponent.sol +19 -15
  386. package/contracts/pool/IPoolService.sol +30 -37
  387. package/contracts/pool/Pool.sol +141 -122
  388. package/contracts/pool/PoolService.sol +263 -157
  389. package/contracts/pool/PoolServiceManager.sol +4 -4
  390. package/contracts/product/ApplicationService.sol +31 -20
  391. package/contracts/product/ApplicationServiceManager.sol +4 -4
  392. package/contracts/product/BasicProduct.sol +8 -12
  393. package/contracts/product/BasicProductAuthorization.sol +1 -3
  394. package/contracts/product/ClaimService.sol +233 -106
  395. package/contracts/product/ClaimServiceManager.sol +4 -4
  396. package/contracts/product/IApplicationService.sol +5 -2
  397. package/contracts/product/IClaimService.sol +3 -2
  398. package/contracts/product/IPolicyService.sol +25 -8
  399. package/contracts/product/IPricingService.sol +9 -9
  400. package/contracts/product/IProductComponent.sol +23 -3
  401. package/contracts/product/PolicyService.sol +361 -198
  402. package/contracts/product/PolicyServiceManager.sol +4 -4
  403. package/contracts/product/PricingService.sol +10 -11
  404. package/contracts/product/PricingServiceManager.sol +3 -3
  405. package/contracts/product/Product.sol +76 -74
  406. package/contracts/product/RiskService.sol +16 -6
  407. package/contracts/product/RiskServiceManager.sol +4 -4
  408. package/contracts/registry/ChainNft.sol +10 -11
  409. package/contracts/registry/IRegistry.sol +8 -3
  410. package/contracts/registry/IRegistryService.sol +5 -12
  411. package/contracts/registry/ITransferInterceptor.sol +1 -2
  412. package/contracts/registry/Registry.sol +29 -6
  413. package/contracts/registry/RegistryAdmin.sol +29 -36
  414. package/contracts/registry/RegistryService.sol +33 -44
  415. package/contracts/registry/RegistryServiceManager.sol +2 -2
  416. package/contracts/registry/ReleaseLifecycle.sol +6 -3
  417. package/contracts/registry/ReleaseRegistry.sol +205 -210
  418. package/contracts/registry/ServiceAuthorizationV3.sol +58 -50
  419. package/contracts/shared/Component.sol +56 -105
  420. package/contracts/shared/ComponentService.sol +384 -329
  421. package/contracts/shared/ComponentServiceManager.sol +8 -5
  422. package/contracts/shared/ComponentVerifyingService.sol +27 -16
  423. package/contracts/shared/ContractLib.sol +224 -0
  424. package/contracts/shared/IComponent.sol +6 -14
  425. package/contracts/shared/IComponentService.sol +45 -37
  426. package/contracts/shared/IInstanceLinkedComponent.sol +3 -22
  427. package/contracts/shared/ILifecycle.sol +3 -1
  428. package/contracts/shared/INftOwnable.sol +2 -0
  429. package/contracts/shared/IPolicyHolder.sol +12 -13
  430. package/contracts/shared/IRegisterable.sol +11 -0
  431. package/contracts/shared/InstanceLinkedComponent.sol +68 -43
  432. package/contracts/shared/KeyValueStore.sol +1 -1
  433. package/contracts/shared/Lifecycle.sol +15 -4
  434. package/contracts/shared/NftOwnable.sol +23 -3
  435. package/contracts/shared/PolicyHolder.sol +11 -5
  436. package/contracts/shared/Registerable.sol +15 -7
  437. package/contracts/shared/RegistryLinked.sol +6 -12
  438. package/contracts/shared/Service.sol +16 -14
  439. package/contracts/shared/TokenHandler.sol +316 -66
  440. package/contracts/shared/TokenHandlerDeployerLib.sol +10 -2
  441. package/contracts/staking/IStaking.sol +9 -4
  442. package/contracts/staking/IStakingService.sol +0 -3
  443. package/contracts/staking/Staking.sol +42 -25
  444. package/contracts/staking/StakingManager.sol +8 -6
  445. package/contracts/staking/StakingReader.sol +12 -5
  446. package/contracts/staking/StakingService.sol +56 -23
  447. package/contracts/staking/StakingServiceManager.sol +2 -2
  448. package/contracts/type/Amount.sol +15 -0
  449. package/contracts/type/ClaimId.sol +6 -1
  450. package/contracts/type/Key32.sol +2 -2
  451. package/contracts/type/Key32Set.sol +62 -0
  452. package/contracts/type/NftId.sol +7 -0
  453. package/contracts/type/ObjectType.sol +14 -0
  454. package/contracts/type/PayoutId.sol +10 -10
  455. package/contracts/type/RiskId.sol +30 -4
  456. package/contracts/type/RoleId.sol +0 -12
  457. package/contracts/type/StateId.sol +14 -1
  458. package/contracts/type/UFixed.sol +13 -119
  459. package/contracts/upgradeability/ProxyManager.sol +68 -34
  460. package/contracts/upgradeability/Versionable.sol +2 -2
  461. package/package.json +4 -3
  462. package/artifacts/contracts/authorization/IModuleAuthorization.sol/IModuleAuthorization.dbg.json +0 -4
  463. package/artifacts/contracts/authorization/IModuleAuthorization.sol/IModuleAuthorization.json +0 -290
  464. package/artifacts/contracts/authorization/ModuleAuthorization.sol/ModuleAuthorization.dbg.json +0 -4
  465. package/artifacts/contracts/authorization/ModuleAuthorization.sol/ModuleAuthorization.json +0 -390
  466. package/artifacts/contracts/shared/InitializableCustom.sol/InitializableCustom.dbg.json +0 -4
  467. package/artifacts/contracts/shared/InitializableCustom.sol/InitializableCustom.json +0 -39
  468. package/artifacts/contracts/type/UFixed.sol/MathLib.dbg.json +0 -4
  469. package/artifacts/contracts/type/UFixed.sol/MathLib.json +0 -16
  470. package/contracts/authorization/IModuleAuthorization.sol +0 -21
  471. package/contracts/authorization/ModuleAuthorization.sol +0 -78
  472. package/contracts/shared/InitializableCustom.sol +0 -177
@@ -13,6 +13,7 @@ import {ObjectType, ObjectTypeLib, PROTOCOL, REGISTRY, SERVICE, INSTANCE, STAKE,
13
13
  import {ChainNft} from "./ChainNft.sol";
14
14
  import {IRegistry} from "./IRegistry.sol";
15
15
  import {IRegisterable} from "../shared/IRegisterable.sol";
16
+ import {IStaking} from "../staking/IStaking.sol";
16
17
  import {ReleaseRegistry} from "./ReleaseRegistry.sol";
17
18
  import {TokenRegistry} from "./TokenRegistry.sol";
18
19
  import {RegistryAdmin} from "./RegistryAdmin.sol";
@@ -243,6 +244,9 @@ contract Registry is
243
244
  {
244
245
  address objectAddress = info.objectAddress;
245
246
  ObjectType objectType = info.objectType;
247
+
248
+ // this indidirectly enforces that the parent is registered
249
+ // parentType would be zero for a non-registered parent which is never a valid type combination
246
250
  ObjectType parentType = _info[info.parentNftId].objectType;
247
251
 
248
252
  // check type combinations for core objects
@@ -339,6 +343,10 @@ contract Registry is
339
343
  return CHAIN_NFT.ownerOf(nftId.toInt());
340
344
  }
341
345
 
346
+ function isOwnerOf(NftId nftId, address expectedOwner) public view returns (bool) {
347
+ return CHAIN_NFT.ownerOf(nftId.toInt()) == expectedOwner;
348
+ }
349
+
342
350
  function ownerOf(address contractAddress) public view returns (address) {
343
351
  return CHAIN_NFT.ownerOf(_nftIdByAddress[contractAddress].toInt());
344
352
  }
@@ -347,6 +355,19 @@ contract Registry is
347
355
  return _info[nftId];
348
356
  }
349
357
 
358
+ function isObjectType(address contractAddress, ObjectType expectedObjectType) external view returns (bool) {
359
+ NftId nftId = _nftIdByAddress[contractAddress];
360
+ return isObjectType(nftId, expectedObjectType);
361
+ }
362
+
363
+ function isObjectType(NftId nftId, ObjectType expectedObjectType) public view returns (bool) {
364
+ return _info[nftId].objectType == expectedObjectType;
365
+ }
366
+
367
+ function getObjectAddress(NftId nftId) external view returns (address) {
368
+ return _info[nftId].objectAddress;
369
+ }
370
+
350
371
  function getObjectInfo(address object) external view returns (ObjectInfo memory) {
351
372
  return _info[_nftIdByAddress[object]];
352
373
  }
@@ -374,8 +395,6 @@ contract Registry is
374
395
  }
375
396
 
376
397
  function getStakingAddress() external view returns (address staking) {
377
- //return getObjectInfo(_stakingNftId).objectAddress;
378
- //return _info[_stakingNftId].objectAddress;
379
398
  return _stakingAddress;
380
399
  }
381
400
 
@@ -622,6 +641,8 @@ contract Registry is
622
641
  initialOwner: stakingOwner,
623
642
  data: ""}),
624
643
  true);
644
+
645
+ IStaking(_stakingAddress).initializeTokenHandler();
625
646
  }
626
647
 
627
648
  /// @dev Register the provided object info for the specified NFT ID.
@@ -686,13 +707,15 @@ contract Registry is
686
707
 
687
708
  // components with instance parent
688
709
  _coreContractCombinations[PRODUCT()][INSTANCE()] = true;
689
- _coreContractCombinations[DISTRIBUTION()][INSTANCE()] = true;
690
- _coreContractCombinations[ORACLE()][INSTANCE()] = true;
691
- _coreContractCombinations[POOL()][INSTANCE()] = true;
710
+
711
+ // components with product parent
712
+ _coreContractCombinations[DISTRIBUTION()][PRODUCT()] = true;
713
+ _coreContractCombinations[ORACLE()][PRODUCT()] = true;
714
+ _coreContractCombinations[POOL()][PRODUCT()] = true;
692
715
 
693
716
  // objects with component parents
694
- _coreObjectCombinations[DISTRIBUTOR()][DISTRIBUTION()] = true;
695
717
  _coreObjectCombinations[POLICY()][PRODUCT()] = true;
718
+ _coreObjectCombinations[DISTRIBUTOR()][DISTRIBUTION()] = true;
696
719
  _coreObjectCombinations[BUNDLE()][POOL()] = true;
697
720
 
698
721
  // staking
@@ -10,6 +10,7 @@ import {IStaking} from "../staking/IStaking.sol";
10
10
  import {ObjectType, ObjectTypeLib, ALL, REGISTRY, STAKING, POOL, RELEASE} from "../type/ObjectType.sol";
11
11
  import {ReleaseRegistry} from "./ReleaseRegistry.sol";
12
12
  import {RoleId, RoleIdLib, ADMIN_ROLE, GIF_MANAGER_ROLE, GIF_ADMIN_ROLE, PUBLIC_ROLE} from "../type/RoleId.sol";
13
+ import {Staking} from "../staking/Staking.sol";
13
14
  import {StakingStore} from "../staking/StakingStore.sol";
14
15
  import {TokenHandler} from "../shared/TokenHandler.sol";
15
16
  import {TokenRegistry} from "./TokenRegistry.sol";
@@ -42,6 +43,7 @@ contract RegistryAdmin is
42
43
  string public constant RELEASE_REGISTRY_TARGET_NAME = "ReleaseRegistry";
43
44
  string public constant TOKEN_REGISTRY_TARGET_NAME = "TokenRegistry";
44
45
  string public constant STAKING_TARGET_NAME = "Staking";
46
+ string public constant STAKING_TH_TARGET_NAME = "StakingTH";
45
47
  string public constant STAKING_STORE_TARGET_NAME = "StakingStore";
46
48
 
47
49
  uint8 public constant MAX_NUM_RELEASES = 99;
@@ -62,7 +64,7 @@ contract RegistryAdmin is
62
64
  address gifManager
63
65
  )
64
66
  external
65
- initializer
67
+ initializer()
66
68
  onlyDeployer()
67
69
  {
68
70
  _registry = address(registry);
@@ -115,21 +117,6 @@ contract RegistryAdmin is
115
117
  address(service));
116
118
  }
117
119
 
118
- function revokeServiceRole(
119
- IService service,
120
- ObjectType domain,
121
- VersionPart version
122
- )
123
- external
124
- restricted()
125
- {
126
- _revokeRoleFromAccount(
127
- RoleIdLib.roleForTypeAndVersion(
128
- domain,
129
- version),
130
- address(service));
131
- }
132
-
133
120
  function grantServiceRoleForAllVersions(IService service, ObjectType domain)
134
121
  external
135
122
  restricted()
@@ -139,13 +126,11 @@ contract RegistryAdmin is
139
126
  address(service));
140
127
  }
141
128
 
142
- function revokeServiceRoleForAllVersions(IService service, ObjectType domain)
129
+ function setServiceLocked(IService service, bool locked)
143
130
  external
144
131
  restricted()
145
132
  {
146
- _revokeRoleFromAccount(
147
- RoleIdLib.roleForTypeAndAllVersions(domain),
148
- address(service));
133
+ _setTargetClosed(address(service), locked);
149
134
  }
150
135
 
151
136
  /*function transferAdmin(address to)
@@ -188,6 +173,8 @@ contract RegistryAdmin is
188
173
  true,
189
174
  false);
190
175
 
176
+ _setTargetClosed(address(service), true);
177
+
191
178
  // create service role
192
179
  RoleId serviceRoleId = RoleIdLib.roleForTypeAndVersion(
193
180
  serviceDomain,
@@ -330,12 +317,11 @@ contract RegistryAdmin is
330
317
  name: RELEASE_REGISTRY_ROLE_NAME}));
331
318
 
332
319
  FunctionInfo[] memory functions;
333
- functions = new FunctionInfo[](5);
320
+ functions = new FunctionInfo[](4);
334
321
  functions[0] = toFunction(RegistryAdmin.authorizeService.selector, "authorizeService");
335
322
  functions[1] = toFunction(RegistryAdmin.grantServiceRoleForAllVersions.selector, "grantServiceRoleForAllVersions");
336
- functions[2] = toFunction(RegistryAdmin.revokeServiceRoleForAllVersions.selector, "revokeServiceRoleForAllVersions");
337
- functions[3] = toFunction(RegistryAdmin.grantServiceRole.selector, "grantServiceRole");
338
- functions[4] = toFunction(RegistryAdmin.revokeServiceRole.selector, "revokeServiceRole");
323
+ functions[2] = toFunction(RegistryAdmin.grantServiceRole.selector, "grantServiceRole");
324
+ functions[3] = toFunction(RegistryAdmin.setServiceLocked.selector, "setServiceLocked");
339
325
  _authorizeTargetFunctions(address(this), releaseRegistryRoleId, functions);
340
326
 
341
327
  _grantRoleToAccount(releaseRegistryRoleId, _releaseRegistry);
@@ -379,8 +365,15 @@ contract RegistryAdmin is
379
365
  onlyInitializing()
380
366
  {
381
367
  _createTarget(_staking, STAKING_TARGET_NAME, true, false);
368
+ _createTarget(address(IStaking(_staking).getTokenHandler()), STAKING_TH_TARGET_NAME, true, false);
382
369
  _createTarget(_stakingStore, STAKING_STORE_TARGET_NAME, true, false);
383
370
 
371
+ // staking function authorization for public role
372
+ FunctionInfo[] memory functions;
373
+ functions = new FunctionInfo[](1);
374
+ functions[0] = toFunction(Staking.approveTokenHandler.selector, "approveTokenHandler");
375
+ _authorizeTargetFunctions(_staking, PUBLIC_ROLE(), functions); // only owner protected
376
+
384
377
  // staking function authorization for staking service
385
378
  RoleId stakingServiceRoleId = RoleIdLib.roleForTypeAndAllVersions(STAKING());
386
379
  _createRole(
@@ -391,8 +384,7 @@ contract RegistryAdmin is
391
384
  maxMemberCount: MAX_NUM_RELEASES,
392
385
  name: STAKING_SERVICE_ROLE_NAME}));
393
386
 
394
- FunctionInfo[] memory functions;
395
- functions = new FunctionInfo[](13);
387
+ functions = new FunctionInfo[](12);
396
388
  functions[0] = toFunction(IStaking.registerTarget.selector, "registerTarget");
397
389
  functions[1] = toFunction(IStaking.setLockingPeriod.selector, "setLockingPeriod");
398
390
  functions[2] = toFunction(IStaking.setRewardRate.selector, "setRewardRate");
@@ -404,9 +396,18 @@ contract RegistryAdmin is
404
396
  functions[8] = toFunction(IStaking.restake.selector, "restake");
405
397
  functions[9] = toFunction(IStaking.updateRewards.selector, "updateRewards");
406
398
  functions[10] = toFunction(IStaking.claimRewards.selector, "claimRewards");
407
- functions[11] = toFunction(IStaking.collectDipAmount.selector, "collectDipAmount");
408
- functions[12] = toFunction(IStaking.transferDipAmount.selector, "transferDipAmount");
409
399
  _authorizeTargetFunctions(_staking, stakingServiceRoleId, functions);
400
+
401
+ // grant token handler authorizations
402
+ IStaking staking = IStaking(_staking);
403
+ functions = new FunctionInfo[](2);
404
+ functions[0] = toFunction(TokenHandler.collectTokens.selector, "collectTokens");
405
+ functions[1] = toFunction(TokenHandler.distributeTokens.selector, "distributeTokens");
406
+
407
+ _authorizeTargetFunctions(
408
+ address(staking.getTokenHandler()),
409
+ stakingServiceRoleId,
410
+ functions);
410
411
 
411
412
  // staking function authorization for pool service
412
413
  RoleId poolServiceRoleId = RoleIdLib.roleForTypeAndAllVersions(POOL());
@@ -452,13 +453,5 @@ contract RegistryAdmin is
452
453
  _authorizeTargetFunctions(_stakingStore, stakingRoleId, functions);
453
454
 
454
455
  _grantRoleToAccount(stakingRoleId, _staking);
455
-
456
- // grant token handler authorizations
457
- IStaking staking = IStaking(_staking);
458
- functions = new FunctionInfo[](2);
459
- functions[0] = toFunction(TokenHandler.collectTokens.selector, "collectTokens");
460
- functions[1] = toFunction(TokenHandler.distributeTokens.selector, "distributeTokens");
461
-
462
- _authorizeTargetFunctions(address(staking.getTokenHandler()), stakingRoleId, functions);
463
456
  }
464
457
  }
@@ -18,8 +18,6 @@ contract RegistryService is
18
18
  Service,
19
19
  IRegistryService
20
20
  {
21
- using NftIdLib for NftId;
22
-
23
21
  // TODO update to real hash when registry is stable
24
22
  bytes32 public constant REGISTRY_CREATION_CODE_HASH = bytes32(0);
25
23
 
@@ -60,7 +58,7 @@ contract RegistryService is
60
58
  function registerInstance(IRegisterable instance, address owner)
61
59
  external
62
60
  virtual
63
- restricted
61
+ restricted()
64
62
  returns(
65
63
  IRegistry.ObjectInfo memory info
66
64
  )
@@ -75,29 +73,33 @@ contract RegistryService is
75
73
  instance.linkToRegisteredNftId(); // asume safe
76
74
  }
77
75
 
78
- function registerProduct(IComponent product, address owner)
76
+ function registerProduct(
77
+ IComponent product,
78
+ address initialOwner
79
+ )
79
80
  external
80
- restricted
81
+ virtual
82
+ restricted()
81
83
  returns(
82
84
  IRegistry.ObjectInfo memory info
83
85
  )
84
86
  {
85
- // CAN revert if no ERC165 support -> will revert with empty message
86
87
  if(!product.supportsInterface(type(IProductComponent).interfaceId)) {
87
88
  revert ErrorRegistryServiceNotProduct(address(product));
88
89
  }
89
90
 
90
- info = _getAndVerifyContractInfo(product, PRODUCT(), owner);
91
+ info = _getAndVerifyContractInfo(product, PRODUCT(), initialOwner);
91
92
  info.nftId = getRegistry().register(info);
92
93
  }
93
94
 
94
- function registerComponent(
95
+ function registerProductLinkedComponent(
95
96
  IComponent component,
96
97
  ObjectType objectType,
97
98
  address initialOwner
98
99
  )
99
100
  external
100
- restricted
101
+ virtual
102
+ restricted()
101
103
  returns(
102
104
  IRegistry.ObjectInfo memory info
103
105
  )
@@ -107,43 +109,18 @@ contract RegistryService is
107
109
  revert ErrorRegistryServiceNotComponent(address(component));
108
110
  }
109
111
 
110
- info = _getAndVerifyContractInfo(component, objectType, initialOwner);
111
- info.nftId = getRegistry().register(info);
112
- }
113
-
114
- function registerPool(IComponent pool, address owner)
115
- external
116
- restricted
117
- returns(
118
- IRegistry.ObjectInfo memory info
119
- )
120
- {
121
- if(!pool.supportsInterface(type(IPoolComponent).interfaceId)) {
122
- revert ErrorRegistryServiceNotPool(address(pool));
123
- }
124
-
125
- info = _getAndVerifyContractInfo(pool, POOL(), owner);
126
- info.nftId = getRegistry().register(info);
127
- }
128
-
129
- function registerDistribution(IComponent distribution, address owner)
130
- external
131
- restricted
132
- returns(
133
- IRegistry.ObjectInfo memory info
134
- )
135
- {
136
- if(!distribution.supportsInterface(type(IDistributionComponent).interfaceId)) {
137
- revert ErrorRegistryServiceNotDistribution(address(distribution));
112
+ if (!(objectType == DISTRIBUTION() || objectType == ORACLE() || objectType == POOL())) {
113
+ revert ErrorRegistryServiceNotProductLinkedComponent(address(component));
138
114
  }
139
115
 
140
- info = _getAndVerifyContractInfo(distribution, DISTRIBUTION(), owner);
116
+ info = _getAndVerifyContractInfo(component, objectType, initialOwner);
141
117
  info.nftId = getRegistry().register(info);
142
118
  }
143
119
 
144
120
  function registerDistributor(IRegistry.ObjectInfo memory info)
145
121
  external
146
- restricted
122
+ virtual
123
+ restricted()
147
124
  returns(NftId nftId)
148
125
  {
149
126
  _verifyObjectInfo(info, DISTRIBUTOR());
@@ -152,7 +129,8 @@ contract RegistryService is
152
129
 
153
130
  function registerPolicy(IRegistry.ObjectInfo memory info)
154
131
  external
155
- restricted
132
+ virtual
133
+ restricted()
156
134
  returns(NftId nftId)
157
135
  {
158
136
  _verifyObjectInfo(info, POLICY());
@@ -161,7 +139,8 @@ contract RegistryService is
161
139
 
162
140
  function registerBundle(IRegistry.ObjectInfo memory info)
163
141
  external
164
- restricted
142
+ virtual
143
+ restricted()
165
144
  returns(NftId nftId)
166
145
  {
167
146
  _verifyObjectInfo(info, BUNDLE());
@@ -170,7 +149,8 @@ contract RegistryService is
170
149
 
171
150
  function registerStake(IRegistry.ObjectInfo memory info)
172
151
  external
173
- restricted
152
+ virtual
153
+ restricted()
174
154
  returns(NftId nftId)
175
155
  {
176
156
  _verifyObjectInfo(info, STAKE());
@@ -185,6 +165,7 @@ contract RegistryService is
185
165
  address expectedOwner // assume can be 0 when given by other service
186
166
  )
187
167
  internal
168
+ virtual
188
169
  view
189
170
  returns(
190
171
  IRegistry.ObjectInfo memory info
@@ -224,6 +205,7 @@ contract RegistryService is
224
205
  ObjectType expectedType
225
206
  )
226
207
  internal
208
+ virtual
227
209
  view
228
210
  {
229
211
  if(info.objectAddress > address(0)) {
@@ -240,8 +222,15 @@ contract RegistryService is
240
222
  revert ErrorRegistryServiceObjectOwnerZero(info.objectType);
241
223
  }
242
224
 
243
- if(getRegistry().isRegistered(owner)) {
244
- revert ErrorRegistryServiceObjectOwnerRegistered(info.objectType, owner);
225
+ if(owner == msg.sender) {
226
+ revert ErrorRegistryServiceInvalidInitialOwner(owner);
227
+ }
228
+
229
+ if(getRegistry().isRegistered(owner)) {
230
+ ObjectType ownerType = getRegistry().getObjectInfo(owner).objectType;
231
+ if(ownerType == REGISTRY() || ownerType == STAKING() || ownerType == SERVICE() || ownerType == INSTANCE()) {
232
+ revert ErrorRegistryServiceObjectOwnerRegistered(info.objectType, owner);
233
+ }
245
234
  }
246
235
  }
247
236
 
@@ -21,7 +21,6 @@ contract RegistryServiceManager is
21
21
  address registry, // used by implementation
22
22
  bytes32 salt
23
23
  )
24
- ProxyManager(registry)
25
24
  {
26
25
  if(authority == address(0)) {
27
26
  revert ErrorRegistryAccessManagerAuthorityZero();
@@ -33,7 +32,8 @@ contract RegistryServiceManager is
33
32
 
34
33
  RegistryService srv = new RegistryService{ salt: salt }();
35
34
  bytes memory data = abi.encode(registry, authority);
36
- IVersionable versionable = deployDetermenistic(
35
+ IVersionable versionable = initialize(
36
+ registry,
37
37
  address(srv),
38
38
  data,
39
39
  salt);
@@ -2,7 +2,7 @@
2
2
  pragma solidity ^0.8.20;
3
3
 
4
4
  import {RELEASE} from "../type/ObjectType.sol";
5
- import {SCHEDULED, DEPLOYING, ACTIVE, PAUSED, CLOSED/*, FREE*/} from "../type/StateId.sol";
5
+ import {SCHEDULED, DEPLOYING, DEPLOYED, SKIPPED, ACTIVE, PAUSED, CLOSED} from "../type/StateId.sol";
6
6
  import {Lifecycle} from "../shared/Lifecycle.sol";
7
7
 
8
8
  contract ReleaseLifecycle is
@@ -18,9 +18,12 @@ contract ReleaseLifecycle is
18
18
  {
19
19
  setInitialState(RELEASE(), SCHEDULED());
20
20
 
21
+ setStateTransition(RELEASE(), SCHEDULED(), SKIPPED());
21
22
  setStateTransition(RELEASE(), SCHEDULED(), DEPLOYING());
22
- setStateTransition(RELEASE(), DEPLOYING(), DEPLOYING());
23
- setStateTransition(RELEASE(), DEPLOYING(), ACTIVE());
23
+ setStateTransition(RELEASE(), DEPLOYING(), SKIPPED());
24
+ setStateTransition(RELEASE(), DEPLOYING(), DEPLOYED());
25
+ setStateTransition(RELEASE(), DEPLOYED(), SKIPPED());
26
+ setStateTransition(RELEASE(), DEPLOYED(), ACTIVE());
24
27
  setStateTransition(RELEASE(), ACTIVE(), PAUSED());
25
28
  setStateTransition(RELEASE(), PAUSED(), ACTIVE());
26
29
  }