@etherisc/gif-next 0.0.2-f7b8c9f-518 → 0.0.2-f7eda15-119

Sign up to get free protection for your applications and to get access to all the features.
Files changed (394) hide show
  1. package/README.md +171 -2
  2. package/artifacts/contracts/components/Component.sol/Component.dbg.json +4 -0
  3. package/artifacts/contracts/components/Component.sol/Component.json +656 -0
  4. package/artifacts/contracts/components/Distribution.sol/Distribution.dbg.json +1 -1
  5. package/artifacts/contracts/components/Distribution.sol/Distribution.json +396 -104
  6. package/artifacts/contracts/components/IComponent.sol/IComponent.dbg.json +4 -0
  7. package/artifacts/contracts/{instance/base/ServiceBase.sol/ServiceBase.json → components/IComponent.sol/IComponent.json} +152 -165
  8. package/artifacts/contracts/components/IDistributionComponent.sol/IDistributionComponent.dbg.json +1 -1
  9. package/artifacts/contracts/components/IDistributionComponent.sol/IDistributionComponent.json +480 -9
  10. package/artifacts/contracts/components/IPoolComponent.sol/IPoolComponent.dbg.json +1 -1
  11. package/artifacts/contracts/components/IPoolComponent.sol/IPoolComponent.json +526 -65
  12. package/artifacts/contracts/components/IProductComponent.sol/IProductComponent.dbg.json +1 -1
  13. package/artifacts/contracts/components/IProductComponent.sol/IProductComponent.json +571 -30
  14. package/artifacts/contracts/components/Pool.sol/Pool.dbg.json +1 -1
  15. package/artifacts/contracts/components/Pool.sol/Pool.json +455 -201
  16. package/artifacts/contracts/components/Product.sol/Product.dbg.json +1 -1
  17. package/artifacts/contracts/components/Product.sol/Product.json +474 -139
  18. package/artifacts/contracts/experiment/cloning/Cloner.sol/Cloner.dbg.json +4 -0
  19. package/artifacts/contracts/experiment/cloning/Cloner.sol/Cloner.json +66 -0
  20. package/artifacts/contracts/experiment/cloning/Cloner.sol/Mock1.dbg.json +4 -0
  21. package/artifacts/contracts/experiment/cloning/Cloner.sol/Mock1.json +24 -0
  22. package/artifacts/contracts/experiment/cloning/Cloner.sol/Mock2.dbg.json +4 -0
  23. package/artifacts/contracts/experiment/cloning/Cloner.sol/Mock2.json +42 -0
  24. package/artifacts/contracts/experiment/errors/Require.sol/Require.dbg.json +1 -1
  25. package/artifacts/contracts/experiment/errors/Revert.sol/Revert.dbg.json +1 -1
  26. package/artifacts/contracts/experiment/inheritance/A.sol/A.dbg.json +1 -1
  27. package/artifacts/contracts/experiment/inheritance/A.sol/AShared.dbg.json +1 -1
  28. package/artifacts/contracts/experiment/inheritance/B.sol/B.dbg.json +1 -1
  29. package/artifacts/contracts/experiment/inheritance/C.sol/C.dbg.json +1 -1
  30. package/artifacts/contracts/experiment/inheritance/IA.sol/IA.dbg.json +1 -1
  31. package/artifacts/contracts/experiment/inheritance/IA.sol/ISharedA.dbg.json +1 -1
  32. package/artifacts/contracts/experiment/inheritance/IB.sol/IB.dbg.json +1 -1
  33. package/artifacts/contracts/experiment/inheritance/IC.sol/IC.dbg.json +1 -1
  34. package/artifacts/contracts/experiment/statemachine/Dummy.sol/LifeCycleModule.dbg.json +1 -1
  35. package/artifacts/contracts/experiment/statemachine/Dummy.sol/LifeCycleModule.json +2 -2
  36. package/artifacts/contracts/experiment/statemachine/ISM.sol/ISM.dbg.json +1 -1
  37. package/artifacts/contracts/experiment/statemachine/ISM.sol/ISMEE.dbg.json +1 -1
  38. package/artifacts/contracts/experiment/statemachine/SM.sol/SM.dbg.json +1 -1
  39. package/artifacts/contracts/experiment/statemachine/SM.sol/SM.json +2 -2
  40. package/artifacts/contracts/experiment/statemachine/SimpleStateMachine.sol/SimpleStateMachine.dbg.json +1 -1
  41. package/artifacts/contracts/experiment/statemachine/SimpleStateMachine.sol/SimpleStateMachine.json +2 -2
  42. package/artifacts/contracts/experiment/types/TypeA.sol/TypeALib.dbg.json +1 -1
  43. package/artifacts/contracts/experiment/types/TypeB.sol/TypeBLib.dbg.json +1 -1
  44. package/artifacts/contracts/instance/BundleManager.sol/BundleManager.dbg.json +4 -0
  45. package/artifacts/contracts/instance/BundleManager.sol/BundleManager.json +764 -0
  46. package/artifacts/contracts/instance/Cloneable.sol/Cloneable.dbg.json +4 -0
  47. package/artifacts/contracts/instance/Cloneable.sol/Cloneable.json +185 -0
  48. package/artifacts/contracts/instance/IInstance.sol/IInstance.dbg.json +1 -1
  49. package/artifacts/contracts/instance/IInstance.sol/IInstance.json +1085 -1354
  50. package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.dbg.json +4 -0
  51. package/artifacts/contracts/instance/{service/IComponentOwnerService.sol/IComponentOwnerService.json → IInstanceService.sol/IInstanceService.json} +176 -56
  52. package/artifacts/contracts/instance/Instance.sol/Instance.dbg.json +1 -1
  53. package/artifacts/contracts/instance/Instance.sol/Instance.json +1731 -1355
  54. package/artifacts/contracts/instance/InstanceAccessManager.sol/InstanceAccessManager.dbg.json +4 -0
  55. package/artifacts/contracts/instance/InstanceAccessManager.sol/InstanceAccessManager.json +1034 -0
  56. package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.dbg.json +4 -0
  57. package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.json +1381 -0
  58. package/artifacts/contracts/instance/InstanceService.sol/InstanceService.dbg.json +4 -0
  59. package/artifacts/contracts/instance/InstanceService.sol/InstanceService.json +1024 -0
  60. package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.dbg.json +4 -0
  61. package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.json +473 -0
  62. package/artifacts/contracts/instance/ObjectManager.sol/ObjectManager.dbg.json +4 -0
  63. package/artifacts/contracts/instance/ObjectManager.sol/ObjectManager.json +261 -0
  64. package/artifacts/contracts/instance/base/ComponentService.sol/ComponentService.dbg.json +4 -0
  65. package/artifacts/contracts/instance/base/{InstanceBase.sol/InstanceBase.json → ComponentService.sol/ComponentService.json} +134 -75
  66. package/artifacts/contracts/instance/base/IKeyValueStore.sol/IKeyValueStore.dbg.json +1 -1
  67. package/artifacts/contracts/instance/base/IKeyValueStore.sol/IKeyValueStore.json +27 -158
  68. package/artifacts/contracts/instance/base/ILifecycle.sol/ILifecycle.dbg.json +1 -1
  69. package/artifacts/contracts/instance/base/KeyValueStore.sol/KeyValueStore.dbg.json +1 -1
  70. package/artifacts/contracts/instance/base/KeyValueStore.sol/KeyValueStore.json +37 -245
  71. package/artifacts/contracts/instance/base/Lifecycle.sol/Lifecycle.dbg.json +1 -1
  72. package/artifacts/contracts/instance/base/Lifecycle.sol/Lifecycle.json +2 -2
  73. package/artifacts/contracts/instance/module/IAccess.sol/IAccess.dbg.json +4 -0
  74. package/artifacts/contracts/instance/module/IAccess.sol/IAccess.json +254 -0
  75. package/artifacts/contracts/instance/module/IBundle.sol/IBundle.dbg.json +4 -0
  76. package/artifacts/contracts/instance/module/{bundle/IBundle.sol → IBundle.sol}/IBundle.json +1 -1
  77. package/artifacts/contracts/instance/module/IDistribution.sol/IDistribution.dbg.json +4 -0
  78. package/artifacts/contracts/instance/module/{distribution/IDistribution.sol → IDistribution.sol}/IDistribution.json +1 -1
  79. package/artifacts/contracts/instance/module/IPolicy.sol/IPolicy.dbg.json +4 -0
  80. package/artifacts/contracts/instance/module/{policy/IPolicy.sol → IPolicy.sol}/IPolicy.json +1 -1
  81. package/artifacts/contracts/instance/module/IRisk.sol/IRisk.dbg.json +4 -0
  82. package/artifacts/contracts/instance/module/{risk/IRisk.sol → IRisk.sol}/IRisk.json +1 -1
  83. package/artifacts/contracts/instance/module/ISetup.sol/ISetup.dbg.json +4 -0
  84. package/artifacts/contracts/instance/{base/ModuleBase.sol/ModuleBase.json → module/ISetup.sol/ISetup.json} +2 -2
  85. package/artifacts/contracts/instance/module/ITreasury.sol/ITreasury.dbg.json +4 -0
  86. package/artifacts/contracts/instance/module/{treasury/ITreasury.sol → ITreasury.sol}/ITreasury.json +1 -1
  87. package/artifacts/contracts/instance/service/BundleService.sol/BundleService.dbg.json +4 -0
  88. package/artifacts/contracts/instance/service/BundleService.sol/BundleService.json +1102 -0
  89. package/artifacts/contracts/instance/service/BundleServiceManager.sol/BundleServiceManager.dbg.json +4 -0
  90. package/artifacts/contracts/instance/service/BundleServiceManager.sol/BundleServiceManager.json +449 -0
  91. package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.dbg.json +1 -1
  92. package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.json +194 -52
  93. package/artifacts/contracts/instance/service/DistributionServiceManager.sol/DistributionServiceManager.dbg.json +4 -0
  94. package/artifacts/contracts/instance/service/DistributionServiceManager.sol/DistributionServiceManager.json +437 -0
  95. package/artifacts/contracts/instance/service/IBundleService.sol/IBundleService.dbg.json +4 -0
  96. package/artifacts/contracts/instance/service/IBundleService.sol/IBundleService.json +715 -0
  97. package/artifacts/contracts/instance/service/IDistributionService.sol/IDistributionService.dbg.json +1 -1
  98. package/artifacts/contracts/instance/service/IDistributionService.sol/IDistributionService.json +13 -18
  99. package/artifacts/contracts/instance/service/IPolicyService.sol/IPolicyService.dbg.json +4 -0
  100. package/artifacts/contracts/instance/service/IPolicyService.sol/IPolicyService.json +766 -0
  101. package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.dbg.json +1 -1
  102. package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.json +15 -82
  103. package/artifacts/contracts/instance/service/IProductService.sol/IProductService.dbg.json +1 -1
  104. package/artifacts/contracts/instance/service/IProductService.sol/IProductService.json +25 -245
  105. package/artifacts/contracts/instance/service/PolicyService.sol/PolicyService.dbg.json +4 -0
  106. package/artifacts/contracts/instance/service/PolicyService.sol/PolicyService.json +1227 -0
  107. package/artifacts/contracts/instance/service/PolicyServiceManager.sol/PolicyServiceManager.dbg.json +4 -0
  108. package/artifacts/contracts/instance/service/PolicyServiceManager.sol/PolicyServiceManager.json +505 -0
  109. package/artifacts/contracts/instance/service/PoolService.sol/PoolService.dbg.json +1 -1
  110. package/artifacts/contracts/instance/service/PoolService.sol/PoolService.json +181 -128
  111. package/artifacts/contracts/instance/service/PoolServiceManager.sol/PoolServiceManager.dbg.json +4 -0
  112. package/artifacts/contracts/instance/service/PoolServiceManager.sol/PoolServiceManager.json +437 -0
  113. package/artifacts/contracts/instance/service/ProductService.sol/ProductService.dbg.json +1 -1
  114. package/artifacts/contracts/instance/service/ProductService.sol/ProductService.json +174 -386
  115. package/artifacts/contracts/instance/service/ProductServiceManager.sol/ProductServiceManager.dbg.json +4 -0
  116. package/artifacts/contracts/instance/service/ProductServiceManager.sol/ProductServiceManager.json +437 -0
  117. package/artifacts/contracts/registry/ChainNft.sol/ChainNft.dbg.json +1 -1
  118. package/artifacts/contracts/registry/ChainNft.sol/ChainNft.json +47 -2
  119. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.dbg.json +1 -1
  120. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.json +223 -63
  121. package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.dbg.json +1 -1
  122. package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.json +285 -49
  123. package/artifacts/contracts/registry/ITransferInterceptor.sol/ITransferInterceptor.dbg.json +1 -1
  124. package/artifacts/contracts/registry/Registry.sol/Registry.dbg.json +1 -1
  125. package/artifacts/contracts/registry/Registry.sol/Registry.json +196 -211
  126. package/artifacts/contracts/registry/RegistryAccessManager.sol/RegistryAccessManager.dbg.json +4 -0
  127. package/artifacts/contracts/registry/RegistryAccessManager.sol/RegistryAccessManager.json +285 -0
  128. package/artifacts/contracts/registry/RegistryService.sol/RegistryService.dbg.json +1 -1
  129. package/artifacts/contracts/registry/RegistryService.sol/RegistryService.json +314 -111
  130. package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.dbg.json +1 -1
  131. package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.json +72 -76
  132. package/artifacts/contracts/registry/ReleaseManager.sol/ReleaseManager.dbg.json +4 -0
  133. package/artifacts/contracts/registry/ReleaseManager.sol/ReleaseManager.json +547 -0
  134. package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.dbg.json +4 -0
  135. package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.json +394 -0
  136. package/artifacts/contracts/shared/ContractDeployerLib.sol/ContractDeployerLib.dbg.json +1 -1
  137. package/artifacts/contracts/shared/ERC165.sol/ERC165.dbg.json +1 -1
  138. package/artifacts/contracts/shared/ERC165.sol/ERC165.json +2 -2
  139. package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.dbg.json +1 -1
  140. package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.dbg.json +1 -1
  141. package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.json +0 -5
  142. package/artifacts/contracts/shared/IService.sol/IService.dbg.json +4 -0
  143. package/artifacts/contracts/{instance/base → shared}/IService.sol/IService.json +14 -19
  144. package/artifacts/contracts/shared/IVersionable.sol/IVersionable.dbg.json +1 -1
  145. package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.dbg.json +1 -1
  146. package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.json +19 -6
  147. package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.dbg.json +1 -1
  148. package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.json +19 -6
  149. package/artifacts/contracts/shared/Registerable.sol/Registerable.dbg.json +1 -1
  150. package/artifacts/contracts/shared/Registerable.sol/Registerable.json +19 -11
  151. package/artifacts/contracts/shared/Service.sol/Service.dbg.json +4 -0
  152. package/artifacts/contracts/{instance/base/ComponentServiceBase.sol/ComponentServiceBase.json → shared/Service.sol/Service.json} +28 -33
  153. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.dbg.json +4 -0
  154. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.json +96 -0
  155. package/artifacts/contracts/shared/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.dbg.json +1 -1
  156. package/artifacts/contracts/shared/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.json +2 -2
  157. package/artifacts/contracts/shared/Versionable.sol/Versionable.dbg.json +1 -1
  158. package/artifacts/contracts/test/TestFee.sol/TestFee.dbg.json +1 -1
  159. package/artifacts/contracts/test/TestFee.sol/TestFee.json +4 -4
  160. package/artifacts/contracts/test/TestRegisterable.sol/TestRegisterable.dbg.json +1 -1
  161. package/artifacts/contracts/test/TestRegisterable.sol/TestRegisterable.json +19 -11
  162. package/artifacts/contracts/test/TestRoleId.sol/TestRoleId.dbg.json +1 -1
  163. package/artifacts/contracts/test/TestRoleId.sol/TestRoleId.json +14 -14
  164. package/artifacts/contracts/test/TestService.sol/TestService.dbg.json +1 -1
  165. package/artifacts/contracts/test/TestService.sol/TestService.json +58 -34
  166. package/artifacts/contracts/test/TestToken.sol/TestUsdc.dbg.json +1 -1
  167. package/artifacts/contracts/test/TestToken.sol/TestUsdc.json +91 -53
  168. package/artifacts/contracts/test/TestVersion.sol/TestVersion.dbg.json +1 -1
  169. package/artifacts/contracts/test/TestVersion.sol/TestVersion.json +2 -2
  170. package/artifacts/contracts/test/TestVersionable.sol/TestVersionable.dbg.json +1 -1
  171. package/artifacts/contracts/test/TestVersionable.sol/TestVersionable.json +18 -2
  172. package/artifacts/contracts/test/Usdc.sol/USDC.dbg.json +1 -1
  173. package/artifacts/contracts/test/Usdc.sol/USDC.json +91 -53
  174. package/artifacts/contracts/types/AddressSet.sol/LibAddressSet.dbg.json +1 -1
  175. package/artifacts/contracts/types/Blocknumber.sol/BlocknumberLib.dbg.json +1 -1
  176. package/artifacts/contracts/types/ChainId.sol/ChainIdLib.dbg.json +1 -1
  177. package/artifacts/contracts/types/DistributorType.sol/DistributorTypeLib.dbg.json +4 -0
  178. package/artifacts/contracts/types/DistributorType.sol/DistributorTypeLib.json +104 -0
  179. package/artifacts/contracts/types/Fee.sol/FeeLib.dbg.json +1 -1
  180. package/artifacts/contracts/types/Fee.sol/FeeLib.json +4 -4
  181. package/artifacts/contracts/types/Key32.sol/Key32Lib.dbg.json +1 -1
  182. package/artifacts/contracts/types/Key32.sol/Key32Lib.json +31 -17
  183. package/artifacts/contracts/types/NftId.sol/NftIdLib.dbg.json +1 -1
  184. package/artifacts/contracts/types/NftId.sol/NftIdLib.json +2 -2
  185. package/artifacts/contracts/types/NftIdSet.sol/LibNftIdSet.dbg.json +1 -1
  186. package/artifacts/contracts/types/NftIdSet.sol/LibNftIdSet.json +26 -3
  187. package/artifacts/contracts/types/NumberId.sol/NumberIdLib.dbg.json +4 -0
  188. package/artifacts/contracts/types/NumberId.sol/NumberIdLib.json +100 -0
  189. package/artifacts/contracts/types/ObjectType.sol/ObjectTypeLib.dbg.json +1 -1
  190. package/artifacts/contracts/types/ObjectType.sol/ObjectTypeLib.json +2 -2
  191. package/artifacts/contracts/types/Referral.sol/ReferralLib.dbg.json +4 -0
  192. package/artifacts/contracts/types/Referral.sol/ReferralLib.json +123 -0
  193. package/artifacts/contracts/types/RiskId.sol/RiskIdLib.dbg.json +1 -1
  194. package/artifacts/contracts/types/RiskId.sol/RiskIdLib.json +2 -2
  195. package/artifacts/contracts/types/RoleId.sol/RoleIdLib.dbg.json +1 -1
  196. package/artifacts/contracts/types/RoleId.sol/RoleIdLib.json +134 -8
  197. package/artifacts/contracts/types/StateId.sol/StateIdLib.dbg.json +1 -1
  198. package/artifacts/contracts/types/StateId.sol/StateIdLib.json +2 -2
  199. package/artifacts/contracts/types/Timestamp.sol/TimestampLib.dbg.json +1 -1
  200. package/artifacts/contracts/types/Timestamp.sol/TimestampLib.json +15 -2
  201. package/artifacts/contracts/types/UFixed.sol/MathLib.dbg.json +4 -0
  202. package/artifacts/contracts/types/UFixed.sol/MathLib.json +10 -0
  203. package/artifacts/contracts/types/UFixed.sol/UFixedLib.dbg.json +4 -0
  204. package/artifacts/contracts/types/UFixed.sol/{UFixedMathLib.json → UFixedLib.json} +3 -3
  205. package/artifacts/contracts/types/Version.sol/VersionLib.dbg.json +1 -1
  206. package/artifacts/contracts/types/Version.sol/VersionLib.json +2 -2
  207. package/artifacts/contracts/types/Version.sol/VersionPartLib.dbg.json +1 -1
  208. package/artifacts/contracts/types/Version.sol/VersionPartLib.json +22 -3
  209. package/contracts/components/Component.sol +216 -0
  210. package/contracts/components/Distribution.sol +48 -53
  211. package/contracts/components/IComponent.sol +43 -0
  212. package/contracts/components/IDistributionComponent.sol +6 -5
  213. package/contracts/components/IPoolComponent.sol +11 -15
  214. package/contracts/components/IProductComponent.sol +9 -7
  215. package/contracts/components/Pool.sol +77 -96
  216. package/contracts/components/Product.sol +83 -117
  217. package/contracts/experiment/cloning/Cloner.sol +47 -0
  218. package/contracts/instance/BundleManager.sol +125 -0
  219. package/contracts/instance/Cloneable.sol +46 -0
  220. package/contracts/instance/IInstance.sol +64 -46
  221. package/contracts/instance/IInstanceService.sol +41 -0
  222. package/contracts/instance/Instance.sol +251 -69
  223. package/contracts/instance/InstanceAccessManager.sol +298 -0
  224. package/contracts/instance/InstanceReader.sol +293 -0
  225. package/contracts/instance/InstanceService.sol +435 -0
  226. package/contracts/instance/InstanceServiceManager.sol +54 -0
  227. package/contracts/instance/ObjectManager.sol +84 -0
  228. package/contracts/instance/base/ComponentService.sol +134 -0
  229. package/contracts/instance/base/IKeyValueStore.sol +13 -14
  230. package/contracts/instance/base/ILifecycle.sol +3 -3
  231. package/contracts/instance/base/KeyValueStore.sol +49 -38
  232. package/contracts/instance/base/Lifecycle.sol +1 -1
  233. package/contracts/instance/module/IAccess.sol +48 -0
  234. package/contracts/instance/module/IBundle.sol +20 -0
  235. package/contracts/instance/module/IDistribution.sol +39 -0
  236. package/contracts/instance/module/IPolicy.sol +45 -0
  237. package/contracts/instance/module/IRisk.sol +11 -0
  238. package/contracts/instance/module/ISetup.sol +46 -0
  239. package/contracts/instance/module/ITreasury.sol +23 -0
  240. package/contracts/instance/service/BundleService.sol +293 -0
  241. package/contracts/instance/service/BundleServiceManager.sol +51 -0
  242. package/contracts/instance/service/DistributionService.sol +72 -20
  243. package/contracts/instance/service/DistributionServiceManager.sol +51 -0
  244. package/contracts/instance/service/IBundleService.sol +44 -0
  245. package/contracts/instance/service/IDistributionService.sol +1 -1
  246. package/contracts/instance/service/IPolicyService.sol +94 -0
  247. package/contracts/instance/service/IPoolService.sol +7 -24
  248. package/contracts/instance/service/IProductService.sol +9 -76
  249. package/contracts/instance/service/PolicyService.sol +538 -0
  250. package/contracts/instance/service/PolicyServiceManager.sol +54 -0
  251. package/contracts/instance/service/PoolService.sol +77 -116
  252. package/contracts/instance/service/PoolServiceManager.sol +51 -0
  253. package/contracts/instance/service/ProductService.sol +157 -433
  254. package/contracts/instance/service/ProductServiceManager.sol +54 -0
  255. package/contracts/registry/ChainNft.sol +41 -26
  256. package/contracts/registry/IRegistry.sol +50 -25
  257. package/contracts/registry/IRegistryService.sol +52 -16
  258. package/contracts/registry/Registry.sol +266 -305
  259. package/contracts/registry/RegistryAccessManager.sol +216 -0
  260. package/contracts/registry/RegistryService.sol +130 -236
  261. package/contracts/registry/RegistryServiceManager.sol +28 -9
  262. package/contracts/registry/ReleaseManager.sol +332 -0
  263. package/contracts/registry/TokenRegistry.sol +112 -0
  264. package/contracts/shared/ERC165.sol +7 -3
  265. package/contracts/shared/IRegisterable.sol +2 -4
  266. package/contracts/shared/IService.sol +16 -0
  267. package/contracts/shared/NftOwnable.sol +7 -4
  268. package/contracts/shared/ProxyManager.sol +4 -4
  269. package/contracts/shared/Registerable.sol +12 -15
  270. package/contracts/shared/Service.sol +60 -0
  271. package/contracts/shared/TokenHandler.sol +27 -0
  272. package/contracts/shared/UpgradableProxyWithAdmin.sol +2 -2
  273. package/contracts/shared/Versionable.sol +3 -3
  274. package/contracts/test/TestFee.sol +2 -2
  275. package/contracts/test/TestRoleId.sol +1 -1
  276. package/contracts/test/TestService.sol +6 -7
  277. package/contracts/types/DistributorType.sol +55 -0
  278. package/contracts/types/Fee.sol +3 -3
  279. package/contracts/types/Key32.sol +8 -3
  280. package/contracts/types/NftIdSet.sol +26 -24
  281. package/contracts/types/NumberId.sol +52 -0
  282. package/contracts/types/ObjectType.sol +35 -14
  283. package/contracts/types/Referral.sol +85 -0
  284. package/contracts/types/RoleId.sol +61 -9
  285. package/contracts/types/StateId.sol +5 -1
  286. package/contracts/types/Timestamp.sol +7 -3
  287. package/contracts/types/UFixed.sol +128 -12
  288. package/contracts/types/Version.sol +4 -1
  289. package/package.json +4 -3
  290. package/artifacts/contracts/components/BaseComponent.sol/BaseComponent.dbg.json +0 -4
  291. package/artifacts/contracts/components/BaseComponent.sol/BaseComponent.json +0 -301
  292. package/artifacts/contracts/components/IBaseComponent.sol/IBaseComponent.dbg.json +0 -4
  293. package/artifacts/contracts/components/IBaseComponent.sol/IBaseComponent.json +0 -254
  294. package/artifacts/contracts/instance/IInstanceLinked.sol/IInstanceLinked.dbg.json +0 -4
  295. package/artifacts/contracts/instance/IInstanceLinked.sol/IInstanceLinked.json +0 -24
  296. package/artifacts/contracts/instance/base/ComponentServiceBase.sol/ComponentServiceBase.dbg.json +0 -4
  297. package/artifacts/contracts/instance/base/IInstanceBase.sol/IInstanceBase.dbg.json +0 -4
  298. package/artifacts/contracts/instance/base/IInstanceBase.sol/IInstanceBase.json +0 -113
  299. package/artifacts/contracts/instance/base/IService.sol/IService.dbg.json +0 -4
  300. package/artifacts/contracts/instance/base/InstanceBase.sol/InstanceBase.dbg.json +0 -4
  301. package/artifacts/contracts/instance/base/ModuleBase.sol/ModuleBase.dbg.json +0 -4
  302. package/artifacts/contracts/instance/base/ServiceBase.sol/ServiceBase.dbg.json +0 -4
  303. package/artifacts/contracts/instance/module/access/Access.sol/AccessModule.dbg.json +0 -4
  304. package/artifacts/contracts/instance/module/access/Access.sol/AccessModule.json +0 -333
  305. package/artifacts/contracts/instance/module/access/IAccess.sol/IAccess.dbg.json +0 -4
  306. package/artifacts/contracts/instance/module/access/IAccess.sol/IAccess.json +0 -10
  307. package/artifacts/contracts/instance/module/access/IAccess.sol/IAccessModule.dbg.json +0 -4
  308. package/artifacts/contracts/instance/module/access/IAccess.sol/IAccessModule.json +0 -333
  309. package/artifacts/contracts/instance/module/bundle/BundleModule.sol/BundleModule.dbg.json +0 -4
  310. package/artifacts/contracts/instance/module/bundle/BundleModule.sol/BundleModule.json +0 -297
  311. package/artifacts/contracts/instance/module/bundle/IBundle.sol/IBundle.dbg.json +0 -4
  312. package/artifacts/contracts/instance/module/bundle/IBundle.sol/IBundleModule.dbg.json +0 -4
  313. package/artifacts/contracts/instance/module/bundle/IBundle.sol/IBundleModule.json +0 -297
  314. package/artifacts/contracts/instance/module/component/ComponentModule.sol/ComponentModule.dbg.json +0 -4
  315. package/artifacts/contracts/instance/module/component/ComponentModule.sol/ComponentModule.json +0 -117
  316. package/artifacts/contracts/instance/module/component/IComponent.sol/IComponent.dbg.json +0 -4
  317. package/artifacts/contracts/instance/module/component/IComponent.sol/IComponent.json +0 -10
  318. package/artifacts/contracts/instance/module/component/IComponent.sol/IComponentModule.dbg.json +0 -4
  319. package/artifacts/contracts/instance/module/component/IComponent.sol/IComponentModule.json +0 -117
  320. package/artifacts/contracts/instance/module/distribution/DistributionModule.sol/DistributionModule.dbg.json +0 -4
  321. package/artifacts/contracts/instance/module/distribution/DistributionModule.sol/DistributionModule.json +0 -10
  322. package/artifacts/contracts/instance/module/distribution/IDistribution.sol/IDistribution.dbg.json +0 -4
  323. package/artifacts/contracts/instance/module/distribution/IDistribution.sol/IDistributionModule.dbg.json +0 -4
  324. package/artifacts/contracts/instance/module/distribution/IDistribution.sol/IDistributionModule.json +0 -10
  325. package/artifacts/contracts/instance/module/policy/IPolicy.sol/IPolicy.dbg.json +0 -4
  326. package/artifacts/contracts/instance/module/policy/IPolicy.sol/IPolicyModule.dbg.json +0 -4
  327. package/artifacts/contracts/instance/module/policy/IPolicy.sol/IPolicyModule.json +0 -271
  328. package/artifacts/contracts/instance/module/policy/PolicyModule.sol/PolicyModule.dbg.json +0 -4
  329. package/artifacts/contracts/instance/module/policy/PolicyModule.sol/PolicyModule.json +0 -271
  330. package/artifacts/contracts/instance/module/pool/IPoolModule.sol/IPool.dbg.json +0 -4
  331. package/artifacts/contracts/instance/module/pool/IPoolModule.sol/IPool.json +0 -10
  332. package/artifacts/contracts/instance/module/pool/IPoolModule.sol/IPoolModule.dbg.json +0 -4
  333. package/artifacts/contracts/instance/module/pool/IPoolModule.sol/IPoolModule.json +0 -164
  334. package/artifacts/contracts/instance/module/pool/PoolModule.sol/PoolModule.dbg.json +0 -4
  335. package/artifacts/contracts/instance/module/pool/PoolModule.sol/PoolModule.json +0 -164
  336. package/artifacts/contracts/instance/module/risk/IRisk.sol/IRisk.dbg.json +0 -4
  337. package/artifacts/contracts/instance/module/risk/IRisk.sol/IRiskModule.dbg.json +0 -4
  338. package/artifacts/contracts/instance/module/risk/IRisk.sol/IRiskModule.json +0 -113
  339. package/artifacts/contracts/instance/module/risk/RiskModule.sol/RiskModule.dbg.json +0 -4
  340. package/artifacts/contracts/instance/module/risk/RiskModule.sol/RiskModule.json +0 -131
  341. package/artifacts/contracts/instance/module/treasury/ITreasury.sol/ITreasury.dbg.json +0 -4
  342. package/artifacts/contracts/instance/module/treasury/ITreasury.sol/ITreasuryModule.dbg.json +0 -4
  343. package/artifacts/contracts/instance/module/treasury/ITreasury.sol/ITreasuryModule.json +0 -638
  344. package/artifacts/contracts/instance/module/treasury/TokenHandler.sol/TokenHandler.dbg.json +0 -4
  345. package/artifacts/contracts/instance/module/treasury/TokenHandler.sol/TokenHandler.json +0 -76
  346. package/artifacts/contracts/instance/module/treasury/TreasuryModule.sol/TreasuryModule.dbg.json +0 -4
  347. package/artifacts/contracts/instance/module/treasury/TreasuryModule.sol/TreasuryModule.json +0 -638
  348. package/artifacts/contracts/instance/service/ComponentOwnerService.sol/ComponentOwnerService.dbg.json +0 -4
  349. package/artifacts/contracts/instance/service/ComponentOwnerService.sol/ComponentOwnerService.json +0 -794
  350. package/artifacts/contracts/instance/service/IComponentOwnerService.sol/IComponentOwnerService.dbg.json +0 -4
  351. package/artifacts/contracts/registry/IChainNft.sol/IChainNft.dbg.json +0 -4
  352. package/artifacts/contracts/registry/IChainNft.sol/IChainNft.json +0 -457
  353. package/artifacts/contracts/test/TestDistribution.sol/TestDistribution.dbg.json +0 -4
  354. package/artifacts/contracts/test/TestDistribution.sol/TestDistribution.json +0 -557
  355. package/artifacts/contracts/test/TestPool.sol/TestPool.dbg.json +0 -4
  356. package/artifacts/contracts/test/TestPool.sol/TestPool.json +0 -716
  357. package/artifacts/contracts/test/TestProduct.sol/TestProduct.dbg.json +0 -4
  358. package/artifacts/contracts/test/TestProduct.sol/TestProduct.json +0 -744
  359. package/artifacts/contracts/types/ReferralId.sol/ReferralIdLib.dbg.json +0 -4
  360. package/artifacts/contracts/types/ReferralId.sol/ReferralIdLib.json +0 -99
  361. package/artifacts/contracts/types/UFixed.sol/UFixedMathLib.dbg.json +0 -4
  362. package/contracts/components/BaseComponent.sol +0 -79
  363. package/contracts/components/IBaseComponent.sol +0 -19
  364. package/contracts/instance/IInstanceLinked.sol +0 -8
  365. package/contracts/instance/base/ComponentServiceBase.sol +0 -49
  366. package/contracts/instance/base/IInstanceBase.sol +0 -23
  367. package/contracts/instance/base/IService.sol +0 -15
  368. package/contracts/instance/base/InstanceBase.sol +0 -89
  369. package/contracts/instance/base/ModuleBase.sol +0 -57
  370. package/contracts/instance/base/ServiceBase.sol +0 -44
  371. package/contracts/instance/module/access/Access.sol +0 -149
  372. package/contracts/instance/module/access/IAccess.sol +0 -53
  373. package/contracts/instance/module/bundle/BundleModule.sol +0 -134
  374. package/contracts/instance/module/bundle/IBundle.sol +0 -53
  375. package/contracts/instance/module/component/ComponentModule.sol +0 -71
  376. package/contracts/instance/module/component/IComponent.sol +0 -28
  377. package/contracts/instance/module/distribution/DistributionModule.sol +0 -17
  378. package/contracts/instance/module/distribution/IDistribution.sol +0 -10
  379. package/contracts/instance/module/policy/IPolicy.sol +0 -63
  380. package/contracts/instance/module/policy/PolicyModule.sol +0 -91
  381. package/contracts/instance/module/pool/IPoolModule.sol +0 -41
  382. package/contracts/instance/module/pool/PoolModule.sol +0 -95
  383. package/contracts/instance/module/risk/IRisk.sol +0 -26
  384. package/contracts/instance/module/risk/RiskModule.sol +0 -62
  385. package/contracts/instance/module/treasury/ITreasury.sol +0 -84
  386. package/contracts/instance/module/treasury/TokenHandler.sol +0 -48
  387. package/contracts/instance/module/treasury/TreasuryModule.sol +0 -131
  388. package/contracts/instance/service/ComponentOwnerService.sol +0 -275
  389. package/contracts/instance/service/IComponentOwnerService.sol +0 -20
  390. package/contracts/registry/IChainNft.sol +0 -22
  391. package/contracts/test/TestDistribution.sol +0 -22
  392. package/contracts/test/TestPool.sol +0 -27
  393. package/contracts/test/TestProduct.sol +0 -74
  394. package/contracts/types/ReferralId.sol +0 -48
@@ -0,0 +1,216 @@
1
+ // SPDX-License-Identifier: Apache-2.0
2
+ pragma solidity ^0.8.20;
3
+
4
+ import {SafeERC20} from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
5
+ import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
6
+ import {AccessManagedUpgradeable} from "@openzeppelin/contracts-upgradeable/access/manager/AccessManagedUpgradeable.sol";
7
+
8
+ import {IComponent} from "./IComponent.sol";
9
+ import {IProductService} from "../instance/service/IProductService.sol";
10
+ import {IInstanceService} from "../instance/IInstanceService.sol";
11
+ import {IInstance} from "../instance/IInstance.sol";
12
+ import {InstanceAccessManager} from "../instance/InstanceAccessManager.sol";
13
+ import {IRegistry} from "../registry/IRegistry.sol";
14
+ import {NftId} from "../types/NftId.sol";
15
+ import {ObjectType, INSTANCE, PRODUCT} from "../types/ObjectType.sol";
16
+ import {VersionPart} from "../types/Version.sol";
17
+ import {Registerable} from "../shared/Registerable.sol";
18
+ import {RoleId, RoleIdLib} from "../types/RoleId.sol";
19
+ import {IAccess} from "../instance/module/IAccess.sol";
20
+
21
+ // TODO discuss to inherit from oz accessmanaged
22
+ // TODO make contract upgradeable
23
+ // then add (Distribution|Pool|Product)Upradeable that also intherit from Versionable
24
+ // same pattern as for Service which is also upgradeable
25
+ abstract contract Component is
26
+ Registerable,
27
+ IComponent,
28
+ AccessManagedUpgradeable
29
+ {
30
+ // keccak256(abi.encode(uint256(keccak256("gif-next.contracts.component.Component.sol")) - 1)) & ~bytes32(uint256(0xff));
31
+ bytes32 public constant CONTRACT_LOCATION_V1 = 0xffe8d4462baed26a47154f4b8f6db497d2f772496965791d25bd456e342b7f00;
32
+
33
+ struct ComponentStorage {
34
+ IInstance _instance; // instance for this component
35
+ string _name; // unique (per instance) component name
36
+ IERC20Metadata _token; // token for this component
37
+ address _wallet; // wallet for this component (default = component contract itself)
38
+ IInstanceService _instanceService; // instance service for this component
39
+
40
+ NftId _productNftId; // only relevant for components that are linked to a aproduct
41
+ IProductService _productService; // product service for component, might not be relevant for some component types (eg oracles)
42
+ }
43
+
44
+
45
+ modifier onlyProductService() {
46
+ if(msg.sender != address(_getComponentStorage()._productService)) {
47
+ revert ErrorComponentNotProductService(msg.sender);
48
+ }
49
+ _;
50
+ }
51
+
52
+ constructor(
53
+ address registry,
54
+ NftId instanceNftId,
55
+ string memory name,
56
+ address token,
57
+ ObjectType componentType,
58
+ bool isInterceptor,
59
+ address initialOwner,
60
+ bytes memory data
61
+ ) {
62
+ _initializeComponent(registry, instanceNftId, name, token, componentType, isInterceptor, initialOwner, data);
63
+ }
64
+
65
+ function _getComponentStorage() private pure returns (ComponentStorage storage $) {
66
+ assembly {
67
+ $.slot := CONTRACT_LOCATION_V1
68
+ }
69
+ }
70
+
71
+ function _initializeComponent(
72
+ address registry,
73
+ NftId instanceNftId,
74
+ string memory name,
75
+ address token,
76
+ ObjectType componentType,
77
+ bool isInterceptor,
78
+ address initialOwner,
79
+ bytes memory data
80
+ )
81
+ internal
82
+ initializer
83
+ virtual
84
+ {
85
+ ComponentStorage storage $ = _getComponentStorage();
86
+ _initializeRegisterable(registry, instanceNftId, componentType, isInterceptor, initialOwner, data);
87
+
88
+ // set unique name of component
89
+ $._name = name;
90
+
91
+ // set and check linked instance
92
+ IRegistry.ObjectInfo memory instanceInfo = getRegistry().getObjectInfo(instanceNftId);
93
+ $._instance = IInstance(instanceInfo.objectAddress);
94
+ if(!$._instance.supportsInterface(type(IInstance).interfaceId)) {
95
+ revert ErrorComponentNotInstance(instanceNftId, instanceInfo.objectAddress);
96
+ }
97
+
98
+ // initialize AccessManagedUpgradeable
99
+ __AccessManaged_init($._instance.authority());
100
+
101
+ // set linked services
102
+ VersionPart gifVersion = $._instance.getMajorVersion();
103
+ $._instanceService = IInstanceService(getRegistry().getServiceAddress(INSTANCE(), gifVersion));
104
+ $._productService = IProductService(getRegistry().getServiceAddress(PRODUCT(), gifVersion));
105
+
106
+ // set wallet and token
107
+ $._wallet = address(this);
108
+ $._token = IERC20Metadata(token);
109
+
110
+ _registerInterface(type(IComponent).interfaceId);
111
+ }
112
+
113
+ function lock() external restricted() override {
114
+ _getComponentStorage()._instanceService.setTargetLocked(getName(), true);
115
+ }
116
+
117
+ function unlock() external restricted() override {
118
+ _getComponentStorage()._instanceService.setTargetLocked(getName(), false);
119
+ }
120
+
121
+ // only product service may set product nft id during registration of product setup
122
+ function setProductNftId(NftId productNftId)
123
+ external
124
+ override
125
+ onlyProductService()
126
+ {
127
+ ComponentStorage storage $ = _getComponentStorage();
128
+
129
+ if($._productNftId.gtz()) {
130
+ revert ErrorComponentProductNftAlreadySet();
131
+ }
132
+
133
+ $._productNftId = productNftId;
134
+ }
135
+
136
+ /// @dev Sets the wallet address for the component.
137
+ /// if the current wallet has tokens, these will be transferred.
138
+ /// if the new wallet address is externally owned, an approval from the
139
+ /// owner of the external wallet for the component to move all tokens must exist.
140
+ function setWallet(address newWallet) external override onlyOwner {
141
+ ComponentStorage storage $ = _getComponentStorage();
142
+
143
+ address currentWallet = $._wallet;
144
+ uint256 currentBalance = $._token.balanceOf(currentWallet);
145
+
146
+ // checks
147
+ if (newWallet == address(0)) {
148
+ revert ErrorComponentWalletAddressZero();
149
+ }
150
+ if (newWallet == currentWallet) {
151
+ revert ErrorComponentWalletAddressIsSameAsCurrent(newWallet);
152
+ }
153
+
154
+ if (currentBalance > 0) {
155
+ if (currentWallet == address(this)) {
156
+ // move tokens from component smart contract to external wallet
157
+ } else {
158
+ // move tokens from external wallet to component smart contract or another external wallet
159
+ uint256 allowance = $._token.allowance(currentWallet, address(this));
160
+ if (allowance < currentBalance) {
161
+ revert ErrorComponentWalletAllowanceTooSmall(currentWallet, newWallet, allowance, currentBalance);
162
+ }
163
+ }
164
+ }
165
+
166
+ // effects
167
+ $._wallet = newWallet;
168
+ emit LogComponentWalletAddressChanged(newWallet);
169
+
170
+ // interactions
171
+ if (currentBalance > 0) {
172
+ // transfer tokens from current wallet to new wallet
173
+ if (currentWallet == address(this)) {
174
+ // transferFrom requires self allowance too
175
+ $._token.approve(address(this), currentBalance);
176
+ }
177
+
178
+ SafeERC20.safeTransferFrom($._token, currentWallet, newWallet, currentBalance);
179
+ emit LogComponentWalletTokensTransferred(currentWallet, newWallet, currentBalance);
180
+ }
181
+ }
182
+
183
+ function getWallet()
184
+ public
185
+ view
186
+ override
187
+ returns (address walletAddress)
188
+ {
189
+ return _getComponentStorage()._wallet;
190
+ }
191
+
192
+ function getToken() public view override returns (IERC20Metadata token) {
193
+ return _getComponentStorage()._token;
194
+ }
195
+
196
+ function getInstance() public view override returns (IInstance instance) {
197
+ return _getComponentStorage()._instance;
198
+ }
199
+
200
+ function getName() public view override returns(string memory name) {
201
+ return _getComponentStorage()._name;
202
+ }
203
+
204
+ function getProductNftId() public view override returns (NftId productNftId) {
205
+ return _getComponentStorage()._productNftId;
206
+ }
207
+
208
+ function getInstanceService() public view returns (IInstanceService) {
209
+ return _getComponentStorage()._instanceService;
210
+ }
211
+
212
+ function getProductService() public view returns (IProductService) {
213
+ return _getComponentStorage()._productService;
214
+ }
215
+
216
+ }
@@ -4,59 +4,65 @@ pragma solidity ^0.8.19;
4
4
  import {DISTRIBUTION} from "../types/ObjectType.sol";
5
5
  import {IDistributionService} from "../instance/service/IDistributionService.sol";
6
6
  import {IProductService} from "../instance/service/IProductService.sol";
7
- import {NftId} from "../types/NftId.sol";
8
- import {ReferralId} from "../types/ReferralId.sol";
7
+ import {NftId, zeroNftId, NftIdLib} from "../types/NftId.sol";
8
+ import {ReferralId} from "../types/Referral.sol";
9
9
  import {Fee, FeeLib} from "../types/Fee.sol";
10
- import {BaseComponent} from "./BaseComponent.sol";
10
+ import {Component} from "./Component.sol";
11
11
  import {IDistributionComponent} from "./IDistributionComponent.sol";
12
12
  import {IRegistry} from "../registry/IRegistry.sol";
13
13
  import {IRegisterable} from "../shared/IRegisterable.sol";
14
+ import {ISetup} from "../instance/module/ISetup.sol";
14
15
  import {Registerable} from "../shared/Registerable.sol";
16
+ import {TokenHandler} from "../shared/TokenHandler.sol";
17
+ import {InstanceReader} from "../instance/InstanceReader.sol";
15
18
 
16
- contract Distribution is
17
- BaseComponent,
19
+ abstract contract Distribution is
20
+ Component,
18
21
  IDistributionComponent
19
22
  {
23
+ using NftIdLib for NftId;
20
24
 
21
- Fee internal _initialDistributionFee;
22
25
  bool internal _isVerifying;
26
+ Fee internal _initialDistributionFee;
23
27
 
24
- IDistributionService private _distributionService;
25
- IProductService private _productService;
28
+ TokenHandler internal _tokenHandler;
26
29
 
27
- modifier onlyProductService() {
28
- require(
29
- msg.sender == address(_productService),
30
- "ERROR:POL-002:NOT_PRODUCT_SERVICE");
31
- _;
32
- }
30
+ IDistributionService private _distributionService;
33
31
 
34
32
  constructor(
35
33
  address registry,
36
34
  NftId instanceNftId,
37
35
  // TODO refactor into tokenNftId
36
+ string memory name,
38
37
  address token,
39
38
  bool verifying,
40
39
  Fee memory distributionFee,
41
- address initialOwner
42
- )
43
- BaseComponent(registry, instanceNftId, token, DISTRIBUTION(), true, initialOwner)
44
- {
40
+ address initialOwner,
41
+ bytes memory data
42
+ ) Component (
43
+ registry,
44
+ instanceNftId,
45
+ name, token,
46
+ DISTRIBUTION(),
47
+ true,
48
+ initialOwner,
49
+ data
50
+ ) {
45
51
  _isVerifying = verifying;
46
52
  _initialDistributionFee = distributionFee;
47
53
 
48
- _distributionService = _instance.getDistributionService();
49
- _productService = _instance.getProductService();
54
+ _tokenHandler = new TokenHandler(token);
55
+ _distributionService = getInstance().getDistributionService();
50
56
 
51
57
  _registerInterface(type(IDistributionComponent).interfaceId);
52
58
  }
53
59
 
54
-
55
60
  function setFees(
56
61
  Fee memory distributionFee
57
62
  )
58
63
  external
59
64
  override
65
+ restricted()
60
66
  {
61
67
  _distributionService.setFees(distributionFee);
62
68
  }
@@ -70,7 +76,8 @@ contract Distribution is
70
76
  virtual override
71
77
  returns (uint256 feeAmount)
72
78
  {
73
- Fee memory fee = getDistributionFee();
79
+ ISetup.DistributionSetupInfo memory setupInfo = getSetupInfo();
80
+ Fee memory fee = setupInfo.distributionFee;
74
81
  (feeAmount,) = FeeLib.calculateFee(fee, netPremiumAmount);
75
82
  }
76
83
 
@@ -93,7 +100,7 @@ contract Distribution is
93
100
  uint256 feeAmount
94
101
  )
95
102
  external
96
- onlyProductService
103
+ restricted()
97
104
  virtual override
98
105
  {
99
106
  // default is no action
@@ -104,7 +111,7 @@ contract Distribution is
104
111
  uint256 feeAmount
105
112
  )
106
113
  external
107
- onlyProductService
114
+ restricted()
108
115
  virtual override
109
116
  {
110
117
  // default is no action
@@ -115,41 +122,29 @@ contract Distribution is
115
122
  return false;
116
123
  }
117
124
 
118
- /// @dev default distribution fee, ie when not using any valid referralId
119
- function getDistributionFee() public view returns (Fee memory distributionFee) {
120
- NftId productNftId = _instance.getProductNftId(getNftId());
121
- if (_instance.hasTreasuryInfo(productNftId)) {
122
- return _instance.getTreasuryInfo(productNftId).distributionFee;
123
- } else {
124
- return _initialDistributionFee;
125
+ function getSetupInfo() public view returns (ISetup.DistributionSetupInfo memory setupInfo) {
126
+ InstanceReader reader = getInstance().getInstanceReader();
127
+ setupInfo = reader.getDistributionSetupInfo(getNftId());
128
+
129
+ // fallback to initial setup info (wallet is always != address(0))
130
+ if(setupInfo.wallet == address(0)) {
131
+ setupInfo = _getInitialSetupInfo();
125
132
  }
126
133
  }
127
134
 
135
+ function _getInitialSetupInfo() internal view returns (ISetup.DistributionSetupInfo memory setupInfo) {
136
+ return ISetup.DistributionSetupInfo(
137
+ zeroNftId(),
138
+ _tokenHandler,
139
+ _initialDistributionFee,
140
+ _isVerifying,
141
+ address(this)
142
+ );
143
+ }
144
+
128
145
 
129
146
  /// @dev returns true iff the component needs to be called when selling/renewing policis
130
147
  function isVerifying() external view returns (bool verifying) {
131
148
  return _isVerifying;
132
149
  }
133
-
134
- // from IRegisterable
135
-
136
- function getInitialInfo()
137
- public
138
- view
139
- override (IRegisterable, Registerable)
140
- returns(IRegistry.ObjectInfo memory, bytes memory)
141
- {
142
- (
143
- IRegistry.ObjectInfo memory info,
144
- bytes memory data
145
- ) = super.getInitialInfo();
146
-
147
- return (
148
- info,
149
- abi.encode(
150
- _initialDistributionFee,
151
- _isVerifying
152
- )
153
- );
154
- }
155
150
  }
@@ -0,0 +1,43 @@
1
+ // SPDX-License-Identifier: Apache-2.0
2
+ pragma solidity ^0.8.20;
3
+
4
+ import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
5
+
6
+ import {IRegisterable} from "../shared/IRegisterable.sol";
7
+ import {IInstance} from "../instance/IInstance.sol";
8
+ import {IInstanceService} from "../instance/IInstanceService.sol";
9
+ import {IProductService} from "../instance/service/IProductService.sol";
10
+ import {NftId} from "../types/NftId.sol";
11
+
12
+ interface IComponent is IRegisterable {
13
+
14
+ error ErrorComponentNotInstance(NftId instanceNftId, address instance);
15
+ error ErrorComponentProductNftAlreadySet();
16
+ error ErrorComponentWalletAddressZero();
17
+ error ErrorComponentWalletAddressIsSameAsCurrent(address newWallet);
18
+ error ErrorComponentWalletAllowanceTooSmall(address oldWallet, address newWallet, uint256 allowance, uint256 balance);
19
+ error ErrorComponentUnauthorized(address caller, uint64 requiredRoleIdNum);
20
+ error ErrorComponentNotProductService(address caller);
21
+
22
+ event LogComponentWalletAddressChanged(address newWallet);
23
+ event LogComponentWalletTokensTransferred(address from, address to, uint256 amount);
24
+
25
+ function getName() external view returns (string memory name);
26
+
27
+ // TODO remove and replace with accessmanaged target locking mechanism
28
+ function lock() external;
29
+ function unlock() external;
30
+
31
+ function getToken() external view returns (IERC20Metadata token);
32
+
33
+ function setWallet(address walletAddress) external;
34
+ function getWallet() external view returns (address walletAddress);
35
+
36
+ function getInstance() external view returns (IInstance instance);
37
+
38
+ function setProductNftId(NftId productNftId) external;
39
+ function getProductNftId() external view returns (NftId productNftId);
40
+
41
+ function getInstanceService() external view returns (IInstanceService);
42
+ function getProductService() external view returns (IProductService);
43
+ }
@@ -2,10 +2,14 @@
2
2
  pragma solidity ^0.8.19;
3
3
 
4
4
  import {Fee} from "../types/Fee.sol";
5
- import {ReferralId} from "../types/ReferralId.sol";
5
+ import {IComponent} from "./IComponent.sol";
6
+ import {ISetup} from "../instance/module/ISetup.sol";
7
+ import {ReferralId} from "../types/Referral.sol";
6
8
  import {NftId} from "../types/NftId.sol";
7
9
 
8
- interface IDistributionComponent {
10
+ interface IDistributionComponent is IComponent {
11
+
12
+ function getSetupInfo() external view returns (ISetup.DistributionSetupInfo memory setupInfo);
9
13
 
10
14
  function setFees(
11
15
  Fee memory distributionFee
@@ -38,9 +42,6 @@ interface IDistributionComponent {
38
42
  /// @dev returns true iff the referral id is valid
39
43
  function referralIsValid(ReferralId referralId) external view returns (bool isValid);
40
44
 
41
- /// @dev default distribution fee, ie when not using any valid referralId
42
- function getDistributionFee() external view returns (Fee memory distributionFee);
43
-
44
45
  /// @dev returns true iff the component needs to be called when selling/renewing policis
45
46
  function isVerifying() external view returns (bool verifying);
46
47
  }
@@ -1,30 +1,24 @@
1
1
  // SPDX-License-Identifier: Apache-2.0
2
2
  pragma solidity ^0.8.20;
3
3
 
4
- import {NftId} from "../types/NftId.sol";
5
4
  import {Fee} from "../types/Fee.sol";
5
+ import {IComponent} from "./IComponent.sol";
6
+ import {ISetup} from "../instance/module/ISetup.sol";
7
+ import {NftId} from "../types/NftId.sol";
6
8
  import {UFixed} from "../types/UFixed.sol";
7
9
 
8
- interface IPoolComponent {
10
+ interface IPoolComponent is IComponent {
9
11
 
10
12
  event LogUnderwrittenByPool(NftId policyNftId, uint256 collateralizationAmount, address pool);
11
13
 
14
+ function getSetupInfo() external view returns (ISetup.PoolSetupInfo memory setupInfo);
15
+
12
16
  function setFees(
13
17
  Fee memory poolFee,
14
18
  Fee memory stakingFee,
15
19
  Fee memory performanceFee
16
20
  ) external;
17
21
 
18
- /**
19
- * @dev creates a new bundle for this pool.
20
- */
21
- function createBundle(
22
- Fee memory fee,
23
- uint256 initialAmount,
24
- uint256 lifetime,
25
- bytes memory filter
26
- ) external returns(NftId bundleNftId);
27
-
28
22
  function setBundleFee(
29
23
  NftId policyNftId,
30
24
  Fee memory fee
@@ -43,6 +37,10 @@ interface IPoolComponent {
43
37
  uint256 collateralizationAmount
44
38
  ) external;
45
39
 
40
+ function lockBundle(NftId bundleNftId) external;
41
+
42
+ function unlockBundle(NftId bundleNftId) external;
43
+
46
44
  /**
47
45
  * @dev returns true iff the policy application data in policyData matches
48
46
  * with the bundle filter criteria encoded in bundleFilter.
@@ -55,10 +53,8 @@ interface IPoolComponent {
55
53
  view
56
54
  returns (bool isMatching);
57
55
 
58
- function isVerifying() external view returns (bool verifying);
56
+ function isConfirmingApplication() external view returns (bool isConfirmingApplication);
59
57
 
60
58
  function getCollateralizationLevel() external view returns (UFixed collateralizationLevel);
61
59
 
62
- function getFees() external view returns (Fee memory poolFee, Fee memory stakingFee, Fee memory performanceFee);
63
-
64
60
  }
@@ -2,11 +2,15 @@
2
2
  pragma solidity ^0.8.20;
3
3
 
4
4
  import {Fee} from "../types/Fee.sol";
5
+ import {IComponent} from "./IComponent.sol";
6
+ import {ISetup} from "../instance/module/ISetup.sol";
5
7
  import {NftId} from "../types/NftId.sol";
6
- import {ReferralId} from "../types/ReferralId.sol";
8
+ import {ReferralId} from "../types/Referral.sol";
7
9
  import {RiskId} from "../types/RiskId.sol";
8
10
 
9
- interface IProductComponent {
11
+ interface IProductComponent is IComponent {
12
+
13
+ function getSetupInfo() external view returns (ISetup.ProductSetupInfo memory setupInfo);
10
14
 
11
15
  function setFees(
12
16
  Fee memory productFee,
@@ -18,8 +22,8 @@ interface IProductComponent {
18
22
  RiskId riskId,
19
23
  uint256 lifetime,
20
24
  bytes memory applicationData,
21
- ReferralId referralId,
22
- NftId bundleNftId
25
+ NftId bundleNftId,
26
+ ReferralId referralId
23
27
  ) external view returns (uint256 premiumAmount);
24
28
 
25
29
  function calculateNetPremium(
@@ -29,9 +33,7 @@ interface IProductComponent {
29
33
  bytes memory applicationData
30
34
  ) external view returns (uint256 netPremiumAmount);
31
35
 
32
- function getProductFee() external view returns (Fee memory productFee);
33
- function getProcessingFee() external view returns (Fee memory processingFee);
34
-
36
+
35
37
  function getPoolNftId() external view returns (NftId poolNftId);
36
38
  function getDistributionNftId() external view returns (NftId distributionNftId);
37
39
  }