@etherisc/gif-next 0.0.2-d288ca9-933 → 0.0.2-d30275e-758

Sign up to get free protection for your applications and to get access to all the features.
Files changed (398) hide show
  1. package/README.md +75 -14
  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 +954 -219
  6. package/artifacts/contracts/components/IComponent.sol/IComponent.dbg.json +4 -0
  7. package/artifacts/contracts/{instance/base/IService.sol/IService.json → components/IComponent.sol/IComponent.json} +317 -133
  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 +864 -49
  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 +849 -247
  16. package/artifacts/contracts/components/Product.sol/Product.dbg.json +1 -1
  17. package/artifacts/contracts/components/Product.sol/Product.json +637 -224
  18. package/artifacts/contracts/instance/AccessManagerUpgradeableInitializeable.sol/AccessManagerUpgradeableInitializeable.dbg.json +4 -0
  19. package/artifacts/contracts/instance/AccessManagerUpgradeableInitializeable.sol/AccessManagerUpgradeableInitializeable.json +1206 -0
  20. package/artifacts/contracts/instance/BundleManager.sol/BundleManager.dbg.json +4 -0
  21. package/artifacts/contracts/instance/BundleManager.sol/BundleManager.json +778 -0
  22. package/artifacts/contracts/instance/Cloneable.sol/Cloneable.dbg.json +4 -0
  23. package/artifacts/contracts/instance/{AccessManagedSimple.sol/AccessManagedSimple.json → Cloneable.sol/Cloneable.json} +79 -3
  24. package/artifacts/contracts/instance/IInstance.sol/IInstance.dbg.json +1 -1
  25. package/artifacts/contracts/instance/IInstance.sol/IInstance.json +556 -246
  26. package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.dbg.json +1 -1
  27. package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.json +389 -156
  28. package/artifacts/contracts/instance/Instance.sol/Instance.dbg.json +1 -1
  29. package/artifacts/contracts/instance/Instance.sol/Instance.json +451 -3017
  30. package/artifacts/contracts/instance/InstanceAccessManager.sol/InstanceAccessManager.dbg.json +1 -1
  31. package/artifacts/contracts/instance/InstanceAccessManager.sol/InstanceAccessManager.json +597 -179
  32. package/artifacts/contracts/instance/InstanceAuthorizationsLib.sol/InstanceAuthorizationsLib.dbg.json +4 -0
  33. package/artifacts/contracts/instance/InstanceAuthorizationsLib.sol/InstanceAuthorizationsLib.json +124 -0
  34. package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.dbg.json +1 -1
  35. package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.json +342 -222
  36. package/artifacts/contracts/instance/InstanceService.sol/InstanceService.dbg.json +1 -1
  37. package/artifacts/contracts/instance/InstanceService.sol/InstanceService.json +510 -209
  38. package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.dbg.json +1 -1
  39. package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.json +316 -75
  40. package/artifacts/contracts/instance/InstanceStore.sol/InstanceStore.dbg.json +4 -0
  41. package/artifacts/contracts/instance/InstanceStore.sol/InstanceStore.json +2663 -0
  42. package/artifacts/contracts/instance/ObjectManager.sol/ObjectManager.dbg.json +4 -0
  43. package/artifacts/contracts/instance/ObjectManager.sol/ObjectManager.json +256 -0
  44. package/artifacts/contracts/instance/base/ComponentService.sol/ComponentService.dbg.json +4 -0
  45. package/artifacts/contracts/instance/base/ComponentService.sol/ComponentService.json +639 -0
  46. package/artifacts/contracts/instance/base/IKeyValueStore.sol/IKeyValueStore.dbg.json +1 -1
  47. package/artifacts/contracts/instance/base/ILifecycle.sol/ILifecycle.dbg.json +1 -1
  48. package/artifacts/contracts/instance/base/KeyValueStore.sol/KeyValueStore.dbg.json +1 -1
  49. package/artifacts/contracts/instance/base/KeyValueStore.sol/KeyValueStore.json +40 -10
  50. package/artifacts/contracts/instance/base/Lifecycle.sol/Lifecycle.dbg.json +1 -1
  51. package/artifacts/contracts/instance/base/Lifecycle.sol/Lifecycle.json +36 -11
  52. package/artifacts/contracts/instance/module/IAccess.sol/IAccess.dbg.json +1 -1
  53. package/artifacts/contracts/instance/module/IAccess.sol/IAccess.json +71 -45
  54. package/artifacts/contracts/instance/module/IBundle.sol/IBundle.dbg.json +1 -1
  55. package/artifacts/contracts/instance/module/IComponents.sol/IComponents.dbg.json +4 -0
  56. package/artifacts/contracts/instance/module/IComponents.sol/IComponents.json +10 -0
  57. package/artifacts/contracts/instance/module/IDistribution.sol/IDistribution.dbg.json +1 -1
  58. package/artifacts/contracts/instance/module/IPolicy.sol/IPolicy.dbg.json +1 -1
  59. package/artifacts/contracts/instance/module/IRisk.sol/IRisk.dbg.json +1 -1
  60. package/artifacts/contracts/instance/module/ISetup.sol/ISetup.dbg.json +1 -1
  61. package/artifacts/contracts/instance/module/ITreasury.sol/ITreasury.dbg.json +1 -1
  62. package/artifacts/contracts/instance/service/ApplicationService.sol/ApplicationService.dbg.json +4 -0
  63. package/artifacts/contracts/instance/service/ApplicationService.sol/ApplicationService.json +902 -0
  64. package/artifacts/contracts/instance/service/ApplicationServiceManager.sol/ApplicationServiceManager.dbg.json +4 -0
  65. package/artifacts/contracts/instance/service/ApplicationServiceManager.sol/ApplicationServiceManager.json +649 -0
  66. package/artifacts/contracts/instance/service/BundleService.sol/BundleService.dbg.json +4 -0
  67. package/artifacts/contracts/instance/service/BundleService.sol/BundleService.json +1326 -0
  68. package/artifacts/contracts/instance/service/BundleServiceManager.sol/BundleServiceManager.dbg.json +4 -0
  69. package/artifacts/contracts/instance/service/BundleServiceManager.sol/BundleServiceManager.json +725 -0
  70. package/artifacts/contracts/instance/service/ClaimService.sol/ClaimService.dbg.json +4 -0
  71. package/artifacts/contracts/instance/service/ClaimService.sol/ClaimService.json +1072 -0
  72. package/artifacts/contracts/instance/service/ClaimServiceManager.sol/ClaimServiceManager.dbg.json +4 -0
  73. package/artifacts/contracts/instance/service/ClaimServiceManager.sol/ClaimServiceManager.json +685 -0
  74. package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.dbg.json +4 -0
  75. package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.json +1515 -0
  76. package/artifacts/contracts/instance/service/DistributionServiceManager.sol/DistributionServiceManager.dbg.json +4 -0
  77. package/artifacts/contracts/instance/service/DistributionServiceManager.sol/DistributionServiceManager.json +757 -0
  78. package/artifacts/contracts/instance/service/IApplicationService.sol/IApplicationService.dbg.json +4 -0
  79. package/artifacts/contracts/instance/service/{IComponentOwnerService.sol/IComponentOwnerService.json → IApplicationService.sol/IApplicationService.json} +235 -200
  80. package/artifacts/contracts/instance/service/IBundleService.sol/IBundleService.dbg.json +4 -0
  81. package/artifacts/contracts/instance/service/IBundleService.sol/IBundleService.json +714 -0
  82. package/artifacts/contracts/instance/service/IClaimService.sol/IClaimService.dbg.json +4 -0
  83. package/artifacts/contracts/instance/service/IClaimService.sol/IClaimService.json +602 -0
  84. package/artifacts/contracts/instance/service/IDistributionService.sol/IDistributionService.dbg.json +1 -1
  85. package/artifacts/contracts/instance/service/IDistributionService.sol/IDistributionService.json +585 -160
  86. package/artifacts/contracts/instance/service/IPolicyService.sol/IPolicyService.dbg.json +4 -0
  87. package/artifacts/contracts/instance/service/IPolicyService.sol/IPolicyService.json +969 -0
  88. package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.dbg.json +1 -1
  89. package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.json +544 -145
  90. package/artifacts/contracts/instance/service/IPricingService.sol/IPricingService.dbg.json +4 -0
  91. package/artifacts/contracts/instance/{base/ServiceBase.sol/ServiceBase.json → service/IPricingService.sol/IPricingService.json} +248 -198
  92. package/artifacts/contracts/instance/service/IProductService.sol/IProductService.dbg.json +1 -1
  93. package/artifacts/contracts/instance/service/IProductService.sol/IProductService.json +90 -391
  94. package/artifacts/contracts/instance/service/PolicyService.sol/PolicyService.dbg.json +4 -0
  95. package/artifacts/contracts/instance/service/PolicyService.sol/PolicyService.json +1575 -0
  96. package/artifacts/contracts/instance/service/PolicyServiceManager.sol/PolicyServiceManager.dbg.json +4 -0
  97. package/artifacts/contracts/instance/service/PolicyServiceManager.sol/PolicyServiceManager.json +741 -0
  98. package/artifacts/contracts/instance/service/PoolService.sol/PoolService.dbg.json +4 -0
  99. package/artifacts/contracts/instance/service/PoolService.sol/PoolService.json +1481 -0
  100. package/artifacts/contracts/instance/service/PoolServiceManager.sol/PoolServiceManager.dbg.json +4 -0
  101. package/artifacts/contracts/instance/service/PoolServiceManager.sol/PoolServiceManager.json +709 -0
  102. package/artifacts/contracts/instance/service/PricingService.sol/PricingService.dbg.json +4 -0
  103. package/artifacts/contracts/instance/service/PricingService.sol/PricingService.json +988 -0
  104. package/artifacts/contracts/instance/service/PricingServiceManager.sol/PricingServiceManager.dbg.json +4 -0
  105. package/artifacts/contracts/instance/service/PricingServiceManager.sol/PricingServiceManager.json +689 -0
  106. package/artifacts/contracts/instance/service/ProductService.sol/ProductService.dbg.json +4 -0
  107. package/artifacts/contracts/instance/service/ProductService.sol/ProductService.json +872 -0
  108. package/artifacts/contracts/instance/service/ProductServiceManager.sol/ProductServiceManager.dbg.json +4 -0
  109. package/artifacts/contracts/instance/service/ProductServiceManager.sol/ProductServiceManager.json +653 -0
  110. package/artifacts/contracts/registry/ChainNft.sol/ChainNft.dbg.json +1 -1
  111. package/artifacts/contracts/registry/ChainNft.sol/ChainNft.json +15 -2
  112. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.dbg.json +1 -1
  113. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.json +373 -61
  114. package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.dbg.json +1 -1
  115. package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.json +223 -229
  116. package/artifacts/contracts/registry/ITransferInterceptor.sol/ITransferInterceptor.dbg.json +1 -1
  117. package/artifacts/contracts/registry/ITransferInterceptor.sol/ITransferInterceptor.json +18 -0
  118. package/artifacts/contracts/registry/Registry.sol/Registry.dbg.json +1 -1
  119. package/artifacts/contracts/registry/Registry.sol/Registry.json +333 -188
  120. package/artifacts/contracts/registry/RegistryAccessManager.sol/RegistryAccessManager.dbg.json +4 -0
  121. package/artifacts/contracts/registry/RegistryAccessManager.sol/RegistryAccessManager.json +285 -0
  122. package/artifacts/contracts/registry/RegistryService.sol/RegistryService.dbg.json +1 -1
  123. package/artifacts/contracts/registry/RegistryService.sol/RegistryService.json +227 -330
  124. package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.dbg.json +1 -1
  125. package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.json +304 -138
  126. package/artifacts/contracts/registry/ReleaseManager.sol/ReleaseManager.dbg.json +4 -0
  127. package/artifacts/contracts/registry/ReleaseManager.sol/ReleaseManager.json +559 -0
  128. package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.dbg.json +4 -0
  129. package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.json +498 -0
  130. package/artifacts/contracts/shared/ContractDeployerLib.sol/ContractDeployerLib.dbg.json +1 -1
  131. package/artifacts/contracts/shared/ERC165.sol/ERC165.dbg.json +1 -1
  132. package/artifacts/contracts/shared/ERC165.sol/ERC165.json +41 -3
  133. package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.dbg.json +1 -1
  134. package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.json +40 -29
  135. package/artifacts/contracts/shared/IPolicyHolder.sol/IPolicyHolder.dbg.json +4 -0
  136. package/artifacts/contracts/shared/IPolicyHolder.sol/IPolicyHolder.json +129 -0
  137. package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.dbg.json +1 -1
  138. package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.json +21 -34
  139. package/artifacts/contracts/shared/IRegistryLinked.sol/IRegistryLinked.dbg.json +4 -0
  140. package/artifacts/contracts/{experiment/inheritance/IB.sol/IB.json → shared/IRegistryLinked.sol/IRegistryLinked.json} +18 -20
  141. package/artifacts/contracts/shared/IService.sol/IService.dbg.json +4 -0
  142. package/artifacts/contracts/{components/BaseComponent.sol/BaseComponent.json → shared/IService.sol/IService.json} +98 -77
  143. package/artifacts/contracts/shared/IVersionable.sol/IVersionable.dbg.json +1 -1
  144. package/artifacts/contracts/shared/IVersionable.sol/IVersionable.json +2 -152
  145. package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.dbg.json +1 -1
  146. package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.json +120 -27
  147. package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.dbg.json +4 -0
  148. package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.json +248 -0
  149. package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.dbg.json +1 -1
  150. package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.json +294 -61
  151. package/artifacts/contracts/shared/Registerable.sol/Registerable.dbg.json +1 -1
  152. package/artifacts/contracts/shared/Registerable.sol/Registerable.json +129 -51
  153. package/artifacts/contracts/shared/RegistryLinked.sol/RegistryLinked.dbg.json +4 -0
  154. package/artifacts/contracts/shared/RegistryLinked.sol/RegistryLinked.json +84 -0
  155. package/artifacts/contracts/shared/Service.sol/Service.dbg.json +4 -0
  156. package/artifacts/contracts/{instance/base/ComponentServiceBase.sol/ComponentServiceBase.json → shared/Service.sol/Service.json} +185 -170
  157. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.dbg.json +1 -1
  158. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.json +2 -2
  159. package/artifacts/contracts/shared/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.dbg.json +1 -1
  160. package/artifacts/contracts/shared/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.json +2 -2
  161. package/artifacts/contracts/shared/Versionable.sol/Versionable.dbg.json +1 -1
  162. package/artifacts/contracts/shared/Versionable.sol/Versionable.json +2 -152
  163. package/artifacts/contracts/test/TestFee.sol/TestFee.dbg.json +1 -1
  164. package/artifacts/contracts/test/TestFee.sol/TestFee.json +2 -2
  165. package/artifacts/contracts/test/TestRegisterable.sol/TestRegisterable.dbg.json +1 -1
  166. package/artifacts/contracts/test/TestRegisterable.sol/TestRegisterable.json +129 -51
  167. package/artifacts/contracts/test/TestRoleId.sol/TestRoleId.dbg.json +1 -1
  168. package/artifacts/contracts/test/TestRoleId.sol/TestRoleId.json +6 -6
  169. package/artifacts/contracts/test/TestService.sol/TestService.dbg.json +1 -1
  170. package/artifacts/contracts/test/TestService.sol/TestService.json +210 -214
  171. package/artifacts/contracts/test/TestToken.sol/TestUsdc.dbg.json +1 -1
  172. package/artifacts/contracts/test/TestVersion.sol/TestVersion.dbg.json +1 -1
  173. package/artifacts/contracts/test/TestVersion.sol/TestVersion.json +2 -2
  174. package/artifacts/contracts/test/TestVersionable.sol/TestVersionable.dbg.json +1 -1
  175. package/artifacts/contracts/test/TestVersionable.sol/TestVersionable.json +8 -190
  176. package/artifacts/contracts/test/Usdc.sol/USDC.dbg.json +1 -1
  177. package/artifacts/contracts/types/AddressSet.sol/LibAddressSet.dbg.json +1 -1
  178. package/artifacts/contracts/types/Amount.sol/AmountLib.dbg.json +4 -0
  179. package/artifacts/contracts/types/Amount.sol/AmountLib.json +209 -0
  180. package/artifacts/contracts/types/Blocknumber.sol/BlocknumberLib.dbg.json +1 -1
  181. package/artifacts/contracts/types/Blocknumber.sol/BlocknumberLib.json +2 -2
  182. package/artifacts/contracts/types/ChainId.sol/ChainIdLib.dbg.json +1 -1
  183. package/artifacts/contracts/types/ClaimId.sol/ClaimIdLib.dbg.json +4 -0
  184. package/artifacts/contracts/types/ClaimId.sol/ClaimIdLib.json +179 -0
  185. package/artifacts/contracts/types/DistributorType.sol/DistributorTypeLib.dbg.json +1 -1
  186. package/artifacts/contracts/types/DistributorType.sol/DistributorTypeLib.json +2 -2
  187. package/artifacts/contracts/types/Fee.sol/FeeLib.dbg.json +1 -1
  188. package/artifacts/contracts/types/Fee.sol/FeeLib.json +40 -9
  189. package/artifacts/contracts/types/Key32.sol/Key32Lib.dbg.json +1 -1
  190. package/artifacts/contracts/types/Key32.sol/Key32Lib.json +2 -2
  191. package/artifacts/contracts/types/NftId.sol/NftIdLib.dbg.json +1 -1
  192. package/artifacts/contracts/types/NftId.sol/NftIdLib.json +17 -4
  193. package/artifacts/contracts/types/NftIdSet.sol/LibNftIdSet.dbg.json +1 -1
  194. package/artifacts/contracts/types/NftIdSet.sol/LibNftIdSet.json +26 -3
  195. package/artifacts/contracts/types/NumberId.sol/NumberIdLib.dbg.json +1 -1
  196. package/artifacts/contracts/types/ObjectType.sol/ObjectTypeLib.dbg.json +1 -1
  197. package/artifacts/contracts/types/ObjectType.sol/ObjectTypeLib.json +2 -2
  198. package/artifacts/contracts/types/PayoutId.sol/PayoutIdLib.dbg.json +4 -0
  199. package/artifacts/contracts/types/PayoutId.sol/PayoutIdLib.json +209 -0
  200. package/artifacts/contracts/types/Referral.sol/ReferralLib.dbg.json +1 -1
  201. package/artifacts/contracts/types/Referral.sol/ReferralLib.json +23 -4
  202. package/artifacts/contracts/types/RiskId.sol/RiskIdLib.dbg.json +1 -1
  203. package/artifacts/contracts/types/RiskId.sol/RiskIdLib.json +2 -2
  204. package/artifacts/contracts/types/RoleId.sol/RoleIdLib.dbg.json +1 -1
  205. package/artifacts/contracts/types/RoleId.sol/RoleIdLib.json +2 -2
  206. package/artifacts/contracts/types/Seconds.sol/SecondsLib.dbg.json +4 -0
  207. package/artifacts/contracts/types/Seconds.sol/SecondsLib.json +124 -0
  208. package/artifacts/contracts/types/StateId.sol/StateIdLib.dbg.json +1 -1
  209. package/artifacts/contracts/types/StateId.sol/StateIdLib.json +2 -2
  210. package/artifacts/contracts/types/Timestamp.sol/TimestampLib.dbg.json +1 -1
  211. package/artifacts/contracts/types/Timestamp.sol/TimestampLib.json +38 -7
  212. package/artifacts/contracts/types/UFixed.sol/MathLib.dbg.json +1 -1
  213. package/artifacts/contracts/types/UFixed.sol/MathLib.json +2 -2
  214. package/artifacts/contracts/types/UFixed.sol/UFixedLib.dbg.json +1 -1
  215. package/artifacts/contracts/types/UFixed.sol/UFixedLib.json +2 -2
  216. package/artifacts/contracts/types/Version.sol/VersionLib.dbg.json +1 -1
  217. package/artifacts/contracts/types/Version.sol/VersionLib.json +2 -2
  218. package/artifacts/contracts/types/Version.sol/VersionPartLib.dbg.json +1 -1
  219. package/artifacts/contracts/types/Version.sol/VersionPartLib.json +22 -3
  220. package/contracts/components/Component.sol +253 -0
  221. package/contracts/components/Distribution.sol +204 -86
  222. package/contracts/components/IComponent.sol +76 -0
  223. package/contracts/components/IDistributionComponent.sol +44 -16
  224. package/contracts/components/IPoolComponent.sol +88 -37
  225. package/contracts/components/IProductComponent.sol +10 -5
  226. package/contracts/components/Pool.sol +224 -181
  227. package/contracts/components/Product.sol +253 -176
  228. package/contracts/instance/AccessManagerUpgradeableInitializeable.sol +13 -0
  229. package/contracts/instance/BundleManager.sol +126 -0
  230. package/contracts/instance/Cloneable.sol +51 -0
  231. package/contracts/instance/IInstance.sol +65 -13
  232. package/contracts/instance/IInstanceService.sol +70 -8
  233. package/contracts/instance/Instance.sol +158 -363
  234. package/contracts/instance/InstanceAccessManager.sol +430 -177
  235. package/contracts/instance/InstanceAuthorizationsLib.sol +300 -0
  236. package/contracts/instance/InstanceReader.sol +69 -39
  237. package/contracts/instance/InstanceService.sol +257 -84
  238. package/contracts/instance/InstanceServiceManager.sol +11 -13
  239. package/contracts/instance/InstanceStore.sol +208 -0
  240. package/contracts/instance/ObjectManager.sol +82 -0
  241. package/contracts/instance/base/ComponentService.sol +148 -0
  242. package/contracts/instance/base/KeyValueStore.sol +13 -5
  243. package/contracts/instance/base/Lifecycle.sol +23 -6
  244. package/contracts/instance/module/IAccess.sol +36 -20
  245. package/contracts/instance/module/IBundle.sol +8 -4
  246. package/contracts/instance/module/IComponents.sol +41 -0
  247. package/contracts/instance/module/IDistribution.sol +2 -0
  248. package/contracts/instance/module/IPolicy.sol +41 -9
  249. package/contracts/instance/module/ISetup.sol +9 -19
  250. package/contracts/instance/service/ApplicationService.sol +185 -0
  251. package/contracts/instance/service/ApplicationServiceManager.sol +35 -0
  252. package/contracts/instance/service/BundleService.sol +440 -0
  253. package/contracts/instance/service/BundleServiceManager.sol +51 -0
  254. package/contracts/instance/service/ClaimService.sol +239 -0
  255. package/contracts/instance/service/ClaimServiceManager.sol +35 -0
  256. package/contracts/instance/service/DistributionService.sol +342 -0
  257. package/contracts/instance/service/DistributionServiceManager.sol +51 -0
  258. package/contracts/instance/service/IApplicationService.sol +61 -0
  259. package/contracts/instance/service/IBundleService.sol +102 -0
  260. package/contracts/instance/service/IClaimService.sol +92 -0
  261. package/contracts/instance/service/IDistributionService.sol +75 -2
  262. package/contracts/instance/service/IPolicyService.sol +139 -0
  263. package/contracts/instance/service/IPoolService.sol +83 -18
  264. package/contracts/instance/service/IPricingService.sol +36 -0
  265. package/contracts/instance/service/IProductService.sol +7 -74
  266. package/contracts/instance/service/PolicyService.sol +577 -0
  267. package/contracts/instance/service/PolicyServiceManager.sol +54 -0
  268. package/contracts/instance/service/PoolService.sol +336 -0
  269. package/contracts/instance/service/PoolServiceManager.sol +51 -0
  270. package/contracts/instance/service/PricingService.sol +275 -0
  271. package/contracts/instance/service/PricingServiceManager.sol +51 -0
  272. package/contracts/instance/service/ProductService.sol +210 -0
  273. package/contracts/instance/service/ProductServiceManager.sol +54 -0
  274. package/contracts/registry/ChainNft.sol +9 -1
  275. package/contracts/registry/IRegistry.sol +52 -8
  276. package/contracts/registry/IRegistryService.sol +53 -20
  277. package/contracts/registry/ITransferInterceptor.sol +1 -0
  278. package/contracts/registry/Registry.sol +270 -226
  279. package/contracts/registry/RegistryAccessManager.sol +216 -0
  280. package/contracts/registry/RegistryService.sol +118 -271
  281. package/contracts/registry/RegistryServiceManager.sol +24 -26
  282. package/contracts/registry/ReleaseManager.sol +324 -0
  283. package/contracts/registry/TokenRegistry.sol +116 -0
  284. package/contracts/shared/ERC165.sol +14 -8
  285. package/contracts/shared/INftOwnable.sol +11 -10
  286. package/contracts/shared/IPolicyHolder.sol +26 -0
  287. package/contracts/shared/IRegisterable.sol +4 -6
  288. package/contracts/shared/IRegistryLinked.sol +12 -0
  289. package/contracts/shared/IService.sol +16 -0
  290. package/contracts/shared/IVersionable.sol +4 -47
  291. package/contracts/shared/NftOwnable.sol +67 -83
  292. package/contracts/shared/PolicyHolder.sol +81 -0
  293. package/contracts/shared/ProxyManager.sol +100 -25
  294. package/contracts/shared/Registerable.sol +16 -31
  295. package/contracts/shared/RegistryLinked.sol +48 -0
  296. package/contracts/shared/Service.sol +72 -0
  297. package/contracts/shared/TokenHandler.sol +11 -5
  298. package/contracts/shared/Versionable.sol +4 -92
  299. package/contracts/test/TestRegisterable.sol +1 -1
  300. package/contracts/test/TestService.sol +6 -7
  301. package/contracts/types/Amount.sol +70 -0
  302. package/contracts/types/Blocknumber.sol +1 -0
  303. package/contracts/types/ClaimId.sol +75 -0
  304. package/contracts/types/DistributorType.sol +2 -2
  305. package/contracts/types/Fee.sol +13 -5
  306. package/contracts/types/NftId.sol +8 -0
  307. package/contracts/types/NftIdSet.sol +26 -24
  308. package/contracts/types/ObjectType.sol +16 -7
  309. package/contracts/types/PayoutId.sol +82 -0
  310. package/contracts/types/Referral.sol +4 -0
  311. package/contracts/types/RoleId.sol +26 -11
  312. package/contracts/types/Seconds.sol +54 -0
  313. package/contracts/types/StateId.sol +11 -2
  314. package/contracts/types/Timestamp.sol +18 -13
  315. package/contracts/types/UFixed.sol +1 -0
  316. package/contracts/types/Version.sol +5 -1
  317. package/package.json +3 -3
  318. package/artifacts/contracts/components/BaseComponent.sol/BaseComponent.dbg.json +0 -4
  319. package/artifacts/contracts/components/IBaseComponent.sol/IBaseComponent.dbg.json +0 -4
  320. package/artifacts/contracts/components/IBaseComponent.sol/IBaseComponent.json +0 -267
  321. package/artifacts/contracts/experiment/cloning/Cloner.sol/Cloner.dbg.json +0 -4
  322. package/artifacts/contracts/experiment/cloning/Cloner.sol/Cloner.json +0 -66
  323. package/artifacts/contracts/experiment/cloning/Cloner.sol/Mock1.dbg.json +0 -4
  324. package/artifacts/contracts/experiment/cloning/Cloner.sol/Mock1.json +0 -24
  325. package/artifacts/contracts/experiment/cloning/Cloner.sol/Mock2.dbg.json +0 -4
  326. package/artifacts/contracts/experiment/cloning/Cloner.sol/Mock2.json +0 -42
  327. package/artifacts/contracts/experiment/errors/Require.sol/Require.dbg.json +0 -4
  328. package/artifacts/contracts/experiment/errors/Require.sol/Require.json +0 -105
  329. package/artifacts/contracts/experiment/errors/Revert.sol/Revert.dbg.json +0 -4
  330. package/artifacts/contracts/experiment/errors/Revert.sol/Revert.json +0 -105
  331. package/artifacts/contracts/experiment/inheritance/A.sol/A.dbg.json +0 -4
  332. package/artifacts/contracts/experiment/inheritance/A.sol/A.json +0 -128
  333. package/artifacts/contracts/experiment/inheritance/A.sol/AShared.dbg.json +0 -4
  334. package/artifacts/contracts/experiment/inheritance/A.sol/AShared.json +0 -42
  335. package/artifacts/contracts/experiment/inheritance/B.sol/B.dbg.json +0 -4
  336. package/artifacts/contracts/experiment/inheritance/B.sol/B.json +0 -76
  337. package/artifacts/contracts/experiment/inheritance/C.sol/C.dbg.json +0 -4
  338. package/artifacts/contracts/experiment/inheritance/C.sol/C.json +0 -89
  339. package/artifacts/contracts/experiment/inheritance/IA.sol/IA.dbg.json +0 -4
  340. package/artifacts/contracts/experiment/inheritance/IA.sol/IA.json +0 -128
  341. package/artifacts/contracts/experiment/inheritance/IA.sol/ISharedA.dbg.json +0 -4
  342. package/artifacts/contracts/experiment/inheritance/IA.sol/ISharedA.json +0 -37
  343. package/artifacts/contracts/experiment/inheritance/IB.sol/IB.dbg.json +0 -4
  344. package/artifacts/contracts/experiment/inheritance/IC.sol/IC.dbg.json +0 -4
  345. package/artifacts/contracts/experiment/inheritance/IC.sol/IC.json +0 -63
  346. package/artifacts/contracts/experiment/statemachine/Dummy.sol/LifeCycleModule.dbg.json +0 -4
  347. package/artifacts/contracts/experiment/statemachine/Dummy.sol/LifeCycleModule.json +0 -59
  348. package/artifacts/contracts/experiment/statemachine/ISM.sol/ISM.dbg.json +0 -4
  349. package/artifacts/contracts/experiment/statemachine/ISM.sol/ISM.json +0 -124
  350. package/artifacts/contracts/experiment/statemachine/ISM.sol/ISMEE.dbg.json +0 -4
  351. package/artifacts/contracts/experiment/statemachine/ISM.sol/ISMEE.json +0 -74
  352. package/artifacts/contracts/experiment/statemachine/SM.sol/SM.dbg.json +0 -4
  353. package/artifacts/contracts/experiment/statemachine/SM.sol/SM.json +0 -124
  354. package/artifacts/contracts/experiment/statemachine/SimpleStateMachine.sol/SimpleStateMachine.dbg.json +0 -4
  355. package/artifacts/contracts/experiment/statemachine/SimpleStateMachine.sol/SimpleStateMachine.json +0 -207
  356. package/artifacts/contracts/experiment/types/TypeA.sol/TypeALib.dbg.json +0 -4
  357. package/artifacts/contracts/experiment/types/TypeA.sol/TypeALib.json +0 -10
  358. package/artifacts/contracts/experiment/types/TypeB.sol/TypeBLib.dbg.json +0 -4
  359. package/artifacts/contracts/experiment/types/TypeB.sol/TypeBLib.json +0 -10
  360. package/artifacts/contracts/instance/AccessManagedSimple.sol/AccessManagedSimple.dbg.json +0 -4
  361. package/artifacts/contracts/instance/AccessManagerSimple.sol/AccessManagerSimple.dbg.json +0 -4
  362. package/artifacts/contracts/instance/AccessManagerSimple.sol/AccessManagerSimple.json +0 -1132
  363. package/artifacts/contracts/instance/IAccessManagerSimple.sol/IAccessManagerSimple.dbg.json +0 -4
  364. package/artifacts/contracts/instance/IAccessManagerSimple.sol/IAccessManagerSimple.json +0 -1082
  365. package/artifacts/contracts/instance/base/ComponentServiceBase.sol/ComponentServiceBase.dbg.json +0 -4
  366. package/artifacts/contracts/instance/base/IInstanceBase.sol/IInstanceBase.dbg.json +0 -4
  367. package/artifacts/contracts/instance/base/IInstanceBase.sol/IInstanceBase.json +0 -113
  368. package/artifacts/contracts/instance/base/IService.sol/IService.dbg.json +0 -4
  369. package/artifacts/contracts/instance/base/ServiceBase.sol/ServiceBase.dbg.json +0 -4
  370. package/artifacts/contracts/instance/service/ComponentOwnerService.sol/ComponentOwnerService.dbg.json +0 -4
  371. package/artifacts/contracts/instance/service/ComponentOwnerService.sol/ComponentOwnerService.json +0 -827
  372. package/artifacts/contracts/instance/service/IComponentOwnerService.sol/IComponentOwnerService.dbg.json +0 -4
  373. package/contracts/components/BaseComponent.sol +0 -86
  374. package/contracts/components/IBaseComponent.sol +0 -24
  375. package/contracts/experiment/cloning/Cloner.sol +0 -47
  376. package/contracts/experiment/errors/Require.sol +0 -38
  377. package/contracts/experiment/errors/Revert.sol +0 -44
  378. package/contracts/experiment/inheritance/A.sol +0 -53
  379. package/contracts/experiment/inheritance/B.sol +0 -28
  380. package/contracts/experiment/inheritance/C.sol +0 -34
  381. package/contracts/experiment/inheritance/IA.sol +0 -13
  382. package/contracts/experiment/inheritance/IB.sol +0 -10
  383. package/contracts/experiment/inheritance/IC.sol +0 -12
  384. package/contracts/experiment/statemachine/Dummy.sol +0 -27
  385. package/contracts/experiment/statemachine/ISM.sol +0 -25
  386. package/contracts/experiment/statemachine/SM.sol +0 -57
  387. package/contracts/experiment/statemachine/SimpleStateMachine.sol +0 -31
  388. package/contracts/experiment/types/TypeA.sol +0 -47
  389. package/contracts/experiment/types/TypeB.sol +0 -29
  390. package/contracts/instance/AccessManagedSimple.sol +0 -122
  391. package/contracts/instance/AccessManagerSimple.sol +0 -692
  392. package/contracts/instance/IAccessManagerSimple.sol +0 -391
  393. package/contracts/instance/base/ComponentServiceBase.sol +0 -49
  394. package/contracts/instance/base/IInstanceBase.sol +0 -23
  395. package/contracts/instance/base/IService.sol +0 -15
  396. package/contracts/instance/base/ServiceBase.sol +0 -44
  397. package/contracts/instance/service/ComponentOwnerService.sol +0 -317
  398. package/contracts/instance/service/IComponentOwnerService.sol +0 -20
@@ -2,101 +2,230 @@
2
2
  pragma solidity ^0.8.20;
3
3
 
4
4
  import {Clones} from "@openzeppelin/contracts/proxy/Clones.sol";
5
+ import {ShortString, ShortStrings} from "@openzeppelin/contracts/utils/ShortStrings.sol";
6
+
7
+ import {NftId} from "../../contracts/types/NftId.sol";
8
+ import {RoleId} from "../types/RoleId.sol";
9
+ import {ADMIN_ROLE, INSTANCE_OWNER_ROLE, DISTRIBUTION_OWNER_ROLE, POOL_OWNER_ROLE, PRODUCT_OWNER_ROLE, INSTANCE_SERVICE_ROLE, DISTRIBUTION_SERVICE_ROLE, POOL_SERVICE_ROLE, PRODUCT_SERVICE_ROLE, APPLICATION_SERVICE_ROLE, POLICY_SERVICE_ROLE, CLAIM_SERVICE_ROLE, BUNDLE_SERVICE_ROLE, INSTANCE_ROLE} from "../types/RoleId.sol";
10
+ import {ObjectType, INSTANCE, BUNDLE, APPLICATION, POLICY, CLAIM, PRODUCT, DISTRIBUTION, REGISTRY, POOL} from "../types/ObjectType.sol";
11
+
12
+ import {Service} from "../shared/Service.sol";
13
+ import {IService} from "../shared/IService.sol";
14
+
15
+ import {IDistributionComponent} from "../components/IDistributionComponent.sol";
16
+ import {IPoolComponent} from "../components/IPoolComponent.sol";
17
+ import {IProductComponent} from "../components/IProductComponent.sol";
18
+
19
+ import {IRegistry} from "../registry/IRegistry.sol";
20
+ import {IRegistryService} from "../registry/IRegistryService.sol";
21
+ import {ChainNft} from "../registry/ChainNft.sol";
5
22
 
6
- import {AccessManagerSimple} from "./AccessManagerSimple.sol";
7
- import {InstanceAccessManager} from "./InstanceAccessManager.sol";
8
23
  import {Instance} from "./Instance.sol";
24
+ import {IInstance} from "./IInstance.sol";
25
+ import {InstanceAccessManager} from "./InstanceAccessManager.sol";
9
26
  import {IInstanceService} from "./IInstanceService.sol";
10
27
  import {InstanceReader} from "./InstanceReader.sol";
11
- import {ServiceBase} from "../../contracts/instance/base/ServiceBase.sol";
12
- import {IRegistry} from "../registry/IRegistry.sol";
13
- import {Registry} from "../registry/Registry.sol";
14
- import {RegistryService} from "../registry/RegistryService.sol";
15
- import {IService} from "../../contracts/instance/base/IService.sol";
16
- import {ContractDeployerLib} from "../shared/ContractDeployerLib.sol";
17
- import {NftId, NftIdLib, zeroNftId} from "../../contracts/types/NftId.sol";
18
- import {VersionLib} from "../types/Version.sol";
19
-
20
- contract InstanceService is ServiceBase, IInstanceService {
28
+ import {BundleManager} from "./BundleManager.sol";
29
+ import {AccessManagerUpgradeableInitializeable} from "./AccessManagerUpgradeableInitializeable.sol";
30
+ import {InstanceStore} from "./InstanceStore.sol";
31
+ import {InstanceAuthorizationsLib} from "./InstanceAuthorizationsLib.sol";
21
32
 
22
- address internal _registryAddress;
23
- address internal _accessManagerMaster;
24
- address internal _instanceMaster;
25
- address internal _instanceReaderMaster;
33
+ contract InstanceService is
34
+ Service,
35
+ IInstanceService
36
+ {
37
+ address internal _masterOzAccessManager;
38
+ address internal _masterInstanceAccessManager;
39
+ address internal _masterInstance;
40
+ address internal _masterInstanceReader;
41
+ address internal _masterInstanceBundleManager;
42
+ address internal _masterInstanceStore;
26
43
 
27
44
  // TODO update to real hash when instance is stable
28
45
  bytes32 public constant INSTANCE_CREATION_CODE_HASH = bytes32(0);
29
- string public constant NAME = "InstanceService";
46
+
47
+ modifier onlyInstanceOwner(NftId instanceNftId) {
48
+ if(msg.sender != getRegistry().ownerOf(instanceNftId)) {
49
+ revert ErrorInstanceServiceRequestUnauhorized(msg.sender);
50
+ }
51
+ _;
52
+ }
53
+ // TODO check service domain?
54
+ // TODO check release version?
55
+ modifier onlyRegisteredService() {
56
+ if (! getRegistry().isRegisteredService(msg.sender)) {
57
+ revert ErrorInstanceServiceRequestUnauhorized(msg.sender);
58
+ }
59
+ _;
60
+ }
61
+ // TODO check release version?
62
+ modifier onlyComponent() {
63
+ if (! getRegistry().isRegisteredComponent(msg.sender)) {
64
+ revert ErrorInstanceServiceRequestUnauhorized(msg.sender);
65
+ }
66
+ _;
67
+ }
30
68
 
31
69
  function createInstanceClone()
32
70
  external
33
71
  returns (
34
- AccessManagerSimple clonedAccessManager,
72
+ AccessManagerUpgradeableInitializeable clonedOzAccessManager,
73
+ InstanceAccessManager clonedInstanceAccessManager,
35
74
  Instance clonedInstance,
36
- NftId instanceNftId,
37
- InstanceReader clonedInstanceReader
75
+ NftId clonedInstanceNftId,
76
+ InstanceReader clonedInstanceReader,
77
+ BundleManager clonedBundleManager,
78
+ InstanceStore clonedInstanceStore
38
79
  )
39
80
  {
40
- Registry registry = Registry(_registryAddress);
41
- NftId registryNftId = registry.getNftId(_registryAddress);
42
- address registryServiceAddress = registry.getServiceAddress("RegistryService", VersionLib.toVersion(3, 0, 0).toMajorPart());
43
- RegistryService registryService = RegistryService(registryServiceAddress);
44
-
45
- clonedAccessManager = AccessManagerSimple(Clones.clone(_accessManagerMaster));
46
- clonedAccessManager.initialize(msg.sender);
47
-
48
- clonedInstance = Instance(Clones.clone(_instanceMaster));
49
- clonedInstance.initialize(address(clonedAccessManager), _registryAddress, registryNftId);
50
- ( IRegistry.ObjectInfo memory info, ) = registryService.registerInstance(clonedInstance);
51
- instanceNftId = info.nftId;
81
+ address instanceOwner = msg.sender;
82
+ IRegistry registry = getRegistry();
83
+ NftId registryNftId = registry.getNftId(address(registry));
84
+ IRegistryService registryService = IRegistryService(
85
+ registry.getServiceAddress(REGISTRY(), getVersion().toMajorPart())
86
+ );
87
+
88
+ clonedOzAccessManager = AccessManagerUpgradeableInitializeable(Clones.clone(_masterOzAccessManager));
89
+
90
+ // initially grants ADMIN_ROLE to this (being the instance service).
91
+ // This will allow the instance service to bootstrap the authorizations of the instance.
92
+ // Instance service will not use oz access manager directlly but through instance access manager instead
93
+ // Instance service will renounce ADMIN_ROLE when bootstraping is finished
94
+ clonedOzAccessManager.initialize(address(this));
95
+
96
+ clonedInstance = Instance(Clones.clone(_masterInstance));
97
+ clonedInstance.initialize(
98
+ address(clonedOzAccessManager),
99
+ address(registry),
100
+ instanceOwner);
101
+ // initialize and set before instance reader
102
+ clonedInstanceStore = InstanceStore(Clones.clone(address(_masterInstanceStore)));
103
+ clonedInstanceStore.initialize(address(clonedInstance));
104
+ clonedInstance.setInstanceStore(clonedInstanceStore);
52
105
 
53
- clonedInstanceReader = InstanceReader(Clones.clone(address(_instanceReaderMaster)));
54
- clonedInstanceReader.initialize(_registryAddress, instanceNftId);
55
- }
106
+ clonedInstanceReader = InstanceReader(Clones.clone(address(_masterInstanceReader)));
107
+ clonedInstanceReader.initialize(address(clonedInstance));
108
+ clonedInstance.setInstanceReader(clonedInstanceReader);
56
109
 
57
- function setAccessManagerMaster(address accessManagerMaster) external {
58
- require(
59
- _accessManagerMaster == address(0),
60
- "ERROR:CRD-001:ACCESS_MANAGER_MASTER_ALREADY_SET");
61
- _accessManagerMaster = accessManagerMaster;
62
- }
110
+ clonedBundleManager = BundleManager(Clones.clone(_masterInstanceBundleManager));
111
+ clonedBundleManager.initialize(address(clonedInstance));
112
+ clonedInstance.setBundleManager(clonedBundleManager);
113
+
114
+ clonedInstanceAccessManager = InstanceAccessManager(Clones.clone(_masterInstanceAccessManager));
115
+ clonedOzAccessManager.grantRole(ADMIN_ROLE().toInt(), address(clonedInstanceAccessManager), 0);
116
+ clonedInstanceAccessManager.initialize(address(clonedInstance));
117
+ clonedInstance.setInstanceAccessManager(clonedInstanceAccessManager);
118
+
119
+ // TODO amend setters with instance specific , policy manager ...
120
+
121
+ // TODO library does external calls -> but it is registry and access manager -> find out is it best practice
122
+ InstanceAuthorizationsLib.grantInitialAuthorizations(
123
+ clonedInstanceAccessManager,
124
+ clonedInstance,
125
+ clonedBundleManager,
126
+ clonedInstanceStore,
127
+ instanceOwner,
128
+ getRegistry(),
129
+ getVersion().toMajorPart());
130
+
131
+ clonedOzAccessManager.renounceRole(ADMIN_ROLE().toInt(), address(this));
132
+
133
+ IRegistry.ObjectInfo memory info = registryService.registerInstance(clonedInstance, instanceOwner);
134
+ clonedInstanceNftId = info.nftId;
63
135
 
64
- function setInstanceMaster(address instanceMaster) external {
65
- require(
66
- _instanceMaster == address(0),
67
- "ERROR:CRD-002:INSTANCE_MASTER_ALREADY_SET");
68
- _instanceMaster = instanceMaster;
136
+ emit LogInstanceCloned(
137
+ address(clonedOzAccessManager),
138
+ address(clonedInstanceAccessManager),
139
+ address(clonedInstance),
140
+ address(clonedInstanceStore),
141
+ address(clonedBundleManager),
142
+ address(clonedInstanceReader),
143
+ clonedInstanceNftId);
69
144
  }
70
145
 
71
- function setInstanceReaderMaster(address instanceReaderMaster) external {
72
- require(
73
- _instanceReaderMaster == address(0),
74
- "ERROR:CRD-003:INSTANCE_READER_MASTER_ALREADY_SET");
75
- _instanceReaderMaster = instanceReaderMaster;
146
+ function setAndRegisterMasterInstance(address instanceAddress)
147
+ external
148
+ onlyOwner
149
+ returns(NftId masterInstanceNftId)
150
+ {
151
+ if(_masterInstance != address(0)) { revert ErrorInstanceServiceMasterInstanceAlreadySet(); }
152
+ if(_masterOzAccessManager != address(0)) { revert ErrorInstanceServiceMasterOzAccessManagerAlreadySet(); }
153
+ if(_masterInstanceAccessManager != address(0)) { revert ErrorInstanceServiceMasterInstanceAccessManagerAlreadySet(); }
154
+ if(_masterInstanceBundleManager != address(0)) { revert ErrorInstanceServiceMasterBundleManagerAlreadySet(); }
155
+
156
+ if(instanceAddress == address(0)) { revert ErrorInstanceServiceInstanceAddressZero(); }
157
+
158
+ IInstance instance = IInstance(instanceAddress);
159
+ AccessManagerUpgradeableInitializeable ozAccessManager = AccessManagerUpgradeableInitializeable(instance.authority());
160
+ address ozAccessManagerAddress = address(ozAccessManager);
161
+ InstanceAccessManager instanceAccessManager = instance.getInstanceAccessManager();
162
+ address instanceAccessManagerAddress = address(instanceAccessManager);
163
+ InstanceReader instanceReader = instance.getInstanceReader();
164
+ address instanceReaderAddress = address(instanceReader);
165
+ BundleManager bundleManager = instance.getBundleManager();
166
+ address bundleManagerAddress = address(bundleManager);
167
+ InstanceStore instanceStore = instance.getInstanceStore();
168
+ address instanceStoreAddress = address(instanceStore);
169
+
170
+ if(ozAccessManagerAddress == address(0)) { revert ErrorInstanceServiceOzAccessManagerZero();}
171
+ if(instanceAccessManagerAddress == address(0)) { revert ErrorInstanceServiceInstanceAccessManagerZero(); }
172
+ if(instanceReaderAddress == address(0)) { revert ErrorInstanceServiceInstanceReaderZero(); }
173
+ if(bundleManagerAddress == address(0)) { revert ErrorInstanceServiceBundleManagerZero(); }
174
+ if(instanceStoreAddress == address(0)) { revert ErrorInstanceServiceInstanceStoreZero(); }
175
+
176
+ if(instance.authority() != instanceAccessManager.authority()) { revert ErrorInstanceServiceInstanceAuthorityMismatch(); }
177
+ if(bundleManager.authority() != instanceAccessManager.authority()) { revert ErrorInstanceServiceBundleManagerAuthorityMismatch(); }
178
+ if(instanceStore.authority() != instanceAccessManager.authority()) { revert ErrorInstanceServiceInstanceStoreAuthorityMismatch(); }
179
+ if(instanceReader.getInstance() != instance) { revert ErrorInstanceServiceInstanceReaderInstanceMismatch2(); }
180
+ if(bundleManager.getInstance() != instance) { revert ErrorInstanceServiceBundleMangerInstanceMismatch(); }
181
+
182
+ _masterOzAccessManager = ozAccessManagerAddress;
183
+ _masterInstanceAccessManager = instanceAccessManagerAddress;
184
+ _masterInstance = instanceAddress;
185
+ _masterInstanceReader = instanceReaderAddress;
186
+ _masterInstanceBundleManager = bundleManagerAddress;
187
+ _masterInstanceStore = instanceStoreAddress;
188
+
189
+ IRegistryService registryService = IRegistryService(getRegistry().getServiceAddress(REGISTRY(), getVersion().toMajorPart()));
190
+ IInstance masterInstance = IInstance(_masterInstance);
191
+ IRegistry.ObjectInfo memory info = registryService.registerInstance(masterInstance, getOwner());
192
+ masterInstanceNftId = info.nftId;
76
193
  }
77
194
 
78
- function getInstanceReaderMaster() external view returns (address) {
79
- return _instanceReaderMaster;
195
+ function setMasterInstanceReader(address instanceReaderAddress) external onlyOwner {
196
+ if(_masterInstanceReader == address(0)) { revert ErrorInstanceServiceMasterInstanceReaderNotSet(); }
197
+ if(instanceReaderAddress == address(0)) { revert ErrorInstanceServiceInstanceReaderAddressZero(); }
198
+ if(instanceReaderAddress == _masterInstanceReader) { revert ErrorInstanceServiceInstanceReaderSameAsMasterInstanceReader(); }
199
+
200
+ InstanceReader instanceReader = InstanceReader(instanceReaderAddress);
201
+ if(instanceReader.getInstance() != IInstance(_masterInstance)) { revert ErrorInstanceServiceInstanceReaderInstanceMismatch(); }
202
+
203
+ _masterInstanceReader = instanceReaderAddress;
80
204
  }
81
205
 
82
- function getInstanceMaster() external view returns (address) {
83
- return _instanceMaster;
206
+ function upgradeInstanceReader(NftId instanceNftId)
207
+ external
208
+ onlyInstanceOwner(instanceNftId)
209
+ {
210
+ IRegistry registry = getRegistry();
211
+ IRegistry.ObjectInfo memory instanceInfo = registry.getObjectInfo(instanceNftId);
212
+ Instance instance = Instance(instanceInfo.objectAddress);
213
+
214
+ InstanceReader upgradedInstanceReaderClone = InstanceReader(Clones.clone(address(_masterInstanceReader)));
215
+ upgradedInstanceReaderClone.initialize(address(instance));
216
+ instance.setInstanceReader(upgradedInstanceReaderClone);
84
217
  }
85
218
 
86
- function getAccessManagerMaster() external view returns (address) {
87
- return _accessManagerMaster;
219
+ function getMasterInstanceReader() external view returns (address) {
220
+ return _masterInstanceReader;
88
221
  }
89
222
 
90
223
  // From IService
91
- function getName() public pure override(IService, ServiceBase) returns(string memory) {
92
- return NAME;
224
+ function getDomain() public pure override returns(ObjectType) {
225
+ return INSTANCE();
93
226
  }
94
227
 
95
228
  /// @dev top level initializer
96
- // 1) registry is non upgradeable -> don't need a proxy and uses constructor !
97
- // 2) deploy registry service first -> from its initialization func it is easier to deploy registry then vice versa
98
- // 3) deploy registry -> pass registry service address as constructor argument
99
- // registry is getting instantiated and locked to registry service address forever
100
229
  function _initialize(
101
230
  address owner,
102
231
  bytes memory data
@@ -105,32 +234,76 @@ contract InstanceService is ServiceBase, IInstanceService {
105
234
  initializer
106
235
  virtual override
107
236
  {
108
- // bytes memory encodedConstructorArguments = abi.encode(
109
- // _registryAddress);
237
+ address initialOwner;
238
+ address registryAddress;
239
+ (registryAddress, initialOwner) = abi.decode(data, (address, address));
240
+ // TODO while InstanceService is not deployed in InstanceServiceManager constructor
241
+ // owner is InstanceServiceManager deployer
242
+ initializeService(registryAddress, address(0), owner);
243
+ registerInterface(type(IInstanceService).interfaceId);
244
+ }
110
245
 
111
- // bytes memory instanceCreationCode = ContractDeployerLib.getCreationCode(
112
- // instanceByteCodeWithInitCode,
113
- // encodedConstructorArguments);
246
+ // all gif targets MUST be childs of instanceNftId
247
+ function createGifTarget(
248
+ NftId instanceNftId,
249
+ address targetAddress,
250
+ string memory targetName,
251
+ bytes4[][] memory selectors,
252
+ RoleId[] memory roles
253
+ )
254
+ external
255
+ onlyRegisteredService
256
+ {
257
+ (
258
+ IInstance instance, // or instanceInfo
259
+ NftId targetNftId // or targetInfo
260
+ ) = _validateInstanceAndComponent(instanceNftId, targetAddress);
114
261
 
115
- // address instanceAddress = ContractDeployerLib.deploy(
116
- // instanceCreationCode,
117
- // INSTANCE_CREATION_CODE_HASH);
262
+ InstanceAccessManager accessManager = instance.getInstanceAccessManager();
263
+ accessManager.createGifTarget(targetAddress, targetName);
264
+ // set proposed target config
265
+ // TODO restriction: gif targets are set only once and only here?
266
+ // assume config is a mix of gif and custom roles and no further configuration by INSTANCE_OWNER_ROLE is ever needed?
267
+ for(uint roleIdx = 0; roleIdx < roles.length; roleIdx++)
268
+ {
269
+ accessManager.setCoreTargetFunctionRole(targetName, selectors[roleIdx], roles[roleIdx]);
270
+ }
271
+ }
118
272
 
119
- address initialOwner = address(0);
120
- (_registryAddress, initialOwner) = abi.decode(data, (address, address));
273
+ // TODO called by component, but target can be component helper...so needs target name
274
+ // TODO check that targetName associated with component...how???
275
+ function setComponentLocked(bool locked) onlyComponent external {
121
276
 
122
- // // TODO register instance in registry
123
- IRegistry registry = IRegistry(_registryAddress);
124
- NftId registryNftId = registry.getNftId(_registryAddress);
277
+ address componentAddress = msg.sender;
278
+ IRegistry registry = getRegistry();
279
+ NftId instanceNftId = registry.getObjectInfo(componentAddress).parentNftId;
125
280
 
126
- _initializeServiceBase(_registryAddress, registryNftId, initialOwner);
127
-
128
- _registerInterface(type(IService).interfaceId);
129
- _registerInterface(type(IInstanceService).interfaceId);
130
- }
281
+ IInstance instance = IInstance(
282
+ registry.getObjectInfo(
283
+ instanceNftId).objectAddress);
131
284
 
132
- function getInstance() external view returns (Instance) {
133
- return Instance(address(this));
285
+ instance.getInstanceAccessManager().setTargetLockedByService(
286
+ componentAddress,
287
+ locked);
134
288
  }
135
- }
136
289
 
290
+ function _validateInstanceAndComponent(NftId instanceNftId, address componentAddress)
291
+ internal
292
+ view
293
+ returns (IInstance instance, NftId componentNftId)
294
+ {
295
+ IRegistry registry = getRegistry();
296
+ IRegistry.ObjectInfo memory instanceInfo = registry.getObjectInfo(instanceNftId);
297
+ if(instanceInfo.objectType != INSTANCE()) {
298
+ revert ErrorInstanceServiceNotInstance(instanceNftId);
299
+ }
300
+
301
+ IRegistry.ObjectInfo memory componentInfo = registry.getObjectInfo(componentAddress);
302
+ if(componentInfo.parentNftId != instanceNftId) {
303
+ revert ErrorInstanceServiceInstanceComponentMismatch(instanceNftId, componentInfo.nftId);
304
+ }
305
+
306
+ instance = Instance(instanceInfo.objectAddress);
307
+ componentNftId = componentInfo.nftId;
308
+ }
309
+ }
@@ -7,7 +7,7 @@ import {ProxyManager} from "../shared/ProxyManager.sol";
7
7
  import {InstanceService} from "./InstanceService.sol";
8
8
  import {Registry} from "../registry/Registry.sol";
9
9
  import {RegistryService} from "../registry/RegistryService.sol";
10
- import {VersionLib} from "../types/Version.sol";
10
+ import {REGISTRY} from "../types/ObjectType.sol";
11
11
 
12
12
  contract InstanceServiceManager is ProxyManager {
13
13
 
@@ -17,7 +17,7 @@ contract InstanceServiceManager is ProxyManager {
17
17
  constructor(
18
18
  address registryAddress
19
19
  )
20
- ProxyManager()
20
+ ProxyManager(registryAddress)
21
21
  {
22
22
  InstanceService instSrv = new InstanceService();
23
23
  // bytes memory initCode = type(InstanceService).creationCode;
@@ -28,20 +28,18 @@ contract InstanceServiceManager is ProxyManager {
28
28
 
29
29
  _instanceService = InstanceService(address(versionable));
30
30
 
31
- Registry registry = Registry(registryAddress);
32
- address registryServiceAddress = registry.getServiceAddress("RegistryService", VersionLib.toVersion(3, 0, 0).toMajorPart());
33
- RegistryService registryService = RegistryService(registryServiceAddress);
34
-
35
- registryService.registerService(_instanceService);
31
+ // TODO `this` must have a role or own nft to register service
32
+ //Registry registry = Registry(registryAddress);
33
+ //address registryServiceAddress = registry.getServiceAddress(REGISTRY(), _instanceService.getMajorVersion());
34
+ //RegistryService registryService = RegistryService(registryServiceAddress);
35
+ //registryService.registerService(_instanceService);
36
36
  // RegistryService registryService = _instanceService.getRegistryService();
37
37
 
38
+ // TODO no nft to link yet
38
39
  // link ownership of instance service manager ot nft owner of instance service
39
- _linkToNftOwnable(
40
- address(registryAddress),
41
- address(_instanceService));
42
-
43
- // implies that after this constructor call only upgrade functionality is available
44
- _isDeployed = true;
40
+ //_linkToNftOwnable(
41
+ // address(registryAddress),
42
+ // address(_instanceService));
45
43
  }
46
44
 
47
45
  //--- view functions ----------------------------------------------------//
@@ -0,0 +1,208 @@
1
+ // SPDX-License-Identifier: Apache-2.0
2
+ pragma solidity ^0.8.20;
3
+
4
+ import {AccessManagedUpgradeable} from "@openzeppelin/contracts-upgradeable/access/manager/AccessManagedUpgradeable.sol";
5
+
6
+ import {Key32, KeyId, Key32Lib} from "../types/Key32.sol";
7
+ import {NftId} from "../types/NftId.sol";
8
+ import {ClaimId} from "../types/ClaimId.sol";
9
+ import {NumberId} from "../types/NumberId.sol";
10
+ import {ObjectType, BUNDLE, DISTRIBUTION, INSTANCE, POLICY, POOL, ROLE, PRODUCT, TARGET, COMPONENT, DISTRIBUTOR, DISTRIBUTOR_TYPE} from "../types/ObjectType.sol";
11
+ import {RiskId, RiskIdLib} from "../types/RiskId.sol";
12
+ import {RoleId, RoleIdLib, INSTANCE_ROLE, INSTANCE_OWNER_ROLE} from "../types/RoleId.sol";
13
+ import {StateId, ACTIVE} from "../types/StateId.sol";
14
+ import {TimestampLib} from "../types/Timestamp.sol";
15
+ import {VersionPart, VersionPartLib} from "../types/Version.sol";
16
+ import {ReferralId} from "../types/Referral.sol";
17
+ import {DistributorType} from "../types/DistributorType.sol";
18
+ import {PayoutId} from "../types/PayoutId.sol";
19
+
20
+ import {IInstance} from "./IInstance.sol";
21
+ import {KeyValueStore} from "./base/KeyValueStore.sol";
22
+ import {IKeyValueStore} from "./base/KeyValueStore.sol";
23
+
24
+ import {IBundle} from "./module/IBundle.sol";
25
+ import {IComponents} from "./module/IComponents.sol";
26
+ import {IDistribution} from "./module/IDistribution.sol";
27
+ import {IPolicy} from "./module/IPolicy.sol";
28
+ import {IRisk} from "./module/IRisk.sol";
29
+ import {ISetup} from "./module/ISetup.sol";
30
+
31
+
32
+ // TODO combine with instance reader?
33
+ contract InstanceStore is AccessManagedUpgradeable, KeyValueStore
34
+ {
35
+ function initialize(address instance)
36
+ public
37
+ initializer()
38
+ {
39
+ address authority = IInstance(instance).authority();
40
+ __AccessManaged_init(authority);
41
+ initializeLifecycle();
42
+ }
43
+
44
+ //--- ProductSetup ------------------------------------------------------//
45
+ function createProductSetup(NftId productNftId, ISetup.ProductSetupInfo memory setup) external restricted() {
46
+ create(_toNftKey32(productNftId, PRODUCT()), abi.encode(setup));
47
+ }
48
+
49
+ function updateProductSetup(NftId productNftId, ISetup.ProductSetupInfo memory setup, StateId newState) external restricted() {
50
+ update(_toNftKey32(productNftId, PRODUCT()), abi.encode(setup), newState);
51
+ }
52
+
53
+ function updateProductSetupState(NftId productNftId, StateId newState) external restricted() {
54
+ updateState(_toNftKey32(productNftId, PRODUCT()), newState);
55
+ }
56
+
57
+ //--- DistributionSetup ------------------------------------------------------//
58
+ function createDistributionSetup(NftId distributionNftId, ISetup.DistributionSetupInfo memory setup) external restricted() {
59
+ create(_toNftKey32(distributionNftId, DISTRIBUTION()), abi.encode(setup));
60
+ }
61
+
62
+ function updateDistributionSetup(NftId distributionNftId, ISetup.DistributionSetupInfo memory setup, StateId newState) external restricted() {
63
+ update(_toNftKey32(distributionNftId, DISTRIBUTION()), abi.encode(setup), newState);
64
+ }
65
+
66
+ function updateDistributionSetupState(NftId distributionNftId, StateId newState) external restricted() {
67
+ updateState(_toNftKey32(distributionNftId, DISTRIBUTION()), newState);
68
+ }
69
+
70
+ //--- PoolSetup ------------------------------------------------------//
71
+ function createPoolSetup(NftId poolNftId, IComponents.ComponentInfo memory info) external restricted() {
72
+ create(_toNftKey32(poolNftId, POOL()), abi.encode(info));
73
+ }
74
+
75
+ function updatePoolSetup(NftId poolNftId, IComponents.ComponentInfo memory info, StateId newState) external restricted() {
76
+ update(_toNftKey32(poolNftId, POOL()), abi.encode(info), newState);
77
+ }
78
+
79
+ function updatePoolSetupState(NftId poolNftId, StateId newState) external restricted() {
80
+ updateState(_toNftKey32(poolNftId, POOL()), newState);
81
+ }
82
+
83
+ //--- DistributorType -------------------------------------------------------//
84
+ function createDistributorType(DistributorType distributorType, IDistribution.DistributorTypeInfo memory info) external restricted() {
85
+ create(distributorType.toKey32(), abi.encode(info));
86
+ }
87
+
88
+ function updateDistributorType(DistributorType distributorType, IDistribution.DistributorTypeInfo memory info, StateId newState) external restricted() {
89
+ update(distributorType.toKey32(), abi.encode(info), newState);
90
+ }
91
+
92
+ function updateDistributorTypeState(DistributorType distributorType, StateId newState) external restricted() {
93
+ updateState(distributorType.toKey32(), newState);
94
+ }
95
+
96
+ //--- Distributor -------------------------------------------------------//
97
+ function createDistributor(NftId distributorNftId, IDistribution.DistributorInfo memory info) external restricted() {
98
+ create(_toNftKey32(distributorNftId, DISTRIBUTOR()), abi.encode(info));
99
+ }
100
+
101
+ function updateDistributor(NftId distributorNftId, IDistribution.DistributorInfo memory info, StateId newState) external restricted() {
102
+ update(_toNftKey32(distributorNftId, DISTRIBUTOR()), abi.encode(info), newState);
103
+ }
104
+
105
+ function updateDistributorState(NftId distributorNftId, StateId newState) external restricted() {
106
+ updateState(_toNftKey32(distributorNftId, DISTRIBUTOR()), newState);
107
+ }
108
+
109
+ //--- Referral ----------------------------------------------------------//
110
+ function createReferral(ReferralId referralId, IDistribution.ReferralInfo memory referralInfo) external restricted() {
111
+ create(referralId.toKey32(), abi.encode(referralInfo));
112
+ }
113
+
114
+ function updateReferral(ReferralId referralId, IDistribution.ReferralInfo memory referralInfo, StateId newState) external restricted() {
115
+ update(referralId.toKey32(), abi.encode(referralInfo), newState);
116
+ }
117
+
118
+ function updateReferralState(ReferralId referralId, StateId newState) external restricted() {
119
+ updateState(referralId.toKey32(), newState);
120
+ }
121
+
122
+ //--- Bundle ------------------------------------------------------------//
123
+ function createBundle(NftId bundleNftId, IBundle.BundleInfo memory bundle) external restricted() {
124
+ create(_toNftKey32(bundleNftId, BUNDLE()), abi.encode(bundle));
125
+ }
126
+
127
+ function updateBundle(NftId bundleNftId, IBundle.BundleInfo memory bundle, StateId newState) external restricted() {
128
+ update(_toNftKey32(bundleNftId, BUNDLE()), abi.encode(bundle), newState);
129
+ }
130
+
131
+ function updateBundleState(NftId bundleNftId, StateId newState) external restricted() {
132
+ updateState(_toNftKey32(bundleNftId, BUNDLE()), newState);
133
+ }
134
+
135
+ //--- Risk --------------------------------------------------------------//
136
+ function createRisk(RiskId riskId, IRisk.RiskInfo memory risk) external restricted() {
137
+ create(riskId.toKey32(), abi.encode(risk));
138
+ }
139
+
140
+ function updateRisk(RiskId riskId, IRisk.RiskInfo memory risk, StateId newState) external restricted() {
141
+ update(riskId.toKey32(), abi.encode(risk), newState);
142
+ }
143
+
144
+ function updateRiskState(RiskId riskId, StateId newState) external restricted() {
145
+ updateState(riskId.toKey32(), newState);
146
+ }
147
+
148
+ //--- Application (Policy) ----------------------------------------------//
149
+ function createApplication(NftId applicationNftId, IPolicy.PolicyInfo memory policy) external restricted() {
150
+ create(_toNftKey32(applicationNftId, POLICY()), abi.encode(policy));
151
+ }
152
+
153
+ function updateApplication(NftId applicationNftId, IPolicy.PolicyInfo memory policy, StateId newState) external restricted() {
154
+ update(_toNftKey32(applicationNftId, POLICY()), abi.encode(policy), newState);
155
+ }
156
+
157
+ function updateApplicationState(NftId applicationNftId, StateId newState) external restricted() {
158
+ updateState(_toNftKey32(applicationNftId, POLICY()), newState);
159
+ }
160
+
161
+ //--- Policy ------------------------------------------------------------//
162
+ function updatePolicy(NftId policyNftId, IPolicy.PolicyInfo memory policy, StateId newState) external restricted() {
163
+ update(_toNftKey32(policyNftId, POLICY()), abi.encode(policy), newState);
164
+ }
165
+
166
+ function updatePolicyState(NftId policyNftId, StateId newState) external restricted() {
167
+ updateState(_toNftKey32(policyNftId, POLICY()), newState);
168
+ }
169
+
170
+ //--- Claim -------------------------------------------------------------//
171
+ function createClaim(NftId policyNftId, ClaimId claimId, IPolicy.ClaimInfo memory claim) external restricted() {
172
+ create(_toClaimKey32(policyNftId, claimId), abi.encode(claim));
173
+ }
174
+
175
+ function updateClaim(NftId policyNftId, ClaimId claimId, IPolicy.ClaimInfo memory claim, StateId newState) external restricted() {
176
+ update(_toClaimKey32(policyNftId, claimId), abi.encode(claim), newState);
177
+ }
178
+
179
+ function updateClaimState(NftId policyNftId, ClaimId claimId, StateId newState) external restricted() {
180
+ updateState(_toClaimKey32(policyNftId, claimId), newState);
181
+ }
182
+
183
+ //--- Payout ------------------------------------------------------------//
184
+ function createPayout(NftId policyNftId, PayoutId payoutId, IPolicy.PayoutInfo memory payout) external restricted() {
185
+ create(_toPayoutKey32(policyNftId, payoutId), abi.encode(payout));
186
+ }
187
+
188
+ function updatePayout(NftId policyNftId, PayoutId payoutId, IPolicy.PayoutInfo memory payout, StateId newState) external restricted() {
189
+ update(_toPayoutKey32(policyNftId, payoutId), abi.encode(payout), newState);
190
+ }
191
+
192
+ function updatePayoutState(NftId policyNftId, PayoutId payoutId, StateId newState) external restricted() {
193
+ updateState(_toPayoutKey32(policyNftId, payoutId), newState);
194
+ }
195
+
196
+ //--- internal view/pure functions --------------------------------------//
197
+ function _toNftKey32(NftId nftId, ObjectType objectType) private pure returns (Key32) {
198
+ return nftId.toKey32(objectType);
199
+ }
200
+
201
+ function _toClaimKey32(NftId policyNftId, ClaimId claimId) private pure returns (Key32) {
202
+ return claimId.toKey32(policyNftId);
203
+ }
204
+
205
+ function _toPayoutKey32(NftId policyNftId, PayoutId payoutId) private pure returns (Key32) {
206
+ return payoutId.toKey32(policyNftId);
207
+ }
208
+ }