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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (453) hide show
  1. package/README.md +27 -6
  2. package/artifacts/contracts/accounting/AccountingService.sol/AccountingService.dbg.json +4 -0
  3. package/artifacts/contracts/accounting/AccountingService.sol/AccountingService.json +944 -0
  4. package/artifacts/contracts/accounting/AccountingServiceManager.sol/AccountingServiceManager.dbg.json +4 -0
  5. package/artifacts/contracts/accounting/AccountingServiceManager.sol/AccountingServiceManager.json +746 -0
  6. package/artifacts/contracts/accounting/IAccountingService.sol/IAccountingService.dbg.json +4 -0
  7. package/artifacts/contracts/accounting/IAccountingService.sol/IAccountingService.json +711 -0
  8. package/artifacts/contracts/authorization/AccessAdmin.sol/AccessAdmin.dbg.json +1 -1
  9. package/artifacts/contracts/authorization/AccessAdmin.sol/AccessAdmin.json +96 -37
  10. package/artifacts/contracts/authorization/AccessAdmin.sol/IAccessManagedChecker.dbg.json +4 -0
  11. package/artifacts/contracts/authorization/AccessAdmin.sol/IAccessManagedChecker.json +24 -0
  12. package/artifacts/contracts/authorization/AccessManagerCloneable.sol/AccessManagerCloneable.dbg.json +1 -1
  13. package/artifacts/contracts/authorization/Authorization.sol/Authorization.dbg.json +1 -1
  14. package/artifacts/contracts/authorization/Authorization.sol/Authorization.json +67 -11
  15. package/artifacts/contracts/authorization/IAccess.sol/IAccess.dbg.json +1 -1
  16. package/artifacts/contracts/authorization/IAccessAdmin.sol/IAccessAdmin.dbg.json +1 -1
  17. package/artifacts/contracts/authorization/IAccessAdmin.sol/IAccessAdmin.json +60 -13
  18. package/artifacts/contracts/authorization/IAuthorization.sol/IAuthorization.dbg.json +1 -1
  19. package/artifacts/contracts/authorization/IAuthorization.sol/IAuthorization.json +40 -3
  20. package/artifacts/contracts/authorization/IServiceAuthorization.sol/IServiceAuthorization.dbg.json +1 -1
  21. package/artifacts/contracts/authorization/IServiceAuthorization.sol/IServiceAuthorization.json +19 -0
  22. package/artifacts/contracts/authorization/ReleaseAccessManager.sol/ReleaseAccessManager.dbg.json +4 -0
  23. package/artifacts/contracts/authorization/ReleaseAccessManager.sol/ReleaseAccessManager.json +1196 -0
  24. package/artifacts/contracts/authorization/ServiceAuthorization.sol/ServiceAuthorization.dbg.json +1 -1
  25. package/artifacts/contracts/authorization/ServiceAuthorization.sol/ServiceAuthorization.json +68 -5
  26. package/artifacts/contracts/distribution/BasicDistribution.sol/BasicDistribution.dbg.json +1 -1
  27. package/artifacts/contracts/distribution/BasicDistribution.sol/BasicDistribution.json +159 -209
  28. package/artifacts/contracts/distribution/BasicDistributionAuthorization.sol/BasicDistributionAuthorization.dbg.json +1 -1
  29. package/artifacts/contracts/distribution/BasicDistributionAuthorization.sol/BasicDistributionAuthorization.json +82 -22
  30. package/artifacts/contracts/distribution/Distribution.sol/Distribution.dbg.json +1 -1
  31. package/artifacts/contracts/distribution/Distribution.sol/Distribution.json +99 -125
  32. package/artifacts/contracts/distribution/DistributionService.sol/DistributionService.dbg.json +1 -1
  33. package/artifacts/contracts/distribution/DistributionService.sol/DistributionService.json +175 -86
  34. package/artifacts/contracts/distribution/DistributionServiceManager.sol/DistributionServiceManager.dbg.json +1 -1
  35. package/artifacts/contracts/distribution/DistributionServiceManager.sol/DistributionServiceManager.json +104 -60
  36. package/artifacts/contracts/distribution/IDistributionComponent.sol/IDistributionComponent.dbg.json +1 -1
  37. package/artifacts/contracts/distribution/IDistributionComponent.sol/IDistributionComponent.json +87 -108
  38. package/artifacts/contracts/distribution/IDistributionService.sol/IDistributionService.dbg.json +1 -1
  39. package/artifacts/contracts/distribution/IDistributionService.sol/IDistributionService.json +52 -0
  40. package/artifacts/contracts/examples/fire/DamageLevel.sol/DamageLevelLib.dbg.json +4 -0
  41. package/artifacts/contracts/examples/fire/DamageLevel.sol/DamageLevelLib.json +22 -0
  42. package/artifacts/contracts/examples/fire/FirePool.sol/FirePool.dbg.json +4 -0
  43. package/artifacts/contracts/examples/fire/FirePool.sol/FirePool.json +1441 -0
  44. package/artifacts/contracts/examples/fire/FirePoolAuthorization.sol/FirePoolAuthorization.dbg.json +4 -0
  45. package/artifacts/contracts/examples/fire/FirePoolAuthorization.sol/FirePoolAuthorization.json +502 -0
  46. package/artifacts/contracts/examples/fire/FireProduct.sol/FireProduct.dbg.json +4 -0
  47. package/artifacts/contracts/examples/fire/FireProduct.sol/FireProduct.json +1991 -0
  48. package/artifacts/contracts/examples/fire/FireProductAuthorization.sol/FireProductAuthorization.dbg.json +4 -0
  49. package/artifacts/contracts/examples/fire/FireProductAuthorization.sol/FireProductAuthorization.json +470 -0
  50. package/artifacts/contracts/examples/fire/FireUSD.sol/FireUSD.dbg.json +4 -0
  51. package/artifacts/contracts/examples/fire/FireUSD.sol/FireUSD.json +376 -0
  52. package/artifacts/contracts/examples/unpermissioned/SimpleDistribution.sol/SimpleDistribution.dbg.json +1 -1
  53. package/artifacts/contracts/examples/unpermissioned/SimpleDistribution.sol/SimpleDistribution.json +187 -169
  54. package/artifacts/contracts/examples/unpermissioned/SimpleDistributionAuthorization.sol/SimpleDistributionAuthorization.dbg.json +4 -0
  55. package/artifacts/contracts/examples/unpermissioned/SimpleDistributionAuthorization.sol/SimpleDistributionAuthorization.json +470 -0
  56. package/artifacts/contracts/examples/unpermissioned/SimpleOracle.sol/SimpleOracle.dbg.json +1 -1
  57. package/artifacts/contracts/examples/unpermissioned/SimpleOracle.sol/SimpleOracle.json +131 -157
  58. package/artifacts/contracts/examples/unpermissioned/SimplePool.sol/SimplePool.dbg.json +1 -1
  59. package/artifacts/contracts/examples/unpermissioned/SimplePool.sol/SimplePool.json +262 -202
  60. package/artifacts/contracts/examples/unpermissioned/SimplePoolAuthorization.sol/SimplePoolAuthorization.dbg.json +4 -0
  61. package/artifacts/contracts/examples/unpermissioned/SimplePoolAuthorization.sol/SimplePoolAuthorization.json +502 -0
  62. package/artifacts/contracts/examples/unpermissioned/SimpleProduct.sol/SimpleProduct.dbg.json +1 -1
  63. package/artifacts/contracts/examples/unpermissioned/SimpleProduct.sol/SimpleProduct.json +562 -252
  64. package/artifacts/contracts/examples/unpermissioned/SimpleProductAuthorization.sol/SimpleProductAuthorization.dbg.json +4 -0
  65. package/artifacts/contracts/examples/unpermissioned/SimpleProductAuthorization.sol/SimpleProductAuthorization.json +470 -0
  66. package/artifacts/contracts/instance/BundleSet.sol/BundleSet.dbg.json +1 -1
  67. package/artifacts/contracts/instance/BundleSet.sol/BundleSet.json +147 -42
  68. package/artifacts/contracts/instance/IInstance.sol/IInstance.dbg.json +1 -1
  69. package/artifacts/contracts/instance/IInstance.sol/IInstance.json +116 -48
  70. package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.dbg.json +1 -1
  71. package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.json +53 -101
  72. package/artifacts/contracts/instance/Instance.sol/Instance.dbg.json +1 -1
  73. package/artifacts/contracts/instance/Instance.sol/Instance.json +149 -60
  74. package/artifacts/contracts/instance/InstanceAdmin.sol/InstanceAdmin.dbg.json +1 -1
  75. package/artifacts/contracts/instance/InstanceAdmin.sol/InstanceAdmin.json +186 -125
  76. package/artifacts/contracts/instance/InstanceAuthorizationV3.sol/InstanceAuthorizationV3.dbg.json +1 -1
  77. package/artifacts/contracts/instance/InstanceAuthorizationV3.sol/InstanceAuthorizationV3.json +58 -85
  78. package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.dbg.json +1 -1
  79. package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.json +514 -88
  80. package/artifacts/contracts/instance/InstanceService.sol/InstanceService.dbg.json +1 -1
  81. package/artifacts/contracts/instance/InstanceService.sol/InstanceService.json +113 -148
  82. package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.dbg.json +1 -1
  83. package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.json +72 -40
  84. package/artifacts/contracts/instance/InstanceStore.sol/InstanceStore.dbg.json +1 -1
  85. package/artifacts/contracts/instance/InstanceStore.sol/InstanceStore.json +185 -124
  86. package/artifacts/contracts/instance/RiskSet.sol/RiskSet.dbg.json +4 -0
  87. package/artifacts/contracts/instance/RiskSet.sol/RiskSet.json +810 -0
  88. package/artifacts/contracts/instance/base/BalanceStore.sol/BalanceStore.dbg.json +1 -1
  89. package/artifacts/contracts/instance/base/BalanceStore.sol/BalanceStore.json +2 -2
  90. package/artifacts/contracts/instance/base/Cloneable.sol/Cloneable.dbg.json +1 -1
  91. package/artifacts/contracts/instance/base/ObjectCounter.sol/ObjectCounter.dbg.json +1 -1
  92. package/artifacts/contracts/instance/base/ObjectCounter.sol/ObjectCounter.json +2 -2
  93. package/artifacts/contracts/instance/base/ObjectLifecycle.sol/ObjectLifecycle.dbg.json +1 -1
  94. package/artifacts/contracts/instance/base/ObjectLifecycle.sol/ObjectLifecycle.json +46 -5
  95. package/artifacts/contracts/instance/base/ObjectSet.sol/ObjectSet.dbg.json +1 -1
  96. package/artifacts/contracts/instance/base/ObjectSet.sol/ObjectSet.json +2 -2
  97. package/artifacts/contracts/instance/module/IAccess.sol/IAccess.dbg.json +1 -1
  98. package/artifacts/contracts/instance/module/IBundle.sol/IBundle.dbg.json +1 -1
  99. package/artifacts/contracts/instance/module/IComponents.sol/IComponents.dbg.json +1 -1
  100. package/artifacts/contracts/instance/module/IDistribution.sol/IDistribution.dbg.json +1 -1
  101. package/artifacts/contracts/instance/module/IPolicy.sol/IPolicy.dbg.json +1 -1
  102. package/artifacts/contracts/instance/module/IRisk.sol/IRisk.dbg.json +1 -1
  103. package/artifacts/contracts/mock/Dip.sol/Dip.dbg.json +1 -1
  104. package/artifacts/contracts/oracle/BasicOracle.sol/BasicOracle.dbg.json +1 -1
  105. package/artifacts/contracts/oracle/BasicOracle.sol/BasicOracle.json +119 -169
  106. package/artifacts/contracts/oracle/BasicOracleAuthorization.sol/BasicOracleAuthorization.dbg.json +1 -1
  107. package/artifacts/contracts/oracle/BasicOracleAuthorization.sol/BasicOracleAuthorization.json +84 -24
  108. package/artifacts/contracts/oracle/IOracle.sol/IOracle.dbg.json +1 -1
  109. package/artifacts/contracts/oracle/IOracleComponent.sol/IOracleComponent.dbg.json +1 -1
  110. package/artifacts/contracts/oracle/IOracleComponent.sol/IOracleComponent.json +82 -103
  111. package/artifacts/contracts/oracle/IOracleService.sol/IOracleService.dbg.json +1 -1
  112. package/artifacts/contracts/oracle/IOracleService.sol/IOracleService.json +43 -9
  113. package/artifacts/contracts/oracle/Oracle.sol/Oracle.dbg.json +1 -1
  114. package/artifacts/contracts/oracle/Oracle.sol/Oracle.json +95 -121
  115. package/artifacts/contracts/oracle/OracleService.sol/OracleService.dbg.json +1 -1
  116. package/artifacts/contracts/oracle/OracleService.sol/OracleService.json +142 -79
  117. package/artifacts/contracts/oracle/OracleServiceManager.sol/OracleServiceManager.dbg.json +1 -1
  118. package/artifacts/contracts/oracle/OracleServiceManager.sol/OracleServiceManager.json +92 -36
  119. package/artifacts/contracts/pool/BasicPool.sol/BasicPool.dbg.json +1 -1
  120. package/artifacts/contracts/pool/BasicPool.sol/BasicPool.json +95 -149
  121. package/artifacts/contracts/pool/BasicPoolAuthorization.sol/BasicPoolAuthorization.dbg.json +1 -1
  122. package/artifacts/contracts/pool/BasicPoolAuthorization.sol/BasicPoolAuthorization.json +114 -22
  123. package/artifacts/contracts/pool/BundleService.sol/BundleService.dbg.json +1 -1
  124. package/artifacts/contracts/pool/BundleService.sol/BundleService.json +143 -150
  125. package/artifacts/contracts/pool/BundleServiceManager.sol/BundleServiceManager.dbg.json +1 -1
  126. package/artifacts/contracts/pool/BundleServiceManager.sol/BundleServiceManager.json +86 -66
  127. package/artifacts/contracts/pool/IBundleService.sol/IBundleService.dbg.json +1 -1
  128. package/artifacts/contracts/pool/IBundleService.sol/IBundleService.json +48 -33
  129. package/artifacts/contracts/pool/IPoolComponent.sol/IPoolComponent.dbg.json +1 -1
  130. package/artifacts/contracts/pool/IPoolComponent.sol/IPoolComponent.json +82 -142
  131. package/artifacts/contracts/pool/IPoolService.sol/IPoolService.dbg.json +1 -1
  132. package/artifacts/contracts/pool/IPoolService.sol/IPoolService.json +272 -185
  133. package/artifacts/contracts/pool/Pool.sol/Pool.dbg.json +1 -1
  134. package/artifacts/contracts/pool/Pool.sol/Pool.json +95 -160
  135. package/artifacts/contracts/pool/PoolService.sol/PoolService.dbg.json +1 -1
  136. package/artifacts/contracts/pool/PoolService.sol/PoolService.json +408 -263
  137. package/artifacts/contracts/pool/PoolServiceManager.sol/PoolServiceManager.dbg.json +1 -1
  138. package/artifacts/contracts/pool/PoolServiceManager.sol/PoolServiceManager.json +109 -41
  139. package/artifacts/contracts/product/ApplicationService.sol/ApplicationService.dbg.json +1 -1
  140. package/artifacts/contracts/product/ApplicationService.sol/ApplicationService.json +114 -45
  141. package/artifacts/contracts/product/ApplicationServiceManager.sol/ApplicationServiceManager.dbg.json +1 -1
  142. package/artifacts/contracts/product/ApplicationServiceManager.sol/ApplicationServiceManager.json +68 -36
  143. package/artifacts/contracts/product/BasicProduct.sol/BasicProduct.dbg.json +1 -1
  144. package/artifacts/contracts/product/BasicProduct.sol/BasicProduct.json +156 -141
  145. package/artifacts/contracts/product/BasicProductAuthorization.sol/BasicProductAuthorization.dbg.json +1 -1
  146. package/artifacts/contracts/product/BasicProductAuthorization.sol/BasicProductAuthorization.json +82 -22
  147. package/artifacts/contracts/product/ClaimService.sol/ClaimService.dbg.json +1 -1
  148. package/artifacts/contracts/product/ClaimService.sol/ClaimService.json +183 -90
  149. package/artifacts/contracts/product/ClaimServiceManager.sol/ClaimServiceManager.dbg.json +1 -1
  150. package/artifacts/contracts/product/ClaimServiceManager.sol/ClaimServiceManager.json +102 -58
  151. package/artifacts/contracts/product/IApplicationService.sol/IApplicationService.dbg.json +1 -1
  152. package/artifacts/contracts/product/IApplicationService.sol/IApplicationService.json +63 -7
  153. package/artifacts/contracts/product/IClaimService.sol/IClaimService.dbg.json +1 -1
  154. package/artifacts/contracts/product/IClaimService.sol/IClaimService.json +64 -8
  155. package/artifacts/contracts/product/IPolicyService.sol/IPolicyService.dbg.json +1 -1
  156. package/artifacts/contracts/product/IPolicyService.sol/IPolicyService.json +96 -19
  157. package/artifacts/contracts/product/IPricingService.sol/IPricingService.dbg.json +1 -1
  158. package/artifacts/contracts/product/IPricingService.sol/IPricingService.json +80 -51
  159. package/artifacts/contracts/product/IProductComponent.sol/IProductComponent.dbg.json +1 -1
  160. package/artifacts/contracts/product/IProductComponent.sol/IProductComponent.json +139 -119
  161. package/artifacts/contracts/product/IRiskService.sol/IRiskService.dbg.json +1 -1
  162. package/artifacts/contracts/product/IRiskService.sol/IRiskService.json +29 -0
  163. package/artifacts/contracts/product/PolicyService.sol/PolicyService.dbg.json +1 -1
  164. package/artifacts/contracts/product/PolicyService.sol/PolicyService.json +215 -125
  165. package/artifacts/contracts/product/PolicyServiceManager.sol/PolicyServiceManager.dbg.json +1 -1
  166. package/artifacts/contracts/product/PolicyServiceManager.sol/PolicyServiceManager.json +102 -54
  167. package/artifacts/contracts/product/PricingService.sol/PricingService.dbg.json +1 -1
  168. package/artifacts/contracts/product/PricingService.sol/PricingService.json +165 -107
  169. package/artifacts/contracts/product/PricingServiceManager.sol/PricingServiceManager.dbg.json +1 -1
  170. package/artifacts/contracts/product/PricingServiceManager.sol/PricingServiceManager.json +85 -45
  171. package/artifacts/contracts/product/Product.sol/Product.dbg.json +1 -1
  172. package/artifacts/contracts/product/Product.sol/Product.json +152 -137
  173. package/artifacts/contracts/product/RiskService.sol/RiskService.dbg.json +1 -1
  174. package/artifacts/contracts/product/RiskService.sol/RiskService.json +76 -26
  175. package/artifacts/contracts/product/RiskServiceManager.sol/RiskServiceManager.dbg.json +1 -1
  176. package/artifacts/contracts/product/RiskServiceManager.sol/RiskServiceManager.json +66 -30
  177. package/artifacts/contracts/registry/ChainNft.sol/ChainNft.dbg.json +1 -1
  178. package/artifacts/contracts/registry/ChainNft.sol/ChainNft.json +2 -2
  179. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.dbg.json +1 -1
  180. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.json +91 -15
  181. package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.dbg.json +1 -1
  182. package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.json +114 -35
  183. package/artifacts/contracts/registry/ITransferInterceptor.sol/ITransferInterceptor.dbg.json +1 -1
  184. package/artifacts/contracts/registry/ITransferInterceptor.sol/ITransferInterceptor.json +5 -18
  185. package/artifacts/contracts/registry/Registry.sol/Registry.dbg.json +1 -1
  186. package/artifacts/contracts/registry/Registry.sol/Registry.json +135 -51
  187. package/artifacts/contracts/registry/RegistryAdmin.sol/RegistryAdmin.dbg.json +1 -1
  188. package/artifacts/contracts/registry/RegistryAdmin.sol/RegistryAdmin.json +203 -162
  189. package/artifacts/contracts/registry/RegistryService.sol/RegistryService.dbg.json +1 -1
  190. package/artifacts/contracts/registry/RegistryService.sol/RegistryService.json +89 -172
  191. package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.dbg.json +1 -1
  192. package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.json +65 -29
  193. package/artifacts/contracts/registry/ReleaseLifecycle.sol/ReleaseLifecycle.dbg.json +1 -1
  194. package/artifacts/contracts/registry/ReleaseLifecycle.sol/ReleaseLifecycle.json +47 -6
  195. package/artifacts/contracts/registry/ReleaseRegistry.sol/ReleaseRegistry.dbg.json +1 -1
  196. package/artifacts/contracts/registry/ReleaseRegistry.sol/ReleaseRegistry.json +123 -225
  197. package/artifacts/contracts/registry/ServiceAuthorizationV3.sol/ServiceAuthorizationV3.dbg.json +1 -1
  198. package/artifacts/contracts/registry/ServiceAuthorizationV3.sol/ServiceAuthorizationV3.json +66 -8
  199. package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.dbg.json +1 -1
  200. package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.json +2 -2
  201. package/artifacts/contracts/shared/Component.sol/Component.dbg.json +1 -1
  202. package/artifacts/contracts/shared/Component.sol/Component.json +72 -80
  203. package/artifacts/contracts/shared/ComponentService.sol/ComponentService.dbg.json +1 -1
  204. package/artifacts/contracts/shared/ComponentService.sol/ComponentService.json +478 -477
  205. package/artifacts/contracts/shared/ComponentServiceManager.sol/ComponentServiceManager.dbg.json +1 -1
  206. package/artifacts/contracts/shared/ComponentServiceManager.sol/ComponentServiceManager.json +96 -72
  207. package/artifacts/contracts/shared/ComponentVerifyingService.sol/ComponentVerifyingService.dbg.json +1 -1
  208. package/artifacts/contracts/shared/ComponentVerifyingService.sol/ComponentVerifyingService.json +42 -0
  209. package/artifacts/contracts/shared/ContractLib.sol/ContractLib.dbg.json +1 -1
  210. package/artifacts/contracts/shared/ContractLib.sol/ContractLib.json +402 -6
  211. package/artifacts/contracts/shared/ContractLib.sol/IInstanceAdminHelper.dbg.json +4 -0
  212. package/artifacts/contracts/shared/ContractLib.sol/IInstanceAdminHelper.json +24 -0
  213. package/artifacts/contracts/shared/ContractLib.sol/ITargetHelper.dbg.json +4 -0
  214. package/artifacts/contracts/shared/ContractLib.sol/ITargetHelper.json +30 -0
  215. package/artifacts/contracts/shared/IComponent.sol/IComponent.dbg.json +1 -1
  216. package/artifacts/contracts/shared/IComponent.sol/IComponent.json +61 -64
  217. package/artifacts/contracts/shared/IComponentService.sol/IComponentService.dbg.json +1 -1
  218. package/artifacts/contracts/shared/IComponentService.sol/IComponentService.json +425 -261
  219. package/artifacts/contracts/shared/IInstanceLinkedComponent.sol/IInstanceLinkedComponent.dbg.json +1 -1
  220. package/artifacts/contracts/shared/IInstanceLinkedComponent.sol/IInstanceLinkedComponent.json +82 -103
  221. package/artifacts/contracts/shared/IKeyValueStore.sol/IKeyValueStore.dbg.json +1 -1
  222. package/artifacts/contracts/shared/IKeyValueStore.sol/IKeyValueStore.json +36 -0
  223. package/artifacts/contracts/shared/ILifecycle.sol/ILifecycle.dbg.json +1 -1
  224. package/artifacts/contracts/shared/ILifecycle.sol/ILifecycle.json +36 -0
  225. package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.dbg.json +1 -1
  226. package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.json +16 -0
  227. package/artifacts/contracts/shared/IPolicyHolder.sol/IPolicyHolder.dbg.json +1 -1
  228. package/artifacts/contracts/shared/IPolicyHolder.sol/IPolicyHolder.json +1 -1
  229. package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.dbg.json +1 -1
  230. package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.json +29 -0
  231. package/artifacts/contracts/shared/IRegistryLinked.sol/IRegistryLinked.dbg.json +1 -1
  232. package/artifacts/contracts/shared/IService.sol/IService.dbg.json +1 -1
  233. package/artifacts/contracts/shared/IService.sol/IService.json +29 -0
  234. package/artifacts/contracts/shared/InitializableERC165.sol/InitializableERC165.dbg.json +1 -1
  235. package/artifacts/contracts/shared/InstanceLinkedComponent.sol/InstanceLinkedComponent.dbg.json +1 -1
  236. package/artifacts/contracts/shared/InstanceLinkedComponent.sol/InstanceLinkedComponent.json +94 -120
  237. package/artifacts/contracts/shared/KeyValueStore.sol/KeyValueStore.dbg.json +1 -1
  238. package/artifacts/contracts/shared/KeyValueStore.sol/KeyValueStore.json +42 -1
  239. package/artifacts/contracts/shared/Lifecycle.sol/Lifecycle.dbg.json +1 -1
  240. package/artifacts/contracts/shared/Lifecycle.sol/Lifecycle.json +42 -1
  241. package/artifacts/contracts/shared/NftIdSet.sol/NftIdSet.dbg.json +1 -1
  242. package/artifacts/contracts/shared/NftIdSet.sol/NftIdSet.json +2 -2
  243. package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.dbg.json +1 -1
  244. package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.json +18 -2
  245. package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.dbg.json +1 -1
  246. package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.json +3 -3
  247. package/artifacts/contracts/shared/Registerable.sol/Registerable.dbg.json +1 -1
  248. package/artifacts/contracts/shared/Registerable.sol/Registerable.json +66 -8
  249. package/artifacts/contracts/shared/RegistryLinked.sol/RegistryLinked.dbg.json +1 -1
  250. package/artifacts/contracts/shared/RegistryLinked.sol/RegistryLinked.json +2 -2
  251. package/artifacts/contracts/shared/Service.sol/Service.dbg.json +1 -1
  252. package/artifacts/contracts/shared/Service.sol/Service.json +42 -0
  253. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.dbg.json +1 -1
  254. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.json +388 -35
  255. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandlerBase.dbg.json +4 -0
  256. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandlerBase.json +395 -0
  257. package/artifacts/contracts/shared/TokenHandlerDeployerLib.sol/TokenHandlerDeployerLib.dbg.json +1 -1
  258. package/artifacts/contracts/shared/TokenHandlerDeployerLib.sol/TokenHandlerDeployerLib.json +88 -24
  259. package/artifacts/contracts/staking/IStaking.sol/IStaking.dbg.json +1 -1
  260. package/artifacts/contracts/staking/IStaking.sol/IStaking.json +79 -100
  261. package/artifacts/contracts/staking/IStakingService.sol/IStakingService.dbg.json +1 -1
  262. package/artifacts/contracts/staking/IStakingService.sol/IStakingService.json +29 -21
  263. package/artifacts/contracts/staking/StakeManagerLib.sol/StakeManagerLib.dbg.json +1 -1
  264. package/artifacts/contracts/staking/StakeManagerLib.sol/StakeManagerLib.json +2 -2
  265. package/artifacts/contracts/staking/Staking.sol/Staking.dbg.json +1 -1
  266. package/artifacts/contracts/staking/Staking.sol/Staking.json +158 -170
  267. package/artifacts/contracts/staking/StakingLifecycle.sol/StakingLifecycle.dbg.json +1 -1
  268. package/artifacts/contracts/staking/StakingLifecycle.sol/StakingLifecycle.json +46 -5
  269. package/artifacts/contracts/staking/StakingManager.sol/StakingManager.dbg.json +1 -1
  270. package/artifacts/contracts/staking/StakingManager.sol/StakingManager.json +81 -51
  271. package/artifacts/contracts/staking/StakingReader.sol/StakingReader.dbg.json +1 -1
  272. package/artifacts/contracts/staking/StakingReader.sol/StakingReader.json +7 -12
  273. package/artifacts/contracts/staking/StakingService.sol/StakingService.dbg.json +1 -1
  274. package/artifacts/contracts/staking/StakingService.sol/StakingService.json +82 -53
  275. package/artifacts/contracts/staking/StakingServiceManager.sol/StakingServiceManager.dbg.json +1 -1
  276. package/artifacts/contracts/staking/StakingServiceManager.sol/StakingServiceManager.json +69 -33
  277. package/artifacts/contracts/staking/StakingStore.sol/StakingStore.dbg.json +1 -1
  278. package/artifacts/contracts/staking/StakingStore.sol/StakingStore.json +144 -103
  279. package/artifacts/contracts/staking/TargetManagerLib.sol/TargetManagerLib.dbg.json +1 -1
  280. package/artifacts/contracts/staking/TargetManagerLib.sol/TargetManagerLib.json +2 -2
  281. package/artifacts/contracts/type/AddressSet.sol/LibAddressSet.dbg.json +1 -1
  282. package/artifacts/contracts/type/Amount.sol/AmountLib.dbg.json +1 -1
  283. package/artifacts/contracts/type/Amount.sol/AmountLib.json +32 -8
  284. package/artifacts/contracts/type/Blocknumber.sol/BlocknumberLib.dbg.json +1 -1
  285. package/artifacts/contracts/type/ClaimId.sol/ClaimIdLib.dbg.json +1 -1
  286. package/artifacts/contracts/type/ClaimId.sol/ClaimIdLib.json +28 -4
  287. package/artifacts/contracts/type/DistributorType.sol/DistributorTypeLib.dbg.json +1 -1
  288. package/artifacts/contracts/type/DistributorType.sol/DistributorTypeLib.json +2 -2
  289. package/artifacts/contracts/type/Fee.sol/FeeLib.dbg.json +1 -1
  290. package/artifacts/contracts/type/Fee.sol/FeeLib.json +2 -2
  291. package/artifacts/contracts/type/Key32.sol/Key32Lib.dbg.json +1 -1
  292. package/artifacts/contracts/type/Key32.sol/Key32Lib.json +2 -2
  293. package/artifacts/contracts/type/Key32Set.sol/LibKey32Set.dbg.json +4 -0
  294. package/artifacts/contracts/type/Key32Set.sol/LibKey32Set.json +33 -0
  295. package/artifacts/contracts/type/NftId.sol/NftIdLib.dbg.json +1 -1
  296. package/artifacts/contracts/type/NftId.sol/NftIdLib.json +23 -4
  297. package/artifacts/contracts/type/NftIdSet.sol/LibNftIdSet.dbg.json +1 -1
  298. package/artifacts/contracts/type/NftIdSet.sol/LibNftIdSet.json +2 -2
  299. package/artifacts/contracts/type/ObjectType.sol/ObjectTypeLib.dbg.json +1 -1
  300. package/artifacts/contracts/type/ObjectType.sol/ObjectTypeLib.json +2 -2
  301. package/artifacts/contracts/type/PayoutId.sol/PayoutIdLib.dbg.json +1 -1
  302. package/artifacts/contracts/type/PayoutId.sol/PayoutIdLib.json +19 -19
  303. package/artifacts/contracts/type/Referral.sol/ReferralLib.dbg.json +1 -1
  304. package/artifacts/contracts/type/Referral.sol/ReferralLib.json +2 -2
  305. package/artifacts/contracts/type/RequestId.sol/RequestIdLib.dbg.json +1 -1
  306. package/artifacts/contracts/type/RequestId.sol/RequestIdLib.json +2 -2
  307. package/artifacts/contracts/type/RiskId.sol/RiskIdLib.dbg.json +1 -1
  308. package/artifacts/contracts/type/RiskId.sol/RiskIdLib.json +99 -5
  309. package/artifacts/contracts/type/RoleId.sol/RoleIdLib.dbg.json +1 -1
  310. package/artifacts/contracts/type/RoleId.sol/RoleIdLib.json +2 -2
  311. package/artifacts/contracts/type/Seconds.sol/SecondsLib.dbg.json +1 -1
  312. package/artifacts/contracts/type/Selector.sol/SelectorLib.dbg.json +1 -1
  313. package/artifacts/contracts/type/Selector.sol/SelectorSetLib.dbg.json +1 -1
  314. package/artifacts/contracts/type/StateId.sol/StateIdLib.dbg.json +1 -1
  315. package/artifacts/contracts/type/StateId.sol/StateIdLib.json +15 -2
  316. package/artifacts/contracts/type/String.sol/StrLib.dbg.json +1 -1
  317. package/artifacts/contracts/type/Timestamp.sol/TimestampLib.dbg.json +1 -1
  318. package/artifacts/contracts/type/UFixed.sol/MathLib.dbg.json +1 -1
  319. package/artifacts/contracts/type/UFixed.sol/MathLib.json +2 -2
  320. package/artifacts/contracts/type/UFixed.sol/UFixedLib.dbg.json +1 -1
  321. package/artifacts/contracts/type/UFixed.sol/UFixedLib.json +15 -2
  322. package/artifacts/contracts/type/Version.sol/VersionLib.dbg.json +1 -1
  323. package/artifacts/contracts/type/Version.sol/VersionPartLib.dbg.json +1 -1
  324. package/artifacts/contracts/upgradeability/IVersionable.sol/IVersionable.dbg.json +1 -1
  325. package/artifacts/contracts/upgradeability/ProxyManager.sol/ProxyManager.dbg.json +1 -1
  326. package/artifacts/contracts/upgradeability/ProxyManager.sol/ProxyManager.json +44 -12
  327. package/artifacts/contracts/upgradeability/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.dbg.json +1 -1
  328. package/artifacts/contracts/upgradeability/Versionable.sol/Versionable.dbg.json +1 -1
  329. package/contracts/accounting/AccountingService.sol +244 -0
  330. package/contracts/accounting/AccountingServiceManager.sol +38 -0
  331. package/contracts/accounting/IAccountingService.sol +42 -0
  332. package/contracts/authorization/AccessAdmin.sol +86 -62
  333. package/contracts/authorization/Authorization.sol +111 -39
  334. package/contracts/authorization/IAccess.sol +1 -0
  335. package/contracts/authorization/IAccessAdmin.sol +4 -2
  336. package/contracts/authorization/IAuthorization.sol +13 -7
  337. package/contracts/authorization/IServiceAuthorization.sol +3 -1
  338. package/contracts/authorization/ReleaseAccessManager.sol +38 -0
  339. package/contracts/authorization/ServiceAuthorization.sol +26 -10
  340. package/contracts/distribution/BasicDistribution.sol +8 -7
  341. package/contracts/distribution/BasicDistributionAuthorization.sol +1 -1
  342. package/contracts/distribution/Distribution.sol +32 -40
  343. package/contracts/distribution/DistributionService.sol +80 -59
  344. package/contracts/distribution/IDistributionComponent.sol +1 -1
  345. package/contracts/distribution/IDistributionService.sol +5 -6
  346. package/contracts/examples/fire/DamageLevel.sol +59 -0
  347. package/contracts/examples/fire/FirePool.sol +90 -0
  348. package/contracts/examples/fire/FirePoolAuthorization.sol +35 -0
  349. package/contracts/examples/fire/FireProduct.sol +436 -0
  350. package/contracts/examples/fire/FireProductAuthorization.sol +45 -0
  351. package/contracts/examples/fire/FireUSD.sol +26 -0
  352. package/contracts/examples/unpermissioned/SimpleDistribution.sol +11 -4
  353. package/contracts/examples/unpermissioned/SimpleDistributionAuthorization.sol +28 -0
  354. package/contracts/examples/unpermissioned/SimpleOracle.sol +4 -4
  355. package/contracts/examples/unpermissioned/SimplePool.sol +37 -6
  356. package/contracts/examples/unpermissioned/SimplePoolAuthorization.sol +28 -0
  357. package/contracts/examples/unpermissioned/SimpleProduct.sol +24 -23
  358. package/contracts/examples/unpermissioned/SimpleProductAuthorization.sol +28 -0
  359. package/contracts/instance/BundleSet.sol +38 -34
  360. package/contracts/instance/IInstance.sol +11 -3
  361. package/contracts/instance/IInstanceService.sol +7 -29
  362. package/contracts/instance/Instance.sol +36 -26
  363. package/contracts/instance/InstanceAdmin.sol +38 -38
  364. package/contracts/instance/InstanceAuthorizationV3.sol +50 -32
  365. package/contracts/instance/InstanceReader.sol +168 -19
  366. package/contracts/instance/InstanceService.sol +51 -126
  367. package/contracts/instance/RiskSet.sol +119 -0
  368. package/contracts/instance/base/ObjectSet.sol +24 -25
  369. package/contracts/instance/module/IComponents.sol +7 -5
  370. package/contracts/instance/module/IPolicy.sol +4 -3
  371. package/contracts/instance/module/IRisk.sol +1 -0
  372. package/contracts/oracle/BasicOracle.sol +0 -1
  373. package/contracts/oracle/IOracleService.sol +2 -1
  374. package/contracts/oracle/Oracle.sol +4 -15
  375. package/contracts/oracle/OracleService.sol +104 -76
  376. package/contracts/pool/BasicPool.sol +33 -24
  377. package/contracts/pool/BasicPoolAuthorization.sol +12 -2
  378. package/contracts/pool/BundleService.sol +68 -81
  379. package/contracts/pool/IBundleService.sol +2 -14
  380. package/contracts/pool/IPoolComponent.sol +1 -7
  381. package/contracts/pool/IPoolService.sol +30 -37
  382. package/contracts/pool/Pool.sol +123 -120
  383. package/contracts/pool/PoolService.sol +261 -154
  384. package/contracts/product/ApplicationService.sol +28 -16
  385. package/contracts/product/BasicProduct.sol +8 -12
  386. package/contracts/product/BasicProductAuthorization.sol +1 -3
  387. package/contracts/product/ClaimService.sol +110 -69
  388. package/contracts/product/IApplicationService.sol +5 -2
  389. package/contracts/product/IClaimService.sol +3 -2
  390. package/contracts/product/IPolicyService.sol +18 -5
  391. package/contracts/product/IPricingService.sol +9 -9
  392. package/contracts/product/IProductComponent.sol +23 -3
  393. package/contracts/product/PolicyService.sol +277 -187
  394. package/contracts/product/PricingService.sol +8 -8
  395. package/contracts/product/Product.sol +76 -75
  396. package/contracts/product/RiskService.sol +14 -3
  397. package/contracts/registry/ChainNft.sol +6 -9
  398. package/contracts/registry/IRegistry.sol +8 -3
  399. package/contracts/registry/IRegistryService.sol +5 -12
  400. package/contracts/registry/ITransferInterceptor.sol +1 -2
  401. package/contracts/registry/Registry.sol +29 -6
  402. package/contracts/registry/RegistryAdmin.sol +28 -35
  403. package/contracts/registry/RegistryService.sol +33 -44
  404. package/contracts/registry/ReleaseLifecycle.sol +6 -3
  405. package/contracts/registry/ReleaseRegistry.sol +202 -208
  406. package/contracts/registry/ServiceAuthorizationV3.sol +28 -52
  407. package/contracts/shared/Component.sol +56 -105
  408. package/contracts/shared/ComponentService.sol +376 -324
  409. package/contracts/shared/ComponentVerifyingService.sol +27 -16
  410. package/contracts/shared/ContractLib.sol +196 -10
  411. package/contracts/shared/IComponent.sol +6 -14
  412. package/contracts/shared/IComponentService.sol +45 -37
  413. package/contracts/shared/IInstanceLinkedComponent.sol +3 -22
  414. package/contracts/shared/ILifecycle.sol +3 -1
  415. package/contracts/shared/INftOwnable.sol +2 -0
  416. package/contracts/shared/IRegisterable.sol +11 -0
  417. package/contracts/shared/InstanceLinkedComponent.sol +68 -43
  418. package/contracts/shared/KeyValueStore.sol +1 -1
  419. package/contracts/shared/Lifecycle.sol +15 -4
  420. package/contracts/shared/NftOwnable.sol +23 -3
  421. package/contracts/shared/PolicyHolder.sol +4 -0
  422. package/contracts/shared/Registerable.sol +15 -7
  423. package/contracts/shared/RegistryLinked.sol +6 -12
  424. package/contracts/shared/Service.sol +4 -7
  425. package/contracts/shared/TokenHandler.sol +316 -66
  426. package/contracts/shared/TokenHandlerDeployerLib.sol +10 -2
  427. package/contracts/staking/IStaking.sol +9 -4
  428. package/contracts/staking/IStakingService.sol +0 -3
  429. package/contracts/staking/Staking.sol +41 -24
  430. package/contracts/staking/StakingReader.sol +12 -5
  431. package/contracts/staking/StakingService.sol +56 -23
  432. package/contracts/type/Amount.sol +15 -0
  433. package/contracts/type/ClaimId.sol +6 -1
  434. package/contracts/type/Key32.sol +2 -2
  435. package/contracts/type/Key32Set.sol +62 -0
  436. package/contracts/type/NftId.sol +7 -0
  437. package/contracts/type/ObjectType.sol +11 -0
  438. package/contracts/type/PayoutId.sol +10 -10
  439. package/contracts/type/RiskId.sol +30 -4
  440. package/contracts/type/RoleId.sol +0 -12
  441. package/contracts/type/StateId.sol +14 -1
  442. package/contracts/type/UFixed.sol +4 -0
  443. package/contracts/upgradeability/ProxyManager.sol +2 -1
  444. package/package.json +4 -3
  445. package/artifacts/contracts/authorization/IModuleAuthorization.sol/IModuleAuthorization.dbg.json +0 -4
  446. package/artifacts/contracts/authorization/IModuleAuthorization.sol/IModuleAuthorization.json +0 -290
  447. package/artifacts/contracts/authorization/ModuleAuthorization.sol/ModuleAuthorization.dbg.json +0 -4
  448. package/artifacts/contracts/authorization/ModuleAuthorization.sol/ModuleAuthorization.json +0 -390
  449. package/artifacts/contracts/shared/InitializableCustom.sol/InitializableCustom.dbg.json +0 -4
  450. package/artifacts/contracts/shared/InitializableCustom.sol/InitializableCustom.json +0 -39
  451. package/contracts/authorization/IModuleAuthorization.sol +0 -21
  452. package/contracts/authorization/ModuleAuthorization.sol +0 -78
  453. package/contracts/shared/InitializableCustom.sol +0 -177
@@ -5,91 +5,201 @@ 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
+ contract TokenHandlerBase {
16
+
17
+ // _setWallet
18
+ event LogTokenHandlerWalletAddressChanged(NftId componentNftId, address oldWallet, address newWallet);
19
+ event LogTokenHandlerWalletTokensTransferred(NftId componentNftId, address oldWallet, address newWallet, Amount amount);
20
+
21
+ // _approveTokenHandler
22
+ event LogTokenHandlerTokenApproved(NftId nftId, address tokenHandler, address token, Amount amount, bool isMaxAmount);
23
+
24
+ // _transfer
25
+ event LogTokenHandlerTokenTransfer(address token, address from, address to, Amount amount);
26
+
27
+ // constructor
28
+ error ErrorTokenHandlerNotRegistry(address registry);
29
+ error ErrorTokenHandlerComponentNotRegistered(address component);
30
+ error ErrorTokenHandlerTokenAddressZero();
31
+
32
+ // _setWallet
33
+ error ErrorTokenHandlerNewWalletAddressZero();
34
+ error ErrorTokenHandlerAddressIsSameAsCurrent();
35
+
36
+ // _approveTokenHandler
37
+ error ErrorTokenHandlerNotWallet(NftId nftId, address tokenHandler, address wallet);
38
+
39
+ // _pullAndPullToken
40
+ error ErrorTokenHandlerWalletsNotDistinct(address from, address to1, address to2);
41
+ error ErrorTokenHandlerPushAmountsTooLarge(Amount pushAmount, Amount pullAmount);
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();
47
+
48
+ IRegistry public immutable REGISTRY;
49
+ IERC20Metadata public immutable TOKEN;
50
+ address public immutable COMPONENT;
51
+ NftId public immutable NFT_ID;
52
+
53
+ address internal _wallet;
54
+
55
+ constructor(
56
+ address registry,
57
+ address component,
58
+ address token
59
+ )
60
+ {
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);
20
72
 
21
- IERC20Metadata private _token;
73
+ if (NFT_ID.eqz()) {
74
+ revert ErrorTokenHandlerComponentNotRegistered(component);
75
+ }
22
76
 
23
- constructor(address token, address initialAuthority) AccessManaged(initialAuthority) {
24
- _token = IERC20Metadata(token);
77
+ TOKEN = IERC20Metadata(token);
25
78
  }
26
79
 
27
- /// @dev returns the default token defined for this TokenHandler
28
- function getToken()
29
- external
80
+
81
+ /// @dev Returns the wallet linked to this TokenHandler.
82
+ function getWallet()
83
+ public
30
84
  view
31
- returns (IERC20Metadata)
85
+ returns (address wallet)
32
86
  {
33
- return _token;
87
+ if (_wallet == address(0)) {
88
+ return address(this);
89
+ }
90
+
91
+ return _wallet;
34
92
  }
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,
93
+
94
+
95
+ /// @dev Approves token handler to spend up to the specified amount of tokens.
96
+ /// Sets spending limit to type(uint256).max for AmountLib.max().
97
+ /// Reverts if wallet is not token handler itself.
98
+ /// Sets approvel using SareERC20.forceApprove internally.
99
+ function _approve(
100
+ IERC20Metadata token,
41
101
  Amount amount
42
102
  )
43
- external
44
- restricted()
103
+ internal
45
104
  {
46
- _transfer(from, to, amount, true);
105
+ // check that wallet is token handler contract itself
106
+ if(_wallet != address(0)) {
107
+ revert ErrorTokenHandlerNotWallet(NFT_ID, address(this), _wallet);
108
+ }
109
+
110
+ // update spending limit for AmountLib.max() to type(uint256).max
111
+ uint256 amountInt = amount.toInt();
112
+ bool isMaxAmount = false;
113
+ if (amount == AmountLib.max()) {
114
+ amountInt = type(uint256).max;
115
+ isMaxAmount = true;
116
+ }
117
+
118
+ emit LogTokenHandlerTokenApproved(NFT_ID, address(this), address(token), amount, isMaxAmount);
119
+
120
+ // execute approval
121
+ SafeERC20.forceApprove(
122
+ token,
123
+ address(this),
124
+ amountInt);
47
125
  }
48
126
 
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(
52
- address from,
53
- address to,
54
- Amount amount,
55
- address to2,
56
- Amount amount2,
57
- address to3,
58
- Amount amount3
59
- )
60
- external
61
- restricted()
127
+
128
+ function _setWallet(address newWallet)
129
+ internal
62
130
  {
63
- if (to == to2 || to == to3 || to2 == to3) {
64
- revert ErrorTokenHandlerRecipientWalletsMustBeDistinct(to, to2, to3);
131
+ address oldWallet = _wallet;
132
+ if (newWallet == oldWallet) {
133
+ revert ErrorTokenHandlerAddressIsSameAsCurrent();
65
134
  }
66
135
 
67
- _checkPreconditions(from, amount + amount2 + amount3);
136
+ // effects
137
+ address oldWalletForBalance = getWallet();
138
+ _wallet = newWallet;
68
139
 
69
- if (amount.gtz()) {
70
- _transfer(from, to, amount, false);
140
+ emit LogTokenHandlerWalletAddressChanged(NFT_ID, oldWallet, newWallet);
141
+
142
+ // interactions
143
+ Amount balanceAmount = AmountLib.toAmount(
144
+ TOKEN.balanceOf(oldWalletForBalance));
145
+
146
+ if (balanceAmount.gtz()) {
147
+ // move tokens from old to new wallet
148
+ emit LogTokenHandlerWalletTokensTransferred(NFT_ID, oldWallet, newWallet, balanceAmount);
149
+
150
+ if (oldWallet == address(0)) {
151
+ // transfer from the component requires an allowance
152
+ _transfer(address(this), newWallet, balanceAmount, true);
153
+ } else if (newWallet == address(0)) {
154
+ _transfer(oldWallet, address(this), balanceAmount, true);
155
+ } else {
156
+ _transfer(oldWallet, newWallet, balanceAmount, true);
157
+ }
71
158
  }
72
- if (amount2.gtz()) {
73
- _transfer(from, to2, amount2, false);
159
+ }
160
+
161
+
162
+ function _pullAndPushToken(
163
+ address from,
164
+ Amount pullAmount,
165
+ address to1,
166
+ Amount amount1,
167
+ address to2,
168
+ Amount amount2
169
+ )
170
+ internal
171
+ {
172
+ address wallet = getWallet();
173
+
174
+ if (wallet == to1 || wallet == to2 || to1 == to2) {
175
+ revert ErrorTokenHandlerWalletsNotDistinct(wallet, to1, to2);
74
176
  }
75
- if (amount3.gtz()) {
76
- _transfer(from, to3, amount3, false);
177
+
178
+ if (amount1 + amount2 > pullAmount) {
179
+ revert ErrorTokenHandlerPushAmountsTooLarge(amount1 + amount2, pullAmount);
77
180
  }
181
+
182
+ _pullToken(from, pullAmount);
183
+
184
+ if (amount1.gtz()) { _pushToken(to1, amount1); }
185
+ if (amount2.gtz()) { _pushToken(to2, amount2); }
78
186
  }
79
187
 
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()
188
+
189
+ function _pullToken(address from, Amount amount)
190
+ internal
191
+ {
192
+ _transfer(from, getWallet(), amount, true);
193
+ }
194
+
195
+
196
+ function _pushToken(address to, Amount amount)
197
+ internal
89
198
  {
90
- _transfer(from, to, amount, true);
199
+ _transfer(getWallet(), to, amount, true);
91
200
  }
92
201
 
202
+
93
203
  function _transfer(
94
204
  address from,
95
205
  address to,
@@ -104,14 +214,16 @@ contract TokenHandler is AccessManaged {
104
214
  }
105
215
 
106
216
  // transfer the tokens
107
- emit LogTokenHandlerTokenTransfer(address(_token), from, to, amount.toInt());
217
+ emit LogTokenHandlerTokenTransfer(address(TOKEN), from, to, amount);
218
+
108
219
  SafeERC20.safeTransferFrom(
109
- _token,
220
+ TOKEN,
110
221
  from,
111
222
  to,
112
223
  amount.toInt());
113
224
  }
114
225
 
226
+
115
227
  function _checkPreconditions(
116
228
  address from,
117
229
  Amount amount
@@ -124,16 +236,154 @@ contract TokenHandler is AccessManaged {
124
236
  revert ErrorTokenHandlerAmountIsZero();
125
237
  }
126
238
 
239
+ // allowance must be >= amount
240
+ uint256 allowance = TOKEN.allowance(from, address(this));
241
+ if (allowance < amount.toInt()) {
242
+ revert ErrorTokenHandlerAllowanceTooSmall(address(TOKEN), from, address(this), allowance, amount.toInt());
243
+ }
244
+
127
245
  // balance must be >= amount
128
- uint256 balance = _token.balanceOf(from);
246
+ uint256 balance = TOKEN.balanceOf(from);
129
247
  if (balance < amount.toInt()) {
130
- revert ErrorTokenHandlerBalanceTooLow(address(_token), from, balance, amount.toInt());
248
+ revert ErrorTokenHandlerBalanceTooLow(address(TOKEN), from, balance, amount.toInt());
131
249
  }
250
+ }
251
+ }
132
252
 
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());
253
+
254
+ /// @dev Token specific transfer helper
255
+ /// a default token contract is provided via contract constructor
256
+ /// relies internally on oz SafeERC20.safeTransferFrom
257
+ contract TokenHandler is
258
+ AccessManaged,
259
+ TokenHandlerBase
260
+ {
261
+
262
+ // onlyService
263
+ error ErrorTokenHandlerNotService(address service);
264
+
265
+ // TODO delete
266
+ error ErrorTokenHandlerRecipientWalletsMustBeDistinct(address to, address to2, address to3);
267
+
268
+ modifier onlyService() {
269
+ if (!REGISTRY.isObjectType(msg.sender, SERVICE())) {
270
+ revert ErrorTokenHandlerNotService(msg.sender);
137
271
  }
272
+ _;
273
+ }
274
+
275
+ constructor(
276
+ address registry,
277
+ address component,
278
+ address token,
279
+ address authority
280
+ )
281
+ TokenHandlerBase(registry, component, token)
282
+ AccessManaged(authority)
283
+ { }
284
+
285
+ /// @dev sets the wallet address for the component.
286
+ /// if the current wallet has tokens, these will be transferred.
287
+ /// if the new wallet address is externally owned, an approval from the
288
+ /// owner of the external wallet to the tokenhandler of the component that
289
+ /// covers the current component balance must exist
290
+ function setWallet(address newWallet)
291
+ external
292
+ // restricted() // TODO re-activate
293
+ onlyService()
294
+ {
295
+ _setWallet(newWallet);
296
+ }
297
+
298
+
299
+ /// @dev Approves token handler to spend up to the specified amount of tokens.
300
+ /// Sets spending limit to type(uint256).max for AmountLib.max().
301
+ /// Reverts if component wallet is not component itself.
302
+ /// Sets approvel using SareERC20.forceApprove internally.
303
+ function approve(
304
+ IERC20Metadata token,
305
+ Amount amount
306
+ )
307
+ external
308
+ // restricted() // TODO re-activate
309
+ onlyService()
310
+ {
311
+ _approve(token, amount);
312
+ }
313
+
314
+ /// @dev Collect tokens from outside of GIF and transfer them to the wallet.
315
+ /// This method also checks balance and allowance and makes sure the amount is greater than zero.
316
+ function collectTokens(
317
+ address from,
318
+ Amount amount
319
+ )
320
+ external
321
+ // restricted() // TODO re-activate
322
+ onlyService()
323
+ {
324
+ _pullToken(from, amount);
325
+ }
326
+
327
+
328
+ /// @dev Collect tokens from outside of GIF and transfer them to the wallet.
329
+ /// This method also checks balance and allowance and makes sure the amount is greater than zero.
330
+ function pushToken(
331
+ address from,
332
+ Amount amount
333
+ )
334
+ external
335
+ // restricted() // TODO re-activate
336
+ onlyService()
337
+ {
338
+ _pushToken(from, amount);
339
+ }
340
+
341
+
342
+ /// @dev collect tokens from outside of the gif and transfer them to three distinct wallets within the scope of gif
343
+ /// This method also checks balance and allowance and makes sure the amount is greater than zero.
344
+ function collectTokensToThreeRecipients(
345
+ address from,
346
+ address to,
347
+ Amount amount,
348
+ address to2,
349
+ Amount amount2,
350
+ address to3,
351
+ Amount amount3
352
+ )
353
+ external
354
+ restricted()
355
+ onlyService()
356
+ {
357
+ if (to == to2 || to == to3 || to2 == to3) {
358
+ revert ErrorTokenHandlerRecipientWalletsMustBeDistinct(to, to2, to3);
359
+ }
360
+
361
+ _checkPreconditions(from, amount + amount2 + amount3);
362
+
363
+ if (amount.gtz()) {
364
+ _transfer(from, to, amount, false);
365
+ }
366
+ if (amount2.gtz()) {
367
+ _transfer(from, to2, amount2, false);
368
+ }
369
+ if (amount3.gtz()) {
370
+ _transfer(from, to3, amount3, false);
371
+ }
372
+ }
373
+
374
+
375
+ /// @dev distribute tokens from a wallet within the scope of gif to an external address.
376
+ /// This method also checks balance and allowance and makes sure the amount is greater than zero.
377
+ function distributeTokens(
378
+ address from,
379
+ address to,
380
+ Amount amount
381
+ )
382
+ external
383
+ restricted()
384
+ onlyService()
385
+ {
386
+ // _transfer(from, to, amount, true);
387
+ _pushToken(to, amount);
138
388
  }
139
389
  }
@@ -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
 
@@ -64,6 +67,8 @@ interface IStaking is
64
67
  UFixed rewardRate;
65
68
  }
66
69
 
70
+ function initializeTokenHandler() external;
71
+
67
72
  // staking rate management
68
73
 
69
74
  /// @dev sets the rate that converts 1 token of total value locked into the
@@ -155,11 +160,11 @@ interface IStaking is
155
160
 
156
161
  //--- helper functions --------------------------------------------------//
157
162
 
158
- /// @dev transfers the specified amount of dips from the from address to the staking wallet.
159
- function collectDipAmount(address from, Amount dipAmount) external;
163
+ // /// @dev transfers the specified amount of dips from the from address to the staking wallet.
164
+ // function collectDipAmount(address from, Amount dipAmount) external;
160
165
 
161
- /// @dev transfers the specified amount of dips from the staking wallet to the to addess.
162
- function transferDipAmount(address to, Amount dipAmount) external;
166
+ // /// @dev transfers the specified amount of dips from the staking wallet to the to addess.
167
+ // function transferDipAmount(address to, Amount dipAmount) external;
163
168
 
164
169
  //--- view and pure functions -------------------------------------------//
165
170
 
@@ -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
 
@@ -33,7 +31,6 @@ interface IStakingService is IService
33
31
  event LogStakingServiceRewardsClaimed(NftId stakeNftId, address stakeOwner, Amount rewardsClaimedAmount);
34
32
 
35
33
  // modifiers
36
- error ErrorStakingServiceNotNftOwner(NftId nftId, address expectedOwner, address owner);
37
34
  error ErrorStakingServiceNotStaking(address stakingAddress);
38
35
  error ErrorStakingServiceNotSupportingIStaking(address stakingAddress);
39
36
 
@@ -1,6 +1,8 @@
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
7
  import {IRegistryService} from "../registry/IRegistryService.sol";
6
8
  import {IStaking} from "./IStaking.sol";
@@ -9,8 +11,9 @@ import {IVersionable} from "../upgradeability/IVersionable.sol";
9
11
  import {Amount, AmountLib} from "../type/Amount.sol";
10
12
  import {Component} from "../shared/Component.sol";
11
13
  import {IComponent} from "../shared/IComponent.sol";
14
+ import {IComponentService} from "../shared/IComponentService.sol";
12
15
  import {NftId} from "../type/NftId.sol";
13
- import {ObjectType, STAKING} from "../type/ObjectType.sol";
16
+ import {ObjectType, COMPONENT, STAKING} from "../type/ObjectType.sol";
14
17
  import {Seconds} from "../type/Seconds.sol";
15
18
  import {StakeManagerLib} from "./StakeManagerLib.sol";
16
19
  import {StakingReader} from "./StakingReader.sol";
@@ -30,7 +33,6 @@ contract Staking is
30
33
  IStaking
31
34
  {
32
35
  string public constant CONTRACT_NAME = "Staking";
33
- uint8 private constant GIF_MAJOR_VERSION = 3;
34
36
 
35
37
  // keccak256(abi.encode(uint256(keccak256("gif-next.contracts.component.Staking.sol")) - 1)) & ~bytes32(uint256(0xff));
36
38
  bytes32 public constant STAKING_LOCATION_V1 = 0xafe8d4462b2ed26a47154f4b8f6d1497d2f772496965791d25bd456e342b7f00;
@@ -60,6 +62,31 @@ contract Staking is
60
62
  _;
61
63
  }
62
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
+
63
90
  // set/update staking reader
64
91
  function setStakingReader(StakingReader stakingReader)
65
92
  external
@@ -372,25 +399,6 @@ contract Staking is
372
399
  }
373
400
 
374
401
 
375
-
376
- //--- other functions ---------------------------------------------------//
377
-
378
- function collectDipAmount(address from, Amount dipAmount)
379
- external
380
- restricted() // only staking service
381
- {
382
- getTokenHandler().collectTokens(from, getWallet(), dipAmount);
383
- }
384
-
385
-
386
- function transferDipAmount(address to, Amount dipAmount)
387
- external
388
- restricted() // only staking service
389
- {
390
- getTokenHandler().distributeTokens(getWallet(), to, dipAmount);
391
- }
392
-
393
-
394
402
  //--- view functions ----------------------------------------------------//
395
403
 
396
404
  function getStakingReader() public view returns (StakingReader reader) {
@@ -416,7 +424,7 @@ contract Staking is
416
424
  virtual override (IVersionable, Versionable)
417
425
  returns(Version)
418
426
  {
419
- return VersionLib.toVersion(GIF_MAJOR_VERSION,0,0);
427
+ return VersionLib.toVersion(GIF_RELEASE,0,0);
420
428
  }
421
429
 
422
430
  //--- internal functions ------------------------------------------------//
@@ -445,6 +453,16 @@ contract Staking is
445
453
  }
446
454
 
447
455
 
456
+ function _approveTokenHandler(IERC20Metadata token, Amount amount)
457
+ internal
458
+ virtual override
459
+ {
460
+ IComponentService(_getServiceAddress(COMPONENT())).approveStakingTokenHandler(
461
+ token,
462
+ amount);
463
+ }
464
+
465
+
448
466
  function _initialize(
449
467
  address owner,
450
468
  bytes memory data
@@ -469,7 +487,7 @@ contract Staking is
469
487
  _initializeComponent(
470
488
  authority,
471
489
  registryAddress,
472
- registry.getNftId(),
490
+ registry.getNftId(), // parent nft id
473
491
  CONTRACT_NAME,
474
492
  dipTokenAddress,
475
493
  STAKING(),
@@ -484,7 +502,6 @@ contract Staking is
484
502
  $._store = StakingStore(stakingStoreAddress);
485
503
  $._reader = StakingStore(stakingStoreAddress).getStakingReader();
486
504
  $._tokenRegistry = TokenRegistry(tokenRegistryAddress);
487
- $._tokenHandler = TokenHandlerDeployerLib.deployTokenHandler(dipTokenAddress, authority);
488
505
 
489
506
  _registerInterface(type(IStaking).interfaceId);
490
507
  }
@@ -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
  }