@etherisc/gif-next 0.0.2-b3a8633-027 → 0.0.2-b3b68b6-318

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 (541) hide show
  1. package/README.md +46 -8
  2. package/artifacts/contracts/accounting/AccountingService.sol/AccountingService.dbg.json +4 -0
  3. package/artifacts/contracts/accounting/AccountingService.sol/AccountingService.json +1007 -0
  4. package/artifacts/contracts/accounting/AccountingServiceManager.sol/AccountingServiceManager.dbg.json +4 -0
  5. package/artifacts/contracts/accounting/AccountingServiceManager.sol/AccountingServiceManager.json +744 -0
  6. package/artifacts/contracts/accounting/IAccountingService.sol/IAccountingService.dbg.json +4 -0
  7. package/artifacts/contracts/accounting/IAccountingService.sol/IAccountingService.json +791 -0
  8. package/artifacts/contracts/authorization/AccessAdmin.sol/AccessAdmin.dbg.json +1 -1
  9. package/artifacts/contracts/authorization/AccessAdmin.sol/AccessAdmin.json +203 -77
  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/AccessManagerCloneable.sol/AccessManagerCloneable.json +233 -5
  14. package/artifacts/contracts/authorization/Authorization.sol/Authorization.dbg.json +1 -1
  15. package/artifacts/contracts/authorization/Authorization.sol/Authorization.json +200 -16
  16. package/artifacts/contracts/authorization/IAccess.sol/IAccess.dbg.json +1 -1
  17. package/artifacts/contracts/authorization/IAccessAdmin.sol/IAccessAdmin.dbg.json +1 -1
  18. package/artifacts/contracts/authorization/IAccessAdmin.sol/IAccessAdmin.json +142 -44
  19. package/artifacts/contracts/authorization/IAuthorization.sol/IAuthorization.dbg.json +1 -1
  20. package/artifacts/contracts/authorization/IAuthorization.sol/IAuthorization.json +107 -15
  21. package/artifacts/contracts/authorization/IServiceAuthorization.sol/IServiceAuthorization.dbg.json +1 -1
  22. package/artifacts/contracts/authorization/IServiceAuthorization.sol/IServiceAuthorization.json +19 -0
  23. package/artifacts/contracts/authorization/ServiceAuthorization.sol/ServiceAuthorization.dbg.json +1 -1
  24. package/artifacts/contracts/authorization/ServiceAuthorization.sol/ServiceAuthorization.json +68 -5
  25. package/artifacts/contracts/distribution/BasicDistribution.sol/BasicDistribution.dbg.json +1 -1
  26. package/artifacts/contracts/distribution/BasicDistribution.sol/BasicDistribution.json +194 -377
  27. package/artifacts/contracts/distribution/BasicDistributionAuthorization.sol/BasicDistributionAuthorization.dbg.json +1 -1
  28. package/artifacts/contracts/distribution/BasicDistributionAuthorization.sol/BasicDistributionAuthorization.json +206 -27
  29. package/artifacts/contracts/distribution/Distribution.sol/Distribution.dbg.json +1 -1
  30. package/artifacts/contracts/distribution/Distribution.sol/Distribution.json +140 -315
  31. package/artifacts/contracts/distribution/DistributionService.sol/DistributionService.dbg.json +1 -1
  32. package/artifacts/contracts/distribution/DistributionService.sol/DistributionService.json +404 -289
  33. package/artifacts/contracts/distribution/DistributionServiceManager.sol/DistributionServiceManager.dbg.json +1 -1
  34. package/artifacts/contracts/distribution/DistributionServiceManager.sol/DistributionServiceManager.json +147 -109
  35. package/artifacts/contracts/distribution/IDistributionComponent.sol/IDistributionComponent.dbg.json +1 -1
  36. package/artifacts/contracts/distribution/IDistributionComponent.sol/IDistributionComponent.json +154 -139
  37. package/artifacts/contracts/distribution/IDistributionService.sol/IDistributionService.dbg.json +1 -1
  38. package/artifacts/contracts/distribution/IDistributionService.sol/IDistributionService.json +255 -90
  39. package/artifacts/contracts/examples/fire/DamageLevel.sol/DamageLevelLib.dbg.json +4 -0
  40. package/artifacts/contracts/examples/fire/DamageLevel.sol/DamageLevelLib.json +22 -0
  41. package/artifacts/contracts/examples/fire/FirePool.sol/FirePool.dbg.json +4 -0
  42. package/artifacts/contracts/examples/fire/FirePool.sol/FirePool.json +1475 -0
  43. package/artifacts/contracts/examples/fire/FirePoolAuthorization.sol/FirePoolAuthorization.dbg.json +4 -0
  44. package/artifacts/contracts/examples/fire/FirePoolAuthorization.sol/FirePoolAuthorization.json +589 -0
  45. package/artifacts/contracts/examples/fire/FireProduct.sol/FireProduct.dbg.json +4 -0
  46. package/artifacts/contracts/examples/fire/FireProduct.sol/FireProduct.json +2040 -0
  47. package/artifacts/contracts/examples/fire/FireProductAuthorization.sol/FireProductAuthorization.dbg.json +4 -0
  48. package/artifacts/contracts/examples/fire/FireProductAuthorization.sol/FireProductAuthorization.json +589 -0
  49. package/artifacts/contracts/examples/fire/FireUSD.sol/FireUSD.dbg.json +4 -0
  50. package/artifacts/contracts/examples/fire/FireUSD.sol/FireUSD.json +376 -0
  51. package/artifacts/contracts/examples/unpermissioned/SimpleDistribution.sol/SimpleDistribution.dbg.json +4 -0
  52. package/artifacts/contracts/examples/unpermissioned/SimpleDistribution.sol/SimpleDistribution.json +1479 -0
  53. package/artifacts/contracts/examples/unpermissioned/SimpleDistributionAuthorization.sol/SimpleDistributionAuthorization.dbg.json +4 -0
  54. package/artifacts/contracts/examples/unpermissioned/SimpleDistributionAuthorization.sol/SimpleDistributionAuthorization.json +589 -0
  55. package/artifacts/contracts/examples/unpermissioned/SimpleOracle.sol/SimpleOracle.dbg.json +4 -0
  56. package/artifacts/contracts/examples/unpermissioned/SimpleOracle.sol/SimpleOracle.json +1195 -0
  57. package/artifacts/contracts/examples/unpermissioned/SimplePool.sol/SimplePool.dbg.json +4 -0
  58. package/artifacts/contracts/examples/unpermissioned/SimplePool.sol/SimplePool.json +1655 -0
  59. package/artifacts/contracts/examples/unpermissioned/SimplePoolAuthorization.sol/SimplePoolAuthorization.dbg.json +4 -0
  60. package/artifacts/contracts/examples/unpermissioned/SimplePoolAuthorization.sol/SimplePoolAuthorization.json +589 -0
  61. package/artifacts/contracts/examples/unpermissioned/SimpleProduct.sol/SimpleProduct.dbg.json +4 -0
  62. package/artifacts/contracts/examples/unpermissioned/SimpleProduct.sol/SimpleProduct.json +2426 -0
  63. package/artifacts/contracts/examples/unpermissioned/SimpleProductAuthorization.sol/SimpleProductAuthorization.dbg.json +4 -0
  64. package/artifacts/contracts/examples/unpermissioned/SimpleProductAuthorization.sol/SimpleProductAuthorization.json +589 -0
  65. package/artifacts/contracts/instance/BundleSet.sol/BundleSet.dbg.json +1 -1
  66. package/artifacts/contracts/instance/BundleSet.sol/BundleSet.json +193 -45
  67. package/artifacts/contracts/instance/IInstance.sol/IInstance.dbg.json +1 -1
  68. package/artifacts/contracts/instance/IInstance.sol/IInstance.json +158 -57
  69. package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.dbg.json +1 -1
  70. package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.json +105 -103
  71. package/artifacts/contracts/instance/Instance.sol/Instance.dbg.json +1 -1
  72. package/artifacts/contracts/instance/Instance.sol/Instance.json +194 -154
  73. package/artifacts/contracts/instance/InstanceAdmin.sol/InstanceAdmin.dbg.json +1 -1
  74. package/artifacts/contracts/instance/InstanceAdmin.sol/InstanceAdmin.json +446 -143
  75. package/artifacts/contracts/instance/InstanceAuthorizationV3.sol/InstanceAuthorizationV3.dbg.json +1 -1
  76. package/artifacts/contracts/instance/InstanceAuthorizationV3.sol/InstanceAuthorizationV3.json +150 -90
  77. package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.dbg.json +1 -1
  78. package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.json +997 -303
  79. package/artifacts/contracts/instance/InstanceService.sol/InstanceService.dbg.json +1 -1
  80. package/artifacts/contracts/instance/InstanceService.sol/InstanceService.json +131 -266
  81. package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.dbg.json +1 -1
  82. package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.json +102 -92
  83. package/artifacts/contracts/instance/InstanceStore.sol/InstanceStore.dbg.json +1 -1
  84. package/artifacts/contracts/instance/InstanceStore.sol/InstanceStore.json +623 -496
  85. package/artifacts/contracts/instance/RiskSet.sol/RiskSet.dbg.json +4 -0
  86. package/artifacts/contracts/instance/RiskSet.sol/RiskSet.json +853 -0
  87. package/artifacts/contracts/instance/base/BalanceStore.sol/BalanceStore.dbg.json +1 -1
  88. package/artifacts/contracts/instance/base/BalanceStore.sol/BalanceStore.json +2 -2
  89. package/artifacts/contracts/instance/base/Cloneable.sol/Cloneable.dbg.json +1 -1
  90. package/artifacts/contracts/instance/base/ObjectCounter.sol/ObjectCounter.dbg.json +1 -1
  91. package/artifacts/contracts/instance/base/ObjectCounter.sol/ObjectCounter.json +2 -2
  92. package/artifacts/contracts/instance/base/ObjectLifecycle.sol/ObjectLifecycle.dbg.json +1 -1
  93. package/artifacts/contracts/instance/base/ObjectLifecycle.sol/ObjectLifecycle.json +46 -5
  94. package/artifacts/contracts/instance/base/ObjectSet.sol/ObjectSet.dbg.json +1 -1
  95. package/artifacts/contracts/instance/base/ObjectSet.sol/ObjectSet.json +16 -5
  96. package/artifacts/contracts/instance/base/ObjectSetHelperLib.sol/ObjectSetHelperLib.dbg.json +4 -0
  97. package/artifacts/contracts/instance/base/ObjectSetHelperLib.sol/ObjectSetHelperLib.json +168 -0
  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/mock/Dip.sol/Dip.json +2 -2
  105. package/artifacts/contracts/oracle/BasicOracle.sol/BasicOracle.dbg.json +1 -1
  106. package/artifacts/contracts/oracle/BasicOracle.sol/BasicOracle.json +139 -335
  107. package/artifacts/contracts/oracle/BasicOracleAuthorization.sol/BasicOracleAuthorization.dbg.json +1 -1
  108. package/artifacts/contracts/oracle/BasicOracleAuthorization.sol/BasicOracleAuthorization.json +180 -29
  109. package/artifacts/contracts/oracle/IOracle.sol/IOracle.dbg.json +1 -1
  110. package/artifacts/contracts/oracle/IOracleComponent.sol/IOracleComponent.dbg.json +1 -1
  111. package/artifacts/contracts/oracle/IOracleComponent.sol/IOracleComponent.json +128 -126
  112. package/artifacts/contracts/oracle/IOracleService.sol/IOracleService.dbg.json +1 -1
  113. package/artifacts/contracts/oracle/IOracleService.sol/IOracleService.json +69 -11
  114. package/artifacts/contracts/oracle/Oracle.sol/Oracle.dbg.json +1 -1
  115. package/artifacts/contracts/oracle/Oracle.sol/Oracle.json +115 -303
  116. package/artifacts/contracts/oracle/OracleService.sol/OracleService.dbg.json +1 -1
  117. package/artifacts/contracts/oracle/OracleService.sol/OracleService.json +153 -190
  118. package/artifacts/contracts/oracle/OracleServiceManager.sol/OracleServiceManager.dbg.json +1 -1
  119. package/artifacts/contracts/oracle/OracleServiceManager.sol/OracleServiceManager.json +122 -88
  120. package/artifacts/contracts/pool/BasicPool.sol/BasicPool.dbg.json +1 -1
  121. package/artifacts/contracts/pool/BasicPool.sol/BasicPool.json +162 -387
  122. package/artifacts/contracts/pool/BasicPoolAuthorization.sol/BasicPoolAuthorization.dbg.json +1 -1
  123. package/artifacts/contracts/pool/BasicPoolAuthorization.sol/BasicPoolAuthorization.json +206 -27
  124. package/artifacts/contracts/pool/BundleService.sol/BundleService.dbg.json +1 -1
  125. package/artifacts/contracts/pool/BundleService.sol/BundleService.json +330 -203
  126. package/artifacts/contracts/pool/BundleServiceManager.sol/BundleServiceManager.dbg.json +1 -1
  127. package/artifacts/contracts/pool/BundleServiceManager.sol/BundleServiceManager.json +143 -97
  128. package/artifacts/contracts/pool/IBundleService.sol/IBundleService.dbg.json +1 -1
  129. package/artifacts/contracts/pool/IBundleService.sol/IBundleService.json +206 -29
  130. package/artifacts/contracts/pool/IPoolComponent.sol/IPoolComponent.dbg.json +1 -1
  131. package/artifacts/contracts/pool/IPoolComponent.sol/IPoolComponent.json +143 -195
  132. package/artifacts/contracts/pool/IPoolService.sol/IPoolService.dbg.json +1 -1
  133. package/artifacts/contracts/pool/IPoolService.sol/IPoolService.json +464 -312
  134. package/artifacts/contracts/pool/Pool.sol/Pool.dbg.json +1 -1
  135. package/artifacts/contracts/pool/Pool.sol/Pool.json +128 -370
  136. package/artifacts/contracts/pool/PoolLib.sol/PoolLib.dbg.json +4 -0
  137. package/artifacts/contracts/pool/PoolLib.sol/PoolLib.json +456 -0
  138. package/artifacts/contracts/pool/PoolService.sol/PoolService.dbg.json +1 -1
  139. package/artifacts/contracts/pool/PoolService.sol/PoolService.json +653 -532
  140. package/artifacts/contracts/pool/PoolServiceManager.sol/PoolServiceManager.dbg.json +1 -1
  141. package/artifacts/contracts/pool/PoolServiceManager.sol/PoolServiceManager.json +163 -97
  142. package/artifacts/contracts/product/ApplicationService.sol/ApplicationService.dbg.json +1 -1
  143. package/artifacts/contracts/product/ApplicationService.sol/ApplicationService.json +134 -184
  144. package/artifacts/contracts/product/ApplicationServiceManager.sol/ApplicationServiceManager.dbg.json +1 -1
  145. package/artifacts/contracts/product/ApplicationServiceManager.sol/ApplicationServiceManager.json +91 -93
  146. package/artifacts/contracts/product/BasicProduct.sol/BasicProduct.dbg.json +1 -1
  147. package/artifacts/contracts/product/BasicProduct.sol/BasicProduct.json +258 -396
  148. package/artifacts/contracts/product/BasicProductAuthorization.sol/BasicProductAuthorization.dbg.json +1 -1
  149. package/artifacts/contracts/product/BasicProductAuthorization.sol/BasicProductAuthorization.json +206 -27
  150. package/artifacts/contracts/product/ClaimService.sol/ClaimService.dbg.json +1 -1
  151. package/artifacts/contracts/product/ClaimService.sol/ClaimService.json +415 -234
  152. package/artifacts/contracts/product/ClaimServiceManager.sol/ClaimServiceManager.dbg.json +1 -1
  153. package/artifacts/contracts/product/ClaimServiceManager.sol/ClaimServiceManager.json +140 -114
  154. package/artifacts/contracts/product/IApplicationService.sol/IApplicationService.dbg.json +1 -1
  155. package/artifacts/contracts/product/IApplicationService.sol/IApplicationService.json +94 -9
  156. package/artifacts/contracts/product/IClaimService.sol/IClaimService.dbg.json +1 -1
  157. package/artifacts/contracts/product/IClaimService.sol/IClaimService.json +308 -16
  158. package/artifacts/contracts/product/IPolicyService.sol/IPolicyService.dbg.json +1 -1
  159. package/artifacts/contracts/product/IPolicyService.sol/IPolicyService.json +365 -104
  160. package/artifacts/contracts/product/IPricingService.sol/IPricingService.dbg.json +1 -1
  161. package/artifacts/contracts/product/IPricingService.sol/IPricingService.json +136 -83
  162. package/artifacts/contracts/product/IProductComponent.sol/IProductComponent.dbg.json +1 -1
  163. package/artifacts/contracts/product/IProductComponent.sol/IProductComponent.json +250 -198
  164. package/artifacts/contracts/product/IRiskService.sol/IRiskService.dbg.json +4 -0
  165. package/artifacts/contracts/product/{IProductService.sol/IProductService.json → IRiskService.sol/IRiskService.json} +57 -4
  166. package/artifacts/contracts/product/PolicyService.sol/PolicyService.dbg.json +1 -1
  167. package/artifacts/contracts/product/PolicyService.sol/PolicyService.json +459 -309
  168. package/artifacts/contracts/product/PolicyServiceLib.sol/PolicyServiceLib.dbg.json +4 -0
  169. package/artifacts/contracts/product/PolicyServiceLib.sol/PolicyServiceLib.json +293 -0
  170. package/artifacts/contracts/product/PolicyServiceManager.sol/PolicyServiceManager.dbg.json +1 -1
  171. package/artifacts/contracts/product/PolicyServiceManager.sol/PolicyServiceManager.json +141 -99
  172. package/artifacts/contracts/product/PricingService.sol/PricingService.dbg.json +1 -1
  173. package/artifacts/contracts/product/PricingService.sol/PricingService.json +230 -312
  174. package/artifacts/contracts/product/PricingServiceManager.sol/PricingServiceManager.dbg.json +1 -1
  175. package/artifacts/contracts/product/PricingServiceManager.sol/PricingServiceManager.json +120 -122
  176. package/artifacts/contracts/product/Product.sol/Product.dbg.json +1 -1
  177. package/artifacts/contracts/product/Product.sol/Product.json +256 -394
  178. package/artifacts/contracts/product/RiskService.sol/RiskService.dbg.json +4 -0
  179. package/artifacts/contracts/product/RiskService.sol/RiskService.json +637 -0
  180. package/artifacts/contracts/product/RiskServiceManager.sol/RiskServiceManager.dbg.json +4 -0
  181. package/artifacts/contracts/product/RiskServiceManager.sol/RiskServiceManager.json +724 -0
  182. package/artifacts/contracts/registry/ChainNft.sol/ChainNft.dbg.json +1 -1
  183. package/artifacts/contracts/registry/ChainNft.sol/ChainNft.json +22 -3
  184. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.dbg.json +1 -1
  185. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.json +343 -32
  186. package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.dbg.json +1 -1
  187. package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.json +144 -41
  188. package/artifacts/contracts/registry/IRelease.sol/IRelease.dbg.json +4 -0
  189. package/artifacts/contracts/registry/IRelease.sol/IRelease.json +24 -0
  190. package/artifacts/contracts/registry/ITransferInterceptor.sol/ITransferInterceptor.dbg.json +1 -1
  191. package/artifacts/contracts/registry/ITransferInterceptor.sol/ITransferInterceptor.json +5 -18
  192. package/artifacts/contracts/registry/Registry.sol/Registry.dbg.json +1 -1
  193. package/artifacts/contracts/registry/Registry.sol/Registry.json +447 -117
  194. package/artifacts/contracts/registry/RegistryAdmin.sol/RegistryAdmin.dbg.json +1 -1
  195. package/artifacts/contracts/registry/RegistryAdmin.sol/RegistryAdmin.json +319 -262
  196. package/artifacts/contracts/registry/RegistryService.sol/RegistryService.dbg.json +1 -1
  197. package/artifacts/contracts/registry/RegistryService.sol/RegistryService.json +109 -292
  198. package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.dbg.json +1 -1
  199. package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.json +94 -80
  200. package/artifacts/contracts/registry/ReleaseAdmin.sol/ReleaseAdmin.dbg.json +4 -0
  201. package/artifacts/contracts/registry/ReleaseAdmin.sol/ReleaseAdmin.json +1849 -0
  202. package/artifacts/contracts/registry/ReleaseLifecycle.sol/ReleaseLifecycle.dbg.json +1 -1
  203. package/artifacts/contracts/registry/ReleaseLifecycle.sol/ReleaseLifecycle.json +47 -6
  204. package/artifacts/contracts/registry/ReleaseRegistry.sol/ReleaseRegistry.dbg.json +1 -1
  205. package/artifacts/contracts/registry/ReleaseRegistry.sol/ReleaseRegistry.json +428 -235
  206. package/artifacts/contracts/registry/ServiceAuthorizationV3.sol/ServiceAuthorizationV3.dbg.json +1 -1
  207. package/artifacts/contracts/registry/ServiceAuthorizationV3.sol/ServiceAuthorizationV3.json +66 -8
  208. package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.dbg.json +1 -1
  209. package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.json +4 -4
  210. package/artifacts/contracts/shared/Component.sol/Component.dbg.json +1 -1
  211. package/artifacts/contracts/shared/Component.sol/Component.json +76 -265
  212. package/artifacts/contracts/shared/ComponentService.sol/ComponentService.dbg.json +1 -1
  213. package/artifacts/contracts/shared/ComponentService.sol/ComponentService.json +579 -495
  214. package/artifacts/contracts/shared/ComponentServiceManager.sol/ComponentServiceManager.dbg.json +1 -1
  215. package/artifacts/contracts/shared/ComponentServiceManager.sol/ComponentServiceManager.json +143 -107
  216. package/artifacts/contracts/shared/ComponentVerifyingService.sol/ComponentVerifyingService.dbg.json +1 -1
  217. package/artifacts/contracts/shared/ComponentVerifyingService.sol/ComponentVerifyingService.json +57 -111
  218. package/artifacts/contracts/shared/ContractLib.sol/ContractLib.dbg.json +4 -0
  219. package/artifacts/contracts/shared/ContractLib.sol/ContractLib.json +541 -0
  220. package/artifacts/contracts/shared/ContractLib.sol/IInstanceAdminHelper.dbg.json +4 -0
  221. package/artifacts/contracts/shared/ContractLib.sol/IInstanceAdminHelper.json +24 -0
  222. package/artifacts/contracts/shared/ContractLib.sol/ITargetHelper.dbg.json +4 -0
  223. package/artifacts/contracts/shared/ContractLib.sol/ITargetHelper.json +30 -0
  224. package/artifacts/contracts/shared/ContractLib.sol/ITokenRegistryHelper.dbg.json +4 -0
  225. package/artifacts/contracts/shared/ContractLib.sol/ITokenRegistryHelper.json +40 -0
  226. package/artifacts/contracts/shared/IComponent.sol/IComponent.dbg.json +1 -1
  227. package/artifacts/contracts/shared/IComponent.sol/IComponent.json +89 -88
  228. package/artifacts/contracts/shared/IComponentService.sol/IComponentService.dbg.json +1 -1
  229. package/artifacts/contracts/shared/IComponentService.sol/IComponentService.json +547 -224
  230. package/artifacts/contracts/shared/IInstanceLinkedComponent.sol/IInstanceLinkedComponent.dbg.json +1 -1
  231. package/artifacts/contracts/shared/IInstanceLinkedComponent.sol/IInstanceLinkedComponent.json +117 -126
  232. package/artifacts/contracts/shared/IKeyValueStore.sol/IKeyValueStore.dbg.json +1 -1
  233. package/artifacts/contracts/shared/IKeyValueStore.sol/IKeyValueStore.json +36 -0
  234. package/artifacts/contracts/shared/ILifecycle.sol/ILifecycle.dbg.json +1 -1
  235. package/artifacts/contracts/shared/ILifecycle.sol/ILifecycle.json +36 -0
  236. package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.dbg.json +1 -1
  237. package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.json +16 -0
  238. package/artifacts/contracts/shared/IPolicyHolder.sol/IPolicyHolder.dbg.json +1 -1
  239. package/artifacts/contracts/shared/IPolicyHolder.sol/IPolicyHolder.json +15 -47
  240. package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.dbg.json +1 -1
  241. package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.json +148 -0
  242. package/artifacts/contracts/shared/IRegistryLinked.sol/IRegistryLinked.dbg.json +1 -1
  243. package/artifacts/contracts/shared/IService.sol/IService.dbg.json +1 -1
  244. package/artifacts/contracts/shared/IService.sol/IService.json +55 -2
  245. package/artifacts/contracts/shared/InitializableERC165.sol/InitializableERC165.dbg.json +4 -0
  246. package/artifacts/contracts/shared/InitializableERC165.sol/InitializableERC165.json +53 -0
  247. package/artifacts/contracts/shared/InstanceLinkedComponent.sol/InstanceLinkedComponent.dbg.json +1 -1
  248. package/artifacts/contracts/shared/InstanceLinkedComponent.sol/InstanceLinkedComponent.json +104 -303
  249. package/artifacts/contracts/shared/KeyValueStore.sol/KeyValueStore.dbg.json +1 -1
  250. package/artifacts/contracts/shared/KeyValueStore.sol/KeyValueStore.json +42 -1
  251. package/artifacts/contracts/shared/Lifecycle.sol/Lifecycle.dbg.json +1 -1
  252. package/artifacts/contracts/shared/Lifecycle.sol/Lifecycle.json +42 -1
  253. package/artifacts/contracts/shared/NftIdSet.sol/NftIdSet.dbg.json +1 -1
  254. package/artifacts/contracts/shared/NftIdSet.sol/NftIdSet.json +2 -2
  255. package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.dbg.json +1 -1
  256. package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.json +22 -57
  257. package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.dbg.json +1 -1
  258. package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.json +19 -141
  259. package/artifacts/contracts/shared/Registerable.sol/Registerable.dbg.json +1 -1
  260. package/artifacts/contracts/shared/Registerable.sol/Registerable.json +122 -97
  261. package/artifacts/contracts/shared/RegistryLinked.sol/RegistryLinked.dbg.json +1 -1
  262. package/artifacts/contracts/shared/RegistryLinked.sol/RegistryLinked.json +2 -15
  263. package/artifacts/contracts/shared/Service.sol/Service.dbg.json +1 -1
  264. package/artifacts/contracts/shared/Service.sol/Service.json +57 -111
  265. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.dbg.json +1 -1
  266. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.json +585 -12
  267. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandlerBase.dbg.json +4 -0
  268. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandlerBase.json +484 -0
  269. package/artifacts/contracts/shared/TokenHandlerDeployerLib.sol/TokenHandlerDeployerLib.dbg.json +4 -0
  270. package/artifacts/contracts/shared/TokenHandlerDeployerLib.sol/TokenHandlerDeployerLib.json +172 -0
  271. package/artifacts/contracts/staking/IStaking.sol/IStaking.dbg.json +1 -1
  272. package/artifacts/contracts/staking/IStaking.sol/IStaking.json +137 -139
  273. package/artifacts/contracts/staking/IStakingService.sol/IStakingService.dbg.json +1 -1
  274. package/artifacts/contracts/staking/IStakingService.sol/IStakingService.json +130 -16
  275. package/artifacts/contracts/staking/StakeManagerLib.sol/StakeManagerLib.dbg.json +1 -1
  276. package/artifacts/contracts/staking/StakeManagerLib.sol/StakeManagerLib.json +95 -88
  277. package/artifacts/contracts/staking/Staking.sol/Staking.dbg.json +1 -1
  278. package/artifacts/contracts/staking/Staking.sol/Staking.json +216 -375
  279. package/artifacts/contracts/staking/StakingLifecycle.sol/StakingLifecycle.dbg.json +1 -1
  280. package/artifacts/contracts/staking/StakingLifecycle.sol/StakingLifecycle.json +46 -5
  281. package/artifacts/contracts/staking/StakingManager.sol/StakingManager.dbg.json +1 -1
  282. package/artifacts/contracts/staking/StakingManager.sol/StakingManager.json +126 -95
  283. package/artifacts/contracts/staking/StakingReader.sol/StakingReader.dbg.json +1 -1
  284. package/artifacts/contracts/staking/StakingReader.sol/StakingReader.json +7 -63
  285. package/artifacts/contracts/staking/StakingService.sol/StakingService.dbg.json +1 -1
  286. package/artifacts/contracts/staking/StakingService.sol/StakingService.json +183 -164
  287. package/artifacts/contracts/staking/StakingServiceManager.sol/StakingServiceManager.dbg.json +1 -1
  288. package/artifacts/contracts/staking/StakingServiceManager.sol/StakingServiceManager.json +103 -85
  289. package/artifacts/contracts/staking/StakingStore.sol/StakingStore.dbg.json +1 -1
  290. package/artifacts/contracts/staking/StakingStore.sol/StakingStore.json +153 -107
  291. package/artifacts/contracts/staking/TargetManagerLib.sol/TargetManagerLib.dbg.json +1 -1
  292. package/artifacts/contracts/staking/TargetManagerLib.sol/TargetManagerLib.json +59 -23
  293. package/artifacts/contracts/type/AddressSet.sol/LibAddressSet.dbg.json +1 -1
  294. package/artifacts/contracts/type/Amount.sol/AmountLib.dbg.json +1 -1
  295. package/artifacts/contracts/type/Amount.sol/AmountLib.json +61 -8
  296. package/artifacts/contracts/type/Blocknumber.sol/BlocknumberLib.dbg.json +1 -1
  297. package/artifacts/contracts/type/Blocknumber.sol/BlocknumberLib.json +2 -2
  298. package/artifacts/contracts/type/ClaimId.sol/ClaimIdLib.dbg.json +1 -1
  299. package/artifacts/contracts/type/ClaimId.sol/ClaimIdLib.json +28 -4
  300. package/artifacts/contracts/type/DistributorType.sol/DistributorTypeLib.dbg.json +1 -1
  301. package/artifacts/contracts/type/DistributorType.sol/DistributorTypeLib.json +2 -2
  302. package/artifacts/contracts/type/Fee.sol/FeeLib.dbg.json +1 -1
  303. package/artifacts/contracts/type/Fee.sol/FeeLib.json +7 -2
  304. package/artifacts/contracts/type/Key32.sol/Key32Lib.dbg.json +1 -1
  305. package/artifacts/contracts/type/Key32.sol/Key32Lib.json +2 -2
  306. package/artifacts/contracts/type/Key32Set.sol/LibKey32Set.dbg.json +4 -0
  307. package/artifacts/contracts/type/Key32Set.sol/LibKey32Set.json +33 -0
  308. package/artifacts/contracts/type/NftId.sol/NftIdLib.dbg.json +1 -1
  309. package/artifacts/contracts/type/NftId.sol/NftIdLib.json +23 -4
  310. package/artifacts/contracts/type/NftIdSet.sol/LibNftIdSet.dbg.json +1 -1
  311. package/artifacts/contracts/type/NftIdSet.sol/LibNftIdSet.json +2 -2
  312. package/artifacts/contracts/type/ObjectType.sol/ObjectTypeLib.dbg.json +1 -1
  313. package/artifacts/contracts/type/ObjectType.sol/ObjectTypeLib.json +2 -2
  314. package/artifacts/contracts/type/PayoutId.sol/PayoutIdLib.dbg.json +1 -1
  315. package/artifacts/contracts/type/PayoutId.sol/PayoutIdLib.json +19 -19
  316. package/artifacts/contracts/type/Referral.sol/ReferralLib.dbg.json +1 -1
  317. package/artifacts/contracts/type/Referral.sol/ReferralLib.json +2 -2
  318. package/artifacts/contracts/type/RequestId.sol/RequestIdLib.dbg.json +1 -1
  319. package/artifacts/contracts/type/RequestId.sol/RequestIdLib.json +2 -2
  320. package/artifacts/contracts/type/RiskId.sol/RiskIdLib.dbg.json +1 -1
  321. package/artifacts/contracts/type/RiskId.sol/RiskIdLib.json +118 -5
  322. package/artifacts/contracts/type/RoleId.sol/RoleIdLib.dbg.json +1 -1
  323. package/artifacts/contracts/type/RoleId.sol/RoleIdLib.json +79 -15
  324. package/artifacts/contracts/type/Seconds.sol/SecondsLib.dbg.json +1 -1
  325. package/artifacts/contracts/type/Seconds.sol/SecondsLib.json +50 -2
  326. package/artifacts/contracts/type/Selector.sol/SelectorLib.dbg.json +1 -1
  327. package/artifacts/contracts/type/Selector.sol/SelectorLib.json +21 -2
  328. package/artifacts/contracts/type/Selector.sol/SelectorSetLib.dbg.json +1 -1
  329. package/artifacts/contracts/type/Selector.sol/SelectorSetLib.json +2 -2
  330. package/artifacts/contracts/type/StateId.sol/StateIdLib.dbg.json +1 -1
  331. package/artifacts/contracts/type/StateId.sol/StateIdLib.json +15 -2
  332. package/artifacts/contracts/type/String.sol/StrLib.dbg.json +1 -1
  333. package/artifacts/contracts/type/Timestamp.sol/TimestampLib.dbg.json +1 -1
  334. package/artifacts/contracts/type/Timestamp.sol/TimestampLib.json +23 -4
  335. package/artifacts/contracts/type/UFixed.sol/UFixedLib.dbg.json +1 -1
  336. package/artifacts/contracts/type/UFixed.sol/UFixedLib.json +52 -2
  337. package/artifacts/contracts/type/Version.sol/VersionLib.dbg.json +1 -1
  338. package/artifacts/contracts/type/Version.sol/VersionLib.json +2 -21
  339. package/artifacts/contracts/type/Version.sol/VersionPartLib.dbg.json +1 -1
  340. package/artifacts/contracts/type/Version.sol/VersionPartLib.json +47 -2
  341. package/artifacts/contracts/upgradeability/IVersionable.sol/IVersionable.dbg.json +1 -1
  342. package/artifacts/contracts/upgradeability/ProxyManager.sol/ProxyManager.dbg.json +1 -1
  343. package/artifacts/contracts/upgradeability/ProxyManager.sol/ProxyManager.json +71 -70
  344. package/artifacts/contracts/upgradeability/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.dbg.json +1 -1
  345. package/artifacts/contracts/upgradeability/Versionable.sol/Versionable.dbg.json +1 -1
  346. package/contracts/accounting/AccountingService.sol +262 -0
  347. package/contracts/accounting/AccountingServiceManager.sol +38 -0
  348. package/contracts/accounting/IAccountingService.sol +45 -0
  349. package/contracts/authorization/AccessAdmin.sol +232 -133
  350. package/contracts/authorization/AccessManagerCloneable.sol +136 -3
  351. package/contracts/authorization/Authorization.sol +321 -202
  352. package/contracts/authorization/IAccess.sol +1 -0
  353. package/contracts/authorization/IAccessAdmin.sol +17 -10
  354. package/contracts/authorization/IAuthorization.sol +27 -7
  355. package/contracts/authorization/IServiceAuthorization.sol +3 -1
  356. package/contracts/authorization/ServiceAuthorization.sol +26 -10
  357. package/contracts/distribution/BasicDistribution.sol +17 -25
  358. package/contracts/distribution/BasicDistributionAuthorization.sol +26 -9
  359. package/contracts/distribution/Distribution.sol +46 -40
  360. package/contracts/distribution/DistributionService.sol +163 -93
  361. package/contracts/distribution/DistributionServiceManager.sol +6 -6
  362. package/contracts/distribution/IDistributionComponent.sol +9 -5
  363. package/contracts/distribution/IDistributionService.sol +37 -21
  364. package/contracts/examples/fire/DamageLevel.sol +59 -0
  365. package/contracts/examples/fire/FirePool.sol +90 -0
  366. package/contracts/examples/fire/FirePoolAuthorization.sol +35 -0
  367. package/contracts/examples/fire/FireProduct.sol +438 -0
  368. package/contracts/examples/fire/FireProductAuthorization.sol +45 -0
  369. package/contracts/examples/fire/FireUSD.sol +26 -0
  370. package/contracts/examples/unpermissioned/SimpleDistribution.sol +57 -0
  371. package/contracts/examples/unpermissioned/SimpleDistributionAuthorization.sol +28 -0
  372. package/contracts/examples/unpermissioned/SimpleOracle.sol +137 -0
  373. package/contracts/examples/unpermissioned/SimplePool.sol +106 -0
  374. package/contracts/examples/unpermissioned/SimplePoolAuthorization.sol +28 -0
  375. package/contracts/examples/unpermissioned/SimpleProduct.sol +377 -0
  376. package/contracts/examples/unpermissioned/SimpleProductAuthorization.sol +28 -0
  377. package/contracts/instance/BundleSet.sol +42 -38
  378. package/contracts/instance/IInstance.sol +21 -37
  379. package/contracts/instance/IInstanceService.sol +9 -29
  380. package/contracts/instance/Instance.sol +59 -66
  381. package/contracts/instance/InstanceAdmin.sol +256 -85
  382. package/contracts/instance/InstanceAuthorizationV3.sol +56 -45
  383. package/contracts/instance/InstanceReader.sol +275 -43
  384. package/contracts/instance/InstanceService.sol +125 -164
  385. package/contracts/instance/InstanceServiceManager.sol +6 -7
  386. package/contracts/instance/InstanceStore.sol +24 -2
  387. package/contracts/instance/RiskSet.sol +118 -0
  388. package/contracts/instance/base/ObjectCounter.sol +1 -2
  389. package/contracts/instance/base/ObjectLifecycle.sol +11 -4
  390. package/contracts/instance/base/ObjectSet.sol +31 -33
  391. package/contracts/instance/base/ObjectSetHelperLib.sol +30 -0
  392. package/contracts/instance/module/IBundle.sol +1 -1
  393. package/contracts/instance/module/IComponents.sol +14 -15
  394. package/contracts/instance/module/IDistribution.sol +2 -2
  395. package/contracts/instance/module/IPolicy.sol +26 -25
  396. package/contracts/instance/module/IRisk.sol +3 -0
  397. package/contracts/mock/Dip.sol +1 -1
  398. package/contracts/oracle/BasicOracle.sol +0 -1
  399. package/contracts/oracle/BasicOracleAuthorization.sol +3 -12
  400. package/contracts/oracle/IOracleComponent.sol +2 -1
  401. package/contracts/oracle/IOracleService.sol +2 -1
  402. package/contracts/oracle/Oracle.sol +21 -22
  403. package/contracts/oracle/OracleService.sol +113 -81
  404. package/contracts/oracle/OracleServiceManager.sol +6 -6
  405. package/contracts/pool/BasicPool.sol +38 -27
  406. package/contracts/pool/BasicPoolAuthorization.sol +36 -9
  407. package/contracts/pool/BundleService.sol +194 -83
  408. package/contracts/pool/BundleServiceManager.sol +6 -6
  409. package/contracts/pool/IBundleService.sol +31 -22
  410. package/contracts/pool/IPoolComponent.sol +20 -10
  411. package/contracts/pool/IPoolService.sol +90 -75
  412. package/contracts/pool/Pool.sol +145 -111
  413. package/contracts/pool/PoolLib.sol +216 -0
  414. package/contracts/pool/PoolService.sol +540 -219
  415. package/contracts/pool/PoolServiceManager.sol +4 -4
  416. package/contracts/product/ApplicationService.sol +72 -43
  417. package/contracts/product/ApplicationServiceManager.sol +4 -4
  418. package/contracts/product/BasicProduct.sol +13 -44
  419. package/contracts/product/BasicProductAuthorization.sol +25 -9
  420. package/contracts/product/ClaimService.sol +367 -151
  421. package/contracts/product/ClaimServiceManager.sol +4 -4
  422. package/contracts/product/IApplicationService.sol +6 -2
  423. package/contracts/product/IClaimService.sol +44 -8
  424. package/contracts/product/IPolicyService.sol +53 -36
  425. package/contracts/product/IPricingService.sol +10 -10
  426. package/contracts/product/IProductComponent.sol +28 -5
  427. package/contracts/product/{IProductService.sol → IRiskService.sol} +1 -1
  428. package/contracts/product/PolicyService.sol +476 -269
  429. package/contracts/product/PolicyServiceLib.sol +65 -0
  430. package/contracts/product/PolicyServiceManager.sol +4 -4
  431. package/contracts/product/PricingService.sol +66 -62
  432. package/contracts/product/PricingServiceManager.sol +4 -4
  433. package/contracts/product/Product.sol +173 -87
  434. package/contracts/product/RiskService.sol +145 -0
  435. package/contracts/product/RiskServiceManager.sol +39 -0
  436. package/contracts/registry/ChainNft.sol +58 -27
  437. package/contracts/registry/IRegistry.sol +58 -25
  438. package/contracts/registry/IRegistryService.sol +5 -12
  439. package/contracts/registry/IRelease.sol +26 -0
  440. package/contracts/registry/ITransferInterceptor.sol +1 -2
  441. package/contracts/registry/Registry.sol +341 -178
  442. package/contracts/registry/RegistryAdmin.sol +142 -235
  443. package/contracts/registry/RegistryService.sol +37 -48
  444. package/contracts/registry/RegistryServiceManager.sol +3 -3
  445. package/contracts/registry/ReleaseAdmin.sol +245 -0
  446. package/contracts/registry/ReleaseLifecycle.sol +8 -3
  447. package/contracts/registry/ReleaseRegistry.sol +244 -266
  448. package/contracts/registry/ServiceAuthorizationV3.sol +99 -52
  449. package/contracts/registry/TokenRegistry.sol +6 -8
  450. package/contracts/shared/Component.sol +74 -128
  451. package/contracts/shared/ComponentService.sol +453 -342
  452. package/contracts/shared/ComponentServiceManager.sol +8 -5
  453. package/contracts/shared/ComponentVerifyingService.sol +28 -17
  454. package/contracts/shared/ContractLib.sol +253 -0
  455. package/contracts/shared/IComponent.sol +8 -17
  456. package/contracts/shared/IComponentService.sol +49 -39
  457. package/contracts/shared/IInstanceLinkedComponent.sol +7 -27
  458. package/contracts/shared/ILifecycle.sol +3 -1
  459. package/contracts/shared/INftOwnable.sol +2 -0
  460. package/contracts/shared/IPolicyHolder.sol +12 -22
  461. package/contracts/shared/IRegisterable.sol +23 -1
  462. package/contracts/shared/IService.sol +3 -5
  463. package/contracts/shared/{ERC165.sol → InitializableERC165.sol} +3 -3
  464. package/contracts/shared/InstanceLinkedComponent.sol +81 -35
  465. package/contracts/shared/KeyValueStore.sol +1 -1
  466. package/contracts/shared/Lifecycle.sol +15 -4
  467. package/contracts/shared/NftOwnable.sol +31 -11
  468. package/contracts/shared/PolicyHolder.sol +17 -57
  469. package/contracts/shared/Registerable.sol +55 -21
  470. package/contracts/shared/RegistryLinked.sol +9 -14
  471. package/contracts/shared/Service.sol +15 -32
  472. package/contracts/shared/TokenHandler.sol +309 -26
  473. package/contracts/shared/TokenHandlerDeployerLib.sol +20 -0
  474. package/contracts/staking/IStaking.sol +8 -11
  475. package/contracts/staking/IStakingService.sol +12 -4
  476. package/contracts/staking/StakeManagerLib.sol +87 -42
  477. package/contracts/staking/Staking.sol +86 -66
  478. package/contracts/staking/StakingManager.sol +8 -6
  479. package/contracts/staking/StakingReader.sol +13 -21
  480. package/contracts/staking/StakingService.sol +79 -37
  481. package/contracts/staking/StakingServiceManager.sol +6 -5
  482. package/contracts/staking/TargetManagerLib.sol +7 -3
  483. package/contracts/type/Amount.sol +27 -5
  484. package/contracts/type/Blocknumber.sol +7 -1
  485. package/contracts/type/ClaimId.sol +6 -1
  486. package/contracts/type/Key32.sol +2 -2
  487. package/contracts/type/Key32Set.sol +62 -0
  488. package/contracts/type/NftId.sol +7 -0
  489. package/contracts/type/ObjectType.sol +52 -20
  490. package/contracts/type/PayoutId.sol +10 -10
  491. package/contracts/type/Referral.sol +1 -0
  492. package/contracts/type/RiskId.sol +35 -4
  493. package/contracts/type/RoleId.sol +23 -15
  494. package/contracts/type/Seconds.sol +21 -1
  495. package/contracts/type/Selector.sol +5 -0
  496. package/contracts/type/StateId.sol +15 -1
  497. package/contracts/type/Timestamp.sol +10 -5
  498. package/contracts/type/UFixed.sol +35 -122
  499. package/contracts/type/Version.sol +15 -5
  500. package/contracts/upgradeability/ProxyManager.sol +68 -34
  501. package/contracts/upgradeability/Versionable.sol +2 -2
  502. package/package.json +4 -3
  503. package/artifacts/contracts/authorization/IModuleAuthorization.sol/IModuleAuthorization.dbg.json +0 -4
  504. package/artifacts/contracts/authorization/IModuleAuthorization.sol/IModuleAuthorization.json +0 -290
  505. package/artifacts/contracts/authorization/ModuleAuthorization.sol/ModuleAuthorization.dbg.json +0 -4
  506. package/artifacts/contracts/authorization/ModuleAuthorization.sol/ModuleAuthorization.json +0 -390
  507. package/artifacts/contracts/instance/module/IAccess.sol/IAccess.dbg.json +0 -4
  508. package/artifacts/contracts/instance/module/IAccess.sol/IAccess.json +0 -129
  509. package/artifacts/contracts/product/IProductService.sol/IProductService.dbg.json +0 -4
  510. package/artifacts/contracts/product/ProductService.sol/ProductService.dbg.json +0 -4
  511. package/artifacts/contracts/product/ProductService.sol/ProductService.json +0 -708
  512. package/artifacts/contracts/product/ProductServiceManager.sol/ProductServiceManager.dbg.json +0 -4
  513. package/artifacts/contracts/product/ProductServiceManager.sol/ProductServiceManager.json +0 -702
  514. package/artifacts/contracts/registry/GlobalRegistry.sol/GlobalRegistry.dbg.json +0 -4
  515. package/artifacts/contracts/registry/GlobalRegistry.sol/GlobalRegistry.json +0 -1503
  516. package/artifacts/contracts/registry/GlobalRegistryAdmin.sol/GlobalRegistryAdmin.dbg.json +0 -4
  517. package/artifacts/contracts/registry/GlobalRegistryAdmin.sol/GlobalRegistryAdmin.json +0 -1881
  518. package/artifacts/contracts/registry/IGlobalRegistry.sol/IGlobalRegistry.dbg.json +0 -4
  519. package/artifacts/contracts/registry/IGlobalRegistry.sol/IGlobalRegistry.json +0 -974
  520. package/artifacts/contracts/shared/ERC165.sol/ERC165.dbg.json +0 -4
  521. package/artifacts/contracts/shared/ERC165.sol/ERC165.json +0 -73
  522. package/artifacts/contracts/shared/InitializableCustom.sol/InitializableCustom.dbg.json +0 -4
  523. package/artifacts/contracts/shared/InitializableCustom.sol/InitializableCustom.json +0 -39
  524. package/artifacts/contracts/shared/MainnetId.sol/MainnetContract.dbg.json +0 -4
  525. package/artifacts/contracts/shared/MainnetId.sol/MainnetContract.json +0 -34
  526. package/artifacts/contracts/shared/MainnetId.sol/MainnetId.dbg.json +0 -4
  527. package/artifacts/contracts/shared/MainnetId.sol/MainnetId.json +0 -24
  528. package/artifacts/contracts/shared/MainnetId.sol/SidenetContract.dbg.json +0 -4
  529. package/artifacts/contracts/shared/MainnetId.sol/SidenetContract.json +0 -34
  530. package/artifacts/contracts/type/UFixed.sol/MathLib.dbg.json +0 -4
  531. package/artifacts/contracts/type/UFixed.sol/MathLib.json +0 -10
  532. package/contracts/authorization/IModuleAuthorization.sol +0 -21
  533. package/contracts/authorization/ModuleAuthorization.sol +0 -78
  534. package/contracts/instance/module/IAccess.sol +0 -46
  535. package/contracts/product/ProductService.sol +0 -99
  536. package/contracts/product/ProductServiceManager.sol +0 -39
  537. package/contracts/registry/GlobalRegistry.sol +0 -95
  538. package/contracts/registry/GlobalRegistryAdmin.sol +0 -38
  539. package/contracts/registry/IGlobalRegistry.sol +0 -17
  540. package/contracts/shared/InitializableCustom.sol +0 -177
  541. package/contracts/shared/MainnetId.sol +0 -29
@@ -30,6 +30,9 @@ interface IStaking is
30
30
  error ErrorStakingNotStakingOwner();
31
31
  error ErrorStakingNotNftOwner(NftId nftId);
32
32
 
33
+ // initializeTokenHandler
34
+ error ErrorStakingNotRegistry(address registry);
35
+
33
36
  // staking rate
34
37
  error ErrorStakingTokenNotRegistered(uint256 chainId, address token);
35
38
 
@@ -42,13 +45,13 @@ interface IStaking is
42
45
  error ErrorStakingTargetNftIdZero();
43
46
  error ErrorStakingTargetTypeNotSupported(NftId targetNftId, ObjectType objectType);
44
47
  error ErrorStakingTargetUnexpectedObjectType(NftId targetNftId, ObjectType expectedObjectType, ObjectType actualObjectType);
45
- error ErrorStakingLockingPeriodZero(NftId targetNftId);
48
+ error ErrorStakingLockingPeriodTooShort(NftId targetNftId, Seconds minLockingPeriod, Seconds lockingPeriod);
46
49
  error ErrorStakingLockingPeriodTooLong(NftId targetNftId, Seconds maxLockingPeriod, Seconds lockingPeriod);
50
+ error ErrorStakingStakeLocked(NftId stakeNftId, Timestamp lockedUntil);
47
51
  error ErrorStakingRewardRateTooHigh(NftId targetNftId, UFixed maxRewardRate, UFixed rewardRate);
48
52
  error ErrorStakingTargetNotFound(NftId targetNftId);
49
53
  error ErrorStakingTargetTokenNotFound(NftId targetNftId, uint256 chainId, address token);
50
54
 
51
- error ErrorStakingTargetNotActive(NftId targetNftId);
52
55
  error ErrorStakingStakeAmountZero(NftId targetNftId);
53
56
 
54
57
  // info for individual stake
@@ -63,6 +66,8 @@ interface IStaking is
63
66
  UFixed rewardRate;
64
67
  }
65
68
 
69
+ function initializeTokenHandler() external;
70
+
66
71
  // staking rate management
67
72
 
68
73
  /// @dev sets the rate that converts 1 token of total value locked into the
@@ -126,7 +131,7 @@ interface IStaking is
126
131
  /// @dev restakes the dips to a new target.
127
132
  /// the sum of the staked dips and the accumulated rewards will be restaked.
128
133
  /// permissioned: only staking service may call this function.
129
- function restake(NftId stakeNftId, NftId newTargetNftId) external returns (NftId newStakeNftId);
134
+ function restake(NftId stakeNftId, NftId newStakeNftId) external returns (Amount newStakeBalance);
130
135
 
131
136
  /// @dev retuns the specified amount of dips to the holder of the specified stake nft.
132
137
  /// if dipAmount is set to Amount.max() all staked dips and all rewards are transferred to
@@ -152,14 +157,6 @@ interface IStaking is
152
157
  Amount rewardsClaimedAmount
153
158
  );
154
159
 
155
- //--- helper functions --------------------------------------------------//
156
-
157
- /// @dev transfers the specified amount of dips from the from address to the staking wallet.
158
- function collectDipAmount(address from, Amount dipAmount) external;
159
-
160
- /// @dev transfers the specified amount of dips from the staking wallet to the to addess.
161
- function transferDipAmount(address to, Amount dipAmount) external;
162
-
163
160
  //--- view and pure functions -------------------------------------------//
164
161
 
165
162
  function getStakingStore() external view returns (StakingStore stakingStore);
@@ -7,9 +7,7 @@ import {Amount} from "../type/Amount.sol";
7
7
  import {IService} from "../shared/IService.sol";
8
8
  import {IStaking} from "./IStaking.sol";
9
9
  import {NftId} from "../type/NftId.sol";
10
- import {ObjectType} from "../type/ObjectType.sol";
11
10
  import {Seconds} from "../type/Seconds.sol";
12
- import {Timestamp} from "../type/Timestamp.sol";
13
11
  import {TokenHandler} from "../shared/TokenHandler.sol";
14
12
  import {UFixed} from "../type/UFixed.sol";
15
13
 
@@ -28,16 +26,18 @@ interface IStakingService is IService
28
26
  event LogStakingServiceStakeCreated(NftId stakeNftId, NftId targetNftId, address owner, Amount stakedAmount);
29
27
  event LogStakingServiceStakeIncreased(NftId stakeNftId, address owner, Amount stakedAmount, Amount stakeBalance);
30
28
  event LogStakingServiceUnstaked(NftId stakeNftId, address stakeOwner, Amount totalAmount);
29
+ event LogStakingServiceStakeRestaked(address stakeOwner, NftId indexed stakeNftId, NftId newStakeNftId, NftId indexed newTargetNftId, Amount indexed newStakeBalance);
31
30
 
32
31
  event LogStakingServiceRewardsUpdated(NftId stakeNftId);
33
32
  event LogStakingServiceRewardsClaimed(NftId stakeNftId, address stakeOwner, Amount rewardsClaimedAmount);
34
33
 
35
34
  // modifiers
36
- error ErrorStakingServiceNotNftOwner(NftId nftId, address expectedOwner, address owner);
35
+ error ErrorStakingServiceNotStakingOwner(address account);
37
36
  error ErrorStakingServiceNotStaking(address stakingAddress);
38
37
  error ErrorStakingServiceNotSupportingIStaking(address stakingAddress);
39
38
 
40
39
  // create
40
+ error ErrorStakingServiceTargetUnknown(NftId targetNftId);
41
41
  error ErrorStakingServiceZeroTargetNftId();
42
42
  error ErrorStakingServiceNotTargetNftId(NftId targetNftId);
43
43
  error ErrorStakingServiceNotActiveTargetNftId(NftId targetNftId);
@@ -51,6 +51,13 @@ interface IStakingService is IService
51
51
  // function setProtocolLockingPeriod(Seconds lockingPeriod) external;
52
52
  // TODO also make sure that protocol rewards can be refilled and withdrawn
53
53
 
54
+ /// @dev Approves the staking token handler.
55
+ /// Reverts if the staking token handler wallet is not the token handler itself.
56
+ function approveTokenHandler(
57
+ IERC20Metadata token,
58
+ Amount amount
59
+ ) external;
60
+
54
61
  /// @dev creates/registers an on-chain instance staking target.
55
62
  /// function granted to instance service
56
63
  function createInstanceTarget(
@@ -111,7 +118,8 @@ interface IStakingService is IService
111
118
  )
112
119
  external
113
120
  returns (
114
- NftId newStakeNftId
121
+ NftId newStakeNftId,
122
+ Amount newStakeBalance
115
123
  );
116
124
 
117
125
 
@@ -1,16 +1,10 @@
1
1
  // SPDX-License-Identifier: Apache-2.0
2
2
  pragma solidity ^0.8.20;
3
3
 
4
- import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
5
-
6
4
  import {Amount, AmountLib} from "../type/Amount.sol";
7
- import {Component} from "../shared/Component.sol";
8
5
  import {IRegistry} from "../registry/IRegistry.sol";
9
- import {IRegistryService} from "../registry/IRegistryService.sol";
10
6
  import {IStaking} from "./IStaking.sol";
11
- import {Key32} from "../type/Key32.sol";
12
7
  import {NftId} from "../type/NftId.sol";
13
- import {ObjectType, INSTANCE, PROTOCOL, TARGET} from "../type/ObjectType.sol";
14
8
  import {Seconds, SecondsLib} from "../type/Seconds.sol";
15
9
  import {StakingReader} from "./StakingReader.sol";
16
10
  import {StakingStore} from "./StakingStore.sol";
@@ -51,7 +45,7 @@ library StakeManagerLib {
51
45
 
52
46
  // TODO check that additional dip, rewards and rewards increment
53
47
  // are still ok with max target staking amount
54
- NftId targetNftId = registry.getObjectInfo(stakeNftId).parentNftId;
48
+ NftId targetNftId = registry.getParentNftId(stakeNftId);
55
49
 
56
50
  stakingStore.restakeRewards(
57
51
  stakeNftId,
@@ -72,6 +66,55 @@ library StakeManagerLib {
72
66
 
73
67
  }
74
68
 
69
+ function restake(
70
+ StakingReader stakingReader,
71
+ StakingStore stakingStore,
72
+ NftId oldStakeNftId,
73
+ NftId newStakeNftId
74
+ )
75
+ external
76
+ returns (Amount newStakeBalance)
77
+ {
78
+ checkUnstakeParameters(stakingReader, oldStakeNftId);
79
+ (NftId oldTargetNftId, UFixed oldRewardRate) = stakingReader.getTargetRewardRate(oldStakeNftId);
80
+
81
+ // calculate new rewards update and unstake full amount
82
+ (
83
+ Amount rewardIncrementAmount,
84
+ ) = calculateRewardIncrease(
85
+ stakingReader,
86
+ oldStakeNftId,
87
+ oldRewardRate);
88
+ stakingStore.updateRewards(
89
+ oldStakeNftId,
90
+ oldTargetNftId,
91
+ rewardIncrementAmount);
92
+ (
93
+ Amount unstakedAmount,
94
+ Amount rewardsAmount
95
+ ) = stakingStore.unstakeUpTo(
96
+ oldStakeNftId,
97
+ oldTargetNftId,
98
+ AmountLib.max(), // unstake all stakes
99
+ AmountLib.max()); // claim all rewards
100
+
101
+ // calculate full restake amount
102
+ newStakeBalance = unstakedAmount + rewardsAmount;
103
+ NftId newTargetNftId = stakingReader.getTargetNftId(newStakeNftId);
104
+
105
+ // create new staking target and increase stake
106
+ Timestamp newLockedUntil = _checkCreateParameters(stakingReader, newTargetNftId, newStakeBalance);
107
+ stakingStore.create(
108
+ newStakeNftId,
109
+ IStaking.StakeInfo({
110
+ lockedUntil: newLockedUntil
111
+ }));
112
+ stakingStore.increaseStake(
113
+ newStakeNftId,
114
+ newTargetNftId,
115
+ newStakeBalance);
116
+ }
117
+
75
118
  function checkCreateParameters(
76
119
  StakingReader stakingReader,
77
120
  NftId targetNftId,
@@ -82,6 +125,19 @@ library StakeManagerLib {
82
125
  returns (
83
126
  Timestamp lockedUntil
84
127
  )
128
+ {
129
+ return _checkCreateParameters(stakingReader, targetNftId, dipAmount);
130
+ }
131
+
132
+ function _checkCreateParameters(
133
+ StakingReader stakingReader,
134
+ NftId targetNftId,
135
+ Amount dipAmount
136
+ )
137
+ internal view
138
+ returns (
139
+ Timestamp lockedUntil
140
+ )
85
141
  {
86
142
  Seconds lockingPeriod = checkTarget(stakingReader, targetNftId);
87
143
  checkDipAmount(stakingReader, targetNftId, dipAmount);
@@ -104,16 +160,33 @@ library StakeManagerLib {
104
160
  {
105
161
  NftId targetNftId = stakingReader.getTargetNftId(stakeNftId);
106
162
 
107
- // only accept stakes for active targets
108
- if (!stakingReader.isActive(targetNftId)) {
109
- revert IStaking.ErrorStakingTargetNotActive(targetNftId);
163
+ // target nft id must be registered
164
+ if (!stakingReader.isTarget(targetNftId)) {
165
+ revert IStaking.ErrorStakingNotTarget(targetNftId);
110
166
  }
111
-
167
+
112
168
  IStaking.TargetInfo memory info = stakingReader.getTargetInfo(targetNftId);
113
169
  rewardRate = info.rewardRate;
114
170
  lockingPeriod = info.lockingPeriod;
115
171
  }
116
172
 
173
+ function checkUnstakeParameters(
174
+ StakingReader stakingReader,
175
+ NftId stakeNftId
176
+ )
177
+ public
178
+ view
179
+ returns (
180
+ Seconds lockingPeriod
181
+ )
182
+ {
183
+ IStaking.StakeInfo memory stakeInfo = stakingReader.getStakeInfo(stakeNftId);
184
+
185
+ if (stakeInfo.lockedUntil > TimestampLib.blockTimestamp()) {
186
+ revert IStaking.ErrorStakingStakeLocked(stakeNftId, stakeInfo.lockedUntil);
187
+ }
188
+ }
189
+
117
190
 
118
191
  function checkTarget(
119
192
  StakingReader stakingReader,
@@ -128,11 +201,6 @@ library StakeManagerLib {
128
201
  revert IStaking.ErrorStakingNotTarget(targetNftId);
129
202
  }
130
203
 
131
- // only accept stakes for active targets
132
- if (!stakingReader.isActive(targetNftId)) {
133
- revert IStaking.ErrorStakingTargetNotActive(targetNftId);
134
- }
135
-
136
204
  lockingPeriod = stakingReader.getTargetInfo(targetNftId).lockingPeriod;
137
205
  }
138
206
 
@@ -153,31 +221,6 @@ library StakeManagerLib {
153
221
  // TODO add check for target specific max dip amount (min stake + tvl * stake rate + buffer)
154
222
  }
155
223
 
156
-
157
- function checkDipBalanceAndAllowance(
158
- IERC20Metadata dip,
159
- address owner,
160
- address tokenHandlerAddress,
161
- Amount dipAmount
162
- )
163
- public
164
- view
165
- {
166
- // check balance
167
- uint256 amount = dipAmount.toInt();
168
- uint256 dipBalance = dip.balanceOf(owner);
169
- if (dipBalance < amount) {
170
- revert IStaking.ErrorStakingDipBalanceInsufficient(owner, amount, dipBalance);
171
- }
172
-
173
- // check allowance
174
- uint256 dipAllowance = dip.allowance(owner, tokenHandlerAddress);
175
- if (dipAllowance < amount) {
176
- revert IStaking.ErrorStakingDipAllowanceInsufficient(owner, tokenHandlerAddress, amount, dipAllowance);
177
- }
178
- }
179
-
180
-
181
224
  function calculateRewardIncrease(
182
225
  StakingReader stakingReader,
183
226
  NftId stakeNftId,
@@ -203,10 +246,12 @@ library StakeManagerLib {
203
246
  rewardRate,
204
247
  duration,
205
248
  stakeAmount);
206
-
249
+
207
250
  totalDipAmount = stakeAmount + rewardAmount + rewardIncreaseAmount;
208
251
  }
209
252
 
253
+ error Debug(Seconds, Amount);
254
+ error Debug2(UFixed);
210
255
 
211
256
  function calculateRewardAmount(
212
257
  UFixed rewardRate,
@@ -1,25 +1,31 @@
1
1
  // SPDX-License-Identifier: Apache-2.0
2
2
  pragma solidity ^0.8.20;
3
3
 
4
+ import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
5
+
4
6
  import {IRegistry} from "../registry/IRegistry.sol";
5
- import {IRegistryService} from "../registry/IRegistryService.sol";
7
+ import {IRelease} from "../registry/IRelease.sol";
6
8
  import {IStaking} from "./IStaking.sol";
7
9
  import {IVersionable} from "../upgradeability/IVersionable.sol";
8
10
 
9
11
  import {Amount, AmountLib} from "../type/Amount.sol";
10
12
  import {Component} from "../shared/Component.sol";
13
+ import {IComponent} from "../shared/IComponent.sol";
14
+ import {IComponentService} from "../shared/IComponentService.sol";
11
15
  import {NftId} from "../type/NftId.sol";
12
- import {ObjectType, STAKING} from "../type/ObjectType.sol";
16
+ import {ObjectType, STAKE, STAKING} from "../type/ObjectType.sol";
13
17
  import {Seconds} from "../type/Seconds.sol";
18
+ import {Registerable} from "../shared/Registerable.sol";
14
19
  import {StakeManagerLib} from "./StakeManagerLib.sol";
15
20
  import {StakingReader} from "./StakingReader.sol";
16
21
  import {StakingStore} from "./StakingStore.sol";
17
22
  import {TargetManagerLib} from "./TargetManagerLib.sol";
18
23
  import {Timestamp} from "../type/Timestamp.sol";
19
24
  import {TokenHandler} from "../shared/TokenHandler.sol";
25
+ import {TokenHandlerDeployerLib} from "../shared/TokenHandlerDeployerLib.sol";
20
26
  import {TokenRegistry} from "../registry/TokenRegistry.sol";
21
27
  import {UFixed} from "../type/UFixed.sol";
22
- import {Version, VersionLib} from "../type/Version.sol";
28
+ import {Version, VersionLib, VersionPart, VersionPartLib} from "../type/Version.sol";
23
29
  import {Versionable} from "../upgradeability/Versionable.sol";
24
30
 
25
31
  contract Staking is
@@ -28,14 +34,13 @@ contract Staking is
28
34
  IStaking
29
35
  {
30
36
  string public constant CONTRACT_NAME = "Staking";
31
- uint8 private constant GIF_MAJOR_VERSION = 3;
32
37
 
33
38
  // keccak256(abi.encode(uint256(keccak256("gif-next.contracts.component.Staking.sol")) - 1)) & ~bytes32(uint256(0xff));
34
39
  bytes32 public constant STAKING_LOCATION_V1 = 0xafe8d4462b2ed26a47154f4b8f6d1497d2f772496965791d25bd456e342b7f00;
35
40
 
36
41
  struct StakingStorage {
37
- IRegistryService _registryService;
38
42
  TokenRegistry _tokenRegistry;
43
+ TokenHandler _tokenHandler;
39
44
  StakingStore _store;
40
45
  StakingReader _reader;
41
46
  NftId _protocolNftId;
@@ -57,6 +62,31 @@ contract Staking is
57
62
  _;
58
63
  }
59
64
 
65
+ function initializeTokenHandler()
66
+ external
67
+ {
68
+ if (msg.sender != address(getRegistry())) {
69
+ revert ErrorStakingNotRegistry(msg.sender);
70
+ }
71
+
72
+ StakingStorage storage $ = _getStakingStorage();
73
+ $._tokenHandler = TokenHandlerDeployerLib.deployTokenHandler(
74
+ address(getRegistry()),
75
+ address(this),
76
+ address(getToken()),
77
+ getRegistry().getAuthority());
78
+ }
79
+
80
+
81
+ function approveTokenHandler(IERC20Metadata token, Amount amount)
82
+ public
83
+ restricted()
84
+ onlyOwner()
85
+ {
86
+ _approveTokenHandler(token, amount);
87
+ }
88
+
89
+
60
90
  // set/update staking reader
61
91
  function setStakingReader(StakingReader stakingReader)
62
92
  external
@@ -286,20 +316,25 @@ contract Staking is
286
316
 
287
317
  function restake(
288
318
  NftId stakeNftId,
289
- NftId newTargetNftId
319
+ NftId newStakeNftId
290
320
  )
291
321
  external
292
322
  virtual
293
323
  restricted() // only staking service
294
324
  onlyStake(stakeNftId)
295
- returns (NftId newStakeNftId)
325
+ returns (Amount newStakeBalance)
296
326
  {
327
+ _checkNftType(stakeNftId, STAKE());
328
+ _checkNftType(newStakeNftId, STAKE());
329
+
297
330
  // TODO add check that allows additional staking amount
298
331
  StakingStorage storage $ = _getStakingStorage();
299
-
300
- // TODO implement
301
- }
302
-
332
+ newStakeBalance = StakeManagerLib.restake(
333
+ $._reader,
334
+ $._store,
335
+ stakeNftId,
336
+ newStakeNftId);
337
+ }
303
338
 
304
339
  function updateRewards(NftId stakeNftId)
305
340
  external
@@ -347,9 +382,10 @@ contract Staking is
347
382
  Amount rewardsClaimedAmount
348
383
  )
349
384
  {
350
- // TODO add check that stake locking is in the past
351
385
  StakingStorage storage $ = _getStakingStorage();
352
-
386
+
387
+ StakeManagerLib.checkUnstakeParameters($._reader, stakeNftId);
388
+
353
389
  // update rewards since last update
354
390
  NftId targetNftId = _updateRewards($._reader, $._store, stakeNftId);
355
391
 
@@ -368,43 +404,6 @@ contract Staking is
368
404
  }
369
405
 
370
406
 
371
-
372
- //--- other functions ---------------------------------------------------//
373
-
374
- function collectDipAmount(address from, Amount dipAmount)
375
- external
376
- restricted() // only staking service
377
- {
378
- TokenHandler tokenHandler = getTokenHandler();
379
- address stakingWallet = getWallet();
380
-
381
- StakeManagerLib.checkDipBalanceAndAllowance(
382
- getToken(),
383
- from,
384
- address(tokenHandler),
385
- dipAmount);
386
-
387
- tokenHandler.transfer(from, stakingWallet, dipAmount);
388
- }
389
-
390
-
391
- function transferDipAmount(address to, Amount dipAmount)
392
- external
393
- restricted() // only staking service
394
- {
395
- TokenHandler tokenHandler = getTokenHandler();
396
- address stakingWallet = getWallet();
397
-
398
- StakeManagerLib.checkDipBalanceAndAllowance(
399
- getToken(),
400
- stakingWallet,
401
- address(tokenHandler),
402
- dipAmount);
403
-
404
- tokenHandler.transfer(stakingWallet, to, dipAmount);
405
- }
406
-
407
-
408
407
  //--- view functions ----------------------------------------------------//
409
408
 
410
409
  function getStakingReader() public view returns (StakingReader reader) {
@@ -419,15 +418,28 @@ contract Staking is
419
418
  return address(_getStakingStorage()._tokenRegistry);
420
419
  }
421
420
 
421
+ function getTokenHandler() public virtual override(Component, IComponent) view returns (TokenHandler tokenHandler) {
422
+ return _getStakingStorage()._tokenHandler;
423
+ }
424
+
425
+ // from IRegisterable
426
+ function getRelease()
427
+ public
428
+ pure
429
+ virtual override (IRelease, Registerable)
430
+ returns(VersionPart)
431
+ {
432
+ return VersionPartLib.toVersionPart(3);
433
+ }
422
434
 
423
- // from Versionable
435
+ // from IVersionable
424
436
  function getVersion()
425
437
  public
426
438
  pure
427
- virtual override (IVersionable, Versionable)
439
+ virtual override (Component, IVersionable, Versionable)
428
440
  returns(Version)
429
441
  {
430
- return VersionLib.toVersion(GIF_MAJOR_VERSION,0,0);
442
+ return VersionLib.toVersion(3,0,0);
431
443
  }
432
444
 
433
445
  //--- internal functions ------------------------------------------------//
@@ -456,13 +468,23 @@ contract Staking is
456
468
  }
457
469
 
458
470
 
471
+ function _approveTokenHandler(IERC20Metadata token, Amount amount)
472
+ internal
473
+ virtual override
474
+ {
475
+ IComponentService(_getServiceAddress(STAKING())).approveTokenHandler(
476
+ token,
477
+ amount);
478
+ }
479
+
480
+
459
481
  function _initialize(
460
482
  address owner,
461
483
  bytes memory data
462
484
  )
463
485
  internal
464
486
  virtual override
465
- initializer
487
+ initializer()
466
488
  {
467
489
  (
468
490
  address registryAddress,
@@ -477,10 +499,17 @@ contract Staking is
477
499
  TokenRegistry tokenRegistry = TokenRegistry(tokenRegistryAddress);
478
500
  address dipTokenAddress = tokenRegistry.getDipTokenAddress();
479
501
 
480
- initializeComponent(
502
+ // wiring to external contracts
503
+ StakingStorage storage $ = _getStakingStorage();
504
+ $._protocolNftId = registry.getProtocolNftId();
505
+ $._store = StakingStore(stakingStoreAddress);
506
+ $._reader = StakingStore(stakingStoreAddress).getStakingReader();
507
+ $._tokenRegistry = TokenRegistry(tokenRegistryAddress);
508
+
509
+ _initializeComponent(
481
510
  authority,
482
511
  registryAddress,
483
- registry.getNftId(),
512
+ registry.getNftId(), // parent nft id
484
513
  CONTRACT_NAME,
485
514
  dipTokenAddress,
486
515
  STAKING(),
@@ -489,16 +518,7 @@ contract Staking is
489
518
  "", // registry data
490
519
  ""); // component data
491
520
 
492
- _createAndSetTokenHandler();
493
-
494
- // wiring to external contracts
495
- StakingStorage storage $ = _getStakingStorage();
496
- $._protocolNftId = getRegistry().getProtocolNftId();
497
- $._store = StakingStore(stakingStoreAddress);
498
- $._reader = StakingStore(stakingStoreAddress).getStakingReader();
499
- $._tokenRegistry = TokenRegistry(tokenRegistryAddress);
500
-
501
- registerInterface(type(IStaking).interfaceId);
521
+ _registerInterface(type(IStaking).interfaceId);
502
522
  }
503
523
 
504
524
 
@@ -18,9 +18,9 @@ contract StakingManager is
18
18
  address registry,
19
19
  address tokenRegistry,
20
20
  address stakingStore,
21
- address initialOwner
21
+ address initialOwner,
22
+ bytes32 salt
22
23
  )
23
- ProxyManager(registry)
24
24
  {
25
25
  Staking stakingImplementation = new Staking();
26
26
 
@@ -30,10 +30,12 @@ contract StakingManager is
30
30
  tokenRegistry,
31
31
  stakingStore,
32
32
  initialOwner);
33
-
34
- IVersionable versionable = deploy(
35
- _initialImplementation,
36
- _initializationData);
33
+
34
+ IVersionable versionable = initialize(
35
+ registry,
36
+ _initialImplementation,
37
+ _initializationData,
38
+ salt);
37
39
 
38
40
  _staking = Staking(address(versionable));
39
41
  }
@@ -1,13 +1,14 @@
1
1
  // SPDX-License-Identifier: Apache-2.0
2
2
  pragma solidity ^0.8.20;
3
3
 
4
+ import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
5
+
4
6
  import {IRegistry} from "../registry/IRegistry.sol";
5
7
  import {IRegistryLinked} from "../shared/IRegistryLinked.sol";
6
8
  import {IStaking} from "../staking/IStaking.sol";
7
9
 
8
10
  import {Amount} from "../type/Amount.sol";
9
11
  import {Blocknumber} from "../type/Blocknumber.sol";
10
- import {InitializableCustom} from "../shared/InitializableCustom.sol";
11
12
  import {NftId} from "../type/NftId.sol";
12
13
  import {STAKE, TARGET} from "../type/ObjectType.sol";
13
14
  import {StakingStore} from "./StakingStore.sol";
@@ -16,16 +17,18 @@ import {UFixed} from "../type/UFixed.sol";
16
17
 
17
18
  contract StakingReader is
18
19
  IRegistryLinked,
19
- InitializableCustom
20
+ Initializable
20
21
  {
21
22
 
22
- error ErrorStakingReaderDependenciesAlreadySet();
23
+ error ErrorStakingReaderUnauthorizedCaler();
23
24
 
25
+ address private _initializeOwner;
24
26
  IRegistry private _registry;
25
27
  IStaking private _staking;
26
28
  StakingStore private _store;
27
29
 
28
- constructor(IRegistry registry) InitializableCustom() {
30
+ constructor(IRegistry registry) {
31
+ _initializeOwner = msg.sender;
29
32
  _registry = registry;
30
33
  }
31
34
 
@@ -34,8 +37,12 @@ contract StakingReader is
34
37
  address stakingStoreAddress
35
38
  )
36
39
  external
37
- initializer
40
+ initializer()
38
41
  {
42
+ if (msg.sender != _initializeOwner) {
43
+ revert ErrorStakingReaderUnauthorizedCaler();
44
+ }
45
+
39
46
  _staking = IStaking(stakingAddress);
40
47
  _store = StakingStore(stakingStoreAddress);
41
48
  }
@@ -70,23 +77,8 @@ contract StakingReader is
70
77
  }
71
78
 
72
79
 
73
- function isActive(NftId targetNftId) external view returns (bool) {
74
- return _store.getTargetNftIdSet().isActive(targetNftId);
75
- }
76
-
77
-
78
- function activeTargets() external view returns (uint256) {
79
- return _store.getTargetNftIdSet().activeNftIds();
80
- }
81
-
82
-
83
- function getActiveTargetNftId(uint256 idx) external view returns (NftId) {
84
- return _store.getTargetNftIdSet().getActiveNftId(idx);
85
- }
86
-
87
-
88
80
  function getTargetNftId(NftId stakeNftId) public view returns (NftId targetNftId) {
89
- return _registry.getObjectInfo(stakeNftId).parentNftId;
81
+ return _registry.getParentNftId(stakeNftId);
90
82
  }
91
83
 
92
84