@etherisc/gif-next 0.0.2-f619be3-760 → 0.0.2-f752d2a-551

Sign up to get free protection for your applications and to get access to all the features.
Files changed (336) hide show
  1. package/README.md +81 -14
  2. package/artifacts/contracts/components/BaseComponent.sol/BaseComponent.dbg.json +4 -0
  3. package/artifacts/contracts/components/{Component.sol/Component.json → BaseComponent.sol/BaseComponent.json} +26 -57
  4. package/artifacts/contracts/components/IBaseComponent.sol/IBaseComponent.dbg.json +4 -0
  5. package/artifacts/contracts/{instance/component/IComponent.sol/IComponentContract.json → components/IBaseComponent.sol/IBaseComponent.json} +26 -57
  6. package/artifacts/contracts/components/IPoolComponent.sol/IPoolComponent.dbg.json +4 -0
  7. package/artifacts/contracts/components/IPoolComponent.sol/IPoolComponent.json +356 -0
  8. package/artifacts/contracts/components/IProductComponent.sol/IProductComponent.dbg.json +4 -0
  9. package/artifacts/contracts/components/{IPool.sol/IPoolComponent.json → IProductComponent.sol/IProductComponent.json} +89 -65
  10. package/artifacts/contracts/components/Pool.sol/Pool.dbg.json +1 -1
  11. package/artifacts/contracts/components/Pool.sol/Pool.json +134 -75
  12. package/artifacts/contracts/components/Product.sol/Product.dbg.json +1 -1
  13. package/artifacts/contracts/components/Product.sol/Product.json +72 -113
  14. package/artifacts/contracts/experiment/errors/Require.sol/Require.dbg.json +1 -1
  15. package/artifacts/contracts/experiment/errors/Revert.sol/Revert.dbg.json +1 -1
  16. package/artifacts/contracts/experiment/inheritance/A.sol/A.dbg.json +1 -1
  17. package/artifacts/contracts/experiment/inheritance/A.sol/AShared.dbg.json +1 -1
  18. package/artifacts/contracts/experiment/inheritance/B.sol/B.dbg.json +1 -1
  19. package/artifacts/contracts/experiment/inheritance/C.sol/C.dbg.json +1 -1
  20. package/artifacts/contracts/experiment/inheritance/IA.sol/IA.dbg.json +1 -1
  21. package/artifacts/contracts/experiment/inheritance/IA.sol/ISharedA.dbg.json +1 -1
  22. package/artifacts/contracts/experiment/inheritance/IB.sol/IB.dbg.json +1 -1
  23. package/artifacts/contracts/experiment/inheritance/IC.sol/IC.dbg.json +1 -1
  24. package/artifacts/contracts/experiment/statemachine/Dummy.sol/LifeCycleModule.dbg.json +1 -1
  25. package/artifacts/contracts/experiment/statemachine/Dummy.sol/LifeCycleModule.json +2 -2
  26. package/artifacts/contracts/experiment/statemachine/ISM.sol/ISM.dbg.json +1 -1
  27. package/artifacts/contracts/experiment/statemachine/ISM.sol/ISMEE.dbg.json +1 -1
  28. package/artifacts/contracts/experiment/statemachine/SM.sol/SM.dbg.json +1 -1
  29. package/artifacts/contracts/experiment/statemachine/SM.sol/SM.json +2 -2
  30. package/artifacts/contracts/experiment/statemachine/SimpleStateMachine.sol/SimpleStateMachine.dbg.json +1 -1
  31. package/artifacts/contracts/experiment/statemachine/SimpleStateMachine.sol/SimpleStateMachine.json +2 -2
  32. package/artifacts/contracts/experiment/types/TypeA.sol/TypeALib.dbg.json +1 -1
  33. package/artifacts/contracts/experiment/types/TypeB.sol/TypeBLib.dbg.json +1 -1
  34. package/artifacts/contracts/instance/IInstance.sol/IInstance.dbg.json +1 -1
  35. package/artifacts/contracts/instance/IInstance.sol/IInstance.json +719 -332
  36. package/artifacts/contracts/instance/IInstanceLinked.sol/IInstanceLinked.dbg.json +4 -0
  37. package/artifacts/contracts/instance/{component/IComponent.sol → IInstanceLinked.sol}/IInstanceLinked.json +1 -1
  38. package/artifacts/contracts/instance/Instance.sol/Instance.dbg.json +1 -1
  39. package/artifacts/contracts/instance/Instance.sol/Instance.json +998 -527
  40. package/artifacts/contracts/instance/base/ComponentServiceBase.sol/ComponentServiceBase.dbg.json +4 -0
  41. package/artifacts/contracts/instance/{component/ComponentModule.sol/ComponentModule.json → base/ComponentServiceBase.sol/ComponentServiceBase.json} +133 -132
  42. package/artifacts/contracts/instance/base/IInstanceBase.sol/IInstanceBase.dbg.json +4 -0
  43. package/artifacts/contracts/instance/{product/ProductService.sol/ProductModule.json → base/IInstanceBase.sol/IInstanceBase.json} +18 -30
  44. package/artifacts/contracts/instance/base/IKeyValueStore.sol/IKeyValueStore.dbg.json +4 -0
  45. package/artifacts/contracts/instance/base/IKeyValueStore.sol/IKeyValueStore.json +511 -0
  46. package/artifacts/contracts/instance/base/ILifecycle.sol/ILifecycle.dbg.json +4 -0
  47. package/artifacts/contracts/instance/{lifecycle/ILifecycle.sol/ILifecycleModule.json → base/ILifecycle.sol/ILifecycle.json} +10 -77
  48. package/artifacts/contracts/instance/base/IService.sol/IService.dbg.json +4 -0
  49. package/artifacts/contracts/instance/base/IService.sol/IService.json +300 -0
  50. package/artifacts/contracts/instance/base/InstanceBase.sol/InstanceBase.dbg.json +4 -0
  51. package/artifacts/contracts/instance/base/InstanceBase.sol/InstanceBase.json +326 -0
  52. package/artifacts/contracts/instance/base/KeyValueStore.sol/KeyValueStore.dbg.json +4 -0
  53. package/artifacts/contracts/instance/base/KeyValueStore.sol/KeyValueStore.json +692 -0
  54. package/artifacts/contracts/instance/base/Lifecycle.sol/Lifecycle.dbg.json +4 -0
  55. package/artifacts/contracts/instance/base/Lifecycle.sol/Lifecycle.json +169 -0
  56. package/artifacts/contracts/instance/base/ModuleBase.sol/ModuleBase.dbg.json +4 -0
  57. package/artifacts/contracts/instance/base/ModuleBase.sol/ModuleBase.json +10 -0
  58. package/artifacts/contracts/instance/base/ServiceBase.sol/ServiceBase.dbg.json +4 -0
  59. package/artifacts/contracts/instance/base/ServiceBase.sol/ServiceBase.json +300 -0
  60. package/artifacts/contracts/instance/module/access/Access.sol/AccessModule.dbg.json +4 -0
  61. package/artifacts/contracts/instance/{access → module/access}/Access.sol/AccessModule.json +85 -152
  62. package/artifacts/contracts/instance/module/access/IAccess.sol/IAccess.dbg.json +4 -0
  63. package/artifacts/contracts/instance/{access → module/access}/IAccess.sol/IAccess.json +1 -1
  64. package/artifacts/contracts/instance/module/access/IAccess.sol/IAccessModule.dbg.json +4 -0
  65. package/artifacts/contracts/instance/{access → module/access}/IAccess.sol/IAccessModule.json +96 -99
  66. package/artifacts/contracts/instance/module/bundle/BundleModule.sol/BundleModule.dbg.json +4 -0
  67. package/artifacts/contracts/instance/module/bundle/BundleModule.sol/BundleModule.json +296 -0
  68. package/artifacts/contracts/instance/module/bundle/IBundle.sol/IBundle.dbg.json +4 -0
  69. package/artifacts/contracts/instance/module/bundle/IBundle.sol/IBundle.json +10 -0
  70. package/artifacts/contracts/instance/module/bundle/IBundle.sol/IBundleModule.dbg.json +4 -0
  71. package/artifacts/contracts/instance/module/bundle/IBundle.sol/IBundleModule.json +296 -0
  72. package/artifacts/contracts/instance/module/compensation/CompensationModule.sol/CompensationModule.dbg.json +4 -0
  73. package/artifacts/contracts/instance/module/compensation/CompensationModule.sol/CompensationModule.json +10 -0
  74. package/artifacts/contracts/instance/module/compensation/ICompensation.sol/ICompensation.dbg.json +4 -0
  75. package/artifacts/contracts/instance/module/compensation/ICompensation.sol/ICompensation.json +10 -0
  76. package/artifacts/contracts/instance/module/compensation/ICompensation.sol/ICompensationModule.dbg.json +4 -0
  77. package/artifacts/contracts/instance/module/compensation/ICompensation.sol/ICompensationModule.json +10 -0
  78. package/artifacts/contracts/instance/module/component/ComponentModule.sol/ComponentModule.dbg.json +4 -0
  79. package/artifacts/contracts/instance/module/component/ComponentModule.sol/ComponentModule.json +188 -0
  80. package/artifacts/contracts/instance/module/component/IComponent.sol/IComponent.dbg.json +4 -0
  81. package/artifacts/contracts/instance/{component → module/component}/IComponent.sol/IComponent.json +1 -1
  82. package/artifacts/contracts/instance/module/component/IComponent.sol/IComponentModule.dbg.json +4 -0
  83. package/artifacts/contracts/instance/{component → module/component}/IComponent.sol/IComponentModule.json +33 -62
  84. package/artifacts/contracts/instance/module/policy/IPolicy.sol/IPolicy.dbg.json +4 -0
  85. package/artifacts/contracts/instance/{policy → module/policy}/IPolicy.sol/IPolicy.json +1 -1
  86. package/artifacts/contracts/instance/module/policy/IPolicy.sol/IPolicyModule.dbg.json +4 -0
  87. package/artifacts/contracts/instance/{policy → module/policy}/IPolicy.sol/IPolicyModule.json +132 -125
  88. package/artifacts/contracts/instance/module/policy/PolicyModule.sol/PolicyModule.dbg.json +4 -0
  89. package/artifacts/contracts/instance/{policy → module/policy}/PolicyModule.sol/PolicyModule.json +132 -125
  90. package/artifacts/contracts/instance/module/pool/IPoolModule.sol/IPool.dbg.json +4 -0
  91. package/artifacts/contracts/instance/{pool → module/pool}/IPoolModule.sol/IPool.json +1 -1
  92. package/artifacts/contracts/instance/module/pool/IPoolModule.sol/IPoolModule.dbg.json +4 -0
  93. package/artifacts/contracts/instance/{pool → module/pool}/IPoolModule.sol/IPoolModule.json +67 -47
  94. package/artifacts/contracts/instance/module/pool/PoolModule.sol/PoolModule.dbg.json +4 -0
  95. package/artifacts/contracts/instance/{pool → module/pool}/PoolModule.sol/PoolModule.json +51 -57
  96. package/artifacts/contracts/instance/module/risk/IRisk.sol/IRisk.dbg.json +4 -0
  97. package/artifacts/contracts/instance/module/risk/IRisk.sol/IRisk.json +10 -0
  98. package/artifacts/contracts/instance/module/risk/IRisk.sol/IRiskModule.dbg.json +4 -0
  99. package/artifacts/contracts/instance/module/risk/IRisk.sol/IRiskModule.json +10 -0
  100. package/artifacts/contracts/instance/module/risk/RiskModule.sol/RiskModule.dbg.json +4 -0
  101. package/artifacts/contracts/instance/module/risk/RiskModule.sol/RiskModule.json +10 -0
  102. package/artifacts/contracts/instance/module/treasury/ITreasury.sol/ITreasury.dbg.json +4 -0
  103. package/artifacts/contracts/instance/{treasury → module/treasury}/ITreasury.sol/ITreasury.json +1 -1
  104. package/artifacts/contracts/instance/module/treasury/ITreasury.sol/ITreasuryModule.dbg.json +4 -0
  105. package/artifacts/contracts/instance/{treasury → module/treasury}/ITreasury.sol/ITreasuryModule.json +100 -57
  106. package/artifacts/contracts/instance/module/treasury/TokenHandler.sol/TokenHandler.dbg.json +4 -0
  107. package/artifacts/contracts/instance/module/treasury/TokenHandler.sol/TokenHandler.json +76 -0
  108. package/artifacts/contracts/instance/module/treasury/TreasuryModule.sol/TreasuryModule.dbg.json +4 -0
  109. package/artifacts/contracts/instance/{treasury → module/treasury}/TreasuryModule.sol/TreasuryModule.json +100 -57
  110. package/artifacts/contracts/instance/service/ComponentOwnerService.sol/ComponentOwnerService.dbg.json +4 -0
  111. package/artifacts/contracts/instance/service/ComponentOwnerService.sol/ComponentOwnerService.json +523 -0
  112. package/artifacts/contracts/instance/service/IComponentOwnerService.sol/IComponentOwnerService.dbg.json +4 -0
  113. package/artifacts/contracts/instance/service/IComponentOwnerService.sol/IComponentOwnerService.json +364 -0
  114. package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.dbg.json +4 -0
  115. package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.json +376 -0
  116. package/artifacts/contracts/instance/service/IProductService.sol/IProductService.dbg.json +4 -0
  117. package/artifacts/contracts/instance/service/IProductService.sol/IProductService.json +477 -0
  118. package/artifacts/contracts/instance/service/PoolService.sol/PoolService.dbg.json +4 -0
  119. package/artifacts/contracts/instance/service/PoolService.sol/PoolService.json +471 -0
  120. package/artifacts/contracts/instance/service/ProductService.sol/ProductService.dbg.json +4 -0
  121. package/artifacts/contracts/instance/service/ProductService.sol/ProductService.json +673 -0
  122. package/artifacts/contracts/registry/ChainNft.sol/ChainNft.dbg.json +1 -1
  123. package/artifacts/contracts/registry/ChainNft.sol/ChainNft.json +65 -2
  124. package/artifacts/contracts/registry/IChainNft.sol/IChainNft.dbg.json +1 -1
  125. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.dbg.json +1 -1
  126. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.json +147 -30
  127. package/artifacts/contracts/registry/IRegistryLinked.sol/IRegistryLinked.dbg.json +4 -0
  128. package/artifacts/contracts/registry/IRegistryLinked.sol/IRegistryLinked.json +24 -0
  129. package/artifacts/contracts/registry/Registry.sol/Registry.dbg.json +1 -1
  130. package/artifacts/contracts/registry/Registry.sol/Registry.json +241 -25
  131. package/artifacts/contracts/shared/ERC165.sol/ERC165.dbg.json +4 -0
  132. package/artifacts/contracts/shared/ERC165.sol/ERC165.json +35 -0
  133. package/artifacts/contracts/shared/IOwnable.sol/IOwnable.dbg.json +4 -0
  134. package/artifacts/contracts/{registry/IRegistry.sol → shared/IOwnable.sol}/IOwnable.json +1 -1
  135. package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.dbg.json +4 -0
  136. package/artifacts/contracts/{registry/IRegistry.sol → shared/IRegisterable.sol}/IRegisterable.json +16 -61
  137. package/artifacts/contracts/shared/IVersionable.sol/IVersionable.dbg.json +4 -0
  138. package/artifacts/contracts/shared/IVersionable.sol/IVersionable.json +164 -0
  139. package/artifacts/contracts/shared/Registerable.sol/Registerable.dbg.json +4 -0
  140. package/artifacts/contracts/{registry/Registry.sol → shared/Registerable.sol}/Registerable.json +16 -61
  141. package/artifacts/contracts/shared/Versionable.sol/Versionable.dbg.json +4 -0
  142. package/artifacts/contracts/shared/Versionable.sol/Versionable.json +164 -0
  143. package/artifacts/contracts/test/TestFee.sol/TestFee.dbg.json +4 -0
  144. package/artifacts/contracts/test/TestFee.sol/TestFee.json +119 -0
  145. package/artifacts/contracts/test/TestPool.sol/TestPool.dbg.json +4 -0
  146. package/artifacts/contracts/test/TestPool.sol/TestPool.json +387 -0
  147. package/artifacts/contracts/test/TestProduct.sol/TestProduct.dbg.json +4 -0
  148. package/artifacts/contracts/test/TestProduct.sol/TestProduct.json +393 -0
  149. package/artifacts/contracts/test/TestRegisterable.sol/TestRegisterable.dbg.json +4 -0
  150. package/artifacts/contracts/test/TestRegisterable.sol/TestRegisterable.json +137 -0
  151. package/artifacts/contracts/test/TestRoleId.sol/TestRoleId.dbg.json +4 -0
  152. package/artifacts/contracts/test/TestRoleId.sol/TestRoleId.json +116 -0
  153. package/artifacts/contracts/test/TestService.sol/TestService.dbg.json +4 -0
  154. package/artifacts/contracts/test/TestService.sol/TestService.json +379 -0
  155. package/artifacts/contracts/test/TestToken.sol/TestUsdc.dbg.json +4 -0
  156. package/artifacts/contracts/test/TestToken.sol/TestUsdc.json +338 -0
  157. package/artifacts/contracts/test/TestVersion.sol/TestVersion.dbg.json +4 -0
  158. package/artifacts/contracts/test/TestVersion.sol/TestVersion.json +218 -0
  159. package/artifacts/contracts/test/TestVersionable.sol/TestVersionable.dbg.json +4 -0
  160. package/artifacts/contracts/test/TestVersionable.sol/TestVersionable.json +206 -0
  161. package/artifacts/contracts/test/Usdc.sol/USDC.dbg.json +4 -0
  162. package/artifacts/contracts/{mock → test}/Usdc.sol/USDC.json +3 -3
  163. package/artifacts/contracts/types/AddressSet.sol/LibAddressSet.dbg.json +4 -0
  164. package/artifacts/contracts/types/AddressSet.sol/LibAddressSet.json +10 -0
  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/Fee.sol/FeeLib.dbg.json +4 -0
  168. package/artifacts/contracts/types/Fee.sol/FeeLib.json +218 -0
  169. package/artifacts/contracts/types/Key32.sol/Key32Lib.dbg.json +4 -0
  170. package/artifacts/contracts/types/Key32.sol/Key32Lib.json +111 -0
  171. package/artifacts/contracts/types/NftId.sol/NftIdLib.dbg.json +1 -1
  172. package/artifacts/contracts/types/NftId.sol/NftIdLib.json +65 -4
  173. package/artifacts/contracts/types/NftIdSet.sol/LibNftIdSet.dbg.json +4 -0
  174. package/artifacts/contracts/types/NftIdSet.sol/LibNftIdSet.json +10 -0
  175. package/artifacts/contracts/types/ObjectType.sol/ObjectTypeLib.dbg.json +1 -1
  176. package/artifacts/contracts/types/ObjectType.sol/ObjectTypeLib.json +2 -2
  177. package/artifacts/contracts/types/RoleId.sol/RoleIdLib.dbg.json +4 -0
  178. package/artifacts/contracts/types/RoleId.sol/RoleIdLib.json +30 -0
  179. package/artifacts/contracts/types/StateId.sol/StateIdLib.dbg.json +1 -1
  180. package/artifacts/contracts/types/StateId.sol/StateIdLib.json +2 -2
  181. package/artifacts/contracts/types/Timestamp.sol/TimestampLib.dbg.json +1 -1
  182. package/artifacts/contracts/types/Timestamp.sol/TimestampLib.json +64 -2
  183. package/artifacts/contracts/types/UFixed.sol/UFixedMathLib.dbg.json +1 -1
  184. package/artifacts/contracts/types/UFixed.sol/UFixedMathLib.json +58 -58
  185. package/artifacts/contracts/types/Version.sol/VersionLib.dbg.json +4 -0
  186. package/artifacts/contracts/types/Version.sol/VersionLib.json +139 -0
  187. package/artifacts/contracts/types/Version.sol/VersionPartLib.dbg.json +4 -0
  188. package/artifacts/contracts/types/Version.sol/VersionPartLib.json +30 -0
  189. package/contracts/components/BaseComponent.sol +88 -0
  190. package/contracts/components/IBaseComponent.sol +19 -0
  191. package/contracts/components/IPoolComponent.sol +57 -0
  192. package/contracts/components/{IProduct.sol → IProductComponent.sol} +9 -6
  193. package/contracts/components/Pool.sol +140 -18
  194. package/contracts/components/Product.sol +53 -25
  195. package/contracts/instance/IInstance.sol +38 -11
  196. package/contracts/instance/IInstanceLinked.sol +8 -0
  197. package/contracts/instance/Instance.sol +44 -48
  198. package/contracts/instance/base/ComponentServiceBase.sol +42 -0
  199. package/contracts/instance/base/IInstanceBase.sol +14 -0
  200. package/contracts/instance/base/IKeyValueStore.sol +49 -0
  201. package/contracts/instance/{lifecycle → base}/ILifecycle.sol +4 -21
  202. package/contracts/instance/base/IService.sol +15 -0
  203. package/contracts/instance/base/InstanceBase.sol +80 -0
  204. package/contracts/instance/base/KeyValueStore.sol +156 -0
  205. package/contracts/instance/{lifecycle/LifecycleModule.sol → base/Lifecycle.sol} +36 -29
  206. package/contracts/instance/base/ModuleBase.sol +52 -0
  207. package/contracts/instance/base/ServiceBase.sol +37 -0
  208. package/contracts/instance/module/access/Access.sol +149 -0
  209. package/contracts/instance/module/access/IAccess.sol +53 -0
  210. package/contracts/instance/module/bundle/BundleModule.sol +136 -0
  211. package/contracts/instance/module/bundle/IBundle.sol +58 -0
  212. package/contracts/instance/module/compensation/CompensationModule.sol +8 -0
  213. package/contracts/instance/module/compensation/ICompensation.sol +10 -0
  214. package/contracts/instance/module/component/ComponentModule.sol +95 -0
  215. package/contracts/instance/module/component/IComponent.sol +53 -0
  216. package/contracts/instance/module/policy/IPolicy.sol +60 -0
  217. package/contracts/instance/module/policy/PolicyModule.sol +76 -0
  218. package/contracts/instance/module/pool/IPoolModule.sol +41 -0
  219. package/contracts/instance/module/pool/PoolModule.sol +87 -0
  220. package/contracts/instance/module/risk/IRisk.sol +10 -0
  221. package/contracts/instance/module/risk/RiskModule.sol +8 -0
  222. package/contracts/instance/{treasury → module/treasury}/ITreasury.sol +27 -15
  223. package/contracts/instance/module/treasury/TokenHandler.sol +48 -0
  224. package/contracts/instance/{treasury → module/treasury}/TreasuryModule.sol +43 -59
  225. package/contracts/instance/service/ComponentOwnerService.sol +170 -0
  226. package/contracts/instance/service/IComponentOwnerService.sol +22 -0
  227. package/contracts/instance/service/IPoolService.sol +30 -0
  228. package/contracts/instance/service/IProductService.sol +58 -0
  229. package/contracts/instance/service/PoolService.sol +123 -0
  230. package/contracts/instance/service/ProductService.sol +354 -0
  231. package/contracts/registry/ChainNft.sol +61 -37
  232. package/contracts/registry/IRegistry.sol +24 -34
  233. package/contracts/registry/IRegistryLinked.sol +8 -0
  234. package/contracts/registry/Registry.sol +284 -85
  235. package/contracts/shared/ERC165.sol +21 -0
  236. package/contracts/shared/IOwnable.sol +6 -0
  237. package/contracts/shared/IRegisterable.sol +24 -0
  238. package/contracts/shared/IVersionable.sol +52 -0
  239. package/contracts/shared/Registerable.sol +86 -0
  240. package/contracts/shared/Versionable.sol +89 -0
  241. package/contracts/test/TestFee.sol +25 -0
  242. package/contracts/test/TestPool.sol +22 -0
  243. package/contracts/test/TestProduct.sol +44 -0
  244. package/contracts/test/TestRegisterable.sol +19 -0
  245. package/contracts/test/TestRoleId.sol +14 -0
  246. package/contracts/test/TestService.sol +32 -0
  247. package/contracts/{mock/Dip.sol → test/TestToken.sol} +5 -5
  248. package/contracts/test/TestVersion.sol +44 -0
  249. package/contracts/test/TestVersionable.sol +17 -0
  250. package/contracts/{mock → test}/Usdc.sol +1 -1
  251. package/contracts/types/AddressSet.sol +58 -0
  252. package/contracts/types/Fee.sol +39 -20
  253. package/contracts/types/Key32.sol +45 -0
  254. package/contracts/types/NftId.sol +22 -1
  255. package/contracts/types/NftIdSet.sol +60 -0
  256. package/contracts/types/ObjectType.sol +22 -14
  257. package/contracts/types/RoleId.sol +38 -0
  258. package/contracts/types/StateId.sol +13 -3
  259. package/contracts/types/Timestamp.sol +22 -1
  260. package/contracts/types/UFixed.sol +12 -13
  261. package/contracts/types/Version.sol +95 -0
  262. package/package.json +8 -3
  263. package/artifacts/contracts/components/Component.sol/Component.dbg.json +0 -4
  264. package/artifacts/contracts/components/Component.sol/InstanceLinked.dbg.json +0 -4
  265. package/artifacts/contracts/components/Component.sol/InstanceLinked.json +0 -35
  266. package/artifacts/contracts/components/IPool.sol/IPoolComponent.dbg.json +0 -4
  267. package/artifacts/contracts/components/IProduct.sol/IProductComponent.dbg.json +0 -4
  268. package/artifacts/contracts/components/IProduct.sol/IProductComponent.json +0 -74
  269. package/artifacts/contracts/instance/access/Access.sol/AccessModule.dbg.json +0 -4
  270. package/artifacts/contracts/instance/access/IAccess.sol/IAccess.dbg.json +0 -4
  271. package/artifacts/contracts/instance/access/IAccess.sol/IAccessCheckRole.dbg.json +0 -4
  272. package/artifacts/contracts/instance/access/IAccess.sol/IAccessCheckRole.json +0 -35
  273. package/artifacts/contracts/instance/access/IAccess.sol/IAccessComponentTypeRoles.dbg.json +0 -4
  274. package/artifacts/contracts/instance/access/IAccess.sol/IAccessComponentTypeRoles.json +0 -50
  275. package/artifacts/contracts/instance/access/IAccess.sol/IAccessModule.dbg.json +0 -4
  276. package/artifacts/contracts/instance/component/ComponentModule.sol/ComponentModule.dbg.json +0 -4
  277. package/artifacts/contracts/instance/component/ComponentModule.sol/ComponentOwnerService.dbg.json +0 -4
  278. package/artifacts/contracts/instance/component/ComponentModule.sol/ComponentOwnerService.json +0 -202
  279. package/artifacts/contracts/instance/component/IComponent.sol/IComponent.dbg.json +0 -4
  280. package/artifacts/contracts/instance/component/IComponent.sol/IComponentContract.dbg.json +0 -4
  281. package/artifacts/contracts/instance/component/IComponent.sol/IComponentModule.dbg.json +0 -4
  282. package/artifacts/contracts/instance/component/IComponent.sol/IComponentOwnerService.dbg.json +0 -4
  283. package/artifacts/contracts/instance/component/IComponent.sol/IComponentOwnerService.json +0 -141
  284. package/artifacts/contracts/instance/component/IComponent.sol/IInstanceLinked.dbg.json +0 -4
  285. package/artifacts/contracts/instance/lifecycle/ILifecycle.sol/ILifecycle.dbg.json +0 -4
  286. package/artifacts/contracts/instance/lifecycle/ILifecycle.sol/ILifecycle.json +0 -134
  287. package/artifacts/contracts/instance/lifecycle/ILifecycle.sol/ILifecycleModule.dbg.json +0 -4
  288. package/artifacts/contracts/instance/lifecycle/LifecycleModule.sol/LifecycleModule.dbg.json +0 -4
  289. package/artifacts/contracts/instance/lifecycle/LifecycleModule.sol/LifecycleModule.json +0 -221
  290. package/artifacts/contracts/instance/policy/IPolicy.sol/IPolicy.dbg.json +0 -4
  291. package/artifacts/contracts/instance/policy/IPolicy.sol/IPolicyModule.dbg.json +0 -4
  292. package/artifacts/contracts/instance/policy/PolicyModule.sol/PolicyModule.dbg.json +0 -4
  293. package/artifacts/contracts/instance/pool/IPoolModule.sol/IPool.dbg.json +0 -4
  294. package/artifacts/contracts/instance/pool/IPoolModule.sol/IPoolModule.dbg.json +0 -4
  295. package/artifacts/contracts/instance/pool/PoolModule.sol/PoolModule.dbg.json +0 -4
  296. package/artifacts/contracts/instance/product/IProductService.sol/IProductModule.dbg.json +0 -4
  297. package/artifacts/contracts/instance/product/IProductService.sol/IProductModule.json +0 -75
  298. package/artifacts/contracts/instance/product/IProductService.sol/IProductService.dbg.json +0 -4
  299. package/artifacts/contracts/instance/product/IProductService.sol/IProductService.json +0 -127
  300. package/artifacts/contracts/instance/product/ProductService.sol/ProductModule.dbg.json +0 -4
  301. package/artifacts/contracts/instance/product/ProductService.sol/ProductService.dbg.json +0 -4
  302. package/artifacts/contracts/instance/product/ProductService.sol/ProductService.json +0 -196
  303. package/artifacts/contracts/instance/treasury/ITreasury.sol/ITreasury.dbg.json +0 -4
  304. package/artifacts/contracts/instance/treasury/ITreasury.sol/ITreasuryModule.dbg.json +0 -4
  305. package/artifacts/contracts/instance/treasury/TokenHandler.sol/TokenHandler.dbg.json +0 -4
  306. package/artifacts/contracts/instance/treasury/TokenHandler.sol/TokenHandler.json +0 -45
  307. package/artifacts/contracts/instance/treasury/TreasuryModule.sol/TreasuryModule.dbg.json +0 -4
  308. package/artifacts/contracts/mock/Dip.sol/DIP.dbg.json +0 -4
  309. package/artifacts/contracts/mock/Dip.sol/DIP.json +0 -338
  310. package/artifacts/contracts/mock/TestPool.sol/TestPool.dbg.json +0 -4
  311. package/artifacts/contracts/mock/TestPool.sol/TestPool.json +0 -294
  312. package/artifacts/contracts/mock/TestProduct.sol/TestProduct.dbg.json +0 -4
  313. package/artifacts/contracts/mock/TestProduct.sol/TestProduct.json +0 -384
  314. package/artifacts/contracts/mock/Usdc.sol/USDC.dbg.json +0 -4
  315. package/artifacts/contracts/registry/IRegistry.sol/IOwnable.dbg.json +0 -4
  316. package/artifacts/contracts/registry/IRegistry.sol/IRegisterable.dbg.json +0 -4
  317. package/artifacts/contracts/registry/IRegistry.sol/IRegistryLinked.dbg.json +0 -4
  318. package/artifacts/contracts/registry/IRegistry.sol/IRegistryLinked.json +0 -49
  319. package/artifacts/contracts/registry/Registry.sol/Registerable.dbg.json +0 -4
  320. package/artifacts/contracts/registry/Registry.sol/RegistryLinked.dbg.json +0 -4
  321. package/artifacts/contracts/registry/Registry.sol/RegistryLinked.json +0 -60
  322. package/contracts/components/Component.sol +0 -77
  323. package/contracts/components/IPool.sol +0 -15
  324. package/contracts/instance/access/Access.sol +0 -165
  325. package/contracts/instance/access/IAccess.sol +0 -63
  326. package/contracts/instance/component/ComponentModule.sol +0 -274
  327. package/contracts/instance/component/IComponent.sol +0 -74
  328. package/contracts/instance/policy/IPolicy.sol +0 -50
  329. package/contracts/instance/policy/PolicyModule.sol +0 -114
  330. package/contracts/instance/pool/IPoolModule.sol +0 -23
  331. package/contracts/instance/pool/PoolModule.sol +0 -81
  332. package/contracts/instance/product/IProductService.sol +0 -36
  333. package/contracts/instance/product/ProductService.sol +0 -136
  334. package/contracts/instance/treasury/TokenHandler.sol +0 -24
  335. package/contracts/mock/TestPool.sol +0 -16
  336. package/contracts/mock/TestProduct.sol +0 -39
@@ -0,0 +1,80 @@
1
+ // SPDX-License-Identifier: Apache-2.0
2
+ pragma solidity ^0.8.19;
3
+
4
+ import {Versionable} from "../../shared/Versionable.sol";
5
+ import {Registerable} from "../../shared/Registerable.sol";
6
+ // import {IRegistry} from "../registry/IRegistry.sol";
7
+
8
+ // import {IInstance} from "./IInstance.sol";
9
+ import {ObjectType, INSTANCE} from "../../types/ObjectType.sol";
10
+ import {NftId} from "../../types/NftId.sol";
11
+ import {Version, VersionPart, VersionLib} from "../../types/Version.sol";
12
+
13
+ import {IComponentOwnerService} from "../service/IComponentOwnerService.sol";
14
+ import {IProductService} from "../service/IProductService.sol";
15
+ import {IPoolService} from "../service/IPoolService.sol";
16
+
17
+ import {IKeyValueStore} from "./IKeyValueStore.sol";
18
+ import {IInstance} from "../IInstance.sol";
19
+ import {IInstanceBase} from "./IInstanceBase.sol";
20
+
21
+ import {KeyValueStore} from "./KeyValueStore.sol";
22
+
23
+ abstract contract InstanceBase is
24
+ Versionable,
25
+ Registerable,
26
+ IInstanceBase
27
+ {
28
+ IKeyValueStore internal _keyValueStore;
29
+
30
+ IComponentOwnerService internal _componentOwnerService;
31
+ IProductService internal _productService;
32
+ IPoolService internal _poolService;
33
+
34
+ constructor(
35
+ address registry,
36
+ NftId registryNftId
37
+ )
38
+ Registerable(registry, registryNftId)
39
+ Versionable()
40
+ {
41
+ _keyValueStore = new KeyValueStore();
42
+
43
+ _registerInterface(type(IInstance).interfaceId);
44
+ _linkToServicesInRegistry();
45
+ }
46
+
47
+ function getKeyValueStore() public view virtual override returns (IKeyValueStore keyValueStore) { return _keyValueStore; }
48
+
49
+ // from versionable
50
+ function getVersion()
51
+ public
52
+ pure
53
+ virtual override
54
+ returns(Version)
55
+ {
56
+ return VersionLib.toVersion(3,0,0);
57
+ }
58
+
59
+ // from registerable
60
+ function getType() external pure override returns (ObjectType objectType) {
61
+ return INSTANCE();
62
+ }
63
+
64
+
65
+ // internal / private functions
66
+ function _linkToServicesInRegistry() internal {
67
+ VersionPart majorVersion = getVersion().toMajorPart();
68
+ _componentOwnerService = IComponentOwnerService(_getAndCheck("ComponentOwnerService", majorVersion));
69
+ _productService = IProductService(_getAndCheck("ProductService", majorVersion));
70
+ _poolService = IPoolService(_getAndCheck("PoolService", majorVersion));
71
+ }
72
+
73
+ function _getAndCheck(string memory serviceName, VersionPart majorVersion) internal view returns (address serviceAddress) {
74
+ serviceAddress = _registry.getServiceAddress(serviceName, majorVersion);
75
+ require(
76
+ serviceAddress != address(0),
77
+ "ERROR:INS-001:NOT_REGISTERED"
78
+ );
79
+ }
80
+ }
@@ -0,0 +1,156 @@
1
+ // SPDX-License-Identifier: Apache-2.0
2
+ pragma solidity ^0.8.19;
3
+
4
+ import {Blocknumber, blockBlocknumber, zeroBlocknumber} from "../../types/Blocknumber.sol";
5
+ import {Key32, KeyId, Key32Lib} from "../../types/Key32.sol";
6
+ import {NftId} from "../../types/NftId.sol";
7
+ import {ObjectType} from "../../types/ObjectType.sol";
8
+ import {StateId, ACTIVE} from "../../types/StateId.sol";
9
+ import {Timestamp, blockTimestamp, zeroTimestamp} from "../../types/Timestamp.sol";
10
+
11
+ import {Lifecycle} from "./Lifecycle.sol";
12
+ import {IKeyValueStore} from "./IKeyValueStore.sol";
13
+
14
+ contract KeyValueStore is Lifecycle, IKeyValueStore {
15
+
16
+ mapping(Key32 key32 => Value value) private _value;
17
+ address private _owner;
18
+
19
+ modifier onlyOwner() {
20
+ require(
21
+ msg.sender == _owner,
22
+ "ERROR:KVS-001:NOT_OWNER");
23
+ _;
24
+ }
25
+
26
+ constructor() {
27
+ _owner = msg.sender;
28
+ }
29
+
30
+ function create(
31
+ Key32 key32,
32
+ ObjectType objectType,
33
+ bytes memory data
34
+ )
35
+ public
36
+ onlyOwner
37
+ {
38
+ require(objectType.gtz(), "ERROR:KVS-010:TYPE_UNDEFINED");
39
+
40
+ Metadata storage metadata = _value[key32].metadata;
41
+ require(metadata.state.eqz(), "ERROR:KVS-012:ALREADY_CREATED");
42
+
43
+ address createdBy = msg.sender;
44
+ Blocknumber blocknumber = blockBlocknumber();
45
+ StateId initialState = hasLifecycle(objectType) ? getInitialState(objectType) : ACTIVE();
46
+
47
+ // set metadata
48
+ metadata.objectType = objectType;
49
+ metadata.state = initialState;
50
+ metadata.updatedBy = createdBy;
51
+ metadata.updatedIn = blocknumber;
52
+ metadata.createdIn = blocknumber;
53
+
54
+ // set data
55
+ _value[key32].data = data;
56
+
57
+ emit LogInfoCreated(toKey(key32), initialState, createdBy);
58
+ }
59
+
60
+ function update(Key32 key32, StateId state, bytes memory data)
61
+ public
62
+ onlyOwner
63
+ {
64
+ require(state.gtz(), "ERROR:KVS-020:STATE_UNDEFINED");
65
+ Metadata storage metadata = _value[key32].metadata;
66
+ StateId stateOld = metadata.state;
67
+ require(stateOld.gtz(), "ERROR:KVS-021:NOT_EXISTING");
68
+
69
+ // update data
70
+ _value[key32].data = data;
71
+
72
+ // update metadata (and state)
73
+ address updatedBy = msg.sender;
74
+ Blocknumber lastUpdatedIn = metadata.updatedIn;
75
+ metadata.state = state;
76
+ metadata.updatedBy = updatedBy;
77
+ metadata.updatedIn = blockBlocknumber();
78
+
79
+ // create log entries
80
+ Key memory key = toKey(key32);
81
+ emit LogStateUpdated(key, state, stateOld, updatedBy, lastUpdatedIn);
82
+ emit LogInfoUpdated(key, state, updatedBy, lastUpdatedIn);
83
+ }
84
+
85
+ function updateData(Key32 key32, bytes memory data)
86
+ public
87
+ onlyOwner
88
+ {
89
+ Metadata storage metadata = _value[key32].metadata;
90
+ StateId state = metadata.state;
91
+ require(state.gtz(), "ERROR:KVS-030:NOT_EXISTING");
92
+
93
+ // update data
94
+ _value[key32].data = data;
95
+
96
+ // update metadata
97
+ address updatedBy = msg.sender;
98
+ Blocknumber lastUpdatedIn = metadata.updatedIn;
99
+ metadata.updatedBy = updatedBy;
100
+ metadata.updatedIn = blockBlocknumber();
101
+
102
+ // create log entry
103
+ Key memory key = toKey(key32);
104
+ emit LogInfoUpdated(key, state, updatedBy, lastUpdatedIn);
105
+ }
106
+
107
+ function updateState(Key32 key32, StateId state)
108
+ public
109
+ onlyOwner
110
+ {
111
+ require(state.gtz(), "ERROR:KVS-040:STATE_UNDEFINED");
112
+ Metadata storage metadata = _value[key32].metadata;
113
+ StateId stateOld = metadata.state;
114
+ require(stateOld.gtz(), "ERROR:KVS-041:NOT_EXISTING");
115
+
116
+ // update metadata (and state)
117
+ address updatedBy = msg.sender;
118
+ Blocknumber lastUpdatedIn = metadata.updatedIn;
119
+ metadata.state = state;
120
+ metadata.updatedBy = updatedBy;
121
+ metadata.updatedIn = blockBlocknumber();
122
+
123
+ // create log entry
124
+ Key memory key = toKey(key32);
125
+ emit LogStateUpdated(key, state, stateOld, updatedBy, lastUpdatedIn);
126
+ }
127
+
128
+ function exists(Key32 key32) public view returns (bool) {
129
+ return _value[key32].metadata.state.gtz();
130
+ }
131
+
132
+ function get(Key32 key32) public view returns (Value memory value) {
133
+ return _value[key32];
134
+ }
135
+
136
+ function getMetadata(Key32 key32) public view returns (Metadata memory metadata) {
137
+ return _value[key32].metadata;
138
+ }
139
+
140
+ function getData(Key32 key32) public view returns (bytes memory data) {
141
+ return _value[key32].data;
142
+ }
143
+
144
+ function getState(Key32 key32) public view returns (StateId state) {
145
+ return _value[key32].metadata.state;
146
+ }
147
+
148
+ function toKey32(ObjectType objectType, KeyId id) external pure returns(Key32) {
149
+ return Key32Lib.toKey32(objectType, id);
150
+ }
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
+ }
@@ -3,10 +3,10 @@ pragma solidity ^0.8.19;
3
3
 
4
4
  import {NftId} from "../../types/NftId.sol";
5
5
  import {ObjectType, PRODUCT, ORACLE, POOL, BUNDLE, POLICY} from "../../types/ObjectType.sol";
6
- import {StateId, ACTIVE, PAUSED, ARCHIVED, CLOSED, APPLIED, REVOKED, DECLINED} from "../../types/StateId.sol";
7
- import {ILifecycleModule} from "./ILifecycle.sol";
6
+ import {StateId, ACTIVE, PAUSED, ARCHIVED, CLOSED, APPLIED, UNDERWRITTEN, REVOKED, DECLINED} from "../../types/StateId.sol";
7
+ import {ILifecycle} from "./ILifecycle.sol";
8
8
 
9
- contract LifecycleModule is ILifecycleModule {
9
+ contract Lifecycle is ILifecycle {
10
10
  mapping(ObjectType objectType => StateId initialState)
11
11
  private _initialState;
12
12
 
@@ -22,38 +22,44 @@ contract LifecycleModule is ILifecycleModule {
22
22
  _setupPolicyLifecycle();
23
23
  }
24
24
 
25
- function checkAndLogTransition(
26
- NftId nftId,
25
+ function hasLifecycle(
26
+ ObjectType objectType
27
+ )
28
+ public
29
+ view
30
+ override
31
+ returns (bool)
32
+ {
33
+ return _initialState[objectType].gtz();
34
+ }
35
+
36
+ function getInitialState(
37
+ ObjectType objectType
38
+ )
39
+ public
40
+ view
41
+ returns (StateId)
42
+ {
43
+ return _initialState[objectType];
44
+ }
45
+
46
+ function checkTransition(
27
47
  ObjectType objectType,
28
48
  StateId fromId,
29
49
  StateId toId
30
- ) public returns (StateId) // add only currentcontract? would that work?
50
+ )
51
+ public
52
+ view
31
53
  {
32
- if (!_isValidTransition[objectType][fromId][toId]) {
33
- revert ErrorInvalidStateTransition(nftId, objectType, fromId, toId);
54
+ // return if no life cycle support
55
+ if (_initialState[objectType].eqz()) {
56
+ return;
34
57
  }
35
58
 
36
- if (objectType == POLICY()) {
37
- emit LogPolicyStateChanged(nftId, fromId, toId);
38
- } else if (objectType == BUNDLE()) {
39
- emit LogBundleStateChanged(nftId, fromId, toId);
40
- } else if (
41
- objectType == PRODUCT() ||
42
- objectType == ORACLE() ||
43
- objectType == POOL()
44
- ) {
45
- emit LogComponentStateChanged(nftId, objectType, fromId, toId);
46
- } else {
47
- revert ErrorNoLifecycle(nftId, objectType);
59
+ // enforce valid state transition
60
+ if (!_isValidTransition[objectType][fromId][toId]) {
61
+ revert ErrorInvalidStateTransition(objectType, fromId, toId);
48
62
  }
49
-
50
- return toId;
51
- }
52
-
53
- function getInitialState(
54
- ObjectType objectType
55
- ) public view returns (StateId) {
56
- return _initialState[objectType];
57
63
  }
58
64
 
59
65
  function isValidTransition(
@@ -82,7 +88,8 @@ contract LifecycleModule is ILifecycleModule {
82
88
  _initialState[POLICY()] = APPLIED();
83
89
  _isValidTransition[POLICY()][APPLIED()][REVOKED()] = true;
84
90
  _isValidTransition[POLICY()][APPLIED()][DECLINED()] = true;
85
- _isValidTransition[POLICY()][APPLIED()][ACTIVE()] = true;
91
+ _isValidTransition[POLICY()][APPLIED()][UNDERWRITTEN()] = true;
92
+ _isValidTransition[POLICY()][UNDERWRITTEN()][ACTIVE()] = true;
86
93
  _isValidTransition[POLICY()][ACTIVE()][CLOSED()] = true;
87
94
  }
88
95
  }
@@ -0,0 +1,52 @@
1
+ // SPDX-License-Identifier: Apache-2.0
2
+ pragma solidity ^0.8.19;
3
+
4
+ import {IRegistry} from "../../registry/IRegistry.sol";
5
+
6
+ import {Blocknumber, blockNumber} from "../../types/Blocknumber.sol";
7
+ import {Key32, KeyId} from "../../types/Key32.sol";
8
+ import {LibNftIdSet} from "../../types/NftIdSet.sol";
9
+ import {NftId} from "../../types/NftId.sol";
10
+ import {ObjectType, PRODUCT, ORACLE, POOL, BUNDLE, POLICY} from "../../types/ObjectType.sol";
11
+ import {StateId, ACTIVE, PAUSED, ARCHIVED, CLOSED, APPLIED, REVOKED, DECLINED} from "../../types/StateId.sol";
12
+ import {Timestamp, blockTimestamp, zeroTimestamp} from "../../types/Timestamp.sol";
13
+
14
+ import {IKeyValueStore} from "./IKeyValueStore.sol";
15
+
16
+ abstract contract ModuleBase {
17
+
18
+ IKeyValueStore private _store;
19
+ ObjectType private _type;
20
+
21
+ function _initialize(IKeyValueStore keyValueStore, ObjectType objectType) internal {
22
+ _store = keyValueStore;
23
+ _type = objectType;
24
+ }
25
+
26
+ function _create(NftId nftId, bytes memory data) internal {
27
+ _store.create(
28
+ _toKey32(nftId),
29
+ _type,
30
+ data);
31
+ }
32
+
33
+ function _updateData(NftId nftId, bytes memory data) internal {
34
+ _store.updateData(_toKey32(nftId), data);
35
+ }
36
+
37
+ function _updateState(NftId nftId, StateId state) internal {
38
+ _store.updateState(_toKey32(nftId), state);
39
+ }
40
+
41
+ function _getData(NftId nftId) internal view returns(bytes memory data) {
42
+ return _store.getData(_toKey32(nftId));
43
+ }
44
+
45
+ function _getState(NftId nftId) internal view returns(StateId) {
46
+ return _store.getState(_toKey32(nftId));
47
+ }
48
+
49
+ function _toKey32(NftId nftId) internal view returns (Key32 key32) {
50
+ return nftId.toKey32(_type);
51
+ }
52
+ }
@@ -0,0 +1,37 @@
1
+ // SPDX-License-Identifier: Apache-2.0
2
+ pragma solidity ^0.8.19;
3
+
4
+ import {NftId, zeroNftId} from "../../types/NftId.sol";
5
+ import {ObjectType, SERVICE} from "../../types/ObjectType.sol";
6
+ import {Version, VersionPart} from "../../types/Version.sol";
7
+
8
+ import {Registerable} from "../../shared/Registerable.sol";
9
+ import {IVersionable} from "../../shared/IVersionable.sol";
10
+ import {Versionable} from "../../shared/Versionable.sol";
11
+
12
+ import {IService} from "./IService.sol";
13
+
14
+ abstract contract ServiceBase is
15
+ Registerable,
16
+ Versionable,
17
+ IService
18
+ {
19
+
20
+ constructor(
21
+ address registry,
22
+ NftId registryNftId
23
+ )
24
+ Registerable(registry, registryNftId)
25
+ Versionable()
26
+ {
27
+ _registerInterface(type(IService).interfaceId);
28
+ }
29
+
30
+ function getMajorVersion() external view override returns(VersionPart majorVersion) {
31
+ return this.getVersion().toMajorPart();
32
+ }
33
+
34
+ function getType() external pure override returns (ObjectType) {
35
+ return SERVICE();
36
+ }
37
+ }
@@ -0,0 +1,149 @@
1
+ // SPDX-License-Identifier: Apache-2.0
2
+ pragma solidity ^0.8.19;
3
+
4
+ // role admin handling of oz doesn't fit nft ownability
5
+ // import {AccessControlEnumerable} from "@openzeppelin/contracts/access/AccessControlEnumerable.sol";
6
+ import "@openzeppelin/contracts/utils/structs/EnumerableSet.sol";
7
+
8
+ import {RoleId, RoleIdLib} from "../../../types/RoleId.sol";
9
+ import {DISTRIBUTOR_OWNER_ROLE, ORACLE_OWNER_ROLE, POOL_OWNER_ROLE, PRODUCT_OWNER_ROLE} from "../../../types/RoleId.sol";
10
+ import {DISTRIBUTOR_OWNER_ROLE_NAME, ORACLE_OWNER_ROLE_NAME, POOL_OWNER_ROLE_NAME, PRODUCT_OWNER_ROLE_NAME} from "../../../types/RoleId.sol";
11
+ import {IAccessModule} from "./IAccess.sol";
12
+
13
+ abstract contract AccessModule is IAccessModule {
14
+
15
+ using EnumerableSet for EnumerableSet.AddressSet;
16
+
17
+ mapping(RoleId role => RoleInfo info) private _info;
18
+ RoleId[] private _roles;
19
+
20
+ mapping(RoleId role => mapping(address member => bool isMember))
21
+ private _isRoleMember;
22
+ mapping(RoleId role => EnumerableSet.AddressSet members) private _roleMembers;
23
+
24
+ modifier onlyAccessOwner() {
25
+ require(
26
+ msg.sender == this.getOwner(),
27
+ "ERROR:ACS-001:NOT_OWNER");
28
+ _;
29
+ }
30
+
31
+ modifier onlyExistingRole(RoleId role) {
32
+ require(
33
+ _info[role].id == role,
34
+ "ERROR:ACS-002:ROLE_NOT_EXISTING");
35
+ _;
36
+ }
37
+
38
+ constructor() {
39
+ _createRole(DISTRIBUTOR_OWNER_ROLE(), DISTRIBUTOR_OWNER_ROLE_NAME());
40
+ _createRole(ORACLE_OWNER_ROLE(), ORACLE_OWNER_ROLE_NAME());
41
+ _createRole(POOL_OWNER_ROLE(), POOL_OWNER_ROLE_NAME());
42
+ _createRole(PRODUCT_OWNER_ROLE(), PRODUCT_OWNER_ROLE_NAME());
43
+ }
44
+
45
+ function createRole(
46
+ string memory roleName
47
+ ) public override onlyAccessOwner returns (RoleId role) {
48
+ role = RoleIdLib.toRoleId(roleName);
49
+ require(
50
+ !roleExists(role),
51
+ "ERROR:ACS-010:ROLE_ALREADY_EXISTS");
52
+
53
+ _createRole(role, roleName);
54
+ }
55
+
56
+ function setRoleState(RoleId role, bool active) external override onlyExistingRole(role) onlyAccessOwner {
57
+ RoleInfo memory info = _info[role];
58
+ info.isActive = active;
59
+ _setRoleInfo(info);
60
+
61
+ emit LogAccessRoleStateSet(role, active);
62
+ }
63
+
64
+ function grantRole(
65
+ RoleId role,
66
+ address member
67
+ ) external override onlyExistingRole(role) onlyAccessOwner {
68
+ require(_info[role].isActive, "ERROR:ACS-040:ROLE_NOT_ACTIVE");
69
+
70
+ _isRoleMember[role][member] = true;
71
+ _roleMembers[role].add(member);
72
+
73
+ emit LogAccessRoleGranted(role, member, _isRoleMember[role][member]);
74
+ }
75
+
76
+ function revokeRole(
77
+ RoleId role,
78
+ address member
79
+ ) external override onlyExistingRole(role) onlyAccessOwner {
80
+ delete _isRoleMember[role][member];
81
+ _roleMembers[role].remove(member);
82
+
83
+ emit LogAccessRoleGranted(role, member, false);
84
+ }
85
+
86
+ function roleExists(RoleId role) public view virtual override returns (bool) {
87
+ return _info[role].id == role;
88
+ }
89
+
90
+ function hasRole(
91
+ RoleId role,
92
+ address member
93
+ ) public view virtual override returns (bool) {
94
+ return _isRoleMember[role][member];
95
+ }
96
+
97
+ function getRoleId(string memory roleName) external pure override returns (RoleId role) {
98
+ return RoleIdLib.toRoleId(roleName);
99
+ }
100
+
101
+ function getRoleInfo(
102
+ RoleId role
103
+ ) external view override returns (RoleInfo memory info) {
104
+ return _info[role];
105
+ }
106
+
107
+ function getRole(
108
+ uint256 idx
109
+ ) external view override returns (RoleId role) {
110
+ return _roles[idx];
111
+ }
112
+
113
+ function getRoleCount() external view override returns (uint256 roles) {
114
+ return _roles.length;
115
+ }
116
+
117
+ function getRoleMemberCount(
118
+ RoleId role
119
+ ) public view override returns (uint256 roleMembers) {
120
+ return _roleMembers[role].length();
121
+ }
122
+
123
+ function getRoleMember(
124
+ RoleId role,
125
+ uint256 idx
126
+ ) public view override returns (address roleMembers) {
127
+ return _roleMembers[role].at(idx);
128
+ }
129
+
130
+ function _createRole(
131
+ RoleId role,
132
+ string memory roleName
133
+ ) internal {
134
+ RoleInfo memory info = RoleInfo(role, roleName, true);
135
+ _setRoleInfo(info);
136
+
137
+ emit LogAccessRoleCreated(role, roleName);
138
+ }
139
+
140
+ function _setRoleInfo(
141
+ RoleInfo memory info
142
+ ) internal {
143
+ RoleId role = info.id;
144
+ _info[role] = info;
145
+ if(!roleExists(role)) {
146
+ _roles.push(role);
147
+ }
148
+ }
149
+ }
@@ -0,0 +1,53 @@
1
+ // SPDX-License-Identifier: Apache-2.0
2
+ pragma solidity ^0.8.19;
3
+
4
+ import {RoleId} from "../../../types/RoleId.sol";
5
+
6
+ interface IAccess {
7
+ struct RoleInfo {
8
+ RoleId id;
9
+ string name;
10
+ bool isActive;
11
+ }
12
+ }
13
+
14
+ interface IAccessModule is
15
+ IAccess
16
+ {
17
+ event LogAccessRoleCreated(RoleId role, string roleName);
18
+ event LogAccessRoleStateSet(RoleId role, bool active);
19
+ event LogAccessRoleGranted(RoleId role, address member, bool isMember);
20
+
21
+ function createRole(string memory roleName) external returns (RoleId role);
22
+
23
+ function setRoleState(RoleId role, bool active) external;
24
+
25
+ function grantRole(RoleId role, address member) external;
26
+
27
+ function revokeRole(RoleId role, address member) external;
28
+
29
+ function roleExists(RoleId role) external view returns (bool);
30
+
31
+ function hasRole(RoleId role, address member) external view returns (bool);
32
+
33
+ function getRoleCount() external view returns (uint256 roles);
34
+
35
+ function getRole(uint256 idx) external view returns (RoleId role);
36
+
37
+ function getRoleId(string memory roleName) external pure returns (RoleId role);
38
+
39
+ function getRoleInfo(
40
+ RoleId role
41
+ ) external view returns (RoleInfo memory info);
42
+
43
+ function getRoleMemberCount(
44
+ RoleId role
45
+ ) external view returns (uint256 roleMembers);
46
+
47
+ function getRoleMember(
48
+ RoleId role,
49
+ uint256 idx
50
+ ) external view returns (address roleMember);
51
+
52
+ function getOwner() external view returns (address owner);
53
+ }