@etherisc/gif-next 0.0.2-de220d6-949 → 0.0.2-def25d4-556

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (379) hide show
  1. package/README.md +179 -1
  2. package/artifacts/contracts/components/BaseComponent.sol/BaseComponent.dbg.json +1 -1
  3. package/artifacts/contracts/components/BaseComponent.sol/BaseComponent.json +176 -23
  4. package/artifacts/contracts/components/Distribution.sol/Distribution.dbg.json +4 -0
  5. package/artifacts/contracts/components/Distribution.sol/Distribution.json +670 -0
  6. package/artifacts/contracts/components/IBaseComponent.sol/IBaseComponent.dbg.json +1 -1
  7. package/artifacts/contracts/components/IBaseComponent.sol/IBaseComponent.json +129 -23
  8. package/artifacts/contracts/components/IDistributionComponent.sol/IDistributionComponent.dbg.json +4 -0
  9. package/artifacts/contracts/components/IDistributionComponent.sol/IDistributionComponent.json +204 -0
  10. package/artifacts/contracts/components/IPoolComponent.sol/IPoolComponent.dbg.json +1 -1
  11. package/artifacts/contracts/components/IPoolComponent.sol/IPoolComponent.json +74 -181
  12. package/artifacts/contracts/components/IProductComponent.sol/IProductComponent.dbg.json +1 -1
  13. package/artifacts/contracts/components/IProductComponent.sol/IProductComponent.json +55 -177
  14. package/artifacts/contracts/components/Pool.sol/Pool.dbg.json +1 -1
  15. package/artifacts/contracts/components/Pool.sol/Pool.json +463 -60
  16. package/artifacts/contracts/components/Product.sol/Product.dbg.json +1 -1
  17. package/artifacts/contracts/components/Product.sol/Product.json +540 -70
  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/errors/Revert.sol/Revert.json +2 -34
  27. package/artifacts/contracts/experiment/inheritance/A.sol/A.dbg.json +1 -1
  28. package/artifacts/contracts/experiment/inheritance/A.sol/AShared.dbg.json +1 -1
  29. package/artifacts/contracts/experiment/inheritance/B.sol/B.dbg.json +1 -1
  30. package/artifacts/contracts/experiment/inheritance/C.sol/C.dbg.json +1 -1
  31. package/artifacts/contracts/experiment/inheritance/IA.sol/IA.dbg.json +1 -1
  32. package/artifacts/contracts/experiment/inheritance/IA.sol/ISharedA.dbg.json +1 -1
  33. package/artifacts/contracts/experiment/inheritance/IB.sol/IB.dbg.json +1 -1
  34. package/artifacts/contracts/experiment/inheritance/IC.sol/IC.dbg.json +1 -1
  35. package/artifacts/contracts/experiment/statemachine/Dummy.sol/LifeCycleModule.dbg.json +1 -1
  36. package/artifacts/contracts/experiment/statemachine/Dummy.sol/LifeCycleModule.json +2 -2
  37. package/artifacts/contracts/experiment/statemachine/ISM.sol/ISM.dbg.json +1 -1
  38. package/artifacts/contracts/experiment/statemachine/ISM.sol/ISMEE.dbg.json +1 -1
  39. package/artifacts/contracts/experiment/statemachine/SM.sol/SM.dbg.json +1 -1
  40. package/artifacts/contracts/experiment/statemachine/SM.sol/SM.json +2 -2
  41. package/artifacts/contracts/experiment/statemachine/SimpleStateMachine.sol/SimpleStateMachine.dbg.json +1 -1
  42. package/artifacts/contracts/experiment/statemachine/SimpleStateMachine.sol/SimpleStateMachine.json +2 -2
  43. package/artifacts/contracts/experiment/types/TypeA.sol/TypeALib.dbg.json +1 -1
  44. package/artifacts/contracts/experiment/types/TypeB.sol/TypeBLib.dbg.json +1 -1
  45. package/artifacts/contracts/instance/AccessManagedSimple.sol/AccessManagedSimple.dbg.json +4 -0
  46. package/artifacts/contracts/instance/AccessManagedSimple.sol/AccessManagedSimple.json +101 -0
  47. package/artifacts/contracts/instance/AccessManagerSimple.sol/AccessManagerSimple.dbg.json +4 -0
  48. package/artifacts/contracts/instance/AccessManagerSimple.sol/AccessManagerSimple.json +1132 -0
  49. package/artifacts/contracts/instance/IAccessManagerSimple.sol/IAccessManagerSimple.dbg.json +4 -0
  50. package/artifacts/contracts/instance/IAccessManagerSimple.sol/IAccessManagerSimple.json +1082 -0
  51. package/artifacts/contracts/instance/IInstance.sol/IInstance.dbg.json +1 -1
  52. package/artifacts/contracts/instance/IInstance.sol/IInstance.json +277 -1709
  53. package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.dbg.json +4 -0
  54. package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.json +480 -0
  55. package/artifacts/contracts/instance/Instance.sol/Instance.dbg.json +1 -1
  56. package/artifacts/contracts/instance/Instance.sol/Instance.json +2480 -1170
  57. package/artifacts/contracts/instance/InstanceAccessManager.sol/InstanceAccessManager.dbg.json +4 -0
  58. package/artifacts/contracts/instance/InstanceAccessManager.sol/InstanceAccessManager.json +917 -0
  59. package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.dbg.json +4 -0
  60. package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.json +1283 -0
  61. package/artifacts/contracts/instance/InstanceService.sol/InstanceService.dbg.json +4 -0
  62. package/artifacts/contracts/instance/InstanceService.sol/InstanceService.json +851 -0
  63. package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.dbg.json +4 -0
  64. package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.json +472 -0
  65. package/artifacts/contracts/instance/base/ComponentServiceBase.sol/ComponentServiceBase.dbg.json +1 -1
  66. package/artifacts/contracts/instance/base/ComponentServiceBase.sol/ComponentServiceBase.json +229 -43
  67. package/artifacts/contracts/instance/base/IInstanceBase.sol/IInstanceBase.dbg.json +1 -1
  68. package/artifacts/contracts/instance/base/IInstanceBase.sol/IInstanceBase.json +51 -1
  69. package/artifacts/contracts/instance/base/IKeyValueStore.sol/IKeyValueStore.dbg.json +1 -1
  70. package/artifacts/contracts/instance/base/IKeyValueStore.sol/IKeyValueStore.json +45 -127
  71. package/artifacts/contracts/instance/base/ILifecycle.sol/ILifecycle.dbg.json +1 -1
  72. package/artifacts/contracts/instance/base/KeyValueStore.sol/KeyValueStore.dbg.json +1 -1
  73. package/artifacts/contracts/instance/base/KeyValueStore.sol/KeyValueStore.json +55 -245
  74. package/artifacts/contracts/instance/base/Lifecycle.sol/Lifecycle.dbg.json +1 -1
  75. package/artifacts/contracts/instance/base/Lifecycle.sol/Lifecycle.json +4 -4
  76. package/artifacts/contracts/instance/module/IAccess.sol/IAccess.dbg.json +4 -0
  77. package/artifacts/contracts/instance/module/IAccess.sol/IAccess.json +211 -0
  78. package/artifacts/contracts/instance/module/IBundle.sol/IBundle.dbg.json +4 -0
  79. package/artifacts/contracts/instance/module/{bundle/IBundle.sol → IBundle.sol}/IBundle.json +1 -1
  80. package/artifacts/contracts/instance/module/IDistribution.sol/IDistribution.dbg.json +4 -0
  81. package/artifacts/contracts/instance/module/{access/IAccess.sol/IAccess.json → IDistribution.sol/IDistribution.json} +2 -2
  82. package/artifacts/contracts/instance/module/IPolicy.sol/IPolicy.dbg.json +4 -0
  83. package/artifacts/contracts/instance/module/{policy/IPolicy.sol → IPolicy.sol}/IPolicy.json +1 -1
  84. package/artifacts/contracts/instance/module/IRisk.sol/IRisk.dbg.json +4 -0
  85. package/artifacts/contracts/instance/module/{risk/IRisk.sol → IRisk.sol}/IRisk.json +1 -1
  86. package/artifacts/contracts/instance/module/ISetup.sol/ISetup.dbg.json +4 -0
  87. package/artifacts/contracts/instance/{base/ModuleBase.sol/ModuleBase.json → module/ISetup.sol/ISetup.json} +2 -2
  88. package/artifacts/contracts/instance/module/ITreasury.sol/ITreasury.dbg.json +4 -0
  89. package/artifacts/contracts/instance/module/{treasury/ITreasury.sol → ITreasury.sol}/ITreasury.json +1 -1
  90. package/artifacts/contracts/instance/service/ComponentOwnerService.sol/ComponentOwnerService.dbg.json +1 -1
  91. package/artifacts/contracts/instance/service/ComponentOwnerService.sol/ComponentOwnerService.json +381 -77
  92. package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.dbg.json +4 -0
  93. package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.json +657 -0
  94. package/artifacts/contracts/instance/service/DistributionServiceManager.sol/DistributionServiceManager.dbg.json +4 -0
  95. package/artifacts/contracts/instance/service/DistributionServiceManager.sol/DistributionServiceManager.json +436 -0
  96. package/artifacts/contracts/instance/service/IComponentOwnerService.sol/IComponentOwnerService.dbg.json +1 -1
  97. package/artifacts/contracts/instance/service/IComponentOwnerService.sol/IComponentOwnerService.json +177 -75
  98. package/artifacts/contracts/instance/service/IDistributionService.sol/IDistributionService.dbg.json +4 -0
  99. package/artifacts/contracts/instance/{base/ServiceBase.sol/ServiceBase.json → service/IDistributionService.sol/IDistributionService.json} +204 -58
  100. package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.dbg.json +1 -1
  101. package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.json +235 -50
  102. package/artifacts/contracts/instance/service/IProductService.sol/IProductService.dbg.json +1 -1
  103. package/artifacts/contracts/instance/service/IProductService.sol/IProductService.json +325 -51
  104. package/artifacts/contracts/registry/ChainNft.sol/ChainNft.dbg.json +1 -1
  105. package/artifacts/contracts/registry/ChainNft.sol/ChainNft.json +186 -12
  106. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.dbg.json +1 -1
  107. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.json +485 -37
  108. package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.dbg.json +4 -0
  109. package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.json +853 -0
  110. package/artifacts/contracts/registry/ITransferInterceptor.sol/ITransferInterceptor.dbg.json +4 -0
  111. package/artifacts/contracts/registry/ITransferInterceptor.sol/ITransferInterceptor.json +34 -0
  112. package/artifacts/contracts/registry/Registry.sol/Registry.dbg.json +1 -1
  113. package/artifacts/contracts/registry/Registry.sol/Registry.json +597 -122
  114. package/artifacts/contracts/registry/RegistryService.sol/RegistryService.dbg.json +4 -0
  115. package/artifacts/contracts/registry/RegistryService.sol/RegistryService.json +1237 -0
  116. package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.dbg.json +4 -0
  117. package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.json +525 -0
  118. package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.dbg.json +4 -0
  119. package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.json +410 -0
  120. package/artifacts/contracts/shared/ContractDeployerLib.sol/ContractDeployerLib.dbg.json +4 -0
  121. package/artifacts/contracts/shared/ContractDeployerLib.sol/ContractDeployerLib.json +107 -0
  122. package/artifacts/contracts/shared/ERC165.sol/ERC165.dbg.json +1 -1
  123. package/artifacts/contracts/shared/ERC165.sol/ERC165.json +2 -2
  124. package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.dbg.json +4 -0
  125. package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.json +127 -0
  126. package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.dbg.json +1 -1
  127. package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.json +117 -37
  128. package/artifacts/contracts/shared/IService.sol/IService.dbg.json +4 -0
  129. package/artifacts/contracts/{instance/base → shared}/IService.sol/IService.json +175 -54
  130. package/artifacts/contracts/shared/IVersionable.sol/IVersionable.dbg.json +1 -1
  131. package/artifacts/contracts/shared/IVersionable.sol/IVersionable.json +55 -14
  132. package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.dbg.json +4 -0
  133. package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.json +158 -0
  134. package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.dbg.json +4 -0
  135. package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.json +349 -0
  136. package/artifacts/contracts/shared/Registerable.sol/Registerable.dbg.json +1 -1
  137. package/artifacts/contracts/shared/Registerable.sol/Registerable.json +190 -37
  138. package/artifacts/contracts/shared/RegisterableUpgradable.sol/RegisterableUpgradable.dbg.json +4 -0
  139. package/artifacts/contracts/{instance/base/InstanceBase.sol/InstanceBase.json → shared/RegisterableUpgradable.sol/RegisterableUpgradable.json} +199 -83
  140. package/artifacts/contracts/shared/Service.sol/Service.dbg.json +4 -0
  141. package/artifacts/contracts/shared/Service.sol/Service.json +468 -0
  142. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.dbg.json +4 -0
  143. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.json +96 -0
  144. package/artifacts/contracts/shared/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.dbg.json +4 -0
  145. package/artifacts/contracts/shared/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.json +129 -0
  146. package/artifacts/contracts/shared/Versionable.sol/Versionable.dbg.json +1 -1
  147. package/artifacts/contracts/shared/Versionable.sol/Versionable.json +78 -14
  148. package/artifacts/contracts/test/TestFee.sol/TestFee.dbg.json +1 -1
  149. package/artifacts/contracts/test/TestFee.sol/TestFee.json +4 -4
  150. package/artifacts/contracts/test/TestRegisterable.sol/TestRegisterable.dbg.json +1 -1
  151. package/artifacts/contracts/test/TestRegisterable.sol/TestRegisterable.json +204 -36
  152. package/artifacts/contracts/test/TestRoleId.sol/TestRoleId.dbg.json +1 -1
  153. package/artifacts/contracts/test/TestRoleId.sol/TestRoleId.json +14 -14
  154. package/artifacts/contracts/test/TestService.sol/TestService.dbg.json +1 -1
  155. package/artifacts/contracts/test/TestService.sol/TestService.json +283 -62
  156. package/artifacts/contracts/test/TestToken.sol/TestUsdc.dbg.json +1 -1
  157. package/artifacts/contracts/test/TestToken.sol/TestUsdc.json +91 -53
  158. package/artifacts/contracts/test/TestVersion.sol/TestVersion.dbg.json +1 -1
  159. package/artifacts/contracts/test/TestVersion.sol/TestVersion.json +2 -2
  160. package/artifacts/contracts/test/TestVersionable.sol/TestVersionable.dbg.json +1 -1
  161. package/artifacts/contracts/test/TestVersionable.sol/TestVersionable.json +103 -23
  162. package/artifacts/contracts/test/Usdc.sol/USDC.dbg.json +1 -1
  163. package/artifacts/contracts/test/Usdc.sol/USDC.json +91 -53
  164. package/artifacts/contracts/types/AddressSet.sol/LibAddressSet.dbg.json +1 -1
  165. package/artifacts/contracts/types/Blocknumber.sol/BlocknumberLib.dbg.json +1 -1
  166. package/artifacts/contracts/types/ChainId.sol/ChainIdLib.dbg.json +1 -1
  167. package/artifacts/contracts/types/DistributorType.sol/DistributorTypeLib.dbg.json +4 -0
  168. package/artifacts/contracts/types/DistributorType.sol/DistributorTypeLib.json +104 -0
  169. package/artifacts/contracts/types/Fee.sol/FeeLib.dbg.json +1 -1
  170. package/artifacts/contracts/types/Fee.sol/FeeLib.json +52 -13
  171. package/artifacts/contracts/types/Key32.sol/Key32Lib.dbg.json +1 -1
  172. package/artifacts/contracts/types/Key32.sol/Key32Lib.json +31 -17
  173. package/artifacts/contracts/types/NftId.sol/NftIdLib.dbg.json +1 -1
  174. package/artifacts/contracts/types/NftId.sol/NftIdLib.json +2 -2
  175. package/artifacts/contracts/types/NftIdSet.sol/LibNftIdSet.dbg.json +1 -1
  176. package/artifacts/contracts/types/NftIdSet.sol/LibNftIdSet.json +2 -2
  177. package/artifacts/contracts/types/NumberId.sol/NumberIdLib.dbg.json +4 -0
  178. package/artifacts/contracts/types/NumberId.sol/NumberIdLib.json +100 -0
  179. package/artifacts/contracts/types/ObjectType.sol/ObjectTypeLib.dbg.json +1 -1
  180. package/artifacts/contracts/types/ObjectType.sol/ObjectTypeLib.json +2 -2
  181. package/artifacts/contracts/types/Referral.sol/ReferralLib.dbg.json +4 -0
  182. package/artifacts/contracts/types/Referral.sol/ReferralLib.json +123 -0
  183. package/artifacts/contracts/types/RiskId.sol/RiskIdLib.dbg.json +4 -0
  184. package/artifacts/contracts/types/RiskId.sol/RiskIdLib.json +86 -0
  185. package/artifacts/contracts/types/RoleId.sol/RoleIdLib.dbg.json +1 -1
  186. package/artifacts/contracts/types/RoleId.sol/RoleIdLib.json +134 -8
  187. package/artifacts/contracts/types/StateId.sol/StateIdLib.dbg.json +1 -1
  188. package/artifacts/contracts/types/StateId.sol/StateIdLib.json +2 -2
  189. package/artifacts/contracts/types/Timestamp.sol/TimestampLib.dbg.json +1 -1
  190. package/artifacts/contracts/types/Timestamp.sol/TimestampLib.json +15 -2
  191. package/artifacts/contracts/types/UFixed.sol/MathLib.dbg.json +4 -0
  192. package/artifacts/contracts/types/UFixed.sol/MathLib.json +10 -0
  193. package/artifacts/contracts/types/UFixed.sol/UFixedLib.dbg.json +4 -0
  194. package/artifacts/contracts/types/UFixed.sol/{UFixedMathLib.json → UFixedLib.json} +3 -3
  195. package/artifacts/contracts/types/Version.sol/VersionLib.dbg.json +1 -1
  196. package/artifacts/contracts/types/Version.sol/VersionLib.json +40 -2
  197. package/artifacts/contracts/types/Version.sol/VersionPartLib.dbg.json +1 -1
  198. package/artifacts/contracts/types/Version.sol/VersionPartLib.json +22 -3
  199. package/contracts/components/BaseComponent.sol +26 -23
  200. package/contracts/components/Distribution.sol +166 -0
  201. package/contracts/components/IBaseComponent.sol +9 -3
  202. package/contracts/components/IDistributionComponent.sol +46 -0
  203. package/contracts/components/IPoolComponent.sol +14 -9
  204. package/contracts/components/IProductComponent.sol +25 -9
  205. package/contracts/components/Pool.sol +114 -30
  206. package/contracts/components/Product.sol +212 -32
  207. package/contracts/experiment/cloning/Cloner.sol +47 -0
  208. package/contracts/experiment/errors/Revert.sol +4 -13
  209. package/contracts/instance/AccessManagedSimple.sol +115 -0
  210. package/contracts/instance/AccessManagerSimple.sol +692 -0
  211. package/contracts/instance/IAccessManagerSimple.sol +391 -0
  212. package/contracts/instance/IInstance.sol +25 -45
  213. package/contracts/instance/IInstanceService.sol +30 -0
  214. package/contracts/instance/Instance.sol +427 -52
  215. package/contracts/instance/InstanceAccessManager.sol +288 -0
  216. package/contracts/instance/InstanceReader.sol +290 -0
  217. package/contracts/instance/InstanceService.sol +170 -0
  218. package/contracts/instance/InstanceServiceManager.sol +56 -0
  219. package/contracts/instance/base/ComponentServiceBase.sol +12 -13
  220. package/contracts/instance/base/IInstanceBase.sol +11 -2
  221. package/contracts/instance/base/IKeyValueStore.sol +13 -13
  222. package/contracts/instance/base/ILifecycle.sol +3 -3
  223. package/contracts/instance/base/KeyValueStore.sol +53 -37
  224. package/contracts/instance/base/Lifecycle.sol +16 -11
  225. package/contracts/instance/module/IAccess.sol +38 -0
  226. package/contracts/instance/module/IBundle.sol +19 -0
  227. package/contracts/instance/module/IDistribution.sol +39 -0
  228. package/contracts/instance/module/IPolicy.sol +45 -0
  229. package/contracts/instance/module/IRisk.sol +11 -0
  230. package/contracts/instance/module/ISetup.sol +43 -0
  231. package/contracts/instance/module/ITreasury.sol +23 -0
  232. package/contracts/instance/service/ComponentOwnerService.sol +244 -97
  233. package/contracts/instance/service/DistributionService.sol +105 -0
  234. package/contracts/instance/service/DistributionServiceManager.sol +53 -0
  235. package/contracts/instance/service/IComponentOwnerService.sol +1 -3
  236. package/contracts/instance/service/IDistributionService.sol +12 -0
  237. package/contracts/instance/service/IPoolService.sol +8 -1
  238. package/contracts/instance/service/IProductService.sol +56 -7
  239. package/contracts/registry/ChainNft.sol +80 -37
  240. package/contracts/registry/IRegistry.sol +62 -25
  241. package/contracts/registry/IRegistryService.sol +33 -0
  242. package/contracts/registry/ITransferInterceptor.sol +6 -0
  243. package/contracts/registry/Registry.sol +375 -267
  244. package/contracts/registry/RegistryService.sol +399 -0
  245. package/contracts/registry/RegistryServiceManager.sol +80 -0
  246. package/contracts/registry/TokenRegistry.sol +111 -0
  247. package/contracts/shared/ContractDeployerLib.sol +72 -0
  248. package/contracts/shared/ERC165.sol +6 -2
  249. package/contracts/shared/INftOwnable.sol +22 -0
  250. package/contracts/shared/IRegisterable.sol +8 -15
  251. package/contracts/{instance/base → shared}/IService.sol +3 -3
  252. package/contracts/shared/IVersionable.sol +55 -11
  253. package/contracts/shared/NftOwnable.sol +136 -0
  254. package/contracts/shared/ProxyManager.sol +94 -0
  255. package/contracts/shared/Registerable.sol +63 -59
  256. package/contracts/shared/RegisterableUpgradable.sol +16 -0
  257. package/contracts/shared/Service.sol +54 -0
  258. package/contracts/shared/TokenHandler.sol +27 -0
  259. package/contracts/shared/UpgradableProxyWithAdmin.sol +16 -0
  260. package/contracts/shared/Versionable.sol +113 -55
  261. package/contracts/test/TestFee.sol +2 -2
  262. package/contracts/test/TestRegisterable.sol +5 -6
  263. package/contracts/test/TestRoleId.sol +1 -1
  264. package/contracts/test/TestService.sol +5 -13
  265. package/contracts/types/DistributorType.sol +55 -0
  266. package/contracts/types/Fee.sol +10 -5
  267. package/contracts/types/Key32.sol +8 -3
  268. package/contracts/types/NumberId.sol +52 -0
  269. package/contracts/types/ObjectType.sol +51 -14
  270. package/contracts/types/Referral.sol +85 -0
  271. package/contracts/types/RiskId.sol +43 -0
  272. package/contracts/types/RoleId.sol +60 -10
  273. package/contracts/types/StateId.sol +5 -1
  274. package/contracts/types/Timestamp.sol +7 -3
  275. package/contracts/types/UFixed.sol +128 -12
  276. package/contracts/types/Version.sol +13 -1
  277. package/package.json +4 -3
  278. package/artifacts/contracts/experiment/errors/IncrementRevert.sol/IIncrementRevert.dbg.json +0 -4
  279. package/artifacts/contracts/experiment/errors/IncrementRevert.sol/IIncrementRevert.json +0 -27
  280. package/artifacts/contracts/experiment/errors/IncrementRevert.sol/IncrementRevert.dbg.json +0 -4
  281. package/artifacts/contracts/experiment/errors/IncrementRevert.sol/IncrementRevert.json +0 -83
  282. package/artifacts/contracts/experiment/errors/Revert.sol/IRevert.dbg.json +0 -4
  283. package/artifacts/contracts/experiment/errors/Revert.sol/IRevert.json +0 -75
  284. package/artifacts/contracts/instance/IInstanceLinked.sol/IInstanceLinked.dbg.json +0 -4
  285. package/artifacts/contracts/instance/IInstanceLinked.sol/IInstanceLinked.json +0 -24
  286. package/artifacts/contracts/instance/base/IService.sol/IService.dbg.json +0 -4
  287. package/artifacts/contracts/instance/base/InstanceBase.sol/InstanceBase.dbg.json +0 -4
  288. package/artifacts/contracts/instance/base/ModuleBase.sol/ModuleBase.dbg.json +0 -4
  289. package/artifacts/contracts/instance/base/ServiceBase.sol/ServiceBase.dbg.json +0 -4
  290. package/artifacts/contracts/instance/module/access/Access.sol/AccessModule.dbg.json +0 -4
  291. package/artifacts/contracts/instance/module/access/Access.sol/AccessModule.json +0 -333
  292. package/artifacts/contracts/instance/module/access/IAccess.sol/IAccess.dbg.json +0 -4
  293. package/artifacts/contracts/instance/module/access/IAccess.sol/IAccessModule.dbg.json +0 -4
  294. package/artifacts/contracts/instance/module/access/IAccess.sol/IAccessModule.json +0 -333
  295. package/artifacts/contracts/instance/module/bundle/BundleModule.sol/BundleModule.dbg.json +0 -4
  296. package/artifacts/contracts/instance/module/bundle/BundleModule.sol/BundleModule.json +0 -296
  297. package/artifacts/contracts/instance/module/bundle/IBundle.sol/IBundle.dbg.json +0 -4
  298. package/artifacts/contracts/instance/module/bundle/IBundle.sol/IBundleModule.dbg.json +0 -4
  299. package/artifacts/contracts/instance/module/bundle/IBundle.sol/IBundleModule.json +0 -296
  300. package/artifacts/contracts/instance/module/compensation/CompensationModule.sol/CompensationModule.dbg.json +0 -4
  301. package/artifacts/contracts/instance/module/compensation/CompensationModule.sol/CompensationModule.json +0 -10
  302. package/artifacts/contracts/instance/module/compensation/ICompensation.sol/ICompensation.dbg.json +0 -4
  303. package/artifacts/contracts/instance/module/compensation/ICompensation.sol/ICompensation.json +0 -10
  304. package/artifacts/contracts/instance/module/compensation/ICompensation.sol/ICompensationModule.dbg.json +0 -4
  305. package/artifacts/contracts/instance/module/compensation/ICompensation.sol/ICompensationModule.json +0 -10
  306. package/artifacts/contracts/instance/module/component/ComponentModule.sol/ComponentModule.dbg.json +0 -4
  307. package/artifacts/contracts/instance/module/component/ComponentModule.sol/ComponentModule.json +0 -188
  308. package/artifacts/contracts/instance/module/component/IComponent.sol/IComponent.dbg.json +0 -4
  309. package/artifacts/contracts/instance/module/component/IComponent.sol/IComponent.json +0 -10
  310. package/artifacts/contracts/instance/module/component/IComponent.sol/IComponentModule.dbg.json +0 -4
  311. package/artifacts/contracts/instance/module/component/IComponent.sol/IComponentModule.json +0 -188
  312. package/artifacts/contracts/instance/module/policy/IPolicy.sol/IPolicy.dbg.json +0 -4
  313. package/artifacts/contracts/instance/module/policy/IPolicy.sol/IPolicyModule.dbg.json +0 -4
  314. package/artifacts/contracts/instance/module/policy/IPolicy.sol/IPolicyModule.json +0 -271
  315. package/artifacts/contracts/instance/module/policy/PolicyModule.sol/PolicyModule.dbg.json +0 -4
  316. package/artifacts/contracts/instance/module/policy/PolicyModule.sol/PolicyModule.json +0 -271
  317. package/artifacts/contracts/instance/module/pool/IPoolModule.sol/IPool.dbg.json +0 -4
  318. package/artifacts/contracts/instance/module/pool/IPoolModule.sol/IPool.json +0 -10
  319. package/artifacts/contracts/instance/module/pool/IPoolModule.sol/IPoolModule.dbg.json +0 -4
  320. package/artifacts/contracts/instance/module/pool/IPoolModule.sol/IPoolModule.json +0 -149
  321. package/artifacts/contracts/instance/module/pool/PoolModule.sol/PoolModule.dbg.json +0 -4
  322. package/artifacts/contracts/instance/module/pool/PoolModule.sol/PoolModule.json +0 -149
  323. package/artifacts/contracts/instance/module/risk/IRisk.sol/IRisk.dbg.json +0 -4
  324. package/artifacts/contracts/instance/module/risk/IRisk.sol/IRiskModule.dbg.json +0 -4
  325. package/artifacts/contracts/instance/module/risk/IRisk.sol/IRiskModule.json +0 -10
  326. package/artifacts/contracts/instance/module/risk/RiskModule.sol/RiskModule.dbg.json +0 -4
  327. package/artifacts/contracts/instance/module/risk/RiskModule.sol/RiskModule.json +0 -10
  328. package/artifacts/contracts/instance/module/treasury/ITreasury.sol/ITreasury.dbg.json +0 -4
  329. package/artifacts/contracts/instance/module/treasury/ITreasury.sol/ITreasuryModule.dbg.json +0 -4
  330. package/artifacts/contracts/instance/module/treasury/ITreasury.sol/ITreasuryModule.json +0 -533
  331. package/artifacts/contracts/instance/module/treasury/TokenHandler.sol/TokenHandler.dbg.json +0 -4
  332. package/artifacts/contracts/instance/module/treasury/TokenHandler.sol/TokenHandler.json +0 -76
  333. package/artifacts/contracts/instance/module/treasury/TreasuryModule.sol/TreasuryModule.dbg.json +0 -4
  334. package/artifacts/contracts/instance/module/treasury/TreasuryModule.sol/TreasuryModule.json +0 -533
  335. package/artifacts/contracts/instance/service/PoolService.sol/PoolService.dbg.json +0 -4
  336. package/artifacts/contracts/instance/service/PoolService.sol/PoolService.json +0 -471
  337. package/artifacts/contracts/instance/service/ProductService.sol/ProductService.dbg.json +0 -4
  338. package/artifacts/contracts/instance/service/ProductService.sol/ProductService.json +0 -673
  339. package/artifacts/contracts/registry/IChainNft.sol/IChainNft.dbg.json +0 -4
  340. package/artifacts/contracts/registry/IChainNft.sol/IChainNft.json +0 -452
  341. package/artifacts/contracts/registry/IRegistryLinked.sol/IRegistryLinked.dbg.json +0 -4
  342. package/artifacts/contracts/registry/IRegistryLinked.sol/IRegistryLinked.json +0 -24
  343. package/artifacts/contracts/shared/IOwnable.sol/IOwnable.dbg.json +0 -4
  344. package/artifacts/contracts/shared/IOwnable.sol/IOwnable.json +0 -24
  345. package/artifacts/contracts/test/TestPool.sol/TestPool.dbg.json +0 -4
  346. package/artifacts/contracts/test/TestPool.sol/TestPool.json +0 -387
  347. package/artifacts/contracts/test/TestProduct.sol/TestProduct.dbg.json +0 -4
  348. package/artifacts/contracts/test/TestProduct.sol/TestProduct.json +0 -393
  349. package/artifacts/contracts/types/UFixed.sol/UFixedMathLib.dbg.json +0 -4
  350. package/contracts/experiment/errors/IncrementRevert.sol +0 -43
  351. package/contracts/experiment/statemachine/README.md +0 -112
  352. package/contracts/instance/IInstanceLinked.sol +0 -8
  353. package/contracts/instance/base/InstanceBase.sol +0 -80
  354. package/contracts/instance/base/ModuleBase.sol +0 -52
  355. package/contracts/instance/base/ServiceBase.sol +0 -37
  356. package/contracts/instance/module/access/Access.sol +0 -149
  357. package/contracts/instance/module/access/IAccess.sol +0 -53
  358. package/contracts/instance/module/bundle/BundleModule.sol +0 -136
  359. package/contracts/instance/module/bundle/IBundle.sol +0 -58
  360. package/contracts/instance/module/compensation/CompensationModule.sol +0 -8
  361. package/contracts/instance/module/compensation/ICompensation.sol +0 -10
  362. package/contracts/instance/module/component/ComponentModule.sol +0 -95
  363. package/contracts/instance/module/component/IComponent.sol +0 -53
  364. package/contracts/instance/module/policy/IPolicy.sol +0 -61
  365. package/contracts/instance/module/policy/PolicyModule.sol +0 -77
  366. package/contracts/instance/module/pool/IPoolModule.sol +0 -41
  367. package/contracts/instance/module/pool/PoolModule.sol +0 -87
  368. package/contracts/instance/module/risk/IRisk.sol +0 -10
  369. package/contracts/instance/module/risk/RiskModule.sol +0 -8
  370. package/contracts/instance/module/treasury/ITreasury.sol +0 -103
  371. package/contracts/instance/module/treasury/TokenHandler.sol +0 -48
  372. package/contracts/instance/module/treasury/TreasuryModule.sol +0 -152
  373. package/contracts/instance/service/PoolService.sol +0 -123
  374. package/contracts/instance/service/ProductService.sol +0 -354
  375. package/contracts/registry/IChainNft.sol +0 -21
  376. package/contracts/registry/IRegistryLinked.sol +0 -8
  377. package/contracts/shared/IOwnable.sol +0 -6
  378. package/contracts/test/TestPool.sol +0 -22
  379. package/contracts/test/TestProduct.sol +0 -44
@@ -0,0 +1,170 @@
1
+ // SPDX-License-Identifier: Apache-2.0
2
+ pragma solidity ^0.8.20;
3
+
4
+ import {Clones} from "@openzeppelin/contracts/proxy/Clones.sol";
5
+
6
+ import {AccessManagerSimple} from "./AccessManagerSimple.sol";
7
+ import {InstanceAccessManager} from "./InstanceAccessManager.sol";
8
+ import {Instance} from "./Instance.sol";
9
+ import {IInstanceService} from "./IInstanceService.sol";
10
+ import {InstanceReader} from "./InstanceReader.sol";
11
+ import {IRegistry} from "../registry/IRegistry.sol";
12
+ import {Registry} from "../registry/Registry.sol";
13
+ import {RegistryService} from "../registry/RegistryService.sol";
14
+ import {Service} from "../../contracts/shared/Service.sol";
15
+ import {IService} from "../shared/IService.sol";
16
+ import {ContractDeployerLib} from "../shared/ContractDeployerLib.sol";
17
+ import {NftId, NftIdLib, zeroNftId} from "../../contracts/types/NftId.sol";
18
+ import {RoleId} from "../types/RoleId.sol";
19
+ import {VersionLib} from "../types/Version.sol";
20
+ import {ADMIN_ROLE, INSTANCE_SERVICE_ROLE, DISTRIBUTION_SERVICE_ROLE} from "../types/RoleId.sol";
21
+
22
+ contract InstanceService is Service, IInstanceService {
23
+
24
+ address internal _registryAddress;
25
+ address internal _accessManagerMaster;
26
+ address internal _instanceMaster;
27
+ address internal _instanceReaderMaster;
28
+
29
+ // TODO update to real hash when instance is stable
30
+ bytes32 public constant INSTANCE_CREATION_CODE_HASH = bytes32(0);
31
+ string public constant NAME = "InstanceService";
32
+
33
+ function createInstanceClone()
34
+ external
35
+ returns (
36
+ AccessManagerSimple clonedAccessManager,
37
+ Instance clonedInstance,
38
+ NftId instanceNftId,
39
+ InstanceReader clonedInstanceReader
40
+ )
41
+ {
42
+ address instanceOwner = msg.sender;
43
+ Registry registry = Registry(_registryAddress);
44
+ NftId registryNftId = registry.getNftId(_registryAddress);
45
+ address registryServiceAddress = registry.getServiceAddress("RegistryService", VersionLib.toVersion(3, 0, 0).toMajorPart());
46
+ RegistryService registryService = RegistryService(registryServiceAddress);
47
+
48
+ // initially set the authority of the access managar to this (being the instance service).
49
+ // This will allow the instance service to bootstrap the authorizations of the instance
50
+ // and then transfer the ownership of the access manager to the instance owner once everything is setup
51
+ clonedAccessManager = AccessManagerSimple(Clones.clone(_accessManagerMaster));
52
+ clonedAccessManager.initialize(address(this));
53
+
54
+ clonedInstance = Instance(Clones.clone(_instanceMaster));
55
+ clonedInstance.initialize(address(clonedAccessManager), _registryAddress, registryNftId, msg.sender);
56
+ ( IRegistry.ObjectInfo memory info, ) = registryService.registerInstance(clonedInstance);
57
+ instanceNftId = info.nftId;
58
+
59
+ clonedInstanceReader = InstanceReader(Clones.clone(address(_instanceReaderMaster)));
60
+ clonedInstanceReader.initialize(_registryAddress, instanceNftId);
61
+
62
+ _grantInitialAuthorizations(clonedAccessManager, clonedInstance);
63
+
64
+ clonedInstance.setInstanceReader(clonedInstanceReader);
65
+
66
+ // to complete setup switch instance ownership to the instance owner
67
+ // TODO: use a role less powerful than admin, maybe INSTANCE_ADMIN (does not exist yet)
68
+ clonedAccessManager.grantRole(ADMIN_ROLE().toInt(), instanceOwner, 0);
69
+ clonedAccessManager.revokeRole(ADMIN_ROLE().toInt(), address(this));
70
+
71
+ emit LogInstanceCloned(address(clonedAccessManager), address(clonedInstance), address(clonedInstanceReader), instanceNftId);
72
+ }
73
+
74
+ function _grantInitialAuthorizations(AccessManagerSimple clonedAccessManager, Instance clonedInstance) internal {
75
+ address distributionServiceAddress = _registry.getServiceAddress("DistributionService", VersionLib.toVersion(3, 0, 0).toMajorPart());
76
+
77
+ clonedAccessManager.grantRole(DISTRIBUTION_SERVICE_ROLE().toInt(), distributionServiceAddress, 0);
78
+ bytes4[] memory instanceDistributionServiceSelectors = new bytes4[](2);
79
+ instanceDistributionServiceSelectors[0] = clonedInstance.createDistributionSetup.selector;
80
+ instanceDistributionServiceSelectors[1] = clonedInstance.updateDistributionSetup.selector;
81
+ clonedAccessManager.setTargetFunctionRole(
82
+ address(clonedInstance),
83
+ instanceDistributionServiceSelectors,
84
+ DISTRIBUTION_SERVICE_ROLE().toInt());
85
+ }
86
+
87
+ function setAccessManagerMaster(address accessManagerMaster) external {
88
+ require(
89
+ _accessManagerMaster == address(0),
90
+ "ERROR:CRD-001:ACCESS_MANAGER_MASTER_ALREADY_SET");
91
+ _accessManagerMaster = accessManagerMaster;
92
+ }
93
+
94
+ function setInstanceMaster(address instanceMaster) external {
95
+ require(
96
+ _instanceMaster == address(0),
97
+ "ERROR:CRD-002:INSTANCE_MASTER_ALREADY_SET");
98
+ _instanceMaster = instanceMaster;
99
+ }
100
+
101
+ function setInstanceReaderMaster(address instanceReaderMaster) external {
102
+ require(
103
+ _instanceReaderMaster == address(0),
104
+ "ERROR:CRD-003:INSTANCE_READER_MASTER_ALREADY_SET");
105
+ _instanceReaderMaster = instanceReaderMaster;
106
+ }
107
+
108
+ function getInstanceReaderMaster() external view returns (address) {
109
+ return _instanceReaderMaster;
110
+ }
111
+
112
+ function getInstanceMaster() external view returns (address) {
113
+ return _instanceMaster;
114
+ }
115
+
116
+ function getAccessManagerMaster() external view returns (address) {
117
+ return _accessManagerMaster;
118
+ }
119
+
120
+ // From IService
121
+ function getName() public pure override(IService, Service) returns(string memory) {
122
+ return NAME;
123
+ }
124
+
125
+ /// @dev top level initializer
126
+ // 1) registry is non upgradeable -> don't need a proxy and uses constructor !
127
+ // 2) deploy registry service first -> from its initialization func it is easier to deploy registry then vice versa
128
+ // 3) deploy registry -> pass registry service address as constructor argument
129
+ // registry is getting instantiated and locked to registry service address forever
130
+ function _initialize(
131
+ address owner,
132
+ bytes memory data
133
+ )
134
+ internal
135
+ initializer
136
+ virtual override
137
+ {
138
+ // bytes memory encodedConstructorArguments = abi.encode(
139
+ // _registryAddress);
140
+
141
+ // bytes memory instanceCreationCode = ContractDeployerLib.getCreationCode(
142
+ // instanceByteCodeWithInitCode,
143
+ // encodedConstructorArguments);
144
+
145
+ // address instanceAddress = ContractDeployerLib.deploy(
146
+ // instanceCreationCode,
147
+ // INSTANCE_CREATION_CODE_HASH);
148
+
149
+ address initialOwner = address(0);
150
+ (_registryAddress, initialOwner) = abi.decode(data, (address, address));
151
+
152
+ _initializeService(_registryAddress, initialOwner);
153
+
154
+ _registerInterface(type(IService).interfaceId);
155
+ _registerInterface(type(IInstanceService).interfaceId);
156
+ }
157
+
158
+ function hasRole(address account, RoleId role, NftId instanceNftId) external view returns (bool) {
159
+ IRegistry.ObjectInfo memory instanceObjectInfo = getRegistry().getObjectInfo(instanceNftId);
160
+ address instanceAddress = instanceObjectInfo.objectAddress;
161
+ Instance instance = Instance(instanceAddress);
162
+ AccessManagerSimple accessManager = AccessManagerSimple(instance.authority());
163
+ (bool isMember, uint32 executionDelay) = accessManager.hasRole(role.toInt(), account);
164
+ if (executionDelay > 0) {
165
+ return false;
166
+ }
167
+ return isMember;
168
+ }
169
+ }
170
+
@@ -0,0 +1,56 @@
1
+ // SPDX-License-Identifier: Apache-2.0
2
+ pragma solidity ^0.8.20;
3
+
4
+ import {Instance} from "./Instance.sol";
5
+ import {IVersionable} from "../shared/IVersionable.sol";
6
+ import {ProxyManager} from "../shared/ProxyManager.sol";
7
+ import {InstanceService} from "./InstanceService.sol";
8
+ import {Registry} from "../registry/Registry.sol";
9
+ import {RegistryService} from "../registry/RegistryService.sol";
10
+ import {VersionLib} from "../types/Version.sol";
11
+
12
+ contract InstanceServiceManager is ProxyManager {
13
+
14
+ InstanceService private _instanceService;
15
+
16
+ /// @dev initializes proxy manager with instance service implementation and deploys instance
17
+ constructor(
18
+ address registryAddress
19
+ )
20
+ ProxyManager()
21
+ {
22
+ InstanceService instSrv = new InstanceService();
23
+ // bytes memory initCode = type(InstanceService).creationCode;
24
+ bytes memory data = abi.encode(registryAddress, address(this));
25
+ IVersionable versionable = deploy(
26
+ address(instSrv),
27
+ data);
28
+
29
+ _instanceService = InstanceService(address(versionable));
30
+
31
+ Registry registry = Registry(registryAddress);
32
+ address registryServiceAddress = registry.getServiceAddress("RegistryService", VersionLib.toVersion(3, 0, 0).toMajorPart());
33
+ RegistryService registryService = RegistryService(registryServiceAddress);
34
+
35
+ registryService.registerService(_instanceService);
36
+ // RegistryService registryService = _instanceService.getRegistryService();
37
+
38
+ // link ownership of instance service manager ot nft owner of instance service
39
+ _linkToNftOwnable(
40
+ address(registryAddress),
41
+ address(_instanceService));
42
+
43
+ // implies that after this constructor call only upgrade functionality is available
44
+ _isDeployed = true;
45
+ }
46
+
47
+ //--- view functions ----------------------------------------------------//
48
+ function getInstanceService()
49
+ external
50
+ view
51
+ returns (InstanceService instanceService)
52
+ {
53
+ return _instanceService;
54
+ }
55
+
56
+ }
@@ -2,23 +2,17 @@
2
2
  pragma solidity ^0.8.19;
3
3
 
4
4
  import {IRegistry} from "../../registry/IRegistry.sol";
5
+ import {IRegistryService} from "../../registry/IRegistryService.sol";
5
6
  import {IInstance} from "../../instance/IInstance.sol";
6
7
  import {ObjectType, INSTANCE, PRODUCT, POOL} from "../../types/ObjectType.sol";
7
8
  import {NftId, NftIdLib} from "../../types/NftId.sol";
8
9
 
9
- import {ServiceBase} from "./ServiceBase.sol";
10
+ import {Service} from "../../shared/Service.sol";
11
+ import {Version, VersionPart, VersionLib} from "../../types/Version.sol";
10
12
 
11
- abstract contract ComponentServiceBase is ServiceBase {
12
-
13
- constructor(
14
- address registry,
15
- NftId registryNftId
16
- )
17
- ServiceBase(registry, registryNftId)
18
- // solhint-disable-next-line no-empty-blocks
19
- {
20
- }
13
+ abstract contract ComponentServiceBase is Service {
21
14
 
15
+ error CallerIsNotComponentOwner();
22
16
 
23
17
  function _getAndVerifyComponentInfoAndInstance(
24
18
  ObjectType objectType
@@ -33,10 +27,15 @@ abstract contract ComponentServiceBase is ServiceBase {
33
27
  NftId componentNftId = _registry.getNftId(msg.sender);
34
28
  require(componentNftId.gtz(), "ERROR_COMPONENT_UNKNOWN");
35
29
 
36
- info = _registry.getObjectInfo(componentNftId);
30
+ info = getRegistry().getObjectInfo(componentNftId);
37
31
  require(info.objectType == objectType, "OBJECT_TYPE_INVALID");
38
32
 
39
- address instanceAddress = _registry.getObjectInfo(info.parentNftId).objectAddress;
33
+ address instanceAddress = getRegistry().getObjectInfo(info.parentNftId).objectAddress;
40
34
  instance = IInstance(instanceAddress);
41
35
  }
36
+
37
+ function getRegistryService() public view virtual returns (IRegistryService) {
38
+ address service = getRegistry().getServiceAddress("RegistryService", getMajorVersion());
39
+ return IRegistryService(service);
40
+ }
42
41
  }
@@ -1,14 +1,23 @@
1
1
  // SPDX-License-Identifier: Apache-2.0
2
- pragma solidity ^0.8.19;
2
+ pragma solidity ^0.8.20;
3
+
4
+ import {Key32} from "../../types/Key32.sol";
5
+ import {StateId} from "../../types/StateId.sol";
3
6
 
4
7
  import {IKeyValueStore} from "./IKeyValueStore.sol";
8
+
5
9
  import {IComponentOwnerService} from "../service/IComponentOwnerService.sol";
10
+ import {IDistributionService} from "../service/IDistributionService.sol";
6
11
  import {IProductService} from "../service/IProductService.sol";
7
12
  import {IPoolService} from "../service/IPoolService.sol";
8
13
 
9
14
  interface IInstanceBase {
10
15
  function getKeyValueStore() external view returns (IKeyValueStore keyValueStore);
11
- function getComponentOwnerService() external view returns(IComponentOwnerService service);
16
+ function updateState(Key32 key, StateId state) external;
17
+ function getState(Key32 key) external view returns (StateId state);
18
+
19
+ function getComponentOwnerService() external view returns(IComponentOwnerService);
20
+ function getDistributionService() external view returns(IDistributionService);
12
21
  function getProductService() external view returns(IProductService service);
13
22
  function getPoolService() external view returns(IPoolService service);
14
23
  }
@@ -1,5 +1,5 @@
1
1
  // SPDX-License-Identifier: Apache-2.0
2
- pragma solidity ^0.8.19;
2
+ pragma solidity ^0.8.20;
3
3
 
4
4
  import {Blocknumber, blockBlocknumber, zeroBlocknumber} from "../../types/Blocknumber.sol";
5
5
  import {Key32, KeyId} from "../../types/Key32.sol";
@@ -9,13 +9,9 @@ import {StateId} from "../../types/StateId.sol";
9
9
 
10
10
  import {ILifecycle} from "./ILifecycle.sol";
11
11
 
12
+ // TODO remove - internal only?
12
13
  interface IKeyValueStore is ILifecycle {
13
14
 
14
- struct Key {
15
- ObjectType objectType;
16
- KeyId id;
17
- }
18
-
19
15
  struct Value {
20
16
  Metadata metadata;
21
17
  bytes data;
@@ -24,20 +20,24 @@ interface IKeyValueStore is ILifecycle {
24
20
  struct Metadata {
25
21
  ObjectType objectType;
26
22
  StateId state;
23
+ // TODO updatedBy needs concept that says what value should go here
24
+ // eg account outside gif objects that initiated the tx
25
+ // implies the caller needs to be propagated through all calls up to key values store itself
26
+ // to always have the instance address there doesn't seem to make sense
27
27
  address updatedBy;
28
28
  Blocknumber updatedIn;
29
29
  Blocknumber createdIn;
30
30
  }
31
31
 
32
- event LogInfoCreated(Key key, StateId state, address createdBy);
33
- event LogInfoUpdated(Key key, StateId state, address updatedBy, Blocknumber lastUpdatedIn);
34
- event LogStateUpdated(Key key, StateId stateOld, StateId stateNew, address updatedBy, Blocknumber lastUpdatedIn);
32
+ event LogInfoCreated(ObjectType objectType, KeyId keyId, StateId state, address createdBy, address txOrigin);
33
+ event LogInfoUpdated(ObjectType objectType, KeyId keyId, StateId state, address updatedBy, address txOrigin, Blocknumber lastUpdatedIn);
34
+ event LogStateUpdated(ObjectType objectType, KeyId keyId, StateId stateOld, StateId stateNew, address updatedBy, address txOrigin, Blocknumber lastUpdatedIn);
35
35
 
36
36
  // generic state changing functions
37
- function create(Key32 key, ObjectType objectType, bytes memory data) external;
38
- function update(Key32 key, StateId state, bytes memory data) external;
39
- function updateData(Key32 key, bytes memory data) external;
40
- function updateState(Key32 key, StateId state) external;
37
+ // function create(Key32 key, bytes memory data) external;
38
+ // function update(Key32 key, bytes memory data, StateId state) external;
39
+ // function updateData(Key32 key, bytes memory data) external;
40
+ // function updateState(Key32 key, StateId state) external;
41
41
 
42
42
  function exists(Key32 key) external view returns (bool);
43
43
  function get(Key32 key) external view returns (Value memory value);
@@ -1,9 +1,9 @@
1
1
  // SPDX-License-Identifier: Apache-2.0
2
- pragma solidity ^0.8.19;
2
+ pragma solidity ^0.8.20;
3
3
 
4
- import {ObjectType} from "../../types/ObjectType.sol";
5
- import {StateId, toStateId, zeroStateId} from "../../types/StateId.sol";
6
4
  import {NftId} from "../../types/NftId.sol";
5
+ import {ObjectType} from "../../types/ObjectType.sol";
6
+ import {StateId} from "../../types/StateId.sol";
7
7
 
8
8
  interface ILifecycle {
9
9
 
@@ -1,12 +1,12 @@
1
1
  // SPDX-License-Identifier: Apache-2.0
2
- pragma solidity ^0.8.19;
2
+ pragma solidity ^0.8.20;
3
3
 
4
4
  import {Blocknumber, blockBlocknumber, zeroBlocknumber} from "../../types/Blocknumber.sol";
5
5
  import {Key32, KeyId, Key32Lib} from "../../types/Key32.sol";
6
6
  import {NftId} from "../../types/NftId.sol";
7
7
  import {ObjectType} from "../../types/ObjectType.sol";
8
8
  import {StateId, ACTIVE} from "../../types/StateId.sol";
9
- import {Timestamp, blockTimestamp, zeroTimestamp} from "../../types/Timestamp.sol";
9
+ import {Timestamp, TimestampLib} from "../../types/Timestamp.sol";
10
10
 
11
11
  import {Lifecycle} from "./Lifecycle.sol";
12
12
  import {IKeyValueStore} from "./IKeyValueStore.sol";
@@ -14,27 +14,23 @@ import {IKeyValueStore} from "./IKeyValueStore.sol";
14
14
  contract KeyValueStore is Lifecycle, IKeyValueStore {
15
15
 
16
16
  mapping(Key32 key32 => Value value) private _value;
17
- address private _owner;
18
17
 
19
- modifier onlyOwner() {
20
- require(
21
- msg.sender == _owner,
22
- "ERROR:KVS-001:NOT_OWNER");
23
- _;
24
- }
25
-
26
- constructor() {
27
- _owner = msg.sender;
18
+ function create(
19
+ Key32 key32,
20
+ bytes memory data
21
+ )
22
+ internal
23
+ {
24
+ _create(key32, data);
28
25
  }
29
26
 
30
- function create(
27
+ function _create(
31
28
  Key32 key32,
32
- ObjectType objectType,
33
29
  bytes memory data
34
30
  )
35
- public
36
- onlyOwner
31
+ internal
37
32
  {
33
+ ObjectType objectType = key32.toObjectType();
38
34
  require(objectType.gtz(), "ERROR:KVS-010:TYPE_UNDEFINED");
39
35
 
40
36
  Metadata storage metadata = _value[key32].metadata;
@@ -54,12 +50,26 @@ contract KeyValueStore is Lifecycle, IKeyValueStore {
54
50
  // set data
55
51
  _value[key32].data = data;
56
52
 
57
- emit LogInfoCreated(toKey(key32), initialState, createdBy);
53
+ // solhint-disable-next-line avoid-tx-origin
54
+ emit LogInfoCreated(key32.toObjectType(), key32.toKeyId(), initialState, createdBy, tx.origin);
58
55
  }
59
56
 
60
- function update(Key32 key32, StateId state, bytes memory data)
61
- public
62
- onlyOwner
57
+ function update(
58
+ Key32 key32,
59
+ bytes memory data,
60
+ StateId state
61
+ )
62
+ internal
63
+ {
64
+ _update(key32, data, state);
65
+ }
66
+
67
+ function _update(
68
+ Key32 key32,
69
+ bytes memory data,
70
+ StateId state
71
+ )
72
+ internal
63
73
  {
64
74
  require(state.gtz(), "ERROR:KVS-020:STATE_UNDEFINED");
65
75
  Metadata storage metadata = _value[key32].metadata;
@@ -77,14 +87,20 @@ contract KeyValueStore is Lifecycle, IKeyValueStore {
77
87
  metadata.updatedIn = blockBlocknumber();
78
88
 
79
89
  // create log entries
80
- Key memory key = toKey(key32);
81
- emit LogStateUpdated(key, state, stateOld, updatedBy, lastUpdatedIn);
82
- emit LogInfoUpdated(key, state, updatedBy, lastUpdatedIn);
90
+ // solhint-disable avoid-tx-origin
91
+ emit LogStateUpdated(key32.toObjectType(), key32.toKeyId(), state, stateOld, updatedBy, tx.origin, lastUpdatedIn);
92
+ emit LogInfoUpdated(key32.toObjectType(), key32.toKeyId(), state, updatedBy, tx.origin, lastUpdatedIn);
93
+ // solhing-enable
83
94
  }
84
95
 
85
96
  function updateData(Key32 key32, bytes memory data)
86
- public
87
- onlyOwner
97
+ internal
98
+ {
99
+ _updateData(key32, data);
100
+ }
101
+
102
+ function _updateData(Key32 key32, bytes memory data)
103
+ internal
88
104
  {
89
105
  Metadata storage metadata = _value[key32].metadata;
90
106
  StateId state = metadata.state;
@@ -100,13 +116,18 @@ contract KeyValueStore is Lifecycle, IKeyValueStore {
100
116
  metadata.updatedIn = blockBlocknumber();
101
117
 
102
118
  // create log entry
103
- Key memory key = toKey(key32);
104
- emit LogInfoUpdated(key, state, updatedBy, lastUpdatedIn);
119
+ // solhint-disable-next-line avoid-tx-origin
120
+ emit LogInfoUpdated(key32.toObjectType(), key32.toKeyId(), state, updatedBy, tx.origin, lastUpdatedIn);
105
121
  }
106
122
 
107
123
  function updateState(Key32 key32, StateId state)
108
- public
109
- onlyOwner
124
+ internal
125
+ {
126
+ _updateState(key32, state);
127
+ }
128
+
129
+ function _updateState(Key32 key32, StateId state)
130
+ internal
110
131
  {
111
132
  require(state.gtz(), "ERROR:KVS-040:STATE_UNDEFINED");
112
133
  Metadata storage metadata = _value[key32].metadata;
@@ -121,8 +142,8 @@ contract KeyValueStore is Lifecycle, IKeyValueStore {
121
142
  metadata.updatedIn = blockBlocknumber();
122
143
 
123
144
  // create log entry
124
- Key memory key = toKey(key32);
125
- emit LogStateUpdated(key, state, stateOld, updatedBy, lastUpdatedIn);
145
+ // solhint-disable-next-line avoid-tx-origin
146
+ emit LogStateUpdated(key32.toObjectType(), key32.toKeyId(), state, stateOld, updatedBy, tx.origin, lastUpdatedIn);
126
147
  }
127
148
 
128
149
  function exists(Key32 key32) public view returns (bool) {
@@ -145,12 +166,7 @@ contract KeyValueStore is Lifecycle, IKeyValueStore {
145
166
  return _value[key32].metadata.state;
146
167
  }
147
168
 
148
- function toKey32(ObjectType objectType, KeyId id) external pure returns(Key32) {
169
+ function toKey32(ObjectType objectType, KeyId id) external pure override returns(Key32) {
149
170
  return Key32Lib.toKey32(objectType, id);
150
171
  }
151
-
152
- function toKey(Key32 key32) public pure returns (Key memory key) {
153
- (ObjectType objectType, KeyId id) = key32.toKey();
154
- return Key(objectType, id);
155
- }
156
172
  }
@@ -1,8 +1,8 @@
1
1
  // SPDX-License-Identifier: Apache-2.0
2
- pragma solidity ^0.8.19;
2
+ pragma solidity ^0.8.20;
3
3
 
4
4
  import {NftId} from "../../types/NftId.sol";
5
- import {ObjectType, PRODUCT, ORACLE, POOL, BUNDLE, POLICY} from "../../types/ObjectType.sol";
5
+ import {ObjectType, COMPONENT, BUNDLE, POLICY, RISK} from "../../types/ObjectType.sol";
6
6
  import {StateId, ACTIVE, PAUSED, ARCHIVED, CLOSED, APPLIED, UNDERWRITTEN, REVOKED, DECLINED} from "../../types/StateId.sol";
7
7
  import {ILifecycle} from "./ILifecycle.sol";
8
8
 
@@ -14,12 +14,10 @@ contract Lifecycle is ILifecycle {
14
14
  private _isValidTransition;
15
15
 
16
16
  constructor() {
17
- _setupComponentLifecycle(PRODUCT());
18
- _setupComponentLifecycle(ORACLE());
19
- _setupComponentLifecycle(POOL());
20
-
21
17
  _setupBundleLifecycle();
18
+ _setupComponentLifecycle();
22
19
  _setupPolicyLifecycle();
20
+ _setupRiskLifecycle();
23
21
  }
24
22
 
25
23
  function hasLifecycle(
@@ -70,11 +68,11 @@ contract Lifecycle is ILifecycle {
70
68
  return _isValidTransition[objectType][fromId][toId];
71
69
  }
72
70
 
73
- function _setupComponentLifecycle(ObjectType objectType) internal {
74
- _initialState[objectType] = ACTIVE();
75
- _isValidTransition[objectType][ACTIVE()][PAUSED()] = true;
76
- _isValidTransition[objectType][PAUSED()][ACTIVE()] = true;
77
- _isValidTransition[objectType][PAUSED()][ARCHIVED()] = true;
71
+ function _setupComponentLifecycle() internal {
72
+ _initialState[COMPONENT()] = ACTIVE();
73
+ _isValidTransition[COMPONENT()][ACTIVE()][PAUSED()] = true;
74
+ _isValidTransition[COMPONENT()][PAUSED()][ACTIVE()] = true;
75
+ _isValidTransition[COMPONENT()][PAUSED()][ARCHIVED()] = true;
78
76
  }
79
77
 
80
78
  function _setupBundleLifecycle() internal {
@@ -92,4 +90,11 @@ contract Lifecycle is ILifecycle {
92
90
  _isValidTransition[POLICY()][UNDERWRITTEN()][ACTIVE()] = true;
93
91
  _isValidTransition[POLICY()][ACTIVE()][CLOSED()] = true;
94
92
  }
93
+
94
+ function _setupRiskLifecycle() internal {
95
+ _initialState[RISK()] = ACTIVE();
96
+ _isValidTransition[RISK()][ACTIVE()][PAUSED()] = true;
97
+ _isValidTransition[RISK()][PAUSED()][ACTIVE()] = true;
98
+ _isValidTransition[RISK()][PAUSED()][ARCHIVED()] = true;
99
+ }
95
100
  }
@@ -0,0 +1,38 @@
1
+ // SPDX-License-Identifier: Apache-2.0
2
+ pragma solidity ^0.8.20;
3
+
4
+ import {EnumerableSet} from "@openzeppelin/contracts/utils/structs/EnumerableSet.sol";
5
+ import {ShortString, ShortStrings} from "@openzeppelin/contracts/utils/ShortStrings.sol";
6
+
7
+ import {RoleId} from "../../types/RoleId.sol";
8
+
9
+ interface IAccess {
10
+ struct RoleInfo {
11
+ ShortString name;
12
+ bool isCustom;
13
+ }
14
+
15
+ struct TargetInfo {
16
+ ShortString name;
17
+ bool isCustom;
18
+ }
19
+
20
+ error ErrorTargetAddressZero();
21
+ error ErrorTargetAlreadyExists(address target, ShortString name);
22
+ error ErrorTargetDoesNotExist(address target);
23
+ error ErrorTargetNameEmpty(address target);
24
+ error ErrorTargetNameExists(address target, address existingTarget, ShortString name);
25
+
26
+ error ErrorRoleIdInvalid(RoleId roleId);
27
+ error ErrorRoleIdTooBig(RoleId roleId);
28
+ error ErrorRoleIdTooSmall(RoleId roleId);
29
+ error ErrorRoleIdAlreadyExists(RoleId roleId, ShortString name);
30
+ error ErrorRoleIdNotActive(RoleId roleId);
31
+ error ErrorRoleNameEmpty(RoleId roleId);
32
+ error ErrorRoleNameNotUnique(RoleId roleId, ShortString name);
33
+ error ErrorRoleInvalidUpdate(RoleId roleId, bool isCustom);
34
+ error ErrorGrantNonexstentRole(RoleId roleId);
35
+ error ErrorRevokeNonexstentRole(RoleId roleId);
36
+ error ErrorRenounceNonexstentRole(RoleId roleId);
37
+
38
+ }
@@ -0,0 +1,19 @@
1
+ // SPDX-License-Identifier: Apache-2.0
2
+ pragma solidity ^0.8.20;
3
+
4
+ import {NftId} from "../../types/NftId.sol";
5
+ import {Fee} from "../../types/Fee.sol";
6
+ import {Timestamp} from "../../types/Timestamp.sol";
7
+
8
+ interface IBundle {
9
+ struct BundleInfo {
10
+ NftId poolNftId;
11
+ Fee fee; // bundle fee on net premium amounts
12
+ bytes filter; // required conditions for applications to be considered for collateralization by this bundle
13
+ uint256 capitalAmount; // net investment capital + net premiums - payouts
14
+ uint256 lockedAmount; // capital amount linked to collateralizaion of non-closed policies (<= balance)
15
+ uint256 balanceAmount; // total amount of funds: capitalAmount + fees (balance >= captial)
16
+ Timestamp expiredAt; // no new policies
17
+ Timestamp closedAt; // no open policies, locked amount = 0
18
+ }
19
+ }