@etherisc/gif-next 0.0.2-bfb44e0-483 → 0.0.2-c0b400a-177

Sign up to get free protection for your applications and to get access to all the features.
Files changed (344) 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 +80 -145
  4. package/artifacts/contracts/components/Distribution.sol/Distribution.dbg.json +1 -1
  5. package/artifacts/contracts/components/Distribution.sol/Distribution.json +125 -239
  6. package/artifacts/contracts/components/IComponent.sol/IComponent.dbg.json +1 -1
  7. package/artifacts/contracts/components/IComponent.sol/IComponent.json +77 -92
  8. package/artifacts/contracts/components/IDistributionComponent.sol/IDistributionComponent.dbg.json +1 -1
  9. package/artifacts/contracts/components/IDistributionComponent.sol/IDistributionComponent.json +102 -183
  10. package/artifacts/contracts/components/IPoolComponent.sol/IPoolComponent.dbg.json +1 -1
  11. package/artifacts/contracts/components/IPoolComponent.sol/IPoolComponent.json +261 -201
  12. package/artifacts/contracts/components/IProductComponent.sol/IProductComponent.dbg.json +1 -1
  13. package/artifacts/contracts/components/IProductComponent.sol/IProductComponent.json +81 -164
  14. package/artifacts/contracts/components/Pool.sol/Pool.dbg.json +1 -1
  15. package/artifacts/contracts/components/Pool.sol/Pool.json +278 -288
  16. package/artifacts/contracts/components/Product.sol/Product.dbg.json +1 -1
  17. package/artifacts/contracts/components/Product.sol/Product.json +85 -218
  18. package/artifacts/contracts/instance/AccessManagerUpgradeableInitializeable.sol/AccessManagerUpgradeableInitializeable.dbg.json +4 -0
  19. package/artifacts/contracts/instance/AccessManagerUpgradeableInitializeable.sol/AccessManagerUpgradeableInitializeable.json +1206 -0
  20. package/artifacts/contracts/instance/BundleManager.sol/BundleManager.dbg.json +1 -1
  21. package/artifacts/contracts/instance/BundleManager.sol/BundleManager.json +64 -50
  22. package/artifacts/contracts/instance/Cloneable.sol/Cloneable.dbg.json +1 -1
  23. package/artifacts/contracts/instance/Cloneable.sol/Cloneable.json +5 -0
  24. package/artifacts/contracts/instance/IInstance.sol/IInstance.dbg.json +1 -1
  25. package/artifacts/contracts/instance/IInstance.sol/IInstance.json +496 -536
  26. package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.dbg.json +1 -1
  27. package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.json +105 -212
  28. package/artifacts/contracts/instance/Instance.sol/Instance.dbg.json +1 -1
  29. package/artifacts/contracts/instance/Instance.sol/Instance.json +567 -621
  30. package/artifacts/contracts/instance/InstanceAccessManager.sol/InstanceAccessManager.dbg.json +1 -1
  31. package/artifacts/contracts/instance/InstanceAccessManager.sol/InstanceAccessManager.json +448 -121
  32. package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.dbg.json +1 -1
  33. package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.json +120 -227
  34. package/artifacts/contracts/instance/InstanceService.sol/InstanceService.dbg.json +1 -1
  35. package/artifacts/contracts/instance/InstanceService.sol/InstanceService.json +170 -397
  36. package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.dbg.json +1 -1
  37. package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.json +207 -116
  38. package/artifacts/contracts/instance/ObjectManager.sol/ObjectManager.dbg.json +1 -1
  39. package/artifacts/contracts/instance/ObjectManager.sol/ObjectManager.json +8 -13
  40. package/artifacts/contracts/instance/base/ComponentService.sol/ComponentService.dbg.json +1 -1
  41. package/artifacts/contracts/instance/base/ComponentService.sol/ComponentService.json +18 -220
  42. package/artifacts/contracts/instance/base/IKeyValueStore.sol/IKeyValueStore.dbg.json +1 -1
  43. package/artifacts/contracts/instance/base/ILifecycle.sol/ILifecycle.dbg.json +1 -1
  44. package/artifacts/contracts/instance/base/KeyValueStore.sol/KeyValueStore.dbg.json +1 -1
  45. package/artifacts/contracts/instance/base/KeyValueStore.sol/KeyValueStore.json +40 -10
  46. package/artifacts/contracts/instance/base/Lifecycle.sol/Lifecycle.dbg.json +1 -1
  47. package/artifacts/contracts/instance/base/Lifecycle.sol/Lifecycle.json +36 -11
  48. package/artifacts/contracts/instance/module/IAccess.sol/IAccess.dbg.json +1 -1
  49. package/artifacts/contracts/instance/module/IAccess.sol/IAccess.json +54 -71
  50. package/artifacts/contracts/instance/module/IBundle.sol/IBundle.dbg.json +1 -1
  51. package/artifacts/contracts/instance/module/IComponents.sol/IComponents.dbg.json +4 -0
  52. package/artifacts/contracts/instance/module/IComponents.sol/IComponents.json +10 -0
  53. package/artifacts/contracts/instance/module/IDistribution.sol/IDistribution.dbg.json +1 -1
  54. package/artifacts/contracts/instance/module/IPolicy.sol/IPolicy.dbg.json +1 -1
  55. package/artifacts/contracts/instance/module/IRisk.sol/IRisk.dbg.json +1 -1
  56. package/artifacts/contracts/instance/module/ISetup.sol/ISetup.dbg.json +1 -1
  57. package/artifacts/contracts/instance/module/ITreasury.sol/ITreasury.dbg.json +1 -1
  58. package/artifacts/contracts/instance/service/ApplicationService.sol/ApplicationService.dbg.json +1 -1
  59. package/artifacts/contracts/instance/service/ApplicationService.sol/ApplicationService.json +182 -331
  60. package/artifacts/contracts/instance/service/ApplicationServiceManager.sol/ApplicationServiceManager.dbg.json +4 -0
  61. package/artifacts/contracts/instance/service/ApplicationServiceManager.sol/ApplicationServiceManager.json +665 -0
  62. package/artifacts/contracts/instance/service/BundleService.sol/BundleService.dbg.json +1 -1
  63. package/artifacts/contracts/instance/service/BundleService.sol/BundleService.json +141 -366
  64. package/artifacts/contracts/instance/service/BundleServiceManager.sol/BundleServiceManager.dbg.json +1 -1
  65. package/artifacts/contracts/instance/service/BundleServiceManager.sol/BundleServiceManager.json +182 -107
  66. package/artifacts/contracts/instance/service/ClaimService.sol/ClaimService.dbg.json +4 -0
  67. package/artifacts/contracts/instance/service/ClaimService.sol/ClaimService.json +754 -0
  68. package/artifacts/contracts/instance/service/ClaimServiceManager.sol/ClaimServiceManager.dbg.json +4 -0
  69. package/artifacts/contracts/instance/service/ClaimServiceManager.sol/ClaimServiceManager.json +637 -0
  70. package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.dbg.json +1 -1
  71. package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.json +824 -268
  72. package/artifacts/contracts/instance/service/DistributionServiceManager.sol/DistributionServiceManager.dbg.json +1 -1
  73. package/artifacts/contracts/instance/service/DistributionServiceManager.sol/DistributionServiceManager.json +312 -109
  74. package/artifacts/contracts/instance/service/IApplicationService.sol/IApplicationService.dbg.json +1 -1
  75. package/artifacts/contracts/instance/service/IApplicationService.sol/IApplicationService.json +124 -206
  76. package/artifacts/contracts/instance/service/IBundleService.sol/IBundleService.dbg.json +1 -1
  77. package/artifacts/contracts/instance/service/IBundleService.sol/IBundleService.json +89 -257
  78. package/artifacts/contracts/instance/service/IClaimService.sol/IClaimService.dbg.json +4 -0
  79. package/artifacts/contracts/instance/service/IClaimService.sol/IClaimService.json +409 -0
  80. package/artifacts/contracts/instance/service/IDistributionService.sol/IDistributionService.dbg.json +1 -1
  81. package/artifacts/contracts/instance/service/IDistributionService.sol/IDistributionService.json +514 -157
  82. package/artifacts/contracts/instance/service/IPolicyService.sol/IPolicyService.dbg.json +1 -1
  83. package/artifacts/contracts/instance/service/IPolicyService.sol/IPolicyService.json +45 -289
  84. package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.dbg.json +1 -1
  85. package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.json +69 -153
  86. package/artifacts/contracts/instance/service/IProductService.sol/IProductService.dbg.json +1 -1
  87. package/artifacts/contracts/instance/service/IProductService.sol/IProductService.json +12 -177
  88. package/artifacts/contracts/instance/service/PolicyService.sol/PolicyService.dbg.json +1 -1
  89. package/artifacts/contracts/instance/service/PolicyService.sol/PolicyService.json +85 -442
  90. package/artifacts/contracts/instance/service/PolicyServiceManager.sol/PolicyServiceManager.dbg.json +1 -1
  91. package/artifacts/contracts/instance/service/PolicyServiceManager.sol/PolicyServiceManager.json +188 -141
  92. package/artifacts/contracts/instance/service/PoolService.sol/PoolService.dbg.json +1 -1
  93. package/artifacts/contracts/instance/service/PoolService.sol/PoolService.json +116 -249
  94. package/artifacts/contracts/instance/service/PoolServiceManager.sol/PoolServiceManager.dbg.json +1 -1
  95. package/artifacts/contracts/instance/service/PoolServiceManager.sol/PoolServiceManager.json +187 -104
  96. package/artifacts/contracts/instance/service/ProductService.sol/ProductService.dbg.json +1 -1
  97. package/artifacts/contracts/instance/service/ProductService.sol/ProductService.json +42 -272
  98. package/artifacts/contracts/instance/service/ProductServiceManager.sol/ProductServiceManager.dbg.json +1 -1
  99. package/artifacts/contracts/instance/service/ProductServiceManager.sol/ProductServiceManager.json +179 -104
  100. package/artifacts/contracts/registry/ChainNft.sol/ChainNft.dbg.json +1 -1
  101. package/artifacts/contracts/registry/ChainNft.sol/ChainNft.json +15 -2
  102. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.dbg.json +1 -1
  103. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.json +19 -0
  104. package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.dbg.json +1 -1
  105. package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.json +71 -180
  106. package/artifacts/contracts/registry/ITransferInterceptor.sol/ITransferInterceptor.dbg.json +1 -1
  107. package/artifacts/contracts/registry/ITransferInterceptor.sol/ITransferInterceptor.json +18 -0
  108. package/artifacts/contracts/registry/Registry.sol/Registry.dbg.json +1 -1
  109. package/artifacts/contracts/registry/Registry.sol/Registry.json +31 -12
  110. package/artifacts/contracts/registry/RegistryAccessManager.sol/RegistryAccessManager.dbg.json +1 -1
  111. package/artifacts/contracts/registry/RegistryAccessManager.sol/RegistryAccessManager.json +2 -2
  112. package/artifacts/contracts/registry/RegistryService.sol/RegistryService.dbg.json +1 -1
  113. package/artifacts/contracts/registry/RegistryService.sol/RegistryService.json +90 -264
  114. package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.dbg.json +1 -1
  115. package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.json +182 -113
  116. package/artifacts/contracts/registry/ReleaseManager.sol/ReleaseManager.dbg.json +1 -1
  117. package/artifacts/contracts/registry/ReleaseManager.sol/ReleaseManager.json +11 -11
  118. package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.dbg.json +1 -1
  119. package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.json +34 -67
  120. package/artifacts/contracts/shared/ContractDeployerLib.sol/ContractDeployerLib.dbg.json +1 -1
  121. package/artifacts/contracts/shared/ERC165.sol/ERC165.dbg.json +1 -1
  122. package/artifacts/contracts/shared/ERC165.sol/ERC165.json +2 -2
  123. package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.dbg.json +1 -1
  124. package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.json +4 -30
  125. package/artifacts/contracts/shared/IPolicyHolder.sol/IPolicyHolder.dbg.json +1 -1
  126. package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.dbg.json +1 -1
  127. package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.json +4 -30
  128. package/artifacts/contracts/shared/IRegistryLinked.sol/IRegistryLinked.dbg.json +1 -1
  129. package/artifacts/contracts/shared/IRegistryLinked.sol/IRegistryLinked.json +0 -21
  130. package/artifacts/contracts/shared/IService.sol/IService.dbg.json +1 -1
  131. package/artifacts/contracts/shared/IService.sol/IService.json +12 -177
  132. package/artifacts/contracts/shared/IVersionable.sol/IVersionable.dbg.json +1 -1
  133. package/artifacts/contracts/shared/IVersionable.sol/IVersionable.json +0 -150
  134. package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.dbg.json +1 -1
  135. package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.json +10 -62
  136. package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.dbg.json +1 -1
  137. package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.json +2 -23
  138. package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.dbg.json +1 -1
  139. package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.json +171 -88
  140. package/artifacts/contracts/shared/Registerable.sol/Registerable.dbg.json +1 -1
  141. package/artifacts/contracts/shared/Registerable.sol/Registerable.json +11 -74
  142. package/artifacts/contracts/shared/RegistryLinked.sol/RegistryLinked.dbg.json +1 -1
  143. package/artifacts/contracts/shared/RegistryLinked.sol/RegistryLinked.json +2 -23
  144. package/artifacts/contracts/shared/Service.sol/Service.dbg.json +1 -1
  145. package/artifacts/contracts/shared/Service.sol/Service.json +13 -215
  146. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.dbg.json +1 -1
  147. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.json +2 -2
  148. package/artifacts/contracts/shared/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.dbg.json +1 -1
  149. package/artifacts/contracts/shared/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.json +2 -2
  150. package/artifacts/contracts/shared/Versionable.sol/Versionable.dbg.json +1 -1
  151. package/artifacts/contracts/shared/Versionable.sol/Versionable.json +0 -150
  152. package/artifacts/contracts/test/TestFee.sol/TestFee.dbg.json +1 -1
  153. package/artifacts/contracts/test/TestFee.sol/TestFee.json +2 -2
  154. package/artifacts/contracts/test/TestRegisterable.sol/TestRegisterable.dbg.json +1 -1
  155. package/artifacts/contracts/test/TestRegisterable.sol/TestRegisterable.json +11 -74
  156. package/artifacts/contracts/test/TestRoleId.sol/TestRoleId.dbg.json +1 -1
  157. package/artifacts/contracts/test/TestRoleId.sol/TestRoleId.json +6 -6
  158. package/artifacts/contracts/test/TestService.sol/TestService.dbg.json +1 -1
  159. package/artifacts/contracts/test/TestService.sol/TestService.json +31 -269
  160. package/artifacts/contracts/test/TestToken.sol/TestUsdc.dbg.json +1 -1
  161. package/artifacts/contracts/test/TestVersion.sol/TestVersion.dbg.json +1 -1
  162. package/artifacts/contracts/test/TestVersion.sol/TestVersion.json +2 -2
  163. package/artifacts/contracts/test/TestVersionable.sol/TestVersionable.dbg.json +1 -1
  164. package/artifacts/contracts/test/TestVersionable.sol/TestVersionable.json +6 -188
  165. package/artifacts/contracts/test/Usdc.sol/USDC.dbg.json +1 -1
  166. package/artifacts/contracts/types/AddressSet.sol/LibAddressSet.dbg.json +1 -1
  167. package/artifacts/contracts/types/Blocknumber.sol/BlocknumberLib.dbg.json +1 -1
  168. package/artifacts/contracts/types/Blocknumber.sol/BlocknumberLib.json +2 -2
  169. package/artifacts/contracts/types/ChainId.sol/ChainIdLib.dbg.json +1 -1
  170. package/artifacts/contracts/types/ClaimId.sol/ClaimIdLib.dbg.json +4 -0
  171. package/artifacts/contracts/types/ClaimId.sol/ClaimIdLib.json +100 -0
  172. package/artifacts/contracts/types/DistributorType.sol/DistributorTypeLib.dbg.json +1 -1
  173. package/artifacts/contracts/types/DistributorType.sol/DistributorTypeLib.json +2 -2
  174. package/artifacts/contracts/types/Fee.sol/FeeLib.dbg.json +1 -1
  175. package/artifacts/contracts/types/Fee.sol/FeeLib.json +2 -2
  176. package/artifacts/contracts/types/Key32.sol/Key32Lib.dbg.json +1 -1
  177. package/artifacts/contracts/types/Key32.sol/Key32Lib.json +2 -2
  178. package/artifacts/contracts/types/NftId.sol/NftIdLib.dbg.json +1 -1
  179. package/artifacts/contracts/types/NftId.sol/NftIdLib.json +17 -4
  180. package/artifacts/contracts/types/NftIdSet.sol/LibNftIdSet.dbg.json +1 -1
  181. package/artifacts/contracts/types/NftIdSet.sol/LibNftIdSet.json +2 -2
  182. package/artifacts/contracts/types/NumberId.sol/NumberIdLib.dbg.json +1 -1
  183. package/artifacts/contracts/types/ObjectType.sol/ObjectTypeLib.dbg.json +1 -1
  184. package/artifacts/contracts/types/ObjectType.sol/ObjectTypeLib.json +2 -2
  185. package/artifacts/contracts/types/PayoutId.sol/PayoutIdLib.dbg.json +4 -0
  186. package/artifacts/contracts/types/PayoutId.sol/PayoutIdLib.json +100 -0
  187. package/artifacts/contracts/types/Referral.sol/ReferralLib.dbg.json +1 -1
  188. package/artifacts/contracts/types/Referral.sol/ReferralLib.json +23 -4
  189. package/artifacts/contracts/types/RiskId.sol/RiskIdLib.dbg.json +1 -1
  190. package/artifacts/contracts/types/RiskId.sol/RiskIdLib.json +2 -2
  191. package/artifacts/contracts/types/RoleId.sol/RoleIdLib.dbg.json +1 -1
  192. package/artifacts/contracts/types/RoleId.sol/RoleIdLib.json +2 -2
  193. package/artifacts/contracts/types/Seconds.sol/SecondsLib.dbg.json +4 -0
  194. package/artifacts/contracts/types/Seconds.sol/SecondsLib.json +124 -0
  195. package/artifacts/contracts/types/StateId.sol/StateIdLib.dbg.json +1 -1
  196. package/artifacts/contracts/types/StateId.sol/StateIdLib.json +2 -2
  197. package/artifacts/contracts/types/Timestamp.sol/TimestampLib.dbg.json +1 -1
  198. package/artifacts/contracts/types/Timestamp.sol/TimestampLib.json +25 -7
  199. package/artifacts/contracts/types/UFixed.sol/MathLib.dbg.json +1 -1
  200. package/artifacts/contracts/types/UFixed.sol/MathLib.json +2 -2
  201. package/artifacts/contracts/types/UFixed.sol/UFixedLib.dbg.json +1 -1
  202. package/artifacts/contracts/types/UFixed.sol/UFixedLib.json +2 -2
  203. package/artifacts/contracts/types/Version.sol/VersionLib.dbg.json +1 -1
  204. package/artifacts/contracts/types/Version.sol/VersionLib.json +2 -2
  205. package/artifacts/contracts/types/Version.sol/VersionPartLib.dbg.json +1 -1
  206. package/artifacts/contracts/types/Version.sol/VersionPartLib.json +2 -2
  207. package/contracts/components/Component.sol +96 -81
  208. package/contracts/components/Distribution.sol +29 -47
  209. package/contracts/components/IComponent.sol +40 -16
  210. package/contracts/components/IDistributionComponent.sol +1 -30
  211. package/contracts/components/IPoolComponent.sol +73 -47
  212. package/contracts/components/IProductComponent.sol +3 -2
  213. package/contracts/components/Pool.sol +171 -126
  214. package/contracts/components/Product.sol +38 -23
  215. package/contracts/instance/AccessManagerUpgradeableInitializeable.sol +13 -0
  216. package/contracts/instance/BundleManager.sol +7 -5
  217. package/contracts/instance/Cloneable.sol +7 -2
  218. package/contracts/instance/IInstance.sol +23 -11
  219. package/contracts/instance/IInstanceService.sol +18 -5
  220. package/contracts/instance/Instance.sol +62 -16
  221. package/contracts/instance/InstanceAccessManager.sol +382 -157
  222. package/contracts/instance/InstanceReader.sol +7 -10
  223. package/contracts/instance/InstanceService.sol +222 -160
  224. package/contracts/instance/InstanceServiceManager.sol +1 -1
  225. package/contracts/instance/ObjectManager.sol +6 -8
  226. package/contracts/instance/base/ComponentService.sol +5 -5
  227. package/contracts/instance/base/KeyValueStore.sol +5 -2
  228. package/contracts/instance/base/Lifecycle.sol +11 -2
  229. package/contracts/instance/module/IAccess.sol +20 -13
  230. package/contracts/instance/module/IBundle.sol +2 -1
  231. package/contracts/instance/module/IComponents.sol +35 -0
  232. package/contracts/instance/module/IDistribution.sol +2 -0
  233. package/contracts/instance/module/IPolicy.sol +30 -3
  234. package/contracts/instance/module/ISetup.sol +7 -21
  235. package/contracts/instance/service/ApplicationService.sol +139 -57
  236. package/contracts/instance/service/ApplicationServiceManager.sol +35 -0
  237. package/contracts/instance/service/BundleService.sol +76 -38
  238. package/contracts/instance/service/BundleServiceManager.sol +1 -1
  239. package/contracts/instance/service/ClaimService.sol +151 -0
  240. package/contracts/instance/service/ClaimServiceManager.sol +35 -0
  241. package/contracts/instance/service/DistributionService.sol +224 -31
  242. package/contracts/instance/service/DistributionServiceManager.sol +1 -1
  243. package/contracts/instance/service/IApplicationService.sol +9 -9
  244. package/contracts/instance/service/IBundleService.sol +19 -11
  245. package/contracts/instance/service/IClaimService.sol +61 -0
  246. package/contracts/instance/service/IDistributionService.sol +36 -3
  247. package/contracts/instance/service/IPolicyService.sol +18 -34
  248. package/contracts/instance/service/IPoolService.sol +17 -2
  249. package/contracts/instance/service/PolicyService.sol +74 -195
  250. package/contracts/instance/service/PolicyServiceManager.sol +2 -2
  251. package/contracts/instance/service/PoolService.sol +128 -17
  252. package/contracts/instance/service/PoolServiceManager.sol +1 -1
  253. package/contracts/instance/service/ProductService.sol +10 -2
  254. package/contracts/instance/service/ProductServiceManager.sol +2 -2
  255. package/contracts/registry/ChainNft.sol +8 -0
  256. package/contracts/registry/IRegistry.sol +2 -0
  257. package/contracts/registry/IRegistryService.sol +10 -8
  258. package/contracts/registry/ITransferInterceptor.sol +1 -0
  259. package/contracts/registry/Registry.sol +26 -21
  260. package/contracts/registry/RegistryService.sol +62 -40
  261. package/contracts/registry/RegistryServiceManager.sol +13 -13
  262. package/contracts/registry/ReleaseManager.sol +18 -28
  263. package/contracts/registry/TokenRegistry.sol +13 -10
  264. package/contracts/shared/ERC165.sol +2 -1
  265. package/contracts/shared/INftOwnable.sol +4 -9
  266. package/contracts/shared/IRegistryLinked.sol +0 -3
  267. package/contracts/shared/IService.sol +2 -0
  268. package/contracts/shared/IVersionable.sol +4 -47
  269. package/contracts/shared/NftOwnable.sol +10 -80
  270. package/contracts/shared/ProxyManager.sol +98 -24
  271. package/contracts/shared/Registerable.sol +3 -10
  272. package/contracts/shared/RegistryLinked.sol +10 -26
  273. package/contracts/shared/Service.sol +10 -12
  274. package/contracts/shared/TokenHandler.sol +11 -5
  275. package/contracts/shared/Versionable.sol +1 -90
  276. package/contracts/types/Blocknumber.sol +1 -0
  277. package/contracts/types/ClaimId.sol +52 -0
  278. package/contracts/types/Fee.sol +1 -0
  279. package/contracts/types/NftId.sol +8 -0
  280. package/contracts/types/ObjectType.sol +5 -4
  281. package/contracts/types/PayoutId.sol +54 -0
  282. package/contracts/types/Referral.sol +4 -0
  283. package/contracts/types/RoleId.sol +16 -9
  284. package/contracts/types/Seconds.sol +54 -0
  285. package/contracts/types/StateId.sol +1 -0
  286. package/contracts/types/Timestamp.sol +13 -13
  287. package/contracts/types/UFixed.sol +1 -0
  288. package/contracts/types/Version.sol +1 -0
  289. package/package.json +1 -1
  290. package/artifacts/contracts/experiment/cloning/Cloner.sol/Cloner.dbg.json +0 -4
  291. package/artifacts/contracts/experiment/cloning/Cloner.sol/Cloner.json +0 -66
  292. package/artifacts/contracts/experiment/cloning/Cloner.sol/Mock1.dbg.json +0 -4
  293. package/artifacts/contracts/experiment/cloning/Cloner.sol/Mock1.json +0 -24
  294. package/artifacts/contracts/experiment/cloning/Cloner.sol/Mock2.dbg.json +0 -4
  295. package/artifacts/contracts/experiment/cloning/Cloner.sol/Mock2.json +0 -42
  296. package/artifacts/contracts/experiment/errors/Require.sol/Require.dbg.json +0 -4
  297. package/artifacts/contracts/experiment/errors/Require.sol/Require.json +0 -105
  298. package/artifacts/contracts/experiment/errors/Revert.sol/Revert.dbg.json +0 -4
  299. package/artifacts/contracts/experiment/errors/Revert.sol/Revert.json +0 -105
  300. package/artifacts/contracts/experiment/inheritance/A.sol/A.dbg.json +0 -4
  301. package/artifacts/contracts/experiment/inheritance/A.sol/A.json +0 -128
  302. package/artifacts/contracts/experiment/inheritance/A.sol/AShared.dbg.json +0 -4
  303. package/artifacts/contracts/experiment/inheritance/A.sol/AShared.json +0 -42
  304. package/artifacts/contracts/experiment/inheritance/B.sol/B.dbg.json +0 -4
  305. package/artifacts/contracts/experiment/inheritance/B.sol/B.json +0 -76
  306. package/artifacts/contracts/experiment/inheritance/C.sol/C.dbg.json +0 -4
  307. package/artifacts/contracts/experiment/inheritance/C.sol/C.json +0 -89
  308. package/artifacts/contracts/experiment/inheritance/IA.sol/IA.dbg.json +0 -4
  309. package/artifacts/contracts/experiment/inheritance/IA.sol/IA.json +0 -128
  310. package/artifacts/contracts/experiment/inheritance/IA.sol/ISharedA.dbg.json +0 -4
  311. package/artifacts/contracts/experiment/inheritance/IA.sol/ISharedA.json +0 -37
  312. package/artifacts/contracts/experiment/inheritance/IB.sol/IB.dbg.json +0 -4
  313. package/artifacts/contracts/experiment/inheritance/IB.sol/IB.json +0 -50
  314. package/artifacts/contracts/experiment/inheritance/IC.sol/IC.dbg.json +0 -4
  315. package/artifacts/contracts/experiment/inheritance/IC.sol/IC.json +0 -63
  316. package/artifacts/contracts/experiment/statemachine/Dummy.sol/LifeCycleModule.dbg.json +0 -4
  317. package/artifacts/contracts/experiment/statemachine/Dummy.sol/LifeCycleModule.json +0 -59
  318. package/artifacts/contracts/experiment/statemachine/ISM.sol/ISM.dbg.json +0 -4
  319. package/artifacts/contracts/experiment/statemachine/ISM.sol/ISM.json +0 -124
  320. package/artifacts/contracts/experiment/statemachine/ISM.sol/ISMEE.dbg.json +0 -4
  321. package/artifacts/contracts/experiment/statemachine/ISM.sol/ISMEE.json +0 -74
  322. package/artifacts/contracts/experiment/statemachine/SM.sol/SM.dbg.json +0 -4
  323. package/artifacts/contracts/experiment/statemachine/SM.sol/SM.json +0 -124
  324. package/artifacts/contracts/experiment/statemachine/SimpleStateMachine.sol/SimpleStateMachine.dbg.json +0 -4
  325. package/artifacts/contracts/experiment/statemachine/SimpleStateMachine.sol/SimpleStateMachine.json +0 -207
  326. package/artifacts/contracts/experiment/types/TypeA.sol/TypeALib.dbg.json +0 -4
  327. package/artifacts/contracts/experiment/types/TypeA.sol/TypeALib.json +0 -10
  328. package/artifacts/contracts/experiment/types/TypeB.sol/TypeBLib.dbg.json +0 -4
  329. package/artifacts/contracts/experiment/types/TypeB.sol/TypeBLib.json +0 -10
  330. package/contracts/experiment/cloning/Cloner.sol +0 -47
  331. package/contracts/experiment/errors/Require.sol +0 -38
  332. package/contracts/experiment/errors/Revert.sol +0 -44
  333. package/contracts/experiment/inheritance/A.sol +0 -53
  334. package/contracts/experiment/inheritance/B.sol +0 -28
  335. package/contracts/experiment/inheritance/C.sol +0 -34
  336. package/contracts/experiment/inheritance/IA.sol +0 -13
  337. package/contracts/experiment/inheritance/IB.sol +0 -10
  338. package/contracts/experiment/inheritance/IC.sol +0 -12
  339. package/contracts/experiment/statemachine/Dummy.sol +0 -27
  340. package/contracts/experiment/statemachine/ISM.sol +0 -25
  341. package/contracts/experiment/statemachine/SM.sol +0 -57
  342. package/contracts/experiment/statemachine/SimpleStateMachine.sol +0 -31
  343. package/contracts/experiment/types/TypeA.sol +0 -47
  344. package/contracts/experiment/types/TypeB.sol +0 -29
@@ -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
+ }
@@ -82,4 +82,8 @@ library ReferralLib {
82
82
  function toKeyId(ReferralId id) public pure returns (KeyId keyId) {
83
83
  return KeyId.wrap(bytes31(ReferralId.unwrap(id)));
84
84
  }
85
+
86
+ function eqz(ReferralId id) public pure returns (bool) {
87
+ return eqReferralId(id, zero());
88
+ }
85
89
  }
@@ -16,27 +16,34 @@ 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
- function DISTRIBUTION_OWNER_ROLE() pure returns (RoleId) { return RoleIdLib.toRoleId(100); }
28
- function ORACLE_OWNER_ROLE() pure returns (RoleId) { return RoleIdLib.toRoleId(200); }
29
- function POOL_OWNER_ROLE() pure returns (RoleId) { return RoleIdLib.toRoleId(300); }
30
- function PRODUCT_OWNER_ROLE() pure returns (RoleId) { return RoleIdLib.toRoleId(400); }
31
-
32
+ function DISTRIBUTION_OWNER_ROLE() pure returns (RoleId) { return RoleIdLib.toRoleId(2); }
33
+ function ORACLE_OWNER_ROLE() pure returns (RoleId) { return RoleIdLib.toRoleId(3); }
34
+ function POOL_OWNER_ROLE() pure returns (RoleId) { return RoleIdLib.toRoleId(4); }
35
+ function PRODUCT_OWNER_ROLE() pure returns (RoleId) { return RoleIdLib.toRoleId(5); }
32
36
 
37
+ function INSTANCE_OWNER_ROLE() pure returns (RoleId) { return RoleIdLib.toRoleId(1900); }
33
38
  function INSTANCE_SERVICE_ROLE() pure returns (RoleId) { return RoleIdLib.toRoleId(2000); }
34
39
  function DISTRIBUTION_SERVICE_ROLE() pure returns (RoleId) { return RoleIdLib.toRoleId(2100); }
35
40
  function POOL_SERVICE_ROLE() pure returns (RoleId) { return RoleIdLib.toRoleId(2200); }
36
41
  function PRODUCT_SERVICE_ROLE() pure returns (RoleId) { return RoleIdLib.toRoleId(2300); }
37
- function POLICY_SERVICE_ROLE() pure returns (RoleId) { return RoleIdLib.toRoleId(2400); }
42
+ function APPLICATION_SERVICE_ROLE() pure returns (RoleId) { return RoleIdLib.toRoleId(2400); }
43
+ function POLICY_SERVICE_ROLE() pure returns (RoleId) { return RoleIdLib.toRoleId(2410); }
44
+ function CLAIM_SERVICE_ROLE() pure returns (RoleId) { return RoleIdLib.toRoleId(2420); }
38
45
  function BUNDLE_SERVICE_ROLE() pure returns (RoleId) { return RoleIdLib.toRoleId(2500); }
39
-
46
+ function INSTANCE_ROLE() pure returns (RoleId) { return RoleIdLib.toRoleId(2600); }
40
47
 
41
48
  function GIF_ADMIN_ROLE() pure returns (RoleId) { return RoleIdLib.toRoleId(1500); }
42
49
  function GIF_MANAGER_ROLE() pure returns (RoleId) { return RoleIdLib.toRoleId(1600); }
@@ -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-bfb44e0-483",
3
+ "version": "0.0.2-c0b400a-177",
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": {
@@ -1,4 +0,0 @@
1
- {
2
- "_format": "hh-sol-dbg-1",
3
- "buildInfo": "../../../../build-info/6a944234dbcb12d19e28b7af6bc3708a.json"
4
- }
@@ -1,66 +0,0 @@
1
- {
2
- "_format": "hh-sol-artifact-1",
3
- "contractName": "Cloner",
4
- "sourceName": "contracts/experiment/cloning/Cloner.sol",
5
- "abi": [
6
- {
7
- "inputs": [],
8
- "stateMutability": "nonpayable",
9
- "type": "constructor"
10
- },
11
- {
12
- "inputs": [],
13
- "name": "ERC1167FailedCreateClone",
14
- "type": "error"
15
- },
16
- {
17
- "inputs": [
18
- {
19
- "internalType": "address",
20
- "name": "master",
21
- "type": "address"
22
- }
23
- ],
24
- "name": "createClone",
25
- "outputs": [
26
- {
27
- "internalType": "address",
28
- "name": "cloned",
29
- "type": "address"
30
- }
31
- ],
32
- "stateMutability": "nonpayable",
33
- "type": "function"
34
- },
35
- {
36
- "inputs": [],
37
- "name": "mock1",
38
- "outputs": [
39
- {
40
- "internalType": "contract Mock1",
41
- "name": "",
42
- "type": "address"
43
- }
44
- ],
45
- "stateMutability": "view",
46
- "type": "function"
47
- },
48
- {
49
- "inputs": [],
50
- "name": "mock2",
51
- "outputs": [
52
- {
53
- "internalType": "contract Mock2",
54
- "name": "",
55
- "type": "address"
56
- }
57
- ],
58
- "stateMutability": "view",
59
- "type": "function"
60
- }
61
- ],
62
- "bytecode": "0x608060405234801561001057600080fd5b5060405161001d906100a8565b604051809103906000f080158015610039573d6000803e3d6000fd5b50600080546001600160a01b0319166001600160a01b0392909216919091179055604051610066906100b4565b604051809103906000f080158015610082573d6000803e3d6000fd5b50600180546001600160a01b0319166001600160a01b03929092169190911790556100c0565b60948061025383390190565b60d0806102e783390190565b610184806100cf6000396000f3fe608060405234801561001057600080fd5b50600436106100415760003560e01c806305e2387f1461004657806357894c1b146100755780638c0a703014610088575b600080fd5b600154610059906001600160a01b031681565b6040516001600160a01b03909116815260200160405180910390f35b61005961008336600461011e565b61009b565b600054610059906001600160a01b031681565b60006100a6826100ac565b92915050565b6000763d602d80600a3d3981f3363d3d373d3d3d363d730000008260601b60e81c176000526e5af43d82803e903d91602b57fd5bf38260781b17602052603760096000f090506001600160a01b038116610119576040516330be1a3d60e21b815260040160405180910390fd5b919050565b60006020828403121561013057600080fd5b81356001600160a01b038116811461014757600080fd5b939250505056fea264697066735822122071711c9285d7c7b532d7a797bcc9f3b63ee36749326d8f4991c26c7fd318708564736f6c634300081400336080604052348015600f57600080fd5b50607780601d6000396000f3fe6080604052348015600f57600080fd5b506004361060285760003560e01c80632096525514602d575b600080fd5b602a60405190815260200160405180910390f3fea2646970667358221220387d2c4138f488b061389f8eae5d59b560b2a8fad5f5ad3786c46f28b935021264736f6c63430008140033608060405234801561001057600080fd5b50602a60005560ac806100246000396000f3fe6080604052348015600f57600080fd5b506004361060325760003560e01c8063209652551460375780635524107714604c575b600080fd5b60005460405190815260200160405180910390f35b605c6057366004605e565b600055565b005b600060208284031215606f57600080fd5b503591905056fea264697066735822122053965bc6b3662eeeacbfd922f297d352227b212611b844166a5d55797fb614ea64736f6c63430008140033",
63
- "deployedBytecode": "0x608060405234801561001057600080fd5b50600436106100415760003560e01c806305e2387f1461004657806357894c1b146100755780638c0a703014610088575b600080fd5b600154610059906001600160a01b031681565b6040516001600160a01b03909116815260200160405180910390f35b61005961008336600461011e565b61009b565b600054610059906001600160a01b031681565b60006100a6826100ac565b92915050565b6000763d602d80600a3d3981f3363d3d373d3d3d363d730000008260601b60e81c176000526e5af43d82803e903d91602b57fd5bf38260781b17602052603760096000f090506001600160a01b038116610119576040516330be1a3d60e21b815260040160405180910390fd5b919050565b60006020828403121561013057600080fd5b81356001600160a01b038116811461014757600080fd5b939250505056fea264697066735822122071711c9285d7c7b532d7a797bcc9f3b63ee36749326d8f4991c26c7fd318708564736f6c63430008140033",
64
- "linkReferences": {},
65
- "deployedLinkReferences": {}
66
- }
@@ -1,4 +0,0 @@
1
- {
2
- "_format": "hh-sol-dbg-1",
3
- "buildInfo": "../../../../build-info/6a944234dbcb12d19e28b7af6bc3708a.json"
4
- }
@@ -1,24 +0,0 @@
1
- {
2
- "_format": "hh-sol-artifact-1",
3
- "contractName": "Mock1",
4
- "sourceName": "contracts/experiment/cloning/Cloner.sol",
5
- "abi": [
6
- {
7
- "inputs": [],
8
- "name": "getValue",
9
- "outputs": [
10
- {
11
- "internalType": "uint256",
12
- "name": "",
13
- "type": "uint256"
14
- }
15
- ],
16
- "stateMutability": "view",
17
- "type": "function"
18
- }
19
- ],
20
- "bytecode": "0x6080604052348015600f57600080fd5b50607780601d6000396000f3fe6080604052348015600f57600080fd5b506004361060285760003560e01c80632096525514602d575b600080fd5b602a60405190815260200160405180910390f3fea2646970667358221220387d2c4138f488b061389f8eae5d59b560b2a8fad5f5ad3786c46f28b935021264736f6c63430008140033",
21
- "deployedBytecode": "0x6080604052348015600f57600080fd5b506004361060285760003560e01c80632096525514602d575b600080fd5b602a60405190815260200160405180910390f3fea2646970667358221220387d2c4138f488b061389f8eae5d59b560b2a8fad5f5ad3786c46f28b935021264736f6c63430008140033",
22
- "linkReferences": {},
23
- "deployedLinkReferences": {}
24
- }
@@ -1,4 +0,0 @@
1
- {
2
- "_format": "hh-sol-dbg-1",
3
- "buildInfo": "../../../../build-info/6a944234dbcb12d19e28b7af6bc3708a.json"
4
- }