@etherisc/gif-next 0.0.2-e769e2e-077 → 0.0.2-e802d97-477

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 (378) hide show
  1. package/README.md +2 -1
  2. package/artifacts/contracts/distribution/Distribution.sol/Distribution.dbg.json +1 -1
  3. package/artifacts/contracts/distribution/Distribution.sol/Distribution.json +19 -13
  4. package/artifacts/contracts/distribution/DistributionService.sol/DistributionService.dbg.json +1 -1
  5. package/artifacts/contracts/distribution/DistributionService.sol/DistributionService.json +79 -73
  6. package/artifacts/contracts/distribution/DistributionServiceManager.sol/DistributionServiceManager.dbg.json +1 -1
  7. package/artifacts/contracts/distribution/DistributionServiceManager.sol/DistributionServiceManager.json +114 -56
  8. package/artifacts/contracts/distribution/IDistributionComponent.sol/IDistributionComponent.dbg.json +1 -1
  9. package/artifacts/contracts/distribution/IDistributionComponent.sol/IDistributionComponent.json +11 -5
  10. package/artifacts/contracts/distribution/IDistributionService.sol/IDistributionService.dbg.json +1 -1
  11. package/artifacts/contracts/distribution/IDistributionService.sol/IDistributionService.json +7 -1
  12. package/artifacts/contracts/instance/BundleManager.sol/BundleManager.dbg.json +1 -1
  13. package/artifacts/contracts/instance/BundleManager.sol/BundleManager.json +2 -2
  14. package/artifacts/contracts/instance/IInstance.sol/IInstance.dbg.json +1 -1
  15. package/artifacts/contracts/instance/IInstance.sol/IInstance.json +25 -6
  16. package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.dbg.json +1 -1
  17. package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.json +12 -22
  18. package/artifacts/contracts/instance/Instance.sol/Instance.dbg.json +1 -1
  19. package/artifacts/contracts/instance/Instance.sol/Instance.json +47 -20
  20. package/artifacts/contracts/instance/InstanceAdmin.sol/InstanceAdmin.dbg.json +4 -0
  21. package/artifacts/contracts/instance/InstanceAdmin.sol/InstanceAdmin.json +708 -0
  22. package/artifacts/contracts/instance/InstanceAuthorizationsLib.sol/InstanceAuthorizationsLib.dbg.json +1 -1
  23. package/artifacts/contracts/instance/InstanceAuthorizationsLib.sol/InstanceAuthorizationsLib.json +126 -30
  24. package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.dbg.json +1 -1
  25. package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.json +195 -64
  26. package/artifacts/contracts/instance/InstanceService.sol/InstanceService.dbg.json +1 -1
  27. package/artifacts/contracts/instance/InstanceService.sol/InstanceService.json +77 -63
  28. package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.dbg.json +1 -1
  29. package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.json +104 -34
  30. package/artifacts/contracts/instance/InstanceStore.sol/InstanceStore.dbg.json +1 -1
  31. package/artifacts/contracts/instance/InstanceStore.sol/InstanceStore.json +246 -104
  32. package/artifacts/contracts/instance/base/BalanceStore.sol/BalanceStore.dbg.json +1 -1
  33. package/artifacts/contracts/instance/base/BalanceStore.sol/BalanceStore.json +2 -2
  34. package/artifacts/contracts/instance/base/Cloneable.sol/Cloneable.dbg.json +1 -1
  35. package/artifacts/contracts/instance/base/ObjectCounter.sol/ObjectCounter.dbg.json +4 -0
  36. package/artifacts/contracts/instance/base/ObjectCounter.sol/ObjectCounter.json +10 -0
  37. package/artifacts/contracts/instance/base/ObjectManager.sol/ObjectManager.dbg.json +1 -1
  38. package/artifacts/contracts/instance/base/ObjectManager.sol/ObjectManager.json +2 -2
  39. package/artifacts/contracts/instance/module/IAccess.sol/IAccess.dbg.json +1 -1
  40. package/artifacts/contracts/instance/module/IAccess.sol/IAccess.json +8 -116
  41. package/artifacts/contracts/instance/module/IBundle.sol/IBundle.dbg.json +1 -1
  42. package/artifacts/contracts/instance/module/IComponents.sol/IComponents.dbg.json +1 -1
  43. package/artifacts/contracts/instance/module/IDistribution.sol/IDistribution.dbg.json +1 -1
  44. package/artifacts/contracts/instance/module/IPolicy.sol/IPolicy.dbg.json +1 -1
  45. package/artifacts/contracts/instance/module/IRisk.sol/IRisk.dbg.json +1 -1
  46. package/artifacts/contracts/mock/Dip.sol/Dip.dbg.json +4 -0
  47. package/artifacts/contracts/mock/Dip.sol/Dip.json +376 -0
  48. package/artifacts/contracts/oracle/IOracle.sol/IOracle.dbg.json +4 -0
  49. package/artifacts/contracts/oracle/IOracle.sol/IOracle.json +10 -0
  50. package/artifacts/contracts/oracle/IOracleComponent.sol/IOracleComponent.dbg.json +4 -0
  51. package/artifacts/contracts/oracle/IOracleComponent.sol/IOracleComponent.json +759 -0
  52. package/artifacts/contracts/oracle/IOracleService.sol/IOracleService.dbg.json +4 -0
  53. package/artifacts/contracts/oracle/IOracleService.sol/IOracleService.json +662 -0
  54. package/artifacts/contracts/oracle/Oracle.sol/Oracle.dbg.json +4 -0
  55. package/artifacts/contracts/oracle/Oracle.sol/Oracle.json +1146 -0
  56. package/artifacts/contracts/oracle/OracleService.sol/OracleService.dbg.json +4 -0
  57. package/artifacts/contracts/oracle/OracleService.sol/OracleService.json +997 -0
  58. package/artifacts/contracts/oracle/OracleServiceManager.sol/OracleServiceManager.dbg.json +4 -0
  59. package/artifacts/contracts/oracle/OracleServiceManager.sol/OracleServiceManager.json +718 -0
  60. package/artifacts/contracts/pool/BundleService.sol/BundleService.dbg.json +1 -1
  61. package/artifacts/contracts/pool/BundleService.sol/BundleService.json +55 -41
  62. package/artifacts/contracts/pool/BundleServiceManager.sol/BundleServiceManager.dbg.json +1 -1
  63. package/artifacts/contracts/pool/BundleServiceManager.sol/BundleServiceManager.json +102 -40
  64. package/artifacts/contracts/pool/IBundleService.sol/IBundleService.dbg.json +1 -1
  65. package/artifacts/contracts/pool/IBundleService.sol/IBundleService.json +7 -1
  66. package/artifacts/contracts/pool/IPoolComponent.sol/IPoolComponent.dbg.json +1 -1
  67. package/artifacts/contracts/pool/IPoolComponent.sol/IPoolComponent.json +11 -5
  68. package/artifacts/contracts/pool/IPoolService.sol/IPoolService.dbg.json +1 -1
  69. package/artifacts/contracts/pool/IPoolService.sol/IPoolService.json +22 -1
  70. package/artifacts/contracts/pool/Pool.sol/Pool.dbg.json +1 -1
  71. package/artifacts/contracts/pool/Pool.sol/Pool.json +18 -12
  72. package/artifacts/contracts/pool/PoolService.sol/PoolService.dbg.json +1 -1
  73. package/artifacts/contracts/pool/PoolService.sol/PoolService.json +56 -35
  74. package/artifacts/contracts/pool/PoolServiceManager.sol/PoolServiceManager.dbg.json +1 -1
  75. package/artifacts/contracts/pool/PoolServiceManager.sol/PoolServiceManager.json +95 -37
  76. package/artifacts/contracts/product/ApplicationService.sol/ApplicationService.dbg.json +1 -1
  77. package/artifacts/contracts/product/ApplicationService.sol/ApplicationService.json +39 -25
  78. package/artifacts/contracts/product/ApplicationServiceManager.sol/ApplicationServiceManager.dbg.json +1 -1
  79. package/artifacts/contracts/product/ApplicationServiceManager.sol/ApplicationServiceManager.json +96 -34
  80. package/artifacts/contracts/product/ClaimService.sol/ClaimService.dbg.json +1 -1
  81. package/artifacts/contracts/product/ClaimService.sol/ClaimService.json +81 -67
  82. package/artifacts/contracts/product/ClaimServiceManager.sol/ClaimServiceManager.dbg.json +1 -1
  83. package/artifacts/contracts/product/ClaimServiceManager.sol/ClaimServiceManager.json +115 -53
  84. package/artifacts/contracts/product/IApplicationService.sol/IApplicationService.dbg.json +1 -1
  85. package/artifacts/contracts/product/IApplicationService.sol/IApplicationService.json +7 -1
  86. package/artifacts/contracts/product/IClaimService.sol/IClaimService.dbg.json +1 -1
  87. package/artifacts/contracts/product/IClaimService.sol/IClaimService.json +7 -1
  88. package/artifacts/contracts/product/IPolicyService.sol/IPolicyService.dbg.json +1 -1
  89. package/artifacts/contracts/product/IPolicyService.sol/IPolicyService.json +7 -1
  90. package/artifacts/contracts/product/IPricingService.sol/IPricingService.dbg.json +1 -1
  91. package/artifacts/contracts/product/IPricingService.sol/IPricingService.json +7 -1
  92. package/artifacts/contracts/product/IProductComponent.sol/IProductComponent.dbg.json +1 -1
  93. package/artifacts/contracts/product/IProductComponent.sol/IProductComponent.json +11 -5
  94. package/artifacts/contracts/product/IProductService.sol/IProductService.dbg.json +1 -1
  95. package/artifacts/contracts/product/IProductService.sol/IProductService.json +7 -1
  96. package/artifacts/contracts/product/PolicyService.sol/PolicyService.dbg.json +1 -1
  97. package/artifacts/contracts/product/PolicyService.sol/PolicyService.json +59 -45
  98. package/artifacts/contracts/product/PolicyServiceManager.sol/PolicyServiceManager.dbg.json +1 -1
  99. package/artifacts/contracts/product/PolicyServiceManager.sol/PolicyServiceManager.json +104 -42
  100. package/artifacts/contracts/product/PricingService.sol/PricingService.dbg.json +1 -1
  101. package/artifacts/contracts/product/PricingService.sol/PricingService.json +69 -55
  102. package/artifacts/contracts/product/PricingServiceManager.sol/PricingServiceManager.dbg.json +1 -1
  103. package/artifacts/contracts/product/PricingServiceManager.sol/PricingServiceManager.json +109 -47
  104. package/artifacts/contracts/product/Product.sol/Product.dbg.json +1 -1
  105. package/artifacts/contracts/product/Product.sol/Product.json +18 -12
  106. package/artifacts/contracts/product/ProductService.sol/ProductService.dbg.json +1 -1
  107. package/artifacts/contracts/product/ProductService.sol/ProductService.json +25 -19
  108. package/artifacts/contracts/product/ProductServiceManager.sol/ProductServiceManager.dbg.json +1 -1
  109. package/artifacts/contracts/product/ProductServiceManager.sol/ProductServiceManager.json +87 -29
  110. package/artifacts/contracts/registry/ChainNft.sol/ChainNft.dbg.json +1 -1
  111. package/artifacts/contracts/registry/ChainNft.sol/ChainNft.json +2 -2
  112. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.dbg.json +1 -1
  113. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.json +150 -53
  114. package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.dbg.json +1 -1
  115. package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.json +187 -67
  116. package/artifacts/contracts/registry/ITransferInterceptor.sol/ITransferInterceptor.dbg.json +1 -1
  117. package/artifacts/contracts/registry/Registry.sol/Registry.dbg.json +1 -1
  118. package/artifacts/contracts/registry/Registry.sol/Registry.json +328 -103
  119. package/artifacts/contracts/registry/RegistryAdmin.sol/RegistryAdmin.dbg.json +4 -0
  120. package/artifacts/contracts/registry/RegistryAdmin.sol/RegistryAdmin.json +407 -0
  121. package/artifacts/contracts/registry/RegistryService.sol/RegistryService.dbg.json +1 -1
  122. package/artifacts/contracts/registry/RegistryService.sol/RegistryService.json +197 -72
  123. package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.dbg.json +1 -1
  124. package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.json +87 -39
  125. package/artifacts/contracts/registry/ReleaseManager.sol/ReleaseManager.dbg.json +1 -1
  126. package/artifacts/contracts/registry/ReleaseManager.sol/ReleaseManager.json +752 -148
  127. package/artifacts/contracts/registry/ServiceAuthorizationsLib.sol/ServiceAuthorizationsLib.dbg.json +1 -1
  128. package/artifacts/contracts/registry/ServiceAuthorizationsLib.sol/ServiceAuthorizationsLib.json +2 -2
  129. package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.dbg.json +1 -1
  130. package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.json +185 -135
  131. package/artifacts/contracts/shared/AccessManagerCustom.sol/AccessManagerCustom.dbg.json +4 -0
  132. package/artifacts/contracts/shared/AccessManagerCustom.sol/AccessManagerCustom.json +1193 -0
  133. package/artifacts/contracts/shared/AccessManagerExtended.sol/AccessManagerExtended.dbg.json +4 -0
  134. package/artifacts/contracts/shared/AccessManagerExtended.sol/AccessManagerExtended.json +1715 -0
  135. package/artifacts/contracts/shared/AccessManagerExtendedInitializeable.sol/AccessManagerExtendedInitializeable.dbg.json +4 -0
  136. package/artifacts/contracts/shared/AccessManagerExtendedInitializeable.sol/AccessManagerExtendedInitializeable.json +1728 -0
  137. package/artifacts/contracts/shared/AccessManagerExtendedWithDisable.sol/AccessManagerExtendedWithDisable.dbg.json +4 -0
  138. package/artifacts/contracts/shared/AccessManagerExtendedWithDisable.sol/AccessManagerExtendedWithDisable.json +1806 -0
  139. package/artifacts/contracts/shared/AccessManagerExtendedWithDisableInitializeable.sol/AccessManagerExtendedWithDisableInitializeable.dbg.json +4 -0
  140. package/artifacts/contracts/shared/AccessManagerExtendedWithDisableInitializeable.sol/AccessManagerExtendedWithDisableInitializeable.json +1824 -0
  141. package/artifacts/contracts/shared/Component.sol/Component.dbg.json +1 -1
  142. package/artifacts/contracts/shared/Component.sol/Component.json +18 -12
  143. package/artifacts/contracts/shared/ComponentService.sol/ComponentService.dbg.json +1 -1
  144. package/artifacts/contracts/shared/ComponentService.sol/ComponentService.json +92 -63
  145. package/artifacts/contracts/shared/ComponentServiceManager.sol/ComponentServiceManager.dbg.json +1 -1
  146. package/artifacts/contracts/shared/ComponentServiceManager.sol/ComponentServiceManager.json +102 -46
  147. package/artifacts/contracts/shared/ComponentVerifyingService.sol/ComponentVerifyingService.dbg.json +1 -1
  148. package/artifacts/contracts/shared/ComponentVerifyingService.sol/ComponentVerifyingService.json +7 -1
  149. package/artifacts/contracts/shared/ERC165.sol/ERC165.dbg.json +1 -1
  150. package/artifacts/contracts/shared/ERC165.sol/ERC165.json +2 -2
  151. package/artifacts/contracts/shared/IAccessManagerExtended.sol/IAccessManagerExtended.dbg.json +4 -0
  152. package/artifacts/contracts/shared/IAccessManagerExtended.sol/IAccessManagerExtended.json +1562 -0
  153. package/artifacts/contracts/shared/IAccessManagerExtendedWithDisable.sol/IAccessManagerExtendedWithDisable.dbg.json +4 -0
  154. package/artifacts/contracts/shared/IAccessManagerExtendedWithDisable.sol/IAccessManagerExtendedWithDisable.json +1600 -0
  155. package/artifacts/contracts/shared/IComponent.sol/IComponent.dbg.json +1 -1
  156. package/artifacts/contracts/shared/IComponent.sol/IComponent.json +11 -5
  157. package/artifacts/contracts/shared/IComponentService.sol/IComponentService.dbg.json +1 -1
  158. package/artifacts/contracts/shared/IComponentService.sol/IComponentService.json +14 -1
  159. package/artifacts/contracts/shared/IInstanceLinkedComponent.sol/IInstanceLinkedComponent.dbg.json +1 -1
  160. package/artifacts/contracts/shared/IInstanceLinkedComponent.sol/IInstanceLinkedComponent.json +11 -5
  161. package/artifacts/contracts/shared/IKeyValueStore.sol/IKeyValueStore.dbg.json +1 -1
  162. package/artifacts/contracts/shared/IKeyValueStore.sol/IKeyValueStore.json +0 -10
  163. package/artifacts/contracts/shared/ILifecycle.sol/ILifecycle.dbg.json +1 -1
  164. package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.dbg.json +1 -1
  165. package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.json +7 -1
  166. package/artifacts/contracts/shared/IPolicyHolder.sol/IPolicyHolder.dbg.json +1 -1
  167. package/artifacts/contracts/shared/IPolicyHolder.sol/IPolicyHolder.json +21 -3
  168. package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.dbg.json +1 -1
  169. package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.json +7 -1
  170. package/artifacts/contracts/shared/IRegistryLinked.sol/IRegistryLinked.dbg.json +1 -1
  171. package/artifacts/contracts/shared/IService.sol/IService.dbg.json +1 -1
  172. package/artifacts/contracts/shared/IService.sol/IService.json +7 -1
  173. package/artifacts/contracts/shared/IVersionable.sol/IVersionable.dbg.json +1 -1
  174. package/artifacts/contracts/shared/InitializableCustom.sol/InitializableCustom.dbg.json +4 -0
  175. package/artifacts/contracts/shared/InitializableCustom.sol/InitializableCustom.json +39 -0
  176. package/artifacts/contracts/shared/InstanceLinkedComponent.sol/InstanceLinkedComponent.dbg.json +1 -1
  177. package/artifacts/contracts/shared/InstanceLinkedComponent.sol/InstanceLinkedComponent.json +18 -12
  178. package/artifacts/contracts/shared/KeyValueStore.sol/KeyValueStore.dbg.json +1 -1
  179. package/artifacts/contracts/shared/KeyValueStore.sol/KeyValueStore.json +10 -20
  180. package/artifacts/contracts/shared/Lifecycle.sol/Lifecycle.dbg.json +1 -1
  181. package/artifacts/contracts/shared/Lifecycle.sol/Lifecycle.json +6 -6
  182. package/artifacts/contracts/shared/NftIdSetManager.sol/NftIdSetManager.dbg.json +4 -0
  183. package/artifacts/contracts/shared/NftIdSetManager.sol/NftIdSetManager.json +306 -0
  184. package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.dbg.json +1 -1
  185. package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.json +13 -7
  186. package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.dbg.json +1 -1
  187. package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.json +31 -13
  188. package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.dbg.json +1 -1
  189. package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.json +64 -16
  190. package/artifacts/contracts/shared/Registerable.sol/Registerable.dbg.json +1 -1
  191. package/artifacts/contracts/shared/Registerable.sol/Registerable.json +15 -9
  192. package/artifacts/contracts/shared/RegistryLinked.sol/RegistryLinked.dbg.json +1 -1
  193. package/artifacts/contracts/shared/RegistryLinked.sol/RegistryLinked.json +2 -2
  194. package/artifacts/contracts/shared/Service.sol/Service.dbg.json +1 -1
  195. package/artifacts/contracts/shared/Service.sol/Service.json +7 -1
  196. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.dbg.json +1 -1
  197. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.json +2 -2
  198. package/artifacts/contracts/shared/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.dbg.json +1 -1
  199. package/artifacts/contracts/shared/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.json +2 -2
  200. package/artifacts/contracts/shared/Versionable.sol/Versionable.dbg.json +1 -1
  201. package/artifacts/contracts/staking/IStaking.sol/IStaking.dbg.json +1 -1
  202. package/artifacts/contracts/staking/IStaking.sol/IStaking.json +424 -593
  203. package/artifacts/contracts/staking/IStakingService.sol/IStakingService.dbg.json +1 -1
  204. package/artifacts/contracts/staking/IStakingService.sol/IStakingService.json +497 -49
  205. package/artifacts/contracts/staking/StakeManagerLib.sol/StakeManagerLib.dbg.json +4 -0
  206. package/artifacts/contracts/staking/StakeManagerLib.sol/StakeManagerLib.json +444 -0
  207. package/artifacts/contracts/staking/Staking.sol/Staking.dbg.json +1 -1
  208. package/artifacts/contracts/staking/Staking.sol/Staking.json +598 -627
  209. package/artifacts/contracts/staking/StakingManager.sol/StakingManager.dbg.json +1 -1
  210. package/artifacts/contracts/staking/StakingManager.sol/StakingManager.json +149 -48
  211. package/artifacts/contracts/staking/StakingReader.sol/StakingReader.dbg.json +4 -0
  212. package/artifacts/contracts/staking/StakingReader.sol/StakingReader.json +592 -0
  213. package/artifacts/contracts/staking/StakingService.sol/StakingService.dbg.json +1 -1
  214. package/artifacts/contracts/staking/StakingService.sol/StakingService.json +593 -74
  215. package/artifacts/contracts/staking/StakingServiceManager.sol/StakingServiceManager.dbg.json +1 -1
  216. package/artifacts/contracts/staking/StakingServiceManager.sol/StakingServiceManager.json +119 -29
  217. package/artifacts/contracts/staking/StakingStore.sol/StakingStore.dbg.json +4 -0
  218. package/artifacts/contracts/staking/StakingStore.sol/StakingStore.json +2189 -0
  219. package/artifacts/contracts/staking/TargetManagerLib.sol/TargetManagerLib.dbg.json +4 -0
  220. package/artifacts/contracts/staking/TargetManagerLib.sol/TargetManagerLib.json +571 -0
  221. package/artifacts/contracts/type/AddressSet.sol/LibAddressSet.dbg.json +1 -1
  222. package/artifacts/contracts/type/AddressSet.sol/LibAddressSet.json +2 -2
  223. package/artifacts/contracts/type/Amount.sol/AmountLib.dbg.json +1 -1
  224. package/artifacts/contracts/type/Amount.sol/AmountLib.json +68 -4
  225. package/artifacts/contracts/type/Blocknumber.sol/BlocknumberLib.dbg.json +1 -1
  226. package/artifacts/contracts/type/Blocknumber.sol/BlocknumberLib.json +40 -2
  227. package/artifacts/contracts/type/ClaimId.sol/ClaimIdLib.dbg.json +1 -1
  228. package/artifacts/contracts/type/ClaimId.sol/ClaimIdLib.json +2 -2
  229. package/artifacts/contracts/type/DistributorType.sol/DistributorTypeLib.dbg.json +1 -1
  230. package/artifacts/contracts/type/DistributorType.sol/DistributorTypeLib.json +2 -2
  231. package/artifacts/contracts/type/Fee.sol/FeeLib.dbg.json +1 -1
  232. package/artifacts/contracts/type/Fee.sol/FeeLib.json +2 -2
  233. package/artifacts/contracts/type/Key32.sol/Key32Lib.dbg.json +1 -1
  234. package/artifacts/contracts/type/Key32.sol/Key32Lib.json +2 -2
  235. package/artifacts/contracts/type/NftId.sol/NftIdLib.dbg.json +1 -1
  236. package/artifacts/contracts/type/NftId.sol/NftIdLib.json +28 -4
  237. package/artifacts/contracts/type/NftIdSet.sol/LibNftIdSet.dbg.json +1 -1
  238. package/artifacts/contracts/type/NftIdSet.sol/LibNftIdSet.json +2 -2
  239. package/artifacts/contracts/type/ObjectType.sol/ObjectTypeLib.dbg.json +1 -1
  240. package/artifacts/contracts/type/ObjectType.sol/ObjectTypeLib.json +15 -2
  241. package/artifacts/contracts/type/PayoutId.sol/PayoutIdLib.dbg.json +1 -1
  242. package/artifacts/contracts/type/PayoutId.sol/PayoutIdLib.json +2 -2
  243. package/artifacts/contracts/type/Referral.sol/ReferralLib.dbg.json +1 -1
  244. package/artifacts/contracts/type/Referral.sol/ReferralLib.json +2 -2
  245. package/artifacts/contracts/type/RequestId.sol/RequestIdLib.dbg.json +4 -0
  246. package/artifacts/contracts/type/RequestId.sol/RequestIdLib.json +204 -0
  247. package/artifacts/contracts/type/RiskId.sol/RiskIdLib.dbg.json +1 -1
  248. package/artifacts/contracts/type/RiskId.sol/RiskIdLib.json +2 -2
  249. package/artifacts/contracts/type/RoleId.sol/RoleIdLib.dbg.json +1 -1
  250. package/artifacts/contracts/type/RoleId.sol/RoleIdLib.json +2 -2
  251. package/artifacts/contracts/type/Seconds.sol/SecondsLib.dbg.json +1 -1
  252. package/artifacts/contracts/type/Seconds.sol/SecondsLib.json +76 -2
  253. package/artifacts/contracts/type/StateId.sol/StateIdLib.dbg.json +1 -1
  254. package/artifacts/contracts/type/StateId.sol/StateIdLib.json +2 -2
  255. package/artifacts/contracts/type/Timestamp.sol/TimestampLib.dbg.json +1 -1
  256. package/artifacts/contracts/type/Timestamp.sol/TimestampLib.json +17 -4
  257. package/artifacts/contracts/type/UFixed.sol/MathLib.dbg.json +1 -1
  258. package/artifacts/contracts/type/UFixed.sol/UFixedLib.dbg.json +1 -1
  259. package/artifacts/contracts/type/Version.sol/VersionLib.dbg.json +1 -1
  260. package/artifacts/contracts/type/Version.sol/VersionLib.json +2 -2
  261. package/artifacts/contracts/type/Version.sol/VersionPartLib.dbg.json +1 -1
  262. package/artifacts/contracts/type/Version.sol/VersionPartLib.json +2 -2
  263. package/contracts/distribution/Distribution.sol +2 -4
  264. package/contracts/distribution/DistributionService.sol +3 -2
  265. package/contracts/distribution/DistributionServiceManager.sol +9 -18
  266. package/contracts/distribution/IDistributionComponent.sol +1 -1
  267. package/contracts/distribution/IDistributionService.sol +1 -1
  268. package/contracts/instance/IInstance.sol +11 -6
  269. package/contracts/instance/IInstanceService.sol +3 -5
  270. package/contracts/instance/Instance.sol +29 -21
  271. package/contracts/instance/InstanceAdmin.sol +331 -0
  272. package/contracts/instance/InstanceAuthorizationsLib.sol +192 -151
  273. package/contracts/instance/InstanceReader.sol +30 -6
  274. package/contracts/instance/InstanceService.sol +69 -55
  275. package/contracts/instance/InstanceServiceManager.sol +10 -20
  276. package/contracts/instance/InstanceStore.sol +64 -42
  277. package/contracts/instance/base/BalanceStore.sol +1 -1
  278. package/contracts/instance/base/ObjectCounter.sol +21 -0
  279. package/contracts/instance/module/IAccess.sol +2 -10
  280. package/contracts/mock/Dip.sol +26 -0
  281. package/contracts/oracle/IOracle.sol +20 -0
  282. package/contracts/oracle/IOracleComponent.sol +32 -0
  283. package/contracts/oracle/IOracleService.sol +65 -0
  284. package/contracts/oracle/Oracle.sol +145 -0
  285. package/contracts/oracle/OracleService.sol +277 -0
  286. package/contracts/oracle/OracleServiceManager.sol +42 -0
  287. package/contracts/pool/BundleService.sol +6 -23
  288. package/contracts/pool/BundleServiceManager.sol +9 -18
  289. package/contracts/pool/IBundleService.sol +1 -1
  290. package/contracts/pool/IPoolService.sol +4 -1
  291. package/contracts/pool/PoolService.sol +45 -13
  292. package/contracts/pool/PoolServiceManager.sol +9 -18
  293. package/contracts/product/ApplicationService.sol +6 -5
  294. package/contracts/product/ApplicationServiceManager.sol +9 -6
  295. package/contracts/product/ClaimService.sol +13 -7
  296. package/contracts/product/ClaimServiceManager.sol +9 -6
  297. package/contracts/product/IApplicationService.sol +1 -1
  298. package/contracts/product/IClaimService.sol +7 -1
  299. package/contracts/product/IPolicyService.sol +1 -1
  300. package/contracts/product/IPricingService.sol +1 -1
  301. package/contracts/product/IProductService.sol +1 -1
  302. package/contracts/product/PolicyService.sol +10 -6
  303. package/contracts/product/PolicyServiceManager.sol +9 -21
  304. package/contracts/product/PricingService.sol +10 -9
  305. package/contracts/product/PricingServiceManager.sol +9 -18
  306. package/contracts/product/Product.sol +1 -1
  307. package/contracts/product/ProductService.sol +7 -5
  308. package/contracts/product/ProductServiceManager.sol +9 -21
  309. package/contracts/registry/ChainNft.sol +1 -0
  310. package/contracts/registry/IRegistry.sol +37 -24
  311. package/contracts/registry/IRegistryService.sol +26 -36
  312. package/contracts/registry/Registry.sol +164 -117
  313. package/contracts/registry/RegistryAdmin.sol +237 -0
  314. package/contracts/registry/RegistryService.sol +22 -83
  315. package/contracts/registry/RegistryServiceManager.sol +21 -23
  316. package/contracts/registry/ReleaseManager.sol +448 -223
  317. package/contracts/registry/TokenRegistry.sol +187 -59
  318. package/contracts/shared/AccessManagerCustom.sol +736 -0
  319. package/contracts/shared/AccessManagerExtended.sol +470 -0
  320. package/contracts/shared/AccessManagerExtendedInitializeable.sol +13 -0
  321. package/contracts/shared/AccessManagerExtendedWithDisable.sol +137 -0
  322. package/contracts/shared/AccessManagerExtendedWithDisableInitializeable.sol +14 -0
  323. package/contracts/shared/Component.sol +8 -13
  324. package/contracts/shared/ComponentService.sol +35 -13
  325. package/contracts/shared/ComponentVerifyingService.sol +13 -7
  326. package/contracts/shared/ERC165.sol +1 -1
  327. package/contracts/shared/IAccessManagerExtended.sol +74 -0
  328. package/contracts/shared/IAccessManagerExtendedWithDisable.sol +18 -0
  329. package/contracts/shared/IComponent.sol +3 -7
  330. package/contracts/shared/IComponentService.sol +11 -0
  331. package/contracts/shared/IKeyValueStore.sol +1 -1
  332. package/contracts/shared/INftOwnable.sol +1 -1
  333. package/contracts/shared/IPolicyHolder.sol +6 -1
  334. package/contracts/shared/IService.sol +1 -1
  335. package/contracts/shared/InitializableCustom.sol +177 -0
  336. package/contracts/shared/InstanceLinkedComponent.sol +1 -2
  337. package/contracts/shared/KeyValueStore.sol +24 -66
  338. package/contracts/shared/Lifecycle.sol +11 -2
  339. package/contracts/shared/NftIdSetManager.sol +65 -0
  340. package/contracts/shared/NftOwnable.sol +2 -13
  341. package/contracts/shared/PolicyHolder.sol +21 -13
  342. package/contracts/shared/ProxyManager.sol +31 -1
  343. package/contracts/shared/Service.sol +1 -1
  344. package/contracts/staking/IStaking.sol +127 -36
  345. package/contracts/staking/IStakingService.sol +83 -39
  346. package/contracts/staking/StakeManagerLib.sol +179 -0
  347. package/contracts/staking/Staking.sol +432 -93
  348. package/contracts/staking/StakingManager.sol +22 -14
  349. package/contracts/staking/StakingReader.sol +187 -0
  350. package/contracts/staking/StakingService.sol +245 -39
  351. package/contracts/staking/StakingServiceManager.sol +8 -4
  352. package/contracts/staking/StakingStore.sol +572 -0
  353. package/contracts/staking/TargetManagerLib.sol +207 -0
  354. package/contracts/type/AddressSet.sol +1 -1
  355. package/contracts/type/Amount.sol +15 -1
  356. package/contracts/type/Blocknumber.sol +14 -2
  357. package/contracts/type/Fee.sol +1 -1
  358. package/contracts/type/NftId.sol +9 -4
  359. package/contracts/type/NftIdSet.sol +1 -1
  360. package/contracts/type/ObjectType.sol +12 -9
  361. package/contracts/type/Referral.sol +1 -1
  362. package/contracts/type/RequestId.sol +75 -0
  363. package/contracts/type/RiskId.sol +1 -1
  364. package/contracts/type/RoleId.sol +16 -8
  365. package/contracts/type/Seconds.sol +27 -0
  366. package/contracts/type/StateId.sol +27 -2
  367. package/contracts/type/Timestamp.sol +6 -2
  368. package/contracts/type/Version.sol +1 -1
  369. package/package.json +3 -3
  370. package/artifacts/contracts/instance/InstanceAccessManager.sol/InstanceAccessManager.dbg.json +0 -4
  371. package/artifacts/contracts/instance/InstanceAccessManager.sol/InstanceAccessManager.json +0 -1348
  372. package/artifacts/contracts/registry/RegistryAccessManager.sol/RegistryAccessManager.dbg.json +0 -4
  373. package/artifacts/contracts/registry/RegistryAccessManager.sol/RegistryAccessManager.json +0 -308
  374. package/artifacts/contracts/shared/AccessManagerUpgradeableInitializeable.sol/AccessManagerUpgradeableInitializeable.dbg.json +0 -4
  375. package/artifacts/contracts/shared/AccessManagerUpgradeableInitializeable.sol/AccessManagerUpgradeableInitializeable.json +0 -1206
  376. package/contracts/instance/InstanceAccessManager.sol +0 -543
  377. package/contracts/registry/RegistryAccessManager.sol +0 -213
  378. package/contracts/shared/AccessManagerUpgradeableInitializeable.sol +0 -13
@@ -0,0 +1,237 @@
1
+ // SPDX-License-Identifier: UNLICENSED
2
+ pragma solidity ^0.8.20;
3
+
4
+ import {IAccessManaged} from "@openzeppelin/contracts/access/manager/IAccessManaged.sol";
5
+ import {AccessManaged} from "@openzeppelin/contracts/access/manager/AccessManaged.sol";
6
+ import {AuthorityUtils} from "@openzeppelin/contracts/access/manager/AuthorityUtils.sol";
7
+
8
+ import {RoleId, RoleIdLib, GIF_MANAGER_ROLE, GIF_ADMIN_ROLE} from "../type/RoleId.sol";
9
+
10
+ import {AccessManagerExtendedInitializeable} from "../shared/AccessManagerExtendedInitializeable.sol";
11
+ import {InitializableCustom} from "../shared/InitializableCustom.sol";
12
+
13
+ import {IRegistry} from "./IRegistry.sol";
14
+ import {ReleaseManager} from "./ReleaseManager.sol";
15
+ import {TokenRegistry} from "./TokenRegistry.sol";
16
+
17
+ /*
18
+ 1) GIF_MANAGER_ROLE
19
+ - can have arbitrary number of members
20
+ - responsible for services registrations
21
+ - responsible for token registration and activation
22
+
23
+ 2) GIF_ADMIN_ROLE
24
+ - admin of GIF_MANAGER_ROLE
25
+ - MUST have 1 member at any time
26
+ - granted/revoked ONLY in transferAdminRole() -> consider lock out situations!!!
27
+ - responsible for creation and activation of releases
28
+ */
29
+
30
+ // !!! USE BUILDER PATTERN FOR CONFIG
31
+ // introduce class - config
32
+ // create instance of this class in admin initializer function
33
+ // call it "add"/"push" function for each entry in config (provide entry parameneters)
34
+ // each call will configure access manager for given parameneters
35
+ // in the end you have fully configured access manager and config object
36
+
37
+ // grants GIF_ADMIN_ROLE to registry owner as registryOwner is transaction sender
38
+ // grants GIF_MANAGER_ROLE to registry owner via contructor argument
39
+ contract RegistryAdmin is
40
+ AccessManaged,
41
+ InitializableCustom
42
+ {
43
+ error ErrorRegistryAdminReleaseManagerAuthorityMismatch();
44
+ error ErrorRegistryAdminTokenRegistryAuthorityMismatch();
45
+ error ErrorRegistryAdminStakingAuthorityMismatch();
46
+
47
+ string public constant GIF_ADMIN_ROLE_NAME = "GifAdminRole";
48
+ string public constant GIF_MANAGER_ROLE_NAME = "GifManagerRole";
49
+
50
+ string public constant RELEASE_MANAGER_TARGET_NAME = "ReleaseManager";
51
+ string public constant TOKEN_REGISTRY_TARGET_NAME = "TokenRegistry";
52
+ string public constant STAKING_TARGET_NAME = "Staking";
53
+
54
+ address private _releaseManager;
55
+ address private _tokenRegistry;
56
+ address private _staking;
57
+
58
+ constructor()
59
+ AccessManaged(msg.sender)
60
+ InitializableCustom()
61
+ {
62
+ AccessManagerExtendedInitializeable accessManager = new AccessManagerExtendedInitializeable();
63
+ accessManager.initialize(address(this));
64
+ setAuthority(address(accessManager));
65
+ }
66
+
67
+ function initialize(
68
+ IRegistry registry,
69
+ address gifAdmin,
70
+ address gifManager
71
+ )
72
+ external
73
+ initializer
74
+ {
75
+ // validate input
76
+ address releaseManagerAddress = registry.getReleaseManagerAddress();
77
+ if(IAccessManaged(releaseManagerAddress).authority() != authority()) {
78
+ revert ErrorRegistryAdminReleaseManagerAuthorityMismatch();
79
+ }
80
+
81
+ address tokenRegistryAddress = registry.getTokenRegistryAddress();
82
+ if(IAccessManaged(tokenRegistryAddress).authority() != authority()) {
83
+ revert ErrorRegistryAdminTokenRegistryAuthorityMismatch();
84
+ }
85
+
86
+ address stakingAddress = registry.getStakingAddress();
87
+ if(IAccessManaged(stakingAddress).authority() != authority()) {
88
+ revert ErrorRegistryAdminStakingAuthorityMismatch();
89
+ }
90
+
91
+ _releaseManager = releaseManagerAddress;
92
+ _tokenRegistry = tokenRegistryAddress;
93
+ _staking = stakingAddress;
94
+
95
+ // at this moment all registry contracts are deployed and fully intialized
96
+ _createRole(GIF_ADMIN_ROLE(), GIF_ADMIN_ROLE_NAME);
97
+ _createRole(GIF_MANAGER_ROLE(), GIF_MANAGER_ROLE_NAME);
98
+
99
+ _createTarget(_releaseManager, RELEASE_MANAGER_TARGET_NAME);
100
+ _createTarget(_tokenRegistry, TOKEN_REGISTRY_TARGET_NAME);
101
+ _createTarget(_staking, STAKING_TARGET_NAME);
102
+
103
+ _setGifAdminRole();
104
+ _setGifManagerRole();
105
+
106
+ _grantRole(GIF_ADMIN_ROLE(), gifAdmin, 0);
107
+ _grantRole(GIF_MANAGER_ROLE(), gifManager, 0);
108
+
109
+ // set gif manager role admin
110
+ _setRoleAdmin(GIF_MANAGER_ROLE(), GIF_ADMIN_ROLE());
111
+ }
112
+
113
+ // TODO makes sense to do this in intialize() function
114
+ // it is a single contract
115
+ // but if many token registries a possible...
116
+ /*function setTokenRegistry(
117
+ address tokenRegistry
118
+ )
119
+ external
120
+ restricted() // GIF_ADMIN_ROLE
121
+ {
122
+ // for TokenRegistry
123
+ bytes4[] memory functionSelector = new bytes4[](5);
124
+ functionSelector[0] = TokenRegistry.registerToken.selector;
125
+ functionSelector[1] = TokenRegistry.registerRemoteToken.selector;
126
+ functionSelector[2] = TokenRegistry.setActive.selector;
127
+ functionSelector[3] = TokenRegistry.setActiveForVersion.selector;
128
+
129
+ // only needed for testing TODO find a better way
130
+ functionSelector[4] = TokenRegistry.setActiveWithVersionCheck.selector;
131
+ _setTargetFunctionRole(address(tokenRegistry), functionSelector, GIF_MANAGER_ROLE());
132
+ }*/
133
+
134
+
135
+ function setTargetFunctionRole(
136
+ address target,
137
+ bytes4[] memory selector,
138
+ RoleId roleId
139
+ )
140
+ external
141
+ restricted // RELEASE_MANAGER_ROLE -> TODO create this role
142
+ {
143
+ _setTargetFunctionRole(target, selector, roleId);
144
+ }
145
+
146
+ /*function transferAdmin(address to)
147
+ external
148
+ restricted // only with GIF_ADMIN_ROLE or nft owner
149
+ {
150
+ _accessManager.revoke(GIF_ADMIN_ROLE, );
151
+ _accesssManager.grant(GIF_ADMIN_ROLE, to, 0);
152
+ }*/
153
+
154
+ //--- view functions ----------------------------------------------------//
155
+
156
+ function hasRole(address account, RoleId roleId) external view returns(bool) {
157
+ (bool isMember,) = AccessManagerExtendedInitializeable(authority()).hasRole(roleId.toInt(), account);
158
+ return isMember;
159
+ }
160
+
161
+
162
+ function canCall(
163
+ address account,
164
+ address target,
165
+ bytes4 functionSelector
166
+ )
167
+ external
168
+ view
169
+ returns(bool)
170
+ {
171
+ (bool immediate,) = AuthorityUtils.canCallWithDelay(
172
+ authority(),
173
+ account,
174
+ target,
175
+ functionSelector);
176
+
177
+ return immediate;
178
+ }
179
+
180
+ //--- private functions -------------------------------------------------//
181
+
182
+ function _setGifAdminRole() private
183
+ {
184
+ // for ReleaseManager
185
+ bytes4[] memory functionSelector2 = new bytes4[](2);
186
+ //functionSelector2[0] = ReleaseManager.registerStaking.selector;
187
+ functionSelector2[0] = ReleaseManager.createNextRelease.selector;
188
+ functionSelector2[1] = ReleaseManager.activateNextRelease.selector;
189
+
190
+ _setTargetFunctionRole(_releaseManager, functionSelector2, GIF_ADMIN_ROLE());
191
+
192
+ // for Staking
193
+ }
194
+
195
+ function _setGifManagerRole() private
196
+ {
197
+ // for TokenRegistry
198
+ bytes4[] memory functionSelectorTr = new bytes4[](5);
199
+ functionSelectorTr[0] = TokenRegistry.registerToken.selector;
200
+ functionSelectorTr[1] = TokenRegistry.registerRemoteToken.selector;
201
+ functionSelectorTr[2] = TokenRegistry.setActive.selector;
202
+ functionSelectorTr[3] = TokenRegistry.setActiveForVersion.selector;
203
+
204
+ // only needed for testing TODO find a better way
205
+ functionSelectorTr[4] = TokenRegistry.setActiveWithVersionCheck.selector;
206
+ _setTargetFunctionRole(_tokenRegistry, functionSelectorTr, GIF_MANAGER_ROLE());
207
+
208
+ // for ReleaseManager
209
+ bytes4[] memory functionSelectorRm = new bytes4[](2);
210
+ functionSelectorRm[0] = ReleaseManager.registerService.selector;
211
+ functionSelectorRm[1] = ReleaseManager.prepareNextRelease.selector;
212
+ _setTargetFunctionRole(_releaseManager, functionSelectorRm, GIF_MANAGER_ROLE());
213
+
214
+ // for Staking
215
+ }
216
+
217
+
218
+ function _setTargetFunctionRole(address target, bytes4[] memory selectors, RoleId roleId) private {
219
+ AccessManagerExtendedInitializeable(authority()).setTargetFunctionRole(target, selectors, roleId.toInt());
220
+ }
221
+
222
+ function _setRoleAdmin(RoleId roleId, RoleId adminRoleId) private {
223
+ AccessManagerExtendedInitializeable(authority()).setRoleAdmin(roleId.toInt(), adminRoleId.toInt());
224
+ }
225
+
226
+ function _grantRole(RoleId roleId, address account, uint32 executionDelay) private {
227
+ AccessManagerExtendedInitializeable(authority()).grantRole(roleId.toInt(), account, executionDelay);
228
+ }
229
+
230
+ function _createRole(RoleId roleId, string memory roleName) private {
231
+ AccessManagerExtendedInitializeable(authority()).createRole(roleId.toInt(), roleName);
232
+ }
233
+
234
+ function _createTarget(address target, string memory targetName) private {
235
+ AccessManagerExtendedInitializeable(authority()).createTarget(target, targetName);
236
+ }
237
+ }
@@ -15,7 +15,6 @@ import {IDistributionComponent} from "../../contracts/distribution/IDistribution
15
15
  import {IVersionable} from "../../contracts/shared/IVersionable.sol";
16
16
  import {Versionable} from "../../contracts/shared/Versionable.sol";
17
17
  import {IRegisterable} from "../../contracts/shared/IRegisterable.sol";
18
- import {Registerable} from "../../contracts/shared/Registerable.sol";
19
18
 
20
19
  import {RoleId, PRODUCT_OWNER_ROLE, POOL_OWNER_ROLE, ORACLE_OWNER_ROLE} from "../../contracts/type/RoleId.sol";
21
20
  import {ObjectType, REGISTRY, SERVICE, PRODUCT, ORACLE, POOL, INSTANCE, COMPONENT, DISTRIBUTION, DISTRIBUTOR, APPLICATION, POLICY, CLAIM, BUNDLE, STAKE, STAKING, PRICE} from "../../contracts/type/ObjectType.sol";
@@ -67,7 +66,7 @@ contract RegistryService is
67
66
  function registerStaking(IRegisterable staking, address owner)
68
67
  external
69
68
  virtual
70
- restricted
69
+ restricted()
71
70
  returns(
72
71
  IRegistry.ObjectInfo memory info
73
72
  )
@@ -86,7 +85,7 @@ contract RegistryService is
86
85
  )
87
86
  {
88
87
  if(!instance.supportsInterface(type(IInstance).interfaceId)) {
89
- revert NotInstance();
88
+ revert ErrorRegistryServiceNotInstance(address(instance));
90
89
  }
91
90
 
92
91
  info = _getAndVerifyContractInfo(instance, INSTANCE(), owner);
@@ -104,7 +103,7 @@ contract RegistryService is
104
103
  {
105
104
  // CAN revert if no ERC165 support -> will revert with empty message
106
105
  if(!product.supportsInterface(type(IProductComponent).interfaceId)) {
107
- revert NotProduct();
106
+ revert ErrorRegistryServiceNotProduct(address(product));
108
107
  }
109
108
 
110
109
  info = _getAndVerifyContractInfo(product, PRODUCT(), owner);
@@ -124,7 +123,7 @@ contract RegistryService is
124
123
  {
125
124
  // CAN revert if no ERC165 support -> will revert with empty message
126
125
  if(!component.supportsInterface(type(IComponent).interfaceId)) {
127
- revert NotComponent();
126
+ revert ErrorRegistryServiceNotComponent(address(component));
128
127
  }
129
128
 
130
129
  info = _getAndVerifyContractInfo(component, objectType, initialOwner);
@@ -139,7 +138,7 @@ contract RegistryService is
139
138
  )
140
139
  {
141
140
  if(!pool.supportsInterface(type(IPoolComponent).interfaceId)) {
142
- revert NotPool();
141
+ revert ErrorRegistryServiceNotPool(address(pool));
143
142
  }
144
143
 
145
144
  info = _getAndVerifyContractInfo(pool, POOL(), owner);
@@ -154,7 +153,7 @@ contract RegistryService is
154
153
  )
155
154
  {
156
155
  if(!distribution.supportsInterface(type(IDistributionComponent).interfaceId)) {
157
- revert NotDistribution();
156
+ revert ErrorRegistryServiceNotDistribution(address(distribution));
158
157
  }
159
158
 
160
159
  info = _getAndVerifyContractInfo(distribution, DISTRIBUTION(), owner);
@@ -176,7 +175,6 @@ contract RegistryService is
176
175
  returns(NftId nftId)
177
176
  {
178
177
  _verifyObjectInfo(info, POLICY());
179
-
180
178
  nftId = getRegistry().register(info);
181
179
  }
182
180
 
@@ -186,7 +184,6 @@ contract RegistryService is
186
184
  returns(NftId nftId)
187
185
  {
188
186
  _verifyObjectInfo(info, BUNDLE());
189
-
190
187
  nftId = getRegistry().register(info);
191
188
  }
192
189
 
@@ -196,71 +193,9 @@ contract RegistryService is
196
193
  returns(NftId nftId)
197
194
  {
198
195
  _verifyObjectInfo(info, STAKE());
199
-
200
196
  nftId = getRegistry().register(info);
201
197
  }
202
198
 
203
- // from IRegisterable
204
-
205
- function getFunctionConfigs()
206
- external
207
- pure
208
- returns(
209
- FunctionConfig[] memory config
210
- )
211
- {
212
- config = new FunctionConfig[](11);
213
-
214
- // order of service registrations MUST be reverse to this array
215
- /*config[-1].serviceDomain = STAKE();
216
- config[-1].selector = RegistryService.registerStake.selector;*/
217
-
218
- config[0].serviceDomain = POLICY();
219
- config[0].authorizedSelectors = new bytes4[](0);
220
-
221
- config[1].serviceDomain = APPLICATION();
222
- config[1].authorizedSelectors = new bytes4[](1);
223
- config[1].authorizedSelectors[0] = RegistryService.registerPolicy.selector;
224
-
225
- config[2].serviceDomain = CLAIM();
226
- config[2].authorizedSelectors = new bytes4[](0);
227
-
228
- config[3].serviceDomain = PRODUCT();
229
- config[3].authorizedSelectors = new bytes4[](1);
230
- config[3].authorizedSelectors[0] = RegistryService.registerProduct.selector;
231
-
232
- config[4].serviceDomain = POOL();
233
- config[4].authorizedSelectors = new bytes4[](1);
234
- config[4].authorizedSelectors[0] = RegistryService.registerPool.selector;
235
-
236
- // registration of bundle service must preceed registration of pool service
237
- config[5].serviceDomain = BUNDLE();
238
- config[5].authorizedSelectors = new bytes4[](1);
239
- config[5].authorizedSelectors[0] = RegistryService.registerBundle.selector;
240
-
241
- // registration of pricing service must preceed registration of application service
242
- config[6].serviceDomain = PRICE();
243
- config[6].authorizedSelectors = new bytes4[](0);
244
-
245
- // registration of distribution service must preceed registration of pricing service
246
- config[7].serviceDomain = DISTRIBUTION();
247
- config[7].authorizedSelectors = new bytes4[](2);
248
- config[7].authorizedSelectors[0] = RegistryService.registerDistribution.selector;
249
- config[7].authorizedSelectors[1] = RegistryService.registerDistributor.selector;
250
-
251
- config[8].serviceDomain = COMPONENT();
252
- config[8].authorizedSelectors = new bytes4[](1);
253
- config[8].authorizedSelectors[0] = RegistryService.registerComponent.selector;
254
-
255
- config[9].serviceDomain = INSTANCE();
256
- config[9].authorizedSelectors = new bytes4[](1);
257
- config[9].authorizedSelectors[0] = RegistryService.registerInstance.selector;
258
-
259
- config[10].serviceDomain = STAKING();
260
- config[10].authorizedSelectors = new bytes4[](1);
261
- config[10].authorizedSelectors[0] = RegistryService.registerStaking.selector;
262
- }
263
-
264
199
  // Internal
265
200
 
266
201
  function _getAndVerifyContractInfo(
@@ -269,34 +204,37 @@ contract RegistryService is
269
204
  address expectedOwner // assume can be 0 when given by other service
270
205
  )
271
206
  internal
272
- // view
207
+ view
273
208
  returns(
274
209
  IRegistry.ObjectInfo memory info
275
210
  )
276
211
  {
277
212
  info = registerable.getInitialInfo();
278
- info.objectAddress = address(registerable);
213
+
214
+ if(info.objectAddress != address(registerable)) {
215
+ revert ErrorRegistryServiceRegisterableAddressInvalid(registerable, info.objectAddress);
216
+ }
279
217
 
280
218
  if(info.objectType != expectedType) {// type is checked in registry anyway...but service logic may depend on expected value
281
- revert UnexpectedRegisterableType(expectedType, info.objectType);
219
+ revert ErrorRegistryServiceRegisterableTypeInvalid(registerable, expectedType, info.objectType);
282
220
  }
283
221
 
284
222
  address owner = info.initialOwner;
285
223
 
286
224
  if(owner != expectedOwner) { // registerable owner protection
287
- revert NotRegisterableOwner(expectedOwner);
225
+ revert ErrorRegistryServiceRegisterableOwnerInvalid(registerable, expectedOwner, owner);
288
226
  }
289
227
 
290
228
  if(owner == address(registerable)) {
291
- revert SelfRegistration();
229
+ revert ErrorRegistryServiceRegisterableSelfRegistration(registerable);
292
230
  }
293
231
 
294
232
  if(owner == address(0)) {
295
- revert RegisterableOwnerIsZero();
233
+ revert ErrorRegistryServiceRegisterableOwnerZero(registerable);
296
234
  }
297
235
 
298
236
  if(getRegistry().isRegistered(owner)) {
299
- revert RegisterableOwnerIsRegistered();
237
+ revert ErrorRegistryServiceRegisterableOwnerRegistered(registerable, owner);
300
238
  }
301
239
  }
302
240
 
@@ -307,21 +245,22 @@ contract RegistryService is
307
245
  internal
308
246
  view
309
247
  {
310
- // enforce instead of check
311
- info.objectAddress = address(0);
248
+ if(info.objectAddress > address(0)) {
249
+ revert ErrorRegistryServiceObjectAddressNotZero(info.objectType);
250
+ }
312
251
 
313
252
  if(info.objectType != expectedType) {// type is checked in registry anyway...but service logic may depend on expected value
314
- revert UnexpectedRegisterableType(expectedType, info.objectType);
253
+ revert ErrorRegistryServiceObjectTypeInvalid(expectedType, info.objectType);
315
254
  }
316
255
 
317
256
  address owner = info.initialOwner;
318
257
 
319
258
  if(owner == address(0)) {
320
- revert RegisterableOwnerIsZero();
259
+ revert ErrorRegistryServiceObjectOwnerZero(info.objectType);
321
260
  }
322
261
 
323
262
  if(getRegistry().isRegistered(owner)) {
324
- revert RegisterableOwnerIsRegistered();
263
+ revert ErrorRegistryServiceObjectOwnerRegistered(info.objectType, owner);
325
264
  }
326
265
  }
327
266
  }
@@ -1,4 +1,4 @@
1
- // SPDX-License-Identifier: UNLICENSED
1
+ // SPDX-License-Identifier: Apache-2.0
2
2
  pragma solidity ^0.8.20;
3
3
 
4
4
  import {AccessManager} from "@openzeppelin/contracts/access/manager/AccessManager.sol";
@@ -13,39 +13,37 @@ import {TokenRegistry} from "./TokenRegistry.sol";
13
13
  contract RegistryServiceManager is
14
14
  ProxyManager
15
15
  {
16
+ error ErrorRegistryAccessManagerAuthorityZero();
17
+ error ErrorRegistryAccessManagerRegistryZero();
18
+
16
19
  bytes32 constant public ACCESS_MANAGER_CREATION_CODE_HASH = 0x0;
17
20
 
18
21
  RegistryService private immutable _registryService;
19
22
 
20
23
  /// @dev initializes proxy manager with registry service implementation and deploys registry
21
24
  constructor(
22
- address initialAuthority, // used by implementation
23
- address registryAddress) // used by implementation
24
- ProxyManager(registryAddress)
25
+ address authority, // used by implementation
26
+ address registry, // used by implementation
27
+ bytes32 salt
28
+ )
29
+ ProxyManager(registry)
25
30
  {
26
- require(initialAuthority > address(0), "RegistryServiceManager: initial authority is 0");
27
- require(registryAddress > address(0), "RegistryServiceManager: registry is 0");
31
+ if(authority == address(0)) {
32
+ revert ErrorRegistryAccessManagerAuthorityZero();
33
+ }
34
+
35
+ if(registry == address(0)) {
36
+ revert ErrorRegistryAccessManagerRegistryZero();
37
+ }
28
38
 
29
- // implementation's initializer func `data` argument
30
- RegistryService srv = new RegistryService();
31
- bytes memory data = abi.encode(registryAddress, initialAuthority);
32
- IVersionable versionable = deploy(
39
+ RegistryService srv = new RegistryService{ salt: salt }();
40
+ bytes memory data = abi.encode(registry, authority);
41
+ IVersionable versionable = deployDetermenistic(
33
42
  address(srv),
34
- data);
43
+ data,
44
+ salt);
35
45
 
36
46
  _registryService = RegistryService(address(versionable));
37
-
38
- // _linkToNftOwnable(address(_registryService));
39
- }
40
-
41
- // // from IRegisterable
42
-
43
- // // IMPORTANT: registry here and in constructor MUST be the same
44
- function linkOwnershipToServiceNft()
45
- public
46
- onlyOwner
47
- {
48
- _linkToNftOwnable(address(_registryService));
49
47
  }
50
48
 
51
49
  //--- view functions ----------------------------------------------------//