@etherisc/gif-next 0.0.2-f5a74cc-201 → 0.0.2-f626d92-602

Sign up to get free protection for your applications and to get access to all the features.
Files changed (381) hide show
  1. package/README.md +8 -13
  2. package/artifacts/contracts/components/Component.sol/Component.dbg.json +4 -0
  3. package/artifacts/contracts/components/Component.sol/Component.json +842 -0
  4. package/artifacts/contracts/components/Distribution.sol/Distribution.dbg.json +1 -1
  5. package/artifacts/contracts/components/Distribution.sol/Distribution.json +753 -168
  6. package/artifacts/contracts/components/IComponent.sol/IComponent.dbg.json +4 -0
  7. package/artifacts/contracts/components/{BaseComponent.sol/BaseComponent.json → IComponent.sol/IComponent.json} +233 -81
  8. package/artifacts/contracts/components/IDistributionComponent.sol/IDistributionComponent.dbg.json +1 -1
  9. package/artifacts/contracts/components/IDistributionComponent.sol/IDistributionComponent.json +848 -31
  10. package/artifacts/contracts/components/IPoolComponent.sol/IPoolComponent.dbg.json +1 -1
  11. package/artifacts/contracts/components/IPoolComponent.sol/IPoolComponent.json +846 -57
  12. package/artifacts/contracts/components/IProductComponent.sol/IProductComponent.dbg.json +1 -1
  13. package/artifacts/contracts/components/IProductComponent.sol/IProductComponent.json +682 -9
  14. package/artifacts/contracts/components/Pool.sol/Pool.dbg.json +1 -1
  15. package/artifacts/contracts/components/Pool.sol/Pool.json +695 -258
  16. package/artifacts/contracts/components/Product.sol/Product.dbg.json +1 -1
  17. package/artifacts/contracts/components/Product.sol/Product.json +529 -217
  18. package/artifacts/contracts/instance/AccessManagerUpgradeableInitializeable.sol/AccessManagerUpgradeableInitializeable.dbg.json +1 -1
  19. package/artifacts/contracts/instance/AccessManagerUpgradeableInitializeable.sol/AccessManagerUpgradeableInitializeable.json +15 -15
  20. package/artifacts/contracts/instance/BundleManager.sol/BundleManager.dbg.json +1 -1
  21. package/artifacts/contracts/instance/BundleManager.sol/BundleManager.json +69 -66
  22. package/artifacts/contracts/instance/Cloneable.sol/Cloneable.dbg.json +1 -1
  23. package/artifacts/contracts/instance/Cloneable.sol/Cloneable.json +5 -0
  24. package/artifacts/contracts/instance/IInstance.sol/IInstance.dbg.json +1 -1
  25. package/artifacts/contracts/instance/IInstance.sol/IInstance.json +1063 -394
  26. package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.dbg.json +1 -1
  27. package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.json +315 -167
  28. package/artifacts/contracts/instance/Instance.sol/Instance.dbg.json +1 -1
  29. package/artifacts/contracts/instance/Instance.sol/Instance.json +937 -1191
  30. package/artifacts/contracts/instance/InstanceAccessManager.sol/InstanceAccessManager.dbg.json +1 -1
  31. package/artifacts/contracts/instance/InstanceAccessManager.sol/InstanceAccessManager.json +583 -193
  32. package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.dbg.json +1 -1
  33. package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.json +137 -270
  34. package/artifacts/contracts/instance/InstanceService.sol/InstanceService.dbg.json +1 -1
  35. package/artifacts/contracts/instance/InstanceService.sol/InstanceService.json +482 -286
  36. package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.dbg.json +1 -1
  37. package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.json +328 -99
  38. package/artifacts/contracts/instance/ObjectManager.sol/ObjectManager.dbg.json +1 -1
  39. package/artifacts/contracts/instance/ObjectManager.sol/ObjectManager.json +11 -27
  40. package/artifacts/contracts/instance/base/ComponentService.sol/ComponentService.dbg.json +4 -0
  41. package/artifacts/contracts/instance/base/{ComponentServiceBase.sol/ComponentServiceBase.json → ComponentService.sol/ComponentService.json} +247 -180
  42. package/artifacts/contracts/instance/base/IKeyValueStore.sol/IKeyValueStore.dbg.json +1 -1
  43. package/artifacts/contracts/instance/base/ILifecycle.sol/ILifecycle.dbg.json +1 -1
  44. package/artifacts/contracts/instance/base/KeyValueStore.sol/KeyValueStore.dbg.json +1 -1
  45. package/artifacts/contracts/instance/base/KeyValueStore.sol/KeyValueStore.json +40 -10
  46. package/artifacts/contracts/instance/base/Lifecycle.sol/Lifecycle.dbg.json +1 -1
  47. package/artifacts/contracts/instance/base/Lifecycle.sol/Lifecycle.json +36 -11
  48. package/artifacts/contracts/instance/module/IAccess.sol/IAccess.dbg.json +1 -1
  49. package/artifacts/contracts/instance/module/IAccess.sol/IAccess.json +71 -45
  50. package/artifacts/contracts/instance/module/IBundle.sol/IBundle.dbg.json +1 -1
  51. package/artifacts/contracts/instance/module/IComponents.sol/IComponents.dbg.json +4 -0
  52. package/artifacts/contracts/instance/module/IComponents.sol/IComponents.json +10 -0
  53. package/artifacts/contracts/instance/module/IDistribution.sol/IDistribution.dbg.json +1 -1
  54. package/artifacts/contracts/instance/module/IPolicy.sol/IPolicy.dbg.json +1 -1
  55. package/artifacts/contracts/instance/module/IRisk.sol/IRisk.dbg.json +1 -1
  56. package/artifacts/contracts/instance/module/ISetup.sol/ISetup.dbg.json +1 -1
  57. package/artifacts/contracts/instance/module/ITreasury.sol/ITreasury.dbg.json +1 -1
  58. package/artifacts/contracts/instance/service/ApplicationService.sol/ApplicationService.dbg.json +4 -0
  59. package/artifacts/contracts/instance/service/ApplicationService.sol/ApplicationService.json +1039 -0
  60. package/artifacts/contracts/instance/service/ApplicationServiceManager.sol/ApplicationServiceManager.dbg.json +4 -0
  61. package/artifacts/contracts/instance/service/ApplicationServiceManager.sol/ApplicationServiceManager.json +673 -0
  62. package/artifacts/contracts/instance/service/BundleService.sol/BundleService.dbg.json +4 -0
  63. package/artifacts/contracts/instance/service/BundleService.sol/BundleService.json +1231 -0
  64. package/artifacts/contracts/instance/service/BundleServiceManager.sol/BundleServiceManager.dbg.json +4 -0
  65. package/artifacts/contracts/instance/service/BundleServiceManager.sol/BundleServiceManager.json +721 -0
  66. package/artifacts/contracts/instance/service/ClaimService.sol/ClaimService.dbg.json +4 -0
  67. package/artifacts/contracts/instance/service/ClaimService.sol/ClaimService.json +817 -0
  68. package/artifacts/contracts/instance/service/ClaimServiceManager.sol/ClaimServiceManager.dbg.json +4 -0
  69. package/artifacts/contracts/instance/service/ClaimServiceManager.sol/ClaimServiceManager.json +641 -0
  70. package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.dbg.json +1 -1
  71. package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.json +1341 -259
  72. package/artifacts/contracts/instance/service/DistributionServiceManager.sol/DistributionServiceManager.dbg.json +1 -1
  73. package/artifacts/contracts/instance/service/DistributionServiceManager.sol/DistributionServiceManager.json +440 -79
  74. package/artifacts/contracts/instance/service/IApplicationService.sol/IApplicationService.dbg.json +4 -0
  75. package/artifacts/contracts/instance/service/IApplicationService.sol/IApplicationService.json +622 -0
  76. package/artifacts/contracts/instance/service/IBundleService.sol/IBundleService.dbg.json +4 -0
  77. package/artifacts/contracts/instance/service/IBundleService.sol/IBundleService.json +659 -0
  78. package/artifacts/contracts/instance/service/IClaimService.sol/IClaimService.dbg.json +4 -0
  79. package/artifacts/contracts/instance/service/{IComponentOwnerService.sol/IComponentOwnerService.json → IClaimService.sol/IClaimService.json} +217 -208
  80. package/artifacts/contracts/instance/service/IDistributionService.sol/IDistributionService.dbg.json +1 -1
  81. package/artifacts/contracts/instance/service/IDistributionService.sol/IDistributionService.json +804 -160
  82. package/artifacts/contracts/instance/service/IPolicyService.sol/IPolicyService.dbg.json +4 -0
  83. package/artifacts/contracts/{shared/RegisterableUpgradable.sol/RegisterableUpgradable.json → instance/service/IPolicyService.sol/IPolicyService.json} +328 -164
  84. package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.dbg.json +1 -1
  85. package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.json +429 -313
  86. package/artifacts/contracts/instance/service/IProductService.sol/IProductService.dbg.json +1 -1
  87. package/artifacts/contracts/instance/service/IProductService.sol/IProductService.json +78 -388
  88. package/artifacts/contracts/instance/service/PolicyService.sol/PolicyService.dbg.json +4 -0
  89. package/artifacts/contracts/instance/service/PolicyService.sol/PolicyService.json +1092 -0
  90. package/artifacts/contracts/instance/service/PolicyServiceManager.sol/PolicyServiceManager.dbg.json +4 -0
  91. package/artifacts/contracts/instance/service/PolicyServiceManager.sol/PolicyServiceManager.json +697 -0
  92. package/artifacts/contracts/instance/service/PoolService.sol/PoolService.dbg.json +1 -1
  93. package/artifacts/contracts/instance/service/PoolService.sol/PoolService.json +614 -426
  94. package/artifacts/contracts/instance/service/PoolServiceManager.sol/PoolServiceManager.dbg.json +1 -1
  95. package/artifacts/contracts/instance/service/PoolServiceManager.sol/PoolServiceManager.json +302 -105
  96. package/artifacts/contracts/instance/service/ProductService.sol/ProductService.dbg.json +1 -1
  97. package/artifacts/contracts/instance/service/ProductService.sol/ProductService.json +257 -564
  98. package/artifacts/contracts/instance/service/ProductServiceManager.sol/ProductServiceManager.dbg.json +1 -1
  99. package/artifacts/contracts/instance/service/ProductServiceManager.sol/ProductServiceManager.json +289 -124
  100. package/artifacts/contracts/registry/ChainNft.sol/ChainNft.dbg.json +1 -1
  101. package/artifacts/contracts/registry/ChainNft.sol/ChainNft.json +15 -2
  102. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.dbg.json +1 -1
  103. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.json +244 -133
  104. package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.dbg.json +1 -1
  105. package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.json +149 -230
  106. package/artifacts/contracts/registry/ITransferInterceptor.sol/ITransferInterceptor.dbg.json +1 -1
  107. package/artifacts/contracts/registry/ITransferInterceptor.sol/ITransferInterceptor.json +18 -0
  108. package/artifacts/contracts/registry/Registry.sol/Registry.dbg.json +1 -1
  109. package/artifacts/contracts/registry/Registry.sol/Registry.json +257 -235
  110. package/artifacts/contracts/registry/RegistryAccessManager.sol/RegistryAccessManager.dbg.json +4 -0
  111. package/artifacts/contracts/registry/RegistryAccessManager.sol/RegistryAccessManager.json +285 -0
  112. package/artifacts/contracts/registry/RegistryService.sol/RegistryService.dbg.json +1 -1
  113. package/artifacts/contracts/registry/RegistryService.sol/RegistryService.json +200 -335
  114. package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.dbg.json +1 -1
  115. package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.json +298 -145
  116. package/artifacts/contracts/registry/ReleaseManager.sol/ReleaseManager.dbg.json +4 -0
  117. package/artifacts/contracts/registry/ReleaseManager.sol/ReleaseManager.json +559 -0
  118. package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.dbg.json +1 -1
  119. package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.json +141 -53
  120. package/artifacts/contracts/shared/ContractDeployerLib.sol/ContractDeployerLib.dbg.json +1 -1
  121. package/artifacts/contracts/shared/ERC165.sol/ERC165.dbg.json +1 -1
  122. package/artifacts/contracts/shared/ERC165.sol/ERC165.json +41 -3
  123. package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.dbg.json +1 -1
  124. package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.json +40 -29
  125. package/artifacts/contracts/shared/IPolicyHolder.sol/IPolicyHolder.dbg.json +4 -0
  126. package/artifacts/contracts/shared/IPolicyHolder.sol/IPolicyHolder.json +129 -0
  127. package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.dbg.json +1 -1
  128. package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.json +21 -34
  129. package/artifacts/contracts/shared/IRegistryLinked.sol/IRegistryLinked.dbg.json +4 -0
  130. package/artifacts/contracts/{experiment/inheritance/IB.sol/IB.json → shared/IRegistryLinked.sol/IRegistryLinked.json} +18 -20
  131. package/artifacts/contracts/shared/IService.sol/IService.dbg.json +1 -1
  132. package/artifacts/contracts/shared/IService.sol/IService.json +86 -172
  133. package/artifacts/contracts/shared/IVersionable.sol/IVersionable.dbg.json +1 -1
  134. package/artifacts/contracts/shared/IVersionable.sol/IVersionable.json +2 -152
  135. package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.dbg.json +1 -1
  136. package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.json +120 -27
  137. package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.dbg.json +4 -0
  138. package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.json +248 -0
  139. package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.dbg.json +1 -1
  140. package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.json +294 -61
  141. package/artifacts/contracts/shared/Registerable.sol/Registerable.dbg.json +1 -1
  142. package/artifacts/contracts/shared/Registerable.sol/Registerable.json +129 -51
  143. package/artifacts/contracts/shared/RegistryLinked.sol/RegistryLinked.dbg.json +4 -0
  144. package/artifacts/contracts/shared/RegistryLinked.sol/RegistryLinked.json +84 -0
  145. package/artifacts/contracts/shared/Service.sol/Service.dbg.json +1 -1
  146. package/artifacts/contracts/shared/Service.sol/Service.json +191 -163
  147. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.dbg.json +1 -1
  148. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.json +2 -2
  149. package/artifacts/contracts/shared/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.dbg.json +1 -1
  150. package/artifacts/contracts/shared/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.json +2 -2
  151. package/artifacts/contracts/shared/Versionable.sol/Versionable.dbg.json +1 -1
  152. package/artifacts/contracts/shared/Versionable.sol/Versionable.json +2 -152
  153. package/artifacts/contracts/test/TestFee.sol/TestFee.dbg.json +1 -1
  154. package/artifacts/contracts/test/TestFee.sol/TestFee.json +2 -2
  155. package/artifacts/contracts/test/TestRegisterable.sol/TestRegisterable.dbg.json +1 -1
  156. package/artifacts/contracts/test/TestRegisterable.sol/TestRegisterable.json +129 -51
  157. package/artifacts/contracts/test/TestRoleId.sol/TestRoleId.dbg.json +1 -1
  158. package/artifacts/contracts/test/TestRoleId.sol/TestRoleId.json +6 -6
  159. package/artifacts/contracts/test/TestService.sol/TestService.dbg.json +1 -1
  160. package/artifacts/contracts/test/TestService.sol/TestService.json +210 -214
  161. package/artifacts/contracts/test/TestToken.sol/TestUsdc.dbg.json +1 -1
  162. package/artifacts/contracts/test/TestVersion.sol/TestVersion.dbg.json +1 -1
  163. package/artifacts/contracts/test/TestVersion.sol/TestVersion.json +2 -2
  164. package/artifacts/contracts/test/TestVersionable.sol/TestVersionable.dbg.json +1 -1
  165. package/artifacts/contracts/test/TestVersionable.sol/TestVersionable.json +8 -190
  166. package/artifacts/contracts/test/Usdc.sol/USDC.dbg.json +1 -1
  167. package/artifacts/contracts/types/AddressSet.sol/LibAddressSet.dbg.json +1 -1
  168. package/artifacts/contracts/types/Amount.sol/AmountLib.dbg.json +4 -0
  169. package/artifacts/contracts/types/Amount.sol/AmountLib.json +161 -0
  170. package/artifacts/contracts/types/Blocknumber.sol/BlocknumberLib.dbg.json +1 -1
  171. package/artifacts/contracts/types/Blocknumber.sol/BlocknumberLib.json +2 -2
  172. package/artifacts/contracts/types/ChainId.sol/ChainIdLib.dbg.json +1 -1
  173. package/artifacts/contracts/types/ClaimId.sol/ClaimIdLib.dbg.json +4 -0
  174. package/artifacts/contracts/types/ClaimId.sol/ClaimIdLib.json +100 -0
  175. package/artifacts/contracts/types/DistributorType.sol/DistributorTypeLib.dbg.json +1 -1
  176. package/artifacts/contracts/types/DistributorType.sol/DistributorTypeLib.json +2 -2
  177. package/artifacts/contracts/types/Fee.sol/FeeLib.dbg.json +1 -1
  178. package/artifacts/contracts/types/Fee.sol/FeeLib.json +40 -9
  179. package/artifacts/contracts/types/Key32.sol/Key32Lib.dbg.json +1 -1
  180. package/artifacts/contracts/types/Key32.sol/Key32Lib.json +2 -2
  181. package/artifacts/contracts/types/NftId.sol/NftIdLib.dbg.json +1 -1
  182. package/artifacts/contracts/types/NftId.sol/NftIdLib.json +17 -4
  183. package/artifacts/contracts/types/NftIdSet.sol/LibNftIdSet.dbg.json +1 -1
  184. package/artifacts/contracts/types/NftIdSet.sol/LibNftIdSet.json +2 -2
  185. package/artifacts/contracts/types/NumberId.sol/NumberIdLib.dbg.json +1 -1
  186. package/artifacts/contracts/types/ObjectType.sol/ObjectTypeLib.dbg.json +1 -1
  187. package/artifacts/contracts/types/ObjectType.sol/ObjectTypeLib.json +2 -2
  188. package/artifacts/contracts/types/PayoutId.sol/PayoutIdLib.dbg.json +4 -0
  189. package/artifacts/contracts/types/PayoutId.sol/PayoutIdLib.json +100 -0
  190. package/artifacts/contracts/types/Referral.sol/ReferralLib.dbg.json +1 -1
  191. package/artifacts/contracts/types/Referral.sol/ReferralLib.json +23 -4
  192. package/artifacts/contracts/types/RiskId.sol/RiskIdLib.dbg.json +1 -1
  193. package/artifacts/contracts/types/RiskId.sol/RiskIdLib.json +2 -2
  194. package/artifacts/contracts/types/RoleId.sol/RoleIdLib.dbg.json +1 -1
  195. package/artifacts/contracts/types/RoleId.sol/RoleIdLib.json +2 -2
  196. package/artifacts/contracts/types/Seconds.sol/SecondsLib.dbg.json +4 -0
  197. package/artifacts/contracts/types/Seconds.sol/SecondsLib.json +124 -0
  198. package/artifacts/contracts/types/StateId.sol/StateIdLib.dbg.json +1 -1
  199. package/artifacts/contracts/types/StateId.sol/StateIdLib.json +2 -2
  200. package/artifacts/contracts/types/Timestamp.sol/TimestampLib.dbg.json +1 -1
  201. package/artifacts/contracts/types/Timestamp.sol/TimestampLib.json +25 -7
  202. package/artifacts/contracts/types/UFixed.sol/MathLib.dbg.json +1 -1
  203. package/artifacts/contracts/types/UFixed.sol/MathLib.json +2 -2
  204. package/artifacts/contracts/types/UFixed.sol/UFixedLib.dbg.json +1 -1
  205. package/artifacts/contracts/types/UFixed.sol/UFixedLib.json +2 -2
  206. package/artifacts/contracts/types/Version.sol/VersionLib.dbg.json +1 -1
  207. package/artifacts/contracts/types/Version.sol/VersionLib.json +2 -2
  208. package/artifacts/contracts/types/Version.sol/VersionPartLib.dbg.json +1 -1
  209. package/artifacts/contracts/types/Version.sol/VersionPartLib.json +2 -2
  210. package/contracts/components/Component.sol +253 -0
  211. package/contracts/components/Distribution.sol +200 -83
  212. package/contracts/components/IComponent.sol +76 -0
  213. package/contracts/components/IDistributionComponent.sol +44 -17
  214. package/contracts/components/IPoolComponent.sol +88 -41
  215. package/contracts/components/IProductComponent.sol +10 -5
  216. package/contracts/components/Pool.sol +218 -182
  217. package/contracts/components/Product.sol +125 -121
  218. package/contracts/instance/AccessManagerUpgradeableInitializeable.sol +2 -12
  219. package/contracts/instance/BundleManager.sol +14 -16
  220. package/contracts/instance/Cloneable.sol +7 -2
  221. package/contracts/instance/IInstance.sol +56 -14
  222. package/contracts/instance/IInstanceService.sol +43 -3
  223. package/contracts/instance/Instance.sol +133 -261
  224. package/contracts/instance/InstanceAccessManager.sol +414 -175
  225. package/contracts/instance/InstanceReader.sol +10 -34
  226. package/contracts/instance/InstanceService.sol +400 -144
  227. package/contracts/instance/InstanceServiceManager.sol +6 -9
  228. package/contracts/instance/ObjectManager.sol +11 -24
  229. package/contracts/instance/base/ComponentService.sol +121 -0
  230. package/contracts/instance/base/KeyValueStore.sol +13 -5
  231. package/contracts/instance/base/Lifecycle.sol +11 -2
  232. package/contracts/instance/module/IAccess.sol +36 -20
  233. package/contracts/instance/module/IBundle.sol +8 -5
  234. package/contracts/instance/module/IComponents.sol +41 -0
  235. package/contracts/instance/module/IDistribution.sol +2 -0
  236. package/contracts/instance/module/IPolicy.sol +30 -3
  237. package/contracts/instance/module/ISetup.sol +7 -20
  238. package/contracts/instance/service/ApplicationService.sol +350 -0
  239. package/contracts/instance/service/ApplicationServiceManager.sol +35 -0
  240. package/contracts/instance/service/BundleService.sol +431 -0
  241. package/contracts/instance/service/BundleServiceManager.sol +51 -0
  242. package/contracts/instance/service/ClaimService.sol +151 -0
  243. package/contracts/instance/service/ClaimServiceManager.sol +35 -0
  244. package/contracts/instance/service/DistributionService.sol +378 -31
  245. package/contracts/instance/service/DistributionServiceManager.sol +7 -10
  246. package/contracts/instance/service/IApplicationService.sol +82 -0
  247. package/contracts/instance/service/IBundleService.sol +93 -0
  248. package/contracts/instance/service/IClaimService.sol +61 -0
  249. package/contracts/instance/service/IDistributionService.sol +87 -0
  250. package/contracts/instance/service/IPolicyService.sol +72 -0
  251. package/contracts/instance/service/IPoolService.sol +73 -25
  252. package/contracts/instance/service/IProductService.sol +2 -72
  253. package/contracts/instance/service/PolicyService.sol +362 -0
  254. package/contracts/instance/service/PolicyServiceManager.sol +54 -0
  255. package/contracts/instance/service/PoolService.sol +203 -187
  256. package/contracts/instance/service/PoolServiceManager.sol +6 -9
  257. package/contracts/instance/service/ProductService.sol +104 -464
  258. package/contracts/instance/service/ProductServiceManager.sol +2 -2
  259. package/contracts/registry/ChainNft.sol +9 -1
  260. package/contracts/registry/IRegistry.sol +39 -19
  261. package/contracts/registry/IRegistryService.sol +31 -13
  262. package/contracts/registry/ITransferInterceptor.sol +1 -0
  263. package/contracts/registry/Registry.sol +243 -224
  264. package/contracts/registry/RegistryAccessManager.sol +216 -0
  265. package/contracts/registry/RegistryService.sol +97 -173
  266. package/contracts/registry/RegistryServiceManager.sol +21 -39
  267. package/contracts/registry/ReleaseManager.sol +324 -0
  268. package/contracts/registry/TokenRegistry.sol +22 -17
  269. package/contracts/shared/ERC165.sol +14 -12
  270. package/contracts/shared/INftOwnable.sol +11 -10
  271. package/contracts/shared/IPolicyHolder.sol +26 -0
  272. package/contracts/shared/IRegisterable.sol +4 -6
  273. package/contracts/shared/IRegistryLinked.sol +12 -0
  274. package/contracts/shared/IService.sol +5 -4
  275. package/contracts/shared/IVersionable.sol +4 -47
  276. package/contracts/shared/NftOwnable.sol +66 -80
  277. package/contracts/shared/PolicyHolder.sol +81 -0
  278. package/contracts/shared/ProxyManager.sol +100 -25
  279. package/contracts/shared/Registerable.sol +16 -32
  280. package/contracts/shared/RegistryLinked.sol +48 -0
  281. package/contracts/shared/Service.sol +41 -24
  282. package/contracts/shared/TokenHandler.sol +11 -5
  283. package/contracts/shared/Versionable.sol +4 -92
  284. package/contracts/test/TestRegisterable.sol +1 -1
  285. package/contracts/test/TestService.sol +4 -3
  286. package/contracts/types/Amount.sol +60 -0
  287. package/contracts/types/Blocknumber.sol +1 -0
  288. package/contracts/types/ClaimId.sol +52 -0
  289. package/contracts/types/DistributorType.sol +2 -2
  290. package/contracts/types/Fee.sol +13 -5
  291. package/contracts/types/NftId.sol +8 -0
  292. package/contracts/types/ObjectType.sol +10 -5
  293. package/contracts/types/PayoutId.sol +54 -0
  294. package/contracts/types/Referral.sol +4 -0
  295. package/contracts/types/RoleId.sol +26 -19
  296. package/contracts/types/Seconds.sol +54 -0
  297. package/contracts/types/StateId.sol +1 -0
  298. package/contracts/types/Timestamp.sol +13 -13
  299. package/contracts/types/UFixed.sol +1 -0
  300. package/contracts/types/Version.sol +1 -0
  301. package/package.json +3 -3
  302. package/artifacts/contracts/components/BaseComponent.sol/BaseComponent.dbg.json +0 -4
  303. package/artifacts/contracts/components/IBaseComponent.sol/IBaseComponent.dbg.json +0 -4
  304. package/artifacts/contracts/components/IBaseComponent.sol/IBaseComponent.json +0 -368
  305. package/artifacts/contracts/experiment/cloning/Cloner.sol/Cloner.dbg.json +0 -4
  306. package/artifacts/contracts/experiment/cloning/Cloner.sol/Cloner.json +0 -66
  307. package/artifacts/contracts/experiment/cloning/Cloner.sol/Mock1.dbg.json +0 -4
  308. package/artifacts/contracts/experiment/cloning/Cloner.sol/Mock1.json +0 -24
  309. package/artifacts/contracts/experiment/cloning/Cloner.sol/Mock2.dbg.json +0 -4
  310. package/artifacts/contracts/experiment/cloning/Cloner.sol/Mock2.json +0 -42
  311. package/artifacts/contracts/experiment/errors/Require.sol/Require.dbg.json +0 -4
  312. package/artifacts/contracts/experiment/errors/Require.sol/Require.json +0 -105
  313. package/artifacts/contracts/experiment/errors/Revert.sol/Revert.dbg.json +0 -4
  314. package/artifacts/contracts/experiment/errors/Revert.sol/Revert.json +0 -105
  315. package/artifacts/contracts/experiment/inheritance/A.sol/A.dbg.json +0 -4
  316. package/artifacts/contracts/experiment/inheritance/A.sol/A.json +0 -128
  317. package/artifacts/contracts/experiment/inheritance/A.sol/AShared.dbg.json +0 -4
  318. package/artifacts/contracts/experiment/inheritance/A.sol/AShared.json +0 -42
  319. package/artifacts/contracts/experiment/inheritance/B.sol/B.dbg.json +0 -4
  320. package/artifacts/contracts/experiment/inheritance/B.sol/B.json +0 -76
  321. package/artifacts/contracts/experiment/inheritance/C.sol/C.dbg.json +0 -4
  322. package/artifacts/contracts/experiment/inheritance/C.sol/C.json +0 -89
  323. package/artifacts/contracts/experiment/inheritance/IA.sol/IA.dbg.json +0 -4
  324. package/artifacts/contracts/experiment/inheritance/IA.sol/IA.json +0 -128
  325. package/artifacts/contracts/experiment/inheritance/IA.sol/ISharedA.dbg.json +0 -4
  326. package/artifacts/contracts/experiment/inheritance/IA.sol/ISharedA.json +0 -37
  327. package/artifacts/contracts/experiment/inheritance/IB.sol/IB.dbg.json +0 -4
  328. package/artifacts/contracts/experiment/inheritance/IC.sol/IC.dbg.json +0 -4
  329. package/artifacts/contracts/experiment/inheritance/IC.sol/IC.json +0 -63
  330. package/artifacts/contracts/experiment/statemachine/Dummy.sol/LifeCycleModule.dbg.json +0 -4
  331. package/artifacts/contracts/experiment/statemachine/Dummy.sol/LifeCycleModule.json +0 -59
  332. package/artifacts/contracts/experiment/statemachine/ISM.sol/ISM.dbg.json +0 -4
  333. package/artifacts/contracts/experiment/statemachine/ISM.sol/ISM.json +0 -124
  334. package/artifacts/contracts/experiment/statemachine/ISM.sol/ISMEE.dbg.json +0 -4
  335. package/artifacts/contracts/experiment/statemachine/ISM.sol/ISMEE.json +0 -74
  336. package/artifacts/contracts/experiment/statemachine/SM.sol/SM.dbg.json +0 -4
  337. package/artifacts/contracts/experiment/statemachine/SM.sol/SM.json +0 -124
  338. package/artifacts/contracts/experiment/statemachine/SimpleStateMachine.sol/SimpleStateMachine.dbg.json +0 -4
  339. package/artifacts/contracts/experiment/statemachine/SimpleStateMachine.sol/SimpleStateMachine.json +0 -207
  340. package/artifacts/contracts/experiment/types/TypeA.sol/TypeALib.dbg.json +0 -4
  341. package/artifacts/contracts/experiment/types/TypeA.sol/TypeALib.json +0 -10
  342. package/artifacts/contracts/experiment/types/TypeB.sol/TypeBLib.dbg.json +0 -4
  343. package/artifacts/contracts/experiment/types/TypeB.sol/TypeBLib.json +0 -10
  344. package/artifacts/contracts/instance/IAccessManagerSimple.sol/IAccessManagerSimple.dbg.json +0 -4
  345. package/artifacts/contracts/instance/IAccessManagerSimple.sol/IAccessManagerSimple.json +0 -1082
  346. package/artifacts/contracts/instance/IInstanceBase.sol/IInstanceBase.dbg.json +0 -4
  347. package/artifacts/contracts/instance/IInstanceBase.sol/IInstanceBase.json +0 -448
  348. package/artifacts/contracts/instance/InstanceBase.sol/InstanceBase.dbg.json +0 -4
  349. package/artifacts/contracts/instance/InstanceBase.sol/InstanceBase.json +0 -763
  350. package/artifacts/contracts/instance/base/ComponentServiceBase.sol/ComponentServiceBase.dbg.json +0 -4
  351. package/artifacts/contracts/instance/base/IInstanceBase.sol/IInstanceBase.dbg.json +0 -4
  352. package/artifacts/contracts/instance/base/IInstanceBase.sol/IInstanceBase.json +0 -113
  353. package/artifacts/contracts/instance/service/ComponentOwnerService.sol/ComponentOwnerService.dbg.json +0 -4
  354. package/artifacts/contracts/instance/service/ComponentOwnerService.sol/ComponentOwnerService.json +0 -827
  355. package/artifacts/contracts/instance/service/IComponentOwnerService.sol/IComponentOwnerService.dbg.json +0 -4
  356. package/artifacts/contracts/shared/RegisterableUpgradable.sol/RegisterableUpgradable.dbg.json +0 -4
  357. package/contracts/components/BaseComponent.sol +0 -132
  358. package/contracts/components/IBaseComponent.sol +0 -31
  359. package/contracts/experiment/cloning/Cloner.sol +0 -47
  360. package/contracts/experiment/errors/Require.sol +0 -38
  361. package/contracts/experiment/errors/Revert.sol +0 -44
  362. package/contracts/experiment/inheritance/A.sol +0 -53
  363. package/contracts/experiment/inheritance/B.sol +0 -28
  364. package/contracts/experiment/inheritance/C.sol +0 -34
  365. package/contracts/experiment/inheritance/IA.sol +0 -13
  366. package/contracts/experiment/inheritance/IB.sol +0 -10
  367. package/contracts/experiment/inheritance/IC.sol +0 -12
  368. package/contracts/experiment/statemachine/Dummy.sol +0 -27
  369. package/contracts/experiment/statemachine/ISM.sol +0 -25
  370. package/contracts/experiment/statemachine/SM.sol +0 -57
  371. package/contracts/experiment/statemachine/SimpleStateMachine.sol +0 -31
  372. package/contracts/experiment/types/TypeA.sol +0 -47
  373. package/contracts/experiment/types/TypeB.sol +0 -29
  374. package/contracts/instance/IAccessManagerSimple.sol +0 -391
  375. package/contracts/instance/IInstanceBase.sol +0 -26
  376. package/contracts/instance/InstanceBase.sol +0 -41
  377. package/contracts/instance/base/ComponentServiceBase.sol +0 -134
  378. package/contracts/instance/base/IInstanceBase.sol +0 -23
  379. package/contracts/instance/service/ComponentOwnerService.sol +0 -317
  380. package/contracts/instance/service/IComponentOwnerService.sol +0 -20
  381. package/contracts/shared/RegisterableUpgradable.sol +0 -16
@@ -8,25 +8,65 @@ import {IService} from "../shared/IService.sol";
8
8
  import {IRegistry} from "../registry/IRegistry.sol";
9
9
 
10
10
  import {IRegisterable} from "../shared/IRegisterable.sol";
11
- import {IBaseComponent} from "../components/IBaseComponent.sol";
11
+ import {IComponent} from "../components/IComponent.sol";
12
12
 
13
13
  import {AccessManagerUpgradeableInitializeable} from "./AccessManagerUpgradeableInitializeable.sol";
14
+ import {InstanceAccessManager} from "./InstanceAccessManager.sol";
14
15
  import {Instance} from "./Instance.sol";
15
16
  import {InstanceReader} from "./InstanceReader.sol";
16
17
  import {BundleManager} from "./BundleManager.sol";
17
18
 
18
19
  interface IInstanceService is IService {
19
20
 
20
- event LogInstanceCloned(address clonedAccessManagerAddress, address clonedInstanceAddress, address clonedInstanceReaderAddress, NftId clonedInstanceNftId);
21
+ error ErrorInstanceServiceMasterInstanceAlreadySet();
22
+ error ErrorInstanceServiceMasterOzAccessManagerAlreadySet();
23
+ error ErrorInstanceServiceMasterInstanceAccessManagerAlreadySet();
24
+ error ErrorInstanceServiceMasterBundleManagerAlreadySet();
25
+ error ErrorInstanceServiceInstanceAddressZero();
26
+
27
+ error ErrorInstanceServiceMasterInstanceReaderNotSet();
28
+ error ErrorInstanceServiceInstanceReaderAddressZero();
29
+ error ErrorInstanceServiceInstanceReaderSameAsMasterInstanceReader();
30
+ error ErrorInstanceServiceInstanceReaderInstanceMismatch();
31
+
32
+ error ErrorInstanceServiceOzAccessManagerZero();
33
+ error ErrorInstanceServiceInstanceAccessManagerZero();
34
+ error ErrorInstanceServiceInstanceReaderZero();
35
+ error ErrorInstanceServiceBundleManagerZero();
36
+
37
+ error ErrorInstanceServiceInstanceAuthorityMismatch();
38
+ error ErrorInstanceServiceBundleManagerAuthorityMismatch();
39
+ error ErrorInstanceServiceInstanceReaderInstanceMismatch2();
40
+ error ErrorInstanceServiceBundleMangerInstanceMismatch();
41
+
42
+ error ErrorInstanceServiceRequestUnauhorized(address caller);
43
+ error ErrorInstanceServiceNotInstanceOwner(address caller, NftId instanceNftId);
44
+ error ErrorInstanceServiceNotInstance(NftId nftId);
45
+ error ErrorInstanceServiceComponentNotRegistered(address componentAddress);
46
+ error ErrorInstanceServiceInstanceComponentMismatch(NftId instanceNftId, NftId componentNftId);
47
+ error ErrorInstanceServiceInvalidComponentType(address componentAddress, ObjectType expectedType, ObjectType componentType);
48
+
49
+ event LogInstanceCloned(address clonedOzAccessManager, address clonedInstanceAccessManager, address clonedInstance, address clonedBundleManager, address clonedInstanceReader, NftId clonedInstanceNftId);
21
50
 
22
51
  function createInstanceClone()
23
52
  external
24
53
  returns (
25
- AccessManagerUpgradeableInitializeable clonedAccessManager,
54
+ AccessManagerUpgradeableInitializeable clonedOzAccessManager,
55
+ InstanceAccessManager clonedInstanceAccessManager,
26
56
  Instance clonedInstance,
27
57
  NftId instanceNftId,
28
58
  InstanceReader clonedInstanceReader,
29
59
  BundleManager clonedBundleManager
30
60
  );
61
+
62
+ function createGifTarget(
63
+ NftId instanceNftId,
64
+ address targetAddress,
65
+ string memory targetName,
66
+ bytes4[][] memory selectors,
67
+ RoleId[] memory roles
68
+ ) external;
69
+
70
+ function setComponentLocked(bool locked) external;
31
71
  }
32
72
 
@@ -1,45 +1,56 @@
1
1
  // SPDX-License-Identifier: Apache-2.0
2
2
  pragma solidity ^0.8.20;
3
3
 
4
- import {EnumerableSet} from "@openzeppelin/contracts/utils/structs/EnumerableSet.sol";
5
- import {ShortString, ShortStrings} from "@openzeppelin/contracts/utils/ShortStrings.sol";
6
- import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";
7
4
  import {AccessManagedUpgradeable} from "@openzeppelin/contracts-upgradeable/access/manager/AccessManagedUpgradeable.sol";
8
- import {AccessManagerUpgradeable} from "@openzeppelin/contracts-upgradeable/access/manager/AccessManagerUpgradeable.sol";
9
5
 
10
- import {IAccess} from "./module/IAccess.sol";
11
- import {IBundle} from "./module/IBundle.sol";
12
- import {IPolicy} from "./module/IPolicy.sol";
13
- import {IRisk} from "./module/IRisk.sol";
14
- import {ISetup} from "./module/ISetup.sol";
15
6
  import {Key32, KeyId, Key32Lib} from "../types/Key32.sol";
16
- import {KeyValueStore} from "./base/KeyValueStore.sol";
17
- import {IInstance} from "./IInstance.sol";
18
- import {InstanceReader} from "./InstanceReader.sol";
19
- import {BundleManager} from "./BundleManager.sol";
20
7
  import {NftId} from "../types/NftId.sol";
8
+ import {ClaimId} from "../types/ClaimId.sol";
21
9
  import {NumberId} from "../types/NumberId.sol";
22
- import {ObjectType, BUNDLE, DISTRIBUTION, INSTANCE, POLICY, POOL, ROLE, PRODUCT, TARGET} from "../types/ObjectType.sol";
10
+ import {ObjectType, BUNDLE, DISTRIBUTION, INSTANCE, POLICY, POOL, ROLE, PRODUCT, TARGET, COMPONENT, DISTRIBUTOR, DISTRIBUTOR_TYPE} from "../types/ObjectType.sol";
23
11
  import {RiskId, RiskIdLib} from "../types/RiskId.sol";
24
- import {RoleId, RoleIdLib} from "../types/RoleId.sol";
12
+ import {RoleId, RoleIdLib, INSTANCE_ROLE, INSTANCE_OWNER_ROLE} from "../types/RoleId.sol";
25
13
  import {StateId, ACTIVE} from "../types/StateId.sol";
14
+ import {TimestampLib} from "../types/Timestamp.sol";
15
+ import {VersionPart, VersionPartLib} from "../types/Version.sol";
16
+
26
17
  import {ERC165} from "../shared/ERC165.sol";
27
18
  import {Registerable} from "../shared/Registerable.sol";
28
- import {ComponentOwnerService} from "./service/ComponentOwnerService.sol";
29
- import {IComponentOwnerService} from "./service/IComponentOwnerService.sol";
19
+
20
+ import {IRegistry} from "../registry/IRegistry.sol";
21
+
22
+ import {IInstance} from "./IInstance.sol";
23
+ import {InstanceReader} from "./InstanceReader.sol";
24
+ import {InstanceAccessManager} from "./InstanceAccessManager.sol";
25
+ import {BundleManager} from "./BundleManager.sol";
26
+
27
+ import {KeyValueStore} from "./base/KeyValueStore.sol";
28
+
29
+ import {IAccess} from "./module/IAccess.sol";
30
+ import {IBundle} from "./module/IBundle.sol";
31
+ import {IComponents} from "./module/IComponents.sol";
32
+ import {IDistribution} from "./module/IDistribution.sol";
33
+ import {IPolicy} from "./module/IPolicy.sol";
34
+ import {IRisk} from "./module/IRisk.sol";
35
+ import {ISetup} from "./module/ISetup.sol";
36
+
30
37
  import {IDistributionService} from "./service/IDistributionService.sol";
31
38
  import {IPoolService} from "./service/IPoolService.sol";
32
39
  import {IProductService} from "./service/IProductService.sol";
33
- import {VersionPart} from "../types/Version.sol";
34
- import {InstanceBase} from "./InstanceBase.sol";
40
+ import {IPolicyService} from "./service/IPolicyService.sol";
41
+ import {IBundleService} from "./service/IBundleService.sol";
42
+ import {TokenHandler} from "../shared/TokenHandler.sol";
43
+ import {VersionPart, VersionPartLib} from "../types/Version.sol";
35
44
 
36
45
  contract Instance is
37
- AccessManagedUpgradeable,
38
46
  IInstance,
39
- // Initializable,
40
- InstanceBase
47
+ AccessManagedUpgradeable,
48
+ Registerable,
49
+ KeyValueStore
41
50
  {
42
51
 
52
+ uint256 public constant GIF_MAJOR_VERSION = 3;
53
+
43
54
  uint64 public constant ADMIN_ROLE = type(uint64).min;
44
55
  uint64 public constant PUBLIC_ROLE = type(uint64).max;
45
56
  uint64 public constant CUSTOM_ROLE_ID_MIN = 10000;
@@ -48,152 +59,28 @@ contract Instance is
48
59
 
49
60
  bool private _initialized;
50
61
 
51
- mapping(ShortString name => RoleId roleId) internal _role;
52
- mapping(RoleId roleId => EnumerableSet.AddressSet roleMembers) internal _roleMembers;
53
- RoleId [] internal _roles;
54
-
55
- mapping(ShortString name => address target) internal _target;
56
-
57
- AccessManagerUpgradeable internal _accessManager;
62
+ InstanceAccessManager internal _accessManager;
58
63
  InstanceReader internal _instanceReader;
59
64
  BundleManager internal _bundleManager;
60
65
 
61
- function initialize(address accessManagerAddress, address registryAddress, NftId registryNftId, address initialOwner)
62
- public
63
- initializer
64
- {
65
- require(!_initialized, "Contract instance has already been initialized");
66
-
67
- __AccessManaged_init(accessManagerAddress);
68
-
69
- _accessManager = AccessManagerUpgradeable(accessManagerAddress);
70
- _createRole(RoleIdLib.toRoleId(ADMIN_ROLE), "AdminRole", false, false);
71
- _createRole(RoleIdLib.toRoleId(PUBLIC_ROLE), "PublicRole", false, false);
72
-
73
- _initializeRegisterable(registryAddress, registryNftId, INSTANCE(), false, initialOwner, "");
74
-
75
- _registerInterface(type(IInstance).interfaceId);
76
- _initialized = true;
77
- }
78
-
79
- //--- Role ------------------------------------------------------//
80
- function createStandardRole(RoleId roleId, string memory name) external restricted() {
81
- _createRole(roleId, name, false, true);
82
- }
83
-
84
- function createCustomRole(RoleId roleId, string memory name) external restricted() {
85
- _createRole(roleId, name, true, true);
86
- }
87
-
88
- function updateRole(RoleId roleId, string memory name, StateId newState) external restricted() {
89
- (bool isCustom,) = _validateRoleParameters(roleId, name, false);
90
- IAccess.RoleInfo memory role = _toRole(roleId, name, isCustom);
91
- update(toRoleKey32(roleId), abi.encode(role), newState);
92
- }
93
-
94
- function updateRoleState(RoleId roleId, StateId newState) external restricted() {
95
- updateState(toRoleKey32(roleId), newState);
96
- }
97
-
98
- function grantRole(RoleId roleId, address member) external restricted() returns (bool granted) {
99
- Key32 roleKey = toRoleKey32(roleId);
100
-
101
- if (!exists(roleKey)) {
102
- revert IAccess.ErrorGrantNonexstentRole(roleId);
103
- }
104
-
105
- if (getState(roleKey) != ACTIVE()) {
106
- revert IAccess.ErrorRoleIdNotActive(roleId);
107
- }
108
-
109
- if (!EnumerableSet.contains(_roleMembers[roleId], member)) {
110
- _accessManager.grantRole(roleId.toInt(), member, EXECUTION_DELAY);
111
- EnumerableSet.add(_roleMembers[roleId], member);
112
- return true;
66
+ modifier onlyChainNft() {
67
+ if(msg.sender != getRegistry().getChainNftAddress()) {
68
+ revert();
113
69
  }
114
-
115
- return false;
116
- }
117
-
118
- function revokeRole(RoleId roleId, address member) external restricted() returns (bool revoked) {
119
- Key32 roleKey = toRoleKey32(roleId);
120
-
121
- if (!exists(roleKey)) {
122
- revert IAccess.ErrorRevokeNonexstentRole(roleId);
123
- }
124
-
125
- if (EnumerableSet.contains(_roleMembers[roleId], member)) {
126
- _accessManager.revokeRole(roleId.toInt(), member);
127
- EnumerableSet.remove(_roleMembers[roleId], member);
128
- return true;
129
- }
130
-
131
- return false;
132
- }
133
-
134
- /// @dev not restricted function by intention
135
- /// the restriction to role members is already enforced by the call to the access manger
136
- function renounceRole(RoleId roleId) external returns (bool revoked) {
137
- address member = msg.sender;
138
- Key32 roleKey = toRoleKey32(roleId);
139
-
140
- if (!exists(roleKey)) {
141
- revert IAccess.ErrorRenounceNonexstentRole(roleId);
142
- }
143
-
144
- if (EnumerableSet.contains(_roleMembers[roleId], member)) {
145
- _accessManager.renounceRole(roleId.toInt(), member);
146
- EnumerableSet.remove(_roleMembers[roleId], member);
147
- return true;
148
- }
149
-
150
- return false;
151
- }
152
-
153
- function roles() external view returns (uint256 numberOfRoles) {
154
- return _roles.length;
70
+ _;
155
71
  }
156
72
 
157
- function getRoleId(uint256 idx) external view returns (RoleId roleId) {
158
- return _roles[idx];
159
- }
160
-
161
- function getRole(RoleId roleId) external view returns (IAccess.RoleInfo memory role) {
162
- return abi.decode(getData(roleId.toKey32()), (IAccess.RoleInfo));
163
- }
164
-
165
- function roleMembers(RoleId roleId) external view returns (uint256 numberOfMembers) {
166
- return EnumerableSet.length(_roleMembers[roleId]);
167
- }
168
-
169
- function getRoleMember(RoleId roleId, uint256 idx) external view returns (address roleMember) {
170
- return EnumerableSet.at(_roleMembers[roleId], idx);
171
- }
172
-
173
- function _createRole(RoleId roleId, string memory name, bool isCustom, bool validateParameters) internal {
174
- if (validateParameters) {
175
- _validateRoleParameters(roleId, name, isCustom);
176
- }
177
-
178
- IAccess.RoleInfo memory role = _toRole(roleId, name, isCustom);
179
- _role[role.name] = roleId;
180
- _roles.push(roleId);
181
-
182
- create(toRoleKey32(roleId), abi.encode(role));
183
- }
184
-
185
- //--- Target ------------------------------------------------------//
186
- function createTarget(address target, IAccess.TargetInfo memory targetInfo) external restricted() {
187
- _validateTargetParameters(target, targetInfo);
188
- create(toTargetKey32(target), abi.encode(targetInfo));
189
- }
190
-
191
- function setTargetClosed(address target, bool closed) external restricted() {
192
- if (!exists(toTargetKey32(target))) {
193
- revert IAccess.ErrorTargetDoesNotExist(target);
194
- }
73
+ function initialize(address authority, address registryAddress, address initialOwner)
74
+ public
75
+ initializer()
76
+ {
77
+ __AccessManaged_init(authority);
78
+
79
+ IRegistry registry = IRegistry(registryAddress);
80
+ initializeRegisterable(registryAddress, registry.getNftId(), INSTANCE(), true, initialOwner, "");
81
+ initializeLifecycle();
195
82
 
196
- _accessManager.setTargetClosed(target, closed);
83
+ registerInterface(type(IInstance).interfaceId);
197
84
  }
198
85
 
199
86
  //--- ProductSetup ------------------------------------------------------//
@@ -223,55 +110,55 @@ contract Instance is
223
110
  }
224
111
 
225
112
  //--- PoolSetup ------------------------------------------------------//
226
- function createPoolSetup(NftId poolNftId, ISetup.PoolSetupInfo memory setup) external restricted() {
227
- create(_toNftKey32(poolNftId, POOL()), abi.encode(setup));
113
+ function createPoolSetup(NftId poolNftId, IComponents.ComponentInfo memory info) external restricted() {
114
+ create(_toNftKey32(poolNftId, POOL()), abi.encode(info));
228
115
  }
229
116
 
230
- function updatePoolSetup(NftId poolNftId, ISetup.PoolSetupInfo memory setup, StateId newState) external restricted() {
231
- update(_toNftKey32(poolNftId, POOL()), abi.encode(setup), newState);
117
+ function updatePoolSetup(NftId poolNftId, IComponents.ComponentInfo memory info, StateId newState) external restricted() {
118
+ update(_toNftKey32(poolNftId, POOL()), abi.encode(info), newState);
232
119
  }
233
120
 
234
121
  function updatePoolSetupState(NftId poolNftId, StateId newState) external restricted() {
235
122
  updateState(_toNftKey32(poolNftId, POOL()), newState);
236
123
  }
237
124
 
238
- //--- DistributorType ---------------------------------------------------//
239
- function createDistributorType(NftId policyNftId, NumberId payoutId, IPolicy.PayoutInfo memory payout) external restricted() {
240
- create(toPolicyKey32(policyNftId), abi.encode(payout));
125
+ //--- DistributorType -------------------------------------------------------//
126
+ function createDistributorType(Key32 distributorKey, IDistribution.DistributorTypeInfo memory info) external restricted() {
127
+ create(distributorKey, abi.encode(info));
241
128
  }
242
129
 
243
- function updateDistributorType(NftId policyNftId, NumberId payoutId, IPolicy.PayoutInfo memory payout, StateId newState) external restricted() {
244
- update(toPolicyKey32(policyNftId), abi.encode(payout), newState);
130
+ function updateDistributorType(Key32 distributorKey, IDistribution.DistributorTypeInfo memory info, StateId newState) external restricted() {
131
+ update(distributorKey, abi.encode(info), newState);
245
132
  }
246
133
 
247
- function updateDistributorTypeState(NftId policyNftId, StateId newState) external restricted() {
248
- updateState(toPolicyKey32(policyNftId), newState);
134
+ function updateDistributorTypeState(Key32 distributorKey, StateId newState) external restricted() {
135
+ updateState(distributorKey, newState);
249
136
  }
250
137
 
251
138
  //--- Distributor -------------------------------------------------------//
252
- function createDistributor(NftId policyNftId, NumberId payoutId, IPolicy.PayoutInfo memory payout) external restricted() {
253
- create(toPolicyKey32(policyNftId), abi.encode(payout));
139
+ function createDistributor(NftId nftId, IDistribution.DistributorInfo memory info) external restricted() {
140
+ create(toDistributorKey32(nftId), abi.encode(info));
254
141
  }
255
142
 
256
- function updateDistributor(NftId policyNftId, NumberId payoutId, IPolicy.PayoutInfo memory payout, StateId newState) external restricted() {
257
- update(toPolicyKey32(policyNftId), abi.encode(payout), newState);
143
+ function updateDistributor(NftId nftId, IDistribution.DistributorInfo memory info, StateId newState) external restricted() {
144
+ update(toDistributorKey32(nftId), abi.encode(info), newState);
258
145
  }
259
146
 
260
- function updateDistributorState(NftId policyNftId, StateId newState) external restricted() {
261
- updateState(toPolicyKey32(policyNftId), newState);
147
+ function updateDistributorState(NftId nftId, StateId newState) external restricted() {
148
+ updateState(toDistributorKey32(nftId), newState);
262
149
  }
263
150
 
264
151
  //--- Referral ----------------------------------------------------------//
265
- function createReferral(NftId policyNftId, NumberId payoutId, IPolicy.PayoutInfo memory payout) external restricted() {
266
- create(toPolicyKey32(policyNftId), abi.encode(payout));
152
+ function createReferral(Key32 referralKey, IDistribution.ReferralInfo memory referralInfo) external restricted() {
153
+ create(referralKey, abi.encode(referralInfo));
267
154
  }
268
155
 
269
- function updateReferral(NftId policyNftId, NumberId payoutId, IPolicy.PayoutInfo memory payout, StateId newState) external restricted() {
270
- update(toPolicyKey32(policyNftId), abi.encode(payout), newState);
156
+ function updateReferral(Key32 referralKey, IDistribution.ReferralInfo memory referralInfo, StateId newState) external restricted() {
157
+ update(referralKey, abi.encode(referralInfo), newState);
271
158
  }
272
159
 
273
- function updateReferralState(NftId policyNftId, StateId newState) external restricted() {
274
- updateState(toPolicyKey32(policyNftId), newState);
160
+ function updateReferralState(Key32 referralKey, StateId newState) external restricted() {
161
+ updateState(referralKey, newState);
275
162
  }
276
163
 
277
164
  //--- Bundle ------------------------------------------------------------//
@@ -300,11 +187,20 @@ contract Instance is
300
187
  updateState(riskId.toKey32(), newState);
301
188
  }
302
189
 
303
- //--- Policy ------------------------------------------------------------//
304
- function createPolicy(NftId policyNftId, IPolicy.PolicyInfo memory policy) external restricted() {
305
- create(toPolicyKey32(policyNftId), abi.encode(policy));
190
+ //--- Application (Policy) ----------------------------------------------//
191
+ function createApplication(NftId applicationNftId, IPolicy.PolicyInfo memory policy) external restricted() {
192
+ create(toPolicyKey32(applicationNftId), abi.encode(policy));
193
+ }
194
+
195
+ function updateApplication(NftId applicationNftId, IPolicy.PolicyInfo memory policy, StateId newState) external restricted() {
196
+ update(toPolicyKey32(applicationNftId), abi.encode(policy), newState);
197
+ }
198
+
199
+ function updateApplicationState(NftId applicationNftId, StateId newState) external restricted() {
200
+ updateState(toPolicyKey32(applicationNftId), newState);
306
201
  }
307
202
 
203
+ //--- Policy ------------------------------------------------------------//
308
204
  function updatePolicy(NftId policyNftId, IPolicy.PolicyInfo memory policy, StateId newState) external restricted() {
309
205
  update(toPolicyKey32(policyNftId), abi.encode(policy), newState);
310
206
  }
@@ -314,15 +210,15 @@ contract Instance is
314
210
  }
315
211
 
316
212
  //--- Claim -------------------------------------------------------------//
317
- function createClaim(NftId policyNftId, NumberId claimId, IPolicy.ClaimInfo memory claim) external restricted() {
213
+ function createClaim(NftId policyNftId, ClaimId claimId, IPolicy.ClaimInfo memory claim) external restricted() {
318
214
  create(toPolicyKey32(policyNftId), abi.encode(claim));
319
215
  }
320
216
 
321
- function updateClaim(NftId policyNftId, NumberId claimId, IPolicy.ClaimInfo memory claim, StateId newState) external restricted() {
217
+ function updateClaim(NftId policyNftId, ClaimId claimId, IPolicy.ClaimInfo memory claim, StateId newState) external restricted() {
322
218
  update(toPolicyKey32(policyNftId), abi.encode(claim), newState);
323
219
  }
324
220
 
325
- function updateClaimState(NftId policyNftId, StateId newState) external restricted() {
221
+ function updateClaimState(NftId policyNftId, ClaimId claimId, StateId newState) external restricted() {
326
222
  updateState(toPolicyKey32(policyNftId), newState);
327
223
  }
328
224
 
@@ -331,7 +227,7 @@ contract Instance is
331
227
  create(toPolicyKey32(policyNftId), abi.encode(payout));
332
228
  }
333
229
 
334
- function updateClaim(NftId policyNftId, NumberId payoutId, IPolicy.PayoutInfo memory payout, StateId newState) external restricted() {
230
+ function updatePayout(NftId policyNftId, NumberId payoutId, IPolicy.PayoutInfo memory payout, StateId newState) external restricted() {
335
231
  update(toPolicyKey32(policyNftId), abi.encode(payout), newState);
336
232
  }
337
233
 
@@ -339,72 +235,18 @@ contract Instance is
339
235
  updateState(toPolicyKey32(policyNftId), newState);
340
236
  }
341
237
 
342
- //--- internal view/pure functions --------------------------------------//
343
- function _toRole(RoleId roleId, string memory name, bool isCustom)
344
- internal
345
- pure
346
- returns (IAccess.RoleInfo memory role)
347
- {
348
- return IAccess.RoleInfo(
349
- ShortStrings.toShortString(name),
350
- isCustom);
351
- }
352
-
353
- function _validateRoleParameters(
354
- RoleId roleId,
355
- string memory name,
356
- bool isCustom
357
- )
358
- internal
359
- view
360
- returns (
361
- bool roleExists,
362
- bool roleIsCustom
363
- )
364
- {
365
- Key32 roleKey = toRoleKey32(roleId);
366
- roleExists = exists(roleKey);
367
- if (roleExists) {
368
- roleIsCustom = abi.decode(getData(roleKey), (IAccess.RoleInfo)).isCustom;
369
- } else {
370
- roleIsCustom = isCustom;
371
- }
372
-
373
- // check role id
374
- uint64 roleIdInt = RoleId.unwrap(roleId);
375
- if(roleIdInt == ADMIN_ROLE || roleIdInt == PUBLIC_ROLE) {
376
- revert IAccess.ErrorRoleIdInvalid(roleId);
377
- }
378
-
379
- if (roleIsCustom && roleIdInt < CUSTOM_ROLE_ID_MIN) {
380
- revert IAccess.ErrorRoleIdTooSmall(roleId);
381
- } else if (roleIsCustom && roleIdInt >= CUSTOM_ROLE_ID_MIN) {
382
- revert IAccess.ErrorRoleIdTooBig(roleId);
383
- }
384
-
385
- // role name checks
386
- ShortString nameShort = ShortStrings.toShortString(name);
387
- if (ShortStrings.byteLength(nameShort) == 0) {
388
- revert IAccess.ErrorRoleNameEmpty(roleId);
389
- }
390
-
391
- if (_role[nameShort] != RoleIdLib.zero() && _role[nameShort] != roleId) {
392
- revert IAccess.ErrorRoleNameNotUnique(_role[nameShort], nameShort);
393
- }
394
- }
395
-
396
- function _validateTargetParameters(address target, IAccess.TargetInfo memory targetInfo) internal view {
397
-
398
- }
399
-
400
- function toRoleKey32(RoleId roleId) public pure returns (Key32) {
401
- return roleId.toKey32();
238
+ //--- ITransferInterceptor ------------------------------------------------------------//
239
+ function nftMint(address to, uint256 tokenId) external onlyChainNft {
240
+ assert(_accessManager.roleMembers(INSTANCE_OWNER_ROLE()) == 0);// temp
241
+ assert(_accessManager.grantRole(INSTANCE_OWNER_ROLE(), to) == true);
402
242
  }
403
243
 
404
- function toTargetKey32(address target) public pure returns (Key32) {
405
- return Key32Lib.toKey32(TARGET(), KeyId.wrap(bytes20(target)));
244
+ function nftTransferFrom(address from, address to, uint256 tokenId) external onlyChainNft {
245
+ assert(_accessManager.revokeRole(INSTANCE_OWNER_ROLE(), from) == true);
246
+ assert(_accessManager.grantRole(INSTANCE_OWNER_ROLE(), to) == true);
406
247
  }
407
248
 
249
+ //--- internal view/pure functions --------------------------------------//
408
250
  function _toNftKey32(NftId nftId, ObjectType objectType) internal pure returns (Key32) {
409
251
  return nftId.toKey32(objectType);
410
252
  }
@@ -417,39 +259,69 @@ contract Instance is
417
259
  return policyNftId.toKey32(POLICY());
418
260
  }
419
261
 
420
- function getComponentOwnerService() external view returns (IComponentOwnerService) {
421
- return ComponentOwnerService(_registry.getServiceAddress("ComponentOwnerService", VersionPart.wrap(3)));
262
+ function toDistributionKey32(NftId distNftId) public pure returns (Key32) {
263
+ return distNftId.toKey32(DISTRIBUTION());
264
+ }
265
+
266
+ function toDistributorTypeKey32(NftId distNftId) public pure returns (Key32) {
267
+ return distNftId.toKey32(DISTRIBUTOR_TYPE());
422
268
  }
423
269
 
270
+ function toDistributorKey32(NftId distNftId) public pure returns (Key32) {
271
+ return distNftId.toKey32(DISTRIBUTOR());
272
+ }
273
+
424
274
  function getDistributionService() external view returns (IDistributionService) {
425
- return IDistributionService(_registry.getServiceAddress("DistributionService", VersionPart.wrap(3)));
275
+ return IDistributionService(getRegistry().getServiceAddress(DISTRIBUTION(), VersionPart.wrap(3)));
426
276
  }
427
277
 
428
278
  function getProductService() external view returns (IProductService) {
429
- return IProductService(_registry.getServiceAddress("ProductService", VersionPart.wrap(3)));
279
+ return IProductService(getRegistry().getServiceAddress(PRODUCT(), VersionPart.wrap(3)));
430
280
  }
431
281
 
432
282
  function getPoolService() external view returns (IPoolService) {
433
- return IPoolService(_registry.getServiceAddress("PoolService", VersionPart.wrap(3)));
283
+ return IPoolService(getRegistry().getServiceAddress(POOL(), VersionPart.wrap(3)));
284
+ }
285
+
286
+ function getPolicyService() external view returns (IPolicyService) {
287
+ return IPolicyService(getRegistry().getServiceAddress(POLICY(), VersionPart.wrap(3)));
288
+ }
289
+
290
+ function getBundleService() external view returns (IBundleService) {
291
+ return IBundleService(getRegistry().getServiceAddress(BUNDLE(), VersionPart.wrap(3)));
434
292
  }
435
293
 
436
294
  function setInstanceReader(InstanceReader instanceReader) external restricted() {
437
- // TODO: reader is for correct instance
438
- require(address(_instanceReader) == address(0), "InstanceReader is set");
295
+ require(instanceReader.getInstance() == Instance(this), "InstanceReader instance mismatch");
439
296
  _instanceReader = instanceReader;
440
297
  }
441
298
 
299
+ function getMajorVersion() external pure returns (VersionPart majorVersion) {
300
+ return VersionPartLib.toVersionPart(GIF_MAJOR_VERSION);
301
+ }
302
+
442
303
  function getInstanceReader() external view returns (InstanceReader) {
443
304
  return _instanceReader;
444
305
  }
445
306
 
446
307
  function setBundleManager(BundleManager bundleManager) external restricted() {
447
- // TODO: reader is for correct instance
448
308
  require(address(_bundleManager) == address(0), "BundleManager is set");
309
+ require(bundleManager.getInstance() == Instance(this), "BundleManager instance mismatch");
310
+ require(bundleManager.authority() == authority(), "BundleManager authority mismatch");
449
311
  _bundleManager = bundleManager;
450
312
  }
451
313
 
452
314
  function getBundleManager() external view returns (BundleManager) {
453
315
  return _bundleManager;
454
316
  }
317
+
318
+ function setInstanceAccessManager(InstanceAccessManager accessManager) external restricted {
319
+ require(address(_accessManager) == address(0), "InstanceAccessManager is set");
320
+ require(accessManager.authority() == authority(), "InstanceAccessManager authority mismatch");
321
+ _accessManager = accessManager;
322
+ }
323
+
324
+ function getInstanceAccessManager() external view returns (InstanceAccessManager) {
325
+ return _accessManager;
326
+ }
455
327
  }