@etherisc/gif-next 0.0.2-de7c770-422 → 0.0.2-deb924b-641

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 (503) hide show
  1. package/README.md +28 -7
  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 -214
  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 +132 -128
  31. package/artifacts/contracts/distribution/DistributionService.sol/DistributionService.dbg.json +1 -1
  32. package/artifacts/contracts/distribution/DistributionService.sol/DistributionService.json +280 -171
  33. package/artifacts/contracts/distribution/DistributionServiceManager.sol/DistributionServiceManager.dbg.json +1 -1
  34. package/artifacts/contracts/distribution/DistributionServiceManager.sol/DistributionServiceManager.json +146 -69
  35. package/artifacts/contracts/distribution/IDistributionComponent.sol/IDistributionComponent.dbg.json +1 -1
  36. package/artifacts/contracts/distribution/IDistributionComponent.sol/IDistributionComponent.json +119 -110
  37. package/artifacts/contracts/distribution/IDistributionService.sol/IDistributionService.dbg.json +1 -1
  38. package/artifacts/contracts/distribution/IDistributionService.sol/IDistributionService.json +148 -72
  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 +1 -1
  52. package/artifacts/contracts/examples/unpermissioned/SimpleDistribution.sol/SimpleDistribution.json +234 -166
  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 +1 -1
  56. package/artifacts/contracts/examples/unpermissioned/SimpleOracle.sol/SimpleOracle.json +175 -151
  57. package/artifacts/contracts/examples/unpermissioned/SimplePool.sol/SimplePool.dbg.json +1 -1
  58. package/artifacts/contracts/examples/unpermissioned/SimplePool.sol/SimplePool.json +321 -183
  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 +1 -1
  62. package/artifacts/contracts/examples/unpermissioned/SimpleProduct.sol/SimpleProduct.json +778 -330
  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 +211 -82
  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 +781 -202
  79. package/artifacts/contracts/instance/InstanceService.sol/InstanceService.dbg.json +1 -1
  80. package/artifacts/contracts/instance/InstanceService.sol/InstanceService.json +134 -157
  81. package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.dbg.json +1 -1
  82. package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.json +110 -49
  83. package/artifacts/contracts/instance/InstanceStore.sol/InstanceStore.dbg.json +1 -1
  84. package/artifacts/contracts/instance/InstanceStore.sol/InstanceStore.json +473 -342
  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/oracle/BasicOracle.sol/BasicOracle.dbg.json +1 -1
  105. package/artifacts/contracts/oracle/BasicOracle.sol/BasicOracle.json +151 -171
  106. package/artifacts/contracts/oracle/BasicOracleAuthorization.sol/BasicOracleAuthorization.dbg.json +1 -1
  107. package/artifacts/contracts/oracle/BasicOracleAuthorization.sol/BasicOracleAuthorization.json +180 -29
  108. package/artifacts/contracts/oracle/IOracle.sol/IOracle.dbg.json +1 -1
  109. package/artifacts/contracts/oracle/IOracleComponent.sol/IOracleComponent.dbg.json +1 -1
  110. package/artifacts/contracts/oracle/IOracleComponent.sol/IOracleComponent.json +113 -104
  111. package/artifacts/contracts/oracle/IOracleService.sol/IOracleService.dbg.json +1 -1
  112. package/artifacts/contracts/oracle/IOracleService.sol/IOracleService.json +69 -11
  113. package/artifacts/contracts/oracle/Oracle.sol/Oracle.dbg.json +1 -1
  114. package/artifacts/contracts/oracle/Oracle.sol/Oracle.json +127 -123
  115. package/artifacts/contracts/oracle/OracleService.sol/OracleService.dbg.json +1 -1
  116. package/artifacts/contracts/oracle/OracleService.sol/OracleService.json +156 -81
  117. package/artifacts/contracts/oracle/OracleServiceManager.sol/OracleServiceManager.dbg.json +1 -1
  118. package/artifacts/contracts/oracle/OracleServiceManager.sol/OracleServiceManager.json +130 -45
  119. package/artifacts/contracts/pool/BasicPool.sol/BasicPool.dbg.json +1 -1
  120. package/artifacts/contracts/pool/BasicPool.sol/BasicPool.json +146 -142
  121. package/artifacts/contracts/pool/BasicPoolAuthorization.sol/BasicPoolAuthorization.dbg.json +1 -1
  122. package/artifacts/contracts/pool/BasicPoolAuthorization.sol/BasicPoolAuthorization.json +206 -27
  123. package/artifacts/contracts/pool/BundleService.sol/BundleService.dbg.json +1 -1
  124. package/artifacts/contracts/pool/BundleService.sol/BundleService.json +161 -262
  125. package/artifacts/contracts/pool/BundleServiceManager.sol/BundleServiceManager.dbg.json +1 -1
  126. package/artifacts/contracts/pool/BundleServiceManager.sol/BundleServiceManager.json +114 -85
  127. package/artifacts/contracts/pool/IBundleService.sol/IBundleService.dbg.json +1 -1
  128. package/artifacts/contracts/pool/IBundleService.sol/IBundleService.json +84 -111
  129. package/artifacts/contracts/pool/IPoolComponent.sol/IPoolComponent.dbg.json +1 -1
  130. package/artifacts/contracts/pool/IPoolComponent.sol/IPoolComponent.json +133 -135
  131. package/artifacts/contracts/pool/IPoolService.sol/IPoolService.dbg.json +1 -1
  132. package/artifacts/contracts/pool/IPoolService.sol/IPoolService.json +279 -247
  133. package/artifacts/contracts/pool/Pool.sol/Pool.dbg.json +1 -1
  134. package/artifacts/contracts/pool/Pool.sol/Pool.json +146 -153
  135. package/artifacts/contracts/pool/PoolLib.sol/PoolLib.dbg.json +4 -0
  136. package/artifacts/contracts/pool/PoolLib.sol/PoolLib.json +456 -0
  137. package/artifacts/contracts/pool/PoolService.sol/PoolService.dbg.json +1 -1
  138. package/artifacts/contracts/pool/PoolService.sol/PoolService.json +495 -390
  139. package/artifacts/contracts/pool/PoolServiceManager.sol/PoolServiceManager.dbg.json +1 -1
  140. package/artifacts/contracts/pool/PoolServiceManager.sol/PoolServiceManager.json +168 -55
  141. package/artifacts/contracts/product/ApplicationService.sol/ApplicationService.dbg.json +1 -1
  142. package/artifacts/contracts/product/ApplicationService.sol/ApplicationService.json +135 -54
  143. package/artifacts/contracts/product/ApplicationServiceManager.sol/ApplicationServiceManager.dbg.json +1 -1
  144. package/artifacts/contracts/product/ApplicationServiceManager.sol/ApplicationServiceManager.json +106 -45
  145. package/artifacts/contracts/product/BasicProduct.sol/BasicProduct.dbg.json +1 -1
  146. package/artifacts/contracts/product/BasicProduct.sol/BasicProduct.json +260 -195
  147. package/artifacts/contracts/product/BasicProductAuthorization.sol/BasicProductAuthorization.dbg.json +1 -1
  148. package/artifacts/contracts/product/BasicProductAuthorization.sol/BasicProductAuthorization.json +206 -27
  149. package/artifacts/contracts/product/ClaimService.sol/ClaimService.dbg.json +1 -1
  150. package/artifacts/contracts/product/ClaimService.sol/ClaimService.json +319 -148
  151. package/artifacts/contracts/product/ClaimServiceManager.sol/ClaimServiceManager.dbg.json +1 -1
  152. package/artifacts/contracts/product/ClaimServiceManager.sol/ClaimServiceManager.json +145 -72
  153. package/artifacts/contracts/product/IApplicationService.sol/IApplicationService.dbg.json +1 -1
  154. package/artifacts/contracts/product/IApplicationService.sol/IApplicationService.json +89 -9
  155. package/artifacts/contracts/product/IClaimService.sol/IClaimService.dbg.json +1 -1
  156. package/artifacts/contracts/product/IClaimService.sol/IClaimService.json +199 -21
  157. package/artifacts/contracts/product/IPolicyService.sol/IPolicyService.dbg.json +1 -1
  158. package/artifacts/contracts/product/IPolicyService.sol/IPolicyService.json +244 -48
  159. package/artifacts/contracts/product/IPricingService.sol/IPricingService.dbg.json +1 -1
  160. package/artifacts/contracts/product/IPricingService.sol/IPricingService.json +105 -52
  161. package/artifacts/contracts/product/IProductComponent.sol/IProductComponent.dbg.json +1 -1
  162. package/artifacts/contracts/product/IProductComponent.sol/IProductComponent.json +246 -176
  163. package/artifacts/contracts/product/IRiskService.sol/IRiskService.dbg.json +1 -1
  164. package/artifacts/contracts/product/IRiskService.sol/IRiskService.json +55 -2
  165. package/artifacts/contracts/product/PolicyService.sol/PolicyService.dbg.json +1 -1
  166. package/artifacts/contracts/product/PolicyService.sol/PolicyService.json +377 -148
  167. package/artifacts/contracts/product/PolicyServiceLib.sol/PolicyServiceLib.dbg.json +4 -0
  168. package/artifacts/contracts/product/PolicyServiceLib.sol/PolicyServiceLib.json +293 -0
  169. package/artifacts/contracts/product/PolicyServiceManager.sol/PolicyServiceManager.dbg.json +1 -1
  170. package/artifacts/contracts/product/PolicyServiceManager.sol/PolicyServiceManager.json +153 -60
  171. package/artifacts/contracts/product/PricingService.sol/PricingService.dbg.json +1 -1
  172. package/artifacts/contracts/product/PricingService.sol/PricingService.json +185 -115
  173. package/artifacts/contracts/product/PricingServiceManager.sol/PricingServiceManager.dbg.json +1 -1
  174. package/artifacts/contracts/product/PricingServiceManager.sol/PricingServiceManager.json +123 -54
  175. package/artifacts/contracts/product/Product.sol/Product.dbg.json +1 -1
  176. package/artifacts/contracts/product/Product.sol/Product.json +256 -191
  177. package/artifacts/contracts/product/RiskService.sol/RiskService.dbg.json +1 -1
  178. package/artifacts/contracts/product/RiskService.sol/RiskService.json +117 -63
  179. package/artifacts/contracts/product/RiskServiceManager.sol/RiskServiceManager.dbg.json +1 -1
  180. package/artifacts/contracts/product/RiskServiceManager.sol/RiskServiceManager.json +115 -42
  181. package/artifacts/contracts/registry/ChainNft.sol/ChainNft.dbg.json +1 -1
  182. package/artifacts/contracts/registry/ChainNft.sol/ChainNft.json +2 -2
  183. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.dbg.json +1 -1
  184. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.json +117 -17
  185. package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.dbg.json +1 -1
  186. package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.json +144 -41
  187. package/artifacts/contracts/registry/IRelease.sol/IRelease.dbg.json +4 -0
  188. package/artifacts/contracts/registry/IRelease.sol/IRelease.json +24 -0
  189. package/artifacts/contracts/registry/ITransferInterceptor.sol/ITransferInterceptor.dbg.json +1 -1
  190. package/artifacts/contracts/registry/ITransferInterceptor.sol/ITransferInterceptor.json +5 -18
  191. package/artifacts/contracts/registry/Registry.sol/Registry.dbg.json +1 -1
  192. package/artifacts/contracts/registry/Registry.sol/Registry.json +161 -53
  193. package/artifacts/contracts/registry/RegistryAdmin.sol/RegistryAdmin.dbg.json +1 -1
  194. package/artifacts/contracts/registry/RegistryAdmin.sol/RegistryAdmin.json +326 -259
  195. package/artifacts/contracts/registry/RegistryService.sol/RegistryService.dbg.json +1 -1
  196. package/artifacts/contracts/registry/RegistryService.sol/RegistryService.json +112 -183
  197. package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.dbg.json +1 -1
  198. package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.json +102 -37
  199. package/artifacts/contracts/registry/ReleaseAdmin.sol/ReleaseAdmin.dbg.json +4 -0
  200. package/artifacts/contracts/registry/ReleaseAdmin.sol/ReleaseAdmin.json +1849 -0
  201. package/artifacts/contracts/registry/ReleaseLifecycle.sol/ReleaseLifecycle.dbg.json +1 -1
  202. package/artifacts/contracts/registry/ReleaseLifecycle.sol/ReleaseLifecycle.json +47 -6
  203. package/artifacts/contracts/registry/ReleaseRegistry.sol/ReleaseRegistry.dbg.json +1 -1
  204. package/artifacts/contracts/registry/ReleaseRegistry.sol/ReleaseRegistry.json +414 -250
  205. package/artifacts/contracts/registry/ServiceAuthorizationV3.sol/ServiceAuthorizationV3.dbg.json +1 -1
  206. package/artifacts/contracts/registry/ServiceAuthorizationV3.sol/ServiceAuthorizationV3.json +66 -8
  207. package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.dbg.json +1 -1
  208. package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.json +4 -4
  209. package/artifacts/contracts/shared/Component.sol/Component.dbg.json +1 -1
  210. package/artifacts/contracts/shared/Component.sol/Component.json +105 -83
  211. package/artifacts/contracts/shared/ComponentService.sol/ComponentService.dbg.json +1 -1
  212. package/artifacts/contracts/shared/ComponentService.sol/ComponentService.json +498 -495
  213. package/artifacts/contracts/shared/ComponentServiceManager.sol/ComponentServiceManager.dbg.json +1 -1
  214. package/artifacts/contracts/shared/ComponentServiceManager.sol/ComponentServiceManager.json +144 -77
  215. package/artifacts/contracts/shared/ComponentVerifyingService.sol/ComponentVerifyingService.dbg.json +1 -1
  216. package/artifacts/contracts/shared/ComponentVerifyingService.sol/ComponentVerifyingService.json +60 -2
  217. package/artifacts/contracts/shared/ContractLib.sol/ContractLib.dbg.json +4 -0
  218. package/artifacts/contracts/shared/ContractLib.sol/ContractLib.json +541 -0
  219. package/artifacts/contracts/shared/ContractLib.sol/IInstanceAdminHelper.dbg.json +4 -0
  220. package/artifacts/contracts/shared/ContractLib.sol/IInstanceAdminHelper.json +24 -0
  221. package/artifacts/contracts/shared/ContractLib.sol/ITargetHelper.dbg.json +4 -0
  222. package/artifacts/contracts/shared/ContractLib.sol/ITargetHelper.json +30 -0
  223. package/artifacts/contracts/shared/ContractLib.sol/ITokenRegistryHelper.dbg.json +4 -0
  224. package/artifacts/contracts/shared/ContractLib.sol/ITokenRegistryHelper.json +40 -0
  225. package/artifacts/contracts/shared/IComponent.sol/IComponent.dbg.json +1 -1
  226. package/artifacts/contracts/shared/IComponent.sol/IComponent.json +92 -65
  227. package/artifacts/contracts/shared/IComponentService.sol/IComponentService.dbg.json +1 -1
  228. package/artifacts/contracts/shared/IComponentService.sol/IComponentService.json +446 -276
  229. package/artifacts/contracts/shared/IInstanceLinkedComponent.sol/IInstanceLinkedComponent.dbg.json +1 -1
  230. package/artifacts/contracts/shared/IInstanceLinkedComponent.sol/IInstanceLinkedComponent.json +113 -104
  231. package/artifacts/contracts/shared/IKeyValueStore.sol/IKeyValueStore.dbg.json +1 -1
  232. package/artifacts/contracts/shared/IKeyValueStore.sol/IKeyValueStore.json +36 -0
  233. package/artifacts/contracts/shared/ILifecycle.sol/ILifecycle.dbg.json +1 -1
  234. package/artifacts/contracts/shared/ILifecycle.sol/ILifecycle.json +36 -0
  235. package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.dbg.json +1 -1
  236. package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.json +16 -0
  237. package/artifacts/contracts/shared/IPolicyHolder.sol/IPolicyHolder.dbg.json +1 -1
  238. package/artifacts/contracts/shared/IPolicyHolder.sol/IPolicyHolder.json +16 -6
  239. package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.dbg.json +1 -1
  240. package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.json +148 -0
  241. package/artifacts/contracts/shared/IRegistryLinked.sol/IRegistryLinked.dbg.json +1 -1
  242. package/artifacts/contracts/shared/IService.sol/IService.dbg.json +1 -1
  243. package/artifacts/contracts/shared/IService.sol/IService.json +55 -2
  244. package/artifacts/contracts/shared/InitializableERC165.sol/InitializableERC165.dbg.json +1 -1
  245. package/artifacts/contracts/shared/InstanceLinkedComponent.sol/InstanceLinkedComponent.dbg.json +1 -1
  246. package/artifacts/contracts/shared/InstanceLinkedComponent.sol/InstanceLinkedComponent.json +126 -122
  247. package/artifacts/contracts/shared/KeyValueStore.sol/KeyValueStore.dbg.json +1 -1
  248. package/artifacts/contracts/shared/KeyValueStore.sol/KeyValueStore.json +42 -1
  249. package/artifacts/contracts/shared/Lifecycle.sol/Lifecycle.dbg.json +1 -1
  250. package/artifacts/contracts/shared/Lifecycle.sol/Lifecycle.json +42 -1
  251. package/artifacts/contracts/shared/NftIdSet.sol/NftIdSet.dbg.json +1 -1
  252. package/artifacts/contracts/shared/NftIdSet.sol/NftIdSet.json +2 -2
  253. package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.dbg.json +1 -1
  254. package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.json +18 -2
  255. package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.dbg.json +1 -1
  256. package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.json +18 -8
  257. package/artifacts/contracts/shared/Registerable.sol/Registerable.dbg.json +1 -1
  258. package/artifacts/contracts/shared/Registerable.sol/Registerable.json +152 -38
  259. package/artifacts/contracts/shared/RegistryLinked.sol/RegistryLinked.dbg.json +1 -1
  260. package/artifacts/contracts/shared/RegistryLinked.sol/RegistryLinked.json +2 -2
  261. package/artifacts/contracts/shared/Service.sol/Service.dbg.json +1 -1
  262. package/artifacts/contracts/shared/Service.sol/Service.json +60 -2
  263. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.dbg.json +1 -1
  264. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.json +327 -73
  265. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandlerBase.dbg.json +4 -0
  266. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandlerBase.json +484 -0
  267. package/artifacts/contracts/shared/TokenHandlerDeployerLib.sol/TokenHandlerDeployerLib.dbg.json +1 -1
  268. package/artifacts/contracts/shared/TokenHandlerDeployerLib.sol/TokenHandlerDeployerLib.json +88 -24
  269. package/artifacts/contracts/staking/IStaking.sol/IStaking.dbg.json +1 -1
  270. package/artifacts/contracts/staking/IStaking.sol/IStaking.json +113 -115
  271. package/artifacts/contracts/staking/IStakingService.sol/IStakingService.dbg.json +1 -1
  272. package/artifacts/contracts/staking/IStakingService.sol/IStakingService.json +119 -16
  273. package/artifacts/contracts/staking/StakeManagerLib.sol/StakeManagerLib.dbg.json +1 -1
  274. package/artifacts/contracts/staking/StakeManagerLib.sol/StakeManagerLib.json +49 -44
  275. package/artifacts/contracts/staking/Staking.sol/Staking.dbg.json +1 -1
  276. package/artifacts/contracts/staking/Staking.sol/Staking.json +203 -185
  277. package/artifacts/contracts/staking/StakingLifecycle.sol/StakingLifecycle.dbg.json +1 -1
  278. package/artifacts/contracts/staking/StakingLifecycle.sol/StakingLifecycle.json +46 -5
  279. package/artifacts/contracts/staking/StakingManager.sol/StakingManager.dbg.json +1 -1
  280. package/artifacts/contracts/staking/StakingManager.sol/StakingManager.json +131 -53
  281. package/artifacts/contracts/staking/StakingReader.sol/StakingReader.dbg.json +1 -1
  282. package/artifacts/contracts/staking/StakingReader.sol/StakingReader.json +7 -63
  283. package/artifacts/contracts/staking/StakingService.sol/StakingService.dbg.json +1 -1
  284. package/artifacts/contracts/staking/StakingService.sol/StakingService.json +175 -55
  285. package/artifacts/contracts/staking/StakingServiceManager.sol/StakingServiceManager.dbg.json +1 -1
  286. package/artifacts/contracts/staking/StakingServiceManager.sol/StakingServiceManager.json +111 -42
  287. package/artifacts/contracts/staking/StakingStore.sol/StakingStore.dbg.json +1 -1
  288. package/artifacts/contracts/staking/StakingStore.sol/StakingStore.json +171 -130
  289. package/artifacts/contracts/staking/TargetManagerLib.sol/TargetManagerLib.dbg.json +1 -1
  290. package/artifacts/contracts/staking/TargetManagerLib.sol/TargetManagerLib.json +23 -23
  291. package/artifacts/contracts/type/AddressSet.sol/LibAddressSet.dbg.json +1 -1
  292. package/artifacts/contracts/type/Amount.sol/AmountLib.dbg.json +1 -1
  293. package/artifacts/contracts/type/Amount.sol/AmountLib.json +33 -9
  294. package/artifacts/contracts/type/Blocknumber.sol/BlocknumberLib.dbg.json +1 -1
  295. package/artifacts/contracts/type/ClaimId.sol/ClaimIdLib.dbg.json +1 -1
  296. package/artifacts/contracts/type/ClaimId.sol/ClaimIdLib.json +28 -4
  297. package/artifacts/contracts/type/DistributorType.sol/DistributorTypeLib.dbg.json +1 -1
  298. package/artifacts/contracts/type/DistributorType.sol/DistributorTypeLib.json +2 -2
  299. package/artifacts/contracts/type/Fee.sol/FeeLib.dbg.json +1 -1
  300. package/artifacts/contracts/type/Fee.sol/FeeLib.json +3 -3
  301. package/artifacts/contracts/type/Key32.sol/Key32Lib.dbg.json +1 -1
  302. package/artifacts/contracts/type/Key32.sol/Key32Lib.json +2 -2
  303. package/artifacts/contracts/type/Key32Set.sol/LibKey32Set.dbg.json +4 -0
  304. package/artifacts/contracts/type/Key32Set.sol/LibKey32Set.json +33 -0
  305. package/artifacts/contracts/type/NftId.sol/NftIdLib.dbg.json +1 -1
  306. package/artifacts/contracts/type/NftId.sol/NftIdLib.json +23 -4
  307. package/artifacts/contracts/type/NftIdSet.sol/LibNftIdSet.dbg.json +1 -1
  308. package/artifacts/contracts/type/NftIdSet.sol/LibNftIdSet.json +2 -2
  309. package/artifacts/contracts/type/ObjectType.sol/ObjectTypeLib.dbg.json +1 -1
  310. package/artifacts/contracts/type/ObjectType.sol/ObjectTypeLib.json +2 -2
  311. package/artifacts/contracts/type/PayoutId.sol/PayoutIdLib.dbg.json +1 -1
  312. package/artifacts/contracts/type/PayoutId.sol/PayoutIdLib.json +19 -19
  313. package/artifacts/contracts/type/Referral.sol/ReferralLib.dbg.json +1 -1
  314. package/artifacts/contracts/type/Referral.sol/ReferralLib.json +2 -2
  315. package/artifacts/contracts/type/RequestId.sol/RequestIdLib.dbg.json +1 -1
  316. package/artifacts/contracts/type/RequestId.sol/RequestIdLib.json +2 -2
  317. package/artifacts/contracts/type/RiskId.sol/RiskIdLib.dbg.json +1 -1
  318. package/artifacts/contracts/type/RiskId.sol/RiskIdLib.json +118 -5
  319. package/artifacts/contracts/type/RoleId.sol/RoleIdLib.dbg.json +1 -1
  320. package/artifacts/contracts/type/RoleId.sol/RoleIdLib.json +79 -15
  321. package/artifacts/contracts/type/Seconds.sol/SecondsLib.dbg.json +1 -1
  322. package/artifacts/contracts/type/Selector.sol/SelectorLib.dbg.json +1 -1
  323. package/artifacts/contracts/type/Selector.sol/SelectorLib.json +21 -2
  324. package/artifacts/contracts/type/Selector.sol/SelectorSetLib.dbg.json +1 -1
  325. package/artifacts/contracts/type/Selector.sol/SelectorSetLib.json +2 -2
  326. package/artifacts/contracts/type/StateId.sol/StateIdLib.dbg.json +1 -1
  327. package/artifacts/contracts/type/StateId.sol/StateIdLib.json +15 -2
  328. package/artifacts/contracts/type/String.sol/StrLib.dbg.json +1 -1
  329. package/artifacts/contracts/type/Timestamp.sol/TimestampLib.dbg.json +1 -1
  330. package/artifacts/contracts/type/Timestamp.sol/TimestampLib.json +2 -2
  331. package/artifacts/contracts/type/UFixed.sol/UFixedLib.dbg.json +1 -1
  332. package/artifacts/contracts/type/UFixed.sol/UFixedLib.json +16 -3
  333. package/artifacts/contracts/type/Version.sol/VersionLib.dbg.json +1 -1
  334. package/artifacts/contracts/type/Version.sol/VersionLib.json +2 -21
  335. package/artifacts/contracts/type/Version.sol/VersionPartLib.dbg.json +1 -1
  336. package/artifacts/contracts/type/Version.sol/VersionPartLib.json +47 -2
  337. package/artifacts/contracts/upgradeability/IVersionable.sol/IVersionable.dbg.json +1 -1
  338. package/artifacts/contracts/upgradeability/ProxyManager.sol/ProxyManager.dbg.json +1 -1
  339. package/artifacts/contracts/upgradeability/ProxyManager.sol/ProxyManager.json +79 -27
  340. package/artifacts/contracts/upgradeability/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.dbg.json +1 -1
  341. package/artifacts/contracts/upgradeability/Versionable.sol/Versionable.dbg.json +1 -1
  342. package/contracts/accounting/AccountingService.sol +262 -0
  343. package/contracts/accounting/AccountingServiceManager.sol +38 -0
  344. package/contracts/accounting/IAccountingService.sol +45 -0
  345. package/contracts/authorization/AccessAdmin.sol +231 -131
  346. package/contracts/authorization/AccessManagerCloneable.sol +136 -3
  347. package/contracts/authorization/Authorization.sol +321 -201
  348. package/contracts/authorization/IAccess.sol +1 -0
  349. package/contracts/authorization/IAccessAdmin.sol +17 -10
  350. package/contracts/authorization/IAuthorization.sol +27 -7
  351. package/contracts/authorization/IServiceAuthorization.sol +3 -1
  352. package/contracts/authorization/ServiceAuthorization.sol +26 -10
  353. package/contracts/distribution/BasicDistribution.sol +15 -12
  354. package/contracts/distribution/BasicDistributionAuthorization.sol +22 -9
  355. package/contracts/distribution/Distribution.sol +41 -47
  356. package/contracts/distribution/DistributionService.sol +104 -82
  357. package/contracts/distribution/DistributionServiceManager.sol +6 -6
  358. package/contracts/distribution/IDistributionComponent.sol +1 -1
  359. package/contracts/distribution/IDistributionService.sol +19 -19
  360. package/contracts/examples/fire/DamageLevel.sol +59 -0
  361. package/contracts/examples/fire/FirePool.sol +90 -0
  362. package/contracts/examples/fire/FirePoolAuthorization.sol +35 -0
  363. package/contracts/examples/fire/FireProduct.sol +438 -0
  364. package/contracts/examples/fire/FireProductAuthorization.sol +45 -0
  365. package/contracts/examples/fire/FireUSD.sol +26 -0
  366. package/contracts/examples/unpermissioned/SimpleDistribution.sol +11 -4
  367. package/contracts/examples/unpermissioned/SimpleDistributionAuthorization.sol +28 -0
  368. package/contracts/examples/unpermissioned/SimpleOracle.sol +4 -4
  369. package/contracts/examples/unpermissioned/SimplePool.sol +37 -7
  370. package/contracts/examples/unpermissioned/SimplePoolAuthorization.sol +28 -0
  371. package/contracts/examples/unpermissioned/SimpleProduct.sol +49 -23
  372. package/contracts/examples/unpermissioned/SimpleProductAuthorization.sol +28 -0
  373. package/contracts/instance/BundleSet.sol +42 -38
  374. package/contracts/instance/IInstance.sol +17 -10
  375. package/contracts/instance/IInstanceService.sol +9 -29
  376. package/contracts/instance/Instance.sol +52 -34
  377. package/contracts/instance/InstanceAdmin.sol +254 -102
  378. package/contracts/instance/InstanceAuthorizationV3.sol +54 -45
  379. package/contracts/instance/InstanceReader.sol +246 -39
  380. package/contracts/instance/InstanceService.sol +86 -149
  381. package/contracts/instance/InstanceServiceManager.sol +6 -7
  382. package/contracts/instance/InstanceStore.sol +13 -2
  383. package/contracts/instance/RiskSet.sol +118 -0
  384. package/contracts/instance/base/ObjectCounter.sol +1 -2
  385. package/contracts/instance/base/ObjectLifecycle.sol +4 -2
  386. package/contracts/instance/base/ObjectSet.sol +31 -33
  387. package/contracts/instance/base/ObjectSetHelperLib.sol +30 -0
  388. package/contracts/instance/module/IComponents.sol +13 -8
  389. package/contracts/instance/module/IDistribution.sol +2 -1
  390. package/contracts/instance/module/IPolicy.sol +4 -3
  391. package/contracts/instance/module/IRisk.sol +3 -0
  392. package/contracts/oracle/BasicOracle.sol +0 -1
  393. package/contracts/oracle/BasicOracleAuthorization.sol +3 -12
  394. package/contracts/oracle/IOracleService.sol +2 -1
  395. package/contracts/oracle/Oracle.sol +5 -16
  396. package/contracts/oracle/OracleService.sol +111 -80
  397. package/contracts/oracle/OracleServiceManager.sol +6 -6
  398. package/contracts/pool/BasicPool.sol +33 -24
  399. package/contracts/pool/BasicPoolAuthorization.sol +27 -9
  400. package/contracts/pool/BundleService.sol +91 -134
  401. package/contracts/pool/BundleServiceManager.sol +6 -6
  402. package/contracts/pool/IBundleService.sol +15 -34
  403. package/contracts/pool/IPoolComponent.sol +19 -15
  404. package/contracts/pool/IPoolService.sol +70 -65
  405. package/contracts/pool/Pool.sol +136 -117
  406. package/contracts/pool/PoolLib.sol +216 -0
  407. package/contracts/pool/PoolService.sol +484 -236
  408. package/contracts/pool/PoolServiceManager.sol +4 -4
  409. package/contracts/product/ApplicationService.sol +32 -21
  410. package/contracts/product/ApplicationServiceManager.sol +4 -4
  411. package/contracts/product/BasicProduct.sol +10 -12
  412. package/contracts/product/BasicProductAuthorization.sol +24 -11
  413. package/contracts/product/ClaimService.sol +300 -155
  414. package/contracts/product/ClaimServiceManager.sol +4 -4
  415. package/contracts/product/IApplicationService.sol +5 -2
  416. package/contracts/product/IClaimService.sol +17 -4
  417. package/contracts/product/IPolicyService.sol +33 -11
  418. package/contracts/product/IPricingService.sol +9 -9
  419. package/contracts/product/IProductComponent.sol +27 -4
  420. package/contracts/product/PolicyService.sol +343 -234
  421. package/contracts/product/PolicyServiceLib.sol +65 -0
  422. package/contracts/product/PolicyServiceManager.sol +4 -4
  423. package/contracts/product/PricingService.sol +31 -28
  424. package/contracts/product/PricingServiceManager.sol +4 -4
  425. package/contracts/product/Product.sol +125 -72
  426. package/contracts/product/RiskService.sol +75 -27
  427. package/contracts/product/RiskServiceManager.sol +4 -4
  428. package/contracts/registry/ChainNft.sol +10 -11
  429. package/contracts/registry/IRegistry.sol +16 -18
  430. package/contracts/registry/IRegistryService.sol +5 -12
  431. package/contracts/registry/IRelease.sol +26 -0
  432. package/contracts/registry/ITransferInterceptor.sol +1 -2
  433. package/contracts/registry/Registry.sol +36 -8
  434. package/contracts/registry/RegistryAdmin.sol +132 -242
  435. package/contracts/registry/RegistryService.sol +36 -47
  436. package/contracts/registry/RegistryServiceManager.sol +3 -3
  437. package/contracts/registry/ReleaseAdmin.sol +245 -0
  438. package/contracts/registry/ReleaseLifecycle.sol +8 -3
  439. package/contracts/registry/ReleaseRegistry.sol +257 -237
  440. package/contracts/registry/ServiceAuthorizationV3.sol +98 -50
  441. package/contracts/registry/TokenRegistry.sol +6 -8
  442. package/contracts/shared/Component.sol +69 -110
  443. package/contracts/shared/ComponentService.sol +424 -373
  444. package/contracts/shared/ComponentServiceManager.sol +8 -5
  445. package/contracts/shared/ComponentVerifyingService.sol +27 -16
  446. package/contracts/shared/ContractLib.sol +253 -0
  447. package/contracts/shared/IComponent.sol +8 -17
  448. package/contracts/shared/IComponentService.sol +41 -37
  449. package/contracts/shared/IInstanceLinkedComponent.sol +3 -22
  450. package/contracts/shared/ILifecycle.sol +3 -1
  451. package/contracts/shared/INftOwnable.sol +2 -0
  452. package/contracts/shared/IPolicyHolder.sol +12 -13
  453. package/contracts/shared/IRegisterable.sol +23 -1
  454. package/contracts/shared/IService.sol +3 -5
  455. package/contracts/shared/InstanceLinkedComponent.sol +69 -44
  456. package/contracts/shared/KeyValueStore.sol +1 -1
  457. package/contracts/shared/Lifecycle.sol +15 -4
  458. package/contracts/shared/NftOwnable.sol +26 -6
  459. package/contracts/shared/PolicyHolder.sol +12 -6
  460. package/contracts/shared/Registerable.sol +53 -19
  461. package/contracts/shared/RegistryLinked.sol +7 -13
  462. package/contracts/shared/Service.sol +13 -30
  463. package/contracts/shared/TokenHandler.sol +274 -72
  464. package/contracts/shared/TokenHandlerDeployerLib.sol +10 -2
  465. package/contracts/staking/IStaking.sol +6 -10
  466. package/contracts/staking/IStakingService.sol +11 -4
  467. package/contracts/staking/StakeManagerLib.sol +67 -16
  468. package/contracts/staking/Staking.sol +74 -42
  469. package/contracts/staking/StakingManager.sol +8 -6
  470. package/contracts/staking/StakingReader.sol +13 -21
  471. package/contracts/staking/StakingService.sol +66 -24
  472. package/contracts/staking/StakingServiceManager.sol +6 -5
  473. package/contracts/type/Amount.sol +15 -0
  474. package/contracts/type/ClaimId.sol +6 -1
  475. package/contracts/type/Key32.sol +2 -2
  476. package/contracts/type/Key32Set.sol +62 -0
  477. package/contracts/type/NftId.sol +7 -0
  478. package/contracts/type/ObjectType.sol +49 -21
  479. package/contracts/type/PayoutId.sol +10 -10
  480. package/contracts/type/RiskId.sol +35 -4
  481. package/contracts/type/RoleId.sol +23 -15
  482. package/contracts/type/Selector.sol +5 -0
  483. package/contracts/type/StateId.sol +14 -1
  484. package/contracts/type/Timestamp.sol +0 -5
  485. package/contracts/type/UFixed.sol +13 -119
  486. package/contracts/type/Version.sol +15 -5
  487. package/contracts/upgradeability/ProxyManager.sol +68 -34
  488. package/contracts/upgradeability/Versionable.sol +2 -2
  489. package/package.json +4 -3
  490. package/artifacts/contracts/authorization/IModuleAuthorization.sol/IModuleAuthorization.dbg.json +0 -4
  491. package/artifacts/contracts/authorization/IModuleAuthorization.sol/IModuleAuthorization.json +0 -290
  492. package/artifacts/contracts/authorization/ModuleAuthorization.sol/ModuleAuthorization.dbg.json +0 -4
  493. package/artifacts/contracts/authorization/ModuleAuthorization.sol/ModuleAuthorization.json +0 -390
  494. package/artifacts/contracts/instance/module/IAccess.sol/IAccess.dbg.json +0 -4
  495. package/artifacts/contracts/instance/module/IAccess.sol/IAccess.json +0 -129
  496. package/artifacts/contracts/shared/InitializableCustom.sol/InitializableCustom.dbg.json +0 -4
  497. package/artifacts/contracts/shared/InitializableCustom.sol/InitializableCustom.json +0 -39
  498. package/artifacts/contracts/type/UFixed.sol/MathLib.dbg.json +0 -4
  499. package/artifacts/contracts/type/UFixed.sol/MathLib.json +0 -16
  500. package/contracts/authorization/IModuleAuthorization.sol +0 -21
  501. package/contracts/authorization/ModuleAuthorization.sol +0 -78
  502. package/contracts/instance/module/IAccess.sol +0 -46
  503. package/contracts/shared/InitializableCustom.sol +0 -177
@@ -1,8 +1,8 @@
1
1
  // SPDX-License-Identifier: Apache-2.0
2
2
  pragma solidity ^0.8.20;
3
3
 
4
- import {AccessManagedUpgradeable} from "@openzeppelin/contracts-upgradeable/access/manager/AccessManagedUpgradeable.sol";
5
4
  import {IAccessManaged} from "@openzeppelin/contracts/access/manager/IAccessManaged.sol";
5
+ import {ReentrancyGuardUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/ReentrancyGuardUpgradeable.sol";
6
6
 
7
7
  import {IRegistry} from "../registry/IRegistry.sol";
8
8
  import {IService} from "./IService.sol";
@@ -18,23 +18,23 @@ import {Versionable} from "../upgradeability/Versionable.sol";
18
18
  abstract contract Service is
19
19
  Registerable,
20
20
  Versionable,
21
- AccessManagedUpgradeable,
21
+ ReentrancyGuardUpgradeable,
22
22
  IService
23
23
  {
24
24
 
25
- uint8 private constant GIF_MAJOR_VERSION = 3;
26
-
27
-
28
- function _initializeService(
29
- address registry,
25
+ function __Service_init(
30
26
  address authority, // real authority for registry service adress(0) for other services
27
+ address registry,
31
28
  address initialOwner
32
29
  )
33
30
  internal
34
31
  virtual
35
32
  onlyInitializing()
36
33
  {
37
- _initializeRegisterable(
34
+ __ReentrancyGuard_init();
35
+
36
+ __Registerable_init(
37
+ authority,
38
38
  registry,
39
39
  IRegistry(registry).getNftId(),
40
40
  SERVICE(),
@@ -42,17 +42,6 @@ abstract contract Service is
42
42
  initialOwner,
43
43
  ""); // data
44
44
 
45
- // externally provided authority
46
- if(authority != address(0)) {
47
- __AccessManaged_init(authority);
48
- } else {
49
- address registryServiceAddress = _getServiceAddress(REGISTRY());
50
-
51
- // copy authority from already registered registry services
52
- __AccessManaged_init(IAccessManaged(registryServiceAddress).authority());
53
- }
54
-
55
- _registerInterface(type(IAccessManaged).interfaceId);
56
45
  _registerInterface(type(IService).interfaceId);
57
46
  }
58
47
 
@@ -60,23 +49,17 @@ abstract contract Service is
60
49
  return _getDomain();
61
50
  }
62
51
 
63
- function getRoleId() external virtual pure returns(RoleId serviceRoleId) {
64
- return RoleIdLib.roleForTypeAndVersion(_getDomain(), VersionPartLib.toVersionPart(GIF_MAJOR_VERSION));
52
+ function getVersion() public pure virtual override (IVersionable, Versionable) returns(Version) {
53
+ return VersionLib.toVersion(3, 0, 0);
65
54
  }
66
55
 
67
- // from Versionable
68
- function getVersion()
69
- public
70
- pure
71
- virtual override (IVersionable, Versionable)
72
- returns(Version)
73
- {
74
- return VersionLib.toVersion(GIF_MAJOR_VERSION,0,0);
56
+ function getRoleId() external virtual view returns(RoleId serviceRoleId) {
57
+ return RoleIdLib.roleForTypeAndVersion(_getDomain(), getRelease());
75
58
  }
76
59
 
77
60
  function _getDomain() internal virtual pure returns (ObjectType);
78
61
 
79
62
  function _getServiceAddress(ObjectType domain) internal view returns (address) {
80
- return getRegistry().getServiceAddress(domain, VersionPartLib.toVersionPart(GIF_MAJOR_VERSION));
63
+ return getRegistry().getServiceAddress(domain, getRelease());
81
64
  }
82
65
  }
@@ -5,91 +5,191 @@ import {AccessManaged} from "@openzeppelin/contracts/access/manager/AccessManage
5
5
  import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
6
6
  import {SafeERC20} from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
7
7
 
8
- import {Amount} from "../type/Amount.sol";
8
+ import {Amount, AmountLib} from "../type/Amount.sol";
9
+ import {ContractLib} from "../shared/ContractLib.sol";
10
+ import {IRegistry} from "../registry/IRegistry.sol";
11
+ import {NftId} from "../type/NftId.sol";
12
+ import {SERVICE} from "../type/ObjectType.sol";
9
13
 
10
- /// @dev token specific transfer helper
11
- /// a default token contract is provided via contract constructor
12
- /// relies internally on oz SafeERC20.safeTransferFrom
13
- contract TokenHandler is AccessManaged {
14
- error ErrorTokenHandlerAmountIsZero();
14
+
15
+ /// @dev Token specific transfer helper base contract.
16
+ /// A default token contract is provided via contract constructor.
17
+ /// Relies internally on OpenZeppelin SafeERC20.safeTransferFrom.
18
+ /// This base contract simplifies writing tests.
19
+ contract TokenHandlerBase {
20
+
21
+ // _setWallet
22
+ event LogTokenHandlerWalletAddressChanged(NftId componentNftId, address oldWallet, address newWallet);
23
+ event LogTokenHandlerWalletTokensTransferred(NftId componentNftId, address oldWallet, address newWallet, Amount amount);
24
+
25
+ // _approveTokenHandler
26
+ event LogTokenHandlerTokenApproved(NftId nftId, address tokenHandler, address token, Amount amount, bool isMaxAmount);
27
+
28
+ // _transfer
29
+ event LogTokenHandlerTokenTransfer(address token, address from, address to, Amount amount);
30
+
31
+ // constructor
32
+ error ErrorTokenHandlerNotRegistry(address registry);
33
+ error ErrorTokenHandlerComponentNotRegistered(address component);
34
+ error ErrorTokenHandlerTokenAddressZero();
35
+
36
+ // _setWallet
37
+ error ErrorTokenHandlerNewWalletAddressZero();
38
+ error ErrorTokenHandlerAddressIsSameAsCurrent();
39
+
40
+ // _approveTokenHandler
41
+ error ErrorTokenHandlerNotWallet(NftId nftId, address tokenHandler, address wallet);
42
+
43
+ // _checkPreconditions
15
44
  error ErrorTokenHandlerBalanceTooLow(address token, address from, uint256 balance, uint256 expectedBalance);
16
45
  error ErrorTokenHandlerAllowanceTooSmall(address token, address from, address spender, uint256 allowance, uint256 expectedAllowance);
17
- error ErrorTokenHandlerRecipientWalletsMustBeDistinct(address to, address to2, address to3);
18
-
19
- event LogTokenHandlerTokenTransfer(address token, address from, address to, uint256 amountTransferred);
46
+ error ErrorTokenHandlerAmountIsZero();
20
47
 
21
- IERC20Metadata private _token;
48
+ IRegistry public immutable REGISTRY;
49
+ IERC20Metadata public immutable TOKEN;
50
+ address public immutable COMPONENT;
51
+ NftId public immutable NFT_ID;
22
52
 
23
- constructor(address token, address initialAuthority) AccessManaged(initialAuthority) {
24
- _token = IERC20Metadata(token);
25
- }
53
+ address internal _wallet;
26
54
 
27
- /// @dev returns the default token defined for this TokenHandler
28
- function getToken()
29
- external
30
- view
31
- returns (IERC20Metadata)
32
- {
33
- return _token;
34
- }
35
-
36
- /// @dev collect tokens from outside of the gif and transfer them to one wallet within the scope of gif.
37
- /// This method also checks balance and allowance and makes sure the amount is greater than zero.
38
- function collectTokens(
39
- address from,
40
- address to,
41
- Amount amount
55
+ constructor(
56
+ address registry,
57
+ address component,
58
+ address token
42
59
  )
43
- external
44
- restricted()
45
60
  {
46
- _transfer(from, to, amount, true);
61
+ if (!ContractLib.isRegistry(registry)) {
62
+ revert ErrorTokenHandlerNotRegistry(registry);
63
+ }
64
+
65
+ if (token == address(0)) {
66
+ revert ErrorTokenHandlerTokenAddressZero();
67
+ }
68
+
69
+ REGISTRY = IRegistry(registry);
70
+ COMPONENT = component;
71
+ NFT_ID = REGISTRY.getNftIdForAddress(component);
72
+
73
+ if (NFT_ID.eqz()) {
74
+ revert ErrorTokenHandlerComponentNotRegistered(component);
75
+ }
76
+
77
+ TOKEN = IERC20Metadata(token);
78
+
79
+ // self approval of token handler to max amount
80
+ _approve(TOKEN, AmountLib.max());
47
81
  }
48
82
 
49
- /// @dev collect tokens from outside of the gif and transfer them to three distinct wallets within the scope of gif
50
- /// This method also checks balance and allowance and makes sure the amount is greater than zero.
51
- function collectTokensToThreeRecipients(
83
+
84
+ /// @dev Checks the balance and allowance for the from address and amount.
85
+ /// When requiring amount > 0 set checkAmount to true.
86
+ function checkBalanceAndAllowance(
52
87
  address from,
53
- address to,
54
88
  Amount amount,
55
- address to2,
56
- Amount amount2,
57
- address to3,
58
- Amount amount3
89
+ bool checkAmount
59
90
  )
60
91
  external
61
- restricted()
92
+ view
62
93
  {
63
- if (to == to2 || to == to3 || to2 == to3) {
64
- revert ErrorTokenHandlerRecipientWalletsMustBeDistinct(to, to2, to3);
94
+ _checkBalanceAndAllowance(from, amount, checkAmount);
95
+ }
96
+
97
+
98
+ /// @dev Returns the wallet linked to this TokenHandler.
99
+ function getWallet()
100
+ public
101
+ view
102
+ returns (address wallet)
103
+ {
104
+ if (_wallet == address(0)) {
105
+ return address(this);
65
106
  }
66
107
 
67
- _checkPreconditions(from, amount + amount2 + amount3);
108
+ return _wallet;
109
+ }
110
+
68
111
 
69
- if (amount.gtz()) {
70
- _transfer(from, to, amount, false);
112
+ /// @dev Approves token handler to spend up to the specified amount of tokens.
113
+ /// Sets spending limit to type(uint256).max for AmountLib.max().
114
+ /// Reverts if wallet is not token handler itself.
115
+ /// Sets approvel using SareERC20.forceApprove internally.
116
+ function _approve(
117
+ IERC20Metadata token,
118
+ Amount amount
119
+ )
120
+ internal
121
+ {
122
+ // check that wallet is token handler contract itself
123
+ if(_wallet != address(0)) {
124
+ revert ErrorTokenHandlerNotWallet(NFT_ID, address(this), _wallet);
71
125
  }
72
- if (amount2.gtz()) {
73
- _transfer(from, to2, amount2, false);
126
+
127
+ // update spending limit for AmountLib.max() to type(uint256).max
128
+ uint256 amountInt = amount.toInt();
129
+ bool isMaxAmount = false;
130
+ if (amount == AmountLib.max()) {
131
+ amountInt = type(uint256).max;
132
+ isMaxAmount = true;
74
133
  }
75
- if (amount3.gtz()) {
76
- _transfer(from, to3, amount3, false);
134
+
135
+ emit LogTokenHandlerTokenApproved(NFT_ID, address(this), address(token), amount, isMaxAmount);
136
+
137
+ // execute approval
138
+ SafeERC20.forceApprove(
139
+ token,
140
+ address(this),
141
+ amountInt);
142
+ }
143
+
144
+
145
+ function _setWallet(address newWallet)
146
+ internal
147
+ {
148
+ address oldWallet = _wallet;
149
+ if (newWallet == oldWallet) {
150
+ revert ErrorTokenHandlerAddressIsSameAsCurrent();
151
+ }
152
+
153
+ // effects
154
+ address oldWalletForBalance = getWallet();
155
+ _wallet = newWallet;
156
+
157
+ emit LogTokenHandlerWalletAddressChanged(NFT_ID, oldWallet, newWallet);
158
+
159
+ // interactions
160
+ Amount balanceAmount = AmountLib.toAmount(
161
+ TOKEN.balanceOf(oldWalletForBalance));
162
+
163
+ if (balanceAmount.gtz()) {
164
+ // move tokens from old to new wallet
165
+ emit LogTokenHandlerWalletTokensTransferred(NFT_ID, oldWallet, newWallet, balanceAmount);
166
+
167
+ if (oldWallet == address(0)) {
168
+ // transfer from the component requires an allowance
169
+ _transfer(address(this), newWallet, balanceAmount, true);
170
+ } else if (newWallet == address(0)) {
171
+ _transfer(oldWallet, address(this), balanceAmount, true);
172
+ } else {
173
+ _transfer(oldWallet, newWallet, balanceAmount, true);
174
+ }
77
175
  }
78
176
  }
79
177
 
80
- /// @dev distribute tokens from a wallet within the scope of gif to an external address.
81
- /// This method also checks balance and allowance and makes sure the amount is greater than zero.
82
- function distributeTokens(
83
- address from,
84
- address to,
85
- Amount amount
86
- )
87
- external
88
- restricted()
178
+
179
+ function _pullToken(address from, Amount amount)
180
+ internal
89
181
  {
90
- _transfer(from, to, amount, true);
182
+ _transfer(from, getWallet(), amount, true);
91
183
  }
92
184
 
185
+
186
+ function _pushToken(address to, Amount amount)
187
+ internal
188
+ {
189
+ _transfer(getWallet(), to, amount, true);
190
+ }
191
+
192
+
93
193
  function _transfer(
94
194
  address from,
95
195
  address to,
@@ -99,41 +199,143 @@ contract TokenHandler is AccessManaged {
99
199
  internal
100
200
  {
101
201
  if (checkPreconditions) {
102
- // check amount > 0, balance >= amount and allowance >= amount
103
- _checkPreconditions(from, amount);
202
+ bool checkAmount = true;
203
+ _checkBalanceAndAllowance(from, amount, checkAmount);
104
204
  }
105
205
 
106
206
  // transfer the tokens
107
- emit LogTokenHandlerTokenTransfer(address(_token), from, to, amount.toInt());
207
+ emit LogTokenHandlerTokenTransfer(address(TOKEN), from, to, amount);
208
+
108
209
  SafeERC20.safeTransferFrom(
109
- _token,
210
+ TOKEN,
110
211
  from,
111
212
  to,
112
213
  amount.toInt());
113
214
  }
114
215
 
115
- function _checkPreconditions(
216
+
217
+ function _checkBalanceAndAllowance(
116
218
  address from,
117
- Amount amount
219
+ Amount amount,
220
+ bool checkAmount
118
221
  )
119
222
  internal
120
223
  view
121
224
  {
122
225
  // amount must be greater than zero
123
- if (amount.eqz()) {
226
+ if (checkAmount && amount.eqz()) {
124
227
  revert ErrorTokenHandlerAmountIsZero();
125
228
  }
126
229
 
230
+ // allowance must be >= amount
231
+ uint256 allowance = TOKEN.allowance(from, address(this));
232
+ if (allowance < amount.toInt()) {
233
+ revert ErrorTokenHandlerAllowanceTooSmall(address(TOKEN), from, address(this), allowance, amount.toInt());
234
+ }
235
+
127
236
  // balance must be >= amount
128
- uint256 balance = _token.balanceOf(from);
237
+ uint256 balance = TOKEN.balanceOf(from);
129
238
  if (balance < amount.toInt()) {
130
- revert ErrorTokenHandlerBalanceTooLow(address(_token), from, balance, amount.toInt());
239
+ revert ErrorTokenHandlerBalanceTooLow(address(TOKEN), from, balance, amount.toInt());
131
240
  }
241
+ }
242
+ }
132
243
 
133
- // allowance must be >= amount
134
- uint256 allowance = _token.allowance(from, address(this));
135
- if (allowance < amount.toInt()) {
136
- revert ErrorTokenHandlerAllowanceTooSmall(address(_token), from, address(this), allowance, amount.toInt());
244
+
245
+ /// @dev Token specific transfer helper.
246
+ /// Contract is derived from TokenHandlerBase and adds
247
+ /// authorization based on OpenZeppelin AccessManaged.
248
+ contract TokenHandler is
249
+ AccessManaged,
250
+ TokenHandlerBase
251
+ {
252
+
253
+ // onlyService
254
+ error ErrorTokenHandlerNotService(address service);
255
+
256
+ modifier onlyService() {
257
+ if (!REGISTRY.isObjectType(msg.sender, SERVICE())) {
258
+ revert ErrorTokenHandlerNotService(msg.sender);
137
259
  }
260
+ _;
261
+ }
262
+
263
+ constructor(
264
+ address registry,
265
+ address component,
266
+ address token,
267
+ address authority
268
+ )
269
+ TokenHandlerBase(registry, component, token)
270
+ AccessManaged(authority)
271
+ { }
272
+
273
+ /// @dev sets the wallet address for the component.
274
+ /// if the current wallet has tokens, these will be transferred.
275
+ /// if the new wallet address is externally owned, an approval from the
276
+ /// owner of the external wallet to the tokenhandler of the component that
277
+ /// covers the current component balance must exist
278
+ function setWallet(address newWallet)
279
+ external
280
+ restricted()
281
+ onlyService()
282
+ {
283
+ _setWallet(newWallet);
284
+ }
285
+
286
+
287
+ /// @dev Approves token handler to spend up to the specified amount of tokens.
288
+ /// Sets spending limit to type(uint256).max for AmountLib.max().
289
+ /// Reverts if component wallet is not component itself.
290
+ /// Sets approvel using SareERC20.forceApprove internally.
291
+ function approve(
292
+ IERC20Metadata token,
293
+ Amount amount
294
+ )
295
+ external
296
+ restricted()
297
+ onlyService()
298
+ {
299
+ _approve(token, amount);
300
+ }
301
+
302
+ /// @dev Collect tokens from outside of GIF and transfer them to the wallet.
303
+ /// This method also checks balance and allowance and makes sure the amount is greater than zero.
304
+ function pullToken(
305
+ address from,
306
+ Amount amount
307
+ )
308
+ external
309
+ restricted()
310
+ onlyService()
311
+ {
312
+ _pullToken(from, amount);
313
+ }
314
+
315
+
316
+ /// @dev Distribute tokens from a wallet within the scope of gif to some address.
317
+ function pushToken(
318
+ address to,
319
+ Amount amount
320
+ )
321
+ external
322
+ restricted()
323
+ onlyService()
324
+ {
325
+ _pushToken(to, amount);
326
+ }
327
+
328
+
329
+ /// @dev Distribute fee tokens from a wallet within the scope of gif to some address.
330
+ /// Separate push function for component service.
331
+ function pushFeeToken(
332
+ address to,
333
+ Amount amount
334
+ )
335
+ external
336
+ restricted()
337
+ onlyService()
338
+ {
339
+ _pushToken(to, amount);
138
340
  }
139
341
  }
@@ -5,8 +5,16 @@ import {TokenHandler} from "./TokenHandler.sol";
5
5
 
6
6
  library TokenHandlerDeployerLib {
7
7
 
8
- function deployTokenHandler(address token, address authority) public returns (TokenHandler) {
9
- return new TokenHandler(address(token), authority);
8
+ function deployTokenHandler(
9
+ address registry,
10
+ address component,
11
+ address token,
12
+ address authority
13
+ )
14
+ public
15
+ returns (TokenHandler)
16
+ {
17
+ return new TokenHandler(registry, component, token, authority);
10
18
  }
11
19
 
12
20
  }
@@ -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
 
@@ -49,7 +52,6 @@ interface IStaking is
49
52
  error ErrorStakingTargetNotFound(NftId targetNftId);
50
53
  error ErrorStakingTargetTokenNotFound(NftId targetNftId, uint256 chainId, address token);
51
54
 
52
- error ErrorStakingTargetNotActive(NftId targetNftId);
53
55
  error ErrorStakingStakeAmountZero(NftId targetNftId);
54
56
 
55
57
  // info for individual stake
@@ -64,6 +66,8 @@ interface IStaking is
64
66
  UFixed rewardRate;
65
67
  }
66
68
 
69
+ function initializeTokenHandler() external;
70
+
67
71
  // staking rate management
68
72
 
69
73
  /// @dev sets the rate that converts 1 token of total value locked into the
@@ -127,7 +131,7 @@ interface IStaking is
127
131
  /// @dev restakes the dips to a new target.
128
132
  /// the sum of the staked dips and the accumulated rewards will be restaked.
129
133
  /// permissioned: only staking service may call this function.
130
- function restake(NftId stakeNftId, NftId newTargetNftId) external returns (NftId newStakeNftId);
134
+ function restake(NftId stakeNftId, NftId newStakeNftId) external returns (Amount newStakeBalance);
131
135
 
132
136
  /// @dev retuns the specified amount of dips to the holder of the specified stake nft.
133
137
  /// if dipAmount is set to Amount.max() all staked dips and all rewards are transferred to
@@ -153,14 +157,6 @@ interface IStaking is
153
157
  Amount rewardsClaimedAmount
154
158
  );
155
159
 
156
- //--- helper functions --------------------------------------------------//
157
-
158
- /// @dev transfers the specified amount of dips from the from address to the staking wallet.
159
- function collectDipAmount(address from, Amount dipAmount) external;
160
-
161
- /// @dev transfers the specified amount of dips from the staking wallet to the to addess.
162
- function transferDipAmount(address to, Amount dipAmount) external;
163
-
164
160
  //--- view and pure functions -------------------------------------------//
165
161
 
166
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,12 +26,13 @@ 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
 
@@ -51,6 +50,13 @@ interface IStakingService is IService
51
50
  // function setProtocolLockingPeriod(Seconds lockingPeriod) external;
52
51
  // TODO also make sure that protocol rewards can be refilled and withdrawn
53
52
 
53
+ /// @dev Approves the staking token handler.
54
+ /// Reverts if the staking token handler wallet is not the token handler itself.
55
+ function approveTokenHandler(
56
+ IERC20Metadata token,
57
+ Amount amount
58
+ ) external;
59
+
54
60
  /// @dev creates/registers an on-chain instance staking target.
55
61
  /// function granted to instance service
56
62
  function createInstanceTarget(
@@ -111,7 +117,8 @@ interface IStakingService is IService
111
117
  )
112
118
  external
113
119
  returns (
114
- NftId newStakeNftId
120
+ NftId newStakeNftId,
121
+ Amount newStakeBalance
115
122
  );
116
123
 
117
124