@etherisc/gif-next 0.0.2-ffa91a6-022 → 3.0.0-06d5e8b-738

Sign up to get free protection for your applications and to get access to all the features.
Files changed (504) hide show
  1. package/README.md +124 -332
  2. package/artifacts/contracts/accounting/AccountingService.sol/AccountingService.dbg.json +1 -1
  3. package/artifacts/contracts/accounting/AccountingService.sol/AccountingService.json +106 -38
  4. package/artifacts/contracts/accounting/AccountingServiceManager.sol/AccountingServiceManager.dbg.json +1 -1
  5. package/artifacts/contracts/accounting/AccountingServiceManager.sol/AccountingServiceManager.json +111 -45
  6. package/artifacts/contracts/accounting/IAccountingService.sol/IAccountingService.dbg.json +1 -1
  7. package/artifacts/contracts/accounting/IAccountingService.sol/IAccountingService.json +58 -6
  8. package/artifacts/contracts/authorization/AccessAdmin.sol/AccessAdmin.dbg.json +1 -1
  9. package/artifacts/contracts/authorization/AccessAdmin.sol/AccessAdmin.json +370 -141
  10. package/artifacts/contracts/authorization/AccessAdminLib.sol/AccessAdminLib.dbg.json +1 -1
  11. package/artifacts/contracts/authorization/AccessAdminLib.sol/AccessAdminLib.json +1582 -202
  12. package/artifacts/contracts/authorization/AccessManagerCloneable.sol/AccessManagerCloneable.dbg.json +1 -1
  13. package/artifacts/contracts/authorization/AccessManagerCloneable.sol/AccessManagerCloneable.json +2 -2
  14. package/artifacts/contracts/authorization/Authorization.sol/Authorization.dbg.json +1 -1
  15. package/artifacts/contracts/authorization/Authorization.sol/Authorization.json +266 -64
  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 +263 -87
  19. package/artifacts/contracts/authorization/IAuthorization.sol/IAuthorization.dbg.json +1 -1
  20. package/artifacts/contracts/authorization/IAuthorization.sol/IAuthorization.json +102 -19
  21. package/artifacts/contracts/authorization/IServiceAuthorization.sol/IServiceAuthorization.dbg.json +1 -1
  22. package/artifacts/contracts/authorization/IServiceAuthorization.sol/IServiceAuthorization.json +256 -16
  23. package/artifacts/contracts/authorization/ServiceAuthorization.sol/ServiceAuthorization.dbg.json +1 -1
  24. package/artifacts/contracts/authorization/ServiceAuthorization.sol/ServiceAuthorization.json +426 -27
  25. package/artifacts/contracts/distribution/BasicDistribution.sol/BasicDistribution.dbg.json +1 -1
  26. package/artifacts/contracts/distribution/BasicDistribution.sol/BasicDistribution.json +63 -38
  27. package/artifacts/contracts/distribution/BasicDistributionAuthorization.sol/BasicDistributionAuthorization.dbg.json +1 -1
  28. package/artifacts/contracts/distribution/BasicDistributionAuthorization.sol/BasicDistributionAuthorization.json +269 -69
  29. package/artifacts/contracts/distribution/Distribution.sol/Distribution.dbg.json +1 -1
  30. package/artifacts/contracts/distribution/Distribution.sol/Distribution.json +21 -12
  31. package/artifacts/contracts/distribution/DistributionService.sol/DistributionService.dbg.json +1 -1
  32. package/artifacts/contracts/distribution/DistributionService.sol/DistributionService.json +376 -147
  33. package/artifacts/contracts/distribution/DistributionServiceManager.sol/DistributionServiceManager.dbg.json +1 -1
  34. package/artifacts/contracts/distribution/DistributionServiceManager.sol/DistributionServiceManager.json +160 -78
  35. package/artifacts/contracts/distribution/IDistributionComponent.sol/IDistributionComponent.dbg.json +1 -1
  36. package/artifacts/contracts/distribution/IDistributionComponent.sol/IDistributionComponent.json +20 -11
  37. package/artifacts/contracts/distribution/IDistributionService.sol/IDistributionService.dbg.json +1 -1
  38. package/artifacts/contracts/distribution/IDistributionService.sol/IDistributionService.json +232 -19
  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 +108 -79
  42. package/artifacts/contracts/examples/fire/FirePoolAuthorization.sol/FirePoolAuthorization.dbg.json +1 -1
  43. package/artifacts/contracts/examples/fire/FirePoolAuthorization.sol/FirePoolAuthorization.json +268 -68
  44. package/artifacts/contracts/examples/fire/FireProduct.sol/FireProduct.dbg.json +1 -1
  45. package/artifacts/contracts/examples/fire/FireProduct.sol/FireProduct.json +136 -95
  46. package/artifacts/contracts/examples/fire/FireProductAuthorization.sol/FireProductAuthorization.dbg.json +1 -1
  47. package/artifacts/contracts/examples/fire/FireProductAuthorization.sol/FireProductAuthorization.json +268 -68
  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 +728 -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/FlightOracle.sol/FlightOracle.dbg.json +4 -0
  54. package/artifacts/contracts/examples/flight/FlightOracle.sol/FlightOracle.json +1234 -0
  55. package/artifacts/contracts/examples/flight/FlightOracleAuthorization.sol/FlightOracleAuthorization.dbg.json +4 -0
  56. package/artifacts/contracts/examples/flight/FlightOracleAuthorization.sol/FlightOracleAuthorization.json +896 -0
  57. package/artifacts/contracts/examples/flight/FlightPool.sol/FlightPool.dbg.json +4 -0
  58. package/artifacts/contracts/examples/flight/FlightPool.sol/FlightPool.json +1466 -0
  59. package/artifacts/contracts/examples/flight/FlightPoolAuthorization.sol/FlightPoolAuthorization.dbg.json +4 -0
  60. package/artifacts/contracts/examples/flight/FlightPoolAuthorization.sol/FlightPoolAuthorization.json +844 -0
  61. package/artifacts/contracts/examples/flight/FlightProduct.sol/FlightProduct.dbg.json +4 -0
  62. package/artifacts/contracts/examples/flight/FlightProduct.sol/FlightProduct.json +2497 -0
  63. package/artifacts/contracts/examples/flight/FlightProductAuthorization.sol/FlightProductAuthorization.dbg.json +4 -0
  64. package/artifacts/contracts/examples/flight/FlightProductAuthorization.sol/FlightProductAuthorization.json +891 -0
  65. package/artifacts/contracts/examples/flight/FlightUSD.sol/FlightUSD.dbg.json +4 -0
  66. package/artifacts/contracts/examples/flight/FlightUSD.sol/FlightUSD.json +586 -0
  67. package/artifacts/contracts/examples/flight/originalV1.sol/FlightDelayChainlink.dbg.json +4 -0
  68. package/artifacts/contracts/examples/flight/originalV1.sol/FlightDelayChainlink.json +901 -0
  69. package/artifacts/contracts/examples/unpermissioned/SimpleDistribution.sol/SimpleDistribution.dbg.json +1 -1
  70. package/artifacts/contracts/examples/unpermissioned/SimpleDistribution.sol/SimpleDistribution.json +86 -45
  71. package/artifacts/contracts/examples/unpermissioned/SimpleDistributionAuthorization.sol/SimpleDistributionAuthorization.dbg.json +1 -1
  72. package/artifacts/contracts/examples/unpermissioned/SimpleDistributionAuthorization.sol/SimpleDistributionAuthorization.json +268 -68
  73. package/artifacts/contracts/examples/unpermissioned/SimpleOracle.sol/SimpleOracle.dbg.json +1 -1
  74. package/artifacts/contracts/examples/unpermissioned/SimpleOracle.sol/SimpleOracle.json +35 -26
  75. package/artifacts/contracts/examples/unpermissioned/SimplePool.sol/SimplePool.dbg.json +1 -1
  76. package/artifacts/contracts/examples/unpermissioned/SimplePool.sol/SimplePool.json +130 -105
  77. package/artifacts/contracts/examples/unpermissioned/SimplePoolAuthorization.sol/SimplePoolAuthorization.dbg.json +1 -1
  78. package/artifacts/contracts/examples/unpermissioned/SimplePoolAuthorization.sol/SimplePoolAuthorization.json +268 -68
  79. package/artifacts/contracts/examples/unpermissioned/SimpleProduct.sol/SimpleProduct.dbg.json +1 -1
  80. package/artifacts/contracts/examples/unpermissioned/SimpleProduct.sol/SimpleProduct.json +333 -147
  81. package/artifacts/contracts/examples/unpermissioned/SimpleProductAuthorization.sol/SimpleProductAuthorization.dbg.json +1 -1
  82. package/artifacts/contracts/examples/unpermissioned/SimpleProductAuthorization.sol/SimpleProductAuthorization.json +268 -68
  83. package/artifacts/contracts/instance/BaseStore.sol/BaseStore.dbg.json +4 -0
  84. package/artifacts/contracts/{shared/IKeyValueStore.sol/IKeyValueStore.json → instance/BaseStore.sol/BaseStore.json} +51 -229
  85. package/artifacts/contracts/instance/BundleSet.sol/BundleSet.dbg.json +1 -1
  86. package/artifacts/contracts/instance/BundleSet.sol/BundleSet.json +2 -2
  87. package/artifacts/contracts/instance/IBaseStore.sol/IBaseStore.dbg.json +4 -0
  88. package/artifacts/contracts/instance/IBaseStore.sol/IBaseStore.json +304 -0
  89. package/artifacts/contracts/instance/IInstance.sol/IInstance.dbg.json +1 -1
  90. package/artifacts/contracts/instance/IInstance.sol/IInstance.json +374 -35
  91. package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.dbg.json +1 -1
  92. package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.json +305 -5
  93. package/artifacts/contracts/instance/Instance.sol/Instance.dbg.json +1 -1
  94. package/artifacts/contracts/instance/Instance.sol/Instance.json +425 -97
  95. package/artifacts/contracts/instance/InstanceAdmin.sol/InstanceAdmin.dbg.json +1 -1
  96. package/artifacts/contracts/instance/InstanceAdmin.sol/InstanceAdmin.json +753 -401
  97. package/artifacts/contracts/instance/InstanceAuthorizationV3.sol/InstanceAuthorizationV3.dbg.json +1 -1
  98. package/artifacts/contracts/instance/InstanceAuthorizationV3.sol/InstanceAuthorizationV3.json +236 -80
  99. package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.dbg.json +1 -1
  100. package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.json +747 -553
  101. package/artifacts/contracts/instance/InstanceService.sol/InstanceService.dbg.json +1 -1
  102. package/artifacts/contracts/instance/InstanceService.sol/InstanceService.json +331 -31
  103. package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.dbg.json +1 -1
  104. package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.json +100 -42
  105. package/artifacts/contracts/instance/InstanceStore.sol/InstanceStore.dbg.json +1 -1
  106. package/artifacts/contracts/instance/InstanceStore.sol/InstanceStore.json +1323 -2012
  107. package/artifacts/contracts/instance/ProductStore.sol/ProductStore.dbg.json +4 -0
  108. package/artifacts/contracts/instance/ProductStore.sol/ProductStore.json +3427 -0
  109. package/artifacts/contracts/instance/RiskSet.sol/RiskSet.dbg.json +1 -1
  110. package/artifacts/contracts/instance/RiskSet.sol/RiskSet.json +101 -88
  111. package/artifacts/contracts/instance/base/BalanceStore.sol/BalanceStore.dbg.json +1 -1
  112. package/artifacts/contracts/instance/base/BalanceStore.sol/BalanceStore.json +8 -8
  113. package/artifacts/contracts/instance/base/Cloneable.sol/Cloneable.dbg.json +1 -1
  114. package/artifacts/contracts/instance/base/ObjectCounter.sol/ObjectCounter.dbg.json +1 -1
  115. package/artifacts/contracts/instance/base/ObjectCounter.sol/ObjectCounter.json +2 -2
  116. package/artifacts/contracts/instance/base/ObjectLifecycle.sol/ObjectLifecycle.dbg.json +1 -1
  117. package/artifacts/contracts/instance/base/ObjectLifecycle.sol/ObjectLifecycle.json +2 -2
  118. package/artifacts/contracts/instance/base/ObjectSet.sol/ObjectSet.dbg.json +1 -1
  119. package/artifacts/contracts/instance/base/ObjectSet.sol/ObjectSet.json +2 -2
  120. package/artifacts/contracts/instance/base/ObjectSetHelperLib.sol/ObjectSetHelperLib.dbg.json +1 -1
  121. package/artifacts/contracts/instance/base/ObjectSetHelperLib.sol/ObjectSetHelperLib.json +20 -20
  122. package/artifacts/contracts/instance/module/IBundle.sol/IBundle.dbg.json +1 -1
  123. package/artifacts/contracts/instance/module/IComponents.sol/IComponents.dbg.json +1 -1
  124. package/artifacts/contracts/instance/module/IDistribution.sol/IDistribution.dbg.json +1 -1
  125. package/artifacts/contracts/instance/module/IPolicy.sol/IPolicy.dbg.json +1 -1
  126. package/artifacts/contracts/instance/module/IRisk.sol/IRisk.dbg.json +1 -1
  127. package/artifacts/contracts/mock/Dip.sol/Dip.dbg.json +1 -1
  128. package/artifacts/contracts/oracle/BasicOracle.sol/BasicOracle.dbg.json +1 -1
  129. package/artifacts/contracts/oracle/BasicOracle.sol/BasicOracle.json +25 -16
  130. package/artifacts/contracts/oracle/BasicOracleAuthorization.sol/BasicOracleAuthorization.dbg.json +1 -1
  131. package/artifacts/contracts/oracle/BasicOracleAuthorization.sol/BasicOracleAuthorization.json +282 -65
  132. package/artifacts/contracts/oracle/IOracle.sol/IOracle.dbg.json +1 -1
  133. package/artifacts/contracts/oracle/IOracleComponent.sol/IOracleComponent.dbg.json +1 -1
  134. package/artifacts/contracts/oracle/IOracleComponent.sol/IOracleComponent.json +19 -10
  135. package/artifacts/contracts/oracle/IOracleService.sol/IOracleService.dbg.json +1 -1
  136. package/artifacts/contracts/oracle/IOracleService.sol/IOracleService.json +29 -0
  137. package/artifacts/contracts/oracle/Oracle.sol/Oracle.dbg.json +1 -1
  138. package/artifacts/contracts/oracle/Oracle.sol/Oracle.json +19 -10
  139. package/artifacts/contracts/oracle/OracleService.sol/OracleService.dbg.json +1 -1
  140. package/artifacts/contracts/oracle/OracleService.sol/OracleService.json +83 -38
  141. package/artifacts/contracts/oracle/OracleServiceManager.sol/OracleServiceManager.dbg.json +1 -1
  142. package/artifacts/contracts/oracle/OracleServiceManager.sol/OracleServiceManager.json +116 -50
  143. package/artifacts/contracts/pool/BasicPool.sol/BasicPool.dbg.json +1 -1
  144. package/artifacts/contracts/pool/BasicPool.sol/BasicPool.json +59 -58
  145. package/artifacts/contracts/pool/BasicPoolAuthorization.sol/BasicPoolAuthorization.dbg.json +1 -1
  146. package/artifacts/contracts/pool/BasicPoolAuthorization.sol/BasicPoolAuthorization.json +268 -68
  147. package/artifacts/contracts/pool/BundleService.sol/BundleService.dbg.json +1 -1
  148. package/artifacts/contracts/pool/BundleService.sol/BundleService.json +300 -123
  149. package/artifacts/contracts/pool/BundleServiceManager.sol/BundleServiceManager.dbg.json +1 -1
  150. package/artifacts/contracts/pool/BundleServiceManager.sol/BundleServiceManager.json +144 -58
  151. package/artifacts/contracts/pool/IBundleService.sol/IBundleService.dbg.json +1 -1
  152. package/artifacts/contracts/pool/IBundleService.sol/IBundleService.json +186 -33
  153. package/artifacts/contracts/pool/IPoolComponent.sol/IPoolComponent.dbg.json +1 -1
  154. package/artifacts/contracts/pool/IPoolComponent.sol/IPoolComponent.json +29 -20
  155. package/artifacts/contracts/pool/IPoolService.sol/IPoolService.dbg.json +1 -1
  156. package/artifacts/contracts/pool/IPoolService.sol/IPoolService.json +238 -19
  157. package/artifacts/contracts/pool/Pool.sol/Pool.dbg.json +1 -1
  158. package/artifacts/contracts/pool/Pool.sol/Pool.json +29 -20
  159. package/artifacts/contracts/pool/PoolLib.sol/PoolLib.dbg.json +1 -1
  160. package/artifacts/contracts/pool/PoolLib.sol/PoolLib.json +100 -34
  161. package/artifacts/contracts/pool/PoolService.sol/PoolService.dbg.json +1 -1
  162. package/artifacts/contracts/pool/PoolService.sol/PoolService.json +338 -79
  163. package/artifacts/contracts/pool/PoolServiceManager.sol/PoolServiceManager.dbg.json +1 -1
  164. package/artifacts/contracts/pool/PoolServiceManager.sol/PoolServiceManager.json +141 -63
  165. package/artifacts/contracts/product/ApplicationService.sol/ApplicationService.dbg.json +1 -1
  166. package/artifacts/contracts/product/ApplicationService.sol/ApplicationService.json +216 -59
  167. package/artifacts/contracts/product/ApplicationServiceManager.sol/ApplicationServiceManager.dbg.json +1 -1
  168. package/artifacts/contracts/product/ApplicationServiceManager.sol/ApplicationServiceManager.json +113 -43
  169. package/artifacts/contracts/product/BasicProduct.sol/BasicProduct.dbg.json +1 -1
  170. package/artifacts/contracts/product/BasicProduct.sol/BasicProduct.json +46 -37
  171. package/artifacts/contracts/product/BasicProductAuthorization.sol/BasicProductAuthorization.dbg.json +1 -1
  172. package/artifacts/contracts/product/BasicProductAuthorization.sol/BasicProductAuthorization.json +268 -68
  173. package/artifacts/contracts/product/ClaimService.sol/ClaimService.dbg.json +1 -1
  174. package/artifacts/contracts/product/ClaimService.sol/ClaimService.json +142 -102
  175. package/artifacts/contracts/product/ClaimServiceManager.sol/ClaimServiceManager.dbg.json +1 -1
  176. package/artifacts/contracts/product/ClaimServiceManager.sol/ClaimServiceManager.json +128 -70
  177. package/artifacts/contracts/product/IApplicationService.sol/IApplicationService.dbg.json +1 -1
  178. package/artifacts/contracts/product/IApplicationService.sol/IApplicationService.json +166 -1
  179. package/artifacts/contracts/product/IClaimService.sol/IClaimService.dbg.json +1 -1
  180. package/artifacts/contracts/product/IClaimService.sol/IClaimService.json +50 -10
  181. package/artifacts/contracts/product/IPolicyService.sol/IPolicyService.dbg.json +1 -1
  182. package/artifacts/contracts/product/IPolicyService.sol/IPolicyService.json +55 -0
  183. package/artifacts/contracts/product/IPricingService.sol/IPricingService.dbg.json +1 -1
  184. package/artifacts/contracts/product/IPricingService.sol/IPricingService.json +29 -0
  185. package/artifacts/contracts/product/IProductComponent.sol/IProductComponent.dbg.json +1 -1
  186. package/artifacts/contracts/product/IProductComponent.sol/IProductComponent.json +40 -31
  187. package/artifacts/contracts/product/IRiskService.sol/IRiskService.dbg.json +1 -1
  188. package/artifacts/contracts/product/IRiskService.sol/IRiskService.json +203 -18
  189. package/artifacts/contracts/product/PolicyService.sol/PolicyService.dbg.json +1 -1
  190. package/artifacts/contracts/product/PolicyService.sol/PolicyService.json +157 -86
  191. package/artifacts/contracts/product/PolicyServiceLib.sol/PolicyServiceLib.dbg.json +1 -1
  192. package/artifacts/contracts/product/PolicyServiceLib.sol/PolicyServiceLib.json +511 -21
  193. package/artifacts/contracts/product/PolicyServiceManager.sol/PolicyServiceManager.dbg.json +1 -1
  194. package/artifacts/contracts/product/PolicyServiceManager.sol/PolicyServiceManager.json +138 -72
  195. package/artifacts/contracts/product/PricingService.sol/PricingService.dbg.json +1 -1
  196. package/artifacts/contracts/product/PricingService.sol/PricingService.json +93 -112
  197. package/artifacts/contracts/product/PricingServiceManager.sol/PricingServiceManager.dbg.json +1 -1
  198. package/artifacts/contracts/product/PricingServiceManager.sol/PricingServiceManager.json +115 -65
  199. package/artifacts/contracts/product/Product.sol/Product.dbg.json +1 -1
  200. package/artifacts/contracts/product/Product.sol/Product.json +40 -31
  201. package/artifacts/contracts/product/RiskService.sol/RiskService.dbg.json +1 -1
  202. package/artifacts/contracts/product/RiskService.sol/RiskService.json +231 -46
  203. package/artifacts/contracts/product/RiskServiceManager.sol/RiskServiceManager.dbg.json +1 -1
  204. package/artifacts/contracts/product/RiskServiceManager.sol/RiskServiceManager.json +101 -43
  205. package/artifacts/contracts/registry/ChainNft.sol/ChainNft.dbg.json +1 -1
  206. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.dbg.json +1 -1
  207. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.json +33 -22
  208. package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.dbg.json +1 -1
  209. package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.json +29 -0
  210. package/artifacts/contracts/registry/IRelease.sol/IRelease.dbg.json +1 -1
  211. package/artifacts/contracts/registry/ITransferInterceptor.sol/ITransferInterceptor.dbg.json +1 -1
  212. package/artifacts/contracts/registry/Registry.sol/Registry.dbg.json +1 -1
  213. package/artifacts/contracts/registry/Registry.sol/Registry.json +71 -60
  214. package/artifacts/contracts/registry/RegistryAdmin.sol/RegistryAdmin.dbg.json +1 -1
  215. package/artifacts/contracts/registry/RegistryAdmin.sol/RegistryAdmin.json +539 -314
  216. package/artifacts/contracts/registry/RegistryAuthorization.sol/RegistryAuthorization.dbg.json +1 -1
  217. package/artifacts/contracts/registry/RegistryAuthorization.sol/RegistryAuthorization.json +335 -76
  218. package/artifacts/contracts/registry/RegistryService.sol/RegistryService.dbg.json +1 -1
  219. package/artifacts/contracts/registry/RegistryService.sol/RegistryService.json +41 -12
  220. package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.dbg.json +1 -1
  221. package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.json +96 -38
  222. package/artifacts/contracts/registry/ReleaseAdmin.sol/ReleaseAdmin.dbg.json +1 -1
  223. package/artifacts/contracts/registry/ReleaseAdmin.sol/ReleaseAdmin.json +551 -246
  224. package/artifacts/contracts/registry/ReleaseLifecycle.sol/ReleaseLifecycle.dbg.json +1 -1
  225. package/artifacts/contracts/registry/ReleaseLifecycle.sol/ReleaseLifecycle.json +2 -2
  226. package/artifacts/contracts/registry/ReleaseRegistry.sol/ReleaseRegistry.dbg.json +1 -1
  227. package/artifacts/contracts/registry/ReleaseRegistry.sol/ReleaseRegistry.json +169 -111
  228. package/artifacts/contracts/registry/ServiceAuthorizationV3.sol/ServiceAuthorizationV3.dbg.json +1 -1
  229. package/artifacts/contracts/registry/ServiceAuthorizationV3.sol/ServiceAuthorizationV3.json +459 -26
  230. package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.dbg.json +1 -1
  231. package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.json +119 -59
  232. package/artifacts/contracts/shared/Component.sol/Component.dbg.json +1 -1
  233. package/artifacts/contracts/shared/Component.sol/Component.json +19 -10
  234. package/artifacts/contracts/shared/ComponentService.sol/ComponentService.dbg.json +1 -1
  235. package/artifacts/contracts/shared/ComponentService.sol/ComponentService.json +196 -201
  236. package/artifacts/contracts/shared/ComponentServiceManager.sol/ComponentServiceManager.dbg.json +1 -1
  237. package/artifacts/contracts/shared/ComponentServiceManager.sol/ComponentServiceManager.json +130 -64
  238. package/artifacts/contracts/shared/ContractLib.sol/ContractLib.dbg.json +1 -1
  239. package/artifacts/contracts/shared/ContractLib.sol/ContractLib.json +76 -41
  240. package/artifacts/contracts/shared/ContractLib.sol/IInstanceAdminHelper.dbg.json +1 -1
  241. package/artifacts/contracts/shared/ContractLib.sol/ITargetHelper.dbg.json +1 -1
  242. package/artifacts/contracts/shared/ContractLib.sol/ITokenRegistryHelper.dbg.json +1 -1
  243. package/artifacts/contracts/shared/ContractLib.sol/ITokenRegistryHelper.json +2 -2
  244. package/artifacts/contracts/shared/IAuthorizedComponent.sol/IAuthorizedComponent.dbg.json +4 -0
  245. package/artifacts/contracts/shared/{ComponentVerifyingService.sol/ComponentVerifyingService.json → IAuthorizedComponent.sol/IAuthorizedComponent.json} +238 -90
  246. package/artifacts/contracts/shared/IComponent.sol/IComponent.dbg.json +1 -1
  247. package/artifacts/contracts/shared/IComponent.sol/IComponent.json +19 -10
  248. package/artifacts/contracts/shared/IComponentService.sol/IComponentService.dbg.json +1 -1
  249. package/artifacts/contracts/shared/IComponentService.sol/IComponentService.json +111 -132
  250. package/artifacts/contracts/shared/IInstanceLinkedComponent.sol/IInstanceLinkedComponent.dbg.json +1 -1
  251. package/artifacts/contracts/shared/IInstanceLinkedComponent.sol/IInstanceLinkedComponent.json +19 -10
  252. package/artifacts/contracts/shared/ILifecycle.sol/ILifecycle.dbg.json +1 -1
  253. package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.dbg.json +1 -1
  254. package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.json +19 -0
  255. package/artifacts/contracts/shared/IPolicyHolder.sol/IPolicyHolder.dbg.json +1 -1
  256. package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.dbg.json +1 -1
  257. package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.json +19 -0
  258. package/artifacts/contracts/shared/IRegistryLinked.sol/IRegistryLinked.dbg.json +1 -1
  259. package/artifacts/contracts/shared/IService.sol/IService.dbg.json +1 -1
  260. package/artifacts/contracts/shared/IService.sol/IService.json +29 -0
  261. package/artifacts/contracts/shared/InitializableERC165.sol/InitializableERC165.dbg.json +1 -1
  262. package/artifacts/contracts/shared/InstanceLinkedComponent.sol/InstanceLinkedComponent.dbg.json +1 -1
  263. package/artifacts/contracts/shared/InstanceLinkedComponent.sol/InstanceLinkedComponent.json +19 -10
  264. package/artifacts/contracts/shared/Lifecycle.sol/Lifecycle.dbg.json +1 -1
  265. package/artifacts/contracts/shared/NftIdSet.sol/NftIdSet.dbg.json +1 -1
  266. package/artifacts/contracts/shared/NftIdSet.sol/NftIdSet.json +2 -2
  267. package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.dbg.json +1 -1
  268. package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.json +21 -2
  269. package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.dbg.json +1 -1
  270. package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.json +2 -2
  271. package/artifacts/contracts/shared/Registerable.sol/Registerable.dbg.json +1 -1
  272. package/artifacts/contracts/shared/Registerable.sol/Registerable.json +19 -0
  273. package/artifacts/contracts/shared/RegistryLinked.sol/RegistryLinked.dbg.json +1 -1
  274. package/artifacts/contracts/shared/RegistryLinked.sol/RegistryLinked.json +2 -2
  275. package/artifacts/contracts/shared/Service.sol/Service.dbg.json +1 -1
  276. package/artifacts/contracts/shared/Service.sol/Service.json +29 -0
  277. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.dbg.json +1 -1
  278. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.json +2 -2
  279. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandlerBase.dbg.json +1 -1
  280. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandlerBase.json +2 -2
  281. package/artifacts/contracts/shared/TokenHandlerDeployerLib.sol/TokenHandlerDeployerLib.dbg.json +1 -1
  282. package/artifacts/contracts/shared/TokenHandlerDeployerLib.sol/TokenHandlerDeployerLib.json +2 -2
  283. package/artifacts/contracts/staking/IStaking.sol/IStaking.dbg.json +1 -1
  284. package/artifacts/contracts/staking/IStaking.sol/IStaking.json +1390 -134
  285. package/artifacts/contracts/staking/IStakingService.sol/IStakingService.dbg.json +1 -1
  286. package/artifacts/contracts/staking/IStakingService.sol/IStakingService.json +97 -117
  287. package/artifacts/contracts/staking/ITargetLimitHandler.sol/ITargetLimitHandler.dbg.json +4 -0
  288. package/artifacts/contracts/staking/ITargetLimitHandler.sol/ITargetLimitHandler.json +50 -0
  289. package/artifacts/contracts/staking/Staking.sol/Staking.dbg.json +1 -1
  290. package/artifacts/contracts/staking/Staking.sol/Staking.json +1479 -192
  291. package/artifacts/contracts/staking/StakingLib.sol/StakingLib.dbg.json +1 -1
  292. package/artifacts/contracts/staking/StakingLib.sol/StakingLib.json +77 -76
  293. package/artifacts/contracts/staking/StakingManager.sol/StakingManager.dbg.json +1 -1
  294. package/artifacts/contracts/staking/StakingManager.sol/StakingManager.json +139 -64
  295. package/artifacts/contracts/staking/StakingReader.sol/StakingReader.dbg.json +1 -1
  296. package/artifacts/contracts/staking/StakingReader.sol/StakingReader.json +296 -152
  297. package/artifacts/contracts/staking/StakingService.sol/StakingService.dbg.json +1 -1
  298. package/artifacts/contracts/staking/StakingService.sol/StakingService.json +131 -167
  299. package/artifacts/contracts/staking/StakingServiceManager.sol/StakingServiceManager.dbg.json +1 -1
  300. package/artifacts/contracts/staking/StakingServiceManager.sol/StakingServiceManager.json +96 -46
  301. package/artifacts/contracts/staking/StakingStore.sol/StakingStore.dbg.json +1 -1
  302. package/artifacts/contracts/staking/StakingStore.sol/StakingStore.json +1615 -815
  303. package/artifacts/contracts/staking/TargetHandler.sol/TargetHandler.dbg.json +4 -0
  304. package/artifacts/contracts/staking/TargetHandler.sol/TargetHandler.json +309 -0
  305. package/artifacts/contracts/staking/TargetManagerLib.sol/TargetManagerLib.dbg.json +1 -1
  306. package/artifacts/contracts/staking/TargetManagerLib.sol/TargetManagerLib.json +153 -91
  307. package/artifacts/contracts/type/AddressSet.sol/LibAddressSet.dbg.json +1 -1
  308. package/artifacts/contracts/type/Amount.sol/AmountLib.dbg.json +1 -1
  309. package/artifacts/contracts/type/Amount.sol/AmountLib.json +10 -10
  310. package/artifacts/contracts/type/Blocknumber.sol/BlocknumberLib.dbg.json +1 -1
  311. package/artifacts/contracts/type/Blocknumber.sol/BlocknumberLib.json +64 -19
  312. package/artifacts/contracts/type/ChainId.sol/ChainIdLib.dbg.json +4 -0
  313. package/artifacts/contracts/type/ChainId.sol/ChainIdLib.json +193 -0
  314. package/artifacts/contracts/type/ClaimId.sol/ClaimIdLib.dbg.json +1 -1
  315. package/artifacts/contracts/type/ClaimId.sol/ClaimIdLib.json +2 -2
  316. package/artifacts/contracts/type/DistributorType.sol/DistributorTypeLib.dbg.json +1 -1
  317. package/artifacts/contracts/type/DistributorType.sol/DistributorTypeLib.json +2 -2
  318. package/artifacts/contracts/type/Fee.sol/FeeLib.dbg.json +1 -1
  319. package/artifacts/contracts/type/Fee.sol/FeeLib.json +93 -37
  320. package/artifacts/contracts/type/Key32.sol/Key32Lib.dbg.json +1 -1
  321. package/artifacts/contracts/type/Key32.sol/Key32Lib.json +2 -2
  322. package/artifacts/contracts/type/Key32Set.sol/LibKey32Set.dbg.json +1 -1
  323. package/artifacts/contracts/type/Key32Set.sol/LibKey32Set.json +2 -2
  324. package/artifacts/contracts/type/NftId.sol/NftIdLib.dbg.json +1 -1
  325. package/artifacts/contracts/type/NftId.sol/NftIdLib.json +2 -2
  326. package/artifacts/contracts/type/NftIdSet.sol/LibNftIdSet.dbg.json +1 -1
  327. package/artifacts/contracts/type/NftIdSet.sol/LibNftIdSet.json +2 -2
  328. package/artifacts/contracts/type/ObjectType.sol/ObjectTypeLib.dbg.json +1 -1
  329. package/artifacts/contracts/type/ObjectType.sol/ObjectTypeLib.json +22 -25
  330. package/artifacts/contracts/type/PayoutId.sol/PayoutIdLib.dbg.json +1 -1
  331. package/artifacts/contracts/type/PayoutId.sol/PayoutIdLib.json +2 -2
  332. package/artifacts/contracts/type/Referral.sol/ReferralLib.dbg.json +1 -1
  333. package/artifacts/contracts/type/Referral.sol/ReferralLib.json +23 -4
  334. package/artifacts/contracts/type/RequestId.sol/RequestIdLib.dbg.json +1 -1
  335. package/artifacts/contracts/type/RequestId.sol/RequestIdLib.json +2 -2
  336. package/artifacts/contracts/type/RequestIdSet.sol/LibRequestIdSet.dbg.json +4 -0
  337. package/artifacts/contracts/type/RequestIdSet.sol/LibRequestIdSet.json +33 -0
  338. package/artifacts/contracts/type/RiskId.sol/RiskIdLib.dbg.json +1 -1
  339. package/artifacts/contracts/type/RiskId.sol/RiskIdLib.json +2 -2
  340. package/artifacts/contracts/type/RoleId.sol/RoleIdLib.dbg.json +1 -1
  341. package/artifacts/contracts/type/RoleId.sol/RoleIdLib.json +39 -218
  342. package/artifacts/contracts/type/Seconds.sol/SecondsLib.dbg.json +1 -1
  343. package/artifacts/contracts/type/Seconds.sol/SecondsLib.json +64 -2
  344. package/artifacts/contracts/type/Selector.sol/SelectorLib.dbg.json +1 -1
  345. package/artifacts/contracts/type/Selector.sol/SelectorSetLib.dbg.json +1 -1
  346. package/artifacts/contracts/type/StateId.sol/StateIdLib.dbg.json +1 -1
  347. package/artifacts/contracts/type/String.sol/StrLib.dbg.json +1 -1
  348. package/artifacts/contracts/type/String.sol/StrLib.json +69 -2
  349. package/artifacts/contracts/type/Timestamp.sol/TimestampLib.dbg.json +1 -1
  350. package/artifacts/contracts/type/Timestamp.sol/TimestampLib.json +37 -5
  351. package/artifacts/contracts/type/UFixed.sol/UFixedLib.dbg.json +1 -1
  352. package/artifacts/contracts/type/UFixed.sol/UFixedLib.json +60 -36
  353. package/artifacts/contracts/type/Version.sol/VersionLib.dbg.json +1 -1
  354. package/artifacts/contracts/type/Version.sol/VersionPartLib.dbg.json +1 -1
  355. package/artifacts/contracts/upgradeability/IVersionable.sol/IVersionable.dbg.json +1 -1
  356. package/artifacts/contracts/upgradeability/IVersionable.sol/IVersionable.json +10 -0
  357. package/artifacts/contracts/upgradeability/ProxyManager.sol/ProxyManager.dbg.json +1 -1
  358. package/artifacts/contracts/upgradeability/ProxyManager.sol/ProxyManager.json +81 -27
  359. package/artifacts/contracts/upgradeability/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.dbg.json +1 -1
  360. package/artifacts/contracts/upgradeability/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.json +15 -2
  361. package/artifacts/contracts/upgradeability/Versionable.sol/Versionable.dbg.json +1 -1
  362. package/artifacts/contracts/upgradeability/Versionable.sol/Versionable.json +10 -0
  363. package/contracts/accounting/AccountingService.sol +15 -3
  364. package/contracts/accounting/IAccountingService.sol +4 -2
  365. package/contracts/authorization/AccessAdmin.sol +303 -326
  366. package/contracts/authorization/AccessAdminLib.sol +535 -23
  367. package/contracts/authorization/AccessManagerCloneable.sol +0 -18
  368. package/contracts/authorization/Authorization.sol +64 -239
  369. package/contracts/authorization/IAccess.sol +29 -12
  370. package/contracts/authorization/IAccessAdmin.sol +25 -53
  371. package/contracts/authorization/IAuthorization.sol +3 -57
  372. package/contracts/authorization/IServiceAuthorization.sol +55 -17
  373. package/contracts/authorization/ServiceAuthorization.sol +228 -34
  374. package/contracts/distribution/BasicDistribution.sol +3 -4
  375. package/contracts/distribution/BasicDistributionAuthorization.sol +11 -4
  376. package/contracts/distribution/Distribution.sol +9 -8
  377. package/contracts/distribution/DistributionService.sol +125 -62
  378. package/contracts/distribution/IDistributionComponent.sol +3 -1
  379. package/contracts/distribution/IDistributionService.sol +20 -8
  380. package/contracts/examples/fire/FireProduct.sol +6 -6
  381. package/contracts/examples/flight/FlightLib.sol +300 -0
  382. package/contracts/examples/flight/FlightMessageVerifier.sol +128 -0
  383. package/contracts/examples/flight/FlightOracle.sol +171 -0
  384. package/contracts/examples/flight/FlightOracleAuthorization.sol +53 -0
  385. package/contracts/examples/flight/FlightPool.sol +89 -0
  386. package/contracts/examples/flight/FlightPoolAuthorization.sol +37 -0
  387. package/contracts/examples/flight/FlightProduct.sol +685 -0
  388. package/contracts/examples/flight/FlightProductAuthorization.sol +69 -0
  389. package/contracts/examples/flight/FlightUSD.sol +28 -0
  390. package/contracts/examples/flight/originalV1.sol +396 -0
  391. package/contracts/examples/unpermissioned/SimpleProduct.sol +83 -19
  392. package/contracts/instance/BaseStore.sol +93 -0
  393. package/contracts/instance/IBaseStore.sol +37 -0
  394. package/contracts/instance/IInstance.sol +57 -6
  395. package/contracts/instance/IInstanceService.sol +42 -7
  396. package/contracts/instance/Instance.sol +111 -56
  397. package/contracts/instance/InstanceAdmin.sol +150 -294
  398. package/contracts/instance/InstanceAuthorizationV3.sol +106 -66
  399. package/contracts/instance/InstanceReader.sol +376 -392
  400. package/contracts/instance/InstanceService.sol +186 -134
  401. package/contracts/instance/InstanceStore.sol +153 -128
  402. package/contracts/instance/ProductStore.sol +290 -0
  403. package/contracts/instance/RiskSet.sol +10 -2
  404. package/contracts/instance/TargetNames.sol +10 -0
  405. package/contracts/instance/base/BalanceStore.sol +4 -6
  406. package/contracts/instance/base/ObjectLifecycle.sol +2 -6
  407. package/contracts/instance/module/IBundle.sol +6 -5
  408. package/contracts/instance/module/IComponents.sol +15 -5
  409. package/contracts/instance/module/IDistribution.sol +17 -7
  410. package/contracts/instance/module/IPolicy.sol +28 -8
  411. package/contracts/instance/module/IRisk.sol +2 -0
  412. package/contracts/oracle/BasicOracle.sol +2 -3
  413. package/contracts/oracle/BasicOracleAuthorization.sol +18 -2
  414. package/contracts/oracle/IOracle.sol +9 -4
  415. package/contracts/oracle/IOracleService.sol +12 -12
  416. package/contracts/oracle/Oracle.sol +4 -6
  417. package/contracts/oracle/OracleService.sol +8 -8
  418. package/contracts/pool/BasicPool.sol +4 -16
  419. package/contracts/pool/BasicPoolAuthorization.sol +10 -5
  420. package/contracts/pool/BundleService.sol +34 -43
  421. package/contracts/pool/IBundleService.sol +14 -13
  422. package/contracts/pool/IPoolService.sol +7 -2
  423. package/contracts/pool/Pool.sol +6 -18
  424. package/contracts/pool/PoolLib.sol +127 -2
  425. package/contracts/pool/PoolService.sol +40 -181
  426. package/contracts/product/ApplicationService.sol +64 -11
  427. package/contracts/product/BasicProduct.sol +2 -3
  428. package/contracts/product/BasicProductAuthorization.sol +13 -5
  429. package/contracts/product/ClaimService.sol +99 -105
  430. package/contracts/product/IApplicationService.sol +21 -2
  431. package/contracts/product/IClaimService.sol +5 -4
  432. package/contracts/product/IPolicyService.sol +9 -2
  433. package/contracts/product/IRiskService.sol +18 -3
  434. package/contracts/product/PolicyService.sol +40 -59
  435. package/contracts/product/PolicyServiceLib.sol +79 -5
  436. package/contracts/product/PricingService.sol +28 -31
  437. package/contracts/product/Product.sol +40 -16
  438. package/contracts/product/RiskService.sol +50 -15
  439. package/contracts/registry/IRegistry.sol +15 -9
  440. package/contracts/registry/IRelease.sol +6 -3
  441. package/contracts/registry/Registry.sol +15 -9
  442. package/contracts/registry/RegistryAdmin.sol +39 -118
  443. package/contracts/registry/RegistryAuthorization.sol +139 -69
  444. package/contracts/registry/RegistryService.sol +1 -1
  445. package/contracts/registry/ReleaseAdmin.sol +59 -106
  446. package/contracts/registry/ReleaseRegistry.sol +20 -12
  447. package/contracts/registry/ServiceAuthorizationV3.sol +43 -32
  448. package/contracts/registry/TokenRegistry.sol +56 -52
  449. package/contracts/shared/Component.sol +8 -8
  450. package/contracts/shared/ComponentService.sol +245 -262
  451. package/contracts/shared/ContractLib.sol +106 -75
  452. package/contracts/shared/EcdsaChecker.sol +5 -0
  453. package/contracts/shared/IAuthorizedComponent.sol +15 -0
  454. package/contracts/shared/IComponent.sol +1 -1
  455. package/contracts/shared/IComponentService.sol +14 -15
  456. package/contracts/shared/IInstanceLinkedComponent.sol +2 -5
  457. package/contracts/shared/INftOwnable.sol +2 -0
  458. package/contracts/shared/IRegisterable.sol +0 -1
  459. package/contracts/shared/InstanceLinkedComponent.sol +64 -26
  460. package/contracts/shared/NftOwnable.sol +3 -1
  461. package/contracts/shared/PolicyHolder.sol +3 -2
  462. package/contracts/shared/Service.sol +6 -4
  463. package/contracts/staking/IStaking.sol +261 -70
  464. package/contracts/staking/IStakingService.sol +39 -84
  465. package/contracts/staking/ITargetLimitHandler.sol +17 -0
  466. package/contracts/staking/Staking.sol +468 -217
  467. package/contracts/staking/StakingLib.sol +38 -124
  468. package/contracts/staking/StakingManager.sol +4 -3
  469. package/contracts/staking/StakingReader.sol +62 -71
  470. package/contracts/staking/StakingService.sol +42 -185
  471. package/contracts/staking/StakingServiceManager.sol +1 -0
  472. package/contracts/staking/StakingStore.sol +1093 -331
  473. package/contracts/staking/TargetHandler.sol +132 -0
  474. package/contracts/staking/TargetManagerLib.sol +69 -46
  475. package/contracts/type/Amount.sol +4 -0
  476. package/contracts/type/Blocknumber.sol +17 -22
  477. package/contracts/type/ChainId.sol +101 -0
  478. package/contracts/type/Fee.sol +8 -8
  479. package/contracts/type/NftId.sol +3 -3
  480. package/contracts/type/ObjectType.sol +17 -33
  481. package/contracts/type/Referral.sol +6 -0
  482. package/contracts/type/RequestIdSet.sol +62 -0
  483. package/contracts/type/RoleId.sol +57 -59
  484. package/contracts/type/Seconds.sol +23 -0
  485. package/contracts/type/String.sol +42 -0
  486. package/contracts/type/Timestamp.sol +14 -3
  487. package/contracts/type/UFixed.sol +28 -10
  488. package/contracts/upgradeability/IVersionable.sol +3 -0
  489. package/contracts/upgradeability/ProxyManager.sol +26 -12
  490. package/contracts/upgradeability/UpgradableProxyWithAdmin.sol +12 -2
  491. package/contracts/upgradeability/Versionable.sol +6 -3
  492. package/package.json +2 -1
  493. package/artifacts/contracts/authorization/AccessAdmin.sol/IAccessManagedChecker.dbg.json +0 -4
  494. package/artifacts/contracts/authorization/AccessAdmin.sol/IAccessManagedChecker.json +0 -24
  495. package/artifacts/contracts/shared/ComponentVerifyingService.sol/ComponentVerifyingService.dbg.json +0 -4
  496. package/artifacts/contracts/shared/IKeyValueStore.sol/IKeyValueStore.dbg.json +0 -4
  497. package/artifacts/contracts/shared/KeyValueStore.sol/KeyValueStore.dbg.json +0 -4
  498. package/artifacts/contracts/shared/KeyValueStore.sol/KeyValueStore.json +0 -538
  499. package/artifacts/contracts/staking/StakingLifecycle.sol/StakingLifecycle.dbg.json +0 -4
  500. package/artifacts/contracts/staking/StakingLifecycle.sol/StakingLifecycle.json +0 -205
  501. package/contracts/shared/ComponentVerifyingService.sol +0 -128
  502. package/contracts/shared/IKeyValueStore.sol +0 -54
  503. package/contracts/shared/KeyValueStore.sol +0 -131
  504. package/contracts/staking/StakingLifecycle.sol +0 -23
package/artifacts/contracts/upgradeability/ProxyManager.sol/ProxyManager.json CHANGED
@@ -117,6 +117,25 @@
117
117
  "name": "Initialized",
118
118
  "type": "event"
119
119
  },
120
+ {
121
+ "anonymous": false,
122
+ "inputs": [
123
+ {
124
+ "indexed": false,
125
+ "internalType": "NftId",
126
+ "name": "nftId",
127
+ "type": "uint96"
128
+ },
129
+ {
130
+ "indexed": false,
131
+ "internalType": "address",
132
+ "name": "owner",
133
+ "type": "address"
134
+ }
135
+ ],
136
+ "name": "LogNftOwnableNftLinkedToAddress",
137
+ "type": "event"
138
+ },
120
139
  {
121
140
  "anonymous": false,
122
141
  "inputs": [
@@ -383,21 +402,11 @@
383
402
  "outputs": [
384
403
  {
385
404
  "components": [
386
- {
387
- "internalType": "Version",
388
- "name": "version",
389
- "type": "uint24"
390
- },
391
405
  {
392
406
  "internalType": "address",
393
407
  "name": "implementation",
394
408
  "type": "address"
395
409
  },
396
- {
397
- "internalType": "address",
398
- "name": "activatedBy",
399
- "type": "address"
400
- },
401
410
  {
402
411
  "internalType": "Timestamp",
403
412
  "name": "activatedAt",
@@ -406,7 +415,17 @@
406
415
  {
407
416
  "internalType": "Blocknumber",
408
417
  "name": "activatedIn",
409
- "type": "uint32"
418
+ "type": "uint40"
419
+ },
420
+ {
421
+ "internalType": "Version",
422
+ "name": "version",
423
+ "type": "uint24"
424
+ },
425
+ {
426
+ "internalType": "address",
427
+ "name": "activatedBy",
428
+ "type": "address"
410
429
  }
411
430
  ],
412
431
  "internalType": "struct ProxyManager.VersionInfo",
@@ -496,6 +515,25 @@
496
515
  "stateMutability": "view",
497
516
  "type": "function"
498
517
  },
518
+ {
519
+ "inputs": [
520
+ {
521
+ "internalType": "address",
522
+ "name": "newImplementation",
523
+ "type": "address"
524
+ }
525
+ ],
526
+ "name": "upgrade",
527
+ "outputs": [
528
+ {
529
+ "internalType": "contract IVersionable",
530
+ "name": "versionable",
531
+ "type": "address"
532
+ }
533
+ ],
534
+ "stateMutability": "nonpayable",
535
+ "type": "function"
536
+ },
499
537
  {
500
538
  "inputs": [
501
539
  {
@@ -521,14 +559,22 @@
521
559
  "type": "function"
522
560
  }
523
561
  ],
524
- "bytecode": "0x6080604052348015600e575f80fd5b506125848061001c5f395ff3fe608060405234801561000f575f80fd5b5060043610610111575f3560e01c8063893d20e81161009e578063ada9652e1161006e578063ada9652e14610369578063b88da7591461037d578063c987336c14610390578063f5c1b5a7146103a3578063fd0c63d9146103b6575f80fd5b8063893d20e81461032b5780638e9afce614610333578063933a9ce814610346578063946dfcfe14610357575f80fd5b80631775564d116100e45780631775564d146101bd5780632db5b86f146101dd5780634d459c90146101f05780635ab1bd53146102fd578063644c45e01461030e575f80fd5b806301ffc9a71461011557806304499582146101565780630d8e6e2c14610181578063138461e01461019d575b5f80fd5b6101416101233660046112f1565b6001600160e01b0319165f9081526020819052604090205460ff1690565b60405190151581526020015b60405180910390f35b6101696101643660046113d5565b6103be565b6040516001600160a01b03909116815260200161014d565b610189610491565b60405162ffffff909116815260200161014d565b6101a5610501565b6040516001600160601b03909116815260200161014d565b6101d06101cb36600461143b565b61050b565b60405161014d91906114b6565b6101696101eb3660046114c8565b610563565b6102a06101fe366004611536565b6040805160a0810182525f808252602082018190529181018290526060810182905260808101919091525062ffffff9081165f90815260036020908152604091829020825160a0810184528154948516815263010000009094046001600160a01b03908116928501929092526001015490811691830191909152600160a01b810464ffffffffff166060830152600160c81b900463ffffffff16608082015290565b60408051825162ffffff1681526020808401516001600160a01b039081169183019190915283830151169181019190915260608083015164ffffffffff169082015260809182015163ffffffff169181019190915260a00161014d565b6001546001600160a01b0316610169565b5f8051602061252f833981519152546001600160601b03166101a5565b610169610630565b6101d0610341366004611551565b610761565b6002546001600160a01b0316610169565b6004545b60405190815260200161014d565b61035b5f8051602061252f83398151915281565b61018961038b36600461158b565b6107b4565b61016961039e36600461143b565b6107f2565b6101696103b13660046113d5565b610999565b6101a5610ab4565b5f6103c7610acb565b5f806103d287610b16565b915091508386826103e3858961050b565b6040516103ef906112e4565b6103fb939291906115a2565b8190604051809103905ff5905080158015610418573d5f803e3d5ffd5b50600280546001600160a01b0319166001600160a01b03929092169190911790556104438683610b58565b6040516001600160a01b038881168252919450908416907f78922e3fa1abc96399973cb25528ba892214b57da9d1a573937c460d9f5eb4759060200160405180910390a25050949350505050565b600254604080516303639b8b60e21b815290515f926001600160a01b031691630d8e6e2c9160048083019260209291908290030181865afa1580156104d8573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906104fc91906115d6565b905090565b5f6104fc30610f61565b60606349bb9e4b60e01b83836040516024016105289291906115f1565b60408051601f198184030181529190526020810180516001600160e01b03166001600160e01b03199093169290921790915290505b92915050565b5f61056c610acb565b5f8061057786610b16565b915091508481610587848761050b565b604051610593906112e4565b61059f939291906115a2565b604051809103905ff0801580156105b8573d5f803e3d5ffd5b50600280546001600160a01b0319166001600160a01b03929092169190911790556105e38583610b58565b6040516001600160a01b038781168252919450908416907f78922e3fa1abc96399973cb25528ba892214b57da9d1a573937c460d9f5eb4759060200160405180910390a250509392505050565b5f805f8051602061252f83398151915280546040516330b8415f60e01b81526001600160601b03909116600482015290915073__$94a2c899be079b00d952d0d84fffaa5c34$__906330b8415f90602401602060405180830381865af415801561069c573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906106c09190611614565b1561074b576001546001600160a01b03168154604051631c5da14d60e11b81526001600160601b0390911660048201526001600160a01b0391909116906338bb429a90602401602060405180830381865afa158015610721573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906107459190611633565b91505090565b54600160601b90046001600160a01b0316919050565b606063329d6e7460e01b8260405160240161077c91906114b6565b60408051601f198184030181529190526020810180516001600160e01b03166001600160e01b03199093169290921790915292915050565b5f600482815481106107c8576107c861164e565b905f5260205f2090600a91828204019190066003029054906101000a900462ffffff169050919050565b5f6107fb610630565b6001600160a01b0316336001600160a01b0316146108335760405163086391f760e31b81523360048201526024015b60405180910390fd5b6004545f036108555760405163366dfd2160e21b815260040160405180910390fd5b5f61085e610630565b90505f6108736002546001600160a01b031690565b6001600160a01b0316638b3240a06040518163ffffffff1660e01b81526004016020604051808303815f875af11580156108af573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906108d39190611633565b6002549091506001600160a01b03908116908216639623609d82886108f789610761565b6040518463ffffffff1660e01b8152600401610915939291906115a2565b5f604051808303815f87803b15801561092c575f80fd5b505af115801561093e573d5f803e3d5ffd5b5050505061094c8684610b58565b6040516001600160a01b038881168252919550908516907f1356a2c922be684528fa1759d1808395e5c5010181dd333cdb6f03e2d8545b659060200160405180910390a250505092915050565b7ff0c57e16840df040f15088dc2f81fe391c3923bec73e23a9662efc9c229c6a0080545f9190600160401b810460ff16159067ffffffffffffffff1683811580156109e15750825b90505f8267ffffffffffffffff1660011480156109fd5750303b155b905081158015610a0b575080155b15610a295760405163f92ee8a960e01b815260040160405180910390fd5b845467ffffffffffffffff191660011785558315610a5357845460ff60401b1916600160401b1785555b610a5f8a8a8a8a6103be565b95508315610aa757845460ff60401b19168555604051600181527fc7f505b2f371ae2175ee4913f4499e1f2633a7b5936321eed1cdaeb6115181d29060200160405180910390a15b5050505050949350505050565b6002545f906104fc906001600160a01b0316610f61565b7ff0c57e16840df040f15088dc2f81fe391c3923bec73e23a9662efc9c229c6a0054600160401b900460ff16610b1457604051631afcd79f60e31b815260040160405180910390fd5b565b6004545f90819015610b3b5760405163402b135f60e11b815260040160405180910390fd5b33610b46848261115a565b610b4e610630565b9430945092505050565b600254604080516303639b8b60e21b815290516001600160a01b03909216915f918391630d8e6e2c916004808201926020929091908290030181865afa158015610ba4573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610bc891906115d6565b9050610c468173__$8eede297b65ed5a56eb3f84d8232ae93f5$__6304b8f6c56040518163ffffffff1660e01b8152600401602060405180830381865af4158015610c15573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610c3991906115d6565b62ffffff90811691161490565b15610c64576040516348c618db60e01b815260040160405180910390fd5b60045415610dbc5760048054610c7c90600190611662565b81548110610c8c57610c8c61164e565b5f9182526020909120600a80830490910154604051635560100760e01b8152919092066003026101000a90910462ffffff16600482015273__$8eede297b65ed5a56eb3f84d8232ae93f5$__90635560100790602401602060405180830381865af4158015610cfd573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610d219190611681565b604051635560100760e01b815262ffffff8316600482015273__$8eede297b65ed5a56eb3f84d8232ae93f5$__90635560100790602401602060405180830381865af4158015610d73573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610d979190611681565b11610dbc57604051633e614b6d60e11b815262ffffff8216600482015260240161082a565b600480546001810182555f829052600a8082047f8a35acfbc15ff81a39ae7d344fd709f28e8600b4aa8c65c6b64bfe7fe36bd19b01805462ffffff808716600394909506939093026101000a848102930219169190911790556040805160a0810182529182526001600160a01b038088166020848101919091529087168383015281516356db0c1960e11b815291519293606085019373__$91d01b1eccbca8d6f94a5eb2a0acb040e9$__9363adb6183293818401939092918290030181865af4158015610e8c573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610eb09190611698565b64ffffffffff90811682524363ffffffff90811660209384015262ffffff9485165f90815260038452604090819020855181549587015197166001600160b81b03199095169490941763010000006001600160a01b0397881602178455840151600190930180546060860151608090960151949096166001600160c81b031990961695909517600160a01b94909216939093021763ffffffff60c81b1916600160c81b919092160217905592915050565b5f805f8051602061252f83398151915280546040516330b8415f60e01b81526001600160601b03909116600482015290915073__$94a2c899be079b00d952d0d84fffaa5c34$__906330b8415f90602401602060405180830381865af4158015610fcd573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610ff19190611614565b1561101d5780546040516301ab8b6760e21b81526001600160601b03909116600482015260240161082a565b6001546001600160a01b031660405163c3c5a54760e01b81526001600160a01b038581166004830152919091169063c3c5a54790602401602060405180830381865afa15801561106f573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906110939190611614565b6110bb5760405163b9304b0d60e01b81526001600160a01b038416600482015260240161082a565b6001546001600160a01b0316604051632f2a35f760e11b81526001600160a01b0385811660048301529190911690635e546bee90602401602060405180830381865afa15801561110d573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061113191906116bc565b81546bffffffffffffffffffffffff19166001600160601b039190911690811790915592915050565b611162610acb565b61116a6111d0565b61117382611218565b6001600160a01b03811661119a5760405163f17ef42d60e01b815260040160405180910390fd5b5f8051602061252f83398151915280546001600160601b0316600160601b6001600160a01b039093169290920291909117905550565b6111d8610acb565b610b146301ffc9a760e01b5f9081526020527f67be87c3ff9960ca1e9cfac5cab2ff4747269cf9ed20c9b7306235ac35a491c5805460ff19166001179055565b611220610acb565b604051633334d16b60e01b81526001600160a01b038216600482015273__$fb599632d08395912d9d70eb2f0f93b5e2$__90633334d16b90602401602060405180830381865af4158015611276573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061129a9190611614565b6112c25760405163fdeac91f60e01b81526001600160a01b038216600482015260240161082a565b600180546001600160a01b0319166001600160a01b0392909216919091179055565b610e4c806116e383390190565b5f60208284031215611301575f80fd5b81356001600160e01b031981168114611318575f80fd5b9392505050565b6001600160a01b0381168114611333575f80fd5b50565b634e487b7160e01b5f52604160045260245ffd5b5f82601f830112611359575f80fd5b813567ffffffffffffffff81111561137357611373611336565b604051601f8201601f19908116603f0116810167ffffffffffffffff811182821017156113a2576113a2611336565b6040528181528382016020018510156113b9575f80fd5b816020850160208301375f918101602001919091529392505050565b5f805f80608085870312156113e8575f80fd5b84356113f38161131f565b935060208501356114038161131f565b9250604085013567ffffffffffffffff81111561141e575f80fd5b61142a8782880161134a565b949793965093946060013593505050565b5f806040838503121561144c575f80fd5b82356114578161131f565b9150602083013567ffffffffffffffff811115611472575f80fd5b61147e8582860161134a565b9150509250929050565b5f81518084528060208401602086015e5f602082860101526020601f19601f83011685010191505092915050565b602081525f6113186020830184611488565b5f805f606084860312156114da575f80fd5b83356114e58161131f565b925060208401356114f58161131f565b9150604084013567ffffffffffffffff811115611510575f80fd5b61151c8682870161134a565b9150509250925092565b62ffffff81168114611333575f80fd5b5f60208284031215611546575f80fd5b813561131881611526565b5f60208284031215611561575f80fd5b813567ffffffffffffffff811115611577575f80fd5b6115838482850161134a565b949350505050565b5f6020828403121561159b575f80fd5b5035919050565b6001600160a01b038481168252831660208201526060604082018190525f906115cd90830184611488565b95945050505050565b5f602082840312156115e6575f80fd5b815161131881611526565b6001600160a01b03831681526040602082018190525f9061158390830184611488565b5f60208284031215611624575f80fd5b81518015158114611318575f80fd5b5f60208284031215611643575f80fd5b81516113188161131f565b634e487b7160e01b5f52603260045260245ffd5b8181038181111561055d57634e487b7160e01b5f52601160045260245ffd5b5f60208284031215611691575f80fd5b5051919050565b5f602082840312156116a8575f80fd5b815164ffffffffff81168114611318575f80fd5b5f602082840312156116cc575f80fd5b81516001600160601b0381168114611318575f80fdfe60a060405234801561000f575f80fd5b50604051610e4c380380610e4c83398101604081905261002e9161037c565b828282828161003d828261009e565b50508160405161004c90610340565b6001600160a01b039091168152602001604051809103905ff080158015610075573d5f803e3d5ffd5b506001600160a01b031660805261009361008e60805190565b6100fc565b505050505050610463565b6100a782610169565b6040516001600160a01b038316907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b905f90a28051156100f0576100eb82826101e7565b505050565b6100f861025a565b5050565b7f7e644d79422f17c01e4894b5f4f588d331ebfa28653d42ae832dc59e38c9798f61013b5f80516020610e2c833981519152546001600160a01b031690565b604080516001600160a01b03928316815291841660208301520160405180910390a16101668161027b565b50565b806001600160a01b03163b5f036101a357604051634c9c8ce360e01b81526001600160a01b03821660048201526024015b60405180910390fd5b807f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc5b80546001600160a01b0319166001600160a01b039290921691909117905550565b60605f80846001600160a01b031684604051610203919061044d565b5f60405180830381855af49150503d805f811461023b576040519150601f19603f3d011682016040523d82523d5f602084013e610240565b606091505b5090925090506102518583836102b8565b95945050505050565b34156102795760405163b398979f60e01b815260040160405180910390fd5b565b6001600160a01b0381166102a457604051633173bdd160e11b81525f600482015260240161019a565b805f80516020610e2c8339815191526101c6565b6060826102cd576102c882610317565b610310565b81511580156102e457506001600160a01b0384163b155b1561030d57604051639996b31560e01b81526001600160a01b038516600482015260240161019a565b50805b9392505050565b8051156103275780518082602001fd5b604051630a12f52160e11b815260040160405180910390fd5b6104ef8061093d83390190565b80516001600160a01b0381168114610363575f80fd5b919050565b634e487b7160e01b5f52604160045260245ffd5b5f805f6060848603121561038e575f80fd5b6103978461034d565b92506103a56020850161034d565b60408501519092506001600160401b038111156103c0575f80fd5b8401601f810186136103d0575f80fd5b80516001600160401b038111156103e9576103e9610368565b604051601f8201601f19908116603f011681016001600160401b038111828210171561041757610417610368565b60405281815282820160200188101561042e575f80fd5b8160208401602083015e5f602083830101528093505050509250925092565b5f82518060208501845e5f920191825250919050565b6080516104bd6104805f395f818160350152607201526104bd5ff3fe60806040526004361061001d575f3560e01c80638b3240a014610027575b610025610070565b005b348015610032575f80fd5b507f00000000000000000000000000000000000000000000000000000000000000006040516001600160a01b03909116815260200160405180910390f35b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031633036100dc575f356001600160e01b03191663278f794360e11b146100d2576040516334ad5dbb60e21b815260040160405180910390fd5b6100da6100e9565b565b6100da610117565b905090565b5f806100f83660048184610365565b81019061010591906103a0565b915091506101138282610127565b5050565b6100da610122610181565b6101b3565b610130826101d1565b6040516001600160a01b038316907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b905f90a280511561017957610174828261024c565b505050565b6101136102be565b5f6100e47f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc546001600160a01b031690565b365f80375f80365f845af43d5f803e8080156101cd573d5ff35b3d5ffd5b806001600160a01b03163b5f0361020b57604051634c9c8ce360e01b81526001600160a01b03821660048201526024015b60405180910390fd5b7f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc80546001600160a01b0319166001600160a01b0392909216919091179055565b60605f80846001600160a01b0316846040516102689190610471565b5f60405180830381855af49150503d805f81146102a0576040519150601f19603f3d011682016040523d82523d5f602084013e6102a5565b606091505b50915091506102b58583836102dd565b95945050505050565b34156100da5760405163b398979f60e01b815260040160405180910390fd5b6060826102f2576102ed8261033c565b610335565b815115801561030957506001600160a01b0384163b155b1561033257604051639996b31560e01b81526001600160a01b0385166004820152602401610202565b50805b9392505050565b80511561034c5780518082602001fd5b604051630a12f52160e11b815260040160405180910390fd5b5f8085851115610373575f80fd5b8386111561037f575f80fd5b5050820193919092039150565b634e487b7160e01b5f52604160045260245ffd5b5f80604083850312156103b1575f80fd5b82356001600160a01b03811681146103c7575f80fd5b9150602083013567ffffffffffffffff8111156103e2575f80fd5b8301601f810185136103f2575f80fd5b803567ffffffffffffffff81111561040c5761040c61038c565b604051601f8201601f19908116603f0116810167ffffffffffffffff8111828210171561043b5761043b61038c565b604052818152828201602001871015610452575f80fd5b816020840160208301375f602083830101528093505050509250929050565b5f82518060208501845e5f92019182525091905056fea26469706673582212205f12e4d638be8d591db7c67d942f3e9eeb14e9e44f78ba8cddaca37631bdc49764736f6c634300081a0033608060405234801561000f575f80fd5b506040516104ef3803806104ef83398101604081905261002e916100bb565b806001600160a01b03811661005c57604051631e4fbdf760e01b81525f600482015260240160405180910390fd5b6100658161006c565b50506100e8565b5f80546001600160a01b038381166001600160a01b0319831681178455604051919092169283917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e09190a35050565b5f602082840312156100cb575f80fd5b81516001600160a01b03811681146100e1575f80fd5b9392505050565b6103fa806100f55f395ff3fe608060405260043610610049575f3560e01c8063715018a61461004d5780638da5cb5b146100635780639623609d1461008e578063ad3cb1cc146100a1578063f2fde38b146100de575b5f80fd5b348015610058575f80fd5b506100616100fd565b005b34801561006e575f80fd5b505f546040516001600160a01b0390911681526020015b60405180910390f35b61006161009c366004610260565b610110565b3480156100ac575f80fd5b506100d1604051806040016040528060058152602001640352e302e360dc1b81525081565b6040516100859190610365565b3480156100e9575f80fd5b506100616100f836600461037e565b61017b565b6101056101bd565b61010e5f6101e9565b565b6101186101bd565b60405163278f794360e11b81526001600160a01b03841690634f1ef2869034906101489086908690600401610399565b5f604051808303818588803b15801561015f575f80fd5b505af1158015610171573d5f803e3d5ffd5b5050505050505050565b6101836101bd565b6001600160a01b0381166101b157604051631e4fbdf760e01b81525f60048201526024015b60405180910390fd5b6101ba816101e9565b50565b5f546001600160a01b0316331461010e5760405163118cdaa760e01b81523360048201526024016101a8565b5f80546001600160a01b038381166001600160a01b0319831681178455604051919092169283917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e09190a35050565b6001600160a01b03811681146101ba575f80fd5b634e487b7160e01b5f52604160045260245ffd5b5f805f60608486031215610272575f80fd5b833561027d81610238565b9250602084013561028d81610238565b9150604084013567ffffffffffffffff8111156102a8575f80fd5b8401601f810186136102b8575f80fd5b803567ffffffffffffffff8111156102d2576102d261024c565b604051601f8201601f19908116603f0116810167ffffffffffffffff811182821017156103015761030161024c565b604052818152828201602001881015610318575f80fd5b816020840160208301375f602083830101528093505050509250925092565b5f81518084528060208401602086015e5f602082860101526020601f19601f83011685010191505092915050565b602081525f6103776020830184610337565b9392505050565b5f6020828403121561038e575f80fd5b813561037781610238565b6001600160a01b03831681526040602082018190525f906103bc90830184610337565b94935050505056fea264697066735822122063012ab3c3421087c307802be7295f03bec95db9eea702a4c2db9595befa162464736f6c634300081a0033b53127684a568b3173ae13b9f8a6016e243e63b6e8ee1178d6a717850b5d610307ebcf49758b6ed3af50fa146bec0abe157c0218fe65dc0874c286e9d5da4f00a26469706673582212205d3d661bab694bb9485c3e679271ee2c7689828e0846c6011e16e3b0ec0cebca64736f6c634300081a0033",
525
- "deployedBytecode": "0x608060405234801561000f575f80fd5b5060043610610111575f3560e01c8063893d20e81161009e578063ada9652e1161006e578063ada9652e14610369578063b88da7591461037d578063c987336c14610390578063f5c1b5a7146103a3578063fd0c63d9146103b6575f80fd5b8063893d20e81461032b5780638e9afce614610333578063933a9ce814610346578063946dfcfe14610357575f80fd5b80631775564d116100e45780631775564d146101bd5780632db5b86f146101dd5780634d459c90146101f05780635ab1bd53146102fd578063644c45e01461030e575f80fd5b806301ffc9a71461011557806304499582146101565780630d8e6e2c14610181578063138461e01461019d575b5f80fd5b6101416101233660046112f1565b6001600160e01b0319165f9081526020819052604090205460ff1690565b60405190151581526020015b60405180910390f35b6101696101643660046113d5565b6103be565b6040516001600160a01b03909116815260200161014d565b610189610491565b60405162ffffff909116815260200161014d565b6101a5610501565b6040516001600160601b03909116815260200161014d565b6101d06101cb36600461143b565b61050b565b60405161014d91906114b6565b6101696101eb3660046114c8565b610563565b6102a06101fe366004611536565b6040805160a0810182525f808252602082018190529181018290526060810182905260808101919091525062ffffff9081165f90815260036020908152604091829020825160a0810184528154948516815263010000009094046001600160a01b03908116928501929092526001015490811691830191909152600160a01b810464ffffffffff166060830152600160c81b900463ffffffff16608082015290565b60408051825162ffffff1681526020808401516001600160a01b039081169183019190915283830151169181019190915260608083015164ffffffffff169082015260809182015163ffffffff169181019190915260a00161014d565b6001546001600160a01b0316610169565b5f8051602061252f833981519152546001600160601b03166101a5565b610169610630565b6101d0610341366004611551565b610761565b6002546001600160a01b0316610169565b6004545b60405190815260200161014d565b61035b5f8051602061252f83398151915281565b61018961038b36600461158b565b6107b4565b61016961039e36600461143b565b6107f2565b6101696103b13660046113d5565b610999565b6101a5610ab4565b5f6103c7610acb565b5f806103d287610b16565b915091508386826103e3858961050b565b6040516103ef906112e4565b6103fb939291906115a2565b8190604051809103905ff5905080158015610418573d5f803e3d5ffd5b50600280546001600160a01b0319166001600160a01b03929092169190911790556104438683610b58565b6040516001600160a01b038881168252919450908416907f78922e3fa1abc96399973cb25528ba892214b57da9d1a573937c460d9f5eb4759060200160405180910390a25050949350505050565b600254604080516303639b8b60e21b815290515f926001600160a01b031691630d8e6e2c9160048083019260209291908290030181865afa1580156104d8573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906104fc91906115d6565b905090565b5f6104fc30610f61565b60606349bb9e4b60e01b83836040516024016105289291906115f1565b60408051601f198184030181529190526020810180516001600160e01b03166001600160e01b03199093169290921790915290505b92915050565b5f61056c610acb565b5f8061057786610b16565b915091508481610587848761050b565b604051610593906112e4565b61059f939291906115a2565b604051809103905ff0801580156105b8573d5f803e3d5ffd5b50600280546001600160a01b0319166001600160a01b03929092169190911790556105e38583610b58565b6040516001600160a01b038781168252919450908416907f78922e3fa1abc96399973cb25528ba892214b57da9d1a573937c460d9f5eb4759060200160405180910390a250509392505050565b5f805f8051602061252f83398151915280546040516330b8415f60e01b81526001600160601b03909116600482015290915073__$94a2c899be079b00d952d0d84fffaa5c34$__906330b8415f90602401602060405180830381865af415801561069c573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906106c09190611614565b1561074b576001546001600160a01b03168154604051631c5da14d60e11b81526001600160601b0390911660048201526001600160a01b0391909116906338bb429a90602401602060405180830381865afa158015610721573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906107459190611633565b91505090565b54600160601b90046001600160a01b0316919050565b606063329d6e7460e01b8260405160240161077c91906114b6565b60408051601f198184030181529190526020810180516001600160e01b03166001600160e01b03199093169290921790915292915050565b5f600482815481106107c8576107c861164e565b905f5260205f2090600a91828204019190066003029054906101000a900462ffffff169050919050565b5f6107fb610630565b6001600160a01b0316336001600160a01b0316146108335760405163086391f760e31b81523360048201526024015b60405180910390fd5b6004545f036108555760405163366dfd2160e21b815260040160405180910390fd5b5f61085e610630565b90505f6108736002546001600160a01b031690565b6001600160a01b0316638b3240a06040518163ffffffff1660e01b81526004016020604051808303815f875af11580156108af573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906108d39190611633565b6002549091506001600160a01b03908116908216639623609d82886108f789610761565b6040518463ffffffff1660e01b8152600401610915939291906115a2565b5f604051808303815f87803b15801561092c575f80fd5b505af115801561093e573d5f803e3d5ffd5b5050505061094c8684610b58565b6040516001600160a01b038881168252919550908516907f1356a2c922be684528fa1759d1808395e5c5010181dd333cdb6f03e2d8545b659060200160405180910390a250505092915050565b7ff0c57e16840df040f15088dc2f81fe391c3923bec73e23a9662efc9c229c6a0080545f9190600160401b810460ff16159067ffffffffffffffff1683811580156109e15750825b90505f8267ffffffffffffffff1660011480156109fd5750303b155b905081158015610a0b575080155b15610a295760405163f92ee8a960e01b815260040160405180910390fd5b845467ffffffffffffffff191660011785558315610a5357845460ff60401b1916600160401b1785555b610a5f8a8a8a8a6103be565b95508315610aa757845460ff60401b19168555604051600181527fc7f505b2f371ae2175ee4913f4499e1f2633a7b5936321eed1cdaeb6115181d29060200160405180910390a15b5050505050949350505050565b6002545f906104fc906001600160a01b0316610f61565b7ff0c57e16840df040f15088dc2f81fe391c3923bec73e23a9662efc9c229c6a0054600160401b900460ff16610b1457604051631afcd79f60e31b815260040160405180910390fd5b565b6004545f90819015610b3b5760405163402b135f60e11b815260040160405180910390fd5b33610b46848261115a565b610b4e610630565b9430945092505050565b600254604080516303639b8b60e21b815290516001600160a01b03909216915f918391630d8e6e2c916004808201926020929091908290030181865afa158015610ba4573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610bc891906115d6565b9050610c468173__$8eede297b65ed5a56eb3f84d8232ae93f5$__6304b8f6c56040518163ffffffff1660e01b8152600401602060405180830381865af4158015610c15573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610c3991906115d6565b62ffffff90811691161490565b15610c64576040516348c618db60e01b815260040160405180910390fd5b60045415610dbc5760048054610c7c90600190611662565b81548110610c8c57610c8c61164e565b5f9182526020909120600a80830490910154604051635560100760e01b8152919092066003026101000a90910462ffffff16600482015273__$8eede297b65ed5a56eb3f84d8232ae93f5$__90635560100790602401602060405180830381865af4158015610cfd573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610d219190611681565b604051635560100760e01b815262ffffff8316600482015273__$8eede297b65ed5a56eb3f84d8232ae93f5$__90635560100790602401602060405180830381865af4158015610d73573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610d979190611681565b11610dbc57604051633e614b6d60e11b815262ffffff8216600482015260240161082a565b600480546001810182555f829052600a8082047f8a35acfbc15ff81a39ae7d344fd709f28e8600b4aa8c65c6b64bfe7fe36bd19b01805462ffffff808716600394909506939093026101000a848102930219169190911790556040805160a0810182529182526001600160a01b038088166020848101919091529087168383015281516356db0c1960e11b815291519293606085019373__$91d01b1eccbca8d6f94a5eb2a0acb040e9$__9363adb6183293818401939092918290030181865af4158015610e8c573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610eb09190611698565b64ffffffffff90811682524363ffffffff90811660209384015262ffffff9485165f90815260038452604090819020855181549587015197166001600160b81b03199095169490941763010000006001600160a01b0397881602178455840151600190930180546060860151608090960151949096166001600160c81b031990961695909517600160a01b94909216939093021763ffffffff60c81b1916600160c81b919092160217905592915050565b5f805f8051602061252f83398151915280546040516330b8415f60e01b81526001600160601b03909116600482015290915073__$94a2c899be079b00d952d0d84fffaa5c34$__906330b8415f90602401602060405180830381865af4158015610fcd573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610ff19190611614565b1561101d5780546040516301ab8b6760e21b81526001600160601b03909116600482015260240161082a565b6001546001600160a01b031660405163c3c5a54760e01b81526001600160a01b038581166004830152919091169063c3c5a54790602401602060405180830381865afa15801561106f573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906110939190611614565b6110bb5760405163b9304b0d60e01b81526001600160a01b038416600482015260240161082a565b6001546001600160a01b0316604051632f2a35f760e11b81526001600160a01b0385811660048301529190911690635e546bee90602401602060405180830381865afa15801561110d573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061113191906116bc565b81546bffffffffffffffffffffffff19166001600160601b039190911690811790915592915050565b611162610acb565b61116a6111d0565b61117382611218565b6001600160a01b03811661119a5760405163f17ef42d60e01b815260040160405180910390fd5b5f8051602061252f83398151915280546001600160601b0316600160601b6001600160a01b039093169290920291909117905550565b6111d8610acb565b610b146301ffc9a760e01b5f9081526020527f67be87c3ff9960ca1e9cfac5cab2ff4747269cf9ed20c9b7306235ac35a491c5805460ff19166001179055565b611220610acb565b604051633334d16b60e01b81526001600160a01b038216600482015273__$fb599632d08395912d9d70eb2f0f93b5e2$__90633334d16b90602401602060405180830381865af4158015611276573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061129a9190611614565b6112c25760405163fdeac91f60e01b81526001600160a01b038216600482015260240161082a565b600180546001600160a01b0319166001600160a01b0392909216919091179055565b610e4c806116e383390190565b5f60208284031215611301575f80fd5b81356001600160e01b031981168114611318575f80fd5b9392505050565b6001600160a01b0381168114611333575f80fd5b50565b634e487b7160e01b5f52604160045260245ffd5b5f82601f830112611359575f80fd5b813567ffffffffffffffff81111561137357611373611336565b604051601f8201601f19908116603f0116810167ffffffffffffffff811182821017156113a2576113a2611336565b6040528181528382016020018510156113b9575f80fd5b816020850160208301375f918101602001919091529392505050565b5f805f80608085870312156113e8575f80fd5b84356113f38161131f565b935060208501356114038161131f565b9250604085013567ffffffffffffffff81111561141e575f80fd5b61142a8782880161134a565b949793965093946060013593505050565b5f806040838503121561144c575f80fd5b82356114578161131f565b9150602083013567ffffffffffffffff811115611472575f80fd5b61147e8582860161134a565b9150509250929050565b5f81518084528060208401602086015e5f602082860101526020601f19601f83011685010191505092915050565b602081525f6113186020830184611488565b5f805f606084860312156114da575f80fd5b83356114e58161131f565b925060208401356114f58161131f565b9150604084013567ffffffffffffffff811115611510575f80fd5b61151c8682870161134a565b9150509250925092565b62ffffff81168114611333575f80fd5b5f60208284031215611546575f80fd5b813561131881611526565b5f60208284031215611561575f80fd5b813567ffffffffffffffff811115611577575f80fd5b6115838482850161134a565b949350505050565b5f6020828403121561159b575f80fd5b5035919050565b6001600160a01b038481168252831660208201526060604082018190525f906115cd90830184611488565b95945050505050565b5f602082840312156115e6575f80fd5b815161131881611526565b6001600160a01b03831681526040602082018190525f9061158390830184611488565b5f60208284031215611624575f80fd5b81518015158114611318575f80fd5b5f60208284031215611643575f80fd5b81516113188161131f565b634e487b7160e01b5f52603260045260245ffd5b8181038181111561055d57634e487b7160e01b5f52601160045260245ffd5b5f60208284031215611691575f80fd5b5051919050565b5f602082840312156116a8575f80fd5b815164ffffffffff81168114611318575f80fd5b5f602082840312156116cc575f80fd5b81516001600160601b0381168114611318575f80fdfe60a060405234801561000f575f80fd5b50604051610e4c380380610e4c83398101604081905261002e9161037c565b828282828161003d828261009e565b50508160405161004c90610340565b6001600160a01b039091168152602001604051809103905ff080158015610075573d5f803e3d5ffd5b506001600160a01b031660805261009361008e60805190565b6100fc565b505050505050610463565b6100a782610169565b6040516001600160a01b038316907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b905f90a28051156100f0576100eb82826101e7565b505050565b6100f861025a565b5050565b7f7e644d79422f17c01e4894b5f4f588d331ebfa28653d42ae832dc59e38c9798f61013b5f80516020610e2c833981519152546001600160a01b031690565b604080516001600160a01b03928316815291841660208301520160405180910390a16101668161027b565b50565b806001600160a01b03163b5f036101a357604051634c9c8ce360e01b81526001600160a01b03821660048201526024015b60405180910390fd5b807f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc5b80546001600160a01b0319166001600160a01b039290921691909117905550565b60605f80846001600160a01b031684604051610203919061044d565b5f60405180830381855af49150503d805f811461023b576040519150601f19603f3d011682016040523d82523d5f602084013e610240565b606091505b5090925090506102518583836102b8565b95945050505050565b34156102795760405163b398979f60e01b815260040160405180910390fd5b565b6001600160a01b0381166102a457604051633173bdd160e11b81525f600482015260240161019a565b805f80516020610e2c8339815191526101c6565b6060826102cd576102c882610317565b610310565b81511580156102e457506001600160a01b0384163b155b1561030d57604051639996b31560e01b81526001600160a01b038516600482015260240161019a565b50805b9392505050565b8051156103275780518082602001fd5b604051630a12f52160e11b815260040160405180910390fd5b6104ef8061093d83390190565b80516001600160a01b0381168114610363575f80fd5b919050565b634e487b7160e01b5f52604160045260245ffd5b5f805f6060848603121561038e575f80fd5b6103978461034d565b92506103a56020850161034d565b60408501519092506001600160401b038111156103c0575f80fd5b8401601f810186136103d0575f80fd5b80516001600160401b038111156103e9576103e9610368565b604051601f8201601f19908116603f011681016001600160401b038111828210171561041757610417610368565b60405281815282820160200188101561042e575f80fd5b8160208401602083015e5f602083830101528093505050509250925092565b5f82518060208501845e5f920191825250919050565b6080516104bd6104805f395f818160350152607201526104bd5ff3fe60806040526004361061001d575f3560e01c80638b3240a014610027575b610025610070565b005b348015610032575f80fd5b507f00000000000000000000000000000000000000000000000000000000000000006040516001600160a01b03909116815260200160405180910390f35b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031633036100dc575f356001600160e01b03191663278f794360e11b146100d2576040516334ad5dbb60e21b815260040160405180910390fd5b6100da6100e9565b565b6100da610117565b905090565b5f806100f83660048184610365565b81019061010591906103a0565b915091506101138282610127565b5050565b6100da610122610181565b6101b3565b610130826101d1565b6040516001600160a01b038316907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b905f90a280511561017957610174828261024c565b505050565b6101136102be565b5f6100e47f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc546001600160a01b031690565b365f80375f80365f845af43d5f803e8080156101cd573d5ff35b3d5ffd5b806001600160a01b03163b5f0361020b57604051634c9c8ce360e01b81526001600160a01b03821660048201526024015b60405180910390fd5b7f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc80546001600160a01b0319166001600160a01b0392909216919091179055565b60605f80846001600160a01b0316846040516102689190610471565b5f60405180830381855af49150503d805f81146102a0576040519150601f19603f3d011682016040523d82523d5f602084013e6102a5565b606091505b50915091506102b58583836102dd565b95945050505050565b34156100da5760405163b398979f60e01b815260040160405180910390fd5b6060826102f2576102ed8261033c565b610335565b815115801561030957506001600160a01b0384163b155b1561033257604051639996b31560e01b81526001600160a01b0385166004820152602401610202565b50805b9392505050565b80511561034c5780518082602001fd5b604051630a12f52160e11b815260040160405180910390fd5b5f8085851115610373575f80fd5b8386111561037f575f80fd5b5050820193919092039150565b634e487b7160e01b5f52604160045260245ffd5b5f80604083850312156103b1575f80fd5b82356001600160a01b03811681146103c7575f80fd5b9150602083013567ffffffffffffffff8111156103e2575f80fd5b8301601f810185136103f2575f80fd5b803567ffffffffffffffff81111561040c5761040c61038c565b604051601f8201601f19908116603f0116810167ffffffffffffffff8111828210171561043b5761043b61038c565b604052818152828201602001871015610452575f80fd5b816020840160208301375f602083830101528093505050509250929050565b5f82518060208501845e5f92019182525091905056fea26469706673582212205f12e4d638be8d591db7c67d942f3e9eeb14e9e44f78ba8cddaca37631bdc49764736f6c634300081a0033608060405234801561000f575f80fd5b506040516104ef3803806104ef83398101604081905261002e916100bb565b806001600160a01b03811661005c57604051631e4fbdf760e01b81525f600482015260240160405180910390fd5b6100658161006c565b50506100e8565b5f80546001600160a01b038381166001600160a01b0319831681178455604051919092169283917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e09190a35050565b5f602082840312156100cb575f80fd5b81516001600160a01b03811681146100e1575f80fd5b9392505050565b6103fa806100f55f395ff3fe608060405260043610610049575f3560e01c8063715018a61461004d5780638da5cb5b146100635780639623609d1461008e578063ad3cb1cc146100a1578063f2fde38b146100de575b5f80fd5b348015610058575f80fd5b506100616100fd565b005b34801561006e575f80fd5b505f546040516001600160a01b0390911681526020015b60405180910390f35b61006161009c366004610260565b610110565b3480156100ac575f80fd5b506100d1604051806040016040528060058152602001640352e302e360dc1b81525081565b6040516100859190610365565b3480156100e9575f80fd5b506100616100f836600461037e565b61017b565b6101056101bd565b61010e5f6101e9565b565b6101186101bd565b60405163278f794360e11b81526001600160a01b03841690634f1ef2869034906101489086908690600401610399565b5f604051808303818588803b15801561015f575f80fd5b505af1158015610171573d5f803e3d5ffd5b5050505050505050565b6101836101bd565b6001600160a01b0381166101b157604051631e4fbdf760e01b81525f60048201526024015b60405180910390fd5b6101ba816101e9565b50565b5f546001600160a01b0316331461010e5760405163118cdaa760e01b81523360048201526024016101a8565b5f80546001600160a01b038381166001600160a01b0319831681178455604051919092169283917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e09190a35050565b6001600160a01b03811681146101ba575f80fd5b634e487b7160e01b5f52604160045260245ffd5b5f805f60608486031215610272575f80fd5b833561027d81610238565b9250602084013561028d81610238565b9150604084013567ffffffffffffffff8111156102a8575f80fd5b8401601f810186136102b8575f80fd5b803567ffffffffffffffff8111156102d2576102d261024c565b604051601f8201601f19908116603f0116810167ffffffffffffffff811182821017156103015761030161024c565b604052818152828201602001881015610318575f80fd5b816020840160208301375f602083830101528093505050509250925092565b5f81518084528060208401602086015e5f602082860101526020601f19601f83011685010191505092915050565b602081525f6103776020830184610337565b9392505050565b5f6020828403121561038e575f80fd5b813561037781610238565b6001600160a01b03831681526040602082018190525f906103bc90830184610337565b94935050505056fea264697066735822122063012ab3c3421087c307802be7295f03bec95db9eea702a4c2db9595befa162464736f6c634300081a0033b53127684a568b3173ae13b9f8a6016e243e63b6e8ee1178d6a717850b5d610307ebcf49758b6ed3af50fa146bec0abe157c0218fe65dc0874c286e9d5da4f00a26469706673582212205d3d661bab694bb9485c3e679271ee2c7689828e0846c6011e16e3b0ec0cebca64736f6c634300081a0033",
562
+ "bytecode": "0x6080604052348015600e575f80fd5b506129418061001c5f395ff3fe608060405234801561000f575f80fd5b506004361061011c575f3560e01c8063644c45e0116100a9578063ada9652e1161006e578063ada9652e14610386578063b88da7591461039a578063c987336c146103ad578063f5c1b5a7146103c0578063fd0c63d9146103d3575f80fd5b8063644c45e01461032b578063893d20e8146103485780638e9afce614610350578063933a9ce814610363578063946dfcfe14610374575f80fd5b8063138461e0116100ef578063138461e0146101bb5780631775564d146101db5780632db5b86f146101fb5780634d459c901461020e5780635ab1bd531461031a575f80fd5b806301ffc9a71461012057806304499582146101615780630900f0101461018c5780630d8e6e2c1461019f575b5f80fd5b61014c61012e36600461141b565b6001600160e01b0319165f9081526020819052604090205460ff1690565b60405190151581526020015b60405180910390f35b61017461016f3660046114f8565b6103db565b6040516001600160a01b039091168152602001610158565b61017461019a36600461155e565b6104ae565b6101a7610502565b60405162ffffff9091168152602001610158565b6101c3610572565b6040516001600160601b039091168152602001610158565b6101ee6101e9366004611579565b61057c565b60405161015891906115f4565b610174610209366004611606565b6105d4565b6102bd61021c366004611674565b6040805160a0810182525f808252602082018190529181018290526060810182905260808101919091525062ffffff9081165f90815260036020908152604091829020825160a08101845281546001600160a01b03808216835264ffffffffff600160a01b8304811695840195909552600160c81b909104909316938101939093526001015492831660608301526301000000909204909116608082015290565b604051610158919081516001600160a01b03908116825260208084015164ffffffffff908116918401919091526040808501519091169083015260608084015162ffffff1690830152608092830151169181019190915260a00190565b6001546001600160a01b0316610174565b5f805160206128ec833981519152546001600160601b03166101c3565b6101746106a1565b6101ee61035e36600461168f565b6107d2565b6002546001600160a01b0316610174565b6004545b604051908152602001610158565b6103785f805160206128ec83398151915281565b6101a76103a83660046116c9565b610825565b6101746103bb366004611579565b610863565b6101746103ce3660046114f8565b610a05565b6101c3610b20565b5f6103e4610b37565b5f806103ef87610b82565b91509150838682610400858961057c565b60405161040c9061140e565b610418939291906116e0565b8190604051809103905ff5905080158015610435573d5f803e3d5ffd5b50600280546001600160a01b0319166001600160a01b03929092169190911790556104608683610bc4565b6040516001600160a01b038881168252919450908416907f78922e3fa1abc96399973cb25528ba892214b57da9d1a573937c460d9f5eb4759060200160405180910390a25050949350505050565b5f6104b76106a1565b6001600160a01b0316336001600160a01b0316146104ef5760405163086391f760e31b81523360048201526024015b60405180910390fd5b60606104fb8382610863565b9392505050565b600254604080516303639b8b60e21b815290515f926001600160a01b031691630d8e6e2c9160048083019260209291908290030181865afa158015610549573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061056d9190611714565b905090565b5f61056d3061102e565b60606349bb9e4b60e01b838360405160240161059992919061172f565b60408051601f198184030181529190526020810180516001600160e01b03166001600160e01b03199093169290921790915290505b92915050565b5f6105dd610b37565b5f806105e886610b82565b9150915084816105f8848761057c565b6040516106049061140e565b610610939291906116e0565b604051809103905ff080158015610629573d5f803e3d5ffd5b50600280546001600160a01b0319166001600160a01b03929092169190911790556106548583610bc4565b6040516001600160a01b038781168252919450908416907f78922e3fa1abc96399973cb25528ba892214b57da9d1a573937c460d9f5eb4759060200160405180910390a250509392505050565b5f805f805160206128ec83398151915280546040516330b8415f60e01b81526001600160601b03909116600482015290915073__$94a2c899be079b00d952d0d84fffaa5c34$__906330b8415f90602401602060405180830381865af415801561070d573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906107319190611752565b156107bc576001546001600160a01b03168154604051631c5da14d60e11b81526001600160601b0390911660048201526001600160a01b0391909116906338bb429a90602401602060405180830381865afa158015610792573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906107b69190611771565b91505090565b54600160601b90046001600160a01b0316919050565b606063329d6e7460e01b826040516024016107ed91906115f4565b60408051601f198184030181529190526020810180516001600160e01b03166001600160e01b03199093169290921790915292915050565b5f600482815481106108395761083961178c565b905f5260205f2090600a91828204019190066003029054906101000a900462ffffff169050919050565b5f61086c6106a1565b6001600160a01b0316336001600160a01b03161461089f5760405163086391f760e31b81523360048201526024016104e6565b6004545f036108c15760405163366dfd2160e21b815260040160405180910390fd5b5f6108ca6106a1565b90505f6108df6002546001600160a01b031690565b6001600160a01b0316638b3240a06040518163ffffffff1660e01b81526004016020604051808303815f875af115801561091b573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061093f9190611771565b6002549091506001600160a01b03908116908216639623609d8288610963896107d2565b6040518463ffffffff1660e01b8152600401610981939291906116e0565b5f604051808303815f87803b158015610998575f80fd5b505af11580156109aa573d5f803e3d5ffd5b505050506109b88684610bc4565b6040516001600160a01b038881168252919550908516907f1356a2c922be684528fa1759d1808395e5c5010181dd333cdb6f03e2d8545b659060200160405180910390a250505092915050565b7ff0c57e16840df040f15088dc2f81fe391c3923bec73e23a9662efc9c229c6a0080545f9190600160401b810460ff16159067ffffffffffffffff168381158015610a4d5750825b90505f8267ffffffffffffffff166001148015610a695750303b155b905081158015610a77575080155b15610a955760405163f92ee8a960e01b815260040160405180910390fd5b845467ffffffffffffffff191660011785558315610abf57845460ff60401b1916600160401b1785555b610acb8a8a8a8a6103db565b95508315610b1357845460ff60401b19168555604051600181527fc7f505b2f371ae2175ee4913f4499e1f2633a7b5936321eed1cdaeb6115181d29060200160405180910390a15b5050505050949350505050565b6002545f9061056d906001600160a01b031661102e565b7ff0c57e16840df040f15088dc2f81fe391c3923bec73e23a9662efc9c229c6a0054600160401b900460ff16610b8057604051631afcd79f60e31b815260040160405180910390fd5b565b6004545f90819015610ba75760405163402b135f60e11b815260040160405180910390fd5b33610bb28482611284565b610bba6106a1565b9430945092505050565b600254604080516303639b8b60e21b815290516001600160a01b03909216915f918391630d8e6e2c916004808201926020929091908290030181865afa158015610c10573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610c349190611714565b9050610cb28173__$8eede297b65ed5a56eb3f84d8232ae93f5$__6304b8f6c56040518163ffffffff1660e01b8152600401602060405180830381865af4158015610c81573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610ca59190611714565b62ffffff90811691161490565b15610cd0576040516348c618db60e01b815260040160405180910390fd5b60045415610e285760048054610ce8906001906117a0565b81548110610cf857610cf861178c565b5f9182526020909120600a80830490910154604051635560100760e01b8152919092066003026101000a90910462ffffff16600482015273__$8eede297b65ed5a56eb3f84d8232ae93f5$__90635560100790602401602060405180830381865af4158015610d69573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610d8d91906117bf565b604051635560100760e01b815262ffffff8316600482015273__$8eede297b65ed5a56eb3f84d8232ae93f5$__90635560100790602401602060405180830381865af4158015610ddf573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610e0391906117bf565b11610e2857604051633e614b6d60e11b815262ffffff821660048201526024016104e6565b600480546001810182555f8290527f8a35acfbc15ff81a39ae7d344fd709f28e8600b4aa8c65c6b64bfe7fe36bd19b600a808304919091018054919092066003026101000a62ffffff81810219909216918516021790556040805160a0810182526001600160a01b03871681528151639fa6a6e360e01b81529151909260208085019373__$91d01b1eccbca8d6f94a5eb2a0acb040e9$__93639fa6a6e39382810193928290030181865af4158015610ee3573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610f0791906117e8565b64ffffffffff16815260200173__$f55ca14f1ddce1b88fe30d23ae45f595f4$__639fa6a6e36040518163ffffffff1660e01b8152600401602060405180830381865af4158015610f5a573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610f7e91906117e8565b64ffffffffff908116825262ffffff93841660208084018290526001600160a01b039788166040948501525f91825260038152908390208451815492860151948601518416600160c81b0264ffffffffff60c81b1995909416600160a01b026001600160c81b03199093169089161791909117929092161781556060820151600190910180546080909301519095166301000000026001600160b81b031990921692169190911717909155919050565b5f805f805160206128ec83398151915280546040516330b8415f60e01b81526001600160601b03909116600482015290915073__$94a2c899be079b00d952d0d84fffaa5c34$__906330b8415f90602401602060405180830381865af415801561109a573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906110be9190611752565b156110ea5780546040516301ab8b6760e21b81526001600160601b0390911660048201526024016104e6565b6001546001600160a01b031660405163c3c5a54760e01b81526001600160a01b038581166004830152919091169063c3c5a54790602401602060405180830381865afa15801561113c573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906111609190611752565b6111885760405163b9304b0d60e01b81526001600160a01b03841660048201526024016104e6565b6001546001600160a01b0316604051632f2a35f760e11b81526001600160a01b0385811660048301529190911690635e546bee90602401602060405180830381865afa1580156111da573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906111fe9190611803565b81546bffffffffffffffffffffffff19166001600160601b039190911690811782557f88857b75cbef7f257c9d5a473e28aaf6a91cc28f717f60f2cda3bcf5623d7b549061124a6106a1565b604080516001600160601b0390931683526001600160a01b0390911660208301520160405180910390a1546001600160601b031692915050565b61128c610b37565b6112946112fa565b61129d82611342565b6001600160a01b0381166112c45760405163f17ef42d60e01b815260040160405180910390fd5b5f805160206128ec83398151915280546001600160601b0316600160601b6001600160a01b039093169290920291909117905550565b611302610b37565b610b806301ffc9a760e01b5f9081526020527f67be87c3ff9960ca1e9cfac5cab2ff4747269cf9ed20c9b7306235ac35a491c5805460ff19166001179055565b61134a610b37565b604051633334d16b60e01b81526001600160a01b038216600482015273__$fb599632d08395912d9d70eb2f0f93b5e2$__90633334d16b90602401602060405180830381865af41580156113a0573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906113c49190611752565b6113ec5760405163fdeac91f60e01b81526001600160a01b03821660048201526024016104e6565b600180546001600160a01b0319166001600160a01b0392909216919091179055565b6110c28061182a83390190565b5f6020828403121561142b575f80fd5b81356001600160e01b0319811681146104fb575f80fd5b6001600160a01b0381168114611456575f80fd5b50565b634e487b7160e01b5f52604160045260245ffd5b5f82601f83011261147c575f80fd5b813567ffffffffffffffff81111561149657611496611459565b604051601f8201601f19908116603f0116810167ffffffffffffffff811182821017156114c5576114c5611459565b6040528181528382016020018510156114dc575f80fd5b816020850160208301375f918101602001919091529392505050565b5f805f806080858703121561150b575f80fd5b843561151681611442565b9350602085013561152681611442565b9250604085013567ffffffffffffffff811115611541575f80fd5b61154d8782880161146d565b949793965093946060013593505050565b5f6020828403121561156e575f80fd5b81356104fb81611442565b5f806040838503121561158a575f80fd5b823561159581611442565b9150602083013567ffffffffffffffff8111156115b0575f80fd5b6115bc8582860161146d565b9150509250929050565b5f81518084528060208401602086015e5f602082860101526020601f19601f83011685010191505092915050565b602081525f6104fb60208301846115c6565b5f805f60608486031215611618575f80fd5b833561162381611442565b9250602084013561163381611442565b9150604084013567ffffffffffffffff81111561164e575f80fd5b61165a8682870161146d565b9150509250925092565b62ffffff81168114611456575f80fd5b5f60208284031215611684575f80fd5b81356104fb81611664565b5f6020828403121561169f575f80fd5b813567ffffffffffffffff8111156116b5575f80fd5b6116c18482850161146d565b949350505050565b5f602082840312156116d9575f80fd5b5035919050565b6001600160a01b038481168252831660208201526060604082018190525f9061170b908301846115c6565b95945050505050565b5f60208284031215611724575f80fd5b81516104fb81611664565b6001600160a01b03831681526040602082018190525f906116c1908301846115c6565b5f60208284031215611762575f80fd5b815180151581146104fb575f80fd5b5f60208284031215611781575f80fd5b81516104fb81611442565b634e487b7160e01b5f52603260045260245ffd5b818103818111156105ce57634e487b7160e01b5f52601160045260245ffd5b5f602082840312156117cf575f80fd5b5051919050565b64ffffffffff81168114611456575f80fd5b5f602082840312156117f8575f80fd5b81516104fb816117d6565b5f60208284031215611813575f80fd5b81516001600160601b03811681146104fb575f80fdfe60a060405234801561000f575f80fd5b506040516110c23803806110c283398101604081905261002e9161038a565b828282828161003d82826100ac565b50508160405161004c9061034e565b6001600160a01b039091168152602001604051809103905ff080158015610075573d5f803e3d5ffd5b506001600160a01b031660805261009361008e60805190565b61010a565b505f91506100a3905082826104de565b505050506105ae565b6100b582610177565b6040516001600160a01b038316907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b905f90a28051156100fe576100f982826101f5565b505050565b610106610268565b5050565b7f7e644d79422f17c01e4894b5f4f588d331ebfa28653d42ae832dc59e38c9798f6101495f805160206110a2833981519152546001600160a01b031690565b604080516001600160a01b03928316815291841660208301520160405180910390a161017481610289565b50565b806001600160a01b03163b5f036101b157604051634c9c8ce360e01b81526001600160a01b03821660048201526024015b60405180910390fd5b807f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc5b80546001600160a01b0319166001600160a01b039290921691909117905550565b60605f80846001600160a01b0316846040516102119190610598565b5f60405180830381855af49150503d805f8114610249576040519150601f19603f3d011682016040523d82523d5f602084013e61024e565b606091505b50909250905061025f8583836102c6565b95945050505050565b34156102875760405163b398979f60e01b815260040160405180910390fd5b565b6001600160a01b0381166102b257604051633173bdd160e11b81525f60048201526024016101a8565b805f805160206110a28339815191526101d4565b6060826102db576102d682610325565b61031e565b81511580156102f257506001600160a01b0384163b155b1561031b57604051639996b31560e01b81526001600160a01b03851660048201526024016101a8565b50805b9392505050565b8051156103355780518082602001fd5b604051630a12f52160e11b815260040160405180910390fd5b6104ef80610bb383390190565b80516001600160a01b0381168114610371575f80fd5b919050565b634e487b7160e01b5f52604160045260245ffd5b5f805f6060848603121561039c575f80fd5b6103a58461035b565b92506103b36020850161035b565b60408501519092506001600160401b038111156103ce575f80fd5b8401601f810186136103de575f80fd5b80516001600160401b038111156103f7576103f7610376565b604051601f8201601f19908116603f011681016001600160401b038111828210171561042557610425610376565b60405281815282820160200188101561043c575f80fd5b8160208401602083015e5f602083830101528093505050509250925092565b600181811c9082168061046f57607f821691505b60208210810361048d57634e487b7160e01b5f52602260045260245ffd5b50919050565b601f8211156100f957805f5260205f20601f840160051c810160208510156104b85750805b601f840160051c820191505b818110156104d7575f81556001016104c4565b5050505050565b81516001600160401b038111156104f7576104f7610376565b61050b81610505845461045b565b84610493565b6020601f82116001811461053d575f83156105265750848201515b5f19600385901b1c1916600184901b1784556104d7565b5f84815260208120601f198516915b8281101561056c578785015182556020948501946001909201910161054c565b508482101561058957868401515f19600387901b60f8161c191681555b50505050600190811b01905550565b5f82518060208501845e5f920191825250919050565b6080516105e86105cb5f395f81816075015260a101526105e85ff3fe608060405260043610610028575f3560e01c8063514e2d93146100325780638b3240a01461005c575b61003061009f565b005b34801561003d575f80fd5b50610046610113565b6040516100539190610423565b60405180910390f35b348015610067575f80fd5b506040516001600160a01b037f0000000000000000000000000000000000000000000000000000000000000000168152602001610053565b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b0316330361010b575f356001600160e01b03191663278f794360e11b14610101576040516334ad5dbb60e21b815260040160405180910390fd5b6101096101a7565b565b6101096101d5565b60605f805461012190610458565b80601f016020809104026020016040519081016040528092919081815260200182805461014d90610458565b80156101985780601f1061016f57610100808354040283529160200191610198565b820191905f5260205f20905b81548152906001019060200180831161017b57829003601f168201915b5050505050905090565b905090565b5f806101b63660048184610490565b8101906101c391906104cb565b915091506101d182826101e5565b5050565b6101096101e061023f565b610271565b6101ee8261028f565b6040516001600160a01b038316907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b905f90a280511561023757610232828261030a565b505050565b6101d161037c565b5f6101a27f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc546001600160a01b031690565b365f80375f80365f845af43d5f803e80801561028b573d5ff35b3d5ffd5b806001600160a01b03163b5f036102c957604051634c9c8ce360e01b81526001600160a01b03821660048201526024015b60405180910390fd5b7f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc80546001600160a01b0319166001600160a01b0392909216919091179055565b60605f80846001600160a01b031684604051610326919061059c565b5f60405180830381855af49150503d805f811461035e576040519150601f19603f3d011682016040523d82523d5f602084013e610363565b606091505b509150915061037385838361039b565b95945050505050565b34156101095760405163b398979f60e01b815260040160405180910390fd5b6060826103b0576103ab826103fa565b6103f3565b81511580156103c757506001600160a01b0384163b155b156103f057604051639996b31560e01b81526001600160a01b03851660048201526024016102c0565b50805b9392505050565b80511561040a5780518082602001fd5b604051630a12f52160e11b815260040160405180910390fd5b602081525f82518060208401528060208501604085015e5f604082850101526040601f19601f83011684010191505092915050565b600181811c9082168061046c57607f821691505b60208210810361048a57634e487b7160e01b5f52602260045260245ffd5b50919050565b5f808585111561049e575f80fd5b838611156104aa575f80fd5b5050820193919092039150565b634e487b7160e01b5f52604160045260245ffd5b5f80604083850312156104dc575f80fd5b82356001600160a01b03811681146104f2575f80fd5b9150602083013567ffffffffffffffff81111561050d575f80fd5b8301601f8101851361051d575f80fd5b803567ffffffffffffffff811115610537576105376104b7565b604051601f8201601f19908116603f0116810167ffffffffffffffff81118282101715610566576105666104b7565b60405281815282820160200187101561057d575f80fd5b816020840160208301375f602083830101528093505050509250929050565b5f82518060208501845e5f92019182525091905056fea264697066735822122068eb3582d94c42ef5e17bc746088d0b2e5458c9bbe06da2bc30decce86f2b96964736f6c634300081a0033608060405234801561000f575f80fd5b506040516104ef3803806104ef83398101604081905261002e916100bb565b806001600160a01b03811661005c57604051631e4fbdf760e01b81525f600482015260240160405180910390fd5b6100658161006c565b50506100e8565b5f80546001600160a01b038381166001600160a01b0319831681178455604051919092169283917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e09190a35050565b5f602082840312156100cb575f80fd5b81516001600160a01b03811681146100e1575f80fd5b9392505050565b6103fa806100f55f395ff3fe608060405260043610610049575f3560e01c8063715018a61461004d5780638da5cb5b146100635780639623609d1461008e578063ad3cb1cc146100a1578063f2fde38b146100de575b5f80fd5b348015610058575f80fd5b506100616100fd565b005b34801561006e575f80fd5b505f546040516001600160a01b0390911681526020015b60405180910390f35b61006161009c366004610260565b610110565b3480156100ac575f80fd5b506100d1604051806040016040528060058152602001640352e302e360dc1b81525081565b6040516100859190610365565b3480156100e9575f80fd5b506100616100f836600461037e565b61017b565b6101056101bd565b61010e5f6101e9565b565b6101186101bd565b60405163278f794360e11b81526001600160a01b03841690634f1ef2869034906101489086908690600401610399565b5f604051808303818588803b15801561015f575f80fd5b505af1158015610171573d5f803e3d5ffd5b5050505050505050565b6101836101bd565b6001600160a01b0381166101b157604051631e4fbdf760e01b81525f60048201526024015b60405180910390fd5b6101ba816101e9565b50565b5f546001600160a01b0316331461010e5760405163118cdaa760e01b81523360048201526024016101a8565b5f80546001600160a01b038381166001600160a01b0319831681178455604051919092169283917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e09190a35050565b6001600160a01b03811681146101ba575f80fd5b634e487b7160e01b5f52604160045260245ffd5b5f805f60608486031215610272575f80fd5b833561027d81610238565b9250602084013561028d81610238565b9150604084013567ffffffffffffffff8111156102a8575f80fd5b8401601f810186136102b8575f80fd5b803567ffffffffffffffff8111156102d2576102d261024c565b604051601f8201601f19908116603f0116810167ffffffffffffffff811182821017156103015761030161024c565b604052818152828201602001881015610318575f80fd5b816020840160208301375f602083830101528093505050509250925092565b5f81518084528060208401602086015e5f602082860101526020601f19601f83011685010191505092915050565b602081525f6103776020830184610337565b9392505050565b5f6020828403121561038e575f80fd5b813561037781610238565b6001600160a01b03831681526040602082018190525f906103bc90830184610337565b94935050505056fea264697066735822122063012ab3c3421087c307802be7295f03bec95db9eea702a4c2db9595befa162464736f6c634300081a0033b53127684a568b3173ae13b9f8a6016e243e63b6e8ee1178d6a717850b5d610307ebcf49758b6ed3af50fa146bec0abe157c0218fe65dc0874c286e9d5da4f00a26469706673582212201e0aca0b0f79e71fcc2b9f79af2911ff9d59e291fae8011165ddcb4d398682ea64736f6c634300081a0033",
563
+ "deployedBytecode": "0x608060405234801561000f575f80fd5b506004361061011c575f3560e01c8063644c45e0116100a9578063ada9652e1161006e578063ada9652e14610386578063b88da7591461039a578063c987336c146103ad578063f5c1b5a7146103c0578063fd0c63d9146103d3575f80fd5b8063644c45e01461032b578063893d20e8146103485780638e9afce614610350578063933a9ce814610363578063946dfcfe14610374575f80fd5b8063138461e0116100ef578063138461e0146101bb5780631775564d146101db5780632db5b86f146101fb5780634d459c901461020e5780635ab1bd531461031a575f80fd5b806301ffc9a71461012057806304499582146101615780630900f0101461018c5780630d8e6e2c1461019f575b5f80fd5b61014c61012e36600461141b565b6001600160e01b0319165f9081526020819052604090205460ff1690565b60405190151581526020015b60405180910390f35b61017461016f3660046114f8565b6103db565b6040516001600160a01b039091168152602001610158565b61017461019a36600461155e565b6104ae565b6101a7610502565b60405162ffffff9091168152602001610158565b6101c3610572565b6040516001600160601b039091168152602001610158565b6101ee6101e9366004611579565b61057c565b60405161015891906115f4565b610174610209366004611606565b6105d4565b6102bd61021c366004611674565b6040805160a0810182525f808252602082018190529181018290526060810182905260808101919091525062ffffff9081165f90815260036020908152604091829020825160a08101845281546001600160a01b03808216835264ffffffffff600160a01b8304811695840195909552600160c81b909104909316938101939093526001015492831660608301526301000000909204909116608082015290565b604051610158919081516001600160a01b03908116825260208084015164ffffffffff908116918401919091526040808501519091169083015260608084015162ffffff1690830152608092830151169181019190915260a00190565b6001546001600160a01b0316610174565b5f805160206128ec833981519152546001600160601b03166101c3565b6101746106a1565b6101ee61035e36600461168f565b6107d2565b6002546001600160a01b0316610174565b6004545b604051908152602001610158565b6103785f805160206128ec83398151915281565b6101a76103a83660046116c9565b610825565b6101746103bb366004611579565b610863565b6101746103ce3660046114f8565b610a05565b6101c3610b20565b5f6103e4610b37565b5f806103ef87610b82565b91509150838682610400858961057c565b60405161040c9061140e565b610418939291906116e0565b8190604051809103905ff5905080158015610435573d5f803e3d5ffd5b50600280546001600160a01b0319166001600160a01b03929092169190911790556104608683610bc4565b6040516001600160a01b038881168252919450908416907f78922e3fa1abc96399973cb25528ba892214b57da9d1a573937c460d9f5eb4759060200160405180910390a25050949350505050565b5f6104b76106a1565b6001600160a01b0316336001600160a01b0316146104ef5760405163086391f760e31b81523360048201526024015b60405180910390fd5b60606104fb8382610863565b9392505050565b600254604080516303639b8b60e21b815290515f926001600160a01b031691630d8e6e2c9160048083019260209291908290030181865afa158015610549573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061056d9190611714565b905090565b5f61056d3061102e565b60606349bb9e4b60e01b838360405160240161059992919061172f565b60408051601f198184030181529190526020810180516001600160e01b03166001600160e01b03199093169290921790915290505b92915050565b5f6105dd610b37565b5f806105e886610b82565b9150915084816105f8848761057c565b6040516106049061140e565b610610939291906116e0565b604051809103905ff080158015610629573d5f803e3d5ffd5b50600280546001600160a01b0319166001600160a01b03929092169190911790556106548583610bc4565b6040516001600160a01b038781168252919450908416907f78922e3fa1abc96399973cb25528ba892214b57da9d1a573937c460d9f5eb4759060200160405180910390a250509392505050565b5f805f805160206128ec83398151915280546040516330b8415f60e01b81526001600160601b03909116600482015290915073__$94a2c899be079b00d952d0d84fffaa5c34$__906330b8415f90602401602060405180830381865af415801561070d573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906107319190611752565b156107bc576001546001600160a01b03168154604051631c5da14d60e11b81526001600160601b0390911660048201526001600160a01b0391909116906338bb429a90602401602060405180830381865afa158015610792573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906107b69190611771565b91505090565b54600160601b90046001600160a01b0316919050565b606063329d6e7460e01b826040516024016107ed91906115f4565b60408051601f198184030181529190526020810180516001600160e01b03166001600160e01b03199093169290921790915292915050565b5f600482815481106108395761083961178c565b905f5260205f2090600a91828204019190066003029054906101000a900462ffffff169050919050565b5f61086c6106a1565b6001600160a01b0316336001600160a01b03161461089f5760405163086391f760e31b81523360048201526024016104e6565b6004545f036108c15760405163366dfd2160e21b815260040160405180910390fd5b5f6108ca6106a1565b90505f6108df6002546001600160a01b031690565b6001600160a01b0316638b3240a06040518163ffffffff1660e01b81526004016020604051808303815f875af115801561091b573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061093f9190611771565b6002549091506001600160a01b03908116908216639623609d8288610963896107d2565b6040518463ffffffff1660e01b8152600401610981939291906116e0565b5f604051808303815f87803b158015610998575f80fd5b505af11580156109aa573d5f803e3d5ffd5b505050506109b88684610bc4565b6040516001600160a01b038881168252919550908516907f1356a2c922be684528fa1759d1808395e5c5010181dd333cdb6f03e2d8545b659060200160405180910390a250505092915050565b7ff0c57e16840df040f15088dc2f81fe391c3923bec73e23a9662efc9c229c6a0080545f9190600160401b810460ff16159067ffffffffffffffff168381158015610a4d5750825b90505f8267ffffffffffffffff166001148015610a695750303b155b905081158015610a77575080155b15610a955760405163f92ee8a960e01b815260040160405180910390fd5b845467ffffffffffffffff191660011785558315610abf57845460ff60401b1916600160401b1785555b610acb8a8a8a8a6103db565b95508315610b1357845460ff60401b19168555604051600181527fc7f505b2f371ae2175ee4913f4499e1f2633a7b5936321eed1cdaeb6115181d29060200160405180910390a15b5050505050949350505050565b6002545f9061056d906001600160a01b031661102e565b7ff0c57e16840df040f15088dc2f81fe391c3923bec73e23a9662efc9c229c6a0054600160401b900460ff16610b8057604051631afcd79f60e31b815260040160405180910390fd5b565b6004545f90819015610ba75760405163402b135f60e11b815260040160405180910390fd5b33610bb28482611284565b610bba6106a1565b9430945092505050565b600254604080516303639b8b60e21b815290516001600160a01b03909216915f918391630d8e6e2c916004808201926020929091908290030181865afa158015610c10573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610c349190611714565b9050610cb28173__$8eede297b65ed5a56eb3f84d8232ae93f5$__6304b8f6c56040518163ffffffff1660e01b8152600401602060405180830381865af4158015610c81573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610ca59190611714565b62ffffff90811691161490565b15610cd0576040516348c618db60e01b815260040160405180910390fd5b60045415610e285760048054610ce8906001906117a0565b81548110610cf857610cf861178c565b5f9182526020909120600a80830490910154604051635560100760e01b8152919092066003026101000a90910462ffffff16600482015273__$8eede297b65ed5a56eb3f84d8232ae93f5$__90635560100790602401602060405180830381865af4158015610d69573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610d8d91906117bf565b604051635560100760e01b815262ffffff8316600482015273__$8eede297b65ed5a56eb3f84d8232ae93f5$__90635560100790602401602060405180830381865af4158015610ddf573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610e0391906117bf565b11610e2857604051633e614b6d60e11b815262ffffff821660048201526024016104e6565b600480546001810182555f8290527f8a35acfbc15ff81a39ae7d344fd709f28e8600b4aa8c65c6b64bfe7fe36bd19b600a808304919091018054919092066003026101000a62ffffff81810219909216918516021790556040805160a0810182526001600160a01b03871681528151639fa6a6e360e01b81529151909260208085019373__$91d01b1eccbca8d6f94a5eb2a0acb040e9$__93639fa6a6e39382810193928290030181865af4158015610ee3573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610f0791906117e8565b64ffffffffff16815260200173__$f55ca14f1ddce1b88fe30d23ae45f595f4$__639fa6a6e36040518163ffffffff1660e01b8152600401602060405180830381865af4158015610f5a573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610f7e91906117e8565b64ffffffffff908116825262ffffff93841660208084018290526001600160a01b039788166040948501525f91825260038152908390208451815492860151948601518416600160c81b0264ffffffffff60c81b1995909416600160a01b026001600160c81b03199093169089161791909117929092161781556060820151600190910180546080909301519095166301000000026001600160b81b031990921692169190911717909155919050565b5f805f805160206128ec83398151915280546040516330b8415f60e01b81526001600160601b03909116600482015290915073__$94a2c899be079b00d952d0d84fffaa5c34$__906330b8415f90602401602060405180830381865af415801561109a573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906110be9190611752565b156110ea5780546040516301ab8b6760e21b81526001600160601b0390911660048201526024016104e6565b6001546001600160a01b031660405163c3c5a54760e01b81526001600160a01b038581166004830152919091169063c3c5a54790602401602060405180830381865afa15801561113c573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906111609190611752565b6111885760405163b9304b0d60e01b81526001600160a01b03841660048201526024016104e6565b6001546001600160a01b0316604051632f2a35f760e11b81526001600160a01b0385811660048301529190911690635e546bee90602401602060405180830381865afa1580156111da573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906111fe9190611803565b81546bffffffffffffffffffffffff19166001600160601b039190911690811782557f88857b75cbef7f257c9d5a473e28aaf6a91cc28f717f60f2cda3bcf5623d7b549061124a6106a1565b604080516001600160601b0390931683526001600160a01b0390911660208301520160405180910390a1546001600160601b031692915050565b61128c610b37565b6112946112fa565b61129d82611342565b6001600160a01b0381166112c45760405163f17ef42d60e01b815260040160405180910390fd5b5f805160206128ec83398151915280546001600160601b0316600160601b6001600160a01b039093169290920291909117905550565b611302610b37565b610b806301ffc9a760e01b5f9081526020527f67be87c3ff9960ca1e9cfac5cab2ff4747269cf9ed20c9b7306235ac35a491c5805460ff19166001179055565b61134a610b37565b604051633334d16b60e01b81526001600160a01b038216600482015273__$fb599632d08395912d9d70eb2f0f93b5e2$__90633334d16b90602401602060405180830381865af41580156113a0573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906113c49190611752565b6113ec5760405163fdeac91f60e01b81526001600160a01b03821660048201526024016104e6565b600180546001600160a01b0319166001600160a01b0392909216919091179055565b6110c28061182a83390190565b5f6020828403121561142b575f80fd5b81356001600160e01b0319811681146104fb575f80fd5b6001600160a01b0381168114611456575f80fd5b50565b634e487b7160e01b5f52604160045260245ffd5b5f82601f83011261147c575f80fd5b813567ffffffffffffffff81111561149657611496611459565b604051601f8201601f19908116603f0116810167ffffffffffffffff811182821017156114c5576114c5611459565b6040528181528382016020018510156114dc575f80fd5b816020850160208301375f918101602001919091529392505050565b5f805f806080858703121561150b575f80fd5b843561151681611442565b9350602085013561152681611442565b9250604085013567ffffffffffffffff811115611541575f80fd5b61154d8782880161146d565b949793965093946060013593505050565b5f6020828403121561156e575f80fd5b81356104fb81611442565b5f806040838503121561158a575f80fd5b823561159581611442565b9150602083013567ffffffffffffffff8111156115b0575f80fd5b6115bc8582860161146d565b9150509250929050565b5f81518084528060208401602086015e5f602082860101526020601f19601f83011685010191505092915050565b602081525f6104fb60208301846115c6565b5f805f60608486031215611618575f80fd5b833561162381611442565b9250602084013561163381611442565b9150604084013567ffffffffffffffff81111561164e575f80fd5b61165a8682870161146d565b9150509250925092565b62ffffff81168114611456575f80fd5b5f60208284031215611684575f80fd5b81356104fb81611664565b5f6020828403121561169f575f80fd5b813567ffffffffffffffff8111156116b5575f80fd5b6116c18482850161146d565b949350505050565b5f602082840312156116d9575f80fd5b5035919050565b6001600160a01b038481168252831660208201526060604082018190525f9061170b908301846115c6565b95945050505050565b5f60208284031215611724575f80fd5b81516104fb81611664565b6001600160a01b03831681526040602082018190525f906116c1908301846115c6565b5f60208284031215611762575f80fd5b815180151581146104fb575f80fd5b5f60208284031215611781575f80fd5b81516104fb81611442565b634e487b7160e01b5f52603260045260245ffd5b818103818111156105ce57634e487b7160e01b5f52601160045260245ffd5b5f602082840312156117cf575f80fd5b5051919050565b64ffffffffff81168114611456575f80fd5b5f602082840312156117f8575f80fd5b81516104fb816117d6565b5f60208284031215611813575f80fd5b81516001600160601b03811681146104fb575f80fdfe60a060405234801561000f575f80fd5b506040516110c23803806110c283398101604081905261002e9161038a565b828282828161003d82826100ac565b50508160405161004c9061034e565b6001600160a01b039091168152602001604051809103905ff080158015610075573d5f803e3d5ffd5b506001600160a01b031660805261009361008e60805190565b61010a565b505f91506100a3905082826104de565b505050506105ae565b6100b582610177565b6040516001600160a01b038316907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b905f90a28051156100fe576100f982826101f5565b505050565b610106610268565b5050565b7f7e644d79422f17c01e4894b5f4f588d331ebfa28653d42ae832dc59e38c9798f6101495f805160206110a2833981519152546001600160a01b031690565b604080516001600160a01b03928316815291841660208301520160405180910390a161017481610289565b50565b806001600160a01b03163b5f036101b157604051634c9c8ce360e01b81526001600160a01b03821660048201526024015b60405180910390fd5b807f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc5b80546001600160a01b0319166001600160a01b039290921691909117905550565b60605f80846001600160a01b0316846040516102119190610598565b5f60405180830381855af49150503d805f8114610249576040519150601f19603f3d011682016040523d82523d5f602084013e61024e565b606091505b50909250905061025f8583836102c6565b95945050505050565b34156102875760405163b398979f60e01b815260040160405180910390fd5b565b6001600160a01b0381166102b257604051633173bdd160e11b81525f60048201526024016101a8565b805f805160206110a28339815191526101d4565b6060826102db576102d682610325565b61031e565b81511580156102f257506001600160a01b0384163b155b1561031b57604051639996b31560e01b81526001600160a01b03851660048201526024016101a8565b50805b9392505050565b8051156103355780518082602001fd5b604051630a12f52160e11b815260040160405180910390fd5b6104ef80610bb383390190565b80516001600160a01b0381168114610371575f80fd5b919050565b634e487b7160e01b5f52604160045260245ffd5b5f805f6060848603121561039c575f80fd5b6103a58461035b565b92506103b36020850161035b565b60408501519092506001600160401b038111156103ce575f80fd5b8401601f810186136103de575f80fd5b80516001600160401b038111156103f7576103f7610376565b604051601f8201601f19908116603f011681016001600160401b038111828210171561042557610425610376565b60405281815282820160200188101561043c575f80fd5b8160208401602083015e5f602083830101528093505050509250925092565b600181811c9082168061046f57607f821691505b60208210810361048d57634e487b7160e01b5f52602260045260245ffd5b50919050565b601f8211156100f957805f5260205f20601f840160051c810160208510156104b85750805b601f840160051c820191505b818110156104d7575f81556001016104c4565b5050505050565b81516001600160401b038111156104f7576104f7610376565b61050b81610505845461045b565b84610493565b6020601f82116001811461053d575f83156105265750848201515b5f19600385901b1c1916600184901b1784556104d7565b5f84815260208120601f198516915b8281101561056c578785015182556020948501946001909201910161054c565b508482101561058957868401515f19600387901b60f8161c191681555b50505050600190811b01905550565b5f82518060208501845e5f920191825250919050565b6080516105e86105cb5f395f81816075015260a101526105e85ff3fe608060405260043610610028575f3560e01c8063514e2d93146100325780638b3240a01461005c575b61003061009f565b005b34801561003d575f80fd5b50610046610113565b6040516100539190610423565b60405180910390f35b348015610067575f80fd5b506040516001600160a01b037f0000000000000000000000000000000000000000000000000000000000000000168152602001610053565b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b0316330361010b575f356001600160e01b03191663278f794360e11b14610101576040516334ad5dbb60e21b815260040160405180910390fd5b6101096101a7565b565b6101096101d5565b60605f805461012190610458565b80601f016020809104026020016040519081016040528092919081815260200182805461014d90610458565b80156101985780601f1061016f57610100808354040283529160200191610198565b820191905f5260205f20905b81548152906001019060200180831161017b57829003601f168201915b5050505050905090565b905090565b5f806101b63660048184610490565b8101906101c391906104cb565b915091506101d182826101e5565b5050565b6101096101e061023f565b610271565b6101ee8261028f565b6040516001600160a01b038316907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b905f90a280511561023757610232828261030a565b505050565b6101d161037c565b5f6101a27f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc546001600160a01b031690565b365f80375f80365f845af43d5f803e80801561028b573d5ff35b3d5ffd5b806001600160a01b03163b5f036102c957604051634c9c8ce360e01b81526001600160a01b03821660048201526024015b60405180910390fd5b7f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc80546001600160a01b0319166001600160a01b0392909216919091179055565b60605f80846001600160a01b031684604051610326919061059c565b5f60405180830381855af49150503d805f811461035e576040519150601f19603f3d011682016040523d82523d5f602084013e610363565b606091505b509150915061037385838361039b565b95945050505050565b34156101095760405163b398979f60e01b815260040160405180910390fd5b6060826103b0576103ab826103fa565b6103f3565b81511580156103c757506001600160a01b0384163b155b156103f057604051639996b31560e01b81526001600160a01b03851660048201526024016102c0565b50805b9392505050565b80511561040a5780518082602001fd5b604051630a12f52160e11b815260040160405180910390fd5b602081525f82518060208401528060208501604085015e5f604082850101526040601f19601f83011684010191505092915050565b600181811c9082168061046c57607f821691505b60208210810361048a57634e487b7160e01b5f52602260045260245ffd5b50919050565b5f808585111561049e575f80fd5b838611156104aa575f80fd5b5050820193919092039150565b634e487b7160e01b5f52604160045260245ffd5b5f80604083850312156104dc575f80fd5b82356001600160a01b03811681146104f2575f80fd5b9150602083013567ffffffffffffffff81111561050d575f80fd5b8301601f8101851361051d575f80fd5b803567ffffffffffffffff811115610537576105376104b7565b604051601f8201601f19908116603f0116810167ffffffffffffffff81118282101715610566576105666104b7565b60405281815282820160200187101561057d575f80fd5b816020840160208301375f602083830101528093505050509250929050565b5f82518060208501845e5f92019182525091905056fea264697066735822122068eb3582d94c42ef5e17bc746088d0b2e5458c9bbe06da2bc30decce86f2b96964736f6c634300081a0033608060405234801561000f575f80fd5b506040516104ef3803806104ef83398101604081905261002e916100bb565b806001600160a01b03811661005c57604051631e4fbdf760e01b81525f600482015260240160405180910390fd5b6100658161006c565b50506100e8565b5f80546001600160a01b038381166001600160a01b0319831681178455604051919092169283917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e09190a35050565b5f602082840312156100cb575f80fd5b81516001600160a01b03811681146100e1575f80fd5b9392505050565b6103fa806100f55f395ff3fe608060405260043610610049575f3560e01c8063715018a61461004d5780638da5cb5b146100635780639623609d1461008e578063ad3cb1cc146100a1578063f2fde38b146100de575b5f80fd5b348015610058575f80fd5b506100616100fd565b005b34801561006e575f80fd5b505f546040516001600160a01b0390911681526020015b60405180910390f35b61006161009c366004610260565b610110565b3480156100ac575f80fd5b506100d1604051806040016040528060058152602001640352e302e360dc1b81525081565b6040516100859190610365565b3480156100e9575f80fd5b506100616100f836600461037e565b61017b565b6101056101bd565b61010e5f6101e9565b565b6101186101bd565b60405163278f794360e11b81526001600160a01b03841690634f1ef2869034906101489086908690600401610399565b5f604051808303818588803b15801561015f575f80fd5b505af1158015610171573d5f803e3d5ffd5b5050505050505050565b6101836101bd565b6001600160a01b0381166101b157604051631e4fbdf760e01b81525f60048201526024015b60405180910390fd5b6101ba816101e9565b50565b5f546001600160a01b0316331461010e5760405163118cdaa760e01b81523360048201526024016101a8565b5f80546001600160a01b038381166001600160a01b0319831681178455604051919092169283917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e09190a35050565b6001600160a01b03811681146101ba575f80fd5b634e487b7160e01b5f52604160045260245ffd5b5f805f60608486031215610272575f80fd5b833561027d81610238565b9250602084013561028d81610238565b9150604084013567ffffffffffffffff8111156102a8575f80fd5b8401601f810186136102b8575f80fd5b803567ffffffffffffffff8111156102d2576102d261024c565b604051601f8201601f19908116603f0116810167ffffffffffffffff811182821017156103015761030161024c565b604052818152828201602001881015610318575f80fd5b816020840160208301375f602083830101528093505050509250925092565b5f81518084528060208401602086015e5f602082860101526020601f19601f83011685010191505092915050565b602081525f6103776020830184610337565b9392505050565b5f6020828403121561038e575f80fd5b813561037781610238565b6001600160a01b03831681526040602082018190525f906103bc90830184610337565b94935050505056fea264697066735822122063012ab3c3421087c307802be7295f03bec95db9eea702a4c2db9595befa162464736f6c634300081a0033b53127684a568b3173ae13b9f8a6016e243e63b6e8ee1178d6a717850b5d610307ebcf49758b6ed3af50fa146bec0abe157c0218fe65dc0874c286e9d5da4f00a26469706673582212201e0aca0b0f79e71fcc2b9f79af2911ff9d59e291fae8011165ddcb4d398682ea64736f6c634300081a0033",
526
564
  "linkReferences": {
527
565
  "contracts/shared/ContractLib.sol": {
528
566
  "ContractLib": [
529
567
  {
530
568
  "length": 20,
531
- "start": 4698
569
+ "start": 4996
570
+ }
571
+ ]
572
+ },
573
+ "contracts/type/Blocknumber.sol": {
574
+ "BlocknumberLib": [
575
+ {
576
+ "length": 20,
577
+ "start": 3889
532
578
  }
533
579
  ]
534
580
  },
@@ -536,11 +582,11 @@
536
582
  "NftIdLib": [
537
583
  {
538
584
  "length": 20,
539
- "start": 1664
585
+ "start": 1777
540
586
  },
541
587
  {
542
588
  "length": 20,
543
- "start": 4017
589
+ "start": 4222
544
590
  }
545
591
  ]
546
592
  },
@@ -548,7 +594,7 @@
548
594
  "TimestampLib": [
549
595
  {
550
596
  "length": 20,
551
- "start": 3696
597
+ "start": 3785
552
598
  }
553
599
  ]
554
600
  },
@@ -556,15 +602,15 @@
556
602
  "VersionLib": [
557
603
  {
558
604
  "length": 20,
559
- "start": 3052
605
+ "start": 3160
560
606
  },
561
607
  {
562
608
  "length": 20,
563
- "start": 3297
609
+ "start": 3405
564
610
  },
565
611
  {
566
612
  "length": 20,
567
- "start": 3415
613
+ "start": 3523
568
614
  }
569
615
  ]
570
616
  }
@@ -574,7 +620,15 @@
574
620
  "ContractLib": [
575
621
  {
576
622
  "length": 20,
577
- "start": 4670
623
+ "start": 4968
624
+ }
625
+ ]
626
+ },
627
+ "contracts/type/Blocknumber.sol": {
628
+ "BlocknumberLib": [
629
+ {
630
+ "length": 20,
631
+ "start": 3861
578
632
  }
579
633
  ]
580
634
  },
@@ -582,11 +636,11 @@
582
636
  "NftIdLib": [
583
637
  {
584
638
  "length": 20,
585
- "start": 1636
639
+ "start": 1749
586
640
  },
587
641
  {
588
642
  "length": 20,
589
- "start": 3989
643
+ "start": 4194
590
644
  }
591
645
  ]
592
646
  },
@@ -594,7 +648,7 @@
594
648
  "TimestampLib": [
595
649
  {
596
650
  "length": 20,
597
- "start": 3668
651
+ "start": 3757
598
652
  }
599
653
  ]
600
654
  },
@@ -602,15 +656,15 @@
602
656
  "VersionLib": [
603
657
  {
604
658
  "length": 20,
605
- "start": 3024
659
+ "start": 3132
606
660
  },
607
661
  {
608
662
  "length": 20,
609
- "start": 3269
663
+ "start": 3377
610
664
  },
611
665
  {
612
666
  "length": 20,
613
- "start": 3387
667
+ "start": 3495
614
668
  }
615
669
  ]
616
670
  }
package/artifacts/contracts/upgradeability/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.dbg.json CHANGED
@@ -1,4 +1,4 @@
1
1
  {
2
2
  "_format": "hh-sol-dbg-1",
3
- "buildInfo": "../../../build-info/c00682b5fe2a68467165493f5b572122.json"
3
+ "buildInfo": "../../../build-info/e9e907a9a5511c407d8ab8cf6d463e70.json"
4
4
  }
package/artifacts/contracts/upgradeability/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.json CHANGED
@@ -108,6 +108,19 @@
108
108
  "stateMutability": "payable",
109
109
  "type": "fallback"
110
110
  },
111
+ {
112
+ "inputs": [],
113
+ "name": "getInitializationData",
114
+ "outputs": [
115
+ {
116
+ "internalType": "bytes",
117
+ "name": "",
118
+ "type": "bytes"
119
+ }
120
+ ],
121
+ "stateMutability": "view",
122
+ "type": "function"
123
+ },
111
124
  {
112
125
  "inputs": [],
113
126
  "name": "getProxyAdmin",
@@ -122,8 +135,8 @@
122
135
  "type": "function"
123
136
  }
124
137
  ],
125
- "bytecode": "0x60a060405234801561000f575f80fd5b50604051610e4c380380610e4c83398101604081905261002e9161037c565b828282828161003d828261009e565b50508160405161004c90610340565b6001600160a01b039091168152602001604051809103905ff080158015610075573d5f803e3d5ffd5b506001600160a01b031660805261009361008e60805190565b6100fc565b505050505050610463565b6100a782610169565b6040516001600160a01b038316907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b905f90a28051156100f0576100eb82826101e7565b505050565b6100f861025a565b5050565b7f7e644d79422f17c01e4894b5f4f588d331ebfa28653d42ae832dc59e38c9798f61013b5f80516020610e2c833981519152546001600160a01b031690565b604080516001600160a01b03928316815291841660208301520160405180910390a16101668161027b565b50565b806001600160a01b03163b5f036101a357604051634c9c8ce360e01b81526001600160a01b03821660048201526024015b60405180910390fd5b807f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc5b80546001600160a01b0319166001600160a01b039290921691909117905550565b60605f80846001600160a01b031684604051610203919061044d565b5f60405180830381855af49150503d805f811461023b576040519150601f19603f3d011682016040523d82523d5f602084013e610240565b606091505b5090925090506102518583836102b8565b95945050505050565b34156102795760405163b398979f60e01b815260040160405180910390fd5b565b6001600160a01b0381166102a457604051633173bdd160e11b81525f600482015260240161019a565b805f80516020610e2c8339815191526101c6565b6060826102cd576102c882610317565b610310565b81511580156102e457506001600160a01b0384163b155b1561030d57604051639996b31560e01b81526001600160a01b038516600482015260240161019a565b50805b9392505050565b8051156103275780518082602001fd5b604051630a12f52160e11b815260040160405180910390fd5b6104ef8061093d83390190565b80516001600160a01b0381168114610363575f80fd5b919050565b634e487b7160e01b5f52604160045260245ffd5b5f805f6060848603121561038e575f80fd5b6103978461034d565b92506103a56020850161034d565b60408501519092506001600160401b038111156103c0575f80fd5b8401601f810186136103d0575f80fd5b80516001600160401b038111156103e9576103e9610368565b604051601f8201601f19908116603f011681016001600160401b038111828210171561041757610417610368565b60405281815282820160200188101561042e575f80fd5b8160208401602083015e5f602083830101528093505050509250925092565b5f82518060208501845e5f920191825250919050565b6080516104bd6104805f395f818160350152607201526104bd5ff3fe60806040526004361061001d575f3560e01c80638b3240a014610027575b610025610070565b005b348015610032575f80fd5b507f00000000000000000000000000000000000000000000000000000000000000006040516001600160a01b03909116815260200160405180910390f35b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031633036100dc575f356001600160e01b03191663278f794360e11b146100d2576040516334ad5dbb60e21b815260040160405180910390fd5b6100da6100e9565b565b6100da610117565b905090565b5f806100f83660048184610365565b81019061010591906103a0565b915091506101138282610127565b5050565b6100da610122610181565b6101b3565b610130826101d1565b6040516001600160a01b038316907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b905f90a280511561017957610174828261024c565b505050565b6101136102be565b5f6100e47f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc546001600160a01b031690565b365f80375f80365f845af43d5f803e8080156101cd573d5ff35b3d5ffd5b806001600160a01b03163b5f0361020b57604051634c9c8ce360e01b81526001600160a01b03821660048201526024015b60405180910390fd5b7f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc80546001600160a01b0319166001600160a01b0392909216919091179055565b60605f80846001600160a01b0316846040516102689190610471565b5f60405180830381855af49150503d805f81146102a0576040519150601f19603f3d011682016040523d82523d5f602084013e6102a5565b606091505b50915091506102b58583836102dd565b95945050505050565b34156100da5760405163b398979f60e01b815260040160405180910390fd5b6060826102f2576102ed8261033c565b610335565b815115801561030957506001600160a01b0384163b155b1561033257604051639996b31560e01b81526001600160a01b0385166004820152602401610202565b50805b9392505050565b80511561034c5780518082602001fd5b604051630a12f52160e11b815260040160405180910390fd5b5f8085851115610373575f80fd5b8386111561037f575f80fd5b5050820193919092039150565b634e487b7160e01b5f52604160045260245ffd5b5f80604083850312156103b1575f80fd5b82356001600160a01b03811681146103c7575f80fd5b9150602083013567ffffffffffffffff8111156103e2575f80fd5b8301601f810185136103f2575f80fd5b803567ffffffffffffffff81111561040c5761040c61038c565b604051601f8201601f19908116603f0116810167ffffffffffffffff8111828210171561043b5761043b61038c565b604052818152828201602001871015610452575f80fd5b816020840160208301375f602083830101528093505050509250929050565b5f82518060208501845e5f92019182525091905056fea26469706673582212205f12e4d638be8d591db7c67d942f3e9eeb14e9e44f78ba8cddaca37631bdc49764736f6c634300081a0033608060405234801561000f575f80fd5b506040516104ef3803806104ef83398101604081905261002e916100bb565b806001600160a01b03811661005c57604051631e4fbdf760e01b81525f600482015260240160405180910390fd5b6100658161006c565b50506100e8565b5f80546001600160a01b038381166001600160a01b0319831681178455604051919092169283917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e09190a35050565b5f602082840312156100cb575f80fd5b81516001600160a01b03811681146100e1575f80fd5b9392505050565b6103fa806100f55f395ff3fe608060405260043610610049575f3560e01c8063715018a61461004d5780638da5cb5b146100635780639623609d1461008e578063ad3cb1cc146100a1578063f2fde38b146100de575b5f80fd5b348015610058575f80fd5b506100616100fd565b005b34801561006e575f80fd5b505f546040516001600160a01b0390911681526020015b60405180910390f35b61006161009c366004610260565b610110565b3480156100ac575f80fd5b506100d1604051806040016040528060058152602001640352e302e360dc1b81525081565b6040516100859190610365565b3480156100e9575f80fd5b506100616100f836600461037e565b61017b565b6101056101bd565b61010e5f6101e9565b565b6101186101bd565b60405163278f794360e11b81526001600160a01b03841690634f1ef2869034906101489086908690600401610399565b5f604051808303818588803b15801561015f575f80fd5b505af1158015610171573d5f803e3d5ffd5b5050505050505050565b6101836101bd565b6001600160a01b0381166101b157604051631e4fbdf760e01b81525f60048201526024015b60405180910390fd5b6101ba816101e9565b50565b5f546001600160a01b0316331461010e5760405163118cdaa760e01b81523360048201526024016101a8565b5f80546001600160a01b038381166001600160a01b0319831681178455604051919092169283917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e09190a35050565b6001600160a01b03811681146101ba575f80fd5b634e487b7160e01b5f52604160045260245ffd5b5f805f60608486031215610272575f80fd5b833561027d81610238565b9250602084013561028d81610238565b9150604084013567ffffffffffffffff8111156102a8575f80fd5b8401601f810186136102b8575f80fd5b803567ffffffffffffffff8111156102d2576102d261024c565b604051601f8201601f19908116603f0116810167ffffffffffffffff811182821017156103015761030161024c565b604052818152828201602001881015610318575f80fd5b816020840160208301375f602083830101528093505050509250925092565b5f81518084528060208401602086015e5f602082860101526020601f19601f83011685010191505092915050565b602081525f6103776020830184610337565b9392505050565b5f6020828403121561038e575f80fd5b813561037781610238565b6001600160a01b03831681526040602082018190525f906103bc90830184610337565b94935050505056fea264697066735822122063012ab3c3421087c307802be7295f03bec95db9eea702a4c2db9595befa162464736f6c634300081a0033b53127684a568b3173ae13b9f8a6016e243e63b6e8ee1178d6a717850b5d6103",
126
- "deployedBytecode": "0x60806040526004361061001d575f3560e01c80638b3240a014610027575b610025610070565b005b348015610032575f80fd5b507f00000000000000000000000000000000000000000000000000000000000000006040516001600160a01b03909116815260200160405180910390f35b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031633036100dc575f356001600160e01b03191663278f794360e11b146100d2576040516334ad5dbb60e21b815260040160405180910390fd5b6100da6100e9565b565b6100da610117565b905090565b5f806100f83660048184610365565b81019061010591906103a0565b915091506101138282610127565b5050565b6100da610122610181565b6101b3565b610130826101d1565b6040516001600160a01b038316907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b905f90a280511561017957610174828261024c565b505050565b6101136102be565b5f6100e47f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc546001600160a01b031690565b365f80375f80365f845af43d5f803e8080156101cd573d5ff35b3d5ffd5b806001600160a01b03163b5f0361020b57604051634c9c8ce360e01b81526001600160a01b03821660048201526024015b60405180910390fd5b7f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc80546001600160a01b0319166001600160a01b0392909216919091179055565b60605f80846001600160a01b0316846040516102689190610471565b5f60405180830381855af49150503d805f81146102a0576040519150601f19603f3d011682016040523d82523d5f602084013e6102a5565b606091505b50915091506102b58583836102dd565b95945050505050565b34156100da5760405163b398979f60e01b815260040160405180910390fd5b6060826102f2576102ed8261033c565b610335565b815115801561030957506001600160a01b0384163b155b1561033257604051639996b31560e01b81526001600160a01b0385166004820152602401610202565b50805b9392505050565b80511561034c5780518082602001fd5b604051630a12f52160e11b815260040160405180910390fd5b5f8085851115610373575f80fd5b8386111561037f575f80fd5b5050820193919092039150565b634e487b7160e01b5f52604160045260245ffd5b5f80604083850312156103b1575f80fd5b82356001600160a01b03811681146103c7575f80fd5b9150602083013567ffffffffffffffff8111156103e2575f80fd5b8301601f810185136103f2575f80fd5b803567ffffffffffffffff81111561040c5761040c61038c565b604051601f8201601f19908116603f0116810167ffffffffffffffff8111828210171561043b5761043b61038c565b604052818152828201602001871015610452575f80fd5b816020840160208301375f602083830101528093505050509250929050565b5f82518060208501845e5f92019182525091905056fea26469706673582212205f12e4d638be8d591db7c67d942f3e9eeb14e9e44f78ba8cddaca37631bdc49764736f6c634300081a0033",
138
+ "bytecode": "0x60a060405234801561000f575f80fd5b506040516110c23803806110c283398101604081905261002e9161038a565b828282828161003d82826100ac565b50508160405161004c9061034e565b6001600160a01b039091168152602001604051809103905ff080158015610075573d5f803e3d5ffd5b506001600160a01b031660805261009361008e60805190565b61010a565b505f91506100a3905082826104de565b505050506105ae565b6100b582610177565b6040516001600160a01b038316907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b905f90a28051156100fe576100f982826101f5565b505050565b610106610268565b5050565b7f7e644d79422f17c01e4894b5f4f588d331ebfa28653d42ae832dc59e38c9798f6101495f805160206110a2833981519152546001600160a01b031690565b604080516001600160a01b03928316815291841660208301520160405180910390a161017481610289565b50565b806001600160a01b03163b5f036101b157604051634c9c8ce360e01b81526001600160a01b03821660048201526024015b60405180910390fd5b807f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc5b80546001600160a01b0319166001600160a01b039290921691909117905550565b60605f80846001600160a01b0316846040516102119190610598565b5f60405180830381855af49150503d805f8114610249576040519150601f19603f3d011682016040523d82523d5f602084013e61024e565b606091505b50909250905061025f8583836102c6565b95945050505050565b34156102875760405163b398979f60e01b815260040160405180910390fd5b565b6001600160a01b0381166102b257604051633173bdd160e11b81525f60048201526024016101a8565b805f805160206110a28339815191526101d4565b6060826102db576102d682610325565b61031e565b81511580156102f257506001600160a01b0384163b155b1561031b57604051639996b31560e01b81526001600160a01b03851660048201526024016101a8565b50805b9392505050565b8051156103355780518082602001fd5b604051630a12f52160e11b815260040160405180910390fd5b6104ef80610bb383390190565b80516001600160a01b0381168114610371575f80fd5b919050565b634e487b7160e01b5f52604160045260245ffd5b5f805f6060848603121561039c575f80fd5b6103a58461035b565b92506103b36020850161035b565b60408501519092506001600160401b038111156103ce575f80fd5b8401601f810186136103de575f80fd5b80516001600160401b038111156103f7576103f7610376565b604051601f8201601f19908116603f011681016001600160401b038111828210171561042557610425610376565b60405281815282820160200188101561043c575f80fd5b8160208401602083015e5f602083830101528093505050509250925092565b600181811c9082168061046f57607f821691505b60208210810361048d57634e487b7160e01b5f52602260045260245ffd5b50919050565b601f8211156100f957805f5260205f20601f840160051c810160208510156104b85750805b601f840160051c820191505b818110156104d7575f81556001016104c4565b5050505050565b81516001600160401b038111156104f7576104f7610376565b61050b81610505845461045b565b84610493565b6020601f82116001811461053d575f83156105265750848201515b5f19600385901b1c1916600184901b1784556104d7565b5f84815260208120601f198516915b8281101561056c578785015182556020948501946001909201910161054c565b508482101561058957868401515f19600387901b60f8161c191681555b50505050600190811b01905550565b5f82518060208501845e5f920191825250919050565b6080516105e86105cb5f395f81816075015260a101526105e85ff3fe608060405260043610610028575f3560e01c8063514e2d93146100325780638b3240a01461005c575b61003061009f565b005b34801561003d575f80fd5b50610046610113565b6040516100539190610423565b60405180910390f35b348015610067575f80fd5b506040516001600160a01b037f0000000000000000000000000000000000000000000000000000000000000000168152602001610053565b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b0316330361010b575f356001600160e01b03191663278f794360e11b14610101576040516334ad5dbb60e21b815260040160405180910390fd5b6101096101a7565b565b6101096101d5565b60605f805461012190610458565b80601f016020809104026020016040519081016040528092919081815260200182805461014d90610458565b80156101985780601f1061016f57610100808354040283529160200191610198565b820191905f5260205f20905b81548152906001019060200180831161017b57829003601f168201915b5050505050905090565b905090565b5f806101b63660048184610490565b8101906101c391906104cb565b915091506101d182826101e5565b5050565b6101096101e061023f565b610271565b6101ee8261028f565b6040516001600160a01b038316907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b905f90a280511561023757610232828261030a565b505050565b6101d161037c565b5f6101a27f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc546001600160a01b031690565b365f80375f80365f845af43d5f803e80801561028b573d5ff35b3d5ffd5b806001600160a01b03163b5f036102c957604051634c9c8ce360e01b81526001600160a01b03821660048201526024015b60405180910390fd5b7f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc80546001600160a01b0319166001600160a01b0392909216919091179055565b60605f80846001600160a01b031684604051610326919061059c565b5f60405180830381855af49150503d805f811461035e576040519150601f19603f3d011682016040523d82523d5f602084013e610363565b606091505b509150915061037385838361039b565b95945050505050565b34156101095760405163b398979f60e01b815260040160405180910390fd5b6060826103b0576103ab826103fa565b6103f3565b81511580156103c757506001600160a01b0384163b155b156103f057604051639996b31560e01b81526001600160a01b03851660048201526024016102c0565b50805b9392505050565b80511561040a5780518082602001fd5b604051630a12f52160e11b815260040160405180910390fd5b602081525f82518060208401528060208501604085015e5f604082850101526040601f19601f83011684010191505092915050565b600181811c9082168061046c57607f821691505b60208210810361048a57634e487b7160e01b5f52602260045260245ffd5b50919050565b5f808585111561049e575f80fd5b838611156104aa575f80fd5b5050820193919092039150565b634e487b7160e01b5f52604160045260245ffd5b5f80604083850312156104dc575f80fd5b82356001600160a01b03811681146104f2575f80fd5b9150602083013567ffffffffffffffff81111561050d575f80fd5b8301601f8101851361051d575f80fd5b803567ffffffffffffffff811115610537576105376104b7565b604051601f8201601f19908116603f0116810167ffffffffffffffff81118282101715610566576105666104b7565b60405281815282820160200187101561057d575f80fd5b816020840160208301375f602083830101528093505050509250929050565b5f82518060208501845e5f92019182525091905056fea264697066735822122068eb3582d94c42ef5e17bc746088d0b2e5458c9bbe06da2bc30decce86f2b96964736f6c634300081a0033608060405234801561000f575f80fd5b506040516104ef3803806104ef83398101604081905261002e916100bb565b806001600160a01b03811661005c57604051631e4fbdf760e01b81525f600482015260240160405180910390fd5b6100658161006c565b50506100e8565b5f80546001600160a01b038381166001600160a01b0319831681178455604051919092169283917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e09190a35050565b5f602082840312156100cb575f80fd5b81516001600160a01b03811681146100e1575f80fd5b9392505050565b6103fa806100f55f395ff3fe608060405260043610610049575f3560e01c8063715018a61461004d5780638da5cb5b146100635780639623609d1461008e578063ad3cb1cc146100a1578063f2fde38b146100de575b5f80fd5b348015610058575f80fd5b506100616100fd565b005b34801561006e575f80fd5b505f546040516001600160a01b0390911681526020015b60405180910390f35b61006161009c366004610260565b610110565b3480156100ac575f80fd5b506100d1604051806040016040528060058152602001640352e302e360dc1b81525081565b6040516100859190610365565b3480156100e9575f80fd5b506100616100f836600461037e565b61017b565b6101056101bd565b61010e5f6101e9565b565b6101186101bd565b60405163278f794360e11b81526001600160a01b03841690634f1ef2869034906101489086908690600401610399565b5f604051808303818588803b15801561015f575f80fd5b505af1158015610171573d5f803e3d5ffd5b5050505050505050565b6101836101bd565b6001600160a01b0381166101b157604051631e4fbdf760e01b81525f60048201526024015b60405180910390fd5b6101ba816101e9565b50565b5f546001600160a01b0316331461010e5760405163118cdaa760e01b81523360048201526024016101a8565b5f80546001600160a01b038381166001600160a01b0319831681178455604051919092169283917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e09190a35050565b6001600160a01b03811681146101ba575f80fd5b634e487b7160e01b5f52604160045260245ffd5b5f805f60608486031215610272575f80fd5b833561027d81610238565b9250602084013561028d81610238565b9150604084013567ffffffffffffffff8111156102a8575f80fd5b8401601f810186136102b8575f80fd5b803567ffffffffffffffff8111156102d2576102d261024c565b604051601f8201601f19908116603f0116810167ffffffffffffffff811182821017156103015761030161024c565b604052818152828201602001881015610318575f80fd5b816020840160208301375f602083830101528093505050509250925092565b5f81518084528060208401602086015e5f602082860101526020601f19601f83011685010191505092915050565b602081525f6103776020830184610337565b9392505050565b5f6020828403121561038e575f80fd5b813561037781610238565b6001600160a01b03831681526040602082018190525f906103bc90830184610337565b94935050505056fea264697066735822122063012ab3c3421087c307802be7295f03bec95db9eea702a4c2db9595befa162464736f6c634300081a0033b53127684a568b3173ae13b9f8a6016e243e63b6e8ee1178d6a717850b5d6103",
139
+ "deployedBytecode": "0x608060405260043610610028575f3560e01c8063514e2d93146100325780638b3240a01461005c575b61003061009f565b005b34801561003d575f80fd5b50610046610113565b6040516100539190610423565b60405180910390f35b348015610067575f80fd5b506040516001600160a01b037f0000000000000000000000000000000000000000000000000000000000000000168152602001610053565b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b0316330361010b575f356001600160e01b03191663278f794360e11b14610101576040516334ad5dbb60e21b815260040160405180910390fd5b6101096101a7565b565b6101096101d5565b60605f805461012190610458565b80601f016020809104026020016040519081016040528092919081815260200182805461014d90610458565b80156101985780601f1061016f57610100808354040283529160200191610198565b820191905f5260205f20905b81548152906001019060200180831161017b57829003601f168201915b5050505050905090565b905090565b5f806101b63660048184610490565b8101906101c391906104cb565b915091506101d182826101e5565b5050565b6101096101e061023f565b610271565b6101ee8261028f565b6040516001600160a01b038316907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b905f90a280511561023757610232828261030a565b505050565b6101d161037c565b5f6101a27f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc546001600160a01b031690565b365f80375f80365f845af43d5f803e80801561028b573d5ff35b3d5ffd5b806001600160a01b03163b5f036102c957604051634c9c8ce360e01b81526001600160a01b03821660048201526024015b60405180910390fd5b7f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc80546001600160a01b0319166001600160a01b0392909216919091179055565b60605f80846001600160a01b031684604051610326919061059c565b5f60405180830381855af49150503d805f811461035e576040519150601f19603f3d011682016040523d82523d5f602084013e610363565b606091505b509150915061037385838361039b565b95945050505050565b34156101095760405163b398979f60e01b815260040160405180910390fd5b6060826103b0576103ab826103fa565b6103f3565b81511580156103c757506001600160a01b0384163b155b156103f057604051639996b31560e01b81526001600160a01b03851660048201526024016102c0565b50805b9392505050565b80511561040a5780518082602001fd5b604051630a12f52160e11b815260040160405180910390fd5b602081525f82518060208401528060208501604085015e5f604082850101526040601f19601f83011684010191505092915050565b600181811c9082168061046c57607f821691505b60208210810361048a57634e487b7160e01b5f52602260045260245ffd5b50919050565b5f808585111561049e575f80fd5b838611156104aa575f80fd5b5050820193919092039150565b634e487b7160e01b5f52604160045260245ffd5b5f80604083850312156104dc575f80fd5b82356001600160a01b03811681146104f2575f80fd5b9150602083013567ffffffffffffffff81111561050d575f80fd5b8301601f8101851361051d575f80fd5b803567ffffffffffffffff811115610537576105376104b7565b604051601f8201601f19908116603f0116810167ffffffffffffffff81118282101715610566576105666104b7565b60405281815282820160200187101561057d575f80fd5b816020840160208301375f602083830101528093505050509250929050565b5f82518060208501845e5f92019182525091905056fea264697066735822122068eb3582d94c42ef5e17bc746088d0b2e5458c9bbe06da2bc30decce86f2b96964736f6c634300081a0033",
127
140
  "linkReferences": {},
128
141
  "deployedLinkReferences": {}
129
142
  }
package/artifacts/contracts/upgradeability/Versionable.sol/Versionable.dbg.json CHANGED
@@ -1,4 +1,4 @@
1
1
  {
2
2
  "_format": "hh-sol-dbg-1",
3
- "buildInfo": "../../../build-info/c00682b5fe2a68467165493f5b572122.json"
3
+ "buildInfo": "../../../build-info/e9e907a9a5511c407d8ab8cf6d463e70.json"
4
4
  }
package/artifacts/contracts/upgradeability/Versionable.sol/Versionable.json CHANGED
@@ -3,6 +3,16 @@
3
3
  "contractName": "Versionable",
4
4
  "sourceName": "contracts/upgradeability/Versionable.sol",
5
5
  "abi": [
6
+ {
7
+ "inputs": [],
8
+ "name": "ErrorVersionableInitializeNotImplemented",
9
+ "type": "error"
10
+ },
11
+ {
12
+ "inputs": [],
13
+ "name": "ErrorVersionableUpgradeNotImplemented",
14
+ "type": "error"
15
+ },
6
16
  {
7
17
  "inputs": [],
8
18
  "name": "InvalidInitialization",
package/contracts/accounting/AccountingService.sol CHANGED
@@ -63,6 +63,19 @@ contract AccountingService is
63
63
  _changeTargetBalance(INCREASE, instanceStore, productNftId, AmountLib.zero(), feeAmount);
64
64
  }
65
65
 
66
+ function increaseProductFeesForPool(
67
+ InstanceStore instanceStore,
68
+ NftId productNftId,
69
+ Amount feeAmount
70
+ )
71
+ external
72
+ virtual
73
+ restricted()
74
+ {
75
+ _checkNftType(productNftId, PRODUCT());
76
+ _changeTargetBalance(INCREASE, instanceStore, productNftId, AmountLib.zero(), feeAmount);
77
+ }
78
+
66
79
 
67
80
  function decreaseProductFees(InstanceStore instanceStore, NftId productNftId, Amount feeAmount)
68
81
  external
@@ -151,9 +164,8 @@ contract AccountingService is
151
164
  Amount feeAmount
152
165
  )
153
166
  public
154
- virtual
155
- // TODO re-enable once role granting is stable and fixed
156
- // restricted()
167
+ virtual
168
+ restricted()
157
169
  {
158
170
  _checkNftType(poolNftId, POOL());
159
171
  _changeTargetBalance(DECREASE, instanceStore, poolNftId, amount, feeAmount);
package/contracts/accounting/IAccountingService.sol CHANGED
@@ -17,9 +17,9 @@ interface IAccountingService is
17
17
  NftId nftId,
18
18
  string feeName,
19
19
  UFixed previousFractionalFee,
20
- uint256 previousFixedFee,
20
+ Amount previousFixedFee,
21
21
  UFixed newFractionalFee,
22
- uint256 newFixedFee
22
+ Amount newFixedFee
23
23
  );
24
24
 
25
25
  function decreaseComponentFees(InstanceStore instanceStore, NftId componentNftId, Amount feeAmount) external;
@@ -27,6 +27,8 @@ interface IAccountingService is
27
27
  function increaseProductFees(InstanceStore instanceStore, NftId productNftId, Amount feeAmount) external;
28
28
  function decreaseProductFees(InstanceStore instanceStore, NftId productNftId, Amount feeAmount) external;
29
29
 
30
+ function increaseProductFeesForPool(InstanceStore instanceStore, NftId productNftId, Amount feeAmount) external;
31
+
30
32
  function increaseDistributionBalance(InstanceStore instanceStore, NftId distributionNftId, Amount amount, Amount feeAmount) external;
31
33
  function decreaseDistributionBalance(InstanceStore instanceStore, NftId distributionNftId, Amount amount, Amount feeAmount) external;
32
34