@etherisc/gif-next 0.0.2-e8ea17d-715 → 0.0.2-e8ea5fe-337

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (380) hide show
  1. package/README.md +19 -2
  2. package/artifacts/contracts/authorization/AccessAdmin.sol/AccessAdmin.dbg.json +1 -1
  3. package/artifacts/contracts/authorization/AccessAdmin.sol/AccessAdmin.json +2 -2
  4. package/artifacts/contracts/authorization/AccessManagerCloneable.sol/AccessManagerCloneable.dbg.json +1 -1
  5. package/artifacts/contracts/authorization/Authorization.sol/Authorization.dbg.json +1 -1
  6. package/artifacts/contracts/authorization/Authorization.sol/Authorization.json +2 -2
  7. package/artifacts/contracts/authorization/IAccess.sol/IAccess.dbg.json +1 -1
  8. package/artifacts/contracts/authorization/IAccessAdmin.sol/IAccessAdmin.dbg.json +1 -1
  9. package/artifacts/contracts/authorization/IAuthorization.sol/IAuthorization.dbg.json +1 -1
  10. package/artifacts/contracts/authorization/IModuleAuthorization.sol/IModuleAuthorization.dbg.json +1 -1
  11. package/artifacts/contracts/authorization/IServiceAuthorization.sol/IServiceAuthorization.dbg.json +1 -1
  12. package/artifacts/contracts/authorization/ModuleAuthorization.sol/ModuleAuthorization.dbg.json +1 -1
  13. package/artifacts/contracts/authorization/ModuleAuthorization.sol/ModuleAuthorization.json +2 -2
  14. package/artifacts/contracts/authorization/ServiceAuthorization.sol/ServiceAuthorization.dbg.json +1 -1
  15. package/artifacts/contracts/authorization/ServiceAuthorization.sol/ServiceAuthorization.json +2 -2
  16. package/artifacts/contracts/distribution/BasicDistribution.sol/BasicDistribution.dbg.json +1 -1
  17. package/artifacts/contracts/distribution/BasicDistribution.sol/BasicDistribution.json +85 -101
  18. package/artifacts/contracts/distribution/BasicDistributionAuthorization.sol/BasicDistributionAuthorization.dbg.json +1 -1
  19. package/artifacts/contracts/distribution/BasicDistributionAuthorization.sol/BasicDistributionAuthorization.json +16 -16
  20. package/artifacts/contracts/distribution/Distribution.sol/Distribution.dbg.json +1 -1
  21. package/artifacts/contracts/distribution/Distribution.sol/Distribution.json +43 -75
  22. package/artifacts/contracts/distribution/DistributionService.sol/DistributionService.dbg.json +1 -1
  23. package/artifacts/contracts/distribution/DistributionService.sol/DistributionService.json +223 -105
  24. package/artifacts/contracts/distribution/DistributionServiceManager.sol/DistributionServiceManager.dbg.json +1 -1
  25. package/artifacts/contracts/distribution/DistributionServiceManager.sol/DistributionServiceManager.json +50 -38
  26. package/artifacts/contracts/distribution/IDistributionComponent.sol/IDistributionComponent.dbg.json +1 -1
  27. package/artifacts/contracts/distribution/IDistributionComponent.sol/IDistributionComponent.json +43 -37
  28. package/artifacts/contracts/distribution/IDistributionService.sol/IDistributionService.dbg.json +1 -1
  29. package/artifacts/contracts/distribution/IDistributionService.sol/IDistributionService.json +120 -31
  30. package/artifacts/contracts/instance/BundleSet.sol/BundleSet.dbg.json +1 -1
  31. package/artifacts/contracts/instance/BundleSet.sol/BundleSet.json +2 -2
  32. package/artifacts/contracts/instance/IInstance.sol/IInstance.dbg.json +1 -1
  33. package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.dbg.json +1 -1
  34. package/artifacts/contracts/instance/Instance.sol/Instance.dbg.json +1 -1
  35. package/artifacts/contracts/instance/Instance.sol/Instance.json +2 -2
  36. package/artifacts/contracts/instance/InstanceAdmin.sol/InstanceAdmin.dbg.json +1 -1
  37. package/artifacts/contracts/instance/InstanceAdmin.sol/InstanceAdmin.json +54 -54
  38. package/artifacts/contracts/instance/InstanceAuthorizationV3.sol/InstanceAuthorizationV3.dbg.json +1 -1
  39. package/artifacts/contracts/instance/InstanceAuthorizationV3.sol/InstanceAuthorizationV3.json +14 -14
  40. package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.dbg.json +1 -1
  41. package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.json +238 -123
  42. package/artifacts/contracts/instance/InstanceService.sol/InstanceService.dbg.json +1 -1
  43. package/artifacts/contracts/instance/InstanceService.sol/InstanceService.json +16 -16
  44. package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.dbg.json +1 -1
  45. package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.json +9 -9
  46. package/artifacts/contracts/instance/InstanceStore.sol/InstanceStore.dbg.json +1 -1
  47. package/artifacts/contracts/instance/InstanceStore.sol/InstanceStore.json +215 -219
  48. package/artifacts/contracts/instance/base/BalanceStore.sol/BalanceStore.dbg.json +1 -1
  49. package/artifacts/contracts/instance/base/BalanceStore.sol/BalanceStore.json +2 -2
  50. package/artifacts/contracts/instance/base/Cloneable.sol/Cloneable.dbg.json +1 -1
  51. package/artifacts/contracts/instance/base/ObjectCounter.sol/ObjectCounter.dbg.json +1 -1
  52. package/artifacts/contracts/instance/base/ObjectCounter.sol/ObjectCounter.json +2 -2
  53. package/artifacts/contracts/instance/base/ObjectLifecycle.sol/ObjectLifecycle.dbg.json +1 -1
  54. package/artifacts/contracts/instance/base/ObjectLifecycle.sol/ObjectLifecycle.json +2 -2
  55. package/artifacts/contracts/instance/base/ObjectSet.sol/ObjectSet.dbg.json +1 -1
  56. package/artifacts/contracts/instance/base/ObjectSet.sol/ObjectSet.json +2 -2
  57. package/artifacts/contracts/instance/module/IAccess.sol/IAccess.dbg.json +1 -1
  58. package/artifacts/contracts/instance/module/IBundle.sol/IBundle.dbg.json +1 -1
  59. package/artifacts/contracts/instance/module/IComponents.sol/IComponents.dbg.json +1 -1
  60. package/artifacts/contracts/instance/module/IDistribution.sol/IDistribution.dbg.json +1 -1
  61. package/artifacts/contracts/instance/module/IPolicy.sol/IPolicy.dbg.json +1 -1
  62. package/artifacts/contracts/instance/module/IRisk.sol/IRisk.dbg.json +1 -1
  63. package/artifacts/contracts/mock/Dip.sol/Dip.dbg.json +1 -1
  64. package/artifacts/contracts/mock/Dip.sol/Dip.json +2 -2
  65. package/artifacts/contracts/oracle/BasicOracle.sol/BasicOracle.dbg.json +1 -1
  66. package/artifacts/contracts/oracle/BasicOracle.sol/BasicOracle.json +59 -88
  67. package/artifacts/contracts/oracle/BasicOracleAuthorization.sol/BasicOracleAuthorization.dbg.json +1 -1
  68. package/artifacts/contracts/oracle/BasicOracleAuthorization.sol/BasicOracleAuthorization.json +2 -2
  69. package/artifacts/contracts/oracle/IOracle.sol/IOracle.dbg.json +1 -1
  70. package/artifacts/contracts/oracle/IOracleComponent.sol/IOracleComponent.dbg.json +1 -1
  71. package/artifacts/contracts/oracle/IOracleComponent.sol/IOracleComponent.json +30 -37
  72. package/artifacts/contracts/oracle/IOracleService.sol/IOracleService.dbg.json +1 -1
  73. package/artifacts/contracts/oracle/Oracle.sol/Oracle.dbg.json +1 -1
  74. package/artifacts/contracts/oracle/Oracle.sol/Oracle.json +27 -72
  75. package/artifacts/contracts/oracle/OracleService.sol/OracleService.dbg.json +1 -1
  76. package/artifacts/contracts/oracle/OracleService.sol/OracleService.json +2 -2
  77. package/artifacts/contracts/oracle/OracleServiceManager.sol/OracleServiceManager.dbg.json +1 -1
  78. package/artifacts/contracts/oracle/OracleServiceManager.sol/OracleServiceManager.json +2 -2
  79. package/artifacts/contracts/pool/BasicPool.sol/BasicPool.dbg.json +1 -1
  80. package/artifacts/contracts/pool/BasicPool.sol/BasicPool.json +55 -137
  81. package/artifacts/contracts/pool/BasicPoolAuthorization.sol/BasicPoolAuthorization.dbg.json +1 -1
  82. package/artifacts/contracts/pool/BasicPoolAuthorization.sol/BasicPoolAuthorization.json +16 -16
  83. package/artifacts/contracts/pool/BundleService.sol/BundleService.dbg.json +1 -1
  84. package/artifacts/contracts/pool/BundleService.sol/BundleService.json +391 -51
  85. package/artifacts/contracts/pool/BundleServiceManager.sol/BundleServiceManager.dbg.json +1 -1
  86. package/artifacts/contracts/pool/BundleServiceManager.sol/BundleServiceManager.json +94 -26
  87. package/artifacts/contracts/pool/IBundleService.sol/IBundleService.dbg.json +1 -1
  88. package/artifacts/contracts/pool/IBundleService.sol/IBundleService.json +205 -1
  89. package/artifacts/contracts/pool/IPoolComponent.sol/IPoolComponent.dbg.json +1 -1
  90. package/artifacts/contracts/pool/IPoolComponent.sol/IPoolComponent.json +45 -95
  91. package/artifacts/contracts/pool/IPoolService.sol/IPoolService.dbg.json +1 -1
  92. package/artifacts/contracts/pool/IPoolService.sol/IPoolService.json +220 -100
  93. package/artifacts/contracts/pool/Pool.sol/Pool.dbg.json +1 -1
  94. package/artifacts/contracts/pool/Pool.sol/Pool.json +45 -133
  95. package/artifacts/contracts/pool/PoolService.sol/PoolService.dbg.json +1 -1
  96. package/artifacts/contracts/pool/PoolService.sol/PoolService.json +264 -136
  97. package/artifacts/contracts/pool/PoolServiceManager.sol/PoolServiceManager.dbg.json +1 -1
  98. package/artifacts/contracts/pool/PoolServiceManager.sol/PoolServiceManager.json +23 -19
  99. package/artifacts/contracts/product/ApplicationService.sol/ApplicationService.dbg.json +1 -1
  100. package/artifacts/contracts/product/ApplicationService.sol/ApplicationService.json +19 -38
  101. package/artifacts/contracts/product/ApplicationServiceManager.sol/ApplicationServiceManager.dbg.json +1 -1
  102. package/artifacts/contracts/product/ApplicationServiceManager.sol/ApplicationServiceManager.json +8 -20
  103. package/artifacts/contracts/product/BasicProduct.sol/BasicProduct.dbg.json +1 -1
  104. package/artifacts/contracts/product/BasicProduct.sol/BasicProduct.json +22 -78
  105. package/artifacts/contracts/product/BasicProductAuthorization.sol/BasicProductAuthorization.dbg.json +1 -1
  106. package/artifacts/contracts/product/BasicProductAuthorization.sol/BasicProductAuthorization.json +16 -16
  107. package/artifacts/contracts/product/ClaimService.sol/ClaimService.dbg.json +1 -1
  108. package/artifacts/contracts/product/ClaimService.sol/ClaimService.json +194 -72
  109. package/artifacts/contracts/product/ClaimServiceManager.sol/ClaimServiceManager.dbg.json +1 -1
  110. package/artifacts/contracts/product/ClaimServiceManager.sol/ClaimServiceManager.json +41 -37
  111. package/artifacts/contracts/product/IApplicationService.sol/IApplicationService.dbg.json +1 -1
  112. package/artifacts/contracts/product/IApplicationService.sol/IApplicationService.json +5 -0
  113. package/artifacts/contracts/product/IClaimService.sol/IClaimService.dbg.json +1 -1
  114. package/artifacts/contracts/product/IClaimService.sol/IClaimService.json +114 -0
  115. package/artifacts/contracts/product/IPolicyService.sol/IPolicyService.dbg.json +1 -1
  116. package/artifacts/contracts/product/IPolicyService.sol/IPolicyService.json +184 -119
  117. package/artifacts/contracts/product/IPricingService.sol/IPricingService.dbg.json +1 -1
  118. package/artifacts/contracts/product/IPricingService.sol/IPricingService.json +43 -43
  119. package/artifacts/contracts/product/IProductComponent.sol/IProductComponent.dbg.json +1 -1
  120. package/artifacts/contracts/product/IProductComponent.sol/IProductComponent.json +19 -37
  121. package/artifacts/contracts/product/IRiskService.sol/IRiskService.dbg.json +4 -0
  122. package/artifacts/contracts/product/{IProductService.sol/IProductService.json → IRiskService.sol/IRiskService.json} +2 -2
  123. package/artifacts/contracts/product/PolicyService.sol/PolicyService.dbg.json +1 -1
  124. package/artifacts/contracts/product/PolicyService.sol/PolicyService.json +242 -209
  125. package/artifacts/contracts/product/PolicyServiceManager.sol/PolicyServiceManager.dbg.json +1 -1
  126. package/artifacts/contracts/product/PolicyServiceManager.sol/PolicyServiceManager.json +38 -38
  127. package/artifacts/contracts/product/PricingService.sol/PricingService.dbg.json +1 -1
  128. package/artifacts/contracts/product/PricingService.sol/PricingService.json +107 -147
  129. package/artifacts/contracts/product/PricingServiceManager.sol/PricingServiceManager.dbg.json +1 -1
  130. package/artifacts/contracts/product/PricingServiceManager.sol/PricingServiceManager.json +40 -60
  131. package/artifacts/contracts/product/Product.sol/Product.dbg.json +1 -1
  132. package/artifacts/contracts/product/Product.sol/Product.json +22 -78
  133. package/artifacts/contracts/product/RiskService.sol/RiskService.dbg.json +4 -0
  134. package/artifacts/contracts/product/{ProductService.sol/ProductService.json → RiskService.sol/RiskService.json} +4 -17
  135. package/artifacts/contracts/product/RiskServiceManager.sol/RiskServiceManager.dbg.json +4 -0
  136. package/artifacts/contracts/product/{ProductServiceManager.sol/ProductServiceManager.json → RiskServiceManager.sol/RiskServiceManager.json} +12 -12
  137. package/artifacts/contracts/registry/ChainNft.sol/ChainNft.dbg.json +1 -1
  138. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.dbg.json +1 -1
  139. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.json +1 -1
  140. package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.dbg.json +1 -1
  141. package/artifacts/contracts/registry/ITransferInterceptor.sol/ITransferInterceptor.dbg.json +1 -1
  142. package/artifacts/contracts/registry/Registry.sol/Registry.dbg.json +1 -1
  143. package/artifacts/contracts/registry/Registry.sol/Registry.json +15 -15
  144. package/artifacts/contracts/registry/RegistryAdmin.sol/RegistryAdmin.dbg.json +1 -1
  145. package/artifacts/contracts/registry/RegistryAdmin.sol/RegistryAdmin.json +28 -28
  146. package/artifacts/contracts/registry/RegistryService.sol/RegistryService.dbg.json +1 -1
  147. package/artifacts/contracts/registry/RegistryService.sol/RegistryService.json +2 -2
  148. package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.dbg.json +1 -1
  149. package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.json +2 -2
  150. package/artifacts/contracts/registry/ReleaseLifecycle.sol/ReleaseLifecycle.dbg.json +1 -1
  151. package/artifacts/contracts/registry/ReleaseLifecycle.sol/ReleaseLifecycle.json +2 -2
  152. package/artifacts/contracts/registry/ReleaseRegistry.sol/ReleaseRegistry.dbg.json +1 -1
  153. package/artifacts/contracts/registry/ReleaseRegistry.sol/ReleaseRegistry.json +2 -2
  154. package/artifacts/contracts/registry/ServiceAuthorizationV3.sol/ServiceAuthorizationV3.dbg.json +1 -1
  155. package/artifacts/contracts/registry/ServiceAuthorizationV3.sol/ServiceAuthorizationV3.json +6 -6
  156. package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.dbg.json +1 -1
  157. package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.json +2 -2
  158. package/artifacts/contracts/shared/Component.sol/Component.dbg.json +1 -1
  159. package/artifacts/contracts/shared/Component.sol/Component.json +0 -64
  160. package/artifacts/contracts/shared/ComponentService.sol/ComponentService.dbg.json +1 -1
  161. package/artifacts/contracts/shared/ComponentService.sol/ComponentService.json +255 -62
  162. package/artifacts/contracts/shared/ComponentServiceManager.sol/ComponentServiceManager.dbg.json +1 -1
  163. package/artifacts/contracts/shared/ComponentServiceManager.sol/ComponentServiceManager.json +52 -32
  164. package/artifacts/contracts/shared/ComponentVerifyingService.sol/ComponentVerifyingService.dbg.json +1 -1
  165. package/artifacts/contracts/shared/IComponent.sol/IComponent.dbg.json +1 -1
  166. package/artifacts/contracts/shared/IComponent.sol/IComponent.json +0 -26
  167. package/artifacts/contracts/shared/IComponentService.sol/IComponentService.dbg.json +1 -1
  168. package/artifacts/contracts/shared/IComponentService.sol/IComponentService.json +153 -0
  169. package/artifacts/contracts/shared/IInstanceLinkedComponent.sol/IInstanceLinkedComponent.dbg.json +1 -1
  170. package/artifacts/contracts/shared/IInstanceLinkedComponent.sol/IInstanceLinkedComponent.json +19 -37
  171. package/artifacts/contracts/shared/IKeyValueStore.sol/IKeyValueStore.dbg.json +1 -1
  172. package/artifacts/contracts/shared/ILifecycle.sol/ILifecycle.dbg.json +1 -1
  173. package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.dbg.json +1 -1
  174. package/artifacts/contracts/shared/IPolicyHolder.sol/IPolicyHolder.dbg.json +1 -1
  175. package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.dbg.json +1 -1
  176. package/artifacts/contracts/shared/IRegistryLinked.sol/IRegistryLinked.dbg.json +1 -1
  177. package/artifacts/contracts/shared/IService.sol/IService.dbg.json +1 -1
  178. package/artifacts/contracts/shared/InitializableCustom.sol/InitializableCustom.dbg.json +1 -1
  179. package/artifacts/contracts/shared/InitializableERC165.sol/InitializableERC165.dbg.json +4 -0
  180. package/artifacts/contracts/shared/{ERC165.sol/ERC165.json → InitializableERC165.sol/InitializableERC165.json} +4 -4
  181. package/artifacts/contracts/shared/InstanceLinkedComponent.sol/InstanceLinkedComponent.dbg.json +1 -1
  182. package/artifacts/contracts/shared/InstanceLinkedComponent.sol/InstanceLinkedComponent.json +19 -75
  183. package/artifacts/contracts/shared/KeyValueStore.sol/KeyValueStore.dbg.json +1 -1
  184. package/artifacts/contracts/shared/Lifecycle.sol/Lifecycle.dbg.json +1 -1
  185. package/artifacts/contracts/shared/NftIdSet.sol/NftIdSet.dbg.json +1 -1
  186. package/artifacts/contracts/shared/NftIdSet.sol/NftIdSet.json +2 -2
  187. package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.dbg.json +1 -1
  188. package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.json +2 -2
  189. package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.dbg.json +1 -1
  190. package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.json +2 -2
  191. package/artifacts/contracts/shared/Registerable.sol/Registerable.dbg.json +1 -1
  192. package/artifacts/contracts/shared/Registerable.sol/Registerable.json +2 -2
  193. package/artifacts/contracts/shared/RegistryLinked.sol/RegistryLinked.dbg.json +1 -1
  194. package/artifacts/contracts/shared/RegistryLinked.sol/RegistryLinked.json +2 -2
  195. package/artifacts/contracts/shared/Service.sol/Service.dbg.json +1 -1
  196. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.dbg.json +1 -1
  197. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.json +330 -11
  198. package/artifacts/contracts/shared/TokenHandlerDeployerLib.sol/TokenHandlerDeployerLib.dbg.json +4 -0
  199. package/artifacts/contracts/shared/TokenHandlerDeployerLib.sol/TokenHandlerDeployerLib.json +108 -0
  200. package/artifacts/contracts/staking/IStaking.sol/IStaking.dbg.json +1 -1
  201. package/artifacts/contracts/staking/IStaking.sol/IStaking.json +27 -27
  202. package/artifacts/contracts/staking/IStakingService.sol/IStakingService.dbg.json +1 -1
  203. package/artifacts/contracts/staking/StakeManagerLib.sol/StakeManagerLib.dbg.json +1 -1
  204. package/artifacts/contracts/staking/StakeManagerLib.sol/StakeManagerLib.json +73 -93
  205. package/artifacts/contracts/staking/Staking.sol/Staking.dbg.json +1 -1
  206. package/artifacts/contracts/staking/Staking.sol/Staking.json +77 -107
  207. package/artifacts/contracts/staking/StakingLifecycle.sol/StakingLifecycle.dbg.json +1 -1
  208. package/artifacts/contracts/staking/StakingLifecycle.sol/StakingLifecycle.json +2 -2
  209. package/artifacts/contracts/staking/StakingManager.sol/StakingManager.dbg.json +1 -1
  210. package/artifacts/contracts/staking/StakingManager.sol/StakingManager.json +26 -22
  211. package/artifacts/contracts/staking/StakingReader.sol/StakingReader.dbg.json +1 -1
  212. package/artifacts/contracts/staking/StakingReader.sol/StakingReader.json +6 -6
  213. package/artifacts/contracts/staking/StakingService.sol/StakingService.dbg.json +1 -1
  214. package/artifacts/contracts/staking/StakingService.sol/StakingService.json +22 -22
  215. package/artifacts/contracts/staking/StakingServiceManager.sol/StakingServiceManager.dbg.json +1 -1
  216. package/artifacts/contracts/staking/StakingServiceManager.sol/StakingServiceManager.json +12 -12
  217. package/artifacts/contracts/staking/StakingStore.sol/StakingStore.dbg.json +1 -1
  218. package/artifacts/contracts/staking/StakingStore.sol/StakingStore.json +89 -84
  219. package/artifacts/contracts/staking/TargetManagerLib.sol/TargetManagerLib.dbg.json +1 -1
  220. package/artifacts/contracts/staking/TargetManagerLib.sol/TargetManagerLib.json +59 -23
  221. package/artifacts/contracts/type/AddressSet.sol/LibAddressSet.dbg.json +1 -1
  222. package/artifacts/contracts/type/Amount.sol/AmountLib.dbg.json +1 -1
  223. package/artifacts/contracts/type/Amount.sol/AmountLib.json +37 -8
  224. package/artifacts/contracts/type/Blocknumber.sol/BlocknumberLib.dbg.json +1 -1
  225. package/artifacts/contracts/type/Blocknumber.sol/BlocknumberLib.json +2 -2
  226. package/artifacts/contracts/type/ClaimId.sol/ClaimIdLib.dbg.json +1 -1
  227. package/artifacts/contracts/type/ClaimId.sol/ClaimIdLib.json +2 -2
  228. package/artifacts/contracts/type/DistributorType.sol/DistributorTypeLib.dbg.json +1 -1
  229. package/artifacts/contracts/type/DistributorType.sol/DistributorTypeLib.json +2 -2
  230. package/artifacts/contracts/type/Fee.sol/FeeLib.dbg.json +1 -1
  231. package/artifacts/contracts/type/Fee.sol/FeeLib.json +7 -2
  232. package/artifacts/contracts/type/Key32.sol/Key32Lib.dbg.json +1 -1
  233. package/artifacts/contracts/type/Key32.sol/Key32Lib.json +2 -2
  234. package/artifacts/contracts/type/NftId.sol/NftIdLib.dbg.json +1 -1
  235. package/artifacts/contracts/type/NftId.sol/NftIdLib.json +2 -2
  236. package/artifacts/contracts/type/NftIdSet.sol/LibNftIdSet.dbg.json +1 -1
  237. package/artifacts/contracts/type/NftIdSet.sol/LibNftIdSet.json +2 -2
  238. package/artifacts/contracts/type/ObjectType.sol/ObjectTypeLib.dbg.json +1 -1
  239. package/artifacts/contracts/type/ObjectType.sol/ObjectTypeLib.json +2 -2
  240. package/artifacts/contracts/type/PayoutId.sol/PayoutIdLib.dbg.json +1 -1
  241. package/artifacts/contracts/type/PayoutId.sol/PayoutIdLib.json +2 -2
  242. package/artifacts/contracts/type/Referral.sol/ReferralLib.dbg.json +1 -1
  243. package/artifacts/contracts/type/Referral.sol/ReferralLib.json +2 -2
  244. package/artifacts/contracts/type/RequestId.sol/RequestIdLib.dbg.json +1 -1
  245. package/artifacts/contracts/type/RequestId.sol/RequestIdLib.json +2 -2
  246. package/artifacts/contracts/type/RiskId.sol/RiskIdLib.dbg.json +1 -1
  247. package/artifacts/contracts/type/RiskId.sol/RiskIdLib.json +2 -2
  248. package/artifacts/contracts/type/RoleId.sol/RoleIdLib.dbg.json +1 -1
  249. package/artifacts/contracts/type/RoleId.sol/RoleIdLib.json +2 -2
  250. package/artifacts/contracts/type/Seconds.sol/SecondsLib.dbg.json +1 -1
  251. package/artifacts/contracts/type/Seconds.sol/SecondsLib.json +50 -2
  252. package/artifacts/contracts/type/Selector.sol/SelectorLib.dbg.json +1 -1
  253. package/artifacts/contracts/type/Selector.sol/SelectorSetLib.dbg.json +1 -1
  254. package/artifacts/contracts/type/StateId.sol/StateIdLib.dbg.json +1 -1
  255. package/artifacts/contracts/type/StateId.sol/StateIdLib.json +2 -2
  256. package/artifacts/contracts/type/String.sol/StrLib.dbg.json +1 -1
  257. package/artifacts/contracts/type/Timestamp.sol/TimestampLib.dbg.json +1 -1
  258. package/artifacts/contracts/type/Timestamp.sol/TimestampLib.json +23 -4
  259. package/artifacts/contracts/type/UFixed.sol/MathLib.dbg.json +1 -1
  260. package/artifacts/contracts/type/UFixed.sol/MathLib.json +9 -3
  261. package/artifacts/contracts/type/UFixed.sol/UFixedLib.dbg.json +1 -1
  262. package/artifacts/contracts/type/UFixed.sol/UFixedLib.json +39 -2
  263. package/artifacts/contracts/type/Version.sol/VersionLib.dbg.json +1 -1
  264. package/artifacts/contracts/type/Version.sol/VersionPartLib.dbg.json +1 -1
  265. package/artifacts/contracts/upgradeability/IVersionable.sol/IVersionable.dbg.json +4 -0
  266. package/artifacts/contracts/{shared → upgradeability}/IVersionable.sol/IVersionable.json +1 -1
  267. package/artifacts/contracts/upgradeability/ProxyManager.sol/ProxyManager.dbg.json +4 -0
  268. package/artifacts/contracts/{shared → upgradeability}/ProxyManager.sol/ProxyManager.json +3 -3
  269. package/artifacts/contracts/upgradeability/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.dbg.json +4 -0
  270. package/artifacts/contracts/{shared → upgradeability}/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.json +3 -3
  271. package/artifacts/contracts/upgradeability/Versionable.sol/Versionable.dbg.json +4 -0
  272. package/artifacts/contracts/{shared → upgradeability}/Versionable.sol/Versionable.json +1 -1
  273. package/contracts/authorization/Authorization.sol +0 -1
  274. package/contracts/distribution/BasicDistribution.sol +4 -15
  275. package/contracts/distribution/BasicDistributionAuthorization.sol +5 -1
  276. package/contracts/distribution/Distribution.sol +22 -10
  277. package/contracts/distribution/DistributionService.sol +67 -33
  278. package/contracts/distribution/DistributionServiceManager.sol +2 -5
  279. package/contracts/distribution/IDistributionComponent.sol +8 -4
  280. package/contracts/distribution/IDistributionService.sol +18 -2
  281. package/contracts/instance/IInstance.sol +7 -30
  282. package/contracts/instance/Instance.sol +8 -33
  283. package/contracts/instance/InstanceAdmin.sol +23 -4
  284. package/contracts/instance/InstanceAuthorizationV3.sol +5 -3
  285. package/contracts/instance/InstanceReader.sol +32 -7
  286. package/contracts/instance/InstanceService.sol +57 -33
  287. package/contracts/instance/InstanceServiceManager.sol +2 -6
  288. package/contracts/instance/InstanceStore.sol +12 -1
  289. package/contracts/instance/base/ObjectLifecycle.sol +9 -4
  290. package/contracts/instance/module/IBundle.sol +1 -1
  291. package/contracts/instance/module/IComponents.sol +1 -7
  292. package/contracts/instance/module/IDistribution.sol +0 -1
  293. package/contracts/instance/module/IPolicy.sol +22 -22
  294. package/contracts/mock/Dip.sol +1 -1
  295. package/contracts/oracle/IOracleComponent.sol +2 -1
  296. package/contracts/oracle/Oracle.sol +16 -6
  297. package/contracts/oracle/OracleService.sol +1 -0
  298. package/contracts/oracle/OracleServiceManager.sol +2 -5
  299. package/contracts/pool/BasicPool.sol +7 -5
  300. package/contracts/pool/BasicPoolAuthorization.sol +11 -2
  301. package/contracts/pool/BundleService.sol +182 -40
  302. package/contracts/pool/BundleServiceManager.sol +2 -5
  303. package/contracts/pool/IBundleService.sol +33 -5
  304. package/contracts/pool/IPoolComponent.sol +6 -0
  305. package/contracts/pool/IPoolService.sol +36 -26
  306. package/contracts/pool/Pool.sol +39 -24
  307. package/contracts/pool/PoolService.sol +161 -103
  308. package/contracts/pool/PoolServiceManager.sol +2 -5
  309. package/contracts/product/ApplicationService.sol +51 -57
  310. package/contracts/product/ApplicationServiceManager.sol +2 -2
  311. package/contracts/product/BasicProduct.sol +3 -32
  312. package/contracts/product/BasicProductAuthorization.sol +3 -0
  313. package/contracts/product/ClaimService.sol +118 -73
  314. package/contracts/product/ClaimServiceManager.sol +2 -2
  315. package/contracts/product/IApplicationService.sol +1 -0
  316. package/contracts/product/IClaimService.sol +28 -5
  317. package/contracts/product/IPolicyService.sol +27 -32
  318. package/contracts/product/IPricingService.sol +7 -7
  319. package/contracts/product/IProductComponent.sol +1 -1
  320. package/contracts/product/{IProductService.sol → IRiskService.sol} +1 -1
  321. package/contracts/product/PolicyService.sol +278 -180
  322. package/contracts/product/PolicyServiceManager.sol +2 -5
  323. package/contracts/product/PricingService.sol +42 -41
  324. package/contracts/product/PricingServiceManager.sol +2 -5
  325. package/contracts/product/Product.sol +67 -34
  326. package/contracts/product/{ProductService.sol → RiskService.sol} +10 -37
  327. package/contracts/product/RiskServiceManager.sol +39 -0
  328. package/contracts/registry/IRegistry.sol +1 -1
  329. package/contracts/registry/Registry.sol +1 -1
  330. package/contracts/registry/RegistryAdmin.sol +10 -1
  331. package/contracts/registry/RegistryService.sol +4 -18
  332. package/contracts/registry/RegistryServiceManager.sol +2 -2
  333. package/contracts/registry/ReleaseRegistry.sol +1 -3
  334. package/contracts/registry/ServiceAuthorizationV3.sol +2 -3
  335. package/contracts/shared/Component.sol +25 -38
  336. package/contracts/shared/ComponentService.sol +82 -22
  337. package/contracts/shared/ComponentServiceManager.sol +2 -2
  338. package/contracts/shared/ComponentVerifyingService.sol +1 -1
  339. package/contracts/shared/IComponent.sol +4 -4
  340. package/contracts/shared/IComponentService.sol +15 -9
  341. package/contracts/shared/IInstanceLinkedComponent.sol +9 -10
  342. package/contracts/shared/IService.sol +1 -1
  343. package/contracts/shared/{ERC165.sol → InitializableERC165.sol} +1 -1
  344. package/contracts/shared/InstanceLinkedComponent.sol +22 -1
  345. package/contracts/shared/NftOwnable.sol +3 -3
  346. package/contracts/shared/PolicyHolder.sol +2 -5
  347. package/contracts/shared/Service.sol +3 -4
  348. package/contracts/shared/TokenHandler.sol +100 -19
  349. package/contracts/shared/TokenHandlerDeployerLib.sol +12 -0
  350. package/contracts/staking/IStaking.sol +3 -2
  351. package/contracts/staking/StakeManagerLib.sol +18 -25
  352. package/contracts/staking/Staking.sol +23 -36
  353. package/contracts/staking/StakingManager.sol +2 -5
  354. package/contracts/staking/StakingReader.sol +6 -9
  355. package/contracts/staking/StakingService.sol +8 -12
  356. package/contracts/staking/StakingServiceManager.sol +2 -2
  357. package/contracts/staking/StakingStore.sol +5 -15
  358. package/contracts/staking/TargetManagerLib.sol +7 -3
  359. package/contracts/type/Amount.sol +12 -5
  360. package/contracts/type/Blocknumber.sol +7 -1
  361. package/contracts/type/ObjectType.sol +15 -11
  362. package/contracts/type/Referral.sol +1 -0
  363. package/contracts/type/Seconds.sol +21 -1
  364. package/contracts/type/StateId.sol +1 -0
  365. package/contracts/type/Timestamp.sol +11 -1
  366. package/contracts/type/UFixed.sol +29 -10
  367. package/contracts/{shared → upgradeability}/ProxyManager.sol +3 -4
  368. package/contracts/{shared → upgradeability}/UpgradableProxyWithAdmin.sol +1 -3
  369. package/package.json +1 -1
  370. package/artifacts/contracts/product/IProductService.sol/IProductService.dbg.json +0 -4
  371. package/artifacts/contracts/product/ProductService.sol/ProductService.dbg.json +0 -4
  372. package/artifacts/contracts/product/ProductServiceManager.sol/ProductServiceManager.dbg.json +0 -4
  373. package/artifacts/contracts/shared/ERC165.sol/ERC165.dbg.json +0 -4
  374. package/artifacts/contracts/shared/IVersionable.sol/IVersionable.dbg.json +0 -4
  375. package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.dbg.json +0 -4
  376. package/artifacts/contracts/shared/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.dbg.json +0 -4
  377. package/artifacts/contracts/shared/Versionable.sol/Versionable.dbg.json +0 -4
  378. package/contracts/product/ProductServiceManager.sol +0 -42
  379. /package/contracts/{shared → upgradeability}/IVersionable.sol +0 -0
  380. /package/contracts/{shared → upgradeability}/Versionable.sol +0 -0
@@ -1,45 +1,30 @@
1
1
  // SPDX-License-Identifier: Apache-2.0
2
2
  pragma solidity ^0.8.20;
3
3
 
4
- import {Pool} from "./Pool.sol";
5
- import {IRegistry} from "../registry/IRegistry.sol";
6
- import {IInstance} from "../instance/IInstance.sol";
7
4
  import {IBundle} from "../instance/module/IBundle.sol";
5
+ import {IBundleService} from "./IBundleService.sol";
8
6
  import {IComponents} from "../instance/module/IComponents.sol";
7
+ import {IComponentService} from "../shared/IComponentService.sol";
8
+ import {IInstance} from "../instance/IInstance.sol";
9
+ import {IInstanceService} from "../instance/IInstanceService.sol";
9
10
  import {IPolicy} from "../instance/module/IPolicy.sol";
10
-
11
- import {IVersionable} from "../shared/IVersionable.sol";
12
- import {Versionable} from "../shared/Versionable.sol";
13
- import {INftOwnable} from "../shared/INftOwnable.sol";
11
+ import {IPoolService} from "./IPoolService.sol";
12
+ import {IRegistry} from "../registry/IRegistry.sol";
13
+ import {IRegistryService} from "../registry/IRegistryService.sol";
14
+ import {IStaking} from "../staking/IStaking.sol";
14
15
 
15
16
  import {Amount, AmountLib} from "../type/Amount.sol";
16
17
  import {Fee, FeeLib} from "../type/Fee.sol";
17
- import {NftId, NftIdLib} from "../type/NftId.sol";
18
- import {ObjectType, POOL, BUNDLE, COMPONENT, INSTANCE, REGISTRY, STAKING} from "../type/ObjectType.sol";
18
+ import {NftId} from "../type/NftId.sol";
19
+ import {ObjectType, POOL, BUNDLE, COMPONENT, INSTANCE, REGISTRY} from "../type/ObjectType.sol";
19
20
  import {RoleId, PUBLIC_ROLE} from "../type/RoleId.sol";
20
21
  import {Fee, FeeLib} from "../type/Fee.sol";
21
- import {Version, VersionLib} from "../type/Version.sol";
22
- import {KEEP_STATE, StateId} from "../type/StateId.sol";
22
+ import {KEEP_STATE} from "../type/StateId.sol";
23
23
  import {Seconds} from "../type/Seconds.sol";
24
- import {TimestampLib, zeroTimestamp} from "../type/Timestamp.sol";
25
- import {TokenHandler} from "../shared/TokenHandler.sol";
26
24
  import {UFixed} from "../type/UFixed.sol";
27
- import {Version, VersionLib} from "../type/Version.sol";
28
-
29
- import {IService} from "../shared/IService.sol";
30
- import {Service} from "../shared/Service.sol";
31
25
  import {ComponentVerifyingService} from "../shared/ComponentVerifyingService.sol";
32
- import {IBundleService} from "./IBundleService.sol";
33
- import {IComponentService} from "../shared/IComponentService.sol";
34
- import {IInstanceService} from "../instance/IInstanceService.sol";
35
- import {IPoolService} from "./IPoolService.sol";
36
- import {IRegistryService} from "../registry/IRegistryService.sol";
37
- import {IStaking} from "../staking/IStaking.sol";
38
- import {InstanceService} from "../instance/InstanceService.sol";
39
26
  import {InstanceReader} from "../instance/InstanceReader.sol";
40
27
  import {InstanceStore} from "../instance/InstanceStore.sol";
41
- import {IComponent} from "../shared/IComponent.sol";
42
- import {IPoolComponent} from "./IPoolComponent.sol";
43
28
 
44
29
  string constant POOL_SERVICE_NAME = "PoolService";
45
30
 
@@ -47,9 +32,6 @@ contract PoolService is
47
32
  ComponentVerifyingService,
48
33
  IPoolService
49
34
  {
50
- using NftIdLib for NftId;
51
- using AmountLib for Amount;
52
-
53
35
  IBundleService internal _bundleService;
54
36
  IComponentService internal _componentService;
55
37
  IInstanceService private _instanceService;
@@ -83,24 +65,20 @@ contract PoolService is
83
65
  registerInterface(type(IPoolService).interfaceId);
84
66
  }
85
67
 
86
-
87
- function setMaxCapitalAmount(Amount maxCapitalAmount)
68
+ /// @inheritdoc IPoolService
69
+ function setMaxBalanceAmount(Amount maxBalanceAmount)
88
70
  external
89
71
  virtual
90
72
  {
91
- /*
92
73
  (NftId poolNftId,, IInstance instance) = _getAndVerifyActiveComponent(POOL());
93
74
  InstanceReader instanceReader = instance.getInstanceReader();
75
+ IComponents.PoolInfo memory poolInfo = instanceReader.getPoolInfo(poolNftId);
94
76
 
95
- IComponents.ComponentInfo memory componentInfo = instanceReader.getComponentInfo(poolNftId);
96
- IComponents.PoolInfo memory poolInfo = abi.decode(componentInfo.data, (IComponents.PoolInfo));
97
- Amount previousMaxCapitalAmount = poolInfo.maxCapitalAmount;
98
-
99
- poolInfo.maxCapitalAmount = maxCapitalAmount;
77
+ Amount previousMaxBalanceAmount = poolInfo.maxBalanceAmount;
78
+ poolInfo.maxBalanceAmount = maxBalanceAmount;
100
79
  instance.getInstanceStore().updatePool(poolNftId, poolInfo, KEEP_STATE());
101
80
 
102
- emit LogPoolServiceMaxCapitalAmountUpdated(poolNftId, previousMaxCapitalAmount, maxCapitalAmount);
103
- */
81
+ emit LogPoolServiceMaxBalanceAmountUpdated(poolNftId, previousMaxBalanceAmount, maxBalanceAmount);
104
82
  }
105
83
 
106
84
  function setBundleOwnerRole(RoleId bundleOwnerRole)
@@ -124,31 +102,10 @@ contract PoolService is
124
102
  emit LogPoolServiceBundleOwnerRoleSet(poolNftId, bundleOwnerRole);
125
103
  }
126
104
 
127
-
128
- function setFees(
129
- Fee memory poolFee,
130
- Fee memory stakingFee,
131
- Fee memory performanceFee
132
- )
133
- external
134
- virtual
135
- {
136
- (NftId poolNftId,, IInstance instance) = _getAndVerifyActiveComponent(POOL());
137
-
138
- IComponents.PoolInfo memory poolInfo = instance.getInstanceReader().getPoolInfo(poolNftId);
139
- poolInfo.poolFee = poolFee;
140
- poolInfo.stakingFee = stakingFee;
141
- poolInfo.performanceFee = performanceFee;
142
-
143
- instance.getInstanceStore().updatePool(poolNftId, poolInfo, KEEP_STATE());
144
-
145
- // TODO add logging
146
- }
147
-
105
+ /// @inheritdoc IPoolService
148
106
  function createBundle(
149
107
  address bundleOwner, // initial bundle owner
150
108
  Fee memory fee, // fees deducted from premium that go to bundle owner
151
- Amount stakingAmount, // staking amount - staking fees result in initial bundle capital
152
109
  Seconds lifetime, // initial duration for which new policies are covered
153
110
  bytes calldata filter // optional use case specific criteria that define if a policy may be covered by this bundle
154
111
  )
@@ -157,38 +114,17 @@ contract PoolService is
157
114
  returns(NftId bundleNftId)
158
115
  {
159
116
  (NftId poolNftId,, IInstance instance) = _getAndVerifyActiveComponent(POOL());
160
- InstanceReader instanceReader = instance.getInstanceReader();
161
-
162
- (
163
- Amount stakingFeeAmount,
164
- Amount stakingNetAmount
165
- ) = FeeLib.calculateFee(
166
- _getStakingFee(instanceReader, poolNftId),
167
- stakingAmount);
168
117
 
118
+ // create the empty bundle
169
119
  bundleNftId = _bundleService.create(
170
120
  instance,
171
121
  poolNftId,
172
122
  bundleOwner,
173
123
  fee,
174
- stakingNetAmount,
124
+ AmountLib.zero(),
175
125
  lifetime,
176
126
  filter);
177
127
 
178
- // pool book keeping
179
- _componentService.increasePoolBalance(
180
- instance.getInstanceStore(),
181
- poolNftId,
182
- stakingAmount,
183
- stakingFeeAmount);
184
-
185
- // pool bookkeeping and collect tokens from bundle owner
186
- _collectStakingAmount(
187
- instanceReader,
188
- poolNftId,
189
- bundleOwner,
190
- stakingAmount);
191
-
192
128
  emit LogPoolServiceBundleCreated(instance.getNftId(), poolNftId, bundleNftId);
193
129
  }
194
130
 
@@ -198,8 +134,8 @@ contract PoolService is
198
134
  view
199
135
  returns (Fee memory stakingFee)
200
136
  {
201
- NftId productNftId = instanceReader.getPoolInfo(poolNftId).productNftId;
202
- return instanceReader.getPoolInfo(productNftId).stakingFee;
137
+ NftId productNftId = instanceReader.getComponentInfo(poolNftId).productNftId;
138
+ return instanceReader.getProductInfo(productNftId).stakingFee;
203
139
  }
204
140
 
205
141
  function closeBundle(NftId bundleNftId)
@@ -208,20 +144,147 @@ contract PoolService is
208
144
  {
209
145
  (NftId poolNftId,, IInstance instance) = _getAndVerifyActiveComponent(POOL());
210
146
 
211
- // TODO book keeping for pool collateral released outside of retention level
147
+ // TODO get performance fee for pool (#477)
212
148
 
213
149
  // releasing collateral in bundle
214
- _bundleService.close(instance, bundleNftId);
215
-
216
- // TODO get performance fee for pool, transfer of remaining funds + bundle fees to bundle owner
150
+ (Amount unstakedAmount, Amount feeAmount) = _bundleService.close(instance, bundleNftId);
217
151
 
152
+ _componentService.decreasePoolBalance(
153
+ instance.getInstanceStore(),
154
+ poolNftId,
155
+ unstakedAmount + feeAmount,
156
+ AmountLib.zero());
157
+
218
158
  emit LogPoolServiceBundleClosed(instance.getNftId(), poolNftId, bundleNftId);
159
+
160
+ if ((unstakedAmount + feeAmount).gtz()){
161
+ IComponents.ComponentInfo memory poolComponentInfo = instance.getInstanceReader().getComponentInfo(poolNftId);
162
+ poolComponentInfo.tokenHandler.distributeTokens(
163
+ poolComponentInfo.wallet,
164
+ getRegistry().ownerOf(bundleNftId),
165
+ unstakedAmount + feeAmount);
166
+ }
167
+ }
168
+
169
+ /// @inheritdoc IPoolService
170
+ function stake(NftId bundleNftId, Amount amount)
171
+ external
172
+ virtual
173
+ // TODO: restricted() (once #462 is done)
174
+ returns(Amount netAmount)
175
+ {
176
+ (NftId poolNftId,, IInstance instance) = _getAndVerifyActiveComponent(POOL());
177
+ InstanceReader instanceReader = instance.getInstanceReader();
178
+ IBundle.BundleInfo memory bundleInfo = instanceReader.getBundleInfo(bundleNftId);
179
+ IComponents.PoolInfo memory poolInfo = instanceReader.getPoolInfo(poolNftId);
180
+
181
+ if (bundleInfo.poolNftId != poolNftId) {
182
+ revert ErrorPoolServiceBundlePoolMismatch(bundleNftId, poolNftId);
183
+ }
184
+
185
+ {
186
+ Amount currentPoolBalance = instanceReader.getBalanceAmount(poolNftId);
187
+ if (currentPoolBalance + amount > poolInfo.maxBalanceAmount) {
188
+ revert ErrorPoolServiceMaxBalanceAmountExceeded(poolNftId, poolInfo.maxBalanceAmount, currentPoolBalance, amount);
189
+ }
190
+ }
191
+
192
+ // calculate fees
193
+ Amount feeAmount;
194
+ (
195
+ feeAmount,
196
+ netAmount
197
+ ) = FeeLib.calculateFee(
198
+ _getStakingFee(instanceReader, poolNftId),
199
+ amount);
200
+
201
+ // do all the bookkeeping
202
+ _componentService.increasePoolBalance(
203
+ instance.getInstanceStore(),
204
+ poolNftId,
205
+ netAmount,
206
+ feeAmount);
207
+
208
+ _bundleService.stake(instance, bundleNftId, netAmount);
209
+
210
+ // collect tokens from bundle owner
211
+ address bundleOwner = getRegistry().ownerOf(bundleNftId);
212
+ emit LogPoolServiceBundleStaked(instance.getNftId(), poolNftId, bundleNftId, amount, netAmount);
213
+
214
+ // TODO only collect staking token when pool is not externally managed
215
+ _collectStakingAmount(
216
+ instanceReader,
217
+ poolNftId,
218
+ bundleOwner,
219
+ amount);
220
+ }
221
+
222
+ /// @inheritdoc IPoolService
223
+ function unstake(NftId bundleNftId, Amount amount)
224
+ external
225
+ virtual
226
+ // TODO: restricted() (once #462 is done)
227
+ returns(Amount netAmount)
228
+ {
229
+ (NftId poolNftId,, IInstance instance) = _getAndVerifyActiveComponent(POOL());
230
+ InstanceReader instanceReader = instance.getInstanceReader();
231
+ InstanceStore instanceStore = instance.getInstanceStore();
232
+ IBundle.BundleInfo memory bundleInfo = instanceReader.getBundleInfo(bundleNftId);
233
+
234
+ if (bundleInfo.poolNftId != poolNftId) {
235
+ revert ErrorPoolServiceBundlePoolMismatch(bundleNftId, poolNftId);
236
+ }
237
+
238
+ // call bundle service for bookkeeping and additional checks
239
+ Amount unstakedAmount = _bundleService.unstake(instance, bundleNftId, amount);
240
+
241
+ // Important: from now on work only with unstakedAmount as it is the only reliable amount.
242
+ // if amount was max, this was set to the available amount
243
+
244
+ // TODO: handle performance fees (issue #477)
245
+
246
+ // update pool bookkeeping - performance fees stay in the pool, but as fees
247
+ _componentService.decreasePoolBalance(
248
+ instanceStore,
249
+ poolNftId,
250
+ unstakedAmount,
251
+ AmountLib.zero());
252
+
253
+ IComponents.ComponentInfo memory poolComponentInfo = instanceReader.getComponentInfo(poolNftId);
254
+ address poolWallet = poolComponentInfo.wallet;
255
+ // transfer amount to bundle owner
256
+ address owner = getRegistry().ownerOf(bundleNftId);
257
+ emit LogPoolServiceBundleUnstaked(instance.getNftId(), poolNftId, bundleNftId, unstakedAmount);
258
+ poolComponentInfo.tokenHandler.distributeTokens(
259
+ poolWallet,
260
+ owner,
261
+ unstakedAmount);
262
+ return unstakedAmount;
263
+ }
264
+
265
+
266
+ function fundPoolWallet(NftId poolNftId, Amount amount)
267
+ external
268
+ virtual
269
+ restricted()
270
+ {
271
+ // TODO check that poolNftId is externally managed
272
+ // TODO implement
219
273
  }
220
274
 
221
275
 
276
+ function defundPoolWallet(NftId poolNftId, Amount amount)
277
+ external
278
+ virtual
279
+ restricted()
280
+ {
281
+ // TODO check that poolNftId is externally managed
282
+ // TODO implement
283
+ }
284
+
222
285
  function processSale(
223
286
  NftId bundleNftId,
224
- IPolicy.Premium memory premium
287
+ IPolicy.PremiumInfo memory premium
225
288
  )
226
289
  external
227
290
  virtual
@@ -233,9 +296,9 @@ contract PoolService is
233
296
  IRegistry.ObjectInfo memory instanceObjectInfo = registry.getObjectInfo(poolObjectInfo.parentNftId);
234
297
  IInstance instance = IInstance(instanceObjectInfo.objectAddress);
235
298
 
236
- Amount poolFeeAmount = AmountLib.toAmount(premium.poolFeeFixAmount + premium.poolFeeVarAmount);
237
- Amount bundleFeeAmount = AmountLib.toAmount(premium.bundleFeeFixAmount + premium.bundleFeeVarAmount);
238
- Amount bundleNetAmount = AmountLib.toAmount(premium.netPremiumAmount);
299
+ Amount poolFeeAmount = premium.poolFeeFixAmount + premium.poolFeeVarAmount;
300
+ Amount bundleFeeAmount = premium.bundleFeeFixAmount + premium.bundleFeeVarAmount;
301
+ Amount bundleNetAmount = premium.netPremiumAmount;
239
302
 
240
303
  InstanceStore instanceStore = instance.getInstanceStore();
241
304
  _componentService.increasePoolBalance(
@@ -421,7 +484,6 @@ contract PoolService is
421
484
  }
422
485
 
423
486
 
424
- // TODO create (I)TreasuryService that deals with all gif related token transfers
425
487
  /// @dev transfers the specified amount from the bundle owner to the pool's wallet
426
488
  function _collectStakingAmount(
427
489
  InstanceReader instanceReader,
@@ -434,15 +496,11 @@ contract PoolService is
434
496
 
435
497
  // collecting investor token
436
498
  IComponents.ComponentInfo memory componentInfo = instanceReader.getComponentInfo(poolNftId);
437
- TokenHandler tokenHandler = componentInfo.tokenHandler;
438
499
  address poolWallet = componentInfo.wallet;
439
-
440
- if(amount.gtz()) {
441
- tokenHandler.transfer(
442
- bundleOwner,
443
- poolWallet,
444
- amount);
445
- }
500
+ componentInfo.tokenHandler.collectTokens(
501
+ bundleOwner,
502
+ poolWallet,
503
+ amount);
446
504
  }
447
505
 
448
506
  function _getDomain() internal pure override returns(ObjectType) {
@@ -1,12 +1,9 @@
1
1
  // SPDX-License-Identifier: Apache-2.0
2
2
  pragma solidity ^0.8.20;
3
3
 
4
- import {IVersionable} from "../shared/IVersionable.sol";
5
- import {ProxyManager} from "../shared/ProxyManager.sol";
4
+ import {IVersionable} from "../upgradeability/IVersionable.sol";
5
+ import {ProxyManager} from "../upgradeability/ProxyManager.sol";
6
6
  import {PoolService} from "./PoolService.sol";
7
- import {Registry} from "../registry/Registry.sol";
8
- import {RegistryService} from "../registry/RegistryService.sol";
9
- import {REGISTRY} from "../type/ObjectType.sol";
10
7
 
11
8
  contract PoolServiceManager is ProxyManager {
12
9
 
@@ -1,51 +1,27 @@
1
1
  // SPDX-License-Identifier: Apache-2.0
2
2
  pragma solidity ^0.8.20;
3
3
 
4
+ import {IApplicationService} from "./IApplicationService.sol";
5
+ import {IComponents} from "../instance/module/IComponents.sol";
6
+ import {IInstance} from "../instance/IInstance.sol";
7
+ import {IRegistry} from "../registry/IRegistry.sol";
8
+ import {IPolicy} from "../instance/module/IPolicy.sol";
9
+ import {IDistributionService} from "../distribution/IDistributionService.sol";
10
+ import {IPricingService} from "./IPricingService.sol";
11
+ import {IRegistryService} from "../registry/IRegistryService.sol";
12
+
4
13
  import {AmountLib} from "../type/Amount.sol";
5
14
  import {Seconds} from "../type/Seconds.sol";
6
- import {Timestamp, TimestampLib, zeroTimestamp} from "../type/Timestamp.sol";
7
- import {UFixed, UFixedLib} from "../type/UFixed.sol";
8
- import {Blocknumber, blockNumber} from "../type/Blocknumber.sol";
9
- import {ObjectType, DISTRIBUTION, INSTANCE, PRODUCT, POOL, REGISTRY, APPLICATION, POLICY, BUNDLE, PRICE} from "../type/ObjectType.sol";
10
- import {APPLIED, REVOKED, ACTIVE, KEEP_STATE} from "../type/StateId.sol";
15
+ import {zeroTimestamp} from "../type/Timestamp.sol";
16
+ import {ObjectType, DISTRIBUTION, PRODUCT, REGISTRY, APPLICATION, POLICY, PRICE} from "../type/ObjectType.sol";
17
+ import {REVOKED} from "../type/StateId.sol";
11
18
  import {NftId, NftIdLib} from "../type/NftId.sol";
12
- import {Fee, FeeLib} from "../type/Fee.sol";
13
19
  import {ReferralId} from "../type/Referral.sol";
14
20
  import {RiskId} from "../type/RiskId.sol";
15
- import {StateId} from "../type/StateId.sol";
16
- import {Version, VersionLib} from "../type/Version.sol";
17
21
  import {Amount, AmountLib} from "../type/Amount.sol";
18
-
19
- import {TokenHandler} from "../shared/TokenHandler.sol";
20
- import {IVersionable} from "../shared/IVersionable.sol";
21
- import {Versionable} from "../shared/Versionable.sol";
22
- import {IService} from "../shared/IService.sol";
23
- import {Service} from "../shared/Service.sol";
24
-
25
- import {IRegistry} from "../registry/IRegistry.sol";
26
-
27
- import {IProductComponent} from "./IProductComponent.sol";
28
- import {IPoolComponent} from "../pool/IPoolComponent.sol";
29
- import {IDistributionComponent} from "../distribution/IDistributionComponent.sol";
30
- import {Product} from "./Product.sol";
31
-
32
- import {IComponents} from "../instance/module/IComponents.sol";
33
- import {IPolicy} from "../instance/module/IPolicy.sol";
34
- import {IRisk} from "../instance/module/IRisk.sol";
35
- import {IBundle} from "../instance/module/IBundle.sol";
36
- import {IProductService} from "./IProductService.sol";
37
-
38
22
  import {ComponentVerifyingService} from "../shared/ComponentVerifyingService.sol";
39
-
40
- import {IInstance} from "../instance/IInstance.sol";
41
23
  import {InstanceReader} from "../instance/InstanceReader.sol";
42
24
 
43
- import {IApplicationService} from "./IApplicationService.sol";
44
- import {IBundleService} from "../pool/IBundleService.sol";
45
- import {IDistributionService} from "../distribution/IDistributionService.sol";
46
- import {IPoolService} from "../pool/IPoolService.sol";
47
- import {IPricingService} from "./IPricingService.sol";
48
- import {IRegistryService} from "../registry/IRegistryService.sol";
49
25
 
50
26
 
51
27
  contract ApplicationService is
@@ -135,8 +111,7 @@ contract ApplicationService is
135
111
  view
136
112
  returns (Amount premiumAmount)
137
113
  {
138
- return AmountLib.toAmount(
139
- _pricingService.calculatePremium(
114
+ return _pricingService.calculatePremium(
140
115
  info.productNftId,
141
116
  info.riskId,
142
117
  info.sumInsuredAmount,
@@ -144,7 +119,7 @@ contract ApplicationService is
144
119
  info.applicationData,
145
120
  info.bundleNftId,
146
121
  info.referralId
147
- ).premiumAmount);
122
+ ).premiumAmount;
148
123
  }
149
124
 
150
125
 
@@ -152,6 +127,7 @@ contract ApplicationService is
152
127
  address applicationOwner,
153
128
  RiskId riskId,
154
129
  Amount sumInsuredAmount,
130
+ Amount premiumAmount,
155
131
  Seconds lifetime,
156
132
  NftId bundleNftId,
157
133
  ReferralId referralId,
@@ -176,14 +152,45 @@ contract ApplicationService is
176
152
  applicationNftId = _registerApplication(productNftId, applicationOwner);
177
153
 
178
154
  // create policy info for application
179
- IPolicy.PolicyInfo memory applicationInfo = IPolicy.PolicyInfo({
155
+ IPolicy.PolicyInfo memory applicationInfo = _createApplicationInfo(
156
+ productNftId,
157
+ riskId,
158
+ sumInsuredAmount,
159
+ premiumAmount,
160
+ lifetime,
161
+ bundleNftId,
162
+ referralId,
163
+ applicationData);
164
+
165
+ // register application with instance
166
+ instance.getInstanceStore().createApplication(
167
+ applicationNftId,
168
+ applicationInfo);
169
+
170
+ // TODO: add logging
171
+ }
172
+
173
+ function _createApplicationInfo(
174
+ NftId productNftId,
175
+ RiskId riskId,
176
+ Amount sumInsuredAmount,
177
+ Amount premiumAmount,
178
+ Seconds lifetime,
179
+ NftId bundleNftId,
180
+ ReferralId referralId,
181
+ bytes memory applicationData
182
+ )
183
+ internal
184
+ virtual
185
+ returns (IPolicy.PolicyInfo memory applicationInfo)
186
+ {
187
+ return IPolicy.PolicyInfo({
180
188
  productNftId: productNftId,
181
189
  bundleNftId: bundleNftId,
182
190
  referralId: referralId,
183
191
  riskId: riskId,
184
192
  sumInsuredAmount: sumInsuredAmount,
185
- premiumAmount: AmountLib.zero(),
186
- premiumPaidAmount: AmountLib.zero(),
193
+ premiumAmount: premiumAmount,
187
194
  lifetime: lifetime,
188
195
  applicationData: applicationData,
189
196
  processData: "",
@@ -195,21 +202,8 @@ contract ApplicationService is
195
202
  expiredAt: zeroTimestamp(),
196
203
  closedAt: zeroTimestamp()
197
204
  });
198
-
199
- // TODO consider to provide this amount externally
200
- // actual calculation is done 2nd time anyway for premium collection
201
- // calculate premium amount
202
- applicationInfo.premiumAmount = _calculatePremiumAmount(applicationInfo);
203
-
204
- // register application with instance
205
- instance.getInstanceStore().createApplication(
206
- applicationNftId,
207
- applicationInfo);
208
-
209
- // TODO: add logging
210
205
  }
211
206
 
212
-
213
207
  function renew(
214
208
  NftId policyNftId, // policy to be renewd (renewal inherits policy attributes)
215
209
  NftId bundleNftId // will likely need a newer bundle for underwriting
@@ -218,7 +212,7 @@ contract ApplicationService is
218
212
  virtual override
219
213
  returns (NftId applicationNftId)
220
214
  {
221
-
215
+ // TODO implement
222
216
  }
223
217
 
224
218
 
@@ -234,7 +228,7 @@ contract ApplicationService is
234
228
  external
235
229
  virtual override
236
230
  {
237
-
231
+ // TODO implement
238
232
  }
239
233
 
240
234
  function revoke(NftId applicationNftId)
@@ -1,8 +1,8 @@
1
1
  // SPDX-License-Identifier: Apache-2.0
2
2
  pragma solidity ^0.8.20;
3
3
 
4
- import {IVersionable} from "../shared/IVersionable.sol";
5
- import {ProxyManager} from "../shared/ProxyManager.sol";
4
+ import {IVersionable} from "../upgradeability/IVersionable.sol";
5
+ import {ProxyManager} from "../upgradeability/ProxyManager.sol";
6
6
  import {ApplicationService} from "./ApplicationService.sol";
7
7
 
8
8
  contract ApplicationServiceManager is ProxyManager {
@@ -1,43 +1,15 @@
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
-
6
- import {Amount, AmountLib} from "../type/Amount.sol";
7
- import {ClaimId} from "../type/ClaimId.sol";
8
- import {InstanceLinkedComponent} from "../shared/InstanceLinkedComponent.sol";
9
- import {Fee, FeeLib} from "../type/Fee.sol";
10
- import {IRisk} from "../instance/module/IRisk.sol";
11
- import {IApplicationService} from "./IApplicationService.sol";
4
+ import {Fee} from "../type/Fee.sol";
12
5
  import {IAuthorization} from "../authorization/IAuthorization.sol";
13
- import {IComponentService} from "../shared/IComponentService.sol";
14
- import {IPolicyService} from "./IPolicyService.sol";
15
- import {IProductService} from "./IProductService.sol";
16
- import {IClaimService} from "./IClaimService.sol";
17
- import {IPricingService} from "./IPricingService.sol";
18
- import {IProductComponent} from "./IProductComponent.sol";
19
- import {NftId, NftIdLib} from "../type/NftId.sol";
6
+ import {NftId} from "../type/NftId.sol";
20
7
  import {Product} from "../product/Product.sol";
21
- import {PayoutId} from "../type/PayoutId.sol";
22
- import {COMPONENT, PRODUCT, APPLICATION, POLICY, CLAIM, PRICE } from "../type/ObjectType.sol";
23
- import {ReferralId} from "../type/Referral.sol";
24
- import {RiskId, RiskIdLib} from "../type/RiskId.sol";
25
- import {Seconds} from "../type/Seconds.sol";
26
- import {StateId} from "../type/StateId.sol";
27
- import {Timestamp} from "../type/Timestamp.sol";
28
-
29
- import {TokenHandler} from "../shared/TokenHandler.sol";
30
-
31
- import {InstanceReader} from "../instance/InstanceReader.sol";
32
- import {IPolicy} from "../instance/module/IPolicy.sol";
33
- import {IComponents} from "../instance/module/IComponents.sol";
34
- import {Pool} from "../pool/Pool.sol";
35
- import {Distribution} from "../distribution/Distribution.sol";
36
8
 
37
9
  abstract contract BasicProduct is
38
10
  Product
39
11
  {
40
-
12
+
41
13
  function setFees(
42
14
  Fee memory productFee,
43
15
  Fee memory processingFee
@@ -50,7 +22,6 @@ abstract contract BasicProduct is
50
22
  _setFees(productFee, processingFee);
51
23
  }
52
24
 
53
-
54
25
  function _initializeBasicProduct(
55
26
  address registry,
56
27
  NftId instanceNftId,
@@ -5,6 +5,7 @@ import {Authorization} from "../authorization/Authorization.sol";
5
5
  import {BasicProduct} from "./BasicProduct.sol";
6
6
  import {PRODUCT} from "../type/ObjectType.sol";
7
7
  import {IAccess} from "../authorization/IAccess.sol";
8
+ import {IInstanceLinkedComponent} from "../shared/IInstanceLinkedComponent.sol";
8
9
  import {PUBLIC_ROLE} from "../../contracts/type/RoleId.sol";
9
10
  import {RoleId} from "../type/RoleId.sol";
10
11
 
@@ -35,6 +36,8 @@ contract BasicProductAuthorization
35
36
  // authorize public role (open access to any account, only allows to lock target)
36
37
  functions = _authorizeForTarget(getTargetName(), PUBLIC_ROLE());
37
38
  _authorize(functions, BasicProduct.setFees.selector, "setFees");
39
+
40
+ _authorize(functions, IInstanceLinkedComponent.withdrawFees.selector, "withdrawFees");
38
41
  }
39
42
  }
40
43