@etherisc/gif-next 0.0.2-f634e5c-828 → 0.0.2-f677999-878

Sign up to get free protection for your applications and to get access to all the features.
Files changed (442) hide show
  1. package/artifacts/contracts/accounting/AccountingService.sol/AccountingService.dbg.json +4 -0
  2. package/artifacts/contracts/accounting/AccountingService.sol/AccountingService.json +1007 -0
  3. package/artifacts/contracts/accounting/AccountingServiceManager.sol/AccountingServiceManager.dbg.json +4 -0
  4. package/artifacts/contracts/accounting/AccountingServiceManager.sol/AccountingServiceManager.json +744 -0
  5. package/artifacts/contracts/accounting/IAccountingService.sol/IAccountingService.dbg.json +4 -0
  6. package/artifacts/contracts/accounting/IAccountingService.sol/IAccountingService.json +791 -0
  7. package/artifacts/contracts/authorization/AccessAdmin.sol/AccessAdmin.dbg.json +1 -1
  8. package/artifacts/contracts/authorization/AccessAdmin.sol/AccessAdmin.json +148 -62
  9. package/artifacts/contracts/authorization/AccessAdmin.sol/IAccessManagedChecker.dbg.json +1 -1
  10. package/artifacts/contracts/authorization/AccessManagerCloneable.sol/AccessManagerCloneable.dbg.json +1 -1
  11. package/artifacts/contracts/authorization/AccessManagerCloneable.sol/AccessManagerCloneable.json +233 -5
  12. package/artifacts/contracts/authorization/Authorization.sol/Authorization.dbg.json +1 -1
  13. package/artifacts/contracts/authorization/Authorization.sol/Authorization.json +149 -21
  14. package/artifacts/contracts/authorization/IAccess.sol/IAccess.dbg.json +1 -1
  15. package/artifacts/contracts/authorization/IAccessAdmin.sol/IAccessAdmin.dbg.json +1 -1
  16. package/artifacts/contracts/authorization/IAccessAdmin.sol/IAccessAdmin.json +82 -12
  17. package/artifacts/contracts/authorization/IAuthorization.sol/IAuthorization.dbg.json +1 -1
  18. package/artifacts/contracts/authorization/IAuthorization.sol/IAuthorization.json +68 -13
  19. package/artifacts/contracts/authorization/IServiceAuthorization.sol/IServiceAuthorization.dbg.json +1 -1
  20. package/artifacts/contracts/authorization/ServiceAuthorization.sol/ServiceAuthorization.dbg.json +1 -1
  21. package/artifacts/contracts/authorization/ServiceAuthorization.sol/ServiceAuthorization.json +2 -2
  22. package/artifacts/contracts/distribution/BasicDistribution.sol/BasicDistribution.dbg.json +1 -1
  23. package/artifacts/contracts/distribution/BasicDistribution.sol/BasicDistribution.json +79 -67
  24. package/artifacts/contracts/distribution/BasicDistributionAuthorization.sol/BasicDistributionAuthorization.dbg.json +1 -1
  25. package/artifacts/contracts/distribution/BasicDistributionAuthorization.sol/BasicDistributionAuthorization.json +152 -33
  26. package/artifacts/contracts/distribution/Distribution.sol/Distribution.dbg.json +1 -1
  27. package/artifacts/contracts/distribution/Distribution.sol/Distribution.json +51 -39
  28. package/artifacts/contracts/distribution/DistributionService.sol/DistributionService.dbg.json +1 -1
  29. package/artifacts/contracts/distribution/DistributionService.sol/DistributionService.json +231 -186
  30. package/artifacts/contracts/distribution/DistributionServiceManager.sol/DistributionServiceManager.dbg.json +1 -1
  31. package/artifacts/contracts/distribution/DistributionServiceManager.sol/DistributionServiceManager.json +57 -51
  32. package/artifacts/contracts/distribution/IDistributionComponent.sol/IDistributionComponent.dbg.json +1 -1
  33. package/artifacts/contracts/distribution/IDistributionComponent.sol/IDistributionComponent.json +38 -26
  34. package/artifacts/contracts/distribution/IDistributionService.sol/IDistributionService.dbg.json +1 -1
  35. package/artifacts/contracts/distribution/IDistributionService.sol/IDistributionService.json +119 -73
  36. package/artifacts/contracts/examples/fire/DamageLevel.sol/DamageLevelLib.dbg.json +1 -1
  37. package/artifacts/contracts/examples/fire/FirePool.sol/FirePool.dbg.json +1 -1
  38. package/artifacts/contracts/examples/fire/FirePool.sol/FirePool.json +102 -42
  39. package/artifacts/contracts/examples/fire/FirePoolAuthorization.sol/FirePoolAuthorization.dbg.json +1 -1
  40. package/artifacts/contracts/examples/fire/FirePoolAuthorization.sol/FirePoolAuthorization.json +127 -40
  41. package/artifacts/contracts/examples/fire/FireProduct.sol/FireProduct.dbg.json +1 -1
  42. package/artifacts/contracts/examples/fire/FireProduct.sol/FireProduct.json +257 -190
  43. package/artifacts/contracts/examples/fire/FireProductAuthorization.sol/FireProductAuthorization.dbg.json +1 -1
  44. package/artifacts/contracts/examples/fire/FireProductAuthorization.sol/FireProductAuthorization.json +152 -33
  45. package/artifacts/contracts/examples/fire/FireUSD.sol/FireUSD.dbg.json +1 -1
  46. package/artifacts/contracts/examples/unpermissioned/SimpleDistribution.sol/SimpleDistribution.dbg.json +1 -1
  47. package/artifacts/contracts/examples/unpermissioned/SimpleDistribution.sol/SimpleDistribution.json +150 -56
  48. package/artifacts/contracts/examples/unpermissioned/SimpleDistributionAuthorization.sol/SimpleDistributionAuthorization.dbg.json +4 -0
  49. package/artifacts/contracts/examples/unpermissioned/SimpleDistributionAuthorization.sol/SimpleDistributionAuthorization.json +589 -0
  50. package/artifacts/contracts/examples/unpermissioned/SimpleOracle.sol/SimpleOracle.dbg.json +1 -1
  51. package/artifacts/contracts/examples/unpermissioned/SimpleOracle.sol/SimpleOracle.json +95 -63
  52. package/artifacts/contracts/examples/unpermissioned/SimplePool.sol/SimplePool.dbg.json +1 -1
  53. package/artifacts/contracts/examples/unpermissioned/SimplePool.sol/SimplePool.json +111 -48
  54. package/artifacts/contracts/examples/unpermissioned/SimplePoolAuthorization.sol/SimplePoolAuthorization.dbg.json +4 -0
  55. package/artifacts/contracts/examples/unpermissioned/SimplePoolAuthorization.sol/SimplePoolAuthorization.json +589 -0
  56. package/artifacts/contracts/examples/unpermissioned/SimpleProduct.sol/SimpleProduct.dbg.json +1 -1
  57. package/artifacts/contracts/examples/unpermissioned/SimpleProduct.sol/SimpleProduct.json +315 -150
  58. package/artifacts/contracts/examples/unpermissioned/SimpleProductAuthorization.sol/SimpleProductAuthorization.dbg.json +4 -0
  59. package/artifacts/contracts/examples/unpermissioned/SimpleProductAuthorization.sol/SimpleProductAuthorization.json +589 -0
  60. package/artifacts/contracts/instance/BundleSet.sol/BundleSet.dbg.json +1 -1
  61. package/artifacts/contracts/instance/BundleSet.sol/BundleSet.json +88 -45
  62. package/artifacts/contracts/instance/IInstance.sol/IInstance.dbg.json +1 -1
  63. package/artifacts/contracts/instance/IInstance.sol/IInstance.json +54 -21
  64. package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.dbg.json +1 -1
  65. package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.json +53 -3
  66. package/artifacts/contracts/instance/Instance.sol/Instance.dbg.json +1 -1
  67. package/artifacts/contracts/instance/Instance.sol/Instance.json +80 -40
  68. package/artifacts/contracts/instance/InstanceAdmin.sol/InstanceAdmin.dbg.json +1 -1
  69. package/artifacts/contracts/instance/InstanceAdmin.sol/InstanceAdmin.json +344 -99
  70. package/artifacts/contracts/instance/InstanceAuthorizationV3.sol/InstanceAuthorizationV3.dbg.json +1 -1
  71. package/artifacts/contracts/instance/InstanceAuthorizationV3.sol/InstanceAuthorizationV3.json +127 -40
  72. package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.dbg.json +1 -1
  73. package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.json +351 -198
  74. package/artifacts/contracts/instance/InstanceService.sol/InstanceService.dbg.json +1 -1
  75. package/artifacts/contracts/instance/InstanceService.sol/InstanceService.json +65 -58
  76. package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.dbg.json +1 -1
  77. package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.json +20 -22
  78. package/artifacts/contracts/instance/InstanceStore.sol/InstanceStore.dbg.json +1 -1
  79. package/artifacts/contracts/instance/InstanceStore.sol/InstanceStore.json +422 -352
  80. package/artifacts/contracts/instance/RiskSet.sol/RiskSet.dbg.json +1 -1
  81. package/artifacts/contracts/instance/RiskSet.sol/RiskSet.json +96 -53
  82. package/artifacts/contracts/instance/base/BalanceStore.sol/BalanceStore.dbg.json +1 -1
  83. package/artifacts/contracts/instance/base/BalanceStore.sol/BalanceStore.json +2 -2
  84. package/artifacts/contracts/instance/base/Cloneable.sol/Cloneable.dbg.json +1 -1
  85. package/artifacts/contracts/instance/base/ObjectCounter.sol/ObjectCounter.dbg.json +1 -1
  86. package/artifacts/contracts/instance/base/ObjectCounter.sol/ObjectCounter.json +2 -2
  87. package/artifacts/contracts/instance/base/ObjectLifecycle.sol/ObjectLifecycle.dbg.json +1 -1
  88. package/artifacts/contracts/instance/base/ObjectLifecycle.sol/ObjectLifecycle.json +2 -2
  89. package/artifacts/contracts/instance/base/ObjectSet.sol/ObjectSet.dbg.json +1 -1
  90. package/artifacts/contracts/instance/base/ObjectSet.sol/ObjectSet.json +16 -5
  91. package/artifacts/contracts/instance/base/ObjectSetHelperLib.sol/ObjectSetHelperLib.dbg.json +4 -0
  92. package/artifacts/contracts/instance/base/ObjectSetHelperLib.sol/ObjectSetHelperLib.json +168 -0
  93. package/artifacts/contracts/instance/module/IBundle.sol/IBundle.dbg.json +1 -1
  94. package/artifacts/contracts/instance/module/IComponents.sol/IComponents.dbg.json +1 -1
  95. package/artifacts/contracts/instance/module/IDistribution.sol/IDistribution.dbg.json +1 -1
  96. package/artifacts/contracts/instance/module/IPolicy.sol/IPolicy.dbg.json +1 -1
  97. package/artifacts/contracts/instance/module/IRisk.sol/IRisk.dbg.json +1 -1
  98. package/artifacts/contracts/mock/Dip.sol/Dip.dbg.json +1 -1
  99. package/artifacts/contracts/oracle/BasicOracle.sol/BasicOracle.dbg.json +1 -1
  100. package/artifacts/contracts/oracle/BasicOracle.sol/BasicOracle.json +68 -56
  101. package/artifacts/contracts/oracle/BasicOracleAuthorization.sol/BasicOracleAuthorization.dbg.json +1 -1
  102. package/artifacts/contracts/oracle/BasicOracleAuthorization.sol/BasicOracleAuthorization.json +126 -35
  103. package/artifacts/contracts/oracle/IOracle.sol/IOracle.dbg.json +1 -1
  104. package/artifacts/contracts/oracle/IOracleComponent.sol/IOracleComponent.dbg.json +1 -1
  105. package/artifacts/contracts/oracle/IOracleComponent.sol/IOracleComponent.json +38 -26
  106. package/artifacts/contracts/oracle/IOracleService.sol/IOracleService.dbg.json +1 -1
  107. package/artifacts/contracts/oracle/IOracleService.sol/IOracleService.json +27 -3
  108. package/artifacts/contracts/oracle/Oracle.sol/Oracle.dbg.json +1 -1
  109. package/artifacts/contracts/oracle/Oracle.sol/Oracle.json +52 -40
  110. package/artifacts/contracts/oracle/OracleService.sol/OracleService.dbg.json +1 -1
  111. package/artifacts/contracts/oracle/OracleService.sol/OracleService.json +75 -68
  112. package/artifacts/contracts/oracle/OracleServiceManager.sol/OracleServiceManager.dbg.json +1 -1
  113. package/artifacts/contracts/oracle/OracleServiceManager.sol/OracleServiceManager.json +25 -27
  114. package/artifacts/contracts/pool/BasicPool.sol/BasicPool.dbg.json +1 -1
  115. package/artifacts/contracts/pool/BasicPool.sol/BasicPool.json +51 -39
  116. package/artifacts/contracts/pool/BasicPoolAuthorization.sol/BasicPoolAuthorization.dbg.json +1 -1
  117. package/artifacts/contracts/pool/BasicPoolAuthorization.sol/BasicPoolAuthorization.json +127 -40
  118. package/artifacts/contracts/pool/BundleService.sol/BundleService.dbg.json +1 -1
  119. package/artifacts/contracts/pool/BundleService.sol/BundleService.json +102 -201
  120. package/artifacts/contracts/pool/BundleServiceManager.sol/BundleServiceManager.dbg.json +1 -1
  121. package/artifacts/contracts/pool/BundleServiceManager.sol/BundleServiceManager.json +33 -55
  122. package/artifacts/contracts/pool/IBundleService.sol/IBundleService.dbg.json +1 -1
  123. package/artifacts/contracts/pool/IBundleService.sol/IBundleService.json +38 -80
  124. package/artifacts/contracts/pool/IPoolComponent.sol/IPoolComponent.dbg.json +1 -1
  125. package/artifacts/contracts/pool/IPoolComponent.sol/IPoolComponent.json +38 -26
  126. package/artifacts/contracts/pool/IPoolService.sol/IPoolService.dbg.json +1 -1
  127. package/artifacts/contracts/pool/IPoolService.sol/IPoolService.json +120 -175
  128. package/artifacts/contracts/pool/Pool.sol/Pool.dbg.json +1 -1
  129. package/artifacts/contracts/pool/Pool.sol/Pool.json +51 -39
  130. package/artifacts/contracts/pool/PoolLib.sol/PoolLib.dbg.json +4 -0
  131. package/artifacts/contracts/pool/PoolLib.sol/PoolLib.json +456 -0
  132. package/artifacts/contracts/pool/PoolService.sol/PoolService.dbg.json +1 -1
  133. package/artifacts/contracts/pool/PoolService.sol/PoolService.json +236 -281
  134. package/artifacts/contracts/pool/PoolServiceManager.sol/PoolServiceManager.dbg.json +1 -1
  135. package/artifacts/contracts/pool/PoolServiceManager.sol/PoolServiceManager.json +61 -47
  136. package/artifacts/contracts/product/ApplicationService.sol/ApplicationService.dbg.json +1 -1
  137. package/artifacts/contracts/product/ApplicationService.sol/ApplicationService.json +57 -50
  138. package/artifacts/contracts/product/ApplicationServiceManager.sol/ApplicationServiceManager.dbg.json +1 -1
  139. package/artifacts/contracts/product/ApplicationServiceManager.sol/ApplicationServiceManager.json +16 -18
  140. package/artifacts/contracts/product/BasicProduct.sol/BasicProduct.dbg.json +1 -1
  141. package/artifacts/contracts/product/BasicProduct.sol/BasicProduct.json +157 -130
  142. package/artifacts/contracts/product/BasicProductAuthorization.sol/BasicProductAuthorization.dbg.json +1 -1
  143. package/artifacts/contracts/product/BasicProductAuthorization.sol/BasicProductAuthorization.json +152 -33
  144. package/artifacts/contracts/product/ClaimService.sol/ClaimService.dbg.json +1 -1
  145. package/artifacts/contracts/product/ClaimService.sol/ClaimService.json +244 -187
  146. package/artifacts/contracts/product/ClaimServiceManager.sol/ClaimServiceManager.dbg.json +1 -1
  147. package/artifacts/contracts/product/ClaimServiceManager.sol/ClaimServiceManager.json +55 -65
  148. package/artifacts/contracts/product/IApplicationService.sol/IApplicationService.dbg.json +1 -1
  149. package/artifacts/contracts/product/IApplicationService.sol/IApplicationService.json +27 -3
  150. package/artifacts/contracts/product/IClaimService.sol/IClaimService.dbg.json +1 -1
  151. package/artifacts/contracts/product/IClaimService.sol/IClaimService.json +142 -20
  152. package/artifacts/contracts/product/IPolicyService.sol/IPolicyService.dbg.json +1 -1
  153. package/artifacts/contracts/product/IPolicyService.sol/IPolicyService.json +105 -68
  154. package/artifacts/contracts/product/IPricingService.sol/IPricingService.dbg.json +1 -1
  155. package/artifacts/contracts/product/IPricingService.sol/IPricingService.json +27 -3
  156. package/artifacts/contracts/product/IProductComponent.sol/IProductComponent.dbg.json +1 -1
  157. package/artifacts/contracts/product/IProductComponent.sol/IProductComponent.json +144 -117
  158. package/artifacts/contracts/product/IRiskService.sol/IRiskService.dbg.json +1 -1
  159. package/artifacts/contracts/product/IRiskService.sol/IRiskService.json +37 -7
  160. package/artifacts/contracts/product/PolicyService.sol/PolicyService.dbg.json +1 -1
  161. package/artifacts/contracts/product/PolicyService.sol/PolicyService.json +193 -173
  162. package/artifacts/contracts/product/PolicyServiceLib.sol/PolicyServiceLib.dbg.json +4 -0
  163. package/artifacts/contracts/product/PolicyServiceLib.sol/PolicyServiceLib.json +293 -0
  164. package/artifacts/contracts/product/PolicyServiceManager.sol/PolicyServiceManager.dbg.json +1 -1
  165. package/artifacts/contracts/product/PolicyServiceManager.sol/PolicyServiceManager.json +45 -47
  166. package/artifacts/contracts/product/PricingService.sol/PricingService.dbg.json +1 -1
  167. package/artifacts/contracts/product/PricingService.sol/PricingService.json +85 -78
  168. package/artifacts/contracts/product/PricingServiceManager.sol/PricingServiceManager.dbg.json +1 -1
  169. package/artifacts/contracts/product/PricingServiceManager.sol/PricingServiceManager.json +31 -33
  170. package/artifacts/contracts/product/Product.sol/Product.dbg.json +1 -1
  171. package/artifacts/contracts/product/Product.sol/Product.json +157 -130
  172. package/artifacts/contracts/product/RiskService.sol/RiskService.dbg.json +1 -1
  173. package/artifacts/contracts/product/RiskService.sol/RiskService.json +102 -81
  174. package/artifacts/contracts/product/RiskServiceManager.sol/RiskServiceManager.dbg.json +1 -1
  175. package/artifacts/contracts/product/RiskServiceManager.sol/RiskServiceManager.json +33 -19
  176. package/artifacts/contracts/registry/ChainNft.sol/ChainNft.dbg.json +1 -1
  177. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.dbg.json +1 -1
  178. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.json +26 -2
  179. package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.dbg.json +1 -1
  180. package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.json +31 -7
  181. package/artifacts/contracts/registry/IRelease.sol/IRelease.dbg.json +4 -0
  182. package/artifacts/contracts/registry/IRelease.sol/IRelease.json +24 -0
  183. package/artifacts/contracts/registry/ITransferInterceptor.sol/ITransferInterceptor.dbg.json +1 -1
  184. package/artifacts/contracts/registry/Registry.sol/Registry.dbg.json +1 -1
  185. package/artifacts/contracts/registry/Registry.sol/Registry.json +64 -40
  186. package/artifacts/contracts/registry/RegistryAdmin.sol/RegistryAdmin.dbg.json +1 -1
  187. package/artifacts/contracts/registry/RegistryAdmin.sol/RegistryAdmin.json +250 -221
  188. package/artifacts/contracts/registry/RegistryService.sol/RegistryService.dbg.json +1 -1
  189. package/artifacts/contracts/registry/RegistryService.sol/RegistryService.json +51 -44
  190. package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.dbg.json +1 -1
  191. package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.json +11 -13
  192. package/artifacts/contracts/registry/ReleaseAdmin.sol/ReleaseAdmin.dbg.json +4 -0
  193. package/artifacts/contracts/registry/ReleaseAdmin.sol/ReleaseAdmin.json +1849 -0
  194. package/artifacts/contracts/registry/ReleaseLifecycle.sol/ReleaseLifecycle.dbg.json +1 -1
  195. package/artifacts/contracts/registry/ReleaseLifecycle.sol/ReleaseLifecycle.json +2 -2
  196. package/artifacts/contracts/registry/ReleaseRegistry.sol/ReleaseRegistry.dbg.json +1 -1
  197. package/artifacts/contracts/registry/ReleaseRegistry.sol/ReleaseRegistry.json +315 -49
  198. package/artifacts/contracts/registry/ServiceAuthorizationV3.sol/ServiceAuthorizationV3.dbg.json +1 -1
  199. package/artifacts/contracts/registry/ServiceAuthorizationV3.sol/ServiceAuthorizationV3.json +6 -6
  200. package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.dbg.json +1 -1
  201. package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.json +4 -4
  202. package/artifacts/contracts/shared/Component.sol/Component.dbg.json +1 -1
  203. package/artifacts/contracts/shared/Component.sol/Component.json +51 -39
  204. package/artifacts/contracts/shared/ComponentService.sol/ComponentService.dbg.json +1 -1
  205. package/artifacts/contracts/shared/ComponentService.sol/ComponentService.json +105 -442
  206. package/artifacts/contracts/shared/ComponentServiceManager.sol/ComponentServiceManager.dbg.json +1 -1
  207. package/artifacts/contracts/shared/ComponentServiceManager.sol/ComponentServiceManager.json +40 -70
  208. package/artifacts/contracts/shared/ComponentVerifyingService.sol/ComponentVerifyingService.dbg.json +1 -1
  209. package/artifacts/contracts/shared/ComponentVerifyingService.sol/ComponentVerifyingService.json +27 -16
  210. package/artifacts/contracts/shared/ContractLib.sol/ContractLib.dbg.json +1 -1
  211. package/artifacts/contracts/shared/ContractLib.sol/ContractLib.json +57 -4
  212. package/artifacts/contracts/shared/ContractLib.sol/IInstanceAdminHelper.dbg.json +1 -1
  213. package/artifacts/contracts/shared/ContractLib.sol/ITargetHelper.dbg.json +1 -1
  214. package/artifacts/contracts/shared/ContractLib.sol/ITokenRegistryHelper.dbg.json +4 -0
  215. package/artifacts/contracts/shared/ContractLib.sol/ITokenRegistryHelper.json +40 -0
  216. package/artifacts/contracts/shared/IComponent.sol/IComponent.dbg.json +1 -1
  217. package/artifacts/contracts/shared/IComponent.sol/IComponent.json +38 -26
  218. package/artifacts/contracts/shared/IComponentService.sol/IComponentService.dbg.json +1 -1
  219. package/artifacts/contracts/shared/IComponentService.sol/IComponentService.json +27 -291
  220. package/artifacts/contracts/shared/IInstanceLinkedComponent.sol/IInstanceLinkedComponent.dbg.json +1 -1
  221. package/artifacts/contracts/shared/IInstanceLinkedComponent.sol/IInstanceLinkedComponent.json +38 -26
  222. package/artifacts/contracts/shared/IKeyValueStore.sol/IKeyValueStore.dbg.json +1 -1
  223. package/artifacts/contracts/shared/ILifecycle.sol/ILifecycle.dbg.json +1 -1
  224. package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.dbg.json +1 -1
  225. package/artifacts/contracts/shared/IPolicyHolder.sol/IPolicyHolder.dbg.json +1 -1
  226. package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.dbg.json +1 -1
  227. package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.json +120 -1
  228. package/artifacts/contracts/shared/IRegistryLinked.sol/IRegistryLinked.dbg.json +1 -1
  229. package/artifacts/contracts/shared/IService.sol/IService.dbg.json +1 -1
  230. package/artifacts/contracts/shared/IService.sol/IService.json +27 -3
  231. package/artifacts/contracts/shared/InitializableERC165.sol/InitializableERC165.dbg.json +1 -1
  232. package/artifacts/contracts/shared/InstanceLinkedComponent.sol/InstanceLinkedComponent.dbg.json +1 -1
  233. package/artifacts/contracts/shared/InstanceLinkedComponent.sol/InstanceLinkedComponent.json +51 -39
  234. package/artifacts/contracts/shared/KeyValueStore.sol/KeyValueStore.dbg.json +1 -1
  235. package/artifacts/contracts/shared/Lifecycle.sol/Lifecycle.dbg.json +1 -1
  236. package/artifacts/contracts/shared/NftIdSet.sol/NftIdSet.dbg.json +1 -1
  237. package/artifacts/contracts/shared/NftIdSet.sol/NftIdSet.json +2 -2
  238. package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.dbg.json +1 -1
  239. package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.json +2 -2
  240. package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.dbg.json +1 -1
  241. package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.json +2 -2
  242. package/artifacts/contracts/shared/Registerable.sol/Registerable.dbg.json +1 -1
  243. package/artifacts/contracts/shared/Registerable.sol/Registerable.json +118 -62
  244. package/artifacts/contracts/shared/RegistryLinked.sol/RegistryLinked.dbg.json +1 -1
  245. package/artifacts/contracts/shared/RegistryLinked.sol/RegistryLinked.json +2 -2
  246. package/artifacts/contracts/shared/Service.sol/Service.dbg.json +1 -1
  247. package/artifacts/contracts/shared/Service.sol/Service.json +27 -16
  248. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.dbg.json +1 -1
  249. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.json +63 -162
  250. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandlerBase.dbg.json +1 -1
  251. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandlerBase.json +118 -29
  252. package/artifacts/contracts/shared/TokenHandlerDeployerLib.sol/TokenHandlerDeployerLib.dbg.json +1 -1
  253. package/artifacts/contracts/shared/TokenHandlerDeployerLib.sol/TokenHandlerDeployerLib.json +32 -32
  254. package/artifacts/contracts/staking/IStaking.sol/IStaking.dbg.json +1 -1
  255. package/artifacts/contracts/staking/IStaking.sol/IStaking.json +38 -26
  256. package/artifacts/contracts/staking/IStakingService.sol/IStakingService.dbg.json +1 -1
  257. package/artifacts/contracts/staking/IStakingService.sol/IStakingService.json +56 -3
  258. package/artifacts/contracts/staking/StakeManagerLib.sol/StakeManagerLib.dbg.json +1 -1
  259. package/artifacts/contracts/staking/StakeManagerLib.sol/StakeManagerLib.json +32 -32
  260. package/artifacts/contracts/staking/Staking.sol/Staking.dbg.json +1 -1
  261. package/artifacts/contracts/staking/Staking.sol/Staking.json +90 -57
  262. package/artifacts/contracts/staking/StakingLifecycle.sol/StakingLifecycle.dbg.json +1 -1
  263. package/artifacts/contracts/staking/StakingLifecycle.sol/StakingLifecycle.json +2 -2
  264. package/artifacts/contracts/staking/StakingManager.sol/StakingManager.dbg.json +1 -1
  265. package/artifacts/contracts/staking/StakingManager.sol/StakingManager.json +27 -19
  266. package/artifacts/contracts/staking/StakingReader.sol/StakingReader.dbg.json +1 -1
  267. package/artifacts/contracts/staking/StakingReader.sol/StakingReader.json +4 -4
  268. package/artifacts/contracts/staking/StakingService.sol/StakingService.dbg.json +1 -1
  269. package/artifacts/contracts/staking/StakingService.sol/StakingService.json +87 -51
  270. package/artifacts/contracts/staking/StakingServiceManager.sol/StakingServiceManager.dbg.json +1 -1
  271. package/artifacts/contracts/staking/StakingServiceManager.sol/StakingServiceManager.json +18 -20
  272. package/artifacts/contracts/staking/StakingStore.sol/StakingStore.dbg.json +1 -1
  273. package/artifacts/contracts/staking/StakingStore.sol/StakingStore.json +128 -128
  274. package/artifacts/contracts/staking/TargetManagerLib.sol/TargetManagerLib.dbg.json +1 -1
  275. package/artifacts/contracts/staking/TargetManagerLib.sol/TargetManagerLib.json +22 -22
  276. package/artifacts/contracts/type/AddressSet.sol/LibAddressSet.dbg.json +1 -1
  277. package/artifacts/contracts/type/Amount.sol/AmountLib.dbg.json +1 -1
  278. package/artifacts/contracts/type/Blocknumber.sol/BlocknumberLib.dbg.json +1 -1
  279. package/artifacts/contracts/type/ClaimId.sol/ClaimIdLib.dbg.json +1 -1
  280. package/artifacts/contracts/type/ClaimId.sol/ClaimIdLib.json +2 -2
  281. package/artifacts/contracts/type/DistributorType.sol/DistributorTypeLib.dbg.json +1 -1
  282. package/artifacts/contracts/type/DistributorType.sol/DistributorTypeLib.json +2 -2
  283. package/artifacts/contracts/type/Fee.sol/FeeLib.dbg.json +1 -1
  284. package/artifacts/contracts/type/Key32.sol/Key32Lib.dbg.json +1 -1
  285. package/artifacts/contracts/type/Key32.sol/Key32Lib.json +2 -2
  286. package/artifacts/contracts/type/Key32Set.sol/LibKey32Set.dbg.json +1 -1
  287. package/artifacts/contracts/type/Key32Set.sol/LibKey32Set.json +2 -2
  288. package/artifacts/contracts/type/NftId.sol/NftIdLib.dbg.json +1 -1
  289. package/artifacts/contracts/type/NftId.sol/NftIdLib.json +2 -2
  290. package/artifacts/contracts/type/NftIdSet.sol/LibNftIdSet.dbg.json +1 -1
  291. package/artifacts/contracts/type/NftIdSet.sol/LibNftIdSet.json +2 -2
  292. package/artifacts/contracts/type/ObjectType.sol/ObjectTypeLib.dbg.json +1 -1
  293. package/artifacts/contracts/type/ObjectType.sol/ObjectTypeLib.json +2 -2
  294. package/artifacts/contracts/type/PayoutId.sol/PayoutIdLib.dbg.json +1 -1
  295. package/artifacts/contracts/type/PayoutId.sol/PayoutIdLib.json +2 -2
  296. package/artifacts/contracts/type/Referral.sol/ReferralLib.dbg.json +1 -1
  297. package/artifacts/contracts/type/Referral.sol/ReferralLib.json +2 -2
  298. package/artifacts/contracts/type/RequestId.sol/RequestIdLib.dbg.json +1 -1
  299. package/artifacts/contracts/type/RequestId.sol/RequestIdLib.json +2 -2
  300. package/artifacts/contracts/type/RiskId.sol/RiskIdLib.dbg.json +1 -1
  301. package/artifacts/contracts/type/RiskId.sol/RiskIdLib.json +30 -6
  302. package/artifacts/contracts/type/RoleId.sol/RoleIdLib.dbg.json +1 -1
  303. package/artifacts/contracts/type/RoleId.sol/RoleIdLib.json +79 -15
  304. package/artifacts/contracts/type/Seconds.sol/SecondsLib.dbg.json +1 -1
  305. package/artifacts/contracts/type/Selector.sol/SelectorLib.dbg.json +1 -1
  306. package/artifacts/contracts/type/Selector.sol/SelectorLib.json +21 -2
  307. package/artifacts/contracts/type/Selector.sol/SelectorSetLib.dbg.json +1 -1
  308. package/artifacts/contracts/type/Selector.sol/SelectorSetLib.json +2 -2
  309. package/artifacts/contracts/type/StateId.sol/StateIdLib.dbg.json +1 -1
  310. package/artifacts/contracts/type/String.sol/StrLib.dbg.json +1 -1
  311. package/artifacts/contracts/type/Timestamp.sol/TimestampLib.dbg.json +1 -1
  312. package/artifacts/contracts/type/Timestamp.sol/TimestampLib.json +2 -2
  313. package/artifacts/contracts/type/UFixed.sol/UFixedLib.dbg.json +1 -1
  314. package/artifacts/contracts/type/Version.sol/VersionLib.dbg.json +1 -1
  315. package/artifacts/contracts/type/Version.sol/VersionLib.json +2 -21
  316. package/artifacts/contracts/type/Version.sol/VersionPartLib.dbg.json +1 -1
  317. package/artifacts/contracts/type/Version.sol/VersionPartLib.json +47 -2
  318. package/artifacts/contracts/upgradeability/IVersionable.sol/IVersionable.dbg.json +1 -1
  319. package/artifacts/contracts/upgradeability/ProxyManager.sol/ProxyManager.dbg.json +1 -1
  320. package/artifacts/contracts/upgradeability/ProxyManager.sol/ProxyManager.json +2 -2
  321. package/artifacts/contracts/upgradeability/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.dbg.json +1 -1
  322. package/artifacts/contracts/upgradeability/Versionable.sol/Versionable.dbg.json +1 -1
  323. package/contracts/accounting/AccountingService.sol +262 -0
  324. package/contracts/accounting/AccountingServiceManager.sol +38 -0
  325. package/contracts/accounting/IAccountingService.sol +45 -0
  326. package/contracts/authorization/AccessAdmin.sol +156 -82
  327. package/contracts/authorization/AccessManagerCloneable.sol +136 -3
  328. package/contracts/authorization/Authorization.sol +277 -229
  329. package/contracts/authorization/IAccessAdmin.sol +13 -7
  330. package/contracts/authorization/IAuthorization.sol +15 -1
  331. package/contracts/distribution/BasicDistribution.sol +11 -9
  332. package/contracts/distribution/BasicDistributionAuthorization.sol +21 -8
  333. package/contracts/distribution/Distribution.sol +37 -32
  334. package/contracts/distribution/DistributionService.sol +59 -33
  335. package/contracts/distribution/DistributionServiceManager.sol +1 -1
  336. package/contracts/distribution/IDistributionService.sol +16 -13
  337. package/contracts/examples/fire/FirePool.sol +6 -2
  338. package/contracts/examples/fire/FirePoolAuthorization.sol +2 -1
  339. package/contracts/examples/fire/FireProduct.sol +9 -3
  340. package/contracts/examples/fire/FireProductAuthorization.sol +2 -1
  341. package/contracts/examples/unpermissioned/SimpleDistribution.sol +29 -9
  342. package/contracts/examples/unpermissioned/SimpleDistributionAuthorization.sol +28 -0
  343. package/contracts/examples/unpermissioned/SimplePool.sol +7 -9
  344. package/contracts/examples/unpermissioned/SimplePoolAuthorization.sol +28 -0
  345. package/contracts/examples/unpermissioned/SimpleProduct.sol +36 -4
  346. package/contracts/examples/unpermissioned/SimpleProductAuthorization.sol +28 -0
  347. package/contracts/instance/BundleSet.sol +4 -4
  348. package/contracts/instance/IInstance.sol +6 -7
  349. package/contracts/instance/IInstanceService.sol +2 -0
  350. package/contracts/instance/Instance.sol +19 -11
  351. package/contracts/instance/InstanceAdmin.sol +213 -64
  352. package/contracts/instance/InstanceAuthorizationV3.sol +18 -23
  353. package/contracts/instance/InstanceReader.sol +91 -35
  354. package/contracts/instance/InstanceService.sol +43 -31
  355. package/contracts/instance/InstanceServiceManager.sol +1 -1
  356. package/contracts/instance/InstanceStore.sol +13 -2
  357. package/contracts/instance/RiskSet.sol +11 -12
  358. package/contracts/instance/base/ObjectLifecycle.sol +4 -2
  359. package/contracts/instance/base/ObjectSet.sol +7 -8
  360. package/contracts/instance/base/ObjectSetHelperLib.sol +30 -0
  361. package/contracts/instance/module/IComponents.sol +3 -2
  362. package/contracts/instance/module/IDistribution.sol +5 -2
  363. package/contracts/instance/module/IRisk.sol +2 -0
  364. package/contracts/oracle/BasicOracleAuthorization.sol +3 -12
  365. package/contracts/oracle/Oracle.sol +1 -1
  366. package/contracts/oracle/OracleService.sol +16 -15
  367. package/contracts/oracle/OracleServiceManager.sol +1 -1
  368. package/contracts/pool/BasicPoolAuthorization.sol +21 -13
  369. package/contracts/pool/BundleService.sol +35 -63
  370. package/contracts/pool/BundleServiceManager.sol +1 -1
  371. package/contracts/pool/IBundleService.sol +13 -20
  372. package/contracts/pool/IPoolService.sol +50 -38
  373. package/contracts/pool/Pool.sol +9 -9
  374. package/contracts/pool/PoolLib.sol +216 -0
  375. package/contracts/pool/PoolService.sol +307 -162
  376. package/contracts/pool/PoolServiceManager.sol +1 -1
  377. package/contracts/product/ApplicationService.sol +3 -3
  378. package/contracts/product/ApplicationServiceManager.sol +1 -1
  379. package/contracts/product/BasicProduct.sol +2 -0
  380. package/contracts/product/BasicProductAuthorization.sol +24 -10
  381. package/contracts/product/ClaimService.sol +157 -139
  382. package/contracts/product/ClaimServiceManager.sol +1 -1
  383. package/contracts/product/IClaimService.sol +14 -2
  384. package/contracts/product/IPolicyService.sol +11 -6
  385. package/contracts/product/IProductComponent.sol +4 -1
  386. package/contracts/product/IRiskService.sol +5 -8
  387. package/contracts/product/PolicyService.sol +95 -146
  388. package/contracts/product/PolicyServiceLib.sol +65 -0
  389. package/contracts/product/PolicyServiceManager.sol +1 -1
  390. package/contracts/product/PricingService.sol +23 -19
  391. package/contracts/product/PricingServiceManager.sol +3 -3
  392. package/contracts/product/Product.sol +55 -13
  393. package/contracts/product/RiskService.sol +66 -29
  394. package/contracts/product/RiskServiceManager.sol +1 -1
  395. package/contracts/registry/IRegistry.sol +8 -15
  396. package/contracts/registry/IRelease.sol +26 -0
  397. package/contracts/registry/Registry.sol +7 -2
  398. package/contracts/registry/RegistryAdmin.sol +129 -226
  399. package/contracts/registry/RegistryService.sol +3 -3
  400. package/contracts/registry/RegistryServiceManager.sol +1 -1
  401. package/contracts/registry/ReleaseAdmin.sol +245 -0
  402. package/contracts/registry/ReleaseLifecycle.sol +2 -0
  403. package/contracts/registry/ReleaseRegistry.sol +124 -99
  404. package/contracts/registry/ServiceAuthorizationV3.sol +85 -14
  405. package/contracts/registry/TokenRegistry.sol +6 -8
  406. package/contracts/shared/Component.sol +32 -27
  407. package/contracts/shared/ComponentService.sol +89 -266
  408. package/contracts/shared/ComponentServiceManager.sol +1 -1
  409. package/contracts/shared/ComponentVerifyingService.sol +1 -1
  410. package/contracts/shared/ContractLib.sol +32 -3
  411. package/contracts/shared/IComponent.sol +3 -9
  412. package/contracts/shared/IComponentService.sol +1 -23
  413. package/contracts/shared/IRegisterable.sol +15 -4
  414. package/contracts/shared/IService.sol +3 -5
  415. package/contracts/shared/InstanceLinkedComponent.sol +3 -3
  416. package/contracts/shared/NftOwnable.sol +4 -4
  417. package/contracts/shared/PolicyHolder.sol +1 -1
  418. package/contracts/shared/Registerable.sol +45 -19
  419. package/contracts/shared/RegistryLinked.sol +1 -1
  420. package/contracts/shared/Service.sol +8 -27
  421. package/contracts/shared/TokenHandler.sol +40 -88
  422. package/contracts/staking/IStaking.sol +0 -8
  423. package/contracts/staking/IStakingService.sol +8 -0
  424. package/contracts/staking/StakeManagerLib.sol +1 -1
  425. package/contracts/staking/Staking.sol +34 -13
  426. package/contracts/staking/StakingReader.sol +1 -1
  427. package/contracts/staking/StakingService.sol +32 -42
  428. package/contracts/staking/StakingServiceManager.sol +5 -4
  429. package/contracts/type/ObjectType.sol +46 -21
  430. package/contracts/type/RiskId.sol +9 -3
  431. package/contracts/type/RoleId.sol +24 -4
  432. package/contracts/type/Selector.sol +5 -0
  433. package/contracts/type/Timestamp.sol +0 -5
  434. package/contracts/type/Version.sol +15 -5
  435. package/contracts/upgradeability/ProxyManager.sol +1 -1
  436. package/package.json +2 -2
  437. package/artifacts/contracts/authorization/ReleaseAccessManager.sol/ReleaseAccessManager.dbg.json +0 -4
  438. package/artifacts/contracts/authorization/ReleaseAccessManager.sol/ReleaseAccessManager.json +0 -1196
  439. package/artifacts/contracts/instance/module/IAccess.sol/IAccess.dbg.json +0 -4
  440. package/artifacts/contracts/instance/module/IAccess.sol/IAccess.json +0 -129
  441. package/contracts/authorization/ReleaseAccessManager.sol +0 -38
  442. package/contracts/instance/module/IAccess.sol +0 -46
@@ -1,15 +1,17 @@
1
1
  // SPDX-License-Identifier: Apache-2.0
2
2
  pragma solidity ^0.8.20;
3
3
 
4
+ import {IAuthorization} from "../authorization/IAuthorization.sol";
5
+
4
6
  import {Distribution} from "./Distribution.sol";
7
+ import {DistributorType} from "../type/DistributorType.sol";
5
8
  import {DISTRIBUTOR} from "../type/ObjectType.sol";
6
- import {IAuthorization} from "../authorization/IAuthorization.sol";
9
+ import {Fee} from "../type/Fee.sol";
7
10
  import {NftId} from "../type/NftId.sol";
8
11
  import {ReferralId} from "../type/Referral.sol";
9
- import {Fee} from "../type/Fee.sol";
10
- import {UFixed} from "../type/UFixed.sol";
11
- import {DistributorType} from "../type/DistributorType.sol";
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
  contract BasicDistribution is
@@ -37,15 +39,15 @@ contract BasicDistribution is
37
39
  UFixed maxDiscountPercentage,
38
40
  UFixed commissionPercentage,
39
41
  uint32 maxReferralCount,
40
- uint32 maxReferralLifetime,
42
+ Seconds maxReferralLifetime,
41
43
  bool allowSelfReferrals,
42
44
  bool allowRenewals,
43
45
  bytes memory data
44
46
  )
45
47
  external
46
48
  virtual
47
- onlyOwner()
48
49
  restricted()
50
+ onlyOwner()
49
51
  returns (DistributorType distributorType)
50
52
  {
51
53
  return _createDistributorType(
@@ -67,8 +69,8 @@ contract BasicDistribution is
67
69
  )
68
70
  external
69
71
  virtual
70
- onlyOwner()
71
72
  restricted()
73
+ onlyOwner()
72
74
  returns(NftId distributorNftId)
73
75
  {
74
76
  return _createDistributor(distributor, distributorType, data);
@@ -81,9 +83,9 @@ contract BasicDistribution is
81
83
  )
82
84
  external
83
85
  virtual
86
+ restricted()
84
87
  onlyOwner()
85
88
  onlyNftOfType(distributorNftId, DISTRIBUTOR())
86
- restricted()
87
89
  {
88
90
  _changeDistributorType(distributorNftId, distributorType, data);
89
91
  }
@@ -101,8 +103,8 @@ contract BasicDistribution is
101
103
  )
102
104
  external
103
105
  virtual
104
- onlyDistributor()
105
106
  restricted()
107
+ onlyDistributor()
106
108
  returns (ReferralId referralId)
107
109
  {
108
110
  NftId distributorNftId = getDistributorNftId(msg.sender);
@@ -1,13 +1,15 @@
1
1
  // SPDX-License-Identifier: Apache-2.0
2
2
  pragma solidity ^0.8.20;
3
3
 
4
+ import {IAccess} from "../authorization/IAccess.sol";
5
+ import {IInstanceLinkedComponent} from "../shared/IInstanceLinkedComponent.sol";
6
+
4
7
  import {Authorization} from "../authorization/Authorization.sol";
5
8
  import {BasicDistribution} from "./BasicDistribution.sol";
6
9
  import {Distribution} from "./Distribution.sol";
7
- import {DISTRIBUTION} from "../type/ObjectType.sol";
8
- import {IAccess} from "../authorization/IAccess.sol";
9
- import {IInstanceLinkedComponent} from "../shared/IInstanceLinkedComponent.sol";
10
- import {PUBLIC_ROLE} from "../../contracts/type/RoleId.sol";
10
+ import {COMPONENT, DISTRIBUTION} from "../type/ObjectType.sol";
11
+ import {RoleId, PUBLIC_ROLE} from "../type/RoleId.sol";
12
+ import {TokenHandler} from "../shared/TokenHandler.sol";
11
13
 
12
14
 
13
15
  contract BasicDistributionAuthorization
@@ -15,16 +17,27 @@ contract BasicDistributionAuthorization
15
17
  {
16
18
 
17
19
  constructor(string memory distributionlName)
18
- Authorization(distributionlName)
20
+ Authorization(distributionlName, DISTRIBUTION())
19
21
  {}
20
22
 
21
- function _setupTargets()
23
+ function _setupServiceTargets()
22
24
  internal
23
25
  virtual override
24
26
  {
25
- _addComponentTargetWithRole(DISTRIBUTION()); // basic target
27
+ _addServiceTargetWithRole(COMPONENT());
26
28
  }
27
29
 
30
+ function _setupTokenHandlerAuthorizations() internal virtual override {
31
+ IAccess.FunctionInfo[] storage functions;
32
+ functions = _authorizeForTarget(getTokenHandlerName(), getServiceRole(COMPONENT()));
33
+ _authorize(functions, TokenHandler.approve.selector, "approve");
34
+ _authorize(functions, TokenHandler.setWallet.selector, "setWallet");
35
+ _authorize(functions, TokenHandler.pushFeeToken.selector, "pushFeeToken");
36
+
37
+ // authorize token handler functions for pool service role
38
+ functions = _authorizeForTarget(getTokenHandlerName(), getServiceRole(DISTRIBUTION()));
39
+ _authorize(functions, TokenHandler.pushToken.selector, "pushToken");
40
+ }
28
41
 
29
42
  function _setupTargetAuthorizations()
30
43
  internal
@@ -33,7 +46,7 @@ contract BasicDistributionAuthorization
33
46
  IAccess.FunctionInfo[] storage functions;
34
47
 
35
48
  // authorize public role (open access to any account, only allows to lock target)
36
- functions = _authorizeForTarget(getTargetName(), PUBLIC_ROLE());
49
+ functions = _authorizeForTarget(getMainTargetName(), PUBLIC_ROLE());
37
50
  _authorize(functions, BasicDistribution.setFees.selector, "setFees");
38
51
  _authorize(functions, BasicDistribution.createDistributorType.selector, "createDistributorType");
39
52
  _authorize(functions, BasicDistribution.createDistributor.selector, "createDistributor");
@@ -1,19 +1,21 @@
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 {COMPONENT, DISTRIBUTION, DISTRIBUTOR} from "../type/ObjectType.sol";
6
4
  import {IAuthorization} from "../authorization/IAuthorization.sol";
5
+ import {IComponentService} from "../shared/IComponentService.sol";
6
+ import {IDistributionComponent} from "./IDistributionComponent.sol";
7
7
  import {IDistributionService} from "./IDistributionService.sol";
8
+
9
+ import {Amount} from "../type/Amount.sol";
10
+ import {COMPONENT, DISTRIBUTION, DISTRIBUTOR} from "../type/ObjectType.sol";
11
+ import {DistributorType} from "../type/DistributorType.sol";
12
+ import {Fee} from "../type/Fee.sol";
8
13
  import {NftId, NftIdLib} from "../type/NftId.sol";
9
14
  import {ReferralId, ReferralStatus, ReferralLib} from "../type/Referral.sol";
10
- import {Fee} from "../type/Fee.sol";
11
15
  import {InstanceLinkedComponent} from "../shared/InstanceLinkedComponent.sol";
12
- import {IComponentService} from "../shared/IComponentService.sol";
13
- import {IDistributionComponent} from "./IDistributionComponent.sol";
14
- import {UFixed} from "../type/UFixed.sol";
15
- import {DistributorType} from "../type/DistributorType.sol";
16
+ import {Seconds} from "../type/Seconds.sol";
16
17
  import {Timestamp} from "../type/Timestamp.sol";
18
+ import {UFixed} from "../type/UFixed.sol";
17
19
 
18
20
 
19
21
  abstract contract Distribution is
@@ -37,6 +39,32 @@ abstract contract Distribution is
37
39
  }
38
40
 
39
41
 
42
+ function processRenewal(
43
+ ReferralId referralId,
44
+ uint256 feeAmount
45
+ )
46
+ external
47
+ virtual
48
+ restricted()
49
+ {
50
+ // default is no action
51
+ }
52
+
53
+
54
+ /// @inheritdoc IDistributionComponent
55
+ function withdrawCommission(NftId distributorNftId, Amount amount)
56
+ external
57
+ virtual
58
+ restricted()
59
+ onlyDistributor()
60
+ onlyNftOfType(distributorNftId, DISTRIBUTOR())
61
+ onlyNftOwner(distributorNftId)
62
+ returns (Amount withdrawnAmount)
63
+ {
64
+ return _withdrawCommission(distributorNftId, amount);
65
+ }
66
+
67
+
40
68
  function isDistributor(address candidate)
41
69
  public
42
70
  view
@@ -97,35 +125,12 @@ abstract contract Distribution is
97
125
  }
98
126
 
99
127
 
100
- function processRenewal(
101
- ReferralId referralId,
102
- uint256 feeAmount
103
- )
104
- external
105
- virtual
106
- restricted()
107
- {
108
- // default is no action
109
- }
110
-
111
128
  /// @dev Returns true iff the component needs to be called when selling/renewing policis
112
129
  function isVerifying() external pure returns (bool verifying) {
113
130
  return true;
114
131
  }
115
132
 
116
- /// @inheritdoc IDistributionComponent
117
- function withdrawCommission(NftId distributorNftId, Amount amount)
118
- external
119
- virtual
120
- restricted()
121
- onlyDistributor()
122
- onlyNftOfType(distributorNftId, DISTRIBUTOR())
123
- onlyNftOwner(distributorNftId)
124
- returns (Amount withdrawnAmount)
125
- {
126
- return _withdrawCommission(distributorNftId, amount);
127
- }
128
-
133
+
129
134
  function _initializeDistribution(
130
135
  address registry,
131
136
  NftId productNftId,
@@ -177,7 +182,7 @@ abstract contract Distribution is
177
182
  UFixed maxDiscountPercentage,
178
183
  UFixed commissionPercentage,
179
184
  uint32 maxReferralCount,
180
- uint32 maxReferralLifetime,
185
+ Seconds maxReferralLifetime,
181
186
  bool allowSelfReferrals,
182
187
  bool allowRenewals,
183
188
  bytes memory data
@@ -1,33 +1,36 @@
1
1
  // SPDX-License-Identifier: Apache-2.0
2
2
  pragma solidity ^0.8.20;
3
3
 
4
- import {IRegistry} from "../registry/IRegistry.sol";
5
- import {IInstance} from "../instance/IInstance.sol";
4
+ import {IAccountingService} from "../accounting/IAccountingService.sol";
6
5
  import {IComponentService} from "../shared/IComponentService.sol";
6
+ import {IDistribution} from "../instance/module/IDistribution.sol";
7
+ import {IDistributionService} from "./IDistributionService.sol";
8
+ import {IInstance} from "../instance/IInstance.sol";
7
9
  import {IInstanceService} from "../instance/IInstanceService.sol";
10
+ import {IRegistry} from "../registry/IRegistry.sol";
8
11
  import {IRegistryService} from "../registry/IRegistryService.sol";
9
- import {InstanceReader} from "../instance/InstanceReader.sol";
10
12
  import {IComponents} from "../instance/module/IComponents.sol";
11
13
  import {IPolicy} from "../instance/module/IPolicy.sol";
12
14
 
13
15
  import {Amount, AmountLib} from "../type/Amount.sol";
14
- import {NftId, NftIdLib} from "../type/NftId.sol";
15
- import {KEEP_STATE} from "../type/StateId.sol";
16
- import {ObjectType, COMPONENT, DISTRIBUTION, INSTANCE, DISTRIBUTION, DISTRIBUTOR, REGISTRY} from "../type/ObjectType.sol";
17
16
  import {ComponentVerifyingService} from "../shared/ComponentVerifyingService.sol";
18
- import {IDistributionService} from "./IDistributionService.sol";
19
- import {UFixed} from "../type/UFixed.sol";
20
17
  import {DistributorType, DistributorTypeLib} from "../type/DistributorType.sol";
18
+ import {NftId, NftIdLib} from "../type/NftId.sol";
19
+ import {KEEP_STATE} from "../type/StateId.sol";
20
+ import {ObjectType, ACCOUNTING, COMPONENT, DISTRIBUTION, INSTANCE, DISTRIBUTION, DISTRIBUTOR, REGISTRY} from "../type/ObjectType.sol";
21
+ import {InstanceReader} from "../instance/InstanceReader.sol";
22
+ import {InstanceStore} from "../instance/InstanceStore.sol";
21
23
  import {ReferralId, ReferralLib} from "../type/Referral.sol";
24
+ import {Seconds} from "../type/Seconds.sol";
22
25
  import {Timestamp, TimestampLib} from "../type/Timestamp.sol";
23
- import {IDistribution} from "../instance/module/IDistribution.sol";
24
- import {InstanceStore} from "../instance/InstanceStore.sol";
26
+ import {UFixed} from "../type/UFixed.sol";
25
27
 
26
28
 
27
29
  contract DistributionService is
28
30
  ComponentVerifyingService,
29
31
  IDistributionService
30
32
  {
33
+ IAccountingService private _accountingService;
31
34
  IComponentService private _componentService;
32
35
  IInstanceService private _instanceService;
33
36
  IRegistryService private _registryService;
@@ -41,12 +44,13 @@ contract DistributionService is
41
44
  initializer()
42
45
  {
43
46
  (
44
- address registryAddress,
45
- address authority
47
+ address authority,
48
+ address registry
46
49
  ) = abi.decode(data, (address, address));
47
50
 
48
- _initializeService(registryAddress, authority, owner);
51
+ __Service_init(authority, registry, owner);
49
52
 
53
+ _accountingService = IAccountingService(_getServiceAddress(ACCOUNTING()));
50
54
  _componentService = IComponentService(_getServiceAddress(COMPONENT()));
51
55
  _instanceService = IInstanceService(_getServiceAddress(INSTANCE()));
52
56
  _registryService = IRegistryService(_getServiceAddress(REGISTRY()));
@@ -61,7 +65,7 @@ contract DistributionService is
61
65
  UFixed maxDiscountPercentage,
62
66
  UFixed commissionPercentage,
63
67
  uint32 maxReferralCount,
64
- uint32 maxReferralLifetime,
68
+ Seconds maxReferralLifetime,
65
69
  bool allowSelfReferrals,
66
70
  bool allowRenewals,
67
71
  bytes memory data
@@ -70,14 +74,13 @@ contract DistributionService is
70
74
  returns (DistributorType distributorType)
71
75
  {
72
76
  (NftId distributionNftId,, IInstance instance) = _getAndVerifyActiveComponent(DISTRIBUTION());
73
- InstanceReader instanceReader = instance.getInstanceReader();
74
77
 
75
78
  {
76
79
  NftId productNftId = _getProductNftId(distributionNftId);
77
- IComponents.ProductInfo memory productInfo = instance.getInstanceReader().getProductInfo(productNftId);
80
+ IComponents.FeeInfo memory feeInfo = instance.getInstanceReader().getFeeInfo(productNftId);
78
81
 
79
- UFixed variableDistributionFees = productInfo.distributionFee.fractionalFee;
80
- UFixed variableFeesPartsTotal = productInfo.minDistributionOwnerFee.fractionalFee + commissionPercentage;
82
+ UFixed variableDistributionFees = feeInfo.distributionFee.fractionalFee;
83
+ UFixed variableFeesPartsTotal = feeInfo.minDistributionOwnerFee.fractionalFee + commissionPercentage;
81
84
 
82
85
  if (variableFeesPartsTotal > variableDistributionFees) {
83
86
  revert ErrorDistributionServiceVariableFeesTooHight(variableDistributionFees.toInt1000(), variableFeesPartsTotal.toInt1000());
@@ -92,6 +95,7 @@ contract DistributionService is
92
95
  distributorType = DistributorTypeLib.toDistributorType(distributionNftId, name);
93
96
  IDistribution.DistributorTypeInfo memory info = IDistribution.DistributorTypeInfo(
94
97
  name,
98
+ distributionNftId,
95
99
  minDiscountPercentage,
96
100
  maxDiscountPercentage,
97
101
  commissionPercentage,
@@ -115,6 +119,7 @@ contract DistributionService is
115
119
  returns (NftId distributorNftId)
116
120
  {
117
121
  (NftId distributionNftId,, IInstance instance) = _getAndVerifyActiveComponent(DISTRIBUTION());
122
+ _checkDistributionType(instance.getInstanceReader(), distributorType, distributionNftId);
118
123
 
119
124
  distributorNftId = _registryService.registerDistributor(
120
125
  IRegistry.ObjectInfo(
@@ -144,7 +149,10 @@ contract DistributionService is
144
149
  external
145
150
  virtual
146
151
  {
147
- (,, IInstance instance) = _getAndVerifyActiveComponent(DISTRIBUTION());
152
+ _checkNftType(distributorNftId, DISTRIBUTOR());
153
+ (NftId distributionNftId,, IInstance instance) = _getAndVerifyActiveComponent(DISTRIBUTION());
154
+ _checkDistributionType(instance.getInstanceReader(), distributorType, distributionNftId);
155
+
148
156
  IDistribution.DistributorInfo memory distributorInfo = instance.getInstanceReader().getDistributorInfo(distributorNftId);
149
157
  distributorInfo.distributorType = distributorType;
150
158
  distributorInfo.data = data;
@@ -168,10 +176,15 @@ contract DistributionService is
168
176
  (NftId distributionNftId,, IInstance instance) = _getAndVerifyActiveComponent(DISTRIBUTION());
169
177
 
170
178
  if (bytes(code).length == 0) {
171
- revert ErrorIDistributionServiceInvalidReferral(code);
179
+ revert ErrorDistributionServiceInvalidReferral(code);
172
180
  }
173
181
  if (expiryAt.eqz() || expiryAt.lte(TimestampLib.blockTimestamp())) {
174
- revert ErrorIDistributionServiceExpirationInvalid(expiryAt);
182
+ revert ErrorDistributionServiceExpirationInvalid(expiryAt);
183
+ }
184
+
185
+ NftId distributorDistributionNftId = getRegistry().getParentNftId(distributorNftId);
186
+ if (distributorDistributionNftId != distributionNftId) {
187
+ revert ErrorDistributionServiceInvalidDistributor(distributorNftId);
175
188
  }
176
189
 
177
190
  {
@@ -180,22 +193,23 @@ contract DistributionService is
180
193
  IDistribution.DistributorTypeInfo memory distributorTypeData = instanceReader.getDistributorTypeInfo(distributorType);
181
194
 
182
195
  if (distributorTypeData.maxReferralCount < maxReferrals) {
183
- revert ErrorIDistributionServiceMaxReferralsExceeded(distributorTypeData.maxReferralCount);
196
+ revert ErrorDistributionServiceMaxReferralsExceeded(distributorTypeData.maxReferralCount);
184
197
  }
185
198
  if (distributorTypeData.minDiscountPercentage > discountPercentage) {
186
- revert ErrorIDistributionServiceDiscountTooLow(distributorTypeData.minDiscountPercentage.toInt(), discountPercentage.toInt());
199
+ revert ErrorDistributionServiceDiscountTooLow(distributorTypeData.minDiscountPercentage.toInt(), discountPercentage.toInt());
187
200
  }
188
201
  if (distributorTypeData.maxDiscountPercentage < discountPercentage) {
189
- revert ErrorIDistributionServiceDiscountTooHigh(distributorTypeData.maxDiscountPercentage.toInt(), discountPercentage.toInt());
202
+ revert ErrorDistributionServiceDiscountTooHigh(distributorTypeData.maxDiscountPercentage.toInt(), discountPercentage.toInt());
190
203
  }
191
- if (expiryAt.toInt() - TimestampLib.blockTimestamp().toInt() > distributorTypeData.maxReferralLifetime) {
192
- revert ErrorIDistributionServiceExpiryTooLong(distributorTypeData.maxReferralLifetime, expiryAt.toInt());
204
+ if (expiryAt.toInt() - TimestampLib.blockTimestamp().toInt() > distributorTypeData.maxReferralLifetime.toInt()) {
205
+ revert ErrorDistributionServiceExpiryTooLong(distributorTypeData.maxReferralLifetime, expiryAt);
193
206
  }
194
207
  }
195
208
 
196
209
  {
197
210
  referralId = ReferralLib.toReferralId(distributionNftId, code);
198
211
  IDistribution.ReferralInfo memory info = IDistribution.ReferralInfo(
212
+ distributionNftId,
199
213
  distributorNftId,
200
214
  code,
201
215
  discountPercentage,
@@ -255,12 +269,12 @@ contract DistributionService is
255
269
 
256
270
  // increase distribution balance by commission amount and distribution owner fee
257
271
  Amount commissionAmount = premium.commissionAmount;
258
- _componentService.increaseDistributionBalance(store, distributionNftId, commissionAmount, distributionOwnerFee);
272
+ _accountingService.increaseDistributionBalance(store, distributionNftId, commissionAmount, distributionOwnerFee);
259
273
 
260
274
  // update book keeping for referral info
261
275
  IDistribution.ReferralInfo memory referralInfo = reader.getReferralInfo(referralId);
262
276
 
263
- _componentService.increaseDistributorBalance(store, referralInfo.distributorNftId, AmountLib.zero(), commissionAmount);
277
+ _accountingService.increaseDistributorBalance(store, referralInfo.distributorNftId, AmountLib.zero(), commissionAmount);
264
278
 
265
279
  // update book keeping for distributor info
266
280
  IDistribution.DistributorInfo memory distributorInfo = reader.getDistributorInfo(referralInfo.distributorNftId);
@@ -268,7 +282,7 @@ contract DistributionService is
268
282
  store.updateDistributor(referralInfo.distributorNftId, distributorInfo, KEEP_STATE());
269
283
  } else {
270
284
  // increase distribution balance by distribution owner fee
271
- _componentService.increaseDistributionBalance(store, distributionNftId, AmountLib.zero(), distributionOwnerFee);
285
+ _accountingService.increaseDistributionBalance(store, distributionNftId, AmountLib.zero(), distributionOwnerFee);
272
286
  }
273
287
  }
274
288
 
@@ -302,16 +316,16 @@ contract DistributionService is
302
316
  {
303
317
  InstanceStore store = instance.getInstanceStore();
304
318
  // decrease fee counter for distribution balance
305
- _componentService.decreaseDistributionBalance(store, distributionNftId, withdrawnAmount, AmountLib.zero());
319
+ _accountingService.decreaseDistributionBalance(store, distributionNftId, withdrawnAmount, AmountLib.zero());
306
320
  // decrease fee counter for distributor fee
307
- _componentService.decreaseDistributorBalance(store, distributorNftId, AmountLib.zero(), withdrawnAmount);
321
+ _accountingService.decreaseDistributorBalance(store, distributorNftId, AmountLib.zero(), withdrawnAmount);
308
322
  }
309
323
 
310
324
  // transfer amount to distributor
311
325
  {
312
326
  address distributor = getRegistry().ownerOf(distributorNftId);
313
327
  emit LogDistributionServiceCommissionWithdrawn(distributorNftId, distributor, address(distributionInfo.token), withdrawnAmount);
314
- distributionInfo.tokenHandler.distributeTokens(distributionWallet, distributor, withdrawnAmount);
328
+ distributionInfo.tokenHandler.pushToken(distributor, withdrawnAmount);
315
329
  }
316
330
  }
317
331
 
@@ -338,12 +352,24 @@ contract DistributionService is
338
352
  isValid = isValid && info.usedReferrals < info.maxReferrals;
339
353
  }
340
354
 
355
+ function _checkDistributionType(InstanceReader instanceReader, DistributorType distributorType, NftId expectedDistributionNftId)
356
+ internal
357
+ view
358
+ {
359
+ // enfore distributor type belongs to the calling distribution
360
+ NftId distributorTypeDistributionNftId = instanceReader.getDistributorTypeInfo(distributorType).distributionNftId;
361
+
362
+ if (distributorTypeDistributionNftId != expectedDistributionNftId) {
363
+ revert ErrorDistributionServiceInvalidDistributorType(distributorType);
364
+ }
365
+ }
366
+
341
367
  function _getInstanceForDistribution(NftId distributionNftId)
342
368
  internal
343
369
  view
344
370
  returns(IInstance instance)
345
371
  {
346
- NftId instanceNftId = getRegistry().getObjectInfo(distributionNftId).parentNftId;
372
+ NftId instanceNftId = getRegistry().getParentNftId(distributionNftId);
347
373
  address instanceAddress = getRegistry().getObjectAddress(instanceNftId);
348
374
  return IInstance(instanceAddress);
349
375
  }
@@ -17,7 +17,7 @@ contract DistributionServiceManager is ProxyManager {
17
17
  )
18
18
  {
19
19
  DistributionService svc = new DistributionService{salt: salt}();
20
- bytes memory data = abi.encode(registry, authority);
20
+ bytes memory data = abi.encode(authority, registry);
21
21
  IVersionable versionable = initialize(
22
22
  registry,
23
23
  address(svc),
@@ -8,30 +8,33 @@ import {IService} from "../shared/IService.sol";
8
8
  import {UFixed} from "../type/UFixed.sol";
9
9
  import {DistributorType} from "../type/DistributorType.sol";
10
10
  import {ReferralId} from "../type/Referral.sol";
11
+ import {Seconds} from "../type/Seconds.sol";
11
12
  import {Timestamp} from "../type/Timestamp.sol";
12
13
 
13
14
 
14
15
  interface IDistributionService is IService {
15
16
 
17
+ error ErrorDistributionServiceInvalidDistributorType(DistributorType distributorType);
18
+ error ErrorDistributionServiceInvalidDistributor(NftId distributorNftId);
16
19
  error ErrorDistributionServiceCallerNotRegistered(address caller);
17
- error ErrorIDistributionServiceParentNftIdNotInstance(NftId nftId, NftId parentNftId);
18
- error ErrorIDistributionServiceCallerNotDistributor(address caller);
19
- error ErrorIDistributionServiceInvalidReferralId(ReferralId referralId);
20
- error ErrorIDistributionServiceMaxReferralsExceeded(uint256 maxReferrals);
21
- error ErrorIDistributionServiceDiscountTooLow(uint256 minDiscountPercentage, uint256 discountPercentage);
22
- error ErrorIDistributionServiceDiscountTooHigh(uint256 maxDiscountPercentage, uint256 discountPercentage);
23
- error ErrorIDistributionServiceExpiryTooLong(uint256 maxReferralLifetime, uint256 expiryAt);
24
- error ErrorIDistributionServiceInvalidReferral(string code);
25
- error ErrorIDistributionServiceExpirationInvalid(Timestamp expiryAt);
26
- error ErrorIDistributionServiceCommissionTooHigh(uint256 commissionPercentage, uint256 maxCommissionPercentage);
27
- error ErrorIDistributionServiceMinFeeTooHigh(uint256 minFee, uint256 limit);
20
+ error ErrorDistributionServiceParentNftIdNotInstance(NftId nftId, NftId parentNftId);
21
+ error ErrorDistributionServiceCallerNotDistributor(address caller);
22
+ error ErrorDistributionServiceInvalidReferralId(ReferralId referralId);
23
+ error ErrorDistributionServiceMaxReferralsExceeded(uint256 maxReferrals);
24
+ error ErrorDistributionServiceDiscountTooLow(uint256 minDiscountPercentage, uint256 discountPercentage);
25
+ error ErrorDistributionServiceDiscountTooHigh(uint256 maxDiscountPercentage, uint256 discountPercentage);
26
+ error ErrorDistributionServiceExpiryTooLong(Seconds maxReferralLifetime, Timestamp expiryAt);
27
+ error ErrorDistributionServiceInvalidReferral(string code);
28
+ error ErrorDistributionServiceExpirationInvalid(Timestamp expiryAt);
29
+ error ErrorDistributionServiceCommissionTooHigh(uint256 commissionPercentage, uint256 maxCommissionPercentage);
30
+ error ErrorDistributionServiceMinFeeTooHigh(uint256 minFee, uint256 limit);
28
31
 
29
32
  error ErrorDistributionServiceCommissionWithdrawAmountExceedsLimit(Amount amount, Amount limit);
30
33
 
31
34
  error ErrorDistributionServiceVariableFeesTooHight(uint256 maxDiscountPercentage, uint256 limit);
32
35
  error ErrorDistributionServiceMaxDiscountTooHigh(uint256 maxDiscountPercentage, uint256 limit);
33
36
 
34
- error ErrorIDistributionServiceReferralInvalid(NftId distributionNftId, ReferralId referralId);
37
+ error ErrorDistributionServiceReferralInvalid(NftId distributionNftId, ReferralId referralId);
35
38
  error ErrorDistributionServiceInvalidFeeTransferred(Amount transferredDistributionFeeAmount, Amount expectedDistributionFeeAmount);
36
39
 
37
40
  event LogDistributionServiceCommissionWithdrawn(NftId distributorNftId, address recipient, address tokenAddress, Amount amount);
@@ -42,7 +45,7 @@ interface IDistributionService is IService {
42
45
  UFixed maxDiscountPercentage,
43
46
  UFixed commissionPercentage,
44
47
  uint32 maxReferralCount,
45
- uint32 maxReferralLifetime,
48
+ Seconds maxReferralLifetime,
46
49
  bool allowSelfReferrals,
47
50
  bool allowRenewals,
48
51
  bytes memory data
@@ -1,6 +1,8 @@
1
1
  // SPDX-License-Identifier: Apache-2.0
2
2
  pragma solidity ^0.8.20;
3
3
 
4
+ import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
5
+
4
6
  import {Amount, AmountLib} from "../../type/Amount.sol";
5
7
  import {BasicPool} from "../../pool/BasicPool.sol";
6
8
  import {Fee} from "../../type/Fee.sol";
@@ -12,8 +14,7 @@ import {UFixed, UFixedLib} from "../../type/UFixed.sol";
12
14
 
13
15
  contract FirePool is
14
16
  BasicPool
15
- {
16
-
17
+ {
17
18
  constructor(
18
19
  address registry,
19
20
  NftId fireProductNftId,
@@ -83,4 +84,7 @@ contract FirePool is
83
84
  netStakedAmount = _stake(bundleNftId, initialAmount);
84
85
  }
85
86
 
87
+ function approveTokenHandler(IERC20Metadata token, Amount amount) external restricted() onlyOwner() { _approveTokenHandler(token, amount); }
88
+ function setLocked(bool locked) external onlyOwner() { _setLocked(locked); }
89
+ function setWallet(address newWallet) external restricted() onlyOwner() { _setWallet(newWallet); }
86
90
  }
@@ -25,8 +25,9 @@ contract FirePoolAuthorization
25
25
  IAccess.FunctionInfo[] storage functions;
26
26
 
27
27
  // authorize public role (open access to any account, only allows to lock target)
28
- functions = _authorizeForTarget(getTargetName(), PUBLIC_ROLE());
28
+ functions = _authorizeForTarget(getMainTargetName(), PUBLIC_ROLE());
29
29
  // TODO: FirePool.createBundle must require a custom role (e.g. INVESTOR) instead of PUBLIC_ROLE
30
+ _authorize(functions, FirePool.approveTokenHandler.selector, "approveTokenHandler");
30
31
  _authorize(functions, FirePool.createBundle.selector, "createBundle");
31
32
  }
32
33
 
@@ -1,6 +1,8 @@
1
1
  // SPDX-License-Identifier: Apache-2.0
2
2
  pragma solidity ^0.8.20;
3
3
 
4
+ import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
5
+
4
6
  import {ACTIVE, PAUSED} from "../../type/StateId.sol";
5
7
  import {Amount, AmountLib} from "../../type/Amount.sol";
6
8
  import {BasicProduct} from "../../product/BasicProduct.sol";
@@ -105,7 +107,9 @@ contract FireProduct is
105
107
  numberOfOracles: 0,
106
108
  poolNftId: NftIdLib.zero(),
107
109
  distributionNftId: NftIdLib.zero(),
108
- oracleNftId: new NftId[](0),
110
+ oracleNftId: new NftId[](0)
111
+ }),
112
+ IComponents.FeeInfo({
109
113
  productFee: FeeLib.zero(),
110
114
  processingFee: FeeLib.zero(),
111
115
  distributionFee: FeeLib.zero(),
@@ -248,8 +252,7 @@ contract FireProduct is
248
252
  return _riskMapping[cityName];
249
253
  }
250
254
  _cities.push(cityName);
251
- risk = RiskIdLib.toRiskId(cityName);
252
- _createRisk(risk, "");
255
+ risk = _createRisk(bytes32(abi.encodePacked(cityName)), "");
253
256
  _riskMapping[cityName] = risk;
254
257
  }
255
258
 
@@ -428,4 +431,7 @@ contract FireProduct is
428
431
  }
429
432
  }
430
433
 
434
+ function approveTokenHandler(IERC20Metadata token, Amount amount) external restricted() onlyOwner() { _approveTokenHandler(token, amount); }
435
+ function setLocked(bool locked) external onlyOwner() { _setLocked(locked); }
436
+ function setWallet(address newWallet) external restricted() onlyOwner() { _setWallet(newWallet); }
431
437
  }
@@ -23,8 +23,9 @@ contract FireProductAuthorization
23
23
  IAccess.FunctionInfo[] storage functions;
24
24
 
25
25
  // authorize public role (open access to any account, only allows to lock target)
26
- functions = _authorizeForTarget(getTargetName(), PUBLIC_ROLE());
26
+ functions = _authorizeForTarget(getMainTargetName(), PUBLIC_ROLE());
27
27
  // fully public functions
28
+ _authorize(functions, FireProduct.approveTokenHandler.selector, "approveTokenHandler");
28
29
  _authorize(functions, FireProduct.createApplication.selector, "createApplication");
29
30
 
30
31
  // only owner