@etherisc/gif-next 0.0.2-d7cec72-860 → 0.0.2-d81839a-779

Sign up to get free protection for your applications and to get access to all the features.
Files changed (613) hide show
  1. package/README.md +137 -9
  2. package/artifacts/contracts/accounting/AccountingService.sol/AccountingService.dbg.json +4 -0
  3. package/artifacts/contracts/accounting/AccountingService.sol/AccountingService.json +1075 -0
  4. package/artifacts/contracts/accounting/AccountingServiceManager.sol/AccountingServiceManager.dbg.json +4 -0
  5. package/artifacts/contracts/accounting/AccountingServiceManager.sol/AccountingServiceManager.json +790 -0
  6. package/artifacts/contracts/accounting/IAccountingService.sol/IAccountingService.dbg.json +4 -0
  7. package/artifacts/contracts/accounting/IAccountingService.sol/IAccountingService.json +843 -0
  8. package/artifacts/contracts/authorization/AccessAdmin.sol/AccessAdmin.dbg.json +4 -0
  9. package/artifacts/contracts/authorization/AccessAdmin.sol/AccessAdmin.json +1664 -0
  10. package/artifacts/contracts/authorization/AccessAdminLib.sol/AccessAdminLib.dbg.json +4 -0
  11. package/artifacts/contracts/authorization/AccessAdminLib.sol/AccessAdminLib.json +1289 -0
  12. package/artifacts/contracts/authorization/AccessManagerCloneable.sol/AccessManagerCloneable.dbg.json +4 -0
  13. package/artifacts/contracts/authorization/AccessManagerCloneable.sol/AccessManagerCloneable.json +1403 -0
  14. package/artifacts/contracts/authorization/Authorization.sol/Authorization.dbg.json +4 -0
  15. package/artifacts/contracts/authorization/Authorization.sol/Authorization.json +790 -0
  16. package/artifacts/contracts/authorization/IAccess.sol/IAccess.dbg.json +4 -0
  17. package/artifacts/contracts/authorization/IAccess.sol/IAccess.json +10 -0
  18. package/artifacts/contracts/authorization/IAccessAdmin.sol/IAccessAdmin.dbg.json +4 -0
  19. package/artifacts/contracts/{shared → authorization}/IAccessAdmin.sol/IAccessAdmin.json +525 -342
  20. package/artifacts/contracts/authorization/IAuthorization.sol/IAuthorization.dbg.json +4 -0
  21. package/artifacts/contracts/authorization/IAuthorization.sol/IAuthorization.json +455 -0
  22. package/artifacts/contracts/authorization/IServiceAuthorization.sol/IServiceAuthorization.dbg.json +4 -0
  23. package/artifacts/contracts/authorization/IServiceAuthorization.sol/IServiceAuthorization.json +397 -0
  24. package/artifacts/contracts/authorization/ServiceAuthorization.sol/ServiceAuthorization.dbg.json +4 -0
  25. package/artifacts/contracts/authorization/ServiceAuthorization.sol/ServiceAuthorization.json +646 -0
  26. package/artifacts/contracts/distribution/BasicDistribution.sol/BasicDistribution.dbg.json +4 -0
  27. package/artifacts/contracts/distribution/BasicDistribution.sol/BasicDistribution.json +1244 -0
  28. package/artifacts/contracts/distribution/BasicDistributionAuthorization.sol/BasicDistributionAuthorization.dbg.json +4 -0
  29. package/artifacts/contracts/distribution/BasicDistributionAuthorization.sol/BasicDistributionAuthorization.json +805 -0
  30. package/artifacts/contracts/distribution/Distribution.sol/Distribution.dbg.json +1 -1
  31. package/artifacts/contracts/distribution/Distribution.sol/Distribution.json +139 -606
  32. package/artifacts/contracts/distribution/DistributionService.sol/DistributionService.dbg.json +1 -1
  33. package/artifacts/contracts/distribution/DistributionService.sol/DistributionService.json +754 -323
  34. package/artifacts/contracts/distribution/DistributionServiceManager.sol/DistributionServiceManager.dbg.json +1 -1
  35. package/artifacts/contracts/distribution/DistributionServiceManager.sol/DistributionServiceManager.json +228 -124
  36. package/artifacts/contracts/distribution/IDistributionComponent.sol/IDistributionComponent.dbg.json +1 -1
  37. package/artifacts/contracts/distribution/IDistributionComponent.sol/IDistributionComponent.json +145 -272
  38. package/artifacts/contracts/distribution/IDistributionService.sol/IDistributionService.dbg.json +1 -1
  39. package/artifacts/contracts/distribution/IDistributionService.sol/IDistributionService.json +535 -78
  40. package/artifacts/contracts/examples/fire/DamageLevel.sol/DamageLevelLib.dbg.json +4 -0
  41. package/artifacts/contracts/examples/fire/DamageLevel.sol/DamageLevelLib.json +22 -0
  42. package/artifacts/contracts/examples/fire/FirePool.sol/FirePool.dbg.json +4 -0
  43. package/artifacts/contracts/examples/fire/FirePool.sol/FirePool.json +1484 -0
  44. package/artifacts/contracts/examples/fire/FirePoolAuthorization.sol/FirePoolAuthorization.dbg.json +4 -0
  45. package/artifacts/contracts/examples/fire/FirePoolAuthorization.sol/FirePoolAuthorization.json +805 -0
  46. package/artifacts/contracts/examples/fire/FireProduct.sol/FireProduct.dbg.json +4 -0
  47. package/artifacts/contracts/examples/fire/FireProduct.sol/FireProduct.json +2053 -0
  48. package/artifacts/contracts/examples/fire/FireProductAuthorization.sol/FireProductAuthorization.dbg.json +4 -0
  49. package/artifacts/contracts/examples/fire/FireProductAuthorization.sol/FireProductAuthorization.json +805 -0
  50. package/artifacts/contracts/examples/fire/FireUSD.sol/FireUSD.dbg.json +4 -0
  51. package/artifacts/contracts/examples/fire/FireUSD.sol/FireUSD.json +376 -0
  52. package/artifacts/contracts/examples/unpermissioned/SimpleDistribution.sol/SimpleDistribution.dbg.json +4 -0
  53. package/artifacts/contracts/examples/unpermissioned/SimpleDistribution.sol/SimpleDistribution.json +1439 -0
  54. package/artifacts/contracts/examples/unpermissioned/SimpleDistributionAuthorization.sol/SimpleDistributionAuthorization.dbg.json +4 -0
  55. package/artifacts/contracts/examples/unpermissioned/SimpleDistributionAuthorization.sol/SimpleDistributionAuthorization.json +805 -0
  56. package/artifacts/contracts/examples/unpermissioned/SimpleOracle.sol/SimpleOracle.dbg.json +4 -0
  57. package/artifacts/contracts/examples/unpermissioned/SimpleOracle.sol/SimpleOracle.json +1171 -0
  58. package/artifacts/contracts/examples/unpermissioned/SimplePool.sol/SimplePool.dbg.json +4 -0
  59. package/artifacts/contracts/examples/unpermissioned/SimplePool.sol/SimplePool.json +1647 -0
  60. package/artifacts/contracts/examples/unpermissioned/SimplePoolAuthorization.sol/SimplePoolAuthorization.dbg.json +4 -0
  61. package/artifacts/contracts/examples/unpermissioned/SimplePoolAuthorization.sol/SimplePoolAuthorization.json +805 -0
  62. package/artifacts/contracts/examples/unpermissioned/SimpleProduct.sol/SimpleProduct.dbg.json +4 -0
  63. package/artifacts/contracts/examples/unpermissioned/SimpleProduct.sol/SimpleProduct.json +2585 -0
  64. package/artifacts/contracts/examples/unpermissioned/SimpleProductAuthorization.sol/SimpleProductAuthorization.dbg.json +4 -0
  65. package/artifacts/contracts/examples/unpermissioned/SimpleProductAuthorization.sol/SimpleProductAuthorization.json +805 -0
  66. package/artifacts/contracts/instance/BaseStore.sol/BaseStore.dbg.json +4 -0
  67. package/artifacts/contracts/instance/BaseStore.sol/BaseStore.json +332 -0
  68. package/artifacts/contracts/instance/BundleSet.sol/BundleSet.dbg.json +4 -0
  69. package/artifacts/contracts/instance/BundleSet.sol/BundleSet.json +851 -0
  70. package/artifacts/contracts/instance/IBaseStore.sol/IBaseStore.dbg.json +4 -0
  71. package/artifacts/contracts/instance/IBaseStore.sol/IBaseStore.json +304 -0
  72. package/artifacts/contracts/instance/IInstance.sol/IInstance.dbg.json +1 -1
  73. package/artifacts/contracts/instance/IInstance.sol/IInstance.json +580 -80
  74. package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.dbg.json +1 -1
  75. package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.json +398 -75
  76. package/artifacts/contracts/instance/Instance.sol/Instance.dbg.json +1 -1
  77. package/artifacts/contracts/instance/Instance.sol/Instance.json +589 -217
  78. package/artifacts/contracts/instance/InstanceAdmin.sol/InstanceAdmin.dbg.json +1 -1
  79. package/artifacts/contracts/instance/InstanceAdmin.sol/InstanceAdmin.json +1889 -313
  80. package/artifacts/contracts/instance/InstanceAuthorizationV3.sol/InstanceAuthorizationV3.dbg.json +4 -0
  81. package/artifacts/contracts/instance/InstanceAuthorizationV3.sol/InstanceAuthorizationV3.json +837 -0
  82. package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.dbg.json +1 -1
  83. package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.json +1677 -772
  84. package/artifacts/contracts/instance/InstanceService.sol/InstanceService.dbg.json +1 -1
  85. package/artifacts/contracts/instance/InstanceService.sol/InstanceService.json +392 -274
  86. package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.dbg.json +1 -1
  87. package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.json +141 -127
  88. package/artifacts/contracts/instance/InstanceStore.sol/InstanceStore.dbg.json +1 -1
  89. package/artifacts/contracts/instance/InstanceStore.sol/InstanceStore.json +376 -1560
  90. package/artifacts/contracts/instance/ProductStore.sol/ProductStore.dbg.json +4 -0
  91. package/artifacts/contracts/instance/ProductStore.sol/ProductStore.json +3427 -0
  92. package/artifacts/contracts/instance/RiskSet.sol/RiskSet.dbg.json +4 -0
  93. package/artifacts/contracts/instance/RiskSet.sol/RiskSet.json +866 -0
  94. package/artifacts/contracts/instance/base/BalanceStore.sol/BalanceStore.dbg.json +1 -1
  95. package/artifacts/contracts/instance/base/BalanceStore.sol/BalanceStore.json +8 -8
  96. package/artifacts/contracts/instance/base/Cloneable.sol/Cloneable.dbg.json +1 -1
  97. package/artifacts/contracts/instance/base/ObjectCounter.sol/ObjectCounter.dbg.json +1 -1
  98. package/artifacts/contracts/instance/base/ObjectCounter.sol/ObjectCounter.json +2 -2
  99. package/artifacts/contracts/instance/base/ObjectLifecycle.sol/ObjectLifecycle.dbg.json +4 -0
  100. package/artifacts/contracts/instance/base/ObjectLifecycle.sol/ObjectLifecycle.json +223 -0
  101. package/artifacts/contracts/instance/base/ObjectSet.sol/ObjectSet.dbg.json +4 -0
  102. package/artifacts/contracts/instance/base/ObjectSet.sol/ObjectSet.json +192 -0
  103. package/artifacts/contracts/instance/base/ObjectSetHelperLib.sol/ObjectSetHelperLib.dbg.json +4 -0
  104. package/artifacts/contracts/instance/base/ObjectSetHelperLib.sol/ObjectSetHelperLib.json +168 -0
  105. package/artifacts/contracts/instance/module/IBundle.sol/IBundle.dbg.json +1 -1
  106. package/artifacts/contracts/instance/module/IComponents.sol/IComponents.dbg.json +1 -1
  107. package/artifacts/contracts/instance/module/IDistribution.sol/IDistribution.dbg.json +1 -1
  108. package/artifacts/contracts/instance/module/IPolicy.sol/IPolicy.dbg.json +1 -1
  109. package/artifacts/contracts/instance/module/IRisk.sol/IRisk.dbg.json +1 -1
  110. package/artifacts/contracts/mock/Dip.sol/Dip.dbg.json +1 -1
  111. package/artifacts/contracts/mock/Dip.sol/Dip.json +2 -2
  112. package/artifacts/contracts/oracle/BasicOracle.sol/BasicOracle.dbg.json +4 -0
  113. package/artifacts/contracts/oracle/BasicOracle.sol/BasicOracle.json +957 -0
  114. package/artifacts/contracts/oracle/BasicOracleAuthorization.sol/BasicOracleAuthorization.dbg.json +4 -0
  115. package/artifacts/contracts/oracle/BasicOracleAuthorization.sol/BasicOracleAuthorization.json +810 -0
  116. package/artifacts/contracts/oracle/IOracle.sol/IOracle.dbg.json +1 -1
  117. package/artifacts/contracts/oracle/IOracle.sol/IOracle.json +43 -1
  118. package/artifacts/contracts/oracle/IOracleComponent.sol/IOracleComponent.dbg.json +1 -1
  119. package/artifacts/contracts/oracle/IOracleComponent.sol/IOracleComponent.json +142 -129
  120. package/artifacts/contracts/oracle/IOracleService.sol/IOracleService.dbg.json +1 -1
  121. package/artifacts/contracts/oracle/IOracleService.sol/IOracleService.json +98 -11
  122. package/artifacts/contracts/oracle/Oracle.sol/Oracle.dbg.json +1 -1
  123. package/artifacts/contracts/oracle/Oracle.sol/Oracle.json +140 -413
  124. package/artifacts/contracts/oracle/OracleService.sol/OracleService.dbg.json +1 -1
  125. package/artifacts/contracts/oracle/OracleService.sol/OracleService.json +198 -190
  126. package/artifacts/contracts/oracle/OracleServiceManager.sol/OracleServiceManager.dbg.json +1 -1
  127. package/artifacts/contracts/oracle/OracleServiceManager.sol/OracleServiceManager.json +177 -97
  128. package/artifacts/contracts/pool/BasicPool.sol/BasicPool.dbg.json +4 -0
  129. package/artifacts/contracts/pool/BasicPool.sol/BasicPool.json +1242 -0
  130. package/artifacts/contracts/pool/BasicPoolAuthorization.sol/BasicPoolAuthorization.dbg.json +4 -0
  131. package/artifacts/contracts/pool/BasicPoolAuthorization.sol/BasicPoolAuthorization.json +805 -0
  132. package/artifacts/contracts/pool/BundleService.sol/BundleService.dbg.json +1 -1
  133. package/artifacts/contracts/pool/BundleService.sol/BundleService.json +569 -265
  134. package/artifacts/contracts/pool/BundleServiceManager.sol/BundleServiceManager.dbg.json +1 -1
  135. package/artifacts/contracts/pool/BundleServiceManager.sol/BundleServiceManager.json +216 -104
  136. package/artifacts/contracts/pool/IBundleService.sol/IBundleService.dbg.json +1 -1
  137. package/artifacts/contracts/pool/IBundleService.sol/IBundleService.json +383 -53
  138. package/artifacts/contracts/pool/IPoolComponent.sol/IPoolComponent.dbg.json +1 -1
  139. package/artifacts/contracts/pool/IPoolComponent.sol/IPoolComponent.json +147 -396
  140. package/artifacts/contracts/pool/IPoolService.sol/IPoolService.dbg.json +1 -1
  141. package/artifacts/contracts/pool/IPoolService.sol/IPoolService.json +711 -340
  142. package/artifacts/contracts/pool/Pool.sol/Pool.dbg.json +1 -1
  143. package/artifacts/contracts/pool/Pool.sol/Pool.json +154 -694
  144. package/artifacts/contracts/pool/PoolLib.sol/PoolLib.dbg.json +4 -0
  145. package/artifacts/contracts/pool/PoolLib.sol/PoolLib.json +522 -0
  146. package/artifacts/contracts/pool/PoolService.sol/PoolService.dbg.json +1 -1
  147. package/artifacts/contracts/pool/PoolService.sol/PoolService.json +925 -545
  148. package/artifacts/contracts/pool/PoolServiceManager.sol/PoolServiceManager.dbg.json +1 -1
  149. package/artifacts/contracts/pool/PoolServiceManager.sol/PoolServiceManager.json +230 -106
  150. package/artifacts/contracts/product/ApplicationService.sol/ApplicationService.dbg.json +1 -1
  151. package/artifacts/contracts/product/ApplicationService.sol/ApplicationService.json +353 -180
  152. package/artifacts/contracts/product/ApplicationServiceManager.sol/ApplicationServiceManager.dbg.json +1 -1
  153. package/artifacts/contracts/product/ApplicationServiceManager.sol/ApplicationServiceManager.json +159 -99
  154. package/artifacts/contracts/product/BasicProduct.sol/BasicProduct.dbg.json +4 -0
  155. package/artifacts/contracts/product/BasicProduct.sol/BasicProduct.json +1159 -0
  156. package/artifacts/contracts/product/BasicProductAuthorization.sol/BasicProductAuthorization.dbg.json +4 -0
  157. package/artifacts/contracts/product/BasicProductAuthorization.sol/BasicProductAuthorization.json +805 -0
  158. package/artifacts/contracts/product/ClaimService.sol/ClaimService.dbg.json +1 -1
  159. package/artifacts/contracts/product/ClaimService.sol/ClaimService.json +466 -245
  160. package/artifacts/contracts/product/ClaimServiceManager.sol/ClaimServiceManager.dbg.json +1 -1
  161. package/artifacts/contracts/product/ClaimServiceManager.sol/ClaimServiceManager.json +187 -123
  162. package/artifacts/contracts/product/IApplicationService.sol/IApplicationService.dbg.json +1 -1
  163. package/artifacts/contracts/product/IApplicationService.sol/IApplicationService.json +301 -9
  164. package/artifacts/contracts/product/IClaimService.sol/IClaimService.dbg.json +1 -1
  165. package/artifacts/contracts/product/IClaimService.sol/IClaimService.json +350 -18
  166. package/artifacts/contracts/product/IPolicyService.sol/IPolicyService.dbg.json +1 -1
  167. package/artifacts/contracts/product/IPolicyService.sol/IPolicyService.json +417 -101
  168. package/artifacts/contracts/product/IPricingService.sol/IPricingService.dbg.json +1 -1
  169. package/artifacts/contracts/product/IPricingService.sol/IPricingService.json +183 -80
  170. package/artifacts/contracts/product/IProductComponent.sol/IProductComponent.dbg.json +1 -1
  171. package/artifacts/contracts/product/IProductComponent.sol/IProductComponent.json +282 -261
  172. package/artifacts/contracts/product/IRiskService.sol/IRiskService.dbg.json +4 -0
  173. package/artifacts/contracts/{shared/ComponentVerifyingService.sol/ComponentVerifyingService.json → product/IRiskService.sol/IRiskService.json} +283 -157
  174. package/artifacts/contracts/product/PolicyService.sol/PolicyService.dbg.json +1 -1
  175. package/artifacts/contracts/product/PolicyService.sol/PolicyService.json +532 -311
  176. package/artifacts/contracts/product/PolicyServiceLib.sol/PolicyServiceLib.dbg.json +4 -0
  177. package/artifacts/contracts/product/PolicyServiceLib.sol/PolicyServiceLib.json +783 -0
  178. package/artifacts/contracts/product/PolicyServiceManager.sol/PolicyServiceManager.dbg.json +1 -1
  179. package/artifacts/contracts/product/PolicyServiceManager.sol/PolicyServiceManager.json +196 -108
  180. package/artifacts/contracts/product/PricingService.sol/PricingService.dbg.json +1 -1
  181. package/artifacts/contracts/product/PricingService.sol/PricingService.json +249 -329
  182. package/artifacts/contracts/product/PricingServiceManager.sol/PricingServiceManager.dbg.json +1 -1
  183. package/artifacts/contracts/product/PricingServiceManager.sol/PricingServiceManager.json +165 -137
  184. package/artifacts/contracts/product/Product.sol/Product.dbg.json +1 -1
  185. package/artifacts/contracts/product/Product.sol/Product.json +284 -564
  186. package/artifacts/contracts/product/RiskService.sol/RiskService.dbg.json +4 -0
  187. package/artifacts/contracts/product/RiskService.sol/RiskService.json +873 -0
  188. package/artifacts/contracts/product/RiskServiceManager.sol/RiskServiceManager.dbg.json +4 -0
  189. package/artifacts/contracts/product/RiskServiceManager.sol/RiskServiceManager.json +774 -0
  190. package/artifacts/contracts/registry/ChainNft.sol/ChainNft.dbg.json +1 -1
  191. package/artifacts/contracts/registry/ChainNft.sol/ChainNft.json +59 -16
  192. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.dbg.json +1 -1
  193. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.json +384 -69
  194. package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.dbg.json +1 -1
  195. package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.json +97 -148
  196. package/artifacts/contracts/registry/IRelease.sol/IRelease.dbg.json +4 -0
  197. package/artifacts/contracts/registry/IRelease.sol/IRelease.json +24 -0
  198. package/artifacts/contracts/registry/ITransferInterceptor.sol/ITransferInterceptor.dbg.json +1 -1
  199. package/artifacts/contracts/registry/ITransferInterceptor.sol/ITransferInterceptor.json +5 -18
  200. package/artifacts/contracts/registry/Registry.sol/Registry.dbg.json +1 -1
  201. package/artifacts/contracts/registry/Registry.sol/Registry.json +617 -133
  202. package/artifacts/contracts/registry/RegistryAdmin.sol/RegistryAdmin.dbg.json +1 -1
  203. package/artifacts/contracts/registry/RegistryAdmin.sol/RegistryAdmin.json +796 -537
  204. package/artifacts/contracts/registry/RegistryAuthorization.sol/RegistryAuthorization.dbg.json +4 -0
  205. package/artifacts/contracts/registry/RegistryAuthorization.sol/RegistryAuthorization.json +1074 -0
  206. package/artifacts/contracts/registry/RegistryService.sol/RegistryService.dbg.json +1 -1
  207. package/artifacts/contracts/registry/RegistryService.sol/RegistryService.json +136 -290
  208. package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.dbg.json +1 -1
  209. package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.json +141 -89
  210. package/artifacts/contracts/registry/ReleaseAdmin.sol/ReleaseAdmin.dbg.json +4 -0
  211. package/artifacts/contracts/registry/ReleaseAdmin.sol/ReleaseAdmin.json +2152 -0
  212. package/artifacts/contracts/registry/ReleaseLifecycle.sol/ReleaseLifecycle.dbg.json +4 -0
  213. package/artifacts/contracts/registry/ReleaseLifecycle.sol/ReleaseLifecycle.json +205 -0
  214. package/artifacts/contracts/registry/ReleaseRegistry.sol/ReleaseRegistry.dbg.json +4 -0
  215. package/artifacts/contracts/registry/ReleaseRegistry.sol/ReleaseRegistry.json +1389 -0
  216. package/artifacts/contracts/registry/ServiceAuthorizationV3.sol/ServiceAuthorizationV3.dbg.json +1 -1
  217. package/artifacts/contracts/registry/ServiceAuthorizationV3.sol/ServiceAuthorizationV3.json +523 -27
  218. package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.dbg.json +1 -1
  219. package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.json +120 -60
  220. package/artifacts/contracts/shared/Component.sol/Component.dbg.json +1 -1
  221. package/artifacts/contracts/shared/Component.sol/Component.json +86 -277
  222. package/artifacts/contracts/shared/ComponentService.sol/ComponentService.dbg.json +1 -1
  223. package/artifacts/contracts/shared/ComponentService.sol/ComponentService.json +609 -569
  224. package/artifacts/contracts/shared/ComponentServiceManager.sol/ComponentServiceManager.dbg.json +1 -1
  225. package/artifacts/contracts/shared/ComponentServiceManager.sol/ComponentServiceManager.json +197 -131
  226. package/artifacts/contracts/shared/ContractLib.sol/ContractLib.dbg.json +4 -0
  227. package/artifacts/contracts/shared/ContractLib.sol/ContractLib.json +632 -0
  228. package/artifacts/contracts/shared/ContractLib.sol/IInstanceAdminHelper.dbg.json +4 -0
  229. package/artifacts/contracts/shared/ContractLib.sol/IInstanceAdminHelper.json +24 -0
  230. package/artifacts/contracts/shared/ContractLib.sol/ITargetHelper.dbg.json +4 -0
  231. package/artifacts/contracts/shared/ContractLib.sol/ITargetHelper.json +30 -0
  232. package/artifacts/contracts/shared/ContractLib.sol/ITokenRegistryHelper.dbg.json +4 -0
  233. package/artifacts/contracts/shared/ContractLib.sol/ITokenRegistryHelper.json +40 -0
  234. package/artifacts/contracts/shared/IComponent.sol/IComponent.dbg.json +1 -1
  235. package/artifacts/contracts/shared/IComponent.sol/IComponent.json +92 -93
  236. package/artifacts/contracts/shared/IComponentService.sol/IComponentService.dbg.json +1 -1
  237. package/artifacts/contracts/shared/IComponentService.sol/IComponentService.json +535 -240
  238. package/artifacts/contracts/shared/IInstanceLinkedComponent.sol/IInstanceLinkedComponent.dbg.json +1 -1
  239. package/artifacts/contracts/shared/IInstanceLinkedComponent.sol/IInstanceLinkedComponent.json +131 -129
  240. package/artifacts/contracts/shared/IKeyValueStore.sol/IKeyValueStore.dbg.json +1 -1
  241. package/artifacts/contracts/shared/IKeyValueStore.sol/IKeyValueStore.json +88 -9
  242. package/artifacts/contracts/shared/ILifecycle.sol/ILifecycle.dbg.json +1 -1
  243. package/artifacts/contracts/shared/ILifecycle.sol/ILifecycle.json +34 -3
  244. package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.dbg.json +1 -1
  245. package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.json +35 -0
  246. package/artifacts/contracts/shared/IPolicyHolder.sol/IPolicyHolder.dbg.json +1 -1
  247. package/artifacts/contracts/shared/IPolicyHolder.sol/IPolicyHolder.json +15 -47
  248. package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.dbg.json +1 -1
  249. package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.json +167 -0
  250. package/artifacts/contracts/shared/IRegistryLinked.sol/IRegistryLinked.dbg.json +1 -1
  251. package/artifacts/contracts/shared/IService.sol/IService.dbg.json +1 -1
  252. package/artifacts/contracts/shared/IService.sol/IService.json +84 -2
  253. package/artifacts/contracts/shared/InitializableERC165.sol/InitializableERC165.dbg.json +4 -0
  254. package/artifacts/contracts/shared/InitializableERC165.sol/InitializableERC165.json +53 -0
  255. package/artifacts/contracts/shared/InstanceLinkedComponent.sol/InstanceLinkedComponent.dbg.json +1 -1
  256. package/artifacts/contracts/shared/InstanceLinkedComponent.sol/InstanceLinkedComponent.json +125 -366
  257. package/artifacts/contracts/shared/KeyValueStore.sol/KeyValueStore.dbg.json +1 -1
  258. package/artifacts/contracts/shared/KeyValueStore.sol/KeyValueStore.json +98 -94
  259. package/artifacts/contracts/shared/Lifecycle.sol/Lifecycle.dbg.json +1 -1
  260. package/artifacts/contracts/shared/Lifecycle.sol/Lifecycle.json +42 -62
  261. package/artifacts/contracts/shared/NftIdSet.sol/NftIdSet.dbg.json +4 -0
  262. package/artifacts/contracts/shared/NftIdSet.sol/NftIdSet.json +306 -0
  263. package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.dbg.json +1 -1
  264. package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.json +41 -57
  265. package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.dbg.json +1 -1
  266. package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.json +19 -141
  267. package/artifacts/contracts/shared/Registerable.sol/Registerable.dbg.json +1 -1
  268. package/artifacts/contracts/shared/Registerable.sol/Registerable.json +141 -97
  269. package/artifacts/contracts/shared/RegistryLinked.sol/RegistryLinked.dbg.json +1 -1
  270. package/artifacts/contracts/shared/RegistryLinked.sol/RegistryLinked.json +2 -15
  271. package/artifacts/contracts/shared/Service.sol/Service.dbg.json +1 -1
  272. package/artifacts/contracts/shared/Service.sol/Service.json +86 -111
  273. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.dbg.json +1 -1
  274. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.json +585 -12
  275. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandlerBase.dbg.json +4 -0
  276. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandlerBase.json +484 -0
  277. package/artifacts/contracts/shared/TokenHandlerDeployerLib.sol/TokenHandlerDeployerLib.dbg.json +4 -0
  278. package/artifacts/contracts/shared/TokenHandlerDeployerLib.sol/TokenHandlerDeployerLib.json +172 -0
  279. package/artifacts/contracts/staking/IStaking.sol/IStaking.dbg.json +1 -1
  280. package/artifacts/contracts/staking/IStaking.sol/IStaking.json +1510 -191
  281. package/artifacts/contracts/staking/IStakingService.sol/IStakingService.dbg.json +1 -1
  282. package/artifacts/contracts/staking/IStakingService.sol/IStakingService.json +235 -123
  283. package/artifacts/contracts/staking/ITargetLimitHandler.sol/ITargetLimitHandler.dbg.json +4 -0
  284. package/artifacts/contracts/staking/ITargetLimitHandler.sol/ITargetLimitHandler.json +50 -0
  285. package/artifacts/contracts/staking/Staking.sol/Staking.dbg.json +1 -1
  286. package/artifacts/contracts/staking/Staking.sol/Staking.json +1635 -455
  287. package/artifacts/contracts/staking/StakingLib.sol/StakingLib.dbg.json +4 -0
  288. package/artifacts/contracts/staking/StakingLib.sol/StakingLib.json +470 -0
  289. package/artifacts/contracts/staking/StakingManager.sol/StakingManager.dbg.json +1 -1
  290. package/artifacts/contracts/staking/StakingManager.sol/StakingManager.json +191 -105
  291. package/artifacts/contracts/staking/StakingReader.sol/StakingReader.dbg.json +1 -1
  292. package/artifacts/contracts/staking/StakingReader.sol/StakingReader.json +295 -183
  293. package/artifacts/contracts/staking/StakingService.sol/StakingService.dbg.json +1 -1
  294. package/artifacts/contracts/staking/StakingService.sol/StakingService.json +282 -281
  295. package/artifacts/contracts/staking/StakingServiceManager.sol/StakingServiceManager.dbg.json +1 -1
  296. package/artifacts/contracts/staking/StakingServiceManager.sol/StakingServiceManager.json +144 -96
  297. package/artifacts/contracts/staking/StakingStore.sol/StakingStore.dbg.json +1 -1
  298. package/artifacts/contracts/staking/StakingStore.sol/StakingStore.json +1637 -801
  299. package/artifacts/contracts/staking/TargetHandler.sol/TargetHandler.dbg.json +4 -0
  300. package/artifacts/contracts/staking/TargetHandler.sol/TargetHandler.json +309 -0
  301. package/artifacts/contracts/staking/TargetManagerLib.sol/TargetManagerLib.dbg.json +1 -1
  302. package/artifacts/contracts/staking/TargetManagerLib.sol/TargetManagerLib.json +184 -76
  303. package/artifacts/contracts/type/AddressSet.sol/LibAddressSet.dbg.json +1 -1
  304. package/artifacts/contracts/type/AddressSet.sol/LibAddressSet.json +2 -2
  305. package/artifacts/contracts/type/Amount.sol/AmountLib.dbg.json +1 -1
  306. package/artifacts/contracts/type/Amount.sol/AmountLib.json +63 -10
  307. package/artifacts/contracts/type/Blocknumber.sol/BlocknumberLib.dbg.json +1 -1
  308. package/artifacts/contracts/type/Blocknumber.sol/BlocknumberLib.json +45 -19
  309. package/artifacts/contracts/type/ChainId.sol/ChainIdLib.dbg.json +4 -0
  310. package/artifacts/contracts/type/ChainId.sol/ChainIdLib.json +193 -0
  311. package/artifacts/contracts/type/ClaimId.sol/ClaimIdLib.dbg.json +1 -1
  312. package/artifacts/contracts/type/ClaimId.sol/ClaimIdLib.json +28 -4
  313. package/artifacts/contracts/type/DistributorType.sol/DistributorTypeLib.dbg.json +1 -1
  314. package/artifacts/contracts/type/DistributorType.sol/DistributorTypeLib.json +4 -4
  315. package/artifacts/contracts/type/Fee.sol/FeeLib.dbg.json +1 -1
  316. package/artifacts/contracts/type/Fee.sol/FeeLib.json +98 -37
  317. package/artifacts/contracts/type/Key32.sol/Key32Lib.dbg.json +1 -1
  318. package/artifacts/contracts/type/Key32.sol/Key32Lib.json +2 -2
  319. package/artifacts/contracts/type/Key32Set.sol/LibKey32Set.dbg.json +4 -0
  320. package/artifacts/contracts/type/Key32Set.sol/LibKey32Set.json +33 -0
  321. package/artifacts/contracts/type/NftId.sol/NftIdLib.dbg.json +1 -1
  322. package/artifacts/contracts/type/NftId.sol/NftIdLib.json +23 -4
  323. package/artifacts/contracts/type/NftIdSet.sol/LibNftIdSet.dbg.json +1 -1
  324. package/artifacts/contracts/type/NftIdSet.sol/LibNftIdSet.json +2 -2
  325. package/artifacts/contracts/type/ObjectType.sol/ObjectTypeLib.dbg.json +1 -1
  326. package/artifacts/contracts/type/ObjectType.sol/ObjectTypeLib.json +59 -4
  327. package/artifacts/contracts/type/PayoutId.sol/PayoutIdLib.dbg.json +1 -1
  328. package/artifacts/contracts/type/PayoutId.sol/PayoutIdLib.json +19 -19
  329. package/artifacts/contracts/type/Referral.sol/ReferralLib.dbg.json +1 -1
  330. package/artifacts/contracts/type/Referral.sol/ReferralLib.json +4 -4
  331. package/artifacts/contracts/type/RequestId.sol/RequestIdLib.dbg.json +1 -1
  332. package/artifacts/contracts/type/RequestId.sol/RequestIdLib.json +4 -4
  333. package/artifacts/contracts/type/RiskId.sol/RiskIdLib.dbg.json +1 -1
  334. package/artifacts/contracts/type/RiskId.sol/RiskIdLib.json +125 -7
  335. package/artifacts/contracts/type/RoleId.sol/RoleIdLib.dbg.json +1 -1
  336. package/artifacts/contracts/type/RoleId.sol/RoleIdLib.json +79 -91
  337. package/artifacts/contracts/type/Seconds.sol/SecondsLib.dbg.json +1 -1
  338. package/artifacts/contracts/type/Seconds.sol/SecondsLib.json +93 -2
  339. package/artifacts/contracts/type/Selector.sol/SelectorLib.dbg.json +1 -1
  340. package/artifacts/contracts/type/Selector.sol/SelectorLib.json +21 -2
  341. package/artifacts/contracts/type/Selector.sol/SelectorSetLib.dbg.json +1 -1
  342. package/artifacts/contracts/type/Selector.sol/SelectorSetLib.json +2 -2
  343. package/artifacts/contracts/type/StateId.sol/StateIdLib.dbg.json +1 -1
  344. package/artifacts/contracts/type/StateId.sol/StateIdLib.json +15 -2
  345. package/artifacts/contracts/type/String.sol/StrLib.dbg.json +1 -1
  346. package/artifacts/contracts/type/String.sol/StrLib.json +50 -2
  347. package/artifacts/contracts/type/Timestamp.sol/TimestampLib.dbg.json +1 -1
  348. package/artifacts/contracts/type/Timestamp.sol/TimestampLib.json +24 -5
  349. package/artifacts/contracts/type/UFixed.sol/UFixedLib.dbg.json +1 -1
  350. package/artifacts/contracts/type/UFixed.sol/UFixedLib.json +126 -33
  351. package/artifacts/contracts/type/Version.sol/VersionLib.dbg.json +1 -1
  352. package/artifacts/contracts/type/Version.sol/VersionLib.json +2 -21
  353. package/artifacts/contracts/type/Version.sol/VersionPartLib.dbg.json +1 -1
  354. package/artifacts/contracts/type/Version.sol/VersionPartLib.json +120 -2
  355. package/artifacts/contracts/upgradeability/IVersionable.sol/IVersionable.dbg.json +4 -0
  356. package/artifacts/contracts/{shared → upgradeability}/IVersionable.sol/IVersionable.json +11 -1
  357. package/artifacts/contracts/upgradeability/ProxyManager.sol/ProxyManager.dbg.json +4 -0
  358. package/artifacts/contracts/upgradeability/ProxyManager.sol/ProxyManager.json +656 -0
  359. package/artifacts/contracts/upgradeability/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.dbg.json +4 -0
  360. package/artifacts/contracts/upgradeability/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.json +142 -0
  361. package/artifacts/contracts/upgradeability/Versionable.sol/Versionable.dbg.json +4 -0
  362. package/artifacts/contracts/{shared → upgradeability}/Versionable.sol/Versionable.json +11 -1
  363. package/contracts/accounting/AccountingService.sol +274 -0
  364. package/contracts/accounting/AccountingServiceManager.sol +38 -0
  365. package/contracts/accounting/IAccountingService.sol +47 -0
  366. package/contracts/authorization/AccessAdmin.sol +780 -0
  367. package/contracts/authorization/AccessAdminLib.sol +396 -0
  368. package/contracts/authorization/AccessManagerCloneable.sol +158 -0
  369. package/contracts/authorization/Authorization.sol +169 -0
  370. package/contracts/authorization/IAccess.sol +67 -0
  371. package/contracts/authorization/IAccessAdmin.sol +144 -0
  372. package/contracts/authorization/IAuthorization.sol +26 -0
  373. package/contracts/authorization/IServiceAuthorization.sol +78 -0
  374. package/contracts/authorization/ServiceAuthorization.sol +320 -0
  375. package/contracts/distribution/BasicDistribution.sol +141 -0
  376. package/contracts/distribution/BasicDistributionAuthorization.sol +67 -0
  377. package/contracts/distribution/Distribution.sol +125 -139
  378. package/contracts/distribution/DistributionService.sol +284 -133
  379. package/contracts/distribution/DistributionServiceManager.sol +8 -11
  380. package/contracts/distribution/IDistributionComponent.sol +21 -42
  381. package/contracts/distribution/IDistributionService.sol +60 -26
  382. package/contracts/examples/fire/DamageLevel.sol +59 -0
  383. package/contracts/examples/fire/FirePool.sol +86 -0
  384. package/contracts/examples/fire/FirePoolAuthorization.sol +35 -0
  385. package/contracts/examples/fire/FireProduct.sol +433 -0
  386. package/contracts/examples/fire/FireProductAuthorization.sol +45 -0
  387. package/contracts/examples/fire/FireUSD.sol +26 -0
  388. package/contracts/examples/unpermissioned/SimpleDistribution.sol +81 -0
  389. package/contracts/examples/unpermissioned/SimpleDistributionAuthorization.sol +28 -0
  390. package/contracts/examples/unpermissioned/SimpleOracle.sol +133 -0
  391. package/contracts/examples/unpermissioned/SimplePool.sol +102 -0
  392. package/contracts/examples/unpermissioned/SimplePoolAuthorization.sol +28 -0
  393. package/contracts/examples/unpermissioned/SimpleProduct.sol +437 -0
  394. package/contracts/examples/unpermissioned/SimpleProductAuthorization.sol +28 -0
  395. package/contracts/instance/BaseStore.sol +93 -0
  396. package/contracts/instance/BundleSet.sol +130 -0
  397. package/contracts/instance/IBaseStore.sol +37 -0
  398. package/contracts/instance/IInstance.sol +118 -49
  399. package/contracts/instance/IInstanceService.sol +68 -46
  400. package/contracts/instance/Instance.sol +221 -133
  401. package/contracts/instance/InstanceAdmin.sol +297 -249
  402. package/contracts/instance/InstanceAuthorizationV3.sol +275 -0
  403. package/contracts/instance/InstanceReader.sol +488 -254
  404. package/contracts/instance/InstanceService.sol +340 -265
  405. package/contracts/instance/InstanceServiceManager.sol +8 -13
  406. package/contracts/instance/InstanceStore.sol +19 -92
  407. package/contracts/instance/ProductStore.sol +303 -0
  408. package/contracts/instance/RiskSet.sol +126 -0
  409. package/contracts/instance/TargetNames.sol +10 -0
  410. package/contracts/instance/base/BalanceStore.sol +4 -6
  411. package/contracts/instance/base/ObjectCounter.sol +1 -2
  412. package/contracts/instance/base/ObjectLifecycle.sol +109 -0
  413. package/contracts/instance/base/ObjectSet.sol +77 -0
  414. package/contracts/instance/base/ObjectSetHelperLib.sol +30 -0
  415. package/contracts/instance/module/IBundle.sol +6 -5
  416. package/contracts/instance/module/IComponents.sol +30 -20
  417. package/contracts/instance/module/IDistribution.sol +21 -9
  418. package/contracts/instance/module/IPolicy.sol +50 -29
  419. package/contracts/instance/module/IRisk.sol +5 -0
  420. package/contracts/mock/Dip.sol +1 -1
  421. package/contracts/oracle/BasicOracle.sol +45 -0
  422. package/contracts/oracle/BasicOracleAuthorization.sol +53 -0
  423. package/contracts/oracle/IOracle.sol +25 -4
  424. package/contracts/oracle/IOracleComponent.sol +2 -1
  425. package/contracts/oracle/IOracleService.sol +2 -1
  426. package/contracts/oracle/Oracle.sol +62 -53
  427. package/contracts/oracle/OracleService.sol +119 -87
  428. package/contracts/oracle/OracleServiceManager.sol +8 -11
  429. package/contracts/pool/BasicPool.sol +162 -0
  430. package/contracts/pool/BasicPoolAuthorization.sol +81 -0
  431. package/contracts/pool/BundleService.sol +222 -132
  432. package/contracts/pool/BundleServiceManager.sol +8 -11
  433. package/contracts/pool/IBundleService.sol +43 -33
  434. package/contracts/pool/IPoolComponent.sol +20 -70
  435. package/contracts/pool/IPoolService.sol +97 -77
  436. package/contracts/pool/Pool.sol +198 -164
  437. package/contracts/pool/PoolLib.sol +341 -0
  438. package/contracts/pool/PoolService.sol +419 -257
  439. package/contracts/pool/PoolServiceManager.sol +6 -9
  440. package/contracts/product/ApplicationService.sol +154 -81
  441. package/contracts/product/ApplicationServiceManager.sol +6 -6
  442. package/contracts/product/BasicProduct.sol +49 -0
  443. package/contracts/product/BasicProductAuthorization.sol +63 -0
  444. package/contracts/product/ClaimService.sol +391 -207
  445. package/contracts/product/ClaimServiceManager.sol +6 -6
  446. package/contracts/product/IApplicationService.sol +29 -3
  447. package/contracts/product/IClaimService.sol +48 -11
  448. package/contracts/product/IPolicyService.sol +61 -37
  449. package/contracts/product/IPricingService.sol +11 -10
  450. package/contracts/product/IProductComponent.sol +29 -9
  451. package/contracts/product/IRiskService.sol +48 -0
  452. package/contracts/product/PolicyService.sol +445 -275
  453. package/contracts/product/PolicyServiceLib.sol +139 -0
  454. package/contracts/product/PolicyServiceManager.sol +6 -9
  455. package/contracts/product/PricingService.sol +90 -84
  456. package/contracts/product/PricingServiceManager.sol +6 -9
  457. package/contracts/product/Product.sol +262 -146
  458. package/contracts/product/RiskService.sol +189 -0
  459. package/contracts/product/RiskServiceManager.sol +39 -0
  460. package/contracts/registry/ChainNft.sol +72 -40
  461. package/contracts/registry/IRegistry.sol +84 -36
  462. package/contracts/registry/IRegistryService.sol +3 -10
  463. package/contracts/registry/IRelease.sol +29 -0
  464. package/contracts/registry/ITransferInterceptor.sol +1 -2
  465. package/contracts/registry/Registry.sol +378 -224
  466. package/contracts/registry/RegistryAdmin.sol +119 -261
  467. package/contracts/registry/RegistryAuthorization.sol +336 -0
  468. package/contracts/registry/RegistryService.sol +42 -67
  469. package/contracts/registry/RegistryServiceManager.sol +5 -5
  470. package/contracts/registry/ReleaseAdmin.sol +195 -0
  471. package/contracts/registry/ReleaseLifecycle.sol +32 -0
  472. package/contracts/registry/ReleaseRegistry.sol +525 -0
  473. package/contracts/registry/ServiceAuthorizationV3.sol +213 -71
  474. package/contracts/registry/TokenRegistry.sol +61 -59
  475. package/contracts/shared/Component.sol +70 -137
  476. package/contracts/shared/ComponentService.sol +459 -385
  477. package/contracts/shared/ComponentServiceManager.sol +10 -7
  478. package/contracts/shared/ContractLib.sol +312 -0
  479. package/contracts/shared/IComponent.sol +6 -18
  480. package/contracts/shared/IComponentService.sol +50 -41
  481. package/contracts/shared/IInstanceLinkedComponent.sol +10 -26
  482. package/contracts/shared/IKeyValueStore.sol +10 -1
  483. package/contracts/shared/ILifecycle.sol +3 -2
  484. package/contracts/shared/INftOwnable.sol +4 -0
  485. package/contracts/shared/IPolicyHolder.sol +12 -22
  486. package/contracts/shared/IRegisterable.sol +22 -1
  487. package/contracts/shared/IService.sol +4 -6
  488. package/contracts/shared/{ERC165.sol → InitializableERC165.sol} +11 -3
  489. package/contracts/shared/InstanceLinkedComponent.sol +95 -45
  490. package/contracts/shared/KeyValueStore.sol +10 -6
  491. package/contracts/shared/Lifecycle.sol +30 -72
  492. package/contracts/shared/{NftIdSetManager.sol → NftIdSet.sol} +1 -1
  493. package/contracts/shared/NftOwnable.sol +33 -11
  494. package/contracts/shared/PolicyHolder.sol +20 -59
  495. package/contracts/shared/Registerable.sol +52 -21
  496. package/contracts/shared/RegistryLinked.sol +9 -14
  497. package/contracts/shared/Service.sol +22 -38
  498. package/contracts/shared/TokenHandler.sol +310 -26
  499. package/contracts/shared/TokenHandlerDeployerLib.sol +20 -0
  500. package/contracts/staking/IStaking.sol +272 -73
  501. package/contracts/staking/IStakingService.sol +48 -74
  502. package/contracts/staking/ITargetLimitHandler.sol +17 -0
  503. package/contracts/staking/Staking.sol +533 -248
  504. package/contracts/staking/StakingLib.sol +195 -0
  505. package/contracts/staking/StakingManager.sol +14 -15
  506. package/contracts/staking/StakingReader.sol +72 -88
  507. package/contracts/staking/StakingService.sol +62 -152
  508. package/contracts/staking/StakingServiceManager.sol +9 -7
  509. package/contracts/staking/StakingStore.sol +1096 -341
  510. package/contracts/staking/TargetHandler.sol +132 -0
  511. package/contracts/staking/TargetManagerLib.sol +73 -46
  512. package/contracts/type/Amount.sol +31 -5
  513. package/contracts/type/Blocknumber.sol +22 -16
  514. package/contracts/type/ChainId.sol +101 -0
  515. package/contracts/type/ClaimId.sol +6 -1
  516. package/contracts/type/Fee.sol +8 -8
  517. package/contracts/type/Key32.sol +2 -2
  518. package/contracts/type/Key32Set.sol +62 -0
  519. package/contracts/type/NftId.sol +7 -0
  520. package/contracts/type/ObjectType.sol +94 -28
  521. package/contracts/type/PayoutId.sol +10 -10
  522. package/contracts/type/Referral.sol +1 -0
  523. package/contracts/type/RiskId.sol +38 -6
  524. package/contracts/type/RoleId.sol +93 -114
  525. package/contracts/type/Seconds.sol +40 -1
  526. package/contracts/type/Selector.sol +5 -0
  527. package/contracts/type/StateId.sol +15 -1
  528. package/contracts/type/String.sol +12 -0
  529. package/contracts/type/Timestamp.sol +14 -7
  530. package/contracts/type/UFixed.sol +62 -125
  531. package/contracts/type/Version.sol +57 -6
  532. package/contracts/{shared → upgradeability}/IVersionable.sol +3 -0
  533. package/contracts/{shared → upgradeability}/ProxyManager.sol +96 -49
  534. package/contracts/upgradeability/UpgradableProxyWithAdmin.sol +24 -0
  535. package/contracts/{shared → upgradeability}/Versionable.sol +8 -5
  536. package/package.json +10 -6
  537. package/artifacts/contracts/instance/BundleManager.sol/BundleManager.dbg.json +0 -4
  538. package/artifacts/contracts/instance/BundleManager.sol/BundleManager.json +0 -709
  539. package/artifacts/contracts/instance/InstanceAuthorizationsLib.sol/InstanceAuthorizationsLib.dbg.json +0 -4
  540. package/artifacts/contracts/instance/InstanceAuthorizationsLib.sol/InstanceAuthorizationsLib.json +0 -228
  541. package/artifacts/contracts/instance/base/ObjectManager.sol/ObjectManager.dbg.json +0 -4
  542. package/artifacts/contracts/instance/base/ObjectManager.sol/ObjectManager.json +0 -187
  543. package/artifacts/contracts/instance/module/IAccess.sol/IAccess.dbg.json +0 -4
  544. package/artifacts/contracts/instance/module/IAccess.sol/IAccess.json +0 -129
  545. package/artifacts/contracts/product/IProductService.sol/IProductService.dbg.json +0 -4
  546. package/artifacts/contracts/product/IProductService.sol/IProductService.json +0 -400
  547. package/artifacts/contracts/product/ProductService.sol/ProductService.dbg.json +0 -4
  548. package/artifacts/contracts/product/ProductService.sol/ProductService.json +0 -708
  549. package/artifacts/contracts/product/ProductServiceManager.sol/ProductServiceManager.dbg.json +0 -4
  550. package/artifacts/contracts/product/ProductServiceManager.sol/ProductServiceManager.json +0 -702
  551. package/artifacts/contracts/registry/IServiceAuthorization.sol/IServiceAuthorization.dbg.json +0 -4
  552. package/artifacts/contracts/registry/IServiceAuthorization.sol/IServiceAuthorization.json +0 -129
  553. package/artifacts/contracts/registry/ReleaseManager.sol/ReleaseManager.dbg.json +0 -4
  554. package/artifacts/contracts/registry/ReleaseManager.sol/ReleaseManager.json +0 -1218
  555. package/artifacts/contracts/registry/ServiceAuthorization.sol/ServiceAuthorization.dbg.json +0 -4
  556. package/artifacts/contracts/registry/ServiceAuthorization.sol/ServiceAuthorization.json +0 -171
  557. package/artifacts/contracts/shared/AccessAdmin.sol/AccessAdmin.dbg.json +0 -4
  558. package/artifacts/contracts/shared/AccessAdmin.sol/AccessAdmin.json +0 -1559
  559. package/artifacts/contracts/shared/AccessManagerCustom.sol/AccessManagerCustom.dbg.json +0 -4
  560. package/artifacts/contracts/shared/AccessManagerCustom.sol/AccessManagerCustom.json +0 -1193
  561. package/artifacts/contracts/shared/AccessManagerExtended.sol/AccessManagerExtended.dbg.json +0 -4
  562. package/artifacts/contracts/shared/AccessManagerExtended.sol/AccessManagerExtended.json +0 -1747
  563. package/artifacts/contracts/shared/AccessManagerExtendedInitializeable.sol/AccessManagerExtendedInitializeable.dbg.json +0 -4
  564. package/artifacts/contracts/shared/AccessManagerExtendedInitializeable.sol/AccessManagerExtendedInitializeable.json +0 -1760
  565. package/artifacts/contracts/shared/AccessManagerExtendedWithDisable.sol/AccessManagerExtendedWithDisable.dbg.json +0 -4
  566. package/artifacts/contracts/shared/AccessManagerExtendedWithDisable.sol/AccessManagerExtendedWithDisable.json +0 -1838
  567. package/artifacts/contracts/shared/AccessManagerExtendedWithDisableInitializeable.sol/AccessManagerExtendedWithDisableInitializeable.dbg.json +0 -4
  568. package/artifacts/contracts/shared/AccessManagerExtendedWithDisableInitializeable.sol/AccessManagerExtendedWithDisableInitializeable.json +0 -1856
  569. package/artifacts/contracts/shared/ComponentVerifyingService.sol/ComponentVerifyingService.dbg.json +0 -4
  570. package/artifacts/contracts/shared/ERC165.sol/ERC165.dbg.json +0 -4
  571. package/artifacts/contracts/shared/ERC165.sol/ERC165.json +0 -73
  572. package/artifacts/contracts/shared/IAccessAdmin.sol/IAccessAdmin.dbg.json +0 -4
  573. package/artifacts/contracts/shared/IAccessManagerExtended.sol/IAccessManagerExtended.dbg.json +0 -4
  574. package/artifacts/contracts/shared/IAccessManagerExtended.sol/IAccessManagerExtended.json +0 -1562
  575. package/artifacts/contracts/shared/IAccessManagerExtendedWithDisable.sol/IAccessManagerExtendedWithDisable.dbg.json +0 -4
  576. package/artifacts/contracts/shared/IAccessManagerExtendedWithDisable.sol/IAccessManagerExtendedWithDisable.json +0 -1600
  577. package/artifacts/contracts/shared/IVersionable.sol/IVersionable.dbg.json +0 -4
  578. package/artifacts/contracts/shared/InitializableCustom.sol/InitializableCustom.dbg.json +0 -4
  579. package/artifacts/contracts/shared/InitializableCustom.sol/InitializableCustom.json +0 -39
  580. package/artifacts/contracts/shared/NftIdSetManager.sol/NftIdSetManager.dbg.json +0 -4
  581. package/artifacts/contracts/shared/NftIdSetManager.sol/NftIdSetManager.json +0 -306
  582. package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.dbg.json +0 -4
  583. package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.json +0 -617
  584. package/artifacts/contracts/shared/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.dbg.json +0 -4
  585. package/artifacts/contracts/shared/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.json +0 -129
  586. package/artifacts/contracts/shared/Versionable.sol/Versionable.dbg.json +0 -4
  587. package/artifacts/contracts/staking/StakeManagerLib.sol/StakeManagerLib.dbg.json +0 -4
  588. package/artifacts/contracts/staking/StakeManagerLib.sol/StakeManagerLib.json +0 -460
  589. package/artifacts/contracts/type/UFixed.sol/MathLib.dbg.json +0 -4
  590. package/artifacts/contracts/type/UFixed.sol/MathLib.json +0 -10
  591. package/contracts/instance/BundleManager.sol +0 -126
  592. package/contracts/instance/InstanceAuthorizationsLib.sol +0 -377
  593. package/contracts/instance/base/ObjectManager.sol +0 -80
  594. package/contracts/instance/module/IAccess.sol +0 -46
  595. package/contracts/product/IProductService.sol +0 -33
  596. package/contracts/product/ProductService.sol +0 -124
  597. package/contracts/product/ProductServiceManager.sol +0 -42
  598. package/contracts/registry/IServiceAuthorization.sol +0 -35
  599. package/contracts/registry/ReleaseManager.sol +0 -527
  600. package/contracts/registry/ServiceAuthorization.sol +0 -86
  601. package/contracts/shared/AccessAdmin.sol +0 -759
  602. package/contracts/shared/AccessManagerCustom.sol +0 -741
  603. package/contracts/shared/AccessManagerExtended.sol +0 -481
  604. package/contracts/shared/AccessManagerExtendedInitializeable.sol +0 -13
  605. package/contracts/shared/AccessManagerExtendedWithDisable.sol +0 -137
  606. package/contracts/shared/AccessManagerExtendedWithDisableInitializeable.sol +0 -14
  607. package/contracts/shared/ComponentVerifyingService.sol +0 -117
  608. package/contracts/shared/IAccessAdmin.sol +0 -168
  609. package/contracts/shared/IAccessManagerExtended.sol +0 -74
  610. package/contracts/shared/IAccessManagerExtendedWithDisable.sol +0 -18
  611. package/contracts/shared/InitializableCustom.sol +0 -177
  612. package/contracts/shared/UpgradableProxyWithAdmin.sol +0 -16
  613. package/contracts/staking/StakeManagerLib.sol +0 -231
@@ -1,8 +1,10 @@
1
1
  // SPDX-License-Identifier: Apache-2.0
2
2
  pragma solidity ^0.8.20;
3
3
 
4
- /// @dev UFixed is a fixed point number with 18 decimals precision.
5
- type UFixed is uint256;
4
+ import {Math} from "@openzeppelin/contracts/utils/math/Math.sol";
5
+
6
+ /// @dev UFixed is a 160-bit fixed point number with 15 decimals precision.
7
+ type UFixed is uint160;
6
8
 
7
9
  using {
8
10
  addUFixed as +,
@@ -15,8 +17,11 @@ using {
15
17
  lteUFixed as <=,
16
18
  eqUFixed as ==,
17
19
  neUFixed as !=,
20
+ UFixedLib.gt,
21
+ UFixedLib.eqz,
22
+ UFixedLib.gtz,
18
23
  UFixedLib.toInt,
19
- UFixedLib.gtz
24
+ UFixedLib.toInt1000
20
25
  } for UFixed global;
21
26
 
22
27
  // TODO move to UFixedLib and rename to zero()
@@ -29,20 +34,24 @@ function addUFixed(UFixed a, UFixed b) pure returns (UFixed) {
29
34
  }
30
35
 
31
36
  function subUFixed(UFixed a, UFixed b) pure returns (UFixed) {
32
- require(a >= b, "ERROR:UFM-010:NEGATIVE_RESULT");
37
+ if (a < b) {
38
+ revert UFixedLib.UFixedLibNegativeResult();
39
+ }
33
40
  return UFixed.wrap(UFixed.unwrap(a) - UFixed.unwrap(b));
34
41
  }
35
42
 
36
43
  function mulUFixed(UFixed a, UFixed b) pure returns (UFixed) {
37
44
  return
38
- UFixed.wrap(MathLib.mulDiv(UFixed.unwrap(a), UFixed.unwrap(b), 10 ** 18));
45
+ UFixed.wrap(uint160(Math.mulDiv(UFixed.unwrap(a), UFixed.unwrap(b), 10 ** 15)));
39
46
  }
40
47
 
41
48
  function divUFixed(UFixed a, UFixed b) pure returns (UFixed) {
42
- require(UFixed.unwrap(b) > 0, "ERROR:UFM-020:DIVISOR_ZERO");
43
-
49
+ if (UFixed.unwrap(b) == 0) {
50
+ revert UFixedLib.UFixedLibDivisionByZero();
51
+ }
52
+
44
53
  return
45
- UFixed.wrap(MathLib.mulDiv(UFixed.unwrap(a), 10 ** 18, UFixed.unwrap(b)));
54
+ UFixed.wrap(uint160(Math.mulDiv(UFixed.unwrap(a), 10 ** 15, UFixed.unwrap(b))));
46
55
  }
47
56
 
48
57
  function gtUFixed(UFixed a, UFixed b) pure returns (bool isGreaterThan) {
@@ -85,116 +94,16 @@ function deltaUFixed(UFixed a, UFixed b) pure returns (UFixed) {
85
94
  return b - a;
86
95
  }
87
96
 
88
- /// @dev copied from https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v4.9.3/contracts/utils/math/Math.sol
89
- library MathLib {
90
-
91
- enum Rounding {
92
- Down, // Toward negative infinity
93
- Up, // Toward infinity
94
- Zero // Toward zero
95
- }
96
-
97
- /**
98
- * @notice Calculates floor(x * y / denominator) with full precision. Throws if result overflows a uint256 or denominator == 0
99
- * @dev Original credit to Remco Bloemen under MIT license (https://xn--2-umb.com/21/muldiv)
100
- * with further edits by Uniswap Labs also under MIT license.
101
- */
102
- function mulDiv(uint256 x, uint256 y, uint256 denominator) internal pure returns (uint256 result) {
103
- unchecked {
104
- // 512-bit multiply [prod1 prod0] = x * y. Compute the product mod 2^256 and mod 2^256 - 1, then use
105
- // use the Chinese Remainder Theorem to reconstruct the 512 bit result. The result is stored in two 256
106
- // variables such that product = prod1 * 2^256 + prod0.
107
- uint256 prod0; // Least significant 256 bits of the product
108
- uint256 prod1; // Most significant 256 bits of the product
109
- assembly {
110
- let mm := mulmod(x, y, not(0))
111
- prod0 := mul(x, y)
112
- prod1 := sub(sub(mm, prod0), lt(mm, prod0))
113
- }
114
-
115
- // Handle non-overflow cases, 256 by 256 division.
116
- if (prod1 == 0) {
117
- // Solidity will revert if denominator == 0, unlike the div opcode on its own.
118
- // The surrounding unchecked block does not change this fact.
119
- // See https://docs.soliditylang.org/en/latest/control-structures.html#checked-or-unchecked-arithmetic.
120
- return prod0 / denominator;
121
- }
122
-
123
- // Make sure the result is less than 2^256. Also prevents denominator == 0.
124
- require(denominator > prod1, "Math: mulDiv overflow");
125
-
126
- ///////////////////////////////////////////////
127
- // 512 by 256 division.
128
- ///////////////////////////////////////////////
129
-
130
- // Make division exact by subtracting the remainder from [prod1 prod0].
131
- uint256 remainder;
132
- assembly {
133
- // Compute remainder using mulmod.
134
- remainder := mulmod(x, y, denominator)
135
-
136
- // Subtract 256 bit number from 512 bit number.
137
- prod1 := sub(prod1, gt(remainder, prod0))
138
- prod0 := sub(prod0, remainder)
139
- }
140
-
141
- // Factor powers of two out of denominator and compute largest power of two divisor of denominator. Always >= 1.
142
- // See https://cs.stackexchange.com/q/138556/92363.
143
-
144
- // Does not overflow because the denominator cannot be zero at this stage in the function.
145
- uint256 twos = denominator & (~denominator + 1);
146
- assembly {
147
- // Divide denominator by twos.
148
- denominator := div(denominator, twos)
149
-
150
- // Divide [prod1 prod0] by twos.
151
- prod0 := div(prod0, twos)
152
-
153
- // Flip twos such that it is 2^256 / twos. If twos is zero, then it becomes one.
154
- twos := add(div(sub(0, twos), twos), 1)
155
- }
156
-
157
- // Shift in bits from prod1 into prod0.
158
- prod0 |= prod1 * twos;
159
-
160
- // Invert denominator mod 2^256. Now that denominator is an odd number, it has an inverse modulo 2^256 such
161
- // that denominator * inv = 1 mod 2^256. Compute the inverse by starting with a seed that is correct for
162
- // four bits. That is, denominator * inv = 1 mod 2^4.
163
- uint256 inverse = (3 * denominator) ^ 2;
164
-
165
- // Use the Newton-Raphson iteration to improve the precision. Thanks to Hensel's lifting lemma, this also works
166
- // in modular arithmetic, doubling the correct bits in each step.
167
- inverse *= 2 - denominator * inverse; // inverse mod 2^8
168
- inverse *= 2 - denominator * inverse; // inverse mod 2^16
169
- inverse *= 2 - denominator * inverse; // inverse mod 2^32
170
- inverse *= 2 - denominator * inverse; // inverse mod 2^64
171
- inverse *= 2 - denominator * inverse; // inverse mod 2^128
172
- inverse *= 2 - denominator * inverse; // inverse mod 2^256
173
-
174
- // Because the division is now exact we can divide by multiplying with the modular inverse of denominator.
175
- // This will give us the correct result modulo 2^256. Since the preconditions guarantee that the outcome is
176
- // less than 2^256, this is the final result. We don't need to compute the high bits of the result and prod1
177
- // is no longer required.
178
- result = prod0 * inverse;
179
- return result;
180
- }
181
- }
97
+ library UFixedLib {
98
+ error UFixedLibNegativeResult();
99
+ error UFixedLibDivisionByZero();
182
100
 
183
- /**
184
- * @notice Calculates x * y / denominator with full precision, following the selected rounding direction.
185
- */
186
- function mulDiv(uint256 x, uint256 y, uint256 denominator, Rounding rounding) internal pure returns (uint256) {
187
- uint256 result = mulDiv(x, y, denominator);
188
- if (rounding == Rounding.Up && mulmod(x, y, denominator) > 0) {
189
- result += 1;
190
- }
191
- return result;
192
- }
101
+ error UFixedLibExponentTooSmall(int8 exp);
102
+ error UFixedLibExponentTooLarge(int8 exp);
193
103
 
194
- }
104
+ error UFixedLibNumberTooLarge(uint256 number);
195
105
 
196
- library UFixedLib {
197
- int8 public constant EXP = 18;
106
+ int8 public constant EXP = 15;
198
107
  uint256 public constant MULTIPLIER = 10 ** uint256(int256(EXP));
199
108
  uint256 public constant MULTIPLIER_HALF = MULTIPLIER / 2;
200
109
 
@@ -213,17 +122,32 @@ library UFixedLib {
213
122
  return uint8(2);
214
123
  }
215
124
 
216
- /// @dev Converts the uint256 to a UFixed.
125
+ /// @dev Converts the uint256 to a uint160 based UFixed.
126
+ /// This method reverts if the number is too large to fit in a uint160.
217
127
  function toUFixed(uint256 a) public pure returns (UFixed) {
218
- return UFixed.wrap(a * MULTIPLIER);
128
+ uint256 n = a * MULTIPLIER;
129
+ if (n > type(uint160).max) {
130
+ revert UFixedLibNumberTooLarge(a);
131
+ }
132
+ return UFixed.wrap(uint160(n));
219
133
  }
220
134
 
221
135
  /// @dev Converts the uint256 to a UFixed with given exponent.
222
136
  function toUFixed(uint256 a, int8 exp) public pure returns (UFixed) {
223
- require(EXP + exp >= 0, "ERROR:FM-010:EXPONENT_TOO_SMALL");
224
- require(EXP + exp <= 64, "ERROR:FM-011:EXPONENT_TOO_LARGE");
137
+ if (EXP + exp < 0) {
138
+ revert UFixedLibExponentTooSmall(exp);
139
+ }
140
+ if (EXP + exp > 48) {
141
+ revert UFixedLibExponentTooLarge(exp);
142
+ }
143
+
144
+ uint256 n = a * 10 ** uint8(EXP + exp);
225
145
 
226
- return UFixed.wrap(a * 10 ** uint8(EXP + exp));
146
+ if (n > type(uint160).max) {
147
+ revert UFixedLibNumberTooLarge(n);
148
+ }
149
+
150
+ return UFixed.wrap(uint160(n));
227
151
  }
228
152
 
229
153
  /// @dev returns the decimals precision of the UFixed type
@@ -236,27 +160,32 @@ library UFixedLib {
236
160
  return toIntWithRounding(a, ROUNDING_HALF_UP());
237
161
  }
238
162
 
163
+ /// @dev Converts a UFixed to a uint256.
164
+ function toInt1000(UFixed a) public pure returns (uint256) {
165
+ return toIntWithRounding(toUFixed(1000) * a, ROUNDING_HALF_UP());
166
+ }
167
+
239
168
  /// @dev Converts a UFixed to a uint256 with given rounding mode.
240
169
  function toIntWithRounding(UFixed a, uint8 rounding) public pure returns (uint256) {
241
170
  if (rounding == ROUNDING_HALF_UP()) {
242
171
  return
243
- MathLib.mulDiv(
172
+ Math.mulDiv(
244
173
  UFixed.unwrap(a) + MULTIPLIER_HALF,
245
174
  1,
246
175
  MULTIPLIER,
247
- MathLib.Rounding.Down
176
+ Math.Rounding.Floor
248
177
  );
249
178
  } else if (rounding == ROUNDING_DOWN()) {
250
179
  return
251
- MathLib.mulDiv(
180
+ Math.mulDiv(
252
181
  UFixed.unwrap(a),
253
182
  1,
254
183
  MULTIPLIER,
255
- MathLib.Rounding.Down
184
+ Math.Rounding.Floor
256
185
  );
257
186
  } else {
258
187
  return
259
- MathLib.mulDiv(UFixed.unwrap(a), 1, MULTIPLIER, MathLib.Rounding.Up);
188
+ Math.mulDiv(UFixed.unwrap(a), 1, MULTIPLIER, Math.Rounding.Ceil);
260
189
  }
261
190
  }
262
191
 
@@ -319,6 +248,14 @@ library UFixedLib {
319
248
  return UFixed.wrap(0);
320
249
  }
321
250
 
251
+ function one() public pure returns (UFixed) {
252
+ return UFixed.wrap(uint160(MULTIPLIER));
253
+ }
254
+
255
+ function max() public pure returns (UFixed) {
256
+ return UFixed.wrap(type(uint160).max);
257
+ }
258
+
322
259
  /// @dev return the absolute delta between two UFixed numbers
323
260
  function delta(UFixed a, UFixed b) public pure returns (UFixed) {
324
261
  return deltaUFixed(a, b);
@@ -7,7 +7,11 @@ using {
7
7
  versionPartGt as >,
8
8
  versionPartEq as ==,
9
9
  versionPartNe as !=,
10
- VersionPartLib.toInt
10
+ VersionPartLib.eqz,
11
+ VersionPartLib.gtz,
12
+ VersionPartLib.toInt,
13
+ VersionPartLib.toString,
14
+ VersionPartLib.isValidRelease
11
15
  }
12
16
  for VersionPart global;
13
17
 
@@ -16,8 +20,54 @@ function versionPartEq(VersionPart a, VersionPart b) pure returns(bool isSame) {
16
20
  function versionPartNe(VersionPart a, VersionPart b) pure returns(bool isSame) { return VersionPart.unwrap(a) != VersionPart.unwrap(b); }
17
21
 
18
22
  library VersionPartLib {
19
- function toInt(VersionPart a) external pure returns(uint) { return VersionPart.unwrap(a); }
20
- function toVersionPart(uint256 a) external pure returns(VersionPart) { return VersionPart.wrap(uint8(a)); }
23
+
24
+ error ErrorReleaseTooBig(VersionPart releaseMax, VersionPart release);
25
+
26
+ function releaseMin() public pure returns (VersionPart) { return toVersionPart(3); }
27
+ function releaseMax() public pure returns (VersionPart) { return toVersionPart(99); }
28
+
29
+ function isValidRelease(VersionPart release) external pure returns(bool) {
30
+ uint256 releaseInt = VersionPart.unwrap(release);
31
+ return 3 <= releaseInt && releaseInt <= 99;
32
+ }
33
+
34
+ function toString(VersionPart a) external pure returns (string memory) {
35
+ if (a > releaseMax()) {
36
+ revert ErrorReleaseTooBig(releaseMax(), a);
37
+ }
38
+
39
+ uint256 value = VersionPart.unwrap(a);
40
+ if (value == 0) {
41
+ return "0";
42
+ }
43
+
44
+ uint256 temp = value;
45
+ uint256 digits = 0;
46
+ while (temp != 0) {
47
+ digits++;
48
+ temp /= 10;
49
+ }
50
+
51
+ bytes memory buffer = new bytes(digits);
52
+ uint index = digits - 1;
53
+
54
+ temp = value;
55
+ while (temp != 0) {
56
+ buffer[index] = bytes1(uint8(48 + temp % 10));
57
+ temp /= 10;
58
+
59
+ if (index > 0) {
60
+ index--;
61
+ }
62
+ }
63
+
64
+ return string(buffer);
65
+ }
66
+
67
+ function eqz(VersionPart a) external pure returns(bool) { return VersionPart.unwrap(a) == 0; }
68
+ function gtz(VersionPart a) external pure returns(bool) { return VersionPart.unwrap(a) > 0; }
69
+ function toInt(VersionPart a) external pure returns(uint256) { return VersionPart.unwrap(a); }
70
+ function toVersionPart(uint256 a) public pure returns(VersionPart) { return VersionPart.wrap(uint8(a)); }
21
71
  }
22
72
 
23
73
  type Version is uint24; // contains major,minor,patch version parts
@@ -36,6 +86,7 @@ function versionGt(Version a, Version b) pure returns(bool isGreaterThan) { retu
36
86
  function versionEq(Version a, Version b) pure returns(bool isSame) { return Version.unwrap(a) == Version.unwrap(b); }
37
87
 
38
88
  library VersionLib {
89
+
39
90
  function toInt(Version version) external pure returns(uint) { return Version.unwrap(version); }
40
91
 
41
92
  function toUint64(Version version) external pure returns(uint64) { return Version.unwrap(version); }
@@ -73,9 +124,9 @@ library VersionLib {
73
124
  );
74
125
  }
75
126
 
76
- function toVersionPart(uint256 versionPart) external pure returns(VersionPart) {
77
- return VersionPart.wrap(uint8(versionPart));
78
- }
127
+ // function toVersionPart(uint256 versionPart) public pure returns(VersionPart) {
128
+ // return VersionPart.wrap(uint8(versionPart));
129
+ // }
79
130
 
80
131
  function toVersion(
81
132
  uint256 major,
@@ -28,6 +28,9 @@ import {Version} from "../type/Version.sol";
28
28
 
29
29
  interface IVersionable {
30
30
 
31
+ error ErrorVersionableInitializeNotImplemented();
32
+ error ErrorVersionableUpgradeNotImplemented();
33
+
31
34
  /**
32
35
  * @dev IMPORTANT
33
36
  * implementation MUST be guarded by initializer modifier
@@ -1,17 +1,16 @@
1
1
  // SPDX-License-Identifier: Apache-2.0
2
2
  pragma solidity ^0.8.20;
3
3
 
4
+ import {ProxyAdmin} from "@openzeppelin/contracts/proxy/transparent/ProxyAdmin.sol";
4
5
  import {ITransparentUpgradeableProxy} from "@openzeppelin/contracts/proxy/transparent/TransparentUpgradeableProxy.sol";
5
6
 
6
7
  import {Blocknumber, blockNumber} from "../type/Blocknumber.sol";
7
8
  import {IVersionable} from "./IVersionable.sol";
8
- import {NftOwnable} from "./NftOwnable.sol";
9
- import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";
10
- import {ProxyAdmin} from "@openzeppelin/contracts/proxy/transparent/ProxyAdmin.sol";
9
+ import {NftId} from "../type/NftId.sol";
10
+ import {NftOwnable} from "../shared/NftOwnable.sol";
11
11
  import {Timestamp, TimestampLib} from "../type/Timestamp.sol";
12
12
  import {UpgradableProxyWithAdmin} from "./UpgradableProxyWithAdmin.sol";
13
13
  import {Version, VersionLib} from "../type/Version.sol";
14
- import {NftId} from "../type/NftId.sol";
15
14
 
16
15
  /// @dev manages proxy deployments for upgradable contracs of type IVersionable
17
16
  contract ProxyManager is
@@ -19,11 +18,13 @@ contract ProxyManager is
19
18
  {
20
19
 
21
20
  struct VersionInfo {
22
- Version version;
21
+ // slot 0
23
22
  address implementation;
24
- address activatedBy;
25
23
  Timestamp activatedAt;
26
24
  Blocknumber activatedIn;
25
+ Version version;
26
+ // slot 1
27
+ address activatedBy;
27
28
  }
28
29
 
29
30
  event LogProxyManagerVersionableDeployed(address indexed proxy, address initialImplementation);
@@ -38,60 +39,71 @@ contract ProxyManager is
38
39
  UpgradableProxyWithAdmin internal _proxy;
39
40
 
40
41
  // state to keep version history
41
- mapping(Version version => VersionInfo info) _versionHistory;
42
- Version [] _versions;
43
-
44
- /// @dev only used to capture proxy owner
45
- constructor(address registry)
46
- {
47
- initializeProxyManager(registry);
48
- }
42
+ mapping(Version version => VersionInfo info) internal _versionHistory;
43
+ Version [] internal _versions;
49
44
 
50
- function initializeProxyManager(address registry)
45
+ /// @dev convencience initializer
46
+ function initialize(
47
+ address registry,
48
+ address implementation,
49
+ bytes memory data,
50
+ bytes32 salt
51
+ )
51
52
  public
52
53
  initializer()
54
+ returns (IVersionable versionable)
53
55
  {
54
- initializeNftOwnable(msg.sender, registry);
56
+ versionable = deployDetermenistic(
57
+ registry,
58
+ implementation,
59
+ data,
60
+ salt);
55
61
  }
56
62
 
57
63
  /// @dev deploy initial contract
58
- function deploy(address initialImplementation, bytes memory initializationData)
64
+ function deploy(
65
+ address registry,
66
+ address initialImplementation,
67
+ bytes memory initializationData
68
+ )
59
69
  public
60
70
  virtual
61
- onlyOwner()
71
+ onlyInitializing()
62
72
  returns (IVersionable versionable)
63
73
  {
64
- if (_versions.length > 0) {
65
- revert ErrorProxyManagerAlreadyDeployed();
66
- }
74
+ (
75
+ address currentProxyOwner,
76
+ address initialProxyAdminOwner
77
+ ) = _preDeployChecksAndSetup(registry);
67
78
 
68
- address currentProxyOwner = getOwner(); // used by implementation
69
- address initialProxyAdminOwner = address(this); // used by proxy
70
-
71
79
  _proxy = new UpgradableProxyWithAdmin(
72
80
  initialImplementation,
73
81
  initialProxyAdminOwner,
74
82
  getDeployData(currentProxyOwner, initializationData)
75
83
  );
76
84
 
77
- versionable = IVersionable(address(_proxy));
78
- _updateVersionHistory(versionable.getVersion(), initialImplementation, currentProxyOwner);
85
+ versionable = _updateVersionHistory(
86
+ initialImplementation,
87
+ currentProxyOwner);
79
88
 
80
- emit LogProxyManagerVersionableDeployed(address(_proxy), initialImplementation);
89
+ emit LogProxyManagerVersionableDeployed(address(versionable), initialImplementation);
81
90
  }
82
91
 
83
- function deployDetermenistic(address initialImplementation, bytes memory initializationData, bytes32 salt)
92
+ function deployDetermenistic(
93
+ address registry,
94
+ address initialImplementation,
95
+ bytes memory initializationData,
96
+ bytes32 salt
97
+ )
84
98
  public
85
99
  virtual
86
- onlyOwner()
100
+ onlyInitializing()
87
101
  returns (IVersionable versionable)
88
102
  {
89
- if (_versions.length > 0) {
90
- revert ErrorProxyManagerAlreadyDeployed();
91
- }
92
-
93
- address currentProxyOwner = getOwner();
94
- address initialProxyAdminOwner = address(this);
103
+ (
104
+ address currentProxyOwner,
105
+ address initialProxyAdminOwner
106
+ ) = _preDeployChecksAndSetup(registry);
95
107
 
96
108
  _proxy = new UpgradableProxyWithAdmin{salt: salt}(
97
109
  initialImplementation,
@@ -99,10 +111,23 @@ contract ProxyManager is
99
111
  getDeployData(currentProxyOwner, initializationData)
100
112
  );
101
113
 
102
- versionable = IVersionable(address(_proxy));
103
- _updateVersionHistory(versionable.getVersion(), initialImplementation, currentProxyOwner);
114
+ versionable = _updateVersionHistory(
115
+ initialImplementation,
116
+ currentProxyOwner);
117
+
118
+ emit LogProxyManagerVersionableDeployed(address(versionable), initialImplementation);
119
+ }
104
120
 
105
- emit LogProxyManagerVersionableDeployed(address(_proxy), initialImplementation);
121
+ /// @dev upgrade existing contract.
122
+ /// convenience method using empty data
123
+ function upgrade(address newImplementation)
124
+ public
125
+ virtual
126
+ onlyOwner()
127
+ returns (IVersionable versionable)
128
+ {
129
+ bytes memory emptyUpgradeData;
130
+ return upgrade(newImplementation, emptyUpgradeData);
106
131
  }
107
132
 
108
133
  /// @dev upgrade existing contract
@@ -125,10 +150,11 @@ contract ProxyManager is
125
150
  newImplementation,
126
151
  getUpgradeData(upgradeData));
127
152
 
128
- versionable = IVersionable(address(_proxy));
129
- _updateVersionHistory(versionable.getVersion(), newImplementation, currentProxyOwner);
153
+ versionable = _updateVersionHistory(
154
+ newImplementation,
155
+ currentProxyOwner);
130
156
 
131
- emit LogProxyManagerVersionableUpgraded(address(_proxy), newImplementation);
157
+ emit LogProxyManagerVersionableUpgraded(address(versionable), newImplementation);
132
158
 
133
159
  }
134
160
 
@@ -169,13 +195,34 @@ contract ProxyManager is
169
195
  return _versionHistory[_version];
170
196
  }
171
197
 
198
+ function _preDeployChecksAndSetup(address registry)
199
+ private
200
+ returns (
201
+ address currentProxyOwner,
202
+ address initialProxyAdminOwner
203
+ )
204
+ {
205
+ if (_versions.length > 0) {
206
+ revert ErrorProxyManagerAlreadyDeployed();
207
+ }
208
+
209
+ address initialOwner = msg.sender;
210
+ __NftOwnable_init(registry, initialOwner);
211
+
212
+ currentProxyOwner = getOwner(); // used by implementation
213
+ initialProxyAdminOwner = address(this); // used by proxy
214
+ }
215
+
172
216
  function _updateVersionHistory(
173
- Version newVersion,
174
217
  address implementation,
175
218
  address activatedBy
176
219
  )
177
220
  private
221
+ returns (IVersionable versionable)
178
222
  {
223
+ versionable = IVersionable(address(_proxy));
224
+ Version newVersion = versionable.getVersion();
225
+
179
226
  if(newVersion == VersionLib.zeroVersion()) {
180
227
  revert ErrorProxyManagerZeroVersion();
181
228
  }
@@ -188,12 +235,12 @@ contract ProxyManager is
188
235
 
189
236
  // update version history
190
237
  _versions.push(newVersion);
191
- _versionHistory[newVersion] = VersionInfo(
192
- newVersion,
193
- implementation,
194
- activatedBy,
195
- TimestampLib.blockTimestamp(),
196
- blockNumber()
197
- );
238
+ _versionHistory[newVersion] = VersionInfo({
239
+ version: newVersion,
240
+ implementation: implementation,
241
+ activatedBy: activatedBy,
242
+ activatedAt: TimestampLib.current(),
243
+ activatedIn: blockNumber()
244
+ });
198
245
  }
199
246
  }
@@ -0,0 +1,24 @@
1
+ // SPDX-License-Identifier: Apache-2.0
2
+ pragma solidity ^0.8.20;
3
+
4
+ import {ProxyAdmin} from "@openzeppelin/contracts/proxy/transparent/ProxyAdmin.sol";
5
+ import {TransparentUpgradeableProxy} from "@openzeppelin/contracts/proxy/transparent/TransparentUpgradeableProxy.sol";
6
+
7
+ contract UpgradableProxyWithAdmin is TransparentUpgradeableProxy {
8
+
9
+ bytes internal _initializationData;
10
+
11
+ constructor(address implementation, address initialProxyAdminOwner, bytes memory data)
12
+ TransparentUpgradeableProxy(implementation, initialProxyAdminOwner, data)
13
+ {
14
+ _initializationData = data;
15
+ }
16
+
17
+ function getProxyAdmin() external returns (ProxyAdmin) {
18
+ return ProxyAdmin(_proxyAdmin());
19
+ }
20
+
21
+ function getInitializationData() external view returns (bytes memory) {
22
+ return _initializationData;
23
+ }
24
+ }
@@ -20,7 +20,7 @@ abstract contract Versionable is
20
20
  bytes memory data
21
21
  )
22
22
  public
23
- initializer
23
+ initializer()
24
24
  {
25
25
  _initialize(activatedBy, data);
26
26
  }
@@ -39,12 +39,15 @@ abstract contract Versionable is
39
39
  // IMPORTANT each version must implement this function
40
40
  // each implementation MUST use onlyInitialising modifier
41
41
  // each implementation MUST call intializers of all base contracts...
42
- function _initialize(address owner, bytes memory data)
42
+ function _initialize(
43
+ address, // owner
44
+ bytes memory // data
45
+ )
43
46
  internal
44
- onlyInitializing
47
+ onlyInitializing()
45
48
  virtual
46
49
  {
47
- revert();
50
+ revert ErrorVersionableInitializeNotImplemented();
48
51
  }
49
52
 
50
53
  // IMPORTANT each version except version "1" must implement this function
@@ -54,6 +57,6 @@ abstract contract Versionable is
54
57
  onlyInitializing
55
58
  virtual
56
59
  {
57
- revert();
60
+ revert ErrorVersionableUpgradeNotImplemented();
58
61
  }
59
62
  }