@etherisc/gif-next 0.0.2-e9148e0-933 → 0.0.2-e922e07-736

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