@etherisc/gif-next 3.0.0-f90c901-018 → 3.0.0-f9ec743-307

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 (520) hide show
  1. package/README.md +10 -1
  2. package/artifacts/contracts/accounting/AccountingService.sol/AccountingService.dbg.json +1 -1
  3. package/artifacts/contracts/accounting/AccountingService.sol/AccountingService.json +83 -164
  4. package/artifacts/contracts/accounting/AccountingServiceManager.sol/AccountingServiceManager.dbg.json +1 -1
  5. package/artifacts/contracts/accounting/AccountingServiceManager.sol/AccountingServiceManager.json +115 -113
  6. package/artifacts/contracts/accounting/IAccountingService.sol/IAccountingService.dbg.json +1 -1
  7. package/artifacts/contracts/accounting/IAccountingService.sol/IAccountingService.json +46 -91
  8. package/artifacts/contracts/authorization/AccessAdmin.sol/AccessAdmin.dbg.json +1 -1
  9. package/artifacts/contracts/authorization/AccessAdmin.sol/AccessAdmin.json +70 -105
  10. package/artifacts/contracts/authorization/AccessAdminLib.sol/AccessAdminLib.dbg.json +1 -1
  11. package/artifacts/contracts/authorization/AccessAdminLib.sol/AccessAdminLib.json +150 -126
  12. package/artifacts/contracts/authorization/AccessManagerCloneable.sol/AccessManagerCloneable.dbg.json +1 -1
  13. package/artifacts/contracts/authorization/AccessManagerCloneable.sol/AccessManagerCloneable.json +101 -43
  14. package/artifacts/contracts/authorization/Authorization.sol/Authorization.dbg.json +1 -1
  15. package/artifacts/contracts/authorization/Authorization.sol/Authorization.json +55 -31
  16. package/artifacts/contracts/authorization/IAccess.sol/IAccess.dbg.json +1 -1
  17. package/artifacts/contracts/authorization/IAccessAdmin.sol/IAccessAdmin.dbg.json +1 -1
  18. package/artifacts/contracts/authorization/IAccessAdmin.sol/IAccessAdmin.json +10 -20
  19. package/artifacts/contracts/authorization/IAuthorization.sol/IAuthorization.dbg.json +1 -1
  20. package/artifacts/contracts/authorization/IAuthorization.sol/IAuthorization.json +1 -1
  21. package/artifacts/contracts/authorization/IServiceAuthorization.sol/IServiceAuthorization.dbg.json +1 -1
  22. package/artifacts/contracts/authorization/IServiceAuthorization.sol/IServiceAuthorization.json +1 -1
  23. package/artifacts/contracts/authorization/ServiceAuthorization.sol/ServiceAuthorization.dbg.json +1 -1
  24. package/artifacts/contracts/authorization/ServiceAuthorization.sol/ServiceAuthorization.json +42 -18
  25. package/artifacts/contracts/distribution/BasicDistribution.sol/BasicDistribution.dbg.json +1 -1
  26. package/artifacts/contracts/distribution/BasicDistribution.sol/BasicDistribution.json +75 -126
  27. package/artifacts/contracts/distribution/BasicDistributionAuthorization.sol/BasicDistributionAuthorization.dbg.json +1 -1
  28. package/artifacts/contracts/distribution/BasicDistributionAuthorization.sol/BasicDistributionAuthorization.json +65 -41
  29. package/artifacts/contracts/distribution/Distribution.sol/Distribution.dbg.json +1 -1
  30. package/artifacts/contracts/distribution/Distribution.sol/Distribution.json +57 -72
  31. package/artifacts/contracts/distribution/DistributionService.sol/DistributionService.dbg.json +1 -1
  32. package/artifacts/contracts/distribution/DistributionService.sol/DistributionService.json +224 -198
  33. package/artifacts/contracts/distribution/DistributionServiceManager.sol/DistributionServiceManager.dbg.json +1 -1
  34. package/artifacts/contracts/distribution/DistributionServiceManager.sol/DistributionServiceManager.json +150 -140
  35. package/artifacts/contracts/distribution/IDistributionComponent.sol/IDistributionComponent.dbg.json +1 -1
  36. package/artifacts/contracts/distribution/IDistributionComponent.sol/IDistributionComponent.json +56 -84
  37. package/artifacts/contracts/distribution/IDistributionService.sol/IDistributionService.dbg.json +1 -1
  38. package/artifacts/contracts/distribution/IDistributionService.sol/IDistributionService.json +117 -71
  39. package/artifacts/contracts/examples/fire/DamageLevel.sol/DamageLevelLib.dbg.json +1 -1
  40. package/artifacts/contracts/examples/fire/DamageLevel.sol/DamageLevelLib.json +2 -2
  41. package/artifacts/contracts/examples/fire/FirePool.sol/FirePool.dbg.json +1 -1
  42. package/artifacts/contracts/examples/fire/FirePool.sol/FirePool.json +104 -166
  43. package/artifacts/contracts/examples/fire/FirePoolAuthorization.sol/FirePoolAuthorization.dbg.json +1 -1
  44. package/artifacts/contracts/examples/fire/FirePoolAuthorization.sol/FirePoolAuthorization.json +65 -41
  45. package/artifacts/contracts/examples/fire/FireProduct.sol/FireProduct.dbg.json +1 -1
  46. package/artifacts/contracts/examples/fire/FireProduct.sol/FireProduct.json +135 -202
  47. package/artifacts/contracts/examples/fire/FireProductAuthorization.sol/FireProductAuthorization.dbg.json +1 -1
  48. package/artifacts/contracts/examples/fire/FireProductAuthorization.sol/FireProductAuthorization.json +65 -41
  49. package/artifacts/contracts/examples/fire/FireUSD.sol/FireUSD.dbg.json +1 -1
  50. package/artifacts/contracts/examples/fire/FireUSD.sol/FireUSD.json +2 -2
  51. package/artifacts/contracts/examples/flight/FlightLib.sol/FlightLib.dbg.json +4 -0
  52. package/artifacts/contracts/examples/flight/FlightLib.sol/FlightLib.json +799 -0
  53. package/artifacts/contracts/examples/flight/FlightMessageVerifier.sol/FlightMessageVerifier.dbg.json +4 -0
  54. package/artifacts/contracts/examples/flight/FlightMessageVerifier.sol/FlightMessageVerifier.json +229 -0
  55. package/artifacts/contracts/examples/flight/FlightNft.sol/FlightNft.dbg.json +4 -0
  56. package/artifacts/contracts/examples/flight/FlightNft.sol/FlightNft.json +801 -0
  57. package/artifacts/contracts/examples/flight/FlightOracle.sol/FlightOracle.dbg.json +4 -0
  58. package/artifacts/contracts/examples/flight/FlightOracle.sol/FlightOracle.json +1353 -0
  59. package/artifacts/contracts/examples/flight/FlightOracleAuthorization.sol/FlightOracleAuthorization.dbg.json +4 -0
  60. package/artifacts/contracts/examples/flight/FlightOracleAuthorization.sol/FlightOracleAuthorization.json +896 -0
  61. package/artifacts/contracts/examples/flight/FlightPool.sol/FlightPool.dbg.json +4 -0
  62. package/artifacts/contracts/examples/flight/FlightPool.sol/FlightPool.json +1466 -0
  63. package/artifacts/contracts/examples/flight/FlightPoolAuthorization.sol/FlightPoolAuthorization.dbg.json +4 -0
  64. package/artifacts/contracts/examples/flight/FlightPoolAuthorization.sol/FlightPoolAuthorization.json +844 -0
  65. package/artifacts/contracts/examples/flight/FlightProduct.sol/FlightProduct.dbg.json +4 -0
  66. package/artifacts/contracts/examples/flight/FlightProduct.sol/FlightProduct.json +2289 -0
  67. package/artifacts/contracts/examples/flight/FlightProductAuthorization.sol/FlightProductAuthorization.dbg.json +4 -0
  68. package/artifacts/contracts/examples/flight/FlightProductAuthorization.sol/FlightProductAuthorization.json +891 -0
  69. package/artifacts/contracts/examples/flight/FlightProductManager.sol/FlightProductManager.dbg.json +4 -0
  70. package/artifacts/contracts/examples/flight/FlightProductManager.sol/FlightProductManager.json +711 -0
  71. package/artifacts/contracts/examples/flight/FlightUSD.sol/FlightUSD.dbg.json +4 -0
  72. package/artifacts/contracts/examples/flight/FlightUSD.sol/FlightUSD.json +586 -0
  73. package/artifacts/contracts/examples/flight/originalV1.sol/FlightDelayChainlink.dbg.json +4 -0
  74. package/artifacts/contracts/examples/flight/originalV1.sol/FlightDelayChainlink.json +901 -0
  75. package/artifacts/contracts/examples/unpermissioned/SimpleDistribution.sol/SimpleDistribution.dbg.json +1 -1
  76. package/artifacts/contracts/examples/unpermissioned/SimpleDistribution.sol/SimpleDistribution.json +102 -159
  77. package/artifacts/contracts/examples/unpermissioned/SimpleDistributionAuthorization.sol/SimpleDistributionAuthorization.dbg.json +1 -1
  78. package/artifacts/contracts/examples/unpermissioned/SimpleDistributionAuthorization.sol/SimpleDistributionAuthorization.json +65 -41
  79. package/artifacts/contracts/examples/unpermissioned/SimpleOracle.sol/SimpleOracle.dbg.json +1 -1
  80. package/artifacts/contracts/examples/unpermissioned/SimpleOracle.sol/SimpleOracle.json +106 -163
  81. package/artifacts/contracts/examples/unpermissioned/SimplePool.sol/SimplePool.dbg.json +1 -1
  82. package/artifacts/contracts/examples/unpermissioned/SimplePool.sol/SimplePool.json +120 -177
  83. package/artifacts/contracts/examples/unpermissioned/SimplePoolAuthorization.sol/SimplePoolAuthorization.dbg.json +1 -1
  84. package/artifacts/contracts/examples/unpermissioned/SimplePoolAuthorization.sol/SimplePoolAuthorization.json +65 -41
  85. package/artifacts/contracts/examples/unpermissioned/SimpleProduct.sol/SimpleProduct.dbg.json +1 -1
  86. package/artifacts/contracts/examples/unpermissioned/SimpleProduct.sol/SimpleProduct.json +114 -171
  87. package/artifacts/contracts/examples/unpermissioned/SimpleProductAuthorization.sol/SimpleProductAuthorization.dbg.json +1 -1
  88. package/artifacts/contracts/examples/unpermissioned/SimpleProductAuthorization.sol/SimpleProductAuthorization.json +65 -41
  89. package/artifacts/contracts/instance/BaseStore.sol/BaseStore.dbg.json +1 -1
  90. package/artifacts/contracts/instance/BaseStore.sol/BaseStore.json +50 -0
  91. package/artifacts/contracts/instance/BundleSet.sol/BundleSet.dbg.json +1 -1
  92. package/artifacts/contracts/instance/BundleSet.sol/BundleSet.json +54 -49
  93. package/artifacts/contracts/instance/IBaseStore.sol/IBaseStore.dbg.json +1 -1
  94. package/artifacts/contracts/instance/IBaseStore.sol/IBaseStore.json +50 -0
  95. package/artifacts/contracts/instance/IInstance.sol/IInstance.dbg.json +1 -1
  96. package/artifacts/contracts/instance/IInstance.sol/IInstance.json +26 -78
  97. package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.dbg.json +1 -1
  98. package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.json +105 -83
  99. package/artifacts/contracts/instance/Instance.sol/Instance.dbg.json +1 -1
  100. package/artifacts/contracts/instance/Instance.sol/Instance.json +51 -145
  101. package/artifacts/contracts/instance/InstanceAdmin.sol/InstanceAdmin.dbg.json +1 -1
  102. package/artifacts/contracts/instance/InstanceAdmin.sol/InstanceAdmin.json +151 -185
  103. package/artifacts/contracts/instance/InstanceAuthorizationV3.sol/InstanceAuthorizationV3.dbg.json +1 -1
  104. package/artifacts/contracts/instance/InstanceAuthorizationV3.sol/InstanceAuthorizationV3.json +67 -43
  105. package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.dbg.json +1 -1
  106. package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.json +238 -77
  107. package/artifacts/contracts/instance/InstanceService.sol/InstanceService.dbg.json +1 -1
  108. package/artifacts/contracts/instance/InstanceService.sol/InstanceService.json +154 -140
  109. package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.dbg.json +1 -1
  110. package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.json +112 -104
  111. package/artifacts/contracts/instance/InstanceStore.sol/InstanceStore.dbg.json +1 -1
  112. package/artifacts/contracts/instance/InstanceStore.sol/InstanceStore.json +82 -32
  113. package/artifacts/contracts/instance/ProductStore.sol/ProductStore.dbg.json +1 -1
  114. package/artifacts/contracts/instance/ProductStore.sol/ProductStore.json +68 -18
  115. package/artifacts/contracts/instance/RiskSet.sol/RiskSet.dbg.json +1 -1
  116. package/artifacts/contracts/instance/RiskSet.sol/RiskSet.json +58 -53
  117. package/artifacts/contracts/instance/base/BalanceStore.sol/BalanceStore.dbg.json +1 -1
  118. package/artifacts/contracts/instance/base/BalanceStore.sol/BalanceStore.json +2 -2
  119. package/artifacts/contracts/instance/base/Cloneable.sol/Cloneable.dbg.json +1 -1
  120. package/artifacts/contracts/instance/base/Cloneable.sol/Cloneable.json +1 -1
  121. package/artifacts/contracts/instance/base/ObjectCounter.sol/ObjectCounter.dbg.json +1 -1
  122. package/artifacts/contracts/instance/base/ObjectCounter.sol/ObjectCounter.json +2 -2
  123. package/artifacts/contracts/instance/base/ObjectLifecycle.sol/ObjectLifecycle.dbg.json +1 -1
  124. package/artifacts/contracts/instance/base/ObjectLifecycle.sol/ObjectLifecycle.json +2 -2
  125. package/artifacts/contracts/instance/base/ObjectSet.sol/ObjectSet.dbg.json +1 -1
  126. package/artifacts/contracts/instance/base/ObjectSet.sol/ObjectSet.json +8 -3
  127. package/artifacts/contracts/instance/base/ObjectSetHelperLib.sol/ObjectSetHelperLib.dbg.json +1 -1
  128. package/artifacts/contracts/instance/base/ObjectSetHelperLib.sol/ObjectSetHelperLib.json +2 -2
  129. package/artifacts/contracts/instance/module/IBundle.sol/IBundle.dbg.json +1 -1
  130. package/artifacts/contracts/instance/module/IComponents.sol/IComponents.dbg.json +1 -1
  131. package/artifacts/contracts/instance/module/IDistribution.sol/IDistribution.dbg.json +1 -1
  132. package/artifacts/contracts/instance/module/IPolicy.sol/IPolicy.dbg.json +1 -1
  133. package/artifacts/contracts/instance/module/IRisk.sol/IRisk.dbg.json +1 -1
  134. package/artifacts/contracts/mock/Dip.sol/Dip.dbg.json +1 -1
  135. package/artifacts/contracts/mock/Dip.sol/Dip.json +2 -2
  136. package/artifacts/contracts/oracle/BasicOracle.sol/BasicOracle.dbg.json +1 -1
  137. package/artifacts/contracts/oracle/BasicOracle.sol/BasicOracle.json +81 -132
  138. package/artifacts/contracts/oracle/BasicOracleAuthorization.sol/BasicOracleAuthorization.dbg.json +1 -1
  139. package/artifacts/contracts/oracle/BasicOracleAuthorization.sol/BasicOracleAuthorization.json +65 -41
  140. package/artifacts/contracts/oracle/IOracle.sol/IOracle.dbg.json +1 -1
  141. package/artifacts/contracts/oracle/IOracleComponent.sol/IOracleComponent.dbg.json +1 -1
  142. package/artifacts/contracts/oracle/IOracleComponent.sol/IOracleComponent.json +66 -94
  143. package/artifacts/contracts/oracle/IOracleService.sol/IOracleService.dbg.json +1 -1
  144. package/artifacts/contracts/oracle/IOracleService.sol/IOracleService.json +83 -80
  145. package/artifacts/contracts/oracle/Oracle.sol/Oracle.dbg.json +1 -1
  146. package/artifacts/contracts/oracle/Oracle.sol/Oracle.json +67 -82
  147. package/artifacts/contracts/oracle/OracleService.sol/OracleService.dbg.json +1 -1
  148. package/artifacts/contracts/oracle/OracleService.sol/OracleService.json +148 -149
  149. package/artifacts/contracts/oracle/OracleServiceManager.sol/OracleServiceManager.dbg.json +1 -1
  150. package/artifacts/contracts/oracle/OracleServiceManager.sol/OracleServiceManager.json +129 -111
  151. package/artifacts/contracts/pool/BasicPool.sol/BasicPool.dbg.json +1 -1
  152. package/artifacts/contracts/pool/BasicPool.sol/BasicPool.json +73 -88
  153. package/artifacts/contracts/pool/BasicPoolAuthorization.sol/BasicPoolAuthorization.dbg.json +1 -1
  154. package/artifacts/contracts/pool/BasicPoolAuthorization.sol/BasicPoolAuthorization.json +65 -41
  155. package/artifacts/contracts/pool/BundleService.sol/BundleService.dbg.json +1 -1
  156. package/artifacts/contracts/pool/BundleService.sol/BundleService.json +129 -176
  157. package/artifacts/contracts/pool/BundleServiceManager.sol/BundleServiceManager.dbg.json +1 -1
  158. package/artifacts/contracts/pool/BundleServiceManager.sol/BundleServiceManager.json +139 -129
  159. package/artifacts/contracts/pool/IBundleService.sol/IBundleService.dbg.json +1 -1
  160. package/artifacts/contracts/pool/IBundleService.sol/IBundleService.json +44 -71
  161. package/artifacts/contracts/pool/IPoolComponent.sol/IPoolComponent.dbg.json +1 -1
  162. package/artifacts/contracts/pool/IPoolComponent.sol/IPoolComponent.json +72 -100
  163. package/artifacts/contracts/pool/IPoolService.sol/IPoolService.dbg.json +1 -1
  164. package/artifacts/contracts/pool/IPoolService.sol/IPoolService.json +98 -94
  165. package/artifacts/contracts/pool/Pool.sol/Pool.dbg.json +1 -1
  166. package/artifacts/contracts/pool/Pool.sol/Pool.json +73 -88
  167. package/artifacts/contracts/pool/PoolLib.sol/PoolLib.dbg.json +1 -1
  168. package/artifacts/contracts/pool/PoolLib.sol/PoolLib.json +244 -26
  169. package/artifacts/contracts/pool/PoolService.sol/PoolService.dbg.json +1 -1
  170. package/artifacts/contracts/pool/PoolService.sol/PoolService.json +177 -233
  171. package/artifacts/contracts/pool/PoolServiceManager.sol/PoolServiceManager.dbg.json +1 -1
  172. package/artifacts/contracts/pool/PoolServiceManager.sol/PoolServiceManager.json +130 -140
  173. package/artifacts/contracts/product/ApplicationService.sol/ApplicationService.dbg.json +1 -1
  174. package/artifacts/contracts/product/ApplicationService.sol/ApplicationService.json +63 -138
  175. package/artifacts/contracts/product/ApplicationServiceManager.sol/ApplicationServiceManager.dbg.json +1 -1
  176. package/artifacts/contracts/product/ApplicationServiceManager.sol/ApplicationServiceManager.json +112 -110
  177. package/artifacts/contracts/product/BasicProduct.sol/BasicProduct.dbg.json +1 -1
  178. package/artifacts/contracts/product/BasicProduct.sol/BasicProduct.json +57 -72
  179. package/artifacts/contracts/product/BasicProductAuthorization.sol/BasicProductAuthorization.dbg.json +1 -1
  180. package/artifacts/contracts/product/BasicProductAuthorization.sol/BasicProductAuthorization.json +65 -41
  181. package/artifacts/contracts/product/ClaimService.sol/ClaimService.dbg.json +1 -1
  182. package/artifacts/contracts/product/ClaimService.sol/ClaimService.json +115 -182
  183. package/artifacts/contracts/product/ClaimServiceManager.sol/ClaimServiceManager.dbg.json +1 -1
  184. package/artifacts/contracts/product/ClaimServiceManager.sol/ClaimServiceManager.json +138 -132
  185. package/artifacts/contracts/product/IApplicationService.sol/IApplicationService.dbg.json +1 -1
  186. package/artifacts/contracts/product/IApplicationService.sol/IApplicationService.json +32 -71
  187. package/artifacts/contracts/product/IClaimService.sol/IClaimService.dbg.json +1 -1
  188. package/artifacts/contracts/product/IClaimService.sol/IClaimService.json +32 -71
  189. package/artifacts/contracts/product/IPolicyService.sol/IPolicyService.dbg.json +1 -1
  190. package/artifacts/contracts/product/IPolicyService.sol/IPolicyService.json +76 -82
  191. package/artifacts/contracts/product/IPricingService.sol/IPricingService.dbg.json +1 -1
  192. package/artifacts/contracts/product/IPricingService.sol/IPricingService.json +43 -82
  193. package/artifacts/contracts/product/IProductComponent.sol/IProductComponent.dbg.json +1 -1
  194. package/artifacts/contracts/product/IProductComponent.sol/IProductComponent.json +56 -84
  195. package/artifacts/contracts/product/IRiskService.sol/IRiskService.dbg.json +1 -1
  196. package/artifacts/contracts/product/IRiskService.sol/IRiskService.json +36 -75
  197. package/artifacts/contracts/product/PolicyService.sol/PolicyService.dbg.json +1 -1
  198. package/artifacts/contracts/product/PolicyService.sol/PolicyService.json +139 -173
  199. package/artifacts/contracts/product/PolicyServiceLib.sol/PolicyServiceLib.dbg.json +1 -1
  200. package/artifacts/contracts/product/PolicyServiceLib.sol/PolicyServiceLib.json +20 -12
  201. package/artifacts/contracts/product/PolicyServiceManager.sol/PolicyServiceManager.dbg.json +1 -1
  202. package/artifacts/contracts/product/PolicyServiceManager.sol/PolicyServiceManager.json +128 -122
  203. package/artifacts/contracts/product/PricingService.sol/PricingService.dbg.json +1 -1
  204. package/artifacts/contracts/product/PricingService.sol/PricingService.json +94 -161
  205. package/artifacts/contracts/product/PricingServiceManager.sol/PricingServiceManager.dbg.json +1 -1
  206. package/artifacts/contracts/product/PricingServiceManager.sol/PricingServiceManager.json +122 -116
  207. package/artifacts/contracts/product/Product.sol/Product.dbg.json +1 -1
  208. package/artifacts/contracts/product/Product.sol/Product.json +57 -72
  209. package/artifacts/contracts/product/RiskService.sol/RiskService.dbg.json +1 -1
  210. package/artifacts/contracts/product/RiskService.sol/RiskService.json +63 -146
  211. package/artifacts/contracts/product/RiskServiceManager.sol/RiskServiceManager.dbg.json +1 -1
  212. package/artifacts/contracts/product/RiskServiceManager.sol/RiskServiceManager.json +107 -109
  213. package/artifacts/contracts/registry/ChainNft.sol/ChainNft.dbg.json +1 -1
  214. package/artifacts/contracts/registry/ChainNft.sol/ChainNft.json +2 -2
  215. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.dbg.json +1 -1
  216. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.json +62 -155
  217. package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.dbg.json +1 -1
  218. package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.json +216 -202
  219. package/artifacts/contracts/registry/IRelease.sol/IRelease.dbg.json +1 -1
  220. package/artifacts/contracts/registry/IRelease.sol/IRelease.json +15 -1
  221. package/artifacts/contracts/registry/ITransferInterceptor.sol/ITransferInterceptor.dbg.json +1 -1
  222. package/artifacts/contracts/registry/Registry.sol/Registry.dbg.json +1 -1
  223. package/artifacts/contracts/registry/Registry.sol/Registry.json +102 -314
  224. package/artifacts/contracts/registry/RegistryAdmin.sol/RegistryAdmin.dbg.json +1 -1
  225. package/artifacts/contracts/registry/RegistryAdmin.sol/RegistryAdmin.json +146 -179
  226. package/artifacts/contracts/registry/RegistryAuthorization.sol/RegistryAuthorization.dbg.json +1 -1
  227. package/artifacts/contracts/registry/RegistryAuthorization.sol/RegistryAuthorization.json +77 -57
  228. package/artifacts/contracts/registry/RegistryService.sol/RegistryService.dbg.json +1 -1
  229. package/artifacts/contracts/registry/RegistryService.sol/RegistryService.json +244 -285
  230. package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.dbg.json +1 -1
  231. package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.json +110 -115
  232. package/artifacts/contracts/registry/ReleaseAdmin.sol/ReleaseAdmin.dbg.json +1 -1
  233. package/artifacts/contracts/registry/ReleaseAdmin.sol/ReleaseAdmin.json +154 -175
  234. package/artifacts/contracts/registry/ReleaseLifecycle.sol/ReleaseLifecycle.dbg.json +1 -1
  235. package/artifacts/contracts/registry/ReleaseLifecycle.sol/ReleaseLifecycle.json +2 -2
  236. package/artifacts/contracts/registry/ReleaseRegistry.sol/ReleaseRegistry.dbg.json +1 -1
  237. package/artifacts/contracts/registry/ReleaseRegistry.sol/ReleaseRegistry.json +208 -140
  238. package/artifacts/contracts/registry/ServiceAuthorizationV3.sol/ServiceAuthorizationV3.dbg.json +1 -1
  239. package/artifacts/contracts/registry/ServiceAuthorizationV3.sol/ServiceAuthorizationV3.json +56 -32
  240. package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.dbg.json +1 -1
  241. package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.json +29 -13
  242. package/artifacts/contracts/shared/Component.sol/Component.dbg.json +1 -1
  243. package/artifacts/contracts/shared/Component.sol/Component.json +39 -84
  244. package/artifacts/contracts/shared/ComponentService.sol/ComponentService.dbg.json +1 -1
  245. package/artifacts/contracts/shared/ComponentService.sol/ComponentService.json +573 -164
  246. package/artifacts/contracts/shared/ComponentServiceManager.sol/ComponentServiceManager.dbg.json +1 -1
  247. package/artifacts/contracts/shared/ComponentServiceManager.sol/ComponentServiceManager.json +141 -115
  248. package/artifacts/contracts/shared/ContractLib.sol/ContractLib.dbg.json +1 -1
  249. package/artifacts/contracts/shared/ContractLib.sol/ContractLib.json +169 -421
  250. package/artifacts/contracts/shared/ContractLib.sol/IInstanceAdminHelper.dbg.json +4 -0
  251. package/artifacts/contracts/shared/ContractLib.sol/IInstanceAdminHelper.json +24 -0
  252. package/artifacts/contracts/shared/ContractLib.sol/ITargetHelper.dbg.json +1 -1
  253. package/artifacts/contracts/shared/ContractLib.sol/ITokenRegistryHelper.dbg.json +4 -0
  254. package/artifacts/contracts/shared/ContractLib.sol/ITokenRegistryHelper.json +40 -0
  255. package/artifacts/contracts/shared/IAuthorizedComponent.sol/IAuthorizedComponent.dbg.json +4 -0
  256. package/artifacts/contracts/shared/IAuthorizedComponent.sol/IAuthorizedComponent.json +633 -0
  257. package/artifacts/contracts/shared/IComponent.sol/IComponent.dbg.json +1 -1
  258. package/artifacts/contracts/shared/IComponent.sol/IComponent.json +38 -96
  259. package/artifacts/contracts/shared/IComponentService.sol/IComponentService.dbg.json +1 -1
  260. package/artifacts/contracts/shared/IComponentService.sol/IComponentService.json +479 -82
  261. package/artifacts/contracts/shared/IInstanceLinkedComponent.sol/IInstanceLinkedComponent.dbg.json +1 -1
  262. package/artifacts/contracts/shared/IInstanceLinkedComponent.sol/IInstanceLinkedComponent.json +56 -84
  263. package/artifacts/contracts/shared/ILifecycle.sol/ILifecycle.dbg.json +1 -1
  264. package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.dbg.json +1 -1
  265. package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.json +28 -1
  266. package/artifacts/contracts/shared/IPolicyHolder.sol/IPolicyHolder.dbg.json +1 -1
  267. package/artifacts/contracts/shared/IPolicyHolder.sol/IPolicyHolder.json +12 -1
  268. package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.dbg.json +1 -1
  269. package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.json +25 -77
  270. package/artifacts/contracts/shared/IRegistryLinked.sol/IRegistryLinked.dbg.json +1 -1
  271. package/artifacts/contracts/shared/IRegistryLinked.sol/IRegistryLinked.json +12 -1
  272. package/artifacts/contracts/shared/IService.sol/IService.dbg.json +1 -1
  273. package/artifacts/contracts/shared/IService.sol/IService.json +32 -71
  274. package/artifacts/contracts/shared/InitializableERC165.sol/InitializableERC165.dbg.json +1 -1
  275. package/artifacts/contracts/shared/InitializableERC165.sol/InitializableERC165.json +2 -2
  276. package/artifacts/contracts/shared/InstanceLinkedComponent.sol/InstanceLinkedComponent.dbg.json +1 -1
  277. package/artifacts/contracts/shared/InstanceLinkedComponent.sol/InstanceLinkedComponent.json +57 -72
  278. package/artifacts/contracts/shared/Lifecycle.sol/Lifecycle.dbg.json +1 -1
  279. package/artifacts/contracts/shared/NftIdSet.sol/NftIdSet.dbg.json +1 -1
  280. package/artifacts/contracts/shared/NftIdSet.sol/NftIdSet.json +2 -2
  281. package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.dbg.json +1 -1
  282. package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.json +34 -15
  283. package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.dbg.json +1 -1
  284. package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.json +14 -3
  285. package/artifacts/contracts/shared/Registerable.sol/Registerable.dbg.json +1 -1
  286. package/artifacts/contracts/shared/Registerable.sol/Registerable.json +24 -76
  287. package/artifacts/contracts/shared/RegistryLinked.sol/RegistryLinked.dbg.json +1 -1
  288. package/artifacts/contracts/shared/RegistryLinked.sol/RegistryLinked.json +37 -3
  289. package/artifacts/contracts/shared/Service.sol/Service.dbg.json +1 -1
  290. package/artifacts/contracts/shared/Service.sol/Service.json +31 -70
  291. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.dbg.json +1 -1
  292. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.json +29 -69
  293. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandlerBase.dbg.json +1 -1
  294. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandlerBase.json +17 -57
  295. package/artifacts/contracts/shared/TokenHandlerDeployerLib.sol/TokenHandlerDeployerLib.dbg.json +1 -1
  296. package/artifacts/contracts/shared/TokenHandlerDeployerLib.sol/TokenHandlerDeployerLib.json +34 -34
  297. package/artifacts/contracts/staking/IStaking.sol/IStaking.dbg.json +1 -1
  298. package/artifacts/contracts/staking/IStaking.sol/IStaking.json +81 -101
  299. package/artifacts/contracts/staking/IStakingService.sol/IStakingService.dbg.json +1 -1
  300. package/artifacts/contracts/staking/IStakingService.sol/IStakingService.json +48 -75
  301. package/artifacts/contracts/staking/ITargetLimitHandler.sol/ITargetLimitHandler.dbg.json +1 -1
  302. package/artifacts/contracts/staking/Staking.sol/Staking.dbg.json +1 -1
  303. package/artifacts/contracts/staking/Staking.sol/Staking.json +134 -170
  304. package/artifacts/contracts/staking/StakingLib.sol/StakingLib.dbg.json +1 -1
  305. package/artifacts/contracts/staking/StakingLib.sol/StakingLib.json +31 -31
  306. package/artifacts/contracts/staking/StakingManager.sol/StakingManager.dbg.json +1 -1
  307. package/artifacts/contracts/staking/StakingManager.sol/StakingManager.json +124 -112
  308. package/artifacts/contracts/staking/StakingReader.sol/StakingReader.dbg.json +1 -1
  309. package/artifacts/contracts/staking/StakingReader.sol/StakingReader.json +22 -5
  310. package/artifacts/contracts/staking/StakingService.sol/StakingService.dbg.json +1 -1
  311. package/artifacts/contracts/staking/StakingService.sol/StakingService.json +77 -132
  312. package/artifacts/contracts/staking/StakingServiceManager.sol/StakingServiceManager.dbg.json +1 -1
  313. package/artifacts/contracts/staking/StakingServiceManager.sol/StakingServiceManager.json +111 -105
  314. package/artifacts/contracts/staking/StakingStore.sol/StakingStore.dbg.json +1 -1
  315. package/artifacts/contracts/staking/StakingStore.sol/StakingStore.json +204 -212
  316. package/artifacts/contracts/staking/TargetHandler.sol/TargetHandler.dbg.json +1 -1
  317. package/artifacts/contracts/staking/TargetHandler.sol/TargetHandler.json +19 -32
  318. package/artifacts/contracts/staking/TargetManagerLib.sol/TargetManagerLib.dbg.json +1 -1
  319. package/artifacts/contracts/staking/TargetManagerLib.sol/TargetManagerLib.json +16 -21
  320. package/artifacts/contracts/type/AddressSet.sol/LibAddressSet.dbg.json +1 -1
  321. package/artifacts/contracts/type/AddressSet.sol/LibAddressSet.json +2 -2
  322. package/artifacts/contracts/type/Amount.sol/AmountLib.dbg.json +1 -1
  323. package/artifacts/contracts/type/Amount.sol/AmountLib.json +2 -7
  324. package/artifacts/contracts/type/Blocknumber.sol/BlocknumberLib.dbg.json +1 -1
  325. package/artifacts/contracts/type/Blocknumber.sol/BlocknumberLib.json +2 -2
  326. package/artifacts/contracts/type/ChainId.sol/ChainIdLib.dbg.json +1 -1
  327. package/artifacts/contracts/type/ChainId.sol/ChainIdLib.json +2 -2
  328. package/artifacts/contracts/type/ClaimId.sol/ClaimIdLib.dbg.json +1 -1
  329. package/artifacts/contracts/type/ClaimId.sol/ClaimIdLib.json +2 -2
  330. package/artifacts/contracts/type/DistributorType.sol/DistributorTypeLib.dbg.json +1 -1
  331. package/artifacts/contracts/type/DistributorType.sol/DistributorTypeLib.json +2 -2
  332. package/artifacts/contracts/type/Fee.sol/FeeLib.dbg.json +1 -1
  333. package/artifacts/contracts/type/Fee.sol/FeeLib.json +2 -7
  334. package/artifacts/contracts/type/Key32.sol/Key32Lib.dbg.json +1 -1
  335. package/artifacts/contracts/type/Key32.sol/Key32Lib.json +2 -2
  336. package/artifacts/contracts/type/Key32Set.sol/LibKey32Set.dbg.json +1 -1
  337. package/artifacts/contracts/type/Key32Set.sol/LibKey32Set.json +2 -2
  338. package/artifacts/contracts/type/NftId.sol/NftIdLib.dbg.json +1 -1
  339. package/artifacts/contracts/type/NftId.sol/NftIdLib.json +2 -2
  340. package/artifacts/contracts/type/NftIdSet.sol/LibNftIdSet.dbg.json +1 -1
  341. package/artifacts/contracts/type/NftIdSet.sol/LibNftIdSet.json +2 -2
  342. package/artifacts/contracts/type/ObjectType.sol/ObjectTypeLib.dbg.json +1 -1
  343. package/artifacts/contracts/type/ObjectType.sol/ObjectTypeLib.json +22 -25
  344. package/artifacts/contracts/type/PayoutId.sol/PayoutIdLib.dbg.json +1 -1
  345. package/artifacts/contracts/type/PayoutId.sol/PayoutIdLib.json +2 -2
  346. package/artifacts/contracts/type/Referral.sol/ReferralLib.dbg.json +1 -1
  347. package/artifacts/contracts/type/Referral.sol/ReferralLib.json +23 -4
  348. package/artifacts/contracts/type/RequestId.sol/RequestIdLib.dbg.json +1 -1
  349. package/artifacts/contracts/type/RequestId.sol/RequestIdLib.json +2 -2
  350. package/artifacts/contracts/type/RequestIdSet.sol/LibRequestIdSet.dbg.json +4 -0
  351. package/artifacts/contracts/type/RequestIdSet.sol/LibRequestIdSet.json +33 -0
  352. package/artifacts/contracts/type/RiskId.sol/RiskIdLib.dbg.json +1 -1
  353. package/artifacts/contracts/type/RiskId.sol/RiskIdLib.json +2 -2
  354. package/artifacts/contracts/type/RoleId.sol/RoleIdLib.dbg.json +1 -1
  355. package/artifacts/contracts/type/RoleId.sol/RoleIdLib.json +4 -4
  356. package/artifacts/contracts/type/Seconds.sol/SecondsLib.dbg.json +1 -1
  357. package/artifacts/contracts/type/Seconds.sol/SecondsLib.json +21 -2
  358. package/artifacts/contracts/type/Selector.sol/SelectorLib.dbg.json +1 -1
  359. package/artifacts/contracts/type/Selector.sol/SelectorLib.json +2 -2
  360. package/artifacts/contracts/type/Selector.sol/SelectorSetLib.dbg.json +1 -1
  361. package/artifacts/contracts/type/Selector.sol/SelectorSetLib.json +2 -2
  362. package/artifacts/contracts/type/StateId.sol/StateIdLib.dbg.json +1 -1
  363. package/artifacts/contracts/type/StateId.sol/StateIdLib.json +2 -2
  364. package/artifacts/contracts/type/String.sol/StrLib.dbg.json +1 -1
  365. package/artifacts/contracts/type/String.sol/StrLib.json +21 -2
  366. package/artifacts/contracts/type/Timestamp.sol/TimestampLib.dbg.json +1 -1
  367. package/artifacts/contracts/type/Timestamp.sol/TimestampLib.json +36 -4
  368. package/artifacts/contracts/type/UFixed.sol/UFixedLib.dbg.json +1 -1
  369. package/artifacts/contracts/type/UFixed.sol/UFixedLib.json +2 -7
  370. package/artifacts/contracts/type/Version.sol/VersionLib.dbg.json +1 -1
  371. package/artifacts/contracts/type/Version.sol/VersionLib.json +10 -10
  372. package/artifacts/contracts/type/Version.sol/VersionPartLib.dbg.json +1 -1
  373. package/artifacts/contracts/type/Version.sol/VersionPartLib.json +6 -19
  374. package/artifacts/contracts/upgradeability/IVersionable.sol/IVersionable.dbg.json +4 -0
  375. package/artifacts/contracts/upgradeability/{IUpgradeable.sol/IUpgradeable.json → IVersionable.sol/IVersionable.json} +4 -54
  376. package/artifacts/contracts/upgradeability/ProxyManager.sol/ProxyManager.dbg.json +1 -1
  377. package/artifacts/contracts/upgradeability/ProxyManager.sol/ProxyManager.json +86 -63
  378. package/artifacts/contracts/upgradeability/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.dbg.json +1 -1
  379. package/artifacts/contracts/upgradeability/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.json +3 -3
  380. package/artifacts/contracts/upgradeability/Versionable.sol/Versionable.dbg.json +4 -0
  381. package/artifacts/contracts/upgradeability/{Upgradeable.sol/Upgradeable.json → Versionable.sol/Versionable.json} +4 -54
  382. package/contracts/accounting/AccountingService.sol +22 -33
  383. package/contracts/accounting/AccountingServiceManager.sol +6 -4
  384. package/contracts/accounting/IAccountingService.sol +7 -8
  385. package/contracts/authorization/AccessAdmin.sol +24 -47
  386. package/contracts/authorization/AccessAdminLib.sol +29 -15
  387. package/contracts/authorization/AccessManagerCloneable.sol +52 -24
  388. package/contracts/authorization/Authorization.sol +2 -2
  389. package/contracts/authorization/IAccessAdmin.sol +3 -3
  390. package/contracts/authorization/IServiceAuthorization.sol +1 -1
  391. package/contracts/authorization/ServiceAuthorization.sol +4 -4
  392. package/contracts/distribution/BasicDistribution.sol +2 -0
  393. package/contracts/distribution/BasicDistributionAuthorization.sol +4 -5
  394. package/contracts/distribution/Distribution.sol +2 -0
  395. package/contracts/distribution/DistributionService.sol +25 -27
  396. package/contracts/distribution/DistributionServiceManager.sol +6 -4
  397. package/contracts/distribution/IDistributionService.sol +4 -3
  398. package/contracts/examples/fire/FirePool.sol +4 -0
  399. package/contracts/examples/fire/FireProduct.sol +4 -0
  400. package/contracts/examples/flight/FlightLib.sol +337 -0
  401. package/contracts/examples/flight/FlightMessageVerifier.sol +128 -0
  402. package/contracts/examples/flight/FlightNft.sol +234 -0
  403. package/contracts/examples/flight/FlightOracle.sol +226 -0
  404. package/contracts/examples/flight/FlightOracleAuthorization.sol +57 -0
  405. package/contracts/examples/flight/FlightPool.sol +89 -0
  406. package/contracts/examples/flight/FlightPoolAuthorization.sol +37 -0
  407. package/contracts/examples/flight/FlightProduct.sol +687 -0
  408. package/contracts/examples/flight/FlightProductAuthorization.sol +70 -0
  409. package/contracts/examples/flight/FlightProductManager.sol +49 -0
  410. package/contracts/examples/flight/FlightUSD.sol +28 -0
  411. package/contracts/examples/flight/originalV1.sol +396 -0
  412. package/contracts/examples/unpermissioned/SimpleDistribution.sol +4 -0
  413. package/contracts/examples/unpermissioned/SimpleOracle.sol +4 -0
  414. package/contracts/examples/unpermissioned/SimplePool.sol +4 -0
  415. package/contracts/examples/unpermissioned/SimpleProduct.sol +4 -0
  416. package/contracts/instance/BaseStore.sol +4 -0
  417. package/contracts/instance/IBaseStore.sol +8 -0
  418. package/contracts/instance/IInstance.sol +1 -1
  419. package/contracts/instance/IInstanceService.sol +2 -0
  420. package/contracts/instance/Instance.sol +12 -8
  421. package/contracts/instance/InstanceAdmin.sol +17 -11
  422. package/contracts/instance/InstanceAuthorizationV3.sol +2 -4
  423. package/contracts/instance/InstanceReader.sol +59 -23
  424. package/contracts/instance/InstanceService.sol +24 -18
  425. package/contracts/instance/InstanceServiceManager.sol +6 -4
  426. package/contracts/instance/base/Cloneable.sol +10 -4
  427. package/contracts/instance/base/ObjectSet.sol +2 -2
  428. package/contracts/oracle/BasicOracle.sol +3 -0
  429. package/contracts/oracle/BasicOracleAuthorization.sol +1 -3
  430. package/contracts/oracle/IOracleService.sol +16 -12
  431. package/contracts/oracle/Oracle.sol +6 -5
  432. package/contracts/oracle/OracleService.sol +67 -37
  433. package/contracts/oracle/OracleServiceManager.sol +6 -4
  434. package/contracts/pool/BasicPool.sol +4 -2
  435. package/contracts/pool/BasicPoolAuthorization.sol +4 -5
  436. package/contracts/pool/BundleService.sol +20 -26
  437. package/contracts/pool/BundleServiceManager.sol +7 -5
  438. package/contracts/pool/IBundleService.sol +1 -1
  439. package/contracts/pool/IPoolService.sol +6 -5
  440. package/contracts/pool/Pool.sol +3 -1
  441. package/contracts/pool/PoolLib.sol +102 -5
  442. package/contracts/pool/PoolService.sol +101 -67
  443. package/contracts/pool/PoolServiceManager.sol +6 -4
  444. package/contracts/product/ApplicationService.sol +34 -13
  445. package/contracts/product/ApplicationServiceManager.sol +6 -4
  446. package/contracts/product/BasicProduct.sol +2 -0
  447. package/contracts/product/BasicProductAuthorization.sol +7 -7
  448. package/contracts/product/ClaimService.sol +34 -10
  449. package/contracts/product/ClaimServiceManager.sol +7 -5
  450. package/contracts/product/IPolicyService.sol +2 -1
  451. package/contracts/product/PolicyService.sol +58 -45
  452. package/contracts/product/PolicyServiceLib.sol +5 -3
  453. package/contracts/product/PolicyServiceManager.sol +6 -4
  454. package/contracts/product/PricingService.sol +8 -7
  455. package/contracts/product/PricingServiceManager.sol +6 -4
  456. package/contracts/product/Product.sol +2 -0
  457. package/contracts/product/RiskService.sol +40 -8
  458. package/contracts/product/RiskServiceManager.sol +6 -4
  459. package/contracts/registry/ChainNft.sol +1 -1
  460. package/contracts/registry/IRegistry.sol +14 -20
  461. package/contracts/registry/IRegistryService.sol +14 -10
  462. package/contracts/registry/IRelease.sol +3 -0
  463. package/contracts/registry/Registry.sol +78 -124
  464. package/contracts/registry/RegistryAdmin.sol +29 -12
  465. package/contracts/registry/RegistryAuthorization.sol +3 -4
  466. package/contracts/registry/RegistryService.sol +82 -99
  467. package/contracts/registry/RegistryServiceManager.sol +11 -4
  468. package/contracts/registry/ReleaseAdmin.sol +23 -9
  469. package/contracts/registry/ReleaseRegistry.sol +74 -64
  470. package/contracts/registry/ServiceAuthorizationV3.sol +3 -4
  471. package/contracts/registry/TokenRegistry.sol +15 -6
  472. package/contracts/shared/Component.sol +22 -27
  473. package/contracts/shared/ComponentService.sol +164 -47
  474. package/contracts/shared/ComponentServiceManager.sol +7 -5
  475. package/contracts/shared/ContractLib.sol +93 -359
  476. package/contracts/shared/EcdsaChecker.sol +5 -0
  477. package/contracts/shared/IAuthorizedComponent.sol +15 -0
  478. package/contracts/shared/IComponent.sol +3 -5
  479. package/contracts/shared/IComponentService.sol +36 -0
  480. package/contracts/shared/IInstanceLinkedComponent.sol +9 -9
  481. package/contracts/shared/INftOwnable.sol +2 -0
  482. package/contracts/shared/IRegisterable.sol +3 -14
  483. package/contracts/shared/IRegistryLinked.sol +3 -1
  484. package/contracts/shared/IService.sol +2 -2
  485. package/contracts/shared/InstanceLinkedComponent.sol +130 -39
  486. package/contracts/shared/NftOwnable.sol +22 -9
  487. package/contracts/shared/PolicyHolder.sol +4 -2
  488. package/contracts/shared/Registerable.sol +20 -37
  489. package/contracts/shared/RegistryLinked.sol +23 -4
  490. package/contracts/shared/Service.sol +9 -8
  491. package/contracts/shared/TokenHandler.sol +1 -4
  492. package/contracts/staking/IStaking.sol +4 -2
  493. package/contracts/staking/IStakingService.sol +1 -1
  494. package/contracts/staking/Staking.sol +34 -28
  495. package/contracts/staking/StakingLib.sol +1 -3
  496. package/contracts/staking/StakingManager.sol +6 -3
  497. package/contracts/staking/StakingReader.sol +17 -9
  498. package/contracts/staking/StakingService.sol +14 -17
  499. package/contracts/staking/StakingServiceManager.sol +8 -4
  500. package/contracts/staking/StakingStore.sol +8 -8
  501. package/contracts/staking/TargetHandler.sol +5 -4
  502. package/contracts/type/ObjectType.sol +2 -31
  503. package/contracts/type/Referral.sol +6 -0
  504. package/contracts/type/RequestIdSet.sol +62 -0
  505. package/contracts/type/Seconds.sol +4 -0
  506. package/contracts/type/String.sol +30 -0
  507. package/contracts/type/Timestamp.sol +10 -1
  508. package/contracts/type/Version.sol +16 -15
  509. package/contracts/upgradeability/{IUpgradeable.sol → IVersionable.sol} +19 -13
  510. package/contracts/upgradeability/ProxyManager.sol +54 -46
  511. package/contracts/upgradeability/{Upgradeable.sol → Versionable.sol} +14 -25
  512. package/package.json +4 -3
  513. package/artifacts/contracts/shared/IVersionable.sol/IVersionable.dbg.json +0 -4
  514. package/artifacts/contracts/shared/IVersionable.sol/IVersionable.json +0 -74
  515. package/artifacts/contracts/shared/Versionable.sol/Versionable.dbg.json +0 -4
  516. package/artifacts/contracts/shared/Versionable.sol/Versionable.json +0 -74
  517. package/artifacts/contracts/upgradeability/IUpgradeable.sol/IUpgradeable.dbg.json +0 -4
  518. package/artifacts/contracts/upgradeability/Upgradeable.sol/Upgradeable.dbg.json +0 -4
  519. package/contracts/shared/IVersionable.sol +0 -19
  520. package/contracts/shared/Versionable.sol +0 -47
@@ -18,9 +18,13 @@ interface IOracleService is IService {
18
18
  event LogOracleServiceRequestCancelled(RequestId requestId, NftId requesterNftId);
19
19
 
20
20
  // create request
21
+ error ErrorOracleServiceProductMismatch(ObjectType callerObjectType, NftId productNft, NftId oracleParentNftId);
21
22
  error ErrorOracleServiceExpiryInThePast(Timestamp blockTimestamp, Timestamp expiryAt);
22
23
  error ErrorOracleServiceCallbackMethodNameEmpty();
23
24
 
25
+ // respond
26
+ error ErrorOracleServiceNotResponsibleOracle(RequestId requestId, NftId expectedOracleNftId, NftId oracleNftId);
27
+
24
28
  // get request info
25
29
  error ErrorOracleServiceRequestStateNotActive(RequestId requestId, StateId state);
26
30
  error ErrorOracleServiceCallerNotResponsibleOracle(RequestId requestId, NftId oracleNftId, NftId callerNftId);
@@ -37,26 +41,26 @@ interface IOracleService is IService {
37
41
  string calldata callbackMethodName
38
42
  ) external returns (RequestId requestId);
39
43
 
40
- /// @dev respond to oracle request by oracle compnent.
41
- /// the response data is amende in the request info stored with the instance.
42
- /// the request state changes to FULFILLED (when calling the callback method of the requester is successful)
44
+ /// @dev Respond to oracle request by oracle compnent.
45
+ /// The response data is amended in the request info stored with the instance.
46
+ /// The request state changes to FULFILLED (when calling the callback method of the requester is successful)
43
47
  /// or to FAILED when calling the requester is not succesful.
44
- /// the function returns true iff the state changes to FULFILLED.
45
- /// permissioned: only the oracle component linked to the request id may call this method
48
+ /// The function returns true iff the state changes to FULFILLED.
49
+ /// Permissioned: only the receiving oracle component may call this method
46
50
  function respond(
47
51
  RequestId requestId,
48
52
  bytes calldata responseData
49
53
  ) external returns (bool success);
50
54
 
51
- /// @dev re send a failed response to the requester.
52
- /// only requests in state FAILED may be re sent.
53
- /// the request state changes to FULFILLED when calling the callback method of the requester is successful.
54
- /// permissioned: only the requester may resend a request
55
+ /// @dev Resend a failed response to the requester.
56
+ /// Only requests in state FAILED may be resent.
57
+ /// The request state changes to FULFILLED when calling the callback method of the requester is successful.
58
+ /// Permissioned: only the receiving oracle may resend a request
55
59
  function resend(RequestId requestId) external;
56
60
 
57
- /// @dev notify the oracle component that the specified request has become invalid.
58
- /// only requests in state ACTIVE may be cancelled.
59
- /// permissioned: only the requester may cancel a request
61
+ /// @dev Notify the oracle component that the specified request has become invalid.
62
+ /// Only requests in state ACTIVE may be cancelled.
63
+ /// Permissioned: only the requester may cancel a request
60
64
  function cancel(RequestId requestId) external;
61
65
 
62
66
  }
@@ -5,11 +5,10 @@ import {Amount} from "../type/Amount.sol";
5
5
  import {COMPONENT, PRODUCT, ORACLE} from "../type/ObjectType.sol";
6
6
  import {IAuthorization} from "../authorization/IAuthorization.sol";
7
7
  import {IComponentService} from "../shared/IComponentService.sol";
8
- import {IComponent} from "../shared/IComponent.sol";
8
+ import {IInstanceLinkedComponent} from "../shared/IInstanceLinkedComponent.sol";
9
9
  import {IOracleComponent} from "./IOracleComponent.sol";
10
10
  import {IOracleService} from "./IOracleService.sol";
11
11
  import {NftId} from "../type/NftId.sol";
12
- import {Component} from "../shared/Component.sol";
13
12
  import {InstanceLinkedComponent} from "../shared/InstanceLinkedComponent.sol";
14
13
  import {RequestId} from "../type/RequestId.sol";
15
14
  import {Timestamp} from "../type/Timestamp.sol";
@@ -67,7 +66,7 @@ abstract contract Oracle is
67
66
  function withdrawFees(Amount amount)
68
67
  external
69
68
  virtual
70
- override(IComponent, Component)
69
+ override(IInstanceLinkedComponent, InstanceLinkedComponent)
71
70
  onlyOwner()
72
71
  restricted()
73
72
  returns (Amount)
@@ -77,6 +76,7 @@ abstract contract Oracle is
77
76
 
78
77
 
79
78
  function __Oracle_init(
79
+ address registry,
80
80
  NftId productNftId,
81
81
  IAuthorization authorization,
82
82
  address initialOwner,
@@ -87,6 +87,7 @@ abstract contract Oracle is
87
87
  onlyInitializing()
88
88
  {
89
89
  __InstanceLinkedComponent_init(
90
+ registry,
90
91
  productNftId,
91
92
  name,
92
93
  ORACLE(),
@@ -139,10 +140,10 @@ abstract contract Oracle is
139
140
  internal
140
141
  virtual
141
142
  {
142
- _getOracleStorage()._oracleService.respond(
143
- requestId, responseData);
143
+ _getOracleStorage()._oracleService.respond(requestId, responseData);
144
144
  }
145
145
 
146
+
146
147
  function _getOracleStorage() private pure returns (OracleStorage storage $) {
147
148
  assembly {
148
149
  $.slot := ORACLE_STORAGE_LOCATION_V1
@@ -29,13 +29,14 @@ contract OracleService is
29
29
  )
30
30
  internal
31
31
  virtual override
32
- onlyInitializing()
32
+ initializer()
33
33
  {
34
34
  (
35
- address authority
36
- ) = abi.decode(data, (address));
35
+ address authority,
36
+ address registry
37
+ ) = abi.decode(data, (address, address));
37
38
 
38
- __Service_init(authority, owner);
39
+ __Service_init(authority, registry, owner);
39
40
  _registerInterface(type(IOracleService).interfaceId);
40
41
  }
41
42
 
@@ -48,24 +49,25 @@ contract OracleService is
48
49
  external
49
50
  virtual
50
51
  restricted()
52
+ onlyNftOfType(oracleNftId, ORACLE())
51
53
  returns (RequestId requestId)
52
54
  {
53
55
  // checks
54
- NftId requesterNftId; // component
55
- IOracleComponent oracle;
56
+ // get and check active caller
57
+ (
58
+ IRegistry.ObjectInfo memory requesterInfo,
59
+ address instance
60
+ ) = ContractLib.getAndVerifyAnyComponent(
61
+ getRegistry(), msg.sender, true);
62
+
63
+ (
64
+ NftId requesterNftId,
65
+ IOracleComponent oracle
66
+ ) = _checkRequestParams(
67
+ getRegistry(), oracleNftId, requesterInfo, expiryAt, callbackMethodName);
56
68
 
69
+ // effects
57
70
  {
58
- IInstance instance;
59
- (
60
- requesterNftId,
61
- oracle,
62
- instance
63
- ) = ContractLib.getAndVerifyComponentAndOracle(
64
- oracleNftId, getRelease());
65
-
66
- _checkRequestParams(expiryAt, callbackMethodName);
67
-
68
- // effects
69
71
  // create request info
70
72
  IOracle.RequestInfo memory request = IOracle.RequestInfo({
71
73
  requesterNftId: requesterNftId,
@@ -79,7 +81,7 @@ contract OracleService is
79
81
  });
80
82
 
81
83
  // store request with instance
82
- requestId = instance.getInstanceStore().createRequest(request);
84
+ requestId = IInstance(instance).getInstanceStore().createRequest(request);
83
85
  }
84
86
 
85
87
  emit LogOracleServiceRequestCreated(requestId, requesterNftId, oracleNftId, expiryAt);
@@ -106,11 +108,13 @@ contract OracleService is
106
108
  returns (bool success)
107
109
  {
108
110
  (
109
- NftId oracleNftId,
110
- IInstance instance
111
+ IRegistry.ObjectInfo memory info,
112
+ address instanceAddress
111
113
  ) = ContractLib.getAndVerifyComponent(
112
- msg.sender, ORACLE(), getRelease(), true);
114
+ getRegistry(), msg.sender, ORACLE(), true);
113
115
 
116
+ NftId oracleNftId = info.nftId;
117
+ IInstance instance = IInstance(instanceAddress);
114
118
  bool callerIsOracle = true;
115
119
  IOracle.RequestInfo memory request = _checkAndGetRequestInfo(instance, requestId, oracleNftId, callerIsOracle);
116
120
  request.responseData = responseData;
@@ -119,7 +123,7 @@ contract OracleService is
119
123
  instance.getInstanceStore().updateRequest(
120
124
  requestId, request, KEEP_STATE());
121
125
 
122
- IRegistry.ObjectInfo memory requesterInfo = _getRegistry().getObjectInfo(
126
+ IRegistry.ObjectInfo memory requesterInfo = getRegistry().getObjectInfo(
123
127
  request.requesterNftId);
124
128
 
125
129
  string memory functionSignature = string(
@@ -152,25 +156,24 @@ contract OracleService is
152
156
  restricted()
153
157
  {
154
158
  (
155
- // !!! TODO requesterNftId is in request.requesterNftId
156
- // here is responder nft id?
157
- NftId requesterNftId, // component
158
- IInstance instance
159
- ) = ContractLib.getAndVerifyComponent(
160
- msg.sender, COMPONENT(), getRelease(), true);
159
+ IRegistry.ObjectInfo memory info,
160
+ address instanceAddress
161
+ ) = ContractLib.getAndVerifyAnyComponent(
162
+ getRegistry(), msg.sender, true);
161
163
 
164
+ NftId requesterNftId = info.nftId;
165
+ IInstance instance = IInstance(instanceAddress);
162
166
  bool callerIsOracle = false;
163
167
  IOracle.RequestInfo memory request = _checkAndGetRequestInfo(instance, requestId, requesterNftId, callerIsOracle);
164
168
 
165
169
  // attempt to deliver response to requester
166
- address requester = msg.sender;
167
170
  string memory functionSignature = string(
168
171
  abi.encodePacked(
169
172
  request.callbackMethodName,
170
173
  "(uint64,bytes)"
171
174
  ));
172
175
 
173
- (bool success, bytes memory returnData) = requester.call(
176
+ (bool success, bytes memory returnData) = info.objectAddress.call(
174
177
  abi.encodeWithSignature(
175
178
  functionSignature,
176
179
  requestId,
@@ -181,8 +184,7 @@ contract OracleService is
181
184
  instance.getInstanceStore().updateRequestState(requestId, FULFILLED());
182
185
  emit LogOracleServiceResponseResent(requestId, requesterNftId);
183
186
  } else {
184
- // TODO why requester address instead of nftId?
185
- emit LogOracleServiceDeliveryFailed(requestId, requester, functionSignature);
187
+ emit LogOracleServiceDeliveryFailed(requestId, info.objectAddress, functionSignature);
186
188
  }
187
189
  }
188
190
 
@@ -193,11 +195,13 @@ contract OracleService is
193
195
  restricted()
194
196
  {
195
197
  (
196
- NftId requesterNftId, // component
197
- IInstance instance
198
- ) = ContractLib.getAndVerifyComponent(
199
- msg.sender, COMPONENT(), getRelease(), true);
198
+ IRegistry.ObjectInfo memory info,
199
+ address instanceAddress
200
+ ) = ContractLib.getAndVerifyAnyComponent(
201
+ getRegistry(), msg.sender, true);
200
202
 
203
+ NftId requesterNftId = info.nftId;
204
+ IInstance instance = IInstance(instanceAddress);
201
205
  bool callerIsOracle = false;
202
206
  // TODO property isCancelled and state update to CANCELLED are redundant, get rid of isCancelled
203
207
  IOracle.RequestInfo memory request = _checkAndGetRequestInfo(instance, requestId, requesterNftId, callerIsOracle);
@@ -207,7 +211,7 @@ contract OracleService is
207
211
 
208
212
  // call oracle component
209
213
  // TODO add check that oracle is active?
210
- address oracleAddress = _getRegistry().getObjectAddress(request.oracleNftId);
214
+ address oracleAddress = getRegistry().getObjectAddress(request.oracleNftId);
211
215
  IOracleComponent(oracleAddress).cancel(requestId);
212
216
 
213
217
  emit LogOracleServiceRequestCancelled(requestId, requesterNftId);
@@ -215,13 +219,39 @@ contract OracleService is
215
219
 
216
220
 
217
221
  function _checkRequestParams(
222
+ IRegistry registry,
223
+ NftId oracleNftId,
224
+ IRegistry.ObjectInfo memory requesterInfo,
218
225
  Timestamp expiryAt,
219
226
  string memory callbackMethodName
220
227
  )
221
228
  internal
222
229
  virtual
223
230
  view
231
+ returns (
232
+ NftId requesterNftId,
233
+ IOracleComponent oracle
234
+ )
224
235
  {
236
+ // get oracle info
237
+ (IRegistry.ObjectInfo memory oracleInfo,) = ContractLib.getInfoAndInstance(
238
+ registry, oracleNftId, true);
239
+
240
+ // obtain return values
241
+ requesterNftId = requesterInfo.nftId;
242
+ oracle = IOracleComponent(oracleInfo.objectAddress);
243
+
244
+ // check that requester and oracle share same product cluster
245
+ if (requesterInfo.objectType == PRODUCT()) {
246
+ if (oracleInfo.parentNftId != requesterNftId) {
247
+ revert ErrorOracleServiceProductMismatch(requesterInfo.objectType, requesterNftId, oracleInfo.parentNftId);
248
+ }
249
+ } else {
250
+ if (oracleInfo.parentNftId != requesterInfo.parentNftId) {
251
+ revert ErrorOracleServiceProductMismatch(requesterInfo.objectType, requesterInfo.parentNftId, oracleInfo.parentNftId);
252
+ }
253
+ }
254
+
225
255
  // check expiriyAt >= now
226
256
  if (expiryAt < TimestampLib.current()) {
227
257
  revert ErrorOracleServiceExpiryInThePast(TimestampLib.current(), expiryAt);
@@ -1,7 +1,7 @@
1
1
  // SPDX-License-Identifier: Apache-2.0
2
2
  pragma solidity ^0.8.20;
3
3
 
4
- import {IUpgradeable} from "../upgradeability/IUpgradeable.sol";
4
+ import {IVersionable} from "../upgradeability/IVersionable.sol";
5
5
  import {ProxyManager} from "../upgradeability/ProxyManager.sol";
6
6
  import {OracleService} from "./OracleService.sol";
7
7
 
@@ -12,17 +12,19 @@ contract OracleServiceManager is ProxyManager {
12
12
  /// @dev initializes proxy manager with service implementation and deploys instance
13
13
  constructor(
14
14
  address authority,
15
+ address registry,
15
16
  bytes32 salt
16
17
  )
17
18
  {
18
19
  OracleService svc = new OracleService{salt: salt}();
19
- bytes memory data = abi.encode(authority);
20
- IUpgradeable upgradeable = initialize(
20
+ bytes memory data = abi.encode(authority, registry);
21
+ IVersionable versionable = initialize(
22
+ registry,
21
23
  address(svc),
22
24
  data,
23
25
  salt);
24
26
 
25
- _oracleService = OracleService(address(upgradeable));
27
+ _oracleService = OracleService(address(versionable));
26
28
  }
27
29
 
28
30
  //--- view functions ----------------------------------------------------//
@@ -18,6 +18,7 @@ abstract contract BasicPool is
18
18
  {
19
19
 
20
20
  function _initializeBasicPool(
21
+ address registry,
21
22
  NftId productNftId,
22
23
  string memory name,
23
24
  IComponents.PoolInfo memory poolInfo,
@@ -29,6 +30,7 @@ abstract contract BasicPool is
29
30
  onlyInitializing()
30
31
  {
31
32
  __Pool_init(
33
+ registry,
32
34
  productNftId,
33
35
  name,
34
36
  poolInfo,
@@ -43,8 +45,8 @@ abstract contract BasicPool is
43
45
  public
44
46
  virtual
45
47
  restricted()
46
- onlyBundleOwner(bundleNftId) // TODO single modifier to check everything about given arbitrary nftId
47
- onlyNftOfType(bundleNftId, BUNDLE()) // TODO service will check this
48
+ onlyBundleOwner(bundleNftId)
49
+ onlyNftOfType(bundleNftId, BUNDLE())
48
50
  {
49
51
  _stake(bundleNftId, amount);
50
52
  }
@@ -2,7 +2,7 @@
2
2
  pragma solidity ^0.8.20;
3
3
 
4
4
  import {IAccess} from "../authorization/IAccess.sol";
5
- import {IComponent} from "../shared/IInstanceLinkedComponent.sol";
5
+ import {IInstanceLinkedComponent} from "../shared/IInstanceLinkedComponent.sol";
6
6
  import {IPoolComponent} from "./IPoolComponent.sol";
7
7
 
8
8
  import {Authorization} from "../authorization/Authorization.sol";
@@ -10,9 +10,8 @@ import {BasicPool} from "./BasicPool.sol";
10
10
  import {COMPONENT, POOL} from "../type/ObjectType.sol";
11
11
  import {PUBLIC_ROLE} from "../../contracts/type/RoleId.sol";
12
12
  import {RoleId} from "../type/RoleId.sol";
13
- import {GIF_INITIAL_RELEASE} from "../registry/Registry.sol";
14
13
  import {TokenHandler} from "../shared/TokenHandler.sol";
15
- import {VersionPartLib} from "../type/Version.sol";
14
+
16
15
 
17
16
  contract BasicPoolAuthorization
18
17
  is Authorization
@@ -22,7 +21,7 @@ contract BasicPoolAuthorization
22
21
  Authorization(
23
22
  poolName,
24
23
  POOL(),
25
- GIF_INITIAL_RELEASE(),
24
+ 3,
26
25
  COMMIT_HASH,
27
26
  TargetType.Component,
28
27
  true)
@@ -71,7 +70,7 @@ contract BasicPoolAuthorization
71
70
  _authorize(functions, BasicPool.unstake.selector, "unstake");
72
71
  _authorize(functions, BasicPool.extend.selector, "extend");
73
72
 
74
- _authorize(functions, IComponent.withdrawFees.selector, "withdrawFees");
73
+ _authorize(functions, IInstanceLinkedComponent.withdrawFees.selector, "withdrawFees");
75
74
  _authorize(functions, BasicPool.withdrawBundleFees.selector, "withdrawBundleFees");
76
75
 
77
76
  // authorize pool service
@@ -12,11 +12,11 @@ import {InstanceStore} from "../instance/InstanceStore.sol";
12
12
 
13
13
  import {Amount, AmountLib} from "../type/Amount.sol";
14
14
  import {BundleSet} from "../instance/BundleSet.sol";
15
- import {ContractLib} from "../shared/ContractLib.sol";
16
15
  import {Fee} from "../type/Fee.sol";
17
16
  import {InstanceReader} from "../instance/InstanceReader.sol";
18
17
  import {NftId, NftIdLib} from "../type/NftId.sol";
19
18
  import {ObjectType, ACCOUNTING, COMPONENT, POOL, BUNDLE, POLICY, REGISTRY} from "../type/ObjectType.sol";
19
+ import {PoolLib} from "./PoolLib.sol";
20
20
  import {Seconds} from "../type/Seconds.sol";
21
21
  import {Service} from "../shared/Service.sol";
22
22
  import {StateId, ACTIVE, PAUSED, CLOSED, KEEP_STATE} from "../type/StateId.sol";
@@ -41,13 +41,14 @@ contract BundleService is
41
41
  )
42
42
  internal
43
43
  virtual override
44
- onlyInitializing()
44
+ initializer()
45
45
  {
46
46
  (
47
- address authority
48
- ) = abi.decode(data, (address));
47
+ address authority,
48
+ address registry
49
+ ) = abi.decode(data, (address, address));
49
50
 
50
- __Service_init(authority, owner);
51
+ __Service_init(authority, registry, owner);
51
52
 
52
53
  _registryService = IRegistryService(_getServiceAddress(REGISTRY()));
53
54
  _accountingService = IAccountingService(_getServiceAddress(ACCOUNTING()));
@@ -65,12 +66,9 @@ contract BundleService is
65
66
  virtual
66
67
  restricted()
67
68
  {
68
- (
69
- NftId poolNftId,
70
- IInstance instance
71
- ) = ContractLib.getAndVerifyPoolForBundle(
72
- bundleNftId, getRelease());
69
+ _checkNftType(bundleNftId, BUNDLE());
73
70
 
71
+ (NftId poolNftId, IInstance instance) = PoolLib.getAndVerifyActivePool(getRegistry(), msg.sender);
74
72
  InstanceReader instanceReader = instance.getInstanceReader();
75
73
  IBundle.BundleInfo memory bundleInfo = instanceReader.getBundleInfo(bundleNftId);
76
74
  if(bundleInfo.poolNftId.eqz()) {
@@ -99,10 +97,7 @@ contract BundleService is
99
97
  restricted()
100
98
  returns(NftId bundleNftId)
101
99
  {
102
- (
103
- NftId poolNftId,
104
- IInstance instance
105
- ) = ContractLib.getAndVerifyPool(getRelease());
100
+ (NftId poolNftId, IInstance instance) = PoolLib.getAndVerifyActivePool(getRegistry(), msg.sender);
106
101
 
107
102
  // register bundle with registry
108
103
  bundleNftId = _registryService.registerBundle(
@@ -110,11 +105,11 @@ contract BundleService is
110
105
  NftIdLib.zero(),
111
106
  poolNftId,
112
107
  BUNDLE(),
113
- getRelease(),
114
108
  false, // intercepting property for bundles is defined on pool
115
- address(0)),
116
- owner,
117
- "" // bundle data to be stored in registry
109
+ address(0),
110
+ owner,
111
+ "" // bundle data to be stored in registry
112
+ )
118
113
  );
119
114
 
120
115
  // create bundle info in instance
@@ -135,7 +130,7 @@ contract BundleService is
135
130
  BundleSet bundleManager = instance.getBundleSet();
136
131
  bundleManager.add(bundleNftId);
137
132
 
138
- emit LogBundleServiceBundleCreated(bundleNftId, poolNftId, lifetime);
133
+ emit LogBundleServiceBundleCreated(bundleNftId, poolNftId, lifetime, bundleFee.fixedFee, bundleFee.fractionalFee);
139
134
  }
140
135
 
141
136
 
@@ -196,8 +191,9 @@ contract BundleService is
196
191
  restricted()
197
192
  {
198
193
  // checks
199
- (, IInstance instance) = ContractLib.getAndVerifyPoolForBundle(
200
- bundleNftId, getRelease());
194
+ _checkNftType(bundleNftId, BUNDLE());
195
+
196
+ (, IInstance instance) = PoolLib.getAndVerifyActivePool(getRegistry(), msg.sender);
201
197
 
202
198
  // effects
203
199
  // update set of active bundles
@@ -335,12 +331,9 @@ contract BundleService is
335
331
  returns (Timestamp extendedExpiredAt)
336
332
  {
337
333
  // checks
338
- (
339
- NftId poolNftId,
340
- IInstance instance
341
- ) = ContractLib.getAndVerifyPoolForBundle(
342
- bundleNftId, getRelease());
334
+ _checkNftType(bundleNftId, BUNDLE());
343
335
 
336
+ (NftId poolNftId, IInstance instance) = PoolLib.getAndVerifyActivePool(getRegistry(), msg.sender);
344
337
  IBundle.BundleInfo memory bundleInfo = instance.getInstanceReader().getBundleInfo(bundleNftId);
345
338
  StateId bundleState = instance.getInstanceReader().getBundleState(bundleNftId);
346
339
 
@@ -386,6 +379,7 @@ contract BundleService is
386
379
  emit LogBundleServiceCollateralReleased(bundleNftId, policyNftId, collateralAmount);
387
380
  }
388
381
 
382
+
389
383
  function _getDomain() internal pure override returns(ObjectType) {
390
384
  return BUNDLE();
391
385
  }
@@ -1,7 +1,7 @@
1
1
  // SPDX-License-Identifier: Apache-2.0
2
2
  pragma solidity ^0.8.20;
3
3
 
4
- import {IUpgradeable} from "../upgradeability/IUpgradeable.sol";
4
+ import {IVersionable} from "../upgradeability/IVersionable.sol";
5
5
  import {ProxyManager} from "../upgradeability/ProxyManager.sol";
6
6
  import {BundleService} from "./BundleService.sol";
7
7
 
@@ -11,18 +11,20 @@ contract BundleServiceManager is ProxyManager {
11
11
 
12
12
  /// @dev initializes proxy manager with pool service implementation
13
13
  constructor(
14
- address authority,
14
+ address authority,
15
+ address registry,
15
16
  bytes32 salt
16
17
  )
17
18
  {
18
19
  BundleService svc = new BundleService{salt: salt}();
19
- bytes memory data = abi.encode(authority);
20
- IUpgradeable upgradeable = initialize(
20
+ bytes memory data = abi.encode(authority, registry);
21
+ IVersionable versionable = initialize(
22
+ registry,
21
23
  address(svc),
22
24
  data,
23
25
  salt);
24
26
 
25
- _bundleService = BundleService(address(upgradeable));
27
+ _bundleService = BundleService(address(versionable));
26
28
  }
27
29
 
28
30
  //--- view functions ----------------------------------------------------//
@@ -30,7 +30,7 @@ interface IBundleService is IService {
30
30
 
31
31
  error ErrorBundleServiceExtensionLifetimeIsZero();
32
32
 
33
- event LogBundleServiceBundleCreated(NftId bundleNftId, NftId poolNftId, Seconds lifetime);
33
+ event LogBundleServiceBundleCreated(NftId bundleNftId, NftId poolNftId, Seconds lifetime, Amount fixedFee, UFixed fractionalFee);
34
34
  event LogBundleServiceBundleClosed(NftId bundleNftId);
35
35
  event LogBundleServiceBundleLocked(NftId bundleNftId);
36
36
  event LogBundleServiceBundleUnlocked(NftId bundleNftId);
@@ -18,14 +18,15 @@ interface IPoolService is IService {
18
18
  event LogPoolServiceWalletFunded(NftId poolNftId, address poolOwner, Amount amount);
19
19
  event LogPoolServiceWalletDefunded(NftId poolNftId, address poolOwner, Amount amount);
20
20
 
21
- event LogPoolServiceBundleClosed(NftId poolNftId, NftId bundleNftId);
21
+ event LogPoolServiceBundleCreated(NftId instanceNftId, NftId poolNftId, NftId bundleNftId);
22
+ event LogPoolServiceBundleClosed(NftId instanceNftId, NftId poolNftId, NftId bundleNftId, Amount balanceAmount, Amount feeAmount);
22
23
 
23
- event LogPoolServiceBundleStaked(NftId poolNftId, NftId bundleNftId, Amount amount, Amount netAmount);
24
- event LogPoolServiceBundleUnstaked(NftId poolNftId, NftId bundleNftId, Amount amount, Amount netAmount);
24
+ event LogPoolServiceBundleStaked(NftId instanceNftId, NftId poolNftId, NftId bundleNftId, Amount amount, Amount netAmount);
25
+ event LogPoolServiceBundleUnstaked(NftId instanceNftId, NftId poolNftId, NftId bundleNftId, Amount amount, Amount netAmount);
25
26
 
26
- event LogPoolServiceFeesWithdrawn(NftId poolNftId, NftId bundleNftId, address recipient, address tokenAddress, Amount amount);
27
+ event LogPoolServiceFeesWithdrawn(NftId bundleNftId, address recipient, address tokenAddress, Amount amount);
27
28
 
28
- event LogPoolServiceProcessFundedClaim(NftId poolNftId, NftId policyNftId, ClaimId claimId, Amount availableAmount);
29
+ event LogPoolServiceProcessFundedClaim(NftId policyNftId, ClaimId claimId, Amount availableAmount);
29
30
 
30
31
  event LogPoolServiceApplicationVerified(NftId poolNftId, NftId bundleNftId, NftId applicationNftId, Amount totalCollateralAmount);
31
32
  event LogPoolServiceCollateralLocked(NftId poolNftId, NftId bundleNftId, NftId applicationNftId, Amount totalCollateralAmount, Amount lockedCollateralAmount);
@@ -35,7 +35,7 @@ abstract contract Pool is
35
35
 
36
36
 
37
37
  modifier onlyBundleOwner(NftId bundleNftId) {
38
- if(msg.sender != _getRegistry().ownerOf(bundleNftId)) {
38
+ if(msg.sender != getRegistry().ownerOf(bundleNftId)) {
39
39
  revert ErrorPoolNotBundleOwner(bundleNftId, msg.sender);
40
40
  }
41
41
  _;
@@ -124,6 +124,7 @@ abstract contract Pool is
124
124
  // Internals
125
125
 
126
126
  function __Pool_init(
127
+ address registry,
127
128
  NftId productNftId,
128
129
  string memory name,
129
130
  IComponents.PoolInfo memory poolInfo,
@@ -135,6 +136,7 @@ abstract contract Pool is
135
136
  onlyInitializing()
136
137
  {
137
138
  __InstanceLinkedComponent_init(
139
+ registry,
138
140
  productNftId,
139
141
  name,
140
142
  POOL(),