@etherisc/gif-next 0.0.2-f78c672-338 → 0.0.2-f78f882-351

Sign up to get free protection for your applications and to get access to all the features.
Files changed (478) hide show
  1. package/README.md +63 -312
  2. package/artifacts/contracts/accounting/AccountingService.sol/AccountingService.dbg.json +1 -1
  3. package/artifacts/contracts/accounting/AccountingService.sol/AccountingService.json +106 -38
  4. package/artifacts/contracts/accounting/AccountingServiceManager.sol/AccountingServiceManager.dbg.json +1 -1
  5. package/artifacts/contracts/accounting/AccountingServiceManager.sol/AccountingServiceManager.json +111 -45
  6. package/artifacts/contracts/accounting/IAccountingService.sol/IAccountingService.dbg.json +1 -1
  7. package/artifacts/contracts/accounting/IAccountingService.sol/IAccountingService.json +58 -6
  8. package/artifacts/contracts/authorization/AccessAdmin.sol/AccessAdmin.dbg.json +1 -1
  9. package/artifacts/contracts/authorization/AccessAdmin.sol/AccessAdmin.json +655 -299
  10. package/artifacts/contracts/authorization/AccessAdminLib.sol/AccessAdminLib.dbg.json +4 -0
  11. package/artifacts/contracts/authorization/AccessAdminLib.sol/AccessAdminLib.json +2008 -0
  12. package/artifacts/contracts/authorization/AccessManagerCloneable.sol/AccessManagerCloneable.dbg.json +1 -1
  13. package/artifacts/contracts/authorization/AccessManagerCloneable.sol/AccessManagerCloneable.json +8 -39
  14. package/artifacts/contracts/authorization/Authorization.sol/Authorization.dbg.json +1 -1
  15. package/artifacts/contracts/authorization/Authorization.sol/Authorization.json +331 -56
  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 +501 -231
  19. package/artifacts/contracts/authorization/IAuthorization.sol/IAuthorization.dbg.json +1 -1
  20. package/artifacts/contracts/authorization/IAuthorization.sol/IAuthorization.json +131 -16
  21. package/artifacts/contracts/authorization/IServiceAuthorization.sol/IServiceAuthorization.dbg.json +1 -1
  22. package/artifacts/contracts/authorization/IServiceAuthorization.sol/IServiceAuthorization.json +256 -16
  23. package/artifacts/contracts/authorization/ServiceAuthorization.sol/ServiceAuthorization.dbg.json +1 -1
  24. package/artifacts/contracts/authorization/ServiceAuthorization.sol/ServiceAuthorization.json +426 -27
  25. package/artifacts/contracts/distribution/BasicDistribution.sol/BasicDistribution.dbg.json +1 -1
  26. package/artifacts/contracts/distribution/BasicDistribution.sol/BasicDistribution.json +63 -59
  27. package/artifacts/contracts/distribution/BasicDistributionAuthorization.sol/BasicDistributionAuthorization.dbg.json +1 -1
  28. package/artifacts/contracts/distribution/BasicDistributionAuthorization.sol/BasicDistributionAuthorization.json +322 -67
  29. package/artifacts/contracts/distribution/Distribution.sol/Distribution.dbg.json +1 -1
  30. package/artifacts/contracts/distribution/Distribution.sol/Distribution.json +21 -33
  31. package/artifacts/contracts/distribution/DistributionService.sol/DistributionService.dbg.json +1 -1
  32. package/artifacts/contracts/distribution/DistributionService.sol/DistributionService.json +379 -150
  33. package/artifacts/contracts/distribution/DistributionServiceManager.sol/DistributionServiceManager.dbg.json +1 -1
  34. package/artifacts/contracts/distribution/DistributionServiceManager.sol/DistributionServiceManager.json +160 -78
  35. package/artifacts/contracts/distribution/IDistributionComponent.sol/IDistributionComponent.dbg.json +1 -1
  36. package/artifacts/contracts/distribution/IDistributionComponent.sol/IDistributionComponent.json +20 -32
  37. package/artifacts/contracts/distribution/IDistributionService.sol/IDistributionService.dbg.json +1 -1
  38. package/artifacts/contracts/distribution/IDistributionService.sol/IDistributionService.json +233 -20
  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 +109 -110
  42. package/artifacts/contracts/examples/fire/FirePoolAuthorization.sol/FirePoolAuthorization.dbg.json +1 -1
  43. package/artifacts/contracts/examples/fire/FirePoolAuthorization.sol/FirePoolAuthorization.json +321 -66
  44. package/artifacts/contracts/examples/fire/FireProduct.sol/FireProduct.dbg.json +1 -1
  45. package/artifacts/contracts/examples/fire/FireProduct.sol/FireProduct.json +145 -134
  46. package/artifacts/contracts/examples/fire/FireProductAuthorization.sol/FireProductAuthorization.dbg.json +1 -1
  47. package/artifacts/contracts/examples/fire/FireProductAuthorization.sol/FireProductAuthorization.json +321 -66
  48. package/artifacts/contracts/examples/fire/FireUSD.sol/FireUSD.dbg.json +1 -1
  49. package/artifacts/contracts/examples/unpermissioned/SimpleDistribution.sol/SimpleDistribution.dbg.json +1 -1
  50. package/artifacts/contracts/examples/unpermissioned/SimpleDistribution.sol/SimpleDistribution.json +82 -84
  51. package/artifacts/contracts/examples/unpermissioned/SimpleDistributionAuthorization.sol/SimpleDistributionAuthorization.dbg.json +1 -1
  52. package/artifacts/contracts/examples/unpermissioned/SimpleDistributionAuthorization.sol/SimpleDistributionAuthorization.json +321 -66
  53. package/artifacts/contracts/examples/unpermissioned/SimpleOracle.sol/SimpleOracle.dbg.json +1 -1
  54. package/artifacts/contracts/examples/unpermissioned/SimpleOracle.sol/SimpleOracle.json +39 -73
  55. package/artifacts/contracts/examples/unpermissioned/SimplePool.sol/SimplePool.dbg.json +1 -1
  56. package/artifacts/contracts/examples/unpermissioned/SimplePool.sol/SimplePool.json +130 -148
  57. package/artifacts/contracts/examples/unpermissioned/SimplePoolAuthorization.sol/SimplePoolAuthorization.dbg.json +1 -1
  58. package/artifacts/contracts/examples/unpermissioned/SimplePoolAuthorization.sol/SimplePoolAuthorization.json +321 -66
  59. package/artifacts/contracts/examples/unpermissioned/SimpleProduct.sol/SimpleProduct.dbg.json +1 -1
  60. package/artifacts/contracts/examples/unpermissioned/SimpleProduct.sol/SimpleProduct.json +333 -190
  61. package/artifacts/contracts/examples/unpermissioned/SimpleProductAuthorization.sol/SimpleProductAuthorization.dbg.json +1 -1
  62. package/artifacts/contracts/examples/unpermissioned/SimpleProductAuthorization.sol/SimpleProductAuthorization.json +321 -66
  63. package/artifacts/contracts/instance/BaseStore.sol/BaseStore.dbg.json +4 -0
  64. package/artifacts/contracts/{shared/IKeyValueStore.sol/IKeyValueStore.json → instance/BaseStore.sol/BaseStore.json} +51 -229
  65. package/artifacts/contracts/instance/BundleSet.sol/BundleSet.dbg.json +1 -1
  66. package/artifacts/contracts/instance/BundleSet.sol/BundleSet.json +2 -2
  67. package/artifacts/contracts/instance/IBaseStore.sol/IBaseStore.dbg.json +4 -0
  68. package/artifacts/contracts/instance/IBaseStore.sol/IBaseStore.json +304 -0
  69. package/artifacts/contracts/instance/IInstance.sol/IInstance.dbg.json +1 -1
  70. package/artifacts/contracts/instance/IInstance.sol/IInstance.json +450 -28
  71. package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.dbg.json +1 -1
  72. package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.json +355 -12
  73. package/artifacts/contracts/instance/Instance.sol/Instance.dbg.json +1 -1
  74. package/artifacts/contracts/instance/Instance.sol/Instance.json +488 -85
  75. package/artifacts/contracts/instance/InstanceAdmin.sol/InstanceAdmin.dbg.json +1 -1
  76. package/artifacts/contracts/instance/InstanceAdmin.sol/InstanceAdmin.json +942 -471
  77. package/artifacts/contracts/instance/InstanceAuthorizationV3.sol/InstanceAuthorizationV3.dbg.json +1 -1
  78. package/artifacts/contracts/instance/InstanceAuthorizationV3.sol/InstanceAuthorizationV3.json +289 -78
  79. package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.dbg.json +1 -1
  80. package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.json +595 -532
  81. package/artifacts/contracts/instance/InstanceService.sol/InstanceService.dbg.json +1 -1
  82. package/artifacts/contracts/instance/InstanceService.sol/InstanceService.json +387 -64
  83. package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.dbg.json +1 -1
  84. package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.json +100 -52
  85. package/artifacts/contracts/instance/InstanceStore.sol/InstanceStore.dbg.json +1 -1
  86. package/artifacts/contracts/instance/InstanceStore.sol/InstanceStore.json +1316 -2015
  87. package/artifacts/contracts/instance/ProductStore.sol/ProductStore.dbg.json +4 -0
  88. package/artifacts/contracts/instance/ProductStore.sol/ProductStore.json +3427 -0
  89. package/artifacts/contracts/instance/RiskSet.sol/RiskSet.dbg.json +1 -1
  90. package/artifacts/contracts/instance/RiskSet.sol/RiskSet.json +101 -88
  91. package/artifacts/contracts/instance/base/BalanceStore.sol/BalanceStore.dbg.json +1 -1
  92. package/artifacts/contracts/instance/base/BalanceStore.sol/BalanceStore.json +8 -8
  93. package/artifacts/contracts/instance/base/Cloneable.sol/Cloneable.dbg.json +1 -1
  94. package/artifacts/contracts/instance/base/ObjectCounter.sol/ObjectCounter.dbg.json +1 -1
  95. package/artifacts/contracts/instance/base/ObjectCounter.sol/ObjectCounter.json +2 -2
  96. package/artifacts/contracts/instance/base/ObjectLifecycle.sol/ObjectLifecycle.dbg.json +1 -1
  97. package/artifacts/contracts/instance/base/ObjectLifecycle.sol/ObjectLifecycle.json +2 -2
  98. package/artifacts/contracts/instance/base/ObjectSet.sol/ObjectSet.dbg.json +1 -1
  99. package/artifacts/contracts/instance/base/ObjectSet.sol/ObjectSet.json +2 -2
  100. package/artifacts/contracts/instance/base/ObjectSetHelperLib.sol/ObjectSetHelperLib.dbg.json +1 -1
  101. package/artifacts/contracts/instance/base/ObjectSetHelperLib.sol/ObjectSetHelperLib.json +20 -20
  102. package/artifacts/contracts/instance/module/IBundle.sol/IBundle.dbg.json +1 -1
  103. package/artifacts/contracts/instance/module/IComponents.sol/IComponents.dbg.json +1 -1
  104. package/artifacts/contracts/instance/module/IDistribution.sol/IDistribution.dbg.json +1 -1
  105. package/artifacts/contracts/instance/module/IPolicy.sol/IPolicy.dbg.json +1 -1
  106. package/artifacts/contracts/instance/module/IRisk.sol/IRisk.dbg.json +1 -1
  107. package/artifacts/contracts/mock/Dip.sol/Dip.dbg.json +1 -1
  108. package/artifacts/contracts/oracle/BasicOracle.sol/BasicOracle.dbg.json +1 -1
  109. package/artifacts/contracts/oracle/BasicOracle.sol/BasicOracle.json +33 -45
  110. package/artifacts/contracts/oracle/BasicOracleAuthorization.sol/BasicOracleAuthorization.dbg.json +1 -1
  111. package/artifacts/contracts/oracle/BasicOracleAuthorization.sol/BasicOracleAuthorization.json +340 -60
  112. package/artifacts/contracts/oracle/IOracle.sol/IOracle.dbg.json +1 -1
  113. package/artifacts/contracts/oracle/IOracleComponent.sol/IOracleComponent.dbg.json +1 -1
  114. package/artifacts/contracts/oracle/IOracleComponent.sol/IOracleComponent.json +19 -31
  115. package/artifacts/contracts/oracle/IOracleService.sol/IOracleService.dbg.json +1 -1
  116. package/artifacts/contracts/oracle/IOracleService.sol/IOracleService.json +29 -0
  117. package/artifacts/contracts/oracle/Oracle.sol/Oracle.dbg.json +1 -1
  118. package/artifacts/contracts/oracle/Oracle.sol/Oracle.json +19 -31
  119. package/artifacts/contracts/oracle/OracleService.sol/OracleService.dbg.json +1 -1
  120. package/artifacts/contracts/oracle/OracleService.sol/OracleService.json +87 -42
  121. package/artifacts/contracts/oracle/OracleServiceManager.sol/OracleServiceManager.dbg.json +1 -1
  122. package/artifacts/contracts/oracle/OracleServiceManager.sol/OracleServiceManager.json +116 -50
  123. package/artifacts/contracts/pool/BasicPool.sol/BasicPool.dbg.json +1 -1
  124. package/artifacts/contracts/pool/BasicPool.sol/BasicPool.json +59 -79
  125. package/artifacts/contracts/pool/BasicPoolAuthorization.sol/BasicPoolAuthorization.dbg.json +1 -1
  126. package/artifacts/contracts/pool/BasicPoolAuthorization.sol/BasicPoolAuthorization.json +321 -66
  127. package/artifacts/contracts/pool/BundleService.sol/BundleService.dbg.json +1 -1
  128. package/artifacts/contracts/pool/BundleService.sol/BundleService.json +300 -123
  129. package/artifacts/contracts/pool/BundleServiceManager.sol/BundleServiceManager.dbg.json +1 -1
  130. package/artifacts/contracts/pool/BundleServiceManager.sol/BundleServiceManager.json +144 -58
  131. package/artifacts/contracts/pool/IBundleService.sol/IBundleService.dbg.json +1 -1
  132. package/artifacts/contracts/pool/IBundleService.sol/IBundleService.json +186 -33
  133. package/artifacts/contracts/pool/IPoolComponent.sol/IPoolComponent.dbg.json +1 -1
  134. package/artifacts/contracts/pool/IPoolComponent.sol/IPoolComponent.json +29 -41
  135. package/artifacts/contracts/pool/IPoolService.sol/IPoolService.dbg.json +1 -1
  136. package/artifacts/contracts/pool/IPoolService.sol/IPoolService.json +238 -19
  137. package/artifacts/contracts/pool/Pool.sol/Pool.dbg.json +1 -1
  138. package/artifacts/contracts/pool/Pool.sol/Pool.json +29 -41
  139. package/artifacts/contracts/pool/PoolLib.sol/PoolLib.dbg.json +1 -1
  140. package/artifacts/contracts/pool/PoolLib.sol/PoolLib.json +100 -34
  141. package/artifacts/contracts/pool/PoolService.sol/PoolService.dbg.json +1 -1
  142. package/artifacts/contracts/pool/PoolService.sol/PoolService.json +346 -87
  143. package/artifacts/contracts/pool/PoolServiceManager.sol/PoolServiceManager.dbg.json +1 -1
  144. package/artifacts/contracts/pool/PoolServiceManager.sol/PoolServiceManager.json +141 -63
  145. package/artifacts/contracts/product/ApplicationService.sol/ApplicationService.dbg.json +1 -1
  146. package/artifacts/contracts/product/ApplicationService.sol/ApplicationService.json +218 -61
  147. package/artifacts/contracts/product/ApplicationServiceManager.sol/ApplicationServiceManager.dbg.json +1 -1
  148. package/artifacts/contracts/product/ApplicationServiceManager.sol/ApplicationServiceManager.json +113 -43
  149. package/artifacts/contracts/product/BasicProduct.sol/BasicProduct.dbg.json +1 -1
  150. package/artifacts/contracts/product/BasicProduct.sol/BasicProduct.json +46 -58
  151. package/artifacts/contracts/product/BasicProductAuthorization.sol/BasicProductAuthorization.dbg.json +1 -1
  152. package/artifacts/contracts/product/BasicProductAuthorization.sol/BasicProductAuthorization.json +321 -66
  153. package/artifacts/contracts/product/ClaimService.sol/ClaimService.dbg.json +1 -1
  154. package/artifacts/contracts/product/ClaimService.sol/ClaimService.json +142 -102
  155. package/artifacts/contracts/product/ClaimServiceManager.sol/ClaimServiceManager.dbg.json +1 -1
  156. package/artifacts/contracts/product/ClaimServiceManager.sol/ClaimServiceManager.json +128 -70
  157. package/artifacts/contracts/product/IApplicationService.sol/IApplicationService.dbg.json +1 -1
  158. package/artifacts/contracts/product/IApplicationService.sol/IApplicationService.json +166 -1
  159. package/artifacts/contracts/product/IClaimService.sol/IClaimService.dbg.json +1 -1
  160. package/artifacts/contracts/product/IClaimService.sol/IClaimService.json +50 -10
  161. package/artifacts/contracts/product/IPolicyService.sol/IPolicyService.dbg.json +1 -1
  162. package/artifacts/contracts/product/IPolicyService.sol/IPolicyService.json +55 -0
  163. package/artifacts/contracts/product/IPricingService.sol/IPricingService.dbg.json +1 -1
  164. package/artifacts/contracts/product/IPricingService.sol/IPricingService.json +29 -0
  165. package/artifacts/contracts/product/IProductComponent.sol/IProductComponent.dbg.json +1 -1
  166. package/artifacts/contracts/product/IProductComponent.sol/IProductComponent.json +40 -52
  167. package/artifacts/contracts/product/IRiskService.sol/IRiskService.dbg.json +1 -1
  168. package/artifacts/contracts/product/IRiskService.sol/IRiskService.json +203 -18
  169. package/artifacts/contracts/product/PolicyService.sol/PolicyService.dbg.json +1 -1
  170. package/artifacts/contracts/product/PolicyService.sol/PolicyService.json +157 -86
  171. package/artifacts/contracts/product/PolicyServiceLib.sol/PolicyServiceLib.dbg.json +1 -1
  172. package/artifacts/contracts/product/PolicyServiceLib.sol/PolicyServiceLib.json +511 -21
  173. package/artifacts/contracts/product/PolicyServiceManager.sol/PolicyServiceManager.dbg.json +1 -1
  174. package/artifacts/contracts/product/PolicyServiceManager.sol/PolicyServiceManager.json +138 -72
  175. package/artifacts/contracts/product/PricingService.sol/PricingService.dbg.json +1 -1
  176. package/artifacts/contracts/product/PricingService.sol/PricingService.json +91 -118
  177. package/artifacts/contracts/product/PricingServiceManager.sol/PricingServiceManager.dbg.json +1 -1
  178. package/artifacts/contracts/product/PricingServiceManager.sol/PricingServiceManager.json +113 -67
  179. package/artifacts/contracts/product/Product.sol/Product.dbg.json +1 -1
  180. package/artifacts/contracts/product/Product.sol/Product.json +40 -52
  181. package/artifacts/contracts/product/RiskService.sol/RiskService.dbg.json +1 -1
  182. package/artifacts/contracts/product/RiskService.sol/RiskService.json +231 -46
  183. package/artifacts/contracts/product/RiskServiceManager.sol/RiskServiceManager.dbg.json +1 -1
  184. package/artifacts/contracts/product/RiskServiceManager.sol/RiskServiceManager.json +101 -43
  185. package/artifacts/contracts/registry/ChainNft.sol/ChainNft.dbg.json +1 -1
  186. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.dbg.json +1 -1
  187. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.json +33 -22
  188. package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.dbg.json +1 -1
  189. package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.json +29 -0
  190. package/artifacts/contracts/registry/IRelease.sol/IRelease.dbg.json +1 -1
  191. package/artifacts/contracts/registry/ITransferInterceptor.sol/ITransferInterceptor.dbg.json +1 -1
  192. package/artifacts/contracts/registry/Registry.sol/Registry.dbg.json +1 -1
  193. package/artifacts/contracts/registry/Registry.sol/Registry.json +71 -60
  194. package/artifacts/contracts/registry/RegistryAdmin.sol/RegistryAdmin.dbg.json +1 -1
  195. package/artifacts/contracts/registry/RegistryAdmin.sol/RegistryAdmin.json +799 -472
  196. package/artifacts/contracts/registry/RegistryAuthorization.sol/RegistryAuthorization.dbg.json +4 -0
  197. package/artifacts/contracts/registry/RegistryAuthorization.sol/RegistryAuthorization.json +1137 -0
  198. package/artifacts/contracts/registry/RegistryService.sol/RegistryService.dbg.json +1 -1
  199. package/artifacts/contracts/registry/RegistryService.sol/RegistryService.json +47 -18
  200. package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.dbg.json +1 -1
  201. package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.json +96 -38
  202. package/artifacts/contracts/registry/ReleaseAdmin.sol/ReleaseAdmin.dbg.json +1 -1
  203. package/artifacts/contracts/registry/ReleaseAdmin.sol/ReleaseAdmin.json +841 -419
  204. package/artifacts/contracts/registry/ReleaseLifecycle.sol/ReleaseLifecycle.dbg.json +1 -1
  205. package/artifacts/contracts/registry/ReleaseLifecycle.sol/ReleaseLifecycle.json +2 -2
  206. package/artifacts/contracts/registry/ReleaseRegistry.sol/ReleaseRegistry.dbg.json +1 -1
  207. package/artifacts/contracts/registry/ReleaseRegistry.sol/ReleaseRegistry.json +197 -129
  208. package/artifacts/contracts/registry/ServiceAuthorizationV3.sol/ServiceAuthorizationV3.dbg.json +1 -1
  209. package/artifacts/contracts/registry/ServiceAuthorizationV3.sol/ServiceAuthorizationV3.json +459 -26
  210. package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.dbg.json +1 -1
  211. package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.json +119 -59
  212. package/artifacts/contracts/shared/Component.sol/Component.dbg.json +1 -1
  213. package/artifacts/contracts/shared/Component.sol/Component.json +19 -31
  214. package/artifacts/contracts/shared/ComponentService.sol/ComponentService.dbg.json +1 -1
  215. package/artifacts/contracts/shared/ComponentService.sol/ComponentService.json +212 -232
  216. package/artifacts/contracts/shared/ComponentServiceManager.sol/ComponentServiceManager.dbg.json +1 -1
  217. package/artifacts/contracts/shared/ComponentServiceManager.sol/ComponentServiceManager.json +133 -71
  218. package/artifacts/contracts/shared/ContractLib.sol/ContractLib.dbg.json +1 -1
  219. package/artifacts/contracts/shared/ContractLib.sol/ContractLib.json +130 -39
  220. package/artifacts/contracts/shared/ContractLib.sol/IInstanceAdminHelper.dbg.json +1 -1
  221. package/artifacts/contracts/shared/ContractLib.sol/ITargetHelper.dbg.json +1 -1
  222. package/artifacts/contracts/shared/ContractLib.sol/ITokenRegistryHelper.dbg.json +1 -1
  223. package/artifacts/contracts/shared/ContractLib.sol/ITokenRegistryHelper.json +2 -2
  224. package/artifacts/contracts/shared/IComponent.sol/IComponent.dbg.json +1 -1
  225. package/artifacts/contracts/shared/IComponent.sol/IComponent.json +19 -31
  226. package/artifacts/contracts/shared/IComponentService.sol/IComponentService.dbg.json +1 -1
  227. package/artifacts/contracts/shared/IComponentService.sol/IComponentService.json +119 -147
  228. package/artifacts/contracts/shared/IInstanceLinkedComponent.sol/IInstanceLinkedComponent.dbg.json +1 -1
  229. package/artifacts/contracts/shared/IInstanceLinkedComponent.sol/IInstanceLinkedComponent.json +19 -31
  230. package/artifacts/contracts/shared/ILifecycle.sol/ILifecycle.dbg.json +1 -1
  231. package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.dbg.json +1 -1
  232. package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.json +19 -0
  233. package/artifacts/contracts/shared/IPolicyHolder.sol/IPolicyHolder.dbg.json +1 -1
  234. package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.dbg.json +1 -1
  235. package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.json +19 -0
  236. package/artifacts/contracts/shared/IRegistryLinked.sol/IRegistryLinked.dbg.json +1 -1
  237. package/artifacts/contracts/shared/IService.sol/IService.dbg.json +1 -1
  238. package/artifacts/contracts/shared/IService.sol/IService.json +29 -0
  239. package/artifacts/contracts/shared/InitializableERC165.sol/InitializableERC165.dbg.json +1 -1
  240. package/artifacts/contracts/shared/InitializableERC165.sol/InitializableERC165.json +2 -2
  241. package/artifacts/contracts/shared/InstanceLinkedComponent.sol/InstanceLinkedComponent.dbg.json +1 -1
  242. package/artifacts/contracts/shared/InstanceLinkedComponent.sol/InstanceLinkedComponent.json +19 -31
  243. package/artifacts/contracts/shared/Lifecycle.sol/Lifecycle.dbg.json +1 -1
  244. package/artifacts/contracts/shared/NftIdSet.sol/NftIdSet.dbg.json +1 -1
  245. package/artifacts/contracts/shared/NftIdSet.sol/NftIdSet.json +2 -2
  246. package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.dbg.json +1 -1
  247. package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.json +21 -2
  248. package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.dbg.json +1 -1
  249. package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.json +2 -2
  250. package/artifacts/contracts/shared/Registerable.sol/Registerable.dbg.json +1 -1
  251. package/artifacts/contracts/shared/Registerable.sol/Registerable.json +19 -0
  252. package/artifacts/contracts/shared/RegistryLinked.sol/RegistryLinked.dbg.json +1 -1
  253. package/artifacts/contracts/shared/RegistryLinked.sol/RegistryLinked.json +2 -2
  254. package/artifacts/contracts/shared/Service.sol/Service.dbg.json +1 -1
  255. package/artifacts/contracts/shared/Service.sol/Service.json +29 -0
  256. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.dbg.json +1 -1
  257. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.json +2 -2
  258. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandlerBase.dbg.json +1 -1
  259. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandlerBase.json +2 -2
  260. package/artifacts/contracts/shared/TokenHandlerDeployerLib.sol/TokenHandlerDeployerLib.dbg.json +1 -1
  261. package/artifacts/contracts/shared/TokenHandlerDeployerLib.sol/TokenHandlerDeployerLib.json +2 -2
  262. package/artifacts/contracts/staking/IStaking.sol/IStaking.dbg.json +1 -1
  263. package/artifacts/contracts/staking/IStaking.sol/IStaking.json +1453 -153
  264. package/artifacts/contracts/staking/IStakingService.sol/IStakingService.dbg.json +1 -1
  265. package/artifacts/contracts/staking/IStakingService.sol/IStakingService.json +161 -110
  266. package/artifacts/contracts/staking/ITargetLimitHandler.sol/ITargetLimitHandler.dbg.json +4 -0
  267. package/artifacts/contracts/staking/ITargetLimitHandler.sol/ITargetLimitHandler.json +50 -0
  268. package/artifacts/contracts/staking/Staking.sol/Staking.dbg.json +1 -1
  269. package/artifacts/contracts/staking/Staking.sol/Staking.json +1565 -239
  270. package/artifacts/contracts/staking/StakingLib.sol/StakingLib.dbg.json +4 -0
  271. package/artifacts/contracts/staking/StakingLib.sol/StakingLib.json +470 -0
  272. package/artifacts/contracts/staking/StakingManager.sol/StakingManager.dbg.json +1 -1
  273. package/artifacts/contracts/staking/StakingManager.sol/StakingManager.json +146 -67
  274. package/artifacts/contracts/staking/StakingReader.sol/StakingReader.dbg.json +1 -1
  275. package/artifacts/contracts/staking/StakingReader.sol/StakingReader.json +294 -177
  276. package/artifacts/contracts/staking/StakingService.sol/StakingService.dbg.json +1 -1
  277. package/artifacts/contracts/staking/StakingService.sol/StakingService.json +200 -157
  278. package/artifacts/contracts/staking/StakingServiceManager.sol/StakingServiceManager.dbg.json +1 -1
  279. package/artifacts/contracts/staking/StakingServiceManager.sol/StakingServiceManager.json +98 -44
  280. package/artifacts/contracts/staking/StakingStore.sol/StakingStore.dbg.json +1 -1
  281. package/artifacts/contracts/staking/StakingStore.sol/StakingStore.json +1633 -819
  282. package/artifacts/contracts/staking/TargetHandler.sol/TargetHandler.dbg.json +4 -0
  283. package/artifacts/contracts/staking/TargetHandler.sol/TargetHandler.json +309 -0
  284. package/artifacts/contracts/staking/TargetManagerLib.sol/TargetManagerLib.dbg.json +1 -1
  285. package/artifacts/contracts/staking/TargetManagerLib.sol/TargetManagerLib.json +159 -87
  286. package/artifacts/contracts/type/AddressSet.sol/LibAddressSet.dbg.json +1 -1
  287. package/artifacts/contracts/type/Amount.sol/AmountLib.dbg.json +1 -1
  288. package/artifacts/contracts/type/Amount.sol/AmountLib.json +10 -10
  289. package/artifacts/contracts/type/Blocknumber.sol/BlocknumberLib.dbg.json +1 -1
  290. package/artifacts/contracts/type/Blocknumber.sol/BlocknumberLib.json +64 -19
  291. package/artifacts/contracts/type/ChainId.sol/ChainIdLib.dbg.json +4 -0
  292. package/artifacts/contracts/type/ChainId.sol/ChainIdLib.json +193 -0
  293. package/artifacts/contracts/type/ClaimId.sol/ClaimIdLib.dbg.json +1 -1
  294. package/artifacts/contracts/type/ClaimId.sol/ClaimIdLib.json +2 -2
  295. package/artifacts/contracts/type/DistributorType.sol/DistributorTypeLib.dbg.json +1 -1
  296. package/artifacts/contracts/type/DistributorType.sol/DistributorTypeLib.json +2 -2
  297. package/artifacts/contracts/type/Fee.sol/FeeLib.dbg.json +1 -1
  298. package/artifacts/contracts/type/Fee.sol/FeeLib.json +93 -37
  299. package/artifacts/contracts/type/Key32.sol/Key32Lib.dbg.json +1 -1
  300. package/artifacts/contracts/type/Key32.sol/Key32Lib.json +2 -2
  301. package/artifacts/contracts/type/Key32Set.sol/LibKey32Set.dbg.json +1 -1
  302. package/artifacts/contracts/type/Key32Set.sol/LibKey32Set.json +2 -2
  303. package/artifacts/contracts/type/NftId.sol/NftIdLib.dbg.json +1 -1
  304. package/artifacts/contracts/type/NftId.sol/NftIdLib.json +2 -2
  305. package/artifacts/contracts/type/NftIdSet.sol/LibNftIdSet.dbg.json +1 -1
  306. package/artifacts/contracts/type/NftIdSet.sol/LibNftIdSet.json +2 -2
  307. package/artifacts/contracts/type/ObjectType.sol/ObjectTypeLib.dbg.json +1 -1
  308. package/artifacts/contracts/type/ObjectType.sol/ObjectTypeLib.json +33 -31
  309. package/artifacts/contracts/type/PayoutId.sol/PayoutIdLib.dbg.json +1 -1
  310. package/artifacts/contracts/type/PayoutId.sol/PayoutIdLib.json +2 -2
  311. package/artifacts/contracts/type/Referral.sol/ReferralLib.dbg.json +1 -1
  312. package/artifacts/contracts/type/Referral.sol/ReferralLib.json +2 -2
  313. package/artifacts/contracts/type/RequestId.sol/RequestIdLib.dbg.json +1 -1
  314. package/artifacts/contracts/type/RequestId.sol/RequestIdLib.json +2 -2
  315. package/artifacts/contracts/type/RiskId.sol/RiskIdLib.dbg.json +1 -1
  316. package/artifacts/contracts/type/RiskId.sol/RiskIdLib.json +2 -2
  317. package/artifacts/contracts/type/RoleId.sol/RoleIdLib.dbg.json +1 -1
  318. package/artifacts/contracts/type/RoleId.sol/RoleIdLib.json +39 -218
  319. package/artifacts/contracts/type/Seconds.sol/SecondsLib.dbg.json +1 -1
  320. package/artifacts/contracts/type/Seconds.sol/SecondsLib.json +45 -2
  321. package/artifacts/contracts/type/Selector.sol/SelectorLib.dbg.json +1 -1
  322. package/artifacts/contracts/type/Selector.sol/SelectorSetLib.dbg.json +1 -1
  323. package/artifacts/contracts/type/StateId.sol/StateIdLib.dbg.json +1 -1
  324. package/artifacts/contracts/type/String.sol/StrLib.dbg.json +1 -1
  325. package/artifacts/contracts/type/String.sol/StrLib.json +50 -2
  326. package/artifacts/contracts/type/Timestamp.sol/TimestampLib.dbg.json +1 -1
  327. package/artifacts/contracts/type/Timestamp.sol/TimestampLib.json +3 -3
  328. package/artifacts/contracts/type/UFixed.sol/UFixedLib.dbg.json +1 -1
  329. package/artifacts/contracts/type/UFixed.sol/UFixedLib.json +60 -36
  330. package/artifacts/contracts/type/Version.sol/VersionLib.dbg.json +1 -1
  331. package/artifacts/contracts/type/Version.sol/VersionLib.json +2 -2
  332. package/artifacts/contracts/type/Version.sol/VersionPartLib.dbg.json +1 -1
  333. package/artifacts/contracts/type/Version.sol/VersionPartLib.json +56 -2
  334. package/artifacts/contracts/upgradeability/IVersionable.sol/IVersionable.dbg.json +1 -1
  335. package/artifacts/contracts/upgradeability/IVersionable.sol/IVersionable.json +10 -0
  336. package/artifacts/contracts/upgradeability/ProxyManager.sol/ProxyManager.dbg.json +1 -1
  337. package/artifacts/contracts/upgradeability/ProxyManager.sol/ProxyManager.json +81 -27
  338. package/artifacts/contracts/upgradeability/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.dbg.json +1 -1
  339. package/artifacts/contracts/upgradeability/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.json +15 -2
  340. package/artifacts/contracts/upgradeability/Versionable.sol/Versionable.dbg.json +1 -1
  341. package/artifacts/contracts/upgradeability/Versionable.sol/Versionable.json +10 -0
  342. package/contracts/accounting/AccountingService.sol +15 -3
  343. package/contracts/accounting/IAccountingService.sol +4 -2
  344. package/contracts/authorization/AccessAdmin.sol +361 -371
  345. package/contracts/authorization/AccessAdminLib.sol +678 -0
  346. package/contracts/authorization/AccessManagerCloneable.sol +23 -32
  347. package/contracts/authorization/Authorization.sol +82 -229
  348. package/contracts/authorization/IAccess.sol +29 -12
  349. package/contracts/authorization/IAccessAdmin.sol +83 -84
  350. package/contracts/authorization/IAuthorization.sol +3 -51
  351. package/contracts/authorization/IServiceAuthorization.sol +55 -17
  352. package/contracts/authorization/ServiceAuthorization.sol +228 -34
  353. package/contracts/distribution/BasicDistribution.sol +5 -7
  354. package/contracts/distribution/BasicDistributionAuthorization.sol +11 -4
  355. package/contracts/distribution/Distribution.sol +12 -17
  356. package/contracts/distribution/DistributionService.sol +129 -66
  357. package/contracts/distribution/IDistributionComponent.sol +3 -1
  358. package/contracts/distribution/IDistributionService.sol +21 -9
  359. package/contracts/examples/fire/FirePool.sol +0 -4
  360. package/contracts/examples/fire/FireProduct.sol +6 -10
  361. package/contracts/examples/unpermissioned/SimpleDistribution.sol +4 -8
  362. package/contracts/examples/unpermissioned/SimpleOracle.sol +4 -8
  363. package/contracts/examples/unpermissioned/SimplePool.sol +0 -4
  364. package/contracts/examples/unpermissioned/SimpleProduct.sol +83 -23
  365. package/contracts/instance/BaseStore.sol +93 -0
  366. package/contracts/instance/IBaseStore.sol +37 -0
  367. package/contracts/instance/IInstance.sol +98 -12
  368. package/contracts/instance/IInstanceService.sol +54 -7
  369. package/contracts/instance/Instance.sol +165 -61
  370. package/contracts/instance/InstanceAdmin.sol +183 -313
  371. package/contracts/instance/InstanceAuthorizationV3.sol +123 -61
  372. package/contracts/instance/InstanceReader.sol +350 -394
  373. package/contracts/instance/InstanceService.sol +283 -173
  374. package/contracts/instance/InstanceStore.sol +153 -128
  375. package/contracts/instance/ProductStore.sol +290 -0
  376. package/contracts/instance/RiskSet.sol +10 -2
  377. package/contracts/instance/TargetNames.sol +10 -0
  378. package/contracts/instance/base/BalanceStore.sol +4 -6
  379. package/contracts/instance/base/ObjectLifecycle.sol +2 -6
  380. package/contracts/instance/module/IBundle.sol +6 -5
  381. package/contracts/instance/module/IComponents.sol +15 -6
  382. package/contracts/instance/module/IDistribution.sol +17 -7
  383. package/contracts/instance/module/IPolicy.sol +28 -8
  384. package/contracts/instance/module/IRisk.sol +2 -0
  385. package/contracts/oracle/BasicOracle.sol +3 -6
  386. package/contracts/oracle/BasicOracleAuthorization.sol +18 -2
  387. package/contracts/oracle/IOracle.sol +9 -4
  388. package/contracts/oracle/Oracle.sol +4 -8
  389. package/contracts/oracle/OracleService.sol +8 -8
  390. package/contracts/pool/BasicPool.sol +4 -18
  391. package/contracts/pool/BasicPoolAuthorization.sol +10 -5
  392. package/contracts/pool/BundleService.sol +34 -43
  393. package/contracts/pool/IBundleService.sol +14 -13
  394. package/contracts/pool/IPoolService.sol +7 -2
  395. package/contracts/pool/Pool.sol +6 -20
  396. package/contracts/pool/PoolLib.sol +127 -2
  397. package/contracts/pool/PoolService.sol +41 -184
  398. package/contracts/product/ApplicationService.sol +65 -12
  399. package/contracts/product/BasicProduct.sol +2 -5
  400. package/contracts/product/BasicProductAuthorization.sol +11 -4
  401. package/contracts/product/ClaimService.sol +99 -105
  402. package/contracts/product/IApplicationService.sol +21 -2
  403. package/contracts/product/IClaimService.sol +5 -4
  404. package/contracts/product/IPolicyService.sol +9 -2
  405. package/contracts/product/IRiskService.sol +18 -3
  406. package/contracts/product/PolicyService.sol +40 -77
  407. package/contracts/product/PolicyServiceLib.sol +79 -5
  408. package/contracts/product/PricingService.sol +29 -32
  409. package/contracts/product/Product.sol +40 -18
  410. package/contracts/product/RiskService.sol +50 -15
  411. package/contracts/registry/IRegistry.sol +15 -9
  412. package/contracts/registry/IRelease.sol +6 -3
  413. package/contracts/registry/Registry.sol +15 -9
  414. package/contracts/registry/RegistryAdmin.sol +85 -266
  415. package/contracts/registry/RegistryAuthorization.sol +337 -0
  416. package/contracts/registry/RegistryService.sol +1 -1
  417. package/contracts/registry/ReleaseAdmin.sol +70 -116
  418. package/contracts/registry/ReleaseRegistry.sol +57 -43
  419. package/contracts/registry/ServiceAuthorizationV3.sol +128 -33
  420. package/contracts/registry/TokenRegistry.sol +56 -52
  421. package/contracts/shared/Component.sol +20 -37
  422. package/contracts/shared/ComponentService.sol +249 -250
  423. package/contracts/shared/ContractLib.sol +134 -75
  424. package/contracts/shared/IComponent.sol +1 -4
  425. package/contracts/shared/IComponentService.sol +21 -22
  426. package/contracts/shared/INftOwnable.sol +2 -0
  427. package/contracts/shared/IRegisterable.sol +0 -1
  428. package/contracts/shared/InitializableERC165.sol +9 -1
  429. package/contracts/shared/InstanceLinkedComponent.sol +6 -11
  430. package/contracts/shared/NftOwnable.sol +4 -2
  431. package/contracts/shared/PolicyHolder.sol +3 -2
  432. package/contracts/shared/Registerable.sol +1 -4
  433. package/contracts/shared/Service.sol +6 -4
  434. package/contracts/shared/TokenHandler.sol +5 -4
  435. package/contracts/staking/IStaking.sol +265 -64
  436. package/contracts/staking/IStakingService.sol +44 -82
  437. package/contracts/staking/ITargetLimitHandler.sol +17 -0
  438. package/contracts/staking/Staking.sol +475 -204
  439. package/contracts/staking/{StakeManagerLib.sol → StakingLib.sol} +55 -84
  440. package/contracts/staking/StakingManager.sol +4 -3
  441. package/contracts/staking/StakingReader.sol +58 -77
  442. package/contracts/staking/StakingService.sol +49 -158
  443. package/contracts/staking/StakingServiceManager.sol +1 -0
  444. package/contracts/staking/StakingStore.sol +1093 -330
  445. package/contracts/staking/TargetHandler.sol +132 -0
  446. package/contracts/staking/TargetManagerLib.sol +69 -46
  447. package/contracts/type/Amount.sol +4 -0
  448. package/contracts/type/Blocknumber.sol +17 -22
  449. package/contracts/type/ChainId.sol +101 -0
  450. package/contracts/type/Fee.sol +8 -8
  451. package/contracts/type/NftId.sol +3 -3
  452. package/contracts/type/ObjectType.sol +21 -17
  453. package/contracts/type/RoleId.sol +57 -59
  454. package/contracts/type/Seconds.sol +19 -0
  455. package/contracts/type/String.sol +12 -0
  456. package/contracts/type/Timestamp.sol +4 -2
  457. package/contracts/type/UFixed.sol +28 -10
  458. package/contracts/type/Version.sol +39 -0
  459. package/contracts/upgradeability/IVersionable.sol +3 -0
  460. package/contracts/upgradeability/ProxyManager.sol +26 -12
  461. package/contracts/upgradeability/UpgradableProxyWithAdmin.sol +12 -2
  462. package/contracts/upgradeability/Versionable.sol +6 -3
  463. package/package.json +1 -1
  464. package/artifacts/contracts/authorization/AccessAdmin.sol/IAccessManagedChecker.dbg.json +0 -4
  465. package/artifacts/contracts/authorization/AccessAdmin.sol/IAccessManagedChecker.json +0 -24
  466. package/artifacts/contracts/shared/ComponentVerifyingService.sol/ComponentVerifyingService.dbg.json +0 -4
  467. package/artifacts/contracts/shared/ComponentVerifyingService.sol/ComponentVerifyingService.json +0 -485
  468. package/artifacts/contracts/shared/IKeyValueStore.sol/IKeyValueStore.dbg.json +0 -4
  469. package/artifacts/contracts/shared/KeyValueStore.sol/KeyValueStore.dbg.json +0 -4
  470. package/artifacts/contracts/shared/KeyValueStore.sol/KeyValueStore.json +0 -538
  471. package/artifacts/contracts/staking/StakeManagerLib.sol/StakeManagerLib.dbg.json +0 -4
  472. package/artifacts/contracts/staking/StakeManagerLib.sol/StakeManagerLib.json +0 -440
  473. package/artifacts/contracts/staking/StakingLifecycle.sol/StakingLifecycle.dbg.json +0 -4
  474. package/artifacts/contracts/staking/StakingLifecycle.sol/StakingLifecycle.json +0 -205
  475. package/contracts/shared/ComponentVerifyingService.sol +0 -128
  476. package/contracts/shared/IKeyValueStore.sol +0 -54
  477. package/contracts/shared/KeyValueStore.sol +0 -131
  478. package/contracts/staking/StakingLifecycle.sol +0 -23
@@ -13,21 +13,24 @@ import {IComponents} from "../instance/module/IComponents.sol";
13
13
  import {IPolicy} from "../instance/module/IPolicy.sol";
14
14
 
15
15
  import {Amount, AmountLib} from "../type/Amount.sol";
16
- import {ComponentVerifyingService} from "../shared/ComponentVerifyingService.sol";
16
+ import {ContractLib} from "../shared/ContractLib.sol";
17
17
  import {DistributorType, DistributorTypeLib} from "../type/DistributorType.sol";
18
18
  import {NftId, NftIdLib} from "../type/NftId.sol";
19
19
  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
- import {ReferralId, ReferralLib} from "../type/Referral.sol";
23
+ // TODO PoolLib feels wrong, should likely go in a component type independent lib
24
+ import {PoolLib} from "../pool/PoolLib.sol";
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";
27
+ import {Service} from "../shared/Service.sol";
25
28
  import {Timestamp, TimestampLib} from "../type/Timestamp.sol";
26
- import {UFixed} from "../type/UFixed.sol";
29
+ import {UFixed, UFixedLib} from "../type/UFixed.sol";
27
30
 
28
31
 
29
32
  contract DistributionService is
30
- ComponentVerifyingService,
33
+ Service,
31
34
  IDistributionService
32
35
  {
33
36
  IAccountingService private _accountingService;
@@ -71,12 +74,14 @@ contract DistributionService is
71
74
  bytes memory data
72
75
  )
73
76
  external
77
+ virtual
78
+ restricted()
74
79
  returns (DistributorType distributorType)
75
80
  {
76
- (NftId distributionNftId,, IInstance instance) = _getAndVerifyActiveComponent(DISTRIBUTION());
81
+ (NftId distributionNftId, IInstance instance) = _getAndVerifyActiveDistribution();
77
82
 
78
83
  {
79
- NftId productNftId = _getProductNftId(distributionNftId);
84
+ NftId productNftId = getRegistry().getParentNftId(distributionNftId);
80
85
  IComponents.FeeInfo memory feeInfo = instance.getInstanceReader().getFeeInfo(productNftId);
81
86
 
82
87
  UFixed variableDistributionFees = feeInfo.distributionFee.fractionalFee;
@@ -87,25 +92,27 @@ contract DistributionService is
87
92
  }
88
93
  UFixed maxDiscountPercentageLimit = variableDistributionFees - variableFeesPartsTotal;
89
94
 
90
- if (maxDiscountPercentage.gt(maxDiscountPercentageLimit)) {
95
+ if (maxDiscountPercentage > maxDiscountPercentageLimit) {
91
96
  revert ErrorDistributionServiceMaxDiscountTooHigh(maxDiscountPercentage.toInt1000(), maxDiscountPercentageLimit.toInt1000());
92
97
  }
93
98
  }
94
99
 
95
100
  distributorType = DistributorTypeLib.toDistributorType(distributionNftId, name);
96
- IDistribution.DistributorTypeInfo memory info = IDistribution.DistributorTypeInfo(
97
- name,
98
- distributionNftId,
99
- minDiscountPercentage,
100
- maxDiscountPercentage,
101
- commissionPercentage,
102
- maxReferralCount,
103
- maxReferralLifetime,
104
- allowSelfReferrals,
105
- allowRenewals,
106
- data);
101
+ IDistribution.DistributorTypeInfo memory info = IDistribution.DistributorTypeInfo({
102
+ name: name,
103
+ distributionNftId: distributionNftId,
104
+ minDiscountPercentage: minDiscountPercentage,
105
+ maxDiscountPercentage: maxDiscountPercentage,
106
+ commissionPercentage: commissionPercentage,
107
+ maxReferralCount: maxReferralCount,
108
+ maxReferralLifetime: maxReferralLifetime,
109
+ allowSelfReferrals: allowSelfReferrals,
110
+ allowRenewals: allowRenewals,
111
+ data: data});
107
112
 
108
113
  instance.getInstanceStore().createDistributorType(distributorType, info);
114
+
115
+ emit LogDistributionServiceDistributorTypeCreated(distributionNftId, name);
109
116
  }
110
117
 
111
118
 
@@ -116,9 +123,10 @@ contract DistributionService is
116
123
  )
117
124
  external
118
125
  virtual
126
+ restricted()
119
127
  returns (NftId distributorNftId)
120
128
  {
121
- (NftId distributionNftId,, IInstance instance) = _getAndVerifyActiveComponent(DISTRIBUTION());
129
+ (NftId distributionNftId, IInstance instance) = _getAndVerifyActiveDistribution();
122
130
  _checkDistributionType(instance.getInstanceReader(), distributorType, distributionNftId);
123
131
 
124
132
  distributorNftId = _registryService.registerDistributor(
@@ -132,31 +140,37 @@ contract DistributionService is
132
140
  ""
133
141
  ));
134
142
 
135
- IDistribution.DistributorInfo memory info = IDistribution.DistributorInfo(
136
- distributorType,
137
- true, // active
138
- data,
139
- 0);
143
+ IDistribution.DistributorInfo memory info = IDistribution.DistributorInfo({
144
+ distributorType: distributorType,
145
+ active: true,
146
+ numPoliciesSold: 0,
147
+ data: data});
140
148
 
141
149
  instance.getInstanceStore().createDistributor(distributorNftId, info);
150
+
151
+ emit LogDistributionServiceDistributorCreated(distributionNftId, distributorNftId, distributorType, distributor);
142
152
  }
143
153
 
144
154
  function changeDistributorType(
145
155
  NftId distributorNftId,
146
- DistributorType distributorType,
156
+ DistributorType newDistributorType,
147
157
  bytes memory data
148
158
  )
149
159
  external
150
160
  virtual
161
+ restricted()
151
162
  {
152
163
  _checkNftType(distributorNftId, DISTRIBUTOR());
153
- (NftId distributionNftId,, IInstance instance) = _getAndVerifyActiveComponent(DISTRIBUTION());
154
- _checkDistributionType(instance.getInstanceReader(), distributorType, distributionNftId);
164
+ (NftId distributionNftId, IInstance instance) = _getAndVerifyActiveDistribution();
165
+ _checkDistributionType(instance.getInstanceReader(), newDistributorType, distributionNftId);
155
166
 
156
167
  IDistribution.DistributorInfo memory distributorInfo = instance.getInstanceReader().getDistributorInfo(distributorNftId);
157
- distributorInfo.distributorType = distributorType;
168
+ DistributorType oldDistributorType = distributorInfo.distributorType;
169
+ distributorInfo.distributorType = newDistributorType;
158
170
  distributorInfo.data = data;
159
171
  instance.getInstanceStore().updateDistributor(distributorNftId, distributorInfo, KEEP_STATE());
172
+
173
+ emit LogDistributionServiceDistributorTypeChanged(distributorNftId, oldDistributorType, newDistributorType);
160
174
  }
161
175
 
162
176
 
@@ -170,15 +184,16 @@ contract DistributionService is
170
184
  )
171
185
  external
172
186
  virtual
187
+ restricted()
173
188
  onlyNftOfType(distributorNftId, DISTRIBUTOR())
174
189
  returns (ReferralId referralId)
175
190
  {
176
- (NftId distributionNftId,, IInstance instance) = _getAndVerifyActiveComponent(DISTRIBUTION());
191
+ (NftId distributionNftId, IInstance instance) = _getAndVerifyActiveDistribution();
177
192
 
178
193
  if (bytes(code).length == 0) {
179
- revert ErrorDistributionServiceInvalidReferral(code);
194
+ revert ErrorDistributionServiceInvalidReferral();
180
195
  }
181
- if (expiryAt.eqz() || expiryAt.lte(TimestampLib.blockTimestamp())) {
196
+ if (expiryAt.eqz() || expiryAt < TimestampLib.current()) {
182
197
  revert ErrorDistributionServiceExpirationInvalid(expiryAt);
183
198
  }
184
199
 
@@ -193,33 +208,35 @@ contract DistributionService is
193
208
  IDistribution.DistributorTypeInfo memory distributorTypeData = instanceReader.getDistributorTypeInfo(distributorType);
194
209
 
195
210
  if (distributorTypeData.maxReferralCount < maxReferrals) {
196
- revert ErrorDistributionServiceMaxReferralsExceeded(distributorTypeData.maxReferralCount);
211
+ revert ErrorDistributionServiceMaxReferralsExceeded(distributorTypeData.maxReferralCount, maxReferrals);
197
212
  }
198
213
  if (distributorTypeData.minDiscountPercentage > discountPercentage) {
199
- revert ErrorDistributionServiceDiscountTooLow(distributorTypeData.minDiscountPercentage.toInt(), discountPercentage.toInt());
214
+ revert ErrorDistributionServiceDiscountTooLow(distributorTypeData.minDiscountPercentage, discountPercentage);
200
215
  }
201
216
  if (distributorTypeData.maxDiscountPercentage < discountPercentage) {
202
- revert ErrorDistributionServiceDiscountTooHigh(distributorTypeData.maxDiscountPercentage.toInt(), discountPercentage.toInt());
217
+ revert ErrorDistributionServiceDiscountTooHigh(distributorTypeData.maxDiscountPercentage, discountPercentage);
203
218
  }
204
- if (expiryAt.toInt() - TimestampLib.blockTimestamp().toInt() > distributorTypeData.maxReferralLifetime.toInt()) {
219
+ if (expiryAt.toInt() - TimestampLib.current().toInt() > distributorTypeData.maxReferralLifetime.toInt()) {
205
220
  revert ErrorDistributionServiceExpiryTooLong(distributorTypeData.maxReferralLifetime, expiryAt);
206
221
  }
207
222
  }
208
223
 
209
224
  {
210
225
  referralId = ReferralLib.toReferralId(distributionNftId, code);
211
- IDistribution.ReferralInfo memory info = IDistribution.ReferralInfo(
212
- distributionNftId,
213
- distributorNftId,
214
- code,
215
- discountPercentage,
216
- maxReferrals,
217
- 0, // used referrals
218
- expiryAt,
219
- data
220
- );
226
+ IDistribution.ReferralInfo memory info = IDistribution.ReferralInfo({
227
+ distributionNftId: distributionNftId,
228
+ distributorNftId: distributorNftId,
229
+ referralCode: code,
230
+ discountPercentage: discountPercentage,
231
+ maxReferrals: maxReferrals,
232
+ usedReferrals: 0,
233
+ expiryAt: expiryAt,
234
+ data: data
235
+ });
221
236
 
222
237
  instance.getInstanceStore().createReferral(referralId, info);
238
+
239
+ emit LogDistributionServiceReferralCreated(distributionNftId, distributorNftId, referralId, code);
223
240
  }
224
241
  }
225
242
 
@@ -234,14 +251,14 @@ contract DistributionService is
234
251
  onlyNftOfType(distributionNftId, DISTRIBUTION())
235
252
  {
236
253
  if (referralIsValid(distributionNftId, referralId)) {
237
- IRegistry registry = getRegistry();
238
- IRegistry.ObjectInfo memory distributionInfo = registry.getObjectInfo(distributionNftId);
239
- IInstance instance = _getInstanceForComponent(registry, distributionInfo.parentNftId);
254
+ IInstance instance = IInstance(ContractLib.getInstanceForComponent(getRegistry(), distributionNftId));
240
255
 
241
256
  // update book keeping for referral info
242
257
  IDistribution.ReferralInfo memory referralInfo = instance.getInstanceReader().getReferralInfo(referralId);
243
258
  referralInfo.usedReferrals += 1;
244
259
  instance.getInstanceStore().updateReferral(referralId, referralInfo, KEEP_STATE());
260
+
261
+ emit LogDistributionServiceReferralProcessed(distributionNftId, referralInfo.distributorNftId, referralId, referralInfo.usedReferrals);
245
262
  }
246
263
  }
247
264
 
@@ -255,9 +272,7 @@ contract DistributionService is
255
272
  restricted()
256
273
  onlyNftOfType(distributionNftId, DISTRIBUTION())
257
274
  {
258
- IRegistry registry = getRegistry();
259
- IRegistry.ObjectInfo memory distributionInfo = registry.getObjectInfo(distributionNftId);
260
- IInstance instance = _getInstanceForComponent(registry, distributionInfo.parentNftId);
275
+ IInstance instance = IInstance(ContractLib.getInstanceForComponent(getRegistry(), distributionNftId));
261
276
  InstanceReader reader = instance.getInstanceReader();
262
277
  InstanceStore store = instance.getInstanceStore();
263
278
 
@@ -284,30 +299,32 @@ contract DistributionService is
284
299
  // increase distribution balance by distribution owner fee
285
300
  _accountingService.increaseDistributionBalance(store, distributionNftId, AmountLib.zero(), distributionOwnerFee);
286
301
  }
302
+
303
+ emit LogDistributionServiceSaleProcessed(distributionNftId, referralId);
287
304
  }
288
305
 
289
306
  /// @inheritdoc IDistributionService
290
307
  function withdrawCommission(NftId distributorNftId, Amount amount)
291
308
  public
292
309
  virtual
293
- // TODO: restricted() (once #462 is done)
310
+ restricted()
294
311
  onlyNftOfType(distributorNftId, DISTRIBUTOR())
295
312
  returns (Amount withdrawnAmount)
296
313
  {
297
- (NftId distributionNftId,, IInstance instance) = _getAndVerifyActiveComponent(DISTRIBUTION());
314
+ (NftId distributionNftId, IInstance instance) = _getAndVerifyActiveDistribution();
298
315
  InstanceReader reader = instance.getInstanceReader();
299
316
 
300
317
  IComponents.ComponentInfo memory distributionInfo = reader.getComponentInfo(distributionNftId);
301
- address distributionWallet = distributionInfo.tokenHandler.getWallet();
318
+ // address distributionWallet = distributionInfo.tokenHandler.getWallet();
302
319
 
303
320
  Amount commissionAmount = reader.getFeeAmount(distributorNftId);
304
321
 
305
322
  // determine withdrawn amount
306
323
  withdrawnAmount = amount;
307
- if (withdrawnAmount.gte(AmountLib.max())) {
324
+ if (withdrawnAmount >= AmountLib.max()) {
308
325
  withdrawnAmount = commissionAmount;
309
326
  } else {
310
- if (withdrawnAmount.gt(commissionAmount)) {
327
+ if (withdrawnAmount > commissionAmount) {
311
328
  revert ErrorDistributionServiceCommissionWithdrawAmountExceedsLimit(withdrawnAmount, commissionAmount);
312
329
  }
313
330
  }
@@ -324,13 +341,14 @@ contract DistributionService is
324
341
  // transfer amount to distributor
325
342
  {
326
343
  address distributor = getRegistry().ownerOf(distributorNftId);
327
- emit LogDistributionServiceCommissionWithdrawn(distributorNftId, distributor, address(distributionInfo.token), withdrawnAmount);
344
+ emit LogDistributionServiceCommissionWithdrawn(distributorNftId, distributor, address(distributionInfo.tokenHandler.TOKEN()), withdrawnAmount);
328
345
  distributionInfo.tokenHandler.pushToken(distributor, withdrawnAmount);
329
346
  }
330
347
  }
331
348
 
332
349
  function referralIsValid(NftId distributionNftId, ReferralId referralId)
333
350
  public
351
+ virtual
334
352
  view
335
353
  onlyNftOfType(distributionNftId, DISTRIBUTION())
336
354
  returns (bool isValid)
@@ -339,9 +357,7 @@ contract DistributionService is
339
357
  return false;
340
358
  }
341
359
 
342
- IRegistry registry = getRegistry();
343
- IRegistry.ObjectInfo memory distributionInfo = registry.getObjectInfo(distributionNftId);
344
- IInstance instance = _getInstanceForComponent(registry, distributionInfo.parentNftId);
360
+ IInstance instance = IInstance(ContractLib.getInstanceForComponent(getRegistry(), distributionNftId));
345
361
  IDistribution.ReferralInfo memory info = instance.getInstanceReader().getReferralInfo(referralId);
346
362
 
347
363
  if (info.distributorNftId.eqz()) {
@@ -353,10 +369,52 @@ contract DistributionService is
353
369
  revert ErrorDistributionServiceReferralDistributionMismatch(referralId, info.distributionNftId, distributionNftId);
354
370
  }
355
371
 
356
- isValid = info.expiryAt.eqz() || (info.expiryAt.gtz() && TimestampLib.blockTimestamp() <= info.expiryAt);
372
+ isValid = info.expiryAt.eqz() || (info.expiryAt.gtz() && TimestampLib.current() <= info.expiryAt);
357
373
  isValid = isValid && info.usedReferrals < info.maxReferrals;
358
374
  }
359
375
 
376
+
377
+ function getDiscountPercentage(
378
+ InstanceReader instanceReader,
379
+ ReferralId referralId
380
+ )
381
+ external
382
+ virtual
383
+ view
384
+ returns (
385
+ UFixed discountPercentage,
386
+ ReferralStatus status
387
+ )
388
+ {
389
+ IDistribution.ReferralInfo memory info = instanceReader.getReferralInfo(
390
+ referralId);
391
+
392
+ if (info.expiryAt.eqz()) {
393
+ return (
394
+ UFixedLib.zero(),
395
+ REFERRAL_ERROR_UNKNOWN());
396
+ }
397
+
398
+ if (info.expiryAt < TimestampLib.current()) {
399
+ return (
400
+ UFixedLib.zero(),
401
+ REFERRAL_ERROR_EXPIRED());
402
+ }
403
+
404
+ if (info.usedReferrals >= info.maxReferrals) {
405
+ return (
406
+ UFixedLib.zero(),
407
+ REFERRAL_ERROR_EXHAUSTED());
408
+ }
409
+
410
+ return (
411
+ info.discountPercentage,
412
+ REFERRAL_OK()
413
+ );
414
+
415
+ }
416
+
417
+
360
418
  function _checkDistributionType(InstanceReader instanceReader, DistributorType distributorType, NftId expectedDistributionNftId)
361
419
  internal
362
420
  view
@@ -369,16 +427,21 @@ contract DistributionService is
369
427
  }
370
428
  }
371
429
 
372
- function _getInstanceForDistribution(NftId distributionNftId)
430
+
431
+
432
+ function _getAndVerifyActiveDistribution()
373
433
  internal
434
+ virtual
374
435
  view
375
- returns(IInstance instance)
436
+ returns (
437
+ NftId poolNftId,
438
+ IInstance instance
439
+ )
376
440
  {
377
- NftId instanceNftId = getRegistry().getParentNftId(distributionNftId);
378
- address instanceAddress = getRegistry().getObjectAddress(instanceNftId);
379
- return IInstance(instanceAddress);
441
+ return PoolLib.getAndVerifyActiveComponent(getRegistry(), msg.sender, DISTRIBUTION());
380
442
  }
381
443
 
444
+
382
445
  function _getDomain() internal pure override returns(ObjectType) {
383
446
  return DISTRIBUTION();
384
447
  }
@@ -1,12 +1,14 @@
1
1
  // SPDX-License-Identifier: Apache-2.0
2
2
  pragma solidity ^0.8.20;
3
3
 
4
- import {Amount} from "../type/Amount.sol";
5
4
  import {IInstanceLinkedComponent} from "../shared/IInstanceLinkedComponent.sol";
5
+
6
+ import {Amount} from "../type/Amount.sol";
6
7
  import {NftId} from "../type/NftId.sol";
7
8
  import {ReferralId, ReferralStatus} from "../type/Referral.sol";
8
9
  import {UFixed} from "../type/UFixed.sol";
9
10
 
11
+
10
12
  interface IDistributionComponent is IInstanceLinkedComponent {
11
13
 
12
14
  event LogDistributorUpdated(address to, address operator);
@@ -1,15 +1,17 @@
1
1
  // SPDX-License-Identifier: Apache-2.0
2
2
  pragma solidity ^0.8.20;
3
3
 
4
- import {Amount} from "../type/Amount.sol";
5
- import {NftId} from "../type/NftId.sol";
6
4
  import {IPolicy} from "../instance/module/IPolicy.sol";
7
5
  import {IService} from "../shared/IService.sol";
8
- import {UFixed} from "../type/UFixed.sol";
6
+
7
+ import {Amount} from "../type/Amount.sol";
9
8
  import {DistributorType} from "../type/DistributorType.sol";
10
- import {ReferralId} from "../type/Referral.sol";
9
+ import {InstanceReader} from "../instance/InstanceReader.sol";
10
+ import {NftId} from "../type/NftId.sol";
11
+ import {ReferralId, ReferralStatus} from "../type/Referral.sol";
11
12
  import {Seconds} from "../type/Seconds.sol";
12
13
  import {Timestamp} from "../type/Timestamp.sol";
14
+ import {UFixed} from "../type/UFixed.sol";
13
15
 
14
16
 
15
17
  interface IDistributionService is IService {
@@ -17,11 +19,11 @@ interface IDistributionService is IService {
17
19
  error ErrorDistributionServiceParentNftIdNotInstance(NftId nftId, NftId parentNftId);
18
20
  error ErrorDistributionServiceCallerNotDistributor(address caller);
19
21
  error ErrorDistributionServiceInvalidReferralId(ReferralId referralId);
20
- error ErrorDistributionServiceMaxReferralsExceeded(uint256 maxReferrals);
21
- error ErrorDistributionServiceDiscountTooLow(uint256 minDiscountPercentage, uint256 discountPercentage);
22
- error ErrorDistributionServiceDiscountTooHigh(uint256 maxDiscountPercentage, uint256 discountPercentage);
22
+ error ErrorDistributionServiceMaxReferralsExceeded(uint256 limit, uint256 maxReferrals);
23
+ error ErrorDistributionServiceDiscountTooLow(UFixed minDiscountPercentage, UFixed discountPercentage);
24
+ error ErrorDistributionServiceDiscountTooHigh(UFixed maxDiscountPercentage, UFixed discountPercentage);
23
25
  error ErrorDistributionServiceExpiryTooLong(Seconds maxReferralLifetime, Timestamp expiryAt);
24
- error ErrorDistributionServiceInvalidReferral(string code);
26
+ error ErrorDistributionServiceInvalidReferral();
25
27
  error ErrorDistributionServiceExpirationInvalid(Timestamp expiryAt);
26
28
  error ErrorDistributionServiceCommissionTooHigh(uint256 commissionPercentage, uint256 maxCommissionPercentage);
27
29
  error ErrorDistributionServiceMinFeeTooHigh(uint256 minFee, uint256 limit);
@@ -38,6 +40,12 @@ interface IDistributionService is IService {
38
40
  error ErrorDistributionServiceReferralDistributionMismatch(ReferralId referralId, NftId referralDistributionNft, NftId distributionNftId);
39
41
 
40
42
  event LogDistributionServiceCommissionWithdrawn(NftId distributorNftId, address recipient, address tokenAddress, Amount amount);
43
+ event LogDistributionServiceDistributorTypeCreated(NftId distributionNftId, string name);
44
+ event LogDistributionServiceDistributorCreated(NftId distributionNftId, NftId distributorNftId, DistributorType distributorType, address distributor);
45
+ event LogDistributionServiceDistributorTypeChanged(NftId distributorNftId, DistributorType oldDistributorType, DistributorType newDistributorType);
46
+ event LogDistributionServiceReferralCreated(NftId distributionNftId, NftId distributorNftId, ReferralId referralId, string code);
47
+ event LogDistributionServiceReferralProcessed(NftId distributionNftId, NftId distributorNftId, ReferralId referralId, uint32 usedReferrals);
48
+ event LogDistributionServiceSaleProcessed(NftId distributionNftId, ReferralId referralId);
41
49
 
42
50
  function createDistributorType(
43
51
  string memory name,
@@ -61,7 +69,7 @@ interface IDistributionService is IService {
61
69
 
62
70
  function changeDistributorType(
63
71
  NftId distributorNftId,
64
- DistributorType distributorType,
72
+ DistributorType newDistributorType,
65
73
  bytes memory data
66
74
  ) external;
67
75
 
@@ -100,4 +108,8 @@ interface IDistributionService is IService {
100
108
  /// @param amount the amount to withdraw. If set to AMOUNT_MAX, the full commission available is withdrawn
101
109
  /// @return withdrawnAmount the effective withdrawn amount
102
110
  function withdrawCommission(NftId distributorNftId, Amount amount) external returns (Amount withdrawnAmount);
111
+
112
+ /// @dev Returns the discount percentage for the provided referral code.
113
+ /// The function retuns both the percentage and the status of the referral code.
114
+ function getDiscountPercentage(InstanceReader instanceReader, ReferralId referralId) external view returns (UFixed discountPercentage, ReferralStatus status);
103
115
  }
@@ -19,7 +19,6 @@ contract FirePool is
19
19
  address registry,
20
20
  NftId fireProductNftId,
21
21
  string memory componentName,
22
- address token,
23
22
  IAuthorization authorization
24
23
  )
25
24
  {
@@ -28,7 +27,6 @@ contract FirePool is
28
27
  registry,
29
28
  fireProductNftId,
30
29
  componentName,
31
- token,
32
30
  IComponents.PoolInfo({
33
31
  maxBalanceAmount: AmountLib.max(),
34
32
  isInterceptingBundleTransfers: false,
@@ -46,7 +44,6 @@ contract FirePool is
46
44
  address registry,
47
45
  NftId fireProductNftId,
48
46
  string memory componentName,
49
- address token,
50
47
  IComponents.PoolInfo memory poolInfo,
51
48
  IAuthorization authorization,
52
49
  address initialOwner
@@ -58,7 +55,6 @@ contract FirePool is
58
55
  registry,
59
56
  fireProductNftId,
60
57
  componentName,
61
- token,
62
58
  poolInfo,
63
59
  authorization,
64
60
  initialOwner);
@@ -68,7 +68,6 @@ contract FireProduct is
68
68
  address registry,
69
69
  NftId instanceNftid,
70
70
  string memory componentName,
71
- address token,
72
71
  IAuthorization authorization
73
72
  )
74
73
  {
@@ -78,7 +77,6 @@ contract FireProduct is
78
77
  registry,
79
78
  instanceNftid,
80
79
  componentName,
81
- token,
82
80
  authorization,
83
81
  initialOwner);
84
82
  }
@@ -87,7 +85,6 @@ contract FireProduct is
87
85
  address registry,
88
86
  NftId instanceNftId,
89
87
  string memory componentName,
90
- address token,
91
88
  IAuthorization authorization,
92
89
  address initialOwner
93
90
  )
@@ -98,7 +95,6 @@ contract FireProduct is
98
95
  registry,
99
96
  instanceNftId,
100
97
  componentName,
101
- token,
102
98
  IComponents.ProductInfo({
103
99
  isProcessingFundedClaims: false,
104
100
  isInterceptingPolicyTransfers: false,
@@ -144,9 +140,9 @@ contract FireProduct is
144
140
  revert ErrorFireProductCityUnknown(cityName);
145
141
  }
146
142
 
147
- _updateRiskState(
143
+ _setRiskLocked(
148
144
  _riskMapping[cityName],
149
- PAUSED()
145
+ true
150
146
  );
151
147
  }
152
148
 
@@ -160,9 +156,9 @@ contract FireProduct is
160
156
  revert ErrorFireProductCityUnknown(cityName);
161
157
  }
162
158
 
163
- _updateRiskState(
159
+ _setRiskLocked(
164
160
  _riskMapping[cityName],
165
- ACTIVE()
161
+ false
166
162
  );
167
163
  }
168
164
 
@@ -267,7 +263,7 @@ contract FireProduct is
267
263
  onlyOwner()
268
264
  onlyNftOfType(policyNftId, POLICY())
269
265
  {
270
- _createPolicy(policyNftId, activateAt);
266
+ _createPolicy(policyNftId, activateAt, AmountLib.max());
271
267
  _collectPremium(policyNftId, activateAt);
272
268
  }
273
269
 
@@ -320,7 +316,7 @@ contract FireProduct is
320
316
  revert ErrorFireProductCityUnknown(cityName);
321
317
  }
322
318
 
323
- if (reportedAt > TimestampLib.blockTimestamp()) {
319
+ if (reportedAt > TimestampLib.current()) {
324
320
  revert ErrorFireProductTimestampInFuture();
325
321
  }
326
322
 
@@ -20,8 +20,7 @@ contract SimpleDistribution is
20
20
  address registry,
21
21
  NftId productNftId,
22
22
  IAuthorization authorization,
23
- address initialOwner,
24
- address token
23
+ address initialOwner
25
24
  )
26
25
  {
27
26
  initialize(
@@ -29,8 +28,7 @@ contract SimpleDistribution is
29
28
  productNftId,
30
29
  authorization,
31
30
  initialOwner,
32
- "SimpleDistribution",
33
- token);
31
+ "SimpleDistribution");
34
32
  }
35
33
 
36
34
  function initialize(
@@ -38,8 +36,7 @@ contract SimpleDistribution is
38
36
  NftId productNftId,
39
37
  IAuthorization authorization,
40
38
  address initialOwner,
41
- string memory name,
42
- address token
39
+ string memory name
43
40
  )
44
41
  public
45
42
  virtual
@@ -50,8 +47,7 @@ contract SimpleDistribution is
50
47
  productNftId,
51
48
  authorization,
52
49
  initialOwner,
53
- name,
54
- token);
50
+ name);
55
51
  }
56
52
 
57
53
  function approveTokenHandler(IERC20Metadata token, Amount amount) external restricted() onlyOwner() { _approveTokenHandler(token, amount); }
@@ -34,8 +34,7 @@ contract SimpleOracle is
34
34
  address registry,
35
35
  NftId productNftId,
36
36
  IAuthorization authorization,
37
- address initialOwner,
38
- address token
37
+ address initialOwner
39
38
  )
40
39
  {
41
40
  initialize(
@@ -43,8 +42,7 @@ contract SimpleOracle is
43
42
  productNftId,
44
43
  authorization,
45
44
  initialOwner,
46
- "SimpleOracle",
47
- token
45
+ "SimpleOracle"
48
46
  );
49
47
  }
50
48
 
@@ -53,8 +51,7 @@ contract SimpleOracle is
53
51
  NftId productNftId,
54
52
  IAuthorization authorization,
55
53
  address initialOwner,
56
- string memory name,
57
- address token
54
+ string memory name
58
55
  )
59
56
  public
60
57
  virtual
@@ -65,8 +62,7 @@ contract SimpleOracle is
65
62
  productNftId,
66
63
  authorization,
67
64
  initialOwner,
68
- name,
69
- token);
65
+ name);
70
66
  }
71
67
 
72
68
  /// @dev use case specific handling of oracle requests