@etherisc/gif-next 0.0.2-2a59cd5-352 → 0.0.2-2af39ab-356

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 (325) hide show
  1. package/README.md +8 -8
  2. package/artifacts/contracts/components/Component.sol/Component.dbg.json +1 -1
  3. package/artifacts/contracts/components/Component.sol/Component.json +62 -145
  4. package/artifacts/contracts/components/Distribution.sol/Distribution.dbg.json +1 -1
  5. package/artifacts/contracts/components/Distribution.sol/Distribution.json +112 -226
  6. package/artifacts/contracts/components/IComponent.sol/IComponent.dbg.json +1 -1
  7. package/artifacts/contracts/components/IComponent.sol/IComponent.json +59 -92
  8. package/artifacts/contracts/components/IDistributionComponent.sol/IDistributionComponent.dbg.json +1 -1
  9. package/artifacts/contracts/components/IDistributionComponent.sol/IDistributionComponent.json +90 -171
  10. package/artifacts/contracts/components/IPoolComponent.sol/IPoolComponent.dbg.json +1 -1
  11. package/artifacts/contracts/components/IPoolComponent.sol/IPoolComponent.json +247 -205
  12. package/artifacts/contracts/components/IProductComponent.sol/IProductComponent.dbg.json +1 -1
  13. package/artifacts/contracts/components/IProductComponent.sol/IProductComponent.json +63 -164
  14. package/artifacts/contracts/components/Pool.sol/Pool.dbg.json +1 -1
  15. package/artifacts/contracts/components/Pool.sol/Pool.json +264 -292
  16. package/artifacts/contracts/components/Product.sol/Product.dbg.json +1 -1
  17. package/artifacts/contracts/components/Product.sol/Product.json +67 -218
  18. package/artifacts/contracts/instance/BundleManager.sol/BundleManager.dbg.json +1 -1
  19. package/artifacts/contracts/instance/BundleManager.sol/BundleManager.json +30 -11
  20. package/artifacts/contracts/instance/Cloneable.sol/Cloneable.dbg.json +1 -1
  21. package/artifacts/contracts/instance/IInstance.sol/IInstance.dbg.json +1 -1
  22. package/artifacts/contracts/instance/IInstance.sol/IInstance.json +415 -522
  23. package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.dbg.json +1 -1
  24. package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.json +19 -184
  25. package/artifacts/contracts/instance/Instance.sol/Instance.dbg.json +1 -1
  26. package/artifacts/contracts/instance/Instance.sol/Instance.json +501 -633
  27. package/artifacts/contracts/instance/InstanceAccessManager.sol/InstanceAccessManager.dbg.json +1 -1
  28. package/artifacts/contracts/instance/InstanceAccessManager.sol/InstanceAccessManager.json +2 -2
  29. package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.dbg.json +1 -1
  30. package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.json +120 -222
  31. package/artifacts/contracts/instance/InstanceService.sol/InstanceService.dbg.json +1 -1
  32. package/artifacts/contracts/instance/InstanceService.sol/InstanceService.json +70 -284
  33. package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.dbg.json +1 -1
  34. package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.json +196 -113
  35. package/artifacts/contracts/instance/ObjectManager.sol/ObjectManager.dbg.json +1 -1
  36. package/artifacts/contracts/instance/ObjectManager.sol/ObjectManager.json +2 -2
  37. package/artifacts/contracts/instance/base/ComponentService.sol/ComponentService.dbg.json +1 -1
  38. package/artifacts/contracts/instance/base/ComponentService.sol/ComponentService.json +18 -220
  39. package/artifacts/contracts/instance/base/IKeyValueStore.sol/IKeyValueStore.dbg.json +1 -1
  40. package/artifacts/contracts/instance/base/ILifecycle.sol/ILifecycle.dbg.json +1 -1
  41. package/artifacts/contracts/instance/base/KeyValueStore.sol/KeyValueStore.dbg.json +1 -1
  42. package/artifacts/contracts/instance/base/KeyValueStore.sol/KeyValueStore.json +40 -10
  43. package/artifacts/contracts/instance/base/Lifecycle.sol/Lifecycle.dbg.json +1 -1
  44. package/artifacts/contracts/instance/base/Lifecycle.sol/Lifecycle.json +36 -11
  45. package/artifacts/contracts/instance/module/IAccess.sol/IAccess.dbg.json +1 -1
  46. package/artifacts/contracts/instance/module/IBundle.sol/IBundle.dbg.json +1 -1
  47. package/artifacts/contracts/instance/module/IComponents.sol/IComponents.dbg.json +4 -0
  48. package/artifacts/contracts/instance/module/IComponents.sol/IComponents.json +10 -0
  49. package/artifacts/contracts/instance/module/IDistribution.sol/IDistribution.dbg.json +1 -1
  50. package/artifacts/contracts/instance/module/IPolicy.sol/IPolicy.dbg.json +1 -1
  51. package/artifacts/contracts/instance/module/IRisk.sol/IRisk.dbg.json +1 -1
  52. package/artifacts/contracts/instance/module/ISetup.sol/ISetup.dbg.json +1 -1
  53. package/artifacts/contracts/instance/module/ITreasury.sol/ITreasury.dbg.json +1 -1
  54. package/artifacts/contracts/instance/service/ApplicationService.sol/ApplicationService.dbg.json +1 -1
  55. package/artifacts/contracts/instance/service/ApplicationService.sol/ApplicationService.json +182 -331
  56. package/artifacts/contracts/instance/service/ApplicationServiceManager.sol/ApplicationServiceManager.dbg.json +4 -0
  57. package/artifacts/contracts/instance/service/ApplicationServiceManager.sol/ApplicationServiceManager.json +665 -0
  58. package/artifacts/contracts/instance/service/BundleService.sol/BundleService.dbg.json +1 -1
  59. package/artifacts/contracts/instance/service/BundleService.sol/BundleService.json +141 -366
  60. package/artifacts/contracts/instance/service/BundleServiceManager.sol/BundleServiceManager.dbg.json +1 -1
  61. package/artifacts/contracts/instance/service/BundleServiceManager.sol/BundleServiceManager.json +182 -107
  62. package/artifacts/contracts/instance/service/ClaimService.sol/ClaimService.dbg.json +4 -0
  63. package/artifacts/contracts/instance/service/ClaimService.sol/ClaimService.json +754 -0
  64. package/artifacts/contracts/instance/service/ClaimServiceManager.sol/ClaimServiceManager.dbg.json +4 -0
  65. package/artifacts/contracts/instance/service/ClaimServiceManager.sol/ClaimServiceManager.json +637 -0
  66. package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.dbg.json +1 -1
  67. package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.json +645 -268
  68. package/artifacts/contracts/instance/service/DistributionServiceManager.sol/DistributionServiceManager.dbg.json +1 -1
  69. package/artifacts/contracts/instance/service/DistributionServiceManager.sol/DistributionServiceManager.json +300 -109
  70. package/artifacts/contracts/instance/service/IApplicationService.sol/IApplicationService.dbg.json +1 -1
  71. package/artifacts/contracts/instance/service/IApplicationService.sol/IApplicationService.json +124 -206
  72. package/artifacts/contracts/instance/service/IBundleService.sol/IBundleService.dbg.json +1 -1
  73. package/artifacts/contracts/instance/service/IBundleService.sol/IBundleService.json +89 -257
  74. package/artifacts/contracts/instance/service/IClaimService.sol/IClaimService.dbg.json +4 -0
  75. package/artifacts/contracts/instance/service/IClaimService.sol/IClaimService.json +409 -0
  76. package/artifacts/contracts/instance/service/IDistributionService.sol/IDistributionService.dbg.json +1 -1
  77. package/artifacts/contracts/instance/service/IDistributionService.sol/IDistributionService.json +369 -167
  78. package/artifacts/contracts/instance/service/IPolicyService.sol/IPolicyService.dbg.json +1 -1
  79. package/artifacts/contracts/instance/service/IPolicyService.sol/IPolicyService.json +25 -290
  80. package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.dbg.json +1 -1
  81. package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.json +69 -153
  82. package/artifacts/contracts/instance/service/IProductService.sol/IProductService.dbg.json +1 -1
  83. package/artifacts/contracts/instance/service/IProductService.sol/IProductService.json +12 -177
  84. package/artifacts/contracts/instance/service/PolicyService.sol/PolicyService.dbg.json +1 -1
  85. package/artifacts/contracts/instance/service/PolicyService.sol/PolicyService.json +65 -443
  86. package/artifacts/contracts/instance/service/PolicyServiceManager.sol/PolicyServiceManager.dbg.json +1 -1
  87. package/artifacts/contracts/instance/service/PolicyServiceManager.sol/PolicyServiceManager.json +188 -141
  88. package/artifacts/contracts/instance/service/PoolService.sol/PoolService.dbg.json +1 -1
  89. package/artifacts/contracts/instance/service/PoolService.sol/PoolService.json +108 -249
  90. package/artifacts/contracts/instance/service/PoolServiceManager.sol/PoolServiceManager.dbg.json +1 -1
  91. package/artifacts/contracts/instance/service/PoolServiceManager.sol/PoolServiceManager.json +183 -104
  92. package/artifacts/contracts/instance/service/ProductService.sol/ProductService.dbg.json +1 -1
  93. package/artifacts/contracts/instance/service/ProductService.sol/ProductService.json +42 -272
  94. package/artifacts/contracts/instance/service/ProductServiceManager.sol/ProductServiceManager.dbg.json +1 -1
  95. package/artifacts/contracts/instance/service/ProductServiceManager.sol/ProductServiceManager.json +179 -104
  96. package/artifacts/contracts/registry/ChainNft.sol/ChainNft.dbg.json +1 -1
  97. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.dbg.json +1 -1
  98. package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.dbg.json +1 -1
  99. package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.json +12 -177
  100. package/artifacts/contracts/registry/ITransferInterceptor.sol/ITransferInterceptor.dbg.json +1 -1
  101. package/artifacts/contracts/registry/Registry.sol/Registry.dbg.json +1 -1
  102. package/artifacts/contracts/registry/Registry.sol/Registry.json +2 -2
  103. package/artifacts/contracts/registry/RegistryAccessManager.sol/RegistryAccessManager.dbg.json +1 -1
  104. package/artifacts/contracts/registry/RegistryAccessManager.sol/RegistryAccessManager.json +2 -2
  105. package/artifacts/contracts/registry/RegistryService.sol/RegistryService.dbg.json +1 -1
  106. package/artifacts/contracts/registry/RegistryService.sol/RegistryService.json +31 -261
  107. package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.dbg.json +1 -1
  108. package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.json +182 -113
  109. package/artifacts/contracts/registry/ReleaseManager.sol/ReleaseManager.dbg.json +1 -1
  110. package/artifacts/contracts/registry/ReleaseManager.sol/ReleaseManager.json +11 -11
  111. package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.dbg.json +1 -1
  112. package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.json +34 -67
  113. package/artifacts/contracts/shared/ContractDeployerLib.sol/ContractDeployerLib.dbg.json +1 -1
  114. package/artifacts/contracts/shared/ERC165.sol/ERC165.dbg.json +1 -1
  115. package/artifacts/contracts/shared/ERC165.sol/ERC165.json +2 -2
  116. package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.dbg.json +1 -1
  117. package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.json +4 -30
  118. package/artifacts/contracts/shared/IPolicyHolder.sol/IPolicyHolder.dbg.json +1 -1
  119. package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.dbg.json +1 -1
  120. package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.json +4 -30
  121. package/artifacts/contracts/shared/IRegistryLinked.sol/IRegistryLinked.dbg.json +1 -1
  122. package/artifacts/contracts/shared/IRegistryLinked.sol/IRegistryLinked.json +0 -21
  123. package/artifacts/contracts/shared/IService.sol/IService.dbg.json +1 -1
  124. package/artifacts/contracts/shared/IService.sol/IService.json +12 -177
  125. package/artifacts/contracts/shared/IVersionable.sol/IVersionable.dbg.json +1 -1
  126. package/artifacts/contracts/shared/IVersionable.sol/IVersionable.json +0 -150
  127. package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.dbg.json +1 -1
  128. package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.json +10 -62
  129. package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.dbg.json +1 -1
  130. package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.json +2 -23
  131. package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.dbg.json +1 -1
  132. package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.json +171 -88
  133. package/artifacts/contracts/shared/Registerable.sol/Registerable.dbg.json +1 -1
  134. package/artifacts/contracts/shared/Registerable.sol/Registerable.json +11 -74
  135. package/artifacts/contracts/shared/RegistryLinked.sol/RegistryLinked.dbg.json +1 -1
  136. package/artifacts/contracts/shared/RegistryLinked.sol/RegistryLinked.json +2 -23
  137. package/artifacts/contracts/shared/Service.sol/Service.dbg.json +1 -1
  138. package/artifacts/contracts/shared/Service.sol/Service.json +13 -215
  139. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.dbg.json +1 -1
  140. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.json +2 -2
  141. package/artifacts/contracts/shared/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.dbg.json +1 -1
  142. package/artifacts/contracts/shared/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.json +2 -2
  143. package/artifacts/contracts/shared/Versionable.sol/Versionable.dbg.json +1 -1
  144. package/artifacts/contracts/shared/Versionable.sol/Versionable.json +0 -150
  145. package/artifacts/contracts/test/TestFee.sol/TestFee.dbg.json +1 -1
  146. package/artifacts/contracts/test/TestFee.sol/TestFee.json +2 -2
  147. package/artifacts/contracts/test/TestRegisterable.sol/TestRegisterable.dbg.json +1 -1
  148. package/artifacts/contracts/test/TestRegisterable.sol/TestRegisterable.json +11 -74
  149. package/artifacts/contracts/test/TestRoleId.sol/TestRoleId.dbg.json +1 -1
  150. package/artifacts/contracts/test/TestRoleId.sol/TestRoleId.json +2 -2
  151. package/artifacts/contracts/test/TestService.sol/TestService.dbg.json +1 -1
  152. package/artifacts/contracts/test/TestService.sol/TestService.json +31 -269
  153. package/artifacts/contracts/test/TestToken.sol/TestUsdc.dbg.json +1 -1
  154. package/artifacts/contracts/test/TestVersion.sol/TestVersion.dbg.json +1 -1
  155. package/artifacts/contracts/test/TestVersion.sol/TestVersion.json +2 -2
  156. package/artifacts/contracts/test/TestVersionable.sol/TestVersionable.dbg.json +1 -1
  157. package/artifacts/contracts/test/TestVersionable.sol/TestVersionable.json +6 -188
  158. package/artifacts/contracts/test/Usdc.sol/USDC.dbg.json +1 -1
  159. package/artifacts/contracts/types/AddressSet.sol/LibAddressSet.dbg.json +1 -1
  160. package/artifacts/contracts/types/Blocknumber.sol/BlocknumberLib.dbg.json +1 -1
  161. package/artifacts/contracts/types/Blocknumber.sol/BlocknumberLib.json +2 -2
  162. package/artifacts/contracts/types/ChainId.sol/ChainIdLib.dbg.json +1 -1
  163. package/artifacts/contracts/types/ClaimId.sol/ClaimIdLib.dbg.json +4 -0
  164. package/artifacts/contracts/types/ClaimId.sol/ClaimIdLib.json +100 -0
  165. package/artifacts/contracts/types/DistributorType.sol/DistributorTypeLib.dbg.json +1 -1
  166. package/artifacts/contracts/types/DistributorType.sol/DistributorTypeLib.json +2 -2
  167. package/artifacts/contracts/types/Fee.sol/FeeLib.dbg.json +1 -1
  168. package/artifacts/contracts/types/Fee.sol/FeeLib.json +2 -2
  169. package/artifacts/contracts/types/Key32.sol/Key32Lib.dbg.json +1 -1
  170. package/artifacts/contracts/types/Key32.sol/Key32Lib.json +2 -2
  171. package/artifacts/contracts/types/NftId.sol/NftIdLib.dbg.json +1 -1
  172. package/artifacts/contracts/types/NftId.sol/NftIdLib.json +17 -4
  173. package/artifacts/contracts/types/NftIdSet.sol/LibNftIdSet.dbg.json +1 -1
  174. package/artifacts/contracts/types/NftIdSet.sol/LibNftIdSet.json +2 -2
  175. package/artifacts/contracts/types/NumberId.sol/NumberIdLib.dbg.json +1 -1
  176. package/artifacts/contracts/types/ObjectType.sol/ObjectTypeLib.dbg.json +1 -1
  177. package/artifacts/contracts/types/ObjectType.sol/ObjectTypeLib.json +2 -2
  178. package/artifacts/contracts/types/PayoutId.sol/PayoutIdLib.dbg.json +4 -0
  179. package/artifacts/contracts/types/PayoutId.sol/PayoutIdLib.json +100 -0
  180. package/artifacts/contracts/types/Referral.sol/ReferralLib.dbg.json +1 -1
  181. package/artifacts/contracts/types/Referral.sol/ReferralLib.json +2 -2
  182. package/artifacts/contracts/types/RiskId.sol/RiskIdLib.dbg.json +1 -1
  183. package/artifacts/contracts/types/RiskId.sol/RiskIdLib.json +2 -2
  184. package/artifacts/contracts/types/RoleId.sol/RoleIdLib.dbg.json +1 -1
  185. package/artifacts/contracts/types/RoleId.sol/RoleIdLib.json +2 -2
  186. package/artifacts/contracts/types/Seconds.sol/SecondsLib.dbg.json +4 -0
  187. package/artifacts/contracts/types/Seconds.sol/SecondsLib.json +124 -0
  188. package/artifacts/contracts/types/StateId.sol/StateIdLib.dbg.json +1 -1
  189. package/artifacts/contracts/types/StateId.sol/StateIdLib.json +2 -2
  190. package/artifacts/contracts/types/Timestamp.sol/TimestampLib.dbg.json +1 -1
  191. package/artifacts/contracts/types/Timestamp.sol/TimestampLib.json +25 -7
  192. package/artifacts/contracts/types/UFixed.sol/MathLib.dbg.json +1 -1
  193. package/artifacts/contracts/types/UFixed.sol/MathLib.json +2 -2
  194. package/artifacts/contracts/types/UFixed.sol/UFixedLib.dbg.json +1 -1
  195. package/artifacts/contracts/types/UFixed.sol/UFixedLib.json +2 -2
  196. package/artifacts/contracts/types/Version.sol/VersionLib.dbg.json +1 -1
  197. package/artifacts/contracts/types/Version.sol/VersionLib.json +2 -2
  198. package/artifacts/contracts/types/Version.sol/VersionPartLib.dbg.json +1 -1
  199. package/artifacts/contracts/types/Version.sol/VersionPartLib.json +2 -2
  200. package/contracts/components/Component.sol +88 -83
  201. package/contracts/components/Distribution.sol +16 -31
  202. package/contracts/components/IComponent.sol +40 -16
  203. package/contracts/components/IDistributionComponent.sol +1 -22
  204. package/contracts/components/IPoolComponent.sol +73 -47
  205. package/contracts/components/IProductComponent.sol +3 -2
  206. package/contracts/components/Pool.sol +171 -126
  207. package/contracts/components/Product.sol +38 -23
  208. package/contracts/instance/BundleManager.sol +7 -5
  209. package/contracts/instance/IInstance.sol +10 -3
  210. package/contracts/instance/IInstanceService.sol +2 -1
  211. package/contracts/instance/Instance.sol +25 -11
  212. package/contracts/instance/InstanceReader.sol +4 -3
  213. package/contracts/instance/InstanceService.sol +59 -11
  214. package/contracts/instance/InstanceServiceManager.sol +1 -1
  215. package/contracts/instance/base/KeyValueStore.sol +5 -2
  216. package/contracts/instance/base/Lifecycle.sol +11 -2
  217. package/contracts/instance/module/IBundle.sol +2 -1
  218. package/contracts/instance/module/IComponents.sol +35 -0
  219. package/contracts/instance/module/IDistribution.sol +2 -0
  220. package/contracts/instance/module/IPolicy.sol +30 -3
  221. package/contracts/instance/module/ISetup.sol +23 -7
  222. package/contracts/instance/service/ApplicationService.sol +139 -57
  223. package/contracts/instance/service/ApplicationServiceManager.sol +35 -0
  224. package/contracts/instance/service/BundleService.sol +76 -38
  225. package/contracts/instance/service/BundleServiceManager.sol +1 -1
  226. package/contracts/instance/service/ClaimService.sol +151 -0
  227. package/contracts/instance/service/ClaimServiceManager.sol +35 -0
  228. package/contracts/instance/service/DistributionService.sol +133 -21
  229. package/contracts/instance/service/DistributionServiceManager.sol +1 -1
  230. package/contracts/instance/service/IApplicationService.sol +9 -9
  231. package/contracts/instance/service/IBundleService.sol +19 -11
  232. package/contracts/instance/service/IClaimService.sol +61 -0
  233. package/contracts/instance/service/IDistributionService.sol +23 -2
  234. package/contracts/instance/service/IPolicyService.sol +17 -35
  235. package/contracts/instance/service/IPoolService.sol +17 -2
  236. package/contracts/instance/service/PolicyService.sol +61 -175
  237. package/contracts/instance/service/PolicyServiceManager.sol +2 -2
  238. package/contracts/instance/service/PoolService.sol +72 -18
  239. package/contracts/instance/service/PoolServiceManager.sol +1 -1
  240. package/contracts/instance/service/ProductServiceManager.sol +2 -2
  241. package/contracts/registry/IRegistryService.sol +7 -7
  242. package/contracts/registry/RegistryService.sol +51 -45
  243. package/contracts/registry/RegistryServiceManager.sol +13 -13
  244. package/contracts/registry/ReleaseManager.sol +10 -19
  245. package/contracts/registry/TokenRegistry.sol +13 -10
  246. package/contracts/shared/ERC165.sol +2 -1
  247. package/contracts/shared/INftOwnable.sol +4 -9
  248. package/contracts/shared/IRegistryLinked.sol +0 -3
  249. package/contracts/shared/IService.sol +2 -0
  250. package/contracts/shared/IVersionable.sol +4 -47
  251. package/contracts/shared/NftOwnable.sol +10 -80
  252. package/contracts/shared/ProxyManager.sol +98 -24
  253. package/contracts/shared/Registerable.sol +3 -10
  254. package/contracts/shared/RegistryLinked.sol +10 -26
  255. package/contracts/shared/Service.sol +10 -12
  256. package/contracts/shared/TokenHandler.sol +11 -5
  257. package/contracts/shared/Versionable.sol +1 -90
  258. package/contracts/types/Blocknumber.sol +1 -0
  259. package/contracts/types/ClaimId.sol +52 -0
  260. package/contracts/types/Fee.sol +1 -0
  261. package/contracts/types/NftId.sol +8 -0
  262. package/contracts/types/ObjectType.sol +5 -4
  263. package/contracts/types/PayoutId.sol +54 -0
  264. package/contracts/types/RoleId.sol +10 -5
  265. package/contracts/types/Seconds.sol +54 -0
  266. package/contracts/types/StateId.sol +1 -0
  267. package/contracts/types/Timestamp.sol +13 -13
  268. package/contracts/types/UFixed.sol +1 -0
  269. package/contracts/types/Version.sol +1 -0
  270. package/package.json +1 -1
  271. package/artifacts/contracts/experiment/cloning/Cloner.sol/Cloner.dbg.json +0 -4
  272. package/artifacts/contracts/experiment/cloning/Cloner.sol/Cloner.json +0 -66
  273. package/artifacts/contracts/experiment/cloning/Cloner.sol/Mock1.dbg.json +0 -4
  274. package/artifacts/contracts/experiment/cloning/Cloner.sol/Mock1.json +0 -24
  275. package/artifacts/contracts/experiment/cloning/Cloner.sol/Mock2.dbg.json +0 -4
  276. package/artifacts/contracts/experiment/cloning/Cloner.sol/Mock2.json +0 -42
  277. package/artifacts/contracts/experiment/errors/Require.sol/Require.dbg.json +0 -4
  278. package/artifacts/contracts/experiment/errors/Require.sol/Require.json +0 -105
  279. package/artifacts/contracts/experiment/errors/Revert.sol/Revert.dbg.json +0 -4
  280. package/artifacts/contracts/experiment/errors/Revert.sol/Revert.json +0 -105
  281. package/artifacts/contracts/experiment/inheritance/A.sol/A.dbg.json +0 -4
  282. package/artifacts/contracts/experiment/inheritance/A.sol/A.json +0 -128
  283. package/artifacts/contracts/experiment/inheritance/A.sol/AShared.dbg.json +0 -4
  284. package/artifacts/contracts/experiment/inheritance/A.sol/AShared.json +0 -42
  285. package/artifacts/contracts/experiment/inheritance/B.sol/B.dbg.json +0 -4
  286. package/artifacts/contracts/experiment/inheritance/B.sol/B.json +0 -76
  287. package/artifacts/contracts/experiment/inheritance/C.sol/C.dbg.json +0 -4
  288. package/artifacts/contracts/experiment/inheritance/C.sol/C.json +0 -89
  289. package/artifacts/contracts/experiment/inheritance/IA.sol/IA.dbg.json +0 -4
  290. package/artifacts/contracts/experiment/inheritance/IA.sol/IA.json +0 -128
  291. package/artifacts/contracts/experiment/inheritance/IA.sol/ISharedA.dbg.json +0 -4
  292. package/artifacts/contracts/experiment/inheritance/IA.sol/ISharedA.json +0 -37
  293. package/artifacts/contracts/experiment/inheritance/IB.sol/IB.dbg.json +0 -4
  294. package/artifacts/contracts/experiment/inheritance/IB.sol/IB.json +0 -50
  295. package/artifacts/contracts/experiment/inheritance/IC.sol/IC.dbg.json +0 -4
  296. package/artifacts/contracts/experiment/inheritance/IC.sol/IC.json +0 -63
  297. package/artifacts/contracts/experiment/statemachine/Dummy.sol/LifeCycleModule.dbg.json +0 -4
  298. package/artifacts/contracts/experiment/statemachine/Dummy.sol/LifeCycleModule.json +0 -59
  299. package/artifacts/contracts/experiment/statemachine/ISM.sol/ISM.dbg.json +0 -4
  300. package/artifacts/contracts/experiment/statemachine/ISM.sol/ISM.json +0 -124
  301. package/artifacts/contracts/experiment/statemachine/ISM.sol/ISMEE.dbg.json +0 -4
  302. package/artifacts/contracts/experiment/statemachine/ISM.sol/ISMEE.json +0 -74
  303. package/artifacts/contracts/experiment/statemachine/SM.sol/SM.dbg.json +0 -4
  304. package/artifacts/contracts/experiment/statemachine/SM.sol/SM.json +0 -124
  305. package/artifacts/contracts/experiment/statemachine/SimpleStateMachine.sol/SimpleStateMachine.dbg.json +0 -4
  306. package/artifacts/contracts/experiment/statemachine/SimpleStateMachine.sol/SimpleStateMachine.json +0 -207
  307. package/artifacts/contracts/experiment/types/TypeA.sol/TypeALib.dbg.json +0 -4
  308. package/artifacts/contracts/experiment/types/TypeA.sol/TypeALib.json +0 -10
  309. package/artifacts/contracts/experiment/types/TypeB.sol/TypeBLib.dbg.json +0 -4
  310. package/artifacts/contracts/experiment/types/TypeB.sol/TypeBLib.json +0 -10
  311. package/contracts/experiment/cloning/Cloner.sol +0 -47
  312. package/contracts/experiment/errors/Require.sol +0 -38
  313. package/contracts/experiment/errors/Revert.sol +0 -44
  314. package/contracts/experiment/inheritance/A.sol +0 -53
  315. package/contracts/experiment/inheritance/B.sol +0 -28
  316. package/contracts/experiment/inheritance/C.sol +0 -34
  317. package/contracts/experiment/inheritance/IA.sol +0 -13
  318. package/contracts/experiment/inheritance/IB.sol +0 -10
  319. package/contracts/experiment/inheritance/IC.sol +0 -12
  320. package/contracts/experiment/statemachine/Dummy.sol +0 -27
  321. package/contracts/experiment/statemachine/ISM.sol +0 -25
  322. package/contracts/experiment/statemachine/SM.sol +0 -57
  323. package/contracts/experiment/statemachine/SimpleStateMachine.sol +0 -31
  324. package/contracts/experiment/types/TypeA.sol +0 -47
  325. package/contracts/experiment/types/TypeB.sol +0 -29
@@ -18,8 +18,6 @@ contract Registerable is
18
18
  // keccak256(abi.encode(uint256(keccak256("gif-next.contracts.shared.Registerable.sol")) - 1)) & ~bytes32(uint256(0xff));
19
19
  bytes32 public constant REGISTERABLE_LOCATION_V1 = 0x6548007c3f4340f82f348c576c0ff69f4f529cadd5ad41f96aae61abceeaa300;
20
20
 
21
- error ErrorRegisterableNotRegistry(address registryAddress);
22
-
23
21
  struct RegisterableStorage {
24
22
  NftId _parentNftId;
25
23
  ObjectType _objectType;
@@ -39,7 +37,7 @@ contract Registerable is
39
37
  ObjectType objectType,
40
38
  bool isInterceptor,
41
39
  address initialOwner,
42
- bytes memory data
40
+ bytes memory registryData // writeonly data that will saved in the object info record of the registry
43
41
  )
44
42
  public
45
43
  virtual
@@ -49,16 +47,11 @@ contract Registerable is
49
47
  initialOwner,
50
48
  registryAddress);
51
49
 
52
- // TODO check parentNftId -> registry.isRegistered(parentNftId)
53
- // TODO check object-parent type pair -> registry.isValidTypeCombo() or something...verify with registry that setup will be able to register...
54
-
55
50
  RegisterableStorage storage $ = _getRegisterableStorage();
56
51
  $._parentNftId = parentNftId;
57
52
  $._objectType = objectType;
58
53
  $._isInterceptor = isInterceptor;
59
- $._data = data;
60
-
61
- registerInterface(type(IRegisterable).interfaceId);
54
+ $._data = registryData;
62
55
  }
63
56
 
64
57
 
@@ -75,7 +68,7 @@ contract Registerable is
75
68
  $._objectType,
76
69
  $._isInterceptor,
77
70
  address(this),
78
- getInitialOwner(),
71
+ getOwner(),
79
72
  $._data);
80
73
  }
81
74
  }
@@ -21,32 +21,6 @@ contract RegistryLinked is
21
21
  virtual
22
22
  onlyInitializing()
23
23
  {
24
- _setRegistry(registryAddress);
25
- }
26
-
27
-
28
- function getRegistry() public view returns (IRegistry) {
29
- return _registry;
30
- }
31
-
32
-
33
- function getRegistryAddress() public view returns (address) {
34
- return address(_registry);
35
- }
36
-
37
-
38
- function _setRegistry(address registryAddress)
39
- internal
40
- {
41
-
42
- if (address(_registry) != address(0)) {
43
- revert ErrorRegistryAlreadyInitialized(address(_registry));
44
- }
45
-
46
- if (registryAddress == address(0)) {
47
- revert ErrorRegistryAddressZero();
48
- }
49
-
50
24
  if (registryAddress.code.length == 0) {
51
25
  revert ErrorNotRegistry(registryAddress);
52
26
  }
@@ -61,4 +35,14 @@ contract RegistryLinked is
61
35
  revert ErrorNotRegistry(registryAddress);
62
36
  }
63
37
  }
38
+
39
+
40
+ function getRegistry() public view returns (IRegistry) {
41
+ return _registry;
42
+ }
43
+
44
+
45
+ function getRegistryAddress() public view returns (address) {
46
+ return address(_registry);
47
+ }
64
48
  }
@@ -3,7 +3,7 @@ pragma solidity ^0.8.19;
3
3
 
4
4
  import {ObjectType, SERVICE} from "../types/ObjectType.sol";
5
5
  import {NftId, zeroNftId} from "../types/NftId.sol";
6
- import {Version, VersionPart, VersionLib} from "../types/Version.sol";
6
+ import {Version, VersionPart, VersionLib, VersionPartLib} from "../types/Version.sol";
7
7
 
8
8
  import {Versionable} from "./Versionable.sol";
9
9
  import {IService} from "./IService.sol";
@@ -22,8 +22,9 @@ abstract contract Service is
22
22
  {
23
23
  function getDomain() public pure virtual override returns(ObjectType);
24
24
 
25
+ // version major version MUST be consistent with major version of getVersion()
25
26
  function getMajorVersion() public view virtual override returns(VersionPart majorVersion) {
26
- return getVersion().toMajorPart();
27
+ return VersionPartLib.toVersionPart(3);
27
28
  }
28
29
 
29
30
  // from Versionable
@@ -44,17 +45,14 @@ abstract contract Service is
44
45
  virtual
45
46
  onlyInitializing()
46
47
  {
47
- // service must provide its name and version upon registration
48
- bytes memory data = abi.encode(getDomain(), getMajorVersion());
49
- NftId registryNftId = _getRegistryNftId(registry);
50
- bool isInterceptor = false;
48
+ initializeRegisterable(
49
+ registry,
50
+ IRegistry(registry).getNftId(),
51
+ SERVICE(),
52
+ false, // is interceptor
53
+ initialOwner,
54
+ ""); // data
51
55
 
52
- initializeRegisterable(registry, registryNftId, SERVICE(), isInterceptor, initialOwner, data);
53
56
  registerInterface(type(IService).interfaceId);
54
57
  }
55
-
56
- // this is just a conveniene function, actual validation will be done upon registration
57
- function _getRegistryNftId(address registryAddress) internal view returns (NftId) {
58
- return IRegistry(registryAddress).getNftId(registryAddress);
59
- }
60
58
  }
@@ -4,6 +4,8 @@ pragma solidity ^0.8.20;
4
4
  import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
5
5
  import {SafeERC20} from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
6
6
 
7
+ /// @dev token specific transfer helper
8
+ /// relies internally on oz SafeERC20.safeTransferFrom
7
9
  contract TokenHandler {
8
10
  IERC20Metadata private _token;
9
11
 
@@ -11,17 +13,21 @@ contract TokenHandler {
11
13
  _token = IERC20Metadata(token);
12
14
  }
13
15
 
14
- // TODO add logging
15
16
  function transfer(
16
17
  address from,
17
18
  address to,
18
- uint256 amount // TODO add authz (only treasury/instance/product/pool/ service)
19
- ) external {
19
+ uint256 amount
20
+ )
21
+ external
22
+ {
20
23
  SafeERC20.safeTransferFrom(_token, from, to, amount);
21
- // _token.transferFrom(from, to, amount);
22
24
  }
23
25
 
24
- function getToken() external view returns (IERC20Metadata) {
26
+ function getToken()
27
+ external
28
+ view
29
+ returns (IERC20Metadata)
30
+ {
25
31
  return _token;
26
32
  }
27
33
  }
@@ -3,84 +3,39 @@ pragma solidity ^0.8.20;
3
3
 
4
4
  import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
5
5
 
6
- import {Blocknumber, blockNumber} from "../types/Blocknumber.sol";
7
- import {Timestamp, TimestampLib} from "../types/Timestamp.sol";
8
- import {Version, VersionPart, VersionLib} from "../types/Version.sol";
9
-
10
6
  import {IVersionable} from "./IVersionable.sol";
11
-
7
+ import {Version, VersionLib} from "../types/Version.sol";
12
8
 
13
9
 
14
10
  abstract contract Versionable is
15
11
  Initializable,
16
12
  IVersionable
17
13
  {
18
- // keccak256(abi.encode(uint256(keccak256("gif-next.contracts.shared.Versionable.sol")) - 1)) & ~bytes32(uint256(0xff))
19
- bytes32 private constant VERSIONABLE_LOCATION_V1 = 0x4f61291a8ac3d020d0a7d919a76b8592aa88385744dee3f8b4f3873b969ed900;
20
-
21
-
22
- /// @custom:storage-location erc7201:gif-next.contracts.shared.Versionable.sol
23
- struct VersionableStorage {
24
- mapping(Version version => VersionInfo info) _versionHistory;
25
- Version [] _versions;
26
- Version _v1;
27
- }
28
-
29
-
30
14
  constructor() {
31
15
  _disableInitializers();
32
16
  }
33
- // TODO write test where new version of private _updateVersionHistory is added and used...
34
17
 
35
18
  function initializeVersionable(
36
- address implementation,
37
19
  address activatedBy,
38
20
  bytes memory data
39
21
  )
40
22
  public
41
23
  initializer
42
24
  {
43
- _updateVersionHistory(implementation, activatedBy);
44
25
  _initialize(activatedBy, data);
45
26
  }
46
27
 
47
- // TODO activatedBy MUST ALWAYS be an owner?
48
28
  function upgradeVersionable(
49
- address implementation,
50
- address activatedBy,
51
29
  bytes memory data
52
30
  )
53
31
  external
54
32
  reinitializer(VersionLib.toUint64(getVersion()))
55
33
  {
56
- _updateVersionHistory(implementation, activatedBy);
57
34
  _upgrade(data);
58
35
  }
59
36
 
60
- function isInitialized(Version _version) public override view returns(bool) {
61
- return _getVersionableStorage()._versionHistory[_version].activatedIn.toInt() > 0;
62
- }
63
-
64
37
  function getVersion() public pure virtual returns(Version);
65
38
 
66
- function getVersionCount() public view override returns(uint256) {
67
- return _getVersionableStorage()._versions.length;
68
- }
69
-
70
- function getVersion(uint256 idx) public view override returns(Version) {
71
- return _getVersionableStorage()._versions[idx];
72
- }
73
-
74
- function getVersionInfo(Version _version) public override view returns(VersionInfo memory) {
75
- return _getVersionableStorage()._versionHistory[_version];
76
- }
77
-
78
- function getInitializedVersion() public view returns(uint64) {
79
- return _getInitializedVersion();
80
- }
81
-
82
-
83
-
84
39
  // IMPORTANT each version must implement this function
85
40
  // each implementation MUST use onlyInitialising modifier
86
41
  // each implementation MUST call intializers of all base contracts...
@@ -92,7 +47,6 @@ abstract contract Versionable is
92
47
  revert();
93
48
  }
94
49
 
95
-
96
50
  // IMPORTANT each version except version "1" must implement this function
97
51
  // each implementation MUST use onlyInitialising modifier
98
52
  function _upgrade(bytes memory data)
@@ -102,47 +56,4 @@ abstract contract Versionable is
102
56
  {
103
57
  revert();
104
58
  }
105
-
106
- function _getVersionableStorage() private pure returns (VersionableStorage storage $) {
107
- assembly {
108
- $.slot := VERSIONABLE_LOCATION_V1
109
- }
110
- }
111
-
112
- // can only be called once per contract
113
- // needs to be called inside the proxy upgrade tx
114
- // TODO run reinitializer(version().toUint64()) modifier after "version()" is checked,
115
- function _updateVersionHistory(
116
- address implementation,
117
- address activatedBy
118
- )
119
- private
120
- onlyInitializing
121
- {
122
- VersionableStorage storage $ = _getVersionableStorage();
123
-
124
- uint64 version = _getInitializedVersion();
125
-
126
- Version thisVersion = getVersion();
127
-
128
- if(version == 1) {
129
- // thisVersion is alias to version "1"
130
- $._v1 = thisVersion;
131
- }
132
- else {
133
- require(thisVersion > $._v1, "INVALID VERSION");
134
- }
135
-
136
- // update version history
137
- $._versions.push(thisVersion);
138
- $._versionHistory[thisVersion] = VersionInfo(
139
- thisVersion,
140
- implementation,
141
- activatedBy,
142
- TimestampLib.blockTimestamp(),
143
- blockNumber()
144
- );
145
-
146
- emit LogVersionableInitialized(thisVersion, implementation, activatedBy);
147
- }
148
59
  }
@@ -52,6 +52,7 @@ function blockBlocknumber() view returns (Blocknumber) {
52
52
  return toBlocknumber(block.number);
53
53
  }
54
54
 
55
+ // TODO move to BlocknumberLib and rename to zero()
55
56
  /// @dev Return the Blocknumber zero (0)
56
57
  function zeroBlocknumber() pure returns (Blocknumber) {
57
58
  return toBlocknumber(0);
@@ -0,0 +1,52 @@
1
+ // SPDX-License-Identifier: Apache-2.0
2
+ pragma solidity ^0.8.20;
3
+
4
+ // uint16 allows for 65'535 claims per policy
5
+ type ClaimId is uint16;
6
+
7
+ // type bindings
8
+ using {
9
+ eqClaimId as ==,
10
+ neClaimId as !=,
11
+ ClaimIdLib.eqz,
12
+ ClaimIdLib.gtz,
13
+ ClaimIdLib.toInt
14
+ } for ClaimId global;
15
+
16
+
17
+ // pure free functions for operators
18
+ function eqClaimId(ClaimId a, ClaimId b) pure returns (bool isSame) {
19
+ return ClaimId.unwrap(a) == ClaimId.unwrap(b);
20
+ }
21
+
22
+ function neClaimId(ClaimId a, ClaimId b) pure returns (bool isDifferent) {
23
+ return ClaimId.unwrap(a) != ClaimId.unwrap(b);
24
+ }
25
+
26
+ // library functions that operate on user defined type
27
+ library ClaimIdLib {
28
+ /// @dev Converts the ClaimId to a uint.
29
+ function zero() public pure returns (ClaimId) {
30
+ return ClaimId.wrap(0);
31
+ }
32
+
33
+ /// @dev Converts an uint into a ClaimId.
34
+ function toClaimId(uint256 a) public pure returns (ClaimId) {
35
+ return ClaimId.wrap(uint16(a));
36
+ }
37
+
38
+ /// @dev Converts the ClaimId to a uint.
39
+ function toInt(ClaimId a) public pure returns (uint16) {
40
+ return uint16(ClaimId.unwrap(a));
41
+ }
42
+
43
+ /// @dev Returns true if the value is non-zero (> 0).
44
+ function gtz(ClaimId a) public pure returns (bool) {
45
+ return ClaimId.unwrap(a) > 0;
46
+ }
47
+
48
+ /// @dev Returns true if the value is zero (== 0).
49
+ function eqz(ClaimId a) public pure returns (bool) {
50
+ return ClaimId.unwrap(a) == 0;
51
+ }
52
+ }
@@ -40,6 +40,7 @@ library FeeLib {
40
40
  return Fee(UFixedLib.toUFixed(percent, -2), 0);
41
41
  }
42
42
 
43
+ // TODO rename to zero
43
44
  /// @dev Return a zero fee struct (0, 0)
44
45
  function zeroFee() public pure returns (Fee memory fee) {
45
46
  return Fee(UFixed.wrap(0), 0);
@@ -24,6 +24,7 @@ function toNftId(uint256 id) pure returns (NftId) {
24
24
  return NftId.wrap(uint96(id));
25
25
  }
26
26
 
27
+ // TODO move to NftIdLib and rename to zero()
27
28
  /// @dev Return the NftId zero (0)
28
29
  function zeroNftId() pure returns (NftId) {
29
30
  return NftId.wrap(0);
@@ -40,6 +41,13 @@ function neNftId(NftId a, NftId b) pure returns (bool isDifferent) {
40
41
 
41
42
  // library functions that operate on user defined type
42
43
  library NftIdLib {
44
+
45
+ /// @dev the zero nft id
46
+ /// is never a valid nft id and implies a non-initialized value
47
+ function zero() public pure returns (NftId) {
48
+ return NftId.wrap(0);
49
+ }
50
+
43
51
  /// @dev Converts the NftId to a uint256.
44
52
  function toInt(NftId nftId) public pure returns (uint96) {
45
53
  return uint96(NftId.unwrap(nftId));
@@ -98,12 +98,12 @@ function POLICY() pure returns (ObjectType) {
98
98
  return toObjectType(211);
99
99
  }
100
100
 
101
- function BUNDLE() pure returns (ObjectType) {
102
- return toObjectType(220);
101
+ function CLAIM() pure returns (ObjectType) {
102
+ return toObjectType(212);
103
103
  }
104
104
 
105
- function CLAIM() pure returns (ObjectType) {
106
- return toObjectType(211);
105
+ function BUNDLE() pure returns (ObjectType) {
106
+ return toObjectType(220);
107
107
  }
108
108
 
109
109
  function PAYOUT() pure returns (ObjectType) {
@@ -115,6 +115,7 @@ function toObjectType(uint256 objectType) pure returns (ObjectType) {
115
115
  return ObjectType.wrap(uint8(objectType));
116
116
  }
117
117
 
118
+ // TODO move to ObjecTypeLib and rename to zero()
118
119
  /// @dev Return the ObjectType zero (0)
119
120
  function zeroObjectType() pure returns (ObjectType) {
120
121
  return ObjectType.wrap(0);
@@ -0,0 +1,54 @@
1
+ // SPDX-License-Identifier: Apache-2.0
2
+ pragma solidity ^0.8.20;
3
+
4
+ // uint24 allows for 65'535 claims with 255 payouts each per policy
5
+ type PayoutId is uint24;
6
+
7
+ // type bindings
8
+ using {
9
+ eqPayoutId as ==,
10
+ nePayoutId as !=,
11
+ PayoutIdLib.eqz,
12
+ PayoutIdLib.gtz,
13
+ PayoutIdLib.toInt
14
+ } for PayoutId global;
15
+
16
+
17
+ // pure free functions for operators
18
+ function eqPayoutId(PayoutId a, PayoutId b) pure returns (bool isSame) {
19
+ return PayoutId.unwrap(a) == PayoutId.unwrap(b);
20
+ }
21
+
22
+ function nePayoutId(PayoutId a, PayoutId b) pure returns (bool isDifferent) {
23
+ return PayoutId.unwrap(a) != PayoutId.unwrap(b);
24
+ }
25
+
26
+ // TODO come up with a way to code claim id into payout id
27
+ // eg payoutId.getClaimId(), payoutId.getPayoutNo()
28
+ // library functions that operate on user defined type
29
+ library PayoutIdLib {
30
+ /// @dev Converts the PayoutId to a uint.
31
+ function zero() public pure returns (PayoutId) {
32
+ return PayoutId.wrap(0);
33
+ }
34
+
35
+ /// @dev Converts an uint into a PayoutId.
36
+ function toPayoutId(uint256 a) public pure returns (PayoutId) {
37
+ return PayoutId.wrap(uint24(a));
38
+ }
39
+
40
+ /// @dev Converts the PayoutId to a uint.
41
+ function toInt(PayoutId a) public pure returns (uint24) {
42
+ return uint24(PayoutId.unwrap(a));
43
+ }
44
+
45
+ /// @dev Returns true if the value is non-zero (> 0).
46
+ function gtz(PayoutId a) public pure returns (bool) {
47
+ return PayoutId.unwrap(a) > 0;
48
+ }
49
+
50
+ /// @dev Returns true if the value is zero (== 0).
51
+ function eqz(PayoutId a) public pure returns (bool) {
52
+ return PayoutId.unwrap(a) == 0;
53
+ }
54
+ }
@@ -16,28 +16,33 @@ using {
16
16
  RoleIdLib.toKey32
17
17
  } for RoleId global;
18
18
 
19
+
20
+ /// @dev role id needs to match with oz AccessManager.ADMIN_ROLE
21
+ function ADMIN_ROLE() pure returns (RoleId) { return RoleIdLib.toRoleId(type(uint64).min); }
22
+
23
+ /// @dev role id needs to match with oz AccessManager.PUBLIC_ROLE
24
+ function PUBLIC_ROLE() pure returns (RoleId) { return RoleIdLib.toRoleId(type(uint64).max); }
25
+
19
26
  // general pure free functions
20
27
  function DISTRIBUTION_OWNER_ROLE_NAME() pure returns (string memory) { return "DistributionOwnerRole"; }
21
28
  function ORACLE_OWNER_ROLE_NAME() pure returns (string memory) { return "OracleOwnerRole"; }
22
29
  function POOL_OWNER_ROLE_NAME() pure returns (string memory) { return "PoolOwnerRole"; }
23
30
  function PRODUCT_OWNER_ROLE_NAME() pure returns (string memory) { return "ProductOwnerRole"; }
24
31
 
25
- function ADMIN_ROLE() pure returns (RoleId) { return RoleIdLib.toRoleId(0); }
26
-
27
32
  function DISTRIBUTION_OWNER_ROLE() pure returns (RoleId) { return RoleIdLib.toRoleId(100); }
28
33
  function ORACLE_OWNER_ROLE() pure returns (RoleId) { return RoleIdLib.toRoleId(200); }
29
34
  function POOL_OWNER_ROLE() pure returns (RoleId) { return RoleIdLib.toRoleId(300); }
30
35
  function PRODUCT_OWNER_ROLE() pure returns (RoleId) { return RoleIdLib.toRoleId(400); }
31
36
 
32
-
33
37
  function INSTANCE_SERVICE_ROLE() pure returns (RoleId) { return RoleIdLib.toRoleId(2000); }
34
38
  function DISTRIBUTION_SERVICE_ROLE() pure returns (RoleId) { return RoleIdLib.toRoleId(2100); }
35
39
  function POOL_SERVICE_ROLE() pure returns (RoleId) { return RoleIdLib.toRoleId(2200); }
36
40
  function PRODUCT_SERVICE_ROLE() pure returns (RoleId) { return RoleIdLib.toRoleId(2300); }
37
- function POLICY_SERVICE_ROLE() pure returns (RoleId) { return RoleIdLib.toRoleId(2400); }
41
+ function APPLICATION_SERVICE_ROLE() pure returns (RoleId) { return RoleIdLib.toRoleId(2400); }
42
+ function POLICY_SERVICE_ROLE() pure returns (RoleId) { return RoleIdLib.toRoleId(2410); }
43
+ function CLAIM_SERVICE_ROLE() pure returns (RoleId) { return RoleIdLib.toRoleId(2420); }
38
44
  function BUNDLE_SERVICE_ROLE() pure returns (RoleId) { return RoleIdLib.toRoleId(2500); }
39
45
 
40
-
41
46
  function GIF_ADMIN_ROLE() pure returns (RoleId) { return RoleIdLib.toRoleId(1500); }
42
47
  function GIF_MANAGER_ROLE() pure returns (RoleId) { return RoleIdLib.toRoleId(1600); }
43
48
  function RELEASE_MANAGER_ROLE() pure returns (RoleId) { return RoleIdLib.toRoleId(1700); }
@@ -0,0 +1,54 @@
1
+ // SPDX-License-Identifier: Apache-2.0
2
+ pragma solidity ^0.8.20;
3
+
4
+ type Seconds is uint40;
5
+
6
+ using {
7
+ SecondsLib.eqz,
8
+ SecondsLib.gtz,
9
+ SecondsLib.toInt
10
+ } for Seconds global;
11
+
12
+
13
+ library SecondsLib {
14
+
15
+ error ErrorSecondsLibDurationTooBig(uint256 duration);
16
+
17
+ function zero() public pure returns (Seconds) {
18
+ return Seconds.wrap(0);
19
+ }
20
+
21
+ function max() public pure returns (Seconds) {
22
+ return Seconds.wrap(_max());
23
+ }
24
+
25
+ /// @dev converts the uint duration into Seconds
26
+ /// function reverts if duration is exceeding max Seconds value
27
+ function toSeconds(uint256 duration) public pure returns (Seconds) {
28
+ // if(duration > type(uint40).max) {
29
+ if(duration > _max()) {
30
+ revert ErrorSecondsLibDurationTooBig(duration);
31
+ }
32
+
33
+ return Seconds.wrap(uint40(duration));
34
+ }
35
+
36
+ /// @dev return true if duration equals 0
37
+ function eqz(Seconds duration) public pure returns (bool) {
38
+ return Seconds.unwrap(duration) == 0;
39
+ }
40
+
41
+ /// @dev return true if duration is larger than 0
42
+ function gtz(Seconds duration) public pure returns (bool) {
43
+ return Seconds.unwrap(duration) > 0;
44
+ }
45
+
46
+ function toInt(Seconds duration) public pure returns (uint256) {
47
+ return uint256(uint40(Seconds.unwrap(duration)));
48
+ }
49
+
50
+ function _max() internal pure returns (uint40) {
51
+ // IMPORTANT: type nees to match with actual definition for Seconds
52
+ return type(uint40).max;
53
+ }
54
+ }
@@ -67,6 +67,7 @@ function toStateId(uint256 id) pure returns (StateId) {
67
67
  return StateId.wrap(uint8(id));
68
68
  }
69
69
 
70
+ // TODO move to StateIdLib and rename to zero()
70
71
  /// @dev Return the StateId zero (0)
71
72
  function zeroStateId() pure returns (StateId) {
72
73
  return StateId.wrap(0);
@@ -1,5 +1,7 @@
1
1
  // SPDX-License-Identifier: Apache-2.0
2
- pragma solidity ^0.8.19;
2
+ pragma solidity ^0.8.20;
3
+
4
+ import {Seconds} from "./Seconds.sol";
3
5
 
4
6
  type Timestamp is uint40;
5
7
 
@@ -12,7 +14,8 @@ using {
12
14
  neTimestamp as !=,
13
15
  TimestampLib.gtz,
14
16
  TimestampLib.eqz,
15
- TimestampLib.addSeconds
17
+ TimestampLib.addSeconds,
18
+ TimestampLib.toInt
16
19
  } for Timestamp global;
17
20
 
18
21
  /// @dev return true if Timestamp a is after Timestamp b
@@ -50,10 +53,7 @@ function toTimestamp(uint256 timestamp) pure returns (Timestamp) {
50
53
  return Timestamp.wrap(uint40(timestamp));
51
54
  }
52
55
 
53
- // function blockTimestamp() view returns (Timestamp) {
54
- // return toTimestamp(block.timestamp);
55
- // }
56
-
56
+ // TODO move to TimestampLib and rename to zero()
57
57
  /// @dev Return the Timestamp zero (0)
58
58
  function zeroTimestamp() pure returns (Timestamp) {
59
59
  return toTimestamp(0);
@@ -103,22 +103,22 @@ library TimestampLib {
103
103
  return neTimestamp(a, b);
104
104
  }
105
105
 
106
- /// @dev return true if Timestamp is larger than 0
107
- function gtz(Timestamp timestamp) public pure returns (bool) {
108
- return Timestamp.unwrap(timestamp) > 0;
109
- }
110
-
111
106
  /// @dev return true if Timestamp equals 0
112
107
  function eqz(Timestamp timestamp) public pure returns (bool) {
113
108
  return Timestamp.unwrap(timestamp) == 0;
114
109
  }
115
110
 
111
+ /// @dev return true if Timestamp is larger than 0
112
+ function gtz(Timestamp timestamp) public pure returns (bool) {
113
+ return Timestamp.unwrap(timestamp) > 0;
114
+ }
115
+
116
116
  /// @dev return true if Timestamp a is not equal to Timestamp b
117
117
  function addSeconds(
118
118
  Timestamp timestamp,
119
- uint256 timeDelta
119
+ Seconds duration
120
120
  ) public pure returns (Timestamp) {
121
- return toTimestamp(Timestamp.unwrap(timestamp) + uint40(timeDelta));
121
+ return toTimestamp(Timestamp.unwrap(timestamp) + duration.toInt());
122
122
  }
123
123
 
124
124
  function toInt(Timestamp timestamp) public pure returns (uint256) {
@@ -19,6 +19,7 @@ using {
19
19
  UFixedLib.gtz
20
20
  } for UFixed global;
21
21
 
22
+ // TODO move to UFixedLib and rename to zero()
22
23
  function zeroUFixed() pure returns (UFixed zero) {
23
24
  return UFixed.wrap(0);
24
25
  }
@@ -101,6 +101,7 @@ library VersionLib {
101
101
  return Version.wrap(uint24(versionNumber));
102
102
  }
103
103
 
104
+ // TODO rename to zero()
104
105
  function zeroVersion() external pure returns(Version) {
105
106
  return Version.wrap(0);
106
107
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@etherisc/gif-next",
3
- "version": "0.0.2-2a59cd5-352",
3
+ "version": "0.0.2-2af39ab-356",
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": {