@etherisc/gif-next 3.0.0-1664e67-168 → 3.0.0-193bd1e-500

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 (485) hide show
  1. package/README.md +9 -1
  2. package/artifacts/contracts/accounting/AccountingService.sol/AccountingService.dbg.json +1 -1
  3. package/artifacts/contracts/accounting/AccountingService.sol/AccountingService.json +83 -164
  4. package/artifacts/contracts/accounting/AccountingServiceManager.sol/AccountingServiceManager.dbg.json +1 -1
  5. package/artifacts/contracts/accounting/AccountingServiceManager.sol/AccountingServiceManager.json +115 -113
  6. package/artifacts/contracts/accounting/IAccountingService.sol/IAccountingService.dbg.json +1 -1
  7. package/artifacts/contracts/accounting/IAccountingService.sol/IAccountingService.json +46 -91
  8. package/artifacts/contracts/authorization/AccessAdmin.sol/AccessAdmin.dbg.json +1 -1
  9. package/artifacts/contracts/authorization/AccessAdmin.sol/AccessAdmin.json +70 -105
  10. package/artifacts/contracts/authorization/AccessAdminLib.sol/AccessAdminLib.dbg.json +1 -1
  11. package/artifacts/contracts/authorization/AccessAdminLib.sol/AccessAdminLib.json +150 -126
  12. package/artifacts/contracts/authorization/AccessManagerCloneable.sol/AccessManagerCloneable.dbg.json +1 -1
  13. package/artifacts/contracts/authorization/AccessManagerCloneable.sol/AccessManagerCloneable.json +84 -20
  14. package/artifacts/contracts/authorization/Authorization.sol/Authorization.dbg.json +1 -1
  15. package/artifacts/contracts/authorization/Authorization.sol/Authorization.json +55 -31
  16. package/artifacts/contracts/authorization/IAccess.sol/IAccess.dbg.json +1 -1
  17. package/artifacts/contracts/authorization/IAccessAdmin.sol/IAccessAdmin.dbg.json +1 -1
  18. package/artifacts/contracts/authorization/IAccessAdmin.sol/IAccessAdmin.json +10 -20
  19. package/artifacts/contracts/authorization/IAuthorization.sol/IAuthorization.dbg.json +1 -1
  20. package/artifacts/contracts/authorization/IAuthorization.sol/IAuthorization.json +1 -1
  21. package/artifacts/contracts/authorization/IServiceAuthorization.sol/IServiceAuthorization.dbg.json +1 -1
  22. package/artifacts/contracts/authorization/IServiceAuthorization.sol/IServiceAuthorization.json +1 -1
  23. package/artifacts/contracts/authorization/ServiceAuthorization.sol/ServiceAuthorization.dbg.json +1 -1
  24. package/artifacts/contracts/authorization/ServiceAuthorization.sol/ServiceAuthorization.json +42 -18
  25. package/artifacts/contracts/distribution/BasicDistribution.sol/BasicDistribution.dbg.json +1 -1
  26. package/artifacts/contracts/distribution/BasicDistribution.sol/BasicDistribution.json +75 -126
  27. package/artifacts/contracts/distribution/BasicDistributionAuthorization.sol/BasicDistributionAuthorization.dbg.json +1 -1
  28. package/artifacts/contracts/distribution/BasicDistributionAuthorization.sol/BasicDistributionAuthorization.json +65 -41
  29. package/artifacts/contracts/distribution/Distribution.sol/Distribution.dbg.json +1 -1
  30. package/artifacts/contracts/distribution/Distribution.sol/Distribution.json +57 -72
  31. package/artifacts/contracts/distribution/DistributionService.sol/DistributionService.dbg.json +1 -1
  32. package/artifacts/contracts/distribution/DistributionService.sol/DistributionService.json +224 -198
  33. package/artifacts/contracts/distribution/DistributionServiceManager.sol/DistributionServiceManager.dbg.json +1 -1
  34. package/artifacts/contracts/distribution/DistributionServiceManager.sol/DistributionServiceManager.json +150 -140
  35. package/artifacts/contracts/distribution/IDistributionComponent.sol/IDistributionComponent.dbg.json +1 -1
  36. package/artifacts/contracts/distribution/IDistributionComponent.sol/IDistributionComponent.json +56 -84
  37. package/artifacts/contracts/distribution/IDistributionService.sol/IDistributionService.dbg.json +1 -1
  38. package/artifacts/contracts/distribution/IDistributionService.sol/IDistributionService.json +117 -71
  39. package/artifacts/contracts/examples/fire/DamageLevel.sol/DamageLevelLib.dbg.json +1 -1
  40. package/artifacts/contracts/examples/fire/FirePool.sol/FirePool.dbg.json +1 -1
  41. package/artifacts/contracts/examples/fire/FirePool.sol/FirePool.json +104 -166
  42. package/artifacts/contracts/examples/fire/FirePoolAuthorization.sol/FirePoolAuthorization.dbg.json +1 -1
  43. package/artifacts/contracts/examples/fire/FirePoolAuthorization.sol/FirePoolAuthorization.json +65 -41
  44. package/artifacts/contracts/examples/fire/FireProduct.sol/FireProduct.dbg.json +1 -1
  45. package/artifacts/contracts/examples/fire/FireProduct.sol/FireProduct.json +138 -200
  46. package/artifacts/contracts/examples/fire/FireProductAuthorization.sol/FireProductAuthorization.dbg.json +1 -1
  47. package/artifacts/contracts/examples/fire/FireProductAuthorization.sol/FireProductAuthorization.json +65 -41
  48. package/artifacts/contracts/examples/fire/FireUSD.sol/FireUSD.dbg.json +1 -1
  49. package/artifacts/contracts/examples/flight/FlightLib.sol/FlightLib.dbg.json +1 -1
  50. package/artifacts/contracts/examples/flight/FlightLib.sol/FlightLib.json +251 -56
  51. package/artifacts/contracts/examples/flight/FlightMessageVerifier.sol/FlightMessageVerifier.dbg.json +1 -1
  52. package/artifacts/contracts/examples/flight/FlightNft.sol/FlightNft.dbg.json +4 -0
  53. package/artifacts/contracts/examples/flight/FlightNft.sol/FlightNft.json +801 -0
  54. package/artifacts/contracts/examples/flight/FlightOracle.sol/FlightOracle.dbg.json +1 -1
  55. package/artifacts/contracts/examples/flight/FlightOracle.sol/FlightOracle.json +260 -162
  56. package/artifacts/contracts/examples/flight/FlightOracleAuthorization.sol/FlightOracleAuthorization.dbg.json +1 -1
  57. package/artifacts/contracts/examples/flight/FlightOracleAuthorization.sol/FlightOracleAuthorization.json +112 -41
  58. package/artifacts/contracts/examples/flight/FlightPool.sol/FlightPool.dbg.json +1 -1
  59. package/artifacts/contracts/examples/flight/FlightPool.sol/FlightPool.json +108 -170
  60. package/artifacts/contracts/examples/flight/FlightPoolAuthorization.sol/FlightPoolAuthorization.dbg.json +1 -1
  61. package/artifacts/contracts/examples/flight/FlightPoolAuthorization.sol/FlightPoolAuthorization.json +65 -41
  62. package/artifacts/contracts/examples/flight/FlightProduct.sol/FlightProduct.dbg.json +1 -1
  63. package/artifacts/contracts/examples/flight/FlightProduct.sol/FlightProduct.json +447 -793
  64. package/artifacts/contracts/examples/flight/FlightProductAuthorization.sol/FlightProductAuthorization.dbg.json +1 -1
  65. package/artifacts/contracts/examples/flight/FlightProductAuthorization.sol/FlightProductAuthorization.json +113 -42
  66. package/artifacts/contracts/examples/flight/FlightProductManager.sol/FlightProductManager.dbg.json +4 -0
  67. package/artifacts/contracts/examples/flight/FlightProductManager.sol/FlightProductManager.json +711 -0
  68. package/artifacts/contracts/examples/flight/FlightUSD.sol/FlightUSD.dbg.json +1 -1
  69. package/artifacts/contracts/examples/flight/originalV1.sol/FlightDelayChainlink.dbg.json +1 -1
  70. package/artifacts/contracts/examples/unpermissioned/SimpleDistribution.sol/SimpleDistribution.dbg.json +1 -1
  71. package/artifacts/contracts/examples/unpermissioned/SimpleDistribution.sol/SimpleDistribution.json +102 -159
  72. package/artifacts/contracts/examples/unpermissioned/SimpleDistributionAuthorization.sol/SimpleDistributionAuthorization.dbg.json +1 -1
  73. package/artifacts/contracts/examples/unpermissioned/SimpleDistributionAuthorization.sol/SimpleDistributionAuthorization.json +65 -41
  74. package/artifacts/contracts/examples/unpermissioned/SimpleOracle.sol/SimpleOracle.dbg.json +1 -1
  75. package/artifacts/contracts/examples/unpermissioned/SimpleOracle.sol/SimpleOracle.json +106 -163
  76. package/artifacts/contracts/examples/unpermissioned/SimplePool.sol/SimplePool.dbg.json +1 -1
  77. package/artifacts/contracts/examples/unpermissioned/SimplePool.sol/SimplePool.json +120 -177
  78. package/artifacts/contracts/examples/unpermissioned/SimplePoolAuthorization.sol/SimplePoolAuthorization.dbg.json +1 -1
  79. package/artifacts/contracts/examples/unpermissioned/SimplePoolAuthorization.sol/SimplePoolAuthorization.json +65 -41
  80. package/artifacts/contracts/examples/unpermissioned/SimpleProduct.sol/SimpleProduct.dbg.json +1 -1
  81. package/artifacts/contracts/examples/unpermissioned/SimpleProduct.sol/SimpleProduct.json +114 -171
  82. package/artifacts/contracts/examples/unpermissioned/SimpleProductAuthorization.sol/SimpleProductAuthorization.dbg.json +1 -1
  83. package/artifacts/contracts/examples/unpermissioned/SimpleProductAuthorization.sol/SimpleProductAuthorization.json +65 -41
  84. package/artifacts/contracts/instance/BaseStore.sol/BaseStore.dbg.json +1 -1
  85. package/artifacts/contracts/instance/BaseStore.sol/BaseStore.json +50 -0
  86. package/artifacts/contracts/instance/BundleSet.sol/BundleSet.dbg.json +1 -1
  87. package/artifacts/contracts/instance/BundleSet.sol/BundleSet.json +54 -49
  88. package/artifacts/contracts/instance/IBaseStore.sol/IBaseStore.dbg.json +1 -1
  89. package/artifacts/contracts/instance/IBaseStore.sol/IBaseStore.json +50 -0
  90. package/artifacts/contracts/instance/IInstance.sol/IInstance.dbg.json +1 -1
  91. package/artifacts/contracts/instance/IInstance.sol/IInstance.json +25 -77
  92. package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.dbg.json +1 -1
  93. package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.json +44 -83
  94. package/artifacts/contracts/instance/Instance.sol/Instance.dbg.json +1 -1
  95. package/artifacts/contracts/instance/Instance.sol/Instance.json +50 -144
  96. package/artifacts/contracts/instance/InstanceAdmin.sol/InstanceAdmin.dbg.json +1 -1
  97. package/artifacts/contracts/instance/InstanceAdmin.sol/InstanceAdmin.json +151 -185
  98. package/artifacts/contracts/instance/InstanceAuthorizationV3.sol/InstanceAuthorizationV3.dbg.json +1 -1
  99. package/artifacts/contracts/instance/InstanceAuthorizationV3.sol/InstanceAuthorizationV3.json +67 -43
  100. package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.dbg.json +1 -1
  101. package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.json +95 -36
  102. package/artifacts/contracts/instance/InstanceService.sol/InstanceService.dbg.json +1 -1
  103. package/artifacts/contracts/instance/InstanceService.sol/InstanceService.json +75 -138
  104. package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.dbg.json +1 -1
  105. package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.json +112 -104
  106. package/artifacts/contracts/instance/InstanceStore.sol/InstanceStore.dbg.json +1 -1
  107. package/artifacts/contracts/instance/InstanceStore.sol/InstanceStore.json +82 -32
  108. package/artifacts/contracts/instance/ProductStore.sol/ProductStore.dbg.json +1 -1
  109. package/artifacts/contracts/instance/ProductStore.sol/ProductStore.json +68 -18
  110. package/artifacts/contracts/instance/RiskSet.sol/RiskSet.dbg.json +1 -1
  111. package/artifacts/contracts/instance/RiskSet.sol/RiskSet.json +58 -53
  112. package/artifacts/contracts/instance/base/BalanceStore.sol/BalanceStore.dbg.json +1 -1
  113. package/artifacts/contracts/instance/base/BalanceStore.sol/BalanceStore.json +2 -2
  114. package/artifacts/contracts/instance/base/Cloneable.sol/Cloneable.dbg.json +1 -1
  115. package/artifacts/contracts/instance/base/Cloneable.sol/Cloneable.json +1 -1
  116. package/artifacts/contracts/instance/base/ObjectCounter.sol/ObjectCounter.dbg.json +1 -1
  117. package/artifacts/contracts/instance/base/ObjectCounter.sol/ObjectCounter.json +2 -2
  118. package/artifacts/contracts/instance/base/ObjectLifecycle.sol/ObjectLifecycle.dbg.json +1 -1
  119. package/artifacts/contracts/instance/base/ObjectLifecycle.sol/ObjectLifecycle.json +2 -2
  120. package/artifacts/contracts/instance/base/ObjectSet.sol/ObjectSet.dbg.json +1 -1
  121. package/artifacts/contracts/instance/base/ObjectSet.sol/ObjectSet.json +8 -3
  122. package/artifacts/contracts/instance/base/ObjectSetHelperLib.sol/ObjectSetHelperLib.dbg.json +1 -1
  123. package/artifacts/contracts/instance/base/ObjectSetHelperLib.sol/ObjectSetHelperLib.json +2 -2
  124. package/artifacts/contracts/instance/module/IBundle.sol/IBundle.dbg.json +1 -1
  125. package/artifacts/contracts/instance/module/IComponents.sol/IComponents.dbg.json +1 -1
  126. package/artifacts/contracts/instance/module/IDistribution.sol/IDistribution.dbg.json +1 -1
  127. package/artifacts/contracts/instance/module/IPolicy.sol/IPolicy.dbg.json +1 -1
  128. package/artifacts/contracts/instance/module/IRisk.sol/IRisk.dbg.json +1 -1
  129. package/artifacts/contracts/mock/Dip.sol/Dip.dbg.json +1 -1
  130. package/artifacts/contracts/oracle/BasicOracle.sol/BasicOracle.dbg.json +1 -1
  131. package/artifacts/contracts/oracle/BasicOracle.sol/BasicOracle.json +81 -132
  132. package/artifacts/contracts/oracle/BasicOracleAuthorization.sol/BasicOracleAuthorization.dbg.json +1 -1
  133. package/artifacts/contracts/oracle/BasicOracleAuthorization.sol/BasicOracleAuthorization.json +65 -41
  134. package/artifacts/contracts/oracle/IOracle.sol/IOracle.dbg.json +1 -1
  135. package/artifacts/contracts/oracle/IOracleComponent.sol/IOracleComponent.dbg.json +1 -1
  136. package/artifacts/contracts/oracle/IOracleComponent.sol/IOracleComponent.json +66 -94
  137. package/artifacts/contracts/oracle/IOracleService.sol/IOracleService.dbg.json +1 -1
  138. package/artifacts/contracts/oracle/IOracleService.sol/IOracleService.json +83 -80
  139. package/artifacts/contracts/oracle/Oracle.sol/Oracle.dbg.json +1 -1
  140. package/artifacts/contracts/oracle/Oracle.sol/Oracle.json +67 -82
  141. package/artifacts/contracts/oracle/OracleService.sol/OracleService.dbg.json +1 -1
  142. package/artifacts/contracts/oracle/OracleService.sol/OracleService.json +148 -149
  143. package/artifacts/contracts/oracle/OracleServiceManager.sol/OracleServiceManager.dbg.json +1 -1
  144. package/artifacts/contracts/oracle/OracleServiceManager.sol/OracleServiceManager.json +129 -111
  145. package/artifacts/contracts/pool/BasicPool.sol/BasicPool.dbg.json +1 -1
  146. package/artifacts/contracts/pool/BasicPool.sol/BasicPool.json +73 -88
  147. package/artifacts/contracts/pool/BasicPoolAuthorization.sol/BasicPoolAuthorization.dbg.json +1 -1
  148. package/artifacts/contracts/pool/BasicPoolAuthorization.sol/BasicPoolAuthorization.json +65 -41
  149. package/artifacts/contracts/pool/BundleService.sol/BundleService.dbg.json +1 -1
  150. package/artifacts/contracts/pool/BundleService.sol/BundleService.json +117 -176
  151. package/artifacts/contracts/pool/BundleServiceManager.sol/BundleServiceManager.dbg.json +1 -1
  152. package/artifacts/contracts/pool/BundleServiceManager.sol/BundleServiceManager.json +139 -129
  153. package/artifacts/contracts/pool/IBundleService.sol/IBundleService.dbg.json +1 -1
  154. package/artifacts/contracts/pool/IBundleService.sol/IBundleService.json +32 -71
  155. package/artifacts/contracts/pool/IPoolComponent.sol/IPoolComponent.dbg.json +1 -1
  156. package/artifacts/contracts/pool/IPoolComponent.sol/IPoolComponent.json +72 -100
  157. package/artifacts/contracts/pool/IPoolService.sol/IPoolService.dbg.json +1 -1
  158. package/artifacts/contracts/pool/IPoolService.sol/IPoolService.json +86 -94
  159. package/artifacts/contracts/pool/Pool.sol/Pool.dbg.json +1 -1
  160. package/artifacts/contracts/pool/Pool.sol/Pool.json +73 -88
  161. package/artifacts/contracts/pool/PoolLib.sol/PoolLib.dbg.json +1 -1
  162. package/artifacts/contracts/pool/PoolLib.sol/PoolLib.json +247 -24
  163. package/artifacts/contracts/pool/PoolService.sol/PoolService.dbg.json +1 -1
  164. package/artifacts/contracts/pool/PoolService.sol/PoolService.json +165 -233
  165. package/artifacts/contracts/pool/PoolServiceManager.sol/PoolServiceManager.dbg.json +1 -1
  166. package/artifacts/contracts/pool/PoolServiceManager.sol/PoolServiceManager.json +130 -140
  167. package/artifacts/contracts/product/ApplicationService.sol/ApplicationService.dbg.json +1 -1
  168. package/artifacts/contracts/product/ApplicationService.sol/ApplicationService.json +63 -138
  169. package/artifacts/contracts/product/ApplicationServiceManager.sol/ApplicationServiceManager.dbg.json +1 -1
  170. package/artifacts/contracts/product/ApplicationServiceManager.sol/ApplicationServiceManager.json +112 -110
  171. package/artifacts/contracts/product/BasicProduct.sol/BasicProduct.dbg.json +1 -1
  172. package/artifacts/contracts/product/BasicProduct.sol/BasicProduct.json +57 -72
  173. package/artifacts/contracts/product/BasicProductAuthorization.sol/BasicProductAuthorization.dbg.json +1 -1
  174. package/artifacts/contracts/product/BasicProductAuthorization.sol/BasicProductAuthorization.json +65 -41
  175. package/artifacts/contracts/product/ClaimService.sol/ClaimService.dbg.json +1 -1
  176. package/artifacts/contracts/product/ClaimService.sol/ClaimService.json +115 -182
  177. package/artifacts/contracts/product/ClaimServiceManager.sol/ClaimServiceManager.dbg.json +1 -1
  178. package/artifacts/contracts/product/ClaimServiceManager.sol/ClaimServiceManager.json +138 -132
  179. package/artifacts/contracts/product/IApplicationService.sol/IApplicationService.dbg.json +1 -1
  180. package/artifacts/contracts/product/IApplicationService.sol/IApplicationService.json +32 -71
  181. package/artifacts/contracts/product/IClaimService.sol/IClaimService.dbg.json +1 -1
  182. package/artifacts/contracts/product/IClaimService.sol/IClaimService.json +32 -71
  183. package/artifacts/contracts/product/IPolicyService.sol/IPolicyService.dbg.json +1 -1
  184. package/artifacts/contracts/product/IPolicyService.sol/IPolicyService.json +64 -82
  185. package/artifacts/contracts/product/IPricingService.sol/IPricingService.dbg.json +1 -1
  186. package/artifacts/contracts/product/IPricingService.sol/IPricingService.json +43 -82
  187. package/artifacts/contracts/product/IProductComponent.sol/IProductComponent.dbg.json +1 -1
  188. package/artifacts/contracts/product/IProductComponent.sol/IProductComponent.json +56 -84
  189. package/artifacts/contracts/product/IRiskService.sol/IRiskService.dbg.json +1 -1
  190. package/artifacts/contracts/product/IRiskService.sol/IRiskService.json +36 -75
  191. package/artifacts/contracts/product/PolicyService.sol/PolicyService.dbg.json +1 -1
  192. package/artifacts/contracts/product/PolicyService.sol/PolicyService.json +127 -173
  193. package/artifacts/contracts/product/PolicyServiceLib.sol/PolicyServiceLib.dbg.json +1 -1
  194. package/artifacts/contracts/product/PolicyServiceLib.sol/PolicyServiceLib.json +20 -12
  195. package/artifacts/contracts/product/PolicyServiceManager.sol/PolicyServiceManager.dbg.json +1 -1
  196. package/artifacts/contracts/product/PolicyServiceManager.sol/PolicyServiceManager.json +128 -122
  197. package/artifacts/contracts/product/PricingService.sol/PricingService.dbg.json +1 -1
  198. package/artifacts/contracts/product/PricingService.sol/PricingService.json +94 -161
  199. package/artifacts/contracts/product/PricingServiceManager.sol/PricingServiceManager.dbg.json +1 -1
  200. package/artifacts/contracts/product/PricingServiceManager.sol/PricingServiceManager.json +122 -116
  201. package/artifacts/contracts/product/Product.sol/Product.dbg.json +1 -1
  202. package/artifacts/contracts/product/Product.sol/Product.json +57 -72
  203. package/artifacts/contracts/product/RiskService.sol/RiskService.dbg.json +1 -1
  204. package/artifacts/contracts/product/RiskService.sol/RiskService.json +63 -146
  205. package/artifacts/contracts/product/RiskServiceManager.sol/RiskServiceManager.dbg.json +1 -1
  206. package/artifacts/contracts/product/RiskServiceManager.sol/RiskServiceManager.json +107 -109
  207. package/artifacts/contracts/registry/ChainNft.sol/ChainNft.dbg.json +1 -1
  208. package/artifacts/contracts/registry/ChainNft.sol/ChainNft.json +2 -2
  209. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.dbg.json +1 -1
  210. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.json +56 -155
  211. package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.dbg.json +1 -1
  212. package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.json +216 -202
  213. package/artifacts/contracts/registry/IRelease.sol/IRelease.dbg.json +1 -1
  214. package/artifacts/contracts/registry/IRelease.sol/IRelease.json +15 -1
  215. package/artifacts/contracts/registry/ITransferInterceptor.sol/ITransferInterceptor.dbg.json +1 -1
  216. package/artifacts/contracts/registry/Registry.sol/Registry.dbg.json +1 -1
  217. package/artifacts/contracts/registry/Registry.sol/Registry.json +96 -314
  218. package/artifacts/contracts/registry/RegistryAdmin.sol/RegistryAdmin.dbg.json +1 -1
  219. package/artifacts/contracts/registry/RegistryAdmin.sol/RegistryAdmin.json +146 -179
  220. package/artifacts/contracts/registry/RegistryAuthorization.sol/RegistryAuthorization.dbg.json +1 -1
  221. package/artifacts/contracts/registry/RegistryAuthorization.sol/RegistryAuthorization.json +77 -57
  222. package/artifacts/contracts/registry/RegistryService.sol/RegistryService.dbg.json +1 -1
  223. package/artifacts/contracts/registry/RegistryService.sol/RegistryService.json +244 -285
  224. package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.dbg.json +1 -1
  225. package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.json +110 -115
  226. package/artifacts/contracts/registry/ReleaseAdmin.sol/ReleaseAdmin.dbg.json +1 -1
  227. package/artifacts/contracts/registry/ReleaseAdmin.sol/ReleaseAdmin.json +154 -175
  228. package/artifacts/contracts/registry/ReleaseLifecycle.sol/ReleaseLifecycle.dbg.json +1 -1
  229. package/artifacts/contracts/registry/ReleaseLifecycle.sol/ReleaseLifecycle.json +2 -2
  230. package/artifacts/contracts/registry/ReleaseRegistry.sol/ReleaseRegistry.dbg.json +1 -1
  231. package/artifacts/contracts/registry/ReleaseRegistry.sol/ReleaseRegistry.json +187 -135
  232. package/artifacts/contracts/registry/ServiceAuthorizationV3.sol/ServiceAuthorizationV3.dbg.json +1 -1
  233. package/artifacts/contracts/registry/ServiceAuthorizationV3.sol/ServiceAuthorizationV3.json +56 -32
  234. package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.dbg.json +1 -1
  235. package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.json +29 -13
  236. package/artifacts/contracts/shared/Component.sol/Component.dbg.json +1 -1
  237. package/artifacts/contracts/shared/Component.sol/Component.json +39 -84
  238. package/artifacts/contracts/shared/ComponentService.sol/ComponentService.dbg.json +1 -1
  239. package/artifacts/contracts/shared/ComponentService.sol/ComponentService.json +345 -164
  240. package/artifacts/contracts/shared/ComponentServiceManager.sol/ComponentServiceManager.dbg.json +1 -1
  241. package/artifacts/contracts/shared/ComponentServiceManager.sol/ComponentServiceManager.json +141 -115
  242. package/artifacts/contracts/shared/ContractLib.sol/ContractLib.dbg.json +1 -1
  243. package/artifacts/contracts/shared/ContractLib.sol/ContractLib.json +169 -421
  244. package/artifacts/contracts/shared/ContractLib.sol/IInstanceAdminHelper.dbg.json +4 -0
  245. package/artifacts/contracts/shared/ContractLib.sol/IInstanceAdminHelper.json +24 -0
  246. package/artifacts/contracts/shared/ContractLib.sol/ITargetHelper.dbg.json +1 -1
  247. package/artifacts/contracts/shared/ContractLib.sol/ITokenRegistryHelper.dbg.json +4 -0
  248. package/artifacts/contracts/shared/ContractLib.sol/ITokenRegistryHelper.json +40 -0
  249. package/artifacts/contracts/shared/IAuthorizedComponent.sol/IAuthorizedComponent.dbg.json +1 -1
  250. package/artifacts/contracts/shared/IAuthorizedComponent.sol/IAuthorizedComponent.json +38 -96
  251. package/artifacts/contracts/shared/IComponent.sol/IComponent.dbg.json +1 -1
  252. package/artifacts/contracts/shared/IComponent.sol/IComponent.json +38 -96
  253. package/artifacts/contracts/shared/IComponentService.sol/IComponentService.dbg.json +1 -1
  254. package/artifacts/contracts/shared/IComponentService.sol/IComponentService.json +251 -82
  255. package/artifacts/contracts/shared/IInstanceLinkedComponent.sol/IInstanceLinkedComponent.dbg.json +1 -1
  256. package/artifacts/contracts/shared/IInstanceLinkedComponent.sol/IInstanceLinkedComponent.json +56 -84
  257. package/artifacts/contracts/shared/ILifecycle.sol/ILifecycle.dbg.json +1 -1
  258. package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.dbg.json +1 -1
  259. package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.json +28 -1
  260. package/artifacts/contracts/shared/IPolicyHolder.sol/IPolicyHolder.dbg.json +1 -1
  261. package/artifacts/contracts/shared/IPolicyHolder.sol/IPolicyHolder.json +12 -1
  262. package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.dbg.json +1 -1
  263. package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.json +25 -77
  264. package/artifacts/contracts/shared/IRegistryLinked.sol/IRegistryLinked.dbg.json +1 -1
  265. package/artifacts/contracts/shared/IRegistryLinked.sol/IRegistryLinked.json +12 -1
  266. package/artifacts/contracts/shared/IService.sol/IService.dbg.json +1 -1
  267. package/artifacts/contracts/shared/IService.sol/IService.json +32 -71
  268. package/artifacts/contracts/shared/InitializableERC165.sol/InitializableERC165.dbg.json +1 -1
  269. package/artifacts/contracts/shared/InstanceLinkedComponent.sol/InstanceLinkedComponent.dbg.json +1 -1
  270. package/artifacts/contracts/shared/InstanceLinkedComponent.sol/InstanceLinkedComponent.json +57 -72
  271. package/artifacts/contracts/shared/Lifecycle.sol/Lifecycle.dbg.json +1 -1
  272. package/artifacts/contracts/shared/NftIdSet.sol/NftIdSet.dbg.json +1 -1
  273. package/artifacts/contracts/shared/NftIdSet.sol/NftIdSet.json +2 -2
  274. package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.dbg.json +1 -1
  275. package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.json +34 -15
  276. package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.dbg.json +1 -1
  277. package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.json +14 -3
  278. package/artifacts/contracts/shared/Registerable.sol/Registerable.dbg.json +1 -1
  279. package/artifacts/contracts/shared/Registerable.sol/Registerable.json +24 -76
  280. package/artifacts/contracts/shared/RegistryLinked.sol/RegistryLinked.dbg.json +1 -1
  281. package/artifacts/contracts/shared/RegistryLinked.sol/RegistryLinked.json +37 -3
  282. package/artifacts/contracts/shared/Service.sol/Service.dbg.json +1 -1
  283. package/artifacts/contracts/shared/Service.sol/Service.json +31 -70
  284. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.dbg.json +1 -1
  285. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.json +29 -42
  286. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandlerBase.dbg.json +1 -1
  287. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandlerBase.json +17 -30
  288. package/artifacts/contracts/shared/TokenHandlerDeployerLib.sol/TokenHandlerDeployerLib.dbg.json +1 -1
  289. package/artifacts/contracts/shared/TokenHandlerDeployerLib.sol/TokenHandlerDeployerLib.json +34 -34
  290. package/artifacts/contracts/staking/IStaking.sol/IStaking.dbg.json +1 -1
  291. package/artifacts/contracts/staking/IStaking.sol/IStaking.json +81 -101
  292. package/artifacts/contracts/staking/IStakingService.sol/IStakingService.dbg.json +1 -1
  293. package/artifacts/contracts/staking/IStakingService.sol/IStakingService.json +36 -75
  294. package/artifacts/contracts/staking/ITargetLimitHandler.sol/ITargetLimitHandler.dbg.json +1 -1
  295. package/artifacts/contracts/staking/Staking.sol/Staking.dbg.json +1 -1
  296. package/artifacts/contracts/staking/Staking.sol/Staking.json +134 -170
  297. package/artifacts/contracts/staking/StakingLib.sol/StakingLib.dbg.json +1 -1
  298. package/artifacts/contracts/staking/StakingLib.sol/StakingLib.json +31 -26
  299. package/artifacts/contracts/staking/StakingManager.sol/StakingManager.dbg.json +1 -1
  300. package/artifacts/contracts/staking/StakingManager.sol/StakingManager.json +124 -112
  301. package/artifacts/contracts/staking/StakingReader.sol/StakingReader.dbg.json +1 -1
  302. package/artifacts/contracts/staking/StakingReader.sol/StakingReader.json +22 -5
  303. package/artifacts/contracts/staking/StakingService.sol/StakingService.dbg.json +1 -1
  304. package/artifacts/contracts/staking/StakingService.sol/StakingService.json +65 -132
  305. package/artifacts/contracts/staking/StakingServiceManager.sol/StakingServiceManager.dbg.json +1 -1
  306. package/artifacts/contracts/staking/StakingServiceManager.sol/StakingServiceManager.json +111 -105
  307. package/artifacts/contracts/staking/StakingStore.sol/StakingStore.dbg.json +1 -1
  308. package/artifacts/contracts/staking/StakingStore.sol/StakingStore.json +204 -212
  309. package/artifacts/contracts/staking/TargetHandler.sol/TargetHandler.dbg.json +1 -1
  310. package/artifacts/contracts/staking/TargetHandler.sol/TargetHandler.json +19 -27
  311. package/artifacts/contracts/staking/TargetManagerLib.sol/TargetManagerLib.dbg.json +1 -1
  312. package/artifacts/contracts/staking/TargetManagerLib.sol/TargetManagerLib.json +16 -16
  313. package/artifacts/contracts/type/AddressSet.sol/LibAddressSet.dbg.json +1 -1
  314. package/artifacts/contracts/type/Amount.sol/AmountLib.dbg.json +1 -1
  315. package/artifacts/contracts/type/Blocknumber.sol/BlocknumberLib.dbg.json +1 -1
  316. package/artifacts/contracts/type/ChainId.sol/ChainIdLib.dbg.json +1 -1
  317. package/artifacts/contracts/type/ChainId.sol/ChainIdLib.json +2 -2
  318. package/artifacts/contracts/type/ClaimId.sol/ClaimIdLib.dbg.json +1 -1
  319. package/artifacts/contracts/type/ClaimId.sol/ClaimIdLib.json +2 -2
  320. package/artifacts/contracts/type/DistributorType.sol/DistributorTypeLib.dbg.json +1 -1
  321. package/artifacts/contracts/type/DistributorType.sol/DistributorTypeLib.json +2 -2
  322. package/artifacts/contracts/type/Fee.sol/FeeLib.dbg.json +1 -1
  323. package/artifacts/contracts/type/Key32.sol/Key32Lib.dbg.json +1 -1
  324. package/artifacts/contracts/type/Key32.sol/Key32Lib.json +2 -2
  325. package/artifacts/contracts/type/Key32Set.sol/LibKey32Set.dbg.json +1 -1
  326. package/artifacts/contracts/type/Key32Set.sol/LibKey32Set.json +2 -2
  327. package/artifacts/contracts/type/NftId.sol/NftIdLib.dbg.json +1 -1
  328. package/artifacts/contracts/type/NftId.sol/NftIdLib.json +2 -2
  329. package/artifacts/contracts/type/NftIdSet.sol/LibNftIdSet.dbg.json +1 -1
  330. package/artifacts/contracts/type/NftIdSet.sol/LibNftIdSet.json +2 -2
  331. package/artifacts/contracts/type/ObjectType.sol/ObjectTypeLib.dbg.json +1 -1
  332. package/artifacts/contracts/type/ObjectType.sol/ObjectTypeLib.json +6 -6
  333. package/artifacts/contracts/type/PayoutId.sol/PayoutIdLib.dbg.json +1 -1
  334. package/artifacts/contracts/type/PayoutId.sol/PayoutIdLib.json +2 -2
  335. package/artifacts/contracts/type/Referral.sol/ReferralLib.dbg.json +1 -1
  336. package/artifacts/contracts/type/Referral.sol/ReferralLib.json +2 -2
  337. package/artifacts/contracts/type/RequestId.sol/RequestIdLib.dbg.json +1 -1
  338. package/artifacts/contracts/type/RequestId.sol/RequestIdLib.json +2 -2
  339. package/artifacts/contracts/type/RequestIdSet.sol/LibRequestIdSet.dbg.json +1 -1
  340. package/artifacts/contracts/type/RequestIdSet.sol/LibRequestIdSet.json +2 -2
  341. package/artifacts/contracts/type/RiskId.sol/RiskIdLib.dbg.json +1 -1
  342. package/artifacts/contracts/type/RiskId.sol/RiskIdLib.json +2 -2
  343. package/artifacts/contracts/type/RoleId.sol/RoleIdLib.dbg.json +1 -1
  344. package/artifacts/contracts/type/RoleId.sol/RoleIdLib.json +4 -4
  345. package/artifacts/contracts/type/Seconds.sol/SecondsLib.dbg.json +1 -1
  346. package/artifacts/contracts/type/Selector.sol/SelectorLib.dbg.json +1 -1
  347. package/artifacts/contracts/type/Selector.sol/SelectorSetLib.dbg.json +1 -1
  348. package/artifacts/contracts/type/StateId.sol/StateIdLib.dbg.json +1 -1
  349. package/artifacts/contracts/type/String.sol/StrLib.dbg.json +1 -1
  350. package/artifacts/contracts/type/Timestamp.sol/TimestampLib.dbg.json +1 -1
  351. package/artifacts/contracts/type/UFixed.sol/UFixedLib.dbg.json +1 -1
  352. package/artifacts/contracts/type/Version.sol/VersionLib.dbg.json +1 -1
  353. package/artifacts/contracts/type/Version.sol/VersionLib.json +10 -10
  354. package/artifacts/contracts/type/Version.sol/VersionPartLib.dbg.json +1 -1
  355. package/artifacts/contracts/type/Version.sol/VersionPartLib.json +6 -19
  356. package/artifacts/contracts/upgradeability/IVersionable.sol/IVersionable.dbg.json +4 -0
  357. package/artifacts/contracts/upgradeability/{IUpgradeable.sol/IUpgradeable.json → IVersionable.sol/IVersionable.json} +4 -54
  358. package/artifacts/contracts/upgradeability/ProxyManager.sol/ProxyManager.dbg.json +1 -1
  359. package/artifacts/contracts/upgradeability/ProxyManager.sol/ProxyManager.json +86 -63
  360. package/artifacts/contracts/upgradeability/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.dbg.json +1 -1
  361. package/artifacts/contracts/upgradeability/Versionable.sol/Versionable.dbg.json +4 -0
  362. package/artifacts/contracts/upgradeability/{Upgradeable.sol/Upgradeable.json → Versionable.sol/Versionable.json} +4 -54
  363. package/contracts/accounting/AccountingService.sol +22 -33
  364. package/contracts/accounting/AccountingServiceManager.sol +6 -4
  365. package/contracts/accounting/IAccountingService.sol +7 -8
  366. package/contracts/authorization/AccessAdmin.sol +25 -47
  367. package/contracts/authorization/AccessAdminLib.sol +27 -13
  368. package/contracts/authorization/AccessManagerCloneable.sol +51 -24
  369. package/contracts/authorization/Authorization.sol +2 -2
  370. package/contracts/authorization/IAccessAdmin.sol +3 -3
  371. package/contracts/authorization/IServiceAuthorization.sol +1 -1
  372. package/contracts/authorization/ServiceAuthorization.sol +4 -4
  373. package/contracts/distribution/BasicDistribution.sol +2 -0
  374. package/contracts/distribution/BasicDistributionAuthorization.sol +4 -5
  375. package/contracts/distribution/Distribution.sol +2 -0
  376. package/contracts/distribution/DistributionService.sol +25 -27
  377. package/contracts/distribution/DistributionServiceManager.sol +6 -4
  378. package/contracts/distribution/IDistributionService.sol +4 -3
  379. package/contracts/examples/fire/FirePool.sol +4 -0
  380. package/contracts/examples/fire/FireProduct.sol +4 -0
  381. package/contracts/examples/flight/FlightLib.sol +90 -75
  382. package/contracts/examples/flight/FlightNft.sol +234 -0
  383. package/contracts/examples/flight/FlightOracle.sol +72 -9
  384. package/contracts/examples/flight/FlightOracleAuthorization.sol +28 -5
  385. package/contracts/examples/flight/FlightPool.sol +5 -1
  386. package/contracts/examples/flight/FlightProduct.sol +283 -246
  387. package/contracts/examples/flight/FlightProductAuthorization.sol +35 -10
  388. package/contracts/examples/flight/FlightProductManager.sol +49 -0
  389. package/contracts/examples/unpermissioned/SimpleDistribution.sol +4 -0
  390. package/contracts/examples/unpermissioned/SimpleOracle.sol +4 -0
  391. package/contracts/examples/unpermissioned/SimplePool.sol +4 -0
  392. package/contracts/examples/unpermissioned/SimpleProduct.sol +4 -0
  393. package/contracts/instance/BaseStore.sol +4 -0
  394. package/contracts/instance/IBaseStore.sol +8 -0
  395. package/contracts/instance/Instance.sol +11 -7
  396. package/contracts/instance/InstanceAdmin.sol +17 -11
  397. package/contracts/instance/InstanceAuthorizationV3.sol +2 -4
  398. package/contracts/instance/InstanceReader.sol +31 -19
  399. package/contracts/instance/InstanceService.sol +20 -18
  400. package/contracts/instance/InstanceServiceManager.sol +6 -4
  401. package/contracts/instance/base/Cloneable.sol +10 -4
  402. package/contracts/instance/base/ObjectSet.sol +2 -2
  403. package/contracts/oracle/BasicOracle.sol +3 -0
  404. package/contracts/oracle/BasicOracleAuthorization.sol +1 -3
  405. package/contracts/oracle/IOracleService.sol +4 -0
  406. package/contracts/oracle/Oracle.sol +6 -5
  407. package/contracts/oracle/OracleService.sol +67 -37
  408. package/contracts/oracle/OracleServiceManager.sol +6 -4
  409. package/contracts/pool/BasicPool.sol +4 -2
  410. package/contracts/pool/BasicPoolAuthorization.sol +4 -5
  411. package/contracts/pool/BundleService.sol +19 -25
  412. package/contracts/pool/BundleServiceManager.sol +7 -5
  413. package/contracts/pool/IPoolService.sol +6 -5
  414. package/contracts/pool/Pool.sol +3 -1
  415. package/contracts/pool/PoolLib.sol +102 -5
  416. package/contracts/pool/PoolService.sol +101 -67
  417. package/contracts/pool/PoolServiceManager.sol +6 -4
  418. package/contracts/product/ApplicationService.sol +34 -13
  419. package/contracts/product/ApplicationServiceManager.sol +6 -4
  420. package/contracts/product/BasicProduct.sol +2 -0
  421. package/contracts/product/BasicProductAuthorization.sol +4 -5
  422. package/contracts/product/ClaimService.sol +34 -10
  423. package/contracts/product/ClaimServiceManager.sol +7 -5
  424. package/contracts/product/IPolicyService.sol +1 -0
  425. package/contracts/product/PolicyService.sol +57 -44
  426. package/contracts/product/PolicyServiceLib.sol +5 -3
  427. package/contracts/product/PolicyServiceManager.sol +6 -4
  428. package/contracts/product/PricingService.sol +8 -7
  429. package/contracts/product/PricingServiceManager.sol +6 -4
  430. package/contracts/product/Product.sol +2 -0
  431. package/contracts/product/RiskService.sol +40 -8
  432. package/contracts/product/RiskServiceManager.sol +6 -4
  433. package/contracts/registry/ChainNft.sol +1 -1
  434. package/contracts/registry/IRegistry.sol +14 -20
  435. package/contracts/registry/IRegistryService.sol +14 -10
  436. package/contracts/registry/IRelease.sol +3 -0
  437. package/contracts/registry/Registry.sol +78 -124
  438. package/contracts/registry/RegistryAdmin.sol +29 -12
  439. package/contracts/registry/RegistryAuthorization.sol +3 -4
  440. package/contracts/registry/RegistryService.sol +82 -99
  441. package/contracts/registry/RegistryServiceManager.sol +11 -4
  442. package/contracts/registry/ReleaseAdmin.sol +23 -9
  443. package/contracts/registry/ReleaseRegistry.sol +74 -64
  444. package/contracts/registry/ServiceAuthorizationV3.sol +3 -4
  445. package/contracts/registry/TokenRegistry.sol +15 -6
  446. package/contracts/shared/Component.sol +22 -27
  447. package/contracts/shared/ComponentService.sol +135 -45
  448. package/contracts/shared/ComponentServiceManager.sol +7 -5
  449. package/contracts/shared/ContractLib.sol +93 -359
  450. package/contracts/shared/IComponent.sol +3 -5
  451. package/contracts/shared/IComponentService.sol +15 -0
  452. package/contracts/shared/IInstanceLinkedComponent.sol +7 -3
  453. package/contracts/shared/INftOwnable.sol +2 -0
  454. package/contracts/shared/IRegisterable.sol +3 -14
  455. package/contracts/shared/IRegistryLinked.sol +3 -1
  456. package/contracts/shared/IService.sol +2 -2
  457. package/contracts/shared/InstanceLinkedComponent.sol +64 -29
  458. package/contracts/shared/NftOwnable.sol +22 -9
  459. package/contracts/shared/PolicyHolder.sol +4 -2
  460. package/contracts/shared/Registerable.sol +20 -37
  461. package/contracts/shared/RegistryLinked.sol +23 -4
  462. package/contracts/shared/Service.sol +9 -8
  463. package/contracts/shared/TokenHandler.sol +1 -4
  464. package/contracts/staking/IStaking.sol +4 -2
  465. package/contracts/staking/Staking.sol +34 -28
  466. package/contracts/staking/StakingLib.sol +1 -3
  467. package/contracts/staking/StakingManager.sol +6 -3
  468. package/contracts/staking/StakingReader.sol +17 -9
  469. package/contracts/staking/StakingService.sol +13 -16
  470. package/contracts/staking/StakingServiceManager.sol +8 -4
  471. package/contracts/staking/StakingStore.sol +8 -8
  472. package/contracts/staking/TargetHandler.sol +5 -4
  473. package/contracts/type/Version.sol +16 -15
  474. package/contracts/upgradeability/{IUpgradeable.sol → IVersionable.sol} +19 -13
  475. package/contracts/upgradeability/ProxyManager.sol +54 -46
  476. package/contracts/upgradeability/{Upgradeable.sol → Versionable.sol} +14 -25
  477. package/package.json +1 -1
  478. package/artifacts/contracts/shared/IVersionable.sol/IVersionable.dbg.json +0 -4
  479. package/artifacts/contracts/shared/IVersionable.sol/IVersionable.json +0 -74
  480. package/artifacts/contracts/shared/Versionable.sol/Versionable.dbg.json +0 -4
  481. package/artifacts/contracts/shared/Versionable.sol/Versionable.json +0 -74
  482. package/artifacts/contracts/upgradeability/IUpgradeable.sol/IUpgradeable.dbg.json +0 -4
  483. package/artifacts/contracts/upgradeability/Upgradeable.sol/Upgradeable.dbg.json +0 -4
  484. package/contracts/shared/IVersionable.sol +0 -19
  485. package/contracts/shared/Versionable.sol +0 -47
@@ -30,7 +30,7 @@ contract ServiceAuthorization is
30
30
  string public constant ROLE_NAME_SUFFIX = "_Role";
31
31
 
32
32
  ObjectType public immutable DOMAIN;
33
- VersionPart internal immutable _release;
33
+ uint256 internal immutable _release;
34
34
  string internal _commitHash;
35
35
 
36
36
  string internal _mainTargetName;
@@ -55,7 +55,7 @@ contract ServiceAuthorization is
55
55
  constructor(
56
56
  string memory mainTargetName,
57
57
  ObjectType domain,
58
- VersionPart release,
58
+ uint8 release,
59
59
  string memory commitHash
60
60
  )
61
61
  {
@@ -68,7 +68,7 @@ contract ServiceAuthorization is
68
68
  revert ErrorAuthorizationTargetDomainZero();
69
69
  }
70
70
 
71
- if (!VersionPartLib.isValidRelease(release)) {
71
+ if (release < VersionPartLib.releaseMin().toInt() || release >= VersionPartLib.releaseMax().toInt()) {
72
72
  revert ErrorAuthorizationReleaseInvalid(release);
73
73
  }
74
74
 
@@ -103,7 +103,7 @@ contract ServiceAuthorization is
103
103
 
104
104
  /// @inheritdoc IServiceAuthorization
105
105
  function getRelease() public view returns(VersionPart release) {
106
- return _release;
106
+ return VersionPartLib.toVersionPart(_release);
107
107
  }
108
108
 
109
109
  /// @inheritdoc IServiceAuthorization
@@ -119,6 +119,7 @@ contract BasicDistribution is
119
119
  }
120
120
 
121
121
  function _initializeBasicDistribution(
122
+ address registry,
122
123
  NftId instanceNftId,
123
124
  IAuthorization authorization,
124
125
  address initialOwner,
@@ -129,6 +130,7 @@ contract BasicDistribution is
129
130
  onlyInitializing()
130
131
  {
131
132
  __Distribution_init(
133
+ registry,
132
134
  instanceNftId,
133
135
  authorization,
134
136
  false,
@@ -2,16 +2,15 @@
2
2
  pragma solidity ^0.8.20;
3
3
 
4
4
  import {IAccess} from "../authorization/IAccess.sol";
5
- import {IComponent} from "../shared/IComponent.sol";
5
+ import {IInstanceLinkedComponent} from "../shared/IInstanceLinkedComponent.sol";
6
6
 
7
7
  import {Authorization} from "../authorization/Authorization.sol";
8
8
  import {BasicDistribution} from "./BasicDistribution.sol";
9
9
  import {Distribution} from "./Distribution.sol";
10
10
  import {COMPONENT, DISTRIBUTION} from "../type/ObjectType.sol";
11
11
  import {PUBLIC_ROLE} from "../type/RoleId.sol";
12
- import {GIF_INITIAL_RELEASE} from "../registry/Registry.sol";
13
12
  import {TokenHandler} from "../shared/TokenHandler.sol";
14
- import {VersionPartLib} from "../type/Version.sol";
13
+
15
14
 
16
15
  contract BasicDistributionAuthorization
17
16
  is Authorization
@@ -21,7 +20,7 @@ contract BasicDistributionAuthorization
21
20
  Authorization(
22
21
  distributionName,
23
22
  DISTRIBUTION(),
24
- GIF_INITIAL_RELEASE(),
23
+ 3,
25
24
  COMMIT_HASH,
26
25
  TargetType.Component,
27
26
  true)
@@ -61,7 +60,7 @@ contract BasicDistributionAuthorization
61
60
  _authorize(functions, BasicDistribution.changeDistributorType.selector, "changeDistributorType");
62
61
  _authorize(functions, BasicDistribution.createReferral.selector, "createReferral");
63
62
 
64
- _authorize(functions, IComponent.withdrawFees.selector, "withdrawFees");
63
+ _authorize(functions, IInstanceLinkedComponent.withdrawFees.selector, "withdrawFees");
65
64
  _authorize(functions, Distribution.withdrawCommission.selector, "withdrawCommission");
66
65
  }
67
66
  }
@@ -104,6 +104,7 @@ abstract contract Distribution is
104
104
 
105
105
 
106
106
  function __Distribution_init(
107
+ address registry,
107
108
  NftId productNftId,
108
109
  IAuthorization authorization,
109
110
  bool isInterceptor,
@@ -115,6 +116,7 @@ abstract contract Distribution is
115
116
  onlyInitializing()
116
117
  {
117
118
  __InstanceLinkedComponent_init(
119
+ registry,
118
120
  productNftId,
119
121
  name,
120
122
  DISTRIBUTION(),
@@ -20,6 +20,8 @@ import {KEEP_STATE} from "../type/StateId.sol";
20
20
  import {ObjectType, ACCOUNTING, COMPONENT, DISTRIBUTION, INSTANCE, DISTRIBUTION, DISTRIBUTOR, REGISTRY} from "../type/ObjectType.sol";
21
21
  import {InstanceReader} from "../instance/InstanceReader.sol";
22
22
  import {InstanceStore} from "../instance/InstanceStore.sol";
23
+ // TODO PoolLib feels wrong, should likely go in a component type independent lib
24
+ import {PoolLib} from "../pool/PoolLib.sol";
23
25
  import {ReferralId, ReferralStatus, ReferralLib, REFERRAL_OK, REFERRAL_ERROR_UNKNOWN, REFERRAL_ERROR_EXPIRED, REFERRAL_ERROR_EXHAUSTED} from "../type/Referral.sol";
24
26
  import {Seconds} from "../type/Seconds.sol";
25
27
  import {Service} from "../shared/Service.sol";
@@ -42,13 +44,14 @@ contract DistributionService is
42
44
  )
43
45
  internal
44
46
  virtual override
45
- onlyInitializing()
47
+ initializer()
46
48
  {
47
49
  (
48
- address authority
49
- ) = abi.decode(data, (address));
50
+ address authority,
51
+ address registry
52
+ ) = abi.decode(data, (address, address));
50
53
 
51
- __Service_init(authority, owner);
54
+ __Service_init(authority, registry, owner);
52
55
 
53
56
  _accountingService = IAccountingService(_getServiceAddress(ACCOUNTING()));
54
57
  _componentService = IComponentService(_getServiceAddress(COMPONENT()));
@@ -78,7 +81,7 @@ contract DistributionService is
78
81
  (NftId distributionNftId, IInstance instance) = _getAndVerifyActiveDistribution();
79
82
 
80
83
  {
81
- NftId productNftId = _getRegistry().getParentNftId(distributionNftId);
84
+ NftId productNftId = getRegistry().getParentNftId(distributionNftId);
82
85
  IComponents.FeeInfo memory feeInfo = instance.getInstanceReader().getFeeInfo(productNftId);
83
86
 
84
87
  UFixed variableDistributionFees = feeInfo.distributionFee.fractionalFee;
@@ -109,7 +112,7 @@ contract DistributionService is
109
112
 
110
113
  instance.getInstanceStore().createDistributorType(distributorType, info);
111
114
 
112
- emit LogDistributionServiceDistributorTypeCreated(distributionNftId, name);
115
+ emit LogDistributionServiceDistributorTypeCreated(distributionNftId, name, commissionPercentage);
113
116
  }
114
117
 
115
118
 
@@ -131,12 +134,11 @@ contract DistributionService is
131
134
  NftIdLib.zero(),
132
135
  distributionNftId,
133
136
  DISTRIBUTOR(),
134
- getRelease(),
135
137
  true, // intercepting property for bundles is defined on pool
136
- address(0)),
137
- distributor,
138
- ""
139
- );
138
+ address(0),
139
+ distributor,
140
+ ""
141
+ ));
140
142
 
141
143
  IDistribution.DistributorInfo memory info = IDistribution.DistributorInfo({
142
144
  distributorType: distributorType,
@@ -195,11 +197,9 @@ contract DistributionService is
195
197
  revert ErrorDistributionServiceExpirationInvalid(expiryAt);
196
198
  }
197
199
 
198
- {
199
- NftId distributorDistributionNftId = _getRegistry().getParentNftId(distributorNftId);
200
- if (distributorDistributionNftId != distributionNftId) {
201
- revert ErrorDistributionServiceDistributorDistributionMismatch(distributorNftId, distributorDistributionNftId, distributionNftId);
202
- }
200
+ NftId distributorDistributionNftId = getRegistry().getParentNftId(distributorNftId);
201
+ if (distributorDistributionNftId != distributionNftId) {
202
+ revert ErrorDistributionServiceDistributorDistributionMismatch(distributorNftId, distributorDistributionNftId, distributionNftId);
203
203
  }
204
204
 
205
205
  {
@@ -236,7 +236,7 @@ contract DistributionService is
236
236
 
237
237
  instance.getInstanceStore().createReferral(referralId, info);
238
238
 
239
- emit LogDistributionServiceReferralCreated(distributionNftId, distributorNftId, referralId, code);
239
+ emit LogDistributionServiceReferralCreated(distributionNftId, distributorNftId, referralId, code, discountPercentage, maxReferrals, expiryAt);
240
240
  }
241
241
  }
242
242
 
@@ -251,7 +251,7 @@ contract DistributionService is
251
251
  onlyNftOfType(distributionNftId, DISTRIBUTION())
252
252
  {
253
253
  if (referralIsValid(distributionNftId, referralId)) {
254
- IInstance instance = IInstance(ContractLib.getInstanceForComponent(distributionNftId));
254
+ IInstance instance = IInstance(ContractLib.getInstanceForComponent(getRegistry(), distributionNftId));
255
255
 
256
256
  // update book keeping for referral info
257
257
  IDistribution.ReferralInfo memory referralInfo = instance.getInstanceReader().getReferralInfo(referralId);
@@ -272,7 +272,7 @@ contract DistributionService is
272
272
  restricted()
273
273
  onlyNftOfType(distributionNftId, DISTRIBUTION())
274
274
  {
275
- IInstance instance = IInstance(ContractLib.getInstanceForComponent(distributionNftId));
275
+ IInstance instance = IInstance(ContractLib.getInstanceForComponent(getRegistry(), distributionNftId));
276
276
  InstanceReader reader = instance.getInstanceReader();
277
277
  InstanceStore store = instance.getInstanceStore();
278
278
 
@@ -295,12 +295,14 @@ contract DistributionService is
295
295
  IDistribution.DistributorInfo memory distributorInfo = reader.getDistributorInfo(referralInfo.distributorNftId);
296
296
  distributorInfo.numPoliciesSold += 1;
297
297
  store.updateDistributor(referralInfo.distributorNftId, distributorInfo, KEEP_STATE());
298
+ emit LogDistributionServiceSaleProcessedWithReferral(distributionNftId, referralInfo.distributorNftId, referralId, distributorInfo.numPoliciesSold, premium.premiumAmount, distributionOwnerFee, commissionAmount);
298
299
  } else {
299
300
  // increase distribution balance by distribution owner fee
300
301
  _accountingService.increaseDistributionBalance(store, distributionNftId, AmountLib.zero(), distributionOwnerFee);
302
+ emit LogDistributionServiceSaleProcessed(distributionNftId, referralId, premium.premiumAmount, distributionOwnerFee);
301
303
  }
302
304
 
303
- emit LogDistributionServiceSaleProcessed(distributionNftId, referralId);
305
+
304
306
  }
305
307
 
306
308
  /// @inheritdoc IDistributionService
@@ -340,7 +342,7 @@ contract DistributionService is
340
342
 
341
343
  // transfer amount to distributor
342
344
  {
343
- address distributor = _getRegistry().ownerOf(distributorNftId);
345
+ address distributor = getRegistry().ownerOf(distributorNftId);
344
346
  emit LogDistributionServiceCommissionWithdrawn(distributorNftId, distributor, address(distributionInfo.tokenHandler.TOKEN()), withdrawnAmount);
345
347
  distributionInfo.tokenHandler.pushToken(distributor, withdrawnAmount);
346
348
  }
@@ -357,7 +359,7 @@ contract DistributionService is
357
359
  return false;
358
360
  }
359
361
 
360
- IInstance instance = IInstance(ContractLib.getInstanceForComponent(distributionNftId));
362
+ IInstance instance = IInstance(ContractLib.getInstanceForComponent(getRegistry(), distributionNftId));
361
363
  IDistribution.ReferralInfo memory info = instance.getInstanceReader().getReferralInfo(referralId);
362
364
 
363
365
  if (info.distributorNftId.eqz()) {
@@ -438,11 +440,7 @@ contract DistributionService is
438
440
  IInstance instance
439
441
  )
440
442
  {
441
- (poolNftId, instance) = ContractLib.getAndVerifyComponent(
442
- msg.sender,
443
- DISTRIBUTION(),
444
- getRelease(),
445
- true);
443
+ return PoolLib.getAndVerifyActiveComponent(getRegistry(), msg.sender, DISTRIBUTION());
446
444
  }
447
445
 
448
446
 
@@ -1,7 +1,7 @@
1
1
  // SPDX-License-Identifier: Apache-2.0
2
2
  pragma solidity ^0.8.20;
3
3
 
4
- import {IUpgradeable} from "../upgradeability/IUpgradeable.sol";
4
+ import {IVersionable} from "../upgradeability/IVersionable.sol";
5
5
  import {ProxyManager} from "../upgradeability/ProxyManager.sol";
6
6
  import {DistributionService} from "./DistributionService.sol";
7
7
 
@@ -12,17 +12,19 @@ contract DistributionServiceManager is ProxyManager {
12
12
  /// @dev initializes proxy manager with distribution service implementation and deploys instance
13
13
  constructor(
14
14
  address authority,
15
+ address registry,
15
16
  bytes32 salt
16
17
  )
17
18
  {
18
19
  DistributionService svc = new DistributionService{salt: salt}();
19
- bytes memory data = abi.encode(authority);
20
- IUpgradeable upgradeable = initialize(
20
+ bytes memory data = abi.encode(authority, registry);
21
+ IVersionable versionable = initialize(
22
+ registry,
21
23
  address(svc),
22
24
  data,
23
25
  salt);
24
26
 
25
- _distributionService = DistributionService(address(upgradeable));
27
+ _distributionService = DistributionService(address(versionable));
26
28
  }
27
29
 
28
30
  //--- view functions ----------------------------------------------------//
@@ -40,12 +40,13 @@ interface IDistributionService is IService {
40
40
  error ErrorDistributionServiceReferralDistributionMismatch(ReferralId referralId, NftId referralDistributionNft, NftId distributionNftId);
41
41
 
42
42
  event LogDistributionServiceCommissionWithdrawn(NftId distributorNftId, address recipient, address tokenAddress, Amount amount);
43
- event LogDistributionServiceDistributorTypeCreated(NftId distributionNftId, string name);
43
+ event LogDistributionServiceDistributorTypeCreated(NftId distributionNftId, string name, UFixed commissionPercentage);
44
44
  event LogDistributionServiceDistributorCreated(NftId distributionNftId, NftId distributorNftId, DistributorType distributorType, address distributor);
45
45
  event LogDistributionServiceDistributorTypeChanged(NftId distributorNftId, DistributorType oldDistributorType, DistributorType newDistributorType);
46
- event LogDistributionServiceReferralCreated(NftId distributionNftId, NftId distributorNftId, ReferralId referralId, string code);
46
+ event LogDistributionServiceReferralCreated(NftId distributionNftId, NftId distributorNftId, ReferralId referralId, string code, UFixed discountPercentage, uint32 maxReferrals, Timestamp expiryAt);
47
47
  event LogDistributionServiceReferralProcessed(NftId distributionNftId, NftId distributorNftId, ReferralId referralId, uint32 usedReferrals);
48
- event LogDistributionServiceSaleProcessed(NftId distributionNftId, ReferralId referralId);
48
+ event LogDistributionServiceSaleProcessed(NftId distributionNftId, ReferralId referralId, Amount premium, Amount distributionOwnerFee);
49
+ event LogDistributionServiceSaleProcessedWithReferral(NftId distributionNftId, NftId distributorNftId, ReferralId referralId, uint32 numPoliciesSold, Amount premium, Amount distributionOwnerFee, Amount commissionAmount);
49
50
 
50
51
  function createDistributorType(
51
52
  string memory name,
@@ -16,6 +16,7 @@ contract FirePool is
16
16
  BasicPool
17
17
  {
18
18
  constructor(
19
+ address registry,
19
20
  NftId fireProductNftId,
20
21
  string memory componentName,
21
22
  IAuthorization authorization
@@ -23,6 +24,7 @@ contract FirePool is
23
24
  {
24
25
  address initialOwner = msg.sender;
25
26
  _intialize(
27
+ registry,
26
28
  fireProductNftId,
27
29
  componentName,
28
30
  IComponents.PoolInfo({
@@ -39,6 +41,7 @@ contract FirePool is
39
41
  }
40
42
 
41
43
  function _intialize(
44
+ address registry,
42
45
  NftId fireProductNftId,
43
46
  string memory componentName,
44
47
  IComponents.PoolInfo memory poolInfo,
@@ -49,6 +52,7 @@ contract FirePool is
49
52
  initializer
50
53
  {
51
54
  _initializeBasicPool(
55
+ registry,
52
56
  fireProductNftId,
53
57
  componentName,
54
58
  poolInfo,
@@ -65,6 +65,7 @@ contract FireProduct is
65
65
  mapping(uint256 fireId => mapping (NftId policyId => bool claimed)) private _claimed;
66
66
 
67
67
  constructor(
68
+ address registry,
68
69
  NftId instanceNftid,
69
70
  string memory componentName,
70
71
  IAuthorization authorization
@@ -73,6 +74,7 @@ contract FireProduct is
73
74
  address initialOwner = msg.sender;
74
75
 
75
76
  _initialize(
77
+ registry,
76
78
  instanceNftid,
77
79
  componentName,
78
80
  authorization,
@@ -80,6 +82,7 @@ contract FireProduct is
80
82
  }
81
83
 
82
84
  function _initialize(
85
+ address registry,
83
86
  NftId instanceNftId,
84
87
  string memory componentName,
85
88
  IAuthorization authorization,
@@ -89,6 +92,7 @@ contract FireProduct is
89
92
  initializer
90
93
  {
91
94
  _initializeBasicProduct(
95
+ registry,
92
96
  instanceNftId,
93
97
  componentName,
94
98
  IComponents.ProductInfo({
@@ -11,6 +11,7 @@ import {InstanceReader} from "../../instance/InstanceReader.sol";
11
11
  import {NftId} from "../../type/NftId.sol";
12
12
  import {RequestId} from "../../type/RequestId.sol";
13
13
  import {RiskId, RiskIdLib} from "../../type/RiskId.sol";
14
+ import {Seconds} from "../../type/Seconds.sol";
14
15
  import {StateId} from "../../type/StateId.sol";
15
16
  import {Str} from "../../type/String.sol";
16
17
  import {Timestamp, TimestampLib} from "../../type/Timestamp.sol";
@@ -18,39 +19,30 @@ import {Timestamp, TimestampLib} from "../../type/Timestamp.sol";
18
19
 
19
20
  library FlightLib {
20
21
 
21
- function checkApplicationDataAndSignature(
22
+ event LogFlightProductErrorUnprocessableStatus(RequestId requestId, RiskId riskId, bytes1 status);
23
+ event LogFlightProductErrorUnexpectedStatus(RequestId requestId, RiskId riskId, bytes1 status, int256 delayMinutes);
24
+
25
+ error ErrorFlightProductRiskInvalid(RiskId riskId);
26
+ error ErrorFlightProductPremiumAmountTooSmall(Amount premiumAmount, Amount minPremium);
27
+ error ErrorFlightProductPremiumAmountTooLarge(Amount premiumAmount, Amount maxPremium);
28
+ error ErrorFlightProductArrivalBeforeDepartureTime(Timestamp departureTime, Timestamp arrivalTime);
29
+ error ErrorFlightProductArrivalAfterMaxFlightDuration(Timestamp arrivalTime, Timestamp maxArrivalTime, Seconds maxDuration);
30
+ error ErrorFlightProductDepartureBeforeMinTimeBeforeDeparture(Timestamp departureTime, Timestamp now, Seconds minTimeBeforeDeparture);
31
+ error ErrorFlightProductDepartureAfterMaxTimeBeforeDeparture(Timestamp departureTime, Timestamp now, Seconds maxTimeBeforeDeparture);
32
+ error ErrorFlightProductNotEnoughObservations(uint256 observations, uint256 minObservations);
33
+ error ErrorFlightProductClusterRisk(Amount totalSumInsured, Amount maxTotalPayout);
34
+
35
+ function checkApplicationData(
22
36
  FlightProduct flightProduct,
23
37
  Str flightData,
24
38
  Timestamp departureTime,
25
39
  Timestamp arrivalTime,
26
- Amount premiumAmount,
27
- uint256[6] memory statistics
28
- // signature fields
29
- // uint8 v,
30
- // bytes32 r,
31
- // bytes32 s
40
+ Amount premiumAmount
32
41
  )
33
42
  public
34
43
  view
35
44
  {
36
45
  _checkApplicationData(flightProduct, premiumAmount, arrivalTime, departureTime);
37
-
38
- // (
39
- // address actualSigner,,
40
- // bool success
41
- // ) = flightProduct.getFlightMessageVerifier().verifyRatingsHash(
42
- // flightData,
43
- // departureTime,
44
- // arrivalTime,
45
- // premiumAmount,
46
- // statistics,
47
- // v, r, s);
48
-
49
- // if (!success) {
50
- // revert FlightProduct.ErrorApplicationDataSignatureMismatch(
51
- // flightProduct.getFlightMessageVerifier().getExpectedSigner(),
52
- // actualSigner);
53
- // }
54
46
  }
55
47
 
56
48
 
@@ -63,67 +55,49 @@ library FlightLib {
63
55
  internal
64
56
  view
65
57
  {
58
+ bool testMode = flightProduct.isTestMode();
59
+
66
60
  // solhint-disable
67
61
  if (premiumAmount < flightProduct.MIN_PREMIUM()) {
68
- revert FlightProduct.ErrorFlightProductPremiumAmountTooSmall(premiumAmount, flightProduct.MIN_PREMIUM());
62
+ revert ErrorFlightProductPremiumAmountTooSmall(premiumAmount, flightProduct.MIN_PREMIUM());
69
63
  }
70
64
  if (premiumAmount > flightProduct.MAX_PREMIUM()) {
71
- revert FlightProduct.ErrorFlightProductPremiumAmountTooLarge(premiumAmount, flightProduct.MAX_PREMIUM());
65
+ revert ErrorFlightProductPremiumAmountTooLarge(premiumAmount, flightProduct.MAX_PREMIUM());
72
66
  }
73
67
  if (arrivalTime <= departureTime) {
74
- revert FlightProduct.ErrorFlightProductArrivalBeforeDepartureTime(departureTime, arrivalTime);
68
+ revert ErrorFlightProductArrivalBeforeDepartureTime(departureTime, arrivalTime);
75
69
  }
76
-
77
70
  if (arrivalTime > departureTime.addSeconds(flightProduct.MAX_FLIGHT_DURATION())) {
78
- revert FlightProduct.ErrorFlightProductArrivalAfterMaxFlightDuration(arrivalTime, departureTime, flightProduct.MAX_FLIGHT_DURATION());
71
+ revert ErrorFlightProductArrivalAfterMaxFlightDuration(arrivalTime, departureTime, flightProduct.MAX_FLIGHT_DURATION());
79
72
  }
80
- if (departureTime < TimestampLib.current().addSeconds(flightProduct.MIN_TIME_BEFORE_DEPARTURE())) {
81
- revert FlightProduct.ErrorFlightProductDepartureBeforeMinTimeBeforeDeparture(departureTime, TimestampLib.current(), flightProduct.MIN_TIME_BEFORE_DEPARTURE());
73
+
74
+ // test mode allows the creation for policies that are outside restricted policy creation times
75
+ if (!testMode && departureTime < TimestampLib.current().addSeconds(flightProduct.MIN_TIME_BEFORE_DEPARTURE())) {
76
+ revert ErrorFlightProductDepartureBeforeMinTimeBeforeDeparture(departureTime, TimestampLib.current(), flightProduct.MIN_TIME_BEFORE_DEPARTURE());
82
77
  }
83
- if (departureTime > TimestampLib.current().addSeconds(flightProduct.MAX_TIME_BEFORE_DEPARTURE())) {
84
- revert FlightProduct.ErrorFlightProductDepartureAfterMaxTimeBeforeDeparture(departureTime, TimestampLib.current(), flightProduct.MAX_TIME_BEFORE_DEPARTURE());
78
+ if (!testMode && departureTime > TimestampLib.current().addSeconds(flightProduct.MAX_TIME_BEFORE_DEPARTURE())) {
79
+ revert ErrorFlightProductDepartureAfterMaxTimeBeforeDeparture(departureTime, TimestampLib.current(), flightProduct.MAX_TIME_BEFORE_DEPARTURE());
85
80
  }
86
81
  // solhint-enable
87
82
  }
88
83
 
89
84
 
90
- // TODO fix or cleanup
91
- // function checkApplication(
92
- // FlightProduct flightProduct,
93
- // Str carrierFlightNumber,
94
- // Timestamp departureTime,
95
- // Timestamp arrivalTime,
96
- // Amount premium
97
- // )
98
- // external
99
- // view
100
- // returns (uint256 errors)
101
- // {
102
- // // Validate input parameters
103
- // if (premium < flightProduct.MIN_PREMIUM()) { errors = errors | (uint256(1) << 0); }
104
- // if (premium > flightProduct.MAX_PREMIUM()) { errors = errors | (uint256(1) << 1); }
105
- // if (arrivalTime < departureTime) { errors = errors | (uint256(1) << 2); }
106
- // if (arrivalTime > departureTime.addSeconds(flightProduct.MAX_FLIGHT_DURATION())) { errors = errors | (uint256(1) << 3); }
107
- // if (departureTime < TimestampLib.current().addSeconds(flightProduct.MIN_TIME_BEFORE_DEPARTURE())) { errors = errors | (uint256(1) << 4); }
108
- // if (departureTime > TimestampLib.current().addSeconds(flightProduct.MAX_TIME_BEFORE_DEPARTURE())) { errors = errors | (uint256(1) << 5); }
109
-
110
- // (, bool exists, FlightProduct.FlightRisk memory flightRisk) = getFlightRisk(
111
- // flightProduct.getInstanceReader(), flightProduct.getNftId(), carrierFlightNumber, departureTime, arrivalTime);
112
-
113
- // if (exists) {
114
- // Amount sumInsured = AmountLib.toAmount(premium.toInt() * flightRisk.premiumMultiplier);
115
- // if (flightRisk.sumOfSumInsuredAmounts + sumInsured > flightProduct.MAX_TOTAL_PAYOUT()) {
116
- // errors = errors | (uint256(1) << 6);
117
- // }
118
- // }
119
-
120
- // return errors;
121
- // }
85
+ function checkClusterRisk(
86
+ Amount sumOfSumInsuredAmounts,
87
+ Amount sumInsuredAmount,
88
+ Amount maxTotalPayout
89
+ )
90
+ public
91
+ pure
92
+ {
93
+ if (sumOfSumInsuredAmounts + sumInsuredAmount > maxTotalPayout) {
94
+ revert ErrorFlightProductClusterRisk(sumOfSumInsuredAmounts + sumInsuredAmount, maxTotalPayout);
95
+ }
96
+ }
122
97
 
123
98
 
124
99
  /// @dev calculates payout option based on flight status and delay minutes.
125
100
  /// Is not a view function as it emits log evens in case of unexpected status.
126
- // TODO decide if reverts instead of log events could work too (and convert the function into a view function)
127
101
  function checkAndGetPayoutOption(
128
102
  RequestId requestId,
129
103
  RiskId riskId,
@@ -138,13 +112,13 @@ library FlightLib {
138
112
 
139
113
  // check status
140
114
  if (status != "L" && status != "A" && status != "C" && status != "D") {
141
- emit FlightProduct.LogErrorUnprocessableStatus(requestId, riskId, status);
115
+ emit LogFlightProductErrorUnprocessableStatus(requestId, riskId, status);
142
116
  return payoutOption;
143
117
  }
144
118
 
145
119
  if (status == "A") {
146
120
  // todo: active, reschedule oracle call + 45 min
147
- emit FlightProduct.LogErrorUnexpectedStatus(requestId, riskId, status, delayMinutes);
121
+ emit LogFlightProductErrorUnexpectedStatus(requestId, riskId, status, delayMinutes);
148
122
  return payoutOption;
149
123
  }
150
124
 
@@ -167,7 +141,7 @@ library FlightLib {
167
141
  {
168
142
  // check we have enough observations
169
143
  if (statistics[0] < flightProduct.MIN_OBSERVATIONS()) {
170
- revert FlightProduct.ErrorFlightProductNotEnoughObservations(statistics[0], flightProduct.MIN_OBSERVATIONS());
144
+ revert ErrorFlightProductNotEnoughObservations(statistics[0], flightProduct.MIN_OBSERVATIONS());
171
145
  }
172
146
 
173
147
  weight = 0;
@@ -200,10 +174,10 @@ library FlightLib {
200
174
  )
201
175
  {
202
176
  if (premium < flightProduct.MIN_PREMIUM()) {
203
- revert FlightProduct.ErrorFlightProductPremiumAmountTooSmall(premium, flightProduct.MIN_PREMIUM());
177
+ revert ErrorFlightProductPremiumAmountTooSmall(premium, flightProduct.MIN_PREMIUM());
204
178
  }
205
179
  if (premium > flightProduct.MAX_PREMIUM()) {
206
- revert FlightProduct.ErrorFlightProductPremiumAmountTooLarge(premium, flightProduct.MAX_PREMIUM());
180
+ revert ErrorFlightProductPremiumAmountTooLarge(premium, flightProduct.MAX_PREMIUM());
207
181
  }
208
182
 
209
183
  sumInsuredAmount = AmountLib.zero();
@@ -222,13 +196,43 @@ library FlightLib {
222
196
  }
223
197
 
224
198
 
199
+ function getPayoutOption(
200
+ InstanceReader reader,
201
+ NftId productNftId,
202
+ RiskId riskId
203
+ )
204
+ public
205
+ view
206
+ returns (
207
+ bool exists,
208
+ bool statusAvailable,
209
+ uint8 payoutOption
210
+ )
211
+ {
212
+ FlightProduct.FlightRisk memory flightRisk;
213
+ (exists, flightRisk) = getFlightRisk(
214
+ reader,
215
+ productNftId,
216
+ riskId,
217
+ false);
218
+
219
+ statusAvailable = flightRisk.statusUpdatedAt.gtz();
220
+ payoutOption = flightRisk.payoutOption;
221
+ }
222
+
223
+
225
224
  function getPayoutAmount(
226
225
  bytes memory applicationData,
227
226
  uint8 payoutOption
228
227
  )
229
228
  public
229
+ pure
230
230
  returns (Amount payoutAmount)
231
231
  {
232
+ if (payoutOption == type(uint8).max) {
233
+ return AmountLib.zero();
234
+ }
235
+
232
236
  // retrieve payout amounts from application data
233
237
  (, Amount[5] memory payoutAmounts) = abi.decode(
234
238
  applicationData, (Amount, Amount[5]));
@@ -243,7 +247,9 @@ library FlightLib {
243
247
  NftId productNftId,
244
248
  Str flightData,
245
249
  Timestamp departureTime,
246
- Timestamp arrivalTime
250
+ string memory departureTimeLocal,
251
+ Timestamp arrivalTime,
252
+ string memory arrivalTimeLocal
247
253
  )
248
254
  public
249
255
  view
@@ -254,17 +260,21 @@ library FlightLib {
254
260
  )
255
261
  {
256
262
  riskId = getRiskId(productNftId, flightData);
257
- (exists, flightRisk) = getFlightRisk(reader, productNftId, riskId);
263
+ (exists, flightRisk) = getFlightRisk(reader, productNftId, riskId, false);
258
264
 
259
265
  // create new risk if not existing
260
266
  if (!exists) {
261
267
  flightRisk = FlightProduct.FlightRisk({
262
268
  flightData: flightData,
263
269
  departureTime: departureTime,
270
+ departureTimeLocal: departureTimeLocal,
264
271
  arrivalTime: arrivalTime,
272
+ arrivalTimeLocal: arrivalTimeLocal,
265
273
  sumOfSumInsuredAmounts: AmountLib.toAmount(0),
266
274
  status: bytes1(0),
267
- delayMinutes: 0});
275
+ delayMinutes: 0,
276
+ payoutOption: uint8(0),
277
+ statusUpdatedAt: TimestampLib.zero()});
268
278
  }
269
279
  }
270
280
 
@@ -272,7 +282,8 @@ library FlightLib {
272
282
  function getFlightRisk(
273
283
  InstanceReader reader,
274
284
  NftId productNftId,
275
- RiskId riskId
285
+ RiskId riskId,
286
+ bool requireRiskExists
276
287
  )
277
288
  public
278
289
  view
@@ -284,6 +295,10 @@ library FlightLib {
284
295
  // check if risk exists
285
296
  exists = reader.isProductRisk(productNftId, riskId);
286
297
 
298
+ if (!exists && requireRiskExists) {
299
+ revert ErrorFlightProductRiskInvalid(riskId);
300
+ }
301
+
287
302
  // get risk data if risk exists
288
303
  if (exists) {
289
304
  flightRisk = abi.decode(