@etherisc/gif-next 0.0.2-f99f1d2-109 → 0.0.2-f9bc4c7-556

Sign up to get free protection for your applications and to get access to all the features.
Files changed (335) hide show
  1. package/README.md +90 -7
  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/Require.sol/Require.json +2 -2
  16. package/artifacts/contracts/experiment/errors/Revert.sol/Revert.dbg.json +1 -1
  17. package/artifacts/contracts/experiment/errors/Revert.sol/Revert.json +2 -2
  18. package/artifacts/contracts/experiment/inheritance/A.sol/A.dbg.json +1 -1
  19. package/artifacts/contracts/experiment/inheritance/A.sol/A.json +2 -2
  20. package/artifacts/contracts/experiment/inheritance/A.sol/AShared.dbg.json +1 -1
  21. package/artifacts/contracts/experiment/inheritance/A.sol/AShared.json +2 -2
  22. package/artifacts/contracts/experiment/inheritance/B.sol/B.dbg.json +1 -1
  23. package/artifacts/contracts/experiment/inheritance/C.sol/C.dbg.json +1 -1
  24. package/artifacts/contracts/experiment/inheritance/IA.sol/IA.dbg.json +1 -1
  25. package/artifacts/contracts/experiment/inheritance/IA.sol/ISharedA.dbg.json +1 -1
  26. package/artifacts/contracts/experiment/inheritance/IB.sol/IB.dbg.json +1 -1
  27. package/artifacts/contracts/experiment/inheritance/IC.sol/IC.dbg.json +1 -1
  28. package/artifacts/contracts/experiment/statemachine/Dummy.sol/LifeCycleModule.dbg.json +1 -1
  29. package/artifacts/contracts/experiment/statemachine/Dummy.sol/LifeCycleModule.json +2 -2
  30. package/artifacts/contracts/experiment/statemachine/ISM.sol/ISM.dbg.json +1 -1
  31. package/artifacts/contracts/experiment/statemachine/ISM.sol/ISMEE.dbg.json +1 -1
  32. package/artifacts/contracts/experiment/statemachine/SM.sol/SM.dbg.json +1 -1
  33. package/artifacts/contracts/experiment/statemachine/SM.sol/SM.json +2 -2
  34. package/artifacts/contracts/experiment/statemachine/SimpleStateMachine.sol/SimpleStateMachine.dbg.json +1 -1
  35. package/artifacts/contracts/experiment/statemachine/SimpleStateMachine.sol/SimpleStateMachine.json +2 -2
  36. package/artifacts/contracts/experiment/types/TypeA.sol/TypeALib.dbg.json +1 -1
  37. package/artifacts/contracts/experiment/types/TypeA.sol/TypeALib.json +2 -2
  38. package/artifacts/contracts/experiment/types/TypeB.sol/TypeBLib.dbg.json +1 -1
  39. package/artifacts/contracts/experiment/types/TypeB.sol/TypeBLib.json +2 -2
  40. package/artifacts/contracts/instance/IInstance.sol/IInstance.dbg.json +1 -1
  41. package/artifacts/contracts/instance/IInstance.sol/IInstance.json +719 -332
  42. package/artifacts/contracts/instance/IInstanceLinked.sol/IInstanceLinked.dbg.json +4 -0
  43. package/artifacts/contracts/instance/{component/IComponent.sol → IInstanceLinked.sol}/IInstanceLinked.json +1 -1
  44. package/artifacts/contracts/instance/Instance.sol/Instance.dbg.json +1 -1
  45. package/artifacts/contracts/instance/Instance.sol/Instance.json +998 -527
  46. package/artifacts/contracts/instance/base/ComponentServiceBase.sol/ComponentServiceBase.dbg.json +4 -0
  47. package/artifacts/contracts/instance/{component/ComponentModule.sol/ComponentModule.json → base/ComponentServiceBase.sol/ComponentServiceBase.json} +133 -132
  48. package/artifacts/contracts/instance/base/IInstanceBase.sol/IInstanceBase.dbg.json +4 -0
  49. package/artifacts/contracts/instance/{product/ProductService.sol/ProductModule.json → base/IInstanceBase.sol/IInstanceBase.json} +18 -30
  50. package/artifacts/contracts/instance/base/IKeyValueStore.sol/IKeyValueStore.dbg.json +4 -0
  51. package/artifacts/contracts/instance/base/IKeyValueStore.sol/IKeyValueStore.json +511 -0
  52. package/artifacts/contracts/instance/base/ILifecycle.sol/ILifecycle.dbg.json +4 -0
  53. package/artifacts/contracts/instance/{lifecycle/ILifecycle.sol/ILifecycleModule.json → base/ILifecycle.sol/ILifecycle.json} +10 -77
  54. package/artifacts/contracts/instance/base/IService.sol/IService.dbg.json +4 -0
  55. package/artifacts/contracts/instance/base/IService.sol/IService.json +300 -0
  56. package/artifacts/contracts/instance/base/InstanceBase.sol/InstanceBase.dbg.json +4 -0
  57. package/artifacts/contracts/instance/base/InstanceBase.sol/InstanceBase.json +326 -0
  58. package/artifacts/contracts/instance/base/KeyValueStore.sol/KeyValueStore.dbg.json +4 -0
  59. package/artifacts/contracts/instance/base/KeyValueStore.sol/KeyValueStore.json +692 -0
  60. package/artifacts/contracts/instance/base/Lifecycle.sol/Lifecycle.dbg.json +4 -0
  61. package/artifacts/contracts/instance/base/Lifecycle.sol/Lifecycle.json +169 -0
  62. package/artifacts/contracts/instance/base/ModuleBase.sol/ModuleBase.dbg.json +4 -0
  63. package/artifacts/contracts/instance/base/ModuleBase.sol/ModuleBase.json +10 -0
  64. package/artifacts/contracts/instance/base/ServiceBase.sol/ServiceBase.dbg.json +4 -0
  65. package/artifacts/contracts/instance/base/ServiceBase.sol/ServiceBase.json +300 -0
  66. package/artifacts/contracts/instance/module/access/Access.sol/AccessModule.dbg.json +4 -0
  67. package/artifacts/contracts/instance/{access → module/access}/Access.sol/AccessModule.json +85 -152
  68. package/artifacts/contracts/instance/module/access/IAccess.sol/IAccess.dbg.json +4 -0
  69. package/artifacts/contracts/instance/{access → module/access}/IAccess.sol/IAccess.json +1 -1
  70. package/artifacts/contracts/instance/module/access/IAccess.sol/IAccessModule.dbg.json +4 -0
  71. package/artifacts/contracts/instance/{access → module/access}/IAccess.sol/IAccessModule.json +96 -99
  72. package/artifacts/contracts/instance/module/bundle/BundleModule.sol/BundleModule.dbg.json +4 -0
  73. package/artifacts/contracts/instance/module/bundle/BundleModule.sol/BundleModule.json +296 -0
  74. package/artifacts/contracts/instance/module/bundle/IBundle.sol/IBundle.dbg.json +4 -0
  75. package/artifacts/contracts/instance/module/bundle/IBundle.sol/IBundle.json +10 -0
  76. package/artifacts/contracts/instance/module/bundle/IBundle.sol/IBundleModule.dbg.json +4 -0
  77. package/artifacts/contracts/instance/module/bundle/IBundle.sol/IBundleModule.json +296 -0
  78. package/artifacts/contracts/instance/module/compensation/CompensationModule.sol/CompensationModule.dbg.json +4 -0
  79. package/artifacts/contracts/instance/module/compensation/CompensationModule.sol/CompensationModule.json +10 -0
  80. package/artifacts/contracts/instance/module/compensation/ICompensation.sol/ICompensation.dbg.json +4 -0
  81. package/artifacts/contracts/instance/module/compensation/ICompensation.sol/ICompensation.json +10 -0
  82. package/artifacts/contracts/instance/module/compensation/ICompensation.sol/ICompensationModule.dbg.json +4 -0
  83. package/artifacts/contracts/instance/module/compensation/ICompensation.sol/ICompensationModule.json +10 -0
  84. package/artifacts/contracts/instance/module/component/ComponentModule.sol/ComponentModule.dbg.json +4 -0
  85. package/artifacts/contracts/instance/module/component/ComponentModule.sol/ComponentModule.json +188 -0
  86. package/artifacts/contracts/instance/module/component/IComponent.sol/IComponent.dbg.json +4 -0
  87. package/artifacts/contracts/instance/{component → module/component}/IComponent.sol/IComponent.json +1 -1
  88. package/artifacts/contracts/instance/module/component/IComponent.sol/IComponentModule.dbg.json +4 -0
  89. package/artifacts/contracts/instance/{component → module/component}/IComponent.sol/IComponentModule.json +33 -62
  90. package/artifacts/contracts/instance/module/policy/IPolicy.sol/IPolicy.dbg.json +4 -0
  91. package/artifacts/contracts/instance/{policy → module/policy}/IPolicy.sol/IPolicy.json +1 -1
  92. package/artifacts/contracts/instance/module/policy/IPolicy.sol/IPolicyModule.dbg.json +4 -0
  93. package/artifacts/contracts/instance/{policy → module/policy}/IPolicy.sol/IPolicyModule.json +132 -125
  94. package/artifacts/contracts/instance/module/policy/PolicyModule.sol/PolicyModule.dbg.json +4 -0
  95. package/artifacts/contracts/instance/{policy → module/policy}/PolicyModule.sol/PolicyModule.json +132 -125
  96. package/artifacts/contracts/instance/module/pool/IPoolModule.sol/IPool.dbg.json +4 -0
  97. package/artifacts/contracts/instance/{pool → module/pool}/IPoolModule.sol/IPool.json +1 -1
  98. package/artifacts/contracts/instance/module/pool/IPoolModule.sol/IPoolModule.dbg.json +4 -0
  99. package/artifacts/contracts/instance/{pool → module/pool}/IPoolModule.sol/IPoolModule.json +67 -47
  100. package/artifacts/contracts/instance/module/pool/PoolModule.sol/PoolModule.dbg.json +4 -0
  101. package/artifacts/contracts/instance/{pool → module/pool}/PoolModule.sol/PoolModule.json +51 -57
  102. package/artifacts/contracts/instance/module/risk/IRisk.sol/IRisk.dbg.json +4 -0
  103. package/artifacts/contracts/instance/module/risk/IRisk.sol/IRisk.json +10 -0
  104. package/artifacts/contracts/instance/module/risk/IRisk.sol/IRiskModule.dbg.json +4 -0
  105. package/artifacts/contracts/instance/module/risk/IRisk.sol/IRiskModule.json +10 -0
  106. package/artifacts/contracts/instance/module/risk/RiskModule.sol/RiskModule.dbg.json +4 -0
  107. package/artifacts/contracts/instance/module/risk/RiskModule.sol/RiskModule.json +10 -0
  108. package/artifacts/contracts/instance/module/treasury/ITreasury.sol/ITreasury.dbg.json +4 -0
  109. package/artifacts/contracts/instance/{treasury → module/treasury}/ITreasury.sol/ITreasury.json +1 -1
  110. package/artifacts/contracts/instance/module/treasury/ITreasury.sol/ITreasuryModule.dbg.json +4 -0
  111. package/artifacts/contracts/instance/{treasury → module/treasury}/ITreasury.sol/ITreasuryModule.json +100 -57
  112. package/artifacts/contracts/instance/module/treasury/TokenHandler.sol/TokenHandler.dbg.json +4 -0
  113. package/artifacts/contracts/instance/module/treasury/TokenHandler.sol/TokenHandler.json +76 -0
  114. package/artifacts/contracts/instance/module/treasury/TreasuryModule.sol/TreasuryModule.dbg.json +4 -0
  115. package/artifacts/contracts/instance/{treasury → module/treasury}/TreasuryModule.sol/TreasuryModule.json +100 -57
  116. package/artifacts/contracts/instance/service/ComponentOwnerService.sol/ComponentOwnerService.dbg.json +4 -0
  117. package/artifacts/contracts/instance/service/ComponentOwnerService.sol/ComponentOwnerService.json +523 -0
  118. package/artifacts/contracts/instance/service/IComponentOwnerService.sol/IComponentOwnerService.dbg.json +4 -0
  119. package/artifacts/contracts/instance/service/IComponentOwnerService.sol/IComponentOwnerService.json +364 -0
  120. package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.dbg.json +4 -0
  121. package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.json +376 -0
  122. package/artifacts/contracts/instance/service/IProductService.sol/IProductService.dbg.json +4 -0
  123. package/artifacts/contracts/instance/service/IProductService.sol/IProductService.json +477 -0
  124. package/artifacts/contracts/instance/service/PoolService.sol/PoolService.dbg.json +4 -0
  125. package/artifacts/contracts/instance/service/PoolService.sol/PoolService.json +471 -0
  126. package/artifacts/contracts/instance/service/ProductService.sol/ProductService.dbg.json +4 -0
  127. package/artifacts/contracts/instance/service/ProductService.sol/ProductService.json +673 -0
  128. package/artifacts/contracts/registry/ChainNft.sol/ChainNft.dbg.json +1 -1
  129. package/artifacts/contracts/registry/ChainNft.sol/ChainNft.json +65 -2
  130. package/artifacts/contracts/registry/IChainNft.sol/IChainNft.dbg.json +1 -1
  131. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.dbg.json +1 -1
  132. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.json +147 -30
  133. package/artifacts/contracts/registry/IRegistryLinked.sol/IRegistryLinked.dbg.json +4 -0
  134. package/artifacts/contracts/registry/IRegistryLinked.sol/IRegistryLinked.json +24 -0
  135. package/artifacts/contracts/registry/Registry.sol/Registry.dbg.json +1 -1
  136. package/artifacts/contracts/registry/Registry.sol/Registry.json +241 -25
  137. package/artifacts/contracts/shared/ERC165.sol/ERC165.dbg.json +4 -0
  138. package/artifacts/contracts/shared/ERC165.sol/ERC165.json +35 -0
  139. package/artifacts/contracts/shared/IOwnable.sol/IOwnable.dbg.json +4 -0
  140. package/artifacts/contracts/{registry/IRegistry.sol → shared/IOwnable.sol}/IOwnable.json +1 -1
  141. package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.dbg.json +4 -0
  142. package/artifacts/contracts/{registry/IRegistry.sol → shared/IRegisterable.sol}/IRegisterable.json +16 -61
  143. package/artifacts/contracts/shared/IVersionable.sol/IVersionable.dbg.json +4 -0
  144. package/artifacts/contracts/shared/IVersionable.sol/IVersionable.json +164 -0
  145. package/artifacts/contracts/shared/Registerable.sol/Registerable.dbg.json +4 -0
  146. package/artifacts/contracts/{registry/Registry.sol → shared/Registerable.sol}/Registerable.json +16 -61
  147. package/artifacts/contracts/shared/Versionable.sol/Versionable.dbg.json +4 -0
  148. package/artifacts/contracts/shared/Versionable.sol/Versionable.json +164 -0
  149. package/artifacts/contracts/test/TestFee.sol/TestFee.dbg.json +4 -0
  150. package/artifacts/contracts/test/TestFee.sol/TestFee.json +119 -0
  151. package/artifacts/contracts/test/TestPool.sol/TestPool.dbg.json +4 -0
  152. package/artifacts/contracts/test/TestPool.sol/TestPool.json +387 -0
  153. package/artifacts/contracts/test/TestProduct.sol/TestProduct.dbg.json +4 -0
  154. package/artifacts/contracts/test/TestProduct.sol/TestProduct.json +393 -0
  155. package/artifacts/contracts/test/TestRegisterable.sol/TestRegisterable.dbg.json +4 -0
  156. package/artifacts/contracts/test/TestRegisterable.sol/TestRegisterable.json +137 -0
  157. package/artifacts/contracts/test/TestRoleId.sol/TestRoleId.dbg.json +4 -0
  158. package/artifacts/contracts/test/TestRoleId.sol/TestRoleId.json +116 -0
  159. package/artifacts/contracts/test/TestService.sol/TestService.dbg.json +4 -0
  160. package/artifacts/contracts/test/TestService.sol/TestService.json +379 -0
  161. package/artifacts/contracts/test/TestToken.sol/TestUsdc.dbg.json +4 -0
  162. package/artifacts/contracts/test/TestToken.sol/TestUsdc.json +338 -0
  163. package/artifacts/contracts/test/TestVersion.sol/TestVersion.dbg.json +4 -0
  164. package/artifacts/contracts/test/TestVersion.sol/TestVersion.json +218 -0
  165. package/artifacts/contracts/test/TestVersionable.sol/TestVersionable.dbg.json +4 -0
  166. package/artifacts/contracts/test/TestVersionable.sol/TestVersionable.json +206 -0
  167. package/artifacts/contracts/test/Usdc.sol/USDC.dbg.json +4 -0
  168. package/artifacts/contracts/test/Usdc.sol/USDC.json +338 -0
  169. package/artifacts/contracts/types/AddressSet.sol/LibAddressSet.dbg.json +4 -0
  170. package/artifacts/contracts/types/AddressSet.sol/LibAddressSet.json +10 -0
  171. package/artifacts/contracts/types/Blocknumber.sol/BlocknumberLib.dbg.json +1 -1
  172. package/artifacts/contracts/types/Blocknumber.sol/BlocknumberLib.json +2 -2
  173. package/artifacts/contracts/types/ChainId.sol/ChainIdLib.dbg.json +1 -1
  174. package/artifacts/contracts/types/ChainId.sol/ChainIdLib.json +2 -2
  175. package/artifacts/contracts/types/Fee.sol/FeeLib.dbg.json +4 -0
  176. package/artifacts/contracts/types/Fee.sol/FeeLib.json +218 -0
  177. package/artifacts/contracts/types/Key32.sol/Key32Lib.dbg.json +4 -0
  178. package/artifacts/contracts/types/Key32.sol/Key32Lib.json +111 -0
  179. package/artifacts/contracts/types/NftId.sol/NftIdLib.dbg.json +1 -1
  180. package/artifacts/contracts/types/NftId.sol/NftIdLib.json +65 -4
  181. package/artifacts/contracts/types/NftIdSet.sol/LibNftIdSet.dbg.json +4 -0
  182. package/artifacts/contracts/types/NftIdSet.sol/LibNftIdSet.json +10 -0
  183. package/artifacts/contracts/types/ObjectType.sol/ObjectTypeLib.dbg.json +1 -1
  184. package/artifacts/contracts/types/ObjectType.sol/ObjectTypeLib.json +2 -2
  185. package/artifacts/contracts/types/RoleId.sol/RoleIdLib.dbg.json +4 -0
  186. package/artifacts/contracts/types/RoleId.sol/RoleIdLib.json +30 -0
  187. package/artifacts/contracts/types/StateId.sol/StateIdLib.dbg.json +1 -1
  188. package/artifacts/contracts/types/StateId.sol/StateIdLib.json +2 -2
  189. package/artifacts/contracts/types/Timestamp.sol/TimestampLib.dbg.json +1 -1
  190. package/artifacts/contracts/types/Timestamp.sol/TimestampLib.json +64 -2
  191. package/artifacts/contracts/types/UFixed.sol/UFixedMathLib.dbg.json +1 -1
  192. package/artifacts/contracts/types/UFixed.sol/UFixedMathLib.json +88 -62
  193. package/artifacts/contracts/types/Version.sol/VersionLib.dbg.json +4 -0
  194. package/artifacts/contracts/types/Version.sol/VersionLib.json +139 -0
  195. package/artifacts/contracts/types/Version.sol/VersionPartLib.dbg.json +4 -0
  196. package/artifacts/contracts/types/Version.sol/VersionPartLib.json +30 -0
  197. package/contracts/components/BaseComponent.sol +88 -0
  198. package/contracts/components/IBaseComponent.sol +19 -0
  199. package/contracts/components/IPoolComponent.sol +57 -0
  200. package/contracts/components/{IProduct.sol → IProductComponent.sol} +9 -6
  201. package/contracts/components/Pool.sol +140 -18
  202. package/contracts/components/Product.sol +53 -25
  203. package/contracts/instance/IInstance.sol +38 -11
  204. package/contracts/instance/IInstanceLinked.sol +8 -0
  205. package/contracts/instance/Instance.sol +44 -48
  206. package/contracts/instance/base/ComponentServiceBase.sol +42 -0
  207. package/contracts/instance/base/IInstanceBase.sol +14 -0
  208. package/contracts/instance/base/IKeyValueStore.sol +49 -0
  209. package/contracts/instance/{lifecycle → base}/ILifecycle.sol +4 -21
  210. package/contracts/instance/base/IService.sol +15 -0
  211. package/contracts/instance/base/InstanceBase.sol +80 -0
  212. package/contracts/instance/base/KeyValueStore.sol +156 -0
  213. package/contracts/instance/{lifecycle/LifecycleModule.sol → base/Lifecycle.sol} +36 -29
  214. package/contracts/instance/base/ModuleBase.sol +52 -0
  215. package/contracts/instance/base/ServiceBase.sol +37 -0
  216. package/contracts/instance/module/access/Access.sol +149 -0
  217. package/contracts/instance/module/access/IAccess.sol +53 -0
  218. package/contracts/instance/module/bundle/BundleModule.sol +136 -0
  219. package/contracts/instance/module/bundle/IBundle.sol +58 -0
  220. package/contracts/instance/module/compensation/CompensationModule.sol +8 -0
  221. package/contracts/instance/module/compensation/ICompensation.sol +10 -0
  222. package/contracts/instance/module/component/ComponentModule.sol +95 -0
  223. package/contracts/instance/module/component/IComponent.sol +53 -0
  224. package/contracts/instance/module/policy/IPolicy.sol +60 -0
  225. package/contracts/instance/module/policy/PolicyModule.sol +76 -0
  226. package/contracts/instance/module/pool/IPoolModule.sol +41 -0
  227. package/contracts/instance/module/pool/PoolModule.sol +87 -0
  228. package/contracts/instance/module/risk/IRisk.sol +10 -0
  229. package/contracts/instance/module/risk/RiskModule.sol +8 -0
  230. package/contracts/instance/{treasury → module/treasury}/ITreasury.sol +27 -15
  231. package/contracts/instance/module/treasury/TokenHandler.sol +48 -0
  232. package/contracts/instance/{treasury → module/treasury}/TreasuryModule.sol +43 -59
  233. package/contracts/instance/service/ComponentOwnerService.sol +170 -0
  234. package/contracts/instance/service/IComponentOwnerService.sol +22 -0
  235. package/contracts/instance/service/IPoolService.sol +30 -0
  236. package/contracts/instance/service/IProductService.sol +58 -0
  237. package/contracts/instance/service/PoolService.sol +123 -0
  238. package/contracts/instance/service/ProductService.sol +354 -0
  239. package/contracts/registry/ChainNft.sol +61 -37
  240. package/contracts/registry/IRegistry.sol +24 -34
  241. package/contracts/registry/IRegistryLinked.sol +8 -0
  242. package/contracts/registry/Registry.sol +284 -85
  243. package/contracts/shared/ERC165.sol +21 -0
  244. package/contracts/shared/IOwnable.sol +6 -0
  245. package/contracts/shared/IRegisterable.sol +24 -0
  246. package/contracts/shared/IVersionable.sol +52 -0
  247. package/contracts/shared/Registerable.sol +86 -0
  248. package/contracts/shared/Versionable.sol +89 -0
  249. package/contracts/test/TestFee.sol +25 -0
  250. package/contracts/test/TestPool.sol +22 -0
  251. package/contracts/test/TestProduct.sol +44 -0
  252. package/contracts/test/TestRegisterable.sol +19 -0
  253. package/contracts/test/TestRoleId.sol +14 -0
  254. package/contracts/test/TestService.sol +32 -0
  255. package/contracts/test/TestToken.sol +26 -0
  256. package/contracts/test/TestVersion.sol +44 -0
  257. package/contracts/test/TestVersionable.sol +17 -0
  258. package/contracts/test/Usdc.sol +26 -0
  259. package/contracts/types/AddressSet.sol +58 -0
  260. package/contracts/types/Fee.sol +39 -20
  261. package/contracts/types/Key32.sol +45 -0
  262. package/contracts/types/NftId.sol +22 -1
  263. package/contracts/types/NftIdSet.sol +60 -0
  264. package/contracts/types/ObjectType.sol +22 -14
  265. package/contracts/types/RoleId.sol +38 -0
  266. package/contracts/types/StateId.sol +13 -3
  267. package/contracts/types/Timestamp.sol +22 -1
  268. package/contracts/types/UFixed.sol +26 -23
  269. package/contracts/types/Version.sol +95 -0
  270. package/package.json +9 -3
  271. package/artifacts/contracts/components/Component.sol/Component.dbg.json +0 -4
  272. package/artifacts/contracts/components/Component.sol/InstanceLinked.dbg.json +0 -4
  273. package/artifacts/contracts/components/Component.sol/InstanceLinked.json +0 -35
  274. package/artifacts/contracts/components/IPool.sol/IPoolComponent.dbg.json +0 -4
  275. package/artifacts/contracts/components/IProduct.sol/IProductComponent.dbg.json +0 -4
  276. package/artifacts/contracts/components/IProduct.sol/IProductComponent.json +0 -74
  277. package/artifacts/contracts/instance/access/Access.sol/AccessModule.dbg.json +0 -4
  278. package/artifacts/contracts/instance/access/IAccess.sol/IAccess.dbg.json +0 -4
  279. package/artifacts/contracts/instance/access/IAccess.sol/IAccessCheckRole.dbg.json +0 -4
  280. package/artifacts/contracts/instance/access/IAccess.sol/IAccessCheckRole.json +0 -35
  281. package/artifacts/contracts/instance/access/IAccess.sol/IAccessComponentTypeRoles.dbg.json +0 -4
  282. package/artifacts/contracts/instance/access/IAccess.sol/IAccessComponentTypeRoles.json +0 -50
  283. package/artifacts/contracts/instance/access/IAccess.sol/IAccessModule.dbg.json +0 -4
  284. package/artifacts/contracts/instance/component/ComponentModule.sol/ComponentModule.dbg.json +0 -4
  285. package/artifacts/contracts/instance/component/ComponentModule.sol/ComponentOwnerService.dbg.json +0 -4
  286. package/artifacts/contracts/instance/component/ComponentModule.sol/ComponentOwnerService.json +0 -202
  287. package/artifacts/contracts/instance/component/IComponent.sol/IComponent.dbg.json +0 -4
  288. package/artifacts/contracts/instance/component/IComponent.sol/IComponentContract.dbg.json +0 -4
  289. package/artifacts/contracts/instance/component/IComponent.sol/IComponentModule.dbg.json +0 -4
  290. package/artifacts/contracts/instance/component/IComponent.sol/IComponentOwnerService.dbg.json +0 -4
  291. package/artifacts/contracts/instance/component/IComponent.sol/IComponentOwnerService.json +0 -141
  292. package/artifacts/contracts/instance/component/IComponent.sol/IInstanceLinked.dbg.json +0 -4
  293. package/artifacts/contracts/instance/lifecycle/ILifecycle.sol/ILifecycle.dbg.json +0 -4
  294. package/artifacts/contracts/instance/lifecycle/ILifecycle.sol/ILifecycle.json +0 -134
  295. package/artifacts/contracts/instance/lifecycle/ILifecycle.sol/ILifecycleModule.dbg.json +0 -4
  296. package/artifacts/contracts/instance/lifecycle/LifecycleModule.sol/LifecycleModule.dbg.json +0 -4
  297. package/artifacts/contracts/instance/lifecycle/LifecycleModule.sol/LifecycleModule.json +0 -221
  298. package/artifacts/contracts/instance/policy/IPolicy.sol/IPolicy.dbg.json +0 -4
  299. package/artifacts/contracts/instance/policy/IPolicy.sol/IPolicyModule.dbg.json +0 -4
  300. package/artifacts/contracts/instance/policy/PolicyModule.sol/PolicyModule.dbg.json +0 -4
  301. package/artifacts/contracts/instance/pool/IPoolModule.sol/IPool.dbg.json +0 -4
  302. package/artifacts/contracts/instance/pool/IPoolModule.sol/IPoolModule.dbg.json +0 -4
  303. package/artifacts/contracts/instance/pool/PoolModule.sol/PoolModule.dbg.json +0 -4
  304. package/artifacts/contracts/instance/product/IProductService.sol/IProductModule.dbg.json +0 -4
  305. package/artifacts/contracts/instance/product/IProductService.sol/IProductModule.json +0 -75
  306. package/artifacts/contracts/instance/product/IProductService.sol/IProductService.dbg.json +0 -4
  307. package/artifacts/contracts/instance/product/IProductService.sol/IProductService.json +0 -127
  308. package/artifacts/contracts/instance/product/ProductService.sol/ProductModule.dbg.json +0 -4
  309. package/artifacts/contracts/instance/product/ProductService.sol/ProductService.dbg.json +0 -4
  310. package/artifacts/contracts/instance/product/ProductService.sol/ProductService.json +0 -196
  311. package/artifacts/contracts/instance/treasury/ITreasury.sol/ITreasury.dbg.json +0 -4
  312. package/artifacts/contracts/instance/treasury/ITreasury.sol/ITreasuryModule.dbg.json +0 -4
  313. package/artifacts/contracts/instance/treasury/TokenHandler.sol/TokenHandler.dbg.json +0 -4
  314. package/artifacts/contracts/instance/treasury/TokenHandler.sol/TokenHandler.json +0 -45
  315. package/artifacts/contracts/instance/treasury/TreasuryModule.sol/TreasuryModule.dbg.json +0 -4
  316. package/artifacts/contracts/registry/IRegistry.sol/IOwnable.dbg.json +0 -4
  317. package/artifacts/contracts/registry/IRegistry.sol/IRegisterable.dbg.json +0 -4
  318. package/artifacts/contracts/registry/IRegistry.sol/IRegistryLinked.dbg.json +0 -4
  319. package/artifacts/contracts/registry/IRegistry.sol/IRegistryLinked.json +0 -49
  320. package/artifacts/contracts/registry/Registry.sol/Registerable.dbg.json +0 -4
  321. package/artifacts/contracts/registry/Registry.sol/RegistryLinked.dbg.json +0 -4
  322. package/artifacts/contracts/registry/Registry.sol/RegistryLinked.json +0 -60
  323. package/contracts/components/Component.sol +0 -77
  324. package/contracts/components/IPool.sol +0 -15
  325. package/contracts/instance/access/Access.sol +0 -165
  326. package/contracts/instance/access/IAccess.sol +0 -63
  327. package/contracts/instance/component/ComponentModule.sol +0 -274
  328. package/contracts/instance/component/IComponent.sol +0 -74
  329. package/contracts/instance/policy/IPolicy.sol +0 -50
  330. package/contracts/instance/policy/PolicyModule.sol +0 -114
  331. package/contracts/instance/pool/IPoolModule.sol +0 -23
  332. package/contracts/instance/pool/PoolModule.sol +0 -81
  333. package/contracts/instance/product/IProductService.sol +0 -36
  334. package/contracts/instance/product/ProductService.sol +0 -136
  335. package/contracts/instance/treasury/TokenHandler.sol +0 -24
@@ -1,32 +1,51 @@
1
1
  // SPDX-License-Identifier: Apache-2.0
2
2
  pragma solidity ^0.8.19;
3
3
 
4
- import {UFixed} from "./UFixed.sol";
4
+ import {UFixed, UFixedMathLib} from "./UFixed.sol";
5
5
 
6
6
  struct Fee {
7
7
  UFixed fractionalFee;
8
8
  uint256 fixedFee;
9
9
  }
10
10
 
11
- // general pure free functions
12
- /// @dev Converts the uint256 to a NftId.
13
- function toFee(
14
- UFixed fractionalFee,
15
- uint256 fixedFee
16
- ) pure returns (Fee memory fee) {
17
- return Fee(fractionalFee, fixedFee);
18
- }
11
+ library FeeLib {
19
12
 
20
- /// @dev Return the NftId zero (0)
21
- function zeroFee() pure returns (Fee memory fee) {
22
- return Fee(UFixed.wrap(0), 0);
23
- }
13
+ function calculateFee(
14
+ uint256 amount,
15
+ Fee memory fee
16
+ )
17
+ public
18
+ pure
19
+ returns (
20
+ uint256 feeAmount,
21
+ uint256 netAmount
22
+ )
23
+ {
24
+ UFixed fractionalAmount = UFixedMathLib.toUFixed(amount) *
25
+ fee.fractionalFee;
26
+ feeAmount = fractionalAmount.toInt() + fee.fixedFee;
27
+ netAmount = amount - feeAmount;
28
+ }
24
29
 
25
- // pure free functions for operators
26
- function feeIsSame(Fee memory a, Fee memory b) pure returns (bool isSame) {
27
- return a.fixedFee == b.fixedFee && a.fractionalFee == b.fractionalFee;
28
- }
30
+ /// @dev Converts the uint256 to a fee struct.
31
+ function toFee(
32
+ UFixed fractionalFee,
33
+ uint256 fixedFee
34
+ ) public pure returns (Fee memory fee) {
35
+ return Fee(fractionalFee, fixedFee);
36
+ }
29
37
 
30
- function feeIsZero(Fee memory fee) pure returns (bool) {
31
- return fee.fixedFee == 0 && UFixed.unwrap(fee.fractionalFee) == 0;
32
- }
38
+ /// @dev Return the zero fee struct (0, 0)
39
+ function zeroFee() public pure returns (Fee memory fee) {
40
+ return Fee(UFixed.wrap(0), 0);
41
+ }
42
+
43
+ // pure free functions for operators
44
+ function feeIsSame(Fee memory a, Fee memory b) public pure returns (bool isSame) {
45
+ return a.fixedFee == b.fixedFee && a.fractionalFee == b.fractionalFee;
46
+ }
47
+
48
+ function feeIsZero(Fee memory fee) public pure returns (bool) {
49
+ return fee.fixedFee == 0 && UFixed.unwrap(fee.fractionalFee) == 0;
50
+ }
51
+ }
@@ -0,0 +1,45 @@
1
+ // SPDX-License-Identifier: Apache-2.0
2
+ pragma solidity ^0.8.19;
3
+
4
+ import {ObjectType} from "./ObjectType.sol";
5
+
6
+ type Key32 is bytes32;
7
+ type KeyId is bytes31;
8
+
9
+ // type bindings
10
+ using {
11
+ eqKey32 as ==,
12
+ neKey32 as !=,
13
+ Key32Lib.toKey
14
+ } for Key32 global;
15
+
16
+ // @dev Returns true iff keys are identical
17
+ function eqKey32(Key32 a, Key32 b) pure returns (bool isSame) {
18
+ return Key32.unwrap(a) == Key32.unwrap(b);
19
+ }
20
+
21
+ // @dev Returns true iff keys are different
22
+ function neKey32(Key32 a, Key32 b) pure returns (bool isDifferent) {
23
+ return Key32.unwrap(a) != Key32.unwrap(b);
24
+ }
25
+
26
+ library Key32Lib {
27
+
28
+ uint8 public constant TYPE_SHIFT = 31 * 8;
29
+ uint8 public constant ID_SHIFT = uint8(32 * 8 - TYPE_SHIFT);
30
+ bytes32 public constant TYPE_MASK = bytes32(bytes1(type(uint8).max)); // first byte in bytes32
31
+ bytes32 public constant ID_MASK = bytes32(~TYPE_MASK); // remaining bytes in bytes32
32
+
33
+ function toKey32(ObjectType objectType, KeyId id) public pure returns (Key32) {
34
+ uint256 uintObjectType = ObjectType.unwrap(objectType);
35
+ uint256 uintId = uint248(KeyId.unwrap(id));
36
+ uint256 uintKey = (uintObjectType << TYPE_SHIFT) + uintId;
37
+ return Key32.wrap(bytes32(uintKey));
38
+ }
39
+
40
+ function toKey(Key32 key) public pure returns (ObjectType objectType, KeyId id) {
41
+ bytes32 key32 = Key32.unwrap(key);
42
+ objectType = ObjectType.wrap(uint8(uint256(key32 & TYPE_MASK) >> TYPE_SHIFT));
43
+ id = KeyId.wrap(bytes31((key32 & ID_MASK) << ID_SHIFT));
44
+ }
45
+ }
@@ -1,11 +1,22 @@
1
1
  // SPDX-License-Identifier: Apache-2.0
2
2
  pragma solidity ^0.8.19;
3
3
 
4
+ import {Key32, KeyId, Key32Lib} from "./Key32.sol";
5
+ import {ObjectType} from "./ObjectType.sol";
6
+
4
7
  // uint96 allows for chain ids up to 13 digits
5
8
  type NftId is uint96;
6
9
 
7
10
  // type bindings
8
- using {eqNftId as ==, neNftId as !=, NftIdLib.toInt} for NftId global;
11
+ using {
12
+ eqNftId as ==,
13
+ neNftId as !=,
14
+ NftIdLib.toInt,
15
+ NftIdLib.gtz,
16
+ NftIdLib.eqz,
17
+ NftIdLib.toKeyId,
18
+ NftIdLib.toKey32
19
+ } for NftId global;
9
20
 
10
21
  // general pure free functions
11
22
  /// @dev Converts the uint256 to a NftId.
@@ -48,4 +59,14 @@ library NftIdLib {
48
59
  function eq(NftId a, NftId b) public pure returns (bool isSame) {
49
60
  return eqNftId(a, b);
50
61
  }
62
+
63
+ /// @dev Returns the key32 value for the specified nft id and object type.
64
+ function toKey32(NftId id, ObjectType objectType) public pure returns (Key32 key) {
65
+ return Key32Lib.toKey32(objectType, toKeyId(id));
66
+ }
67
+
68
+ /// @dev Returns the key id value for the specified nft id
69
+ function toKeyId(NftId id) public pure returns (KeyId keyId) {
70
+ return KeyId.wrap(bytes31(uint248(NftId.unwrap(id))));
71
+ }
51
72
  }
@@ -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,40 @@ 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 PRODUCT() pure returns (ObjectType) {
41
+ return toObjectType(100);
42
+ }
43
+
44
+ function DISTRIBUTOR() pure returns (ObjectType) {
45
+ return toObjectType(110);
46
+ }
47
+
40
48
  function ORACLE() pure returns (ObjectType) {
41
- return toObjectType(70);
49
+ return toObjectType(120);
42
50
  }
43
51
 
44
52
  function POOL() pure returns (ObjectType) {
45
- return toObjectType(80);
53
+ return toObjectType(130);
46
54
  }
47
55
 
48
- function BUNDLE() pure returns (ObjectType) {
49
- return toObjectType(81);
56
+ function POLICY() pure returns (ObjectType) {
57
+ return toObjectType(200);
50
58
  }
51
59
 
52
- function POLICY() pure returns (ObjectType) {
53
- return toObjectType(90);
60
+ function BUNDLE() pure returns (ObjectType) {
61
+ return toObjectType(210);
54
62
  }
55
63
 
56
64
  function CLAIM() pure returns (ObjectType) {
57
- return toObjectType(91);
65
+ return toObjectType(201);
58
66
  }
59
67
 
60
68
  function PAYOUT() pure returns (ObjectType) {
61
- return toObjectType(92);
69
+ return toObjectType(202);
62
70
  }
63
71
 
64
72
  /// @dev Converts the uint8 to a ObjectType.
@@ -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,49 +77,51 @@ function deltaUFixed(UFixed a, UFixed b) pure returns (UFixed) {
76
77
  }
77
78
 
78
79
  library UFixedMathLib {
79
- enum Rounding {
80
- /// @dev Round down - floor(value)
81
- Down,
82
- /// @dev Round up - ceil(value)
83
- Up,
84
- /// @dev Round half up - round(value)
85
- HalfUp
86
- }
87
-
88
80
  int8 public constant EXP = 18;
89
81
  uint256 public constant MULTIPLIER = 10 ** uint256(int256(EXP));
90
82
  uint256 public constant MULTIPLIER_HALF = MULTIPLIER / 2;
91
83
 
92
- /// @dev Default rounding mode used by ftoi is HalfUp
93
- Rounding public constant ROUNDING_DEFAULT = Rounding.HalfUp;
84
+ /// @dev returns the rounding mode DOWN - 0.4 becomes 0, 0.5 becomes 0, 0.6 becomes 0
85
+ function ROUNDING_DOWN() public pure returns (uint8) {
86
+ return uint8(0);
87
+ }
94
88
 
95
- /// @dev returns the decimals precision of the UFixed type
96
- function decimals() public pure returns (uint256) {
97
- return uint8(EXP);
89
+ /// @dev returns the rounding mode UP - 0.4 becomes 1, 0.5 becomes 1, 0.6 becomes 1
90
+ function ROUNDING_UP() public pure returns (uint8) {
91
+ return uint8(1);
92
+ }
93
+
94
+ /// @dev returns the rounding mode HALF_UP - 0.4 becomes 0, 0.5 becomes 1, 0.6 becomes 1
95
+ function ROUNDING_HALF_UP() public pure returns (uint8) {
96
+ return uint8(2);
98
97
  }
99
98
 
100
99
  /// @dev Converts the uint256 to a UFixed.
101
- function itof(uint256 a) public pure returns (UFixed) {
100
+ function toUFixed(uint256 a) public pure returns (UFixed) {
102
101
  return UFixed.wrap(a * MULTIPLIER);
103
102
  }
104
103
 
105
- // TODO rename to toUFixed
106
104
  /// @dev Converts the uint256 to a UFixed with given exponent.
107
- function itof(uint256 a, int8 exp) public pure returns (UFixed) {
105
+ function toUFixed(uint256 a, int8 exp) public pure returns (UFixed) {
108
106
  require(EXP + exp >= 0, "ERROR:FM-010:EXPONENT_TOO_SMALL");
109
107
  require(EXP + exp <= 64, "ERROR:FM-011:EXPONENT_TOO_LARGE");
110
108
 
111
109
  return UFixed.wrap(a * 10 ** uint8(EXP + exp));
112
110
  }
113
111
 
112
+ /// @dev returns the decimals precision of the UFixed type
113
+ function decimals() public pure returns (uint256) {
114
+ return uint8(EXP);
115
+ }
116
+
114
117
  /// @dev Converts a UFixed to a uint256.
115
- function ftoi(UFixed a) public pure returns (uint256) {
116
- return ftoi(a, ROUNDING_DEFAULT);
118
+ function toInt(UFixed a) public pure returns (uint256) {
119
+ return toIntWithRounding(a, ROUNDING_HALF_UP());
117
120
  }
118
121
 
119
122
  /// @dev Converts a UFixed to a uint256 with given rounding mode.
120
- function ftoi(UFixed a, Rounding rounding) public pure returns (uint256) {
121
- if (rounding == Rounding.HalfUp) {
123
+ function toIntWithRounding(UFixed a, uint8 rounding) public pure returns (uint256) {
124
+ if (rounding == ROUNDING_HALF_UP()) {
122
125
  return
123
126
  Math.mulDiv(
124
127
  UFixed.unwrap(a) + MULTIPLIER_HALF,
@@ -126,7 +129,7 @@ library UFixedMathLib {
126
129
  MULTIPLIER,
127
130
  Math.Rounding.Down
128
131
  );
129
- } else if (rounding == Rounding.Down) {
132
+ } else if (rounding == ROUNDING_DOWN()) {
130
133
  return
131
134
  Math.mulDiv(
132
135
  UFixed.unwrap(a),
@@ -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-f99f1d2-109",
3
+ "version": "0.0.2-f9bc4c7-556",
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,14 +32,19 @@
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",
41
46
  "@openzeppelin/contracts-upgradeable": "^4.9.3",
47
+ "abi-coder": "^5.0.0",
42
48
  "ethers": "^6.7.1",
43
49
  "winston": "^3.10.0"
44
50
  }
@@ -1,4 +0,0 @@
1
- {
2
- "_format": "hh-sol-dbg-1",
3
- "buildInfo": "../../../build-info/ddbd31d07c8880f0f0a18b3f2b9bcc56.json"
4
- }
@@ -1,4 +0,0 @@
1
- {
2
- "_format": "hh-sol-dbg-1",
3
- "buildInfo": "../../../build-info/ddbd31d07c8880f0f0a18b3f2b9bcc56.json"
4
- }