@etherisc/gif-next 0.0.2-e83e4a5-207 → 0.0.2-e876b87-961

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 (490) hide show
  1. package/README.md +32 -3
  2. package/artifacts/contracts/authorization/AccessAdmin.sol/AccessAdmin.dbg.json +1 -1
  3. package/artifacts/contracts/authorization/AccessAdmin.sol/AccessAdmin.json +105 -65
  4. package/artifacts/contracts/authorization/AccessManagerCloneable.sol/AccessManagerCloneable.dbg.json +1 -1
  5. package/artifacts/contracts/authorization/AccessManagerCloneable.sol/AccessManagerCloneable.json +2 -2
  6. package/artifacts/contracts/authorization/Authorization.sol/Authorization.dbg.json +1 -1
  7. package/artifacts/contracts/authorization/Authorization.sol/Authorization.json +67 -11
  8. package/artifacts/contracts/authorization/IAccess.sol/IAccess.dbg.json +1 -1
  9. package/artifacts/contracts/authorization/IAccessAdmin.sol/IAccessAdmin.dbg.json +1 -1
  10. package/artifacts/contracts/authorization/IAccessAdmin.sol/IAccessAdmin.json +60 -32
  11. package/artifacts/contracts/authorization/IAuthorization.sol/IAuthorization.dbg.json +1 -1
  12. package/artifacts/contracts/authorization/IAuthorization.sol/IAuthorization.json +40 -3
  13. package/artifacts/contracts/authorization/IServiceAuthorization.sol/IServiceAuthorization.dbg.json +1 -1
  14. package/artifacts/contracts/authorization/IServiceAuthorization.sol/IServiceAuthorization.json +19 -0
  15. package/artifacts/contracts/authorization/ReleaseAccessManager.sol/ReleaseAccessManager.dbg.json +4 -0
  16. package/artifacts/contracts/authorization/ReleaseAccessManager.sol/ReleaseAccessManager.json +1196 -0
  17. package/artifacts/contracts/authorization/ServiceAuthorization.sol/ServiceAuthorization.dbg.json +1 -1
  18. package/artifacts/contracts/authorization/ServiceAuthorization.sol/ServiceAuthorization.json +68 -5
  19. package/artifacts/contracts/distribution/BasicDistribution.sol/BasicDistribution.dbg.json +1 -1
  20. package/artifacts/contracts/distribution/BasicDistribution.sol/BasicDistribution.json +206 -309
  21. package/artifacts/contracts/distribution/BasicDistributionAuthorization.sol/BasicDistributionAuthorization.dbg.json +1 -1
  22. package/artifacts/contracts/distribution/BasicDistributionAuthorization.sol/BasicDistributionAuthorization.json +82 -22
  23. package/artifacts/contracts/distribution/Distribution.sol/Distribution.dbg.json +1 -1
  24. package/artifacts/contracts/distribution/Distribution.sol/Distribution.json +134 -277
  25. package/artifacts/contracts/distribution/DistributionService.sol/DistributionService.dbg.json +1 -1
  26. package/artifacts/contracts/distribution/DistributionService.sol/DistributionService.json +284 -223
  27. package/artifacts/contracts/distribution/DistributionServiceManager.sol/DistributionServiceManager.dbg.json +1 -1
  28. package/artifacts/contracts/distribution/DistributionServiceManager.sol/DistributionServiceManager.json +116 -104
  29. package/artifacts/contracts/distribution/IDistributionComponent.sol/IDistributionComponent.dbg.json +1 -1
  30. package/artifacts/contracts/distribution/IDistributionComponent.sol/IDistributionComponent.json +121 -92
  31. package/artifacts/contracts/distribution/IDistributionService.sol/IDistributionService.dbg.json +1 -1
  32. package/artifacts/contracts/distribution/IDistributionService.sol/IDistributionService.json +149 -31
  33. package/artifacts/contracts/examples/fire/DamageLevel.sol/DamageLevelLib.dbg.json +4 -0
  34. package/artifacts/contracts/examples/fire/DamageLevel.sol/DamageLevelLib.json +22 -0
  35. package/artifacts/contracts/examples/fire/FirePool.sol/FirePool.dbg.json +4 -0
  36. package/artifacts/contracts/examples/fire/FirePool.sol/FirePool.json +1538 -0
  37. package/artifacts/contracts/examples/fire/FirePoolAuthorization.sol/FirePoolAuthorization.dbg.json +4 -0
  38. package/artifacts/contracts/examples/fire/FirePoolAuthorization.sol/FirePoolAuthorization.json +470 -0
  39. package/artifacts/contracts/examples/fire/FireProduct.sol/FireProduct.dbg.json +4 -0
  40. package/artifacts/contracts/examples/fire/FireProduct.sol/FireProduct.json +2072 -0
  41. package/artifacts/contracts/examples/fire/FireProductAuthorization.sol/FireProductAuthorization.dbg.json +4 -0
  42. package/artifacts/contracts/examples/fire/FireProductAuthorization.sol/FireProductAuthorization.json +470 -0
  43. package/artifacts/contracts/examples/fire/FireUSD.sol/FireUSD.dbg.json +4 -0
  44. package/artifacts/contracts/examples/fire/FireUSD.sol/FireUSD.json +376 -0
  45. package/artifacts/contracts/examples/unpermissioned/SimpleDistribution.sol/SimpleDistribution.dbg.json +4 -0
  46. package/artifacts/contracts/examples/unpermissioned/SimpleDistribution.sol/SimpleDistribution.json +1471 -0
  47. package/artifacts/contracts/examples/unpermissioned/SimpleOracle.sol/SimpleOracle.dbg.json +4 -0
  48. package/artifacts/contracts/examples/unpermissioned/SimpleOracle.sol/SimpleOracle.json +1231 -0
  49. package/artifacts/contracts/examples/unpermissioned/SimplePool.sol/SimplePool.dbg.json +4 -0
  50. package/artifacts/contracts/examples/unpermissioned/SimplePool.sol/SimplePool.json +1592 -0
  51. package/artifacts/contracts/examples/unpermissioned/SimpleProduct.sol/SimpleProduct.dbg.json +4 -0
  52. package/artifacts/contracts/examples/unpermissioned/SimpleProduct.sol/SimpleProduct.json +2095 -0
  53. package/artifacts/contracts/instance/BundleSet.sol/BundleSet.dbg.json +4 -0
  54. package/artifacts/contracts/instance/BundleSet.sol/BundleSet.json +703 -0
  55. package/artifacts/contracts/instance/IInstance.sol/IInstance.dbg.json +1 -1
  56. package/artifacts/contracts/instance/IInstance.sol/IInstance.json +59 -37
  57. package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.dbg.json +1 -1
  58. package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.json +34 -89
  59. package/artifacts/contracts/instance/Instance.sol/Instance.dbg.json +1 -1
  60. package/artifacts/contracts/instance/Instance.sol/Instance.json +63 -130
  61. package/artifacts/contracts/instance/InstanceAdmin.sol/InstanceAdmin.dbg.json +1 -1
  62. package/artifacts/contracts/instance/InstanceAdmin.sol/InstanceAdmin.json +167 -140
  63. package/artifacts/contracts/instance/InstanceAuthorizationV3.sol/InstanceAuthorizationV3.dbg.json +1 -1
  64. package/artifacts/contracts/instance/InstanceAuthorizationV3.sol/InstanceAuthorizationV3.json +58 -98
  65. package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.dbg.json +1 -1
  66. package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.json +459 -136
  67. package/artifacts/contracts/instance/InstanceService.sol/InstanceService.dbg.json +1 -1
  68. package/artifacts/contracts/instance/InstanceService.sol/InstanceService.json +82 -247
  69. package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.dbg.json +1 -1
  70. package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.json +75 -87
  71. package/artifacts/contracts/instance/InstanceStore.sol/InstanceStore.dbg.json +1 -1
  72. package/artifacts/contracts/instance/InstanceStore.sol/InstanceStore.json +330 -243
  73. package/artifacts/contracts/instance/base/BalanceStore.sol/BalanceStore.dbg.json +1 -1
  74. package/artifacts/contracts/instance/base/BalanceStore.sol/BalanceStore.json +2 -2
  75. package/artifacts/contracts/instance/base/Cloneable.sol/Cloneable.dbg.json +1 -1
  76. package/artifacts/contracts/instance/base/ObjectCounter.sol/ObjectCounter.dbg.json +1 -1
  77. package/artifacts/contracts/instance/base/ObjectCounter.sol/ObjectCounter.json +2 -2
  78. package/artifacts/contracts/instance/base/ObjectLifecycle.sol/ObjectLifecycle.dbg.json +1 -1
  79. package/artifacts/contracts/instance/base/ObjectLifecycle.sol/ObjectLifecycle.json +46 -5
  80. package/artifacts/contracts/instance/base/ObjectSet.sol/ObjectSet.dbg.json +4 -0
  81. package/artifacts/contracts/instance/base/{ObjectManager.sol/ObjectManager.json → ObjectSet.sol/ObjectSet.json} +6 -6
  82. package/artifacts/contracts/instance/module/IAccess.sol/IAccess.dbg.json +1 -1
  83. package/artifacts/contracts/instance/module/IBundle.sol/IBundle.dbg.json +1 -1
  84. package/artifacts/contracts/instance/module/IComponents.sol/IComponents.dbg.json +1 -1
  85. package/artifacts/contracts/instance/module/IDistribution.sol/IDistribution.dbg.json +1 -1
  86. package/artifacts/contracts/instance/module/IPolicy.sol/IPolicy.dbg.json +1 -1
  87. package/artifacts/contracts/instance/module/IRisk.sol/IRisk.dbg.json +1 -1
  88. package/artifacts/contracts/mock/Dip.sol/Dip.dbg.json +1 -1
  89. package/artifacts/contracts/mock/Dip.sol/Dip.json +2 -2
  90. package/artifacts/contracts/oracle/BasicOracle.sol/BasicOracle.dbg.json +1 -1
  91. package/artifacts/contracts/oracle/BasicOracle.sol/BasicOracle.json +164 -280
  92. package/artifacts/contracts/oracle/BasicOracleAuthorization.sol/BasicOracleAuthorization.dbg.json +1 -1
  93. package/artifacts/contracts/oracle/BasicOracleAuthorization.sol/BasicOracleAuthorization.json +84 -24
  94. package/artifacts/contracts/oracle/IOracle.sol/IOracle.dbg.json +1 -1
  95. package/artifacts/contracts/oracle/IOracleComponent.sol/IOracleComponent.dbg.json +1 -1
  96. package/artifacts/contracts/oracle/IOracleComponent.sol/IOracleComponent.json +96 -80
  97. package/artifacts/contracts/oracle/IOracleService.sol/IOracleService.dbg.json +1 -1
  98. package/artifacts/contracts/oracle/IOracleService.sol/IOracleService.json +43 -9
  99. package/artifacts/contracts/oracle/Oracle.sol/Oracle.dbg.json +1 -1
  100. package/artifacts/contracts/oracle/Oracle.sol/Oracle.json +106 -262
  101. package/artifacts/contracts/oracle/OracleService.sol/OracleService.dbg.json +1 -1
  102. package/artifacts/contracts/oracle/OracleService.sol/OracleService.json +91 -159
  103. package/artifacts/contracts/oracle/OracleServiceManager.sol/OracleServiceManager.dbg.json +1 -1
  104. package/artifacts/contracts/oracle/OracleServiceManager.sol/OracleServiceManager.json +75 -83
  105. package/artifacts/contracts/pool/BasicPool.sol/BasicPool.dbg.json +1 -1
  106. package/artifacts/contracts/pool/BasicPool.sol/BasicPool.json +152 -330
  107. package/artifacts/contracts/pool/BasicPoolAuthorization.sol/BasicPoolAuthorization.dbg.json +1 -1
  108. package/artifacts/contracts/pool/BasicPoolAuthorization.sol/BasicPoolAuthorization.json +82 -22
  109. package/artifacts/contracts/pool/BundleService.sol/BundleService.dbg.json +1 -1
  110. package/artifacts/contracts/pool/BundleService.sol/BundleService.json +498 -167
  111. package/artifacts/contracts/pool/BundleServiceManager.sol/BundleServiceManager.dbg.json +1 -1
  112. package/artifacts/contracts/pool/BundleServiceManager.sol/BundleServiceManager.json +169 -89
  113. package/artifacts/contracts/pool/IBundleService.sol/IBundleService.dbg.json +1 -1
  114. package/artifacts/contracts/pool/IBundleService.sol/IBundleService.json +258 -1
  115. package/artifacts/contracts/pool/IPoolComponent.sol/IPoolComponent.dbg.json +1 -1
  116. package/artifacts/contracts/pool/IPoolComponent.sol/IPoolComponent.json +131 -130
  117. package/artifacts/contracts/pool/IPoolService.sol/IPoolService.dbg.json +1 -1
  118. package/artifacts/contracts/pool/IPoolService.sol/IPoolService.json +384 -179
  119. package/artifacts/contracts/pool/Pool.sol/Pool.dbg.json +1 -1
  120. package/artifacts/contracts/pool/Pool.sol/Pool.json +142 -313
  121. package/artifacts/contracts/pool/PoolService.sol/PoolService.dbg.json +1 -1
  122. package/artifacts/contracts/pool/PoolService.sol/PoolService.json +506 -334
  123. package/artifacts/contracts/pool/PoolServiceManager.sol/PoolServiceManager.dbg.json +1 -1
  124. package/artifacts/contracts/pool/PoolServiceManager.sol/PoolServiceManager.json +111 -87
  125. package/artifacts/contracts/product/ApplicationService.sol/ApplicationService.dbg.json +1 -1
  126. package/artifacts/contracts/product/ApplicationService.sol/ApplicationService.json +76 -168
  127. package/artifacts/contracts/product/ApplicationServiceManager.sol/ApplicationServiceManager.dbg.json +1 -1
  128. package/artifacts/contracts/product/ApplicationServiceManager.sol/ApplicationServiceManager.json +72 -92
  129. package/artifacts/contracts/product/BasicProduct.sol/BasicProduct.dbg.json +1 -1
  130. package/artifacts/contracts/product/BasicProduct.sol/BasicProduct.json +155 -281
  131. package/artifacts/contracts/product/BasicProductAuthorization.sol/BasicProductAuthorization.dbg.json +1 -1
  132. package/artifacts/contracts/product/BasicProductAuthorization.sol/BasicProductAuthorization.json +82 -22
  133. package/artifacts/contracts/product/ClaimService.sol/ClaimService.dbg.json +1 -1
  134. package/artifacts/contracts/product/ClaimService.sol/ClaimService.json +303 -187
  135. package/artifacts/contracts/product/ClaimServiceManager.sol/ClaimServiceManager.dbg.json +1 -1
  136. package/artifacts/contracts/product/ClaimServiceManager.sol/ClaimServiceManager.json +119 -103
  137. package/artifacts/contracts/product/IApplicationService.sol/IApplicationService.dbg.json +1 -1
  138. package/artifacts/contracts/product/IApplicationService.sol/IApplicationService.json +34 -0
  139. package/artifacts/contracts/product/IClaimService.sol/IClaimService.dbg.json +1 -1
  140. package/artifacts/contracts/product/IClaimService.sol/IClaimService.json +176 -6
  141. package/artifacts/contracts/product/IPolicyService.sol/IPolicyService.dbg.json +1 -1
  142. package/artifacts/contracts/product/IPolicyService.sol/IPolicyService.json +323 -118
  143. package/artifacts/contracts/product/IPricingService.sol/IPricingService.dbg.json +1 -1
  144. package/artifacts/contracts/product/IPricingService.sol/IPricingService.json +114 -85
  145. package/artifacts/contracts/product/IProductComponent.sol/IProductComponent.dbg.json +1 -1
  146. package/artifacts/contracts/product/IProductComponent.sol/IProductComponent.json +143 -97
  147. package/artifacts/contracts/product/IRiskService.sol/IRiskService.dbg.json +4 -0
  148. package/artifacts/contracts/product/{IProductService.sol/IProductService.json → IRiskService.sol/IRiskService.json} +31 -2
  149. package/artifacts/contracts/product/PolicyService.sol/PolicyService.dbg.json +1 -1
  150. package/artifacts/contracts/product/PolicyService.sol/PolicyService.json +444 -325
  151. package/artifacts/contracts/product/PolicyServiceManager.sol/PolicyServiceManager.dbg.json +1 -1
  152. package/artifacts/contracts/product/PolicyServiceManager.sol/PolicyServiceManager.json +119 -103
  153. package/artifacts/contracts/product/PricingService.sol/PricingService.dbg.json +1 -1
  154. package/artifacts/contracts/product/PricingService.sol/PricingService.json +202 -307
  155. package/artifacts/contracts/product/PricingServiceManager.sol/PricingServiceManager.dbg.json +1 -1
  156. package/artifacts/contracts/product/PricingServiceManager.sol/PricingServiceManager.json +96 -120
  157. package/artifacts/contracts/product/Product.sol/Product.dbg.json +1 -1
  158. package/artifacts/contracts/product/Product.sol/Product.json +155 -281
  159. package/artifacts/contracts/product/RiskService.sol/RiskService.dbg.json +4 -0
  160. package/artifacts/contracts/product/RiskService.sol/RiskService.json +622 -0
  161. package/artifacts/contracts/product/RiskServiceManager.sol/RiskServiceManager.dbg.json +4 -0
  162. package/artifacts/contracts/product/RiskServiceManager.sol/RiskServiceManager.json +694 -0
  163. package/artifacts/contracts/registry/ChainNft.sol/ChainNft.dbg.json +1 -1
  164. package/artifacts/contracts/registry/ChainNft.sol/ChainNft.json +59 -16
  165. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.dbg.json +1 -1
  166. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.json +322 -22
  167. package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.dbg.json +1 -1
  168. package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.json +42 -146
  169. package/artifacts/contracts/registry/ITransferInterceptor.sol/ITransferInterceptor.dbg.json +1 -1
  170. package/artifacts/contracts/registry/ITransferInterceptor.sol/ITransferInterceptor.json +5 -18
  171. package/artifacts/contracts/registry/Registry.sol/Registry.dbg.json +1 -1
  172. package/artifacts/contracts/registry/Registry.sol/Registry.json +549 -80
  173. package/artifacts/contracts/registry/RegistryAdmin.sol/RegistryAdmin.dbg.json +1 -1
  174. package/artifacts/contracts/registry/RegistryAdmin.sol/RegistryAdmin.json +285 -145
  175. package/artifacts/contracts/registry/RegistryService.sol/RegistryService.dbg.json +1 -1
  176. package/artifacts/contracts/registry/RegistryService.sol/RegistryService.json +78 -284
  177. package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.dbg.json +1 -1
  178. package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.json +67 -75
  179. package/artifacts/contracts/registry/ReleaseLifecycle.sol/ReleaseLifecycle.dbg.json +1 -1
  180. package/artifacts/contracts/registry/ReleaseLifecycle.sol/ReleaseLifecycle.json +47 -6
  181. package/artifacts/contracts/registry/ReleaseRegistry.sol/ReleaseRegistry.dbg.json +4 -0
  182. package/artifacts/contracts/registry/ReleaseRegistry.sol/ReleaseRegistry.json +1067 -0
  183. package/artifacts/contracts/registry/ServiceAuthorizationV3.sol/ServiceAuthorizationV3.dbg.json +1 -1
  184. package/artifacts/contracts/registry/ServiceAuthorizationV3.sol/ServiceAuthorizationV3.json +66 -8
  185. package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.dbg.json +1 -1
  186. package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.json +2 -2
  187. package/artifacts/contracts/shared/Component.sol/Component.dbg.json +1 -1
  188. package/artifacts/contracts/shared/Component.sol/Component.json +65 -236
  189. package/artifacts/contracts/shared/ComponentService.sol/ComponentService.dbg.json +1 -1
  190. package/artifacts/contracts/shared/ComponentService.sol/ComponentService.json +546 -248
  191. package/artifacts/contracts/shared/ComponentServiceHelperLib.sol/ComponentServiceHelperLib.dbg.json +4 -0
  192. package/artifacts/contracts/shared/ComponentServiceHelperLib.sol/ComponentServiceHelperLib.json +206 -0
  193. package/artifacts/contracts/shared/ComponentServiceManager.sol/ComponentServiceManager.dbg.json +1 -1
  194. package/artifacts/contracts/shared/ComponentServiceManager.sol/ComponentServiceManager.json +136 -110
  195. package/artifacts/contracts/shared/ComponentVerifyingService.sol/ComponentVerifyingService.dbg.json +1 -1
  196. package/artifacts/contracts/shared/ComponentVerifyingService.sol/ComponentVerifyingService.json +47 -112
  197. package/artifacts/contracts/shared/ContractLib.sol/ContractLib.dbg.json +4 -0
  198. package/artifacts/contracts/shared/ContractLib.sol/ContractLib.json +92 -0
  199. package/artifacts/contracts/shared/IComponent.sol/IComponent.dbg.json +1 -1
  200. package/artifacts/contracts/shared/IComponent.sol/IComponent.json +55 -54
  201. package/artifacts/contracts/shared/IComponentService.sol/IComponentService.dbg.json +1 -1
  202. package/artifacts/contracts/shared/IComponentService.sol/IComponentService.json +499 -19
  203. package/artifacts/contracts/shared/IInstanceLinkedComponent.sol/IInstanceLinkedComponent.dbg.json +1 -1
  204. package/artifacts/contracts/shared/IInstanceLinkedComponent.sol/IInstanceLinkedComponent.json +85 -80
  205. package/artifacts/contracts/shared/IKeyValueStore.sol/IKeyValueStore.dbg.json +1 -1
  206. package/artifacts/contracts/shared/IKeyValueStore.sol/IKeyValueStore.json +36 -0
  207. package/artifacts/contracts/shared/ILifecycle.sol/ILifecycle.dbg.json +1 -1
  208. package/artifacts/contracts/shared/ILifecycle.sol/ILifecycle.json +36 -0
  209. package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.dbg.json +1 -1
  210. package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.json +16 -0
  211. package/artifacts/contracts/shared/IPolicyHolder.sol/IPolicyHolder.dbg.json +1 -1
  212. package/artifacts/contracts/shared/IPolicyHolder.sol/IPolicyHolder.json +15 -47
  213. package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.dbg.json +1 -1
  214. package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.json +29 -0
  215. package/artifacts/contracts/shared/IRegistryLinked.sol/IRegistryLinked.dbg.json +1 -1
  216. package/artifacts/contracts/shared/IService.sol/IService.dbg.json +1 -1
  217. package/artifacts/contracts/shared/IService.sol/IService.json +29 -0
  218. package/artifacts/contracts/shared/InitializableERC165.sol/InitializableERC165.dbg.json +4 -0
  219. package/artifacts/contracts/shared/InitializableERC165.sol/InitializableERC165.json +53 -0
  220. package/artifacts/contracts/shared/InstanceLinkedComponent.sol/InstanceLinkedComponent.dbg.json +1 -1
  221. package/artifacts/contracts/shared/InstanceLinkedComponent.sol/InstanceLinkedComponent.json +98 -265
  222. package/artifacts/contracts/shared/KeyValueStore.sol/KeyValueStore.dbg.json +1 -1
  223. package/artifacts/contracts/shared/KeyValueStore.sol/KeyValueStore.json +42 -1
  224. package/artifacts/contracts/shared/Lifecycle.sol/Lifecycle.dbg.json +1 -1
  225. package/artifacts/contracts/shared/Lifecycle.sol/Lifecycle.json +42 -1
  226. package/artifacts/contracts/shared/NftIdSet.sol/NftIdSet.dbg.json +4 -0
  227. package/artifacts/contracts/shared/{NftIdSetManager.sol/NftIdSetManager.json → NftIdSet.sol/NftIdSet.json} +4 -4
  228. package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.dbg.json +1 -1
  229. package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.json +22 -57
  230. package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.dbg.json +1 -1
  231. package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.json +19 -141
  232. package/artifacts/contracts/shared/Registerable.sol/Registerable.dbg.json +1 -1
  233. package/artifacts/contracts/shared/Registerable.sol/Registerable.json +58 -89
  234. package/artifacts/contracts/shared/RegistryLinked.sol/RegistryLinked.dbg.json +1 -1
  235. package/artifacts/contracts/shared/RegistryLinked.sol/RegistryLinked.json +2 -15
  236. package/artifacts/contracts/shared/Service.sol/Service.dbg.json +1 -1
  237. package/artifacts/contracts/shared/Service.sol/Service.json +47 -112
  238. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.dbg.json +1 -1
  239. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.json +407 -11
  240. package/artifacts/contracts/shared/TokenHandlerDeployerLib.sol/TokenHandlerDeployerLib.dbg.json +4 -0
  241. package/artifacts/contracts/shared/TokenHandlerDeployerLib.sol/TokenHandlerDeployerLib.json +132 -0
  242. package/artifacts/contracts/staking/IStaking.sol/IStaking.dbg.json +1 -1
  243. package/artifacts/contracts/staking/IStaking.sol/IStaking.json +82 -55
  244. package/artifacts/contracts/staking/IStakingService.sol/IStakingService.dbg.json +1 -1
  245. package/artifacts/contracts/staking/IStakingService.sol/IStakingService.json +29 -21
  246. package/artifacts/contracts/staking/StakeManagerLib.sol/StakeManagerLib.dbg.json +1 -1
  247. package/artifacts/contracts/staking/StakeManagerLib.sol/StakeManagerLib.json +73 -93
  248. package/artifacts/contracts/staking/Staking.sol/Staking.dbg.json +1 -1
  249. package/artifacts/contracts/staking/Staking.sol/Staking.json +174 -291
  250. package/artifacts/contracts/staking/StakingLifecycle.sol/StakingLifecycle.dbg.json +1 -1
  251. package/artifacts/contracts/staking/StakingLifecycle.sol/StakingLifecycle.json +46 -5
  252. package/artifacts/contracts/staking/StakingManager.sol/StakingManager.dbg.json +1 -1
  253. package/artifacts/contracts/staking/StakingManager.sol/StakingManager.json +106 -91
  254. package/artifacts/contracts/staking/StakingReader.sol/StakingReader.dbg.json +1 -1
  255. package/artifacts/contracts/staking/StakingReader.sol/StakingReader.json +6 -11
  256. package/artifacts/contracts/staking/StakingService.sol/StakingService.dbg.json +1 -1
  257. package/artifacts/contracts/staking/StakingService.sol/StakingService.json +71 -165
  258. package/artifacts/contracts/staking/StakingServiceManager.sol/StakingServiceManager.dbg.json +1 -1
  259. package/artifacts/contracts/staking/StakingServiceManager.sol/StakingServiceManager.json +71 -79
  260. package/artifacts/contracts/staking/StakingStore.sol/StakingStore.dbg.json +1 -1
  261. package/artifacts/contracts/staking/StakingStore.sol/StakingStore.json +177 -131
  262. package/artifacts/contracts/staking/TargetManagerLib.sol/TargetManagerLib.dbg.json +1 -1
  263. package/artifacts/contracts/staking/TargetManagerLib.sol/TargetManagerLib.json +59 -23
  264. package/artifacts/contracts/type/AddressSet.sol/LibAddressSet.dbg.json +1 -1
  265. package/artifacts/contracts/type/Amount.sol/AmountLib.dbg.json +1 -1
  266. package/artifacts/contracts/type/Amount.sol/AmountLib.json +61 -8
  267. package/artifacts/contracts/type/Blocknumber.sol/BlocknumberLib.dbg.json +1 -1
  268. package/artifacts/contracts/type/Blocknumber.sol/BlocknumberLib.json +2 -2
  269. package/artifacts/contracts/type/ClaimId.sol/ClaimIdLib.dbg.json +1 -1
  270. package/artifacts/contracts/type/ClaimId.sol/ClaimIdLib.json +28 -4
  271. package/artifacts/contracts/type/DistributorType.sol/DistributorTypeLib.dbg.json +1 -1
  272. package/artifacts/contracts/type/DistributorType.sol/DistributorTypeLib.json +2 -2
  273. package/artifacts/contracts/type/Fee.sol/FeeLib.dbg.json +1 -1
  274. package/artifacts/contracts/type/Fee.sol/FeeLib.json +7 -2
  275. package/artifacts/contracts/type/Key32.sol/Key32Lib.dbg.json +1 -1
  276. package/artifacts/contracts/type/Key32.sol/Key32Lib.json +2 -2
  277. package/artifacts/contracts/type/NftId.sol/NftIdLib.dbg.json +1 -1
  278. package/artifacts/contracts/type/NftId.sol/NftIdLib.json +2 -2
  279. package/artifacts/contracts/type/NftIdSet.sol/LibNftIdSet.dbg.json +1 -1
  280. package/artifacts/contracts/type/NftIdSet.sol/LibNftIdSet.json +2 -2
  281. package/artifacts/contracts/type/ObjectType.sol/ObjectTypeLib.dbg.json +1 -1
  282. package/artifacts/contracts/type/ObjectType.sol/ObjectTypeLib.json +2 -2
  283. package/artifacts/contracts/type/PayoutId.sol/PayoutIdLib.dbg.json +1 -1
  284. package/artifacts/contracts/type/PayoutId.sol/PayoutIdLib.json +19 -19
  285. package/artifacts/contracts/type/Referral.sol/ReferralLib.dbg.json +1 -1
  286. package/artifacts/contracts/type/Referral.sol/ReferralLib.json +2 -2
  287. package/artifacts/contracts/type/RequestId.sol/RequestIdLib.dbg.json +1 -1
  288. package/artifacts/contracts/type/RequestId.sol/RequestIdLib.json +2 -2
  289. package/artifacts/contracts/type/RiskId.sol/RiskIdLib.dbg.json +1 -1
  290. package/artifacts/contracts/type/RiskId.sol/RiskIdLib.json +60 -4
  291. package/artifacts/contracts/type/RoleId.sol/RoleIdLib.dbg.json +1 -1
  292. package/artifacts/contracts/type/RoleId.sol/RoleIdLib.json +2 -2
  293. package/artifacts/contracts/type/Seconds.sol/SecondsLib.dbg.json +1 -1
  294. package/artifacts/contracts/type/Seconds.sol/SecondsLib.json +50 -2
  295. package/artifacts/contracts/type/Selector.sol/SelectorLib.dbg.json +1 -1
  296. package/artifacts/contracts/type/Selector.sol/SelectorSetLib.dbg.json +1 -1
  297. package/artifacts/contracts/type/StateId.sol/StateIdLib.dbg.json +1 -1
  298. package/artifacts/contracts/type/StateId.sol/StateIdLib.json +15 -2
  299. package/artifacts/contracts/type/String.sol/StrLib.dbg.json +1 -1
  300. package/artifacts/contracts/type/Timestamp.sol/TimestampLib.dbg.json +1 -1
  301. package/artifacts/contracts/type/Timestamp.sol/TimestampLib.json +23 -4
  302. package/artifacts/contracts/type/UFixed.sol/MathLib.dbg.json +1 -1
  303. package/artifacts/contracts/type/UFixed.sol/MathLib.json +9 -3
  304. package/artifacts/contracts/type/UFixed.sol/UFixedLib.dbg.json +1 -1
  305. package/artifacts/contracts/type/UFixed.sol/UFixedLib.json +52 -2
  306. package/artifacts/contracts/type/Version.sol/VersionLib.dbg.json +1 -1
  307. package/artifacts/contracts/type/Version.sol/VersionLib.json +2 -2
  308. package/artifacts/contracts/type/Version.sol/VersionPartLib.dbg.json +1 -1
  309. package/artifacts/contracts/type/Version.sol/VersionPartLib.json +21 -2
  310. package/artifacts/contracts/upgradeability/IVersionable.sol/IVersionable.dbg.json +4 -0
  311. package/artifacts/contracts/{shared → upgradeability}/IVersionable.sol/IVersionable.json +1 -1
  312. package/artifacts/contracts/upgradeability/ProxyManager.sol/ProxyManager.dbg.json +4 -0
  313. package/artifacts/contracts/upgradeability/ProxyManager.sol/ProxyManager.json +602 -0
  314. package/artifacts/contracts/upgradeability/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.dbg.json +4 -0
  315. package/artifacts/contracts/{shared → upgradeability}/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.json +3 -3
  316. package/artifacts/contracts/upgradeability/Versionable.sol/Versionable.dbg.json +4 -0
  317. package/artifacts/contracts/{shared → upgradeability}/Versionable.sol/Versionable.json +1 -1
  318. package/contracts/authorization/AccessAdmin.sol +64 -59
  319. package/contracts/authorization/Authorization.sol +111 -40
  320. package/contracts/authorization/IAccess.sol +1 -0
  321. package/contracts/authorization/IAccessAdmin.sol +4 -3
  322. package/contracts/authorization/IAuthorization.sol +13 -7
  323. package/contracts/authorization/IServiceAuthorization.sol +3 -1
  324. package/contracts/authorization/ReleaseAccessManager.sol +38 -0
  325. package/contracts/authorization/ServiceAuthorization.sol +26 -10
  326. package/contracts/distribution/BasicDistribution.sol +6 -16
  327. package/contracts/distribution/BasicDistributionAuthorization.sol +5 -1
  328. package/contracts/distribution/Distribution.sol +28 -26
  329. package/contracts/distribution/DistributionService.sol +128 -75
  330. package/contracts/distribution/DistributionServiceManager.sol +8 -11
  331. package/contracts/distribution/IDistributionComponent.sol +9 -5
  332. package/contracts/distribution/IDistributionService.sol +18 -2
  333. package/contracts/examples/fire/DamageLevel.sol +59 -0
  334. package/contracts/examples/fire/FirePool.sol +73 -0
  335. package/contracts/examples/fire/FirePoolAuthorization.sol +34 -0
  336. package/contracts/examples/fire/FireProduct.sol +415 -0
  337. package/contracts/examples/fire/FireProductAuthorization.sol +44 -0
  338. package/contracts/examples/fire/FireUSD.sol +26 -0
  339. package/contracts/examples/unpermissioned/SimpleDistribution.sol +50 -0
  340. package/contracts/examples/unpermissioned/SimpleOracle.sol +137 -0
  341. package/contracts/examples/unpermissioned/SimplePool.sol +76 -0
  342. package/contracts/examples/unpermissioned/SimpleProduct.sol +351 -0
  343. package/contracts/instance/{BundleManager.sol → BundleSet.sol} +23 -23
  344. package/contracts/instance/IInstance.sol +14 -34
  345. package/contracts/instance/IInstanceService.sol +5 -25
  346. package/contracts/instance/Instance.sol +32 -54
  347. package/contracts/instance/InstanceAdmin.sol +47 -34
  348. package/contracts/instance/InstanceAuthorizationV3.sol +24 -32
  349. package/contracts/instance/InstanceReader.sol +115 -25
  350. package/contracts/instance/InstanceService.sol +75 -105
  351. package/contracts/instance/InstanceServiceManager.sol +8 -13
  352. package/contracts/instance/InstanceStore.sol +12 -1
  353. package/contracts/instance/base/ObjectLifecycle.sol +9 -4
  354. package/contracts/instance/base/{ObjectManager.sol → ObjectSet.sol} +5 -5
  355. package/contracts/instance/module/IBundle.sol +1 -1
  356. package/contracts/instance/module/IComponents.sol +10 -11
  357. package/contracts/instance/module/IDistribution.sol +0 -1
  358. package/contracts/instance/module/IPolicy.sol +24 -24
  359. package/contracts/mock/Dip.sol +1 -1
  360. package/contracts/oracle/BasicOracle.sol +0 -1
  361. package/contracts/oracle/IOracleComponent.sol +2 -1
  362. package/contracts/oracle/IOracleService.sol +2 -1
  363. package/contracts/oracle/Oracle.sol +21 -22
  364. package/contracts/oracle/OracleService.sol +47 -34
  365. package/contracts/oracle/OracleServiceManager.sol +8 -11
  366. package/contracts/pool/BasicPool.sol +21 -31
  367. package/contracts/pool/BasicPoolAuthorization.sol +11 -3
  368. package/contracts/pool/BundleService.sol +267 -70
  369. package/contracts/pool/BundleServiceManager.sol +8 -11
  370. package/contracts/pool/IBundleService.sol +42 -5
  371. package/contracts/pool/IPoolComponent.sol +24 -8
  372. package/contracts/pool/IPoolService.sol +56 -39
  373. package/contracts/pool/Pool.sol +73 -49
  374. package/contracts/pool/PoolService.sol +256 -164
  375. package/contracts/pool/PoolServiceManager.sol +6 -9
  376. package/contracts/product/ApplicationService.sol +70 -65
  377. package/contracts/product/ApplicationServiceManager.sol +6 -6
  378. package/contracts/product/BasicProduct.sol +9 -38
  379. package/contracts/product/BasicProductAuthorization.sol +2 -0
  380. package/contracts/product/ClaimService.sol +316 -146
  381. package/contracts/product/ClaimServiceManager.sol +6 -6
  382. package/contracts/product/IApplicationService.sol +1 -0
  383. package/contracts/product/IClaimService.sol +31 -7
  384. package/contracts/product/IPolicyService.sol +34 -32
  385. package/contracts/product/IPricingService.sol +10 -10
  386. package/contracts/product/IProductComponent.sol +24 -4
  387. package/contracts/product/{IProductService.sol → IRiskService.sol} +1 -1
  388. package/contracts/product/PolicyService.sol +419 -203
  389. package/contracts/product/PolicyServiceManager.sol +6 -9
  390. package/contracts/product/PricingService.sol +54 -54
  391. package/contracts/product/PricingServiceManager.sol +5 -8
  392. package/contracts/product/Product.sol +134 -71
  393. package/contracts/product/{ProductService.sol → RiskService.sol} +13 -41
  394. package/contracts/product/RiskServiceManager.sol +39 -0
  395. package/contracts/registry/ChainNft.sol +68 -38
  396. package/contracts/registry/IRegistry.sol +69 -19
  397. package/contracts/registry/IRegistryService.sol +3 -10
  398. package/contracts/registry/ITransferInterceptor.sol +1 -2
  399. package/contracts/registry/Registry.sol +354 -215
  400. package/contracts/registry/RegistryAdmin.sol +155 -72
  401. package/contracts/registry/RegistryService.sol +39 -64
  402. package/contracts/registry/RegistryServiceManager.sol +4 -4
  403. package/contracts/registry/ReleaseLifecycle.sol +6 -3
  404. package/contracts/registry/ReleaseRegistry.sol +501 -0
  405. package/contracts/registry/ServiceAuthorizationV3.sol +16 -22
  406. package/contracts/registry/TokenRegistry.sol +2 -2
  407. package/contracts/shared/Component.sol +52 -62
  408. package/contracts/shared/ComponentService.sol +299 -179
  409. package/contracts/shared/ComponentServiceHelperLib.sol +118 -0
  410. package/contracts/shared/ComponentServiceManager.sol +10 -7
  411. package/contracts/shared/ComponentVerifyingService.sol +23 -14
  412. package/contracts/shared/ContractLib.sol +38 -0
  413. package/contracts/shared/IComponent.sol +10 -6
  414. package/contracts/shared/IComponentService.sol +39 -20
  415. package/contracts/shared/IInstanceLinkedComponent.sol +8 -17
  416. package/contracts/shared/ILifecycle.sol +3 -1
  417. package/contracts/shared/INftOwnable.sol +2 -0
  418. package/contracts/shared/IPolicyHolder.sol +12 -22
  419. package/contracts/shared/IRegisterable.sol +11 -0
  420. package/contracts/shared/IService.sol +1 -1
  421. package/contracts/shared/{ERC165.sol → InitializableERC165.sol} +3 -3
  422. package/contracts/shared/InstanceLinkedComponent.sol +85 -23
  423. package/contracts/shared/KeyValueStore.sol +1 -1
  424. package/contracts/shared/Lifecycle.sol +15 -4
  425. package/contracts/shared/{NftIdSetManager.sol → NftIdSet.sol} +1 -1
  426. package/contracts/shared/NftOwnable.sol +29 -9
  427. package/contracts/shared/PolicyHolder.sol +17 -57
  428. package/contracts/shared/Registerable.sol +19 -9
  429. package/contracts/shared/RegistryLinked.sol +3 -2
  430. package/contracts/shared/Service.sol +23 -22
  431. package/contracts/shared/TokenHandler.sol +144 -19
  432. package/contracts/shared/TokenHandlerDeployerLib.sol +12 -0
  433. package/contracts/staking/IStaking.sol +3 -3
  434. package/contracts/staking/IStakingService.sol +12 -8
  435. package/contracts/staking/StakeManagerLib.sol +18 -25
  436. package/contracts/staking/Staking.sol +29 -45
  437. package/contracts/staking/StakingManager.sol +10 -12
  438. package/contracts/staking/StakingReader.sol +23 -20
  439. package/contracts/staking/StakingService.sol +25 -29
  440. package/contracts/staking/StakingServiceManager.sol +4 -4
  441. package/contracts/staking/StakingStore.sol +12 -22
  442. package/contracts/staking/TargetManagerLib.sol +7 -3
  443. package/contracts/type/Amount.sol +27 -5
  444. package/contracts/type/Blocknumber.sol +7 -1
  445. package/contracts/type/ClaimId.sol +6 -1
  446. package/contracts/type/NftId.sol +1 -0
  447. package/contracts/type/ObjectType.sol +19 -18
  448. package/contracts/type/PayoutId.sol +10 -10
  449. package/contracts/type/Referral.sol +1 -0
  450. package/contracts/type/RiskId.sol +15 -1
  451. package/contracts/type/RoleId.sol +0 -12
  452. package/contracts/type/Seconds.sol +21 -1
  453. package/contracts/type/StateId.sol +15 -1
  454. package/contracts/type/Timestamp.sol +11 -1
  455. package/contracts/type/UFixed.sol +33 -10
  456. package/contracts/type/Version.sol +3 -1
  457. package/contracts/{shared → upgradeability}/ProxyManager.sol +71 -38
  458. package/contracts/{shared → upgradeability}/UpgradableProxyWithAdmin.sol +1 -3
  459. package/contracts/{shared → upgradeability}/Versionable.sol +2 -2
  460. package/package.json +4 -3
  461. package/artifacts/contracts/authorization/IModuleAuthorization.sol/IModuleAuthorization.dbg.json +0 -4
  462. package/artifacts/contracts/authorization/IModuleAuthorization.sol/IModuleAuthorization.json +0 -290
  463. package/artifacts/contracts/authorization/ModuleAuthorization.sol/ModuleAuthorization.dbg.json +0 -4
  464. package/artifacts/contracts/authorization/ModuleAuthorization.sol/ModuleAuthorization.json +0 -390
  465. package/artifacts/contracts/instance/BundleManager.sol/BundleManager.dbg.json +0 -4
  466. package/artifacts/contracts/instance/BundleManager.sol/BundleManager.json +0 -703
  467. package/artifacts/contracts/instance/base/ObjectManager.sol/ObjectManager.dbg.json +0 -4
  468. package/artifacts/contracts/product/IProductService.sol/IProductService.dbg.json +0 -4
  469. package/artifacts/contracts/product/ProductService.sol/ProductService.dbg.json +0 -4
  470. package/artifacts/contracts/product/ProductService.sol/ProductService.json +0 -708
  471. package/artifacts/contracts/product/ProductServiceManager.sol/ProductServiceManager.dbg.json +0 -4
  472. package/artifacts/contracts/product/ProductServiceManager.sol/ProductServiceManager.json +0 -702
  473. package/artifacts/contracts/registry/ReleaseManager.sol/ReleaseManager.dbg.json +0 -4
  474. package/artifacts/contracts/registry/ReleaseManager.sol/ReleaseManager.json +0 -1159
  475. package/artifacts/contracts/shared/ERC165.sol/ERC165.dbg.json +0 -4
  476. package/artifacts/contracts/shared/ERC165.sol/ERC165.json +0 -73
  477. package/artifacts/contracts/shared/IVersionable.sol/IVersionable.dbg.json +0 -4
  478. package/artifacts/contracts/shared/InitializableCustom.sol/InitializableCustom.dbg.json +0 -4
  479. package/artifacts/contracts/shared/InitializableCustom.sol/InitializableCustom.json +0 -39
  480. package/artifacts/contracts/shared/NftIdSetManager.sol/NftIdSetManager.dbg.json +0 -4
  481. package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.dbg.json +0 -4
  482. package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.json +0 -617
  483. package/artifacts/contracts/shared/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.dbg.json +0 -4
  484. package/artifacts/contracts/shared/Versionable.sol/Versionable.dbg.json +0 -4
  485. package/contracts/authorization/IModuleAuthorization.sol +0 -21
  486. package/contracts/authorization/ModuleAuthorization.sol +0 -78
  487. package/contracts/product/ProductServiceManager.sol +0 -42
  488. package/contracts/registry/ReleaseManager.sol +0 -487
  489. package/contracts/shared/InitializableCustom.sol +0 -177
  490. /package/contracts/{shared → upgradeability}/IVersionable.sol +0 -0
@@ -6,6 +6,7 @@ import {IAccessManaged} from "@openzeppelin/contracts/access/manager/IAccessMana
6
6
  import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
7
7
  import {SafeERC20} from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
8
8
 
9
+ import {Amount} from "../type/Amount.sol";
9
10
  import {Component} from "./Component.sol";
10
11
  import {IComponentService} from "./IComponentService.sol";
11
12
  import {IInstanceLinkedComponent} from "./IInstanceLinkedComponent.sol";
@@ -16,7 +17,7 @@ import {IInstance} from "../instance/IInstance.sol";
16
17
  import {InstanceReader} from "../instance/InstanceReader.sol";
17
18
  import {IRegistry} from "../registry/IRegistry.sol";
18
19
  import {NftId} from "../type/NftId.sol";
19
- import {ObjectType, COMPONENT, INSTANCE} from "../type/ObjectType.sol";
20
+ import {ObjectType, COMPONENT, INSTANCE, PRODUCT} from "../type/ObjectType.sol";
20
21
  import {VersionPart} from "../type/Version.sol";
21
22
  import {RoleId, RoleIdLib} from "../type/RoleId.sol";
22
23
  import {IAccess} from "../instance/module/IAccess.sol";
@@ -36,6 +37,7 @@ abstract contract InstanceLinkedComponent is
36
37
  IInstance _instance; // instance for this component
37
38
  InstanceReader _instanceReader; // instance reader for this component
38
39
  IAuthorization _initialAuthorization;
40
+ IComponentService _componentService;
39
41
  }
40
42
 
41
43
  function lock() external onlyOwner {
@@ -46,14 +48,23 @@ abstract contract InstanceLinkedComponent is
46
48
  IInstanceService(_getServiceAddress(INSTANCE())).setComponentLocked(false);
47
49
  }
48
50
 
49
- function getInstance() public view override returns (IInstance instance) {
50
- return _getInstanceLinkedComponentStorage()._instance;
51
+ /// @inheritdoc IInstanceLinkedComponent
52
+ function withdrawFees(Amount amount)
53
+ external
54
+ virtual
55
+ onlyOwner()
56
+ restricted()
57
+ returns (Amount withdrawnAmount)
58
+ {
59
+ return _withdrawFees(amount);
51
60
  }
52
61
 
53
- function getProductNftId() public view override returns (NftId productNftId) {
54
- return getComponentInfo().productNftId;
62
+ /// @inheritdoc IInstanceLinkedComponent
63
+ function getInstance() public view override returns (IInstance instance) {
64
+ return _getInstanceLinkedComponentStorage()._instance;
55
65
  }
56
66
 
67
+ /// @inheritdoc IInstanceLinkedComponent
57
68
  function getAuthorization() external view returns (IAuthorization authorization) {
58
69
  return _getInstanceLinkedComponentStorage()._initialAuthorization;
59
70
  }
@@ -66,50 +77,94 @@ abstract contract InstanceLinkedComponent is
66
77
 
67
78
  function _initializeInstanceLinkedComponent(
68
79
  address registry,
69
- NftId instanceNftId,
80
+ NftId parentNftId,
70
81
  string memory name,
71
82
  address token,
72
83
  ObjectType componentType,
73
84
  IAuthorization authorization,
74
85
  bool isInterceptor,
75
86
  address initialOwner,
76
- bytes memory registryData, // writeonly data that will saved in the object info record of the registry
77
87
  bytes memory componentData // data that will saved with the component info in the instance store
78
88
  )
79
89
  internal
80
90
  virtual
81
91
  onlyInitializing()
82
92
  {
93
+ // validate registry, nft ids and get parent nft id
94
+ NftId instanceNftId = _checkAndGetInstanceNftId(
95
+ registry,
96
+ parentNftId,
97
+ componentType);
98
+
83
99
  // set and check linked instance
84
100
  InstanceLinkedComponentStorage storage $ = _getInstanceLinkedComponentStorage();
85
101
  $._instance = IInstance(
86
- IRegistry(registry).getObjectInfo(
87
- instanceNftId).objectAddress);
102
+ IRegistry(registry).getObjectAddress(instanceNftId));
88
103
 
89
- if(!$._instance.supportsInterface(type(IInstance).interfaceId)) {
90
- revert ErrorComponentNotInstance(instanceNftId);
91
- }
92
-
93
- initializeComponent(
94
- $._instance.authority(),
104
+ // set component specific parameters
105
+ _initializeComponent(
106
+ $._instance.authority(), // instance linked components need to point to instance admin
95
107
  registry,
96
- instanceNftId,
108
+ parentNftId,
97
109
  name,
98
110
  token,
99
111
  componentType,
100
112
  isInterceptor,
101
113
  initialOwner,
102
- registryData,
114
+ "", // registry data
103
115
  componentData);
104
116
 
105
- // set component state
117
+ // set instance linked specific parameters
106
118
  $._instanceReader = $._instance.getInstanceReader();
107
119
  $._initialAuthorization = authorization;
120
+ $._componentService = IComponentService(_getServiceAddress(COMPONENT()));
121
+
122
+ // register interfaces
123
+ _registerInterface(type(IAccessManaged).interfaceId);
124
+ _registerInterface(type(IInstanceLinkedComponent).interfaceId);
125
+ }
126
+
127
+
128
+ function _checkAndGetInstanceNftId(
129
+ address registryAddress,
130
+ NftId parentNftId,
131
+ ObjectType componentType
132
+ )
133
+ internal
134
+ view
135
+ returns (NftId instanceNftId)
136
+ {
137
+ // if product, then parent is already instance
138
+ if (componentType == PRODUCT()) {
139
+ _checkAndGetRegistry(registryAddress, parentNftId, INSTANCE());
140
+ return parentNftId;
141
+ }
108
142
 
109
- registerInterface(type(IAccessManaged).interfaceId);
110
- registerInterface(type(IInstanceLinkedComponent).interfaceId);
143
+ // if not product parent is product, and parent of product is instance
144
+ IRegistry registry = _checkAndGetRegistry(registryAddress, parentNftId, PRODUCT());
145
+ return registry.getObjectInfo(parentNftId).parentNftId;
111
146
  }
112
147
 
148
+ /// @dev checks the and gets registry.
149
+ /// validates registry using a provided nft id and expected object type.
150
+ function _checkAndGetRegistry(
151
+ address registryAddress,
152
+ NftId objectNftId,
153
+ ObjectType requiredType
154
+ )
155
+ internal
156
+ view
157
+ returns (IRegistry registry)
158
+ {
159
+ registry = IRegistry(registryAddress);
160
+ IRegistry.ObjectInfo memory info = registry.getObjectInfo(objectNftId);
161
+
162
+ if (info.objectType != requiredType) {
163
+ revert ErrorInstanceLinkedComponentTypeMismatch(requiredType, info.objectType);
164
+ }
165
+ }
166
+
167
+
113
168
  /// @dev for instance linked components the wallet address stored in the instance store.
114
169
  /// updating needs to go throug component service
115
170
  function _setWallet(address newWallet) internal virtual override onlyOwner {
@@ -118,7 +173,7 @@ abstract contract InstanceLinkedComponent is
118
173
 
119
174
 
120
175
  function _getComponentInfo() internal virtual override view returns (IComponents.ComponentInfo memory info) {
121
- NftId componentNftId = getRegistry().getNftId(address(this));
176
+ NftId componentNftId = getRegistry().getNftIdForAddress(address(this));
122
177
 
123
178
  // if registered, attempt to return component info via instance reader
124
179
  if (componentNftId.gtz()) {
@@ -141,11 +196,18 @@ abstract contract InstanceLinkedComponent is
141
196
  return _getInstanceLinkedComponentStorage()._instanceReader;
142
197
  }
143
198
 
199
+ function _withdrawFees(Amount amount)
200
+ internal
201
+ returns (Amount withdrawnAmount)
202
+ {
203
+ return _getInstanceLinkedComponentStorage()._componentService.withdrawFees(amount);
204
+ }
205
+
144
206
 
145
207
  /// @dev returns the service address for the specified domain
146
208
  /// gets address via lookup from registry using the major version form the linked instance
147
209
  function _getServiceAddress(ObjectType domain) internal view returns (address service) {
148
- VersionPart majorVersion = _getInstanceLinkedComponentStorage()._instance.getMajorVersion();
149
- return getRegistry().getServiceAddress(domain, majorVersion);
210
+ VersionPart release = _getInstanceLinkedComponentStorage()._instance.getRelease();
211
+ return getRegistry().getServiceAddress(domain, release);
150
212
  }
151
213
  }
@@ -94,7 +94,7 @@ abstract contract KeyValueStore is
94
94
 
95
95
  // update state
96
96
  if(state != KEEP_STATE()) {
97
- checkTransition(metadata.objectType, stateOld, state);
97
+ checkTransition(stateOld, metadata.objectType, stateOld, state);
98
98
  metadata.state = state;
99
99
 
100
100
  // solhint-disable-next-line avoid-tx-origin
@@ -49,8 +49,9 @@ abstract contract Lifecycle is
49
49
  }
50
50
 
51
51
  function checkTransition(
52
+ StateId stateId,
52
53
  ObjectType objectType,
53
- StateId fromId,
54
+ StateId expectedFromId,
54
55
  StateId toId
55
56
  )
56
57
  public
@@ -58,12 +59,22 @@ abstract contract Lifecycle is
58
59
  {
59
60
  // revert if no life cycle support
60
61
  if (_initialState[objectType].eqz()) {
61
- revert ErrorNoLifecycle(objectType);
62
+ revert ErrorNoLifecycle(address(this), objectType);
63
+ }
64
+
65
+ // revert if current state is not expected `from` state
66
+ if(stateId != expectedFromId) {
67
+ revert ErrorFromStateMissmatch(address(this), objectType, stateId, expectedFromId);
62
68
  }
63
69
 
64
70
  // enforce valid state transition
65
- if (!_isValidTransition[objectType][fromId][toId]) {
66
- revert ErrorInvalidStateTransition(objectType, fromId, toId);
71
+ if (!_isValidTransition[objectType][stateId][toId]) {
72
+ revert ErrorInvalidStateTransition(
73
+ address(this),
74
+ objectType,
75
+ stateId,
76
+ toId
77
+ );
67
78
  }
68
79
  }
69
80
 
@@ -4,7 +4,7 @@ pragma solidity ^0.8.20;
4
4
  import {LibNftIdSet} from "../type/NftIdSet.sol";
5
5
  import {NftId} from "../type/NftId.sol";
6
6
 
7
- contract NftIdSetManager {
7
+ contract NftIdSet {
8
8
 
9
9
  error ErrorNftIdSetManagerNotOwner(address owner, address sender);
10
10
  error ErrorNftIdSetManagerOwnerAlreadySet(address owner);
@@ -1,13 +1,14 @@
1
1
  // SPDX-License-Identifier: Apache-2.0
2
2
  pragma solidity ^0.8.20;
3
3
 
4
- import {ERC165} from "./ERC165.sol";
4
+ import {InitializableERC165} from "./InitializableERC165.sol";
5
5
  import {INftOwnable} from "./INftOwnable.sol";
6
6
  import {NftId} from "../type/NftId.sol";
7
+ import {ObjectType} from "../type/ObjectType.sol";
7
8
  import {RegistryLinked} from "./RegistryLinked.sol";
8
9
 
9
10
  contract NftOwnable is
10
- ERC165,
11
+ InitializableERC165,
11
12
  RegistryLinked,
12
13
  INftOwnable
13
14
  {
@@ -27,19 +28,37 @@ contract NftOwnable is
27
28
  _;
28
29
  }
29
30
 
31
+ modifier onlyNftOwner(NftId nftId) {
32
+ if(!getRegistry().isOwnerOf(nftId, msg.sender)) {
33
+ revert ErrorNftOwnableNotOwner(msg.sender);
34
+ }
35
+ _;
36
+ }
37
+
38
+ modifier onlyNftOfType(NftId nftId, ObjectType expectedObjectType) {
39
+ _checkNftType(nftId, expectedObjectType);
40
+ _;
41
+ }
42
+
43
+ function _checkNftType(NftId nftId, ObjectType expectedObjectType) internal view {
44
+ if(!getRegistry().isObjectType(nftId, expectedObjectType)) {
45
+ revert ErrorNftOwnableInvalidType(nftId, expectedObjectType);
46
+ }
47
+ }
48
+
30
49
 
31
50
  /// @dev initialization for upgradable contracts
32
51
  // used in _initializeRegisterable
33
- function initializeNftOwnable(
34
- address initialOwner,
35
- address registryAddress
52
+ function _initializeNftOwnable(
53
+ address registry,
54
+ address initialOwner
36
55
  )
37
- public
56
+ internal
38
57
  virtual
39
58
  onlyInitializing()
40
59
  {
41
- initializeRegistryLinked(registryAddress);
42
- initializeERC165();
60
+ _initializeRegistryLinked(registry);
61
+ _initializeERC165();
43
62
 
44
63
  if(initialOwner == address(0)) {
45
64
  revert ErrorNftOwnableInitialOwnerZero();
@@ -93,13 +112,14 @@ contract NftOwnable is
93
112
  revert ErrorNftOwnableContractNotRegistered(nftOwnableAddress);
94
113
  }
95
114
 
96
- $._nftId = getRegistry().getNftId(nftOwnableAddress);
115
+ $._nftId = getRegistry().getNftIdForAddress(nftOwnableAddress);
97
116
 
98
117
  return $._nftId;
99
118
  }
100
119
 
101
120
 
102
121
  function _getNftOwnableStorage() private pure returns (NftOwnableStorage storage $) {
122
+ // solhint-disable-next-line no-inline-assembly
103
123
  assembly {
104
124
  $.slot := NFT_OWNABLE_STORAGE_LOCATION_V1
105
125
  }
@@ -1,74 +1,50 @@
1
1
  // SPDX-License-Identifier: Apache-2.0
2
2
  pragma solidity ^0.8.20;
3
3
 
4
- import {IERC165} from "@openzeppelin/contracts/utils/introspection/IERC165.sol";
5
4
  import {IERC721Receiver} from "@openzeppelin/contracts/token/ERC721/IERC721Receiver.sol";
6
- import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
7
5
 
8
6
  import {Amount} from "../type/Amount.sol";
9
7
  import {ClaimId} from "../type/ClaimId.sol";
10
- import {ERC165} from "./ERC165.sol";
8
+ import {InitializableERC165} from "./InitializableERC165.sol";
11
9
  import {IPolicyHolder} from "./IPolicyHolder.sol";
12
10
  import {NftId} from "../type/NftId.sol";
13
11
  import {PayoutId, PayoutIdLib} from "../type/PayoutId.sol";
14
12
  import {RegistryLinked} from "./RegistryLinked.sol";
15
- import {IRegistry} from "../registry/IRegistry.sol";
13
+ import {Timestamp} from "../type/Timestamp.sol";
16
14
 
17
15
  /// @dev template implementation for IPolicyHolder
18
16
  contract PolicyHolder is
19
- ERC165,
20
- RegistryLinked, // TODO need upgradeable version
17
+ InitializableERC165,
18
+ RegistryLinked,
21
19
  IPolicyHolder
22
20
  {
23
- // keccak256(abi.encode(uint256(keccak256("etherisc.storage.PolicyHolder")) - 1)) & ~bytes32(uint256(0xff));
24
- // TODO fix address
25
- bytes32 public constant POLICY_HOLDER_STORAGE_LOCATION_V1 = 0x07ebcf49758b6ed3af50fa146bec0abe157c0218fe65dc0874c286e9d5da4f00;
21
+ // TODO add modifier to protect callback functions from unauthorized access
22
+ // callbacks must only be allowed from the policy and claim services
23
+ // will need a release parameter to fetch the right service addresses for the modifiers
26
24
 
27
- struct PolicyHolderStorage {
28
- mapping(NftId policyId => mapping(PayoutId payoutId => address beneficiary)) _beneficiary;
29
- address _beneficiaryDefault;
30
- }
31
-
32
- function initializePolicyHolder(
33
- address registryAddress,
34
- address beneficiaryDefault
25
+ function _initializePolicyHolder(
26
+ address registryAddress
35
27
  )
36
- public
28
+ internal
37
29
  virtual
38
30
  onlyInitializing()
39
31
  {
40
- initializeRegistryLinked(registryAddress);
41
-
42
- _getPolicyHolderStorage()._beneficiaryDefault = beneficiaryDefault;
43
-
44
- registerInterface(type(IPolicyHolder).interfaceId);
32
+ _initializeRegistryLinked(registryAddress);
33
+ _initializeERC165();
34
+ _registerInterface(type(IPolicyHolder).interfaceId);
45
35
  }
46
36
 
47
37
  /// @dev empty default implementation
48
- function requestPayout(NftId requestingPolicyNftId, Amount requestedPayoutAmount) external { }
38
+ function policyActivated(NftId policyNftId, Timestamp activatedAt) external virtual {}
49
39
 
50
40
  /// @dev empty default implementation
51
- function policyActivated(NftId policyNftId) external {}
41
+ function policyExpired(NftId policyNftId, Timestamp expiredAt) external virtual {}
52
42
 
53
43
  /// @dev empty default implementation
54
- function policyExpired(NftId policyNftId) external {}
44
+ function claimConfirmed(NftId policyNftId, ClaimId claimId, Amount amount) external virtual {}
55
45
 
56
46
  /// @dev empty default implementation
57
- function claimConfirmed(NftId policyNftId, ClaimId claimId, Amount amount) external {}
58
-
59
- /// @dev empty default implementation
60
- function payoutExecuted(NftId policyNftId, PayoutId payoutId, address beneficiary, Amount amount) external {}
61
-
62
- /// @dev returns payout specific beneficiary
63
- /// when no such beneficiary is defined the policy specific beneficiary is returned
64
- function getBeneficiary(NftId policyNftId, PayoutId payoutId) external virtual view returns (address beneficiary) {
65
- beneficiary = _getPolicyHolderStorage()._beneficiary[policyNftId][payoutId];
66
-
67
- // fallback to claim independent beneficiary
68
- if(beneficiary == address(0) && payoutId.gtz()) {
69
- beneficiary = _getPolicyHolderStorage()._beneficiary[policyNftId][PayoutIdLib.zero()];
70
- }
71
- }
47
+ function payoutExecuted(NftId policyNftId, PayoutId payoutId, Amount amount, address beneficiary) external virtual {}
72
48
 
73
49
  //--- IERC165 functions ---------------//
74
50
  function onERC721Received(
@@ -83,20 +59,4 @@ contract PolicyHolder is
83
59
  {
84
60
  return IERC721Receiver.onERC721Received.selector;
85
61
  }
86
-
87
- /// @dev sets policy specific beneficiary (used when no payout specific beneficiary is defined)
88
- function _setBeneficiary(NftId policyNftId, address beneficiary) internal {
89
- _setBeneficiary(policyNftId, PayoutIdLib.zero(), beneficiary);
90
- }
91
-
92
- /// @dev sets policy and claim specific beneficiary
93
- function _setBeneficiary(NftId policyNftId, PayoutId payoutId, address beneficiary) internal {
94
- _getPolicyHolderStorage()._beneficiary[policyNftId][payoutId] = beneficiary;
95
- }
96
-
97
- function _getPolicyHolderStorage() private pure returns (PolicyHolderStorage storage $) {
98
- assembly {
99
- $.slot := POLICY_HOLDER_STORAGE_LOCATION_V1
100
- }
101
- }
102
62
  }
@@ -6,6 +6,7 @@ import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Ini
6
6
  import {NftId, NftIdLib} from "../type/NftId.sol";
7
7
  import {NftOwnable} from "../shared/NftOwnable.sol";
8
8
  import {ObjectType} from "../type/ObjectType.sol";
9
+ import {VersionPart, VersionPartLib} from "../type/Version.sol";
9
10
 
10
11
  import {IRegistry} from "../registry/IRegistry.sol";
11
12
  import {IRegisterable} from "./IRegisterable.sol";
@@ -14,6 +15,8 @@ contract Registerable is
14
15
  NftOwnable,
15
16
  IRegisterable
16
17
  {
18
+ uint256 public constant GIF_RELEASE = 3;
19
+
17
20
  // keccak256(abi.encode(uint256(keccak256("gif-next.contracts.shared.Registerable.sol")) - 1)) & ~bytes32(uint256(0xff));
18
21
  bytes32 public constant REGISTERABLE_LOCATION_V1 = 0x6548007c3f4340f82f348c576c0ff69f4f529cadd5ad41f96aae61abceeaa300;
19
22
 
@@ -24,21 +27,21 @@ contract Registerable is
24
27
  bytes _data;
25
28
  }
26
29
 
27
- function initializeRegisterable(
28
- address registryAddress,
30
+ function _initializeRegisterable(
31
+ address registry,
29
32
  NftId parentNftId,
30
33
  ObjectType objectType,
31
34
  bool isInterceptor,
32
35
  address initialOwner,
33
- bytes memory registryData // writeonly data that will saved in the object info record of the registry
36
+ bytes memory data // writeonly data that will saved in the object info record of the registry
34
37
  )
35
- public
38
+ internal
36
39
  virtual
37
- onlyInitializing
40
+ onlyInitializing()
38
41
  {
39
- initializeNftOwnable(
40
- initialOwner,
41
- registryAddress);
42
+ _initializeNftOwnable(
43
+ registry,
44
+ initialOwner);
42
45
 
43
46
  RegisterableStorage storage $;
44
47
  assembly {
@@ -48,10 +51,17 @@ contract Registerable is
48
51
  $._parentNftId = parentNftId;
49
52
  $._objectType = objectType;
50
53
  $._isInterceptor = isInterceptor;
51
- $._data = registryData;
54
+ $._data = data;
55
+ }
56
+
57
+
58
+ /// @inheritdoc IRegisterable
59
+ function getRelease() public virtual pure returns (VersionPart release) {
60
+ return VersionPartLib.toVersionPart(GIF_RELEASE);
52
61
  }
53
62
 
54
63
 
64
+ /// @inheritdoc IRegisterable
55
65
  function getInitialInfo()
56
66
  public
57
67
  view
@@ -10,14 +10,15 @@ contract RegistryLinked is
10
10
  IRegistryLinked
11
11
  {
12
12
 
13
+ // priorize simplicity and size over using standard upgradeability structs
13
14
  IRegistry private _registry;
14
15
 
15
16
  /// @dev initialization for upgradable contracts
16
17
  // used in _initializeRegisterable
17
- function initializeRegistryLinked(
18
+ function _initializeRegistryLinked(
18
19
  address registryAddress
19
20
  )
20
- public
21
+ internal
21
22
  virtual
22
23
  onlyInitializing()
23
24
  {
@@ -3,16 +3,16 @@ pragma solidity ^0.8.20;
3
3
 
4
4
  import {AccessManagedUpgradeable} from "@openzeppelin/contracts-upgradeable/access/manager/AccessManagedUpgradeable.sol";
5
5
  import {IAccessManaged} from "@openzeppelin/contracts/access/manager/IAccessManaged.sol";
6
+ import {ReentrancyGuardUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/ReentrancyGuardUpgradeable.sol";
6
7
 
7
8
  import {IRegistry} from "../registry/IRegistry.sol";
8
9
  import {IService} from "./IService.sol";
9
- import {IVersionable} from "./IVersionable.sol";
10
- import {NftId} from "../type/NftId.sol";
10
+ import {IVersionable} from "../upgradeability/IVersionable.sol";
11
11
  import {ObjectType, REGISTRY, SERVICE} from "../type/ObjectType.sol";
12
12
  import {Registerable} from "./Registerable.sol";
13
13
  import {RoleId, RoleIdLib} from "../type/RoleId.sol";
14
- import {Version, VersionPart, VersionLib, VersionPartLib} from "../type/Version.sol";
15
- import {Versionable} from "./Versionable.sol";
14
+ import {Version, VersionLib, VersionPartLib} from "../type/Version.sol";
15
+ import {Versionable} from "../upgradeability/Versionable.sol";
16
16
 
17
17
 
18
18
  /// @dev service base contract
@@ -20,28 +20,20 @@ abstract contract Service is
20
20
  Registerable,
21
21
  Versionable,
22
22
  AccessManagedUpgradeable,
23
+ ReentrancyGuardUpgradeable,
23
24
  IService
24
25
  {
25
26
 
26
- uint8 private constant GIF_MAJOR_VERSION = 3;
27
-
28
-
29
- function initializeService(
27
+ function _initializeService(
30
28
  address registry,
31
29
  address authority, // real authority for registry service adress(0) for other services
32
30
  address initialOwner
33
31
  )
34
- public
32
+ internal
35
33
  virtual
36
34
  onlyInitializing()
37
35
  {
38
- initializeRegisterable(
39
- registry,
40
- IRegistry(registry).getNftId(),
41
- SERVICE(),
42
- false, // is interceptor
43
- initialOwner,
44
- ""); // data
36
+ __ReentrancyGuard_init();
45
37
 
46
38
  // externally provided authority
47
39
  if(authority != address(0)) {
@@ -53,8 +45,17 @@ abstract contract Service is
53
45
  __AccessManaged_init(IAccessManaged(registryServiceAddress).authority());
54
46
  }
55
47
 
56
- registerInterface(type(IAccessManaged).interfaceId);
57
- registerInterface(type(IService).interfaceId);
48
+ _initializeRegisterable(
49
+ registry,
50
+ IRegistry(registry).getNftId(),
51
+ SERVICE(),
52
+ false, // is interceptor
53
+ initialOwner,
54
+ ""); // data
55
+
56
+
57
+ _registerInterface(type(IAccessManaged).interfaceId);
58
+ _registerInterface(type(IService).interfaceId);
58
59
  }
59
60
 
60
61
  function getDomain() external virtual pure returns(ObjectType serviceDomain) {
@@ -62,22 +63,22 @@ abstract contract Service is
62
63
  }
63
64
 
64
65
  function getRoleId() external virtual pure returns(RoleId serviceRoleId) {
65
- return RoleIdLib.roleForTypeAndVersion(_getDomain(), VersionPartLib.toVersionPart(GIF_MAJOR_VERSION));
66
+ return RoleIdLib.roleForTypeAndVersion(_getDomain(), getRelease());
66
67
  }
67
68
 
68
- // from Versionable
69
+ /// @inheritdoc IVersionable
69
70
  function getVersion()
70
71
  public
71
72
  pure
72
73
  virtual override (IVersionable, Versionable)
73
74
  returns(Version)
74
75
  {
75
- return VersionLib.toVersion(GIF_MAJOR_VERSION,0,0);
76
+ return VersionLib.toVersion(GIF_RELEASE,0,0);
76
77
  }
77
78
 
78
79
  function _getDomain() internal virtual pure returns (ObjectType);
79
80
 
80
81
  function _getServiceAddress(ObjectType domain) internal view returns (address) {
81
- return getRegistry().getServiceAddress(domain, VersionPartLib.toVersionPart(GIF_MAJOR_VERSION));
82
+ return getRegistry().getServiceAddress(domain, getRelease());
82
83
  }
83
84
  }