@etherisc/gif-next 0.0.2-e9a637d-547 → 0.0.2-eadf4ad-211

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 (417) hide show
  1. package/README.md +6 -12
  2. package/artifacts/contracts/distribution/Distribution.sol/Distribution.dbg.json +4 -0
  3. package/artifacts/contracts/{components → distribution}/Distribution.sol/Distribution.json +61 -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 +819 -0
  8. package/artifacts/contracts/distribution/IDistributionComponent.sol/IDistributionComponent.dbg.json +4 -0
  9. package/artifacts/contracts/{components → distribution}/IDistributionComponent.sol/IDistributionComponent.json +45 -14
  10. package/artifacts/contracts/distribution/IDistributionService.sol/IDistributionService.dbg.json +4 -0
  11. package/artifacts/contracts/{instance/service → distribution}/IDistributionService.sol/IDistributionService.json +24 -274
  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 +93 -13
  16. package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.dbg.json +1 -1
  17. package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.json +5 -43
  18. package/artifacts/contracts/instance/Instance.sol/Instance.dbg.json +1 -1
  19. package/artifacts/contracts/instance/Instance.sol/Instance.json +109 -29
  20. package/artifacts/contracts/instance/InstanceAccessManager.sol/InstanceAccessManager.dbg.json +1 -1
  21. package/artifacts/contracts/instance/InstanceAccessManager.sol/InstanceAccessManager.json +6 -6
  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 +349 -64
  26. package/artifacts/contracts/instance/InstanceService.sol/InstanceService.dbg.json +1 -1
  27. package/artifacts/contracts/instance/InstanceService.sol/InstanceService.json +49 -278
  28. package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.dbg.json +1 -1
  29. package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.json +83 -133
  30. package/artifacts/contracts/instance/InstanceStore.sol/InstanceStore.dbg.json +1 -1
  31. package/artifacts/contracts/instance/InstanceStore.sol/InstanceStore.json +427 -257
  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/IBundle.sol/IBundle.dbg.json +1 -1
  45. package/artifacts/contracts/instance/module/IComponents.sol/IComponents.dbg.json +1 -1
  46. package/artifacts/contracts/instance/module/IDistribution.sol/IDistribution.dbg.json +1 -1
  47. package/artifacts/contracts/instance/module/IPolicy.sol/IPolicy.dbg.json +1 -1
  48. package/artifacts/contracts/instance/module/IRisk.sol/IRisk.dbg.json +1 -1
  49. package/artifacts/contracts/instance/module/ISetup.sol/ISetup.dbg.json +1 -1
  50. package/artifacts/contracts/instance/module/ITreasury.sol/ITreasury.dbg.json +1 -1
  51. package/artifacts/contracts/pool/BundleService.sol/BundleService.dbg.json +4 -0
  52. package/artifacts/contracts/pool/BundleService.sol/BundleService.json +1288 -0
  53. package/artifacts/contracts/pool/BundleServiceManager.sol/BundleServiceManager.dbg.json +4 -0
  54. package/artifacts/contracts/pool/BundleServiceManager.sol/BundleServiceManager.json +735 -0
  55. package/artifacts/contracts/pool/IBundleService.sol/IBundleService.dbg.json +4 -0
  56. package/artifacts/contracts/{instance/service → pool}/IBundleService.sol/IBundleService.json +105 -29
  57. package/artifacts/contracts/pool/IPoolComponent.sol/IPoolComponent.dbg.json +4 -0
  58. package/artifacts/contracts/{components → pool}/IPoolComponent.sol/IPoolComponent.json +56 -25
  59. package/artifacts/contracts/pool/IPoolService.sol/IPoolService.dbg.json +4 -0
  60. package/artifacts/contracts/{instance/service → pool}/IPoolService.sol/IPoolService.json +272 -39
  61. package/artifacts/contracts/pool/Pool.sol/Pool.dbg.json +4 -0
  62. package/artifacts/contracts/{components → pool}/Pool.sol/Pool.json +56 -25
  63. package/artifacts/contracts/pool/PoolService.sol/PoolService.dbg.json +4 -0
  64. package/artifacts/contracts/pool/PoolService.sol/PoolService.json +1622 -0
  65. package/artifacts/contracts/pool/PoolServiceManager.sol/PoolServiceManager.dbg.json +4 -0
  66. package/artifacts/contracts/pool/PoolServiceManager.sol/PoolServiceManager.json +747 -0
  67. package/artifacts/contracts/product/ApplicationService.sol/ApplicationService.dbg.json +4 -0
  68. package/artifacts/contracts/product/ApplicationService.sol/ApplicationService.json +918 -0
  69. package/artifacts/contracts/product/ApplicationServiceManager.sol/ApplicationServiceManager.dbg.json +4 -0
  70. package/artifacts/contracts/product/ApplicationServiceManager.sol/ApplicationServiceManager.json +687 -0
  71. package/artifacts/contracts/product/ClaimService.sol/ClaimService.dbg.json +4 -0
  72. package/artifacts/contracts/product/ClaimService.sol/ClaimService.json +1386 -0
  73. package/artifacts/contracts/product/ClaimServiceManager.sol/ClaimServiceManager.dbg.json +4 -0
  74. package/artifacts/contracts/product/ClaimServiceManager.sol/ClaimServiceManager.json +787 -0
  75. package/artifacts/contracts/product/IApplicationService.sol/IApplicationService.dbg.json +4 -0
  76. package/artifacts/contracts/{instance/service/IClaimService.sol/IClaimService.json → product/IApplicationService.sol/IApplicationService.json} +119 -101
  77. package/artifacts/contracts/product/IClaimService.sol/IClaimService.dbg.json +4 -0
  78. package/artifacts/contracts/product/IClaimService.sol/IClaimService.json +753 -0
  79. package/artifacts/contracts/product/IPolicyService.sol/IPolicyService.dbg.json +4 -0
  80. package/artifacts/contracts/{instance/service → product}/IPolicyService.sol/IPolicyService.json +129 -84
  81. package/artifacts/contracts/product/IPricingService.sol/IPricingService.dbg.json +4 -0
  82. package/artifacts/contracts/{instance/service/IApplicationService.sol/IApplicationService.json → product/IPricingService.sol/IPricingService.json} +63 -175
  83. package/artifacts/contracts/product/IProductComponent.sol/IProductComponent.dbg.json +4 -0
  84. package/artifacts/contracts/{components → product}/IProductComponent.sol/IProductComponent.json +53 -22
  85. package/artifacts/contracts/product/IProductService.sol/IProductService.dbg.json +4 -0
  86. package/artifacts/contracts/{instance/service → product}/IProductService.sol/IProductService.json +6 -14
  87. package/artifacts/contracts/product/PolicyService.sol/PolicyService.dbg.json +4 -0
  88. package/artifacts/contracts/product/PolicyService.sol/PolicyService.json +1281 -0
  89. package/artifacts/contracts/product/PolicyServiceManager.sol/PolicyServiceManager.dbg.json +4 -0
  90. package/artifacts/contracts/product/PolicyServiceManager.sol/PolicyServiceManager.json +779 -0
  91. package/artifacts/contracts/product/PricingService.sol/PricingService.dbg.json +4 -0
  92. package/artifacts/contracts/product/PricingService.sol/PricingService.json +1004 -0
  93. package/artifacts/contracts/product/PricingServiceManager.sol/PricingServiceManager.dbg.json +4 -0
  94. package/artifacts/contracts/product/PricingServiceManager.sol/PricingServiceManager.json +727 -0
  95. package/artifacts/contracts/product/Product.sol/Product.dbg.json +4 -0
  96. package/artifacts/contracts/{components → product}/Product.sol/Product.json +53 -22
  97. package/artifacts/contracts/product/ProductService.sol/ProductService.dbg.json +4 -0
  98. package/artifacts/contracts/product/ProductService.sol/ProductService.json +864 -0
  99. package/artifacts/contracts/product/ProductServiceManager.sol/ProductServiceManager.dbg.json +4 -0
  100. package/artifacts/contracts/product/ProductServiceManager.sol/ProductServiceManager.json +679 -0
  101. package/artifacts/contracts/registry/ChainNft.sol/ChainNft.dbg.json +1 -1
  102. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.dbg.json +1 -1
  103. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.json +73 -13
  104. package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.dbg.json +1 -1
  105. package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.json +154 -60
  106. package/artifacts/contracts/registry/ITransferInterceptor.sol/ITransferInterceptor.dbg.json +1 -1
  107. package/artifacts/contracts/registry/Registry.sol/Registry.dbg.json +1 -1
  108. package/artifacts/contracts/registry/Registry.sol/Registry.json +97 -29
  109. package/artifacts/contracts/registry/RegistryAccessManager.sol/RegistryAccessManager.dbg.json +1 -1
  110. package/artifacts/contracts/registry/RegistryAccessManager.sol/RegistryAccessManager.json +50 -97
  111. package/artifacts/contracts/registry/RegistryService.sol/RegistryService.dbg.json +1 -1
  112. package/artifacts/contracts/registry/RegistryService.sol/RegistryService.json +174 -80
  113. package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.dbg.json +1 -1
  114. package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.json +78 -47
  115. package/artifacts/contracts/registry/ReleaseManager.sol/ReleaseManager.dbg.json +1 -1
  116. package/artifacts/contracts/registry/ReleaseManager.sol/ReleaseManager.json +369 -82
  117. package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.dbg.json +1 -1
  118. package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.json +14 -27
  119. package/artifacts/contracts/shared/AccessManagerUpgradeableInitializeable.sol/AccessManagerUpgradeableInitializeable.dbg.json +4 -0
  120. package/artifacts/contracts/{instance → shared}/AccessManagerUpgradeableInitializeable.sol/AccessManagerUpgradeableInitializeable.json +3 -3
  121. package/artifacts/contracts/shared/Component.sol/Component.dbg.json +4 -0
  122. package/artifacts/contracts/{components → shared}/Component.sol/Component.json +38 -7
  123. package/artifacts/contracts/shared/ComponentService.sol/ComponentService.dbg.json +4 -0
  124. package/artifacts/contracts/{instance/base → shared}/ComponentService.sol/ComponentService.json +38 -14
  125. package/artifacts/contracts/shared/ERC165.sol/ERC165.dbg.json +1 -1
  126. package/artifacts/contracts/shared/IComponent.sol/IComponent.dbg.json +4 -0
  127. package/artifacts/contracts/{components → shared}/IComponent.sol/IComponent.json +38 -7
  128. package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.dbg.json +1 -1
  129. package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.json +0 -13
  130. package/artifacts/contracts/shared/IPolicyHolder.sol/IPolicyHolder.dbg.json +1 -1
  131. package/artifacts/contracts/shared/IPolicyHolder.sol/IPolicyHolder.json +69 -9
  132. package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.dbg.json +1 -1
  133. package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.json +0 -13
  134. package/artifacts/contracts/shared/IRegistryLinked.sol/IRegistryLinked.dbg.json +1 -1
  135. package/artifacts/contracts/shared/IRegistryLinked.sol/IRegistryLinked.json +0 -13
  136. package/artifacts/contracts/shared/IService.sol/IService.dbg.json +1 -1
  137. package/artifacts/contracts/shared/IService.sol/IService.json +5 -13
  138. package/artifacts/contracts/shared/IVersionable.sol/IVersionable.dbg.json +1 -1
  139. package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.dbg.json +1 -1
  140. package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.json +8 -21
  141. package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.dbg.json +1 -1
  142. package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.json +80 -26
  143. package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.dbg.json +1 -1
  144. package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.json +49 -33
  145. package/artifacts/contracts/shared/Registerable.sol/Registerable.dbg.json +1 -1
  146. package/artifacts/contracts/shared/Registerable.sol/Registerable.json +8 -21
  147. package/artifacts/contracts/shared/RegistryLinked.sol/RegistryLinked.dbg.json +1 -1
  148. package/artifacts/contracts/shared/RegistryLinked.sol/RegistryLinked.json +2 -15
  149. package/artifacts/contracts/shared/Service.sol/Service.dbg.json +1 -1
  150. package/artifacts/contracts/shared/Service.sol/Service.json +5 -13
  151. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.dbg.json +1 -1
  152. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.json +24 -6
  153. package/artifacts/contracts/shared/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.dbg.json +1 -1
  154. package/artifacts/contracts/shared/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.json +2 -2
  155. package/artifacts/contracts/shared/Versionable.sol/Versionable.dbg.json +1 -1
  156. package/artifacts/contracts/staking/IStakingService.sol/IStakingService.dbg.json +4 -0
  157. package/artifacts/contracts/staking/IStakingService.sol/IStakingService.json +523 -0
  158. package/artifacts/contracts/staking/StakingService.sol/StakingService.dbg.json +4 -0
  159. package/artifacts/contracts/staking/StakingService.sol/StakingService.json +767 -0
  160. package/artifacts/contracts/staking/StakingServiceManager.sol/StakingServiceManager.dbg.json +4 -0
  161. package/artifacts/contracts/staking/StakingServiceManager.sol/StakingServiceManager.json +667 -0
  162. package/artifacts/contracts/type/AddressSet.sol/LibAddressSet.dbg.json +4 -0
  163. package/artifacts/contracts/{types → type}/AddressSet.sol/LibAddressSet.json +3 -3
  164. package/artifacts/contracts/type/Amount.sol/AmountLib.dbg.json +4 -0
  165. package/artifacts/contracts/type/Amount.sol/AmountLib.json +281 -0
  166. package/artifacts/contracts/type/Blocknumber.sol/BlocknumberLib.dbg.json +4 -0
  167. package/artifacts/contracts/{types → type}/Blocknumber.sol/BlocknumberLib.json +3 -3
  168. package/artifacts/contracts/type/ClaimId.sol/ClaimIdLib.dbg.json +4 -0
  169. package/artifacts/contracts/type/ClaimId.sol/ClaimIdLib.json +179 -0
  170. package/artifacts/contracts/type/DistributorType.sol/DistributorTypeLib.dbg.json +4 -0
  171. package/artifacts/contracts/{types → type}/DistributorType.sol/DistributorTypeLib.json +5 -5
  172. package/artifacts/contracts/type/Fee.sol/FeeLib.dbg.json +4 -0
  173. package/artifacts/contracts/type/Fee.sol/FeeLib.json +312 -0
  174. package/artifacts/contracts/type/Key32.sol/Key32Lib.dbg.json +4 -0
  175. package/artifacts/contracts/{types → type}/Key32.sol/Key32Lib.json +3 -3
  176. package/artifacts/contracts/type/NftId.sol/NftIdLib.dbg.json +4 -0
  177. package/artifacts/contracts/{types → type}/NftId.sol/NftIdLib.json +5 -5
  178. package/artifacts/contracts/type/NftIdSet.sol/LibNftIdSet.dbg.json +4 -0
  179. package/artifacts/contracts/{types → type}/NftIdSet.sol/LibNftIdSet.json +3 -3
  180. package/artifacts/contracts/type/ObjectType.sol/ObjectTypeLib.dbg.json +4 -0
  181. package/artifacts/contracts/{types → type}/ObjectType.sol/ObjectTypeLib.json +3 -3
  182. package/artifacts/contracts/type/PayoutId.sol/PayoutIdLib.dbg.json +4 -0
  183. package/artifacts/contracts/type/PayoutId.sol/PayoutIdLib.json +209 -0
  184. package/artifacts/contracts/type/Referral.sol/ReferralLib.dbg.json +4 -0
  185. package/artifacts/contracts/{types → type}/Referral.sol/ReferralLib.json +5 -5
  186. package/artifacts/contracts/type/RiskId.sol/RiskIdLib.dbg.json +4 -0
  187. package/artifacts/contracts/{types → type}/RiskId.sol/RiskIdLib.json +5 -5
  188. package/artifacts/contracts/type/RoleId.sol/RoleIdLib.dbg.json +4 -0
  189. package/artifacts/contracts/{types → type}/RoleId.sol/RoleIdLib.json +5 -5
  190. package/artifacts/contracts/type/Seconds.sol/SecondsLib.dbg.json +4 -0
  191. package/artifacts/contracts/{types → type}/Seconds.sol/SecondsLib.json +3 -3
  192. package/artifacts/contracts/type/StateId.sol/StateIdLib.dbg.json +4 -0
  193. package/artifacts/contracts/{types → type}/StateId.sol/StateIdLib.json +3 -3
  194. package/artifacts/contracts/type/Timestamp.sol/TimestampLib.dbg.json +4 -0
  195. package/artifacts/contracts/{types → type}/Timestamp.sol/TimestampLib.json +20 -7
  196. package/artifacts/contracts/type/UFixed.sol/MathLib.dbg.json +4 -0
  197. package/artifacts/contracts/{types → type}/UFixed.sol/MathLib.json +3 -3
  198. package/artifacts/contracts/type/UFixed.sol/UFixedLib.dbg.json +4 -0
  199. package/artifacts/contracts/{types → type}/UFixed.sol/UFixedLib.json +3 -3
  200. package/artifacts/contracts/type/Version.sol/VersionLib.dbg.json +4 -0
  201. package/artifacts/contracts/{types → type}/Version.sol/VersionLib.json +3 -3
  202. package/artifacts/contracts/type/Version.sol/VersionPartLib.dbg.json +4 -0
  203. package/artifacts/contracts/{types → type}/Version.sol/VersionPartLib.json +3 -3
  204. package/contracts/{components → distribution}/Distribution.sol +21 -16
  205. package/contracts/{instance/service → distribution}/DistributionService.sol +93 -179
  206. package/contracts/{instance/service → distribution}/DistributionServiceManager.sol +14 -11
  207. package/contracts/{components → distribution}/IDistributionComponent.sol +7 -7
  208. package/contracts/{instance/service → distribution}/IDistributionService.sol +18 -30
  209. package/contracts/instance/BundleManager.sol +8 -9
  210. package/contracts/instance/IInstance.sol +30 -13
  211. package/contracts/instance/IInstanceService.sol +6 -17
  212. package/contracts/instance/Instance.sol +76 -46
  213. package/contracts/instance/InstanceAccessManager.sol +8 -5
  214. package/contracts/instance/InstanceAuthorizationsLib.sol +308 -0
  215. package/contracts/instance/InstanceReader.sol +91 -16
  216. package/contracts/instance/InstanceService.sol +78 -307
  217. package/contracts/instance/InstanceServiceManager.sol +11 -21
  218. package/contracts/instance/InstanceStore.sol +57 -65
  219. package/contracts/instance/{Cloneable.sol → base/Cloneable.sol} +1 -1
  220. package/contracts/instance/base/IKeyValueStore.sol +14 -10
  221. package/contracts/instance/base/ILifecycle.sol +3 -3
  222. package/contracts/instance/base/KeyValueStore.sol +32 -43
  223. package/contracts/instance/base/Lifecycle.sol +17 -5
  224. package/contracts/instance/{ObjectManager.sol → base/ObjectManager.sol} +7 -7
  225. package/contracts/instance/module/IAccess.sol +2 -2
  226. package/contracts/instance/module/IBundle.sol +5 -5
  227. package/contracts/instance/module/IComponents.sol +8 -8
  228. package/contracts/instance/module/IDistribution.sol +7 -6
  229. package/contracts/instance/module/IPolicy.sol +22 -16
  230. package/contracts/instance/module/IRisk.sol +1 -1
  231. package/contracts/instance/module/ISetup.sol +4 -4
  232. package/contracts/instance/module/ITreasury.sol +2 -2
  233. package/contracts/{instance/service → pool}/BundleService.sol +108 -155
  234. package/contracts/pool/BundleServiceManager.sol +42 -0
  235. package/contracts/{instance/service → pool}/IBundleService.sol +43 -18
  236. package/contracts/{components → pool}/IPoolComponent.sol +14 -13
  237. package/contracts/{instance/service → pool}/IPoolService.sol +28 -13
  238. package/contracts/{components → pool}/Pool.sol +20 -21
  239. package/contracts/{instance/service → pool}/PoolService.sol +160 -59
  240. package/contracts/pool/PoolServiceManager.sol +42 -0
  241. package/contracts/product/ApplicationService.sol +187 -0
  242. package/contracts/{instance/service → product}/ApplicationServiceManager.sol +11 -8
  243. package/contracts/product/ClaimService.sol +443 -0
  244. package/contracts/{instance/service → product}/ClaimServiceManager.sol +11 -8
  245. package/contracts/{instance/service → product}/IApplicationService.sol +14 -34
  246. package/contracts/product/IClaimService.sol +93 -0
  247. package/contracts/{instance/service → product}/IPolicyService.sol +34 -26
  248. package/contracts/product/IPricingService.sol +37 -0
  249. package/contracts/{components → product}/IProductComponent.sol +11 -10
  250. package/contracts/{instance/service → product}/IProductService.sol +10 -10
  251. package/contracts/{instance/service → product}/PolicyService.sol +154 -138
  252. package/contracts/product/PolicyServiceManager.sol +42 -0
  253. package/contracts/product/PricingService.sol +276 -0
  254. package/contracts/product/PricingServiceManager.sol +42 -0
  255. package/contracts/{components → product}/Product.sol +160 -74
  256. package/contracts/{instance/service → product}/ProductService.sol +50 -47
  257. package/contracts/product/ProductServiceManager.sol +42 -0
  258. package/contracts/registry/IRegistry.sol +23 -16
  259. package/contracts/registry/IRegistryService.sol +26 -36
  260. package/contracts/registry/Registry.sol +43 -39
  261. package/contracts/registry/RegistryAccessManager.sol +39 -123
  262. package/contracts/registry/RegistryService.sol +32 -83
  263. package/contracts/registry/RegistryServiceManager.sol +21 -11
  264. package/contracts/registry/ReleaseManager.sol +247 -189
  265. package/contracts/registry/TokenRegistry.sol +2 -2
  266. package/contracts/{components → shared}/Component.sol +26 -8
  267. package/contracts/{instance/base → shared}/ComponentService.sol +60 -40
  268. package/contracts/{components → shared}/IComponent.sol +19 -5
  269. package/contracts/shared/INftOwnable.sol +1 -1
  270. package/contracts/shared/IPolicyHolder.sol +24 -10
  271. package/contracts/shared/IRegistryLinked.sol +0 -1
  272. package/contracts/shared/IService.sol +3 -1
  273. package/contracts/shared/IVersionable.sol +1 -1
  274. package/contracts/shared/NftOwnable.sol +1 -3
  275. package/contracts/shared/PolicyHolder.sol +31 -18
  276. package/contracts/shared/ProxyManager.sol +29 -3
  277. package/contracts/shared/Registerable.sol +12 -11
  278. package/contracts/shared/RegistryLinked.sol +0 -5
  279. package/contracts/shared/Service.sol +3 -3
  280. package/contracts/shared/TokenHandler.sol +4 -2
  281. package/contracts/shared/Versionable.sol +1 -1
  282. package/contracts/staking/IStakingService.sol +102 -0
  283. package/contracts/staking/StakingService.sol +169 -0
  284. package/contracts/staking/StakingServiceManager.sol +40 -0
  285. package/contracts/{types → type}/Amount.sol +49 -0
  286. package/contracts/{types → type}/ClaimId.sol +25 -2
  287. package/contracts/{types → type}/Fee.sol +7 -6
  288. package/contracts/{types → type}/NftIdSet.sol +1 -1
  289. package/contracts/{types → type}/ObjectType.sol +10 -5
  290. package/contracts/{types → type}/PayoutId.sol +33 -5
  291. package/contracts/{types → type}/RoleId.sol +50 -8
  292. package/contracts/{types → type}/StateId.sol +6 -2
  293. package/contracts/{types → type}/Timestamp.sol +5 -0
  294. package/package.json +1 -1
  295. package/artifacts/contracts/components/Component.sol/Component.dbg.json +0 -4
  296. package/artifacts/contracts/components/Distribution.sol/Distribution.dbg.json +0 -4
  297. package/artifacts/contracts/components/IComponent.sol/IComponent.dbg.json +0 -4
  298. package/artifacts/contracts/components/IDistributionComponent.sol/IDistributionComponent.dbg.json +0 -4
  299. package/artifacts/contracts/components/IPoolComponent.sol/IPoolComponent.dbg.json +0 -4
  300. package/artifacts/contracts/components/IProductComponent.sol/IProductComponent.dbg.json +0 -4
  301. package/artifacts/contracts/components/Pool.sol/Pool.dbg.json +0 -4
  302. package/artifacts/contracts/components/Product.sol/Product.dbg.json +0 -4
  303. package/artifacts/contracts/instance/AccessManagerUpgradeableInitializeable.sol/AccessManagerUpgradeableInitializeable.dbg.json +0 -4
  304. package/artifacts/contracts/instance/Cloneable.sol/Cloneable.dbg.json +0 -4
  305. package/artifacts/contracts/instance/ObjectManager.sol/ObjectManager.dbg.json +0 -4
  306. package/artifacts/contracts/instance/base/ComponentService.sol/ComponentService.dbg.json +0 -4
  307. package/artifacts/contracts/instance/service/ApplicationService.sol/ApplicationService.dbg.json +0 -4
  308. package/artifacts/contracts/instance/service/ApplicationService.sol/ApplicationService.json +0 -1039
  309. package/artifacts/contracts/instance/service/ApplicationServiceManager.sol/ApplicationServiceManager.dbg.json +0 -4
  310. package/artifacts/contracts/instance/service/ApplicationServiceManager.sol/ApplicationServiceManager.json +0 -673
  311. package/artifacts/contracts/instance/service/BundleService.sol/BundleService.dbg.json +0 -4
  312. package/artifacts/contracts/instance/service/BundleService.sol/BundleService.json +0 -1231
  313. package/artifacts/contracts/instance/service/BundleServiceManager.sol/BundleServiceManager.dbg.json +0 -4
  314. package/artifacts/contracts/instance/service/BundleServiceManager.sol/BundleServiceManager.json +0 -721
  315. package/artifacts/contracts/instance/service/ClaimService.sol/ClaimService.dbg.json +0 -4
  316. package/artifacts/contracts/instance/service/ClaimService.sol/ClaimService.json +0 -817
  317. package/artifacts/contracts/instance/service/ClaimServiceManager.sol/ClaimServiceManager.dbg.json +0 -4
  318. package/artifacts/contracts/instance/service/ClaimServiceManager.sol/ClaimServiceManager.json +0 -641
  319. package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.dbg.json +0 -4
  320. package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.json +0 -1798
  321. package/artifacts/contracts/instance/service/DistributionServiceManager.sol/DistributionServiceManager.dbg.json +0 -4
  322. package/artifacts/contracts/instance/service/DistributionServiceManager.sol/DistributionServiceManager.json +0 -805
  323. package/artifacts/contracts/instance/service/IApplicationService.sol/IApplicationService.dbg.json +0 -4
  324. package/artifacts/contracts/instance/service/IBundleService.sol/IBundleService.dbg.json +0 -4
  325. package/artifacts/contracts/instance/service/IClaimService.sol/IClaimService.dbg.json +0 -4
  326. package/artifacts/contracts/instance/service/IDistributionService.sol/IDistributionService.dbg.json +0 -4
  327. package/artifacts/contracts/instance/service/IPolicyService.sol/IPolicyService.dbg.json +0 -4
  328. package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.dbg.json +0 -4
  329. package/artifacts/contracts/instance/service/IProductService.sol/IProductService.dbg.json +0 -4
  330. package/artifacts/contracts/instance/service/PolicyService.sol/PolicyService.dbg.json +0 -4
  331. package/artifacts/contracts/instance/service/PolicyService.sol/PolicyService.json +0 -1092
  332. package/artifacts/contracts/instance/service/PolicyServiceManager.sol/PolicyServiceManager.dbg.json +0 -4
  333. package/artifacts/contracts/instance/service/PolicyServiceManager.sol/PolicyServiceManager.json +0 -697
  334. package/artifacts/contracts/instance/service/PoolService.sol/PoolService.dbg.json +0 -4
  335. package/artifacts/contracts/instance/service/PoolService.sol/PoolService.json +0 -1237
  336. package/artifacts/contracts/instance/service/PoolServiceManager.sol/PoolServiceManager.dbg.json +0 -4
  337. package/artifacts/contracts/instance/service/PoolServiceManager.sol/PoolServiceManager.json +0 -661
  338. package/artifacts/contracts/instance/service/ProductService.sol/ProductService.dbg.json +0 -4
  339. package/artifacts/contracts/instance/service/ProductService.sol/ProductService.json +0 -840
  340. package/artifacts/contracts/instance/service/ProductServiceManager.sol/ProductServiceManager.dbg.json +0 -4
  341. package/artifacts/contracts/instance/service/ProductServiceManager.sol/ProductServiceManager.json +0 -653
  342. package/artifacts/contracts/shared/ContractDeployerLib.sol/ContractDeployerLib.dbg.json +0 -4
  343. package/artifacts/contracts/shared/ContractDeployerLib.sol/ContractDeployerLib.json +0 -107
  344. package/artifacts/contracts/test/TestFee.sol/TestFee.dbg.json +0 -4
  345. package/artifacts/contracts/test/TestFee.sol/TestFee.json +0 -119
  346. package/artifacts/contracts/test/TestRegisterable.sol/TestRegisterable.dbg.json +0 -4
  347. package/artifacts/contracts/test/TestRegisterable.sol/TestRegisterable.json +0 -383
  348. package/artifacts/contracts/test/TestRoleId.sol/TestRoleId.dbg.json +0 -4
  349. package/artifacts/contracts/test/TestRoleId.sol/TestRoleId.json +0 -116
  350. package/artifacts/contracts/test/TestService.sol/TestService.dbg.json +0 -4
  351. package/artifacts/contracts/test/TestService.sol/TestService.json +0 -596
  352. package/artifacts/contracts/test/TestToken.sol/TestUsdc.dbg.json +0 -4
  353. package/artifacts/contracts/test/TestToken.sol/TestUsdc.json +0 -376
  354. package/artifacts/contracts/test/TestVersion.sol/TestVersion.dbg.json +0 -4
  355. package/artifacts/contracts/test/TestVersion.sol/TestVersion.json +0 -218
  356. package/artifacts/contracts/test/TestVersionable.sol/TestVersionable.dbg.json +0 -4
  357. package/artifacts/contracts/test/TestVersionable.sol/TestVersionable.json +0 -104
  358. package/artifacts/contracts/test/Usdc.sol/USDC.dbg.json +0 -4
  359. package/artifacts/contracts/test/Usdc.sol/USDC.json +0 -376
  360. package/artifacts/contracts/types/AddressSet.sol/LibAddressSet.dbg.json +0 -4
  361. package/artifacts/contracts/types/Amount.sol/AmountLib.dbg.json +0 -4
  362. package/artifacts/contracts/types/Amount.sol/AmountLib.json +0 -161
  363. package/artifacts/contracts/types/Blocknumber.sol/BlocknumberLib.dbg.json +0 -4
  364. package/artifacts/contracts/types/ChainId.sol/ChainIdLib.dbg.json +0 -4
  365. package/artifacts/contracts/types/ChainId.sol/ChainIdLib.json +0 -10
  366. package/artifacts/contracts/types/ClaimId.sol/ClaimIdLib.dbg.json +0 -4
  367. package/artifacts/contracts/types/ClaimId.sol/ClaimIdLib.json +0 -100
  368. package/artifacts/contracts/types/DistributorType.sol/DistributorTypeLib.dbg.json +0 -4
  369. package/artifacts/contracts/types/Fee.sol/FeeLib.dbg.json +0 -4
  370. package/artifacts/contracts/types/Fee.sol/FeeLib.json +0 -288
  371. package/artifacts/contracts/types/Key32.sol/Key32Lib.dbg.json +0 -4
  372. package/artifacts/contracts/types/NftId.sol/NftIdLib.dbg.json +0 -4
  373. package/artifacts/contracts/types/NftIdSet.sol/LibNftIdSet.dbg.json +0 -4
  374. package/artifacts/contracts/types/NumberId.sol/NumberIdLib.dbg.json +0 -4
  375. package/artifacts/contracts/types/NumberId.sol/NumberIdLib.json +0 -100
  376. package/artifacts/contracts/types/ObjectType.sol/ObjectTypeLib.dbg.json +0 -4
  377. package/artifacts/contracts/types/PayoutId.sol/PayoutIdLib.dbg.json +0 -4
  378. package/artifacts/contracts/types/PayoutId.sol/PayoutIdLib.json +0 -100
  379. package/artifacts/contracts/types/Referral.sol/ReferralLib.dbg.json +0 -4
  380. package/artifacts/contracts/types/RiskId.sol/RiskIdLib.dbg.json +0 -4
  381. package/artifacts/contracts/types/RoleId.sol/RoleIdLib.dbg.json +0 -4
  382. package/artifacts/contracts/types/Seconds.sol/SecondsLib.dbg.json +0 -4
  383. package/artifacts/contracts/types/StateId.sol/StateIdLib.dbg.json +0 -4
  384. package/artifacts/contracts/types/Timestamp.sol/TimestampLib.dbg.json +0 -4
  385. package/artifacts/contracts/types/UFixed.sol/MathLib.dbg.json +0 -4
  386. package/artifacts/contracts/types/UFixed.sol/UFixedLib.dbg.json +0 -4
  387. package/artifacts/contracts/types/Version.sol/VersionLib.dbg.json +0 -4
  388. package/artifacts/contracts/types/Version.sol/VersionPartLib.dbg.json +0 -4
  389. package/contracts/instance/service/ApplicationService.sol +0 -351
  390. package/contracts/instance/service/BundleServiceManager.sol +0 -51
  391. package/contracts/instance/service/ClaimService.sol +0 -151
  392. package/contracts/instance/service/IClaimService.sol +0 -61
  393. package/contracts/instance/service/PolicyServiceManager.sol +0 -54
  394. package/contracts/instance/service/PoolServiceManager.sol +0 -51
  395. package/contracts/instance/service/ProductServiceManager.sol +0 -54
  396. package/contracts/shared/ContractDeployerLib.sol +0 -72
  397. package/contracts/test/TestFee.sol +0 -25
  398. package/contracts/test/TestRegisterable.sol +0 -18
  399. package/contracts/test/TestRoleId.sol +0 -14
  400. package/contracts/test/TestService.sol +0 -25
  401. package/contracts/test/TestToken.sol +0 -26
  402. package/contracts/test/TestVersion.sol +0 -44
  403. package/contracts/test/TestVersionable.sol +0 -17
  404. package/contracts/test/Usdc.sol +0 -26
  405. package/contracts/types/ChainId.sol +0 -38
  406. package/contracts/types/NumberId.sol +0 -52
  407. /package/contracts/{instance → shared}/AccessManagerUpgradeableInitializeable.sol +0 -0
  408. /package/contracts/{types → type}/AddressSet.sol +0 -0
  409. /package/contracts/{types → type}/Blocknumber.sol +0 -0
  410. /package/contracts/{types → type}/DistributorType.sol +0 -0
  411. /package/contracts/{types → type}/Key32.sol +0 -0
  412. /package/contracts/{types → type}/NftId.sol +0 -0
  413. /package/contracts/{types → type}/Referral.sol +0 -0
  414. /package/contracts/{types → type}/RiskId.sol +0 -0
  415. /package/contracts/{types → type}/Seconds.sol +0 -0
  416. /package/contracts/{types → type}/UFixed.sol +0 -0
  417. /package/contracts/{types → type}/Version.sol +0 -0
@@ -1,31 +1,24 @@
1
1
  // SPDX-License-Identifier: UNLICENSED
2
2
  pragma solidity ^0.8.20;
3
3
 
4
- import {AccessManager} from "@openzeppelin/contracts/access/manager/AccessManager.sol";
4
+ import {IAccessManaged} from "@openzeppelin/contracts/access/manager/IAccessManaged.sol";
5
5
  import {AccessManaged} from "@openzeppelin/contracts/access/manager/AccessManaged.sol";
6
+ import {AccessManager} from "@openzeppelin/contracts/access/manager/AccessManager.sol";
7
+ import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";
8
+
9
+ import {RoleId, RoleIdLib, GIF_MANAGER_ROLE, GIF_ADMIN_ROLE} from "../type/RoleId.sol";
6
10
 
7
- import {RoleId, RoleIdLib,
8
- GIF_MANAGER_ROLE,
9
- GIF_ADMIN_ROLE,
10
- RELEASE_MANAGER_ROLE} from "../types/RoleId.sol";
11
+ import {AccessManagerUpgradeableInitializeable} from "../shared/AccessManagerUpgradeableInitializeable.sol";
11
12
 
12
13
  import {TokenRegistry} from "./TokenRegistry.sol";
13
14
  import {ReleaseManager} from "./ReleaseManager.sol";
14
15
 
15
16
  /*
16
- 4 types of roles:
17
- 1) RELEASE_MANAGER_ROLE
18
- - has only ReleaseManager as member
19
- - responsible for setting and granting of REGISTRAR roles
20
- 1) REGISTRAR roles
21
- - set and granted by RELEASE_MANAGER_ROLE
22
- - each has 1 unique member (regular service ver.X) (subject to change)
23
- - each set to 1 target (registry service ver.X) and 1 selector (function of registry service ver.X) (subject to change)
24
- 2) GIF_MANAGER_ROLE
17
+ 1) GIF_MANAGER_ROLE
25
18
  - can have arbitrary number of members
26
19
  - responsible for services registrations
27
20
  - responsible for token registration and activation
28
- 3) GIF_ADMIN_ROLE
21
+ 2) GIF_ADMIN_ROLE
29
22
  - admin of GIF_MANAGER_ROLE
30
23
  - MUST have 1 member at any time
31
24
  - granted/revoked ONLY in transferAdminRole() -> consider lock out situations!!!
@@ -33,95 +26,52 @@ import {ReleaseManager} from "./ReleaseManager.sol";
33
26
 
34
27
  */
35
28
 
36
- contract RegistryAccessManager is AccessManaged
29
+ contract RegistryAccessManager is AccessManaged, Initializable
37
30
  {
38
- error NotInitialized();
39
- error AlreadyInitialized();
31
+ error ErrorRegistryAccessManagerReleaseManagerAuthorityMismatch();
32
+ error ErrorRegistryAccessManagerTokenRegistryZero();
40
33
 
41
34
  uint64 public constant UNIQUE_ROLE_ID_MIN = 1000000;
42
35
 
43
- AccessManager private immutable _accessManager;
44
36
  address private _releaseManager;
45
37
  address private _tokenRegistry;
46
38
 
47
39
  uint64 private _idNext; // role id
48
- bool private _isInitialized;
49
-
50
- modifier onlyOnce() {
51
- if(_isInitialized) {
52
- revert AlreadyInitialized();
53
- }
54
- _;
55
- _isInitialized = true;
56
- }
57
40
 
58
- modifier onlyInitialized() {
59
- if(!_isInitialized) {
60
- revert NotInitialized();
61
- }
62
- _;
63
- }
64
41
 
65
- constructor(address manager)
42
+ // IMPORTNAT: this.authority() must be valid before initialize() function....
43
+ // -> have constructor and initializer function
44
+ constructor()
66
45
  AccessManaged(msg.sender)
67
46
  {
68
- _accessManager = new AccessManager(address(this));
69
- setAuthority(address(_accessManager));
70
-
71
- _idNext = UNIQUE_ROLE_ID_MIN;
72
-
73
- _configureAdminRoleInitial();
74
-
75
- address admin = msg.sender;
76
- _grantRole(GIF_ADMIN_ROLE(), admin, 0);
77
- _grantRole(GIF_MANAGER_ROLE(), manager, 0);
47
+ AccessManagerUpgradeableInitializeable accessManager = new AccessManagerUpgradeableInitializeable();
48
+ accessManager.initialize(address(this));
49
+ setAuthority(address(accessManager));
78
50
  }
79
51
 
80
- function initialize(address releaseManager, address tokenRegistry)
81
- external
82
- restricted // GIF_ADMIN_ROLE
83
- onlyOnce
52
+ function initialize(address admin, address manager, address releaseManager, address tokenRegistry)
53
+ external
54
+ initializer
84
55
  {
85
- require(
86
- ReleaseManager(releaseManager).authority() == address(_accessManager),
87
- "RegistryAccessManager: release manager authority is invalid");
88
- require(tokenRegistry > address(0), "RegistryAccessManager: token registry is 0");
89
- //require(tokenRegistry.authority() == address(_accessManager));
56
+ // validate input
57
+ if(IAccessManaged(releaseManager).authority() != authority()) {
58
+ revert ErrorRegistryAccessManagerReleaseManagerAuthorityMismatch();
59
+ }
60
+ if(tokenRegistry == address(0)) {
61
+ revert ErrorRegistryAccessManagerTokenRegistryZero();
62
+ }
90
63
 
91
64
  _releaseManager = releaseManager;
92
65
  _tokenRegistry = tokenRegistry;
66
+ _idNext = UNIQUE_ROLE_ID_MIN;
93
67
 
94
- _configureAdminRole();
95
- _configureManagerRole();
96
- _configureReleaseManagerRole();
68
+ _setAdminRole();
69
+ _setManagerRole();
97
70
 
98
- _grantRole(RELEASE_MANAGER_ROLE(), releaseManager, 0);
99
- }
71
+ _grantRole(GIF_ADMIN_ROLE(), admin, 0);
72
+ _grantRole(GIF_MANAGER_ROLE(), manager, 0);
100
73
 
101
- // set unique role for target, role forever have 1 member and never revoked
102
- function setAndGrantUniqueRole(
103
- address account,
104
- address target,
105
- bytes4[] memory selector
106
- )
107
- external
108
- restricted // RELEASE_MANAGER_ROLE
109
- onlyInitialized
110
- returns(RoleId)
111
- {
112
- // TODO questionable check...
113
- // target is not part of `runtime`
114
- //if(
115
- // target == address(this) ||
116
- // target == address(_accessManager) ||
117
- // target == _releaseManager ||
118
- // target == _tokenRegistry)
119
- //{ return TargetInvalid(); }
120
-
121
- RoleId roleId = _getNextRoleId();
122
-
123
- _setTargetFunctionRole(target, selector, roleId);
124
- _grantRole(roleId, account, 0);
74
+ _setRoleAdmin(GIF_MANAGER_ROLE(), GIF_ADMIN_ROLE());
125
75
  }
126
76
 
127
77
  /*function transferAdmin(address to)
@@ -134,35 +84,12 @@ contract RegistryAccessManager is AccessManaged
134
84
 
135
85
  //--- view functions ----------------------------------------------------//
136
86
 
137
- function getAccessManager()
138
- external
139
- view
140
- returns (AccessManager)
141
- {
142
- return _accessManager;
143
- }
144
-
145
87
  //--- private functions -------------------------------------------------//
146
88
 
147
- function _configureAdminRoleInitial() private
148
- {
149
- bytes4[] memory functionSelector = new bytes4[](1);
150
-
151
- functionSelector[0] = RegistryAccessManager.initialize.selector;
152
- _setTargetFunctionRole(address(this), functionSelector, GIF_ADMIN_ROLE());
153
- }
154
-
155
- function _configureAdminRole() private
89
+ function _setAdminRole() private
156
90
  {
157
91
  bytes4[] memory functionSelector = new bytes4[](1);
158
92
 
159
- // for RegistryServiceProxyManager
160
- // TODO upgrading with releaseManager.upgrade()->proxy.upgrade()???
161
- //functionSelector[0] = RegistryServiceManager.upgrade.selector;
162
- //_setTargetFunctionRole(address(this), functionSelector, GIF_ADMIN_ROLE());
163
-
164
- // for TokenRegistry
165
-
166
93
  // for ReleaseManager
167
94
  functionSelector[0] = ReleaseManager.createNextRelease.selector;
168
95
  _setTargetFunctionRole(_releaseManager, functionSelector, GIF_ADMIN_ROLE());
@@ -171,7 +98,7 @@ contract RegistryAccessManager is AccessManaged
171
98
  _setTargetFunctionRole(_releaseManager, functionSelector, GIF_ADMIN_ROLE());
172
99
  }
173
100
 
174
- function _configureManagerRole() private
101
+ function _setManagerRole() private
175
102
  {
176
103
  bytes4[] memory functionSelector = new bytes4[](1);
177
104
 
@@ -183,31 +110,20 @@ contract RegistryAccessManager is AccessManaged
183
110
  functionSelector[0] = ReleaseManager.registerService.selector;
184
111
  _setTargetFunctionRole(_releaseManager, functionSelector, GIF_MANAGER_ROLE());
185
112
 
186
- functionSelector[0] = ReleaseManager.registerRegistryService.selector;
113
+ functionSelector[0] = ReleaseManager.prepareNextRelease.selector;
187
114
  _setTargetFunctionRole(_releaseManager, functionSelector, GIF_MANAGER_ROLE());
188
-
189
- // set admin
190
- _setRoleAdmin(GIF_MANAGER_ROLE(), GIF_ADMIN_ROLE());
191
- }
192
-
193
- function _configureReleaseManagerRole() private
194
- {
195
- bytes4[] memory functionSelector = new bytes4[](1);
196
-
197
- functionSelector[0] = RegistryAccessManager.setAndGrantUniqueRole.selector;
198
- _setTargetFunctionRole(address(this), functionSelector, RELEASE_MANAGER_ROLE());
199
115
  }
200
116
 
201
117
  function _setTargetFunctionRole(address target, bytes4[] memory selectors, RoleId roleId) private {
202
- _accessManager.setTargetFunctionRole(target, selectors, roleId.toInt());
118
+ AccessManager(authority()).setTargetFunctionRole(target, selectors, roleId.toInt());
203
119
  }
204
120
 
205
121
  function _setRoleAdmin(RoleId roleId, RoleId adminRoleId) private {
206
- _accessManager.setRoleAdmin(roleId.toInt(), adminRoleId.toInt());
122
+ AccessManager(authority()).setRoleAdmin(roleId.toInt(), adminRoleId.toInt());
207
123
  }
208
124
 
209
125
  function _grantRole(RoleId roleId, address account, uint32 executionDelay) private {
210
- _accessManager.grantRole(roleId.toInt(), account, executionDelay);
126
+ AccessManager(authority()).grantRole(roleId.toInt(), account, executionDelay);
211
127
  }
212
128
 
213
129
  function _getNextRoleId() private returns(RoleId roleId) {
@@ -7,23 +7,22 @@ import {ERC165Checker} from "@openzeppelin/contracts/utils/introspection/ERC165C
7
7
  import {IRegistry} from "./IRegistry.sol";
8
8
  import {IInstance} from "../instance/IInstance.sol";
9
9
 
10
- import {ContractDeployerLib} from "../shared/ContractDeployerLib.sol";
11
- import {IComponent} from "../../contracts/components/IComponent.sol";
12
- import {IPoolComponent} from "../../contracts/components/IPoolComponent.sol";
13
- import {IProductComponent} from "../../contracts/components/IProductComponent.sol";
14
- import {IDistributionComponent} from "../../contracts/components/IDistributionComponent.sol";
10
+ import {IComponent} from "../../contracts/shared/IComponent.sol";
11
+ import {IPoolComponent} from "../../contracts/pool/IPoolComponent.sol";
12
+ import {IProductComponent} from "../../contracts/product/IProductComponent.sol";
13
+ import {IDistributionComponent} from "../../contracts/distribution/IDistributionComponent.sol";
15
14
 
16
15
  import {IVersionable} from "../../contracts/shared/IVersionable.sol";
17
16
  import {Versionable} from "../../contracts/shared/Versionable.sol";
18
17
  import {IRegisterable} from "../../contracts/shared/IRegisterable.sol";
19
18
  import {Registerable} from "../../contracts/shared/Registerable.sol";
20
19
 
21
- import {RoleId, PRODUCT_OWNER_ROLE, POOL_OWNER_ROLE, ORACLE_OWNER_ROLE} from "../../contracts/types/RoleId.sol";
22
- import {ObjectType, REGISTRY, SERVICE, PRODUCT, ORACLE, POOL, INSTANCE, DISTRIBUTION, DISTRIBUTOR, APPLICATION, POLICY, CLAIM, BUNDLE, STAKE} from "../../contracts/types/ObjectType.sol";
23
- import {StateId, ACTIVE, PAUSED} from "../../contracts/types/StateId.sol";
24
- import {NftId, NftIdLib, zeroNftId} from "../../contracts/types/NftId.sol";
25
- import {Fee, FeeLib} from "../../contracts/types/Fee.sol";
26
- import {Version, VersionPart, VersionLib} from "../../contracts/types/Version.sol";
20
+ import {RoleId, PRODUCT_OWNER_ROLE, POOL_OWNER_ROLE, ORACLE_OWNER_ROLE} from "../../contracts/type/RoleId.sol";
21
+ import {ObjectType, REGISTRY, SERVICE, PRODUCT, ORACLE, POOL, INSTANCE, DISTRIBUTION, DISTRIBUTOR, APPLICATION, POLICY, CLAIM, BUNDLE, STAKE, PRICE} from "../../contracts/type/ObjectType.sol";
22
+ import {StateId, ACTIVE, PAUSED} from "../../contracts/type/StateId.sol";
23
+ import {NftId, NftIdLib, zeroNftId} from "../../contracts/type/NftId.sol";
24
+ import {Fee, FeeLib} from "../../contracts/type/Fee.sol";
25
+ import {Version, VersionPart, VersionLib} from "../../contracts/type/Version.sol";
27
26
 
28
27
  import {Service} from "../shared/Service.sol";
29
28
  import {IService} from "../shared/IService.sol";
@@ -55,13 +54,12 @@ contract RegistryService is
55
54
  virtual override
56
55
  initializer()
57
56
  {
58
- (
59
- address registryAddress,
60
- address initialAuthority
61
- ) = abi.decode(data, (address, address));
62
-
63
- initializeService(registryAddress, initialAuthority, owner);
57
+ address initialOwner;
58
+ address registryAddress;
59
+ address authority;
60
+ (registryAddress, initialOwner, authority) = abi.decode(data, (address, address, address));
64
61
 
62
+ initializeService(registryAddress, authority, owner);
65
63
  registerInterface(type(IRegistryService).interfaceId);
66
64
  }
67
65
 
@@ -73,7 +71,7 @@ contract RegistryService is
73
71
  )
74
72
  {
75
73
  if(!instance.supportsInterface(type(IInstance).interfaceId)) {
76
- revert NotInstance();
74
+ revert ErrorRegistryServiceNotInstance(address(instance));
77
75
  }
78
76
 
79
77
  info = _getAndVerifyContractInfo(instance, INSTANCE(), owner);
@@ -91,7 +89,7 @@ contract RegistryService is
91
89
  {
92
90
  // CAN revert if no ERC165 support -> will revert with empty message
93
91
  if(!product.supportsInterface(type(IProductComponent).interfaceId)) {
94
- revert NotProduct();
92
+ revert ErrorRegistryServiceNotProduct(address(product));
95
93
  }
96
94
 
97
95
  info = _getAndVerifyContractInfo(product, PRODUCT(), owner);
@@ -106,7 +104,7 @@ contract RegistryService is
106
104
  )
107
105
  {
108
106
  if(!pool.supportsInterface(type(IPoolComponent).interfaceId)) {
109
- revert NotPool();
107
+ revert ErrorRegistryServiceNotPool(address(pool));
110
108
  }
111
109
 
112
110
  info = _getAndVerifyContractInfo(pool, POOL(), owner);
@@ -121,7 +119,7 @@ contract RegistryService is
121
119
  )
122
120
  {
123
121
  if(!distribution.supportsInterface(type(IDistributionComponent).interfaceId)) {
124
- revert NotDistribution();
122
+ revert ErrorRegistryServiceNotDistribution(address(distribution));
125
123
  }
126
124
 
127
125
  info = _getAndVerifyContractInfo(distribution, DISTRIBUTION(), owner);
@@ -143,7 +141,6 @@ contract RegistryService is
143
141
  returns(NftId nftId)
144
142
  {
145
143
  _verifyObjectInfo(info, POLICY());
146
-
147
144
  nftId = getRegistry().register(info);
148
145
  }
149
146
 
@@ -153,7 +150,6 @@ contract RegistryService is
153
150
  returns(NftId nftId)
154
151
  {
155
152
  _verifyObjectInfo(info, BUNDLE());
156
-
157
153
  nftId = getRegistry().register(info);
158
154
  }
159
155
 
@@ -163,59 +159,9 @@ contract RegistryService is
163
159
  returns(NftId nftId)
164
160
  {
165
161
  _verifyObjectInfo(info, STAKE());
166
-
167
162
  nftId = getRegistry().register(info);
168
163
  }
169
164
 
170
- // from IRegisterable
171
-
172
- function getFunctionConfigs()
173
- external
174
- pure
175
- returns(
176
- FunctionConfig[] memory config
177
- )
178
- {
179
- config = new FunctionConfig[](8);
180
-
181
- // order of service registrations MUST be reverse to this array
182
- /*config[-1].serviceDomain = STAKE();
183
- config[-1].selector = RegistryService.registerStake.selector;*/
184
-
185
- config[0].serviceDomain = POLICY();
186
- config[0].selectors = new bytes4[](0);
187
-
188
- config[1].serviceDomain = APPLICATION();
189
- config[1].selectors = new bytes4[](1);
190
- config[1].selectors[0] = RegistryService.registerPolicy.selector;
191
-
192
- config[2].serviceDomain = CLAIM();
193
- config[2].selectors = new bytes4[](0);
194
-
195
- config[3].serviceDomain = PRODUCT();
196
- config[3].selectors = new bytes4[](1);
197
- config[3].selectors[0] = RegistryService.registerProduct.selector;
198
-
199
- config[4].serviceDomain = POOL();
200
- config[4].selectors = new bytes4[](1);
201
- config[4].selectors[0] = RegistryService.registerPool.selector;
202
-
203
- // registration of bundle service must preceed registration of pool service
204
- config[5].serviceDomain = BUNDLE();
205
- config[5].selectors = new bytes4[](1);
206
- config[5].selectors[0] = RegistryService.registerBundle.selector;
207
-
208
- config[6].serviceDomain = DISTRIBUTION();
209
- config[6].selectors = new bytes4[](2);
210
- config[6].selectors[0] = RegistryService.registerDistribution.selector;
211
- config[6].selectors[1] = RegistryService.registerDistributor.selector;
212
-
213
- // registerInstance() have no restriction
214
- config[7].serviceDomain = INSTANCE();
215
- config[7].selectors = new bytes4[](1);
216
- config[7].selectors[0] = RegistryService.registerInstance.selector;
217
- }
218
-
219
165
  // Internal
220
166
 
221
167
  function _getAndVerifyContractInfo(
@@ -224,34 +170,37 @@ contract RegistryService is
224
170
  address expectedOwner // assume can be 0 when given by other service
225
171
  )
226
172
  internal
227
- // view
173
+ view
228
174
  returns(
229
175
  IRegistry.ObjectInfo memory info
230
176
  )
231
177
  {
232
178
  info = registerable.getInitialInfo();
233
- info.objectAddress = address(registerable);
179
+
180
+ if(info.objectAddress != address(registerable)) {
181
+ revert ErrorRegistryServiceRegisterableAddressInvalid(registerable, info.objectAddress);
182
+ }
234
183
 
235
184
  if(info.objectType != expectedType) {// type is checked in registry anyway...but service logic may depend on expected value
236
- revert UnexpectedRegisterableType(expectedType, info.objectType);
185
+ revert ErrorRegistryServiceRegisterableTypeInvalid(registerable, expectedType, info.objectType);
237
186
  }
238
187
 
239
188
  address owner = info.initialOwner;
240
189
 
241
190
  if(owner != expectedOwner) { // registerable owner protection
242
- revert NotRegisterableOwner(expectedOwner);
191
+ revert ErrorRegistryServiceRegisterableOwnerInvalid(registerable, expectedOwner, owner);
243
192
  }
244
193
 
245
194
  if(owner == address(registerable)) {
246
- revert SelfRegistration();
195
+ revert ErrorRegistryServiceRegisterableSelfRegistration(registerable);
247
196
  }
248
197
 
249
198
  if(owner == address(0)) {
250
- revert RegisterableOwnerIsZero();
199
+ revert ErrorRegistryServiceRegisterableOwnerZero(registerable);
251
200
  }
252
201
 
253
202
  if(getRegistry().isRegistered(owner)) {
254
- revert RegisterableOwnerIsRegistered();
203
+ revert ErrorRegistryServiceRegisterableOwnerRegistered(registerable, owner);
255
204
  }
256
205
  }
257
206
 
@@ -266,17 +215,17 @@ contract RegistryService is
266
215
  info.objectAddress = address(0);
267
216
 
268
217
  if(info.objectType != expectedType) {// type is checked in registry anyway...but service logic may depend on expected value
269
- revert UnexpectedRegisterableType(expectedType, info.objectType);
218
+ revert ErrorRegistryServiceObjectTypeInvalid(expectedType, info.objectType);
270
219
  }
271
220
 
272
221
  address owner = info.initialOwner;
273
222
 
274
223
  if(owner == address(0)) {
275
- revert RegisterableOwnerIsZero();
224
+ revert ErrorRegistryServiceObjectOwnerZero(info.objectType);
276
225
  }
277
226
 
278
227
  if(getRegistry().isRegistered(owner)) {
279
- revert RegisterableOwnerIsRegistered();
228
+ revert ErrorRegistryServiceObjectOwnerRegistered(info.objectType, owner);
280
229
  }
281
230
  }
282
231
  }
@@ -2,8 +2,7 @@
2
2
  pragma solidity ^0.8.20;
3
3
 
4
4
  import {AccessManager} from "@openzeppelin/contracts/access/manager/AccessManager.sol";
5
-
6
- import {ContractDeployerLib} from "../shared/ContractDeployerLib.sol";
5
+ import {Create2} from "@openzeppelin/contracts/utils/Create2.sol";
7
6
 
8
7
  import {Registry} from "./Registry.sol";
9
8
  import {IVersionable} from "../shared/IVersionable.sol";
@@ -15,25 +14,36 @@ import {TokenRegistry} from "./TokenRegistry.sol";
15
14
  contract RegistryServiceManager is
16
15
  ProxyManager
17
16
  {
17
+ error ErrorRegistryAccessManagerAuthorityZero();
18
+ error ErrorRegistryAccessManagerRegistryZero();
19
+
18
20
  bytes32 constant public ACCESS_MANAGER_CREATION_CODE_HASH = 0x0;
19
21
 
20
22
  RegistryService private immutable _registryService;
21
23
 
22
24
  /// @dev initializes proxy manager with registry service implementation and deploys registry
23
25
  constructor(
24
- address initialAuthority, // used by implementation
25
- address registryAddress) // used by implementation
26
- ProxyManager(registryAddress)
26
+ address authority, // used by implementation
27
+ address registry, // used by implementation
28
+ bytes32 salt
29
+ )
30
+ ProxyManager(registry)
27
31
  {
28
- require(initialAuthority > address(0), "RegistryServiceManager: initial authority is 0");
29
- require(registryAddress > address(0), "RegistryServiceManager: registry is 0");
32
+ if(authority == address(0)) {
33
+ revert ErrorRegistryAccessManagerAuthorityZero();
34
+ }
35
+
36
+ if(registry == address(0)) {
37
+ revert ErrorRegistryAccessManagerRegistryZero();
38
+ }
30
39
 
31
40
  // implementation's initializer func `data` argument
32
- RegistryService srv = new RegistryService();
33
- bytes memory data = abi.encode(registryAddress, initialAuthority);
34
- IVersionable versionable = deploy(
41
+ RegistryService srv = new RegistryService{ salt: salt }();
42
+ bytes memory data = abi.encode(registry, address(this), authority);
43
+ IVersionable versionable = deployDetermenistic(
35
44
  address(srv),
36
- data);
45
+ data,
46
+ salt);
37
47
 
38
48
  _registryService = RegistryService(address(versionable));
39
49