@etherisc/gif-next 0.0.2-de9ede4-391 → 0.0.2-df69269-973

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 (406) hide show
  1. package/artifacts/contracts/accounting/AccountingService.sol/AccountingService.dbg.json +1 -1
  2. package/artifacts/contracts/accounting/AccountingService.sol/AccountingService.json +65 -58
  3. package/artifacts/contracts/accounting/AccountingServiceManager.sol/AccountingServiceManager.dbg.json +1 -1
  4. package/artifacts/contracts/accounting/AccountingServiceManager.sol/AccountingServiceManager.json +20 -22
  5. package/artifacts/contracts/accounting/IAccountingService.sol/IAccountingService.dbg.json +1 -1
  6. package/artifacts/contracts/accounting/IAccountingService.sol/IAccountingService.json +27 -3
  7. package/artifacts/contracts/authorization/AccessAdmin.sol/AccessAdmin.dbg.json +1 -1
  8. package/artifacts/contracts/authorization/AccessAdmin.sol/AccessAdmin.json +103 -55
  9. package/artifacts/contracts/authorization/AccessAdmin.sol/IAccessManagedChecker.dbg.json +1 -1
  10. package/artifacts/contracts/authorization/AccessManagerCloneable.sol/AccessManagerCloneable.dbg.json +1 -1
  11. package/artifacts/contracts/authorization/AccessManagerCloneable.sol/AccessManagerCloneable.json +233 -5
  12. package/artifacts/contracts/authorization/Authorization.sol/Authorization.dbg.json +1 -1
  13. package/artifacts/contracts/authorization/Authorization.sol/Authorization.json +115 -21
  14. package/artifacts/contracts/authorization/IAccess.sol/IAccess.dbg.json +1 -1
  15. package/artifacts/contracts/authorization/IAccessAdmin.sol/IAccessAdmin.dbg.json +1 -1
  16. package/artifacts/contracts/authorization/IAccessAdmin.sol/IAccessAdmin.json +37 -5
  17. package/artifacts/contracts/authorization/IAuthorization.sol/IAuthorization.dbg.json +1 -1
  18. package/artifacts/contracts/authorization/IAuthorization.sol/IAuthorization.json +42 -13
  19. package/artifacts/contracts/authorization/IServiceAuthorization.sol/IServiceAuthorization.dbg.json +1 -1
  20. package/artifacts/contracts/authorization/ServiceAuthorization.sol/ServiceAuthorization.dbg.json +1 -1
  21. package/artifacts/contracts/authorization/ServiceAuthorization.sol/ServiceAuthorization.json +2 -2
  22. package/artifacts/contracts/distribution/BasicDistribution.sol/BasicDistribution.dbg.json +1 -1
  23. package/artifacts/contracts/distribution/BasicDistribution.sol/BasicDistribution.json +77 -47
  24. package/artifacts/contracts/distribution/BasicDistributionAuthorization.sol/BasicDistributionAuthorization.dbg.json +1 -1
  25. package/artifacts/contracts/distribution/BasicDistributionAuthorization.sol/BasicDistributionAuthorization.json +90 -33
  26. package/artifacts/contracts/distribution/Distribution.sol/Distribution.dbg.json +1 -1
  27. package/artifacts/contracts/distribution/Distribution.sol/Distribution.json +51 -21
  28. package/artifacts/contracts/distribution/DistributionService.sol/DistributionService.dbg.json +1 -1
  29. package/artifacts/contracts/distribution/DistributionService.sol/DistributionService.json +117 -110
  30. package/artifacts/contracts/distribution/DistributionServiceManager.sol/DistributionServiceManager.dbg.json +1 -1
  31. package/artifacts/contracts/distribution/DistributionServiceManager.sol/DistributionServiceManager.json +46 -48
  32. package/artifacts/contracts/distribution/IDistributionComponent.sol/IDistributionComponent.dbg.json +1 -1
  33. package/artifacts/contracts/distribution/IDistributionComponent.sol/IDistributionComponent.json +38 -8
  34. package/artifacts/contracts/distribution/IDistributionService.sol/IDistributionService.dbg.json +1 -1
  35. package/artifacts/contracts/distribution/IDistributionService.sol/IDistributionService.json +27 -3
  36. package/artifacts/contracts/examples/fire/DamageLevel.sol/DamageLevelLib.dbg.json +1 -1
  37. package/artifacts/contracts/examples/fire/FirePool.sol/FirePool.dbg.json +1 -1
  38. package/artifacts/contracts/examples/fire/FirePool.sol/FirePool.json +76 -42
  39. package/artifacts/contracts/examples/fire/FirePoolAuthorization.sol/FirePoolAuthorization.dbg.json +1 -1
  40. package/artifacts/contracts/examples/fire/FirePoolAuthorization.sol/FirePoolAuthorization.json +93 -40
  41. package/artifacts/contracts/examples/fire/FireProduct.sol/FireProduct.dbg.json +1 -1
  42. package/artifacts/contracts/examples/fire/FireProduct.sol/FireProduct.json +233 -184
  43. package/artifacts/contracts/examples/fire/FireProductAuthorization.sol/FireProductAuthorization.dbg.json +1 -1
  44. package/artifacts/contracts/examples/fire/FireProductAuthorization.sol/FireProductAuthorization.json +90 -33
  45. package/artifacts/contracts/examples/fire/FireUSD.sol/FireUSD.dbg.json +1 -1
  46. package/artifacts/contracts/examples/unpermissioned/SimpleDistribution.sol/SimpleDistribution.dbg.json +1 -1
  47. package/artifacts/contracts/examples/unpermissioned/SimpleDistribution.sol/SimpleDistribution.json +104 -54
  48. package/artifacts/contracts/examples/unpermissioned/SimpleDistributionAuthorization.sol/SimpleDistributionAuthorization.dbg.json +1 -1
  49. package/artifacts/contracts/examples/unpermissioned/SimpleDistributionAuthorization.sol/SimpleDistributionAuthorization.json +90 -33
  50. package/artifacts/contracts/examples/unpermissioned/SimpleOracle.sol/SimpleOracle.dbg.json +1 -1
  51. package/artifacts/contracts/examples/unpermissioned/SimpleOracle.sol/SimpleOracle.json +95 -45
  52. package/artifacts/contracts/examples/unpermissioned/SimplePool.sol/SimplePool.dbg.json +1 -1
  53. package/artifacts/contracts/examples/unpermissioned/SimplePool.sol/SimplePool.json +98 -48
  54. package/artifacts/contracts/examples/unpermissioned/SimplePoolAuthorization.sol/SimplePoolAuthorization.dbg.json +1 -1
  55. package/artifacts/contracts/examples/unpermissioned/SimplePoolAuthorization.sol/SimplePoolAuthorization.json +93 -40
  56. package/artifacts/contracts/examples/unpermissioned/SimpleProduct.sol/SimpleProduct.dbg.json +1 -1
  57. package/artifacts/contracts/examples/unpermissioned/SimpleProduct.sol/SimpleProduct.json +262 -147
  58. package/artifacts/contracts/examples/unpermissioned/SimpleProductAuthorization.sol/SimpleProductAuthorization.dbg.json +1 -1
  59. package/artifacts/contracts/examples/unpermissioned/SimpleProductAuthorization.sol/SimpleProductAuthorization.json +90 -33
  60. package/artifacts/contracts/instance/BundleSet.sol/BundleSet.dbg.json +1 -1
  61. package/artifacts/contracts/instance/BundleSet.sol/BundleSet.json +2 -2
  62. package/artifacts/contracts/instance/IInstance.sol/IInstance.dbg.json +1 -1
  63. package/artifacts/contracts/instance/IInstance.sol/IInstance.json +54 -21
  64. package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.dbg.json +1 -1
  65. package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.json +53 -3
  66. package/artifacts/contracts/instance/Instance.sol/Instance.dbg.json +1 -1
  67. package/artifacts/contracts/instance/Instance.sol/Instance.json +80 -40
  68. package/artifacts/contracts/instance/InstanceAdmin.sol/InstanceAdmin.dbg.json +1 -1
  69. package/artifacts/contracts/instance/InstanceAdmin.sol/InstanceAdmin.json +289 -92
  70. package/artifacts/contracts/instance/InstanceAuthorizationV3.sol/InstanceAuthorizationV3.dbg.json +1 -1
  71. package/artifacts/contracts/instance/InstanceAuthorizationV3.sol/InstanceAuthorizationV3.json +97 -40
  72. package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.dbg.json +1 -1
  73. package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.json +81 -195
  74. package/artifacts/contracts/instance/InstanceService.sol/InstanceService.dbg.json +1 -1
  75. package/artifacts/contracts/instance/InstanceService.sol/InstanceService.json +65 -58
  76. package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.dbg.json +1 -1
  77. package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.json +20 -22
  78. package/artifacts/contracts/instance/InstanceStore.sol/InstanceStore.dbg.json +1 -1
  79. package/artifacts/contracts/instance/InstanceStore.sol/InstanceStore.json +40 -268
  80. package/artifacts/contracts/instance/RiskSet.sol/RiskSet.dbg.json +1 -1
  81. package/artifacts/contracts/instance/RiskSet.sol/RiskSet.json +2 -2
  82. package/artifacts/contracts/instance/base/BalanceStore.sol/BalanceStore.dbg.json +1 -1
  83. package/artifacts/contracts/instance/base/BalanceStore.sol/BalanceStore.json +2 -2
  84. package/artifacts/contracts/instance/base/Cloneable.sol/Cloneable.dbg.json +1 -1
  85. package/artifacts/contracts/instance/base/ObjectCounter.sol/ObjectCounter.dbg.json +1 -1
  86. package/artifacts/contracts/instance/base/ObjectCounter.sol/ObjectCounter.json +2 -2
  87. package/artifacts/contracts/instance/base/ObjectLifecycle.sol/ObjectLifecycle.dbg.json +1 -1
  88. package/artifacts/contracts/instance/base/ObjectLifecycle.sol/ObjectLifecycle.json +2 -2
  89. package/artifacts/contracts/instance/base/ObjectSet.sol/ObjectSet.dbg.json +1 -1
  90. package/artifacts/contracts/instance/base/ObjectSet.sol/ObjectSet.json +2 -2
  91. package/artifacts/contracts/instance/module/IAccess.sol/IAccess.dbg.json +1 -1
  92. package/artifacts/contracts/instance/module/IBundle.sol/IBundle.dbg.json +1 -1
  93. package/artifacts/contracts/instance/module/IComponents.sol/IComponents.dbg.json +1 -1
  94. package/artifacts/contracts/instance/module/IDistribution.sol/IDistribution.dbg.json +1 -1
  95. package/artifacts/contracts/instance/module/IPolicy.sol/IPolicy.dbg.json +1 -1
  96. package/artifacts/contracts/instance/module/IRisk.sol/IRisk.dbg.json +1 -1
  97. package/artifacts/contracts/mock/Dip.sol/Dip.dbg.json +1 -1
  98. package/artifacts/contracts/oracle/BasicOracle.sol/BasicOracle.dbg.json +1 -1
  99. package/artifacts/contracts/oracle/BasicOracle.sol/BasicOracle.json +68 -38
  100. package/artifacts/contracts/oracle/BasicOracleAuthorization.sol/BasicOracleAuthorization.dbg.json +1 -1
  101. package/artifacts/contracts/oracle/BasicOracleAuthorization.sol/BasicOracleAuthorization.json +92 -35
  102. package/artifacts/contracts/oracle/IOracle.sol/IOracle.dbg.json +1 -1
  103. package/artifacts/contracts/oracle/IOracleComponent.sol/IOracleComponent.dbg.json +1 -1
  104. package/artifacts/contracts/oracle/IOracleComponent.sol/IOracleComponent.json +38 -8
  105. package/artifacts/contracts/oracle/IOracleService.sol/IOracleService.dbg.json +1 -1
  106. package/artifacts/contracts/oracle/IOracleService.sol/IOracleService.json +27 -3
  107. package/artifacts/contracts/oracle/Oracle.sol/Oracle.dbg.json +1 -1
  108. package/artifacts/contracts/oracle/Oracle.sol/Oracle.json +52 -22
  109. package/artifacts/contracts/oracle/OracleService.sol/OracleService.dbg.json +1 -1
  110. package/artifacts/contracts/oracle/OracleService.sol/OracleService.json +75 -68
  111. package/artifacts/contracts/oracle/OracleServiceManager.sol/OracleServiceManager.dbg.json +1 -1
  112. package/artifacts/contracts/oracle/OracleServiceManager.sol/OracleServiceManager.json +25 -27
  113. package/artifacts/contracts/pool/BasicPool.sol/BasicPool.dbg.json +1 -1
  114. package/artifacts/contracts/pool/BasicPool.sol/BasicPool.json +51 -21
  115. package/artifacts/contracts/pool/BasicPoolAuthorization.sol/BasicPoolAuthorization.dbg.json +1 -1
  116. package/artifacts/contracts/pool/BasicPoolAuthorization.sol/BasicPoolAuthorization.json +93 -40
  117. package/artifacts/contracts/pool/BundleService.sol/BundleService.dbg.json +1 -1
  118. package/artifacts/contracts/pool/BundleService.sol/BundleService.json +101 -94
  119. package/artifacts/contracts/pool/BundleServiceManager.sol/BundleServiceManager.dbg.json +1 -1
  120. package/artifacts/contracts/pool/BundleServiceManager.sol/BundleServiceManager.json +38 -40
  121. package/artifacts/contracts/pool/IBundleService.sol/IBundleService.dbg.json +1 -1
  122. package/artifacts/contracts/pool/IBundleService.sol/IBundleService.json +27 -3
  123. package/artifacts/contracts/pool/IPoolComponent.sol/IPoolComponent.dbg.json +1 -1
  124. package/artifacts/contracts/pool/IPoolComponent.sol/IPoolComponent.json +38 -8
  125. package/artifacts/contracts/pool/IPoolService.sol/IPoolService.dbg.json +1 -1
  126. package/artifacts/contracts/pool/IPoolService.sol/IPoolService.json +27 -3
  127. package/artifacts/contracts/pool/Pool.sol/Pool.dbg.json +1 -1
  128. package/artifacts/contracts/pool/Pool.sol/Pool.json +51 -21
  129. package/artifacts/contracts/pool/PoolService.sol/PoolService.dbg.json +1 -1
  130. package/artifacts/contracts/pool/PoolService.sol/PoolService.json +85 -78
  131. package/artifacts/contracts/pool/PoolServiceManager.sol/PoolServiceManager.dbg.json +1 -1
  132. package/artifacts/contracts/pool/PoolServiceManager.sol/PoolServiceManager.json +30 -32
  133. package/artifacts/contracts/product/ApplicationService.sol/ApplicationService.dbg.json +1 -1
  134. package/artifacts/contracts/product/ApplicationService.sol/ApplicationService.json +57 -50
  135. package/artifacts/contracts/product/ApplicationServiceManager.sol/ApplicationServiceManager.dbg.json +1 -1
  136. package/artifacts/contracts/product/ApplicationServiceManager.sol/ApplicationServiceManager.json +16 -18
  137. package/artifacts/contracts/product/BasicProduct.sol/BasicProduct.dbg.json +1 -1
  138. package/artifacts/contracts/product/BasicProduct.sol/BasicProduct.json +157 -112
  139. package/artifacts/contracts/product/BasicProductAuthorization.sol/BasicProductAuthorization.dbg.json +1 -1
  140. package/artifacts/contracts/product/BasicProductAuthorization.sol/BasicProductAuthorization.json +90 -33
  141. package/artifacts/contracts/product/ClaimService.sol/ClaimService.dbg.json +1 -1
  142. package/artifacts/contracts/product/ClaimService.sol/ClaimService.json +249 -150
  143. package/artifacts/contracts/product/ClaimServiceManager.sol/ClaimServiceManager.dbg.json +1 -1
  144. package/artifacts/contracts/product/ClaimServiceManager.sol/ClaimServiceManager.json +57 -55
  145. package/artifacts/contracts/product/IApplicationService.sol/IApplicationService.dbg.json +1 -1
  146. package/artifacts/contracts/product/IApplicationService.sol/IApplicationService.json +27 -3
  147. package/artifacts/contracts/product/IClaimService.sol/IClaimService.dbg.json +1 -1
  148. package/artifacts/contracts/product/IClaimService.sol/IClaimService.json +143 -3
  149. package/artifacts/contracts/product/IPolicyService.sol/IPolicyService.dbg.json +1 -1
  150. package/artifacts/contracts/product/IPolicyService.sol/IPolicyService.json +27 -3
  151. package/artifacts/contracts/product/IPricingService.sol/IPricingService.dbg.json +1 -1
  152. package/artifacts/contracts/product/IPricingService.sol/IPricingService.json +27 -3
  153. package/artifacts/contracts/product/IProductComponent.sol/IProductComponent.dbg.json +1 -1
  154. package/artifacts/contracts/product/IProductComponent.sol/IProductComponent.json +144 -99
  155. package/artifacts/contracts/product/IRiskService.sol/IRiskService.dbg.json +1 -1
  156. package/artifacts/contracts/product/IRiskService.sol/IRiskService.json +27 -3
  157. package/artifacts/contracts/product/PolicyService.sol/PolicyService.dbg.json +1 -1
  158. package/artifacts/contracts/product/PolicyService.sol/PolicyService.json +95 -88
  159. package/artifacts/contracts/product/PolicyServiceManager.sol/PolicyServiceManager.dbg.json +1 -1
  160. package/artifacts/contracts/product/PolicyServiceManager.sol/PolicyServiceManager.json +35 -37
  161. package/artifacts/contracts/product/PricingService.sol/PricingService.dbg.json +1 -1
  162. package/artifacts/contracts/product/PricingService.sol/PricingService.json +85 -78
  163. package/artifacts/contracts/product/PricingServiceManager.sol/PricingServiceManager.dbg.json +1 -1
  164. package/artifacts/contracts/product/PricingServiceManager.sol/PricingServiceManager.json +31 -33
  165. package/artifacts/contracts/product/Product.sol/Product.dbg.json +1 -1
  166. package/artifacts/contracts/product/Product.sol/Product.json +157 -112
  167. package/artifacts/contracts/product/RiskService.sol/RiskService.dbg.json +1 -1
  168. package/artifacts/contracts/product/RiskService.sol/RiskService.json +76 -77
  169. package/artifacts/contracts/product/RiskServiceManager.sol/RiskServiceManager.dbg.json +1 -1
  170. package/artifacts/contracts/product/RiskServiceManager.sol/RiskServiceManager.json +25 -19
  171. package/artifacts/contracts/registry/ChainNft.sol/ChainNft.dbg.json +1 -1
  172. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.dbg.json +1 -1
  173. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.json +7 -2
  174. package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.dbg.json +1 -1
  175. package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.json +31 -7
  176. package/artifacts/contracts/registry/IRelease.sol/IRelease.dbg.json +4 -0
  177. package/artifacts/contracts/registry/IRelease.sol/IRelease.json +24 -0
  178. package/artifacts/contracts/registry/ITransferInterceptor.sol/ITransferInterceptor.dbg.json +1 -1
  179. package/artifacts/contracts/registry/Registry.sol/Registry.dbg.json +1 -1
  180. package/artifacts/contracts/registry/Registry.sol/Registry.json +45 -40
  181. package/artifacts/contracts/registry/RegistryAdmin.sol/RegistryAdmin.dbg.json +1 -1
  182. package/artifacts/contracts/registry/RegistryAdmin.sol/RegistryAdmin.json +176 -214
  183. package/artifacts/contracts/registry/RegistryService.sol/RegistryService.dbg.json +1 -1
  184. package/artifacts/contracts/registry/RegistryService.sol/RegistryService.json +51 -44
  185. package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.dbg.json +1 -1
  186. package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.json +11 -13
  187. package/artifacts/contracts/registry/ReleaseAdmin.sol/ReleaseAdmin.dbg.json +4 -0
  188. package/artifacts/contracts/registry/ReleaseAdmin.sol/ReleaseAdmin.json +1795 -0
  189. package/artifacts/contracts/registry/ReleaseLifecycle.sol/ReleaseLifecycle.dbg.json +1 -1
  190. package/artifacts/contracts/registry/ReleaseLifecycle.sol/ReleaseLifecycle.json +2 -2
  191. package/artifacts/contracts/registry/ReleaseRegistry.sol/ReleaseRegistry.dbg.json +1 -1
  192. package/artifacts/contracts/registry/ReleaseRegistry.sol/ReleaseRegistry.json +307 -49
  193. package/artifacts/contracts/registry/ServiceAuthorizationV3.sol/ServiceAuthorizationV3.dbg.json +1 -1
  194. package/artifacts/contracts/registry/ServiceAuthorizationV3.sol/ServiceAuthorizationV3.json +6 -6
  195. package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.dbg.json +1 -1
  196. package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.json +4 -4
  197. package/artifacts/contracts/shared/Component.sol/Component.dbg.json +1 -1
  198. package/artifacts/contracts/shared/Component.sol/Component.json +51 -21
  199. package/artifacts/contracts/shared/ComponentService.sol/ComponentService.dbg.json +1 -1
  200. package/artifacts/contracts/shared/ComponentService.sol/ComponentService.json +113 -90
  201. package/artifacts/contracts/shared/ComponentServiceManager.sol/ComponentServiceManager.dbg.json +1 -1
  202. package/artifacts/contracts/shared/ComponentServiceManager.sol/ComponentServiceManager.json +44 -38
  203. package/artifacts/contracts/shared/ComponentVerifyingService.sol/ComponentVerifyingService.dbg.json +1 -1
  204. package/artifacts/contracts/shared/ComponentVerifyingService.sol/ComponentVerifyingService.json +27 -16
  205. package/artifacts/contracts/shared/ContractLib.sol/ContractLib.dbg.json +1 -1
  206. package/artifacts/contracts/shared/ContractLib.sol/ContractLib.json +57 -4
  207. package/artifacts/contracts/shared/ContractLib.sol/IInstanceAdminHelper.dbg.json +1 -1
  208. package/artifacts/contracts/shared/ContractLib.sol/ITargetHelper.dbg.json +1 -1
  209. package/artifacts/contracts/shared/ContractLib.sol/ITokenRegistryHelper.dbg.json +4 -0
  210. package/artifacts/contracts/shared/ContractLib.sol/ITokenRegistryHelper.json +40 -0
  211. package/artifacts/contracts/shared/IComponent.sol/IComponent.dbg.json +1 -1
  212. package/artifacts/contracts/shared/IComponent.sol/IComponent.json +38 -8
  213. package/artifacts/contracts/shared/IComponentService.sol/IComponentService.dbg.json +1 -1
  214. package/artifacts/contracts/shared/IComponentService.sol/IComponentService.json +27 -3
  215. package/artifacts/contracts/shared/IInstanceLinkedComponent.sol/IInstanceLinkedComponent.dbg.json +1 -1
  216. package/artifacts/contracts/shared/IInstanceLinkedComponent.sol/IInstanceLinkedComponent.json +38 -8
  217. package/artifacts/contracts/shared/IKeyValueStore.sol/IKeyValueStore.dbg.json +1 -1
  218. package/artifacts/contracts/shared/ILifecycle.sol/ILifecycle.dbg.json +1 -1
  219. package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.dbg.json +1 -1
  220. package/artifacts/contracts/shared/IPolicyHolder.sol/IPolicyHolder.dbg.json +1 -1
  221. package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.dbg.json +1 -1
  222. package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.json +120 -1
  223. package/artifacts/contracts/shared/IRegistryLinked.sol/IRegistryLinked.dbg.json +1 -1
  224. package/artifacts/contracts/shared/IService.sol/IService.dbg.json +1 -1
  225. package/artifacts/contracts/shared/IService.sol/IService.json +27 -3
  226. package/artifacts/contracts/shared/InitializableERC165.sol/InitializableERC165.dbg.json +1 -1
  227. package/artifacts/contracts/shared/InstanceLinkedComponent.sol/InstanceLinkedComponent.dbg.json +1 -1
  228. package/artifacts/contracts/shared/InstanceLinkedComponent.sol/InstanceLinkedComponent.json +51 -21
  229. package/artifacts/contracts/shared/KeyValueStore.sol/KeyValueStore.dbg.json +1 -1
  230. package/artifacts/contracts/shared/Lifecycle.sol/Lifecycle.dbg.json +1 -1
  231. package/artifacts/contracts/shared/NftIdSet.sol/NftIdSet.dbg.json +1 -1
  232. package/artifacts/contracts/shared/NftIdSet.sol/NftIdSet.json +2 -2
  233. package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.dbg.json +1 -1
  234. package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.json +2 -2
  235. package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.dbg.json +1 -1
  236. package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.json +2 -2
  237. package/artifacts/contracts/shared/Registerable.sol/Registerable.dbg.json +1 -1
  238. package/artifacts/contracts/shared/Registerable.sol/Registerable.json +118 -62
  239. package/artifacts/contracts/shared/RegistryLinked.sol/RegistryLinked.dbg.json +1 -1
  240. package/artifacts/contracts/shared/RegistryLinked.sol/RegistryLinked.json +2 -2
  241. package/artifacts/contracts/shared/Service.sol/Service.dbg.json +1 -1
  242. package/artifacts/contracts/shared/Service.sol/Service.json +27 -16
  243. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.dbg.json +1 -1
  244. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.json +3 -3
  245. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandlerBase.dbg.json +1 -1
  246. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandlerBase.json +2 -2
  247. package/artifacts/contracts/shared/TokenHandlerDeployerLib.sol/TokenHandlerDeployerLib.dbg.json +1 -1
  248. package/artifacts/contracts/shared/TokenHandlerDeployerLib.sol/TokenHandlerDeployerLib.json +2 -2
  249. package/artifacts/contracts/staking/IStaking.sol/IStaking.dbg.json +1 -1
  250. package/artifacts/contracts/staking/IStaking.sol/IStaking.json +38 -8
  251. package/artifacts/contracts/staking/IStakingService.sol/IStakingService.dbg.json +1 -1
  252. package/artifacts/contracts/staking/IStakingService.sol/IStakingService.json +27 -3
  253. package/artifacts/contracts/staking/StakeManagerLib.sol/StakeManagerLib.dbg.json +1 -1
  254. package/artifacts/contracts/staking/StakeManagerLib.sol/StakeManagerLib.json +2 -2
  255. package/artifacts/contracts/staking/Staking.sol/Staking.dbg.json +1 -1
  256. package/artifacts/contracts/staking/Staking.sol/Staking.json +90 -57
  257. package/artifacts/contracts/staking/StakingLifecycle.sol/StakingLifecycle.dbg.json +1 -1
  258. package/artifacts/contracts/staking/StakingLifecycle.sol/StakingLifecycle.json +2 -2
  259. package/artifacts/contracts/staking/StakingManager.sol/StakingManager.dbg.json +1 -1
  260. package/artifacts/contracts/staking/StakingManager.sol/StakingManager.json +27 -19
  261. package/artifacts/contracts/staking/StakingReader.sol/StakingReader.dbg.json +1 -1
  262. package/artifacts/contracts/staking/StakingReader.sol/StakingReader.json +2 -2
  263. package/artifacts/contracts/staking/StakingService.sol/StakingService.dbg.json +1 -1
  264. package/artifacts/contracts/staking/StakingService.sol/StakingService.json +59 -52
  265. package/artifacts/contracts/staking/StakingServiceManager.sol/StakingServiceManager.dbg.json +1 -1
  266. package/artifacts/contracts/staking/StakingServiceManager.sol/StakingServiceManager.json +17 -19
  267. package/artifacts/contracts/staking/StakingStore.sol/StakingStore.dbg.json +1 -1
  268. package/artifacts/contracts/staking/StakingStore.sol/StakingStore.json +128 -128
  269. package/artifacts/contracts/staking/TargetManagerLib.sol/TargetManagerLib.dbg.json +1 -1
  270. package/artifacts/contracts/staking/TargetManagerLib.sol/TargetManagerLib.json +22 -22
  271. package/artifacts/contracts/type/AddressSet.sol/LibAddressSet.dbg.json +1 -1
  272. package/artifacts/contracts/type/Amount.sol/AmountLib.dbg.json +1 -1
  273. package/artifacts/contracts/type/Blocknumber.sol/BlocknumberLib.dbg.json +1 -1
  274. package/artifacts/contracts/type/ClaimId.sol/ClaimIdLib.dbg.json +1 -1
  275. package/artifacts/contracts/type/ClaimId.sol/ClaimIdLib.json +2 -2
  276. package/artifacts/contracts/type/DistributorType.sol/DistributorTypeLib.dbg.json +1 -1
  277. package/artifacts/contracts/type/DistributorType.sol/DistributorTypeLib.json +2 -2
  278. package/artifacts/contracts/type/Fee.sol/FeeLib.dbg.json +1 -1
  279. package/artifacts/contracts/type/Key32.sol/Key32Lib.dbg.json +1 -1
  280. package/artifacts/contracts/type/Key32.sol/Key32Lib.json +2 -2
  281. package/artifacts/contracts/type/Key32Set.sol/LibKey32Set.dbg.json +1 -1
  282. package/artifacts/contracts/type/Key32Set.sol/LibKey32Set.json +2 -2
  283. package/artifacts/contracts/type/NftId.sol/NftIdLib.dbg.json +1 -1
  284. package/artifacts/contracts/type/NftId.sol/NftIdLib.json +2 -2
  285. package/artifacts/contracts/type/NftIdSet.sol/LibNftIdSet.dbg.json +1 -1
  286. package/artifacts/contracts/type/NftIdSet.sol/LibNftIdSet.json +2 -2
  287. package/artifacts/contracts/type/ObjectType.sol/ObjectTypeLib.dbg.json +1 -1
  288. package/artifacts/contracts/type/ObjectType.sol/ObjectTypeLib.json +2 -2
  289. package/artifacts/contracts/type/PayoutId.sol/PayoutIdLib.dbg.json +1 -1
  290. package/artifacts/contracts/type/PayoutId.sol/PayoutIdLib.json +2 -2
  291. package/artifacts/contracts/type/Referral.sol/ReferralLib.dbg.json +1 -1
  292. package/artifacts/contracts/type/Referral.sol/ReferralLib.json +2 -2
  293. package/artifacts/contracts/type/RequestId.sol/RequestIdLib.dbg.json +1 -1
  294. package/artifacts/contracts/type/RequestId.sol/RequestIdLib.json +2 -2
  295. package/artifacts/contracts/type/RiskId.sol/RiskIdLib.dbg.json +1 -1
  296. package/artifacts/contracts/type/RiskId.sol/RiskIdLib.json +23 -4
  297. package/artifacts/contracts/type/RoleId.sol/RoleIdLib.dbg.json +1 -1
  298. package/artifacts/contracts/type/RoleId.sol/RoleIdLib.json +79 -15
  299. package/artifacts/contracts/type/Seconds.sol/SecondsLib.dbg.json +1 -1
  300. package/artifacts/contracts/type/Selector.sol/SelectorLib.dbg.json +1 -1
  301. package/artifacts/contracts/type/Selector.sol/SelectorSetLib.dbg.json +1 -1
  302. package/artifacts/contracts/type/StateId.sol/StateIdLib.dbg.json +1 -1
  303. package/artifacts/contracts/type/String.sol/StrLib.dbg.json +1 -1
  304. package/artifacts/contracts/type/Timestamp.sol/TimestampLib.dbg.json +1 -1
  305. package/artifacts/contracts/type/Timestamp.sol/TimestampLib.json +2 -2
  306. package/artifacts/contracts/type/UFixed.sol/UFixedLib.dbg.json +1 -1
  307. package/artifacts/contracts/type/Version.sol/VersionLib.dbg.json +1 -1
  308. package/artifacts/contracts/type/Version.sol/VersionLib.json +2 -21
  309. package/artifacts/contracts/type/Version.sol/VersionPartLib.dbg.json +1 -1
  310. package/artifacts/contracts/type/Version.sol/VersionPartLib.json +47 -2
  311. package/artifacts/contracts/upgradeability/IVersionable.sol/IVersionable.dbg.json +1 -1
  312. package/artifacts/contracts/upgradeability/ProxyManager.sol/ProxyManager.dbg.json +1 -1
  313. package/artifacts/contracts/upgradeability/ProxyManager.sol/ProxyManager.json +2 -2
  314. package/artifacts/contracts/upgradeability/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.dbg.json +1 -1
  315. package/artifacts/contracts/upgradeability/Versionable.sol/Versionable.dbg.json +1 -1
  316. package/contracts/accounting/AccountingService.sol +3 -4
  317. package/contracts/accounting/AccountingServiceManager.sol +1 -1
  318. package/contracts/authorization/AccessAdmin.sol +115 -71
  319. package/contracts/authorization/AccessManagerCloneable.sol +136 -3
  320. package/contracts/authorization/Authorization.sol +268 -227
  321. package/contracts/authorization/IAccessAdmin.sol +6 -3
  322. package/contracts/authorization/IAuthorization.sol +7 -1
  323. package/contracts/distribution/BasicDistributionAuthorization.sol +9 -8
  324. package/contracts/distribution/DistributionService.sol +6 -6
  325. package/contracts/distribution/DistributionServiceManager.sol +1 -1
  326. package/contracts/examples/fire/FirePoolAuthorization.sol +1 -1
  327. package/contracts/examples/fire/FireProduct.sol +3 -1
  328. package/contracts/examples/fire/FireProductAuthorization.sol +1 -1
  329. package/contracts/examples/unpermissioned/SimpleDistributionAuthorization.sol +1 -1
  330. package/contracts/examples/unpermissioned/SimplePoolAuthorization.sol +1 -1
  331. package/contracts/examples/unpermissioned/SimpleProduct.sol +18 -0
  332. package/contracts/examples/unpermissioned/SimpleProductAuthorization.sol +1 -1
  333. package/contracts/instance/BundleSet.sol +0 -1
  334. package/contracts/instance/IInstance.sol +6 -7
  335. package/contracts/instance/IInstanceService.sol +2 -0
  336. package/contracts/instance/Instance.sol +17 -9
  337. package/contracts/instance/InstanceAdmin.sol +227 -53
  338. package/contracts/instance/InstanceAuthorizationV3.sol +14 -8
  339. package/contracts/instance/InstanceReader.sol +6 -6
  340. package/contracts/instance/InstanceService.sol +41 -29
  341. package/contracts/instance/InstanceServiceManager.sol +1 -1
  342. package/contracts/instance/InstanceStore.sol +1 -0
  343. package/contracts/instance/RiskSet.sol +7 -9
  344. package/contracts/instance/base/ObjectLifecycle.sol +2 -1
  345. package/contracts/instance/module/IComponents.sol +0 -8
  346. package/contracts/instance/module/IRisk.sol +2 -0
  347. package/contracts/oracle/BasicOracleAuthorization.sol +11 -10
  348. package/contracts/oracle/Oracle.sol +1 -1
  349. package/contracts/oracle/OracleService.sol +16 -15
  350. package/contracts/oracle/OracleServiceManager.sol +1 -1
  351. package/contracts/pool/BasicPoolAuthorization.sol +10 -9
  352. package/contracts/pool/BundleService.sol +3 -3
  353. package/contracts/pool/BundleServiceManager.sol +1 -1
  354. package/contracts/pool/PoolService.sol +4 -4
  355. package/contracts/pool/PoolServiceManager.sol +1 -1
  356. package/contracts/product/ApplicationService.sol +3 -3
  357. package/contracts/product/ApplicationServiceManager.sol +1 -1
  358. package/contracts/product/BasicProduct.sol +2 -0
  359. package/contracts/product/BasicProductAuthorization.sol +10 -9
  360. package/contracts/product/ClaimService.sol +144 -50
  361. package/contracts/product/ClaimServiceManager.sol +1 -1
  362. package/contracts/product/IClaimService.sol +13 -0
  363. package/contracts/product/IProductComponent.sol +4 -1
  364. package/contracts/product/PolicyService.sol +3 -3
  365. package/contracts/product/PolicyServiceManager.sol +1 -1
  366. package/contracts/product/PricingService.sol +23 -19
  367. package/contracts/product/PricingServiceManager.sol +3 -3
  368. package/contracts/product/Product.sol +36 -0
  369. package/contracts/product/RiskService.sol +65 -21
  370. package/contracts/product/RiskServiceManager.sol +1 -1
  371. package/contracts/registry/IRegistry.sol +6 -15
  372. package/contracts/registry/IRelease.sol +26 -0
  373. package/contracts/registry/Registry.sol +3 -2
  374. package/contracts/registry/RegistryAdmin.sol +117 -230
  375. package/contracts/registry/RegistryService.sol +3 -3
  376. package/contracts/registry/RegistryServiceManager.sol +1 -1
  377. package/contracts/registry/ReleaseAdmin.sol +245 -0
  378. package/contracts/registry/ReleaseLifecycle.sol +2 -0
  379. package/contracts/registry/ReleaseRegistry.sol +124 -99
  380. package/contracts/registry/ServiceAuthorizationV3.sol +36 -1
  381. package/contracts/registry/TokenRegistry.sol +6 -8
  382. package/contracts/shared/Component.sol +24 -17
  383. package/contracts/shared/ComponentService.sol +63 -51
  384. package/contracts/shared/ComponentServiceManager.sol +1 -1
  385. package/contracts/shared/ContractLib.sol +29 -1
  386. package/contracts/shared/IComponent.sol +3 -4
  387. package/contracts/shared/IRegisterable.sol +15 -4
  388. package/contracts/shared/IService.sol +3 -5
  389. package/contracts/shared/NftOwnable.sol +4 -4
  390. package/contracts/shared/PolicyHolder.sol +1 -1
  391. package/contracts/shared/Registerable.sol +45 -19
  392. package/contracts/shared/RegistryLinked.sol +1 -1
  393. package/contracts/shared/Service.sol +8 -27
  394. package/contracts/shared/TokenHandler.sol +2 -2
  395. package/contracts/staking/Staking.sol +23 -12
  396. package/contracts/staking/StakingService.sol +2 -3
  397. package/contracts/type/ObjectType.sol +41 -27
  398. package/contracts/type/RiskId.sol +5 -0
  399. package/contracts/type/RoleId.sol +24 -4
  400. package/contracts/type/Timestamp.sol +0 -5
  401. package/contracts/type/Version.sol +15 -5
  402. package/contracts/upgradeability/ProxyManager.sol +1 -1
  403. package/package.json +1 -1
  404. package/artifacts/contracts/authorization/ReleaseAccessManager.sol/ReleaseAccessManager.dbg.json +0 -4
  405. package/artifacts/contracts/authorization/ReleaseAccessManager.sol/ReleaseAccessManager.json +0 -1196
  406. package/contracts/authorization/ReleaseAccessManager.sol +0 -38
@@ -8,10 +8,13 @@ import {
8
8
  import {IAccess} from "../authorization/IAccess.sol";
9
9
  import {IAccountingService} from "../accounting/IAccountingService.sol";
10
10
  import {IBundleService} from "../pool/IBundleService.sol";
11
+ import {IClaimService} from "../product/IClaimService.sol";
11
12
  import {IDistributionService} from "../distribution/IDistributionService.sol";
13
+ import {IInstanceService} from "../instance/IInstanceService.sol";
12
14
  import {IPoolService} from "../pool/IPoolService.sol";
13
15
  import {IStakingService} from "../staking/IStakingService.sol";
14
16
  import {IRegistryService} from "./IRegistryService.sol";
17
+ import {IRiskService} from "../product/IRiskService.sol";
15
18
  import {ServiceAuthorization} from "../authorization/ServiceAuthorization.sol";
16
19
 
17
20
 
@@ -51,8 +54,11 @@ contract ServiceAuthorizationV3
51
54
  _setupIRegistryServiceAuthorization();
52
55
  _setupStakingServiceAuthorization();
53
56
  _setupInstanceServiceAuthorization();
57
+ _setupInstanceServiceAuthorization();
54
58
  _setupAccountingServiceAuthorization();
55
59
  _setupComponentServiceAuthorization();
60
+ _setupClaimServiceAuthorization();
61
+ _setupRiskServiceAuthorization();
56
62
  _setupDistributionServiceAuthorization();
57
63
  _setupPoolServiceAuthorization();
58
64
  _setupBundleServiceAuthorization();
@@ -115,6 +121,16 @@ contract ServiceAuthorizationV3
115
121
  function _setupInstanceServiceAuthorization()
116
122
  internal
117
123
  {
124
+ IAccess.FunctionInfo[] storage functions;
125
+ functions = _authorizeForService(INSTANCE(), ALL());
126
+ _authorize(functions, IInstanceService.createInstance.selector, "createInstance");
127
+ _authorize(functions, IInstanceService.upgradeInstanceReader.selector, "upgradeInstanceReader");
128
+ _authorize(functions, IInstanceService.upgradeMasterInstanceReader.selector, "upgradeMasterInstanceReader");
129
+
130
+ _authorize(functions, IInstanceService.setStakingLockingPeriod.selector, "setStakingLockingPeriod");
131
+ _authorize(functions, IInstanceService.setStakingRewardRate.selector, "setStakingRewardRate");
132
+ _authorize(functions, IInstanceService.refillStakingRewardReserves.selector, "refillStakingRewardReserves");
133
+ _authorize(functions, IInstanceService.withdrawStakingRewardReserves.selector, "withdrawStakingRewardReserves");
118
134
  }
119
135
 
120
136
  /// @dev Accounting service function authorization.
@@ -155,11 +171,30 @@ contract ServiceAuthorizationV3
155
171
  }
156
172
 
157
173
  /// @dev Distribution service function authorization.
158
- function _setupDistributionServiceAuthorization()
174
+ function _setupRiskServiceAuthorization()
159
175
  internal
160
176
  {
161
177
  IAccess.FunctionInfo[] storage functions;
178
+ functions = _authorizeForService(RISK(), ALL());
179
+ _authorize(functions, IRiskService.createRisk.selector, "createRisk");
180
+ _authorize(functions, IRiskService.updateRisk.selector, "updateRisk");
181
+ _authorize(functions, IRiskService.updateRiskState.selector, "updateRiskState");
182
+ }
162
183
 
184
+ /// @dev Distribution service function authorization.
185
+ function _setupClaimServiceAuthorization()
186
+ internal
187
+ {
188
+ IAccess.FunctionInfo[] storage functions;
189
+ functions = _authorizeForService(CLAIM(), ALL());
190
+ _authorize(functions, IClaimService.submit.selector, "submit");
191
+ }
192
+
193
+ /// @dev Distribution service function authorization.
194
+ function _setupDistributionServiceAuthorization()
195
+ internal
196
+ {
197
+ IAccess.FunctionInfo[] storage functions;
163
198
  functions = _authorizeForService(DISTRIBUTION(), POLICY());
164
199
  _authorize(functions, IDistributionService.processSale.selector, "processSale");
165
200
  _authorize(functions, IDistributionService.processReferral.selector, "processReferral");
@@ -8,15 +8,13 @@ import {ERC165Checker} from "@openzeppelin/contracts/utils/introspection/ERC165C
8
8
  import {REGISTRY} from "../type/ObjectType.sol";
9
9
  import {VersionPart} from "../type/Version.sol";
10
10
 
11
- import {IRegisterable} from "../shared/IRegisterable.sol";
12
-
13
11
  import {IRegistry} from "./IRegistry.sol";
14
12
  import {IRegistryLinked} from "../shared/IRegistryLinked.sol";
15
13
  import {ReleaseRegistry} from "./ReleaseRegistry.sol";
16
14
  import {RegistryAdmin} from "./RegistryAdmin.sol";
17
15
 
18
-
19
- /// @title contract to register token per GIF major release.
16
+ /// @dev The TokenRegistry contract is used to whitelist/manage ERC-20 of tokens per major release.
17
+ /// Only whitelisted tokens can be used as default tokens for products, distribution and pools components.
20
18
  contract TokenRegistry is
21
19
  AccessManaged,
22
20
  IRegistryLinked
@@ -68,7 +66,7 @@ contract TokenRegistry is
68
66
  setAuthority(authority);
69
67
 
70
68
  _registry = registry;
71
- _dipToken = dipToken;
69
+ _dipToken = _verifyOnchainToken(address(dipToken));
72
70
 
73
71
  // register dip token
74
72
  uint256 chainId = block.chainid;
@@ -212,13 +210,13 @@ contract TokenRegistry is
212
210
  return _tokenInfo[chainId][token].chainId > 0;
213
211
  }
214
212
 
215
- /// @dev returns true iff both the token is active for the specfied version and the global token state is active
216
- function isActive(uint256 chainId, address token, VersionPart majorVersion) external view returns (bool) {
213
+ /// @dev returns true iff both the token is active for the specfied release and the global token state is active
214
+ function isActive(uint256 chainId, address token, VersionPart release) external view returns (bool) {
217
215
  if(!_tokenInfo[chainId][token].active) {
218
216
  return false;
219
217
  }
220
218
 
221
- return _active[chainId][token][majorVersion];
219
+ return _active[chainId][token][release];
222
220
  }
223
221
 
224
222
  function getDipTokenAddress() external view returns (address) {
@@ -1,21 +1,24 @@
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";
6
5
  import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
7
6
 
8
7
  import {Amount} from "../type/Amount.sol";
8
+ import {ContractLib} from "./ContractLib.sol";
9
9
  import {IComponent} from "./IComponent.sol";
10
10
  import {IComponents} from "../instance/module/IComponents.sol";
11
11
  import {IComponentService} from "./IComponentService.sol";
12
+ import {IRegistry} from "../registry/IRegistry.sol";
13
+ import {IRelease} from "../registry/IRelease.sol";
12
14
  import {NftId} from "../type/NftId.sol";
13
- import {ObjectType, COMPONENT} from "../type/ObjectType.sol";
15
+ import {ObjectType, COMPONENT, STAKING} from "../type/ObjectType.sol";
14
16
  import {Registerable} from "../shared/Registerable.sol";
15
17
  import {TokenHandler} from "../shared/TokenHandler.sol";
18
+ import {Version, VersionLib, VersionPart} from "../type/Version.sol";
19
+
16
20
 
17
21
  abstract contract Component is
18
- AccessManagedUpgradeable,
19
22
  Registerable,
20
23
  IComponent
21
24
  {
@@ -62,15 +65,26 @@ abstract contract Component is
62
65
  virtual
63
66
  onlyInitializing()
64
67
  {
65
- if (token == address(0)) {
66
- revert ErrorComponentTokenAddressZero();
68
+ address tokenRegistry = IRegistry(registry).getTokenRegistryAddress();
69
+ VersionPart release = IRelease(authority).getRelease();
70
+
71
+ // special case for staking: component intitialization happens before
72
+ // GIF core contract setup is complete. at that time token registry
73
+ // is not yet available. therefore we skip the check for staking.
74
+ if (componentType != STAKING()) {
75
+
76
+ // check if provided token is whitelisted and active
77
+ if (!ContractLib.isActiveToken(tokenRegistry, token, block.chainid, release)) {
78
+ revert ErrorComponentTokenInvalid(token);
79
+ }
67
80
  }
68
81
 
69
82
  if (bytes(name).length == 0) {
70
83
  revert ErrorComponentNameLengthZero();
71
84
  }
72
85
 
73
- _initializeRegisterable(
86
+ __Registerable_init(
87
+ authority,
74
88
  registry,
75
89
  parentNftId,
76
90
  componentType,
@@ -78,8 +92,6 @@ abstract contract Component is
78
92
  initialOwner,
79
93
  registryData);
80
94
 
81
- __AccessManaged_init(authority);
82
-
83
95
  // set component state
84
96
  ComponentStorage storage $ = _getComponentStorage();
85
97
  $._name = name;
@@ -93,15 +105,6 @@ abstract contract Component is
93
105
  }
94
106
 
95
107
 
96
- // function setWallet(address newWallet)
97
- // external
98
- // virtual
99
- // override
100
- // onlyOwner
101
- // {
102
- // _setWallet(newWallet);
103
- // }
104
-
105
108
  /// @dev callback function for nft transfers
106
109
  /// may only be called by chain nft contract.
107
110
  /// override internal function _nftTransferFrom to implement custom behaviour
@@ -129,6 +132,10 @@ abstract contract Component is
129
132
  return getComponentInfo().name;
130
133
  }
131
134
 
135
+ function getVersion() public view virtual returns (Version version) {
136
+ return VersionLib.toVersion(1, 0, 0);
137
+ }
138
+
132
139
  function getComponentInfo() public virtual view returns (IComponents.ComponentInfo memory info) {
133
140
  if (isRegistered()) {
134
141
  return _getComponentInfo();
@@ -3,9 +3,6 @@ pragma solidity ^0.8.20;
3
3
 
4
4
  import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
5
5
 
6
- import {Amount, AmountLib} from "../type/Amount.sol";
7
- import {ContractLib} from "../shared/ContractLib.sol";
8
- import {Fee, FeeLib} from "../type/Fee.sol";
9
6
  import {IAccountingService} from "../accounting/IAccountingService.sol";
10
7
  import {IComponent} from "../shared/IComponent.sol";
11
8
  import {IComponents} from "../instance/module/IComponents.sol";
@@ -26,7 +23,7 @@ import {Amount, AmountLib} from "../type/Amount.sol";
26
23
  import {ContractLib} from "../shared/ContractLib.sol";
27
24
  import {Fee, FeeLib} from "../type/Fee.sol";
28
25
  import {KEEP_STATE} from "../type/StateId.sol";
29
- import {NftId} from "../type/NftId.sol";
26
+ import {NftId, NftIdLib} from "../type/NftId.sol";
30
27
  import {ObjectType, ACCOUNTING, REGISTRY, COMPONENT, DISTRIBUTION, INSTANCE, ORACLE, POOL, PRODUCT} from "../type/ObjectType.sol";
31
28
  import {Service} from "../shared/Service.sol";
32
29
  import {TokenHandler} from "../shared/TokenHandler.sol";
@@ -79,11 +76,11 @@ contract ComponentService is
79
76
  initializer()
80
77
  {
81
78
  (
82
- address registryAddress,
83
- address authority
79
+ address authority,
80
+ address registry
84
81
  ) = abi.decode(data, (address, address));
85
82
 
86
- _initializeService(registryAddress, authority, owner);
83
+ __Service_init(authority, registry, owner);
87
84
 
88
85
  _accountingService = IAccountingService(_getServiceAddress(ACCOUNTING()));
89
86
  _registryService = IRegistryService(_getServiceAddress(REGISTRY()));
@@ -236,14 +233,25 @@ contract ComponentService is
236
233
 
237
234
  // get product
238
235
  IProductComponent product = IProductComponent(productAddress);
236
+
237
+ IComponents.ProductInfo memory initialProductInfo = product.getInitialProductInfo();
238
+ // force initialization of linked components with empty values to
239
+ // ensure no components are linked upon initialization of the product
240
+ initialProductInfo.poolNftId = NftIdLib.zero();
241
+ initialProductInfo.distributionNftId = NftIdLib.zero();
242
+ initialProductInfo.oracleNftId = new NftId[](initialProductInfo.expectedNumberOfOracles);
239
243
 
240
244
  // create info
241
245
  instanceStore.createProduct(
242
246
  productNftId,
243
- product.getInitialProductInfo());
247
+ initialProductInfo);
248
+ instanceStore.createFee(
249
+ productNftId,
250
+ product.getInitialFeeInfo());
244
251
 
252
+ // TODO cleanup move authorization into _register
245
253
  // authorize
246
- instanceAdmin.initializeComponentAuthorization(product);
254
+ // instanceAdmin.initializeComponentAuthorization(product);
247
255
  }
248
256
 
249
257
 
@@ -256,25 +264,25 @@ contract ComponentService is
256
264
  nonReentrant()
257
265
  {
258
266
  (NftId productNftId, IInstance instance) = _getAndVerifyActiveComponent(PRODUCT());
259
- IComponents.ProductInfo memory productInfo = instance.getInstanceReader().getProductInfo(productNftId);
267
+ IComponents.FeeInfo memory feeInfo = instance.getInstanceReader().getFeeInfo(productNftId);
260
268
  bool feesChanged = false;
261
269
 
262
270
  // update product fee if required
263
- if(!FeeLib.eq(productInfo.productFee, productFee)) {
264
- _logUpdateFee(productNftId, "ProductFee", productInfo.productFee, productFee);
265
- productInfo.productFee = productFee;
271
+ if(!FeeLib.eq(feeInfo.productFee, productFee)) {
272
+ _logUpdateFee(productNftId, "ProductFee", feeInfo.productFee, productFee);
273
+ feeInfo.productFee = productFee;
266
274
  feesChanged = true;
267
275
  }
268
276
 
269
277
  // update processing fee if required
270
- if(!FeeLib.eq(productInfo.processingFee, processingFee)) {
271
- _logUpdateFee(productNftId, "ProcessingFee", productInfo.processingFee, processingFee);
272
- productInfo.processingFee = processingFee;
278
+ if(!FeeLib.eq(feeInfo.processingFee, processingFee)) {
279
+ _logUpdateFee(productNftId, "ProcessingFee", feeInfo.processingFee, processingFee);
280
+ feeInfo.processingFee = processingFee;
273
281
  feesChanged = true;
274
282
  }
275
283
 
276
284
  if(feesChanged) {
277
- instance.getInstanceStore().updateProduct(productNftId, productInfo, KEEP_STATE());
285
+ instance.getInstanceStore().updateFee(productNftId, feeInfo);
278
286
  emit LogComponentServiceProductFeesUpdated(productNftId);
279
287
  }
280
288
  }
@@ -310,9 +318,10 @@ contract ComponentService is
310
318
  productInfo.distributionNftId = distributionNftId;
311
319
  instanceStore.updateProduct(productNftId, productInfo, KEEP_STATE());
312
320
 
321
+ // TODO cleanup
313
322
  // authorize
314
- instanceAdmin.initializeComponentAuthorization(
315
- IInstanceLinkedComponent(distributioAddress));
323
+ // instanceAdmin.initializeComponentAuthorization(
324
+ // IInstanceLinkedComponent(distributioAddress));
316
325
  }
317
326
 
318
327
 
@@ -324,26 +333,26 @@ contract ComponentService is
324
333
  virtual
325
334
  {
326
335
  (NftId distributionNftId, IInstance instance) = _getAndVerifyActiveComponent(DISTRIBUTION());
327
- (NftId productNftId, IComponents.ProductInfo memory productInfo) = _getLinkedProductInfo(
336
+ (NftId productNftId, IComponents.FeeInfo memory feeInfo) = _getLinkedFeeInfo(
328
337
  instance.getInstanceReader(), distributionNftId);
329
338
  bool feesChanged = false;
330
339
 
331
340
  // update distributino fee if required
332
- if(!FeeLib.eq(productInfo.distributionFee, distributionFee)) {
333
- _logUpdateFee(productNftId, "DistributionFee", productInfo.distributionFee, distributionFee);
334
- productInfo.distributionFee = distributionFee;
341
+ if(!FeeLib.eq(feeInfo.distributionFee, distributionFee)) {
342
+ _logUpdateFee(productNftId, "DistributionFee", feeInfo.distributionFee, distributionFee);
343
+ feeInfo.distributionFee = distributionFee;
335
344
  feesChanged = true;
336
345
  }
337
346
 
338
347
  // update min distribution owner fee if required
339
- if(!FeeLib.eq(productInfo.minDistributionOwnerFee, minDistributionOwnerFee)) {
340
- _logUpdateFee(productNftId, "MinDistributionOwnerFee", productInfo.minDistributionOwnerFee, minDistributionOwnerFee);
341
- productInfo.minDistributionOwnerFee = minDistributionOwnerFee;
348
+ if(!FeeLib.eq(feeInfo.minDistributionOwnerFee, minDistributionOwnerFee)) {
349
+ _logUpdateFee(productNftId, "MinDistributionOwnerFee", feeInfo.minDistributionOwnerFee, minDistributionOwnerFee);
350
+ feeInfo.minDistributionOwnerFee = minDistributionOwnerFee;
342
351
  feesChanged = true;
343
352
  }
344
353
 
345
354
  if(feesChanged) {
346
- instance.getInstanceStore().updateProduct(productNftId, productInfo, KEEP_STATE());
355
+ instance.getInstanceStore().updateFee(productNftId, feeInfo);
347
356
  emit LogComponentServiceDistributionFeesUpdated(distributionNftId);
348
357
  }
349
358
  }
@@ -379,9 +388,9 @@ contract ComponentService is
379
388
  productInfo.numberOfOracles++;
380
389
  instanceStore.updateProduct(productNftId, productInfo, KEEP_STATE());
381
390
 
382
- // authorize
383
- instanceAdmin.initializeComponentAuthorization(
384
- IInstanceLinkedComponent(oracleAddress));
391
+ // TODO cleanup
392
+ // instanceAdmin.initializeComponentAuthorization(
393
+ // IInstanceLinkedComponent(oracleAddress));
385
394
  }
386
395
 
387
396
  //-------- pool ---------------------------------------------------------//
@@ -417,8 +426,8 @@ contract ComponentService is
417
426
  productInfo.poolNftId = poolNftId;
418
427
  instanceStore.updateProduct(productNftId, productInfo, KEEP_STATE());
419
428
 
420
- // authorize
421
- instanceAdmin.initializeComponentAuthorization(pool);
429
+ // TODO cleanup
430
+ // instanceAdmin.initializeComponentAuthorization(pool);
422
431
  }
423
432
 
424
433
 
@@ -432,33 +441,33 @@ contract ComponentService is
432
441
  {
433
442
  (NftId poolNftId, IInstance instance) = _getAndVerifyActiveComponent(POOL());
434
443
 
435
- (NftId productNftId, IComponents.ProductInfo memory productInfo) = _getLinkedProductInfo(
444
+ (NftId productNftId, IComponents.FeeInfo memory feeInfo) = _getLinkedFeeInfo(
436
445
  instance.getInstanceReader(), poolNftId);
437
446
  bool feesChanged = false;
438
447
 
439
448
  // update pool fee if required
440
- if(!FeeLib.eq(productInfo.poolFee, poolFee)) {
441
- _logUpdateFee(productNftId, "PoolFee", productInfo.poolFee, poolFee);
442
- productInfo.poolFee = poolFee;
449
+ if(!FeeLib.eq(feeInfo.poolFee, poolFee)) {
450
+ _logUpdateFee(productNftId, "PoolFee", feeInfo.poolFee, poolFee);
451
+ feeInfo.poolFee = poolFee;
443
452
  feesChanged = true;
444
453
  }
445
454
 
446
455
  // update staking fee if required
447
- if(!FeeLib.eq(productInfo.stakingFee, stakingFee)) {
448
- _logUpdateFee(productNftId, "StakingFee", productInfo.stakingFee, stakingFee);
449
- productInfo.stakingFee = stakingFee;
456
+ if(!FeeLib.eq(feeInfo.stakingFee, stakingFee)) {
457
+ _logUpdateFee(productNftId, "StakingFee", feeInfo.stakingFee, stakingFee);
458
+ feeInfo.stakingFee = stakingFee;
450
459
  feesChanged = true;
451
460
  }
452
461
 
453
462
  // update performance fee if required
454
- if(!FeeLib.eq(productInfo.performanceFee, performanceFee)) {
455
- _logUpdateFee(productNftId, "PerformanceFee", productInfo.performanceFee, performanceFee);
456
- productInfo.performanceFee = performanceFee;
463
+ if(!FeeLib.eq(feeInfo.performanceFee, performanceFee)) {
464
+ _logUpdateFee(productNftId, "PerformanceFee", feeInfo.performanceFee, performanceFee);
465
+ feeInfo.performanceFee = performanceFee;
457
466
  feesChanged = true;
458
467
  }
459
468
 
460
469
  if(feesChanged) {
461
- instance.getInstanceStore().updateProduct(productNftId, productInfo, KEEP_STATE());
470
+ instance.getInstanceStore().updateFee(productNftId, feeInfo);
462
471
  emit LogComponentServicePoolFeesUpdated(poolNftId);
463
472
  }
464
473
  }
@@ -517,9 +526,6 @@ contract ComponentService is
517
526
  address(token),
518
527
  address(instanceAdmin.authority()));
519
528
 
520
- // set token handler allowance to max
521
- // componentInfo.tokenHandler.approve(token, AmountLib.max());
522
-
523
529
  // register component with instance
524
530
  instanceStore.createComponent(
525
531
  componentNftId,
@@ -528,6 +534,9 @@ contract ComponentService is
528
534
  // link component contract to nft id
529
535
  component.linkToRegisteredNftId();
530
536
 
537
+ // authorize
538
+ instanceAdmin.initializeComponentAuthorization(component);
539
+
531
540
  emit LogComponentServiceRegistered(instanceNftId, componentNftId, requiredType, address(component), address(token), initialOwner);
532
541
  }
533
542
 
@@ -547,7 +556,7 @@ contract ComponentService is
547
556
  }
548
557
 
549
558
 
550
- function _getLinkedProductInfo(
559
+ function _getLinkedFeeInfo(
551
560
  InstanceReader instanceReader,
552
561
  NftId componentNftId
553
562
  )
@@ -555,11 +564,11 @@ contract ComponentService is
555
564
  view
556
565
  returns(
557
566
  NftId productNftId,
558
- IComponents.ProductInfo memory info
567
+ IComponents.FeeInfo memory info
559
568
  )
560
569
  {
561
570
  productNftId = getRegistry().getObjectInfo(componentNftId).parentNftId;
562
- info = instanceReader.getProductInfo(productNftId);
571
+ info = instanceReader.getFeeInfo(productNftId);
563
572
  }
564
573
 
565
574
 
@@ -607,9 +616,12 @@ contract ComponentService is
607
616
  revert ErrorComponentServiceAlreadyRegistered(componentAddress);
608
617
  }
609
618
 
610
- // check release matches
619
+ // component release matches servie release
611
620
  address parentAddress = registry.getObjectAddress(parentNftId);
612
- if (component.getRelease() != IRegisterable(parentAddress).getRelease()) {
621
+ if (component.getRelease() != getRelease()) {
622
+ revert ErrorComponentServiceReleaseMismatch(componentAddress, component.getRelease(), getRelease());
623
+ // component release matches parent release
624
+ } else if (component.getRelease() != IRegisterable(parentAddress).getRelease()){
613
625
  revert ErrorComponentServiceReleaseMismatch(componentAddress, component.getRelease(), IRegisterable(parentAddress).getRelease());
614
626
  }
615
627
 
@@ -17,7 +17,7 @@ contract ComponentServiceManager is ProxyManager {
17
17
  )
18
18
  {
19
19
  ComponentService svc = new ComponentService();
20
- bytes memory data = abi.encode(registry, authority);
20
+ bytes memory data = abi.encode(authority, registry);
21
21
  IVersionable versionable = initialize(
22
22
  registry,
23
23
  address(svc),
@@ -2,12 +2,14 @@
2
2
  pragma solidity ^0.8.20;
3
3
 
4
4
  import {ERC165Checker} from "@openzeppelin/contracts/utils/introspection/ERC165Checker.sol";
5
+ import {IAccessManager} from "@openzeppelin/contracts/access/manager/IAccessManager.sol";
5
6
 
6
7
  // import {InstanceAdmin} from "../instance/InstanceAdmin.sol";
7
8
  import {IRegistry} from "../registry/IRegistry.sol";
8
9
  import {IPolicyHolder} from "../shared/IPolicyHolder.sol";
9
10
  import {NftId} from "../type/NftId.sol";
10
11
  import {ObjectType, PRODUCT, DISTRIBUTION, ORACLE, POOL, STAKING} from "../type/ObjectType.sol";
12
+ import {VersionPart} from "../type/Version.sol";
11
13
 
12
14
  interface ITargetHelper {
13
15
  function isTargetLocked(address target) external view returns (bool);
@@ -17,6 +19,10 @@ interface IInstanceAdminHelper {
17
19
  function getInstanceAdmin() external view returns (ITargetHelper);
18
20
  }
19
21
 
22
+ interface ITokenRegistryHelper {
23
+ function isActive(uint256 chainId, address token, VersionPart release) external view returns (bool);
24
+ }
25
+
20
26
  library ContractLib {
21
27
 
22
28
  error ErrorContractLibNotRegistered(address target);
@@ -25,7 +31,6 @@ library ContractLib {
25
31
  error ErrorContractLibComponentTypeMismatch(NftId componentNftId, ObjectType expectedType, ObjectType actualType);
26
32
  error ErrorContractLibComponentInactive(NftId componentNftId);
27
33
 
28
-
29
34
  function getAndVerifyComponent(
30
35
  IRegistry registry,
31
36
  address target,
@@ -135,12 +140,35 @@ library ContractLib {
135
140
  return registry.getObjectInfo(instanceNftId).objectAddress;
136
141
  }
137
142
 
143
+ function isActiveToken(
144
+ address tokenRegistryAddress,
145
+ address token,
146
+ uint256 chainId,
147
+ VersionPart release
148
+ )
149
+ external
150
+ view
151
+ returns (bool)
152
+ {
153
+ return ITokenRegistryHelper(
154
+ tokenRegistryAddress).isActive(
155
+ chainId, token, release);
156
+ }
138
157
 
139
158
  function isPolicyHolder(address target) external view returns (bool) {
140
159
  return ERC165Checker.supportsInterface(target, type(IPolicyHolder).interfaceId);
141
160
  }
142
161
 
143
162
 
163
+ function isAuthority(address authority) public view returns (bool) {
164
+ if (!isContract(authority)) {
165
+ return false;
166
+ }
167
+
168
+ return supportsInterface(authority, type(IAccessManager).interfaceId);
169
+ }
170
+
171
+
144
172
  function isRegistry(address registry) public view returns (bool) {
145
173
  if (!isContract(registry)) {
146
174
  return false;
@@ -1,7 +1,6 @@
1
1
  // SPDX-License-Identifier: Apache-2.0
2
2
  pragma solidity ^0.8.20;
3
3
 
4
- import {IAccessManaged} from "@openzeppelin/contracts/access/manager/IAccessManaged.sol";
5
4
  import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
6
5
 
7
6
  import {Amount} from "../type/Amount.sol";
@@ -13,18 +12,18 @@ import {TokenHandler} from "../shared/TokenHandler.sol";
13
12
  /// @dev component base class
14
13
  /// component examples are staking, product, distribution, pool and oracle
15
14
  interface IComponent is
16
- IAccessManaged,
17
15
  IRegisterable,
18
16
  ITransferInterceptor
19
17
  {
18
+
19
+ error ErrorComponentTokenInvalid(address token);
20
+
20
21
  error ErrorComponentProductNftIdZero();
21
22
  error ErrorComponentProductNftIdNonzero();
22
23
  error ErrorComponentNameLengthZero();
23
24
 
24
25
  error ErrorComponentNotChainNft(address caller);
25
26
 
26
- error ErrorComponentTokenAddressNonzero();
27
- error ErrorComponentTokenAddressZero();
28
27
  error ErrorComponentWalletAddressZero();
29
28
  error ErrorComponentWalletAddressIsSameAsCurrent();
30
29
  error ErrorComponentWalletNotComponent();
@@ -1,7 +1,10 @@
1
1
  // SPDX-License-Identifier: Apache-2.0
2
2
  pragma solidity ^0.8.20;
3
3
 
4
+ import {IAccessManaged} from "@openzeppelin/contracts/access/manager/IAccessManaged.sol";
5
+
4
6
  import {INftOwnable} from "./INftOwnable.sol";
7
+ import {IRelease} from "../registry/IRelease.sol";
5
8
  import {IRegistry} from "../registry/IRegistry.sol";
6
9
  import {VersionPart} from "../type/Version.sol";
7
10
 
@@ -9,11 +12,19 @@ import {VersionPart} from "../type/Version.sol";
9
12
  /// @dev Marks contracts that are intended to be registered in the registry.
10
13
  ///
11
14
  interface IRegisterable is
12
- INftOwnable
15
+ IAccessManaged,
16
+ INftOwnable,
17
+ IRelease
13
18
  {
14
- /// @dev retuns the GIF release version for this contract.
15
- /// This
16
- function getRelease() external pure returns (VersionPart release);
19
+ // __Registerable_init
20
+ error ErrorAuthorityInvalid(address authority);
21
+
22
+ // onlyActive()
23
+ error ErrorRegisterableNotActive();
24
+
25
+ /// @dev Returns true iff this contract managed by its authority is active.
26
+ /// Queries the IAccessManaged.authority().
27
+ function isActive() external view returns (bool active);
17
28
 
18
29
  /// @dev retuns the object info relevant for registering for this contract
19
30
  /// IMPORTANT information returned by this function may only be used
@@ -9,17 +9,15 @@ import {ObjectType} from "../type/ObjectType.sol";
9
9
  import {RoleId} from "../type/RoleId.sol";
10
10
 
11
11
  interface IService is
12
+ IAccessManaged,
12
13
  IRegisterable,
13
- IVersionable,
14
- IAccessManaged
14
+ IVersionable
15
15
  {
16
- error ErrorServiceNotImplemented();
17
-
18
16
  /// @dev returns the domain for this service.
19
17
  /// In any GIF release only one service for any given domain may be deployed.
20
18
  function getDomain() external pure returns(ObjectType serviceDomain);
21
19
 
22
20
  /// @dev returns the GIF release specific role id.
23
21
  /// These role ids are used to authorize service to service communication.
24
- function getRoleId() external pure returns(RoleId serviceRoleId);
22
+ function getRoleId() external view returns(RoleId serviceRoleId);
25
23
  }
@@ -47,9 +47,9 @@ contract NftOwnable is
47
47
  }
48
48
 
49
49
 
50
- /// @dev initialization for upgradable contracts
51
- // used in _initializeRegisterable
52
- function _initializeNftOwnable(
50
+ /// @dev Initialization for upgradable contracts.
51
+ // used in __Registerable_init, ProxyManager._preDeployChecksAndSetup
52
+ function __NftOwnable_init(
53
53
  address registry,
54
54
  address initialOwner
55
55
  )
@@ -57,7 +57,7 @@ contract NftOwnable is
57
57
  virtual
58
58
  onlyInitializing()
59
59
  {
60
- _initializeRegistryLinked(registry);
60
+ __RegistryLinked_init(registry);
61
61
  _initializeERC165();
62
62
 
63
63
  if(initialOwner == address(0)) {