@etherisc/gif-next 0.0.2-e6d2794-419 → 0.0.2-e79d227-681

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 (505) hide show
  1. package/README.md +58 -9
  2. package/artifacts/contracts/authorization/AccessAdmin.sol/AccessAdmin.dbg.json +1 -1
  3. package/artifacts/contracts/authorization/AccessAdmin.sol/AccessAdmin.json +105 -65
  4. package/artifacts/contracts/authorization/AccessAdmin.sol/IAccessManagedChecker.dbg.json +4 -0
  5. package/artifacts/contracts/authorization/AccessAdmin.sol/IAccessManagedChecker.json +24 -0
  6. package/artifacts/contracts/authorization/AccessManagerCloneable.sol/AccessManagerCloneable.dbg.json +1 -1
  7. package/artifacts/contracts/authorization/AccessManagerCloneable.sol/AccessManagerCloneable.json +2 -2
  8. package/artifacts/contracts/authorization/Authorization.sol/Authorization.dbg.json +1 -1
  9. package/artifacts/contracts/authorization/Authorization.sol/Authorization.json +67 -11
  10. package/artifacts/contracts/authorization/IAccess.sol/IAccess.dbg.json +1 -1
  11. package/artifacts/contracts/authorization/IAccessAdmin.sol/IAccessAdmin.dbg.json +1 -1
  12. package/artifacts/contracts/authorization/IAccessAdmin.sol/IAccessAdmin.json +60 -32
  13. package/artifacts/contracts/authorization/IAuthorization.sol/IAuthorization.dbg.json +1 -1
  14. package/artifacts/contracts/authorization/IAuthorization.sol/IAuthorization.json +40 -3
  15. package/artifacts/contracts/authorization/IServiceAuthorization.sol/IServiceAuthorization.dbg.json +1 -1
  16. package/artifacts/contracts/authorization/IServiceAuthorization.sol/IServiceAuthorization.json +19 -0
  17. package/artifacts/contracts/authorization/ReleaseAccessManager.sol/ReleaseAccessManager.dbg.json +4 -0
  18. package/artifacts/contracts/authorization/ReleaseAccessManager.sol/ReleaseAccessManager.json +1196 -0
  19. package/artifacts/contracts/authorization/ServiceAuthorization.sol/ServiceAuthorization.dbg.json +1 -1
  20. package/artifacts/contracts/authorization/ServiceAuthorization.sol/ServiceAuthorization.json +68 -5
  21. package/artifacts/contracts/distribution/BasicDistribution.sol/BasicDistribution.dbg.json +1 -1
  22. package/artifacts/contracts/distribution/BasicDistribution.sol/BasicDistribution.json +188 -369
  23. package/artifacts/contracts/distribution/BasicDistributionAuthorization.sol/BasicDistributionAuthorization.dbg.json +1 -1
  24. package/artifacts/contracts/distribution/BasicDistributionAuthorization.sol/BasicDistributionAuthorization.json +82 -22
  25. package/artifacts/contracts/distribution/Distribution.sol/Distribution.dbg.json +1 -1
  26. package/artifacts/contracts/distribution/Distribution.sol/Distribution.json +141 -314
  27. package/artifacts/contracts/distribution/DistributionService.sol/DistributionService.dbg.json +1 -1
  28. package/artifacts/contracts/distribution/DistributionService.sol/DistributionService.json +323 -223
  29. package/artifacts/contracts/distribution/DistributionServiceManager.sol/DistributionServiceManager.dbg.json +1 -1
  30. package/artifacts/contracts/distribution/DistributionServiceManager.sol/DistributionServiceManager.json +140 -104
  31. package/artifacts/contracts/distribution/IDistributionComponent.sol/IDistributionComponent.dbg.json +1 -1
  32. package/artifacts/contracts/distribution/IDistributionComponent.sol/IDistributionComponent.json +132 -115
  33. package/artifacts/contracts/distribution/IDistributionService.sol/IDistributionService.dbg.json +1 -1
  34. package/artifacts/contracts/distribution/IDistributionService.sol/IDistributionService.json +172 -31
  35. package/artifacts/contracts/examples/fire/DamageLevel.sol/DamageLevelLib.dbg.json +4 -0
  36. package/artifacts/contracts/examples/fire/DamageLevel.sol/DamageLevelLib.json +22 -0
  37. package/artifacts/contracts/examples/fire/FirePool.sol/FirePool.dbg.json +4 -0
  38. package/artifacts/contracts/examples/fire/FirePool.sol/FirePool.json +1429 -0
  39. package/artifacts/contracts/examples/fire/FirePoolAuthorization.sol/FirePoolAuthorization.dbg.json +4 -0
  40. package/artifacts/contracts/examples/fire/FirePoolAuthorization.sol/FirePoolAuthorization.json +502 -0
  41. package/artifacts/contracts/examples/fire/FireProduct.sol/FireProduct.dbg.json +4 -0
  42. package/artifacts/contracts/examples/fire/FireProduct.sol/FireProduct.json +1979 -0
  43. package/artifacts/contracts/examples/fire/FireProductAuthorization.sol/FireProductAuthorization.dbg.json +4 -0
  44. package/artifacts/contracts/examples/fire/FireProductAuthorization.sol/FireProductAuthorization.json +470 -0
  45. package/artifacts/contracts/examples/fire/FireUSD.sol/FireUSD.dbg.json +4 -0
  46. package/artifacts/contracts/examples/fire/FireUSD.sol/FireUSD.json +376 -0
  47. package/artifacts/contracts/examples/unpermissioned/SimpleDistribution.sol/SimpleDistribution.dbg.json +4 -0
  48. package/artifacts/contracts/examples/unpermissioned/SimpleDistribution.sol/SimpleDistribution.json +1430 -0
  49. package/artifacts/contracts/examples/unpermissioned/SimpleOracle.sol/SimpleOracle.dbg.json +4 -0
  50. package/artifacts/contracts/examples/unpermissioned/SimpleOracle.sol/SimpleOracle.json +1177 -0
  51. package/artifacts/contracts/examples/unpermissioned/SimplePool.sol/SimplePool.dbg.json +4 -0
  52. package/artifacts/contracts/examples/unpermissioned/SimplePool.sol/SimplePool.json +1606 -0
  53. package/artifacts/contracts/examples/unpermissioned/SimpleProduct.sol/SimpleProduct.dbg.json +4 -0
  54. package/artifacts/contracts/examples/unpermissioned/SimpleProduct.sol/SimpleProduct.json +2281 -0
  55. package/artifacts/contracts/instance/BundleSet.sol/BundleSet.dbg.json +4 -0
  56. package/artifacts/contracts/instance/BundleSet.sol/BundleSet.json +808 -0
  57. package/artifacts/contracts/instance/IInstance.sol/IInstance.dbg.json +1 -1
  58. package/artifacts/contracts/instance/IInstance.sol/IInstance.json +104 -36
  59. package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.dbg.json +1 -1
  60. package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.json +56 -91
  61. package/artifacts/contracts/instance/Instance.sol/Instance.dbg.json +1 -1
  62. package/artifacts/contracts/instance/Instance.sol/Instance.json +130 -130
  63. package/artifacts/contracts/instance/InstanceAdmin.sol/InstanceAdmin.dbg.json +1 -1
  64. package/artifacts/contracts/instance/InstanceAdmin.sol/InstanceAdmin.json +180 -140
  65. package/artifacts/contracts/instance/InstanceAuthorizationV3.sol/InstanceAuthorizationV3.dbg.json +1 -1
  66. package/artifacts/contracts/instance/InstanceAuthorizationV3.sol/InstanceAuthorizationV3.json +59 -86
  67. package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.dbg.json +1 -1
  68. package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.json +697 -146
  69. package/artifacts/contracts/instance/InstanceService.sol/InstanceService.dbg.json +1 -1
  70. package/artifacts/contracts/instance/InstanceService.sol/InstanceService.json +121 -250
  71. package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.dbg.json +1 -1
  72. package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.json +99 -87
  73. package/artifacts/contracts/instance/InstanceStore.sol/InstanceStore.dbg.json +1 -1
  74. package/artifacts/contracts/instance/InstanceStore.sol/InstanceStore.json +340 -263
  75. package/artifacts/contracts/instance/RiskSet.sol/RiskSet.dbg.json +4 -0
  76. package/artifacts/contracts/instance/RiskSet.sol/RiskSet.json +810 -0
  77. package/artifacts/contracts/instance/base/BalanceStore.sol/BalanceStore.dbg.json +1 -1
  78. package/artifacts/contracts/instance/base/BalanceStore.sol/BalanceStore.json +2 -2
  79. package/artifacts/contracts/instance/base/Cloneable.sol/Cloneable.dbg.json +1 -1
  80. package/artifacts/contracts/instance/base/ObjectCounter.sol/ObjectCounter.dbg.json +1 -1
  81. package/artifacts/contracts/instance/base/ObjectCounter.sol/ObjectCounter.json +2 -2
  82. package/artifacts/contracts/instance/base/ObjectLifecycle.sol/ObjectLifecycle.dbg.json +1 -1
  83. package/artifacts/contracts/instance/base/ObjectLifecycle.sol/ObjectLifecycle.json +46 -5
  84. package/artifacts/contracts/instance/base/ObjectSet.sol/ObjectSet.dbg.json +4 -0
  85. package/artifacts/contracts/instance/base/{ObjectManager.sol/ObjectManager.json → ObjectSet.sol/ObjectSet.json} +6 -6
  86. package/artifacts/contracts/instance/module/IAccess.sol/IAccess.dbg.json +1 -1
  87. package/artifacts/contracts/instance/module/IBundle.sol/IBundle.dbg.json +1 -1
  88. package/artifacts/contracts/instance/module/IComponents.sol/IComponents.dbg.json +1 -1
  89. package/artifacts/contracts/instance/module/IDistribution.sol/IDistribution.dbg.json +1 -1
  90. package/artifacts/contracts/instance/module/IPolicy.sol/IPolicy.dbg.json +1 -1
  91. package/artifacts/contracts/instance/module/IRisk.sol/IRisk.dbg.json +1 -1
  92. package/artifacts/contracts/mock/Dip.sol/Dip.dbg.json +1 -1
  93. package/artifacts/contracts/mock/Dip.sol/Dip.json +2 -2
  94. package/artifacts/contracts/oracle/BasicOracle.sol/BasicOracle.dbg.json +1 -1
  95. package/artifacts/contracts/oracle/BasicOracle.sol/BasicOracle.json +138 -332
  96. package/artifacts/contracts/oracle/BasicOracleAuthorization.sol/BasicOracleAuthorization.dbg.json +1 -1
  97. package/artifacts/contracts/oracle/BasicOracleAuthorization.sol/BasicOracleAuthorization.json +84 -24
  98. package/artifacts/contracts/oracle/IOracle.sol/IOracle.dbg.json +1 -1
  99. package/artifacts/contracts/oracle/IOracleComponent.sol/IOracleComponent.dbg.json +1 -1
  100. package/artifacts/contracts/oracle/IOracleComponent.sol/IOracleComponent.json +107 -103
  101. package/artifacts/contracts/oracle/IOracleService.sol/IOracleService.dbg.json +1 -1
  102. package/artifacts/contracts/oracle/IOracleService.sol/IOracleService.json +43 -9
  103. package/artifacts/contracts/oracle/Oracle.sol/Oracle.dbg.json +1 -1
  104. package/artifacts/contracts/oracle/Oracle.sol/Oracle.json +114 -300
  105. package/artifacts/contracts/oracle/OracleService.sol/OracleService.dbg.json +1 -1
  106. package/artifacts/contracts/oracle/OracleService.sol/OracleService.json +147 -191
  107. package/artifacts/contracts/oracle/OracleServiceManager.sol/OracleServiceManager.dbg.json +1 -1
  108. package/artifacts/contracts/oracle/OracleServiceManager.sol/OracleServiceManager.json +119 -83
  109. package/artifacts/contracts/pool/BasicPool.sol/BasicPool.dbg.json +1 -1
  110. package/artifacts/contracts/pool/BasicPool.sol/BasicPool.json +160 -383
  111. package/artifacts/contracts/pool/BasicPoolAuthorization.sol/BasicPoolAuthorization.dbg.json +1 -1
  112. package/artifacts/contracts/pool/BasicPoolAuthorization.sol/BasicPoolAuthorization.json +114 -22
  113. package/artifacts/contracts/pool/BundleService.sol/BundleService.dbg.json +1 -1
  114. package/artifacts/contracts/pool/BundleService.sol/BundleService.json +430 -204
  115. package/artifacts/contracts/pool/BundleServiceManager.sol/BundleServiceManager.dbg.json +1 -1
  116. package/artifacts/contracts/pool/BundleServiceManager.sol/BundleServiceManager.json +160 -92
  117. package/artifacts/contracts/pool/IBundleService.sol/IBundleService.dbg.json +1 -1
  118. package/artifacts/contracts/pool/IBundleService.sol/IBundleService.json +244 -25
  119. package/artifacts/contracts/pool/IPoolComponent.sol/IPoolComponent.dbg.json +1 -1
  120. package/artifacts/contracts/pool/IPoolComponent.sol/IPoolComponent.json +118 -168
  121. package/artifacts/contracts/pool/IPoolService.sol/IPoolService.dbg.json +1 -1
  122. package/artifacts/contracts/pool/IPoolService.sol/IPoolService.json +422 -215
  123. package/artifacts/contracts/pool/Pool.sol/Pool.dbg.json +1 -1
  124. package/artifacts/contracts/pool/Pool.sol/Pool.json +126 -366
  125. package/artifacts/contracts/pool/PoolService.sol/PoolService.dbg.json +1 -1
  126. package/artifacts/contracts/pool/PoolService.sol/PoolService.json +569 -403
  127. package/artifacts/contracts/pool/PoolServiceManager.sol/PoolServiceManager.dbg.json +1 -1
  128. package/artifacts/contracts/pool/PoolServiceManager.sol/PoolServiceManager.json +139 -87
  129. package/artifacts/contracts/product/ApplicationService.sol/ApplicationService.dbg.json +1 -1
  130. package/artifacts/contracts/product/ApplicationService.sol/ApplicationService.json +124 -181
  131. package/artifacts/contracts/product/ApplicationServiceManager.sol/ApplicationServiceManager.dbg.json +1 -1
  132. package/artifacts/contracts/product/ApplicationServiceManager.sol/ApplicationServiceManager.json +89 -89
  133. package/artifacts/contracts/product/BasicProduct.sol/BasicProduct.dbg.json +1 -1
  134. package/artifacts/contracts/product/BasicProduct.sol/BasicProduct.json +168 -319
  135. package/artifacts/contracts/product/BasicProductAuthorization.sol/BasicProductAuthorization.dbg.json +1 -1
  136. package/artifacts/contracts/product/BasicProductAuthorization.sol/BasicProductAuthorization.json +82 -22
  137. package/artifacts/contracts/product/ClaimService.sol/ClaimService.dbg.json +1 -1
  138. package/artifacts/contracts/product/ClaimService.sol/ClaimService.json +311 -187
  139. package/artifacts/contracts/product/ClaimServiceManager.sol/ClaimServiceManager.dbg.json +1 -1
  140. package/artifacts/contracts/product/ClaimServiceManager.sol/ClaimServiceManager.json +139 -103
  141. package/artifacts/contracts/product/IApplicationService.sol/IApplicationService.dbg.json +1 -1
  142. package/artifacts/contracts/product/IApplicationService.sol/IApplicationService.json +68 -7
  143. package/artifacts/contracts/product/IClaimService.sol/IClaimService.dbg.json +1 -1
  144. package/artifacts/contracts/product/IClaimService.sol/IClaimService.json +176 -6
  145. package/artifacts/contracts/product/IPolicyService.sol/IPolicyService.dbg.json +1 -1
  146. package/artifacts/contracts/product/IPolicyService.sol/IPolicyService.json +344 -120
  147. package/artifacts/contracts/product/IPricingService.sol/IPricingService.dbg.json +1 -1
  148. package/artifacts/contracts/product/IPricingService.sol/IPricingService.json +114 -85
  149. package/artifacts/contracts/product/IProductComponent.sol/IProductComponent.dbg.json +1 -1
  150. package/artifacts/contracts/product/IProductComponent.sol/IProductComponent.json +155 -116
  151. package/artifacts/contracts/product/IRiskService.sol/IRiskService.dbg.json +4 -0
  152. package/artifacts/contracts/product/{IProductService.sol/IProductService.json → IRiskService.sol/IRiskService.json} +31 -2
  153. package/artifacts/contracts/product/PolicyService.sol/PolicyService.dbg.json +1 -1
  154. package/artifacts/contracts/product/PolicyService.sol/PolicyService.json +447 -317
  155. package/artifacts/contracts/product/PolicyServiceManager.sol/PolicyServiceManager.dbg.json +1 -1
  156. package/artifacts/contracts/product/PolicyServiceManager.sol/PolicyServiceManager.json +138 -94
  157. package/artifacts/contracts/product/PricingService.sol/PricingService.dbg.json +1 -1
  158. package/artifacts/contracts/product/PricingService.sol/PricingService.json +218 -307
  159. package/artifacts/contracts/product/PricingServiceManager.sol/PricingServiceManager.dbg.json +1 -1
  160. package/artifacts/contracts/product/PricingServiceManager.sol/PricingServiceManager.json +117 -117
  161. package/artifacts/contracts/product/Product.sol/Product.dbg.json +1 -1
  162. package/artifacts/contracts/product/Product.sol/Product.json +166 -317
  163. package/artifacts/contracts/product/RiskService.sol/RiskService.dbg.json +4 -0
  164. package/artifacts/contracts/product/RiskService.sol/RiskService.json +638 -0
  165. package/artifacts/contracts/product/RiskServiceManager.sol/RiskServiceManager.dbg.json +4 -0
  166. package/artifacts/contracts/product/RiskServiceManager.sol/RiskServiceManager.json +718 -0
  167. package/artifacts/contracts/registry/ChainNft.sol/ChainNft.dbg.json +1 -1
  168. package/artifacts/contracts/registry/ChainNft.sol/ChainNft.json +59 -16
  169. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.dbg.json +1 -1
  170. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.json +346 -22
  171. package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.dbg.json +1 -1
  172. package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.json +42 -146
  173. package/artifacts/contracts/registry/ITransferInterceptor.sol/ITransferInterceptor.dbg.json +1 -1
  174. package/artifacts/contracts/registry/ITransferInterceptor.sol/ITransferInterceptor.json +5 -18
  175. package/artifacts/contracts/registry/Registry.sol/Registry.dbg.json +1 -1
  176. package/artifacts/contracts/registry/Registry.sol/Registry.json +573 -80
  177. package/artifacts/contracts/registry/RegistryAdmin.sol/RegistryAdmin.dbg.json +1 -1
  178. package/artifacts/contracts/registry/RegistryAdmin.sol/RegistryAdmin.json +298 -145
  179. package/artifacts/contracts/registry/RegistryService.sol/RegistryService.dbg.json +1 -1
  180. package/artifacts/contracts/registry/RegistryService.sol/RegistryService.json +94 -284
  181. package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.dbg.json +1 -1
  182. package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.json +91 -75
  183. package/artifacts/contracts/registry/ReleaseLifecycle.sol/ReleaseLifecycle.dbg.json +1 -1
  184. package/artifacts/contracts/registry/ReleaseLifecycle.sol/ReleaseLifecycle.json +47 -6
  185. package/artifacts/contracts/registry/ReleaseRegistry.sol/ReleaseRegistry.dbg.json +4 -0
  186. package/artifacts/contracts/registry/ReleaseRegistry.sol/ReleaseRegistry.json +1067 -0
  187. package/artifacts/contracts/registry/ServiceAuthorizationV3.sol/ServiceAuthorizationV3.dbg.json +1 -1
  188. package/artifacts/contracts/registry/ServiceAuthorizationV3.sol/ServiceAuthorizationV3.json +66 -8
  189. package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.dbg.json +1 -1
  190. package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.json +2 -2
  191. package/artifacts/contracts/shared/Component.sol/Component.dbg.json +1 -1
  192. package/artifacts/contracts/shared/Component.sol/Component.json +73 -274
  193. package/artifacts/contracts/shared/ComponentService.sol/ComponentService.dbg.json +1 -1
  194. package/artifacts/contracts/shared/ComponentService.sol/ComponentService.json +606 -258
  195. package/artifacts/contracts/shared/ComponentServiceManager.sol/ComponentServiceManager.dbg.json +1 -1
  196. package/artifacts/contracts/shared/ComponentServiceManager.sol/ComponentServiceManager.json +168 -106
  197. package/artifacts/contracts/shared/ComponentVerifyingService.sol/ComponentVerifyingService.dbg.json +1 -1
  198. package/artifacts/contracts/shared/ComponentVerifyingService.sol/ComponentVerifyingService.json +47 -112
  199. package/artifacts/contracts/shared/ContractLib.sol/ContractLib.dbg.json +4 -0
  200. package/artifacts/contracts/shared/ContractLib.sol/ContractLib.json +488 -0
  201. package/artifacts/contracts/shared/ContractLib.sol/IInstanceAdminHelper.dbg.json +4 -0
  202. package/artifacts/contracts/shared/ContractLib.sol/IInstanceAdminHelper.json +24 -0
  203. package/artifacts/contracts/shared/ContractLib.sol/ITargetHelper.dbg.json +4 -0
  204. package/artifacts/contracts/shared/ContractLib.sol/ITargetHelper.json +30 -0
  205. package/artifacts/contracts/shared/IComponent.sol/IComponent.dbg.json +1 -1
  206. package/artifacts/contracts/shared/IComponent.sol/IComponent.json +66 -77
  207. package/artifacts/contracts/shared/IComponentService.sol/IComponentService.dbg.json +1 -1
  208. package/artifacts/contracts/shared/IComponentService.sol/IComponentService.json +541 -19
  209. package/artifacts/contracts/shared/IInstanceLinkedComponent.sol/IInstanceLinkedComponent.dbg.json +1 -1
  210. package/artifacts/contracts/shared/IInstanceLinkedComponent.sol/IInstanceLinkedComponent.json +96 -103
  211. package/artifacts/contracts/shared/IKeyValueStore.sol/IKeyValueStore.dbg.json +1 -1
  212. package/artifacts/contracts/shared/IKeyValueStore.sol/IKeyValueStore.json +36 -0
  213. package/artifacts/contracts/shared/ILifecycle.sol/ILifecycle.dbg.json +1 -1
  214. package/artifacts/contracts/shared/ILifecycle.sol/ILifecycle.json +36 -0
  215. package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.dbg.json +1 -1
  216. package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.json +16 -0
  217. package/artifacts/contracts/shared/IPolicyHolder.sol/IPolicyHolder.dbg.json +1 -1
  218. package/artifacts/contracts/shared/IPolicyHolder.sol/IPolicyHolder.json +15 -47
  219. package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.dbg.json +1 -1
  220. package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.json +29 -0
  221. package/artifacts/contracts/shared/IRegistryLinked.sol/IRegistryLinked.dbg.json +1 -1
  222. package/artifacts/contracts/shared/IService.sol/IService.dbg.json +1 -1
  223. package/artifacts/contracts/shared/IService.sol/IService.json +29 -0
  224. package/artifacts/contracts/shared/InitializableERC165.sol/InitializableERC165.dbg.json +4 -0
  225. package/artifacts/contracts/shared/InitializableERC165.sol/InitializableERC165.json +53 -0
  226. package/artifacts/contracts/shared/InstanceLinkedComponent.sol/InstanceLinkedComponent.dbg.json +1 -1
  227. package/artifacts/contracts/shared/InstanceLinkedComponent.sol/InstanceLinkedComponent.json +106 -303
  228. package/artifacts/contracts/shared/KeyValueStore.sol/KeyValueStore.dbg.json +1 -1
  229. package/artifacts/contracts/shared/KeyValueStore.sol/KeyValueStore.json +42 -1
  230. package/artifacts/contracts/shared/Lifecycle.sol/Lifecycle.dbg.json +1 -1
  231. package/artifacts/contracts/shared/Lifecycle.sol/Lifecycle.json +42 -1
  232. package/artifacts/contracts/shared/NftIdSet.sol/NftIdSet.dbg.json +4 -0
  233. package/artifacts/contracts/shared/{NftIdSetManager.sol/NftIdSetManager.json → NftIdSet.sol/NftIdSet.json} +4 -4
  234. package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.dbg.json +1 -1
  235. package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.json +22 -57
  236. package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.dbg.json +1 -1
  237. package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.json +19 -141
  238. package/artifacts/contracts/shared/Registerable.sol/Registerable.dbg.json +1 -1
  239. package/artifacts/contracts/shared/Registerable.sol/Registerable.json +58 -89
  240. package/artifacts/contracts/shared/RegistryLinked.sol/RegistryLinked.dbg.json +1 -1
  241. package/artifacts/contracts/shared/RegistryLinked.sol/RegistryLinked.json +2 -15
  242. package/artifacts/contracts/shared/Service.sol/Service.dbg.json +1 -1
  243. package/artifacts/contracts/shared/Service.sol/Service.json +47 -112
  244. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.dbg.json +1 -1
  245. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.json +697 -25
  246. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandlerBase.dbg.json +4 -0
  247. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandlerBase.json +395 -0
  248. package/artifacts/contracts/shared/TokenHandlerDeployerLib.sol/TokenHandlerDeployerLib.dbg.json +4 -0
  249. package/artifacts/contracts/shared/TokenHandlerDeployerLib.sol/TokenHandlerDeployerLib.json +172 -0
  250. package/artifacts/contracts/staking/IStaking.sol/IStaking.dbg.json +1 -1
  251. package/artifacts/contracts/staking/IStaking.sol/IStaking.json +111 -114
  252. package/artifacts/contracts/staking/IStakingService.sol/IStakingService.dbg.json +1 -1
  253. package/artifacts/contracts/staking/IStakingService.sol/IStakingService.json +29 -21
  254. package/artifacts/contracts/staking/StakeManagerLib.sol/StakeManagerLib.dbg.json +1 -1
  255. package/artifacts/contracts/staking/StakeManagerLib.sol/StakeManagerLib.json +73 -93
  256. package/artifacts/contracts/staking/Staking.sol/Staking.dbg.json +1 -1
  257. package/artifacts/contracts/staking/Staking.sol/Staking.json +190 -379
  258. package/artifacts/contracts/staking/StakingLifecycle.sol/StakingLifecycle.dbg.json +1 -1
  259. package/artifacts/contracts/staking/StakingLifecycle.sol/StakingLifecycle.json +46 -5
  260. package/artifacts/contracts/staking/StakingManager.sol/StakingManager.dbg.json +1 -1
  261. package/artifacts/contracts/staking/StakingManager.sol/StakingManager.json +118 -99
  262. package/artifacts/contracts/staking/StakingReader.sol/StakingReader.dbg.json +1 -1
  263. package/artifacts/contracts/staking/StakingReader.sol/StakingReader.json +6 -11
  264. package/artifacts/contracts/staking/StakingService.sol/StakingService.dbg.json +1 -1
  265. package/artifacts/contracts/staking/StakingService.sol/StakingService.json +87 -165
  266. package/artifacts/contracts/staking/StakingServiceManager.sol/StakingServiceManager.dbg.json +1 -1
  267. package/artifacts/contracts/staking/StakingServiceManager.sol/StakingServiceManager.json +95 -79
  268. package/artifacts/contracts/staking/StakingStore.sol/StakingStore.dbg.json +1 -1
  269. package/artifacts/contracts/staking/StakingStore.sol/StakingStore.json +177 -131
  270. package/artifacts/contracts/staking/TargetManagerLib.sol/TargetManagerLib.dbg.json +1 -1
  271. package/artifacts/contracts/staking/TargetManagerLib.sol/TargetManagerLib.json +59 -23
  272. package/artifacts/contracts/type/AddressSet.sol/LibAddressSet.dbg.json +1 -1
  273. package/artifacts/contracts/type/Amount.sol/AmountLib.dbg.json +1 -1
  274. package/artifacts/contracts/type/Amount.sol/AmountLib.json +61 -8
  275. package/artifacts/contracts/type/Blocknumber.sol/BlocknumberLib.dbg.json +1 -1
  276. package/artifacts/contracts/type/Blocknumber.sol/BlocknumberLib.json +2 -2
  277. package/artifacts/contracts/type/ClaimId.sol/ClaimIdLib.dbg.json +1 -1
  278. package/artifacts/contracts/type/ClaimId.sol/ClaimIdLib.json +28 -4
  279. package/artifacts/contracts/type/DistributorType.sol/DistributorTypeLib.dbg.json +1 -1
  280. package/artifacts/contracts/type/DistributorType.sol/DistributorTypeLib.json +2 -2
  281. package/artifacts/contracts/type/Fee.sol/FeeLib.dbg.json +1 -1
  282. package/artifacts/contracts/type/Fee.sol/FeeLib.json +7 -2
  283. package/artifacts/contracts/type/Key32.sol/Key32Lib.dbg.json +1 -1
  284. package/artifacts/contracts/type/Key32.sol/Key32Lib.json +2 -2
  285. package/artifacts/contracts/type/Key32Set.sol/LibKey32Set.dbg.json +4 -0
  286. package/artifacts/contracts/type/Key32Set.sol/LibKey32Set.json +33 -0
  287. package/artifacts/contracts/type/NftId.sol/NftIdLib.dbg.json +1 -1
  288. package/artifacts/contracts/type/NftId.sol/NftIdLib.json +23 -4
  289. package/artifacts/contracts/type/NftIdSet.sol/LibNftIdSet.dbg.json +1 -1
  290. package/artifacts/contracts/type/NftIdSet.sol/LibNftIdSet.json +2 -2
  291. package/artifacts/contracts/type/ObjectType.sol/ObjectTypeLib.dbg.json +1 -1
  292. package/artifacts/contracts/type/ObjectType.sol/ObjectTypeLib.json +2 -2
  293. package/artifacts/contracts/type/PayoutId.sol/PayoutIdLib.dbg.json +1 -1
  294. package/artifacts/contracts/type/PayoutId.sol/PayoutIdLib.json +19 -19
  295. package/artifacts/contracts/type/Referral.sol/ReferralLib.dbg.json +1 -1
  296. package/artifacts/contracts/type/Referral.sol/ReferralLib.json +2 -2
  297. package/artifacts/contracts/type/RequestId.sol/RequestIdLib.dbg.json +1 -1
  298. package/artifacts/contracts/type/RequestId.sol/RequestIdLib.json +2 -2
  299. package/artifacts/contracts/type/RiskId.sol/RiskIdLib.dbg.json +1 -1
  300. package/artifacts/contracts/type/RiskId.sol/RiskIdLib.json +99 -5
  301. package/artifacts/contracts/type/RoleId.sol/RoleIdLib.dbg.json +1 -1
  302. package/artifacts/contracts/type/RoleId.sol/RoleIdLib.json +2 -2
  303. package/artifacts/contracts/type/Seconds.sol/SecondsLib.dbg.json +1 -1
  304. package/artifacts/contracts/type/Seconds.sol/SecondsLib.json +50 -2
  305. package/artifacts/contracts/type/Selector.sol/SelectorLib.dbg.json +1 -1
  306. package/artifacts/contracts/type/Selector.sol/SelectorSetLib.dbg.json +1 -1
  307. package/artifacts/contracts/type/StateId.sol/StateIdLib.dbg.json +1 -1
  308. package/artifacts/contracts/type/StateId.sol/StateIdLib.json +15 -2
  309. package/artifacts/contracts/type/String.sol/StrLib.dbg.json +1 -1
  310. package/artifacts/contracts/type/Timestamp.sol/TimestampLib.dbg.json +1 -1
  311. package/artifacts/contracts/type/Timestamp.sol/TimestampLib.json +23 -4
  312. package/artifacts/contracts/type/UFixed.sol/MathLib.dbg.json +1 -1
  313. package/artifacts/contracts/type/UFixed.sol/MathLib.json +9 -3
  314. package/artifacts/contracts/type/UFixed.sol/UFixedLib.dbg.json +1 -1
  315. package/artifacts/contracts/type/UFixed.sol/UFixedLib.json +52 -2
  316. package/artifacts/contracts/type/Version.sol/VersionLib.dbg.json +1 -1
  317. package/artifacts/contracts/type/Version.sol/VersionLib.json +2 -2
  318. package/artifacts/contracts/type/Version.sol/VersionPartLib.dbg.json +1 -1
  319. package/artifacts/contracts/type/Version.sol/VersionPartLib.json +21 -2
  320. package/artifacts/contracts/upgradeability/IVersionable.sol/IVersionable.dbg.json +4 -0
  321. package/artifacts/contracts/{shared → upgradeability}/IVersionable.sol/IVersionable.json +1 -1
  322. package/artifacts/contracts/upgradeability/ProxyManager.sol/ProxyManager.dbg.json +4 -0
  323. package/artifacts/contracts/upgradeability/ProxyManager.sol/ProxyManager.json +618 -0
  324. package/artifacts/contracts/upgradeability/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.dbg.json +4 -0
  325. package/artifacts/contracts/{shared → upgradeability}/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.json +3 -3
  326. package/artifacts/contracts/upgradeability/Versionable.sol/Versionable.dbg.json +4 -0
  327. package/artifacts/contracts/{shared → upgradeability}/Versionable.sol/Versionable.json +1 -1
  328. package/contracts/authorization/AccessAdmin.sol +83 -58
  329. package/contracts/authorization/Authorization.sol +111 -40
  330. package/contracts/authorization/IAccess.sol +1 -0
  331. package/contracts/authorization/IAccessAdmin.sol +4 -3
  332. package/contracts/authorization/IAuthorization.sol +13 -7
  333. package/contracts/authorization/IServiceAuthorization.sol +3 -1
  334. package/contracts/authorization/ReleaseAccessManager.sol +38 -0
  335. package/contracts/authorization/ServiceAuthorization.sol +26 -10
  336. package/contracts/distribution/BasicDistribution.sol +8 -18
  337. package/contracts/distribution/BasicDistributionAuthorization.sol +6 -2
  338. package/contracts/distribution/Distribution.sol +33 -32
  339. package/contracts/distribution/DistributionService.sol +142 -90
  340. package/contracts/distribution/DistributionServiceManager.sol +8 -11
  341. package/contracts/distribution/IDistributionComponent.sol +9 -5
  342. package/contracts/distribution/IDistributionService.sol +23 -8
  343. package/contracts/examples/fire/DamageLevel.sol +59 -0
  344. package/contracts/examples/fire/FirePool.sol +86 -0
  345. package/contracts/examples/fire/FirePoolAuthorization.sol +34 -0
  346. package/contracts/examples/fire/FireProduct.sol +431 -0
  347. package/contracts/examples/fire/FireProductAuthorization.sol +44 -0
  348. package/contracts/examples/fire/FireUSD.sol +26 -0
  349. package/contracts/examples/unpermissioned/SimpleDistribution.sol +58 -0
  350. package/contracts/examples/unpermissioned/SimpleOracle.sol +137 -0
  351. package/contracts/examples/unpermissioned/SimplePool.sol +108 -0
  352. package/contracts/examples/unpermissioned/SimpleProduct.sol +345 -0
  353. package/contracts/instance/BundleSet.sol +130 -0
  354. package/contracts/instance/IInstance.sol +20 -34
  355. package/contracts/instance/IInstanceService.sol +11 -29
  356. package/contracts/instance/Instance.sol +44 -57
  357. package/contracts/instance/InstanceAdmin.sol +48 -36
  358. package/contracts/instance/InstanceAuthorizationV3.sol +50 -35
  359. package/contracts/instance/InstanceReader.sol +199 -25
  360. package/contracts/instance/InstanceService.sol +96 -115
  361. package/contracts/instance/InstanceServiceManager.sol +8 -13
  362. package/contracts/instance/InstanceStore.sol +12 -1
  363. package/contracts/instance/RiskSet.sol +119 -0
  364. package/contracts/instance/base/ObjectLifecycle.sol +9 -4
  365. package/contracts/instance/base/ObjectSet.sol +78 -0
  366. package/contracts/instance/module/IBundle.sol +1 -1
  367. package/contracts/instance/module/IComponents.sol +11 -13
  368. package/contracts/instance/module/IDistribution.sol +0 -1
  369. package/contracts/instance/module/IPolicy.sol +26 -25
  370. package/contracts/instance/module/IRisk.sol +1 -0
  371. package/contracts/mock/Dip.sol +1 -1
  372. package/contracts/oracle/BasicOracle.sol +0 -1
  373. package/contracts/oracle/IOracleComponent.sol +2 -1
  374. package/contracts/oracle/IOracleService.sol +2 -1
  375. package/contracts/oracle/Oracle.sol +21 -22
  376. package/contracts/oracle/OracleService.sol +112 -81
  377. package/contracts/oracle/OracleServiceManager.sol +8 -11
  378. package/contracts/pool/BasicPool.sol +38 -27
  379. package/contracts/pool/BasicPoolAuthorization.sol +22 -3
  380. package/contracts/pool/BundleService.sol +228 -101
  381. package/contracts/pool/BundleServiceManager.sol +8 -11
  382. package/contracts/pool/IBundleService.sol +33 -17
  383. package/contracts/pool/IPoolComponent.sol +20 -10
  384. package/contracts/pool/IPoolService.sol +53 -50
  385. package/contracts/pool/Pool.sol +150 -116
  386. package/contracts/pool/PoolService.sol +335 -175
  387. package/contracts/pool/PoolServiceManager.sol +6 -9
  388. package/contracts/product/ApplicationService.sol +82 -77
  389. package/contracts/product/ApplicationServiceManager.sol +6 -6
  390. package/contracts/product/BasicProduct.sol +11 -44
  391. package/contracts/product/BasicProductAuthorization.sol +2 -0
  392. package/contracts/product/ClaimService.sol +318 -146
  393. package/contracts/product/ClaimServiceManager.sol +6 -6
  394. package/contracts/product/IApplicationService.sol +6 -2
  395. package/contracts/product/IClaimService.sol +31 -7
  396. package/contracts/product/IPolicyService.sol +46 -34
  397. package/contracts/product/IPricingService.sol +10 -10
  398. package/contracts/product/IProductComponent.sol +24 -4
  399. package/contracts/product/{IProductService.sol → IRiskService.sol} +1 -1
  400. package/contracts/product/PolicyService.sol +515 -257
  401. package/contracts/product/PolicyServiceManager.sol +6 -9
  402. package/contracts/product/PricingService.sol +54 -54
  403. package/contracts/product/PricingServiceManager.sol +5 -8
  404. package/contracts/product/Product.sol +126 -91
  405. package/contracts/product/{ProductService.sol → RiskService.sol} +27 -44
  406. package/contracts/product/RiskServiceManager.sol +39 -0
  407. package/contracts/registry/ChainNft.sol +68 -38
  408. package/contracts/registry/IRegistry.sol +71 -19
  409. package/contracts/registry/IRegistryService.sol +3 -10
  410. package/contracts/registry/ITransferInterceptor.sol +1 -2
  411. package/contracts/registry/Registry.sol +362 -215
  412. package/contracts/registry/RegistryAdmin.sol +161 -75
  413. package/contracts/registry/RegistryService.sol +39 -64
  414. package/contracts/registry/RegistryServiceManager.sol +4 -4
  415. package/contracts/registry/ReleaseLifecycle.sol +6 -3
  416. package/contracts/registry/ReleaseRegistry.sol +485 -0
  417. package/contracts/registry/ServiceAuthorizationV3.sol +22 -47
  418. package/contracts/registry/TokenRegistry.sol +2 -2
  419. package/contracts/shared/Component.sol +54 -118
  420. package/contracts/shared/ComponentService.sol +399 -174
  421. package/contracts/shared/ComponentServiceManager.sol +10 -7
  422. package/contracts/shared/ComponentVerifyingService.sol +28 -17
  423. package/contracts/shared/ContractLib.sol +224 -0
  424. package/contracts/shared/IComponent.sol +10 -13
  425. package/contracts/shared/IComponentService.sol +50 -22
  426. package/contracts/shared/IInstanceLinkedComponent.sol +8 -17
  427. package/contracts/shared/ILifecycle.sol +3 -1
  428. package/contracts/shared/INftOwnable.sol +2 -0
  429. package/contracts/shared/IPolicyHolder.sol +12 -22
  430. package/contracts/shared/IRegisterable.sol +11 -0
  431. package/contracts/shared/IService.sol +1 -1
  432. package/contracts/shared/{ERC165.sol → InitializableERC165.sol} +3 -3
  433. package/contracts/shared/InstanceLinkedComponent.sol +82 -28
  434. package/contracts/shared/KeyValueStore.sol +1 -1
  435. package/contracts/shared/Lifecycle.sol +15 -4
  436. package/contracts/shared/{NftIdSetManager.sol → NftIdSet.sol} +1 -1
  437. package/contracts/shared/NftOwnable.sol +29 -9
  438. package/contracts/shared/PolicyHolder.sol +17 -57
  439. package/contracts/shared/Registerable.sol +19 -11
  440. package/contracts/shared/RegistryLinked.sol +9 -14
  441. package/contracts/shared/Service.sol +23 -22
  442. package/contracts/shared/TokenHandler.sol +358 -27
  443. package/contracts/shared/TokenHandlerDeployerLib.sol +20 -0
  444. package/contracts/staking/IStaking.sol +12 -7
  445. package/contracts/staking/IStakingService.sol +12 -8
  446. package/contracts/staking/StakeManagerLib.sol +18 -25
  447. package/contracts/staking/Staking.sol +54 -62
  448. package/contracts/staking/StakingManager.sol +10 -12
  449. package/contracts/staking/StakingReader.sol +23 -20
  450. package/contracts/staking/StakingService.sol +65 -36
  451. package/contracts/staking/StakingServiceManager.sol +4 -4
  452. package/contracts/staking/StakingStore.sol +12 -22
  453. package/contracts/staking/TargetManagerLib.sol +7 -3
  454. package/contracts/type/Amount.sol +27 -5
  455. package/contracts/type/Blocknumber.sol +7 -1
  456. package/contracts/type/ClaimId.sol +6 -1
  457. package/contracts/type/Key32.sol +2 -2
  458. package/contracts/type/Key32Set.sol +62 -0
  459. package/contracts/type/NftId.sol +7 -0
  460. package/contracts/type/ObjectType.sol +21 -18
  461. package/contracts/type/PayoutId.sol +10 -10
  462. package/contracts/type/Referral.sol +1 -0
  463. package/contracts/type/RiskId.sol +30 -4
  464. package/contracts/type/RoleId.sol +0 -12
  465. package/contracts/type/Seconds.sol +21 -1
  466. package/contracts/type/StateId.sol +15 -1
  467. package/contracts/type/Timestamp.sol +11 -1
  468. package/contracts/type/UFixed.sol +33 -10
  469. package/contracts/type/Version.sol +3 -1
  470. package/contracts/{shared → upgradeability}/ProxyManager.sol +71 -38
  471. package/contracts/{shared → upgradeability}/UpgradableProxyWithAdmin.sol +1 -3
  472. package/contracts/{shared → upgradeability}/Versionable.sol +2 -2
  473. package/package.json +6 -5
  474. package/artifacts/contracts/authorization/IModuleAuthorization.sol/IModuleAuthorization.dbg.json +0 -4
  475. package/artifacts/contracts/authorization/IModuleAuthorization.sol/IModuleAuthorization.json +0 -290
  476. package/artifacts/contracts/authorization/ModuleAuthorization.sol/ModuleAuthorization.dbg.json +0 -4
  477. package/artifacts/contracts/authorization/ModuleAuthorization.sol/ModuleAuthorization.json +0 -390
  478. package/artifacts/contracts/instance/BundleManager.sol/BundleManager.dbg.json +0 -4
  479. package/artifacts/contracts/instance/BundleManager.sol/BundleManager.json +0 -703
  480. package/artifacts/contracts/instance/base/ObjectManager.sol/ObjectManager.dbg.json +0 -4
  481. package/artifacts/contracts/product/IProductService.sol/IProductService.dbg.json +0 -4
  482. package/artifacts/contracts/product/ProductService.sol/ProductService.dbg.json +0 -4
  483. package/artifacts/contracts/product/ProductService.sol/ProductService.json +0 -708
  484. package/artifacts/contracts/product/ProductServiceManager.sol/ProductServiceManager.dbg.json +0 -4
  485. package/artifacts/contracts/product/ProductServiceManager.sol/ProductServiceManager.json +0 -702
  486. package/artifacts/contracts/registry/ReleaseManager.sol/ReleaseManager.dbg.json +0 -4
  487. package/artifacts/contracts/registry/ReleaseManager.sol/ReleaseManager.json +0 -1159
  488. package/artifacts/contracts/shared/ERC165.sol/ERC165.dbg.json +0 -4
  489. package/artifacts/contracts/shared/ERC165.sol/ERC165.json +0 -73
  490. package/artifacts/contracts/shared/IVersionable.sol/IVersionable.dbg.json +0 -4
  491. package/artifacts/contracts/shared/InitializableCustom.sol/InitializableCustom.dbg.json +0 -4
  492. package/artifacts/contracts/shared/InitializableCustom.sol/InitializableCustom.json +0 -39
  493. package/artifacts/contracts/shared/NftIdSetManager.sol/NftIdSetManager.dbg.json +0 -4
  494. package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.dbg.json +0 -4
  495. package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.json +0 -617
  496. package/artifacts/contracts/shared/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.dbg.json +0 -4
  497. package/artifacts/contracts/shared/Versionable.sol/Versionable.dbg.json +0 -4
  498. package/contracts/authorization/IModuleAuthorization.sol +0 -21
  499. package/contracts/authorization/ModuleAuthorization.sol +0 -78
  500. package/contracts/instance/BundleManager.sol +0 -126
  501. package/contracts/instance/base/ObjectManager.sol +0 -79
  502. package/contracts/product/ProductServiceManager.sol +0 -42
  503. package/contracts/registry/ReleaseManager.sol +0 -487
  504. package/contracts/shared/InitializableCustom.sol +0 -177
  505. /package/contracts/{shared → upgradeability}/IVersionable.sol +0 -0
@@ -2,8 +2,8 @@
2
2
  pragma solidity ^0.8.20;
3
3
 
4
4
  import {IRegistry} from "../registry/IRegistry.sol";
5
- import {IVersionable} from "../shared/IVersionable.sol";
6
- import {ProxyManager} from "../shared/ProxyManager.sol";
5
+ import {IVersionable} from "../upgradeability/IVersionable.sol";
6
+ import {ProxyManager} from "../upgradeability/ProxyManager.sol";
7
7
  import {StakingService} from "./StakingService.sol";
8
8
 
9
9
  contract StakingServiceManager is
@@ -18,14 +18,14 @@ contract StakingServiceManager is
18
18
  address registryAddress,
19
19
  bytes32 salt
20
20
  )
21
- ProxyManager(registryAddress)
22
21
  {
23
22
  StakingService svc = new StakingService();
24
23
  bytes memory data = abi.encode(
25
24
  authority,
26
25
  registryAddress,
27
26
  IRegistry(registryAddress).getStakingAddress());
28
- IVersionable versionable = deployDetermenistic(
27
+ IVersionable versionable = initialize(
28
+ registryAddress,
29
29
  address(svc),
30
30
  data,
31
31
  salt);
@@ -3,32 +3,21 @@ pragma solidity ^0.8.20;
3
3
 
4
4
  import {AccessManaged} from "@openzeppelin/contracts/access/manager/AccessManaged.sol";
5
5
 
6
- import {Amount, AmountLib} from "../type/Amount.sol";
7
- import {Blocknumber, BlocknumberLib} from "../type/Blocknumber.sol";
8
- import {ChainNft} from "../registry/ChainNft.sol";
9
- import {Component} from "../shared/Component.sol";
10
6
  import {IRegistry} from "../registry/IRegistry.sol";
11
- import {IRegistryService} from "../registry/IRegistryService.sol";
12
7
  import {IStaking} from "./IStaking.sol";
13
- import {IVersionable} from "../shared/IVersionable.sol";
14
- import {Key32} from "../type/Key32.sol";
8
+
9
+ import {Amount, AmountLib} from "../type/Amount.sol";
10
+ import {Blocknumber, BlocknumberLib} from "../type/Blocknumber.sol";
15
11
  import {KeyValueStore} from "../shared/KeyValueStore.sol";
16
12
  import {KEEP_STATE} from "../type/StateId.sol";
17
- import {LibNftIdSet} from "../type/NftIdSet.sol";
18
13
  import {NftId, NftIdLib} from "../type/NftId.sol";
19
- import {NftIdSetManager} from "../shared/NftIdSetManager.sol";
20
- import {ObjectType, INSTANCE, PROTOCOL, STAKE, STAKING, TARGET} from "../type/ObjectType.sol";
21
- import {Seconds, SecondsLib} from "../type/Seconds.sol";
14
+ import {NftIdSet} from "../shared/NftIdSet.sol";
15
+ import {PROTOCOL, STAKE, TARGET} from "../type/ObjectType.sol";
22
16
  import {StakingReader} from "./StakingReader.sol";
23
17
  import {TargetManagerLib} from "./TargetManagerLib.sol";
24
18
  import {Timestamp, TimestampLib} from "../type/Timestamp.sol";
25
- import {TokenRegistry} from "../registry/TokenRegistry.sol";
26
- import {UFixed, UFixedLib} from "../type/UFixed.sol";
27
- import {Version, VersionLib} from "../type/Version.sol";
28
- import {Versionable} from "../shared/Versionable.sol";
29
-
30
- import {RegistryAdmin} from "../registry/RegistryAdmin.sol";
31
19
  import {StakingLifecycle} from "./StakingLifecycle.sol";
20
+ import {UFixed} from "../type/UFixed.sol";
32
21
 
33
22
 
34
23
  contract StakingStore is
@@ -63,7 +52,7 @@ contract StakingStore is
63
52
  error ErrorStakingStoreTvlBalanceNotInitialized(NftId nftId);
64
53
 
65
54
  IRegistry private _registry;
66
- NftIdSetManager private _targetManager;
55
+ NftIdSet private _targetNftIdSet;
67
56
  StakingReader private _reader;
68
57
 
69
58
  // staking rate
@@ -93,7 +82,7 @@ contract StakingStore is
93
82
  // set internal variables
94
83
  _registry = registry; //TODO if keeps registry -> RegistryLinked and checks registry address
95
84
  _reader = reader;
96
- _targetManager = new NftIdSetManager();
85
+ _targetNftIdSet = new NftIdSet();
97
86
 
98
87
  // register protocol target
99
88
  _createTarget(
@@ -428,8 +417,9 @@ contract StakingStore is
428
417
  return _reader;
429
418
  }
430
419
 
431
- function getTargetManager() external view returns (NftIdSetManager targetManager){
432
- return _targetManager;
420
+ // TODO rename
421
+ function getTargetNftIdSet() external view returns (NftIdSet targetNftIdSet){
422
+ return _targetNftIdSet;
433
423
  }
434
424
 
435
425
  function getStakingRate(uint256 chainId, address token) external view returns (UFixed stakingRate) { return _stakingRate[chainId][token]; }
@@ -493,7 +483,7 @@ contract StakingStore is
493
483
  _tvlLastUpdatedIn[targetNftId]= BlocknumberLib.currentBlocknumber();
494
484
  _createTargetBalance(targetNftId);
495
485
 
496
- _targetManager.add(targetNftId);
486
+ _targetNftIdSet.add(targetNftId);
497
487
  }
498
488
 
499
489
  function _updateReserves(
@@ -132,9 +132,9 @@ library TargetManagerLib {
132
132
  public
133
133
  pure
134
134
  {
135
- // check locking period is > 0
136
- if (lockingPeriod.eqz()) {
137
- revert IStaking.ErrorStakingLockingPeriodZero(targetNftId);
135
+ // check locking period is >= min locking period
136
+ if (lockingPeriod.lt(getMinimumLockingPeriod())) {
137
+ revert IStaking.ErrorStakingLockingPeriodTooShort(targetNftId, getMinimumLockingPeriod(), lockingPeriod);
138
138
  }
139
139
 
140
140
  // check locking period <= max locking period
@@ -190,6 +190,10 @@ library TargetManagerLib {
190
190
  return SecondsLib.toSeconds(365 * 24 * 3600 / 2);
191
191
  }
192
192
 
193
+ /// @dev the minimum locking period is 24 hours
194
+ function getMinimumLockingPeriod() public pure returns (Seconds minLockingPeriod) {
195
+ return SecondsLib.toSeconds(24 * 3600);
196
+ }
193
197
 
194
198
  function getMaxRewardRate() public pure returns (UFixed maxRewardRate) {
195
199
  return UFixedLib.toUFixed(33, -2);
@@ -11,14 +11,18 @@ using {
11
11
  eqAmount as ==,
12
12
  nqAmount as !=,
13
13
  ltAmount as <,
14
+ ltAmount as <=,
14
15
  gtAmount as >,
16
+ gteAmount as >=,
17
+ AmountLib.add,
15
18
  AmountLib.eq,
16
19
  AmountLib.eqz,
17
20
  AmountLib.gtz,
21
+ AmountLib.gt,
22
+ AmountLib.gte,
23
+ AmountLib.multiplyWith,
18
24
  AmountLib.toInt,
19
- AmountLib.add,
20
- AmountLib.toUFixed,
21
- AmountLib.multiplyWith
25
+ AmountLib.toUFixed
22
26
  } for Amount global;
23
27
 
24
28
  function addAmount(Amount a, Amount b) pure returns (Amount) {
@@ -41,10 +45,18 @@ function ltAmount(Amount a, Amount b) pure returns (bool) {
41
45
  return AmountLib.lt(a, b);
42
46
  }
43
47
 
48
+ function lteAmount(Amount a, Amount b) pure returns (bool) {
49
+ return AmountLib.lte(a, b);
50
+ }
51
+
44
52
  function gtAmount(Amount a, Amount b) pure returns (bool) {
45
53
  return AmountLib.gt(a, b);
46
54
  }
47
55
 
56
+ function gteAmount(Amount a, Amount b) pure returns (bool) {
57
+ return AmountLib.gte(a, b);
58
+ }
59
+
48
60
  library AmountLib {
49
61
 
50
62
  error ErrorAmountLibValueTooBig(uint256 amount);
@@ -77,16 +89,26 @@ library AmountLib {
77
89
  return Amount.unwrap(amount1) == Amount.unwrap(amount2);
78
90
  }
79
91
 
80
- /// @dev return true if amount a1 is smaller than a2
92
+ /// @dev return true if amount a1 is less than a2
81
93
  function lt(Amount a1, Amount a2) public pure returns (bool) {
82
94
  return Amount.unwrap(a1) < Amount.unwrap(a2);
83
95
  }
84
96
 
85
- /// @dev return true if amount a1 is larger than a2
97
+ /// @dev return true if amount a1 is less or equal than a2
98
+ function lte(Amount a1, Amount a2) public pure returns (bool) {
99
+ return Amount.unwrap(a1) <= Amount.unwrap(a2);
100
+ }
101
+
102
+ /// @dev return true if amount a1 is greater than a2
86
103
  function gt(Amount a1, Amount a2) public pure returns (bool) {
87
104
  return Amount.unwrap(a1) > Amount.unwrap(a2);
88
105
  }
89
106
 
107
+ /// @dev return true if amount a1 is greater or equal than a2
108
+ function gte(Amount a1, Amount a2) public pure returns (bool) {
109
+ return Amount.unwrap(a1) >= Amount.unwrap(a2);
110
+ }
111
+
90
112
  /// @dev return minimum of a1 and a2.
91
113
  function min(Amount a1, Amount a2) public pure returns (Amount) {
92
114
  if (Amount.unwrap(a1) < Amount.unwrap(a2)) {
@@ -11,8 +11,14 @@ using {
11
11
  eqBlocknumber as ==,
12
12
  neBlocknumber as !=,
13
13
  BlocknumberLib.toInt,
14
+ BlocknumberLib.eq,
15
+ BlocknumberLib.ne,
14
16
  BlocknumberLib.eqz,
15
- BlocknumberLib.gtz
17
+ BlocknumberLib.gtz,
18
+ BlocknumberLib.gt,
19
+ BlocknumberLib.gte,
20
+ BlocknumberLib.lt,
21
+ BlocknumberLib.lte
16
22
  } for Blocknumber global;
17
23
 
18
24
  /// @dev return true if Blocknumber a is greater than Blocknumber b
@@ -12,6 +12,7 @@ import {NftId} from "./NftId.sol";
12
12
  using {
13
13
  eqClaimId as ==,
14
14
  neClaimId as !=,
15
+ ClaimIdLib.eq,
15
16
  ClaimIdLib.eqz,
16
17
  ClaimIdLib.gtz,
17
18
  ClaimIdLib.toInt,
@@ -21,7 +22,7 @@ using {
21
22
 
22
23
  // pure free functions for operators
23
24
  function eqClaimId(ClaimId a, ClaimId b) pure returns (bool isSame) {
24
- return ClaimId.unwrap(a) == ClaimId.unwrap(b);
25
+ return ClaimIdLib.eq(a, b);
25
26
  }
26
27
 
27
28
  function neClaimId(ClaimId a, ClaimId b) pure returns (bool isDifferent) {
@@ -68,6 +69,10 @@ library ClaimIdLib {
68
69
  return ClaimId.unwrap(a) > 0;
69
70
  }
70
71
 
72
+ function eq(ClaimId a, ClaimId b) public pure returns (bool) {
73
+ return ClaimId.unwrap(a) == ClaimId.unwrap(b);
74
+ }
75
+
71
76
  /// @dev Returns true if the value is zero (== 0).
72
77
  function eqz(ClaimId a) public pure returns (bool) {
73
78
  return ClaimId.unwrap(a) == 0;
@@ -28,8 +28,8 @@ library Key32Lib {
28
28
 
29
29
  uint8 public constant TYPE_SHIFT = 31 * 8;
30
30
  uint8 public constant ID_SHIFT = uint8(32 * 8 - TYPE_SHIFT);
31
- bytes32 public constant TYPE_MASK = bytes32(bytes1(type(uint8).max)); // first byte in bytes32
32
- bytes32 public constant ID_MASK = bytes32(~TYPE_MASK); // remaining bytes in bytes32
31
+ bytes32 public constant TYPE_MASK = bytes32(bytes1(type(uint8).max)); // [32] byte in bytes32
32
+ bytes32 public constant ID_MASK = bytes32(~TYPE_MASK); // [0..31] bytes in bytes32
33
33
 
34
34
  function toKey32(ObjectType objectType, KeyId id) public pure returns (Key32) {
35
35
  uint256 uintObjectType = ObjectType.unwrap(objectType);
@@ -0,0 +1,62 @@
1
+ // SPDX-License-Identifier: Apache-2.0
2
+ pragma solidity ^0.8.20;
3
+
4
+ import {Key32} from "../type/Key32.sol";
5
+
6
+ // based on https://github.com/OpenZeppelin/openzeppelin-contracts/blob/master/contracts/utils/structs/EnumerableSet.sol
7
+ library LibKey32Set {
8
+
9
+ struct Set {
10
+ Key32[] keys;
11
+ mapping(Key32 key => uint256 index) at;
12
+ }
13
+
14
+ error ErrorKey32SetAlreadyAdded(Key32 key);
15
+ error ErrorKey32SetNotInSet(Key32 key);
16
+
17
+
18
+ function add(Set storage set, Key32 key) external {
19
+ if (set.at[key] > 0) {
20
+ revert ErrorKey32SetAlreadyAdded(key);
21
+ }
22
+
23
+ set.keys.push(key);
24
+ set.at[key] = set.keys.length;
25
+ }
26
+
27
+ function remove(Set storage set, Key32 key) external {
28
+ uint256 nftIdIndex = set.at[key];
29
+
30
+ if (nftIdIndex == 0) {
31
+ revert ErrorKey32SetNotInSet(key);
32
+ }
33
+
34
+ uint256 toDeleteIndex = nftIdIndex - 1;
35
+ uint256 lastIndex = set.keys.length - 1;
36
+
37
+ if (lastIndex != toDeleteIndex) {
38
+ Key32 lastId = set.keys[lastIndex];
39
+ set.keys[toDeleteIndex] = lastId;
40
+ set.at[lastId] = nftIdIndex; // Replace lastValue's index to valueIndex
41
+ }
42
+
43
+ set.keys.pop();
44
+ delete set.at[key];
45
+ }
46
+
47
+ function isEmpty(Set storage set) external view returns(bool empty) {
48
+ return set.keys.length == 0;
49
+ }
50
+
51
+ function contains(Set storage set, Key32 key) external view returns(bool inSet) {
52
+ return set.at[key] > 0;
53
+ }
54
+
55
+ function size(Set storage set) external view returns(uint256 length) {
56
+ return set.keys.length;
57
+ }
58
+
59
+ function getElementAt(Set storage set, uint256 index) external view returns(Key32 key) {
60
+ return set.keys[index];
61
+ }
62
+ }
@@ -14,6 +14,7 @@ using {
14
14
  NftIdLib.toInt,
15
15
  NftIdLib.gtz,
16
16
  NftIdLib.eqz,
17
+ NftIdLib.eq,
17
18
  NftIdLib.toKeyId,
18
19
  NftIdLib.toKey32
19
20
  } for NftId global;
@@ -75,4 +76,10 @@ library NftIdLib {
75
76
  function toKeyId(NftId id) public pure returns (KeyId keyId) {
76
77
  return KeyId.wrap(bytes31(uint248(NftId.unwrap(id))));
77
78
  }
79
+
80
+ function toNftId(KeyId keyId) public pure returns (NftId nftId) {
81
+ uint248 keyIdInt = uint248(bytes31(KeyId.unwrap(keyId)));
82
+ assert(keyIdInt < type(uint96).max);
83
+ return NftId.wrap(uint96(keyIdInt));
84
+ }
78
85
  }
@@ -9,6 +9,7 @@ using {
9
9
  neObjectType as !=,
10
10
  ObjectTypeLib.toInt,
11
11
  ObjectTypeLib.eqz,
12
+ ObjectTypeLib.eq,
12
13
  ObjectTypeLib.gtz
13
14
  } for ObjectType global;
14
15
 
@@ -27,20 +28,16 @@ function STAKING() pure returns (ObjectType) {
27
28
  return ObjectType.wrap(3);
28
29
  }
29
30
 
30
- function TOKEN() pure returns (ObjectType) {
31
- return ObjectType.wrap(6);
32
- }
33
-
34
31
  function RELEASE() pure returns (ObjectType) {
35
- return ObjectType.wrap(7);
32
+ return ObjectType.wrap(6);
36
33
  }
37
34
 
38
35
  function ROLE() pure returns (ObjectType) {
39
- return ObjectType.wrap(8);
36
+ return ObjectType.wrap(7);
40
37
  }
41
38
 
42
39
  function SERVICE() pure returns (ObjectType) {
43
- return ObjectType.wrap(9);
40
+ return ObjectType.wrap(8);
44
41
  }
45
42
 
46
43
  function INSTANCE() pure returns (ObjectType) {
@@ -75,48 +72,52 @@ function POLICY() pure returns (ObjectType) {
75
72
  return ObjectType.wrap(21);
76
73
  }
77
74
 
78
- function CLAIM() pure returns (ObjectType) {
75
+ function PREMIUM() pure returns (ObjectType) {
79
76
  return ObjectType.wrap(22);
80
77
  }
81
78
 
79
+ function CLAIM() pure returns (ObjectType) {
80
+ return ObjectType.wrap(23);
81
+ }
82
+
82
83
  function PAYOUT() pure returns (ObjectType) {
83
- return ObjectType.wrap(23);
84
+ return ObjectType.wrap(24);
84
85
  }
85
86
 
86
87
  function RISK() pure returns (ObjectType) {
87
- return ObjectType.wrap(24);
88
+ return ObjectType.wrap(25);
88
89
  }
89
90
 
90
91
  function PRICE() pure returns (ObjectType) {
91
- return ObjectType.wrap(25);
92
+ return ObjectType.wrap(26);
92
93
  }
93
94
 
94
95
  function REQUEST() pure returns (ObjectType) {
95
- return ObjectType.wrap(26);
96
+ return ObjectType.wrap(27);
96
97
  }
97
98
 
98
99
  function DISTRIBUTOR_TYPE() pure returns (ObjectType) {
99
- return ObjectType.wrap(27);
100
+ return ObjectType.wrap(28);
100
101
  }
101
102
 
102
103
  function DISTRIBUTOR() pure returns (ObjectType) {
103
- return ObjectType.wrap(28);
104
+ return ObjectType.wrap(29);
104
105
  }
105
106
 
106
107
  function REFERRAL() pure returns (ObjectType) {
107
- return ObjectType.wrap(29);
108
+ return ObjectType.wrap(30);
108
109
  }
109
110
 
110
111
  function BUNDLE() pure returns (ObjectType) {
111
- return ObjectType.wrap(30);
112
+ return ObjectType.wrap(31);
112
113
  }
113
114
 
114
115
  function TARGET() pure returns (ObjectType) {
115
- return ObjectType.wrap(31);
116
+ return ObjectType.wrap(32);
116
117
  }
117
118
 
118
119
  function STAKE() pure returns (ObjectType) {
119
- return ObjectType.wrap(32);
120
+ return ObjectType.wrap(33);
120
121
  }
121
122
 
122
123
  /// @dev Object type that includes any other object type.
@@ -201,6 +202,8 @@ library ObjectTypeLib {
201
202
  return "Price";
202
203
  } else if (objectType == BUNDLE()) {
203
204
  return "Bundle";
205
+ } else if (objectType == RISK()) {
206
+ return "Risk";
204
207
  }
205
208
 
206
209
  // fallback: ObjectType<obect-type-int>
@@ -1,8 +1,8 @@
1
1
  // SPDX-License-Identifier: Apache-2.0
2
2
  pragma solidity ^0.8.20;
3
3
 
4
- // uint24 allows for 65'535 claims with 255 payouts each per policy
5
- type PayoutId is uint24;
4
+ // uint40 allows for 65'535 claims with 16'777'216 payouts each per policy
5
+ type PayoutId is uint40;
6
6
 
7
7
  import {ClaimId} from "./ClaimId.sol";
8
8
  import {PAYOUT} from "./ObjectType.sol";
@@ -39,21 +39,21 @@ library PayoutIdLib {
39
39
  }
40
40
 
41
41
  /// @dev Converts an uint into a PayoutId.
42
- function toPayoutId(ClaimId claimId, uint8 payoutNo) public pure returns (PayoutId) {
43
- return PayoutId.wrap((ClaimId.unwrap(claimId) << 8) + payoutNo);
42
+ function toPayoutId(ClaimId claimId, uint24 payoutNo) public pure returns (PayoutId) {
43
+ return PayoutId.wrap((uint40(ClaimId.unwrap(claimId)) << 24) + payoutNo);
44
44
  }
45
45
 
46
46
  function toClaimId(PayoutId payoutId) public pure returns (ClaimId) {
47
- return ClaimId.wrap(uint16(PayoutId.unwrap(payoutId) >> 8));
47
+ return ClaimId.wrap(uint16(PayoutId.unwrap(payoutId) >> 24));
48
48
  }
49
49
 
50
- function toPayoutNo(PayoutId payoutId) public pure returns (uint8) {
51
- return uint8(PayoutId.unwrap(payoutId) & 255);
50
+ function toPayoutNo(PayoutId payoutId) public pure returns (uint24) {
51
+ return uint24(PayoutId.unwrap(payoutId) & 16777215);
52
52
  }
53
53
 
54
54
  /// @dev Converts the PayoutId to a uint.
55
- function toInt(PayoutId a) public pure returns (uint24) {
56
- return uint24(PayoutId.unwrap(a));
55
+ function toInt(PayoutId a) public pure returns (uint40) {
56
+ return PayoutId.unwrap(a);
57
57
  }
58
58
 
59
59
  /// @dev Returns true if the value is non-zero (> 0).
@@ -77,6 +77,6 @@ library PayoutIdLib {
77
77
  bytes31(
78
78
  bytes15(
79
79
  uint120(
80
- (NftId.unwrap(policyNftId) << 24) + PayoutId.unwrap(payoutId)))));
80
+ (NftId.unwrap(policyNftId) << 40) + PayoutId.unwrap(payoutId)))));
81
81
  }
82
82
  }
@@ -12,6 +12,7 @@ type ReferralStatus is uint8;
12
12
  using {
13
13
  eqReferralId as ==,
14
14
  neReferralId as !=,
15
+ ReferralLib.eqz,
15
16
  ReferralLib.toKey32
16
17
  } for ReferralId global;
17
18
 
@@ -10,6 +10,10 @@ type RiskId is bytes8;
10
10
  using {
11
11
  eqRiskId as ==,
12
12
  neRiskId as !=,
13
+ RiskIdLib.eq,
14
+ RiskIdLib.eqz,
15
+ RiskIdLib.toInt,
16
+ RiskIdLib.toKeyId,
13
17
  RiskIdLib.toKey32
14
18
  } for RiskId global;
15
19
 
@@ -26,18 +30,40 @@ function neRiskId(RiskId a, RiskId b) pure returns (bool isDifferent) {
26
30
  }
27
31
 
28
32
  library RiskIdLib {
29
- // @dev Converts a role string into a role id.
33
+ function zero() public pure returns (RiskId) {
34
+ return RiskId.wrap(bytes8(0));
35
+ }
36
+
37
+ // @dev Converts a risk id into a uint256.
38
+ function toInt(RiskId riskId) public pure returns (uint256) {
39
+ return uint64(RiskId.unwrap(riskId));
40
+ }
41
+
42
+ // @dev Converts a risk id string into a risk id.
30
43
  function toRiskId(string memory risk) public pure returns (RiskId) {
31
44
  return RiskId.wrap(bytes8(keccak256(abi.encode(risk))));
32
45
  }
33
46
 
34
- /// @dev Returns the key32 value for the specified nft id and object type.
35
- function toKey32(RiskId id) public pure returns (Key32 key) {
36
- return Key32Lib.toKey32(RISK(), toKeyId(id));
47
+ /// @dev Returns the key32 value for the specified risk id.
48
+ function toKey32(RiskId riskId) public pure returns (Key32 key) {
49
+ return Key32Lib.toKey32(RISK(), toKeyId(riskId));
37
50
  }
38
51
 
39
52
  /// @dev Returns the key id value for the specified nft id
40
53
  function toKeyId(RiskId id) public pure returns (KeyId keyId) {
41
54
  return KeyId.wrap(bytes31(RiskId.unwrap(id)));
42
55
  }
56
+
57
+ function toRiskId(KeyId keyId) public pure returns (RiskId riskId) {
58
+ riskId = RiskId.wrap(bytes8(KeyId.unwrap(keyId)));
59
+ assert(toInt(riskId) < 2**64);
60
+ }
61
+
62
+ function eq(RiskId a, RiskId b) public pure returns (bool isSame) {
63
+ return eqRiskId(a, b);
64
+ }
65
+
66
+ function eqz(RiskId a) public pure returns (bool isZero) {
67
+ return eqRiskId(a, zero());
68
+ }
43
69
  }
@@ -54,18 +54,6 @@ function GIF_MANAGER_ROLE() pure returns (RoleId) { return RoleIdLib.toRoleId(2)
54
54
  /// @dev role for registering remote staking targets and reporting remote total value locked amounts.
55
55
  function GIF_REMOTE_MANAGER_ROLE() pure returns (RoleId) { return RoleIdLib.toRoleId(3); }
56
56
 
57
- /// @dev instance specific role to register/own a product component
58
- function PRODUCT_OWNER_ROLE() pure returns (RoleId) { return RoleIdLib.toRoleId(11); }
59
-
60
- /// @dev instance specific role to register/own an oracle component
61
- function ORACLE_OWNER_ROLE() pure returns (RoleId) { return RoleIdLib.toRoleId(12); }
62
-
63
- /// @dev instance specific role to register/own a distribution component
64
- function DISTRIBUTION_OWNER_ROLE() pure returns (RoleId) { return RoleIdLib.toRoleId(13); }
65
-
66
- /// @dev instance specific role to register/own a pool component
67
- function POOL_OWNER_ROLE() pure returns (RoleId) { return RoleIdLib.toRoleId(14); }
68
-
69
57
  //--- GIF core contract roles (range: 200 - 9'900) --------------------------//
70
58
  // created and assigned during initial deployment for registry and staking
71
59
  // granting for instances and components in instance service
@@ -6,9 +6,14 @@ type Seconds is uint40;
6
6
  using {
7
7
  SecondsEq as ==,
8
8
  SecondsGt as >,
9
+ SecondsAdd as +,
9
10
  SecondsLib.eqz,
10
11
  SecondsLib.gtz,
11
- SecondsLib.toInt
12
+ SecondsLib.eq,
13
+ SecondsLib.gt,
14
+ SecondsLib.lt,
15
+ SecondsLib.toInt,
16
+ SecondsLib.add
12
17
  } for Seconds global;
13
18
 
14
19
  function SecondsEq(Seconds duration1, Seconds duration2) pure returns (bool) {
@@ -19,6 +24,11 @@ function SecondsGt(Seconds duration1, Seconds duration2) pure returns (bool) {
19
24
  return SecondsLib.gt(duration1, duration2);
20
25
  }
21
26
 
27
+ function SecondsAdd(Seconds duration1, Seconds duration2) pure returns (Seconds) {
28
+ return SecondsLib.add(duration1, duration2);
29
+ }
30
+
31
+
22
32
  library SecondsLib {
23
33
 
24
34
  error ErrorSecondsLibDurationTooBig(uint256 duration);
@@ -70,6 +80,16 @@ library SecondsLib {
70
80
  return Seconds.unwrap(duration1) > Seconds.unwrap(duration2);
71
81
  }
72
82
 
83
+ /// @dev return true if duration1 is smaller than duration2
84
+ function lt(Seconds duration1, Seconds duration2) public pure returns (bool) {
85
+ return Seconds.unwrap(duration1) < Seconds.unwrap(duration2);
86
+ }
87
+
88
+ /// @dev return add duration1 and duration2
89
+ function add(Seconds duration1, Seconds duration2) public pure returns (Seconds) {
90
+ return Seconds.wrap(Seconds.unwrap(duration1) + Seconds.unwrap(duration2));
91
+ }
92
+
73
93
  function toInt(Seconds duration) public pure returns (uint256) {
74
94
  return uint256(uint40(Seconds.unwrap(duration)));
75
95
  }
@@ -9,6 +9,7 @@ using {
9
9
  eqStateId as ==,
10
10
  neStateId as !=,
11
11
  StateIdLib.eqz,
12
+ StateIdLib.eq,
12
13
  StateIdLib.gtz,
13
14
  StateIdLib.toInt
14
15
  } for StateId global;
@@ -27,10 +28,18 @@ function DEPLOYING() pure returns (StateId) {
27
28
  return toStateId(3);
28
29
  }
29
30
 
30
- function ACTIVE() pure returns (StateId) {
31
+ function DEPLOYED() pure returns (StateId) {
31
32
  return toStateId(4);
32
33
  }
33
34
 
35
+ function ACTIVE() pure returns (StateId) {
36
+ return toStateId(5);
37
+ }
38
+
39
+ function SKIPPED() pure returns (StateId) {
40
+ return toStateId(6);
41
+ }
42
+
34
43
  function APPLIED() pure returns (StateId) {
35
44
  return toStateId(10);
36
45
  }
@@ -113,6 +122,11 @@ function neStateId(StateId a, StateId b) pure returns (bool isDifferent) {
113
122
 
114
123
  // library functions that operate on user defined type
115
124
  library StateIdLib {
125
+
126
+ function zero() public pure returns (StateId) {
127
+ return StateId.wrap(0);
128
+ }
129
+
116
130
  /// @dev Converts the NftId to a uint256.
117
131
  function toInt(StateId stateId) public pure returns (uint96) {
118
132
  return uint96(StateId.unwrap(stateId));