@etherisc/gif-next 0.0.2-d911522 → 0.0.2-dc7e4cb-141

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (332) hide show
  1. package/README.md +125 -0
  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} +48 -53
  4. package/artifacts/contracts/components/IBaseComponent.sol/IBaseComponent.dbg.json +4 -0
  5. package/artifacts/contracts/components/{IPool.sol/IPoolComponent.json → IBaseComponent.sol/IBaseComponent.json} +48 -53
  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/{IProduct.sol → IProductComponent.sol}/IProductComponent.json +139 -52
  10. package/artifacts/contracts/components/Pool.sol/Pool.dbg.json +1 -1
  11. package/artifacts/contracts/components/Pool.sol/Pool.json +218 -44
  12. package/artifacts/contracts/components/Product.sol/Product.dbg.json +1 -1
  13. package/artifacts/contracts/components/Product.sol/Product.json +144 -70
  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 +4 -0
  29. package/artifacts/contracts/experiment/statemachine/Dummy.sol/LifeCycleModule.json +59 -0
  30. package/artifacts/contracts/experiment/statemachine/ISM.sol/ISM.dbg.json +4 -0
  31. package/artifacts/contracts/experiment/statemachine/ISM.sol/ISM.json +124 -0
  32. package/artifacts/contracts/experiment/statemachine/ISM.sol/ISMEE.dbg.json +4 -0
  33. package/artifacts/contracts/experiment/statemachine/ISM.sol/ISMEE.json +74 -0
  34. package/artifacts/contracts/experiment/statemachine/SM.sol/SM.dbg.json +4 -0
  35. package/artifacts/contracts/experiment/statemachine/SM.sol/SM.json +124 -0
  36. package/artifacts/contracts/experiment/statemachine/SimpleStateMachine.sol/SimpleStateMachine.dbg.json +4 -0
  37. package/artifacts/contracts/experiment/statemachine/SimpleStateMachine.sol/SimpleStateMachine.json +207 -0
  38. package/artifacts/contracts/experiment/types/TypeA.sol/TypeALib.dbg.json +1 -1
  39. package/artifacts/contracts/experiment/types/TypeA.sol/TypeALib.json +2 -2
  40. package/artifacts/contracts/experiment/types/TypeB.sol/TypeBLib.dbg.json +1 -1
  41. package/artifacts/contracts/experiment/types/TypeB.sol/TypeBLib.json +2 -2
  42. package/artifacts/contracts/instance/IInstance.sol/IInstance.dbg.json +1 -1
  43. package/artifacts/contracts/instance/IInstance.sol/IInstance.json +1414 -289
  44. package/artifacts/contracts/instance/IInstanceLinked.sol/IInstanceLinked.dbg.json +4 -0
  45. package/artifacts/contracts/instance/{component/IComponent.sol → IInstanceLinked.sol}/IInstanceLinked.json +1 -1
  46. package/artifacts/contracts/instance/IServiceLinked.sol/IServiceLinked.dbg.json +4 -0
  47. package/artifacts/contracts/instance/{access/IAccess.sol/IAccessComponentTypeRoles.json → IServiceLinked.sol/IServiceLinked.json} +14 -14
  48. package/artifacts/contracts/instance/Instance.sol/Instance.dbg.json +1 -1
  49. package/artifacts/contracts/instance/Instance.sol/Instance.json +1554 -348
  50. package/artifacts/contracts/instance/InstanceBase.sol/InstanceBase.dbg.json +4 -0
  51. package/artifacts/contracts/instance/{component/ComponentModule.sol/ComponentModule.json → InstanceBase.sol/InstanceBase.json} +128 -142
  52. package/artifacts/contracts/instance/module/access/Access.sol/AccessModule.dbg.json +4 -0
  53. package/artifacts/contracts/instance/{access → module/access}/Access.sol/AccessModule.json +85 -152
  54. package/artifacts/contracts/instance/module/access/IAccess.sol/IAccess.dbg.json +4 -0
  55. package/artifacts/contracts/instance/{access → module/access}/IAccess.sol/IAccess.json +1 -1
  56. package/artifacts/contracts/instance/module/access/IAccess.sol/IAccessModule.dbg.json +4 -0
  57. package/artifacts/contracts/instance/{access → module/access}/IAccess.sol/IAccessModule.json +96 -99
  58. package/artifacts/contracts/instance/module/bundle/BundleModule.sol/BundleModule.dbg.json +4 -0
  59. package/artifacts/contracts/instance/module/bundle/BundleModule.sol/BundleModule.json +276 -0
  60. package/artifacts/contracts/instance/module/bundle/IBundle.sol/IBundle.dbg.json +4 -0
  61. package/artifacts/contracts/instance/module/bundle/IBundle.sol/IBundle.json +10 -0
  62. package/artifacts/contracts/instance/module/bundle/IBundle.sol/IBundleModule.dbg.json +4 -0
  63. package/artifacts/contracts/instance/module/bundle/IBundle.sol/IBundleModule.json +276 -0
  64. package/artifacts/contracts/instance/module/compensation/CompensationModule.sol/CompensationModule.dbg.json +4 -0
  65. package/artifacts/contracts/instance/module/compensation/CompensationModule.sol/CompensationModule.json +10 -0
  66. package/artifacts/contracts/instance/module/compensation/ICompensation.sol/ICompensation.dbg.json +4 -0
  67. package/artifacts/contracts/instance/module/compensation/ICompensation.sol/ICompensation.json +10 -0
  68. package/artifacts/contracts/instance/module/compensation/ICompensation.sol/ICompensationModule.dbg.json +4 -0
  69. package/artifacts/contracts/instance/module/compensation/ICompensation.sol/ICompensationModule.json +10 -0
  70. package/artifacts/contracts/instance/module/component/ComponentModule.sol/ComponentModule.dbg.json +4 -0
  71. package/artifacts/contracts/instance/module/component/ComponentModule.sol/ComponentModule.json +188 -0
  72. package/artifacts/contracts/instance/module/component/IComponent.sol/IComponent.dbg.json +4 -0
  73. package/artifacts/contracts/instance/{component → module/component}/IComponent.sol/IComponent.json +1 -1
  74. package/artifacts/contracts/instance/module/component/IComponent.sol/IComponentModule.dbg.json +4 -0
  75. package/artifacts/contracts/instance/{component → module/component}/IComponent.sol/IComponentModule.json +40 -97
  76. package/artifacts/contracts/instance/module/lifecycle/ILifecycle.sol/ILifecycle.dbg.json +4 -0
  77. package/artifacts/contracts/instance/module/lifecycle/ILifecycle.sol/ILifecycle.json +134 -0
  78. package/artifacts/contracts/instance/module/lifecycle/ILifecycle.sol/ILifecycleModule.dbg.json +4 -0
  79. package/artifacts/contracts/instance/module/lifecycle/ILifecycle.sol/ILifecycleModule.json +182 -0
  80. package/artifacts/contracts/instance/module/lifecycle/LifecycleModule.sol/LifecycleModule.dbg.json +4 -0
  81. package/artifacts/contracts/instance/module/lifecycle/LifecycleModule.sol/LifecycleModule.json +221 -0
  82. package/artifacts/contracts/instance/module/policy/IPolicy.sol/IPolicy.dbg.json +4 -0
  83. package/artifacts/contracts/instance/{policy → module/policy}/IPolicy.sol/IPolicy.json +1 -1
  84. package/artifacts/contracts/instance/module/policy/IPolicy.sol/IPolicyModule.dbg.json +4 -0
  85. package/artifacts/contracts/instance/{policy → module/policy}/IPolicy.sol/IPolicyModule.json +142 -112
  86. package/artifacts/contracts/instance/module/policy/PolicyModule.sol/PolicyModule.dbg.json +4 -0
  87. package/artifacts/contracts/instance/{policy → module/policy}/PolicyModule.sol/PolicyModule.json +142 -112
  88. package/artifacts/contracts/instance/module/pool/IPoolModule.sol/IPool.dbg.json +4 -0
  89. package/artifacts/contracts/instance/{pool → module/pool}/IPoolModule.sol/IPool.json +1 -1
  90. package/artifacts/contracts/instance/module/pool/IPoolModule.sol/IPoolModule.dbg.json +4 -0
  91. package/artifacts/contracts/instance/{pool → module/pool}/IPoolModule.sol/IPoolModule.json +57 -57
  92. package/artifacts/contracts/instance/module/pool/PoolModule.sol/PoolModule.dbg.json +4 -0
  93. package/artifacts/contracts/instance/{pool → module/pool}/PoolModule.sol/PoolModule.json +50 -63
  94. package/artifacts/contracts/instance/module/risk/IRisk.sol/IRisk.dbg.json +4 -0
  95. package/artifacts/contracts/instance/module/risk/IRisk.sol/IRisk.json +10 -0
  96. package/artifacts/contracts/instance/module/risk/IRisk.sol/IRiskModule.dbg.json +4 -0
  97. package/artifacts/contracts/instance/module/risk/IRisk.sol/IRiskModule.json +10 -0
  98. package/artifacts/contracts/instance/module/risk/RiskModule.sol/RiskModule.dbg.json +4 -0
  99. package/artifacts/contracts/instance/module/risk/RiskModule.sol/RiskModule.json +10 -0
  100. package/artifacts/contracts/instance/module/treasury/ITreasury.sol/ITreasury.dbg.json +4 -0
  101. package/artifacts/contracts/instance/module/treasury/ITreasury.sol/ITreasury.json +10 -0
  102. package/artifacts/contracts/instance/module/treasury/ITreasury.sol/ITreasuryModule.dbg.json +4 -0
  103. package/artifacts/contracts/instance/module/treasury/ITreasury.sol/ITreasuryModule.json +533 -0
  104. package/artifacts/contracts/instance/module/treasury/TokenHandler.sol/TokenHandler.dbg.json +4 -0
  105. package/artifacts/contracts/instance/module/treasury/TokenHandler.sol/TokenHandler.json +76 -0
  106. package/artifacts/contracts/instance/module/treasury/TreasuryModule.sol/TreasuryModule.dbg.json +4 -0
  107. package/artifacts/contracts/instance/module/treasury/TreasuryModule.sol/TreasuryModule.json +533 -0
  108. package/artifacts/contracts/instance/service/ComponentOwnerService.sol/ComponentOwnerService.dbg.json +4 -0
  109. package/artifacts/contracts/instance/service/ComponentOwnerService.sol/ComponentOwnerService.json +491 -0
  110. package/artifacts/contracts/instance/service/ComponentServiceBase.sol/ComponentServiceBase.dbg.json +4 -0
  111. package/artifacts/contracts/instance/service/ComponentServiceBase.sol/ComponentServiceBase.json +300 -0
  112. package/artifacts/contracts/instance/service/IComponentOwnerService.sol/IComponentOwnerService.dbg.json +4 -0
  113. package/artifacts/contracts/instance/service/IComponentOwnerService.sol/IComponentOwnerService.json +364 -0
  114. package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.dbg.json +4 -0
  115. package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.json +376 -0
  116. package/artifacts/contracts/instance/service/IProductService.sol/IProductService.dbg.json +4 -0
  117. package/artifacts/contracts/instance/service/IProductService.sol/IProductService.json +477 -0
  118. package/artifacts/contracts/instance/service/IService.sol/IService.dbg.json +4 -0
  119. package/artifacts/contracts/instance/{component/IComponent.sol/IComponentContract.json → service/IService.sol/IService.json} +148 -27
  120. package/artifacts/contracts/instance/service/PoolService.sol/PoolService.dbg.json +4 -0
  121. package/artifacts/contracts/instance/service/PoolService.sol/PoolService.json +471 -0
  122. package/artifacts/contracts/instance/service/ProductService.sol/ProductService.dbg.json +4 -0
  123. package/artifacts/contracts/instance/service/ProductService.sol/ProductService.json +673 -0
  124. package/artifacts/contracts/instance/service/ServiceBase.sol/ServiceBase.dbg.json +4 -0
  125. package/artifacts/contracts/instance/service/ServiceBase.sol/ServiceBase.json +300 -0
  126. package/artifacts/contracts/registry/ChainNft.sol/ChainNft.dbg.json +1 -1
  127. package/artifacts/contracts/registry/ChainNft.sol/ChainNft.json +65 -2
  128. package/artifacts/contracts/registry/IChainNft.sol/IChainNft.dbg.json +1 -1
  129. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.dbg.json +1 -1
  130. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.json +103 -77
  131. package/artifacts/contracts/registry/IRegistryLinked.sol/IRegistryLinked.dbg.json +4 -0
  132. package/artifacts/contracts/registry/IRegistryLinked.sol/IRegistryLinked.json +24 -0
  133. package/artifacts/contracts/registry/Registry.sol/Registry.dbg.json +1 -1
  134. package/artifacts/contracts/registry/Registry.sol/Registry.json +194 -69
  135. package/artifacts/contracts/shared/ERC165.sol/ERC165.dbg.json +4 -0
  136. package/artifacts/contracts/shared/ERC165.sol/ERC165.json +35 -0
  137. package/artifacts/contracts/shared/IOwnable.sol/IOwnable.dbg.json +4 -0
  138. package/artifacts/contracts/{registry/IRegistry.sol → shared/IOwnable.sol}/IOwnable.json +1 -1
  139. package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.dbg.json +4 -0
  140. package/artifacts/contracts/{registry/IRegistry.sol → shared/IRegisterable.sol}/IRegisterable.json +18 -63
  141. package/artifacts/contracts/shared/IVersionable.sol/IVersionable.dbg.json +4 -0
  142. package/artifacts/contracts/shared/IVersionable.sol/IVersionable.json +164 -0
  143. package/artifacts/contracts/shared/Registerable.sol/Registerable.dbg.json +4 -0
  144. package/artifacts/contracts/{registry/Registry.sol → shared/Registerable.sol}/Registerable.json +18 -63
  145. package/artifacts/contracts/shared/Versionable.sol/Versionable.dbg.json +4 -0
  146. package/artifacts/contracts/shared/Versionable.sol/Versionable.json +164 -0
  147. package/artifacts/contracts/test/TestFee.sol/TestFee.dbg.json +4 -0
  148. package/artifacts/contracts/test/TestFee.sol/TestFee.json +119 -0
  149. package/artifacts/contracts/test/TestPool.sol/TestPool.dbg.json +4 -0
  150. package/artifacts/contracts/test/TestPool.sol/TestPool.json +387 -0
  151. package/artifacts/contracts/test/TestProduct.sol/TestProduct.dbg.json +4 -0
  152. package/artifacts/contracts/test/TestProduct.sol/TestProduct.json +393 -0
  153. package/artifacts/contracts/test/TestRegisterable.sol/TestRegisterable.dbg.json +4 -0
  154. package/artifacts/contracts/test/TestRegisterable.sol/TestRegisterable.json +137 -0
  155. package/artifacts/contracts/test/TestRoleId.sol/TestRoleId.dbg.json +4 -0
  156. package/artifacts/contracts/test/TestRoleId.sol/TestRoleId.json +82 -0
  157. package/artifacts/contracts/test/TestService.sol/TestService.dbg.json +4 -0
  158. package/artifacts/contracts/test/TestService.sol/TestService.json +379 -0
  159. package/artifacts/contracts/test/TestToken.sol/TestUsdc.dbg.json +4 -0
  160. package/artifacts/contracts/test/TestToken.sol/TestUsdc.json +338 -0
  161. package/artifacts/contracts/test/TestVersion.sol/TestVersion.dbg.json +4 -0
  162. package/artifacts/contracts/test/TestVersion.sol/TestVersion.json +218 -0
  163. package/artifacts/contracts/test/TestVersionable.sol/TestVersionable.dbg.json +4 -0
  164. package/artifacts/contracts/test/TestVersionable.sol/TestVersionable.json +206 -0
  165. package/artifacts/contracts/test/Usdc.sol/USDC.dbg.json +4 -0
  166. package/artifacts/contracts/test/Usdc.sol/USDC.json +338 -0
  167. package/artifacts/contracts/types/AddressSet.sol/LibAddressSet.dbg.json +4 -0
  168. package/artifacts/contracts/types/AddressSet.sol/LibAddressSet.json +10 -0
  169. package/artifacts/contracts/types/Blocknumber.sol/BlocknumberLib.dbg.json +1 -1
  170. package/artifacts/contracts/types/Blocknumber.sol/BlocknumberLib.json +2 -2
  171. package/artifacts/contracts/types/ChainId.sol/ChainIdLib.dbg.json +1 -1
  172. package/artifacts/contracts/types/ChainId.sol/ChainIdLib.json +2 -2
  173. package/artifacts/contracts/types/Fee.sol/FeeLib.dbg.json +4 -0
  174. package/artifacts/contracts/types/Fee.sol/FeeLib.json +218 -0
  175. package/artifacts/contracts/types/NftId.sol/NftIdLib.dbg.json +1 -1
  176. package/artifacts/contracts/types/NftId.sol/NftIdLib.json +2 -2
  177. package/artifacts/contracts/types/NftIdSet.sol/LibNftIdSet.dbg.json +4 -0
  178. package/artifacts/contracts/types/NftIdSet.sol/LibNftIdSet.json +10 -0
  179. package/artifacts/contracts/types/ObjectType.sol/ObjectTypeLib.dbg.json +4 -0
  180. package/artifacts/contracts/types/ObjectType.sol/ObjectTypeLib.json +92 -0
  181. package/artifacts/contracts/types/StateId.sol/StateIdLib.dbg.json +4 -0
  182. package/artifacts/contracts/types/StateId.sol/StateIdLib.json +92 -0
  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 +98 -59
  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 +89 -0
  192. package/contracts/components/IBaseComponent.sol +19 -0
  193. package/contracts/components/IPoolComponent.sol +57 -0
  194. package/contracts/components/IProductComponent.sol +19 -0
  195. package/contracts/components/Pool.sol +161 -16
  196. package/contracts/components/Product.sol +77 -26
  197. package/contracts/experiment/errors/Require.sol +10 -5
  198. package/contracts/experiment/errors/Revert.sol +13 -8
  199. package/contracts/experiment/inheritance/A.sol +8 -11
  200. package/contracts/experiment/inheritance/B.sol +10 -5
  201. package/contracts/experiment/inheritance/C.sol +11 -5
  202. package/contracts/experiment/inheritance/IA.sol +2 -7
  203. package/contracts/experiment/inheritance/IB.sol +3 -2
  204. package/contracts/experiment/inheritance/IC.sol +4 -3
  205. package/contracts/experiment/statemachine/Dummy.sol +27 -0
  206. package/contracts/experiment/statemachine/ISM.sol +25 -0
  207. package/contracts/experiment/statemachine/README.md +112 -0
  208. package/contracts/experiment/statemachine/SM.sol +57 -0
  209. package/contracts/experiment/statemachine/SimpleStateMachine.sol +31 -0
  210. package/contracts/experiment/types/TypeA.sol +14 -9
  211. package/contracts/experiment/types/TypeB.sol +14 -9
  212. package/contracts/instance/IInstance.sol +41 -8
  213. package/contracts/instance/IInstanceLinked.sol +8 -0
  214. package/contracts/instance/IServiceLinked.sol +12 -0
  215. package/contracts/instance/Instance.sol +46 -44
  216. package/contracts/instance/InstanceBase.sol +71 -0
  217. package/contracts/instance/module/access/Access.sol +149 -0
  218. package/contracts/instance/module/access/IAccess.sol +53 -0
  219. package/contracts/instance/module/bundle/BundleModule.sol +228 -0
  220. package/contracts/instance/module/bundle/IBundle.sol +53 -0
  221. package/contracts/instance/module/compensation/CompensationModule.sol +8 -0
  222. package/contracts/instance/module/compensation/ICompensation.sol +10 -0
  223. package/contracts/instance/module/component/ComponentModule.sol +103 -0
  224. package/contracts/instance/module/component/IComponent.sol +53 -0
  225. package/contracts/instance/module/lifecycle/ILifecycle.sol +47 -0
  226. package/contracts/instance/module/lifecycle/LifecycleModule.sol +89 -0
  227. package/contracts/instance/module/policy/IPolicy.sol +60 -0
  228. package/contracts/instance/module/policy/PolicyModule.sol +84 -0
  229. package/contracts/instance/module/pool/IPoolModule.sol +41 -0
  230. package/contracts/instance/module/pool/PoolModule.sol +87 -0
  231. package/contracts/instance/module/risk/IRisk.sol +10 -0
  232. package/contracts/instance/module/risk/RiskModule.sol +8 -0
  233. package/contracts/instance/module/treasury/ITreasury.sol +103 -0
  234. package/contracts/instance/module/treasury/TokenHandler.sol +48 -0
  235. package/contracts/instance/module/treasury/TreasuryModule.sol +152 -0
  236. package/contracts/instance/service/ComponentOwnerService.sol +171 -0
  237. package/contracts/instance/service/ComponentServiceBase.sol +41 -0
  238. package/contracts/instance/service/IComponentOwnerService.sol +22 -0
  239. package/contracts/instance/service/IPoolService.sol +30 -0
  240. package/contracts/instance/service/IProductService.sol +58 -0
  241. package/contracts/instance/service/IService.sol +15 -0
  242. package/contracts/instance/service/PoolService.sol +123 -0
  243. package/contracts/instance/service/ProductService.sol +355 -0
  244. package/contracts/instance/service/ServiceBase.sol +39 -0
  245. package/contracts/registry/ChainNft.sol +80 -94
  246. package/contracts/registry/IChainNft.sol +10 -7
  247. package/contracts/registry/IRegistry.sol +38 -51
  248. package/contracts/registry/IRegistryLinked.sol +8 -0
  249. package/contracts/registry/Registry.sol +310 -111
  250. package/contracts/shared/ERC165.sol +21 -0
  251. package/contracts/shared/IOwnable.sol +6 -0
  252. package/contracts/shared/IRegisterable.sol +24 -0
  253. package/contracts/shared/IVersionable.sol +52 -0
  254. package/contracts/shared/Registerable.sol +86 -0
  255. package/contracts/shared/Versionable.sol +89 -0
  256. package/contracts/test/TestFee.sol +25 -0
  257. package/contracts/test/TestPool.sol +22 -0
  258. package/contracts/test/TestProduct.sol +44 -0
  259. package/contracts/test/TestRegisterable.sol +19 -0
  260. package/contracts/test/TestRoleId.sol +14 -0
  261. package/contracts/test/TestService.sol +32 -0
  262. package/contracts/test/TestToken.sol +26 -0
  263. package/contracts/test/TestVersion.sol +44 -0
  264. package/contracts/test/TestVersionable.sol +17 -0
  265. package/contracts/test/Usdc.sol +26 -0
  266. package/contracts/types/AddressSet.sol +58 -0
  267. package/contracts/types/Blocknumber.sol +76 -18
  268. package/contracts/types/ChainId.sol +18 -10
  269. package/contracts/types/Fee.sol +51 -0
  270. package/contracts/types/NftId.sol +33 -11
  271. package/contracts/types/NftIdSet.sol +60 -0
  272. package/contracts/types/ObjectType.sol +115 -0
  273. package/contracts/types/RoleId.sol +36 -0
  274. package/contracts/types/StateId.sol +95 -0
  275. package/contracts/types/Timestamp.sol +85 -17
  276. package/contracts/types/UFixed.sol +78 -76
  277. package/contracts/types/Version.sol +95 -0
  278. package/package.json +19 -5
  279. package/artifacts/contracts/components/Component.sol/Component.dbg.json +0 -4
  280. package/artifacts/contracts/components/Component.sol/InstanceLinked.dbg.json +0 -4
  281. package/artifacts/contracts/components/Component.sol/InstanceLinked.json +0 -35
  282. package/artifacts/contracts/components/IPool.sol/IPoolComponent.dbg.json +0 -4
  283. package/artifacts/contracts/components/IProduct.sol/IProductComponent.dbg.json +0 -4
  284. package/artifacts/contracts/instance/access/Access.sol/AccessModule.dbg.json +0 -4
  285. package/artifacts/contracts/instance/access/IAccess.sol/IAccess.dbg.json +0 -4
  286. package/artifacts/contracts/instance/access/IAccess.sol/IAccessCheckRole.dbg.json +0 -4
  287. package/artifacts/contracts/instance/access/IAccess.sol/IAccessCheckRole.json +0 -35
  288. package/artifacts/contracts/instance/access/IAccess.sol/IAccessComponentTypeRoles.dbg.json +0 -4
  289. package/artifacts/contracts/instance/access/IAccess.sol/IAccessModule.dbg.json +0 -4
  290. package/artifacts/contracts/instance/component/ComponentModule.sol/ComponentModule.dbg.json +0 -4
  291. package/artifacts/contracts/instance/component/ComponentModule.sol/ComponentOwnerService.dbg.json +0 -4
  292. package/artifacts/contracts/instance/component/ComponentModule.sol/ComponentOwnerService.json +0 -147
  293. package/artifacts/contracts/instance/component/IComponent.sol/IComponent.dbg.json +0 -4
  294. package/artifacts/contracts/instance/component/IComponent.sol/IComponentContract.dbg.json +0 -4
  295. package/artifacts/contracts/instance/component/IComponent.sol/IComponentModule.dbg.json +0 -4
  296. package/artifacts/contracts/instance/component/IComponent.sol/IComponentOwnerService.dbg.json +0 -4
  297. package/artifacts/contracts/instance/component/IComponent.sol/IComponentOwnerService.json +0 -94
  298. package/artifacts/contracts/instance/component/IComponent.sol/IInstanceLinked.dbg.json +0 -4
  299. package/artifacts/contracts/instance/policy/IPolicy.sol/IPolicy.dbg.json +0 -4
  300. package/artifacts/contracts/instance/policy/IPolicy.sol/IPolicyModule.dbg.json +0 -4
  301. package/artifacts/contracts/instance/policy/PolicyModule.sol/PolicyModule.dbg.json +0 -4
  302. package/artifacts/contracts/instance/pool/IPoolModule.sol/IPool.dbg.json +0 -4
  303. package/artifacts/contracts/instance/pool/IPoolModule.sol/IPoolModule.dbg.json +0 -4
  304. package/artifacts/contracts/instance/pool/PoolModule.sol/PoolModule.dbg.json +0 -4
  305. package/artifacts/contracts/instance/product/IProductService.sol/IProductModule.dbg.json +0 -4
  306. package/artifacts/contracts/instance/product/IProductService.sol/IProductModule.json +0 -75
  307. package/artifacts/contracts/instance/product/IProductService.sol/IProductService.dbg.json +0 -4
  308. package/artifacts/contracts/instance/product/IProductService.sol/IProductService.json +0 -114
  309. package/artifacts/contracts/instance/product/ProductService.sol/ProductModule.dbg.json +0 -4
  310. package/artifacts/contracts/instance/product/ProductService.sol/ProductModule.json +0 -75
  311. package/artifacts/contracts/instance/product/ProductService.sol/ProductService.dbg.json +0 -4
  312. package/artifacts/contracts/instance/product/ProductService.sol/ProductService.json +0 -167
  313. package/artifacts/contracts/registry/IRegistry.sol/IOwnable.dbg.json +0 -4
  314. package/artifacts/contracts/registry/IRegistry.sol/IRegisterable.dbg.json +0 -4
  315. package/artifacts/contracts/registry/IRegistry.sol/IRegistryLinked.dbg.json +0 -4
  316. package/artifacts/contracts/registry/IRegistry.sol/IRegistryLinked.json +0 -49
  317. package/artifacts/contracts/registry/Registry.sol/Registerable.dbg.json +0 -4
  318. package/artifacts/contracts/registry/Registry.sol/RegistryLinked.dbg.json +0 -4
  319. package/artifacts/contracts/registry/Registry.sol/RegistryLinked.json +0 -60
  320. package/contracts/components/Component.sol +0 -62
  321. package/contracts/components/IPool.sol +0 -9
  322. package/contracts/components/IProduct.sol +0 -12
  323. package/contracts/instance/access/Access.sol +0 -218
  324. package/contracts/instance/access/IAccess.sol +0 -83
  325. package/contracts/instance/component/ComponentModule.sol +0 -248
  326. package/contracts/instance/component/IComponent.sol +0 -95
  327. package/contracts/instance/policy/IPolicy.sol +0 -66
  328. package/contracts/instance/policy/PolicyModule.sol +0 -107
  329. package/contracts/instance/pool/IPoolModule.sol +0 -41
  330. package/contracts/instance/pool/PoolModule.sol +0 -86
  331. package/contracts/instance/product/IProductService.sol +0 -46
  332. package/contracts/instance/product/ProductService.sol +0 -108
@@ -9,47 +9,115 @@ 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
16
- function gtTimestamp(Timestamp a, Timestamp b) pure returns(bool) { return Timestamp.unwrap(a) > Timestamp.unwrap(b); }
19
+ function gtTimestamp(Timestamp a, Timestamp b) pure returns (bool) {
20
+ return Timestamp.unwrap(a) > Timestamp.unwrap(b);
21
+ }
22
+
17
23
  /// @dev return true if Timestamp a is after or equal to Timestamp b
18
- function gteTimestamp(Timestamp a, Timestamp b) pure returns(bool) { return Timestamp.unwrap(a) >= Timestamp.unwrap(b); }
24
+ function gteTimestamp(Timestamp a, Timestamp b) pure returns (bool) {
25
+ return Timestamp.unwrap(a) >= Timestamp.unwrap(b);
26
+ }
19
27
 
20
28
  /// @dev return true if Timestamp a is before Timestamp b
21
- function ltTimestamp(Timestamp a, Timestamp b) pure returns(bool) { return Timestamp.unwrap(a) < Timestamp.unwrap(b); }
29
+ function ltTimestamp(Timestamp a, Timestamp b) pure returns (bool) {
30
+ return Timestamp.unwrap(a) < Timestamp.unwrap(b);
31
+ }
32
+
22
33
  /// @dev return true if Timestamp a is before or equal to Timestamp b
23
- function lteTimestamp(Timestamp a, Timestamp b) pure returns(bool) { return Timestamp.unwrap(a) <= Timestamp.unwrap(b); }
34
+ function lteTimestamp(Timestamp a, Timestamp b) pure returns (bool) {
35
+ return Timestamp.unwrap(a) <= Timestamp.unwrap(b);
36
+ }
24
37
 
25
38
  /// @dev return true if Timestamp a is equal to Timestamp b
26
- function eqTimestamp(Timestamp a, Timestamp b) pure returns(bool) { return Timestamp.unwrap(a) == Timestamp.unwrap(b); }
39
+ function eqTimestamp(Timestamp a, Timestamp b) pure returns (bool) {
40
+ return Timestamp.unwrap(a) == Timestamp.unwrap(b);
41
+ }
42
+
27
43
  /// @dev return true if Timestamp a is not equal to Timestamp b
28
- function neTimestamp(Timestamp a, Timestamp b) pure returns(bool) { return Timestamp.unwrap(a) != Timestamp.unwrap(b); }
44
+ function neTimestamp(Timestamp a, Timestamp b) pure returns (bool) {
45
+ return Timestamp.unwrap(a) != Timestamp.unwrap(b);
46
+ }
29
47
 
30
48
  /// @dev Converts the uint256 to a Timestamp.
31
- function toTimestamp(uint256 timestamp) pure returns(Timestamp) { return Timestamp.wrap(uint40(timestamp));}
49
+ function toTimestamp(uint256 timestamp) pure returns (Timestamp) {
50
+ return Timestamp.wrap(uint40(timestamp));
51
+ }
32
52
 
33
- function blockTimestamp() view returns(Timestamp) { return toTimestamp(block.timestamp); }
53
+ function blockTimestamp() view returns (Timestamp) {
54
+ return toTimestamp(block.timestamp);
55
+ }
34
56
 
35
57
  /// @dev Return the Timestamp zero (0)
36
- function zeroTimestamp() pure returns(Timestamp) { return toTimestamp(0); }
58
+ function zeroTimestamp() pure returns (Timestamp) {
59
+ return toTimestamp(0);
60
+ }
37
61
 
38
62
  library TimestampLib {
39
63
  /// @dev return true if Timestamp a is after Timestamp b
40
- function gt(Timestamp a, Timestamp b) public pure returns(bool isAfter) { return gtTimestamp(a, b); }
64
+ function gt(Timestamp a, Timestamp b) public pure returns (bool isAfter) {
65
+ return gtTimestamp(a, b);
66
+ }
67
+
41
68
  /// @dev return true if Timestamp a is after or the same than Timestamp b
42
- function gte(Timestamp a, Timestamp b) public pure returns(bool isAfterOrSame) { return gteTimestamp(a, b); }
69
+ function gte(
70
+ Timestamp a,
71
+ Timestamp b
72
+ ) public pure returns (bool isAfterOrSame) {
73
+ return gteTimestamp(a, b);
74
+ }
43
75
 
44
76
  /// @dev return true if Timestamp a is before Timestamp b
45
- function lt(Timestamp a, Timestamp b) public pure returns(bool isBefore) { return ltTimestamp(a, b); }
77
+ function lt(Timestamp a, Timestamp b) public pure returns (bool isBefore) {
78
+ return ltTimestamp(a, b);
79
+ }
80
+
46
81
  /// @dev return true if Timestamp a is before or the same than Timestamp b
47
- function lte(Timestamp a, Timestamp b) public pure returns(bool isBeforeOrSame) { return lteTimestamp(a, b); }
82
+ function lte(
83
+ Timestamp a,
84
+ Timestamp b
85
+ ) public pure returns (bool isBeforeOrSame) {
86
+ return lteTimestamp(a, b);
87
+ }
48
88
 
49
89
  /// @dev return true if Timestamp a is equal to Timestamp b
50
- function eq(Timestamp a, Timestamp b) public pure returns(bool isSame) { return eqTimestamp(a, b); }
90
+ function eq(Timestamp a, Timestamp b) public pure returns (bool isSame) {
91
+ return eqTimestamp(a, b);
92
+ }
93
+
94
+ /// @dev return true if Timestamp a is not equal to Timestamp b
95
+ function ne(
96
+ Timestamp a,
97
+ Timestamp b
98
+ ) public pure returns (bool isDifferent) {
99
+ return neTimestamp(a, b);
100
+ }
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
+
51
112
  /// @dev return true if Timestamp a is not equal to Timestamp b
52
- function ne(Timestamp a, Timestamp b) public pure returns(bool isDifferent) { return neTimestamp(a, b); }
113
+ function addSeconds(
114
+ Timestamp timestamp,
115
+ uint256 timeDelta
116
+ ) public pure returns (Timestamp) {
117
+ return toTimestamp(Timestamp.unwrap(timestamp) + uint40(timeDelta));
118
+ }
53
119
 
54
- function toInt(Timestamp timestamp) public pure returns(uint256) { return uint256(uint40(Timestamp.unwrap(timestamp))); }
120
+ function toInt(Timestamp timestamp) public pure returns (uint256) {
121
+ return uint256(uint40(Timestamp.unwrap(timestamp)));
122
+ }
55
123
  }
@@ -1,7 +1,7 @@
1
1
  // SPDX-License-Identifier: Apache-2.0
2
2
  pragma solidity ^0.8.19;
3
3
 
4
- import { Math } from "@openzeppelin/contracts/utils/math/Math.sol";
4
+ import {Math} from "@openzeppelin/contracts/utils/math/Math.sol";
5
5
 
6
6
  /// @dev UFixed is a fixed point number with 18 decimals precision.
7
7
  type UFixed is uint256;
@@ -15,62 +15,61 @@ 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
- function addUFixed(UFixed a, UFixed b) pure returns(UFixed) {
22
+ function addUFixed(UFixed a, UFixed b) pure returns (UFixed) {
22
23
  return UFixed.wrap(UFixed.unwrap(a) + UFixed.unwrap(b));
23
24
  }
24
25
 
25
- function subUFixed(UFixed a, UFixed b) pure returns(UFixed) {
26
+ function subUFixed(UFixed a, UFixed b) pure returns (UFixed) {
26
27
  require(a >= b, "ERROR:UFM-010:NEGATIVE_RESULT");
27
28
  return UFixed.wrap(UFixed.unwrap(a) - UFixed.unwrap(b));
28
29
  }
29
30
 
30
- function mulUFixed(UFixed a, UFixed b) pure returns(UFixed) {
31
- return UFixed.wrap(Math.mulDiv(UFixed.unwrap(a), UFixed.unwrap(b), 10 ** 18));
31
+ function mulUFixed(UFixed a, UFixed b) pure returns (UFixed) {
32
+ return
33
+ UFixed.wrap(Math.mulDiv(UFixed.unwrap(a), UFixed.unwrap(b), 10 ** 18));
32
34
  }
33
35
 
34
- function divUFixed(UFixed a, UFixed b) pure returns(UFixed) {
36
+ function divUFixed(UFixed a, UFixed b) pure returns (UFixed) {
35
37
  require(UFixed.unwrap(b) > 0, "ERROR:UFM-020:DIVISOR_ZERO");
36
38
 
37
- return UFixed.wrap(
38
- Math.mulDiv(
39
- UFixed.unwrap(a),
40
- 10 ** 18,
41
- UFixed.unwrap(b)));
39
+ return
40
+ UFixed.wrap(Math.mulDiv(UFixed.unwrap(a), 10 ** 18, UFixed.unwrap(b)));
42
41
  }
43
42
 
44
- function gtUFixed(UFixed a, UFixed b) pure returns(bool isGreaterThan) {
43
+ function gtUFixed(UFixed a, UFixed b) pure returns (bool isGreaterThan) {
45
44
  return UFixed.unwrap(a) > UFixed.unwrap(b);
46
45
  }
47
46
 
48
- function gteUFixed(UFixed a, UFixed b) pure returns(bool isGreaterThan) {
47
+ function gteUFixed(UFixed a, UFixed b) pure returns (bool isGreaterThan) {
49
48
  return UFixed.unwrap(a) >= UFixed.unwrap(b);
50
49
  }
51
50
 
52
- function ltUFixed(UFixed a, UFixed b) pure returns(bool isGreaterThan) {
51
+ function ltUFixed(UFixed a, UFixed b) pure returns (bool isGreaterThan) {
53
52
  return UFixed.unwrap(a) < UFixed.unwrap(b);
54
53
  }
55
54
 
56
- function lteUFixed(UFixed a, UFixed b) pure returns(bool isGreaterThan) {
55
+ function lteUFixed(UFixed a, UFixed b) pure returns (bool isGreaterThan) {
57
56
  return UFixed.unwrap(a) <= UFixed.unwrap(b);
58
57
  }
59
58
 
60
- function eqUFixed(UFixed a, UFixed b) pure returns(bool isEqual) {
59
+ function eqUFixed(UFixed a, UFixed b) pure returns (bool isEqual) {
61
60
  return UFixed.unwrap(a) == UFixed.unwrap(b);
62
61
  }
63
62
 
64
- function gtzUFixed(UFixed a) pure returns(bool isZero) {
63
+ function gtzUFixed(UFixed a) pure returns (bool isZero) {
65
64
  return UFixed.unwrap(a) > 0;
66
65
  }
67
66
 
68
- function eqzUFixed(UFixed a) pure returns(bool isZero) {
67
+ function eqzUFixed(UFixed a) pure returns (bool isZero) {
69
68
  return UFixed.unwrap(a) == 0;
70
69
  }
71
70
 
72
- function deltaUFixed(UFixed a, UFixed b) pure returns(UFixed) {
73
- if(a > b) {
71
+ function deltaUFixed(UFixed a, UFixed b) pure returns (UFixed) {
72
+ if (a > b) {
74
73
  return a - b;
75
74
  }
76
75
 
@@ -78,130 +77,133 @@ function deltaUFixed(UFixed a, UFixed b) pure returns(UFixed) {
78
77
  }
79
78
 
80
79
  library UFixedMathLib {
81
-
82
- enum Rounding {
83
- /// @dev Round down - floor(value)
84
- Down,
85
- /// @dev Round up - ceil(value)
86
- Up,
87
- /// @dev Round half up - round(value)
88
- HalfUp
89
- }
90
-
91
80
  int8 public constant EXP = 18;
92
81
  uint256 public constant MULTIPLIER = 10 ** uint256(int256(EXP));
93
82
  uint256 public constant MULTIPLIER_HALF = MULTIPLIER / 2;
94
-
95
- /// @dev Default rounding mode used by ftoi is HalfUp
96
- Rounding public constant ROUNDING_DEFAULT = Rounding.HalfUp;
97
83
 
98
- /// @dev returns the decimals precision of the UFixed type
99
- function decimals() public pure returns(uint256) {
100
- return uint8(EXP);
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
+ }
88
+
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);
101
97
  }
102
98
 
103
99
  /// @dev Converts the uint256 to a UFixed.
104
- function itof(uint256 a)
105
- public
106
- pure
107
- returns(UFixed)
108
- {
100
+ function toUFixed(uint256 a) public pure returns (UFixed) {
109
101
  return UFixed.wrap(a * MULTIPLIER);
110
102
  }
111
103
 
112
104
  /// @dev Converts the uint256 to a UFixed with given exponent.
113
- function itof(uint256 a, int8 exp)
114
- public
115
- pure
116
- returns(UFixed)
117
- {
105
+ function toUFixed(uint256 a, int8 exp) public pure returns (UFixed) {
118
106
  require(EXP + exp >= 0, "ERROR:FM-010:EXPONENT_TOO_SMALL");
119
- require(EXP + exp <= 2 * EXP, "ERROR:FM-011:EXPONENT_TOO_LARGE");
107
+ require(EXP + exp <= 64, "ERROR:FM-011:EXPONENT_TOO_LARGE");
120
108
 
121
109
  return UFixed.wrap(a * 10 ** uint8(EXP + exp));
122
110
  }
123
111
 
112
+ /// @dev returns the decimals precision of the UFixed type
113
+ function decimals() public pure returns (uint256) {
114
+ return uint8(EXP);
115
+ }
116
+
124
117
  /// @dev Converts a UFixed to a uint256.
125
- function ftoi(UFixed a)
126
- public
127
- pure
128
- returns(uint256)
129
- {
130
- return ftoi(a, ROUNDING_DEFAULT);
118
+ function toInt(UFixed a) public pure returns (uint256) {
119
+ return toIntWithRounding(a, ROUNDING_HALF_UP());
131
120
  }
132
121
 
133
122
  /// @dev Converts a UFixed to a uint256 with given rounding mode.
134
- function ftoi(UFixed a, Rounding rounding)
135
- public
136
- pure
137
- returns(uint256)
138
- {
139
- if(rounding == Rounding.HalfUp) {
140
- return Math.mulDiv(UFixed.unwrap(a) + MULTIPLIER_HALF, 1, MULTIPLIER, Math.Rounding.Down);
141
- } else if(rounding == Rounding.Down) {
142
- return Math.mulDiv(UFixed.unwrap(a), 1, MULTIPLIER, Math.Rounding.Down);
123
+ function toIntWithRounding(UFixed a, uint8 rounding) public pure returns (uint256) {
124
+ if (rounding == ROUNDING_HALF_UP()) {
125
+ return
126
+ Math.mulDiv(
127
+ UFixed.unwrap(a) + MULTIPLIER_HALF,
128
+ 1,
129
+ MULTIPLIER,
130
+ Math.Rounding.Down
131
+ );
132
+ } else if (rounding == ROUNDING_DOWN()) {
133
+ return
134
+ Math.mulDiv(
135
+ UFixed.unwrap(a),
136
+ 1,
137
+ MULTIPLIER,
138
+ Math.Rounding.Down
139
+ );
143
140
  } else {
144
- return Math.mulDiv(UFixed.unwrap(a), 1, MULTIPLIER, Math.Rounding.Up);
141
+ return
142
+ Math.mulDiv(UFixed.unwrap(a), 1, MULTIPLIER, Math.Rounding.Up);
145
143
  }
146
144
  }
147
145
 
148
146
  /// @dev adds two UFixed numbers
149
- function add(UFixed a, UFixed b) public pure returns(UFixed) {
147
+ function add(UFixed a, UFixed b) public pure returns (UFixed) {
150
148
  return addUFixed(a, b);
151
149
  }
152
150
 
153
151
  /// @dev subtracts two UFixed numbers
154
- function sub(UFixed a, UFixed b) public pure returns(UFixed) {
152
+ function sub(UFixed a, UFixed b) public pure returns (UFixed) {
155
153
  return subUFixed(a, b);
156
154
  }
157
155
 
158
156
  /// @dev multiplies two UFixed numbers
159
- function mul(UFixed a, UFixed b) public pure returns(UFixed) {
157
+ function mul(UFixed a, UFixed b) public pure returns (UFixed) {
160
158
  return mulUFixed(a, b);
161
159
  }
162
160
 
163
161
  /// @dev divides two UFixed numbers
164
- function div(UFixed a, UFixed b) public pure returns(UFixed) {
162
+ function div(UFixed a, UFixed b) public pure returns (UFixed) {
165
163
  return divUFixed(a, b);
166
164
  }
167
165
 
168
166
  /// @dev return true if UFixed a is greater than UFixed b
169
- function gt(UFixed a, UFixed b) public pure returns(bool isGreaterThan) {
167
+ function gt(UFixed a, UFixed b) public pure returns (bool isGreaterThan) {
170
168
  return gtUFixed(a, b);
171
169
  }
172
170
 
173
171
  /// @dev return true if UFixed a is greater than or equal to UFixed b
174
- function gte(UFixed a, UFixed b) public pure returns(bool isGreaterThan) {
172
+ function gte(UFixed a, UFixed b) public pure returns (bool isGreaterThan) {
175
173
  return gteUFixed(a, b);
176
174
  }
177
175
 
178
176
  /// @dev return true if UFixed a is less than UFixed b
179
- function lt(UFixed a, UFixed b) public pure returns(bool isGreaterThan) {
177
+ function lt(UFixed a, UFixed b) public pure returns (bool isGreaterThan) {
180
178
  return ltUFixed(a, b);
181
179
  }
182
180
 
183
181
  /// @dev return true if UFixed a is less than or equal to UFixed b
184
- function lte(UFixed a, UFixed b) public pure returns(bool isGreaterThan) {
182
+ function lte(UFixed a, UFixed b) public pure returns (bool isGreaterThan) {
185
183
  return lteUFixed(a, b);
186
184
  }
187
185
 
188
186
  /// @dev return true if UFixed a is equal to UFixed b
189
- function eq(UFixed a, UFixed b) public pure returns(bool isEqual) {
187
+ function eq(UFixed a, UFixed b) public pure returns (bool isEqual) {
190
188
  return eqUFixed(a, b);
191
189
  }
192
190
 
193
191
  /// @dev return true if UFixed a is not zero
194
- function gtz(UFixed a) public pure returns(bool isZero) {
192
+ function gtz(UFixed a) public pure returns (bool isZero) {
195
193
  return gtzUFixed(a);
196
194
  }
197
195
 
198
196
  /// @dev return true if UFixed a is zero
199
- function eqz(UFixed a) public pure returns(bool isZero) {
197
+ function eqz(UFixed a) public pure returns (bool isZero) {
200
198
  return eqzUFixed(a);
201
199
  }
202
200
 
201
+ function zero() public pure returns (UFixed) {
202
+ return UFixed.wrap(0);
203
+ }
204
+
203
205
  /// @dev return the absolute delta between two UFixed numbers
204
- function delta(UFixed a, UFixed b) public pure returns(UFixed) {
206
+ function delta(UFixed a, UFixed b) public pure returns (UFixed) {
205
207
  return deltaUFixed(a, b);
206
208
  }
207
209
  }
@@ -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-d911522",
3
+ "version": "0.0.2-dc7e4cb-141",
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": {
@@ -8,7 +8,11 @@
8
8
  "test": "hh test",
9
9
  "ptest": "hh test --parallel",
10
10
  "test-with-gas": "REPORT_GAS=true hh test",
11
- "coverage": "hh coverage"
11
+ "coverage": "hh coverage",
12
+ "styleFix": "prettier --write --plugin=prettier-plugin-solidity 'contracts/**/*.sol' 'test_forge/**/*.t.sol'",
13
+ "styleCheck": "prettier --check --plugin=prettier-plugin-solidity 'contracts/**/*.sol' 'test_forge/**/*.t.sol'",
14
+ "lint": "solhint 'contracts/**/*.sol' 'test_forge/**/*.t.sol'",
15
+ "eslint": "eslint ."
12
16
  },
13
17
  "repository": {
14
18
  "type": "git",
@@ -25,13 +29,23 @@
25
29
  ],
26
30
  "homepage": "https://github.com/etherisc/gif-next#readme",
27
31
  "devDependencies": {
28
- "@nomicfoundation/hardhat-foundry": "^1.0.3",
32
+ "@nomicfoundation/hardhat-foundry": "^1.1.1",
29
33
  "@nomicfoundation/hardhat-toolbox": "^3.0.0",
34
+ "@nomicfoundation/hardhat-verify": "^1.1.1",
35
+ "@typescript-eslint/eslint-plugin": "^6.7.2",
36
+ "@typescript-eslint/parser": "^6.7.2",
30
37
  "dotenv": "^16.3.1",
31
- "hardhat": "^2.17.1"
38
+ "eslint": "^8.50.0",
39
+ "hardhat": "^2.17.2",
40
+ "prettier": "^3.0.3",
41
+ "prettier-plugin-solidity": "^1.1.3",
42
+ "typescript": "^5"
32
43
  },
33
44
  "dependencies": {
34
45
  "@openzeppelin/contracts": "^4.9.3",
35
- "@openzeppelin/contracts-upgradeable": "^4.9.3"
46
+ "@openzeppelin/contracts-upgradeable": "^4.9.3",
47
+ "abi-coder": "^5.0.0",
48
+ "ethers": "^6.7.1",
49
+ "winston": "^3.10.0"
36
50
  }
37
51
  }
@@ -1,4 +0,0 @@
1
- {
2
- "_format": "hh-sol-dbg-1",
3
- "buildInfo": "../../../build-info/5d58518916abd285d6742c7724f5c203.json"
4
- }
@@ -1,4 +0,0 @@
1
- {
2
- "_format": "hh-sol-dbg-1",
3
- "buildInfo": "../../../build-info/5d58518916abd285d6742c7724f5c203.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": "0x608060405234801561001057600080fd5b50604051610249380380610249833981810160405281019061003291906100db565b806000806101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555050610108565b600080fd5b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b60006100a88261007d565b9050919050565b6100b88161009d565b81146100c357600080fd5b50565b6000815190506100d5816100af565b92915050565b6000602082840312156100f1576100f0610078565b5b60006100ff848285016100c6565b91505092915050565b610132806101176000396000f3fe6080604052348015600f57600080fd5b506004361060285760003560e01c8063de7b5d1414602d575b600080fd5b60336047565b604051603e919060e3565b60405180910390f35b60008060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff16905090565b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b6000819050919050565b600060af60ab60a7846070565b6090565b6070565b9050919050565b600060bf82609a565b9050919050565b600060cf8260b6565b9050919050565b60dd8160c6565b82525050565b600060208201905060f6600083018460d6565b9291505056fea2646970667358221220e78278246c3e44db4b709006b118bd00a9bc3a08e56a0bb4d74c0cc55c10b23c64736f6c63430008140033",
32
- "deployedBytecode": "0x6080604052348015600f57600080fd5b506004361060285760003560e01c8063de7b5d1414602d575b600080fd5b60336047565b604051603e919060e3565b60405180910390f35b60008060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff16905090565b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b6000819050919050565b600060af60ab60a7846070565b6090565b6070565b9050919050565b600060bf82609a565b9050919050565b600060cf8260b6565b9050919050565b60dd8160c6565b82525050565b600060208201905060f6600083018460d6565b9291505056fea2646970667358221220e78278246c3e44db4b709006b118bd00a9bc3a08e56a0bb4d74c0cc55c10b23c64736f6c63430008140033",
33
- "linkReferences": {},
34
- "deployedLinkReferences": {}
35
- }
@@ -1,4 +0,0 @@
1
- {
2
- "_format": "hh-sol-dbg-1",
3
- "buildInfo": "../../../build-info/5d58518916abd285d6742c7724f5c203.json"
4
- }
@@ -1,4 +0,0 @@
1
- {
2
- "_format": "hh-sol-dbg-1",
3
- "buildInfo": "../../../build-info/5d58518916abd285d6742c7724f5c203.json"
4
- }
@@ -1,4 +0,0 @@
1
- {
2
- "_format": "hh-sol-dbg-1",
3
- "buildInfo": "../../../../build-info/5d58518916abd285d6742c7724f5c203.json"
4
- }
@@ -1,4 +0,0 @@
1
- {
2
- "_format": "hh-sol-dbg-1",
3
- "buildInfo": "../../../../build-info/5d58518916abd285d6742c7724f5c203.json"
4
- }
@@ -1,4 +0,0 @@
1
- {
2
- "_format": "hh-sol-dbg-1",
3
- "buildInfo": "../../../../build-info/5d58518916abd285d6742c7724f5c203.json"
4
- }
@@ -1,35 +0,0 @@
1
- {
2
- "_format": "hh-sol-artifact-1",
3
- "contractName": "IAccessCheckRole",
4
- "sourceName": "contracts/instance/access/IAccess.sol",
5
- "abi": [
6
- {
7
- "inputs": [
8
- {
9
- "internalType": "bytes32",
10
- "name": "role",
11
- "type": "bytes32"
12
- },
13
- {
14
- "internalType": "address",
15
- "name": "member",
16
- "type": "address"
17
- }
18
- ],
19
- "name": "hasRole",
20
- "outputs": [
21
- {
22
- "internalType": "bool",
23
- "name": "",
24
- "type": "bool"
25
- }
26
- ],
27
- "stateMutability": "view",
28
- "type": "function"
29
- }
30
- ],
31
- "bytecode": "0x",
32
- "deployedBytecode": "0x",
33
- "linkReferences": {},
34
- "deployedLinkReferences": {}
35
- }