@etherisc/gif-next 0.0.2-f4f92b3-338 → 0.0.2-f509abc-684

Sign up to get free protection for your applications and to get access to all the features.
Files changed (350) hide show
  1. package/README.md +73 -1
  2. package/artifacts/contracts/components/Component.sol/Component.dbg.json +1 -1
  3. package/artifacts/contracts/components/Component.sol/Component.json +270 -94
  4. package/artifacts/contracts/components/Distribution.sol/Distribution.dbg.json +1 -1
  5. package/artifacts/contracts/components/Distribution.sol/Distribution.json +627 -157
  6. package/artifacts/contracts/components/IComponent.sol/IComponent.dbg.json +1 -1
  7. package/artifacts/contracts/components/IComponent.sol/IComponent.json +122 -72
  8. package/artifacts/contracts/components/IDistributionComponent.sol/IDistributionComponent.dbg.json +1 -1
  9. package/artifacts/contracts/components/IDistributionComponent.sol/IDistributionComponent.json +323 -102
  10. package/artifacts/contracts/components/IPoolComponent.sol/IPoolComponent.dbg.json +1 -1
  11. package/artifacts/contracts/components/IPoolComponent.sol/IPoolComponent.json +325 -186
  12. package/artifacts/contracts/components/IProductComponent.sol/IProductComponent.dbg.json +1 -1
  13. package/artifacts/contracts/components/IProductComponent.sol/IProductComponent.json +126 -144
  14. package/artifacts/contracts/components/Pool.sol/Pool.dbg.json +1 -1
  15. package/artifacts/contracts/components/Pool.sol/Pool.json +552 -212
  16. package/artifacts/contracts/components/Product.sol/Product.dbg.json +1 -1
  17. package/artifacts/contracts/components/Product.sol/Product.json +374 -166
  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 +1 -1
  21. package/artifacts/contracts/instance/BundleManager.sol/BundleManager.json +64 -50
  22. package/artifacts/contracts/instance/Cloneable.sol/Cloneable.dbg.json +1 -1
  23. package/artifacts/contracts/instance/Cloneable.sol/Cloneable.json +5 -0
  24. package/artifacts/contracts/instance/IInstance.sol/IInstance.dbg.json +1 -1
  25. package/artifacts/contracts/instance/IInstance.sol/IInstance.json +801 -434
  26. package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.dbg.json +1 -1
  27. package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.json +194 -192
  28. package/artifacts/contracts/instance/Instance.sol/Instance.dbg.json +1 -1
  29. package/artifacts/contracts/instance/Instance.sol/Instance.json +992 -782
  30. package/artifacts/contracts/instance/InstanceAccessManager.sol/InstanceAccessManager.dbg.json +1 -1
  31. package/artifacts/contracts/instance/InstanceAccessManager.sol/InstanceAccessManager.json +441 -164
  32. package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.dbg.json +1 -1
  33. package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.json +119 -221
  34. package/artifacts/contracts/instance/InstanceService.sol/InstanceService.dbg.json +1 -1
  35. package/artifacts/contracts/instance/InstanceService.sol/InstanceService.json +371 -302
  36. package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.dbg.json +1 -1
  37. package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.json +330 -102
  38. package/artifacts/contracts/instance/ObjectManager.sol/ObjectManager.dbg.json +1 -1
  39. package/artifacts/contracts/instance/ObjectManager.sol/ObjectManager.json +8 -13
  40. package/artifacts/contracts/instance/base/ComponentService.sol/ComponentService.dbg.json +1 -1
  41. package/artifacts/contracts/instance/base/ComponentService.sol/ComponentService.json +118 -169
  42. package/artifacts/contracts/instance/base/IKeyValueStore.sol/IKeyValueStore.dbg.json +1 -1
  43. package/artifacts/contracts/instance/base/ILifecycle.sol/ILifecycle.dbg.json +1 -1
  44. package/artifacts/contracts/instance/base/KeyValueStore.sol/KeyValueStore.dbg.json +1 -1
  45. package/artifacts/contracts/instance/base/KeyValueStore.sol/KeyValueStore.json +40 -10
  46. package/artifacts/contracts/instance/base/Lifecycle.sol/Lifecycle.dbg.json +1 -1
  47. package/artifacts/contracts/instance/base/Lifecycle.sol/Lifecycle.json +36 -11
  48. package/artifacts/contracts/instance/module/IAccess.sol/IAccess.dbg.json +1 -1
  49. package/artifacts/contracts/instance/module/IAccess.sol/IAccess.json +61 -78
  50. package/artifacts/contracts/instance/module/IBundle.sol/IBundle.dbg.json +1 -1
  51. package/artifacts/contracts/instance/module/IComponents.sol/IComponents.dbg.json +4 -0
  52. package/artifacts/contracts/instance/module/IComponents.sol/IComponents.json +10 -0
  53. package/artifacts/contracts/instance/module/IDistribution.sol/IDistribution.dbg.json +1 -1
  54. package/artifacts/contracts/instance/module/IPolicy.sol/IPolicy.dbg.json +1 -1
  55. package/artifacts/contracts/instance/module/IRisk.sol/IRisk.dbg.json +1 -1
  56. package/artifacts/contracts/instance/module/ISetup.sol/ISetup.dbg.json +1 -1
  57. package/artifacts/contracts/instance/module/ITreasury.sol/ITreasury.dbg.json +1 -1
  58. package/artifacts/contracts/instance/service/ApplicationService.sol/ApplicationService.dbg.json +4 -0
  59. package/artifacts/contracts/instance/service/ApplicationService.sol/ApplicationService.json +968 -0
  60. package/artifacts/contracts/instance/service/ApplicationServiceManager.sol/ApplicationServiceManager.dbg.json +4 -0
  61. package/artifacts/contracts/instance/service/ApplicationServiceManager.sol/ApplicationServiceManager.json +665 -0
  62. package/artifacts/contracts/instance/service/BundleService.sol/BundleService.dbg.json +1 -1
  63. package/artifacts/contracts/instance/service/BundleService.sol/BundleService.json +306 -315
  64. package/artifacts/contracts/instance/service/BundleServiceManager.sol/BundleServiceManager.dbg.json +1 -1
  65. package/artifacts/contracts/instance/service/BundleServiceManager.sol/BundleServiceManager.json +305 -93
  66. package/artifacts/contracts/instance/service/ClaimService.sol/ClaimService.dbg.json +4 -0
  67. package/artifacts/contracts/instance/service/ClaimService.sol/ClaimService.json +754 -0
  68. package/artifacts/contracts/instance/service/ClaimServiceManager.sol/ClaimServiceManager.dbg.json +4 -0
  69. package/artifacts/contracts/instance/service/ClaimServiceManager.sol/ClaimServiceManager.json +637 -0
  70. package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.dbg.json +1 -1
  71. package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.json +1212 -252
  72. package/artifacts/contracts/instance/service/DistributionServiceManager.sol/DistributionServiceManager.dbg.json +1 -1
  73. package/artifacts/contracts/instance/service/DistributionServiceManager.sol/DistributionServiceManager.json +453 -85
  74. package/artifacts/contracts/instance/service/IApplicationService.sol/IApplicationService.dbg.json +4 -0
  75. package/artifacts/contracts/instance/service/IApplicationService.sol/IApplicationService.json +556 -0
  76. package/artifacts/contracts/instance/service/IBundleService.sol/IBundleService.dbg.json +1 -1
  77. package/artifacts/contracts/instance/service/IBundleService.sol/IBundleService.json +155 -240
  78. package/artifacts/contracts/instance/service/IClaimService.sol/IClaimService.dbg.json +4 -0
  79. package/artifacts/contracts/instance/service/IClaimService.sol/IClaimService.json +409 -0
  80. package/artifacts/contracts/instance/service/IDistributionService.sol/IDistributionService.dbg.json +1 -1
  81. package/artifacts/contracts/instance/service/IDistributionService.sol/IDistributionService.json +711 -139
  82. package/artifacts/contracts/instance/service/IPolicyService.sol/IPolicyService.dbg.json +1 -1
  83. package/artifacts/contracts/instance/service/IPolicyService.sol/IPolicyService.json +60 -286
  84. package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.dbg.json +1 -1
  85. package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.json +81 -147
  86. package/artifacts/contracts/instance/service/IProductService.sol/IProductService.dbg.json +1 -1
  87. package/artifacts/contracts/instance/service/IProductService.sol/IProductService.json +22 -169
  88. package/artifacts/contracts/instance/service/PolicyService.sol/PolicyService.dbg.json +1 -1
  89. package/artifacts/contracts/instance/service/PolicyService.sol/PolicyService.json +185 -391
  90. package/artifacts/contracts/instance/service/PolicyServiceManager.sol/PolicyServiceManager.dbg.json +1 -1
  91. package/artifacts/contracts/instance/service/PolicyServiceManager.sol/PolicyServiceManager.json +311 -127
  92. package/artifacts/contracts/instance/service/PoolService.sol/PoolService.dbg.json +1 -1
  93. package/artifacts/contracts/instance/service/PoolService.sol/PoolService.json +222 -204
  94. package/artifacts/contracts/instance/service/PoolServiceManager.sol/PoolServiceManager.dbg.json +1 -1
  95. package/artifacts/contracts/instance/service/PoolServiceManager.sol/PoolServiceManager.json +310 -90
  96. package/artifacts/contracts/instance/service/ProductService.sol/ProductService.dbg.json +1 -1
  97. package/artifacts/contracts/instance/service/ProductService.sol/ProductService.json +142 -221
  98. package/artifacts/contracts/instance/service/ProductServiceManager.sol/ProductServiceManager.dbg.json +1 -1
  99. package/artifacts/contracts/instance/service/ProductServiceManager.sol/ProductServiceManager.json +302 -90
  100. package/artifacts/contracts/registry/ChainNft.sol/ChainNft.dbg.json +1 -1
  101. package/artifacts/contracts/registry/ChainNft.sol/ChainNft.json +15 -2
  102. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.dbg.json +1 -1
  103. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.json +34 -2
  104. package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.dbg.json +1 -1
  105. package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.json +83 -174
  106. package/artifacts/contracts/registry/ITransferInterceptor.sol/ITransferInterceptor.dbg.json +1 -1
  107. package/artifacts/contracts/registry/ITransferInterceptor.sol/ITransferInterceptor.json +18 -0
  108. package/artifacts/contracts/registry/Registry.sol/Registry.dbg.json +1 -1
  109. package/artifacts/contracts/registry/Registry.sol/Registry.json +47 -15
  110. package/artifacts/contracts/registry/RegistryAccessManager.sol/RegistryAccessManager.dbg.json +1 -1
  111. package/artifacts/contracts/registry/RegistryAccessManager.sol/RegistryAccessManager.json +2 -2
  112. package/artifacts/contracts/registry/RegistryService.sol/RegistryService.dbg.json +1 -1
  113. package/artifacts/contracts/registry/RegistryService.sol/RegistryService.json +193 -216
  114. package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.dbg.json +1 -1
  115. package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.json +300 -94
  116. package/artifacts/contracts/registry/ReleaseManager.sol/ReleaseManager.dbg.json +1 -1
  117. package/artifacts/contracts/registry/ReleaseManager.sol/ReleaseManager.json +11 -11
  118. package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.dbg.json +1 -1
  119. package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.json +141 -37
  120. package/artifacts/contracts/shared/ContractDeployerLib.sol/ContractDeployerLib.dbg.json +1 -1
  121. package/artifacts/contracts/shared/ERC165.sol/ERC165.dbg.json +1 -1
  122. package/artifacts/contracts/shared/ERC165.sol/ERC165.json +41 -3
  123. package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.dbg.json +1 -1
  124. package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.json +40 -29
  125. package/artifacts/contracts/shared/IPolicyHolder.sol/IPolicyHolder.dbg.json +4 -0
  126. package/artifacts/contracts/shared/IPolicyHolder.sol/IPolicyHolder.json +129 -0
  127. package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.dbg.json +1 -1
  128. package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.json +21 -29
  129. package/artifacts/contracts/shared/IRegistryLinked.sol/IRegistryLinked.dbg.json +4 -0
  130. package/artifacts/contracts/{experiment/inheritance/IB.sol/IB.json → shared/IRegistryLinked.sol/IRegistryLinked.json} +18 -20
  131. package/artifacts/contracts/shared/IService.sol/IService.dbg.json +1 -1
  132. package/artifacts/contracts/shared/IService.sol/IService.json +22 -169
  133. package/artifacts/contracts/shared/IVersionable.sol/IVersionable.dbg.json +1 -1
  134. package/artifacts/contracts/shared/IVersionable.sol/IVersionable.json +2 -152
  135. package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.dbg.json +1 -1
  136. package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.json +113 -33
  137. package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.dbg.json +4 -0
  138. package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.json +248 -0
  139. package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.dbg.json +1 -1
  140. package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.json +294 -74
  141. package/artifacts/contracts/shared/Registerable.sol/Registerable.dbg.json +1 -1
  142. package/artifacts/contracts/shared/Registerable.sol/Registerable.json +125 -55
  143. package/artifacts/contracts/shared/RegistryLinked.sol/RegistryLinked.dbg.json +4 -0
  144. package/artifacts/contracts/shared/RegistryLinked.sol/RegistryLinked.json +84 -0
  145. package/artifacts/contracts/shared/Service.sol/Service.dbg.json +1 -1
  146. package/artifacts/contracts/shared/Service.sol/Service.json +113 -164
  147. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.dbg.json +1 -1
  148. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.json +2 -2
  149. package/artifacts/contracts/shared/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.dbg.json +1 -1
  150. package/artifacts/contracts/shared/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.json +2 -2
  151. package/artifacts/contracts/shared/Versionable.sol/Versionable.dbg.json +1 -1
  152. package/artifacts/contracts/shared/Versionable.sol/Versionable.json +2 -152
  153. package/artifacts/contracts/test/TestFee.sol/TestFee.dbg.json +1 -1
  154. package/artifacts/contracts/test/TestFee.sol/TestFee.json +2 -2
  155. package/artifacts/contracts/test/TestRegisterable.sol/TestRegisterable.dbg.json +1 -1
  156. package/artifacts/contracts/test/TestRegisterable.sol/TestRegisterable.json +125 -55
  157. package/artifacts/contracts/test/TestRoleId.sol/TestRoleId.dbg.json +1 -1
  158. package/artifacts/contracts/test/TestRoleId.sol/TestRoleId.json +6 -6
  159. package/artifacts/contracts/test/TestService.sol/TestService.dbg.json +1 -1
  160. package/artifacts/contracts/test/TestService.sol/TestService.json +134 -221
  161. package/artifacts/contracts/test/TestToken.sol/TestUsdc.dbg.json +1 -1
  162. package/artifacts/contracts/test/TestVersion.sol/TestVersion.dbg.json +1 -1
  163. package/artifacts/contracts/test/TestVersion.sol/TestVersion.json +2 -2
  164. package/artifacts/contracts/test/TestVersionable.sol/TestVersionable.dbg.json +1 -1
  165. package/artifacts/contracts/test/TestVersionable.sol/TestVersionable.json +8 -190
  166. package/artifacts/contracts/test/Usdc.sol/USDC.dbg.json +1 -1
  167. package/artifacts/contracts/types/AddressSet.sol/LibAddressSet.dbg.json +1 -1
  168. package/artifacts/contracts/types/Blocknumber.sol/BlocknumberLib.dbg.json +1 -1
  169. package/artifacts/contracts/types/Blocknumber.sol/BlocknumberLib.json +2 -2
  170. package/artifacts/contracts/types/ChainId.sol/ChainIdLib.dbg.json +1 -1
  171. package/artifacts/contracts/types/ClaimId.sol/ClaimIdLib.dbg.json +4 -0
  172. package/artifacts/contracts/types/ClaimId.sol/ClaimIdLib.json +100 -0
  173. package/artifacts/contracts/types/DistributorType.sol/DistributorTypeLib.dbg.json +1 -1
  174. package/artifacts/contracts/types/DistributorType.sol/DistributorTypeLib.json +2 -2
  175. package/artifacts/contracts/types/Fee.sol/FeeLib.dbg.json +1 -1
  176. package/artifacts/contracts/types/Fee.sol/FeeLib.json +2 -2
  177. package/artifacts/contracts/types/Key32.sol/Key32Lib.dbg.json +1 -1
  178. package/artifacts/contracts/types/Key32.sol/Key32Lib.json +2 -2
  179. package/artifacts/contracts/types/NftId.sol/NftIdLib.dbg.json +1 -1
  180. package/artifacts/contracts/types/NftId.sol/NftIdLib.json +17 -4
  181. package/artifacts/contracts/types/NftIdSet.sol/LibNftIdSet.dbg.json +1 -1
  182. package/artifacts/contracts/types/NftIdSet.sol/LibNftIdSet.json +2 -2
  183. package/artifacts/contracts/types/NumberId.sol/NumberIdLib.dbg.json +1 -1
  184. package/artifacts/contracts/types/ObjectType.sol/ObjectTypeLib.dbg.json +1 -1
  185. package/artifacts/contracts/types/ObjectType.sol/ObjectTypeLib.json +2 -2
  186. package/artifacts/contracts/types/PayoutId.sol/PayoutIdLib.dbg.json +4 -0
  187. package/artifacts/contracts/types/PayoutId.sol/PayoutIdLib.json +100 -0
  188. package/artifacts/contracts/types/Referral.sol/ReferralLib.dbg.json +1 -1
  189. package/artifacts/contracts/types/Referral.sol/ReferralLib.json +23 -4
  190. package/artifacts/contracts/types/RiskId.sol/RiskIdLib.dbg.json +1 -1
  191. package/artifacts/contracts/types/RiskId.sol/RiskIdLib.json +2 -2
  192. package/artifacts/contracts/types/RoleId.sol/RoleIdLib.dbg.json +1 -1
  193. package/artifacts/contracts/types/RoleId.sol/RoleIdLib.json +2 -2
  194. package/artifacts/contracts/types/Seconds.sol/SecondsLib.dbg.json +4 -0
  195. package/artifacts/contracts/types/Seconds.sol/SecondsLib.json +124 -0
  196. package/artifacts/contracts/types/StateId.sol/StateIdLib.dbg.json +1 -1
  197. package/artifacts/contracts/types/StateId.sol/StateIdLib.json +2 -2
  198. package/artifacts/contracts/types/Timestamp.sol/TimestampLib.dbg.json +1 -1
  199. package/artifacts/contracts/types/Timestamp.sol/TimestampLib.json +25 -7
  200. package/artifacts/contracts/types/UFixed.sol/MathLib.dbg.json +1 -1
  201. package/artifacts/contracts/types/UFixed.sol/MathLib.json +2 -2
  202. package/artifacts/contracts/types/UFixed.sol/UFixedLib.dbg.json +1 -1
  203. package/artifacts/contracts/types/UFixed.sol/UFixedLib.json +2 -2
  204. package/artifacts/contracts/types/Version.sol/VersionLib.dbg.json +1 -1
  205. package/artifacts/contracts/types/Version.sol/VersionLib.json +2 -2
  206. package/artifacts/contracts/types/Version.sol/VersionPartLib.dbg.json +1 -1
  207. package/artifacts/contracts/types/Version.sol/VersionPartLib.json +2 -2
  208. package/contracts/components/Component.sol +112 -83
  209. package/contracts/components/Distribution.sol +189 -53
  210. package/contracts/components/IComponent.sol +48 -17
  211. package/contracts/components/IDistributionComponent.sol +39 -15
  212. package/contracts/components/IPoolComponent.sol +84 -41
  213. package/contracts/components/IProductComponent.sol +3 -2
  214. package/contracts/components/Pool.sol +211 -153
  215. package/contracts/components/Product.sol +96 -61
  216. package/contracts/instance/AccessManagerUpgradeableInitializeable.sol +13 -0
  217. package/contracts/instance/BundleManager.sol +7 -5
  218. package/contracts/instance/Cloneable.sol +7 -2
  219. package/contracts/instance/IInstance.sol +36 -10
  220. package/contracts/instance/IInstanceService.sol +36 -4
  221. package/contracts/instance/Instance.sol +101 -43
  222. package/contracts/instance/InstanceAccessManager.sol +383 -159
  223. package/contracts/instance/InstanceReader.sol +7 -10
  224. package/contracts/instance/InstanceService.sol +262 -129
  225. package/contracts/instance/InstanceServiceManager.sol +1 -1
  226. package/contracts/instance/ObjectManager.sol +6 -8
  227. package/contracts/instance/base/ComponentService.sol +6 -6
  228. package/contracts/instance/base/KeyValueStore.sol +5 -2
  229. package/contracts/instance/base/Lifecycle.sol +11 -2
  230. package/contracts/instance/module/IAccess.sol +22 -16
  231. package/contracts/instance/module/IBundle.sol +2 -1
  232. package/contracts/instance/module/IComponents.sol +35 -0
  233. package/contracts/instance/module/IDistribution.sol +2 -0
  234. package/contracts/instance/module/IPolicy.sol +30 -3
  235. package/contracts/instance/module/ISetup.sol +7 -20
  236. package/contracts/instance/service/ApplicationService.sol +350 -0
  237. package/contracts/instance/service/ApplicationServiceManager.sol +35 -0
  238. package/contracts/instance/service/BundleService.sol +82 -39
  239. package/contracts/instance/service/BundleServiceManager.sol +1 -1
  240. package/contracts/instance/service/ClaimService.sol +151 -0
  241. package/contracts/instance/service/ClaimServiceManager.sol +35 -0
  242. package/contracts/instance/service/DistributionService.sol +376 -15
  243. package/contracts/instance/service/DistributionServiceManager.sol +1 -1
  244. package/contracts/instance/service/IApplicationService.sol +82 -0
  245. package/contracts/instance/service/IBundleService.sol +30 -12
  246. package/contracts/instance/service/IClaimService.sol +61 -0
  247. package/contracts/instance/service/IDistributionService.sol +86 -0
  248. package/contracts/instance/service/IPolicyService.sol +27 -49
  249. package/contracts/instance/service/IPoolService.sol +17 -2
  250. package/contracts/instance/service/PolicyService.sol +148 -283
  251. package/contracts/instance/service/PolicyServiceManager.sol +2 -2
  252. package/contracts/instance/service/PoolService.sol +130 -19
  253. package/contracts/instance/service/PoolServiceManager.sol +1 -1
  254. package/contracts/instance/service/ProductService.sol +20 -11
  255. package/contracts/instance/service/ProductServiceManager.sol +2 -2
  256. package/contracts/registry/ChainNft.sol +8 -0
  257. package/contracts/registry/IRegistry.sol +5 -2
  258. package/contracts/registry/IRegistryService.sol +10 -8
  259. package/contracts/registry/ITransferInterceptor.sol +1 -0
  260. package/contracts/registry/Registry.sol +43 -28
  261. package/contracts/registry/RegistryService.sol +69 -48
  262. package/contracts/registry/RegistryServiceManager.sol +13 -13
  263. package/contracts/registry/ReleaseManager.sol +18 -28
  264. package/contracts/registry/TokenRegistry.sol +16 -12
  265. package/contracts/shared/ERC165.sol +14 -12
  266. package/contracts/shared/INftOwnable.sol +11 -10
  267. package/contracts/shared/IPolicyHolder.sol +26 -0
  268. package/contracts/shared/IRegisterable.sol +3 -3
  269. package/contracts/shared/IRegistryLinked.sol +12 -0
  270. package/contracts/shared/IService.sol +2 -0
  271. package/contracts/shared/IVersionable.sol +4 -47
  272. package/contracts/shared/NftOwnable.sol +66 -85
  273. package/contracts/shared/PolicyHolder.sol +81 -0
  274. package/contracts/shared/ProxyManager.sol +100 -25
  275. package/contracts/shared/Registerable.sol +7 -19
  276. package/contracts/shared/RegistryLinked.sol +48 -0
  277. package/contracts/shared/Service.sol +15 -17
  278. package/contracts/shared/TokenHandler.sol +11 -5
  279. package/contracts/shared/Versionable.sol +4 -92
  280. package/contracts/test/TestRegisterable.sol +1 -1
  281. package/contracts/test/TestService.sol +1 -1
  282. package/contracts/types/Blocknumber.sol +1 -0
  283. package/contracts/types/ClaimId.sol +52 -0
  284. package/contracts/types/DistributorType.sol +2 -2
  285. package/contracts/types/Fee.sol +1 -0
  286. package/contracts/types/NftId.sol +8 -0
  287. package/contracts/types/ObjectType.sol +10 -5
  288. package/contracts/types/PayoutId.sol +54 -0
  289. package/contracts/types/Referral.sol +4 -0
  290. package/contracts/types/RoleId.sol +16 -9
  291. package/contracts/types/Seconds.sol +54 -0
  292. package/contracts/types/StateId.sol +1 -0
  293. package/contracts/types/Timestamp.sol +13 -13
  294. package/contracts/types/UFixed.sol +1 -0
  295. package/contracts/types/Version.sol +1 -0
  296. package/package.json +3 -3
  297. package/artifacts/contracts/experiment/cloning/Cloner.sol/Cloner.dbg.json +0 -4
  298. package/artifacts/contracts/experiment/cloning/Cloner.sol/Cloner.json +0 -66
  299. package/artifacts/contracts/experiment/cloning/Cloner.sol/Mock1.dbg.json +0 -4
  300. package/artifacts/contracts/experiment/cloning/Cloner.sol/Mock1.json +0 -24
  301. package/artifacts/contracts/experiment/cloning/Cloner.sol/Mock2.dbg.json +0 -4
  302. package/artifacts/contracts/experiment/cloning/Cloner.sol/Mock2.json +0 -42
  303. package/artifacts/contracts/experiment/errors/Require.sol/Require.dbg.json +0 -4
  304. package/artifacts/contracts/experiment/errors/Require.sol/Require.json +0 -105
  305. package/artifacts/contracts/experiment/errors/Revert.sol/Revert.dbg.json +0 -4
  306. package/artifacts/contracts/experiment/errors/Revert.sol/Revert.json +0 -105
  307. package/artifacts/contracts/experiment/inheritance/A.sol/A.dbg.json +0 -4
  308. package/artifacts/contracts/experiment/inheritance/A.sol/A.json +0 -128
  309. package/artifacts/contracts/experiment/inheritance/A.sol/AShared.dbg.json +0 -4
  310. package/artifacts/contracts/experiment/inheritance/A.sol/AShared.json +0 -42
  311. package/artifacts/contracts/experiment/inheritance/B.sol/B.dbg.json +0 -4
  312. package/artifacts/contracts/experiment/inheritance/B.sol/B.json +0 -76
  313. package/artifacts/contracts/experiment/inheritance/C.sol/C.dbg.json +0 -4
  314. package/artifacts/contracts/experiment/inheritance/C.sol/C.json +0 -89
  315. package/artifacts/contracts/experiment/inheritance/IA.sol/IA.dbg.json +0 -4
  316. package/artifacts/contracts/experiment/inheritance/IA.sol/IA.json +0 -128
  317. package/artifacts/contracts/experiment/inheritance/IA.sol/ISharedA.dbg.json +0 -4
  318. package/artifacts/contracts/experiment/inheritance/IA.sol/ISharedA.json +0 -37
  319. package/artifacts/contracts/experiment/inheritance/IB.sol/IB.dbg.json +0 -4
  320. package/artifacts/contracts/experiment/inheritance/IC.sol/IC.dbg.json +0 -4
  321. package/artifacts/contracts/experiment/inheritance/IC.sol/IC.json +0 -63
  322. package/artifacts/contracts/experiment/statemachine/Dummy.sol/LifeCycleModule.dbg.json +0 -4
  323. package/artifacts/contracts/experiment/statemachine/Dummy.sol/LifeCycleModule.json +0 -59
  324. package/artifacts/contracts/experiment/statemachine/ISM.sol/ISM.dbg.json +0 -4
  325. package/artifacts/contracts/experiment/statemachine/ISM.sol/ISM.json +0 -124
  326. package/artifacts/contracts/experiment/statemachine/ISM.sol/ISMEE.dbg.json +0 -4
  327. package/artifacts/contracts/experiment/statemachine/ISM.sol/ISMEE.json +0 -74
  328. package/artifacts/contracts/experiment/statemachine/SM.sol/SM.dbg.json +0 -4
  329. package/artifacts/contracts/experiment/statemachine/SM.sol/SM.json +0 -124
  330. package/artifacts/contracts/experiment/statemachine/SimpleStateMachine.sol/SimpleStateMachine.dbg.json +0 -4
  331. package/artifacts/contracts/experiment/statemachine/SimpleStateMachine.sol/SimpleStateMachine.json +0 -207
  332. package/artifacts/contracts/experiment/types/TypeA.sol/TypeALib.dbg.json +0 -4
  333. package/artifacts/contracts/experiment/types/TypeA.sol/TypeALib.json +0 -10
  334. package/artifacts/contracts/experiment/types/TypeB.sol/TypeBLib.dbg.json +0 -4
  335. package/artifacts/contracts/experiment/types/TypeB.sol/TypeBLib.json +0 -10
  336. package/contracts/experiment/cloning/Cloner.sol +0 -47
  337. package/contracts/experiment/errors/Require.sol +0 -38
  338. package/contracts/experiment/errors/Revert.sol +0 -44
  339. package/contracts/experiment/inheritance/A.sol +0 -53
  340. package/contracts/experiment/inheritance/B.sol +0 -28
  341. package/contracts/experiment/inheritance/C.sol +0 -34
  342. package/contracts/experiment/inheritance/IA.sol +0 -13
  343. package/contracts/experiment/inheritance/IB.sol +0 -10
  344. package/contracts/experiment/inheritance/IC.sol +0 -12
  345. package/contracts/experiment/statemachine/Dummy.sol +0 -27
  346. package/contracts/experiment/statemachine/ISM.sol +0 -25
  347. package/contracts/experiment/statemachine/SM.sol +0 -57
  348. package/contracts/experiment/statemachine/SimpleStateMachine.sol +0 -31
  349. package/contracts/experiment/types/TypeA.sol +0 -47
  350. package/contracts/experiment/types/TypeB.sol +0 -29
@@ -4,12 +4,16 @@ pragma solidity ^0.8.19;
4
4
  import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
5
5
 
6
6
  import {IRisk} from "../instance/module/IRisk.sol";
7
+ import {IApplicationService} from "../instance/service/IApplicationService.sol";
7
8
  import {IPolicyService} from "../instance/service/IPolicyService.sol";
9
+ import {IProductService} from "../instance/service/IProductService.sol";
10
+ import {IClaimService} from "../instance/service/IClaimService.sol";
8
11
  import {IProductComponent} from "./IProductComponent.sol";
9
12
  import {NftId, NftIdLib} from "../types/NftId.sol";
10
- import {PRODUCT} from "../types/ObjectType.sol";
13
+ import {PRODUCT, APPLICATION, POLICY, CLAIM } from "../types/ObjectType.sol";
11
14
  import {ReferralId} from "../types/Referral.sol";
12
15
  import {RiskId, RiskIdLib} from "../types/RiskId.sol";
16
+ import {Seconds} from "../types/Seconds.sol";
13
17
  import {StateId} from "../types/StateId.sol";
14
18
  import {Timestamp} from "../types/Timestamp.sol";
15
19
  import {Fee} from "../types/Fee.sol";
@@ -18,26 +22,36 @@ import {Component} from "./Component.sol";
18
22
  import {TokenHandler} from "../shared/TokenHandler.sol";
19
23
 
20
24
  import {InstanceReader} from "../instance/InstanceReader.sol";
25
+ import {IPolicy} from "../instance/module/IPolicy.sol";
21
26
  import {ISetup} from "../instance/module/ISetup.sol";
27
+ import {IComponents} from "../instance/module/IComponents.sol";
22
28
  import {Pool} from "../components/Pool.sol";
23
29
  import {Distribution} from "../components/Distribution.sol";
24
30
 
25
- abstract contract Product is Component, IProductComponent {
26
- using NftIdLib for NftId;
27
-
28
- IPolicyService internal _policyService;
29
- Pool internal _pool;
30
- Distribution internal _distribution;
31
- Fee internal _initialProductFee;
32
- Fee internal _initialProcessingFee;
33
- TokenHandler internal _tokenHandler;
34
-
35
- NftId internal _poolNftId;
36
- NftId internal _distributionNftId;
31
+ abstract contract Product is
32
+ Component,
33
+ IProductComponent
34
+ {
35
+ // keccak256(abi.encode(uint256(keccak256("etherisc.storage.Product")) - 1)) & ~bytes32(uint256(0xff));
36
+ bytes32 public constant PRODUCT_STORAGE_LOCATION_V1 = 0x0bb7aafdb8e380f81267337bc5b5dfdf76e6d3a380ecadb51ec665246d9d6800;
37
+
38
+ struct ProductStorage {
39
+ IProductService _productService;
40
+ IApplicationService _applicationService;
41
+ IPolicyService _policyService;
42
+ IClaimService _claimService;
43
+ Pool _pool;
44
+ Distribution _distribution;
45
+ Fee _initialProductFee;
46
+ Fee _initialProcessingFee;
47
+ TokenHandler _tokenHandler;
48
+ NftId _poolNftId;
49
+ NftId _distributionNftId;
50
+ }
37
51
 
38
- function __initialize(
52
+ function initializeProduct(
39
53
  address registry,
40
- NftId instanceNftid,
54
+ NftId instanceNftId,
41
55
  string memory name,
42
56
  address token,
43
57
  bool isInterceptor,
@@ -46,30 +60,37 @@ abstract contract Product is Component, IProductComponent {
46
60
  Fee memory productFee,
47
61
  Fee memory processingFee,
48
62
  address initialOwner,
49
- bytes memory data
50
- ) internal {
51
- _initializeComponent(registry, instanceNftid, name, token, PRODUCT(), isInterceptor, initialOwner, data);
63
+ bytes memory registryData // writeonly data that will saved in the object info record of the registry
64
+ )
65
+ public
66
+ virtual
67
+ onlyInitializing()
68
+ {
69
+ initializeComponent(registry, instanceNftId, name, token, PRODUCT(), isInterceptor, initialOwner, registryData);
52
70
 
71
+ ProductStorage storage $ = _getProductStorage();
53
72
  // TODO add validation
54
- _policyService = getInstance().getPolicyService();
55
- _pool = Pool(pool);
56
- _distribution = Distribution(distribution);
57
- _initialProductFee = productFee;
58
- _initialProcessingFee = processingFee;
59
-
60
- _tokenHandler = new TokenHandler(token);
61
-
62
- _poolNftId = getRegistry().getNftId(address(_pool));
63
- _distributionNftId = getRegistry().getNftId(address(_distribution));
64
-
65
- _registerInterface(type(IProductComponent).interfaceId);
73
+ // TODO refactor to go via registry
74
+ $._productService = IProductService(_getServiceAddress(PRODUCT()));
75
+ $._applicationService = IApplicationService(_getServiceAddress(APPLICATION()));
76
+ $._policyService = IPolicyService(_getServiceAddress(POLICY()));
77
+ $._claimService = IClaimService(_getServiceAddress(CLAIM()));
78
+ $._pool = Pool(pool);
79
+ $._distribution = Distribution(distribution);
80
+ $._initialProductFee = productFee;
81
+ $._initialProcessingFee = processingFee;
82
+ $._tokenHandler = new TokenHandler(token);
83
+ $._poolNftId = getRegistry().getNftId(pool);
84
+ $._distributionNftId = getRegistry().getNftId(distribution);
85
+
86
+ registerInterface(type(IProductComponent).interfaceId);
66
87
  }
67
88
 
68
89
 
69
90
  function calculatePremium(
70
91
  uint256 sumInsuredAmount,
71
92
  RiskId riskId,
72
- uint256 lifetime,
93
+ Seconds lifetime,
73
94
  bytes memory applicationData,
74
95
  NftId bundleNftId,
75
96
  ReferralId referralId
@@ -79,7 +100,8 @@ abstract contract Product is Component, IProductComponent {
79
100
  override
80
101
  returns (uint256 premiumAmount)
81
102
  {
82
- (premiumAmount,,,,) = _policyService.calculatePremium(
103
+ IPolicy.Premium memory premium = _getProductStorage()._applicationService.calculatePremium(
104
+ getNftId(),
83
105
  riskId,
84
106
  sumInsuredAmount,
85
107
  lifetime,
@@ -87,13 +109,14 @@ abstract contract Product is Component, IProductComponent {
87
109
  bundleNftId,
88
110
  referralId
89
111
  );
112
+ premiumAmount = premium.premiumAmount;
90
113
  }
91
114
 
92
115
 
93
116
  function calculateNetPremium(
94
117
  uint256 sumInsuredAmount,
95
118
  RiskId riskId,
96
- uint256 lifetime,
119
+ Seconds lifetime,
97
120
  bytes memory applicationData
98
121
  )
99
122
  external
@@ -113,7 +136,7 @@ abstract contract Product is Component, IProductComponent {
113
136
  RiskId id,
114
137
  bytes memory data
115
138
  ) internal {
116
- getProductService().createRisk(
139
+ _getProductService().createRisk(
117
140
  id,
118
141
  data
119
142
  );
@@ -123,7 +146,7 @@ abstract contract Product is Component, IProductComponent {
123
146
  RiskId id,
124
147
  bytes memory data
125
148
  ) internal {
126
- getProductService().updateRisk(
149
+ _getProductService().updateRisk(
127
150
  id,
128
151
  data
129
152
  );
@@ -133,7 +156,7 @@ abstract contract Product is Component, IProductComponent {
133
156
  RiskId id,
134
157
  StateId state
135
158
  ) internal {
136
- getProductService().updateRiskState(
159
+ _getProductService().updateRiskState(
137
160
  id,
138
161
  state
139
162
  );
@@ -147,19 +170,22 @@ abstract contract Product is Component, IProductComponent {
147
170
  address applicationOwner,
148
171
  RiskId riskId,
149
172
  uint256 sumInsuredAmount,
150
- uint256 lifetime,
151
- bytes memory applicationData,
173
+ Seconds lifetime,
152
174
  NftId bundleNftId,
153
- ReferralId referralId
154
- ) internal returns (NftId nftId) {
155
- nftId = _policyService.createApplication(
175
+ ReferralId referralId,
176
+ bytes memory applicationData
177
+ )
178
+ internal
179
+ returns (NftId applicationNftId)
180
+ {
181
+ return _getProductStorage()._applicationService.create(
156
182
  applicationOwner,
157
183
  riskId,
158
184
  sumInsuredAmount,
159
185
  lifetime,
160
- applicationData,
161
186
  bundleNftId,
162
- referralId
187
+ referralId,
188
+ applicationData
163
189
  );
164
190
  }
165
191
 
@@ -170,7 +196,7 @@ abstract contract Product is Component, IProductComponent {
170
196
  )
171
197
  internal
172
198
  {
173
- _policyService.underwrite(
199
+ _getProductStorage()._policyService.underwrite(
174
200
  policyNftId,
175
201
  requirePremiumPayment,
176
202
  activateAt);
@@ -182,7 +208,7 @@ abstract contract Product is Component, IProductComponent {
182
208
  )
183
209
  internal
184
210
  {
185
- _policyService.collectPremium(
211
+ _getProductStorage()._policyService.collectPremium(
186
212
  policyNftId,
187
213
  activateAt);
188
214
  }
@@ -193,7 +219,7 @@ abstract contract Product is Component, IProductComponent {
193
219
  )
194
220
  internal
195
221
  {
196
- _policyService.activate(
222
+ _getProductStorage()._policyService.activate(
197
223
  policyNftId,
198
224
  activateAt);
199
225
  }
@@ -203,15 +229,15 @@ abstract contract Product is Component, IProductComponent {
203
229
  )
204
230
  internal
205
231
  {
206
- _policyService.close(policyNftId);
232
+ _getProductStorage()._policyService.close(policyNftId);
207
233
  }
208
234
 
209
235
  function getPoolNftId() external view override returns (NftId poolNftId) {
210
- return getRegistry().getNftId(address(_pool));
236
+ return getRegistry().getNftId(address(_getProductStorage()._pool));
211
237
  }
212
238
 
213
239
  function getDistributionNftId() external view override returns (NftId distributionNftId) {
214
- return getRegistry().getNftId(address(_distribution));
240
+ return getRegistry().getNftId(address(_getProductStorage()._distribution));
215
241
  }
216
242
 
217
243
  // from product component
@@ -221,9 +247,10 @@ abstract contract Product is Component, IProductComponent {
221
247
  )
222
248
  external
223
249
  onlyOwner
250
+ restricted()
224
251
  override
225
252
  {
226
- getProductService().setFees(productFee, processingFee);
253
+ _getProductService().setFees(productFee, processingFee);
227
254
  }
228
255
 
229
256
  function getSetupInfo() public view returns (ISetup.ProductSetupInfo memory setupInfo) {
@@ -237,22 +264,30 @@ abstract contract Product is Component, IProductComponent {
237
264
  }
238
265
 
239
266
  function _getInitialSetupInfo() internal view returns (ISetup.ProductSetupInfo memory setupInfo) {
240
- ISetup.DistributionSetupInfo memory distributionSetupInfo = _distribution.getSetupInfo();
241
- ISetup.PoolSetupInfo memory poolSetupInfo = _pool.getSetupInfo();
267
+ ProductStorage storage $ = _getProductStorage();
268
+
269
+ ISetup.DistributionSetupInfo memory distributionSetupInfo = $._distribution.getSetupInfo();
270
+ IComponents.PoolInfo memory poolInfo = $._pool.getPoolInfo();
242
271
 
243
272
  return ISetup.ProductSetupInfo(
244
273
  getToken(),
245
- _tokenHandler,
246
- _distributionNftId,
247
- _poolNftId,
248
- distributionSetupInfo.distributionFee,
249
- _initialProductFee,
250
- _initialProcessingFee,
251
- poolSetupInfo.poolFee,
252
- poolSetupInfo.stakingFee,
253
- poolSetupInfo.performanceFee,
274
+ $._tokenHandler,
275
+ $._distributionNftId,
276
+ $._poolNftId,
277
+ $._initialProductFee,
278
+ $._initialProcessingFee,
254
279
  false,
255
280
  getWallet()
256
281
  );
257
282
  }
283
+
284
+ function _getProductStorage() private pure returns (ProductStorage storage $) {
285
+ assembly {
286
+ $.slot := PRODUCT_STORAGE_LOCATION_V1
287
+ }
288
+ }
289
+
290
+ function _getProductService() internal view returns (IProductService) {
291
+ return _getProductStorage()._productService;
292
+ }
258
293
  }
@@ -0,0 +1,13 @@
1
+ // SPDX-License-Identifier: Apache-2.0
2
+ pragma solidity ^0.8.20;
3
+
4
+ import {AccessManagerUpgradeable} from "@openzeppelin/contracts-upgradeable/access/manager/AccessManagerUpgradeable.sol";
5
+
6
+
7
+ contract AccessManagerUpgradeableInitializeable is AccessManagerUpgradeable {
8
+
9
+ function initialize(address initialAdmin) initializer public {
10
+ __AccessManager_init(initialAdmin);
11
+ }
12
+
13
+ }
@@ -22,9 +22,10 @@ contract BundleManager is
22
22
  event LogBundleManagerBundleAdded(NftId poolNftId, NftId bundleNftId);
23
23
  event LogBundleManagerBundleUnlocked(NftId poolNftId, NftId bundleNftId);
24
24
  event LogBundleManagerBundleLocked(NftId poolNftId, NftId bundleNftId);
25
+ event LogBundleManagerBundleClosed(NftId poolNftId, NftId bundleNftId);
25
26
 
26
- error ErrorBundleManagerErrorPolicyAlreadyActivated(NftId policyNftId);
27
- error ErrorBundleManagerErrorBundleLocked(NftId bundleNftId, NftId policyNftId);
27
+ error ErrorBundleManagerPolicyAlreadyActivated(NftId policyNftId);
28
+ error ErrorBundleManagerBundleLocked(NftId bundleNftId, NftId policyNftId);
28
29
  error ErrorBundleManagerPolicyWithOpenClaims(NftId policyNftId, uint256 openClaimsCount);
29
30
  error ErrorBundleManagerPolicyNotCloseable(NftId policyNftId);
30
31
  error ErrorBundleManagerBundleUnknown(NftId bundleNftId);
@@ -32,7 +33,7 @@ contract BundleManager is
32
33
 
33
34
  mapping(NftId bundleNftId => LibNftIdSet.Set policies) internal _activePolicies;
34
35
 
35
- /// @dev links a policy with its bundle
36
+ /// @dev links a policy to its bundle
36
37
  // to link a policy it MUST NOT yet have been activated
37
38
  // the bundle MUST be unlocked (active) for linking (underwriting) and registered with this instance
38
39
  function linkPolicy(NftId policyNftId) external restricted() {
@@ -42,7 +43,7 @@ contract BundleManager is
42
43
 
43
44
  // ensure bundle is unlocked (in active set) and registered with this instance
44
45
  if (!_isActive(poolNftId, bundleNftId)) {
45
- revert ErrorBundleManagerErrorBundleLocked(bundleNftId, policyNftId);
46
+ revert ErrorBundleManagerBundleLocked(bundleNftId, policyNftId);
46
47
  }
47
48
 
48
49
  LibNftIdSet.add(_activePolicies[bundleNftId], policyNftId);
@@ -71,7 +72,7 @@ contract BundleManager is
71
72
  }
72
73
 
73
74
 
74
- /// @dev add a new bundle to a riskpool registerd with this instance
75
+ /// @dev add a new bundle to a pool registerd with this instance
75
76
  // the corresponding pool is fetched via instance reader
76
77
  function add(NftId bundleNftId) external restricted() {
77
78
  NftId poolNftId = _instance.getInstanceReader().getBundleInfo(bundleNftId).poolNftId;
@@ -85,6 +86,7 @@ contract BundleManager is
85
86
  emit LogBundleManagerBundleAdded(poolNftId, bundleNftId);
86
87
  }
87
88
 
89
+
88
90
  /// @dev unlocked (active) bundles are available to underwrite new policies
89
91
  function unlock(NftId bundleNftId) external restricted() {
90
92
  NftId poolNftId = _instance.getInstanceReader().getBundleInfo(bundleNftId).poolNftId;
@@ -10,7 +10,8 @@ abstract contract Cloneable is
10
10
  AccessManagedUpgradeable
11
11
  {
12
12
  event CloneableInitialized(address authority, address registry);
13
-
13
+
14
+ error CloneableAuthorityZero();
14
15
  error CloneableRegistryInvalid(address registry);
15
16
 
16
17
  IRegistry internal _registry;
@@ -25,9 +26,13 @@ abstract contract Cloneable is
25
26
  address registry
26
27
  )
27
28
  public
28
- initializer
29
+ onlyInitializing
29
30
  {
30
31
  // check/handle access managed
32
+ if(authority == address(0)) {
33
+ revert CloneableAuthorityZero();
34
+ }
35
+
31
36
  __AccessManaged_init(authority);
32
37
 
33
38
  // check/handle registry
@@ -6,19 +6,25 @@ import {IAccessManaged} from "@openzeppelin/contracts/access/manager/IAccessMana
6
6
  import {NftId} from "../types/NftId.sol";
7
7
  import {StateId} from "../types/StateId.sol";
8
8
  import {RiskId} from "../types/RiskId.sol";
9
+ import {VersionPart} from "../types/Version.sol";
10
+ import {Key32} from "../types/Key32.sol";
9
11
 
10
12
  import {IRegisterable} from "../shared/IRegisterable.sol";
11
13
 
14
+ import {ITransferInterceptor} from "../registry/ITransferInterceptor.sol";
15
+
12
16
  import {InstanceAccessManager} from "./InstanceAccessManager.sol";
13
17
  import {BundleManager} from "./BundleManager.sol";
14
18
  import {InstanceReader} from "./InstanceReader.sol";
15
19
 
16
20
  import {IBundle} from "./module/IBundle.sol";
17
21
  import {IBundleService} from "./service/IBundleService.sol";
22
+ import {IComponents} from "./module/IComponents.sol";
18
23
  import {IDistributionService} from "./service/IDistributionService.sol";
19
24
  import {InstanceAccessManager} from "./InstanceAccessManager.sol";
20
25
  import {IKeyValueStore} from "./base/IKeyValueStore.sol";
21
26
  import {IPolicy} from "./module/IPolicy.sol";
27
+ import {IDistribution} from "./module/IDistribution.sol";
22
28
  import {IPolicyService} from "./service/IPolicyService.sol";
23
29
  import {IPoolService} from "./service/IPoolService.sol";
24
30
  import {IProductService} from "./service/IProductService.sol";
@@ -26,16 +32,15 @@ import {IPolicyService} from "./service/IPolicyService.sol";
26
32
  import {IBundleService} from "./service/IBundleService.sol";
27
33
  import {IRisk} from "./module/IRisk.sol";
28
34
  import {ISetup} from "./module/ISetup.sol";
29
- import {NftId} from "../types/NftId.sol";
30
- import {RiskId} from "../types/RiskId.sol";
31
- import {StateId} from "../types/StateId.sol";
32
- import {VersionPart} from "../types/Version.sol";
33
-
34
35
 
35
36
 
36
37
 
37
- interface IInstance is IRegisterable, IKeyValueStore, IAccessManaged {
38
-
38
+ interface IInstance is
39
+ IRegisterable,
40
+ ITransferInterceptor,
41
+ IAccessManaged,
42
+ IKeyValueStore
43
+ {
39
44
  function getDistributionService() external view returns (IDistributionService);
40
45
  function getProductService() external view returns (IProductService);
41
46
  function getPoolService() external view returns (IPoolService);
@@ -46,8 +51,8 @@ interface IInstance is IRegisterable, IKeyValueStore, IAccessManaged {
46
51
  function updateDistributionSetup(NftId distributionNftId, ISetup.DistributionSetupInfo memory setup, StateId newState) external;
47
52
  function updateDistributionSetupState(NftId distributionNftId, StateId newState) external;
48
53
 
49
- function createPoolSetup(NftId poolNftId, ISetup.PoolSetupInfo memory setup) external;
50
- function updatePoolSetup(NftId poolNftId, ISetup.PoolSetupInfo memory setup, StateId newState) external;
54
+ function createPoolSetup(NftId poolNftId, IComponents.ComponentInfo memory info) external;
55
+ function updatePoolSetup(NftId poolNftId, IComponents.ComponentInfo memory info, StateId newState) external;
51
56
  function updatePoolSetupState(NftId poolNftId, StateId newState) external;
52
57
 
53
58
  function createBundle(NftId bundleNftId, IBundle.BundleInfo memory bundle) external;
@@ -58,15 +63,36 @@ interface IInstance is IRegisterable, IKeyValueStore, IAccessManaged {
58
63
  function updateProductSetup(NftId productNftId, ISetup.ProductSetupInfo memory setup, StateId newState) external;
59
64
  function updateProductSetupState(NftId productNftId, StateId newState) external;
60
65
 
66
+ function createDistributorType(Key32 distributorKey, IDistribution.DistributorTypeInfo memory info) external;
67
+ function updateDistributorType(Key32 distributorKey, IDistribution.DistributorTypeInfo memory info, StateId newState) external;
68
+ function updateDistributorTypeState(Key32 distributorKey, StateId newState) external;
69
+
70
+ function createDistributor(NftId nftId, IDistribution.DistributorInfo memory info) external;
71
+ function updateDistributor(NftId nftId, IDistribution.DistributorInfo memory info, StateId newState) external;
72
+ function updateDistributorState(NftId nftId, StateId newState) external;
73
+
74
+ function createReferral(Key32 referralKey, IDistribution.ReferralInfo memory referralInfo) external;
75
+ function updateReferral(Key32 referralKey, IDistribution.ReferralInfo memory referralInfo, StateId newState) external;
76
+ function updateReferralState(Key32 referralKey, StateId newState) external;
77
+
61
78
  function createRisk(RiskId riskId, IRisk.RiskInfo memory risk) external;
62
79
  function updateRisk(RiskId riskId, IRisk.RiskInfo memory risk, StateId newState) external;
63
80
  function updateRiskState(RiskId riskId, StateId newState) external;
64
81
 
65
- function createPolicy(NftId policyNftId, IPolicy.PolicyInfo memory policy) external;
82
+ function createApplication(NftId applicationNftId, IPolicy.PolicyInfo memory policy) external;
83
+ function updateApplication(NftId applicationNftId, IPolicy.PolicyInfo memory policy, StateId newState) external;
84
+ function updateApplicationState(NftId applicationNftId, StateId newState) external;
85
+
66
86
  function updatePolicy(NftId policyNftId, IPolicy.PolicyInfo memory policy, StateId newState) external;
67
87
  function updatePolicyState(NftId policyNftId, StateId newState) external;
68
88
 
89
+ // TODO add claims/payouts function to instance
90
+ // function updateClaims(NftId policyNftId, IPolicy.PolicyInfo memory policy, StateId newState) external;
91
+
69
92
  function getMajorVersion() external pure returns (VersionPart majorVersion);
70
93
  function getInstanceReader() external view returns (InstanceReader);
71
94
  function getBundleManager() external view returns (BundleManager);
95
+
96
+ function setInstanceAccessManager(InstanceAccessManager accessManager) external;
97
+ function getInstanceAccessManager() external view returns (InstanceAccessManager);
72
98
  }
@@ -10,6 +10,7 @@ import {IRegistry} from "../registry/IRegistry.sol";
10
10
  import {IRegisterable} from "../shared/IRegisterable.sol";
11
11
  import {IComponent} from "../components/IComponent.sol";
12
12
 
13
+ import {AccessManagerUpgradeableInitializeable} from "./AccessManagerUpgradeableInitializeable.sol";
13
14
  import {InstanceAccessManager} from "./InstanceAccessManager.sol";
14
15
  import {Instance} from "./Instance.sol";
15
16
  import {InstanceReader} from "./InstanceReader.sol";
@@ -17,24 +18,55 @@ import {BundleManager} from "./BundleManager.sol";
17
18
 
18
19
  interface IInstanceService is IService {
19
20
 
21
+ error ErrorInstanceServiceMasterInstanceAlreadySet();
22
+ error ErrorInstanceServiceMasterOzAccessManagerAlreadySet();
23
+ error ErrorInstanceServiceMasterInstanceAccessManagerAlreadySet();
24
+ error ErrorInstanceServiceMasterBundleManagerAlreadySet();
25
+ error ErrorInstanceServiceInstanceAddressZero();
26
+
27
+ error ErrorInstanceServiceMasterInstanceReaderNotSet();
28
+ error ErrorInstanceServiceInstanceReaderAddressZero();
29
+ error ErrorInstanceServiceInstanceReaderSameAsMasterInstanceReader();
30
+ error ErrorInstanceServiceInstanceReaderInstanceMismatch();
31
+
32
+ error ErrorInstanceServiceOzAccessManagerZero();
33
+ error ErrorInstanceServiceInstanceAccessManagerZero();
34
+ error ErrorInstanceServiceInstanceReaderZero();
35
+ error ErrorInstanceServiceBundleManagerZero();
36
+
37
+ error ErrorInstanceServiceInstanceAuthorityMismatch();
38
+ error ErrorInstanceServiceBundleManagerAuthorityMismatch();
39
+ error ErrorInstanceServiceInstanceReaderInstanceMismatch2();
40
+ error ErrorInstanceServiceBundleMangerInstanceMismatch();
41
+
20
42
  error ErrorInstanceServiceRequestUnauhorized(address caller);
21
43
  error ErrorInstanceServiceNotInstanceOwner(address caller, NftId instanceNftId);
44
+ error ErrorInstanceServiceNotInstance(NftId nftId);
22
45
  error ErrorInstanceServiceComponentNotRegistered(address componentAddress);
46
+ error ErrorInstanceServiceInstanceComponentMismatch(NftId instanceNftId, NftId componentNftId);
47
+ error ErrorInstanceServiceInvalidComponentType(address componentAddress, ObjectType expectedType, ObjectType componentType);
23
48
 
24
- event LogInstanceCloned(address clonedAccessManagerAddress, address clonedInstanceAddress, address clonedInstanceReaderAddress, NftId clonedInstanceNftId);
49
+ event LogInstanceCloned(address clonedOzAccessManager, address clonedInstanceAccessManager, address clonedInstance, address clonedBundleManager, address clonedInstanceReader, NftId clonedInstanceNftId);
25
50
 
26
51
  function createInstanceClone()
27
52
  external
28
53
  returns (
29
- InstanceAccessManager clonedAccessManager,
54
+ AccessManagerUpgradeableInitializeable clonedOzAccessManager,
55
+ InstanceAccessManager clonedInstanceAccessManager,
30
56
  Instance clonedInstance,
31
57
  NftId instanceNftId,
32
58
  InstanceReader clonedInstanceReader,
33
59
  BundleManager clonedBundleManager
34
60
  );
35
61
 
36
- function hasRole(address account, RoleId role, address instanceAddress) external returns (bool);
37
- function setTargetLocked(string memory targetName, bool locked) external;
62
+ function createGifTarget(
63
+ NftId instanceNftId,
64
+ address targetAddress,
65
+ string memory targetName,
66
+ bytes4[][] memory selectors,
67
+ RoleId[] memory roles
68
+ ) external;
38
69
 
70
+ function setComponentLocked(bool locked) external;
39
71
  }
40
72