@etherisc/gif-next 0.0.2-f619be3-760 → 0.0.2-f72939c-380

Sign up to get free protection for your applications and to get access to all the features.
Files changed (343) hide show
  1. package/README.md +114 -11
  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 +156 -29
  12. package/artifacts/contracts/components/Product.sol/Product.dbg.json +1 -1
  13. package/artifacts/contracts/components/Product.sol/Product.json +74 -72
  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 +1124 -598
  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 +1424 -782
  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/base/IInstanceBase.sol/IInstanceBase.json +81 -0
  44. package/artifacts/contracts/instance/base/IKeyValueStore.sol/IKeyValueStore.dbg.json +4 -0
  45. package/artifacts/contracts/instance/base/IKeyValueStore.sol/IKeyValueStore.json +560 -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 +344 -0
  52. package/artifacts/contracts/instance/base/KeyValueStore.sol/KeyValueStore.dbg.json +4 -0
  53. package/artifacts/contracts/instance/base/KeyValueStore.sol/KeyValueStore.json +710 -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 +265 -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 +265 -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 +136 -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/{product/IProductService.sol/IProductService.json → module/component/IComponent.sol/IComponentModule.json} +66 -57
  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 +145 -111
  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 +146 -112
  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 -52
  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 -62
  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 +132 -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 +150 -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 +231 -190
  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 +232 -191
  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 +548 -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 +744 -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 +455 -0
  147. package/artifacts/contracts/test/TestProduct.sol/TestProduct.dbg.json +4 -0
  148. package/artifacts/contracts/test/TestProduct.sol/TestProduct.json +479 -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/RiskId.sol/RiskIdLib.dbg.json +4 -0
  178. package/artifacts/contracts/types/RiskId.sol/RiskIdLib.json +86 -0
  179. package/artifacts/contracts/types/RoleId.sol/RoleIdLib.dbg.json +4 -0
  180. package/artifacts/contracts/types/RoleId.sol/RoleIdLib.json +30 -0
  181. package/artifacts/contracts/types/StateId.sol/StateIdLib.dbg.json +1 -1
  182. package/artifacts/contracts/types/StateId.sol/StateIdLib.json +2 -2
  183. package/artifacts/contracts/types/Timestamp.sol/TimestampLib.dbg.json +1 -1
  184. package/artifacts/contracts/types/Timestamp.sol/TimestampLib.json +64 -2
  185. package/artifacts/contracts/types/UFixed.sol/UFixedMathLib.dbg.json +1 -1
  186. package/artifacts/contracts/types/UFixed.sol/UFixedMathLib.json +58 -58
  187. package/artifacts/contracts/types/Version.sol/VersionLib.dbg.json +4 -0
  188. package/artifacts/contracts/types/Version.sol/VersionLib.json +139 -0
  189. package/artifacts/contracts/types/Version.sol/VersionPartLib.dbg.json +4 -0
  190. package/artifacts/contracts/types/Version.sol/VersionPartLib.json +30 -0
  191. package/contracts/components/BaseComponent.sol +94 -0
  192. package/contracts/components/IBaseComponent.sol +19 -0
  193. package/contracts/components/IPoolComponent.sol +57 -0
  194. package/contracts/components/{IProduct.sol → IProductComponent.sol} +9 -6
  195. package/contracts/components/Pool.sol +155 -16
  196. package/contracts/components/Product.sol +116 -24
  197. package/contracts/instance/IInstance.sol +37 -11
  198. package/contracts/instance/IInstanceLinked.sol +8 -0
  199. package/contracts/instance/Instance.sol +48 -49
  200. package/contracts/instance/base/ComponentServiceBase.sol +42 -0
  201. package/contracts/instance/base/IInstanceBase.sol +19 -0
  202. package/contracts/instance/base/IKeyValueStore.sol +50 -0
  203. package/contracts/instance/{lifecycle → base}/ILifecycle.sol +4 -21
  204. package/contracts/instance/base/IService.sol +15 -0
  205. package/contracts/instance/base/InstanceBase.sol +84 -0
  206. package/contracts/instance/base/KeyValueStore.sol +161 -0
  207. package/contracts/instance/base/Lifecycle.sol +100 -0
  208. package/contracts/instance/base/ModuleBase.sol +53 -0
  209. package/contracts/instance/base/ServiceBase.sol +37 -0
  210. package/contracts/instance/module/access/Access.sol +149 -0
  211. package/contracts/instance/module/access/IAccess.sol +53 -0
  212. package/contracts/instance/module/bundle/BundleModule.sol +135 -0
  213. package/contracts/instance/module/bundle/IBundle.sol +51 -0
  214. package/contracts/instance/module/compensation/CompensationModule.sol +17 -0
  215. package/contracts/instance/module/compensation/ICompensation.sol +10 -0
  216. package/contracts/instance/module/component/ComponentModule.sol +81 -0
  217. package/contracts/instance/module/component/IComponent.sol +29 -0
  218. package/contracts/instance/module/policy/IPolicy.sol +62 -0
  219. package/contracts/instance/module/policy/PolicyModule.sol +92 -0
  220. package/contracts/instance/module/pool/IPoolModule.sol +40 -0
  221. package/contracts/instance/module/pool/PoolModule.sol +90 -0
  222. package/contracts/instance/module/risk/IRisk.sol +27 -0
  223. package/contracts/instance/module/risk/RiskModule.sol +70 -0
  224. package/contracts/instance/module/treasury/ITreasury.sol +96 -0
  225. package/contracts/instance/module/treasury/TokenHandler.sol +48 -0
  226. package/contracts/instance/module/treasury/TreasuryModule.sol +171 -0
  227. package/contracts/instance/service/ComponentOwnerService.sol +155 -0
  228. package/contracts/instance/service/IComponentOwnerService.sol +22 -0
  229. package/contracts/instance/service/IPoolService.sol +30 -0
  230. package/contracts/instance/service/IProductService.sol +78 -0
  231. package/contracts/instance/service/PoolService.sol +129 -0
  232. package/contracts/instance/service/ProductService.sol +406 -0
  233. package/contracts/registry/ChainNft.sol +61 -37
  234. package/contracts/registry/IRegistry.sol +24 -34
  235. package/contracts/registry/IRegistryLinked.sol +8 -0
  236. package/contracts/registry/Registry.sol +284 -85
  237. package/contracts/shared/ERC165.sol +21 -0
  238. package/contracts/shared/IOwnable.sol +6 -0
  239. package/contracts/shared/IRegisterable.sol +24 -0
  240. package/contracts/shared/IVersionable.sol +52 -0
  241. package/contracts/shared/Registerable.sol +86 -0
  242. package/contracts/shared/Versionable.sol +89 -0
  243. package/contracts/test/TestFee.sol +25 -0
  244. package/contracts/test/TestPool.sol +24 -0
  245. package/contracts/test/TestProduct.sol +66 -0
  246. package/contracts/test/TestRegisterable.sol +19 -0
  247. package/contracts/test/TestRoleId.sol +14 -0
  248. package/contracts/test/TestService.sol +32 -0
  249. package/contracts/{mock/Dip.sol → test/TestToken.sol} +5 -5
  250. package/contracts/test/TestVersion.sol +44 -0
  251. package/contracts/test/TestVersionable.sol +17 -0
  252. package/contracts/{mock → test}/Usdc.sol +1 -1
  253. package/contracts/types/AddressSet.sol +58 -0
  254. package/contracts/types/Fee.sol +39 -20
  255. package/contracts/types/Key32.sol +45 -0
  256. package/contracts/types/NftId.sol +22 -1
  257. package/contracts/types/NftIdSet.sol +60 -0
  258. package/contracts/types/ObjectType.sol +33 -13
  259. package/contracts/types/RiskId.sol +43 -0
  260. package/contracts/types/RoleId.sol +38 -0
  261. package/contracts/types/StateId.sol +13 -3
  262. package/contracts/types/Timestamp.sol +22 -1
  263. package/contracts/types/UFixed.sol +12 -13
  264. package/contracts/types/Version.sol +95 -0
  265. package/package.json +8 -3
  266. package/artifacts/contracts/components/Component.sol/Component.dbg.json +0 -4
  267. package/artifacts/contracts/components/Component.sol/InstanceLinked.dbg.json +0 -4
  268. package/artifacts/contracts/components/Component.sol/InstanceLinked.json +0 -35
  269. package/artifacts/contracts/components/IPool.sol/IPoolComponent.dbg.json +0 -4
  270. package/artifacts/contracts/components/IProduct.sol/IProductComponent.dbg.json +0 -4
  271. package/artifacts/contracts/components/IProduct.sol/IProductComponent.json +0 -74
  272. package/artifacts/contracts/instance/access/Access.sol/AccessModule.dbg.json +0 -4
  273. package/artifacts/contracts/instance/access/IAccess.sol/IAccess.dbg.json +0 -4
  274. package/artifacts/contracts/instance/access/IAccess.sol/IAccessCheckRole.dbg.json +0 -4
  275. package/artifacts/contracts/instance/access/IAccess.sol/IAccessCheckRole.json +0 -35
  276. package/artifacts/contracts/instance/access/IAccess.sol/IAccessComponentTypeRoles.dbg.json +0 -4
  277. package/artifacts/contracts/instance/access/IAccess.sol/IAccessComponentTypeRoles.json +0 -50
  278. package/artifacts/contracts/instance/access/IAccess.sol/IAccessModule.dbg.json +0 -4
  279. package/artifacts/contracts/instance/component/ComponentModule.sol/ComponentModule.dbg.json +0 -4
  280. package/artifacts/contracts/instance/component/ComponentModule.sol/ComponentOwnerService.dbg.json +0 -4
  281. package/artifacts/contracts/instance/component/ComponentModule.sol/ComponentOwnerService.json +0 -202
  282. package/artifacts/contracts/instance/component/IComponent.sol/IComponent.dbg.json +0 -4
  283. package/artifacts/contracts/instance/component/IComponent.sol/IComponentContract.dbg.json +0 -4
  284. package/artifacts/contracts/instance/component/IComponent.sol/IComponentModule.dbg.json +0 -4
  285. package/artifacts/contracts/instance/component/IComponent.sol/IComponentModule.json +0 -217
  286. package/artifacts/contracts/instance/component/IComponent.sol/IComponentOwnerService.dbg.json +0 -4
  287. package/artifacts/contracts/instance/component/IComponent.sol/IComponentOwnerService.json +0 -141
  288. package/artifacts/contracts/instance/component/IComponent.sol/IInstanceLinked.dbg.json +0 -4
  289. package/artifacts/contracts/instance/lifecycle/ILifecycle.sol/ILifecycle.dbg.json +0 -4
  290. package/artifacts/contracts/instance/lifecycle/ILifecycle.sol/ILifecycle.json +0 -134
  291. package/artifacts/contracts/instance/lifecycle/ILifecycle.sol/ILifecycleModule.dbg.json +0 -4
  292. package/artifacts/contracts/instance/lifecycle/LifecycleModule.sol/LifecycleModule.dbg.json +0 -4
  293. package/artifacts/contracts/instance/lifecycle/LifecycleModule.sol/LifecycleModule.json +0 -221
  294. package/artifacts/contracts/instance/policy/IPolicy.sol/IPolicy.dbg.json +0 -4
  295. package/artifacts/contracts/instance/policy/IPolicy.sol/IPolicyModule.dbg.json +0 -4
  296. package/artifacts/contracts/instance/policy/PolicyModule.sol/PolicyModule.dbg.json +0 -4
  297. package/artifacts/contracts/instance/pool/IPoolModule.sol/IPool.dbg.json +0 -4
  298. package/artifacts/contracts/instance/pool/IPoolModule.sol/IPoolModule.dbg.json +0 -4
  299. package/artifacts/contracts/instance/pool/PoolModule.sol/PoolModule.dbg.json +0 -4
  300. package/artifacts/contracts/instance/product/IProductService.sol/IProductModule.dbg.json +0 -4
  301. package/artifacts/contracts/instance/product/IProductService.sol/IProductModule.json +0 -75
  302. package/artifacts/contracts/instance/product/IProductService.sol/IProductService.dbg.json +0 -4
  303. package/artifacts/contracts/instance/product/ProductService.sol/ProductModule.dbg.json +0 -4
  304. package/artifacts/contracts/instance/product/ProductService.sol/ProductModule.json +0 -75
  305. package/artifacts/contracts/instance/product/ProductService.sol/ProductService.dbg.json +0 -4
  306. package/artifacts/contracts/instance/product/ProductService.sol/ProductService.json +0 -196
  307. package/artifacts/contracts/instance/treasury/ITreasury.sol/ITreasury.dbg.json +0 -4
  308. package/artifacts/contracts/instance/treasury/ITreasury.sol/ITreasuryModule.dbg.json +0 -4
  309. package/artifacts/contracts/instance/treasury/TokenHandler.sol/TokenHandler.dbg.json +0 -4
  310. package/artifacts/contracts/instance/treasury/TokenHandler.sol/TokenHandler.json +0 -45
  311. package/artifacts/contracts/instance/treasury/TreasuryModule.sol/TreasuryModule.dbg.json +0 -4
  312. package/artifacts/contracts/mock/Dip.sol/DIP.dbg.json +0 -4
  313. package/artifacts/contracts/mock/Dip.sol/DIP.json +0 -338
  314. package/artifacts/contracts/mock/TestPool.sol/TestPool.dbg.json +0 -4
  315. package/artifacts/contracts/mock/TestPool.sol/TestPool.json +0 -294
  316. package/artifacts/contracts/mock/TestProduct.sol/TestProduct.dbg.json +0 -4
  317. package/artifacts/contracts/mock/TestProduct.sol/TestProduct.json +0 -384
  318. package/artifacts/contracts/mock/Usdc.sol/USDC.dbg.json +0 -4
  319. package/artifacts/contracts/registry/IRegistry.sol/IOwnable.dbg.json +0 -4
  320. package/artifacts/contracts/registry/IRegistry.sol/IRegisterable.dbg.json +0 -4
  321. package/artifacts/contracts/registry/IRegistry.sol/IRegistryLinked.dbg.json +0 -4
  322. package/artifacts/contracts/registry/IRegistry.sol/IRegistryLinked.json +0 -49
  323. package/artifacts/contracts/registry/Registry.sol/Registerable.dbg.json +0 -4
  324. package/artifacts/contracts/registry/Registry.sol/RegistryLinked.dbg.json +0 -4
  325. package/artifacts/contracts/registry/Registry.sol/RegistryLinked.json +0 -60
  326. package/contracts/components/Component.sol +0 -77
  327. package/contracts/components/IPool.sol +0 -15
  328. package/contracts/instance/access/Access.sol +0 -165
  329. package/contracts/instance/access/IAccess.sol +0 -63
  330. package/contracts/instance/component/ComponentModule.sol +0 -274
  331. package/contracts/instance/component/IComponent.sol +0 -74
  332. package/contracts/instance/lifecycle/LifecycleModule.sol +0 -88
  333. package/contracts/instance/policy/IPolicy.sol +0 -50
  334. package/contracts/instance/policy/PolicyModule.sol +0 -114
  335. package/contracts/instance/pool/IPoolModule.sol +0 -23
  336. package/contracts/instance/pool/PoolModule.sol +0 -81
  337. package/contracts/instance/product/IProductService.sol +0 -36
  338. package/contracts/instance/product/ProductService.sol +0 -136
  339. package/contracts/instance/treasury/ITreasury.sol +0 -91
  340. package/contracts/instance/treasury/TokenHandler.sol +0 -24
  341. package/contracts/instance/treasury/TreasuryModule.sol +0 -168
  342. package/contracts/mock/TestPool.sol +0 -16
  343. package/contracts/mock/TestProduct.sol +0 -39
@@ -0,0 +1,60 @@
1
+ // SPDX-License-Identifier: Apache-2.0
2
+ pragma solidity ^0.8.19;
3
+
4
+ import {NftId} from "../types/NftId.sol";
5
+
6
+ // based on https://github.com/OpenZeppelin/openzeppelin-contracts/blob/master/contracts/utils/structs/EnumerableSet.sol
7
+ library LibNftIdSet {
8
+
9
+ struct Set {
10
+ NftId[] ids;
11
+ mapping(NftId nftid => uint256 index) at;
12
+ }
13
+
14
+ function add(Set storage set, NftId nftId) external returns(bool added) {
15
+ if (set.at[nftId] == 0) {
16
+ set.ids.push(nftId);
17
+ set.at[nftId] = set.ids.length;
18
+ return true;
19
+ } else {
20
+ return false;
21
+ }
22
+ }
23
+
24
+ function remove(Set storage set, NftId nftId) external returns(bool removed) {
25
+ uint256 nftIdIndex = set.at[nftId];
26
+
27
+ if (nftIdIndex > 0) {
28
+ uint256 toDeleteIndex = nftIdIndex - 1;
29
+ uint256 lastIndex = set.ids.length - 1;
30
+
31
+ if (lastIndex != toDeleteIndex) {
32
+ NftId lastId = set.ids[lastIndex];
33
+ set.ids[toDeleteIndex] = lastId;
34
+ set.at[lastId] = nftIdIndex; // Replace lastValue's index to valueIndex
35
+ }
36
+
37
+ set.ids.pop();
38
+ delete set.at[nftId];
39
+ return true;
40
+ } else {
41
+ return false;
42
+ }
43
+ }
44
+
45
+ function isEmpty(Set storage set) external view returns(bool empty) {
46
+ return set.ids.length == 0;
47
+ }
48
+
49
+ function contains(Set storage set, NftId nftId) external view returns(bool inSet) {
50
+ return set.at[nftId] > 0;
51
+ }
52
+
53
+ function getLength(Set storage set) external view returns(uint256 length) {
54
+ return set.ids.length;
55
+ }
56
+
57
+ function getElementAt(Set storage set, uint256 index) external view returns(NftId nftId) {
58
+ return set.ids[index];
59
+ }
60
+ }
@@ -1,14 +1,14 @@
1
1
  // SPDX-License-Identifier: Apache-2.0
2
2
  pragma solidity ^0.8.19;
3
3
 
4
- // uint96 allows for chain ids up to 13 digits
5
4
  type ObjectType is uint8;
6
5
 
7
6
  // type bindings
8
7
  using {
9
8
  eqObjectType as ==,
10
9
  neObjectType as !=,
11
- ObjectTypeLib.toInt
10
+ ObjectTypeLib.toInt,
11
+ ObjectTypeLib.gtz
12
12
  } for ObjectType global;
13
13
 
14
14
  // general pure free functions
@@ -17,15 +17,15 @@ function PROTOCOL() pure returns (ObjectType) {
17
17
  return toObjectType(10);
18
18
  }
19
19
 
20
- function CHAIN() pure returns (ObjectType) {
20
+ function REGISTRY() pure returns (ObjectType) {
21
21
  return toObjectType(20);
22
22
  }
23
23
 
24
- function REGISTRY() pure returns (ObjectType) {
24
+ function TOKEN() pure returns (ObjectType) {
25
25
  return toObjectType(30);
26
26
  }
27
27
 
28
- function TOKEN() pure returns (ObjectType) {
28
+ function SERVICE() pure returns (ObjectType) {
29
29
  return toObjectType(40);
30
30
  }
31
31
 
@@ -33,32 +33,52 @@ function INSTANCE() pure returns (ObjectType) {
33
33
  return toObjectType(50);
34
34
  }
35
35
 
36
- function PRODUCT() pure returns (ObjectType) {
36
+ function STAKE() pure returns (ObjectType) {
37
37
  return toObjectType(60);
38
38
  }
39
39
 
40
+ function COMPONENT() pure returns (ObjectType) {
41
+ return toObjectType(100);
42
+ }
43
+
44
+ function TREASURY() pure returns (ObjectType) {
45
+ return toObjectType(101);
46
+ }
47
+
48
+ function PRODUCT() pure returns (ObjectType) {
49
+ return toObjectType(110);
50
+ }
51
+
52
+ function COMPENSATION() pure returns (ObjectType) {
53
+ return toObjectType(120);
54
+ }
55
+
40
56
  function ORACLE() pure returns (ObjectType) {
41
- return toObjectType(70);
57
+ return toObjectType(130);
42
58
  }
43
59
 
44
60
  function POOL() pure returns (ObjectType) {
45
- return toObjectType(80);
61
+ return toObjectType(140);
46
62
  }
47
63
 
48
- function BUNDLE() pure returns (ObjectType) {
49
- return toObjectType(81);
64
+ function RISK() pure returns (ObjectType) {
65
+ return toObjectType(200);
50
66
  }
51
67
 
52
68
  function POLICY() pure returns (ObjectType) {
53
- return toObjectType(90);
69
+ return toObjectType(210);
70
+ }
71
+
72
+ function BUNDLE() pure returns (ObjectType) {
73
+ return toObjectType(220);
54
74
  }
55
75
 
56
76
  function CLAIM() pure returns (ObjectType) {
57
- return toObjectType(91);
77
+ return toObjectType(211);
58
78
  }
59
79
 
60
80
  function PAYOUT() pure returns (ObjectType) {
61
- return toObjectType(92);
81
+ return toObjectType(212);
62
82
  }
63
83
 
64
84
  /// @dev Converts the uint8 to a ObjectType.
@@ -0,0 +1,43 @@
1
+ // SPDX-License-Identifier: Apache-2.0
2
+ pragma solidity ^0.8.19;
3
+
4
+ import {Key32, KeyId, Key32Lib} from "./Key32.sol";
5
+ import {RISK} from "./ObjectType.sol";
6
+
7
+ type RiskId is bytes8;
8
+
9
+ // type bindings
10
+ using {
11
+ eqRiskId as ==,
12
+ neRiskId as !=,
13
+ RiskIdLib.toKey32
14
+ } for RiskId global;
15
+
16
+ // general pure free functions
17
+
18
+ // @dev Returns true iff risk ids a and b are identical
19
+ function eqRiskId(RiskId a, RiskId b) pure returns (bool isSame) {
20
+ return RiskId.unwrap(a) == RiskId.unwrap(b);
21
+ }
22
+
23
+ // @dev Returns true iff risk ids a and b are different
24
+ function neRiskId(RiskId a, RiskId b) pure returns (bool isDifferent) {
25
+ return RiskId.unwrap(a) != RiskId.unwrap(b);
26
+ }
27
+
28
+ library RiskIdLib {
29
+ // @dev Converts a role string into a role id.
30
+ function toRiskId(string memory risk) public pure returns (RiskId) {
31
+ return RiskId.wrap(bytes8(keccak256(abi.encode(risk))));
32
+ }
33
+
34
+ /// @dev Returns the key32 value for the specified nft id and object type.
35
+ function toKey32(RiskId id) public pure returns (Key32 key) {
36
+ return Key32Lib.toKey32(RISK(), toKeyId(id));
37
+ }
38
+
39
+ /// @dev Returns the key id value for the specified nft id
40
+ function toKeyId(RiskId id) public pure returns (KeyId keyId) {
41
+ return KeyId.wrap(bytes31(RiskId.unwrap(id)));
42
+ }
43
+ }
@@ -0,0 +1,38 @@
1
+ // SPDX-License-Identifier: Apache-2.0
2
+ pragma solidity ^0.8.19;
3
+
4
+ type RoleId is bytes8;
5
+
6
+ // type bindings
7
+ using {
8
+ eqRoleId as ==,
9
+ neRoleId as !=
10
+ } for RoleId global;
11
+
12
+ // general pure free functions
13
+ function DISTRIBUTOR_OWNER_ROLE_NAME() pure returns (string memory) { return "DistributorOwnerRole"; }
14
+ function ORACLE_OWNER_ROLE_NAME() pure returns (string memory) { return "OracleOwnerRole"; }
15
+ function POOL_OWNER_ROLE_NAME() pure returns (string memory) { return "PoolOwnerRole"; }
16
+ function PRODUCT_OWNER_ROLE_NAME() pure returns (string memory) { return "ProductOwnerRole"; }
17
+
18
+ function DISTRIBUTOR_OWNER_ROLE() pure returns (RoleId) { return RoleIdLib.toRoleId("DistributorOwnerRole"); }
19
+ function ORACLE_OWNER_ROLE() pure returns (RoleId) { return RoleIdLib.toRoleId("OracleOwnerRole"); }
20
+ function POOL_OWNER_ROLE() pure returns (RoleId) { return RoleIdLib.toRoleId("PoolOwnerRole"); }
21
+ function PRODUCT_OWNER_ROLE() pure returns (RoleId) { return RoleIdLib.toRoleId("ProductOwnerRole"); }
22
+
23
+ // @dev Returns true iff role ids a and b are identical
24
+ function eqRoleId(RoleId a, RoleId b) pure returns (bool isSame) {
25
+ return RoleId.unwrap(a) == RoleId.unwrap(b);
26
+ }
27
+
28
+ // @dev Returns true iff role ids a and b are different
29
+ function neRoleId(RoleId a, RoleId b) pure returns (bool isDifferent) {
30
+ return RoleId.unwrap(a) != RoleId.unwrap(b);
31
+ }
32
+
33
+ library RoleIdLib {
34
+ // @dev Converts a role string into a role id.
35
+ function toRoleId(string memory role) public pure returns (RoleId) {
36
+ return RoleId.wrap(bytes8(keccak256(abi.encode(role))));
37
+ }
38
+ }
@@ -5,7 +5,13 @@ pragma solidity ^0.8.19;
5
5
  type StateId is uint8;
6
6
 
7
7
  // type bindings
8
- using {eqStateId as ==, neStateId as !=, StateIdLib.toInt} for StateId global;
8
+ using {
9
+ eqStateId as ==,
10
+ neStateId as !=,
11
+ StateIdLib.eqz,
12
+ StateIdLib.gtz,
13
+ StateIdLib.toInt
14
+ } for StateId global;
9
15
 
10
16
  // general pure free functions
11
17
  function APPLIED() pure returns (StateId) {
@@ -20,14 +26,18 @@ function DECLINED() pure returns (StateId) {
20
26
  return toStateId(30);
21
27
  }
22
28
 
23
- function CONFIRMED() pure returns (StateId) {
29
+ function UNDERWRITTEN() pure returns (StateId) {
24
30
  return toStateId(40);
25
31
  }
26
32
 
27
- function EXPECTED() pure returns (StateId) {
33
+ function CONFIRMED() pure returns (StateId) {
28
34
  return toStateId(50);
29
35
  }
30
36
 
37
+ function EXPECTED() pure returns (StateId) {
38
+ return toStateId(60);
39
+ }
40
+
31
41
  function ACTIVE() pure returns (StateId) {
32
42
  return toStateId(100);
33
43
  }
@@ -9,7 +9,10 @@ using {
9
9
  ltTimestamp as <,
10
10
  lteTimestamp as <=,
11
11
  eqTimestamp as ==,
12
- neTimestamp as !=
12
+ neTimestamp as !=,
13
+ TimestampLib.gtz,
14
+ TimestampLib.eqz,
15
+ TimestampLib.addSeconds
13
16
  } for Timestamp global;
14
17
 
15
18
  /// @dev return true if Timestamp a is after Timestamp b
@@ -96,6 +99,24 @@ library TimestampLib {
96
99
  return neTimestamp(a, b);
97
100
  }
98
101
 
102
+ /// @dev return true if Timestamp is larger than 0
103
+ function gtz(Timestamp timestamp) public pure returns (bool) {
104
+ return Timestamp.unwrap(timestamp) > 0;
105
+ }
106
+
107
+ /// @dev return true if Timestamp equals 0
108
+ function eqz(Timestamp timestamp) public pure returns (bool) {
109
+ return Timestamp.unwrap(timestamp) == 0;
110
+ }
111
+
112
+ /// @dev return true if Timestamp a is not equal to Timestamp b
113
+ function addSeconds(
114
+ Timestamp timestamp,
115
+ uint256 timeDelta
116
+ ) public pure returns (Timestamp) {
117
+ return toTimestamp(Timestamp.unwrap(timestamp) + uint40(timeDelta));
118
+ }
119
+
99
120
  function toInt(Timestamp timestamp) public pure returns (uint256) {
100
121
  return uint256(uint40(Timestamp.unwrap(timestamp)));
101
122
  }
@@ -15,7 +15,8 @@ using {
15
15
  gteUFixed as >=,
16
16
  ltUFixed as <,
17
17
  lteUFixed as <=,
18
- eqUFixed as ==
18
+ eqUFixed as ==,
19
+ UFixedMathLib.toInt
19
20
  } for UFixed global;
20
21
 
21
22
  function addUFixed(UFixed a, UFixed b) pure returns (UFixed) {
@@ -76,7 +77,6 @@ function deltaUFixed(UFixed a, UFixed b) pure returns (UFixed) {
76
77
  }
77
78
 
78
79
  library UFixedMathLib {
79
-
80
80
  int8 public constant EXP = 18;
81
81
  uint256 public constant MULTIPLIER = 10 ** uint256(int256(EXP));
82
82
  uint256 public constant MULTIPLIER_HALF = MULTIPLIER / 2;
@@ -96,32 +96,31 @@ library UFixedMathLib {
96
96
  return uint8(2);
97
97
  }
98
98
 
99
- /// @dev returns the decimals precision of the UFixed type
100
- function decimals() public pure returns (uint256) {
101
- return uint8(EXP);
102
- }
103
-
104
99
  /// @dev Converts the uint256 to a UFixed.
105
- function itof(uint256 a) public pure returns (UFixed) {
100
+ function toUFixed(uint256 a) public pure returns (UFixed) {
106
101
  return UFixed.wrap(a * MULTIPLIER);
107
102
  }
108
103
 
109
- // TODO rename to toUFixed
110
104
  /// @dev Converts the uint256 to a UFixed with given exponent.
111
- function itof(uint256 a, int8 exp) public pure returns (UFixed) {
105
+ function toUFixed(uint256 a, int8 exp) public pure returns (UFixed) {
112
106
  require(EXP + exp >= 0, "ERROR:FM-010:EXPONENT_TOO_SMALL");
113
107
  require(EXP + exp <= 64, "ERROR:FM-011:EXPONENT_TOO_LARGE");
114
108
 
115
109
  return UFixed.wrap(a * 10 ** uint8(EXP + exp));
116
110
  }
117
111
 
112
+ /// @dev returns the decimals precision of the UFixed type
113
+ function decimals() public pure returns (uint256) {
114
+ return uint8(EXP);
115
+ }
116
+
118
117
  /// @dev Converts a UFixed to a uint256.
119
- function ftoi(UFixed a) public pure returns (uint256) {
120
- return ftoi(a, ROUNDING_HALF_UP());
118
+ function toInt(UFixed a) public pure returns (uint256) {
119
+ return toIntWithRounding(a, ROUNDING_HALF_UP());
121
120
  }
122
121
 
123
122
  /// @dev Converts a UFixed to a uint256 with given rounding mode.
124
- function ftoi(UFixed a, uint8 rounding) public pure returns (uint256) {
123
+ function toIntWithRounding(UFixed a, uint8 rounding) public pure returns (uint256) {
125
124
  if (rounding == ROUNDING_HALF_UP()) {
126
125
  return
127
126
  Math.mulDiv(
@@ -0,0 +1,95 @@
1
+ // SPDX-License-Identifier: Apache-2.0
2
+ pragma solidity ^0.8.19;
3
+
4
+ type VersionPart is uint8;
5
+
6
+ using {
7
+ versionPartGt as >,
8
+ versionPartEq as ==,
9
+ VersionPartLib.toInt
10
+ }
11
+ for VersionPart global;
12
+
13
+ function versionPartGt(VersionPart a, VersionPart b) pure returns(bool isGreaterThan) { return VersionPart.unwrap(a) > VersionPart.unwrap(b); }
14
+ function versionPartEq(VersionPart a, VersionPart b) pure returns(bool isSame) { return VersionPart.unwrap(a) == VersionPart.unwrap(b); }
15
+
16
+ library VersionPartLib {
17
+ function toInt(VersionPart x) external pure returns(uint) { return VersionPart.unwrap(x); }
18
+ }
19
+
20
+ type Version is uint24; // contains major,minor,patch version parts
21
+
22
+ using {
23
+ versionGt as >,
24
+ versionEq as ==,
25
+ VersionLib.toInt,
26
+ VersionLib.toMajorPart,
27
+ VersionLib.toVersionParts
28
+ }
29
+ for Version global;
30
+
31
+ function versionGt(Version a, Version b) pure returns(bool isGreaterThan) { return Version.unwrap(a) > Version.unwrap(b); }
32
+ function versionEq(Version a, Version b) pure returns(bool isSame) { return Version.unwrap(a) == Version.unwrap(b); }
33
+
34
+ library VersionLib {
35
+ function toInt(Version version) external pure returns(uint) { return Version.unwrap(version); }
36
+
37
+ function toMajorPart(Version version)
38
+ external
39
+ pure
40
+ returns(VersionPart major)
41
+ {
42
+ uint24 versionInt = Version.unwrap(version);
43
+ uint8 majorInt = uint8(versionInt >> 16);
44
+ return VersionPart.wrap(majorInt);
45
+ }
46
+
47
+ function toVersionParts(Version version)
48
+ external
49
+ pure
50
+ returns(
51
+ VersionPart major,
52
+ VersionPart minor,
53
+ VersionPart patch
54
+ )
55
+ {
56
+ uint24 versionInt = Version.unwrap(version);
57
+ uint8 majorInt = uint8(versionInt >> 16);
58
+
59
+ versionInt -= majorInt << 16;
60
+ uint8 minorInt = uint8(versionInt >> 8);
61
+ uint8 patchInt = uint8(versionInt - (minorInt << 8));
62
+
63
+ return (
64
+ VersionPart.wrap(majorInt),
65
+ VersionPart.wrap(minorInt),
66
+ VersionPart.wrap(patchInt)
67
+ );
68
+ }
69
+
70
+ function toVersionPart(uint256 versionPart) external pure returns(VersionPart) {
71
+ return VersionPart.wrap(uint8(versionPart));
72
+ }
73
+
74
+ function toVersion(
75
+ uint256 major,
76
+ uint256 minor,
77
+ uint256 patch
78
+ )
79
+ external
80
+ pure
81
+ returns(Version)
82
+ {
83
+ require(
84
+ major < 256 && minor < 256 && patch < 256,
85
+ "ERROR:VRS-010:VERSION_PART_TOO_BIG");
86
+
87
+ return Version.wrap(
88
+ uint24(
89
+ (major << 16) + (minor << 8) + patch));
90
+ }
91
+
92
+ function zeroVersion() external pure returns(Version) {
93
+ return Version.wrap(0);
94
+ }
95
+ }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@etherisc/gif-next",
3
- "version": "0.0.2-f619be3-760",
3
+ "version": "0.0.2-f72939c-380",
4
4
  "description": "This is the repository for the next version of the Generic Insurance Framework (GIF) smart contracts. ",
5
5
  "main": "index.js",
6
6
  "scripts": {
@@ -11,7 +11,8 @@
11
11
  "coverage": "hh coverage",
12
12
  "styleFix": "prettier --write --plugin=prettier-plugin-solidity 'contracts/**/*.sol' 'test_forge/**/*.t.sol'",
13
13
  "styleCheck": "prettier --check --plugin=prettier-plugin-solidity 'contracts/**/*.sol' 'test_forge/**/*.t.sol'",
14
- "lint": "solhint 'contracts/**/*.sol' 'test_forge/**/*.t.sol'"
14
+ "lint": "solhint 'contracts/**/*.sol' 'test_forge/**/*.t.sol'",
15
+ "eslint": "eslint ."
15
16
  },
16
17
  "repository": {
17
18
  "type": "git",
@@ -31,10 +32,14 @@
31
32
  "@nomicfoundation/hardhat-foundry": "^1.1.1",
32
33
  "@nomicfoundation/hardhat-toolbox": "^3.0.0",
33
34
  "@nomicfoundation/hardhat-verify": "^1.1.1",
35
+ "@typescript-eslint/eslint-plugin": "^6.7.2",
36
+ "@typescript-eslint/parser": "^6.7.2",
34
37
  "dotenv": "^16.3.1",
38
+ "eslint": "^8.50.0",
35
39
  "hardhat": "^2.17.2",
36
40
  "prettier": "^3.0.3",
37
- "prettier-plugin-solidity": "^1.1.3"
41
+ "prettier-plugin-solidity": "^1.1.3",
42
+ "typescript": "^5"
38
43
  },
39
44
  "dependencies": {
40
45
  "@openzeppelin/contracts": "^4.9.3",
@@ -1,4 +0,0 @@
1
- {
2
- "_format": "hh-sol-dbg-1",
3
- "buildInfo": "../../../build-info/371956c35f778b248bb1774ada1ed516.json"
4
- }
@@ -1,4 +0,0 @@
1
- {
2
- "_format": "hh-sol-dbg-1",
3
- "buildInfo": "../../../build-info/371956c35f778b248bb1774ada1ed516.json"
4
- }
@@ -1,35 +0,0 @@
1
- {
2
- "_format": "hh-sol-artifact-1",
3
- "contractName": "InstanceLinked",
4
- "sourceName": "contracts/components/Component.sol",
5
- "abi": [
6
- {
7
- "inputs": [
8
- {
9
- "internalType": "address",
10
- "name": "instance",
11
- "type": "address"
12
- }
13
- ],
14
- "stateMutability": "nonpayable",
15
- "type": "constructor"
16
- },
17
- {
18
- "inputs": [],
19
- "name": "getInstance",
20
- "outputs": [
21
- {
22
- "internalType": "contract IInstance",
23
- "name": "instance",
24
- "type": "address"
25
- }
26
- ],
27
- "stateMutability": "view",
28
- "type": "function"
29
- }
30
- ],
31
- "bytecode": "0x608060405234801561001057600080fd5b5060405161011438038061011483398101604081905261002f91610054565b600080546001600160a01b0319166001600160a01b0392909216919091179055610084565b60006020828403121561006657600080fd5b81516001600160a01b038116811461007d57600080fd5b9392505050565b6082806100926000396000f3fe6080604052348015600f57600080fd5b506004361060285760003560e01c8063de7b5d1414602d575b600080fd5b600054604080516001600160a01b039092168252519081900360200190f3fea264697066735822122073a0ea8fa4352d28b2a129d826cfd42d4c8f65d3a006cdf283aa909e0fac0e4264736f6c63430008140033",
32
- "deployedBytecode": "0x6080604052348015600f57600080fd5b506004361060285760003560e01c8063de7b5d1414602d575b600080fd5b600054604080516001600160a01b039092168252519081900360200190f3fea264697066735822122073a0ea8fa4352d28b2a129d826cfd42d4c8f65d3a006cdf283aa909e0fac0e4264736f6c63430008140033",
33
- "linkReferences": {},
34
- "deployedLinkReferences": {}
35
- }
@@ -1,4 +0,0 @@
1
- {
2
- "_format": "hh-sol-dbg-1",
3
- "buildInfo": "../../../build-info/371956c35f778b248bb1774ada1ed516.json"
4
- }
@@ -1,4 +0,0 @@
1
- {
2
- "_format": "hh-sol-dbg-1",
3
- "buildInfo": "../../../build-info/371956c35f778b248bb1774ada1ed516.json"
4
- }
@@ -1,74 +0,0 @@
1
- {
2
- "_format": "hh-sol-artifact-1",
3
- "contractName": "IProductComponent",
4
- "sourceName": "contracts/components/IProduct.sol",
5
- "abi": [
6
- {
7
- "inputs": [],
8
- "name": "getPolicyFee",
9
- "outputs": [
10
- {
11
- "components": [
12
- {
13
- "internalType": "UFixed",
14
- "name": "fractionalFee",
15
- "type": "uint256"
16
- },
17
- {
18
- "internalType": "uint256",
19
- "name": "fixedFee",
20
- "type": "uint256"
21
- }
22
- ],
23
- "internalType": "struct Fee",
24
- "name": "policyFee",
25
- "type": "tuple"
26
- }
27
- ],
28
- "stateMutability": "view",
29
- "type": "function"
30
- },
31
- {
32
- "inputs": [],
33
- "name": "getPoolNftId",
34
- "outputs": [
35
- {
36
- "internalType": "NftId",
37
- "name": "poolNftId",
38
- "type": "uint96"
39
- }
40
- ],
41
- "stateMutability": "view",
42
- "type": "function"
43
- },
44
- {
45
- "inputs": [],
46
- "name": "getProcessingFee",
47
- "outputs": [
48
- {
49
- "components": [
50
- {
51
- "internalType": "UFixed",
52
- "name": "fractionalFee",
53
- "type": "uint256"
54
- },
55
- {
56
- "internalType": "uint256",
57
- "name": "fixedFee",
58
- "type": "uint256"
59
- }
60
- ],
61
- "internalType": "struct Fee",
62
- "name": "processingFee",
63
- "type": "tuple"
64
- }
65
- ],
66
- "stateMutability": "view",
67
- "type": "function"
68
- }
69
- ],
70
- "bytecode": "0x",
71
- "deployedBytecode": "0x",
72
- "linkReferences": {},
73
- "deployedLinkReferences": {}
74
- }
@@ -1,4 +0,0 @@
1
- {
2
- "_format": "hh-sol-dbg-1",
3
- "buildInfo": "../../../../build-info/371956c35f778b248bb1774ada1ed516.json"
4
- }
@@ -1,4 +0,0 @@
1
- {
2
- "_format": "hh-sol-dbg-1",
3
- "buildInfo": "../../../../build-info/371956c35f778b248bb1774ada1ed516.json"
4
- }
@@ -1,4 +0,0 @@
1
- {
2
- "_format": "hh-sol-dbg-1",
3
- "buildInfo": "../../../../build-info/371956c35f778b248bb1774ada1ed516.json"
4
- }