@etherisc/gif-next 0.0.2-df73b56-462 → 0.0.2-e016345-525

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 (453) hide show
  1. package/README.md +27 -6
  2. package/artifacts/contracts/accounting/AccountingService.sol/AccountingService.dbg.json +4 -0
  3. package/artifacts/contracts/accounting/AccountingService.sol/AccountingService.json +944 -0
  4. package/artifacts/contracts/accounting/AccountingServiceManager.sol/AccountingServiceManager.dbg.json +4 -0
  5. package/artifacts/contracts/accounting/AccountingServiceManager.sol/AccountingServiceManager.json +746 -0
  6. package/artifacts/contracts/accounting/IAccountingService.sol/IAccountingService.dbg.json +4 -0
  7. package/artifacts/contracts/accounting/IAccountingService.sol/IAccountingService.json +711 -0
  8. package/artifacts/contracts/authorization/AccessAdmin.sol/AccessAdmin.dbg.json +1 -1
  9. package/artifacts/contracts/authorization/AccessAdmin.sol/AccessAdmin.json +96 -37
  10. package/artifacts/contracts/authorization/AccessAdmin.sol/IAccessManagedChecker.dbg.json +4 -0
  11. package/artifacts/contracts/authorization/AccessAdmin.sol/IAccessManagedChecker.json +24 -0
  12. package/artifacts/contracts/authorization/AccessManagerCloneable.sol/AccessManagerCloneable.dbg.json +1 -1
  13. package/artifacts/contracts/authorization/Authorization.sol/Authorization.dbg.json +1 -1
  14. package/artifacts/contracts/authorization/Authorization.sol/Authorization.json +67 -11
  15. package/artifacts/contracts/authorization/IAccess.sol/IAccess.dbg.json +1 -1
  16. package/artifacts/contracts/authorization/IAccessAdmin.sol/IAccessAdmin.dbg.json +1 -1
  17. package/artifacts/contracts/authorization/IAccessAdmin.sol/IAccessAdmin.json +60 -13
  18. package/artifacts/contracts/authorization/IAuthorization.sol/IAuthorization.dbg.json +1 -1
  19. package/artifacts/contracts/authorization/IAuthorization.sol/IAuthorization.json +40 -3
  20. package/artifacts/contracts/authorization/IServiceAuthorization.sol/IServiceAuthorization.dbg.json +1 -1
  21. package/artifacts/contracts/authorization/IServiceAuthorization.sol/IServiceAuthorization.json +19 -0
  22. package/artifacts/contracts/authorization/ReleaseAccessManager.sol/ReleaseAccessManager.dbg.json +4 -0
  23. package/artifacts/contracts/authorization/ReleaseAccessManager.sol/ReleaseAccessManager.json +1196 -0
  24. package/artifacts/contracts/authorization/ServiceAuthorization.sol/ServiceAuthorization.dbg.json +1 -1
  25. package/artifacts/contracts/authorization/ServiceAuthorization.sol/ServiceAuthorization.json +68 -5
  26. package/artifacts/contracts/distribution/BasicDistribution.sol/BasicDistribution.dbg.json +1 -1
  27. package/artifacts/contracts/distribution/BasicDistribution.sol/BasicDistribution.json +159 -209
  28. package/artifacts/contracts/distribution/BasicDistributionAuthorization.sol/BasicDistributionAuthorization.dbg.json +1 -1
  29. package/artifacts/contracts/distribution/BasicDistributionAuthorization.sol/BasicDistributionAuthorization.json +82 -22
  30. package/artifacts/contracts/distribution/Distribution.sol/Distribution.dbg.json +1 -1
  31. package/artifacts/contracts/distribution/Distribution.sol/Distribution.json +99 -125
  32. package/artifacts/contracts/distribution/DistributionService.sol/DistributionService.dbg.json +1 -1
  33. package/artifacts/contracts/distribution/DistributionService.sol/DistributionService.json +175 -86
  34. package/artifacts/contracts/distribution/DistributionServiceManager.sol/DistributionServiceManager.dbg.json +1 -1
  35. package/artifacts/contracts/distribution/DistributionServiceManager.sol/DistributionServiceManager.json +104 -60
  36. package/artifacts/contracts/distribution/IDistributionComponent.sol/IDistributionComponent.dbg.json +1 -1
  37. package/artifacts/contracts/distribution/IDistributionComponent.sol/IDistributionComponent.json +87 -108
  38. package/artifacts/contracts/distribution/IDistributionService.sol/IDistributionService.dbg.json +1 -1
  39. package/artifacts/contracts/distribution/IDistributionService.sol/IDistributionService.json +52 -0
  40. package/artifacts/contracts/examples/fire/DamageLevel.sol/DamageLevelLib.dbg.json +4 -0
  41. package/artifacts/contracts/examples/fire/DamageLevel.sol/DamageLevelLib.json +22 -0
  42. package/artifacts/contracts/examples/fire/FirePool.sol/FirePool.dbg.json +4 -0
  43. package/artifacts/contracts/examples/fire/FirePool.sol/FirePool.json +1441 -0
  44. package/artifacts/contracts/examples/fire/FirePoolAuthorization.sol/FirePoolAuthorization.dbg.json +4 -0
  45. package/artifacts/contracts/examples/fire/FirePoolAuthorization.sol/FirePoolAuthorization.json +502 -0
  46. package/artifacts/contracts/examples/fire/FireProduct.sol/FireProduct.dbg.json +4 -0
  47. package/artifacts/contracts/examples/fire/FireProduct.sol/FireProduct.json +1991 -0
  48. package/artifacts/contracts/examples/fire/FireProductAuthorization.sol/FireProductAuthorization.dbg.json +4 -0
  49. package/artifacts/contracts/examples/fire/FireProductAuthorization.sol/FireProductAuthorization.json +470 -0
  50. package/artifacts/contracts/examples/fire/FireUSD.sol/FireUSD.dbg.json +4 -0
  51. package/artifacts/contracts/examples/fire/FireUSD.sol/FireUSD.json +376 -0
  52. package/artifacts/contracts/examples/unpermissioned/SimpleDistribution.sol/SimpleDistribution.dbg.json +1 -1
  53. package/artifacts/contracts/examples/unpermissioned/SimpleDistribution.sol/SimpleDistribution.json +187 -169
  54. package/artifacts/contracts/examples/unpermissioned/SimpleDistributionAuthorization.sol/SimpleDistributionAuthorization.dbg.json +4 -0
  55. package/artifacts/contracts/examples/unpermissioned/SimpleDistributionAuthorization.sol/SimpleDistributionAuthorization.json +470 -0
  56. package/artifacts/contracts/examples/unpermissioned/SimpleOracle.sol/SimpleOracle.dbg.json +1 -1
  57. package/artifacts/contracts/examples/unpermissioned/SimpleOracle.sol/SimpleOracle.json +131 -157
  58. package/artifacts/contracts/examples/unpermissioned/SimplePool.sol/SimplePool.dbg.json +1 -1
  59. package/artifacts/contracts/examples/unpermissioned/SimplePool.sol/SimplePool.json +262 -202
  60. package/artifacts/contracts/examples/unpermissioned/SimplePoolAuthorization.sol/SimplePoolAuthorization.dbg.json +4 -0
  61. package/artifacts/contracts/examples/unpermissioned/SimplePoolAuthorization.sol/SimplePoolAuthorization.json +502 -0
  62. package/artifacts/contracts/examples/unpermissioned/SimpleProduct.sol/SimpleProduct.dbg.json +1 -1
  63. package/artifacts/contracts/examples/unpermissioned/SimpleProduct.sol/SimpleProduct.json +562 -252
  64. package/artifacts/contracts/examples/unpermissioned/SimpleProductAuthorization.sol/SimpleProductAuthorization.dbg.json +4 -0
  65. package/artifacts/contracts/examples/unpermissioned/SimpleProductAuthorization.sol/SimpleProductAuthorization.json +470 -0
  66. package/artifacts/contracts/instance/BundleSet.sol/BundleSet.dbg.json +1 -1
  67. package/artifacts/contracts/instance/BundleSet.sol/BundleSet.json +147 -42
  68. package/artifacts/contracts/instance/IInstance.sol/IInstance.dbg.json +1 -1
  69. package/artifacts/contracts/instance/IInstance.sol/IInstance.json +116 -48
  70. package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.dbg.json +1 -1
  71. package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.json +53 -101
  72. package/artifacts/contracts/instance/Instance.sol/Instance.dbg.json +1 -1
  73. package/artifacts/contracts/instance/Instance.sol/Instance.json +149 -60
  74. package/artifacts/contracts/instance/InstanceAdmin.sol/InstanceAdmin.dbg.json +1 -1
  75. package/artifacts/contracts/instance/InstanceAdmin.sol/InstanceAdmin.json +186 -125
  76. package/artifacts/contracts/instance/InstanceAuthorizationV3.sol/InstanceAuthorizationV3.dbg.json +1 -1
  77. package/artifacts/contracts/instance/InstanceAuthorizationV3.sol/InstanceAuthorizationV3.json +58 -85
  78. package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.dbg.json +1 -1
  79. package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.json +514 -88
  80. package/artifacts/contracts/instance/InstanceService.sol/InstanceService.dbg.json +1 -1
  81. package/artifacts/contracts/instance/InstanceService.sol/InstanceService.json +113 -148
  82. package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.dbg.json +1 -1
  83. package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.json +72 -40
  84. package/artifacts/contracts/instance/InstanceStore.sol/InstanceStore.dbg.json +1 -1
  85. package/artifacts/contracts/instance/InstanceStore.sol/InstanceStore.json +185 -124
  86. package/artifacts/contracts/instance/RiskSet.sol/RiskSet.dbg.json +4 -0
  87. package/artifacts/contracts/instance/RiskSet.sol/RiskSet.json +810 -0
  88. package/artifacts/contracts/instance/base/BalanceStore.sol/BalanceStore.dbg.json +1 -1
  89. package/artifacts/contracts/instance/base/BalanceStore.sol/BalanceStore.json +2 -2
  90. package/artifacts/contracts/instance/base/Cloneable.sol/Cloneable.dbg.json +1 -1
  91. package/artifacts/contracts/instance/base/ObjectCounter.sol/ObjectCounter.dbg.json +1 -1
  92. package/artifacts/contracts/instance/base/ObjectCounter.sol/ObjectCounter.json +2 -2
  93. package/artifacts/contracts/instance/base/ObjectLifecycle.sol/ObjectLifecycle.dbg.json +1 -1
  94. package/artifacts/contracts/instance/base/ObjectLifecycle.sol/ObjectLifecycle.json +46 -5
  95. package/artifacts/contracts/instance/base/ObjectSet.sol/ObjectSet.dbg.json +1 -1
  96. package/artifacts/contracts/instance/base/ObjectSet.sol/ObjectSet.json +2 -2
  97. package/artifacts/contracts/instance/module/IAccess.sol/IAccess.dbg.json +1 -1
  98. package/artifacts/contracts/instance/module/IBundle.sol/IBundle.dbg.json +1 -1
  99. package/artifacts/contracts/instance/module/IComponents.sol/IComponents.dbg.json +1 -1
  100. package/artifacts/contracts/instance/module/IDistribution.sol/IDistribution.dbg.json +1 -1
  101. package/artifacts/contracts/instance/module/IPolicy.sol/IPolicy.dbg.json +1 -1
  102. package/artifacts/contracts/instance/module/IRisk.sol/IRisk.dbg.json +1 -1
  103. package/artifacts/contracts/mock/Dip.sol/Dip.dbg.json +1 -1
  104. package/artifacts/contracts/oracle/BasicOracle.sol/BasicOracle.dbg.json +1 -1
  105. package/artifacts/contracts/oracle/BasicOracle.sol/BasicOracle.json +119 -169
  106. package/artifacts/contracts/oracle/BasicOracleAuthorization.sol/BasicOracleAuthorization.dbg.json +1 -1
  107. package/artifacts/contracts/oracle/BasicOracleAuthorization.sol/BasicOracleAuthorization.json +84 -24
  108. package/artifacts/contracts/oracle/IOracle.sol/IOracle.dbg.json +1 -1
  109. package/artifacts/contracts/oracle/IOracleComponent.sol/IOracleComponent.dbg.json +1 -1
  110. package/artifacts/contracts/oracle/IOracleComponent.sol/IOracleComponent.json +82 -103
  111. package/artifacts/contracts/oracle/IOracleService.sol/IOracleService.dbg.json +1 -1
  112. package/artifacts/contracts/oracle/IOracleService.sol/IOracleService.json +43 -9
  113. package/artifacts/contracts/oracle/Oracle.sol/Oracle.dbg.json +1 -1
  114. package/artifacts/contracts/oracle/Oracle.sol/Oracle.json +95 -121
  115. package/artifacts/contracts/oracle/OracleService.sol/OracleService.dbg.json +1 -1
  116. package/artifacts/contracts/oracle/OracleService.sol/OracleService.json +142 -79
  117. package/artifacts/contracts/oracle/OracleServiceManager.sol/OracleServiceManager.dbg.json +1 -1
  118. package/artifacts/contracts/oracle/OracleServiceManager.sol/OracleServiceManager.json +92 -36
  119. package/artifacts/contracts/pool/BasicPool.sol/BasicPool.dbg.json +1 -1
  120. package/artifacts/contracts/pool/BasicPool.sol/BasicPool.json +95 -149
  121. package/artifacts/contracts/pool/BasicPoolAuthorization.sol/BasicPoolAuthorization.dbg.json +1 -1
  122. package/artifacts/contracts/pool/BasicPoolAuthorization.sol/BasicPoolAuthorization.json +114 -22
  123. package/artifacts/contracts/pool/BundleService.sol/BundleService.dbg.json +1 -1
  124. package/artifacts/contracts/pool/BundleService.sol/BundleService.json +143 -150
  125. package/artifacts/contracts/pool/BundleServiceManager.sol/BundleServiceManager.dbg.json +1 -1
  126. package/artifacts/contracts/pool/BundleServiceManager.sol/BundleServiceManager.json +86 -66
  127. package/artifacts/contracts/pool/IBundleService.sol/IBundleService.dbg.json +1 -1
  128. package/artifacts/contracts/pool/IBundleService.sol/IBundleService.json +48 -33
  129. package/artifacts/contracts/pool/IPoolComponent.sol/IPoolComponent.dbg.json +1 -1
  130. package/artifacts/contracts/pool/IPoolComponent.sol/IPoolComponent.json +82 -142
  131. package/artifacts/contracts/pool/IPoolService.sol/IPoolService.dbg.json +1 -1
  132. package/artifacts/contracts/pool/IPoolService.sol/IPoolService.json +272 -185
  133. package/artifacts/contracts/pool/Pool.sol/Pool.dbg.json +1 -1
  134. package/artifacts/contracts/pool/Pool.sol/Pool.json +95 -160
  135. package/artifacts/contracts/pool/PoolService.sol/PoolService.dbg.json +1 -1
  136. package/artifacts/contracts/pool/PoolService.sol/PoolService.json +408 -263
  137. package/artifacts/contracts/pool/PoolServiceManager.sol/PoolServiceManager.dbg.json +1 -1
  138. package/artifacts/contracts/pool/PoolServiceManager.sol/PoolServiceManager.json +109 -41
  139. package/artifacts/contracts/product/ApplicationService.sol/ApplicationService.dbg.json +1 -1
  140. package/artifacts/contracts/product/ApplicationService.sol/ApplicationService.json +114 -45
  141. package/artifacts/contracts/product/ApplicationServiceManager.sol/ApplicationServiceManager.dbg.json +1 -1
  142. package/artifacts/contracts/product/ApplicationServiceManager.sol/ApplicationServiceManager.json +68 -36
  143. package/artifacts/contracts/product/BasicProduct.sol/BasicProduct.dbg.json +1 -1
  144. package/artifacts/contracts/product/BasicProduct.sol/BasicProduct.json +156 -141
  145. package/artifacts/contracts/product/BasicProductAuthorization.sol/BasicProductAuthorization.dbg.json +1 -1
  146. package/artifacts/contracts/product/BasicProductAuthorization.sol/BasicProductAuthorization.json +82 -22
  147. package/artifacts/contracts/product/ClaimService.sol/ClaimService.dbg.json +1 -1
  148. package/artifacts/contracts/product/ClaimService.sol/ClaimService.json +183 -90
  149. package/artifacts/contracts/product/ClaimServiceManager.sol/ClaimServiceManager.dbg.json +1 -1
  150. package/artifacts/contracts/product/ClaimServiceManager.sol/ClaimServiceManager.json +102 -58
  151. package/artifacts/contracts/product/IApplicationService.sol/IApplicationService.dbg.json +1 -1
  152. package/artifacts/contracts/product/IApplicationService.sol/IApplicationService.json +63 -7
  153. package/artifacts/contracts/product/IClaimService.sol/IClaimService.dbg.json +1 -1
  154. package/artifacts/contracts/product/IClaimService.sol/IClaimService.json +64 -8
  155. package/artifacts/contracts/product/IPolicyService.sol/IPolicyService.dbg.json +1 -1
  156. package/artifacts/contracts/product/IPolicyService.sol/IPolicyService.json +96 -19
  157. package/artifacts/contracts/product/IPricingService.sol/IPricingService.dbg.json +1 -1
  158. package/artifacts/contracts/product/IPricingService.sol/IPricingService.json +80 -51
  159. package/artifacts/contracts/product/IProductComponent.sol/IProductComponent.dbg.json +1 -1
  160. package/artifacts/contracts/product/IProductComponent.sol/IProductComponent.json +139 -119
  161. package/artifacts/contracts/product/IRiskService.sol/IRiskService.dbg.json +1 -1
  162. package/artifacts/contracts/product/IRiskService.sol/IRiskService.json +29 -0
  163. package/artifacts/contracts/product/PolicyService.sol/PolicyService.dbg.json +1 -1
  164. package/artifacts/contracts/product/PolicyService.sol/PolicyService.json +215 -125
  165. package/artifacts/contracts/product/PolicyServiceManager.sol/PolicyServiceManager.dbg.json +1 -1
  166. package/artifacts/contracts/product/PolicyServiceManager.sol/PolicyServiceManager.json +102 -54
  167. package/artifacts/contracts/product/PricingService.sol/PricingService.dbg.json +1 -1
  168. package/artifacts/contracts/product/PricingService.sol/PricingService.json +165 -107
  169. package/artifacts/contracts/product/PricingServiceManager.sol/PricingServiceManager.dbg.json +1 -1
  170. package/artifacts/contracts/product/PricingServiceManager.sol/PricingServiceManager.json +85 -45
  171. package/artifacts/contracts/product/Product.sol/Product.dbg.json +1 -1
  172. package/artifacts/contracts/product/Product.sol/Product.json +152 -137
  173. package/artifacts/contracts/product/RiskService.sol/RiskService.dbg.json +1 -1
  174. package/artifacts/contracts/product/RiskService.sol/RiskService.json +76 -26
  175. package/artifacts/contracts/product/RiskServiceManager.sol/RiskServiceManager.dbg.json +1 -1
  176. package/artifacts/contracts/product/RiskServiceManager.sol/RiskServiceManager.json +66 -30
  177. package/artifacts/contracts/registry/ChainNft.sol/ChainNft.dbg.json +1 -1
  178. package/artifacts/contracts/registry/ChainNft.sol/ChainNft.json +2 -2
  179. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.dbg.json +1 -1
  180. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.json +91 -15
  181. package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.dbg.json +1 -1
  182. package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.json +114 -35
  183. package/artifacts/contracts/registry/ITransferInterceptor.sol/ITransferInterceptor.dbg.json +1 -1
  184. package/artifacts/contracts/registry/ITransferInterceptor.sol/ITransferInterceptor.json +5 -18
  185. package/artifacts/contracts/registry/Registry.sol/Registry.dbg.json +1 -1
  186. package/artifacts/contracts/registry/Registry.sol/Registry.json +135 -51
  187. package/artifacts/contracts/registry/RegistryAdmin.sol/RegistryAdmin.dbg.json +1 -1
  188. package/artifacts/contracts/registry/RegistryAdmin.sol/RegistryAdmin.json +203 -162
  189. package/artifacts/contracts/registry/RegistryService.sol/RegistryService.dbg.json +1 -1
  190. package/artifacts/contracts/registry/RegistryService.sol/RegistryService.json +89 -172
  191. package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.dbg.json +1 -1
  192. package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.json +65 -29
  193. package/artifacts/contracts/registry/ReleaseLifecycle.sol/ReleaseLifecycle.dbg.json +1 -1
  194. package/artifacts/contracts/registry/ReleaseLifecycle.sol/ReleaseLifecycle.json +47 -6
  195. package/artifacts/contracts/registry/ReleaseRegistry.sol/ReleaseRegistry.dbg.json +1 -1
  196. package/artifacts/contracts/registry/ReleaseRegistry.sol/ReleaseRegistry.json +123 -225
  197. package/artifacts/contracts/registry/ServiceAuthorizationV3.sol/ServiceAuthorizationV3.dbg.json +1 -1
  198. package/artifacts/contracts/registry/ServiceAuthorizationV3.sol/ServiceAuthorizationV3.json +66 -8
  199. package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.dbg.json +1 -1
  200. package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.json +2 -2
  201. package/artifacts/contracts/shared/Component.sol/Component.dbg.json +1 -1
  202. package/artifacts/contracts/shared/Component.sol/Component.json +72 -80
  203. package/artifacts/contracts/shared/ComponentService.sol/ComponentService.dbg.json +1 -1
  204. package/artifacts/contracts/shared/ComponentService.sol/ComponentService.json +478 -477
  205. package/artifacts/contracts/shared/ComponentServiceManager.sol/ComponentServiceManager.dbg.json +1 -1
  206. package/artifacts/contracts/shared/ComponentServiceManager.sol/ComponentServiceManager.json +96 -72
  207. package/artifacts/contracts/shared/ComponentVerifyingService.sol/ComponentVerifyingService.dbg.json +1 -1
  208. package/artifacts/contracts/shared/ComponentVerifyingService.sol/ComponentVerifyingService.json +42 -0
  209. package/artifacts/contracts/shared/ContractLib.sol/ContractLib.dbg.json +1 -1
  210. package/artifacts/contracts/shared/ContractLib.sol/ContractLib.json +402 -6
  211. package/artifacts/contracts/shared/ContractLib.sol/IInstanceAdminHelper.dbg.json +4 -0
  212. package/artifacts/contracts/shared/ContractLib.sol/IInstanceAdminHelper.json +24 -0
  213. package/artifacts/contracts/shared/ContractLib.sol/ITargetHelper.dbg.json +4 -0
  214. package/artifacts/contracts/shared/ContractLib.sol/ITargetHelper.json +30 -0
  215. package/artifacts/contracts/shared/IComponent.sol/IComponent.dbg.json +1 -1
  216. package/artifacts/contracts/shared/IComponent.sol/IComponent.json +61 -64
  217. package/artifacts/contracts/shared/IComponentService.sol/IComponentService.dbg.json +1 -1
  218. package/artifacts/contracts/shared/IComponentService.sol/IComponentService.json +425 -261
  219. package/artifacts/contracts/shared/IInstanceLinkedComponent.sol/IInstanceLinkedComponent.dbg.json +1 -1
  220. package/artifacts/contracts/shared/IInstanceLinkedComponent.sol/IInstanceLinkedComponent.json +82 -103
  221. package/artifacts/contracts/shared/IKeyValueStore.sol/IKeyValueStore.dbg.json +1 -1
  222. package/artifacts/contracts/shared/IKeyValueStore.sol/IKeyValueStore.json +36 -0
  223. package/artifacts/contracts/shared/ILifecycle.sol/ILifecycle.dbg.json +1 -1
  224. package/artifacts/contracts/shared/ILifecycle.sol/ILifecycle.json +36 -0
  225. package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.dbg.json +1 -1
  226. package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.json +16 -0
  227. package/artifacts/contracts/shared/IPolicyHolder.sol/IPolicyHolder.dbg.json +1 -1
  228. package/artifacts/contracts/shared/IPolicyHolder.sol/IPolicyHolder.json +1 -1
  229. package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.dbg.json +1 -1
  230. package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.json +29 -0
  231. package/artifacts/contracts/shared/IRegistryLinked.sol/IRegistryLinked.dbg.json +1 -1
  232. package/artifacts/contracts/shared/IService.sol/IService.dbg.json +1 -1
  233. package/artifacts/contracts/shared/IService.sol/IService.json +29 -0
  234. package/artifacts/contracts/shared/InitializableERC165.sol/InitializableERC165.dbg.json +1 -1
  235. package/artifacts/contracts/shared/InstanceLinkedComponent.sol/InstanceLinkedComponent.dbg.json +1 -1
  236. package/artifacts/contracts/shared/InstanceLinkedComponent.sol/InstanceLinkedComponent.json +94 -120
  237. package/artifacts/contracts/shared/KeyValueStore.sol/KeyValueStore.dbg.json +1 -1
  238. package/artifacts/contracts/shared/KeyValueStore.sol/KeyValueStore.json +42 -1
  239. package/artifacts/contracts/shared/Lifecycle.sol/Lifecycle.dbg.json +1 -1
  240. package/artifacts/contracts/shared/Lifecycle.sol/Lifecycle.json +42 -1
  241. package/artifacts/contracts/shared/NftIdSet.sol/NftIdSet.dbg.json +1 -1
  242. package/artifacts/contracts/shared/NftIdSet.sol/NftIdSet.json +2 -2
  243. package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.dbg.json +1 -1
  244. package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.json +18 -2
  245. package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.dbg.json +1 -1
  246. package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.json +3 -3
  247. package/artifacts/contracts/shared/Registerable.sol/Registerable.dbg.json +1 -1
  248. package/artifacts/contracts/shared/Registerable.sol/Registerable.json +66 -8
  249. package/artifacts/contracts/shared/RegistryLinked.sol/RegistryLinked.dbg.json +1 -1
  250. package/artifacts/contracts/shared/RegistryLinked.sol/RegistryLinked.json +2 -2
  251. package/artifacts/contracts/shared/Service.sol/Service.dbg.json +1 -1
  252. package/artifacts/contracts/shared/Service.sol/Service.json +42 -0
  253. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.dbg.json +1 -1
  254. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.json +388 -35
  255. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandlerBase.dbg.json +4 -0
  256. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandlerBase.json +395 -0
  257. package/artifacts/contracts/shared/TokenHandlerDeployerLib.sol/TokenHandlerDeployerLib.dbg.json +1 -1
  258. package/artifacts/contracts/shared/TokenHandlerDeployerLib.sol/TokenHandlerDeployerLib.json +88 -24
  259. package/artifacts/contracts/staking/IStaking.sol/IStaking.dbg.json +1 -1
  260. package/artifacts/contracts/staking/IStaking.sol/IStaking.json +79 -100
  261. package/artifacts/contracts/staking/IStakingService.sol/IStakingService.dbg.json +1 -1
  262. package/artifacts/contracts/staking/IStakingService.sol/IStakingService.json +29 -21
  263. package/artifacts/contracts/staking/StakeManagerLib.sol/StakeManagerLib.dbg.json +1 -1
  264. package/artifacts/contracts/staking/StakeManagerLib.sol/StakeManagerLib.json +2 -2
  265. package/artifacts/contracts/staking/Staking.sol/Staking.dbg.json +1 -1
  266. package/artifacts/contracts/staking/Staking.sol/Staking.json +158 -170
  267. package/artifacts/contracts/staking/StakingLifecycle.sol/StakingLifecycle.dbg.json +1 -1
  268. package/artifacts/contracts/staking/StakingLifecycle.sol/StakingLifecycle.json +46 -5
  269. package/artifacts/contracts/staking/StakingManager.sol/StakingManager.dbg.json +1 -1
  270. package/artifacts/contracts/staking/StakingManager.sol/StakingManager.json +81 -51
  271. package/artifacts/contracts/staking/StakingReader.sol/StakingReader.dbg.json +1 -1
  272. package/artifacts/contracts/staking/StakingReader.sol/StakingReader.json +7 -12
  273. package/artifacts/contracts/staking/StakingService.sol/StakingService.dbg.json +1 -1
  274. package/artifacts/contracts/staking/StakingService.sol/StakingService.json +82 -53
  275. package/artifacts/contracts/staking/StakingServiceManager.sol/StakingServiceManager.dbg.json +1 -1
  276. package/artifacts/contracts/staking/StakingServiceManager.sol/StakingServiceManager.json +69 -33
  277. package/artifacts/contracts/staking/StakingStore.sol/StakingStore.dbg.json +1 -1
  278. package/artifacts/contracts/staking/StakingStore.sol/StakingStore.json +144 -103
  279. package/artifacts/contracts/staking/TargetManagerLib.sol/TargetManagerLib.dbg.json +1 -1
  280. package/artifacts/contracts/staking/TargetManagerLib.sol/TargetManagerLib.json +2 -2
  281. package/artifacts/contracts/type/AddressSet.sol/LibAddressSet.dbg.json +1 -1
  282. package/artifacts/contracts/type/Amount.sol/AmountLib.dbg.json +1 -1
  283. package/artifacts/contracts/type/Amount.sol/AmountLib.json +32 -8
  284. package/artifacts/contracts/type/Blocknumber.sol/BlocknumberLib.dbg.json +1 -1
  285. package/artifacts/contracts/type/ClaimId.sol/ClaimIdLib.dbg.json +1 -1
  286. package/artifacts/contracts/type/ClaimId.sol/ClaimIdLib.json +28 -4
  287. package/artifacts/contracts/type/DistributorType.sol/DistributorTypeLib.dbg.json +1 -1
  288. package/artifacts/contracts/type/DistributorType.sol/DistributorTypeLib.json +2 -2
  289. package/artifacts/contracts/type/Fee.sol/FeeLib.dbg.json +1 -1
  290. package/artifacts/contracts/type/Fee.sol/FeeLib.json +2 -2
  291. package/artifacts/contracts/type/Key32.sol/Key32Lib.dbg.json +1 -1
  292. package/artifacts/contracts/type/Key32.sol/Key32Lib.json +2 -2
  293. package/artifacts/contracts/type/Key32Set.sol/LibKey32Set.dbg.json +4 -0
  294. package/artifacts/contracts/type/Key32Set.sol/LibKey32Set.json +33 -0
  295. package/artifacts/contracts/type/NftId.sol/NftIdLib.dbg.json +1 -1
  296. package/artifacts/contracts/type/NftId.sol/NftIdLib.json +23 -4
  297. package/artifacts/contracts/type/NftIdSet.sol/LibNftIdSet.dbg.json +1 -1
  298. package/artifacts/contracts/type/NftIdSet.sol/LibNftIdSet.json +2 -2
  299. package/artifacts/contracts/type/ObjectType.sol/ObjectTypeLib.dbg.json +1 -1
  300. package/artifacts/contracts/type/ObjectType.sol/ObjectTypeLib.json +2 -2
  301. package/artifacts/contracts/type/PayoutId.sol/PayoutIdLib.dbg.json +1 -1
  302. package/artifacts/contracts/type/PayoutId.sol/PayoutIdLib.json +19 -19
  303. package/artifacts/contracts/type/Referral.sol/ReferralLib.dbg.json +1 -1
  304. package/artifacts/contracts/type/Referral.sol/ReferralLib.json +2 -2
  305. package/artifacts/contracts/type/RequestId.sol/RequestIdLib.dbg.json +1 -1
  306. package/artifacts/contracts/type/RequestId.sol/RequestIdLib.json +2 -2
  307. package/artifacts/contracts/type/RiskId.sol/RiskIdLib.dbg.json +1 -1
  308. package/artifacts/contracts/type/RiskId.sol/RiskIdLib.json +99 -5
  309. package/artifacts/contracts/type/RoleId.sol/RoleIdLib.dbg.json +1 -1
  310. package/artifacts/contracts/type/RoleId.sol/RoleIdLib.json +2 -2
  311. package/artifacts/contracts/type/Seconds.sol/SecondsLib.dbg.json +1 -1
  312. package/artifacts/contracts/type/Selector.sol/SelectorLib.dbg.json +1 -1
  313. package/artifacts/contracts/type/Selector.sol/SelectorSetLib.dbg.json +1 -1
  314. package/artifacts/contracts/type/StateId.sol/StateIdLib.dbg.json +1 -1
  315. package/artifacts/contracts/type/StateId.sol/StateIdLib.json +15 -2
  316. package/artifacts/contracts/type/String.sol/StrLib.dbg.json +1 -1
  317. package/artifacts/contracts/type/Timestamp.sol/TimestampLib.dbg.json +1 -1
  318. package/artifacts/contracts/type/UFixed.sol/MathLib.dbg.json +1 -1
  319. package/artifacts/contracts/type/UFixed.sol/MathLib.json +2 -2
  320. package/artifacts/contracts/type/UFixed.sol/UFixedLib.dbg.json +1 -1
  321. package/artifacts/contracts/type/UFixed.sol/UFixedLib.json +15 -2
  322. package/artifacts/contracts/type/Version.sol/VersionLib.dbg.json +1 -1
  323. package/artifacts/contracts/type/Version.sol/VersionPartLib.dbg.json +1 -1
  324. package/artifacts/contracts/upgradeability/IVersionable.sol/IVersionable.dbg.json +1 -1
  325. package/artifacts/contracts/upgradeability/ProxyManager.sol/ProxyManager.dbg.json +1 -1
  326. package/artifacts/contracts/upgradeability/ProxyManager.sol/ProxyManager.json +44 -12
  327. package/artifacts/contracts/upgradeability/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.dbg.json +1 -1
  328. package/artifacts/contracts/upgradeability/Versionable.sol/Versionable.dbg.json +1 -1
  329. package/contracts/accounting/AccountingService.sol +244 -0
  330. package/contracts/accounting/AccountingServiceManager.sol +38 -0
  331. package/contracts/accounting/IAccountingService.sol +42 -0
  332. package/contracts/authorization/AccessAdmin.sol +86 -62
  333. package/contracts/authorization/Authorization.sol +111 -39
  334. package/contracts/authorization/IAccess.sol +1 -0
  335. package/contracts/authorization/IAccessAdmin.sol +4 -2
  336. package/contracts/authorization/IAuthorization.sol +13 -7
  337. package/contracts/authorization/IServiceAuthorization.sol +3 -1
  338. package/contracts/authorization/ReleaseAccessManager.sol +38 -0
  339. package/contracts/authorization/ServiceAuthorization.sol +26 -10
  340. package/contracts/distribution/BasicDistribution.sol +8 -7
  341. package/contracts/distribution/BasicDistributionAuthorization.sol +1 -1
  342. package/contracts/distribution/Distribution.sol +32 -40
  343. package/contracts/distribution/DistributionService.sol +80 -59
  344. package/contracts/distribution/IDistributionComponent.sol +1 -1
  345. package/contracts/distribution/IDistributionService.sol +5 -6
  346. package/contracts/examples/fire/DamageLevel.sol +59 -0
  347. package/contracts/examples/fire/FirePool.sol +90 -0
  348. package/contracts/examples/fire/FirePoolAuthorization.sol +35 -0
  349. package/contracts/examples/fire/FireProduct.sol +436 -0
  350. package/contracts/examples/fire/FireProductAuthorization.sol +45 -0
  351. package/contracts/examples/fire/FireUSD.sol +26 -0
  352. package/contracts/examples/unpermissioned/SimpleDistribution.sol +11 -4
  353. package/contracts/examples/unpermissioned/SimpleDistributionAuthorization.sol +28 -0
  354. package/contracts/examples/unpermissioned/SimpleOracle.sol +4 -4
  355. package/contracts/examples/unpermissioned/SimplePool.sol +37 -6
  356. package/contracts/examples/unpermissioned/SimplePoolAuthorization.sol +28 -0
  357. package/contracts/examples/unpermissioned/SimpleProduct.sol +24 -23
  358. package/contracts/examples/unpermissioned/SimpleProductAuthorization.sol +28 -0
  359. package/contracts/instance/BundleSet.sol +38 -34
  360. package/contracts/instance/IInstance.sol +11 -3
  361. package/contracts/instance/IInstanceService.sol +7 -29
  362. package/contracts/instance/Instance.sol +36 -26
  363. package/contracts/instance/InstanceAdmin.sol +38 -38
  364. package/contracts/instance/InstanceAuthorizationV3.sol +50 -32
  365. package/contracts/instance/InstanceReader.sol +168 -19
  366. package/contracts/instance/InstanceService.sol +51 -126
  367. package/contracts/instance/RiskSet.sol +119 -0
  368. package/contracts/instance/base/ObjectSet.sol +24 -25
  369. package/contracts/instance/module/IComponents.sol +7 -5
  370. package/contracts/instance/module/IPolicy.sol +4 -3
  371. package/contracts/instance/module/IRisk.sol +1 -0
  372. package/contracts/oracle/BasicOracle.sol +0 -1
  373. package/contracts/oracle/IOracleService.sol +2 -1
  374. package/contracts/oracle/Oracle.sol +4 -15
  375. package/contracts/oracle/OracleService.sol +104 -76
  376. package/contracts/pool/BasicPool.sol +33 -24
  377. package/contracts/pool/BasicPoolAuthorization.sol +12 -2
  378. package/contracts/pool/BundleService.sol +68 -81
  379. package/contracts/pool/IBundleService.sol +2 -14
  380. package/contracts/pool/IPoolComponent.sol +1 -7
  381. package/contracts/pool/IPoolService.sol +30 -37
  382. package/contracts/pool/Pool.sol +123 -120
  383. package/contracts/pool/PoolService.sol +261 -154
  384. package/contracts/product/ApplicationService.sol +28 -16
  385. package/contracts/product/BasicProduct.sol +8 -12
  386. package/contracts/product/BasicProductAuthorization.sol +1 -3
  387. package/contracts/product/ClaimService.sol +110 -69
  388. package/contracts/product/IApplicationService.sol +5 -2
  389. package/contracts/product/IClaimService.sol +3 -2
  390. package/contracts/product/IPolicyService.sol +18 -5
  391. package/contracts/product/IPricingService.sol +9 -9
  392. package/contracts/product/IProductComponent.sol +23 -3
  393. package/contracts/product/PolicyService.sol +277 -187
  394. package/contracts/product/PricingService.sol +8 -8
  395. package/contracts/product/Product.sol +76 -75
  396. package/contracts/product/RiskService.sol +14 -3
  397. package/contracts/registry/ChainNft.sol +6 -9
  398. package/contracts/registry/IRegistry.sol +8 -3
  399. package/contracts/registry/IRegistryService.sol +5 -12
  400. package/contracts/registry/ITransferInterceptor.sol +1 -2
  401. package/contracts/registry/Registry.sol +29 -6
  402. package/contracts/registry/RegistryAdmin.sol +28 -35
  403. package/contracts/registry/RegistryService.sol +33 -44
  404. package/contracts/registry/ReleaseLifecycle.sol +6 -3
  405. package/contracts/registry/ReleaseRegistry.sol +202 -208
  406. package/contracts/registry/ServiceAuthorizationV3.sol +28 -52
  407. package/contracts/shared/Component.sol +56 -105
  408. package/contracts/shared/ComponentService.sol +376 -324
  409. package/contracts/shared/ComponentVerifyingService.sol +27 -16
  410. package/contracts/shared/ContractLib.sol +196 -10
  411. package/contracts/shared/IComponent.sol +6 -14
  412. package/contracts/shared/IComponentService.sol +45 -37
  413. package/contracts/shared/IInstanceLinkedComponent.sol +3 -22
  414. package/contracts/shared/ILifecycle.sol +3 -1
  415. package/contracts/shared/INftOwnable.sol +2 -0
  416. package/contracts/shared/IRegisterable.sol +11 -0
  417. package/contracts/shared/InstanceLinkedComponent.sol +68 -43
  418. package/contracts/shared/KeyValueStore.sol +1 -1
  419. package/contracts/shared/Lifecycle.sol +15 -4
  420. package/contracts/shared/NftOwnable.sol +23 -3
  421. package/contracts/shared/PolicyHolder.sol +4 -0
  422. package/contracts/shared/Registerable.sol +15 -7
  423. package/contracts/shared/RegistryLinked.sol +6 -12
  424. package/contracts/shared/Service.sol +4 -7
  425. package/contracts/shared/TokenHandler.sol +316 -66
  426. package/contracts/shared/TokenHandlerDeployerLib.sol +10 -2
  427. package/contracts/staking/IStaking.sol +9 -4
  428. package/contracts/staking/IStakingService.sol +0 -3
  429. package/contracts/staking/Staking.sol +41 -24
  430. package/contracts/staking/StakingReader.sol +12 -5
  431. package/contracts/staking/StakingService.sol +56 -23
  432. package/contracts/type/Amount.sol +15 -0
  433. package/contracts/type/ClaimId.sol +6 -1
  434. package/contracts/type/Key32.sol +2 -2
  435. package/contracts/type/Key32Set.sol +62 -0
  436. package/contracts/type/NftId.sol +7 -0
  437. package/contracts/type/ObjectType.sol +11 -0
  438. package/contracts/type/PayoutId.sol +10 -10
  439. package/contracts/type/RiskId.sol +30 -4
  440. package/contracts/type/RoleId.sol +0 -12
  441. package/contracts/type/StateId.sol +14 -1
  442. package/contracts/type/UFixed.sol +4 -0
  443. package/contracts/upgradeability/ProxyManager.sol +2 -1
  444. package/package.json +4 -3
  445. package/artifacts/contracts/authorization/IModuleAuthorization.sol/IModuleAuthorization.dbg.json +0 -4
  446. package/artifacts/contracts/authorization/IModuleAuthorization.sol/IModuleAuthorization.json +0 -290
  447. package/artifacts/contracts/authorization/ModuleAuthorization.sol/ModuleAuthorization.dbg.json +0 -4
  448. package/artifacts/contracts/authorization/ModuleAuthorization.sol/ModuleAuthorization.json +0 -390
  449. package/artifacts/contracts/shared/InitializableCustom.sol/InitializableCustom.dbg.json +0 -4
  450. package/artifacts/contracts/shared/InitializableCustom.sol/InitializableCustom.json +0 -39
  451. package/contracts/authorization/IModuleAuthorization.sol +0 -21
  452. package/contracts/authorization/ModuleAuthorization.sol +0 -78
  453. package/contracts/shared/InitializableCustom.sol +0 -177
@@ -2,7 +2,7 @@
2
2
  pragma solidity ^0.8.20;
3
3
 
4
4
  import {Amount} from "../type/Amount.sol";
5
- import {COMPONENT, ORACLE} from "../type/ObjectType.sol";
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
8
  import {IInstanceLinkedComponent} from "../shared/IInstanceLinkedComponent.sol";
@@ -27,15 +27,6 @@ abstract contract Oracle is
27
27
  }
28
28
 
29
29
 
30
- function register()
31
- external
32
- virtual
33
- onlyOwner()
34
- {
35
- _getOracleStorage()._componentService.registerOracle();
36
- }
37
-
38
-
39
30
  function request(
40
31
  RequestId requestId,
41
32
  NftId requesterId,
@@ -86,12 +77,11 @@ abstract contract Oracle is
86
77
 
87
78
  function _initializeOracle(
88
79
  address registry,
89
- NftId instanceNftId,
80
+ NftId productNftId,
90
81
  IAuthorization authorization,
91
82
  address initialOwner,
92
83
  string memory name,
93
84
  address token,
94
- bytes memory registryData, // writeonly data that will saved in the object info record of the registry
95
85
  bytes memory componentData // component specifidc data
96
86
  )
97
87
  internal
@@ -100,19 +90,18 @@ abstract contract Oracle is
100
90
  {
101
91
  _initializeInstanceLinkedComponent(
102
92
  registry,
103
- instanceNftId,
93
+ productNftId,
104
94
  name,
105
95
  token,
106
96
  ORACLE(),
107
97
  authorization,
108
98
  true,
109
99
  initialOwner,
110
- registryData,
111
100
  componentData);
112
101
 
113
102
  OracleStorage storage $ = _getOracleStorage();
114
- $._oracleService = IOracleService(_getServiceAddress(ORACLE()));
115
103
  $._componentService = IComponentService(_getServiceAddress(COMPONENT()));
104
+ $._oracleService = IOracleService(_getServiceAddress(ORACLE()));
116
105
 
117
106
  _registerInterface(type(IOracleComponent).interfaceId);
118
107
  }
@@ -1,7 +1,7 @@
1
1
  // SPDX-License-Identifier: Apache-2.0
2
2
  pragma solidity ^0.8.20;
3
3
 
4
- import {ComponentVerifyingService} from "../shared/ComponentVerifyingService.sol";
4
+ import {ContractLib} from "../shared/ContractLib.sol";
5
5
  import {IComponent} from "../shared/IComponent.sol";
6
6
  import {IInstance} from "../instance/IInstance.sol";
7
7
  import {IInstanceService} from "../instance/IInstanceService.sol";
@@ -11,14 +11,15 @@ import {IOracleComponent} from "./IOracleComponent.sol";
11
11
  import {IOracleService} from "./IOracleService.sol";
12
12
  import {IRegistry} from "../registry/IRegistry.sol";
13
13
  import {NftId} from "../type/NftId.sol";
14
- import {ObjectType, COMPONENT, ORACLE, INSTANCE} from "../type/ObjectType.sol";
14
+ import {ObjectType, COMPONENT, ORACLE, PRODUCT} from "../type/ObjectType.sol";
15
15
  import {RequestId} from "../type/RequestId.sol";
16
+ import {Service} from "../shared/Service.sol";
16
17
  import {StateId, ACTIVE, KEEP_STATE, FULFILLED, FAILED, CANCELLED} from "../type/StateId.sol";
17
18
  import {Timestamp, TimestampLib} from "../type/Timestamp.sol";
18
19
 
19
20
 
20
21
  contract OracleService is
21
- ComponentVerifyingService,
22
+ Service,
22
23
  IOracleService
23
24
  {
24
25
 
@@ -48,63 +49,49 @@ contract OracleService is
48
49
  external
49
50
  virtual
50
51
  // restricted() // add authz
51
- returns (
52
- RequestId requestId
53
- )
52
+ onlyNftOfType(oracleNftId, ORACLE())
53
+ returns (RequestId requestId)
54
54
  {
55
- (
56
- NftId componentNftId,
57
- IRegistry.ObjectInfo memory componentInfo,
58
- IInstance instance
59
- ) = _getAndVerifyActiveComponent(COMPONENT());
55
+ // IRegistry registry = getRegistry();
60
56
 
61
- // oracleNftId exists and is active oracle
57
+ // get and check active caller
62
58
  (
63
- IRegistry.ObjectInfo memory oracleInfo,
64
- ) = _getAndVerifyComponentInfo(
65
- oracleNftId,
66
- ORACLE(),
67
- true); // only active
68
-
69
- // TODO move to stronger validation, requester and oracle need to belong to same product cluster
70
- // check that requester and oracle share same instance
71
- if (componentInfo.parentNftId != oracleInfo.parentNftId) {
72
- revert ErrorOracleServiceInstanceMismatch(componentInfo.parentNftId, oracleInfo.parentNftId);
73
- }
59
+ IRegistry.ObjectInfo memory info,
60
+ address instance
61
+ ) = ContractLib.getAndVerifyAnyComponent(
62
+ getRegistry(), msg.sender, true);
74
63
 
75
- // check expiriyAt >= now
76
- if (expiryAt < TimestampLib.blockTimestamp()) {
77
- revert ErrorOracleServiceExpiryInThePast(TimestampLib.blockTimestamp(), expiryAt);
78
- }
79
-
80
- // check callbackMethodName.length > 0
81
- if (bytes(callbackMethodName).length == 0) {
82
- revert ErrorOracleServiceCallbackMethodNameEmpty();
64
+ (
65
+ NftId requesterNftId,
66
+ IOracleComponent oracle
67
+ ) = _checkRequestParams(
68
+ getRegistry(), oracleNftId, info, expiryAt, callbackMethodName);
69
+
70
+ {
71
+ // create request info
72
+ IOracle.RequestInfo memory request = IOracle.RequestInfo({
73
+ requesterNftId: requesterNftId,
74
+ callbackMethodName: callbackMethodName,
75
+ oracleNftId: oracleNftId,
76
+ requestData: requestData,
77
+ responseData: "",
78
+ respondedAt: TimestampLib.zero(),
79
+ expiredAt: expiryAt,
80
+ isCancelled: false
81
+ });
82
+
83
+ // store request with instance
84
+ requestId = IInstance(instance).getInstanceStore().createRequest(request);
83
85
  }
84
86
 
85
- // create request info
86
- IOracle.RequestInfo memory request = IOracle.RequestInfo({
87
- requesterNftId: componentNftId,
88
- callbackMethodName: callbackMethodName,
89
- oracleNftId: oracleNftId,
90
- requestData: requestData,
91
- responseData: "",
92
- respondedAt: TimestampLib.zero(),
93
- expiredAt: expiryAt,
94
- isCancelled: false
95
- });
96
-
97
- // store request with instance
98
- requestId = instance.getInstanceStore().createRequest(request);
99
-
100
- // call oracle component
101
- IOracleComponent(oracleInfo.objectAddress).request(
87
+ // callback to oracle component
88
+ oracle.request(
102
89
  requestId,
103
- componentNftId,
90
+ requesterNftId,
104
91
  requestData,
105
92
  expiryAt);
106
93
 
107
- emit LogOracleServiceRequestCreated(requestId, componentNftId, oracleNftId, expiryAt);
94
+ emit LogOracleServiceRequestCreated(requestId, requesterNftId, oracleNftId, expiryAt);
108
95
  }
109
96
 
110
97
 
@@ -120,11 +107,13 @@ contract OracleService is
120
107
  returns (bool success)
121
108
  {
122
109
  (
123
- NftId oracleNftId,
124
- IRegistry.ObjectInfo memory componentInfo,
125
- IInstance instance
126
- ) = _getAndVerifyActiveComponent(ORACLE());
110
+ IRegistry.ObjectInfo memory info,
111
+ address instanceAddress
112
+ ) = ContractLib.getAndVerifyComponent(
113
+ getRegistry(), msg.sender, ORACLE(), true);
127
114
 
115
+ NftId oracleNftId = info.nftId;
116
+ IInstance instance = IInstance(instanceAddress);
128
117
  bool callerIsOracle = true;
129
118
  IOracle.RequestInfo memory request = _checkAndGetRequestInfo(instance, requestId, oracleNftId, callerIsOracle);
130
119
  request.responseData = responseData;
@@ -166,11 +155,13 @@ contract OracleService is
166
155
  // restricted() // add authz
167
156
  {
168
157
  (
169
- NftId requesterNftId,
170
- IRegistry.ObjectInfo memory requesterInfo,
171
- IInstance instance
172
- ) = _getAndVerifyActiveComponent(COMPONENT());
158
+ IRegistry.ObjectInfo memory info,
159
+ address instanceAddress
160
+ ) = ContractLib.getAndVerifyAnyComponent(
161
+ getRegistry(), msg.sender, true);
173
162
 
163
+ NftId requesterNftId = info.nftId;
164
+ IInstance instance = IInstance(instanceAddress);
174
165
  bool callerIsOracle = false;
175
166
  IOracle.RequestInfo memory request = _checkAndGetRequestInfo(instance, requestId, requesterNftId, callerIsOracle);
176
167
 
@@ -181,7 +172,7 @@ contract OracleService is
181
172
  "(uint64,bytes)"
182
173
  ));
183
174
 
184
- (bool success, bytes memory returnData) = requesterInfo.objectAddress.call(
175
+ (bool success, bytes memory returnData) = info.objectAddress.call(
185
176
  abi.encodeWithSignature(
186
177
  functionSignature,
187
178
  requestId,
@@ -192,7 +183,7 @@ contract OracleService is
192
183
  instance.getInstanceStore().updateRequestState(requestId, FULFILLED());
193
184
  emit LogOracleServiceResponseResent(requestId, requesterNftId);
194
185
  } else {
195
- emit LogOracleServiceDeliveryFailed(requestId, requesterInfo.objectAddress, functionSignature);
186
+ emit LogOracleServiceDeliveryFailed(requestId, info.objectAddress, functionSignature);
196
187
  }
197
188
  }
198
189
 
@@ -203,11 +194,13 @@ contract OracleService is
203
194
  // restricted() // add authz
204
195
  {
205
196
  (
206
- NftId requesterNftId,
207
- IRegistry.ObjectInfo memory componentInfo,
208
- IInstance instance
209
- ) = _getAndVerifyActiveComponent(COMPONENT());
197
+ IRegistry.ObjectInfo memory info,
198
+ address instanceAddress
199
+ ) = ContractLib.getAndVerifyAnyComponent(
200
+ getRegistry(), msg.sender, true);
210
201
 
202
+ NftId requesterNftId = info.nftId;
203
+ IInstance instance = IInstance(instanceAddress);
211
204
  bool callerIsOracle = false;
212
205
  // TODO property isCancelled and state update to CANCELLED are redundant, get rid of isCancelled
213
206
  IOracle.RequestInfo memory request = _checkAndGetRequestInfo(instance, requestId, requesterNftId, callerIsOracle);
@@ -217,13 +210,59 @@ contract OracleService is
217
210
 
218
211
  // call oracle component
219
212
  // TODO add check that oracle is active?
220
- address oracleAddress = getRegistry().getObjectInfo(request.oracleNftId).objectAddress;
213
+ address oracleAddress = getRegistry().getObjectAddress(request.oracleNftId);
221
214
  IOracleComponent(oracleAddress).cancel(requestId);
222
215
 
223
216
  emit LogOracleServiceRequestCancelled(requestId, requesterNftId);
224
217
  }
225
218
 
226
219
 
220
+ function _checkRequestParams(
221
+ IRegistry registry,
222
+ NftId oracleNftId,
223
+ IRegistry.ObjectInfo memory info,
224
+ Timestamp expiryAt,
225
+ string memory callbackMethodName
226
+ )
227
+ internal
228
+ virtual
229
+ view
230
+ returns (
231
+ NftId requesterNftId,
232
+ IOracleComponent oracle
233
+ )
234
+ {
235
+ // get oracle info
236
+ (IRegistry.ObjectInfo memory oracleInfo,) = ContractLib.getInfoAndInstance(
237
+ registry, oracleNftId, true);
238
+
239
+ // obtain return values
240
+ requesterNftId = info.nftId;
241
+ oracle = IOracleComponent(oracleInfo.objectAddress);
242
+
243
+ // check that requester and oracle share same product cluster
244
+ if (info.objectType == PRODUCT()) {
245
+ if (oracleInfo.parentNftId != requesterNftId) {
246
+ revert ErrorOracleServiceProductMismatch(info.objectType, requesterNftId, oracleInfo.parentNftId);
247
+ }
248
+ } else {
249
+ if (oracleInfo.parentNftId != info.parentNftId) {
250
+ revert ErrorOracleServiceProductMismatch(info.objectType, info.parentNftId, oracleInfo.parentNftId);
251
+ }
252
+ }
253
+
254
+ // check expiriyAt >= now
255
+ if (expiryAt < TimestampLib.blockTimestamp()) {
256
+ revert ErrorOracleServiceExpiryInThePast(TimestampLib.blockTimestamp(), expiryAt);
257
+ }
258
+
259
+ // check callbackMethodName.length > 0
260
+ if (bytes(callbackMethodName).length == 0) {
261
+ revert ErrorOracleServiceCallbackMethodNameEmpty();
262
+ }
263
+ }
264
+
265
+
227
266
  function _checkAndGetRequestInfo(
228
267
  IInstance instance,
229
268
  RequestId requestId,
@@ -264,17 +303,6 @@ contract OracleService is
264
303
  }
265
304
 
266
305
 
267
- function _getInstanceForComponent(NftId componentNftId)
268
- internal
269
- view
270
- returns(IInstance instance)
271
- {
272
- NftId instanceNftId = getRegistry().getObjectInfo(componentNftId).parentNftId;
273
- address instanceAddress = getRegistry().getObjectInfo(instanceNftId).objectAddress;
274
- return IInstance(instanceAddress);
275
- }
276
-
277
-
278
306
  function _getDomain() internal pure override returns(ObjectType) {
279
307
  return ORACLE();
280
308
  }
@@ -1,22 +1,15 @@
1
1
  // SPDX-License-Identifier: Apache-2.0
2
2
  pragma solidity ^0.8.20;
3
3
 
4
- import {Amount, AmountLib} from "../type/Amount.sol";
5
- import {InstanceLinkedComponent} from "../shared/InstanceLinkedComponent.sol";
6
- import {Fee, FeeLib} from "../type/Fee.sol";
4
+ import {Amount} from "../type/Amount.sol";
5
+ import {Fee} from "../type/Fee.sol";
7
6
  import {IAuthorization} from "../authorization/IAuthorization.sol";
8
- import {IBundleService} from "./IBundleService.sol";
9
- import {IPoolComponent} from "./IPoolComponent.sol";
10
- import {IPoolService} from "./IPoolService.sol";
11
7
  import {IComponents} from "../instance/module/IComponents.sol";
12
- import {IComponentService} from "../shared/IComponentService.sol";
13
- import {NftId, NftIdLib} from "../type/NftId.sol";
14
- import {BUNDLE, COMPONENT, POOL} from "../type/ObjectType.sol";
15
- import {RoleId, PUBLIC_ROLE} from "../type/RoleId.sol";
8
+ import {NftId} from "../type/NftId.sol";
9
+ import {BUNDLE} from "../type/ObjectType.sol";
10
+ import {RoleId} from "../type/RoleId.sol";
16
11
  import {Seconds} from "../type/Seconds.sol";
17
12
  import {Timestamp} from "../type/Timestamp.sol";
18
- import {TokenHandler} from "../shared/TokenHandler.sol";
19
- import {UFixed, UFixedLib} from "../type/UFixed.sol";
20
13
 
21
14
  import {Pool} from "./Pool.sol";
22
15
 
@@ -26,10 +19,11 @@ abstract contract BasicPool is
26
19
 
27
20
  function _initializeBasicPool(
28
21
  address registry,
29
- NftId instanceNftId,
30
- IAuthorization authorization,
31
- address token,
22
+ NftId productNftId,
32
23
  string memory name,
24
+ address token,
25
+ IComponents.PoolInfo memory poolInfo,
26
+ IAuthorization authorization,
33
27
  address initialOwner
34
28
  )
35
29
  internal
@@ -38,13 +32,12 @@ abstract contract BasicPool is
38
32
  {
39
33
  _initializePool(
40
34
  registry,
41
- instanceNftId,
35
+ productNftId,
42
36
  name,
43
37
  token,
38
+ poolInfo,
44
39
  authorization,
45
- false, // isInterceptingNftTransfers,
46
40
  initialOwner,
47
- "", // registryData
48
41
  ""); // componentData
49
42
  }
50
43
 
@@ -56,6 +49,7 @@ abstract contract BasicPool is
56
49
  virtual
57
50
  restricted()
58
51
  onlyBundleOwner(bundleNftId)
52
+ onlyNftOfType(bundleNftId, BUNDLE())
59
53
  {
60
54
  _stake(bundleNftId, amount);
61
55
  }
@@ -69,6 +63,7 @@ abstract contract BasicPool is
69
63
  virtual
70
64
  restricted()
71
65
  onlyBundleOwner(bundleNftId)
66
+ onlyNftOfType(bundleNftId, BUNDLE())
72
67
  {
73
68
  _unstake(bundleNftId, amount);
74
69
  }
@@ -82,6 +77,7 @@ abstract contract BasicPool is
82
77
  virtual
83
78
  restricted()
84
79
  onlyBundleOwner(bundleNftId)
80
+ onlyNftOfType(bundleNftId, BUNDLE())
85
81
  returns(Timestamp newExpiredAt)
86
82
  {
87
83
  return _extend(bundleNftId, lifetimeExtension);
@@ -93,6 +89,7 @@ abstract contract BasicPool is
93
89
  virtual
94
90
  restricted()
95
91
  onlyBundleOwner(bundleNftId)
92
+ onlyNftOfType(bundleNftId, BUNDLE())
96
93
  {
97
94
  _lockBundle(bundleNftId);
98
95
  }
@@ -103,6 +100,7 @@ abstract contract BasicPool is
103
100
  virtual
104
101
  restricted()
105
102
  onlyBundleOwner(bundleNftId)
103
+ onlyNftOfType(bundleNftId, BUNDLE())
106
104
  {
107
105
  _unlockBundle(bundleNftId);
108
106
  }
@@ -113,11 +111,15 @@ abstract contract BasicPool is
113
111
  virtual
114
112
  restricted()
115
113
  onlyBundleOwner(bundleNftId)
114
+ onlyNftOfType(bundleNftId, BUNDLE())
116
115
  {
117
116
  _closeBundle(bundleNftId);
118
117
  }
119
118
 
120
119
 
120
+ /// @dev Updates the bundle feeds to the specified values.
121
+ /// @param bundleNftId the bundle Nft Id
122
+ /// @param fee the new fee values
121
123
  function setBundleFee(
122
124
  NftId bundleNftId,
123
125
  Fee memory fee
@@ -126,28 +128,35 @@ abstract contract BasicPool is
126
128
  virtual
127
129
  restricted()
128
130
  onlyBundleOwner(bundleNftId)
131
+ onlyNftOfType(bundleNftId, BUNDLE())
129
132
  {
130
133
  _setBundleFee(bundleNftId, fee);
131
134
  }
132
135
 
133
136
 
134
- function setMaxBalanceAmount(Amount maxBalanceAmount)
135
- public
137
+ /// @dev Withdraw bundle feeds for the given bundle.
138
+ /// @param bundleNftId the bundle Nft Id
139
+ /// @param amount the amount to withdraw. If set to AMOUNT_MAX, the full commission available is withdrawn
140
+ /// @return withdrawnAmount the effective withdrawn amount
141
+ function withdrawBundleFees(NftId bundleNftId, Amount amount)
142
+ external
136
143
  virtual
137
144
  restricted()
138
- onlyOwner()
145
+ onlyBundleOwner(bundleNftId)
146
+ onlyNftOfType(bundleNftId, BUNDLE())
147
+ returns (Amount withdrawnAmount)
139
148
  {
140
- _setMaxBalanceAmount(maxBalanceAmount);
149
+ return _withdrawBundleFees(bundleNftId, amount);
141
150
  }
142
151
 
143
152
 
144
- function setBundleOwnerRole(RoleId bundleOwnerRole)
153
+ function setMaxBalanceAmount(Amount maxBalanceAmount)
145
154
  public
146
155
  virtual
147
156
  restricted()
148
157
  onlyOwner()
149
158
  {
150
- _setBundleOwnerRole(bundleOwnerRole);
159
+ _setMaxBalanceAmount(maxBalanceAmount);
151
160
  }
152
161
 
153
162
 
@@ -19,6 +19,13 @@ contract BasicPoolAuthorization
19
19
  Authorization(poolName)
20
20
  {}
21
21
 
22
+ function _setupServiceTargets()
23
+ internal
24
+ virtual override
25
+ {
26
+ _addServiceTargetWithRole(POOL());
27
+ }
28
+
22
29
  function _setupTargets()
23
30
  internal
24
31
  virtual override
@@ -44,7 +51,6 @@ contract BasicPoolAuthorization
44
51
  _authorize(functions, BasicPool.setBundleFee.selector, "setBundleFee");
45
52
 
46
53
  _authorize(functions, BasicPool.setMaxBalanceAmount.selector, "setMaxBalanceAmount");
47
- _authorize(functions, BasicPool.setBundleOwnerRole.selector, "setBundleOwnerRole");
48
54
  _authorize(functions, BasicPool.setFees.selector, "setFees");
49
55
  _authorize(functions, BasicPool.stake.selector, "stake");
50
56
  _authorize(functions, BasicPool.unstake.selector, "unstake");
@@ -52,7 +58,11 @@ contract BasicPoolAuthorization
52
58
 
53
59
  _authorize(functions, IInstanceLinkedComponent.withdrawFees.selector, "withdrawFees");
54
60
 
55
- _authorize(functions, IPoolComponent.withdrawBundleFees.selector, "withdrawBundleFees");
61
+ _authorize(functions, BasicPool.withdrawBundleFees.selector, "withdrawBundleFees");
62
+
63
+ // authorize pool service
64
+ functions = _authorizeForTarget(getTargetName(), getServiceRole(POOL()));
65
+ _authorize(functions, IPoolComponent.verifyApplication.selector, "verifyApplication");
56
66
  }
57
67
  }
58
68