@etherisc/gif-next 0.0.2-9682fee-392 → 0.0.2-96b5b72-170

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 (437) hide show
  1. package/README.md +6 -83
  2. package/artifacts/contracts/distribution/Distribution.sol/Distribution.dbg.json +4 -0
  3. package/artifacts/contracts/{components → distribution}/Distribution.sol/Distribution.json +82 -14
  4. package/artifacts/contracts/distribution/DistributionService.sol/DistributionService.dbg.json +4 -0
  5. package/artifacts/contracts/distribution/DistributionService.sol/DistributionService.json +1556 -0
  6. package/artifacts/contracts/distribution/DistributionServiceManager.sol/DistributionServiceManager.dbg.json +4 -0
  7. package/artifacts/contracts/distribution/DistributionServiceManager.sol/DistributionServiceManager.json +780 -0
  8. package/artifacts/contracts/distribution/IDistributionComponent.sol/IDistributionComponent.dbg.json +4 -0
  9. package/artifacts/contracts/{components → distribution}/IDistributionComponent.sol/IDistributionComponent.json +156 -14
  10. package/artifacts/contracts/distribution/IDistributionService.sol/IDistributionService.dbg.json +4 -0
  11. package/artifacts/contracts/{instance/service → distribution}/IDistributionService.sol/IDistributionService.json +110 -283
  12. package/artifacts/contracts/instance/BundleManager.sol/BundleManager.dbg.json +1 -1
  13. package/artifacts/contracts/instance/BundleManager.sol/BundleManager.json +6 -6
  14. package/artifacts/contracts/instance/IInstance.sol/IInstance.dbg.json +1 -1
  15. package/artifacts/contracts/instance/IInstance.sol/IInstance.json +310 -2004
  16. package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.dbg.json +1 -1
  17. package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.json +101 -52
  18. package/artifacts/contracts/instance/Instance.sol/Instance.dbg.json +1 -1
  19. package/artifacts/contracts/instance/Instance.sol/Instance.json +430 -2762
  20. package/artifacts/contracts/instance/InstanceAccessManager.sol/InstanceAccessManager.dbg.json +1 -1
  21. package/artifacts/contracts/instance/InstanceAccessManager.sol/InstanceAccessManager.json +99 -62
  22. package/artifacts/contracts/instance/InstanceAuthorizationsLib.sol/InstanceAuthorizationsLib.dbg.json +4 -0
  23. package/artifacts/contracts/instance/InstanceAuthorizationsLib.sol/InstanceAuthorizationsLib.json +124 -0
  24. package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.dbg.json +1 -1
  25. package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.json +366 -71
  26. package/artifacts/contracts/instance/InstanceService.sol/InstanceService.dbg.json +1 -1
  27. package/artifacts/contracts/instance/InstanceService.sol/InstanceService.json +157 -211
  28. package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.dbg.json +1 -1
  29. package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.json +45 -90
  30. package/artifacts/contracts/instance/InstanceStore.sol/InstanceStore.dbg.json +4 -0
  31. package/artifacts/contracts/instance/InstanceStore.sol/InstanceStore.json +2847 -0
  32. package/artifacts/contracts/instance/base/Cloneable.sol/Cloneable.dbg.json +4 -0
  33. package/artifacts/contracts/instance/{Cloneable.sol → base/Cloneable.sol}/Cloneable.json +1 -1
  34. package/artifacts/contracts/instance/base/IKeyValueStore.sol/IKeyValueStore.dbg.json +1 -1
  35. package/artifacts/contracts/instance/base/IKeyValueStore.sol/IKeyValueStore.json +49 -0
  36. package/artifacts/contracts/instance/base/ILifecycle.sol/ILifecycle.dbg.json +1 -1
  37. package/artifacts/contracts/instance/base/KeyValueStore.sol/KeyValueStore.dbg.json +1 -1
  38. package/artifacts/contracts/instance/base/KeyValueStore.sol/KeyValueStore.json +61 -12
  39. package/artifacts/contracts/instance/base/Lifecycle.sol/Lifecycle.dbg.json +1 -1
  40. package/artifacts/contracts/instance/base/Lifecycle.sol/Lifecycle.json +8 -8
  41. package/artifacts/contracts/instance/base/ObjectManager.sol/ObjectManager.dbg.json +4 -0
  42. package/artifacts/contracts/instance/{ObjectManager.sol → base/ObjectManager.sol}/ObjectManager.json +3 -3
  43. package/artifacts/contracts/instance/module/IAccess.sol/IAccess.dbg.json +1 -1
  44. package/artifacts/contracts/instance/module/IAccess.sol/IAccess.json +6 -6
  45. package/artifacts/contracts/instance/module/IBundle.sol/IBundle.dbg.json +1 -1
  46. package/artifacts/contracts/instance/module/IComponents.sol/IComponents.dbg.json +1 -1
  47. package/artifacts/contracts/instance/module/IDistribution.sol/IDistribution.dbg.json +1 -1
  48. package/artifacts/contracts/instance/module/IPolicy.sol/IPolicy.dbg.json +1 -1
  49. package/artifacts/contracts/instance/module/IRisk.sol/IRisk.dbg.json +1 -1
  50. package/artifacts/contracts/instance/module/ISetup.sol/ISetup.dbg.json +1 -1
  51. package/artifacts/contracts/instance/module/ITreasury.sol/ITreasury.dbg.json +1 -1
  52. package/artifacts/contracts/pool/BundleService.sol/BundleService.dbg.json +4 -0
  53. package/artifacts/contracts/pool/BundleService.sol/BundleService.json +1288 -0
  54. package/artifacts/contracts/pool/BundleServiceManager.sol/BundleServiceManager.dbg.json +4 -0
  55. package/artifacts/contracts/pool/BundleServiceManager.sol/BundleServiceManager.json +696 -0
  56. package/artifacts/contracts/pool/IBundleService.sol/IBundleService.dbg.json +4 -0
  57. package/artifacts/contracts/{instance/service → pool}/IBundleService.sol/IBundleService.json +234 -129
  58. package/artifacts/contracts/pool/IPoolComponent.sol/IPoolComponent.dbg.json +4 -0
  59. package/artifacts/contracts/{components → pool}/IPoolComponent.sol/IPoolComponent.json +173 -21
  60. package/artifacts/contracts/pool/IPoolService.sol/IPoolService.dbg.json +4 -0
  61. package/artifacts/contracts/pool/IPoolService.sol/IPoolService.json +1077 -0
  62. package/artifacts/contracts/pool/Pool.sol/Pool.dbg.json +4 -0
  63. package/artifacts/contracts/{components → pool}/Pool.sol/Pool.json +83 -21
  64. package/artifacts/contracts/pool/PoolService.sol/PoolService.dbg.json +4 -0
  65. package/artifacts/contracts/pool/PoolService.sol/PoolService.json +1630 -0
  66. package/artifacts/contracts/pool/PoolServiceManager.sol/PoolServiceManager.dbg.json +4 -0
  67. package/artifacts/contracts/pool/PoolServiceManager.sol/PoolServiceManager.json +712 -0
  68. package/artifacts/contracts/product/ApplicationService.sol/ApplicationService.dbg.json +4 -0
  69. package/artifacts/contracts/product/ApplicationService.sol/ApplicationService.json +918 -0
  70. package/artifacts/contracts/product/ApplicationServiceManager.sol/ApplicationServiceManager.dbg.json +4 -0
  71. package/artifacts/contracts/product/ApplicationServiceManager.sol/ApplicationServiceManager.json +648 -0
  72. package/artifacts/contracts/product/ClaimService.sol/ClaimService.dbg.json +4 -0
  73. package/artifacts/contracts/product/ClaimService.sol/ClaimService.json +1386 -0
  74. package/artifacts/contracts/product/ClaimServiceManager.sol/ClaimServiceManager.dbg.json +4 -0
  75. package/artifacts/contracts/product/ClaimServiceManager.sol/ClaimServiceManager.json +748 -0
  76. package/artifacts/contracts/product/IApplicationService.sol/IApplicationService.dbg.json +4 -0
  77. package/artifacts/contracts/{instance/service/IClaimService.sol/IClaimService.json → product/IApplicationService.sol/IApplicationService.json} +184 -100
  78. package/artifacts/contracts/product/IClaimService.sol/IClaimService.dbg.json +4 -0
  79. package/artifacts/contracts/product/IClaimService.sol/IClaimService.json +753 -0
  80. package/artifacts/contracts/product/IPolicyService.sol/IPolicyService.dbg.json +4 -0
  81. package/artifacts/contracts/{instance/service → product}/IPolicyService.sol/IPolicyService.json +211 -100
  82. package/artifacts/contracts/product/IPricingService.sol/IPricingService.dbg.json +4 -0
  83. package/artifacts/contracts/{instance/service/IApplicationService.sol/IApplicationService.json → product/IPricingService.sol/IPricingService.json} +120 -166
  84. package/artifacts/contracts/product/IProductComponent.sol/IProductComponent.dbg.json +4 -0
  85. package/artifacts/contracts/{components → product}/IProductComponent.sol/IProductComponent.json +163 -21
  86. package/artifacts/contracts/product/IProductService.sol/IProductService.dbg.json +4 -0
  87. package/artifacts/contracts/{instance/service → product}/IProductService.sol/IProductService.json +86 -28
  88. package/artifacts/contracts/product/PolicyService.sol/PolicyService.dbg.json +4 -0
  89. package/artifacts/contracts/product/PolicyService.sol/PolicyService.json +1281 -0
  90. package/artifacts/contracts/product/PolicyServiceManager.sol/PolicyServiceManager.dbg.json +4 -0
  91. package/artifacts/contracts/product/PolicyServiceManager.sol/PolicyServiceManager.json +740 -0
  92. package/artifacts/contracts/product/PricingService.sol/PricingService.dbg.json +4 -0
  93. package/artifacts/contracts/product/PricingService.sol/PricingService.json +1004 -0
  94. package/artifacts/contracts/product/PricingServiceManager.sol/PricingServiceManager.dbg.json +4 -0
  95. package/artifacts/contracts/product/PricingServiceManager.sol/PricingServiceManager.json +688 -0
  96. package/artifacts/contracts/product/Product.sol/Product.dbg.json +4 -0
  97. package/artifacts/contracts/{components → product}/Product.sol/Product.json +74 -22
  98. package/artifacts/contracts/product/ProductService.sol/ProductService.dbg.json +4 -0
  99. package/artifacts/contracts/product/ProductService.sol/ProductService.json +864 -0
  100. package/artifacts/contracts/product/ProductServiceManager.sol/ProductServiceManager.dbg.json +4 -0
  101. package/artifacts/contracts/product/ProductServiceManager.sol/ProductServiceManager.json +640 -0
  102. package/artifacts/contracts/registry/ChainNft.sol/ChainNft.dbg.json +1 -1
  103. package/artifacts/contracts/registry/ChainNft.sol/ChainNft.json +2 -2
  104. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.dbg.json +1 -1
  105. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.json +48 -0
  106. package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.dbg.json +1 -1
  107. package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.json +66 -37
  108. package/artifacts/contracts/registry/ITransferInterceptor.sol/ITransferInterceptor.dbg.json +1 -1
  109. package/artifacts/contracts/registry/Registry.sol/Registry.dbg.json +1 -1
  110. package/artifacts/contracts/registry/Registry.sol/Registry.json +77 -16
  111. package/artifacts/contracts/registry/RegistryAccessManager.sol/RegistryAccessManager.dbg.json +1 -1
  112. package/artifacts/contracts/registry/RegistryAccessManager.sol/RegistryAccessManager.json +20 -20
  113. package/artifacts/contracts/registry/RegistryService.sol/RegistryService.dbg.json +1 -1
  114. package/artifacts/contracts/registry/RegistryService.sol/RegistryService.json +87 -53
  115. package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.dbg.json +1 -1
  116. package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.json +27 -40
  117. package/artifacts/contracts/registry/ReleaseManager.sol/ReleaseManager.dbg.json +1 -1
  118. package/artifacts/contracts/registry/ReleaseManager.sol/ReleaseManager.json +95 -22
  119. package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.dbg.json +1 -1
  120. package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.json +14 -27
  121. package/artifacts/contracts/shared/AccessManagerUpgradeableInitializeable.sol/AccessManagerUpgradeableInitializeable.dbg.json +4 -0
  122. package/artifacts/contracts/{instance → shared}/AccessManagerUpgradeableInitializeable.sol/AccessManagerUpgradeableInitializeable.json +3 -3
  123. package/artifacts/contracts/shared/Component.sol/Component.dbg.json +4 -0
  124. package/artifacts/contracts/shared/Component.sol/Component.json +723 -0
  125. package/artifacts/contracts/shared/ComponentService.sol/ComponentService.dbg.json +4 -0
  126. package/artifacts/contracts/{instance/base → shared}/ComponentService.sol/ComponentService.json +114 -35
  127. package/artifacts/contracts/shared/ERC165.sol/ERC165.dbg.json +1 -1
  128. package/artifacts/contracts/shared/IComponent.sol/IComponent.dbg.json +4 -0
  129. package/artifacts/contracts/{instance/service/IPoolService.sol/IPoolService.json → shared/IComponent.sol/IComponent.json} +177 -142
  130. package/artifacts/contracts/shared/IInstanceLinkedComponent.sol/IInstanceLinkedComponent.dbg.json +4 -0
  131. package/artifacts/contracts/shared/IInstanceLinkedComponent.sol/IInstanceLinkedComponent.json +647 -0
  132. package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.dbg.json +1 -1
  133. package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.json +0 -13
  134. package/artifacts/contracts/shared/IPolicyHolder.sol/IPolicyHolder.dbg.json +1 -1
  135. package/artifacts/contracts/shared/IPolicyHolder.sol/IPolicyHolder.json +69 -9
  136. package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.dbg.json +1 -1
  137. package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.json +0 -13
  138. package/artifacts/contracts/shared/IRegistryLinked.sol/IRegistryLinked.dbg.json +1 -1
  139. package/artifacts/contracts/shared/IRegistryLinked.sol/IRegistryLinked.json +0 -13
  140. package/artifacts/contracts/shared/IService.sol/IService.dbg.json +1 -1
  141. package/artifacts/contracts/shared/IService.sol/IService.json +85 -27
  142. package/artifacts/contracts/shared/IVersionable.sol/IVersionable.dbg.json +1 -1
  143. package/artifacts/contracts/shared/InstanceLinkedComponent.sol/InstanceLinkedComponent.dbg.json +4 -0
  144. package/artifacts/contracts/{components/Component.sol/Component.json → shared/InstanceLinkedComponent.sol/InstanceLinkedComponent.json} +60 -8
  145. package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.dbg.json +1 -1
  146. package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.json +8 -21
  147. package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.dbg.json +1 -1
  148. package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.json +80 -26
  149. package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.dbg.json +1 -1
  150. package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.json +20 -33
  151. package/artifacts/contracts/shared/Registerable.sol/Registerable.dbg.json +1 -1
  152. package/artifacts/contracts/shared/Registerable.sol/Registerable.json +8 -21
  153. package/artifacts/contracts/shared/RegistryLinked.sol/RegistryLinked.dbg.json +1 -1
  154. package/artifacts/contracts/shared/RegistryLinked.sol/RegistryLinked.json +2 -15
  155. package/artifacts/contracts/shared/Service.sol/Service.dbg.json +1 -1
  156. package/artifacts/contracts/shared/Service.sol/Service.json +91 -28
  157. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.dbg.json +1 -1
  158. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.json +60 -6
  159. package/artifacts/contracts/shared/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.dbg.json +1 -1
  160. package/artifacts/contracts/shared/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.json +2 -2
  161. package/artifacts/contracts/shared/Versionable.sol/Versionable.dbg.json +1 -1
  162. package/artifacts/contracts/staking/IStaking.sol/IStaking.dbg.json +4 -0
  163. package/artifacts/contracts/{components/IComponent.sol/IComponent.json → staking/IStaking.sol/IStaking.json} +123 -121
  164. package/artifacts/contracts/staking/IStakingService.sol/IStakingService.dbg.json +4 -0
  165. package/artifacts/contracts/staking/IStakingService.sol/IStakingService.json +545 -0
  166. package/artifacts/contracts/staking/Staking.sol/Staking.dbg.json +4 -0
  167. package/artifacts/contracts/staking/Staking.sol/Staking.json +854 -0
  168. package/artifacts/contracts/staking/StakingManager.sol/StakingManager.dbg.json +4 -0
  169. package/artifacts/contracts/staking/StakingManager.sol/StakingManager.json +640 -0
  170. package/artifacts/contracts/staking/StakingService.sol/StakingService.dbg.json +4 -0
  171. package/artifacts/contracts/staking/StakingService.sol/StakingService.json +797 -0
  172. package/artifacts/contracts/staking/StakingServiceManager.sol/StakingServiceManager.dbg.json +4 -0
  173. package/artifacts/contracts/staking/StakingServiceManager.sol/StakingServiceManager.json +632 -0
  174. package/artifacts/contracts/type/AddressSet.sol/LibAddressSet.dbg.json +4 -0
  175. package/artifacts/contracts/{types → type}/AddressSet.sol/LibAddressSet.json +3 -3
  176. package/artifacts/contracts/type/Amount.sol/AmountLib.dbg.json +4 -0
  177. package/artifacts/contracts/type/Amount.sol/AmountLib.json +281 -0
  178. package/artifacts/contracts/type/Blocknumber.sol/BlocknumberLib.dbg.json +4 -0
  179. package/artifacts/contracts/{types → type}/Blocknumber.sol/BlocknumberLib.json +3 -3
  180. package/artifacts/contracts/type/ClaimId.sol/ClaimIdLib.dbg.json +4 -0
  181. package/artifacts/contracts/type/ClaimId.sol/ClaimIdLib.json +179 -0
  182. package/artifacts/contracts/type/DistributorType.sol/DistributorTypeLib.dbg.json +4 -0
  183. package/artifacts/contracts/{types → type}/DistributorType.sol/DistributorTypeLib.json +5 -5
  184. package/artifacts/contracts/type/Fee.sol/FeeLib.dbg.json +4 -0
  185. package/artifacts/contracts/type/Fee.sol/FeeLib.json +312 -0
  186. package/artifacts/contracts/type/Key32.sol/Key32Lib.dbg.json +4 -0
  187. package/artifacts/contracts/{types → type}/Key32.sol/Key32Lib.json +3 -3
  188. package/artifacts/contracts/type/NftId.sol/NftIdLib.dbg.json +4 -0
  189. package/artifacts/contracts/{types → type}/NftId.sol/NftIdLib.json +5 -5
  190. package/artifacts/contracts/type/NftIdSet.sol/LibNftIdSet.dbg.json +4 -0
  191. package/artifacts/contracts/{types → type}/NftIdSet.sol/LibNftIdSet.json +3 -3
  192. package/artifacts/contracts/type/ObjectType.sol/ObjectTypeLib.dbg.json +4 -0
  193. package/artifacts/contracts/{types → type}/ObjectType.sol/ObjectTypeLib.json +3 -3
  194. package/artifacts/contracts/type/PayoutId.sol/PayoutIdLib.dbg.json +4 -0
  195. package/artifacts/contracts/type/PayoutId.sol/PayoutIdLib.json +209 -0
  196. package/artifacts/contracts/type/Referral.sol/ReferralLib.dbg.json +4 -0
  197. package/artifacts/contracts/{types → type}/Referral.sol/ReferralLib.json +5 -5
  198. package/artifacts/contracts/type/RiskId.sol/RiskIdLib.dbg.json +4 -0
  199. package/artifacts/contracts/{types → type}/RiskId.sol/RiskIdLib.json +5 -5
  200. package/artifacts/contracts/type/RoleId.sol/RoleIdLib.dbg.json +4 -0
  201. package/artifacts/contracts/{types → type}/RoleId.sol/RoleIdLib.json +5 -5
  202. package/artifacts/contracts/type/Seconds.sol/SecondsLib.dbg.json +4 -0
  203. package/artifacts/contracts/{types → type}/Seconds.sol/SecondsLib.json +3 -3
  204. package/artifacts/contracts/type/StateId.sol/StateIdLib.dbg.json +4 -0
  205. package/artifacts/contracts/{types → type}/StateId.sol/StateIdLib.json +3 -3
  206. package/artifacts/contracts/type/Timestamp.sol/TimestampLib.dbg.json +4 -0
  207. package/artifacts/contracts/{types → type}/Timestamp.sol/TimestampLib.json +20 -7
  208. package/artifacts/contracts/type/UFixed.sol/MathLib.dbg.json +4 -0
  209. package/artifacts/contracts/{types → type}/UFixed.sol/MathLib.json +3 -3
  210. package/artifacts/contracts/type/UFixed.sol/UFixedLib.dbg.json +4 -0
  211. package/artifacts/contracts/{types → type}/UFixed.sol/UFixedLib.json +3 -3
  212. package/artifacts/contracts/type/Version.sol/VersionLib.dbg.json +4 -0
  213. package/artifacts/contracts/{types → type}/Version.sol/VersionLib.json +3 -3
  214. package/artifacts/contracts/type/Version.sol/VersionPartLib.dbg.json +4 -0
  215. package/artifacts/contracts/{types → type}/Version.sol/VersionPartLib.json +3 -3
  216. package/contracts/{components → distribution}/Distribution.sol +22 -17
  217. package/contracts/distribution/DistributionService.sol +349 -0
  218. package/contracts/{instance/service → distribution}/DistributionServiceManager.sol +5 -5
  219. package/contracts/{components → distribution}/IDistributionComponent.sol +8 -8
  220. package/contracts/{instance/service → distribution}/IDistributionService.sol +19 -30
  221. package/contracts/instance/BundleManager.sol +8 -9
  222. package/contracts/instance/IInstance.sol +43 -64
  223. package/contracts/instance/IInstanceService.sol +18 -17
  224. package/contracts/instance/Instance.sol +116 -214
  225. package/contracts/instance/InstanceAccessManager.sol +49 -28
  226. package/contracts/instance/InstanceAuthorizationsLib.sol +308 -0
  227. package/contracts/instance/InstanceReader.sol +96 -18
  228. package/contracts/instance/InstanceService.sol +103 -290
  229. package/contracts/instance/InstanceServiceManager.sol +1 -1
  230. package/contracts/instance/InstanceStore.sol +211 -0
  231. package/contracts/instance/{Cloneable.sol → base/Cloneable.sol} +1 -1
  232. package/contracts/instance/base/IKeyValueStore.sol +14 -10
  233. package/contracts/instance/base/ILifecycle.sol +3 -3
  234. package/contracts/instance/base/KeyValueStore.sol +39 -45
  235. package/contracts/instance/base/Lifecycle.sol +17 -5
  236. package/contracts/instance/{ObjectManager.sol → base/ObjectManager.sol} +7 -7
  237. package/contracts/instance/module/IAccess.sol +4 -4
  238. package/contracts/instance/module/IBundle.sol +10 -8
  239. package/contracts/instance/module/IComponents.sol +11 -5
  240. package/contracts/instance/module/IDistribution.sol +7 -6
  241. package/contracts/instance/module/IPolicy.sol +22 -16
  242. package/contracts/instance/module/IRisk.sol +1 -1
  243. package/contracts/instance/module/ISetup.sol +4 -4
  244. package/contracts/instance/module/ITreasury.sol +2 -2
  245. package/contracts/pool/BundleService.sol +382 -0
  246. package/contracts/{instance/service → pool}/BundleServiceManager.sol +5 -5
  247. package/contracts/pool/IBundleService.sol +118 -0
  248. package/contracts/{components → pool}/IPoolComponent.sol +15 -14
  249. package/contracts/pool/IPoolService.sol +114 -0
  250. package/contracts/{components → pool}/Pool.sol +26 -23
  251. package/contracts/pool/PoolService.sol +403 -0
  252. package/contracts/{instance/service → pool}/PoolServiceManager.sol +5 -5
  253. package/contracts/product/ApplicationService.sol +186 -0
  254. package/contracts/{instance/service → product}/ApplicationServiceManager.sol +2 -2
  255. package/contracts/product/ClaimService.sol +442 -0
  256. package/contracts/{instance/service → product}/ClaimServiceManager.sol +2 -2
  257. package/contracts/{instance/service → product}/IApplicationService.sol +14 -34
  258. package/contracts/product/IClaimService.sol +93 -0
  259. package/contracts/{instance/service → product}/IPolicyService.sol +34 -26
  260. package/contracts/product/IPricingService.sol +37 -0
  261. package/contracts/{components → product}/IProductComponent.sol +12 -11
  262. package/contracts/{instance/service → product}/IProductService.sol +10 -10
  263. package/contracts/product/PolicyService.sol +376 -0
  264. package/contracts/{instance/service → product}/PolicyServiceManager.sol +5 -5
  265. package/contracts/product/PricingService.sol +275 -0
  266. package/contracts/product/PricingServiceManager.sol +51 -0
  267. package/contracts/{components → product}/Product.sol +161 -75
  268. package/contracts/product/ProductService.sol +210 -0
  269. package/contracts/{instance/service → product}/ProductServiceManager.sol +5 -5
  270. package/contracts/registry/ChainNft.sol +7 -1
  271. package/contracts/registry/IRegistry.sol +15 -6
  272. package/contracts/registry/IRegistryService.sol +10 -8
  273. package/contracts/registry/Registry.sol +45 -7
  274. package/contracts/registry/RegistryAccessManager.sol +6 -15
  275. package/contracts/registry/RegistryService.sol +52 -31
  276. package/contracts/registry/RegistryServiceManager.sol +0 -2
  277. package/contracts/registry/ReleaseManager.sol +78 -40
  278. package/contracts/registry/TokenRegistry.sol +2 -2
  279. package/contracts/shared/Component.sol +177 -0
  280. package/contracts/shared/ComponentService.sol +150 -0
  281. package/contracts/shared/IComponent.sol +58 -0
  282. package/contracts/{components/IComponent.sol → shared/IInstanceLinkedComponent.sol} +9 -31
  283. package/contracts/shared/INftOwnable.sol +1 -1
  284. package/contracts/shared/IPolicyHolder.sol +24 -10
  285. package/contracts/shared/IRegistryLinked.sol +0 -1
  286. package/contracts/shared/IService.sol +6 -6
  287. package/contracts/shared/IVersionable.sol +1 -1
  288. package/contracts/{components/Component.sol → shared/InstanceLinkedComponent.sol} +35 -15
  289. package/contracts/shared/NftOwnable.sol +1 -3
  290. package/contracts/shared/PolicyHolder.sol +31 -18
  291. package/contracts/shared/ProxyManager.sol +3 -3
  292. package/contracts/shared/Registerable.sol +12 -11
  293. package/contracts/shared/RegistryLinked.sol +0 -5
  294. package/contracts/shared/Service.sol +23 -9
  295. package/contracts/shared/TokenHandler.sol +27 -2
  296. package/contracts/shared/Versionable.sol +1 -1
  297. package/contracts/staking/IStaking.sol +30 -0
  298. package/contracts/staking/IStakingService.sol +105 -0
  299. package/contracts/staking/Staking.sol +65 -0
  300. package/contracts/staking/StakingManager.sol +46 -0
  301. package/contracts/staking/StakingService.sol +204 -0
  302. package/contracts/staking/StakingServiceManager.sol +41 -0
  303. package/contracts/type/Amount.sol +109 -0
  304. package/contracts/{types → type}/ClaimId.sol +25 -2
  305. package/contracts/{types → type}/Fee.sol +16 -8
  306. package/contracts/{types → type}/NftIdSet.sol +1 -1
  307. package/contracts/{types → type}/ObjectType.sol +14 -5
  308. package/contracts/{types → type}/PayoutId.sol +33 -5
  309. package/contracts/{types → type}/RoleId.sol +44 -9
  310. package/contracts/{types → type}/StateId.sol +6 -2
  311. package/contracts/{types → type}/Timestamp.sol +5 -0
  312. package/package.json +1 -1
  313. package/artifacts/contracts/components/Component.sol/Component.dbg.json +0 -4
  314. package/artifacts/contracts/components/Distribution.sol/Distribution.dbg.json +0 -4
  315. package/artifacts/contracts/components/IComponent.sol/IComponent.dbg.json +0 -4
  316. package/artifacts/contracts/components/IDistributionComponent.sol/IDistributionComponent.dbg.json +0 -4
  317. package/artifacts/contracts/components/IPoolComponent.sol/IPoolComponent.dbg.json +0 -4
  318. package/artifacts/contracts/components/IProductComponent.sol/IProductComponent.dbg.json +0 -4
  319. package/artifacts/contracts/components/Pool.sol/Pool.dbg.json +0 -4
  320. package/artifacts/contracts/components/Product.sol/Product.dbg.json +0 -4
  321. package/artifacts/contracts/instance/AccessManagerUpgradeableInitializeable.sol/AccessManagerUpgradeableInitializeable.dbg.json +0 -4
  322. package/artifacts/contracts/instance/Cloneable.sol/Cloneable.dbg.json +0 -4
  323. package/artifacts/contracts/instance/ObjectManager.sol/ObjectManager.dbg.json +0 -4
  324. package/artifacts/contracts/instance/base/ComponentService.sol/ComponentService.dbg.json +0 -4
  325. package/artifacts/contracts/instance/service/ApplicationService.sol/ApplicationService.dbg.json +0 -4
  326. package/artifacts/contracts/instance/service/ApplicationService.sol/ApplicationService.json +0 -968
  327. package/artifacts/contracts/instance/service/ApplicationServiceManager.sol/ApplicationServiceManager.dbg.json +0 -4
  328. package/artifacts/contracts/instance/service/ApplicationServiceManager.sol/ApplicationServiceManager.json +0 -665
  329. package/artifacts/contracts/instance/service/BundleService.sol/BundleService.dbg.json +0 -4
  330. package/artifacts/contracts/instance/service/BundleService.sol/BundleService.json +0 -1093
  331. package/artifacts/contracts/instance/service/BundleServiceManager.sol/BundleServiceManager.dbg.json +0 -4
  332. package/artifacts/contracts/instance/service/BundleServiceManager.sol/BundleServiceManager.json +0 -661
  333. package/artifacts/contracts/instance/service/ClaimService.sol/ClaimService.dbg.json +0 -4
  334. package/artifacts/contracts/instance/service/ClaimService.sol/ClaimService.json +0 -754
  335. package/artifacts/contracts/instance/service/ClaimServiceManager.sol/ClaimServiceManager.dbg.json +0 -4
  336. package/artifacts/contracts/instance/service/ClaimServiceManager.sol/ClaimServiceManager.json +0 -637
  337. package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.dbg.json +0 -4
  338. package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.json +0 -1732
  339. package/artifacts/contracts/instance/service/DistributionServiceManager.sol/DistributionServiceManager.dbg.json +0 -4
  340. package/artifacts/contracts/instance/service/DistributionServiceManager.sol/DistributionServiceManager.json +0 -805
  341. package/artifacts/contracts/instance/service/IApplicationService.sol/IApplicationService.dbg.json +0 -4
  342. package/artifacts/contracts/instance/service/IBundleService.sol/IBundleService.dbg.json +0 -4
  343. package/artifacts/contracts/instance/service/IClaimService.sol/IClaimService.dbg.json +0 -4
  344. package/artifacts/contracts/instance/service/IDistributionService.sol/IDistributionService.dbg.json +0 -4
  345. package/artifacts/contracts/instance/service/IPolicyService.sol/IPolicyService.dbg.json +0 -4
  346. package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.dbg.json +0 -4
  347. package/artifacts/contracts/instance/service/IProductService.sol/IProductService.dbg.json +0 -4
  348. package/artifacts/contracts/instance/service/PolicyService.sol/PolicyService.dbg.json +0 -4
  349. package/artifacts/contracts/instance/service/PolicyService.sol/PolicyService.json +0 -1021
  350. package/artifacts/contracts/instance/service/PolicyServiceManager.sol/PolicyServiceManager.dbg.json +0 -4
  351. package/artifacts/contracts/instance/service/PolicyServiceManager.sol/PolicyServiceManager.json +0 -689
  352. package/artifacts/contracts/instance/service/PoolService.sol/PoolService.dbg.json +0 -4
  353. package/artifacts/contracts/instance/service/PoolService.sol/PoolService.json +0 -824
  354. package/artifacts/contracts/instance/service/PoolServiceManager.sol/PoolServiceManager.dbg.json +0 -4
  355. package/artifacts/contracts/instance/service/PoolServiceManager.sol/PoolServiceManager.json +0 -657
  356. package/artifacts/contracts/instance/service/ProductService.sol/ProductService.dbg.json +0 -4
  357. package/artifacts/contracts/instance/service/ProductService.sol/ProductService.json +0 -777
  358. package/artifacts/contracts/instance/service/ProductServiceManager.sol/ProductServiceManager.dbg.json +0 -4
  359. package/artifacts/contracts/instance/service/ProductServiceManager.sol/ProductServiceManager.json +0 -649
  360. package/artifacts/contracts/shared/ContractDeployerLib.sol/ContractDeployerLib.dbg.json +0 -4
  361. package/artifacts/contracts/shared/ContractDeployerLib.sol/ContractDeployerLib.json +0 -107
  362. package/artifacts/contracts/test/TestFee.sol/TestFee.dbg.json +0 -4
  363. package/artifacts/contracts/test/TestFee.sol/TestFee.json +0 -119
  364. package/artifacts/contracts/test/TestRegisterable.sol/TestRegisterable.dbg.json +0 -4
  365. package/artifacts/contracts/test/TestRegisterable.sol/TestRegisterable.json +0 -383
  366. package/artifacts/contracts/test/TestRoleId.sol/TestRoleId.dbg.json +0 -4
  367. package/artifacts/contracts/test/TestRoleId.sol/TestRoleId.json +0 -116
  368. package/artifacts/contracts/test/TestService.sol/TestService.dbg.json +0 -4
  369. package/artifacts/contracts/test/TestService.sol/TestService.json +0 -521
  370. package/artifacts/contracts/test/TestToken.sol/TestUsdc.dbg.json +0 -4
  371. package/artifacts/contracts/test/TestToken.sol/TestUsdc.json +0 -376
  372. package/artifacts/contracts/test/TestVersion.sol/TestVersion.dbg.json +0 -4
  373. package/artifacts/contracts/test/TestVersion.sol/TestVersion.json +0 -218
  374. package/artifacts/contracts/test/TestVersionable.sol/TestVersionable.dbg.json +0 -4
  375. package/artifacts/contracts/test/TestVersionable.sol/TestVersionable.json +0 -104
  376. package/artifacts/contracts/test/Usdc.sol/USDC.dbg.json +0 -4
  377. package/artifacts/contracts/test/Usdc.sol/USDC.json +0 -376
  378. package/artifacts/contracts/types/AddressSet.sol/LibAddressSet.dbg.json +0 -4
  379. package/artifacts/contracts/types/Blocknumber.sol/BlocknumberLib.dbg.json +0 -4
  380. package/artifacts/contracts/types/ChainId.sol/ChainIdLib.dbg.json +0 -4
  381. package/artifacts/contracts/types/ChainId.sol/ChainIdLib.json +0 -10
  382. package/artifacts/contracts/types/ClaimId.sol/ClaimIdLib.dbg.json +0 -4
  383. package/artifacts/contracts/types/ClaimId.sol/ClaimIdLib.json +0 -100
  384. package/artifacts/contracts/types/DistributorType.sol/DistributorTypeLib.dbg.json +0 -4
  385. package/artifacts/contracts/types/Fee.sol/FeeLib.dbg.json +0 -4
  386. package/artifacts/contracts/types/Fee.sol/FeeLib.json +0 -257
  387. package/artifacts/contracts/types/Key32.sol/Key32Lib.dbg.json +0 -4
  388. package/artifacts/contracts/types/NftId.sol/NftIdLib.dbg.json +0 -4
  389. package/artifacts/contracts/types/NftIdSet.sol/LibNftIdSet.dbg.json +0 -4
  390. package/artifacts/contracts/types/NumberId.sol/NumberIdLib.dbg.json +0 -4
  391. package/artifacts/contracts/types/NumberId.sol/NumberIdLib.json +0 -100
  392. package/artifacts/contracts/types/ObjectType.sol/ObjectTypeLib.dbg.json +0 -4
  393. package/artifacts/contracts/types/PayoutId.sol/PayoutIdLib.dbg.json +0 -4
  394. package/artifacts/contracts/types/PayoutId.sol/PayoutIdLib.json +0 -100
  395. package/artifacts/contracts/types/Referral.sol/ReferralLib.dbg.json +0 -4
  396. package/artifacts/contracts/types/RiskId.sol/RiskIdLib.dbg.json +0 -4
  397. package/artifacts/contracts/types/RoleId.sol/RoleIdLib.dbg.json +0 -4
  398. package/artifacts/contracts/types/Seconds.sol/SecondsLib.dbg.json +0 -4
  399. package/artifacts/contracts/types/StateId.sol/StateIdLib.dbg.json +0 -4
  400. package/artifacts/contracts/types/Timestamp.sol/TimestampLib.dbg.json +0 -4
  401. package/artifacts/contracts/types/UFixed.sol/MathLib.dbg.json +0 -4
  402. package/artifacts/contracts/types/UFixed.sol/UFixedLib.dbg.json +0 -4
  403. package/artifacts/contracts/types/Version.sol/VersionLib.dbg.json +0 -4
  404. package/artifacts/contracts/types/Version.sol/VersionPartLib.dbg.json +0 -4
  405. package/contracts/instance/base/ComponentService.sol +0 -134
  406. package/contracts/instance/service/ApplicationService.sol +0 -350
  407. package/contracts/instance/service/BundleService.sol +0 -336
  408. package/contracts/instance/service/ClaimService.sol +0 -151
  409. package/contracts/instance/service/DistributionService.sol +0 -467
  410. package/contracts/instance/service/IBundleService.sol +0 -62
  411. package/contracts/instance/service/IClaimService.sol +0 -61
  412. package/contracts/instance/service/IPoolService.sol +0 -35
  413. package/contracts/instance/service/PolicyService.sol +0 -403
  414. package/contracts/instance/service/PoolService.sol +0 -220
  415. package/contracts/instance/service/ProductService.sol +0 -241
  416. package/contracts/shared/ContractDeployerLib.sol +0 -72
  417. package/contracts/test/TestFee.sol +0 -25
  418. package/contracts/test/TestRegisterable.sol +0 -18
  419. package/contracts/test/TestRoleId.sol +0 -14
  420. package/contracts/test/TestService.sol +0 -25
  421. package/contracts/test/TestToken.sol +0 -26
  422. package/contracts/test/TestVersion.sol +0 -44
  423. package/contracts/test/TestVersionable.sol +0 -17
  424. package/contracts/test/Usdc.sol +0 -26
  425. package/contracts/types/ChainId.sol +0 -38
  426. package/contracts/types/NumberId.sol +0 -52
  427. /package/contracts/{instance → shared}/AccessManagerUpgradeableInitializeable.sol +0 -0
  428. /package/contracts/{types → type}/AddressSet.sol +0 -0
  429. /package/contracts/{types → type}/Blocknumber.sol +0 -0
  430. /package/contracts/{types → type}/DistributorType.sol +0 -0
  431. /package/contracts/{types → type}/Key32.sol +0 -0
  432. /package/contracts/{types → type}/NftId.sol +0 -0
  433. /package/contracts/{types → type}/Referral.sol +0 -0
  434. /package/contracts/{types → type}/RiskId.sol +0 -0
  435. /package/contracts/{types → type}/Seconds.sol +0 -0
  436. /package/contracts/{types → type}/UFixed.sol +0 -0
  437. /package/contracts/{types → type}/Version.sol +0 -0
@@ -3,17 +3,19 @@ pragma solidity ^0.8.20;
3
3
 
4
4
  import {AccessManaged} from "@openzeppelin/contracts/access/manager/AccessManaged.sol";
5
5
 
6
- import {NftId} from "../types/NftId.sol";
7
- import {RoleId} from "../types/RoleId.sol";
8
- import {ObjectType, ObjectTypeLib, zeroObjectType, REGISTRY, SERVICE} from "../types/ObjectType.sol";
9
- import {VersionPart, VersionPartLib} from "../types/Version.sol";
10
- import {Timestamp, TimestampLib} from "../types/Timestamp.sol";
6
+ import {NftId} from "../type/NftId.sol";
7
+ import {RoleId} from "../type/RoleId.sol";
8
+ import {ObjectType, ObjectTypeLib, zeroObjectType, REGISTRY, SERVICE, STAKING} from "../type/ObjectType.sol";
9
+ import {Version, VersionLib, VersionPart, VersionPartLib} from "../type/Version.sol";
10
+ import {Timestamp, TimestampLib} from "../type/Timestamp.sol";
11
11
 
12
+ import {IRegisterable} from "../shared/IRegisterable.sol";
13
+ import {IRegistry} from "./IRegistry.sol";
14
+ import {IRegistryService} from "./IRegistryService.sol";
12
15
  import {IService} from "../shared/IService.sol";
16
+ import {IStaking} from "../staking/IStaking.sol";
13
17
 
14
- import {IRegistry} from "./IRegistry.sol";
15
18
  import {Registry} from "./Registry.sol";
16
- import {IRegistryService} from "./IRegistryService.sol";
17
19
  import {RegistryAccessManager} from "./RegistryAccessManager.sol";
18
20
 
19
21
 
@@ -28,6 +30,9 @@ contract ReleaseManager is AccessManaged
28
30
  error NotRegistryService();
29
31
  error UnexpectedServiceAuthority(address expected, address found);
30
32
 
33
+ // register staking
34
+ error ErrorReleaseManagerStakingAlreadySet(address stakingAddress);
35
+
31
36
  // registerService
32
37
  error NotService();
33
38
 
@@ -36,8 +41,10 @@ contract ReleaseManager is AccessManaged
36
41
  error ReleaseRegistrationNotFinished();
37
42
 
38
43
  // _getAndVerifyContractInfo
44
+ error ErrorReleaseManagerUnexpectedRegisterableAddress(address expected, address actual);
45
+ error ErrorReleaseManagerIsInterceptorTrue();
39
46
  error UnexpectedRegisterableType(ObjectType expected, ObjectType found);
40
- error NotRegisterableOwner(address notOwner);
47
+ error NotRegisterableOwner(address expectedOwner, address actualOwner);
41
48
  error SelfRegistration();
42
49
  error RegisterableOwnerIsRegistered();
43
50
 
@@ -51,27 +58,29 @@ contract ReleaseManager is AccessManaged
51
58
  error ConfigSelectorZero(uint configArrayIndex);
52
59
  error SelectorAlreadyExists(VersionPart releaseVersion, ObjectType serviceDomain);
53
60
 
54
-
55
61
  RegistryAccessManager private immutable _accessManager;
56
62
  IRegistry private immutable _registry;
63
+ IStaking private _staking;
57
64
 
58
- VersionPart immutable _initial;// first active version
59
- VersionPart _latest;// latest active version
60
- VersionPart _next;// version to create and activate
65
+ VersionPart immutable _initial;// first active major version
66
+ VersionPart _latest;// latest active major version
67
+ VersionPart _next;// major version to create and activate
61
68
 
62
- mapping(VersionPart version => IRegistry.ReleaseInfo info) _release;
69
+ mapping(VersionPart majorVersion => IRegistry.ReleaseInfo info) _release;
63
70
 
64
- mapping(VersionPart version => mapping(ObjectType serviceDomain => bytes4[])) _selectors; // registry service function selector assigned to domain
71
+ // registry service function selector assigned to domain
72
+ mapping(VersionPart majorVersion => mapping(ObjectType serviceDomain => bytes4[])) _selectors;
65
73
 
66
74
  uint _awaitingRegistration; // "services left to register" counter
67
75
 
68
76
  mapping(address registryService => bool isActive) _active;
69
77
 
70
- mapping(VersionPart version => bool isValid) _valid; // TODO refactor to use _active only
78
+ mapping(VersionPart majorVersion => bool isValid) _valid; // TODO refactor to use _active only
71
79
 
72
80
  constructor(
73
81
  RegistryAccessManager accessManager,
74
- VersionPart initialVersion)
82
+ VersionPart initialVersion
83
+ )
75
84
  AccessManaged(accessManager.authority())
76
85
  {
77
86
  require(initialVersion.toInt() > 0, "ReleaseManager: initial version is 0");
@@ -80,17 +89,37 @@ contract ReleaseManager is AccessManaged
80
89
 
81
90
  _initial = initialVersion;
82
91
  _next = initialVersion;
83
-
84
92
  _registry = new Registry();
85
93
  }
86
94
 
95
+ function registerStaking(
96
+ address stakingAddress,
97
+ address stakingOwner
98
+ )
99
+ external
100
+ restricted // GIF_ADMIN_ROLE
101
+ returns(NftId nftId)
102
+ {
103
+ // verify staking contract
104
+ _getAndVerifyContractInfo(stakingAddress, STAKING(), stakingOwner);
105
+ _staking = IStaking(stakingAddress);
106
+
107
+ nftId = _registry.registerStaking(
108
+ stakingAddress,
109
+ stakingOwner);
110
+
111
+ _staking.linkToRegisteredNftId();
112
+ }
113
+
87
114
  /// @dev skips previous release if was not activated
88
115
  function createNextRelease()
89
116
  external
90
117
  restricted // GIF_ADMIN_ROLE
91
118
  {
92
119
  // allow to register new registry service for next version
120
+ // TODO check/test: assignment to _next likely missing ...
93
121
  VersionPartLib.toVersionPart(_next.toInt() + 1);
122
+
94
123
  // disallow registration of regular services for next version while registry service is not registered
95
124
  _awaitingRegistration = 0;
96
125
 
@@ -124,9 +153,10 @@ contract ReleaseManager is AccessManaged
124
153
  emit LogReleaseActivation(version);
125
154
  }
126
155
 
127
- // TODO deploy proxy and initialize with given implementation instead of using given proxy?
156
+ // TODO implement reliable way this function can only be called directly after createNextRelease()
128
157
  // IMPORTANT: MUST never be possible to create with access/release manager, token registry
129
- // callable once per release after release creation, can not register regular services while registry service is not registered
158
+ // callable once per release after release creation
159
+ // can not register regular services
130
160
  function registerRegistryService(IRegistryService service)
131
161
  external
132
162
  restricted // GIF_MANAGER_ROLE
@@ -144,14 +174,14 @@ contract ReleaseManager is AccessManaged
144
174
  serviceAuthority);
145
175
  }
146
176
 
147
- IRegistry.ObjectInfo memory info = _getAndVerifyContractInfo(service, SERVICE(), msg.sender);
177
+ IRegistry.ObjectInfo memory info = _getAndVerifyContractInfo(address(service), SERVICE(), msg.sender);
148
178
 
149
- VersionPart version = _next;
179
+ VersionPart majorVersion = _next;
150
180
  ObjectType domain = REGISTRY();
151
- _verifyService(service, version, domain);
181
+ _verifyService(service, majorVersion, domain);
152
182
  _createRelease(service.getFunctionConfigs());
153
183
 
154
- nftId = _registry.registerService(info, version, domain);
184
+ nftId = _registry.registerService(info, majorVersion, domain);
155
185
 
156
186
  // external call
157
187
  service.linkToRegisteredNftId();
@@ -168,14 +198,14 @@ contract ReleaseManager is AccessManaged
168
198
  revert NotService();
169
199
  }
170
200
 
171
- IRegistry.ObjectInfo memory info = _getAndVerifyContractInfo(service, SERVICE(), msg.sender);
172
- VersionPart version = getNextVersion();
173
- ObjectType domain = _release[version].domains[_awaitingRegistration];// reversed registration order of services specified in RegistryService config
174
- _verifyService(service, version, domain);
201
+ IRegistry.ObjectInfo memory info = _getAndVerifyContractInfo(address(service), SERVICE(), msg.sender);
202
+ VersionPart majorVersion = getNextVersion();
203
+ ObjectType domain = _release[majorVersion].domains[_awaitingRegistration];// reversed registration order of services specified in RegistryService config
204
+ _verifyService(service, majorVersion, domain);
175
205
 
176
206
  // setup and grant unique role if service does registrations
177
- bytes4[] memory selectors = _selectors[version][domain];
178
- address registryService = _registry.getServiceAddress(REGISTRY(), version);
207
+ bytes4[] memory selectors = _selectors[majorVersion][domain];
208
+ address registryService = _registry.getServiceAddress(REGISTRY(), majorVersion);
179
209
  if(selectors.length > 0) {
180
210
  _accessManager.setAndGrantUniqueRole(
181
211
  address(service),
@@ -185,7 +215,7 @@ contract ReleaseManager is AccessManaged
185
215
 
186
216
  _awaitingRegistration--;
187
217
 
188
- nftId = _registry.registerService(info, version, domain);
218
+ nftId = _registry.registerService(info, majorVersion, domain);
189
219
 
190
220
  // external call
191
221
  service.linkToRegisteredNftId();
@@ -203,9 +233,9 @@ contract ReleaseManager is AccessManaged
203
233
  return _valid[version];
204
234
  }
205
235
 
206
- function getRegistry() external view returns(address)
236
+ function getRegistryAddress() external view returns(address)
207
237
  {
208
- return (address(_registry));
238
+ return address(_registry);
209
239
  }
210
240
 
211
241
  function getReleaseInfo(VersionPart version) external view returns(IRegistry.ReleaseInfo memory)
@@ -229,7 +259,7 @@ contract ReleaseManager is AccessManaged
229
259
  //--- private functions ----------------------------------------------------//
230
260
 
231
261
  function _getAndVerifyContractInfo(
232
- IService service,
262
+ address registerableAddress,
233
263
  ObjectType expectedType,
234
264
  address expectedOwner // assume always valid, can not be 0
235
265
  )
@@ -239,9 +269,15 @@ contract ReleaseManager is AccessManaged
239
269
  IRegistry.ObjectInfo memory info
240
270
  )
241
271
  {
242
- info = service.getInitialInfo();
243
- info.objectAddress = address(service);
244
- info.isInterceptor = false; // service is never interceptor, at least now
272
+ info = IRegisterable(registerableAddress).getInitialInfo();
273
+
274
+ if(info.objectAddress != registerableAddress) {
275
+ revert ErrorReleaseManagerUnexpectedRegisterableAddress(registerableAddress, info.objectAddress);
276
+ }
277
+
278
+ if(info.isInterceptor) {
279
+ revert ErrorReleaseManagerIsInterceptorTrue();
280
+ }
245
281
 
246
282
  if(info.objectType != expectedType) {// type is checked in registry anyway...but service logic may depend on expected value
247
283
  revert UnexpectedRegisterableType(expectedType, info.objectType);
@@ -250,10 +286,10 @@ contract ReleaseManager is AccessManaged
250
286
  address owner = info.initialOwner;
251
287
 
252
288
  if(owner != expectedOwner) { // registerable owner protection
253
- revert NotRegisterableOwner(expectedOwner);
289
+ revert NotRegisterableOwner(expectedOwner, owner);
254
290
  }
255
291
 
256
- if(owner == address(service)) {
292
+ if(owner == address(registerableAddress)) {
257
293
  revert SelfRegistration();
258
294
  }
259
295
 
@@ -271,8 +307,10 @@ contract ReleaseManager is AccessManaged
271
307
  view
272
308
  returns(ObjectType)
273
309
  {
274
- if(service.getMajorVersion() != expectedVersion) {
275
- revert UnexpectedServiceVersion(expectedVersion, service.getMajorVersion());
310
+ Version version = service.getVersion();
311
+ VersionPart majorVersion = version.toMajorPart();
312
+ if(majorVersion != expectedVersion) {
313
+ revert UnexpectedServiceVersion(expectedVersion, majorVersion);
276
314
  }
277
315
 
278
316
  if(service.getDomain() != expectedDomain) {
@@ -6,8 +6,8 @@ import {ERC165Checker} from "@openzeppelin/contracts/utils/introspection/ERC165C
6
6
 
7
7
  import {IRegisterable} from "../shared/IRegisterable.sol";
8
8
  import {IRegistry} from "./IRegistry.sol";
9
- import {VersionPart} from "../types/Version.sol";
10
- import {REGISTRY} from "../types/ObjectType.sol";
9
+ import {VersionPart} from "../type/Version.sol";
10
+ import {REGISTRY} from "../type/ObjectType.sol";
11
11
  import {NftOwnable} from "../shared/NftOwnable.sol";
12
12
 
13
13
  /// @title contract to register token per GIF major release.
@@ -0,0 +1,177 @@
1
+ // SPDX-License-Identifier: Apache-2.0
2
+ pragma solidity ^0.8.20;
3
+
4
+ import {AccessManagedUpgradeable} from "@openzeppelin/contracts-upgradeable/access/manager/AccessManagedUpgradeable.sol";
5
+ import {IAccessManaged} from "@openzeppelin/contracts/access/manager/IAccessManaged.sol";
6
+ import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
7
+ import {SafeERC20} from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
8
+
9
+ import {IComponent} from "./IComponent.sol";
10
+ import {IComponents} from "../instance/module/IComponents.sol";
11
+ import {IInstanceService} from "../instance/IInstanceService.sol";
12
+ import {IInstance} from "../instance/IInstance.sol";
13
+ import {InstanceAccessManager} from "../instance/InstanceAccessManager.sol";
14
+ import {InstanceReader} from "../instance/InstanceReader.sol";
15
+ import {IRegistry} from "../registry/IRegistry.sol";
16
+ import {NftId} from "../type/NftId.sol";
17
+ import {ObjectType, INSTANCE, PRODUCT} from "../type/ObjectType.sol";
18
+ import {VersionPart} from "../type/Version.sol";
19
+ import {Registerable} from "../shared/Registerable.sol";
20
+ import {RoleId, RoleIdLib} from "../type/RoleId.sol";
21
+ import {IAccess} from "../instance/module/IAccess.sol";
22
+ import {TokenHandler} from "../shared/TokenHandler.sol";
23
+ import {VersionPart} from "../type/Version.sol";
24
+
25
+ abstract contract Component is
26
+ AccessManagedUpgradeable,
27
+ Registerable,
28
+ IComponent
29
+ {
30
+ // keccak256(abi.encode(uint256(keccak256("gif-next.contracts.component.Component.sol")) - 1)) & ~bytes32(uint256(0xff));
31
+ bytes32 public constant COMPONENT_LOCATION_V1 = 0xffe8d4462baed26a47154f4b8f6db497d2f772496965791d25bd456e342b7f00;
32
+
33
+ struct ComponentStorage {
34
+ string _name; // unique (per instance) component name
35
+ IERC20Metadata _token; // token for this component
36
+ TokenHandler _tokenHandler; // token handler for this component
37
+ address _wallet; // wallet for this component (default = component contract itself)
38
+ }
39
+
40
+ function _getComponentStorage() private pure returns (ComponentStorage storage $) {
41
+ assembly {
42
+ $.slot := COMPONENT_LOCATION_V1
43
+ }
44
+ }
45
+
46
+ function initializeComponent(
47
+ address authority,
48
+ address registry,
49
+ NftId parentNftId,
50
+ string memory name,
51
+ address token,
52
+ ObjectType componentType,
53
+ bool isInterceptor,
54
+ address initialOwner,
55
+ bytes memory registryData // writeonly data that will saved in the object info record of the registry
56
+ )
57
+ public
58
+ virtual
59
+ onlyInitializing()
60
+ {
61
+ initializeRegisterable(registry, parentNftId, componentType, isInterceptor, initialOwner, registryData);
62
+ __AccessManaged_init(authority);
63
+
64
+ if (token == address(0)) {
65
+ revert ErrorComponentTokenAddressZero();
66
+ }
67
+
68
+ // set component state
69
+ ComponentStorage storage $ = _getComponentStorage();
70
+ $._name = name;
71
+ $._wallet = address(this);
72
+ $._token = IERC20Metadata(token);
73
+ $._tokenHandler = new TokenHandler(token);
74
+
75
+ registerInterface(type(IAccessManaged).interfaceId);
76
+ registerInterface(type(IComponent).interfaceId);
77
+ }
78
+
79
+ function approveTokenHandler(uint256 spendingLimitAmount)
80
+ external
81
+ virtual
82
+ onlyOwner
83
+ {
84
+ ComponentStorage storage $ = _getComponentStorage();
85
+ approveTokenHandler(address($._token), spendingLimitAmount);
86
+ }
87
+
88
+ function approveTokenHandler(address token, uint256 spendingLimitAmount)
89
+ public
90
+ virtual
91
+ onlyOwner
92
+ {
93
+ ComponentStorage storage $ = _getComponentStorage();
94
+
95
+ if($._wallet != address(this)) {
96
+ revert ErrorComponentWalletNotComponent();
97
+ }
98
+
99
+ IERC20Metadata(token).approve(
100
+ address($._tokenHandler),
101
+ spendingLimitAmount);
102
+
103
+ emit LogComponentTokenHandlerApproved(token, spendingLimitAmount);
104
+ }
105
+
106
+ function setWallet(address newWallet)
107
+ external
108
+ virtual
109
+ override
110
+ onlyOwner
111
+ {
112
+ ComponentStorage storage $ = _getComponentStorage();
113
+ address currentWallet = $._wallet;
114
+ uint256 currentBalance = $._token.balanceOf(currentWallet);
115
+
116
+ // checks
117
+ if (newWallet == address(0)) {
118
+ revert ErrorComponentWalletAddressZero();
119
+ }
120
+
121
+ if (newWallet == currentWallet) {
122
+ revert ErrorComponentWalletAddressIsSameAsCurrent();
123
+ }
124
+
125
+ if (currentBalance > 0) {
126
+ if (currentWallet == address(this)) {
127
+ // move tokens from component smart contract to external wallet
128
+ } else {
129
+ // move tokens from external wallet to component smart contract or another external wallet
130
+ uint256 allowance = $._token.allowance(currentWallet, address(this));
131
+ if (allowance < currentBalance) {
132
+ revert ErrorComponentWalletAllowanceTooSmall(currentWallet, newWallet, allowance, currentBalance);
133
+ }
134
+ }
135
+ }
136
+
137
+ // effects
138
+ $._wallet = newWallet;
139
+ emit LogComponentWalletAddressChanged(currentWallet, newWallet);
140
+
141
+ // interactions
142
+ if (currentBalance > 0) {
143
+ // transfer tokens from current wallet to new wallet
144
+ if (currentWallet == address(this)) {
145
+ // transferFrom requires self allowance too
146
+ $._token.approve(address(this), currentBalance);
147
+ }
148
+
149
+ SafeERC20.safeTransferFrom($._token, currentWallet, newWallet, currentBalance);
150
+ emit LogComponentWalletTokensTransferred(currentWallet, newWallet, currentBalance);
151
+ }
152
+ }
153
+
154
+ function getWallet() public view virtual returns (address walletAddress)
155
+ {
156
+ return _getComponentStorage()._wallet;
157
+ }
158
+
159
+ function getToken() public view virtual returns (IERC20Metadata token) {
160
+ return _getComponentStorage()._token;
161
+ }
162
+
163
+ function getTokenHandler() public view virtual returns (TokenHandler tokenHandler) {
164
+ return _getComponentStorage()._tokenHandler;
165
+ }
166
+
167
+ function getName() public view override returns(string memory name) {
168
+ return _getComponentStorage()._name;
169
+ }
170
+
171
+ /// @dev internal function for nft transfers.
172
+ /// handling logic that deals with nft transfers need to overwrite this function
173
+ function _nftTransferFrom(address from, address to, uint256 tokenId)
174
+ internal
175
+ virtual
176
+ { }
177
+ }
@@ -0,0 +1,150 @@
1
+ // SPDX-License-Identifier: Apache-2.0
2
+ pragma solidity ^0.8.19;
3
+
4
+ import {IInstanceLinkedComponent} from "./IInstanceLinkedComponent.sol";
5
+ import {IRegistry} from "../registry/IRegistry.sol";
6
+ import {IRegistryService} from "../registry/IRegistryService.sol";
7
+ import {IInstance} from "../instance/IInstance.sol";
8
+ import {IAccess} from "../instance/module/IAccess.sol";
9
+ import {ObjectType, INSTANCE, REGISTRY} from "../type/ObjectType.sol";
10
+ import {NftId} from "../type/NftId.sol";
11
+ import {RoleId} from "../type/RoleId.sol";
12
+
13
+ import {Service} from "../shared/Service.sol";
14
+ import {InstanceService} from "../instance/InstanceService.sol";
15
+ import {InstanceAccessManager} from "../instance/InstanceAccessManager.sol";
16
+
17
+ abstract contract ComponentService is
18
+ Service
19
+ {
20
+
21
+ error ErrorComponentServiceNotComponent(address component);
22
+ error ErrorComponentServiceInvalidType(address component, ObjectType requiredType, ObjectType componentType);
23
+ error ErrorComponentServiceSenderNotOwner(address component, address initialOwner, address sender);
24
+ error ErrorComponentServiceExpectedRoleMissing(NftId instanceNftId, RoleId requiredRole, address sender);
25
+ error ErrorComponentServiceComponentLocked(address component);
26
+ error ErrorComponentServiceSenderNotService(address sender);
27
+ error ErrorComponentServiceComponentTypeInvalid(address component, ObjectType expectedType, ObjectType foundType);
28
+
29
+ /// @dev modifier to check if caller is a registered service
30
+ modifier onlyService() {
31
+ address caller = msg.sender;
32
+ if(!getRegistry().isRegisteredService(caller)) {
33
+ revert ErrorComponentServiceSenderNotService(caller);
34
+ }
35
+ _;
36
+ }
37
+
38
+ // view functions
39
+
40
+ function getRegistryService() public view virtual returns (IRegistryService) {
41
+ return IRegistryService(_getServiceAddress(REGISTRY()));
42
+ }
43
+
44
+ function getInstanceService() public view returns (InstanceService) {
45
+ return InstanceService(_getServiceAddress(INSTANCE()));
46
+ }
47
+
48
+ // internal functions
49
+ function _checkComponentForRegistration(
50
+ address componentAddress,
51
+ ObjectType requiredType,
52
+ RoleId requiredRole
53
+ )
54
+ internal
55
+ view
56
+ returns (
57
+ IInstanceLinkedComponent component,
58
+ address owner,
59
+ IInstance instance,
60
+ NftId instanceNftId
61
+ )
62
+ {
63
+ // component may only be registerd by initial owner of component
64
+ owner = msg.sender;
65
+
66
+ // check this is a component
67
+ component = IInstanceLinkedComponent(componentAddress);
68
+ if(!component.supportsInterface(type(IInstanceLinkedComponent).interfaceId)) {
69
+ revert ErrorComponentServiceNotComponent(componentAddress);
70
+ }
71
+
72
+ // check component is of required type
73
+ IRegistry.ObjectInfo memory componentInfo = component.getInitialInfo();
74
+ if(componentInfo.objectType != requiredType) {
75
+ revert ErrorComponentServiceInvalidType(componentAddress, requiredType, componentInfo.objectType);
76
+ }
77
+
78
+ // check msg.sender is component owner
79
+ address initialOwner = componentInfo.initialOwner;
80
+ if(owner != initialOwner) {
81
+ revert ErrorComponentServiceSenderNotOwner(componentAddress, componentInfo.initialOwner, owner);
82
+ }
83
+
84
+ // check instance has assigned required role to owner
85
+ instanceNftId = componentInfo.parentNftId;
86
+ instance = _getInstance(instanceNftId);
87
+ if(!instance.getInstanceAccessManager().hasRole(requiredRole, owner)) {
88
+ revert ErrorComponentServiceExpectedRoleMissing(instanceNftId, requiredRole, owner);
89
+ }
90
+ }
91
+
92
+ // internal view functions
93
+ function _getAndVerifyCallingComponentAndInstance(
94
+ ObjectType expectedType // assume always of `component` type
95
+ )
96
+ internal
97
+ view
98
+ returns(
99
+ NftId componentNftId,
100
+ IRegistry.ObjectInfo memory componentInfo,
101
+ IInstance instance
102
+ )
103
+ {
104
+ componentNftId = getRegistry().getNftId(msg.sender);
105
+ (componentInfo, instance) = _getAndVerifyComponentInfoAndInstance(componentNftId, expectedType);
106
+
107
+ // locked component can not call services
108
+ if (instance.getInstanceAccessManager().isTargetLocked(componentInfo.objectAddress)) {
109
+ revert IAccess.ErrorIAccessTargetLocked(componentInfo.objectAddress);
110
+ }
111
+ }
112
+
113
+ function _getAndVerifyComponentInfoAndInstance(
114
+ NftId componentNftId,
115
+ ObjectType expectedType // assume always of `component` type
116
+ )
117
+ internal
118
+ view
119
+ returns(
120
+ IRegistry.ObjectInfo memory componentInfo,
121
+ IInstance instance
122
+ )
123
+ {
124
+ componentInfo = getRegistry().getObjectInfo(componentNftId);
125
+ if(componentInfo.objectType != expectedType) {
126
+ revert ErrorComponentServiceComponentTypeInvalid(
127
+ componentInfo.objectAddress,
128
+ expectedType,
129
+ componentInfo.objectType);
130
+ }
131
+
132
+ instance = _getInstance(componentInfo.parentNftId);
133
+ }
134
+ // assume componentNftId is always of `instance` type
135
+ function _getInstance(NftId instanceNftId) internal view returns (IInstance) {
136
+ return IInstance(
137
+ getRegistry().getObjectInfo(
138
+ instanceNftId).objectAddress);
139
+ }
140
+ // assume componentNftId is always of `component` type
141
+ /*function _getInstanceForComponent(NftId componentNftId) internal view returns (IInstance) {
142
+ NftId instanceNftId = getRegistry().getObjectInfo(componentNftId).parentNftId;
143
+ address instanceAddress = getRegistry().getObjectInfo(instanceNftId).objectAddress;
144
+ return IInstance(instanceAddress);
145
+ }*/
146
+
147
+ function _getServiceAddress(ObjectType domain) internal view returns (address) {
148
+ return getRegistry().getServiceAddress(domain, getVersion().toMajorPart());
149
+ }
150
+ }
@@ -0,0 +1,58 @@
1
+ // SPDX-License-Identifier: Apache-2.0
2
+ pragma solidity ^0.8.20;
3
+
4
+ import {IAccessManaged} from "@openzeppelin/contracts/access/manager/IAccessManaged.sol";
5
+ import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
6
+
7
+ import {IComponents} from "../instance/module/IComponents.sol";
8
+ import {IInstance} from "../instance/IInstance.sol";
9
+ import {IInstanceService} from "../instance/IInstanceService.sol";
10
+ import {IProductService} from "../product/IProductService.sol";
11
+ import {IRegisterable} from "../shared/IRegisterable.sol";
12
+ import {ITransferInterceptor} from "../registry/ITransferInterceptor.sol";
13
+ import {NftId} from "../type/NftId.sol";
14
+ import {ObjectType} from "../type/ObjectType.sol";
15
+ import {TokenHandler} from "../shared/TokenHandler.sol";
16
+
17
+ /// @dev component base class
18
+ /// component examples are staking, product, distribution, pool and oracle
19
+ interface IComponent is
20
+ IRegisterable,
21
+ IAccessManaged
22
+ {
23
+ error ErrorComponentNotChainNft(address caller);
24
+ error ErrorComponentTokenAddressZero();
25
+ error ErrorComponentWalletAddressZero();
26
+ error ErrorComponentWalletAddressIsSameAsCurrent();
27
+ error ErrorComponentWalletAllowanceTooSmall(address oldWallet, address newWallet, uint256 allowance, uint256 balance);
28
+ error ErrorComponentWalletNotComponent();
29
+
30
+ event LogComponentWalletAddressChanged(address oldWallet, address newWallet);
31
+ event LogComponentWalletTokensTransferred(address from, address to, uint256 amount);
32
+ event LogComponentTokenHandlerApproved(address token, uint256 limit);
33
+
34
+ /// @dev approves token hanlder to spend up to the specified amount of tokens
35
+ /// reverts if component wallet is not component itself
36
+ /// only component owner (nft holder) is authorizes to call this function
37
+ function approveTokenHandler(uint256 spendingLimitAmount) external;
38
+
39
+ /// @dev sets the wallet address for the component
40
+ /// if the current wallet has tokens, these will be transferred
41
+ /// if the new wallet address is externally owned, an approval from the
42
+ /// owner of the external wallet for the component to move all tokens must exist
43
+ function setWallet(address walletAddress) external;
44
+
45
+ /// @dev returns the name of this component
46
+ /// to successfully register the component with an instance the name MUST be unique in the linked instance
47
+ function getName() external view returns (string memory name);
48
+
49
+ /// @dev defines which ERC20 token is used by this component
50
+ function getToken() external view returns (IERC20Metadata token);
51
+
52
+ /// @dev returns token handler for this component
53
+ function getTokenHandler() external view returns (TokenHandler tokenHandler);
54
+
55
+ /// @dev defines the wallet address used to hold the ERC20 tokens related to this component
56
+ /// the default address is the component token address
57
+ function getWallet() external view returns (address walletAddress);
58
+ }