@etherisc/gif-next 0.0.2-df73b56-462 → 0.0.2-dfb8aa3-070

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 (406) hide show
  1. package/artifacts/contracts/authorization/AccessAdmin.sol/AccessAdmin.dbg.json +1 -1
  2. package/artifacts/contracts/authorization/AccessAdmin.sol/AccessAdmin.json +96 -37
  3. package/artifacts/contracts/authorization/AccessManagerCloneable.sol/AccessManagerCloneable.dbg.json +1 -1
  4. package/artifacts/contracts/authorization/Authorization.sol/Authorization.dbg.json +1 -1
  5. package/artifacts/contracts/authorization/Authorization.sol/Authorization.json +67 -11
  6. package/artifacts/contracts/authorization/IAccess.sol/IAccess.dbg.json +1 -1
  7. package/artifacts/contracts/authorization/IAccessAdmin.sol/IAccessAdmin.dbg.json +1 -1
  8. package/artifacts/contracts/authorization/IAccessAdmin.sol/IAccessAdmin.json +60 -13
  9. package/artifacts/contracts/authorization/IAuthorization.sol/IAuthorization.dbg.json +1 -1
  10. package/artifacts/contracts/authorization/IAuthorization.sol/IAuthorization.json +40 -3
  11. package/artifacts/contracts/authorization/IServiceAuthorization.sol/IServiceAuthorization.dbg.json +1 -1
  12. package/artifacts/contracts/authorization/IServiceAuthorization.sol/IServiceAuthorization.json +19 -0
  13. package/artifacts/contracts/authorization/ReleaseAccessManager.sol/ReleaseAccessManager.dbg.json +4 -0
  14. package/artifacts/contracts/authorization/ReleaseAccessManager.sol/ReleaseAccessManager.json +1196 -0
  15. package/artifacts/contracts/authorization/ServiceAuthorization.sol/ServiceAuthorization.dbg.json +1 -1
  16. package/artifacts/contracts/authorization/ServiceAuthorization.sol/ServiceAuthorization.json +68 -5
  17. package/artifacts/contracts/distribution/BasicDistribution.sol/BasicDistribution.dbg.json +1 -1
  18. package/artifacts/contracts/distribution/BasicDistribution.sol/BasicDistribution.json +154 -94
  19. package/artifacts/contracts/distribution/BasicDistributionAuthorization.sol/BasicDistributionAuthorization.dbg.json +1 -1
  20. package/artifacts/contracts/distribution/BasicDistributionAuthorization.sol/BasicDistributionAuthorization.json +82 -22
  21. package/artifacts/contracts/distribution/Distribution.sol/Distribution.dbg.json +1 -1
  22. package/artifacts/contracts/distribution/Distribution.sol/Distribution.json +94 -58
  23. package/artifacts/contracts/distribution/DistributionService.sol/DistributionService.dbg.json +1 -1
  24. package/artifacts/contracts/distribution/DistributionService.sol/DistributionService.json +136 -86
  25. package/artifacts/contracts/distribution/DistributionServiceManager.sol/DistributionServiceManager.dbg.json +1 -1
  26. package/artifacts/contracts/distribution/DistributionServiceManager.sol/DistributionServiceManager.json +80 -60
  27. package/artifacts/contracts/distribution/IDistributionComponent.sol/IDistributionComponent.dbg.json +1 -1
  28. package/artifacts/contracts/distribution/IDistributionComponent.sol/IDistributionComponent.json +81 -58
  29. package/artifacts/contracts/distribution/IDistributionService.sol/IDistributionService.dbg.json +1 -1
  30. package/artifacts/contracts/distribution/IDistributionService.sol/IDistributionService.json +29 -0
  31. package/artifacts/contracts/examples/fire/DamageLevel.sol/DamageLevelLib.dbg.json +4 -0
  32. package/artifacts/contracts/examples/fire/DamageLevel.sol/DamageLevelLib.json +22 -0
  33. package/artifacts/contracts/examples/fire/FirePool.sol/FirePool.dbg.json +4 -0
  34. package/artifacts/contracts/examples/fire/FirePool.sol/FirePool.json +1538 -0
  35. package/artifacts/contracts/examples/fire/FirePoolAuthorization.sol/FirePoolAuthorization.dbg.json +4 -0
  36. package/artifacts/contracts/examples/fire/FirePoolAuthorization.sol/FirePoolAuthorization.json +470 -0
  37. package/artifacts/contracts/examples/fire/FireProduct.sol/FireProduct.dbg.json +4 -0
  38. package/artifacts/contracts/examples/fire/FireProduct.sol/FireProduct.json +2072 -0
  39. package/artifacts/contracts/examples/fire/FireProductAuthorization.sol/FireProductAuthorization.dbg.json +4 -0
  40. package/artifacts/contracts/examples/fire/FireProductAuthorization.sol/FireProductAuthorization.json +470 -0
  41. package/artifacts/contracts/examples/fire/FireUSD.sol/FireUSD.dbg.json +4 -0
  42. package/artifacts/contracts/examples/fire/FireUSD.sol/FireUSD.json +376 -0
  43. package/artifacts/contracts/examples/unpermissioned/SimpleDistribution.sol/SimpleDistribution.dbg.json +1 -1
  44. package/artifacts/contracts/examples/unpermissioned/SimpleDistribution.sol/SimpleDistribution.json +156 -96
  45. package/artifacts/contracts/examples/unpermissioned/SimpleOracle.sol/SimpleOracle.dbg.json +1 -1
  46. package/artifacts/contracts/examples/unpermissioned/SimpleOracle.sol/SimpleOracle.json +137 -77
  47. package/artifacts/contracts/examples/unpermissioned/SimplePool.sol/SimplePool.dbg.json +1 -1
  48. package/artifacts/contracts/examples/unpermissioned/SimplePool.sol/SimplePool.json +153 -106
  49. package/artifacts/contracts/examples/unpermissioned/SimpleProduct.sol/SimpleProduct.dbg.json +1 -1
  50. package/artifacts/contracts/examples/unpermissioned/SimpleProduct.sol/SimpleProduct.json +241 -129
  51. package/artifacts/contracts/instance/BundleSet.sol/BundleSet.dbg.json +1 -1
  52. package/artifacts/contracts/instance/BundleSet.sol/BundleSet.json +2 -2
  53. package/artifacts/contracts/instance/IInstance.sol/IInstance.dbg.json +1 -1
  54. package/artifacts/contracts/instance/IInstance.sol/IInstance.json +53 -31
  55. package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.dbg.json +1 -1
  56. package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.json +29 -84
  57. package/artifacts/contracts/instance/Instance.sol/Instance.dbg.json +1 -1
  58. package/artifacts/contracts/instance/Instance.sol/Instance.json +62 -40
  59. package/artifacts/contracts/instance/InstanceAdmin.sol/InstanceAdmin.dbg.json +1 -1
  60. package/artifacts/contracts/instance/InstanceAdmin.sol/InstanceAdmin.json +148 -118
  61. package/artifacts/contracts/instance/InstanceAuthorizationV3.sol/InstanceAuthorizationV3.dbg.json +1 -1
  62. package/artifacts/contracts/instance/InstanceAuthorizationV3.sol/InstanceAuthorizationV3.json +57 -97
  63. package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.dbg.json +1 -1
  64. package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.json +275 -77
  65. package/artifacts/contracts/instance/InstanceService.sol/InstanceService.dbg.json +1 -1
  66. package/artifacts/contracts/instance/InstanceService.sol/InstanceService.json +72 -130
  67. package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.dbg.json +1 -1
  68. package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.json +48 -40
  69. package/artifacts/contracts/instance/InstanceStore.sol/InstanceStore.dbg.json +1 -1
  70. package/artifacts/contracts/instance/InstanceStore.sol/InstanceStore.json +175 -104
  71. package/artifacts/contracts/instance/base/BalanceStore.sol/BalanceStore.dbg.json +1 -1
  72. package/artifacts/contracts/instance/base/BalanceStore.sol/BalanceStore.json +2 -2
  73. package/artifacts/contracts/instance/base/Cloneable.sol/Cloneable.dbg.json +1 -1
  74. package/artifacts/contracts/instance/base/ObjectCounter.sol/ObjectCounter.dbg.json +1 -1
  75. package/artifacts/contracts/instance/base/ObjectCounter.sol/ObjectCounter.json +2 -2
  76. package/artifacts/contracts/instance/base/ObjectLifecycle.sol/ObjectLifecycle.dbg.json +1 -1
  77. package/artifacts/contracts/instance/base/ObjectLifecycle.sol/ObjectLifecycle.json +46 -5
  78. package/artifacts/contracts/instance/base/ObjectSet.sol/ObjectSet.dbg.json +1 -1
  79. package/artifacts/contracts/instance/base/ObjectSet.sol/ObjectSet.json +2 -2
  80. package/artifacts/contracts/instance/module/IAccess.sol/IAccess.dbg.json +1 -1
  81. package/artifacts/contracts/instance/module/IBundle.sol/IBundle.dbg.json +1 -1
  82. package/artifacts/contracts/instance/module/IComponents.sol/IComponents.dbg.json +1 -1
  83. package/artifacts/contracts/instance/module/IDistribution.sol/IDistribution.dbg.json +1 -1
  84. package/artifacts/contracts/instance/module/IPolicy.sol/IPolicy.dbg.json +1 -1
  85. package/artifacts/contracts/instance/module/IRisk.sol/IRisk.dbg.json +1 -1
  86. package/artifacts/contracts/mock/Dip.sol/Dip.dbg.json +1 -1
  87. package/artifacts/contracts/oracle/BasicOracle.sol/BasicOracle.dbg.json +1 -1
  88. package/artifacts/contracts/oracle/BasicOracle.sol/BasicOracle.json +135 -75
  89. package/artifacts/contracts/oracle/BasicOracleAuthorization.sol/BasicOracleAuthorization.dbg.json +1 -1
  90. package/artifacts/contracts/oracle/BasicOracleAuthorization.sol/BasicOracleAuthorization.json +84 -24
  91. package/artifacts/contracts/oracle/IOracle.sol/IOracle.dbg.json +1 -1
  92. package/artifacts/contracts/oracle/IOracleComponent.sol/IOracleComponent.dbg.json +1 -1
  93. package/artifacts/contracts/oracle/IOracleComponent.sol/IOracleComponent.json +76 -53
  94. package/artifacts/contracts/oracle/IOracleService.sol/IOracleService.dbg.json +1 -1
  95. package/artifacts/contracts/oracle/IOracleService.sol/IOracleService.json +43 -9
  96. package/artifacts/contracts/oracle/Oracle.sol/Oracle.dbg.json +1 -1
  97. package/artifacts/contracts/oracle/Oracle.sol/Oracle.json +89 -53
  98. package/artifacts/contracts/oracle/OracleService.sol/OracleService.dbg.json +1 -1
  99. package/artifacts/contracts/oracle/OracleService.sol/OracleService.json +86 -47
  100. package/artifacts/contracts/oracle/OracleServiceManager.sol/OracleServiceManager.dbg.json +1 -1
  101. package/artifacts/contracts/oracle/OracleServiceManager.sol/OracleServiceManager.json +48 -36
  102. package/artifacts/contracts/pool/BasicPool.sol/BasicPool.dbg.json +1 -1
  103. package/artifacts/contracts/pool/BasicPool.sol/BasicPool.json +89 -66
  104. package/artifacts/contracts/pool/BasicPoolAuthorization.sol/BasicPoolAuthorization.dbg.json +1 -1
  105. package/artifacts/contracts/pool/BasicPoolAuthorization.sol/BasicPoolAuthorization.json +82 -22
  106. package/artifacts/contracts/pool/BundleService.sol/BundleService.dbg.json +1 -1
  107. package/artifacts/contracts/pool/BundleService.sol/BundleService.json +180 -82
  108. package/artifacts/contracts/pool/BundleServiceManager.sol/BundleServiceManager.dbg.json +1 -1
  109. package/artifacts/contracts/pool/BundleServiceManager.sol/BundleServiceManager.json +90 -58
  110. package/artifacts/contracts/pool/IBundleService.sol/IBundleService.dbg.json +1 -1
  111. package/artifacts/contracts/pool/IBundleService.sol/IBundleService.json +53 -0
  112. package/artifacts/contracts/pool/IPoolComponent.sol/IPoolComponent.dbg.json +1 -1
  113. package/artifacts/contracts/pool/IPoolComponent.sol/IPoolComponent.json +76 -53
  114. package/artifacts/contracts/pool/IPoolService.sol/IPoolService.dbg.json +1 -1
  115. package/artifacts/contracts/pool/IPoolService.sol/IPoolService.json +200 -115
  116. package/artifacts/contracts/pool/Pool.sol/Pool.dbg.json +1 -1
  117. package/artifacts/contracts/pool/Pool.sol/Pool.json +89 -53
  118. package/artifacts/contracts/pool/PoolService.sol/PoolService.dbg.json +1 -1
  119. package/artifacts/contracts/pool/PoolService.sol/PoolService.json +312 -161
  120. package/artifacts/contracts/pool/PoolServiceManager.sol/PoolServiceManager.dbg.json +1 -1
  121. package/artifacts/contracts/pool/PoolServiceManager.sol/PoolServiceManager.json +81 -41
  122. package/artifacts/contracts/product/ApplicationService.sol/ApplicationService.dbg.json +1 -1
  123. package/artifacts/contracts/product/ApplicationService.sol/ApplicationService.json +66 -32
  124. package/artifacts/contracts/product/ApplicationServiceManager.sol/ApplicationServiceManager.dbg.json +1 -1
  125. package/artifacts/contracts/product/ApplicationServiceManager.sol/ApplicationServiceManager.json +45 -33
  126. package/artifacts/contracts/product/BasicProduct.sol/BasicProduct.dbg.json +1 -1
  127. package/artifacts/contracts/product/BasicProduct.sol/BasicProduct.json +145 -73
  128. package/artifacts/contracts/product/BasicProductAuthorization.sol/BasicProductAuthorization.dbg.json +1 -1
  129. package/artifacts/contracts/product/BasicProductAuthorization.sol/BasicProductAuthorization.json +82 -22
  130. package/artifacts/contracts/product/ClaimService.sol/ClaimService.dbg.json +1 -1
  131. package/artifacts/contracts/product/ClaimService.sol/ClaimService.json +175 -90
  132. package/artifacts/contracts/product/ClaimServiceManager.sol/ClaimServiceManager.dbg.json +1 -1
  133. package/artifacts/contracts/product/ClaimServiceManager.sol/ClaimServiceManager.json +82 -58
  134. package/artifacts/contracts/product/IApplicationService.sol/IApplicationService.dbg.json +1 -1
  135. package/artifacts/contracts/product/IApplicationService.sol/IApplicationService.json +29 -0
  136. package/artifacts/contracts/product/IClaimService.sol/IClaimService.dbg.json +1 -1
  137. package/artifacts/contracts/product/IClaimService.sol/IClaimService.json +64 -8
  138. package/artifacts/contracts/product/IPolicyService.sol/IPolicyService.dbg.json +1 -1
  139. package/artifacts/contracts/product/IPolicyService.sol/IPolicyService.json +58 -0
  140. package/artifacts/contracts/product/IPricingService.sol/IPricingService.dbg.json +1 -1
  141. package/artifacts/contracts/product/IPricingService.sol/IPricingService.json +80 -51
  142. package/artifacts/contracts/product/IProductComponent.sol/IProductComponent.dbg.json +1 -1
  143. package/artifacts/contracts/product/IProductComponent.sol/IProductComponent.json +132 -73
  144. package/artifacts/contracts/product/IRiskService.sol/IRiskService.dbg.json +1 -1
  145. package/artifacts/contracts/product/IRiskService.sol/IRiskService.json +29 -0
  146. package/artifacts/contracts/product/PolicyService.sol/PolicyService.dbg.json +1 -1
  147. package/artifacts/contracts/product/PolicyService.sol/PolicyService.json +139 -60
  148. package/artifacts/contracts/product/PolicyServiceManager.sol/PolicyServiceManager.dbg.json +1 -1
  149. package/artifacts/contracts/product/PolicyServiceManager.sol/PolicyServiceManager.json +67 -47
  150. package/artifacts/contracts/product/PricingService.sol/PricingService.dbg.json +1 -1
  151. package/artifacts/contracts/product/PricingService.sol/PricingService.json +149 -107
  152. package/artifacts/contracts/product/PricingServiceManager.sol/PricingServiceManager.dbg.json +1 -1
  153. package/artifacts/contracts/product/PricingServiceManager.sol/PricingServiceManager.json +61 -45
  154. package/artifacts/contracts/product/Product.sol/Product.dbg.json +1 -1
  155. package/artifacts/contracts/product/Product.sol/Product.json +145 -73
  156. package/artifacts/contracts/product/RiskService.sol/RiskService.dbg.json +1 -1
  157. package/artifacts/contracts/product/RiskService.sol/RiskService.json +60 -26
  158. package/artifacts/contracts/product/RiskServiceManager.sol/RiskServiceManager.dbg.json +1 -1
  159. package/artifacts/contracts/product/RiskServiceManager.sol/RiskServiceManager.json +42 -30
  160. package/artifacts/contracts/registry/ChainNft.sol/ChainNft.dbg.json +1 -1
  161. package/artifacts/contracts/registry/ChainNft.sol/ChainNft.json +2 -2
  162. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.dbg.json +1 -1
  163. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.json +67 -15
  164. package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.dbg.json +1 -1
  165. package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.json +114 -35
  166. package/artifacts/contracts/registry/ITransferInterceptor.sol/ITransferInterceptor.dbg.json +1 -1
  167. package/artifacts/contracts/registry/ITransferInterceptor.sol/ITransferInterceptor.json +5 -18
  168. package/artifacts/contracts/registry/Registry.sol/Registry.dbg.json +1 -1
  169. package/artifacts/contracts/registry/Registry.sol/Registry.json +111 -51
  170. package/artifacts/contracts/registry/RegistryAdmin.sol/RegistryAdmin.dbg.json +1 -1
  171. package/artifacts/contracts/registry/RegistryAdmin.sol/RegistryAdmin.json +193 -165
  172. package/artifacts/contracts/registry/RegistryService.sol/RegistryService.dbg.json +1 -1
  173. package/artifacts/contracts/registry/RegistryService.sol/RegistryService.json +73 -172
  174. package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.dbg.json +1 -1
  175. package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.json +41 -29
  176. package/artifacts/contracts/registry/ReleaseLifecycle.sol/ReleaseLifecycle.dbg.json +1 -1
  177. package/artifacts/contracts/registry/ReleaseLifecycle.sol/ReleaseLifecycle.json +47 -6
  178. package/artifacts/contracts/registry/ReleaseRegistry.sol/ReleaseRegistry.dbg.json +1 -1
  179. package/artifacts/contracts/registry/ReleaseRegistry.sol/ReleaseRegistry.json +121 -223
  180. package/artifacts/contracts/registry/ServiceAuthorizationV3.sol/ServiceAuthorizationV3.dbg.json +1 -1
  181. package/artifacts/contracts/registry/ServiceAuthorizationV3.sol/ServiceAuthorizationV3.json +66 -8
  182. package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.dbg.json +1 -1
  183. package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.json +2 -2
  184. package/artifacts/contracts/shared/Component.sol/Component.dbg.json +1 -1
  185. package/artifacts/contracts/shared/Component.sol/Component.json +68 -28
  186. package/artifacts/contracts/shared/ComponentService.sol/ComponentService.dbg.json +1 -1
  187. package/artifacts/contracts/shared/ComponentService.sol/ComponentService.json +350 -155
  188. package/artifacts/contracts/shared/ComponentServiceManager.sol/ComponentServiceManager.dbg.json +1 -1
  189. package/artifacts/contracts/shared/ComponentServiceManager.sol/ComponentServiceManager.json +83 -63
  190. package/artifacts/contracts/shared/ComponentVerifyingService.sol/ComponentVerifyingService.dbg.json +1 -1
  191. package/artifacts/contracts/shared/ComponentVerifyingService.sol/ComponentVerifyingService.json +42 -0
  192. package/artifacts/contracts/shared/ContractLib.sol/ContractLib.dbg.json +1 -1
  193. package/artifacts/contracts/shared/ContractLib.sol/ContractLib.json +2 -2
  194. package/artifacts/contracts/shared/IComponent.sol/IComponent.dbg.json +1 -1
  195. package/artifacts/contracts/shared/IComponent.sol/IComponent.json +55 -28
  196. package/artifacts/contracts/shared/IComponentService.sol/IComponentService.dbg.json +1 -1
  197. package/artifacts/contracts/shared/IComponentService.sol/IComponentService.json +321 -19
  198. package/artifacts/contracts/shared/IInstanceLinkedComponent.sol/IInstanceLinkedComponent.dbg.json +1 -1
  199. package/artifacts/contracts/shared/IInstanceLinkedComponent.sol/IInstanceLinkedComponent.json +76 -53
  200. package/artifacts/contracts/shared/IKeyValueStore.sol/IKeyValueStore.dbg.json +1 -1
  201. package/artifacts/contracts/shared/IKeyValueStore.sol/IKeyValueStore.json +36 -0
  202. package/artifacts/contracts/shared/ILifecycle.sol/ILifecycle.dbg.json +1 -1
  203. package/artifacts/contracts/shared/ILifecycle.sol/ILifecycle.json +36 -0
  204. package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.dbg.json +1 -1
  205. package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.json +16 -0
  206. package/artifacts/contracts/shared/IPolicyHolder.sol/IPolicyHolder.dbg.json +1 -1
  207. package/artifacts/contracts/shared/IPolicyHolder.sol/IPolicyHolder.json +1 -1
  208. package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.dbg.json +1 -1
  209. package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.json +29 -0
  210. package/artifacts/contracts/shared/IRegistryLinked.sol/IRegistryLinked.dbg.json +1 -1
  211. package/artifacts/contracts/shared/IService.sol/IService.dbg.json +1 -1
  212. package/artifacts/contracts/shared/IService.sol/IService.json +29 -0
  213. package/artifacts/contracts/shared/InitializableERC165.sol/InitializableERC165.dbg.json +1 -1
  214. package/artifacts/contracts/shared/InstanceLinkedComponent.sol/InstanceLinkedComponent.dbg.json +1 -1
  215. package/artifacts/contracts/shared/InstanceLinkedComponent.sol/InstanceLinkedComponent.json +89 -53
  216. package/artifacts/contracts/shared/KeyValueStore.sol/KeyValueStore.dbg.json +1 -1
  217. package/artifacts/contracts/shared/KeyValueStore.sol/KeyValueStore.json +42 -1
  218. package/artifacts/contracts/shared/Lifecycle.sol/Lifecycle.dbg.json +1 -1
  219. package/artifacts/contracts/shared/Lifecycle.sol/Lifecycle.json +42 -1
  220. package/artifacts/contracts/shared/NftIdSet.sol/NftIdSet.dbg.json +1 -1
  221. package/artifacts/contracts/shared/NftIdSet.sol/NftIdSet.json +2 -2
  222. package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.dbg.json +1 -1
  223. package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.json +18 -2
  224. package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.dbg.json +1 -1
  225. package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.json +3 -3
  226. package/artifacts/contracts/shared/Registerable.sol/Registerable.dbg.json +1 -1
  227. package/artifacts/contracts/shared/Registerable.sol/Registerable.json +66 -8
  228. package/artifacts/contracts/shared/RegistryLinked.sol/RegistryLinked.dbg.json +1 -1
  229. package/artifacts/contracts/shared/RegistryLinked.sol/RegistryLinked.json +2 -2
  230. package/artifacts/contracts/shared/Service.sol/Service.dbg.json +1 -1
  231. package/artifacts/contracts/shared/Service.sol/Service.json +42 -0
  232. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.dbg.json +1 -1
  233. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.json +2 -2
  234. package/artifacts/contracts/shared/TokenHandlerDeployerLib.sol/TokenHandlerDeployerLib.dbg.json +1 -1
  235. package/artifacts/contracts/shared/TokenHandlerDeployerLib.sol/TokenHandlerDeployerLib.json +2 -2
  236. package/artifacts/contracts/staking/IStaking.sol/IStaking.dbg.json +1 -1
  237. package/artifacts/contracts/staking/IStaking.sol/IStaking.json +55 -28
  238. package/artifacts/contracts/staking/IStakingService.sol/IStakingService.dbg.json +1 -1
  239. package/artifacts/contracts/staking/IStakingService.sol/IStakingService.json +29 -21
  240. package/artifacts/contracts/staking/StakeManagerLib.sol/StakeManagerLib.dbg.json +1 -1
  241. package/artifacts/contracts/staking/StakeManagerLib.sol/StakeManagerLib.json +2 -2
  242. package/artifacts/contracts/staking/Staking.sol/Staking.dbg.json +1 -1
  243. package/artifacts/contracts/staking/Staking.sol/Staking.json +138 -78
  244. package/artifacts/contracts/staking/StakingLifecycle.sol/StakingLifecycle.dbg.json +1 -1
  245. package/artifacts/contracts/staking/StakingLifecycle.sol/StakingLifecycle.json +46 -5
  246. package/artifacts/contracts/staking/StakingManager.sol/StakingManager.dbg.json +1 -1
  247. package/artifacts/contracts/staking/StakingManager.sol/StakingManager.json +68 -42
  248. package/artifacts/contracts/staking/StakingReader.sol/StakingReader.dbg.json +1 -1
  249. package/artifacts/contracts/staking/StakingReader.sol/StakingReader.json +7 -12
  250. package/artifacts/contracts/staking/StakingService.sol/StakingService.dbg.json +1 -1
  251. package/artifacts/contracts/staking/StakingService.sol/StakingService.json +66 -53
  252. package/artifacts/contracts/staking/StakingServiceManager.sol/StakingServiceManager.dbg.json +1 -1
  253. package/artifacts/contracts/staking/StakingServiceManager.sol/StakingServiceManager.json +45 -33
  254. package/artifacts/contracts/staking/StakingStore.sol/StakingStore.dbg.json +1 -1
  255. package/artifacts/contracts/staking/StakingStore.sol/StakingStore.json +144 -103
  256. package/artifacts/contracts/staking/TargetManagerLib.sol/TargetManagerLib.dbg.json +1 -1
  257. package/artifacts/contracts/staking/TargetManagerLib.sol/TargetManagerLib.json +2 -2
  258. package/artifacts/contracts/type/AddressSet.sol/LibAddressSet.dbg.json +1 -1
  259. package/artifacts/contracts/type/Amount.sol/AmountLib.dbg.json +1 -1
  260. package/artifacts/contracts/type/Amount.sol/AmountLib.json +32 -8
  261. package/artifacts/contracts/type/Blocknumber.sol/BlocknumberLib.dbg.json +1 -1
  262. package/artifacts/contracts/type/ClaimId.sol/ClaimIdLib.dbg.json +1 -1
  263. package/artifacts/contracts/type/ClaimId.sol/ClaimIdLib.json +28 -4
  264. package/artifacts/contracts/type/DistributorType.sol/DistributorTypeLib.dbg.json +1 -1
  265. package/artifacts/contracts/type/DistributorType.sol/DistributorTypeLib.json +2 -2
  266. package/artifacts/contracts/type/Fee.sol/FeeLib.dbg.json +1 -1
  267. package/artifacts/contracts/type/Fee.sol/FeeLib.json +2 -2
  268. package/artifacts/contracts/type/Key32.sol/Key32Lib.dbg.json +1 -1
  269. package/artifacts/contracts/type/Key32.sol/Key32Lib.json +2 -2
  270. package/artifacts/contracts/type/NftId.sol/NftIdLib.dbg.json +1 -1
  271. package/artifacts/contracts/type/NftId.sol/NftIdLib.json +2 -2
  272. package/artifacts/contracts/type/NftIdSet.sol/LibNftIdSet.dbg.json +1 -1
  273. package/artifacts/contracts/type/NftIdSet.sol/LibNftIdSet.json +2 -2
  274. package/artifacts/contracts/type/ObjectType.sol/ObjectTypeLib.dbg.json +1 -1
  275. package/artifacts/contracts/type/ObjectType.sol/ObjectTypeLib.json +2 -2
  276. package/artifacts/contracts/type/PayoutId.sol/PayoutIdLib.dbg.json +1 -1
  277. package/artifacts/contracts/type/PayoutId.sol/PayoutIdLib.json +19 -19
  278. package/artifacts/contracts/type/Referral.sol/ReferralLib.dbg.json +1 -1
  279. package/artifacts/contracts/type/Referral.sol/ReferralLib.json +2 -2
  280. package/artifacts/contracts/type/RequestId.sol/RequestIdLib.dbg.json +1 -1
  281. package/artifacts/contracts/type/RequestId.sol/RequestIdLib.json +2 -2
  282. package/artifacts/contracts/type/RiskId.sol/RiskIdLib.dbg.json +1 -1
  283. package/artifacts/contracts/type/RiskId.sol/RiskIdLib.json +60 -4
  284. package/artifacts/contracts/type/RoleId.sol/RoleIdLib.dbg.json +1 -1
  285. package/artifacts/contracts/type/RoleId.sol/RoleIdLib.json +2 -2
  286. package/artifacts/contracts/type/Seconds.sol/SecondsLib.dbg.json +1 -1
  287. package/artifacts/contracts/type/Selector.sol/SelectorLib.dbg.json +1 -1
  288. package/artifacts/contracts/type/Selector.sol/SelectorSetLib.dbg.json +1 -1
  289. package/artifacts/contracts/type/StateId.sol/StateIdLib.dbg.json +1 -1
  290. package/artifacts/contracts/type/StateId.sol/StateIdLib.json +15 -2
  291. package/artifacts/contracts/type/String.sol/StrLib.dbg.json +1 -1
  292. package/artifacts/contracts/type/Timestamp.sol/TimestampLib.dbg.json +1 -1
  293. package/artifacts/contracts/type/UFixed.sol/MathLib.dbg.json +1 -1
  294. package/artifacts/contracts/type/UFixed.sol/MathLib.json +2 -2
  295. package/artifacts/contracts/type/UFixed.sol/UFixedLib.dbg.json +1 -1
  296. package/artifacts/contracts/type/UFixed.sol/UFixedLib.json +15 -2
  297. package/artifacts/contracts/type/Version.sol/VersionLib.dbg.json +1 -1
  298. package/artifacts/contracts/type/Version.sol/VersionPartLib.dbg.json +1 -1
  299. package/artifacts/contracts/upgradeability/IVersionable.sol/IVersionable.dbg.json +1 -1
  300. package/artifacts/contracts/upgradeability/ProxyManager.sol/ProxyManager.dbg.json +1 -1
  301. package/artifacts/contracts/upgradeability/ProxyManager.sol/ProxyManager.json +28 -12
  302. package/artifacts/contracts/upgradeability/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.dbg.json +1 -1
  303. package/artifacts/contracts/upgradeability/Versionable.sol/Versionable.dbg.json +1 -1
  304. package/contracts/authorization/AccessAdmin.sol +65 -61
  305. package/contracts/authorization/Authorization.sol +111 -39
  306. package/contracts/authorization/IAccess.sol +1 -0
  307. package/contracts/authorization/IAccessAdmin.sol +4 -2
  308. package/contracts/authorization/IAuthorization.sol +13 -7
  309. package/contracts/authorization/IServiceAuthorization.sol +3 -1
  310. package/contracts/authorization/ReleaseAccessManager.sol +38 -0
  311. package/contracts/authorization/ServiceAuthorization.sol +26 -10
  312. package/contracts/distribution/BasicDistribution.sol +2 -1
  313. package/contracts/distribution/Distribution.sol +6 -16
  314. package/contracts/distribution/DistributionService.sol +55 -36
  315. package/contracts/distribution/IDistributionComponent.sol +1 -1
  316. package/contracts/examples/fire/DamageLevel.sol +59 -0
  317. package/contracts/examples/fire/FirePool.sol +73 -0
  318. package/contracts/examples/fire/FirePoolAuthorization.sol +34 -0
  319. package/contracts/examples/fire/FireProduct.sol +415 -0
  320. package/contracts/examples/fire/FireProductAuthorization.sol +44 -0
  321. package/contracts/examples/fire/FireUSD.sol +26 -0
  322. package/contracts/examples/unpermissioned/SimpleDistribution.sol +4 -4
  323. package/contracts/examples/unpermissioned/SimpleOracle.sol +4 -4
  324. package/contracts/examples/unpermissioned/SimplePool.sol +4 -4
  325. package/contracts/examples/unpermissioned/SimpleProduct.sol +10 -10
  326. package/contracts/instance/IInstance.sol +4 -1
  327. package/contracts/instance/IInstanceService.sol +0 -20
  328. package/contracts/instance/Instance.sol +20 -17
  329. package/contracts/instance/InstanceAdmin.sol +22 -30
  330. package/contracts/instance/InstanceAuthorizationV3.sol +9 -19
  331. package/contracts/instance/InstanceReader.sol +83 -18
  332. package/contracts/instance/InstanceService.sol +15 -70
  333. package/contracts/instance/module/IComponents.sol +6 -3
  334. package/contracts/instance/module/IPolicy.sol +2 -2
  335. package/contracts/oracle/BasicOracle.sol +0 -1
  336. package/contracts/oracle/IOracleService.sol +2 -1
  337. package/contracts/oracle/Oracle.sol +4 -15
  338. package/contracts/oracle/OracleService.sol +39 -29
  339. package/contracts/pool/BasicPool.sol +14 -26
  340. package/contracts/pool/BasicPoolAuthorization.sol +0 -1
  341. package/contracts/pool/BundleService.sol +75 -20
  342. package/contracts/pool/IBundleService.sol +9 -0
  343. package/contracts/pool/IPoolService.sol +21 -14
  344. package/contracts/pool/Pool.sol +22 -29
  345. package/contracts/pool/PoolService.sol +116 -80
  346. package/contracts/product/ApplicationService.sol +16 -4
  347. package/contracts/product/BasicProduct.sol +6 -6
  348. package/contracts/product/BasicProductAuthorization.sol +0 -1
  349. package/contracts/product/ClaimService.sol +108 -69
  350. package/contracts/product/IClaimService.sol +3 -2
  351. package/contracts/product/IPolicyService.sol +3 -0
  352. package/contracts/product/IPricingService.sol +9 -9
  353. package/contracts/product/IProductComponent.sol +23 -3
  354. package/contracts/product/PolicyService.sol +66 -21
  355. package/contracts/product/PricingService.sol +8 -8
  356. package/contracts/product/Product.sol +81 -52
  357. package/contracts/registry/ChainNft.sol +6 -9
  358. package/contracts/registry/IRegistry.sol +6 -3
  359. package/contracts/registry/IRegistryService.sol +5 -12
  360. package/contracts/registry/ITransferInterceptor.sol +1 -2
  361. package/contracts/registry/Registry.sol +21 -6
  362. package/contracts/registry/RegistryAdmin.sol +7 -23
  363. package/contracts/registry/RegistryService.sol +33 -44
  364. package/contracts/registry/ReleaseLifecycle.sol +6 -3
  365. package/contracts/registry/ReleaseRegistry.sol +201 -191
  366. package/contracts/registry/ServiceAuthorizationV3.sol +14 -19
  367. package/contracts/shared/Component.sol +25 -28
  368. package/contracts/shared/ComponentService.sol +235 -131
  369. package/contracts/shared/ComponentVerifyingService.sol +22 -13
  370. package/contracts/shared/IComponent.sol +6 -2
  371. package/contracts/shared/IComponentService.sol +25 -13
  372. package/contracts/shared/IInstanceLinkedComponent.sol +3 -11
  373. package/contracts/shared/ILifecycle.sol +3 -1
  374. package/contracts/shared/INftOwnable.sol +2 -0
  375. package/contracts/shared/IRegisterable.sol +11 -0
  376. package/contracts/shared/InstanceLinkedComponent.sol +68 -27
  377. package/contracts/shared/KeyValueStore.sol +1 -1
  378. package/contracts/shared/Lifecycle.sol +15 -4
  379. package/contracts/shared/NftOwnable.sol +23 -3
  380. package/contracts/shared/PolicyHolder.sol +4 -0
  381. package/contracts/shared/Registerable.sol +15 -5
  382. package/contracts/shared/Service.sol +4 -7
  383. package/contracts/staking/IStakingService.sol +0 -3
  384. package/contracts/staking/Staking.sol +2 -3
  385. package/contracts/staking/StakingReader.sol +12 -5
  386. package/contracts/staking/StakingService.sol +15 -15
  387. package/contracts/type/Amount.sol +15 -0
  388. package/contracts/type/ClaimId.sol +6 -1
  389. package/contracts/type/NftId.sol +1 -0
  390. package/contracts/type/ObjectType.sol +1 -0
  391. package/contracts/type/PayoutId.sol +10 -10
  392. package/contracts/type/RiskId.sol +15 -1
  393. package/contracts/type/RoleId.sol +0 -12
  394. package/contracts/type/StateId.sol +14 -1
  395. package/contracts/type/UFixed.sol +4 -0
  396. package/contracts/upgradeability/ProxyManager.sol +2 -1
  397. package/package.json +2 -1
  398. package/artifacts/contracts/authorization/IModuleAuthorization.sol/IModuleAuthorization.dbg.json +0 -4
  399. package/artifacts/contracts/authorization/IModuleAuthorization.sol/IModuleAuthorization.json +0 -290
  400. package/artifacts/contracts/authorization/ModuleAuthorization.sol/ModuleAuthorization.dbg.json +0 -4
  401. package/artifacts/contracts/authorization/ModuleAuthorization.sol/ModuleAuthorization.json +0 -390
  402. package/artifacts/contracts/shared/InitializableCustom.sol/InitializableCustom.dbg.json +0 -4
  403. package/artifacts/contracts/shared/InitializableCustom.sol/InitializableCustom.json +0 -39
  404. package/contracts/authorization/IModuleAuthorization.sol +0 -21
  405. package/contracts/authorization/ModuleAuthorization.sol +0 -78
  406. package/contracts/shared/InitializableCustom.sol +0 -177
@@ -1,45 +1,33 @@
1
1
  // SPDX-License-Identifier: Apache-2.0
2
2
  pragma solidity ^0.8.20;
3
3
 
4
- import {Create2} from "@openzeppelin/contracts/utils/Create2.sol";
5
4
  import {Clones} from "@openzeppelin/contracts/proxy/Clones.sol";
6
- import {IAccessManager} from "@openzeppelin/contracts/access/manager/IAccessManager.sol";
7
- import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";
8
5
  import {AccessManaged} from "@openzeppelin/contracts/access/manager/AccessManaged.sol";
9
- import {Math} from "@openzeppelin/contracts/utils/math/Math.sol";
10
6
 
11
7
  import {NftId} from "../type/NftId.sol";
12
- import {RoleId, ADMIN_ROLE, PUBLIC_ROLE} from "../type/RoleId.sol";
13
8
  import {ObjectType, ObjectTypeLib, POOL, RELEASE, REGISTRY, SERVICE, STAKING} from "../type/ObjectType.sol";
14
- import {Version, VersionLib, VersionPart, VersionPartLib} from "../type/Version.sol";
15
- import {Timestamp, TimestampLib, zeroTimestamp, ltTimestamp} from "../type/Timestamp.sol";
16
- import {Seconds, SecondsLib} from "../type/Seconds.sol";
17
- import {StateId, INITIAL, SCHEDULED, DEPLOYING, ACTIVE, PAUSED, CLOSED} from "../type/StateId.sol";
18
- import {Version, VersionLib, VersionPart, VersionPartLib} from "../type/Version.sol";
9
+ import {TimestampLib, zeroTimestamp} from "../type/Timestamp.sol";
10
+ import {Seconds} from "../type/Seconds.sol";
11
+ import {StateId, SCHEDULED, DEPLOYING, DEPLOYED, SKIPPED, ACTIVE, PAUSED} from "../type/StateId.sol";
12
+ import {VersionPart, VersionPartLib} from "../type/Version.sol";
19
13
 
20
14
  import {IService} from "../shared/IService.sol";
21
- import {ILifecycle} from "../shared/ILifecycle.sol";
22
- import {INftOwnable} from "../shared/INftOwnable.sol";
23
15
  import {IRegisterable} from "../shared/IRegisterable.sol";
24
16
 
25
17
  import {IRegistry} from "./IRegistry.sol";
26
18
  import {IRegistryLinked} from "../shared/IRegistryLinked.sol";
27
- import {IRegistryService} from "./IRegistryService.sol";
28
19
  import {IServiceAuthorization} from "../authorization/IServiceAuthorization.sol";
29
- import {IAccessAdmin} from "../authorization/IAccessAdmin.sol";
30
20
  import {RegistryAdmin} from "./RegistryAdmin.sol";
31
21
  import {Registry} from "./Registry.sol";
32
- import {TokenRegistry} from "./TokenRegistry.sol";
33
22
  import {ReleaseLifecycle} from "./ReleaseLifecycle.sol";
34
23
 
24
+
35
25
  contract ReleaseRegistry is
36
26
  AccessManaged,
37
27
  ReleaseLifecycle,
38
28
  IRegistryLinked
39
29
  {
40
- using ObjectTypeLib for ObjectType;
41
-
42
- uint256 public constant INITIAL_GIF_VERSION = 3;
30
+ uint256 public constant INITIAL_GIF_VERSION = 3;// first active version
43
31
 
44
32
  event LogReleaseCreation(VersionPart version, bytes32 salt);
45
33
  event LogReleaseActivation(VersionPart version);
@@ -49,35 +37,22 @@ contract ReleaseRegistry is
49
37
  // constructor
50
38
  error ErrorReleaseRegistryNotRegistry(Registry registry);
51
39
 
52
- // createNextRelease
53
- error ErrorReleaseRegistryReleaseCreationDisallowed(VersionPart version, StateId currentStateId);
54
-
55
- // prepareRelease
56
- error ErrorReleaseRegistryReleasePreparationDisallowed(VersionPart version, StateId currentStateId);
57
- error ErrorReleaseRegistryReleaseAlreadyPrepared(VersionPart version, StateId currentStateId);
58
- error ErrorReleaseRegistryVersionMismatch(VersionPart expected, VersionPart actual);
59
- error ErrorReleaseRegistryNoDomains(VersionPart version);
40
+ // _verifyServiceAuthorization
41
+ error ErrorReleaseRegistryNotServiceAuth(address notAuth);
42
+ error ErrorReleaseRegistryServiceAuthVersionMismatch(IServiceAuthorization auth, VersionPart expected, VersionPart actual);
43
+ error ErrorReleaseRegistryServiceAuthDomainsZero(IServiceAuthorization auth, VersionPart version);
60
44
 
61
45
  // registerService
62
- error ErrorReleaseRegistryNoServiceRegistrationExpected();
63
- error ErrorReleaseRegistryServiceRegistrationDisallowed(StateId currentStateId);
64
- error ErrorReleaseRegistryServiceDomainMismatch(ObjectType expectedDomain, ObjectType actualDomain);
65
- error ErrorReleaseRegistryNotService(address notService);
66
46
  error ErrorReleaseRegistryServiceAddressMismatch(address expected, address actual);
67
47
 
68
48
  // activateNextRelease
69
- error ErrorReleaseRegistryReleaseActivationDisallowed(VersionPart releaseVersion, StateId currentStateId);
70
- error ErrorReleaseRegistryReleaseNotCreated(VersionPart releaseVersion);
71
- error ErrorReleaseRegistryReleaseRegistrationNotFinished(VersionPart releaseVersion, uint awaitingRegistration);
72
- error ErrorReleaseRegistryReleaseAlreadyActivated(VersionPart releaseVersion);
73
-
74
- // disableRelease
75
- error ErrorReleaseRegistryReleaseNotActivated(VersionPart releaseVersion);
76
- error ErrorReleaseRegistryReleaseAlreadyDisabled(VersionPart releaseVersion);
49
+ error ErrorReleaseRegistryRegistryServiceMissing(VersionPart releaseVersion);
77
50
 
78
51
  // _verifyService
79
- error ErrorReleaseRegistryServiceReleaseAuthorityMismatch(IService service, address serviceAuthority, address releaseAuthority);
80
- error ErrorReleaseRegistryServiceReleaseVersionMismatch(IService service, VersionPart serviceVersion, VersionPart releaseVersion);
52
+ error ErrorReleaseRegistryNotService(address notService);
53
+ error ErrorReleaseRegistryServiceAuthorityMismatch(IService service, address serviceAuthority, address releaseAuthority);
54
+ error ErrorReleaseRegistryServiceVersionMismatch(IService service, VersionPart serviceVersion, VersionPart releaseVersion);
55
+ error ErrorReleaseRegistryServiceDomainMismatch(IService service, ObjectType expectedDomain, ObjectType actualDomain);
81
56
 
82
57
  // _verifyServiceInfo
83
58
  error ErrorReleaseRegistryServiceInfoAddressInvalid(IService service, address expected);
@@ -87,23 +62,13 @@ contract ReleaseRegistry is
87
62
  error ErrorReleaseRegistryServiceSelfRegistration(IService service);
88
63
  error ErrorReleaseRegistryServiceOwnerRegistered(IService service, address owner);
89
64
 
90
- Seconds public constant MIN_DISABLE_DELAY = Seconds.wrap(60 * 24 * 365); // 1 year
91
-
92
65
  RegistryAdmin public immutable _admin;
93
66
  Registry public immutable _registry;
94
- IRegisterable private _staking;
95
- address private _stakingOwner;
96
67
 
97
68
  mapping(VersionPart version => IRegistry.ReleaseInfo info) internal _releaseInfo;
98
- mapping(VersionPart version => IServiceAuthorization authz) internal _serviceAuthorization;
99
-
100
- // TODO check where/why this is used
101
- mapping(address registryService => VersionPart version) _releaseVersionByAddress;
102
-
103
- VersionPart private _initial;// first active version
69
+ VersionPart [] internal _release; // array of all created releases
104
70
  VersionPart internal _latest; // latest active version
105
71
  VersionPart internal _next; // version to create and activate
106
- mapping(VersionPart verson => StateId releaseState) private _state;
107
72
 
108
73
  uint256 internal _registeredServices;
109
74
  uint256 internal _servicesToRegister;
@@ -121,21 +86,30 @@ contract ReleaseRegistry is
121
86
  _registry = registry;
122
87
  _admin = RegistryAdmin(_registry.getRegistryAdminAddress());
123
88
 
124
- _initial = VersionPartLib.toVersionPart(INITIAL_GIF_VERSION);
125
89
  _next = VersionPartLib.toVersionPart(INITIAL_GIF_VERSION - 1);
126
90
  }
127
91
 
128
- /// @dev skips previous release if was not activated
92
+ /// @dev sets previous release into SKIPPED state if it was created but not activated
129
93
  /// sets next release into state SCHEDULED
130
94
  function createNextRelease()
131
95
  external
132
96
  restricted() // GIF_ADMIN_ROLE
133
97
  returns(VersionPart)
134
98
  {
135
- _next = VersionPartLib.toVersionPart(_next.toInt() + 1);
99
+ VersionPart version = _next;
100
+
101
+ if(isValidTransition(RELEASE(), _releaseInfo[version].state, SKIPPED())) {
102
+ _releaseInfo[version].state = SKIPPED();
103
+ }
104
+
105
+ version = VersionPartLib.toVersionPart(version.toInt() + 1);
106
+ _release.push(version);
107
+
108
+ _next = version;
109
+ _releaseInfo[version].version = version;
110
+ _releaseInfo[version].state = getInitialState(RELEASE());
136
111
  _servicesToRegister = 0;
137
112
  _registeredServices = 0;
138
- _state[_next] = getInitialState(RELEASE());
139
113
 
140
114
  return _next;
141
115
  }
@@ -147,51 +121,36 @@ contract ReleaseRegistry is
147
121
  external
148
122
  restricted() // GIF_MANAGER_ROLE
149
123
  returns(
150
- address authority,
151
- VersionPart version,
124
+ address releaseAuthority,
125
+ VersionPart releaseVersion,
152
126
  bytes32 releaseSalt
153
127
  )
154
128
  {
155
- authority = _admin.authority();
156
- version = _next;
129
+ releaseVersion = _next;
130
+
131
+ // release can transition into DEPLOYING state
132
+ checkTransition(_releaseInfo[releaseVersion].state, RELEASE(), SCHEDULED(), DEPLOYING());
157
133
 
134
+ uint256 serviceDomainsCount = _verifyServiceAuthorization(serviceAuthorization, releaseVersion, salt);
135
+
136
+ releaseAuthority = _admin.authority();
137
+ releaseSalt = salt;
158
138
  // ensures unique salt
159
139
  // TODO CreateX have clones capability also
160
140
  // what would releaseSalt look like if used with CreateX in pemissioned mode?
161
- releaseSalt = keccak256(
141
+ /*releaseSalt = keccak256(
162
142
  bytes.concat(
163
- bytes32(version.toInt()),
164
- salt));
165
-
166
- // verify release in state SCHEDULED
167
- if (!isValidTransition(RELEASE(), _state[version], DEPLOYING())) {
168
- revert ErrorReleaseRegistryReleasePreparationDisallowed(version, _state[version]);
169
- }
170
-
171
- _state[version] = DEPLOYING();
172
-
173
- // verify authorizaion contract release matches with expected version
174
- VersionPart releaseVersion = serviceAuthorization.getRelease();
175
- if (releaseVersion != version) {
176
- revert ErrorReleaseRegistryVersionMismatch(version, releaseVersion);
177
- }
178
-
179
-
180
- // sanity check to ensure service domain list is not empty
181
- uint256 serviceDomainsCount = serviceAuthorization.getServiceDomains().length;
182
- if (serviceDomainsCount == 0) {
183
- revert ErrorReleaseRegistryNoDomains(version);
184
- }
185
-
186
- // verify prepareNextRelease is only called once per release
187
- if(_servicesToRegister > 0) {
188
- revert ErrorReleaseRegistryReleaseAlreadyPrepared(version, _state[version]);
189
- }
143
+ bytes32(releaseVersion.toInt()),
144
+ salt));*/
190
145
 
191
146
  _servicesToRegister = serviceDomainsCount;
192
- _serviceAuthorization[version] = serviceAuthorization;
147
+ _releaseInfo[releaseVersion].state = DEPLOYING();
148
+ _releaseInfo[releaseVersion].salt = releaseSalt;
149
+ // TODO allow for the same serviceAuthorization address to be used for multiple releases?
150
+ _releaseInfo[releaseVersion].auth = serviceAuthorization;
151
+ //_releaseInfo[releaseVersion].authority = releaseAuthority;
193
152
 
194
- emit LogReleaseCreation(version, releaseSalt);
153
+ emit LogReleaseCreation(releaseVersion, releaseSalt);
195
154
  }
196
155
 
197
156
  function registerService(IService service)
@@ -200,135 +159,124 @@ contract ReleaseRegistry is
200
159
  returns(NftId nftId)
201
160
  {
202
161
  VersionPart releaseVersion = _next;
203
- StateId state = _state[releaseVersion];
204
162
 
205
- // verify release in state DEPLOYING
206
- if (!isValidTransition(RELEASE(), state, DEPLOYING())) {
207
- // TOOD name must represent failed state transition
208
- revert ErrorReleaseRegistryServiceRegistrationDisallowed(state);
209
- }
163
+ // release can transition to DEPLOYED state
164
+ checkTransition(_releaseInfo[releaseVersion].state, RELEASE(), DEPLOYING(), DEPLOYED());
210
165
 
211
- _state[releaseVersion] = DEPLOYING();
166
+ address releaseAuthority = _admin.authority();
167
+ IServiceAuthorization serviceAuth = _releaseInfo[releaseVersion].auth;
168
+ ObjectType expectedDomain = serviceAuth.getServiceDomain(_registeredServices);
212
169
 
213
- // not all services are registered
214
- if (_servicesToRegister == _registeredServices) {
215
- revert ErrorReleaseRegistryNoServiceRegistrationExpected();
216
- }
217
-
218
- // service can work with release manager
170
+ // service can work with release registry and release version
219
171
  (
220
172
  IRegistry.ObjectInfo memory info,
221
173
  ObjectType serviceDomain,
222
174
  VersionPart serviceVersion
223
- ) = _verifyService(service);
175
+ //,string memory serviceName
176
+ ) = _verifyService(
177
+ service,
178
+ releaseAuthority,
179
+ releaseVersion,
180
+ expectedDomain
181
+ );
182
+
183
+ //_releaseInfo[releaseVersion].addresses.push(address(service)); // TODO get this info from auth contract?
184
+ //_releaseInfo[releaseVersion].domains.push(serviceDomain);
185
+ //_releaseInfo[releaseVersion].names.push(serviceName); // TODO if needed read in _verifyService()
186
+
187
+ _registeredServices++; // TODO use releaseInfo.someArray.length instead of _registeredServices
224
188
 
225
- // service domain matches defined in release config
226
- ObjectType expectedDomain = _serviceAuthorization[releaseVersion].getServiceDomain(_registeredServices);
227
- if (serviceDomain != expectedDomain) {
228
- revert ErrorReleaseRegistryServiceDomainMismatch(expectedDomain, serviceDomain);
189
+ // release fully deployed
190
+ if(_servicesToRegister == _registeredServices) {
191
+ _releaseInfo[releaseVersion].state = DEPLOYED();
229
192
  }
230
193
 
231
- // register service with registry
232
- // !!! TODO MUST call registry at the end of this function
233
- nftId = _registry.registerService(info, serviceVersion, serviceDomain);
234
- service.linkToRegisteredNftId();
235
- _registeredServices++;
194
+ // TODO: service address matches defined in release auth (precalculated one)
195
+ // revert ErrorReleaseRegistryServiceAddressMismatch()
236
196
 
237
197
  // setup service authorization
238
- // !!! TODO service A can call service B while release is not active
239
198
  _admin.authorizeService(
240
- _serviceAuthorization[releaseVersion],
199
+ serviceAuth,
241
200
  service,
242
201
  serviceDomain,
243
- serviceVersion);
244
-
245
- // special roles for registry/staking/pool service
246
- // !!! TODO registry service allowed to call registry while release is not activated (same for staking/pool service and staking)
247
- if (
248
- serviceDomain == REGISTRY() ||
249
- serviceDomain == STAKING() ||
250
- serviceDomain == POOL())
251
- {
252
- _admin.grantServiceRoleForAllVersions(service, serviceDomain);
253
- }
254
- }
255
-
202
+ releaseVersion);
256
203
 
204
+ // register service with registry
205
+ nftId = _registry.registerService(info, serviceVersion, serviceDomain);
206
+ service.linkToRegisteredNftId();
207
+ }
208
+ // TODO return activated version
257
209
  function activateNextRelease()
258
210
  external
259
211
  restricted // GIF_ADMIN_ROLE
260
212
  {
261
213
  VersionPart version = _next;
262
- StateId state = _state[version];
263
- StateId newState = ACTIVE();
264
214
 
265
- // verify release in state DEPLOYING
266
- if (!isValidTransition(RELEASE(), state, newState)) {
267
- revert ErrorReleaseRegistryReleaseActivationDisallowed(version, state);
268
- }
215
+ // release can transition to ACTIVE state
216
+ checkTransition(_releaseInfo[version].state, RELEASE(), DEPLOYED(), ACTIVE());
269
217
 
270
- // release fully deployed
271
- if(_registeredServices < _servicesToRegister) {
272
- revert ErrorReleaseRegistryReleaseRegistrationNotFinished(version, _servicesToRegister - _registeredServices);
273
- }
218
+ _latest = version;
219
+ _releaseInfo[version].state = ACTIVE();
220
+ _releaseInfo[version].activatedAt = TimestampLib.blockTimestamp();
221
+
222
+ // grant special roles for registry/staking/pool services
223
+ // this will enable access to core contracts functions
274
224
 
275
- // release exists, registry service MUST exist
225
+ // registry service MUST be registered for each release
276
226
  address service = _registry.getServiceAddress(REGISTRY(), version);
277
227
  if(service == address(0)) {
278
- revert ErrorReleaseRegistryReleaseNotCreated(version);
228
+ revert ErrorReleaseRegistryRegistryServiceMissing(version);
279
229
  }
280
230
 
281
- _latest = version;
282
- _state[version] = newState;
231
+ _admin.grantServiceRoleForAllVersions(IService(service), REGISTRY());
283
232
 
284
- _releaseVersionByAddress[service] = version;
285
- _releaseInfo[version].activatedAt = TimestampLib.blockTimestamp();
233
+ service = _registry.getServiceAddress(STAKING(), version);
234
+ if(service != address(0)) {
235
+ _admin.grantServiceRoleForAllVersions(IService(service), STAKING());
236
+ }
237
+
238
+ service = _registry.getServiceAddress(POOL(), version);
239
+ if(service != address(0)) {
240
+ _admin.grantServiceRoleForAllVersions(IService(service), POOL());
241
+ }
242
+
243
+ // TODO may run out of gas
244
+ // TODO test how many service can be locked in one transaction
245
+ // -> add to docs + each release must test for this -> add to release version tests (in test call with some gas limit?)
246
+ _setReleaseLocked(version, false);
286
247
 
287
248
  emit LogReleaseActivation(version);
288
249
  }
289
250
 
290
251
  /// @dev stop all operations with release services
291
252
  function pauseRelease(VersionPart version)
292
- external
253
+ external
293
254
  restricted // GIF_ADMIN_ROLE
294
255
  {
295
- StateId state = _state[version];
296
- StateId newState = PAUSED();
297
-
298
- // verify release in state ACTIVE
299
- if (!isValidTransition(RELEASE(), state, newState)) {
300
- revert ErrorReleaseRegistryReleaseActivationDisallowed(version, state);
301
- }
256
+ // release can transition to PAUSED state
257
+ checkTransition(_releaseInfo[version].state, RELEASE(), ACTIVE(), PAUSED());
302
258
 
303
- // TODO come up with a substitute
304
- //_releaseAccessManager[version].disable();
305
-
306
- _state[version] = newState;
259
+ _releaseInfo[version].state = PAUSED();
307
260
  _releaseInfo[version].disabledAt = TimestampLib.blockTimestamp();
308
261
 
262
+ _setReleaseLocked(version, true);
263
+
309
264
  emit LogReleaseDisabled(version);
310
265
  }
311
266
 
312
- // TODO consider revert if some delay is expired -> becomes disabled automatically
313
267
  /// @dev resume operations with release services
314
268
  function unpauseRelease(VersionPart version)
315
269
  external
316
270
  restricted // GIF_ADMIN_ROLE
317
271
  {
318
- StateId state = _state[version];
319
- StateId newState = ACTIVE();
320
-
321
- // verify release in state PAUSED
322
- if (!isValidTransition(RELEASE(), state, newState)) {
323
- revert ErrorReleaseRegistryReleaseActivationDisallowed(version, state);
324
- }
325
-
326
- // TODO come up with a substitute
327
- // _releaseAccessManager[version].enable();
272
+ // release can transition to ACTIVE state
273
+ checkTransition(_releaseInfo[version].state, RELEASE(), PAUSED(), ACTIVE());
328
274
 
329
- _state[version] = newState;
275
+ _releaseInfo[version].state = ACTIVE();
330
276
  _releaseInfo[version].disabledAt = zeroTimestamp();
331
277
 
278
+ _setReleaseLocked(version, false);
279
+
332
280
  emit LogReleaseEnabled(version);
333
281
  }
334
282
 
@@ -342,33 +290,39 @@ contract ReleaseRegistry is
342
290
  return Clones.predictDeterministicAddress(implementation, salt, deployer);
343
291
  }
344
292
 
345
- function isActiveRegistryService(address service) external view returns(bool) {
346
- VersionPart version = _releaseVersionByAddress[service];
347
- return isActiveRelease(version);
348
- }
349
-
350
293
  function isActiveRelease(VersionPart version) public view returns(bool) {
351
- return _state[version] == ACTIVE();
294
+ return _releaseInfo[version].state == ACTIVE();
352
295
  }
353
296
 
354
297
  function getReleaseInfo(VersionPart version) external view returns(IRegistry.ReleaseInfo memory) {
355
298
  return _releaseInfo[version];
356
299
  }
357
300
 
301
+ /// @dev Returns the number of created releases.
302
+ /// Releases might be in another state than ACTIVE.
303
+ function releases() external view returns (uint) {
304
+ return _release.length;
305
+ }
306
+
307
+ /// @dev Returns the n-th release version.
308
+ /// Valid values for idx [0 .. releases() - 1]
309
+ function getVersion(uint256 idx) external view returns (VersionPart version) {
310
+ // return _releases;
311
+ return _release[idx];
312
+ }
313
+
358
314
  function getNextVersion() public view returns(VersionPart) {
359
315
  return _next;
360
316
  }
361
317
 
318
+ /// @dev Returns the latest activated relase version.
319
+ /// There is no guarantee that the release is not currently paused.
362
320
  function getLatestVersion() external view returns(VersionPart) {
363
321
  return _latest;
364
322
  }
365
323
 
366
- function getInitialVersion() external view returns(VersionPart) {
367
- return _initial;
368
- }
369
-
370
324
  function getState(VersionPart version) external view returns (StateId stateId) {
371
- return _state[version];
325
+ return _releaseInfo[version].state;
372
326
  }
373
327
 
374
328
  function getRemainingServicesToRegister() external view returns (uint256 services) {
@@ -380,7 +334,7 @@ contract ReleaseRegistry is
380
334
  view
381
335
  returns (IServiceAuthorization serviceAuthorization)
382
336
  {
383
- return _serviceAuthorization[version];
337
+ return _releaseInfo[version].auth;
384
338
  }
385
339
 
386
340
  function getRegistryAdmin() external view returns (address) {
@@ -395,7 +349,61 @@ contract ReleaseRegistry is
395
349
 
396
350
  //--- private functions ----------------------------------------------------//
397
351
 
398
- function _verifyService(IService service)
352
+ // close / open service targets instead of revoking / granting roles
353
+ function _setReleaseLocked(VersionPart version, bool locked)
354
+ private
355
+ {
356
+ address service;
357
+ ObjectType domain;
358
+ IServiceAuthorization auth = _releaseInfo[version].auth;
359
+
360
+ ObjectType[] memory domains = auth.getServiceDomains();
361
+ for(uint idx = 0; idx < domains.length; idx++)
362
+ {
363
+ domain = domains[idx];
364
+ service = _registry.getServiceAddress(domain, version);
365
+ assert(service != address(0));
366
+
367
+ _admin.setServiceLocked(IService(service), locked);
368
+ }
369
+
370
+ // TODO add check for active/disabled release to core contracts functions interacting with releases
371
+ }
372
+
373
+ function _verifyServiceAuthorization(
374
+ IServiceAuthorization serviceAuthorization,
375
+ VersionPart releaseVersion,
376
+ bytes32 salt
377
+ )
378
+ private
379
+ view
380
+ returns (uint256 serviceDomainsCount)
381
+ {
382
+ // authorization contract supports IServiceAuthorization interface
383
+ if(!serviceAuthorization.supportsInterface(type(IServiceAuthorization).interfaceId)) {
384
+ revert ErrorReleaseRegistryNotServiceAuth(address(serviceAuthorization));
385
+ }
386
+
387
+ // authorizaions contract version matches with release version
388
+ VersionPart authVersion = serviceAuthorization.getRelease();
389
+ if (releaseVersion != authVersion) {
390
+ revert ErrorReleaseRegistryServiceAuthVersionMismatch(serviceAuthorization, releaseVersion, authVersion);
391
+ }
392
+
393
+ // sanity check to ensure service domain list is not empty
394
+ serviceDomainsCount = serviceAuthorization.getServiceDomains().length;
395
+ if (serviceDomainsCount == 0) {
396
+ revert ErrorReleaseRegistryServiceAuthDomainsZero(serviceAuthorization, releaseVersion);
397
+ }
398
+ }
399
+
400
+ // TODO get service names
401
+ function _verifyService(
402
+ IService service,
403
+ address expectedAuthority,
404
+ VersionPart expectedVersion,
405
+ ObjectType expectedDomain
406
+ )
399
407
  internal
400
408
  view
401
409
  returns(
@@ -416,22 +424,25 @@ contract ReleaseRegistry is
416
424
 
417
425
  _verifyServiceInfo(service, serviceInfo, owner);
418
426
 
419
- VersionPart releaseVersion = _next; // never 0
420
- address expectedAuthority = _admin.authority(); // can be zero if registering service when release is not created
421
-
422
- // IMPORTANT: can not guarantee service access is actually controlled by authority
423
427
  if(serviceAuthority != expectedAuthority) {
424
- revert ErrorReleaseRegistryServiceReleaseAuthorityMismatch(
428
+ revert ErrorReleaseRegistryServiceAuthorityMismatch(
425
429
  service,
426
430
  serviceAuthority,
427
431
  expectedAuthority);
428
432
  }
429
433
 
430
- if(serviceVersion != releaseVersion) {
431
- revert ErrorReleaseRegistryServiceReleaseVersionMismatch(
434
+ if(serviceVersion != expectedVersion) {
435
+ revert ErrorReleaseRegistryServiceVersionMismatch(
432
436
  service,
433
437
  serviceVersion,
434
- releaseVersion);
438
+ expectedVersion);
439
+ }
440
+
441
+ if(serviceDomain != expectedDomain) {
442
+ revert ErrorReleaseRegistryServiceDomainMismatch(
443
+ service,
444
+ expectedDomain,
445
+ serviceDomain);
435
446
  }
436
447
  }
437
448
 
@@ -445,7 +456,7 @@ contract ReleaseRegistry is
445
456
  view
446
457
  {
447
458
  if(info.objectAddress != address(service)) {
448
- revert ErrorReleaseRegistryServiceInfoAddressInvalid(service, address(service));
459
+ revert ErrorReleaseRegistryServiceInfoAddressInvalid(service, info.objectAddress);
449
460
  }
450
461
 
451
462
  if(info.isInterceptor != false) { // service is never interceptor
@@ -478,8 +489,7 @@ contract ReleaseRegistry is
478
489
  if (registryAddress == address(0)) {
479
490
  return false;
480
491
  }
481
- // TODO try catch and return false in case of revert
482
- // or just panic
492
+ // TODO try catch and return false in case of revert or just panic
483
493
  // check if contract returns a zero nft id for its own address
484
494
  if (IRegistry(registryAddress).getNftIdForAddress(registryAddress).eqz()) {
485
495
  return false;