@etherisc/gif-next 3.0.0-f90c901-018 → 3.0.0-fb87f3a-607

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 (507) hide show
  1. package/README.md +10 -1
  2. package/artifacts/contracts/accounting/AccountingService.sol/AccountingService.dbg.json +1 -1
  3. package/artifacts/contracts/accounting/AccountingService.sol/AccountingService.json +83 -164
  4. package/artifacts/contracts/accounting/AccountingServiceManager.sol/AccountingServiceManager.dbg.json +1 -1
  5. package/artifacts/contracts/accounting/AccountingServiceManager.sol/AccountingServiceManager.json +115 -113
  6. package/artifacts/contracts/accounting/IAccountingService.sol/IAccountingService.dbg.json +1 -1
  7. package/artifacts/contracts/accounting/IAccountingService.sol/IAccountingService.json +46 -91
  8. package/artifacts/contracts/authorization/AccessAdmin.sol/AccessAdmin.dbg.json +1 -1
  9. package/artifacts/contracts/authorization/AccessAdmin.sol/AccessAdmin.json +70 -105
  10. package/artifacts/contracts/authorization/AccessAdminLib.sol/AccessAdminLib.dbg.json +1 -1
  11. package/artifacts/contracts/authorization/AccessAdminLib.sol/AccessAdminLib.json +150 -126
  12. package/artifacts/contracts/authorization/AccessManagerCloneable.sol/AccessManagerCloneable.dbg.json +1 -1
  13. package/artifacts/contracts/authorization/AccessManagerCloneable.sol/AccessManagerCloneable.json +84 -20
  14. package/artifacts/contracts/authorization/Authorization.sol/Authorization.dbg.json +1 -1
  15. package/artifacts/contracts/authorization/Authorization.sol/Authorization.json +55 -31
  16. package/artifacts/contracts/authorization/IAccess.sol/IAccess.dbg.json +1 -1
  17. package/artifacts/contracts/authorization/IAccessAdmin.sol/IAccessAdmin.dbg.json +1 -1
  18. package/artifacts/contracts/authorization/IAccessAdmin.sol/IAccessAdmin.json +10 -20
  19. package/artifacts/contracts/authorization/IAuthorization.sol/IAuthorization.dbg.json +1 -1
  20. package/artifacts/contracts/authorization/IAuthorization.sol/IAuthorization.json +1 -1
  21. package/artifacts/contracts/authorization/IServiceAuthorization.sol/IServiceAuthorization.dbg.json +1 -1
  22. package/artifacts/contracts/authorization/IServiceAuthorization.sol/IServiceAuthorization.json +1 -1
  23. package/artifacts/contracts/authorization/ServiceAuthorization.sol/ServiceAuthorization.dbg.json +1 -1
  24. package/artifacts/contracts/authorization/ServiceAuthorization.sol/ServiceAuthorization.json +42 -18
  25. package/artifacts/contracts/distribution/BasicDistribution.sol/BasicDistribution.dbg.json +1 -1
  26. package/artifacts/contracts/distribution/BasicDistribution.sol/BasicDistribution.json +75 -126
  27. package/artifacts/contracts/distribution/BasicDistributionAuthorization.sol/BasicDistributionAuthorization.dbg.json +1 -1
  28. package/artifacts/contracts/distribution/BasicDistributionAuthorization.sol/BasicDistributionAuthorization.json +65 -41
  29. package/artifacts/contracts/distribution/Distribution.sol/Distribution.dbg.json +1 -1
  30. package/artifacts/contracts/distribution/Distribution.sol/Distribution.json +57 -72
  31. package/artifacts/contracts/distribution/DistributionService.sol/DistributionService.dbg.json +1 -1
  32. package/artifacts/contracts/distribution/DistributionService.sol/DistributionService.json +224 -198
  33. package/artifacts/contracts/distribution/DistributionServiceManager.sol/DistributionServiceManager.dbg.json +1 -1
  34. package/artifacts/contracts/distribution/DistributionServiceManager.sol/DistributionServiceManager.json +150 -140
  35. package/artifacts/contracts/distribution/IDistributionComponent.sol/IDistributionComponent.dbg.json +1 -1
  36. package/artifacts/contracts/distribution/IDistributionComponent.sol/IDistributionComponent.json +56 -84
  37. package/artifacts/contracts/distribution/IDistributionService.sol/IDistributionService.dbg.json +1 -1
  38. package/artifacts/contracts/distribution/IDistributionService.sol/IDistributionService.json +117 -71
  39. package/artifacts/contracts/examples/fire/DamageLevel.sol/DamageLevelLib.dbg.json +1 -1
  40. package/artifacts/contracts/examples/fire/FirePool.sol/FirePool.dbg.json +1 -1
  41. package/artifacts/contracts/examples/fire/FirePool.sol/FirePool.json +104 -166
  42. package/artifacts/contracts/examples/fire/FirePoolAuthorization.sol/FirePoolAuthorization.dbg.json +1 -1
  43. package/artifacts/contracts/examples/fire/FirePoolAuthorization.sol/FirePoolAuthorization.json +65 -41
  44. package/artifacts/contracts/examples/fire/FireProduct.sol/FireProduct.dbg.json +1 -1
  45. package/artifacts/contracts/examples/fire/FireProduct.sol/FireProduct.json +138 -200
  46. package/artifacts/contracts/examples/fire/FireProductAuthorization.sol/FireProductAuthorization.dbg.json +1 -1
  47. package/artifacts/contracts/examples/fire/FireProductAuthorization.sol/FireProductAuthorization.json +65 -41
  48. package/artifacts/contracts/examples/fire/FireUSD.sol/FireUSD.dbg.json +1 -1
  49. package/artifacts/contracts/examples/flight/FlightLib.sol/FlightLib.dbg.json +4 -0
  50. package/artifacts/contracts/examples/flight/FlightLib.sol/FlightLib.json +799 -0
  51. package/artifacts/contracts/examples/flight/FlightMessageVerifier.sol/FlightMessageVerifier.dbg.json +4 -0
  52. package/artifacts/contracts/examples/flight/FlightMessageVerifier.sol/FlightMessageVerifier.json +229 -0
  53. package/artifacts/contracts/examples/flight/FlightNft.sol/FlightNft.dbg.json +4 -0
  54. package/artifacts/contracts/examples/flight/FlightNft.sol/FlightNft.json +801 -0
  55. package/artifacts/contracts/examples/flight/FlightOracle.sol/FlightOracle.dbg.json +4 -0
  56. package/artifacts/contracts/examples/flight/FlightOracle.sol/FlightOracle.json +1353 -0
  57. package/artifacts/contracts/examples/flight/FlightOracleAuthorization.sol/FlightOracleAuthorization.dbg.json +4 -0
  58. package/artifacts/contracts/examples/flight/FlightOracleAuthorization.sol/FlightOracleAuthorization.json +896 -0
  59. package/artifacts/contracts/examples/flight/FlightPool.sol/FlightPool.dbg.json +4 -0
  60. package/artifacts/contracts/examples/flight/FlightPool.sol/FlightPool.json +1466 -0
  61. package/artifacts/contracts/examples/flight/FlightPoolAuthorization.sol/FlightPoolAuthorization.dbg.json +4 -0
  62. package/artifacts/contracts/examples/flight/FlightPoolAuthorization.sol/FlightPoolAuthorization.json +844 -0
  63. package/artifacts/contracts/examples/flight/FlightProduct.sol/FlightProduct.dbg.json +4 -0
  64. package/artifacts/contracts/examples/flight/FlightProduct.sol/FlightProduct.json +2289 -0
  65. package/artifacts/contracts/examples/flight/FlightProductAuthorization.sol/FlightProductAuthorization.dbg.json +4 -0
  66. package/artifacts/contracts/examples/flight/FlightProductAuthorization.sol/FlightProductAuthorization.json +891 -0
  67. package/artifacts/contracts/examples/flight/FlightProductManager.sol/FlightProductManager.dbg.json +4 -0
  68. package/artifacts/contracts/examples/flight/FlightProductManager.sol/FlightProductManager.json +711 -0
  69. package/artifacts/contracts/examples/flight/FlightUSD.sol/FlightUSD.dbg.json +4 -0
  70. package/artifacts/contracts/examples/flight/FlightUSD.sol/FlightUSD.json +586 -0
  71. package/artifacts/contracts/examples/flight/originalV1.sol/FlightDelayChainlink.dbg.json +4 -0
  72. package/artifacts/contracts/examples/flight/originalV1.sol/FlightDelayChainlink.json +901 -0
  73. package/artifacts/contracts/examples/unpermissioned/SimpleDistribution.sol/SimpleDistribution.dbg.json +1 -1
  74. package/artifacts/contracts/examples/unpermissioned/SimpleDistribution.sol/SimpleDistribution.json +102 -159
  75. package/artifacts/contracts/examples/unpermissioned/SimpleDistributionAuthorization.sol/SimpleDistributionAuthorization.dbg.json +1 -1
  76. package/artifacts/contracts/examples/unpermissioned/SimpleDistributionAuthorization.sol/SimpleDistributionAuthorization.json +65 -41
  77. package/artifacts/contracts/examples/unpermissioned/SimpleOracle.sol/SimpleOracle.dbg.json +1 -1
  78. package/artifacts/contracts/examples/unpermissioned/SimpleOracle.sol/SimpleOracle.json +106 -163
  79. package/artifacts/contracts/examples/unpermissioned/SimplePool.sol/SimplePool.dbg.json +1 -1
  80. package/artifacts/contracts/examples/unpermissioned/SimplePool.sol/SimplePool.json +120 -177
  81. package/artifacts/contracts/examples/unpermissioned/SimplePoolAuthorization.sol/SimplePoolAuthorization.dbg.json +1 -1
  82. package/artifacts/contracts/examples/unpermissioned/SimplePoolAuthorization.sol/SimplePoolAuthorization.json +65 -41
  83. package/artifacts/contracts/examples/unpermissioned/SimpleProduct.sol/SimpleProduct.dbg.json +1 -1
  84. package/artifacts/contracts/examples/unpermissioned/SimpleProduct.sol/SimpleProduct.json +114 -171
  85. package/artifacts/contracts/examples/unpermissioned/SimpleProductAuthorization.sol/SimpleProductAuthorization.dbg.json +1 -1
  86. package/artifacts/contracts/examples/unpermissioned/SimpleProductAuthorization.sol/SimpleProductAuthorization.json +65 -41
  87. package/artifacts/contracts/instance/BaseStore.sol/BaseStore.dbg.json +1 -1
  88. package/artifacts/contracts/instance/BaseStore.sol/BaseStore.json +50 -0
  89. package/artifacts/contracts/instance/BundleSet.sol/BundleSet.dbg.json +1 -1
  90. package/artifacts/contracts/instance/BundleSet.sol/BundleSet.json +54 -49
  91. package/artifacts/contracts/instance/IBaseStore.sol/IBaseStore.dbg.json +1 -1
  92. package/artifacts/contracts/instance/IBaseStore.sol/IBaseStore.json +50 -0
  93. package/artifacts/contracts/instance/IInstance.sol/IInstance.dbg.json +1 -1
  94. package/artifacts/contracts/instance/IInstance.sol/IInstance.json +26 -78
  95. package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.dbg.json +1 -1
  96. package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.json +105 -83
  97. package/artifacts/contracts/instance/Instance.sol/Instance.dbg.json +1 -1
  98. package/artifacts/contracts/instance/Instance.sol/Instance.json +51 -145
  99. package/artifacts/contracts/instance/InstanceAdmin.sol/InstanceAdmin.dbg.json +1 -1
  100. package/artifacts/contracts/instance/InstanceAdmin.sol/InstanceAdmin.json +151 -185
  101. package/artifacts/contracts/instance/InstanceAuthorizationV3.sol/InstanceAuthorizationV3.dbg.json +1 -1
  102. package/artifacts/contracts/instance/InstanceAuthorizationV3.sol/InstanceAuthorizationV3.json +67 -43
  103. package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.dbg.json +1 -1
  104. package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.json +238 -77
  105. package/artifacts/contracts/instance/InstanceService.sol/InstanceService.dbg.json +1 -1
  106. package/artifacts/contracts/instance/InstanceService.sol/InstanceService.json +136 -138
  107. package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.dbg.json +1 -1
  108. package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.json +112 -104
  109. package/artifacts/contracts/instance/InstanceStore.sol/InstanceStore.dbg.json +1 -1
  110. package/artifacts/contracts/instance/InstanceStore.sol/InstanceStore.json +82 -32
  111. package/artifacts/contracts/instance/ProductStore.sol/ProductStore.dbg.json +1 -1
  112. package/artifacts/contracts/instance/ProductStore.sol/ProductStore.json +68 -18
  113. package/artifacts/contracts/instance/RiskSet.sol/RiskSet.dbg.json +1 -1
  114. package/artifacts/contracts/instance/RiskSet.sol/RiskSet.json +58 -53
  115. package/artifacts/contracts/instance/base/BalanceStore.sol/BalanceStore.dbg.json +1 -1
  116. package/artifacts/contracts/instance/base/BalanceStore.sol/BalanceStore.json +2 -2
  117. package/artifacts/contracts/instance/base/Cloneable.sol/Cloneable.dbg.json +1 -1
  118. package/artifacts/contracts/instance/base/Cloneable.sol/Cloneable.json +1 -1
  119. package/artifacts/contracts/instance/base/ObjectCounter.sol/ObjectCounter.dbg.json +1 -1
  120. package/artifacts/contracts/instance/base/ObjectCounter.sol/ObjectCounter.json +2 -2
  121. package/artifacts/contracts/instance/base/ObjectLifecycle.sol/ObjectLifecycle.dbg.json +1 -1
  122. package/artifacts/contracts/instance/base/ObjectLifecycle.sol/ObjectLifecycle.json +2 -2
  123. package/artifacts/contracts/instance/base/ObjectSet.sol/ObjectSet.dbg.json +1 -1
  124. package/artifacts/contracts/instance/base/ObjectSet.sol/ObjectSet.json +8 -3
  125. package/artifacts/contracts/instance/base/ObjectSetHelperLib.sol/ObjectSetHelperLib.dbg.json +1 -1
  126. package/artifacts/contracts/instance/base/ObjectSetHelperLib.sol/ObjectSetHelperLib.json +2 -2
  127. package/artifacts/contracts/instance/module/IBundle.sol/IBundle.dbg.json +1 -1
  128. package/artifacts/contracts/instance/module/IComponents.sol/IComponents.dbg.json +1 -1
  129. package/artifacts/contracts/instance/module/IDistribution.sol/IDistribution.dbg.json +1 -1
  130. package/artifacts/contracts/instance/module/IPolicy.sol/IPolicy.dbg.json +1 -1
  131. package/artifacts/contracts/instance/module/IRisk.sol/IRisk.dbg.json +1 -1
  132. package/artifacts/contracts/mock/Dip.sol/Dip.dbg.json +1 -1
  133. package/artifacts/contracts/oracle/BasicOracle.sol/BasicOracle.dbg.json +1 -1
  134. package/artifacts/contracts/oracle/BasicOracle.sol/BasicOracle.json +81 -132
  135. package/artifacts/contracts/oracle/BasicOracleAuthorization.sol/BasicOracleAuthorization.dbg.json +1 -1
  136. package/artifacts/contracts/oracle/BasicOracleAuthorization.sol/BasicOracleAuthorization.json +65 -41
  137. package/artifacts/contracts/oracle/IOracle.sol/IOracle.dbg.json +1 -1
  138. package/artifacts/contracts/oracle/IOracleComponent.sol/IOracleComponent.dbg.json +1 -1
  139. package/artifacts/contracts/oracle/IOracleComponent.sol/IOracleComponent.json +66 -94
  140. package/artifacts/contracts/oracle/IOracleService.sol/IOracleService.dbg.json +1 -1
  141. package/artifacts/contracts/oracle/IOracleService.sol/IOracleService.json +83 -80
  142. package/artifacts/contracts/oracle/Oracle.sol/Oracle.dbg.json +1 -1
  143. package/artifacts/contracts/oracle/Oracle.sol/Oracle.json +67 -82
  144. package/artifacts/contracts/oracle/OracleService.sol/OracleService.dbg.json +1 -1
  145. package/artifacts/contracts/oracle/OracleService.sol/OracleService.json +148 -149
  146. package/artifacts/contracts/oracle/OracleServiceManager.sol/OracleServiceManager.dbg.json +1 -1
  147. package/artifacts/contracts/oracle/OracleServiceManager.sol/OracleServiceManager.json +129 -111
  148. package/artifacts/contracts/pool/BasicPool.sol/BasicPool.dbg.json +1 -1
  149. package/artifacts/contracts/pool/BasicPool.sol/BasicPool.json +73 -88
  150. package/artifacts/contracts/pool/BasicPoolAuthorization.sol/BasicPoolAuthorization.dbg.json +1 -1
  151. package/artifacts/contracts/pool/BasicPoolAuthorization.sol/BasicPoolAuthorization.json +65 -41
  152. package/artifacts/contracts/pool/BundleService.sol/BundleService.dbg.json +1 -1
  153. package/artifacts/contracts/pool/BundleService.sol/BundleService.json +129 -176
  154. package/artifacts/contracts/pool/BundleServiceManager.sol/BundleServiceManager.dbg.json +1 -1
  155. package/artifacts/contracts/pool/BundleServiceManager.sol/BundleServiceManager.json +139 -129
  156. package/artifacts/contracts/pool/IBundleService.sol/IBundleService.dbg.json +1 -1
  157. package/artifacts/contracts/pool/IBundleService.sol/IBundleService.json +44 -71
  158. package/artifacts/contracts/pool/IPoolComponent.sol/IPoolComponent.dbg.json +1 -1
  159. package/artifacts/contracts/pool/IPoolComponent.sol/IPoolComponent.json +72 -100
  160. package/artifacts/contracts/pool/IPoolService.sol/IPoolService.dbg.json +1 -1
  161. package/artifacts/contracts/pool/IPoolService.sol/IPoolService.json +98 -94
  162. package/artifacts/contracts/pool/Pool.sol/Pool.dbg.json +1 -1
  163. package/artifacts/contracts/pool/Pool.sol/Pool.json +73 -88
  164. package/artifacts/contracts/pool/PoolLib.sol/PoolLib.dbg.json +1 -1
  165. package/artifacts/contracts/pool/PoolLib.sol/PoolLib.json +247 -24
  166. package/artifacts/contracts/pool/PoolService.sol/PoolService.dbg.json +1 -1
  167. package/artifacts/contracts/pool/PoolService.sol/PoolService.json +177 -233
  168. package/artifacts/contracts/pool/PoolServiceManager.sol/PoolServiceManager.dbg.json +1 -1
  169. package/artifacts/contracts/pool/PoolServiceManager.sol/PoolServiceManager.json +130 -140
  170. package/artifacts/contracts/product/ApplicationService.sol/ApplicationService.dbg.json +1 -1
  171. package/artifacts/contracts/product/ApplicationService.sol/ApplicationService.json +63 -138
  172. package/artifacts/contracts/product/ApplicationServiceManager.sol/ApplicationServiceManager.dbg.json +1 -1
  173. package/artifacts/contracts/product/ApplicationServiceManager.sol/ApplicationServiceManager.json +112 -110
  174. package/artifacts/contracts/product/BasicProduct.sol/BasicProduct.dbg.json +1 -1
  175. package/artifacts/contracts/product/BasicProduct.sol/BasicProduct.json +57 -72
  176. package/artifacts/contracts/product/BasicProductAuthorization.sol/BasicProductAuthorization.dbg.json +1 -1
  177. package/artifacts/contracts/product/BasicProductAuthorization.sol/BasicProductAuthorization.json +65 -41
  178. package/artifacts/contracts/product/ClaimService.sol/ClaimService.dbg.json +1 -1
  179. package/artifacts/contracts/product/ClaimService.sol/ClaimService.json +115 -182
  180. package/artifacts/contracts/product/ClaimServiceManager.sol/ClaimServiceManager.dbg.json +1 -1
  181. package/artifacts/contracts/product/ClaimServiceManager.sol/ClaimServiceManager.json +138 -132
  182. package/artifacts/contracts/product/IApplicationService.sol/IApplicationService.dbg.json +1 -1
  183. package/artifacts/contracts/product/IApplicationService.sol/IApplicationService.json +32 -71
  184. package/artifacts/contracts/product/IClaimService.sol/IClaimService.dbg.json +1 -1
  185. package/artifacts/contracts/product/IClaimService.sol/IClaimService.json +32 -71
  186. package/artifacts/contracts/product/IPolicyService.sol/IPolicyService.dbg.json +1 -1
  187. package/artifacts/contracts/product/IPolicyService.sol/IPolicyService.json +76 -82
  188. package/artifacts/contracts/product/IPricingService.sol/IPricingService.dbg.json +1 -1
  189. package/artifacts/contracts/product/IPricingService.sol/IPricingService.json +43 -82
  190. package/artifacts/contracts/product/IProductComponent.sol/IProductComponent.dbg.json +1 -1
  191. package/artifacts/contracts/product/IProductComponent.sol/IProductComponent.json +56 -84
  192. package/artifacts/contracts/product/IRiskService.sol/IRiskService.dbg.json +1 -1
  193. package/artifacts/contracts/product/IRiskService.sol/IRiskService.json +36 -75
  194. package/artifacts/contracts/product/PolicyService.sol/PolicyService.dbg.json +1 -1
  195. package/artifacts/contracts/product/PolicyService.sol/PolicyService.json +139 -173
  196. package/artifacts/contracts/product/PolicyServiceLib.sol/PolicyServiceLib.dbg.json +1 -1
  197. package/artifacts/contracts/product/PolicyServiceLib.sol/PolicyServiceLib.json +20 -12
  198. package/artifacts/contracts/product/PolicyServiceManager.sol/PolicyServiceManager.dbg.json +1 -1
  199. package/artifacts/contracts/product/PolicyServiceManager.sol/PolicyServiceManager.json +128 -122
  200. package/artifacts/contracts/product/PricingService.sol/PricingService.dbg.json +1 -1
  201. package/artifacts/contracts/product/PricingService.sol/PricingService.json +94 -161
  202. package/artifacts/contracts/product/PricingServiceManager.sol/PricingServiceManager.dbg.json +1 -1
  203. package/artifacts/contracts/product/PricingServiceManager.sol/PricingServiceManager.json +122 -116
  204. package/artifacts/contracts/product/Product.sol/Product.dbg.json +1 -1
  205. package/artifacts/contracts/product/Product.sol/Product.json +57 -72
  206. package/artifacts/contracts/product/RiskService.sol/RiskService.dbg.json +1 -1
  207. package/artifacts/contracts/product/RiskService.sol/RiskService.json +63 -146
  208. package/artifacts/contracts/product/RiskServiceManager.sol/RiskServiceManager.dbg.json +1 -1
  209. package/artifacts/contracts/product/RiskServiceManager.sol/RiskServiceManager.json +107 -109
  210. package/artifacts/contracts/registry/ChainNft.sol/ChainNft.dbg.json +1 -1
  211. package/artifacts/contracts/registry/ChainNft.sol/ChainNft.json +2 -2
  212. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.dbg.json +1 -1
  213. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.json +62 -155
  214. package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.dbg.json +1 -1
  215. package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.json +216 -202
  216. package/artifacts/contracts/registry/IRelease.sol/IRelease.dbg.json +1 -1
  217. package/artifacts/contracts/registry/IRelease.sol/IRelease.json +15 -1
  218. package/artifacts/contracts/registry/ITransferInterceptor.sol/ITransferInterceptor.dbg.json +1 -1
  219. package/artifacts/contracts/registry/Registry.sol/Registry.dbg.json +1 -1
  220. package/artifacts/contracts/registry/Registry.sol/Registry.json +102 -314
  221. package/artifacts/contracts/registry/RegistryAdmin.sol/RegistryAdmin.dbg.json +1 -1
  222. package/artifacts/contracts/registry/RegistryAdmin.sol/RegistryAdmin.json +146 -179
  223. package/artifacts/contracts/registry/RegistryAuthorization.sol/RegistryAuthorization.dbg.json +1 -1
  224. package/artifacts/contracts/registry/RegistryAuthorization.sol/RegistryAuthorization.json +77 -57
  225. package/artifacts/contracts/registry/RegistryService.sol/RegistryService.dbg.json +1 -1
  226. package/artifacts/contracts/registry/RegistryService.sol/RegistryService.json +244 -285
  227. package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.dbg.json +1 -1
  228. package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.json +110 -115
  229. package/artifacts/contracts/registry/ReleaseAdmin.sol/ReleaseAdmin.dbg.json +1 -1
  230. package/artifacts/contracts/registry/ReleaseAdmin.sol/ReleaseAdmin.json +154 -175
  231. package/artifacts/contracts/registry/ReleaseLifecycle.sol/ReleaseLifecycle.dbg.json +1 -1
  232. package/artifacts/contracts/registry/ReleaseLifecycle.sol/ReleaseLifecycle.json +2 -2
  233. package/artifacts/contracts/registry/ReleaseRegistry.sol/ReleaseRegistry.dbg.json +1 -1
  234. package/artifacts/contracts/registry/ReleaseRegistry.sol/ReleaseRegistry.json +187 -135
  235. package/artifacts/contracts/registry/ServiceAuthorizationV3.sol/ServiceAuthorizationV3.dbg.json +1 -1
  236. package/artifacts/contracts/registry/ServiceAuthorizationV3.sol/ServiceAuthorizationV3.json +56 -32
  237. package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.dbg.json +1 -1
  238. package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.json +29 -13
  239. package/artifacts/contracts/shared/Component.sol/Component.dbg.json +1 -1
  240. package/artifacts/contracts/shared/Component.sol/Component.json +39 -84
  241. package/artifacts/contracts/shared/ComponentService.sol/ComponentService.dbg.json +1 -1
  242. package/artifacts/contracts/shared/ComponentService.sol/ComponentService.json +345 -164
  243. package/artifacts/contracts/shared/ComponentServiceManager.sol/ComponentServiceManager.dbg.json +1 -1
  244. package/artifacts/contracts/shared/ComponentServiceManager.sol/ComponentServiceManager.json +141 -115
  245. package/artifacts/contracts/shared/ContractLib.sol/ContractLib.dbg.json +1 -1
  246. package/artifacts/contracts/shared/ContractLib.sol/ContractLib.json +169 -421
  247. package/artifacts/contracts/shared/ContractLib.sol/IInstanceAdminHelper.dbg.json +4 -0
  248. package/artifacts/contracts/shared/ContractLib.sol/IInstanceAdminHelper.json +24 -0
  249. package/artifacts/contracts/shared/ContractLib.sol/ITargetHelper.dbg.json +1 -1
  250. package/artifacts/contracts/shared/ContractLib.sol/ITokenRegistryHelper.dbg.json +4 -0
  251. package/artifacts/contracts/shared/ContractLib.sol/ITokenRegistryHelper.json +40 -0
  252. package/artifacts/contracts/shared/IAuthorizedComponent.sol/IAuthorizedComponent.dbg.json +4 -0
  253. package/artifacts/contracts/shared/IAuthorizedComponent.sol/IAuthorizedComponent.json +633 -0
  254. package/artifacts/contracts/shared/IComponent.sol/IComponent.dbg.json +1 -1
  255. package/artifacts/contracts/shared/IComponent.sol/IComponent.json +38 -96
  256. package/artifacts/contracts/shared/IComponentService.sol/IComponentService.dbg.json +1 -1
  257. package/artifacts/contracts/shared/IComponentService.sol/IComponentService.json +251 -82
  258. package/artifacts/contracts/shared/IInstanceLinkedComponent.sol/IInstanceLinkedComponent.dbg.json +1 -1
  259. package/artifacts/contracts/shared/IInstanceLinkedComponent.sol/IInstanceLinkedComponent.json +56 -84
  260. package/artifacts/contracts/shared/ILifecycle.sol/ILifecycle.dbg.json +1 -1
  261. package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.dbg.json +1 -1
  262. package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.json +28 -1
  263. package/artifacts/contracts/shared/IPolicyHolder.sol/IPolicyHolder.dbg.json +1 -1
  264. package/artifacts/contracts/shared/IPolicyHolder.sol/IPolicyHolder.json +12 -1
  265. package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.dbg.json +1 -1
  266. package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.json +25 -77
  267. package/artifacts/contracts/shared/IRegistryLinked.sol/IRegistryLinked.dbg.json +1 -1
  268. package/artifacts/contracts/shared/IRegistryLinked.sol/IRegistryLinked.json +12 -1
  269. package/artifacts/contracts/shared/IService.sol/IService.dbg.json +1 -1
  270. package/artifacts/contracts/shared/IService.sol/IService.json +32 -71
  271. package/artifacts/contracts/shared/InitializableERC165.sol/InitializableERC165.dbg.json +1 -1
  272. package/artifacts/contracts/shared/InstanceLinkedComponent.sol/InstanceLinkedComponent.dbg.json +1 -1
  273. package/artifacts/contracts/shared/InstanceLinkedComponent.sol/InstanceLinkedComponent.json +57 -72
  274. package/artifacts/contracts/shared/Lifecycle.sol/Lifecycle.dbg.json +1 -1
  275. package/artifacts/contracts/shared/NftIdSet.sol/NftIdSet.dbg.json +1 -1
  276. package/artifacts/contracts/shared/NftIdSet.sol/NftIdSet.json +2 -2
  277. package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.dbg.json +1 -1
  278. package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.json +34 -15
  279. package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.dbg.json +1 -1
  280. package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.json +14 -3
  281. package/artifacts/contracts/shared/Registerable.sol/Registerable.dbg.json +1 -1
  282. package/artifacts/contracts/shared/Registerable.sol/Registerable.json +24 -76
  283. package/artifacts/contracts/shared/RegistryLinked.sol/RegistryLinked.dbg.json +1 -1
  284. package/artifacts/contracts/shared/RegistryLinked.sol/RegistryLinked.json +37 -3
  285. package/artifacts/contracts/shared/Service.sol/Service.dbg.json +1 -1
  286. package/artifacts/contracts/shared/Service.sol/Service.json +31 -70
  287. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.dbg.json +1 -1
  288. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.json +29 -42
  289. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandlerBase.dbg.json +1 -1
  290. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandlerBase.json +17 -30
  291. package/artifacts/contracts/shared/TokenHandlerDeployerLib.sol/TokenHandlerDeployerLib.dbg.json +1 -1
  292. package/artifacts/contracts/shared/TokenHandlerDeployerLib.sol/TokenHandlerDeployerLib.json +34 -34
  293. package/artifacts/contracts/staking/IStaking.sol/IStaking.dbg.json +1 -1
  294. package/artifacts/contracts/staking/IStaking.sol/IStaking.json +81 -101
  295. package/artifacts/contracts/staking/IStakingService.sol/IStakingService.dbg.json +1 -1
  296. package/artifacts/contracts/staking/IStakingService.sol/IStakingService.json +48 -75
  297. package/artifacts/contracts/staking/ITargetLimitHandler.sol/ITargetLimitHandler.dbg.json +1 -1
  298. package/artifacts/contracts/staking/Staking.sol/Staking.dbg.json +1 -1
  299. package/artifacts/contracts/staking/Staking.sol/Staking.json +134 -170
  300. package/artifacts/contracts/staking/StakingLib.sol/StakingLib.dbg.json +1 -1
  301. package/artifacts/contracts/staking/StakingLib.sol/StakingLib.json +31 -26
  302. package/artifacts/contracts/staking/StakingManager.sol/StakingManager.dbg.json +1 -1
  303. package/artifacts/contracts/staking/StakingManager.sol/StakingManager.json +124 -112
  304. package/artifacts/contracts/staking/StakingReader.sol/StakingReader.dbg.json +1 -1
  305. package/artifacts/contracts/staking/StakingReader.sol/StakingReader.json +22 -5
  306. package/artifacts/contracts/staking/StakingService.sol/StakingService.dbg.json +1 -1
  307. package/artifacts/contracts/staking/StakingService.sol/StakingService.json +77 -132
  308. package/artifacts/contracts/staking/StakingServiceManager.sol/StakingServiceManager.dbg.json +1 -1
  309. package/artifacts/contracts/staking/StakingServiceManager.sol/StakingServiceManager.json +111 -105
  310. package/artifacts/contracts/staking/StakingStore.sol/StakingStore.dbg.json +1 -1
  311. package/artifacts/contracts/staking/StakingStore.sol/StakingStore.json +204 -212
  312. package/artifacts/contracts/staking/TargetHandler.sol/TargetHandler.dbg.json +1 -1
  313. package/artifacts/contracts/staking/TargetHandler.sol/TargetHandler.json +19 -27
  314. package/artifacts/contracts/staking/TargetManagerLib.sol/TargetManagerLib.dbg.json +1 -1
  315. package/artifacts/contracts/staking/TargetManagerLib.sol/TargetManagerLib.json +16 -16
  316. package/artifacts/contracts/type/AddressSet.sol/LibAddressSet.dbg.json +1 -1
  317. package/artifacts/contracts/type/Amount.sol/AmountLib.dbg.json +1 -1
  318. package/artifacts/contracts/type/Blocknumber.sol/BlocknumberLib.dbg.json +1 -1
  319. package/artifacts/contracts/type/ChainId.sol/ChainIdLib.dbg.json +1 -1
  320. package/artifacts/contracts/type/ChainId.sol/ChainIdLib.json +2 -2
  321. package/artifacts/contracts/type/ClaimId.sol/ClaimIdLib.dbg.json +1 -1
  322. package/artifacts/contracts/type/ClaimId.sol/ClaimIdLib.json +2 -2
  323. package/artifacts/contracts/type/DistributorType.sol/DistributorTypeLib.dbg.json +1 -1
  324. package/artifacts/contracts/type/DistributorType.sol/DistributorTypeLib.json +2 -2
  325. package/artifacts/contracts/type/Fee.sol/FeeLib.dbg.json +1 -1
  326. package/artifacts/contracts/type/Key32.sol/Key32Lib.dbg.json +1 -1
  327. package/artifacts/contracts/type/Key32.sol/Key32Lib.json +2 -2
  328. package/artifacts/contracts/type/Key32Set.sol/LibKey32Set.dbg.json +1 -1
  329. package/artifacts/contracts/type/Key32Set.sol/LibKey32Set.json +2 -2
  330. package/artifacts/contracts/type/NftId.sol/NftIdLib.dbg.json +1 -1
  331. package/artifacts/contracts/type/NftId.sol/NftIdLib.json +2 -2
  332. package/artifacts/contracts/type/NftIdSet.sol/LibNftIdSet.dbg.json +1 -1
  333. package/artifacts/contracts/type/NftIdSet.sol/LibNftIdSet.json +2 -2
  334. package/artifacts/contracts/type/ObjectType.sol/ObjectTypeLib.dbg.json +1 -1
  335. package/artifacts/contracts/type/ObjectType.sol/ObjectTypeLib.json +22 -25
  336. package/artifacts/contracts/type/PayoutId.sol/PayoutIdLib.dbg.json +1 -1
  337. package/artifacts/contracts/type/PayoutId.sol/PayoutIdLib.json +2 -2
  338. package/artifacts/contracts/type/Referral.sol/ReferralLib.dbg.json +1 -1
  339. package/artifacts/contracts/type/Referral.sol/ReferralLib.json +23 -4
  340. package/artifacts/contracts/type/RequestId.sol/RequestIdLib.dbg.json +1 -1
  341. package/artifacts/contracts/type/RequestId.sol/RequestIdLib.json +2 -2
  342. package/artifacts/contracts/type/RequestIdSet.sol/LibRequestIdSet.dbg.json +4 -0
  343. package/artifacts/contracts/type/RequestIdSet.sol/LibRequestIdSet.json +33 -0
  344. package/artifacts/contracts/type/RiskId.sol/RiskIdLib.dbg.json +1 -1
  345. package/artifacts/contracts/type/RiskId.sol/RiskIdLib.json +2 -2
  346. package/artifacts/contracts/type/RoleId.sol/RoleIdLib.dbg.json +1 -1
  347. package/artifacts/contracts/type/RoleId.sol/RoleIdLib.json +4 -4
  348. package/artifacts/contracts/type/Seconds.sol/SecondsLib.dbg.json +1 -1
  349. package/artifacts/contracts/type/Seconds.sol/SecondsLib.json +21 -2
  350. package/artifacts/contracts/type/Selector.sol/SelectorLib.dbg.json +1 -1
  351. package/artifacts/contracts/type/Selector.sol/SelectorSetLib.dbg.json +1 -1
  352. package/artifacts/contracts/type/StateId.sol/StateIdLib.dbg.json +1 -1
  353. package/artifacts/contracts/type/String.sol/StrLib.dbg.json +1 -1
  354. package/artifacts/contracts/type/String.sol/StrLib.json +21 -2
  355. package/artifacts/contracts/type/Timestamp.sol/TimestampLib.dbg.json +1 -1
  356. package/artifacts/contracts/type/Timestamp.sol/TimestampLib.json +36 -4
  357. package/artifacts/contracts/type/UFixed.sol/UFixedLib.dbg.json +1 -1
  358. package/artifacts/contracts/type/Version.sol/VersionLib.dbg.json +1 -1
  359. package/artifacts/contracts/type/Version.sol/VersionLib.json +10 -10
  360. package/artifacts/contracts/type/Version.sol/VersionPartLib.dbg.json +1 -1
  361. package/artifacts/contracts/type/Version.sol/VersionPartLib.json +6 -19
  362. package/artifacts/contracts/upgradeability/IVersionable.sol/IVersionable.dbg.json +4 -0
  363. package/artifacts/contracts/upgradeability/{IUpgradeable.sol/IUpgradeable.json → IVersionable.sol/IVersionable.json} +4 -54
  364. package/artifacts/contracts/upgradeability/ProxyManager.sol/ProxyManager.dbg.json +1 -1
  365. package/artifacts/contracts/upgradeability/ProxyManager.sol/ProxyManager.json +86 -63
  366. package/artifacts/contracts/upgradeability/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.dbg.json +1 -1
  367. package/artifacts/contracts/upgradeability/Versionable.sol/Versionable.dbg.json +4 -0
  368. package/artifacts/contracts/upgradeability/{Upgradeable.sol/Upgradeable.json → Versionable.sol/Versionable.json} +4 -54
  369. package/contracts/accounting/AccountingService.sol +22 -33
  370. package/contracts/accounting/AccountingServiceManager.sol +6 -4
  371. package/contracts/accounting/IAccountingService.sol +7 -8
  372. package/contracts/authorization/AccessAdmin.sol +24 -47
  373. package/contracts/authorization/AccessAdminLib.sol +29 -15
  374. package/contracts/authorization/AccessManagerCloneable.sol +51 -24
  375. package/contracts/authorization/Authorization.sol +2 -2
  376. package/contracts/authorization/IAccessAdmin.sol +3 -3
  377. package/contracts/authorization/IServiceAuthorization.sol +1 -1
  378. package/contracts/authorization/ServiceAuthorization.sol +4 -4
  379. package/contracts/distribution/BasicDistribution.sol +2 -0
  380. package/contracts/distribution/BasicDistributionAuthorization.sol +4 -5
  381. package/contracts/distribution/Distribution.sol +2 -0
  382. package/contracts/distribution/DistributionService.sol +25 -27
  383. package/contracts/distribution/DistributionServiceManager.sol +6 -4
  384. package/contracts/distribution/IDistributionService.sol +4 -3
  385. package/contracts/examples/fire/FirePool.sol +4 -0
  386. package/contracts/examples/fire/FireProduct.sol +4 -0
  387. package/contracts/examples/flight/FlightLib.sol +337 -0
  388. package/contracts/examples/flight/FlightMessageVerifier.sol +128 -0
  389. package/contracts/examples/flight/FlightNft.sol +234 -0
  390. package/contracts/examples/flight/FlightOracle.sol +226 -0
  391. package/contracts/examples/flight/FlightOracleAuthorization.sol +57 -0
  392. package/contracts/examples/flight/FlightPool.sol +89 -0
  393. package/contracts/examples/flight/FlightPoolAuthorization.sol +37 -0
  394. package/contracts/examples/flight/FlightProduct.sol +687 -0
  395. package/contracts/examples/flight/FlightProductAuthorization.sol +70 -0
  396. package/contracts/examples/flight/FlightProductManager.sol +49 -0
  397. package/contracts/examples/flight/FlightUSD.sol +28 -0
  398. package/contracts/examples/flight/originalV1.sol +396 -0
  399. package/contracts/examples/unpermissioned/SimpleDistribution.sol +4 -0
  400. package/contracts/examples/unpermissioned/SimpleOracle.sol +4 -0
  401. package/contracts/examples/unpermissioned/SimplePool.sol +4 -0
  402. package/contracts/examples/unpermissioned/SimpleProduct.sol +4 -0
  403. package/contracts/instance/BaseStore.sol +4 -0
  404. package/contracts/instance/IBaseStore.sol +8 -0
  405. package/contracts/instance/IInstance.sol +1 -1
  406. package/contracts/instance/IInstanceService.sol +2 -0
  407. package/contracts/instance/Instance.sol +12 -8
  408. package/contracts/instance/InstanceAdmin.sol +17 -11
  409. package/contracts/instance/InstanceAuthorizationV3.sol +2 -4
  410. package/contracts/instance/InstanceReader.sol +56 -22
  411. package/contracts/instance/InstanceService.sol +24 -18
  412. package/contracts/instance/InstanceServiceManager.sol +6 -4
  413. package/contracts/instance/base/Cloneable.sol +10 -4
  414. package/contracts/instance/base/ObjectSet.sol +2 -2
  415. package/contracts/oracle/BasicOracle.sol +3 -0
  416. package/contracts/oracle/BasicOracleAuthorization.sol +1 -3
  417. package/contracts/oracle/IOracleService.sol +16 -12
  418. package/contracts/oracle/Oracle.sol +6 -5
  419. package/contracts/oracle/OracleService.sol +67 -37
  420. package/contracts/oracle/OracleServiceManager.sol +6 -4
  421. package/contracts/pool/BasicPool.sol +4 -2
  422. package/contracts/pool/BasicPoolAuthorization.sol +4 -5
  423. package/contracts/pool/BundleService.sol +20 -26
  424. package/contracts/pool/BundleServiceManager.sol +7 -5
  425. package/contracts/pool/IBundleService.sol +1 -1
  426. package/contracts/pool/IPoolService.sol +6 -5
  427. package/contracts/pool/Pool.sol +3 -1
  428. package/contracts/pool/PoolLib.sol +102 -5
  429. package/contracts/pool/PoolService.sol +101 -67
  430. package/contracts/pool/PoolServiceManager.sol +6 -4
  431. package/contracts/product/ApplicationService.sol +34 -13
  432. package/contracts/product/ApplicationServiceManager.sol +6 -4
  433. package/contracts/product/BasicProduct.sol +2 -0
  434. package/contracts/product/BasicProductAuthorization.sol +7 -7
  435. package/contracts/product/ClaimService.sol +34 -10
  436. package/contracts/product/ClaimServiceManager.sol +7 -5
  437. package/contracts/product/IPolicyService.sol +2 -1
  438. package/contracts/product/PolicyService.sol +58 -45
  439. package/contracts/product/PolicyServiceLib.sol +5 -3
  440. package/contracts/product/PolicyServiceManager.sol +6 -4
  441. package/contracts/product/PricingService.sol +8 -7
  442. package/contracts/product/PricingServiceManager.sol +6 -4
  443. package/contracts/product/Product.sol +2 -0
  444. package/contracts/product/RiskService.sol +40 -8
  445. package/contracts/product/RiskServiceManager.sol +6 -4
  446. package/contracts/registry/ChainNft.sol +1 -1
  447. package/contracts/registry/IRegistry.sol +14 -20
  448. package/contracts/registry/IRegistryService.sol +14 -10
  449. package/contracts/registry/IRelease.sol +3 -0
  450. package/contracts/registry/Registry.sol +78 -124
  451. package/contracts/registry/RegistryAdmin.sol +29 -12
  452. package/contracts/registry/RegistryAuthorization.sol +3 -4
  453. package/contracts/registry/RegistryService.sol +82 -99
  454. package/contracts/registry/RegistryServiceManager.sol +11 -4
  455. package/contracts/registry/ReleaseAdmin.sol +23 -9
  456. package/contracts/registry/ReleaseRegistry.sol +74 -64
  457. package/contracts/registry/ServiceAuthorizationV3.sol +3 -4
  458. package/contracts/registry/TokenRegistry.sol +15 -6
  459. package/contracts/shared/Component.sol +22 -27
  460. package/contracts/shared/ComponentService.sol +135 -45
  461. package/contracts/shared/ComponentServiceManager.sol +7 -5
  462. package/contracts/shared/ContractLib.sol +93 -359
  463. package/contracts/shared/EcdsaChecker.sol +5 -0
  464. package/contracts/shared/IAuthorizedComponent.sol +15 -0
  465. package/contracts/shared/IComponent.sol +3 -5
  466. package/contracts/shared/IComponentService.sol +15 -0
  467. package/contracts/shared/IInstanceLinkedComponent.sol +9 -9
  468. package/contracts/shared/INftOwnable.sol +2 -0
  469. package/contracts/shared/IRegisterable.sol +3 -14
  470. package/contracts/shared/IRegistryLinked.sol +3 -1
  471. package/contracts/shared/IService.sol +2 -2
  472. package/contracts/shared/InstanceLinkedComponent.sol +130 -39
  473. package/contracts/shared/NftOwnable.sol +22 -9
  474. package/contracts/shared/PolicyHolder.sol +4 -2
  475. package/contracts/shared/Registerable.sol +20 -37
  476. package/contracts/shared/RegistryLinked.sol +23 -4
  477. package/contracts/shared/Service.sol +9 -8
  478. package/contracts/shared/TokenHandler.sol +1 -4
  479. package/contracts/staking/IStaking.sol +4 -2
  480. package/contracts/staking/IStakingService.sol +1 -1
  481. package/contracts/staking/Staking.sol +34 -28
  482. package/contracts/staking/StakingLib.sol +1 -3
  483. package/contracts/staking/StakingManager.sol +6 -3
  484. package/contracts/staking/StakingReader.sol +17 -9
  485. package/contracts/staking/StakingService.sol +14 -17
  486. package/contracts/staking/StakingServiceManager.sol +8 -4
  487. package/contracts/staking/StakingStore.sol +8 -8
  488. package/contracts/staking/TargetHandler.sol +5 -4
  489. package/contracts/type/ObjectType.sol +2 -31
  490. package/contracts/type/Referral.sol +6 -0
  491. package/contracts/type/RequestIdSet.sol +62 -0
  492. package/contracts/type/Seconds.sol +4 -0
  493. package/contracts/type/String.sol +30 -0
  494. package/contracts/type/Timestamp.sol +10 -1
  495. package/contracts/type/Version.sol +16 -15
  496. package/contracts/upgradeability/{IUpgradeable.sol → IVersionable.sol} +19 -13
  497. package/contracts/upgradeability/ProxyManager.sol +54 -46
  498. package/contracts/upgradeability/{Upgradeable.sol → Versionable.sol} +14 -25
  499. package/package.json +2 -1
  500. package/artifacts/contracts/shared/IVersionable.sol/IVersionable.dbg.json +0 -4
  501. package/artifacts/contracts/shared/IVersionable.sol/IVersionable.json +0 -74
  502. package/artifacts/contracts/shared/Versionable.sol/Versionable.dbg.json +0 -4
  503. package/artifacts/contracts/shared/Versionable.sol/Versionable.json +0 -74
  504. package/artifacts/contracts/upgradeability/IUpgradeable.sol/IUpgradeable.dbg.json +0 -4
  505. package/artifacts/contracts/upgradeability/Upgradeable.sol/Upgradeable.dbg.json +0 -4
  506. package/contracts/shared/IVersionable.sol +0 -19
  507. package/contracts/shared/Versionable.sol +0 -47
@@ -10,7 +10,6 @@ import {ITargetLimitHandler} from "./ITargetLimitHandler.sol";
10
10
  import {Amount, AmountLib} from "../type/Amount.sol";
11
11
  import {Blocknumber, BlocknumberLib} from "../type/Blocknumber.sol";
12
12
  import {NftId} from "../type/NftId.sol";
13
- import {RegistryLinked} from "../shared/RegistryLinked.sol";
14
13
  import {StakingStore} from "./StakingStore.sol";
15
14
  import {UFixed, UFixedLib} from "../type/UFixed.sol";
16
15
 
@@ -18,12 +17,12 @@ import {UFixed, UFixedLib} from "../type/UFixed.sol";
18
17
  contract TargetHandler is
19
18
  Initializable,
20
19
  AccessManaged,
21
- ITargetLimitHandler,
22
- RegistryLinked
20
+ ITargetLimitHandler
23
21
  {
24
22
 
25
23
  event LogTargetHandlerUpdateTriggersSet(uint16 tvlUpdatesTrigger, UFixed minTvlRatioTrigger, Blocknumber lastUpdateIn);
26
24
 
25
+ IRegistry private _registry;
27
26
  StakingStore private _store;
28
27
 
29
28
  /// @dev Update trigger value: Number of TVL updates below which limit updates are suppressed
@@ -34,12 +33,14 @@ contract TargetHandler is
34
33
 
35
34
 
36
35
  constructor (
36
+ IRegistry registry,
37
37
  StakingStore stakingStore
38
38
  )
39
39
  AccessManaged(msg.sender)
40
40
  {
41
41
  // set final authority and registry
42
- setAuthority(_getRegistry().getAuthority());
42
+ setAuthority(registry.getAuthority());
43
+ _registry = registry;
43
44
  _store = stakingStore;
44
45
 
45
46
  // set default trigger values
@@ -1,6 +1,7 @@
1
1
  // SPDX-License-Identifier: Apache-2.0
2
2
  pragma solidity ^0.8.20;
3
3
 
4
+ import {StrLib} from "./String.sol";
4
5
  import {VersionPart} from "./Version.sol";
5
6
 
6
7
  type ObjectType is uint8;
@@ -247,7 +248,7 @@ library ObjectTypeLib {
247
248
  return string(
248
249
  abi.encodePacked(
249
250
  "ObjectType",
250
- toString(
251
+ StrLib.uintToString(
251
252
  toInt(objectType))));
252
253
  }
253
254
 
@@ -274,34 +275,4 @@ library ObjectTypeLib {
274
275
  versionName,
275
276
  release.toString()));
276
277
  }
277
-
278
- /// @dev returns the provied int as a string
279
- function toString(uint256 value) public pure returns (string memory name) {
280
-
281
- if (value == 0) {
282
- return "0";
283
- }
284
-
285
- uint256 temp = value;
286
- uint256 digits = 0;
287
- while (temp != 0) {
288
- digits++;
289
- temp /= 10;
290
- }
291
-
292
- bytes memory buffer = new bytes(digits);
293
- uint256 index = digits - 1;
294
-
295
- temp = value;
296
- while (temp != 0) {
297
- buffer[index] = bytes1(uint8(48 + temp % 10));
298
- temp /= 10;
299
-
300
- if (index > 0) {
301
- index--;
302
- }
303
- }
304
-
305
- return string(buffer);
306
- }
307
278
  }
@@ -13,6 +13,7 @@ using {
13
13
  eqReferralId as ==,
14
14
  neReferralId as !=,
15
15
  ReferralLib.eqz,
16
+ ReferralLib.toInt,
16
17
  ReferralLib.toKey32
17
18
  } for ReferralId global;
18
19
 
@@ -74,6 +75,11 @@ library ReferralLib {
74
75
  return ReferralStatus.wrap(status);
75
76
  }
76
77
 
78
+ /// @dev Converts a referral id into a uint256.
79
+ function toInt(ReferralId referralId) public pure returns (uint256) {
80
+ return uint64(ReferralId.unwrap(referralId));
81
+ }
82
+
77
83
  /// @dev Returns the key32 value for the specified nft id and object type.
78
84
  function toKey32(ReferralId id) public pure returns (Key32 key) {
79
85
  return Key32Lib.toKey32(REFERRAL(), toKeyId(id));
@@ -0,0 +1,62 @@
1
+ // SPDX-License-Identifier: Apache-2.0
2
+ pragma solidity ^0.8.20;
3
+
4
+ import {RequestId} from "../type/RequestId.sol";
5
+
6
+ // based on https://github.com/OpenZeppelin/openzeppelin-contracts/blob/master/contracts/utils/structs/EnumerableSet.sol
7
+ library LibRequestIdSet {
8
+
9
+ struct Set {
10
+ RequestId[] ids;
11
+ mapping(RequestId requestId => uint256 index) at;
12
+ }
13
+
14
+ error ErrorRequestIdSetAlreadyAdded(RequestId requestId);
15
+ error ErrorRequestIdSetNotInSet(RequestId requestId);
16
+
17
+
18
+ function add(Set storage set, RequestId requestId) external {
19
+ if (set.at[requestId] > 0) {
20
+ revert ErrorRequestIdSetAlreadyAdded(requestId);
21
+ }
22
+
23
+ set.ids.push(requestId);
24
+ set.at[requestId] = set.ids.length;
25
+ }
26
+
27
+ function remove(Set storage set, RequestId requestId) external {
28
+ uint256 requestIdIndex = set.at[requestId];
29
+
30
+ if (requestIdIndex == 0) {
31
+ revert ErrorRequestIdSetNotInSet(requestId);
32
+ }
33
+
34
+ uint256 toDeleteIndex = requestIdIndex - 1;
35
+ uint256 lastIndex = set.ids.length - 1;
36
+
37
+ if (lastIndex != toDeleteIndex) {
38
+ RequestId lastId = set.ids[lastIndex];
39
+ set.ids[toDeleteIndex] = lastId;
40
+ set.at[lastId] = requestIdIndex; // Replace lastValue's index to valueIndex
41
+ }
42
+
43
+ set.ids.pop();
44
+ delete set.at[requestId];
45
+ }
46
+
47
+ function isEmpty(Set storage set) external view returns(bool empty) {
48
+ return set.ids.length == 0;
49
+ }
50
+
51
+ function contains(Set storage set, RequestId requestId) external view returns(bool inSet) {
52
+ return set.at[requestId] > 0;
53
+ }
54
+
55
+ function size(Set storage set) external view returns(uint256 length) {
56
+ return set.ids.length;
57
+ }
58
+
59
+ function getElementAt(Set storage set, uint256 index) external view returns(RequestId requestId) {
60
+ return set.ids[index];
61
+ }
62
+ }
@@ -47,6 +47,10 @@ library SecondsLib {
47
47
  return Seconds.wrap(_max());
48
48
  }
49
49
 
50
+ function fromHours(uint32 numberOfHours) public pure returns (Seconds duration) {
51
+ return Seconds.wrap(numberOfHours * 3600);
52
+ }
53
+
50
54
  function oneDay() public pure returns (Seconds duration) {
51
55
  return Seconds.wrap(24 * 3600);
52
56
  }
@@ -62,4 +62,34 @@ library StrLib {
62
62
  function length(Str str) public pure returns (uint256 byteLength) {
63
63
  return ShortStrings.byteLength(ShortString.wrap(Str.unwrap(str)));
64
64
  }
65
+
66
+ /// @dev Returns the provied int as a string
67
+ function uintToString(uint256 value) public pure returns (string memory name) {
68
+
69
+ if (value == 0) {
70
+ return "0";
71
+ }
72
+
73
+ uint256 temp = value;
74
+ uint256 digits = 0;
75
+ while (temp != 0) {
76
+ digits++;
77
+ temp /= 10;
78
+ }
79
+
80
+ bytes memory buffer = new bytes(digits);
81
+ uint256 index = digits - 1;
82
+
83
+ temp = value;
84
+ while (temp != 0) {
85
+ buffer[index] = bytes1(uint8(48 + temp % 10));
86
+ temp /= 10;
87
+
88
+ if (index > 0) {
89
+ index--;
90
+ }
91
+ }
92
+
93
+ return string(buffer);
94
+ }
65
95
  }
@@ -23,6 +23,7 @@ using {
23
23
  TimestampLib.gtz,
24
24
  TimestampLib.eqz,
25
25
  TimestampLib.addSeconds,
26
+ TimestampLib.subtractSeconds,
26
27
  TimestampLib.toInt
27
28
  } for Timestamp global;
28
29
 
@@ -129,7 +130,7 @@ library TimestampLib {
129
130
  return Timestamp.unwrap(timestamp) > 0;
130
131
  }
131
132
 
132
- /// @dev return true if Timestamp a is not equal to Timestamp b
133
+ /// @dev return a new timestamp that is duration seconds later than the provided timestamp.
133
134
  function addSeconds(
134
135
  Timestamp timestamp,
135
136
  Seconds duration
@@ -137,6 +138,14 @@ library TimestampLib {
137
138
  return toTimestamp(Timestamp.unwrap(timestamp) + duration.toInt());
138
139
  }
139
140
 
141
+ /// @dev return a new timestamp that is duration seconds earlier than the provided timestamp.
142
+ function subtractSeconds(
143
+ Timestamp timestamp,
144
+ Seconds duration
145
+ ) public pure returns (Timestamp) {
146
+ return toTimestamp(Timestamp.unwrap(timestamp) - duration.toInt());
147
+ }
148
+
140
149
  function toInt(Timestamp timestamp) public pure returns (uint256) {
141
150
  return uint256(uint40(Timestamp.unwrap(timestamp)));
142
151
  }
@@ -5,9 +5,6 @@ type VersionPart is uint8;
5
5
 
6
6
  using {
7
7
  versionPartGt as >,
8
- versionPartGte as >=,
9
- versionPartLt as <,
10
- versionPartLte as <=,
11
8
  versionPartEq as ==,
12
9
  versionPartNe as !=,
13
10
  VersionPartLib.eqz,
@@ -19,9 +16,6 @@ using {
19
16
  for VersionPart global;
20
17
 
21
18
  function versionPartGt(VersionPart a, VersionPart b) pure returns(bool isGreaterThan) { return VersionPart.unwrap(a) > VersionPart.unwrap(b); }
22
- function versionPartGte(VersionPart a, VersionPart b) pure returns(bool isGreaterThan) { return VersionPart.unwrap(a) >= VersionPart.unwrap(b); }
23
- function versionPartLt(VersionPart a, VersionPart b) pure returns(bool isLessThan) { return VersionPart.unwrap(a) < VersionPart.unwrap(b); }
24
- function versionPartLte(VersionPart a, VersionPart b) pure returns(bool isLessThan) { return VersionPart.unwrap(a) <= VersionPart.unwrap(b); }
25
19
  function versionPartEq(VersionPart a, VersionPart b) pure returns(bool isSame) { return VersionPart.unwrap(a) == VersionPart.unwrap(b); }
26
20
  function versionPartNe(VersionPart a, VersionPart b) pure returns(bool isSame) { return VersionPart.unwrap(a) != VersionPart.unwrap(b); }
27
21
 
@@ -33,7 +27,8 @@ library VersionPartLib {
33
27
  function releaseMax() public pure returns (VersionPart) { return toVersionPart(99); }
34
28
 
35
29
  function isValidRelease(VersionPart release) external pure returns(bool) {
36
- return releaseMin() <= release && release <= releaseMax();
30
+ uint256 releaseInt = VersionPart.unwrap(release);
31
+ return 3 <= releaseInt && releaseInt <= 99;
37
32
  }
38
33
 
39
34
  function toString(VersionPart a) external pure returns (string memory) {
@@ -71,9 +66,8 @@ library VersionPartLib {
71
66
 
72
67
  function eqz(VersionPart a) external pure returns(bool) { return VersionPart.unwrap(a) == 0; }
73
68
  function gtz(VersionPart a) external pure returns(bool) { return VersionPart.unwrap(a) > 0; }
74
- function toInt(VersionPart a) external pure returns(uint8) { return VersionPart.unwrap(a); }
75
- function toVersionPart(uint8 a) public pure returns(VersionPart) { return VersionPart.wrap(uint8(a)); }
76
- function zero() external pure returns(VersionPart) { return VersionPart.wrap(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)); }
77
71
  }
78
72
 
79
73
  type Version is uint24; // contains major,minor,patch version parts
@@ -93,7 +87,7 @@ function versionEq(Version a, Version b) pure returns(bool isSame) { return Vers
93
87
 
94
88
  library VersionLib {
95
89
 
96
- function toInt(Version version) external pure returns(uint24) { return Version.unwrap(version); }
90
+ function toInt(Version version) external pure returns(uint) { return Version.unwrap(version); }
97
91
 
98
92
  function toUint64(Version version) external pure returns(uint64) { return Version.unwrap(version); }
99
93
 
@@ -130,19 +124,26 @@ library VersionLib {
130
124
  );
131
125
  }
132
126
 
127
+ // function toVersionPart(uint256 versionPart) public pure returns(VersionPart) {
128
+ // return VersionPart.wrap(uint8(versionPart));
129
+ // }
130
+
133
131
  function toVersion(
134
- uint8 major,
135
- uint8 minor,
136
- uint8 patch
132
+ uint256 major,
133
+ uint256 minor,
134
+ uint256 patch
137
135
  )
138
136
  external
139
137
  pure
140
138
  returns(Version)
141
139
  {
140
+ require(
141
+ major < 256 && minor < 256 && patch < 256,
142
+ "ERROR:VRS-010:VERSION_PART_TOO_BIG");
142
143
 
143
144
  return Version.wrap(
144
145
  uint24(
145
- (uint24(major) << 16) + (uint24(minor) << 8) + patch));
146
+ (major << 16) + (minor << 8) + patch));
146
147
  }
147
148
 
148
149
  // TODO check for overflow?
@@ -1,21 +1,21 @@
1
1
  // SPDX-License-Identifier: Apache-2.0
2
2
  pragma solidity ^0.8.20;
3
3
 
4
- import {IVersionable} from "../shared/IVersionable.sol";
4
+ import {Version} from "../type/Version.sol";
5
5
 
6
6
  /// IMPORTANT
7
7
  // Upgradeable contract MUST:
8
- // 1) inherit Upgradeable
9
- // 2) implement getVersion() function
8
+ // 1) inherit from Versionable
9
+ // 2) implement version() function
10
10
  // 3) implement internal _initialize() function with onlyInitializing modifier
11
11
  // 4) implement internal _upgrade() function with onlyInitializing modifier (1st version MUST revert)
12
- // 5) have onlyInitialising modifier for each function callable inside _initialize()/_upgrade()
13
- // 6) use different functions for initialization, upgrade and normal operations
14
- // 7) use default empty constructor -> _disableInitializer() is called from Upgradeable contructor
15
- // 8) use namespace storage (should storage be needed)
12
+ // 5) have onlyInitialising modifier for each function callable inside _initialize()/_upgrade() (MUST use different functions for initialization/upgrade and normal operations)
13
+ // 6) use default empty constructor -> _disableInitializer() is called from Versionable contructor
14
+ // 7) use namespace storage (should this be needed)
15
+ // 8) since now inheritance is used for upgradability, contract MUST BE inherited ONLY by the next version
16
16
  // Upgradeable contract SHOULD:
17
17
  // 9) define all non private methods as virtual (in order to be able to upgrade them latter)
18
- // otherwise, it is still possible to upgrade contract, but everyone who is using it will have to switch to a new functions
18
+ // otherwise, it is still possible to upgrade contract, but everyone who is using it will have to switch to a new fucntions
19
19
  // in some cases this ok but not in the others...
20
20
  //
21
21
  // IMPORTANT
@@ -26,25 +26,31 @@ import {IVersionable} from "../shared/IVersionable.sol";
26
26
  // 2) ALWAYS define private getter if accessing storage
27
27
  // - MUST use default implementation, CAN change ONLY return type
28
28
 
29
- interface IUpgradeable is IVersionable {
29
+ interface IVersionable {
30
30
 
31
31
  error ErrorVersionableInitializeNotImplemented();
32
32
  error ErrorVersionableUpgradeNotImplemented();
33
33
 
34
34
  /**
35
35
  * @dev IMPORTANT
36
- * top level initializer for each upgradeable
37
36
  * implementation MUST be guarded by initializer modifier
38
37
  * new version MUST inherit from previous version
39
38
  */
40
- function initialize(address activatedBy, bytes memory activationData) external;
39
+ function initializeVersionable(address activatedBy, bytes memory activationData) external;
41
40
 
42
41
  /**
43
42
  * @dev
44
- * top level reinitializer for each upgradeable
45
43
  * implementation MUST be guarded by reinitializer(version().toUint64()) modifier
46
44
  * new version MUST inherit from previous version
47
45
  * the first verion MUST revert
48
46
  */
49
- function upgrade(bytes memory upgradeData) external;
47
+ function upgradeVersionable(bytes memory upgradeData) external;
48
+
49
+ /**
50
+ * @dev returns version of this contract
51
+ * each new implementation MUST implement this function
52
+ * version number MUST increase
53
+ */
54
+ function getVersion() external pure returns(Version);
55
+
50
56
  }
@@ -5,14 +5,14 @@ import {ProxyAdmin} from "@openzeppelin/contracts/proxy/transparent/ProxyAdmin.s
5
5
  import {ITransparentUpgradeableProxy} from "@openzeppelin/contracts/proxy/transparent/TransparentUpgradeableProxy.sol";
6
6
 
7
7
  import {Blocknumber, BlocknumberLib} from "../type/Blocknumber.sol";
8
- import {IUpgradeable} from "./IUpgradeable.sol";
8
+ import {IVersionable} from "./IVersionable.sol";
9
9
  import {NftId} from "../type/NftId.sol";
10
10
  import {NftOwnable} from "../shared/NftOwnable.sol";
11
11
  import {Timestamp, TimestampLib} from "../type/Timestamp.sol";
12
12
  import {UpgradableProxyWithAdmin} from "./UpgradableProxyWithAdmin.sol";
13
- import {Version, VersionPart, VersionLib} from "../type/Version.sol";
13
+ import {Version, VersionLib} from "../type/Version.sol";
14
14
 
15
- /// @dev manages proxy deployments for upgradable contracs of type IUpgradeable
15
+ /// @dev manages proxy deployments for upgradable contracs of type IVersionable
16
16
  contract ProxyManager is
17
17
  NftOwnable
18
18
  {
@@ -27,15 +27,14 @@ contract ProxyManager is
27
27
  address activatedBy;
28
28
  }
29
29
 
30
- event LogProxyManagerProxyDeployed(address indexed proxy, address initialImplementation);
31
- event LogProxyManagerProxyUpgraded(address indexed proxy, address upgradedImplementation);
30
+ event LogProxyManagerVersionableDeployed(address indexed proxy, address initialImplementation);
31
+ event LogProxyManagerVersionableUpgraded(address indexed proxy, address upgradedImplementation);
32
32
 
33
33
  error ErrorProxyManagerAlreadyDeployed();
34
34
  error ErrorProxyManagerNotYetDeployed();
35
35
 
36
36
  error ErrorProxyManagerZeroVersion();
37
37
  error ErrorProxyManagerNextVersionNotIncreasing(Version nextVersion);
38
- error ErrorProxyManagerNextVersionReleaseInvalid(Version nextVersion);
39
38
 
40
39
  UpgradableProxyWithAdmin internal _proxy;
41
40
 
@@ -45,19 +44,17 @@ contract ProxyManager is
45
44
 
46
45
  /// @dev convencience initializer
47
46
  function initialize(
47
+ address registry,
48
48
  address implementation,
49
49
  bytes memory data,
50
50
  bytes32 salt
51
51
  )
52
52
  public
53
53
  initializer()
54
- returns (IUpgradeable upgradeable)
54
+ returns (IVersionable versionable)
55
55
  {
56
- address initialOwner = msg.sender;
57
-
58
- __NftOwnable_init(initialOwner);
59
-
60
- upgradeable = deployDetermenistic(
56
+ versionable = deployDetermenistic(
57
+ registry,
61
58
  implementation,
62
59
  data,
63
60
  salt);
@@ -65,20 +62,19 @@ contract ProxyManager is
65
62
 
66
63
  /// @dev deploy initial contract
67
64
  function deploy(
65
+ address registry,
68
66
  address initialImplementation,
69
67
  bytes memory initializationData
70
68
  )
71
69
  public
72
70
  virtual
73
71
  onlyInitializing()
74
- returns (IUpgradeable upgradeable)
72
+ returns (IVersionable versionable)
75
73
  {
76
- if (_versions.length > 0) {
77
- revert ErrorProxyManagerAlreadyDeployed();
78
- }
79
-
80
- address currentProxyOwner = getOwner(); // used by implementation
81
- address initialProxyAdminOwner = address(this); // used by proxy
74
+ (
75
+ address currentProxyOwner,
76
+ address initialProxyAdminOwner
77
+ ) = _preDeployChecksAndSetup(registry);
82
78
 
83
79
  _proxy = new UpgradableProxyWithAdmin(
84
80
  initialImplementation,
@@ -86,14 +82,15 @@ contract ProxyManager is
86
82
  getDeployData(currentProxyOwner, initializationData)
87
83
  );
88
84
 
89
- upgradeable = _updateVersionHistory(
85
+ versionable = _updateVersionHistory(
90
86
  initialImplementation,
91
87
  currentProxyOwner);
92
88
 
93
- emit LogProxyManagerProxyDeployed(address(upgradeable), initialImplementation);
89
+ emit LogProxyManagerVersionableDeployed(address(versionable), initialImplementation);
94
90
  }
95
91
 
96
92
  function deployDetermenistic(
93
+ address registry,
97
94
  address initialImplementation,
98
95
  bytes memory initializationData,
99
96
  bytes32 salt
@@ -101,14 +98,12 @@ contract ProxyManager is
101
98
  public
102
99
  virtual
103
100
  onlyInitializing()
104
- returns (IUpgradeable upgradeable)
101
+ returns (IVersionable versionable)
105
102
  {
106
- if (_versions.length > 0) {
107
- revert ErrorProxyManagerAlreadyDeployed();
108
- }
109
-
110
- address currentProxyOwner = getOwner(); // used by implementation
111
- address initialProxyAdminOwner = address(this); // used by proxy
103
+ (
104
+ address currentProxyOwner,
105
+ address initialProxyAdminOwner
106
+ ) = _preDeployChecksAndSetup(registry);
112
107
 
113
108
  _proxy = new UpgradableProxyWithAdmin{salt: salt}(
114
109
  initialImplementation,
@@ -116,11 +111,11 @@ contract ProxyManager is
116
111
  getDeployData(currentProxyOwner, initializationData)
117
112
  );
118
113
 
119
- upgradeable = _updateVersionHistory(
114
+ versionable = _updateVersionHistory(
120
115
  initialImplementation,
121
116
  currentProxyOwner);
122
117
 
123
- emit LogProxyManagerProxyDeployed(address(upgradeable), initialImplementation);
118
+ emit LogProxyManagerVersionableDeployed(address(versionable), initialImplementation);
124
119
  }
125
120
 
126
121
  /// @dev upgrade existing contract.
@@ -129,7 +124,7 @@ contract ProxyManager is
129
124
  public
130
125
  virtual
131
126
  onlyOwner()
132
- returns (IUpgradeable upgradeable)
127
+ returns (IVersionable versionable)
133
128
  {
134
129
  bytes memory emptyUpgradeData;
135
130
  return upgrade(newImplementation, emptyUpgradeData);
@@ -140,7 +135,7 @@ contract ProxyManager is
140
135
  public
141
136
  virtual
142
137
  onlyOwner()
143
- returns (IUpgradeable upgradeable)
138
+ returns (IVersionable versionable)
144
139
  {
145
140
  if (_versions.length == 0) {
146
141
  revert ErrorProxyManagerNotYetDeployed();
@@ -155,11 +150,11 @@ contract ProxyManager is
155
150
  newImplementation,
156
151
  getUpgradeData(upgradeData));
157
152
 
158
- upgradeable = _updateVersionHistory(
153
+ versionable = _updateVersionHistory(
159
154
  newImplementation,
160
155
  currentProxyOwner);
161
156
 
162
- emit LogProxyManagerProxyUpgraded(address(upgradeable), newImplementation);
157
+ emit LogProxyManagerVersionableUpgraded(address(versionable), newImplementation);
163
158
 
164
159
  }
165
160
 
@@ -169,14 +164,14 @@ contract ProxyManager is
169
164
 
170
165
  function getDeployData(address proxyOwner, bytes memory deployData) public pure returns (bytes memory data) {
171
166
  return abi.encodeWithSelector(
172
- IUpgradeable.initialize.selector,
167
+ IVersionable.initializeVersionable.selector,
173
168
  proxyOwner,
174
169
  deployData);
175
170
  }
176
171
 
177
172
  function getUpgradeData(bytes memory upgradeData) public pure returns (bytes memory data) {
178
173
  return abi.encodeWithSelector(
179
- IUpgradeable.upgrade.selector,
174
+ IVersionable.upgradeVersionable.selector,
180
175
  upgradeData);
181
176
  }
182
177
 
@@ -185,7 +180,7 @@ contract ProxyManager is
185
180
  }
186
181
 
187
182
  function getVersion() external view virtual returns(Version) {
188
- return _versionHistory[_versions[_versions.length]].version;
183
+ return IVersionable(address(_proxy)).getVersion();
189
184
  }
190
185
 
191
186
  function getVersionCount() external view returns(uint256) {
@@ -200,29 +195,42 @@ contract ProxyManager is
200
195
  return _versionHistory[_version];
201
196
  }
202
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
+
203
216
  function _updateVersionHistory(
204
217
  address implementation,
205
218
  address activatedBy
206
219
  )
207
220
  private
208
- returns (IUpgradeable upgradeable)
221
+ returns (IVersionable versionable)
209
222
  {
210
- upgradeable = IUpgradeable(address(_proxy));
211
- Version newVersion = upgradeable.getVersion();
223
+ versionable = IVersionable(address(_proxy));
224
+ Version newVersion = versionable.getVersion();
212
225
 
213
226
  if(newVersion == VersionLib.zeroVersion()) {
214
227
  revert ErrorProxyManagerZeroVersion();
215
228
  }
216
229
 
217
230
  if(_versions.length > 0) {
218
- Version version = _versions[_versions.length-1];
219
- if(newVersion.toInt() <= version.toInt()) {
231
+ if(newVersion.toInt() <= _versions[_versions.length-1].toInt()) {
220
232
  revert ErrorProxyManagerNextVersionNotIncreasing(newVersion);
221
233
  }
222
-
223
- if(newVersion.toMajorPart() != version.toMajorPart()) {
224
- revert ErrorProxyManagerNextVersionReleaseInvalid(newVersion);
225
- }
226
234
  }
227
235
 
228
236
  // update version history