@etherisc/gif-next 0.0.2-b61b9f6-206 → 0.0.2-b62165c-823

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (390) hide show
  1. package/README.md +31 -3
  2. package/artifacts/contracts/authorization/AccessAdmin.sol/AccessAdmin.dbg.json +1 -1
  3. package/artifacts/contracts/authorization/AccessAdmin.sol/AccessAdmin.json +2 -2
  4. package/artifacts/contracts/authorization/AccessManagerCloneable.sol/AccessManagerCloneable.dbg.json +1 -1
  5. package/artifacts/contracts/authorization/Authorization.sol/Authorization.dbg.json +1 -1
  6. package/artifacts/contracts/authorization/Authorization.sol/Authorization.json +2 -2
  7. package/artifacts/contracts/authorization/IAccess.sol/IAccess.dbg.json +1 -1
  8. package/artifacts/contracts/authorization/IAccessAdmin.sol/IAccessAdmin.dbg.json +1 -1
  9. package/artifacts/contracts/authorization/IAuthorization.sol/IAuthorization.dbg.json +1 -1
  10. package/artifacts/contracts/authorization/IModuleAuthorization.sol/IModuleAuthorization.dbg.json +1 -1
  11. package/artifacts/contracts/authorization/IServiceAuthorization.sol/IServiceAuthorization.dbg.json +1 -1
  12. package/artifacts/contracts/authorization/ModuleAuthorization.sol/ModuleAuthorization.dbg.json +1 -1
  13. package/artifacts/contracts/authorization/ModuleAuthorization.sol/ModuleAuthorization.json +2 -2
  14. package/artifacts/contracts/authorization/ServiceAuthorization.sol/ServiceAuthorization.dbg.json +1 -1
  15. package/artifacts/contracts/authorization/ServiceAuthorization.sol/ServiceAuthorization.json +2 -2
  16. package/artifacts/contracts/distribution/BasicDistribution.sol/BasicDistribution.dbg.json +1 -1
  17. package/artifacts/contracts/distribution/BasicDistribution.sol/BasicDistribution.json +85 -90
  18. package/artifacts/contracts/distribution/BasicDistributionAuthorization.sol/BasicDistributionAuthorization.dbg.json +1 -1
  19. package/artifacts/contracts/distribution/BasicDistributionAuthorization.sol/BasicDistributionAuthorization.json +16 -16
  20. package/artifacts/contracts/distribution/Distribution.sol/Distribution.dbg.json +1 -1
  21. package/artifacts/contracts/distribution/Distribution.sol/Distribution.json +43 -64
  22. package/artifacts/contracts/distribution/DistributionService.sol/DistributionService.dbg.json +1 -1
  23. package/artifacts/contracts/distribution/DistributionService.sol/DistributionService.json +223 -105
  24. package/artifacts/contracts/distribution/DistributionServiceManager.sol/DistributionServiceManager.dbg.json +1 -1
  25. package/artifacts/contracts/distribution/DistributionServiceManager.sol/DistributionServiceManager.json +50 -38
  26. package/artifacts/contracts/distribution/IDistributionComponent.sol/IDistributionComponent.dbg.json +1 -1
  27. package/artifacts/contracts/distribution/IDistributionComponent.sol/IDistributionComponent.json +43 -26
  28. package/artifacts/contracts/distribution/IDistributionService.sol/IDistributionService.dbg.json +1 -1
  29. package/artifacts/contracts/distribution/IDistributionService.sol/IDistributionService.json +120 -31
  30. package/artifacts/contracts/instance/BundleSet.sol/BundleSet.dbg.json +4 -0
  31. package/artifacts/contracts/instance/BundleSet.sol/BundleSet.json +703 -0
  32. package/artifacts/contracts/instance/IInstance.sol/IInstance.dbg.json +1 -1
  33. package/artifacts/contracts/instance/IInstance.sol/IInstance.json +6 -6
  34. package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.dbg.json +1 -1
  35. package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.json +5 -5
  36. package/artifacts/contracts/instance/Instance.sol/Instance.dbg.json +1 -1
  37. package/artifacts/contracts/instance/Instance.sol/Instance.json +9 -9
  38. package/artifacts/contracts/instance/InstanceAdmin.sol/InstanceAdmin.dbg.json +1 -1
  39. package/artifacts/contracts/instance/InstanceAdmin.sol/InstanceAdmin.json +75 -75
  40. package/artifacts/contracts/instance/InstanceAuthorizationV3.sol/InstanceAuthorizationV3.dbg.json +1 -1
  41. package/artifacts/contracts/instance/InstanceAuthorizationV3.sol/InstanceAuthorizationV3.json +31 -31
  42. package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.dbg.json +1 -1
  43. package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.json +213 -117
  44. package/artifacts/contracts/instance/InstanceService.sol/InstanceService.dbg.json +1 -1
  45. package/artifacts/contracts/instance/InstanceService.sol/InstanceService.json +21 -21
  46. package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.dbg.json +1 -1
  47. package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.json +9 -9
  48. package/artifacts/contracts/instance/InstanceStore.sol/InstanceStore.dbg.json +1 -1
  49. package/artifacts/contracts/instance/InstanceStore.sol/InstanceStore.json +315 -194
  50. package/artifacts/contracts/instance/base/BalanceStore.sol/BalanceStore.dbg.json +1 -1
  51. package/artifacts/contracts/instance/base/BalanceStore.sol/BalanceStore.json +2 -2
  52. package/artifacts/contracts/instance/base/Cloneable.sol/Cloneable.dbg.json +1 -1
  53. package/artifacts/contracts/instance/base/ObjectCounter.sol/ObjectCounter.dbg.json +1 -1
  54. package/artifacts/contracts/instance/base/ObjectCounter.sol/ObjectCounter.json +2 -2
  55. package/artifacts/contracts/instance/base/ObjectLifecycle.sol/ObjectLifecycle.dbg.json +1 -1
  56. package/artifacts/contracts/instance/base/ObjectLifecycle.sol/ObjectLifecycle.json +2 -2
  57. package/artifacts/contracts/instance/base/ObjectSet.sol/ObjectSet.dbg.json +4 -0
  58. package/artifacts/contracts/instance/base/{ObjectManager.sol/ObjectManager.json → ObjectSet.sol/ObjectSet.json} +6 -6
  59. package/artifacts/contracts/instance/module/IAccess.sol/IAccess.dbg.json +1 -1
  60. package/artifacts/contracts/instance/module/IBundle.sol/IBundle.dbg.json +1 -1
  61. package/artifacts/contracts/instance/module/IComponents.sol/IComponents.dbg.json +1 -1
  62. package/artifacts/contracts/instance/module/IDistribution.sol/IDistribution.dbg.json +1 -1
  63. package/artifacts/contracts/instance/module/IPolicy.sol/IPolicy.dbg.json +1 -1
  64. package/artifacts/contracts/instance/module/IRisk.sol/IRisk.dbg.json +1 -1
  65. package/artifacts/contracts/mock/Dip.sol/Dip.dbg.json +1 -1
  66. package/artifacts/contracts/mock/Dip.sol/Dip.json +2 -2
  67. package/artifacts/contracts/oracle/BasicOracle.sol/BasicOracle.dbg.json +1 -1
  68. package/artifacts/contracts/oracle/BasicOracle.sol/BasicOracle.json +59 -77
  69. package/artifacts/contracts/oracle/BasicOracleAuthorization.sol/BasicOracleAuthorization.dbg.json +1 -1
  70. package/artifacts/contracts/oracle/BasicOracleAuthorization.sol/BasicOracleAuthorization.json +2 -2
  71. package/artifacts/contracts/oracle/IOracle.sol/IOracle.dbg.json +1 -1
  72. package/artifacts/contracts/oracle/IOracleComponent.sol/IOracleComponent.dbg.json +1 -1
  73. package/artifacts/contracts/oracle/IOracleComponent.sol/IOracleComponent.json +30 -26
  74. package/artifacts/contracts/oracle/IOracleService.sol/IOracleService.dbg.json +1 -1
  75. package/artifacts/contracts/oracle/Oracle.sol/Oracle.dbg.json +1 -1
  76. package/artifacts/contracts/oracle/Oracle.sol/Oracle.json +27 -61
  77. package/artifacts/contracts/oracle/OracleService.sol/OracleService.dbg.json +1 -1
  78. package/artifacts/contracts/oracle/OracleService.sol/OracleService.json +2 -2
  79. package/artifacts/contracts/oracle/OracleServiceManager.sol/OracleServiceManager.dbg.json +1 -1
  80. package/artifacts/contracts/oracle/OracleServiceManager.sol/OracleServiceManager.json +2 -2
  81. package/artifacts/contracts/pool/BasicPool.sol/BasicPool.dbg.json +1 -1
  82. package/artifacts/contracts/pool/BasicPool.sol/BasicPool.json +54 -125
  83. package/artifacts/contracts/pool/BasicPoolAuthorization.sol/BasicPoolAuthorization.dbg.json +1 -1
  84. package/artifacts/contracts/pool/BasicPoolAuthorization.sol/BasicPoolAuthorization.json +16 -16
  85. package/artifacts/contracts/pool/BundleService.sol/BundleService.dbg.json +1 -1
  86. package/artifacts/contracts/pool/BundleService.sol/BundleService.json +402 -62
  87. package/artifacts/contracts/pool/BundleServiceManager.sol/BundleServiceManager.dbg.json +1 -1
  88. package/artifacts/contracts/pool/BundleServiceManager.sol/BundleServiceManager.json +94 -26
  89. package/artifacts/contracts/pool/IBundleService.sol/IBundleService.dbg.json +1 -1
  90. package/artifacts/contracts/pool/IBundleService.sol/IBundleService.json +205 -1
  91. package/artifacts/contracts/pool/IPoolComponent.sol/IPoolComponent.dbg.json +1 -1
  92. package/artifacts/contracts/pool/IPoolComponent.sol/IPoolComponent.json +44 -83
  93. package/artifacts/contracts/pool/IPoolService.sol/IPoolService.dbg.json +1 -1
  94. package/artifacts/contracts/pool/IPoolService.sol/IPoolService.json +220 -90
  95. package/artifacts/contracts/pool/Pool.sol/Pool.dbg.json +1 -1
  96. package/artifacts/contracts/pool/Pool.sol/Pool.json +44 -121
  97. package/artifacts/contracts/pool/PoolService.sol/PoolService.dbg.json +1 -1
  98. package/artifacts/contracts/pool/PoolService.sol/PoolService.json +264 -126
  99. package/artifacts/contracts/pool/PoolServiceManager.sol/PoolServiceManager.dbg.json +1 -1
  100. package/artifacts/contracts/pool/PoolServiceManager.sol/PoolServiceManager.json +23 -19
  101. package/artifacts/contracts/product/ApplicationService.sol/ApplicationService.dbg.json +1 -1
  102. package/artifacts/contracts/product/ApplicationService.sol/ApplicationService.json +21 -32
  103. package/artifacts/contracts/product/ApplicationServiceManager.sol/ApplicationServiceManager.dbg.json +1 -1
  104. package/artifacts/contracts/product/ApplicationServiceManager.sol/ApplicationServiceManager.json +9 -17
  105. package/artifacts/contracts/product/BasicProduct.sol/BasicProduct.dbg.json +1 -1
  106. package/artifacts/contracts/product/BasicProduct.sol/BasicProduct.json +22 -67
  107. package/artifacts/contracts/product/BasicProductAuthorization.sol/BasicProductAuthorization.dbg.json +1 -1
  108. package/artifacts/contracts/product/BasicProductAuthorization.sol/BasicProductAuthorization.json +16 -16
  109. package/artifacts/contracts/product/ClaimService.sol/ClaimService.dbg.json +1 -1
  110. package/artifacts/contracts/product/ClaimService.sol/ClaimService.json +74 -58
  111. package/artifacts/contracts/product/ClaimServiceManager.sol/ClaimServiceManager.dbg.json +1 -1
  112. package/artifacts/contracts/product/ClaimServiceManager.sol/ClaimServiceManager.json +30 -30
  113. package/artifacts/contracts/product/IApplicationService.sol/IApplicationService.dbg.json +1 -1
  114. package/artifacts/contracts/product/IApplicationService.sol/IApplicationService.json +5 -0
  115. package/artifacts/contracts/product/IClaimService.sol/IClaimService.dbg.json +1 -1
  116. package/artifacts/contracts/product/IClaimService.sol/IClaimService.json +16 -0
  117. package/artifacts/contracts/product/IPolicyService.sol/IPolicyService.dbg.json +1 -1
  118. package/artifacts/contracts/product/IPolicyService.sol/IPolicyService.json +183 -108
  119. package/artifacts/contracts/product/IPricingService.sol/IPricingService.dbg.json +1 -1
  120. package/artifacts/contracts/product/IPricingService.sol/IPricingService.json +43 -43
  121. package/artifacts/contracts/product/IProductComponent.sol/IProductComponent.dbg.json +1 -1
  122. package/artifacts/contracts/product/IProductComponent.sol/IProductComponent.json +19 -26
  123. package/artifacts/contracts/product/IProductService.sol/IProductService.dbg.json +1 -1
  124. package/artifacts/contracts/product/PolicyService.sol/PolicyService.dbg.json +1 -1
  125. package/artifacts/contracts/product/PolicyService.sol/PolicyService.json +235 -179
  126. package/artifacts/contracts/product/PolicyServiceManager.sol/PolicyServiceManager.dbg.json +1 -1
  127. package/artifacts/contracts/product/PolicyServiceManager.sol/PolicyServiceManager.json +32 -32
  128. package/artifacts/contracts/product/PricingService.sol/PricingService.dbg.json +1 -1
  129. package/artifacts/contracts/product/PricingService.sol/PricingService.json +107 -147
  130. package/artifacts/contracts/product/PricingServiceManager.sol/PricingServiceManager.dbg.json +1 -1
  131. package/artifacts/contracts/product/PricingServiceManager.sol/PricingServiceManager.json +40 -60
  132. package/artifacts/contracts/product/Product.sol/Product.dbg.json +1 -1
  133. package/artifacts/contracts/product/Product.sol/Product.json +22 -67
  134. package/artifacts/contracts/product/ProductService.sol/ProductService.dbg.json +1 -1
  135. package/artifacts/contracts/product/ProductService.sol/ProductService.json +2 -2
  136. package/artifacts/contracts/product/ProductServiceManager.sol/ProductServiceManager.dbg.json +1 -1
  137. package/artifacts/contracts/product/ProductServiceManager.sol/ProductServiceManager.json +2 -2
  138. package/artifacts/contracts/registry/ChainNft.sol/ChainNft.dbg.json +1 -1
  139. package/artifacts/contracts/registry/ChainNft.sol/ChainNft.json +2 -2
  140. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.dbg.json +1 -1
  141. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.json +50 -2
  142. package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.dbg.json +1 -1
  143. package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.json +0 -183
  144. package/artifacts/contracts/registry/ITransferInterceptor.sol/ITransferInterceptor.dbg.json +1 -1
  145. package/artifacts/contracts/registry/Registry.sol/Registry.dbg.json +1 -1
  146. package/artifacts/contracts/registry/Registry.sol/Registry.json +95 -23
  147. package/artifacts/contracts/registry/RegistryAdmin.sol/RegistryAdmin.dbg.json +1 -1
  148. package/artifacts/contracts/registry/RegistryAdmin.sol/RegistryAdmin.json +88 -88
  149. package/artifacts/contracts/registry/RegistryService.sol/RegistryService.dbg.json +1 -1
  150. package/artifacts/contracts/registry/RegistryService.sol/RegistryService.json +2 -2
  151. package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.dbg.json +1 -1
  152. package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.json +2 -2
  153. package/artifacts/contracts/registry/ReleaseLifecycle.sol/ReleaseLifecycle.dbg.json +1 -1
  154. package/artifacts/contracts/registry/ReleaseLifecycle.sol/ReleaseLifecycle.json +2 -2
  155. package/artifacts/contracts/registry/ReleaseRegistry.sol/ReleaseRegistry.dbg.json +4 -0
  156. package/artifacts/contracts/registry/ReleaseRegistry.sol/ReleaseRegistry.json +1159 -0
  157. package/artifacts/contracts/registry/ServiceAuthorizationV3.sol/ServiceAuthorizationV3.dbg.json +1 -1
  158. package/artifacts/contracts/registry/ServiceAuthorizationV3.sol/ServiceAuthorizationV3.json +6 -6
  159. package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.dbg.json +1 -1
  160. package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.json +2 -2
  161. package/artifacts/contracts/shared/Component.sol/Component.dbg.json +1 -1
  162. package/artifacts/contracts/shared/Component.sol/Component.json +0 -64
  163. package/artifacts/contracts/shared/ComponentService.sol/ComponentService.dbg.json +1 -1
  164. package/artifacts/contracts/shared/ComponentService.sol/ComponentService.json +255 -62
  165. package/artifacts/contracts/shared/ComponentServiceManager.sol/ComponentServiceManager.dbg.json +1 -1
  166. package/artifacts/contracts/shared/ComponentServiceManager.sol/ComponentServiceManager.json +52 -32
  167. package/artifacts/contracts/shared/ComponentVerifyingService.sol/ComponentVerifyingService.dbg.json +1 -1
  168. package/artifacts/contracts/shared/IComponent.sol/IComponent.dbg.json +1 -1
  169. package/artifacts/contracts/shared/IComponent.sol/IComponent.json +0 -26
  170. package/artifacts/contracts/shared/IComponentService.sol/IComponentService.dbg.json +1 -1
  171. package/artifacts/contracts/shared/IComponentService.sol/IComponentService.json +153 -0
  172. package/artifacts/contracts/shared/IInstanceLinkedComponent.sol/IInstanceLinkedComponent.dbg.json +1 -1
  173. package/artifacts/contracts/shared/IInstanceLinkedComponent.sol/IInstanceLinkedComponent.json +19 -26
  174. package/artifacts/contracts/shared/IKeyValueStore.sol/IKeyValueStore.dbg.json +1 -1
  175. package/artifacts/contracts/shared/ILifecycle.sol/ILifecycle.dbg.json +1 -1
  176. package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.dbg.json +1 -1
  177. package/artifacts/contracts/shared/IPolicyHolder.sol/IPolicyHolder.dbg.json +1 -1
  178. package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.dbg.json +1 -1
  179. package/artifacts/contracts/shared/IRegistryLinked.sol/IRegistryLinked.dbg.json +1 -1
  180. package/artifacts/contracts/shared/IService.sol/IService.dbg.json +1 -1
  181. package/artifacts/contracts/shared/InitializableCustom.sol/InitializableCustom.dbg.json +1 -1
  182. package/artifacts/contracts/shared/InitializableERC165.sol/InitializableERC165.dbg.json +4 -0
  183. package/artifacts/contracts/shared/{ERC165.sol/ERC165.json → InitializableERC165.sol/InitializableERC165.json} +4 -4
  184. package/artifacts/contracts/shared/InstanceLinkedComponent.sol/InstanceLinkedComponent.dbg.json +1 -1
  185. package/artifacts/contracts/shared/InstanceLinkedComponent.sol/InstanceLinkedComponent.json +19 -64
  186. package/artifacts/contracts/shared/KeyValueStore.sol/KeyValueStore.dbg.json +1 -1
  187. package/artifacts/contracts/shared/Lifecycle.sol/Lifecycle.dbg.json +1 -1
  188. package/artifacts/contracts/shared/NftIdSet.sol/NftIdSet.dbg.json +4 -0
  189. package/artifacts/contracts/shared/{NftIdSetManager.sol/NftIdSetManager.json → NftIdSet.sol/NftIdSet.json} +4 -4
  190. package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.dbg.json +1 -1
  191. package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.json +2 -2
  192. package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.dbg.json +1 -1
  193. package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.json +2 -2
  194. package/artifacts/contracts/shared/Registerable.sol/Registerable.dbg.json +1 -1
  195. package/artifacts/contracts/shared/Registerable.sol/Registerable.json +2 -2
  196. package/artifacts/contracts/shared/RegistryLinked.sol/RegistryLinked.dbg.json +1 -1
  197. package/artifacts/contracts/shared/RegistryLinked.sol/RegistryLinked.json +2 -2
  198. package/artifacts/contracts/shared/Service.sol/Service.dbg.json +1 -1
  199. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.dbg.json +1 -1
  200. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.json +330 -11
  201. package/artifacts/contracts/shared/TokenHandlerDeployerLib.sol/TokenHandlerDeployerLib.dbg.json +4 -0
  202. package/artifacts/contracts/shared/TokenHandlerDeployerLib.sol/TokenHandlerDeployerLib.json +108 -0
  203. package/artifacts/contracts/staking/IStaking.sol/IStaking.dbg.json +1 -1
  204. package/artifacts/contracts/staking/IStaking.sol/IStaking.json +0 -26
  205. package/artifacts/contracts/staking/IStakingService.sol/IStakingService.dbg.json +1 -1
  206. package/artifacts/contracts/staking/StakeManagerLib.sol/StakeManagerLib.dbg.json +1 -1
  207. package/artifacts/contracts/staking/StakeManagerLib.sol/StakeManagerLib.json +40 -113
  208. package/artifacts/contracts/staking/Staking.sol/Staking.dbg.json +1 -1
  209. package/artifacts/contracts/staking/Staking.sol/Staking.json +48 -112
  210. package/artifacts/contracts/staking/StakingLifecycle.sol/StakingLifecycle.dbg.json +1 -1
  211. package/artifacts/contracts/staking/StakingLifecycle.sol/StakingLifecycle.json +2 -2
  212. package/artifacts/contracts/staking/StakingManager.sol/StakingManager.dbg.json +1 -1
  213. package/artifacts/contracts/staking/StakingManager.sol/StakingManager.json +25 -25
  214. package/artifacts/contracts/staking/StakingReader.sol/StakingReader.dbg.json +1 -1
  215. package/artifacts/contracts/staking/StakingReader.sol/StakingReader.json +6 -6
  216. package/artifacts/contracts/staking/StakingService.sol/StakingService.dbg.json +1 -1
  217. package/artifacts/contracts/staking/StakingService.sol/StakingService.json +22 -22
  218. package/artifacts/contracts/staking/StakingServiceManager.sol/StakingServiceManager.dbg.json +1 -1
  219. package/artifacts/contracts/staking/StakingServiceManager.sol/StakingServiceManager.json +12 -12
  220. package/artifacts/contracts/staking/StakingStore.sol/StakingStore.dbg.json +1 -1
  221. package/artifacts/contracts/staking/StakingStore.sol/StakingStore.json +92 -87
  222. package/artifacts/contracts/staking/TargetManagerLib.sol/TargetManagerLib.dbg.json +1 -1
  223. package/artifacts/contracts/staking/TargetManagerLib.sol/TargetManagerLib.json +25 -20
  224. package/artifacts/contracts/type/AddressSet.sol/LibAddressSet.dbg.json +1 -1
  225. package/artifacts/contracts/type/Amount.sol/AmountLib.dbg.json +1 -1
  226. package/artifacts/contracts/type/Amount.sol/AmountLib.json +37 -8
  227. package/artifacts/contracts/type/Blocknumber.sol/BlocknumberLib.dbg.json +1 -1
  228. package/artifacts/contracts/type/Blocknumber.sol/BlocknumberLib.json +2 -2
  229. package/artifacts/contracts/type/ClaimId.sol/ClaimIdLib.dbg.json +1 -1
  230. package/artifacts/contracts/type/ClaimId.sol/ClaimIdLib.json +2 -2
  231. package/artifacts/contracts/type/DistributorType.sol/DistributorTypeLib.dbg.json +1 -1
  232. package/artifacts/contracts/type/DistributorType.sol/DistributorTypeLib.json +2 -2
  233. package/artifacts/contracts/type/Fee.sol/FeeLib.dbg.json +1 -1
  234. package/artifacts/contracts/type/Fee.sol/FeeLib.json +7 -2
  235. package/artifacts/contracts/type/Key32.sol/Key32Lib.dbg.json +1 -1
  236. package/artifacts/contracts/type/Key32.sol/Key32Lib.json +2 -2
  237. package/artifacts/contracts/type/NftId.sol/NftIdLib.dbg.json +1 -1
  238. package/artifacts/contracts/type/NftId.sol/NftIdLib.json +2 -2
  239. package/artifacts/contracts/type/NftIdSet.sol/LibNftIdSet.dbg.json +1 -1
  240. package/artifacts/contracts/type/NftIdSet.sol/LibNftIdSet.json +2 -2
  241. package/artifacts/contracts/type/ObjectType.sol/ObjectTypeLib.dbg.json +1 -1
  242. package/artifacts/contracts/type/ObjectType.sol/ObjectTypeLib.json +2 -2
  243. package/artifacts/contracts/type/PayoutId.sol/PayoutIdLib.dbg.json +1 -1
  244. package/artifacts/contracts/type/PayoutId.sol/PayoutIdLib.json +2 -2
  245. package/artifacts/contracts/type/Referral.sol/ReferralLib.dbg.json +1 -1
  246. package/artifacts/contracts/type/Referral.sol/ReferralLib.json +2 -2
  247. package/artifacts/contracts/type/RequestId.sol/RequestIdLib.dbg.json +1 -1
  248. package/artifacts/contracts/type/RequestId.sol/RequestIdLib.json +2 -2
  249. package/artifacts/contracts/type/RiskId.sol/RiskIdLib.dbg.json +1 -1
  250. package/artifacts/contracts/type/RiskId.sol/RiskIdLib.json +2 -2
  251. package/artifacts/contracts/type/RoleId.sol/RoleIdLib.dbg.json +1 -1
  252. package/artifacts/contracts/type/RoleId.sol/RoleIdLib.json +2 -2
  253. package/artifacts/contracts/type/Seconds.sol/SecondsLib.dbg.json +1 -1
  254. package/artifacts/contracts/type/Seconds.sol/SecondsLib.json +26 -2
  255. package/artifacts/contracts/type/Selector.sol/SelectorLib.dbg.json +1 -1
  256. package/artifacts/contracts/type/Selector.sol/SelectorSetLib.dbg.json +1 -1
  257. package/artifacts/contracts/type/StateId.sol/StateIdLib.dbg.json +1 -1
  258. package/artifacts/contracts/type/String.sol/StrLib.dbg.json +1 -1
  259. package/artifacts/contracts/type/Timestamp.sol/TimestampLib.dbg.json +1 -1
  260. package/artifacts/contracts/type/Timestamp.sol/TimestampLib.json +23 -4
  261. package/artifacts/contracts/type/UFixed.sol/MathLib.dbg.json +1 -1
  262. package/artifacts/contracts/type/UFixed.sol/MathLib.json +9 -3
  263. package/artifacts/contracts/type/UFixed.sol/UFixedLib.dbg.json +1 -1
  264. package/artifacts/contracts/type/UFixed.sol/UFixedLib.json +39 -2
  265. package/artifacts/contracts/type/Version.sol/VersionLib.dbg.json +1 -1
  266. package/artifacts/contracts/type/Version.sol/VersionLib.json +2 -2
  267. package/artifacts/contracts/type/Version.sol/VersionPartLib.dbg.json +1 -1
  268. package/artifacts/contracts/type/Version.sol/VersionPartLib.json +21 -2
  269. package/artifacts/contracts/upgradeability/IVersionable.sol/IVersionable.dbg.json +4 -0
  270. package/artifacts/contracts/{shared → upgradeability}/IVersionable.sol/IVersionable.json +1 -1
  271. package/artifacts/contracts/upgradeability/ProxyManager.sol/ProxyManager.dbg.json +4 -0
  272. package/artifacts/contracts/{shared → upgradeability}/ProxyManager.sol/ProxyManager.json +3 -3
  273. package/artifacts/contracts/upgradeability/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.dbg.json +4 -0
  274. package/artifacts/contracts/{shared → upgradeability}/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.json +3 -3
  275. package/artifacts/contracts/upgradeability/Versionable.sol/Versionable.dbg.json +4 -0
  276. package/artifacts/contracts/{shared → upgradeability}/Versionable.sol/Versionable.json +1 -1
  277. package/contracts/authorization/Authorization.sol +0 -1
  278. package/contracts/distribution/BasicDistribution.sol +4 -15
  279. package/contracts/distribution/BasicDistributionAuthorization.sol +5 -1
  280. package/contracts/distribution/Distribution.sol +22 -10
  281. package/contracts/distribution/DistributionService.sol +67 -33
  282. package/contracts/distribution/DistributionServiceManager.sol +2 -5
  283. package/contracts/distribution/IDistributionComponent.sol +8 -4
  284. package/contracts/distribution/IDistributionService.sol +18 -2
  285. package/contracts/instance/{BundleManager.sol → BundleSet.sol} +23 -23
  286. package/contracts/instance/IInstance.sol +5 -5
  287. package/contracts/instance/IInstanceService.sol +5 -5
  288. package/contracts/instance/Instance.sol +4 -4
  289. package/contracts/instance/InstanceAdmin.sol +25 -6
  290. package/contracts/instance/InstanceAuthorizationV3.sol +15 -14
  291. package/contracts/instance/InstanceReader.sol +24 -7
  292. package/contracts/instance/InstanceService.sol +60 -36
  293. package/contracts/instance/InstanceServiceManager.sol +2 -6
  294. package/contracts/instance/InstanceStore.sol +16 -1
  295. package/contracts/instance/base/ObjectLifecycle.sol +8 -4
  296. package/contracts/instance/base/{ObjectManager.sol → ObjectSet.sol} +5 -5
  297. package/contracts/instance/module/IBundle.sol +1 -1
  298. package/contracts/instance/module/IComponents.sol +1 -7
  299. package/contracts/instance/module/IDistribution.sol +0 -1
  300. package/contracts/instance/module/IPolicy.sol +17 -17
  301. package/contracts/mock/Dip.sol +1 -1
  302. package/contracts/oracle/IOracleComponent.sol +2 -1
  303. package/contracts/oracle/Oracle.sol +15 -6
  304. package/contracts/oracle/OracleServiceManager.sol +2 -5
  305. package/contracts/pool/BasicPool.sol +7 -5
  306. package/contracts/pool/BasicPoolAuthorization.sol +11 -2
  307. package/contracts/pool/BundleService.sol +189 -47
  308. package/contracts/pool/BundleServiceManager.sol +2 -5
  309. package/contracts/pool/IBundleService.sol +33 -5
  310. package/contracts/pool/IPoolComponent.sol +6 -0
  311. package/contracts/pool/IPoolService.sol +36 -26
  312. package/contracts/pool/Pool.sol +31 -16
  313. package/contracts/pool/PoolService.sol +161 -104
  314. package/contracts/pool/PoolServiceManager.sol +2 -5
  315. package/contracts/product/ApplicationService.sol +51 -56
  316. package/contracts/product/ApplicationServiceManager.sol +2 -2
  317. package/contracts/product/BasicProduct.sol +3 -33
  318. package/contracts/product/BasicProductAuthorization.sol +3 -0
  319. package/contracts/product/ClaimService.sol +13 -39
  320. package/contracts/product/ClaimServiceManager.sol +2 -2
  321. package/contracts/product/IApplicationService.sol +1 -0
  322. package/contracts/product/IClaimService.sol +1 -0
  323. package/contracts/product/IPolicyService.sol +25 -30
  324. package/contracts/product/IPricingService.sol +7 -7
  325. package/contracts/product/IProductComponent.sol +1 -1
  326. package/contracts/product/IProductService.sol +1 -0
  327. package/contracts/product/PolicyService.sol +272 -171
  328. package/contracts/product/PolicyServiceManager.sol +2 -5
  329. package/contracts/product/PricingService.sol +42 -41
  330. package/contracts/product/PricingServiceManager.sol +2 -5
  331. package/contracts/product/Product.sol +33 -19
  332. package/contracts/product/ProductService.sol +7 -32
  333. package/contracts/product/ProductServiceManager.sol +2 -5
  334. package/contracts/registry/IRegistry.sol +26 -13
  335. package/contracts/registry/IRegistryService.sol +6 -6
  336. package/contracts/registry/Registry.sol +80 -82
  337. package/contracts/registry/RegistryAdmin.sol +33 -24
  338. package/contracts/registry/RegistryService.sol +4 -18
  339. package/contracts/registry/RegistryServiceManager.sol +2 -2
  340. package/contracts/registry/{ReleaseManager.sol → ReleaseRegistry.sol} +48 -50
  341. package/contracts/registry/ServiceAuthorizationV3.sol +7 -8
  342. package/contracts/registry/TokenRegistry.sol +2 -2
  343. package/contracts/shared/Component.sol +24 -37
  344. package/contracts/shared/ComponentService.sol +81 -21
  345. package/contracts/shared/ComponentServiceManager.sol +2 -2
  346. package/contracts/shared/IComponent.sol +4 -4
  347. package/contracts/shared/IComponentService.sol +15 -9
  348. package/contracts/shared/IInstanceLinkedComponent.sol +9 -3
  349. package/contracts/shared/IService.sol +1 -1
  350. package/contracts/shared/{ERC165.sol → InitializableERC165.sol} +1 -1
  351. package/contracts/shared/InstanceLinkedComponent.sol +21 -0
  352. package/contracts/shared/{NftIdSetManager.sol → NftIdSet.sol} +1 -1
  353. package/contracts/shared/NftOwnable.sol +2 -2
  354. package/contracts/shared/PolicyHolder.sol +2 -5
  355. package/contracts/shared/Service.sol +3 -4
  356. package/contracts/shared/TokenHandler.sol +100 -19
  357. package/contracts/shared/TokenHandlerDeployerLib.sol +12 -0
  358. package/contracts/staking/IStaking.sol +1 -2
  359. package/contracts/staking/IStakingService.sol +12 -5
  360. package/contracts/staking/StakeManagerLib.sol +0 -25
  361. package/contracts/staking/Staking.sol +21 -37
  362. package/contracts/staking/StakingManager.sol +2 -6
  363. package/contracts/staking/StakingReader.sol +12 -16
  364. package/contracts/staking/StakingService.sol +8 -12
  365. package/contracts/staking/StakingServiceManager.sol +2 -2
  366. package/contracts/staking/StakingStore.sol +12 -22
  367. package/contracts/type/Amount.sol +12 -5
  368. package/contracts/type/Blocknumber.sol +7 -1
  369. package/contracts/type/ObjectType.sol +18 -18
  370. package/contracts/type/Referral.sol +1 -0
  371. package/contracts/type/Seconds.sol +13 -1
  372. package/contracts/type/Timestamp.sol +11 -1
  373. package/contracts/type/UFixed.sol +29 -10
  374. package/contracts/type/Version.sol +3 -1
  375. package/contracts/{shared → upgradeability}/ProxyManager.sol +3 -4
  376. package/contracts/{shared → upgradeability}/UpgradableProxyWithAdmin.sol +1 -3
  377. package/package.json +3 -3
  378. package/artifacts/contracts/instance/BundleManager.sol/BundleManager.dbg.json +0 -4
  379. package/artifacts/contracts/instance/BundleManager.sol/BundleManager.json +0 -703
  380. package/artifacts/contracts/instance/base/ObjectManager.sol/ObjectManager.dbg.json +0 -4
  381. package/artifacts/contracts/registry/ReleaseManager.sol/ReleaseManager.dbg.json +0 -4
  382. package/artifacts/contracts/registry/ReleaseManager.sol/ReleaseManager.json +0 -1159
  383. package/artifacts/contracts/shared/ERC165.sol/ERC165.dbg.json +0 -4
  384. package/artifacts/contracts/shared/IVersionable.sol/IVersionable.dbg.json +0 -4
  385. package/artifacts/contracts/shared/NftIdSetManager.sol/NftIdSetManager.dbg.json +0 -4
  386. package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.dbg.json +0 -4
  387. package/artifacts/contracts/shared/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.dbg.json +0 -4
  388. package/artifacts/contracts/shared/Versionable.sol/Versionable.dbg.json +0 -4
  389. /package/contracts/{shared → upgradeability}/IVersionable.sol +0 -0
  390. /package/contracts/{shared → upgradeability}/Versionable.sol +0 -0
package/artifacts/contracts/type/Version.sol/VersionLib.json CHANGED
@@ -170,8 +170,8 @@
170
170
  "type": "function"
171
171
  }
172
172
  ],
173
- "bytecode": "0x610375610034600b8282823980515f1a607314602857634e487b7160e01b5f525f60045260245ffd5b305f52607381538281f3fe7300000000000000000000000000000000000000003014608060405260043610610090575f3560e01c80638e4ad86c116100635780638e4ad86c1461011d57806394aa449c14610140578063a123b37c1461014e578063c9e66e2914610175575f80fd5b806304b8f6c5146100945780632efe0113146100af57806349a7111a146100c257806355601007146100f9575b5f80fd5b5f5b60405162ffffff90911681526020015b60405180910390f35b6100966100bd366004610267565b61018c565b6100d56100d0366004610290565b61022c565b6040805160ff948516815292841660208401529216918101919091526060016100a6565b61010f610107366004610290565b62ffffff1690565b6040519081526020016100a6565b61012e61012b3660046102b9565b90565b60405160ff90911681526020016100a6565b61009661012b3660046102d0565b61015c610107366004610290565b60405167ffffffffffffffff90911681526020016100a6565b61012e610183366004610290565b60101c60ff1690565b5f6101008410801561019f575061010083105b80156101ac575061010082105b6102075760405162461bcd60e51b815260206004820152602260248201527f4552524f523a5652532d3031303a56455253494f4e5f504152545f544f4f5f42604482015261494760f01b606482015260840160405180910390fd5b8161021a600885901b601087901b61030b565b610224919061030b565b949350505050565b5f80808360ff601082901c166102428383610324565b915061ffff600883901c165f6102588185610324565b92989197509195509350505050565b5f805f60608486031215610279575f80fd5b505081359360208301359350604090920135919050565b5f602082840312156102a0575f80fd5b813562ffffff811681146102b2575f80fd5b9392505050565b5f602082840312156102c9575f80fd5b5035919050565b5f602082840312156102e0575f80fd5b813567ffffffffffffffff811681146102b2575f80fd5b634e487b7160e01b5f52601160045260245ffd5b8082018082111561031e5761031e6102f7565b92915050565b62ffffff828116828216039081111561031e5761031e6102f756fea2646970667358221220374a4a729de468f3940ff47331d0d3d12edb8d24fd5e103ec67f0f30abb0121f64736f6c634300081a0033",
174
- "deployedBytecode": "0x7300000000000000000000000000000000000000003014608060405260043610610090575f3560e01c80638e4ad86c116100635780638e4ad86c1461011d57806394aa449c14610140578063a123b37c1461014e578063c9e66e2914610175575f80fd5b806304b8f6c5146100945780632efe0113146100af57806349a7111a146100c257806355601007146100f9575b5f80fd5b5f5b60405162ffffff90911681526020015b60405180910390f35b6100966100bd366004610267565b61018c565b6100d56100d0366004610290565b61022c565b6040805160ff948516815292841660208401529216918101919091526060016100a6565b61010f610107366004610290565b62ffffff1690565b6040519081526020016100a6565b61012e61012b3660046102b9565b90565b60405160ff90911681526020016100a6565b61009661012b3660046102d0565b61015c610107366004610290565b60405167ffffffffffffffff90911681526020016100a6565b61012e610183366004610290565b60101c60ff1690565b5f6101008410801561019f575061010083105b80156101ac575061010082105b6102075760405162461bcd60e51b815260206004820152602260248201527f4552524f523a5652532d3031303a56455253494f4e5f504152545f544f4f5f42604482015261494760f01b606482015260840160405180910390fd5b8161021a600885901b601087901b61030b565b610224919061030b565b949350505050565b5f80808360ff601082901c166102428383610324565b915061ffff600883901c165f6102588185610324565b92989197509195509350505050565b5f805f60608486031215610279575f80fd5b505081359360208301359350604090920135919050565b5f602082840312156102a0575f80fd5b813562ffffff811681146102b2575f80fd5b9392505050565b5f602082840312156102c9575f80fd5b5035919050565b5f602082840312156102e0575f80fd5b813567ffffffffffffffff811681146102b2575f80fd5b634e487b7160e01b5f52601160045260245ffd5b8082018082111561031e5761031e6102f7565b92915050565b62ffffff828116828216039081111561031e5761031e6102f756fea2646970667358221220374a4a729de468f3940ff47331d0d3d12edb8d24fd5e103ec67f0f30abb0121f64736f6c634300081a0033",
173
+ "bytecode": "0x610375610034600b8282823980515f1a607314602857634e487b7160e01b5f525f60045260245ffd5b305f52607381538281f3fe7300000000000000000000000000000000000000003014608060405260043610610090575f3560e01c80638e4ad86c116100635780638e4ad86c1461011d57806394aa449c14610140578063a123b37c1461014e578063c9e66e2914610175575f80fd5b806304b8f6c5146100945780632efe0113146100af57806349a7111a146100c257806355601007146100f9575b5f80fd5b5f5b60405162ffffff90911681526020015b60405180910390f35b6100966100bd366004610267565b61018c565b6100d56100d0366004610290565b61022c565b6040805160ff948516815292841660208401529216918101919091526060016100a6565b61010f610107366004610290565b62ffffff1690565b6040519081526020016100a6565b61012e61012b3660046102b9565b90565b60405160ff90911681526020016100a6565b61009661012b3660046102d0565b61015c610107366004610290565b60405167ffffffffffffffff90911681526020016100a6565b61012e610183366004610290565b60101c60ff1690565b5f6101008410801561019f575061010083105b80156101ac575061010082105b6102075760405162461bcd60e51b815260206004820152602260248201527f4552524f523a5652532d3031303a56455253494f4e5f504152545f544f4f5f42604482015261494760f01b606482015260840160405180910390fd5b8161021a600885901b601087901b61030b565b610224919061030b565b949350505050565b5f80808360ff601082901c166102428383610324565b915061ffff600883901c165f6102588185610324565b92989197509195509350505050565b5f805f60608486031215610279575f80fd5b505081359360208301359350604090920135919050565b5f602082840312156102a0575f80fd5b813562ffffff811681146102b2575f80fd5b9392505050565b5f602082840312156102c9575f80fd5b5035919050565b5f602082840312156102e0575f80fd5b813567ffffffffffffffff811681146102b2575f80fd5b634e487b7160e01b5f52601160045260245ffd5b8082018082111561031e5761031e6102f7565b92915050565b62ffffff828116828216039081111561031e5761031e6102f756fea2646970667358221220b7b280d4d79eb682a642e02ab59edfb5583f4fd4184dbddb14f1f65201cf09d264736f6c634300081a0033",
174
+ "deployedBytecode": "0x7300000000000000000000000000000000000000003014608060405260043610610090575f3560e01c80638e4ad86c116100635780638e4ad86c1461011d57806394aa449c14610140578063a123b37c1461014e578063c9e66e2914610175575f80fd5b806304b8f6c5146100945780632efe0113146100af57806349a7111a146100c257806355601007146100f9575b5f80fd5b5f5b60405162ffffff90911681526020015b60405180910390f35b6100966100bd366004610267565b61018c565b6100d56100d0366004610290565b61022c565b6040805160ff948516815292841660208401529216918101919091526060016100a6565b61010f610107366004610290565b62ffffff1690565b6040519081526020016100a6565b61012e61012b3660046102b9565b90565b60405160ff90911681526020016100a6565b61009661012b3660046102d0565b61015c610107366004610290565b60405167ffffffffffffffff90911681526020016100a6565b61012e610183366004610290565b60101c60ff1690565b5f6101008410801561019f575061010083105b80156101ac575061010082105b6102075760405162461bcd60e51b815260206004820152602260248201527f4552524f523a5652532d3031303a56455253494f4e5f504152545f544f4f5f42604482015261494760f01b606482015260840160405180910390fd5b8161021a600885901b601087901b61030b565b610224919061030b565b949350505050565b5f80808360ff601082901c166102428383610324565b915061ffff600883901c165f6102588185610324565b92989197509195509350505050565b5f805f60608486031215610279575f80fd5b505081359360208301359350604090920135919050565b5f602082840312156102a0575f80fd5b813562ffffff811681146102b2575f80fd5b9392505050565b5f602082840312156102c9575f80fd5b5035919050565b5f602082840312156102e0575f80fd5b813567ffffffffffffffff811681146102b2575f80fd5b634e487b7160e01b5f52601160045260245ffd5b8082018082111561031e5761031e6102f7565b92915050565b62ffffff828116828216039081111561031e5761031e6102f756fea2646970667358221220b7b280d4d79eb682a642e02ab59edfb5583f4fd4184dbddb14f1f65201cf09d264736f6c634300081a0033",
175
175
  "linkReferences": {},
176
176
  "deployedLinkReferences": {}
177
177
  }
package/artifacts/contracts/type/Version.sol/VersionPartLib.dbg.json CHANGED
@@ -1,4 +1,4 @@
1
1
  {
2
2
  "_format": "hh-sol-dbg-1",
3
- "buildInfo": "../../../build-info/6299e4573ae7ede14c67636188ae8c7e.json"
3
+ "buildInfo": "../../../build-info/5695401de7c03376933cf5a112bb7c6c.json"
4
4
  }
package/artifacts/contracts/type/Version.sol/VersionPartLib.json CHANGED
@@ -3,6 +3,25 @@
3
3
  "contractName": "VersionPartLib",
4
4
  "sourceName": "contracts/type/Version.sol",
5
5
  "abi": [
6
+ {
7
+ "inputs": [
8
+ {
9
+ "internalType": "VersionPart",
10
+ "name": "a",
11
+ "type": "uint8"
12
+ }
13
+ ],
14
+ "name": "eqz",
15
+ "outputs": [
16
+ {
17
+ "internalType": "bool",
18
+ "name": "",
19
+ "type": "bool"
20
+ }
21
+ ],
22
+ "stateMutability": "pure",
23
+ "type": "function"
24
+ },
6
25
  {
7
26
  "inputs": [
8
27
  {
@@ -42,8 +61,8 @@
42
61
  "type": "function"
43
62
  }
44
63
  ],
45
- "bytecode": "0x60f4610033600b8282823980515f1a607314602757634e487b7160e01b5f525f60045260245ffd5b305f52607381538281f3fe7300000000000000000000000000000000000000003014608060405260043610603c575f3560e01c80638e4ad86c146040578063ac43d834146065575b5f80fd5b604e604b3660046083565b90565b60405160ff90911681526020015b60405180910390f35b607660703660046099565b60ff1690565b604051908152602001605c565b5f602082840312156092575f80fd5b5035919050565b5f6020828403121560a8575f80fd5b813560ff8116811460b7575f80fd5b939250505056fea2646970667358221220577a856f6b9a521e70f52979c1947808212bb1957a370c9e7e460eeb908e722f64736f6c634300081a0033",
46
- "deployedBytecode": "0x7300000000000000000000000000000000000000003014608060405260043610603c575f3560e01c80638e4ad86c146040578063ac43d834146065575b5f80fd5b604e604b3660046083565b90565b60405160ff90911681526020015b60405180910390f35b607660703660046099565b60ff1690565b604051908152602001605c565b5f602082840312156092575f80fd5b5035919050565b5f6020828403121560a8575f80fd5b813560ff8116811460b7575f80fd5b939250505056fea2646970667358221220577a856f6b9a521e70f52979c1947808212bb1957a370c9e7e460eeb908e722f64736f6c634300081a0033",
64
+ "bytecode": "0x61011f610034600b8282823980515f1a607314602857634e487b7160e01b5f525f60045260245ffd5b305f52607381538281f3fe73000000000000000000000000000000000000000030146080604052600436106046575f3560e01c80636f91962014604a5780638e4ad86c146071578063ac43d834146090575b5f80fd5b605c605536600460ae565b60ff161590565b60405190151581526020015b60405180910390f35b607f607c36600460d3565b90565b60405160ff90911681526020016068565b60a1609b36600460ae565b60ff1690565b6040519081526020016068565b5f6020828403121560bd575f80fd5b813560ff8116811460cc575f80fd5b9392505050565b5f6020828403121560e2575f80fd5b503591905056fea2646970667358221220109b2d4519c6e03de0613938014ee99eeb1ac3eda338f45205aa2c8d80684d1464736f6c634300081a0033",
65
+ "deployedBytecode": "0x73000000000000000000000000000000000000000030146080604052600436106046575f3560e01c80636f91962014604a5780638e4ad86c146071578063ac43d834146090575b5f80fd5b605c605536600460ae565b60ff161590565b60405190151581526020015b60405180910390f35b607f607c36600460d3565b90565b60405160ff90911681526020016068565b60a1609b36600460ae565b60ff1690565b6040519081526020016068565b5f6020828403121560bd575f80fd5b813560ff8116811460cc575f80fd5b9392505050565b5f6020828403121560e2575f80fd5b503591905056fea2646970667358221220109b2d4519c6e03de0613938014ee99eeb1ac3eda338f45205aa2c8d80684d1464736f6c634300081a0033",
47
66
  "linkReferences": {},
48
67
  "deployedLinkReferences": {}
49
68
  }
package/artifacts/contracts/upgradeability/IVersionable.sol/IVersionable.dbg.json ADDED
@@ -0,0 +1,4 @@
1
+ {
2
+ "_format": "hh-sol-dbg-1",
3
+ "buildInfo": "../../../build-info/5695401de7c03376933cf5a112bb7c6c.json"
4
+ }
package/artifacts/contracts/{shared → upgradeability}/IVersionable.sol/IVersionable.json RENAMED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "_format": "hh-sol-artifact-1",
3
3
  "contractName": "IVersionable",
4
- "sourceName": "contracts/shared/IVersionable.sol",
4
+ "sourceName": "contracts/upgradeability/IVersionable.sol",
5
5
  "abi": [
6
6
  {
7
7
  "inputs": [],
package/artifacts/contracts/upgradeability/ProxyManager.sol/ProxyManager.dbg.json ADDED
@@ -0,0 +1,4 @@
1
+ {
2
+ "_format": "hh-sol-dbg-1",
3
+ "buildInfo": "../../../build-info/5695401de7c03376933cf5a112bb7c6c.json"
4
+ }
package/artifacts/contracts/{shared → upgradeability}/ProxyManager.sol/ProxyManager.json RENAMED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "_format": "hh-sol-artifact-1",
3
3
  "contractName": "ProxyManager",
4
- "sourceName": "contracts/shared/ProxyManager.sol",
4
+ "sourceName": "contracts/upgradeability/ProxyManager.sol",
5
5
  "abi": [
6
6
  {
7
7
  "inputs": [
@@ -536,8 +536,8 @@
536
536
  "type": "function"
537
537
  }
538
538
  ],
539
- "bytecode": "0x608060405234801561000f575f80fd5b50604051612b39380380612b3983398101604081905261002e9161038b565b6100378161003d565b506103d7565b7ff0c57e16840df040f15088dc2f81fe391c3923bec73e23a9662efc9c229c6a00805468010000000000000000810460ff1615906001600160401b03165f811580156100865750825b90505f826001600160401b031660011480156100a15750303b155b9050811580156100af575080155b156100cd5760405163f92ee8a960e01b815260040160405180910390fd5b84546001600160401b031916600117855583156100fb57845460ff60401b1916680100000000000000001785555b6101053387610153565b831561014b57845460ff60401b19168555604051600181527fc7f505b2f371ae2175ee4913f4499e1f2633a7b5936321eed1cdaeb6115181d29060200160405180910390a15b505050505050565b61015b6101e5565b61016481610235565b61016c610346565b6001600160a01b0382166101935760405163f17ef42d60e01b815260040160405180910390fd5b507f07ebcf49758b6ed3af50fa146bec0abe157c0218fe65dc0874c286e9d5da4f0080546001600160601b03166c010000000000000000000000006001600160a01b0390931692909202919091179055565b7ff0c57e16840df040f15088dc2f81fe391c3923bec73e23a9662efc9c229c6a005468010000000000000000900460ff1661023357604051631afcd79f60e31b815260040160405180910390fd5b565b61023d6101e5565b806001600160a01b03163b5f036102775760405163fdeac91f60e01b81526001600160a01b03821660048201526024015b60405180910390fd5b600180546001600160a01b0319166001600160a01b0383169081179091556040516301ffc9a760e01b81526311da029b60e01b60048201526301ffc9a790602401602060405180830381865afa9250505080156102f1575060408051601f3d908101601f191682019092526102ee918101906103b8565b60015b6103195760405163fdeac91f60e01b81526001600160a01b038216600482015260240161026e565b806103425760405163fdeac91f60e01b81526001600160a01b038316600482015260240161026e565b5050565b61034e6101e5565b6301ffc9a760e01b5f9081526020527f67be87c3ff9960ca1e9cfac5cab2ff4747269cf9ed20c9b7306235ac35a491c5805460ff19166001179055565b5f6020828403121561039b575f80fd5b81516001600160a01b03811681146103b1575f80fd5b9392505050565b5f602082840312156103c8575f80fd5b815180151581146103b1575f80fd5b612755806103e45f395ff3fe608060405234801561000f575f80fd5b506004361061013d575f3560e01c8063675393bf116100b4578063ada9652e11610079578063ada9652e146103c5578063b88da759146103d9578063c987336c146103ec578063e97fac05146103ff578063f7c34ee014610412578063fd0c63d914610425575f80fd5b8063675393bf14610374578063893d20e8146103875780638e9afce61461038f578063933a9ce8146103a2578063946dfcfe146103b3575f80fd5b80631775564d116101055780631775564d146101fe578063214cdb801461021e57806336fc697e146102315780634d459c90146102395780635ab1bd5314610346578063644c45e014610357575f80fd5b806301ffc9a714610141578063058f7a971461018257806307484e80146101975780630d8e6e2c146101c2578063138461e0146101de575b5f80fd5b61016d61014f3660046114e2565b6001600160e01b0319165f9081526020819052604090205460ff1690565b60405190151581526020015b60405180910390f35b610195610190366004611524565b61042d565b005b6101aa6101a53660046115de565b61053c565b6040516001600160a01b039091168152602001610179565b6101ca6106c5565b60405162ffffff9091168152602001610179565b6101e6610735565b6040516001600160601b039091168152602001610179565b61021161020c366004611633565b61073f565b60405161017991906116ae565b61019561022c3660046114e2565b610797565b6101956107c3565b6102e96102473660046116d0565b6040805160a0810182525f808252602082018190529181018290526060810182905260808101919091525062ffffff9081165f90815260036020908152604091829020825160a0810184528154948516815263010000009094046001600160a01b03908116928501929092526001015490811691830191909152600160a01b810464ffffffffff166060830152600160c81b900463ffffffff16608082015290565b60408051825162ffffff1681526020808401516001600160a01b039081169183019190915283830151169181019190915260608083015164ffffffffff169082015260809182015163ffffffff169181019190915260a001610179565b6001546001600160a01b03166101aa565b5f80516020612700833981519152546001600160601b03166101e6565b610195610382366004611524565b610808565b6101aa610915565b61021161039d3660046116eb565b610a46565b6002546001600160a01b03166101aa565b6004545b604051908152602001610179565b6103b75f8051602061270083398151915281565b6101ca6103e7366004611725565b610a99565b6101aa6103fa366004611633565b610ad7565b6101aa61040d366004611633565b610cf0565b61019561042036600461173c565b610e6e565b6101e6610ee4565b7ff0c57e16840df040f15088dc2f81fe391c3923bec73e23a9662efc9c229c6a008054600160401b810460ff16159067ffffffffffffffff165f811580156104725750825b90505f8267ffffffffffffffff16600114801561048e5750303b155b90508115801561049c575080155b156104ba5760405163f92ee8a960e01b815260040160405180910390fd5b845467ffffffffffffffff1916600117855583156104e457845460ff60401b1916600160401b1785555b6104ee3387610e6e565b831561053457845460ff60401b19168555604051600181527fc7f505b2f371ae2175ee4913f4499e1f2633a7b5936321eed1cdaeb6115181d29060200160405180910390a15b505050505050565b5f610545610915565b6001600160a01b0316336001600160a01b03161461057d5760405163086391f760e31b81523360048201526024015b60405180910390fd5b6004541561059e5760405163402b135f60e11b815260040160405180910390fd5b5f6105a7610915565b9050308386826105b7858961073f565b6040516105c3906114d5565b6105cf93929190611773565b8190604051809103905ff59050801580156105ec573d5f803e3d5ffd5b50600280546001600160a01b0319166001600160a01b03929092169182179055604080516303639b8b60e21b81529051919450610678918591630d8e6e2c9160048083019260209291908290030181865afa15801561064d573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061067191906117a7565b8784610efb565b6002546040516001600160a01b038881168252909116907f78922e3fa1abc96399973cb25528ba892214b57da9d1a573937c460d9f5eb4759060200160405180910390a250509392505050565b600254604080516303639b8b60e21b815290515f926001600160a01b031691630d8e6e2c9160048083019260209291908290030181865afa15801561070c573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061073091906117a7565b905090565b5f61073030611291565b60606349bb9e4b60e01b838360405160240161075c9291906117c2565b60408051601f198184030181529190526020810180516001600160e01b03166001600160e01b03199093169290921790915290505b92915050565b61079f61148a565b6001600160e01b0319165f908152602081905260409020805460ff19166001179055565b6107cb61148a565b6301ffc9a760e01b5f9081526020527f67be87c3ff9960ca1e9cfac5cab2ff4747269cf9ed20c9b7306235ac35a491c5805460ff19166001179055565b61081061148a565b806001600160a01b03163b5f036108455760405163fdeac91f60e01b81526001600160a01b0382166004820152602401610574565b600180546001600160a01b0319166001600160a01b0383169081179091556040516301ffc9a760e01b81526311da029b60e01b60048201526301ffc9a790602401602060405180830381865afa9250505080156108bf575060408051601f3d908101601f191682019092526108bc918101906117e5565b60015b6108e75760405163fdeac91f60e01b81526001600160a01b0382166004820152602401610574565b806109105760405163fdeac91f60e01b81526001600160a01b0383166004820152602401610574565b505b50565b5f805f8051602061270083398151915280546040516330b8415f60e01b81526001600160601b03909116600482015290915073__$94a2c899be079b00d952d0d84fffaa5c34$__906330b8415f90602401602060405180830381865af4158015610981573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906109a591906117e5565b15610a30576001546001600160a01b03168154604051631c5da14d60e11b81526001600160601b0390911660048201526001600160a01b0391909116906338bb429a90602401602060405180830381865afa158015610a06573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610a2a9190611804565b91505090565b54600160601b90046001600160a01b0316919050565b606063329d6e7460e01b82604051602401610a6191906116ae565b60408051601f198184030181529190526020810180516001600160e01b03166001600160e01b03199093169290921790915292915050565b5f60048281548110610aad57610aad61181f565b905f5260205f2090600a91828204019190066003029054906101000a900462ffffff169050919050565b5f610ae0610915565b6001600160a01b0316336001600160a01b031614610b135760405163086391f760e31b8152336004820152602401610574565b6004545f03610b355760405163366dfd2160e21b815260040160405180910390fd5b5f610b3e610915565b90505f610b536002546001600160a01b031690565b6001600160a01b0316638b3240a06040518163ffffffff1660e01b81526004016020604051808303815f875af1158015610b8f573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610bb39190611804565b6002549091506001600160a01b03908116908216639623609d8288610bd789610a46565b6040518463ffffffff1660e01b8152600401610bf593929190611773565b5f604051808303815f87803b158015610c0c575f80fd5b505af1158015610c1e573d5f803e3d5ffd5b5050505060025f9054906101000a90046001600160a01b03169350610ca3846001600160a01b0316630d8e6e2c6040518163ffffffff1660e01b8152600401602060405180830381865afa158015610c78573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610c9c91906117a7565b8785610efb565b6002546040516001600160a01b038881168252909116907f1356a2c922be684528fa1759d1808395e5c5010181dd333cdb6f03e2d8545b659060200160405180910390a250505092915050565b5f610cf9610915565b6001600160a01b0316336001600160a01b031614610d2c5760405163086391f760e31b8152336004820152602401610574565b60045415610d4d5760405163402b135f60e11b815260040160405180910390fd5b5f610d56610915565b9050308481610d65848761073f565b604051610d71906114d5565b610d7d93929190611773565b604051809103905ff080158015610d96573d5f803e3d5ffd5b50600280546001600160a01b0319166001600160a01b03929092169182179055604080516303639b8b60e21b81529051919450610e22918591630d8e6e2c9160048083019260209291908290030181865afa158015610df7573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610e1b91906117a7565b8684610efb565b6002546040516001600160a01b038781168252909116907f78922e3fa1abc96399973cb25528ba892214b57da9d1a573937c460d9f5eb4759060200160405180910390a2505092915050565b610e7661148a565b610e7f81610808565b610e876107c3565b6001600160a01b038216610eae5760405163f17ef42d60e01b815260040160405180910390fd5b505f8051602061270083398151915280546001600160601b0316600160601b6001600160a01b0390931692909202919091179055565b6002545f90610730906001600160a01b0316611291565b610f778373__$8eede297b65ed5a56eb3f84d8232ae93f5$__6304b8f6c56040518163ffffffff1660e01b8152600401602060405180830381865af4158015610f46573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610f6a91906117a7565b62ffffff90811691161490565b15610f95576040516348c618db60e01b815260040160405180910390fd5b600454156110ed5760048054610fad90600190611833565b81548110610fbd57610fbd61181f565b5f9182526020909120600a80830490910154604051635560100760e01b8152919092066003026101000a90910462ffffff16600482015273__$8eede297b65ed5a56eb3f84d8232ae93f5$__90635560100790602401602060405180830381865af415801561102e573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906110529190611852565b604051635560100760e01b815262ffffff8516600482015273__$8eede297b65ed5a56eb3f84d8232ae93f5$__90635560100790602401602060405180830381865af41580156110a4573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906110c89190611852565b116110ed57604051633e614b6d60e11b815262ffffff84166004820152602401610574565b600480546001810182555f829052600a8082047f8a35acfbc15ff81a39ae7d344fd709f28e8600b4aa8c65c6b64bfe7fe36bd19b01805462ffffff808916600394909506939093026101000a848102930219169190911790556040805160a0810182529182526001600160a01b038086166020848101919091529085168383015281516356db0c1960e11b815291519293606085019373__$91d01b1eccbca8d6f94a5eb2a0acb040e9$__9363adb6183293818401939092918290030181865af41580156111bd573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906111e19190611869565b64ffffffffff90811682524363ffffffff90811660209384015262ffffff9687165f90815260038452604090819020855181549587015199166001600160b81b03199095169490941763010000006001600160a01b03998a1602178455840151600190930180546060860151608090960151949098166001600160c81b031990981697909717600160a01b94909216939093021763ffffffff60c81b1916600160c81b9190921602179092555050565b5f805f8051602061270083398151915280546040516330b8415f60e01b81526001600160601b03909116600482015290915073__$94a2c899be079b00d952d0d84fffaa5c34$__906330b8415f90602401602060405180830381865af41580156112fd573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061132191906117e5565b1561134d5780546040516301ab8b6760e21b81526001600160601b039091166004820152602401610574565b6001546001600160a01b031660405163c3c5a54760e01b81526001600160a01b038581166004830152919091169063c3c5a54790602401602060405180830381865afa15801561139f573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906113c391906117e5565b6113eb5760405163b9304b0d60e01b81526001600160a01b0384166004820152602401610574565b6001546001600160a01b0316604051636939560f60e11b81526001600160a01b038581166004830152919091169063d272ac1e90602401602060405180830381865afa15801561143d573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190611461919061188d565b81546bffffffffffffffffffffffff19166001600160601b039190911690811790915592915050565b7ff0c57e16840df040f15088dc2f81fe391c3923bec73e23a9662efc9c229c6a0054600160401b900460ff166114d357604051631afcd79f60e31b815260040160405180910390fd5b565b610e4c806118b483390190565b5f602082840312156114f2575f80fd5b81356001600160e01b031981168114611509575f80fd5b9392505050565b6001600160a01b0381168114610912575f80fd5b5f60208284031215611534575f80fd5b813561150981611510565b634e487b7160e01b5f52604160045260245ffd5b5f82601f830112611562575f80fd5b813567ffffffffffffffff81111561157c5761157c61153f565b604051601f8201601f19908116603f0116810167ffffffffffffffff811182821017156115ab576115ab61153f565b6040528181528382016020018510156115c2575f80fd5b816020850160208301375f918101602001919091529392505050565b5f805f606084860312156115f0575f80fd5b83356115fb81611510565b9250602084013567ffffffffffffffff811115611616575f80fd5b61162286828701611553565b925050604084013590509250925092565b5f8060408385031215611644575f80fd5b823561164f81611510565b9150602083013567ffffffffffffffff81111561166a575f80fd5b61167685828601611553565b9150509250929050565b5f81518084528060208401602086015e5f602082860101526020601f19601f83011685010191505092915050565b602081525f6115096020830184611680565b62ffffff81168114610912575f80fd5b5f602082840312156116e0575f80fd5b8135611509816116c0565b5f602082840312156116fb575f80fd5b813567ffffffffffffffff811115611711575f80fd5b61171d84828501611553565b949350505050565b5f60208284031215611735575f80fd5b5035919050565b5f806040838503121561174d575f80fd5b823561175881611510565b9150602083013561176881611510565b809150509250929050565b6001600160a01b038481168252831660208201526060604082018190525f9061179e90830184611680565b95945050505050565b5f602082840312156117b7575f80fd5b8151611509816116c0565b6001600160a01b03831681526040602082018190525f9061171d90830184611680565b5f602082840312156117f5575f80fd5b81518015158114611509575f80fd5b5f60208284031215611814575f80fd5b815161150981611510565b634e487b7160e01b5f52603260045260245ffd5b8181038181111561079157634e487b7160e01b5f52601160045260245ffd5b5f60208284031215611862575f80fd5b5051919050565b5f60208284031215611879575f80fd5b815164ffffffffff81168114611509575f80fd5b5f6020828403121561189d575f80fd5b81516001600160601b0381168114611509575f80fdfe60a060405234801561000f575f80fd5b50604051610e4c380380610e4c83398101604081905261002e9161037c565b828282828161003d828261009e565b50508160405161004c90610340565b6001600160a01b039091168152602001604051809103905ff080158015610075573d5f803e3d5ffd5b506001600160a01b031660805261009361008e60805190565b6100fc565b505050505050610463565b6100a782610169565b6040516001600160a01b038316907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b905f90a28051156100f0576100eb82826101e7565b505050565b6100f861025a565b5050565b7f7e644d79422f17c01e4894b5f4f588d331ebfa28653d42ae832dc59e38c9798f61013b5f80516020610e2c833981519152546001600160a01b031690565b604080516001600160a01b03928316815291841660208301520160405180910390a16101668161027b565b50565b806001600160a01b03163b5f036101a357604051634c9c8ce360e01b81526001600160a01b03821660048201526024015b60405180910390fd5b807f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc5b80546001600160a01b0319166001600160a01b039290921691909117905550565b60605f80846001600160a01b031684604051610203919061044d565b5f60405180830381855af49150503d805f811461023b576040519150601f19603f3d011682016040523d82523d5f602084013e610240565b606091505b5090925090506102518583836102b8565b95945050505050565b34156102795760405163b398979f60e01b815260040160405180910390fd5b565b6001600160a01b0381166102a457604051633173bdd160e11b81525f600482015260240161019a565b805f80516020610e2c8339815191526101c6565b6060826102cd576102c882610317565b610310565b81511580156102e457506001600160a01b0384163b155b1561030d57604051639996b31560e01b81526001600160a01b038516600482015260240161019a565b50805b9392505050565b8051156103275780518082602001fd5b604051630a12f52160e11b815260040160405180910390fd5b6104ef8061093d83390190565b80516001600160a01b0381168114610363575f80fd5b919050565b634e487b7160e01b5f52604160045260245ffd5b5f805f6060848603121561038e575f80fd5b6103978461034d565b92506103a56020850161034d565b60408501519092506001600160401b038111156103c0575f80fd5b8401601f810186136103d0575f80fd5b80516001600160401b038111156103e9576103e9610368565b604051601f8201601f19908116603f011681016001600160401b038111828210171561041757610417610368565b60405281815282820160200188101561042e575f80fd5b8160208401602083015e5f602083830101528093505050509250925092565b5f82518060208501845e5f920191825250919050565b6080516104bd6104805f395f818160350152607201526104bd5ff3fe60806040526004361061001d575f3560e01c80638b3240a014610027575b610025610070565b005b348015610032575f80fd5b507f00000000000000000000000000000000000000000000000000000000000000006040516001600160a01b03909116815260200160405180910390f35b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031633036100dc575f356001600160e01b03191663278f794360e11b146100d2576040516334ad5dbb60e21b815260040160405180910390fd5b6100da6100e9565b565b6100da610117565b905090565b5f806100f83660048184610365565b81019061010591906103a0565b915091506101138282610127565b5050565b6100da610122610181565b6101b3565b610130826101d1565b6040516001600160a01b038316907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b905f90a280511561017957610174828261024c565b505050565b6101136102be565b5f6100e47f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc546001600160a01b031690565b365f80375f80365f845af43d5f803e8080156101cd573d5ff35b3d5ffd5b806001600160a01b03163b5f0361020b57604051634c9c8ce360e01b81526001600160a01b03821660048201526024015b60405180910390fd5b7f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc80546001600160a01b0319166001600160a01b0392909216919091179055565b60605f80846001600160a01b0316846040516102689190610471565b5f60405180830381855af49150503d805f81146102a0576040519150601f19603f3d011682016040523d82523d5f602084013e6102a5565b606091505b50915091506102b58583836102dd565b95945050505050565b34156100da5760405163b398979f60e01b815260040160405180910390fd5b6060826102f2576102ed8261033c565b610335565b815115801561030957506001600160a01b0384163b155b1561033257604051639996b31560e01b81526001600160a01b0385166004820152602401610202565b50805b9392505050565b80511561034c5780518082602001fd5b604051630a12f52160e11b815260040160405180910390fd5b5f8085851115610373575f80fd5b8386111561037f575f80fd5b5050820193919092039150565b634e487b7160e01b5f52604160045260245ffd5b5f80604083850312156103b1575f80fd5b82356001600160a01b03811681146103c7575f80fd5b9150602083013567ffffffffffffffff8111156103e2575f80fd5b8301601f810185136103f2575f80fd5b803567ffffffffffffffff81111561040c5761040c61038c565b604051601f8201601f19908116603f0116810167ffffffffffffffff8111828210171561043b5761043b61038c565b604052818152828201602001871015610452575f80fd5b816020840160208301375f602083830101528093505050509250929050565b5f82518060208501845e5f92019182525091905056fea26469706673582212201de12efcff2877afcc9a3b955c2c6d13d14cd8f5ebf783a67a494b62cb87fb9464736f6c634300081a0033608060405234801561000f575f80fd5b506040516104ef3803806104ef83398101604081905261002e916100bb565b806001600160a01b03811661005c57604051631e4fbdf760e01b81525f600482015260240160405180910390fd5b6100658161006c565b50506100e8565b5f80546001600160a01b038381166001600160a01b0319831681178455604051919092169283917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e09190a35050565b5f602082840312156100cb575f80fd5b81516001600160a01b03811681146100e1575f80fd5b9392505050565b6103fa806100f55f395ff3fe608060405260043610610049575f3560e01c8063715018a61461004d5780638da5cb5b146100635780639623609d1461008e578063ad3cb1cc146100a1578063f2fde38b146100de575b5f80fd5b348015610058575f80fd5b506100616100fd565b005b34801561006e575f80fd5b505f546040516001600160a01b0390911681526020015b60405180910390f35b61006161009c366004610260565b610110565b3480156100ac575f80fd5b506100d1604051806040016040528060058152602001640352e302e360dc1b81525081565b6040516100859190610365565b3480156100e9575f80fd5b506100616100f836600461037e565b61017b565b6101056101bd565b61010e5f6101e9565b565b6101186101bd565b60405163278f794360e11b81526001600160a01b03841690634f1ef2869034906101489086908690600401610399565b5f604051808303818588803b15801561015f575f80fd5b505af1158015610171573d5f803e3d5ffd5b5050505050505050565b6101836101bd565b6001600160a01b0381166101b157604051631e4fbdf760e01b81525f60048201526024015b60405180910390fd5b6101ba816101e9565b50565b5f546001600160a01b0316331461010e5760405163118cdaa760e01b81523360048201526024016101a8565b5f80546001600160a01b038381166001600160a01b0319831681178455604051919092169283917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e09190a35050565b6001600160a01b03811681146101ba575f80fd5b634e487b7160e01b5f52604160045260245ffd5b5f805f60608486031215610272575f80fd5b833561027d81610238565b9250602084013561028d81610238565b9150604084013567ffffffffffffffff8111156102a8575f80fd5b8401601f810186136102b8575f80fd5b803567ffffffffffffffff8111156102d2576102d261024c565b604051601f8201601f19908116603f0116810167ffffffffffffffff811182821017156103015761030161024c565b604052818152828201602001881015610318575f80fd5b816020840160208301375f602083830101528093505050509250925092565b5f81518084528060208401602086015e5f602082860101526020601f19601f83011685010191505092915050565b602081525f6103776020830184610337565b9392505050565b5f6020828403121561038e575f80fd5b813561037781610238565b6001600160a01b03831681526040602082018190525f906103bc90830184610337565b94935050505056fea2646970667358221220caf6b9bdb996e9a89d8eb50cc88de16d08be3a2eadb3b93dcb76b59576d5f8c564736f6c634300081a0033b53127684a568b3173ae13b9f8a6016e243e63b6e8ee1178d6a717850b5d610307ebcf49758b6ed3af50fa146bec0abe157c0218fe65dc0874c286e9d5da4f00a2646970667358221220f046f55cd1de91bfcd01685b143b76186dc3da898c0ed73eeda3affc781179f464736f6c634300081a0033",
540
- "deployedBytecode": "0x608060405234801561000f575f80fd5b506004361061013d575f3560e01c8063675393bf116100b4578063ada9652e11610079578063ada9652e146103c5578063b88da759146103d9578063c987336c146103ec578063e97fac05146103ff578063f7c34ee014610412578063fd0c63d914610425575f80fd5b8063675393bf14610374578063893d20e8146103875780638e9afce61461038f578063933a9ce8146103a2578063946dfcfe146103b3575f80fd5b80631775564d116101055780631775564d146101fe578063214cdb801461021e57806336fc697e146102315780634d459c90146102395780635ab1bd5314610346578063644c45e014610357575f80fd5b806301ffc9a714610141578063058f7a971461018257806307484e80146101975780630d8e6e2c146101c2578063138461e0146101de575b5f80fd5b61016d61014f3660046114e2565b6001600160e01b0319165f9081526020819052604090205460ff1690565b60405190151581526020015b60405180910390f35b610195610190366004611524565b61042d565b005b6101aa6101a53660046115de565b61053c565b6040516001600160a01b039091168152602001610179565b6101ca6106c5565b60405162ffffff9091168152602001610179565b6101e6610735565b6040516001600160601b039091168152602001610179565b61021161020c366004611633565b61073f565b60405161017991906116ae565b61019561022c3660046114e2565b610797565b6101956107c3565b6102e96102473660046116d0565b6040805160a0810182525f808252602082018190529181018290526060810182905260808101919091525062ffffff9081165f90815260036020908152604091829020825160a0810184528154948516815263010000009094046001600160a01b03908116928501929092526001015490811691830191909152600160a01b810464ffffffffff166060830152600160c81b900463ffffffff16608082015290565b60408051825162ffffff1681526020808401516001600160a01b039081169183019190915283830151169181019190915260608083015164ffffffffff169082015260809182015163ffffffff169181019190915260a001610179565b6001546001600160a01b03166101aa565b5f80516020612700833981519152546001600160601b03166101e6565b610195610382366004611524565b610808565b6101aa610915565b61021161039d3660046116eb565b610a46565b6002546001600160a01b03166101aa565b6004545b604051908152602001610179565b6103b75f8051602061270083398151915281565b6101ca6103e7366004611725565b610a99565b6101aa6103fa366004611633565b610ad7565b6101aa61040d366004611633565b610cf0565b61019561042036600461173c565b610e6e565b6101e6610ee4565b7ff0c57e16840df040f15088dc2f81fe391c3923bec73e23a9662efc9c229c6a008054600160401b810460ff16159067ffffffffffffffff165f811580156104725750825b90505f8267ffffffffffffffff16600114801561048e5750303b155b90508115801561049c575080155b156104ba5760405163f92ee8a960e01b815260040160405180910390fd5b845467ffffffffffffffff1916600117855583156104e457845460ff60401b1916600160401b1785555b6104ee3387610e6e565b831561053457845460ff60401b19168555604051600181527fc7f505b2f371ae2175ee4913f4499e1f2633a7b5936321eed1cdaeb6115181d29060200160405180910390a15b505050505050565b5f610545610915565b6001600160a01b0316336001600160a01b03161461057d5760405163086391f760e31b81523360048201526024015b60405180910390fd5b6004541561059e5760405163402b135f60e11b815260040160405180910390fd5b5f6105a7610915565b9050308386826105b7858961073f565b6040516105c3906114d5565b6105cf93929190611773565b8190604051809103905ff59050801580156105ec573d5f803e3d5ffd5b50600280546001600160a01b0319166001600160a01b03929092169182179055604080516303639b8b60e21b81529051919450610678918591630d8e6e2c9160048083019260209291908290030181865afa15801561064d573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061067191906117a7565b8784610efb565b6002546040516001600160a01b038881168252909116907f78922e3fa1abc96399973cb25528ba892214b57da9d1a573937c460d9f5eb4759060200160405180910390a250509392505050565b600254604080516303639b8b60e21b815290515f926001600160a01b031691630d8e6e2c9160048083019260209291908290030181865afa15801561070c573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061073091906117a7565b905090565b5f61073030611291565b60606349bb9e4b60e01b838360405160240161075c9291906117c2565b60408051601f198184030181529190526020810180516001600160e01b03166001600160e01b03199093169290921790915290505b92915050565b61079f61148a565b6001600160e01b0319165f908152602081905260409020805460ff19166001179055565b6107cb61148a565b6301ffc9a760e01b5f9081526020527f67be87c3ff9960ca1e9cfac5cab2ff4747269cf9ed20c9b7306235ac35a491c5805460ff19166001179055565b61081061148a565b806001600160a01b03163b5f036108455760405163fdeac91f60e01b81526001600160a01b0382166004820152602401610574565b600180546001600160a01b0319166001600160a01b0383169081179091556040516301ffc9a760e01b81526311da029b60e01b60048201526301ffc9a790602401602060405180830381865afa9250505080156108bf575060408051601f3d908101601f191682019092526108bc918101906117e5565b60015b6108e75760405163fdeac91f60e01b81526001600160a01b0382166004820152602401610574565b806109105760405163fdeac91f60e01b81526001600160a01b0383166004820152602401610574565b505b50565b5f805f8051602061270083398151915280546040516330b8415f60e01b81526001600160601b03909116600482015290915073__$94a2c899be079b00d952d0d84fffaa5c34$__906330b8415f90602401602060405180830381865af4158015610981573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906109a591906117e5565b15610a30576001546001600160a01b03168154604051631c5da14d60e11b81526001600160601b0390911660048201526001600160a01b0391909116906338bb429a90602401602060405180830381865afa158015610a06573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610a2a9190611804565b91505090565b54600160601b90046001600160a01b0316919050565b606063329d6e7460e01b82604051602401610a6191906116ae565b60408051601f198184030181529190526020810180516001600160e01b03166001600160e01b03199093169290921790915292915050565b5f60048281548110610aad57610aad61181f565b905f5260205f2090600a91828204019190066003029054906101000a900462ffffff169050919050565b5f610ae0610915565b6001600160a01b0316336001600160a01b031614610b135760405163086391f760e31b8152336004820152602401610574565b6004545f03610b355760405163366dfd2160e21b815260040160405180910390fd5b5f610b3e610915565b90505f610b536002546001600160a01b031690565b6001600160a01b0316638b3240a06040518163ffffffff1660e01b81526004016020604051808303815f875af1158015610b8f573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610bb39190611804565b6002549091506001600160a01b03908116908216639623609d8288610bd789610a46565b6040518463ffffffff1660e01b8152600401610bf593929190611773565b5f604051808303815f87803b158015610c0c575f80fd5b505af1158015610c1e573d5f803e3d5ffd5b5050505060025f9054906101000a90046001600160a01b03169350610ca3846001600160a01b0316630d8e6e2c6040518163ffffffff1660e01b8152600401602060405180830381865afa158015610c78573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610c9c91906117a7565b8785610efb565b6002546040516001600160a01b038881168252909116907f1356a2c922be684528fa1759d1808395e5c5010181dd333cdb6f03e2d8545b659060200160405180910390a250505092915050565b5f610cf9610915565b6001600160a01b0316336001600160a01b031614610d2c5760405163086391f760e31b8152336004820152602401610574565b60045415610d4d5760405163402b135f60e11b815260040160405180910390fd5b5f610d56610915565b9050308481610d65848761073f565b604051610d71906114d5565b610d7d93929190611773565b604051809103905ff080158015610d96573d5f803e3d5ffd5b50600280546001600160a01b0319166001600160a01b03929092169182179055604080516303639b8b60e21b81529051919450610e22918591630d8e6e2c9160048083019260209291908290030181865afa158015610df7573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610e1b91906117a7565b8684610efb565b6002546040516001600160a01b038781168252909116907f78922e3fa1abc96399973cb25528ba892214b57da9d1a573937c460d9f5eb4759060200160405180910390a2505092915050565b610e7661148a565b610e7f81610808565b610e876107c3565b6001600160a01b038216610eae5760405163f17ef42d60e01b815260040160405180910390fd5b505f8051602061270083398151915280546001600160601b0316600160601b6001600160a01b0390931692909202919091179055565b6002545f90610730906001600160a01b0316611291565b610f778373__$8eede297b65ed5a56eb3f84d8232ae93f5$__6304b8f6c56040518163ffffffff1660e01b8152600401602060405180830381865af4158015610f46573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610f6a91906117a7565b62ffffff90811691161490565b15610f95576040516348c618db60e01b815260040160405180910390fd5b600454156110ed5760048054610fad90600190611833565b81548110610fbd57610fbd61181f565b5f9182526020909120600a80830490910154604051635560100760e01b8152919092066003026101000a90910462ffffff16600482015273__$8eede297b65ed5a56eb3f84d8232ae93f5$__90635560100790602401602060405180830381865af415801561102e573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906110529190611852565b604051635560100760e01b815262ffffff8516600482015273__$8eede297b65ed5a56eb3f84d8232ae93f5$__90635560100790602401602060405180830381865af41580156110a4573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906110c89190611852565b116110ed57604051633e614b6d60e11b815262ffffff84166004820152602401610574565b600480546001810182555f829052600a8082047f8a35acfbc15ff81a39ae7d344fd709f28e8600b4aa8c65c6b64bfe7fe36bd19b01805462ffffff808916600394909506939093026101000a848102930219169190911790556040805160a0810182529182526001600160a01b038086166020848101919091529085168383015281516356db0c1960e11b815291519293606085019373__$91d01b1eccbca8d6f94a5eb2a0acb040e9$__9363adb6183293818401939092918290030181865af41580156111bd573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906111e19190611869565b64ffffffffff90811682524363ffffffff90811660209384015262ffffff9687165f90815260038452604090819020855181549587015199166001600160b81b03199095169490941763010000006001600160a01b03998a1602178455840151600190930180546060860151608090960151949098166001600160c81b031990981697909717600160a01b94909216939093021763ffffffff60c81b1916600160c81b9190921602179092555050565b5f805f8051602061270083398151915280546040516330b8415f60e01b81526001600160601b03909116600482015290915073__$94a2c899be079b00d952d0d84fffaa5c34$__906330b8415f90602401602060405180830381865af41580156112fd573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061132191906117e5565b1561134d5780546040516301ab8b6760e21b81526001600160601b039091166004820152602401610574565b6001546001600160a01b031660405163c3c5a54760e01b81526001600160a01b038581166004830152919091169063c3c5a54790602401602060405180830381865afa15801561139f573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906113c391906117e5565b6113eb5760405163b9304b0d60e01b81526001600160a01b0384166004820152602401610574565b6001546001600160a01b0316604051636939560f60e11b81526001600160a01b038581166004830152919091169063d272ac1e90602401602060405180830381865afa15801561143d573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190611461919061188d565b81546bffffffffffffffffffffffff19166001600160601b039190911690811790915592915050565b7ff0c57e16840df040f15088dc2f81fe391c3923bec73e23a9662efc9c229c6a0054600160401b900460ff166114d357604051631afcd79f60e31b815260040160405180910390fd5b565b610e4c806118b483390190565b5f602082840312156114f2575f80fd5b81356001600160e01b031981168114611509575f80fd5b9392505050565b6001600160a01b0381168114610912575f80fd5b5f60208284031215611534575f80fd5b813561150981611510565b634e487b7160e01b5f52604160045260245ffd5b5f82601f830112611562575f80fd5b813567ffffffffffffffff81111561157c5761157c61153f565b604051601f8201601f19908116603f0116810167ffffffffffffffff811182821017156115ab576115ab61153f565b6040528181528382016020018510156115c2575f80fd5b816020850160208301375f918101602001919091529392505050565b5f805f606084860312156115f0575f80fd5b83356115fb81611510565b9250602084013567ffffffffffffffff811115611616575f80fd5b61162286828701611553565b925050604084013590509250925092565b5f8060408385031215611644575f80fd5b823561164f81611510565b9150602083013567ffffffffffffffff81111561166a575f80fd5b61167685828601611553565b9150509250929050565b5f81518084528060208401602086015e5f602082860101526020601f19601f83011685010191505092915050565b602081525f6115096020830184611680565b62ffffff81168114610912575f80fd5b5f602082840312156116e0575f80fd5b8135611509816116c0565b5f602082840312156116fb575f80fd5b813567ffffffffffffffff811115611711575f80fd5b61171d84828501611553565b949350505050565b5f60208284031215611735575f80fd5b5035919050565b5f806040838503121561174d575f80fd5b823561175881611510565b9150602083013561176881611510565b809150509250929050565b6001600160a01b038481168252831660208201526060604082018190525f9061179e90830184611680565b95945050505050565b5f602082840312156117b7575f80fd5b8151611509816116c0565b6001600160a01b03831681526040602082018190525f9061171d90830184611680565b5f602082840312156117f5575f80fd5b81518015158114611509575f80fd5b5f60208284031215611814575f80fd5b815161150981611510565b634e487b7160e01b5f52603260045260245ffd5b8181038181111561079157634e487b7160e01b5f52601160045260245ffd5b5f60208284031215611862575f80fd5b5051919050565b5f60208284031215611879575f80fd5b815164ffffffffff81168114611509575f80fd5b5f6020828403121561189d575f80fd5b81516001600160601b0381168114611509575f80fdfe60a060405234801561000f575f80fd5b50604051610e4c380380610e4c83398101604081905261002e9161037c565b828282828161003d828261009e565b50508160405161004c90610340565b6001600160a01b039091168152602001604051809103905ff080158015610075573d5f803e3d5ffd5b506001600160a01b031660805261009361008e60805190565b6100fc565b505050505050610463565b6100a782610169565b6040516001600160a01b038316907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b905f90a28051156100f0576100eb82826101e7565b505050565b6100f861025a565b5050565b7f7e644d79422f17c01e4894b5f4f588d331ebfa28653d42ae832dc59e38c9798f61013b5f80516020610e2c833981519152546001600160a01b031690565b604080516001600160a01b03928316815291841660208301520160405180910390a16101668161027b565b50565b806001600160a01b03163b5f036101a357604051634c9c8ce360e01b81526001600160a01b03821660048201526024015b60405180910390fd5b807f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc5b80546001600160a01b0319166001600160a01b039290921691909117905550565b60605f80846001600160a01b031684604051610203919061044d565b5f60405180830381855af49150503d805f811461023b576040519150601f19603f3d011682016040523d82523d5f602084013e610240565b606091505b5090925090506102518583836102b8565b95945050505050565b34156102795760405163b398979f60e01b815260040160405180910390fd5b565b6001600160a01b0381166102a457604051633173bdd160e11b81525f600482015260240161019a565b805f80516020610e2c8339815191526101c6565b6060826102cd576102c882610317565b610310565b81511580156102e457506001600160a01b0384163b155b1561030d57604051639996b31560e01b81526001600160a01b038516600482015260240161019a565b50805b9392505050565b8051156103275780518082602001fd5b604051630a12f52160e11b815260040160405180910390fd5b6104ef8061093d83390190565b80516001600160a01b0381168114610363575f80fd5b919050565b634e487b7160e01b5f52604160045260245ffd5b5f805f6060848603121561038e575f80fd5b6103978461034d565b92506103a56020850161034d565b60408501519092506001600160401b038111156103c0575f80fd5b8401601f810186136103d0575f80fd5b80516001600160401b038111156103e9576103e9610368565b604051601f8201601f19908116603f011681016001600160401b038111828210171561041757610417610368565b60405281815282820160200188101561042e575f80fd5b8160208401602083015e5f602083830101528093505050509250925092565b5f82518060208501845e5f920191825250919050565b6080516104bd6104805f395f818160350152607201526104bd5ff3fe60806040526004361061001d575f3560e01c80638b3240a014610027575b610025610070565b005b348015610032575f80fd5b507f00000000000000000000000000000000000000000000000000000000000000006040516001600160a01b03909116815260200160405180910390f35b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031633036100dc575f356001600160e01b03191663278f794360e11b146100d2576040516334ad5dbb60e21b815260040160405180910390fd5b6100da6100e9565b565b6100da610117565b905090565b5f806100f83660048184610365565b81019061010591906103a0565b915091506101138282610127565b5050565b6100da610122610181565b6101b3565b610130826101d1565b6040516001600160a01b038316907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b905f90a280511561017957610174828261024c565b505050565b6101136102be565b5f6100e47f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc546001600160a01b031690565b365f80375f80365f845af43d5f803e8080156101cd573d5ff35b3d5ffd5b806001600160a01b03163b5f0361020b57604051634c9c8ce360e01b81526001600160a01b03821660048201526024015b60405180910390fd5b7f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc80546001600160a01b0319166001600160a01b0392909216919091179055565b60605f80846001600160a01b0316846040516102689190610471565b5f60405180830381855af49150503d805f81146102a0576040519150601f19603f3d011682016040523d82523d5f602084013e6102a5565b606091505b50915091506102b58583836102dd565b95945050505050565b34156100da5760405163b398979f60e01b815260040160405180910390fd5b6060826102f2576102ed8261033c565b610335565b815115801561030957506001600160a01b0384163b155b1561033257604051639996b31560e01b81526001600160a01b0385166004820152602401610202565b50805b9392505050565b80511561034c5780518082602001fd5b604051630a12f52160e11b815260040160405180910390fd5b5f8085851115610373575f80fd5b8386111561037f575f80fd5b5050820193919092039150565b634e487b7160e01b5f52604160045260245ffd5b5f80604083850312156103b1575f80fd5b82356001600160a01b03811681146103c7575f80fd5b9150602083013567ffffffffffffffff8111156103e2575f80fd5b8301601f810185136103f2575f80fd5b803567ffffffffffffffff81111561040c5761040c61038c565b604051601f8201601f19908116603f0116810167ffffffffffffffff8111828210171561043b5761043b61038c565b604052818152828201602001871015610452575f80fd5b816020840160208301375f602083830101528093505050509250929050565b5f82518060208501845e5f92019182525091905056fea26469706673582212201de12efcff2877afcc9a3b955c2c6d13d14cd8f5ebf783a67a494b62cb87fb9464736f6c634300081a0033608060405234801561000f575f80fd5b506040516104ef3803806104ef83398101604081905261002e916100bb565b806001600160a01b03811661005c57604051631e4fbdf760e01b81525f600482015260240160405180910390fd5b6100658161006c565b50506100e8565b5f80546001600160a01b038381166001600160a01b0319831681178455604051919092169283917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e09190a35050565b5f602082840312156100cb575f80fd5b81516001600160a01b03811681146100e1575f80fd5b9392505050565b6103fa806100f55f395ff3fe608060405260043610610049575f3560e01c8063715018a61461004d5780638da5cb5b146100635780639623609d1461008e578063ad3cb1cc146100a1578063f2fde38b146100de575b5f80fd5b348015610058575f80fd5b506100616100fd565b005b34801561006e575f80fd5b505f546040516001600160a01b0390911681526020015b60405180910390f35b61006161009c366004610260565b610110565b3480156100ac575f80fd5b506100d1604051806040016040528060058152602001640352e302e360dc1b81525081565b6040516100859190610365565b3480156100e9575f80fd5b506100616100f836600461037e565b61017b565b6101056101bd565b61010e5f6101e9565b565b6101186101bd565b60405163278f794360e11b81526001600160a01b03841690634f1ef2869034906101489086908690600401610399565b5f604051808303818588803b15801561015f575f80fd5b505af1158015610171573d5f803e3d5ffd5b5050505050505050565b6101836101bd565b6001600160a01b0381166101b157604051631e4fbdf760e01b81525f60048201526024015b60405180910390fd5b6101ba816101e9565b50565b5f546001600160a01b0316331461010e5760405163118cdaa760e01b81523360048201526024016101a8565b5f80546001600160a01b038381166001600160a01b0319831681178455604051919092169283917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e09190a35050565b6001600160a01b03811681146101ba575f80fd5b634e487b7160e01b5f52604160045260245ffd5b5f805f60608486031215610272575f80fd5b833561027d81610238565b9250602084013561028d81610238565b9150604084013567ffffffffffffffff8111156102a8575f80fd5b8401601f810186136102b8575f80fd5b803567ffffffffffffffff8111156102d2576102d261024c565b604051601f8201601f19908116603f0116810167ffffffffffffffff811182821017156103015761030161024c565b604052818152828201602001881015610318575f80fd5b816020840160208301375f602083830101528093505050509250925092565b5f81518084528060208401602086015e5f602082860101526020601f19601f83011685010191505092915050565b602081525f6103776020830184610337565b9392505050565b5f6020828403121561038e575f80fd5b813561037781610238565b6001600160a01b03831681526040602082018190525f906103bc90830184610337565b94935050505056fea2646970667358221220caf6b9bdb996e9a89d8eb50cc88de16d08be3a2eadb3b93dcb76b59576d5f8c564736f6c634300081a0033b53127684a568b3173ae13b9f8a6016e243e63b6e8ee1178d6a717850b5d610307ebcf49758b6ed3af50fa146bec0abe157c0218fe65dc0874c286e9d5da4f00a2646970667358221220f046f55cd1de91bfcd01685b143b76186dc3da898c0ed73eeda3affc781179f464736f6c634300081a0033",
539
+ "bytecode": "0x608060405234801561000f575f80fd5b50604051612b39380380612b3983398101604081905261002e9161038b565b6100378161003d565b506103d7565b7ff0c57e16840df040f15088dc2f81fe391c3923bec73e23a9662efc9c229c6a00805468010000000000000000810460ff1615906001600160401b03165f811580156100865750825b90505f826001600160401b031660011480156100a15750303b155b9050811580156100af575080155b156100cd5760405163f92ee8a960e01b815260040160405180910390fd5b84546001600160401b031916600117855583156100fb57845460ff60401b1916680100000000000000001785555b6101053387610153565b831561014b57845460ff60401b19168555604051600181527fc7f505b2f371ae2175ee4913f4499e1f2633a7b5936321eed1cdaeb6115181d29060200160405180910390a15b505050505050565b61015b6101e5565b61016481610235565b61016c610346565b6001600160a01b0382166101935760405163f17ef42d60e01b815260040160405180910390fd5b507f07ebcf49758b6ed3af50fa146bec0abe157c0218fe65dc0874c286e9d5da4f0080546001600160601b03166c010000000000000000000000006001600160a01b0390931692909202919091179055565b7ff0c57e16840df040f15088dc2f81fe391c3923bec73e23a9662efc9c229c6a005468010000000000000000900460ff1661023357604051631afcd79f60e31b815260040160405180910390fd5b565b61023d6101e5565b806001600160a01b03163b5f036102775760405163fdeac91f60e01b81526001600160a01b03821660048201526024015b60405180910390fd5b600180546001600160a01b0319166001600160a01b0383169081179091556040516301ffc9a760e01b81526318788cbb60e11b60048201526301ffc9a790602401602060405180830381865afa9250505080156102f1575060408051601f3d908101601f191682019092526102ee918101906103b8565b60015b6103195760405163fdeac91f60e01b81526001600160a01b038216600482015260240161026e565b806103425760405163fdeac91f60e01b81526001600160a01b038316600482015260240161026e565b5050565b61034e6101e5565b6301ffc9a760e01b5f9081526020527f67be87c3ff9960ca1e9cfac5cab2ff4747269cf9ed20c9b7306235ac35a491c5805460ff19166001179055565b5f6020828403121561039b575f80fd5b81516001600160a01b03811681146103b1575f80fd5b9392505050565b5f602082840312156103c8575f80fd5b815180151581146103b1575f80fd5b612755806103e45f395ff3fe608060405234801561000f575f80fd5b506004361061013d575f3560e01c8063675393bf116100b4578063ada9652e11610079578063ada9652e146103c5578063b88da759146103d9578063c987336c146103ec578063e97fac05146103ff578063f7c34ee014610412578063fd0c63d914610425575f80fd5b8063675393bf14610374578063893d20e8146103875780638e9afce61461038f578063933a9ce8146103a2578063946dfcfe146103b3575f80fd5b80631775564d116101055780631775564d146101fe578063214cdb801461021e57806336fc697e146102315780634d459c90146102395780635ab1bd5314610346578063644c45e014610357575f80fd5b806301ffc9a714610141578063058f7a971461018257806307484e80146101975780630d8e6e2c146101c2578063138461e0146101de575b5f80fd5b61016d61014f3660046114e2565b6001600160e01b0319165f9081526020819052604090205460ff1690565b60405190151581526020015b60405180910390f35b610195610190366004611524565b61042d565b005b6101aa6101a53660046115de565b61053c565b6040516001600160a01b039091168152602001610179565b6101ca6106c5565b60405162ffffff9091168152602001610179565b6101e6610735565b6040516001600160601b039091168152602001610179565b61021161020c366004611633565b61073f565b60405161017991906116ae565b61019561022c3660046114e2565b610797565b6101956107c3565b6102e96102473660046116d0565b6040805160a0810182525f808252602082018190529181018290526060810182905260808101919091525062ffffff9081165f90815260036020908152604091829020825160a0810184528154948516815263010000009094046001600160a01b03908116928501929092526001015490811691830191909152600160a01b810464ffffffffff166060830152600160c81b900463ffffffff16608082015290565b60408051825162ffffff1681526020808401516001600160a01b039081169183019190915283830151169181019190915260608083015164ffffffffff169082015260809182015163ffffffff169181019190915260a001610179565b6001546001600160a01b03166101aa565b5f80516020612700833981519152546001600160601b03166101e6565b610195610382366004611524565b610808565b6101aa610915565b61021161039d3660046116eb565b610a46565b6002546001600160a01b03166101aa565b6004545b604051908152602001610179565b6103b75f8051602061270083398151915281565b6101ca6103e7366004611725565b610a99565b6101aa6103fa366004611633565b610ad7565b6101aa61040d366004611633565b610cf0565b61019561042036600461173c565b610e6e565b6101e6610ee4565b7ff0c57e16840df040f15088dc2f81fe391c3923bec73e23a9662efc9c229c6a008054600160401b810460ff16159067ffffffffffffffff165f811580156104725750825b90505f8267ffffffffffffffff16600114801561048e5750303b155b90508115801561049c575080155b156104ba5760405163f92ee8a960e01b815260040160405180910390fd5b845467ffffffffffffffff1916600117855583156104e457845460ff60401b1916600160401b1785555b6104ee3387610e6e565b831561053457845460ff60401b19168555604051600181527fc7f505b2f371ae2175ee4913f4499e1f2633a7b5936321eed1cdaeb6115181d29060200160405180910390a15b505050505050565b5f610545610915565b6001600160a01b0316336001600160a01b03161461057d5760405163086391f760e31b81523360048201526024015b60405180910390fd5b6004541561059e5760405163402b135f60e11b815260040160405180910390fd5b5f6105a7610915565b9050308386826105b7858961073f565b6040516105c3906114d5565b6105cf93929190611773565b8190604051809103905ff59050801580156105ec573d5f803e3d5ffd5b50600280546001600160a01b0319166001600160a01b03929092169182179055604080516303639b8b60e21b81529051919450610678918591630d8e6e2c9160048083019260209291908290030181865afa15801561064d573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061067191906117a7565b8784610efb565b6002546040516001600160a01b038881168252909116907f78922e3fa1abc96399973cb25528ba892214b57da9d1a573937c460d9f5eb4759060200160405180910390a250509392505050565b600254604080516303639b8b60e21b815290515f926001600160a01b031691630d8e6e2c9160048083019260209291908290030181865afa15801561070c573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061073091906117a7565b905090565b5f61073030611291565b60606349bb9e4b60e01b838360405160240161075c9291906117c2565b60408051601f198184030181529190526020810180516001600160e01b03166001600160e01b03199093169290921790915290505b92915050565b61079f61148a565b6001600160e01b0319165f908152602081905260409020805460ff19166001179055565b6107cb61148a565b6301ffc9a760e01b5f9081526020527f67be87c3ff9960ca1e9cfac5cab2ff4747269cf9ed20c9b7306235ac35a491c5805460ff19166001179055565b61081061148a565b806001600160a01b03163b5f036108455760405163fdeac91f60e01b81526001600160a01b0382166004820152602401610574565b600180546001600160a01b0319166001600160a01b0383169081179091556040516301ffc9a760e01b81526318788cbb60e11b60048201526301ffc9a790602401602060405180830381865afa9250505080156108bf575060408051601f3d908101601f191682019092526108bc918101906117e5565b60015b6108e75760405163fdeac91f60e01b81526001600160a01b0382166004820152602401610574565b806109105760405163fdeac91f60e01b81526001600160a01b0383166004820152602401610574565b505b50565b5f805f8051602061270083398151915280546040516330b8415f60e01b81526001600160601b03909116600482015290915073__$94a2c899be079b00d952d0d84fffaa5c34$__906330b8415f90602401602060405180830381865af4158015610981573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906109a591906117e5565b15610a30576001546001600160a01b03168154604051631c5da14d60e11b81526001600160601b0390911660048201526001600160a01b0391909116906338bb429a90602401602060405180830381865afa158015610a06573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610a2a9190611804565b91505090565b54600160601b90046001600160a01b0316919050565b606063329d6e7460e01b82604051602401610a6191906116ae565b60408051601f198184030181529190526020810180516001600160e01b03166001600160e01b03199093169290921790915292915050565b5f60048281548110610aad57610aad61181f565b905f5260205f2090600a91828204019190066003029054906101000a900462ffffff169050919050565b5f610ae0610915565b6001600160a01b0316336001600160a01b031614610b135760405163086391f760e31b8152336004820152602401610574565b6004545f03610b355760405163366dfd2160e21b815260040160405180910390fd5b5f610b3e610915565b90505f610b536002546001600160a01b031690565b6001600160a01b0316638b3240a06040518163ffffffff1660e01b81526004016020604051808303815f875af1158015610b8f573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610bb39190611804565b6002549091506001600160a01b03908116908216639623609d8288610bd789610a46565b6040518463ffffffff1660e01b8152600401610bf593929190611773565b5f604051808303815f87803b158015610c0c575f80fd5b505af1158015610c1e573d5f803e3d5ffd5b5050505060025f9054906101000a90046001600160a01b03169350610ca3846001600160a01b0316630d8e6e2c6040518163ffffffff1660e01b8152600401602060405180830381865afa158015610c78573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610c9c91906117a7565b8785610efb565b6002546040516001600160a01b038881168252909116907f1356a2c922be684528fa1759d1808395e5c5010181dd333cdb6f03e2d8545b659060200160405180910390a250505092915050565b5f610cf9610915565b6001600160a01b0316336001600160a01b031614610d2c5760405163086391f760e31b8152336004820152602401610574565b60045415610d4d5760405163402b135f60e11b815260040160405180910390fd5b5f610d56610915565b9050308481610d65848761073f565b604051610d71906114d5565b610d7d93929190611773565b604051809103905ff080158015610d96573d5f803e3d5ffd5b50600280546001600160a01b0319166001600160a01b03929092169182179055604080516303639b8b60e21b81529051919450610e22918591630d8e6e2c9160048083019260209291908290030181865afa158015610df7573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610e1b91906117a7565b8684610efb565b6002546040516001600160a01b038781168252909116907f78922e3fa1abc96399973cb25528ba892214b57da9d1a573937c460d9f5eb4759060200160405180910390a2505092915050565b610e7661148a565b610e7f81610808565b610e876107c3565b6001600160a01b038216610eae5760405163f17ef42d60e01b815260040160405180910390fd5b505f8051602061270083398151915280546001600160601b0316600160601b6001600160a01b0390931692909202919091179055565b6002545f90610730906001600160a01b0316611291565b610f778373__$8eede297b65ed5a56eb3f84d8232ae93f5$__6304b8f6c56040518163ffffffff1660e01b8152600401602060405180830381865af4158015610f46573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610f6a91906117a7565b62ffffff90811691161490565b15610f95576040516348c618db60e01b815260040160405180910390fd5b600454156110ed5760048054610fad90600190611833565b81548110610fbd57610fbd61181f565b5f9182526020909120600a80830490910154604051635560100760e01b8152919092066003026101000a90910462ffffff16600482015273__$8eede297b65ed5a56eb3f84d8232ae93f5$__90635560100790602401602060405180830381865af415801561102e573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906110529190611852565b604051635560100760e01b815262ffffff8516600482015273__$8eede297b65ed5a56eb3f84d8232ae93f5$__90635560100790602401602060405180830381865af41580156110a4573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906110c89190611852565b116110ed57604051633e614b6d60e11b815262ffffff84166004820152602401610574565b600480546001810182555f829052600a8082047f8a35acfbc15ff81a39ae7d344fd709f28e8600b4aa8c65c6b64bfe7fe36bd19b01805462ffffff808916600394909506939093026101000a848102930219169190911790556040805160a0810182529182526001600160a01b038086166020848101919091529085168383015281516356db0c1960e11b815291519293606085019373__$91d01b1eccbca8d6f94a5eb2a0acb040e9$__9363adb6183293818401939092918290030181865af41580156111bd573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906111e19190611869565b64ffffffffff90811682524363ffffffff90811660209384015262ffffff9687165f90815260038452604090819020855181549587015199166001600160b81b03199095169490941763010000006001600160a01b03998a1602178455840151600190930180546060860151608090960151949098166001600160c81b031990981697909717600160a01b94909216939093021763ffffffff60c81b1916600160c81b9190921602179092555050565b5f805f8051602061270083398151915280546040516330b8415f60e01b81526001600160601b03909116600482015290915073__$94a2c899be079b00d952d0d84fffaa5c34$__906330b8415f90602401602060405180830381865af41580156112fd573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061132191906117e5565b1561134d5780546040516301ab8b6760e21b81526001600160601b039091166004820152602401610574565b6001546001600160a01b031660405163c3c5a54760e01b81526001600160a01b038581166004830152919091169063c3c5a54790602401602060405180830381865afa15801561139f573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906113c391906117e5565b6113eb5760405163b9304b0d60e01b81526001600160a01b0384166004820152602401610574565b6001546001600160a01b0316604051636939560f60e11b81526001600160a01b038581166004830152919091169063d272ac1e90602401602060405180830381865afa15801561143d573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190611461919061188d565b81546bffffffffffffffffffffffff19166001600160601b039190911690811790915592915050565b7ff0c57e16840df040f15088dc2f81fe391c3923bec73e23a9662efc9c229c6a0054600160401b900460ff166114d357604051631afcd79f60e31b815260040160405180910390fd5b565b610e4c806118b483390190565b5f602082840312156114f2575f80fd5b81356001600160e01b031981168114611509575f80fd5b9392505050565b6001600160a01b0381168114610912575f80fd5b5f60208284031215611534575f80fd5b813561150981611510565b634e487b7160e01b5f52604160045260245ffd5b5f82601f830112611562575f80fd5b813567ffffffffffffffff81111561157c5761157c61153f565b604051601f8201601f19908116603f0116810167ffffffffffffffff811182821017156115ab576115ab61153f565b6040528181528382016020018510156115c2575f80fd5b816020850160208301375f918101602001919091529392505050565b5f805f606084860312156115f0575f80fd5b83356115fb81611510565b9250602084013567ffffffffffffffff811115611616575f80fd5b61162286828701611553565b925050604084013590509250925092565b5f8060408385031215611644575f80fd5b823561164f81611510565b9150602083013567ffffffffffffffff81111561166a575f80fd5b61167685828601611553565b9150509250929050565b5f81518084528060208401602086015e5f602082860101526020601f19601f83011685010191505092915050565b602081525f6115096020830184611680565b62ffffff81168114610912575f80fd5b5f602082840312156116e0575f80fd5b8135611509816116c0565b5f602082840312156116fb575f80fd5b813567ffffffffffffffff811115611711575f80fd5b61171d84828501611553565b949350505050565b5f60208284031215611735575f80fd5b5035919050565b5f806040838503121561174d575f80fd5b823561175881611510565b9150602083013561176881611510565b809150509250929050565b6001600160a01b038481168252831660208201526060604082018190525f9061179e90830184611680565b95945050505050565b5f602082840312156117b7575f80fd5b8151611509816116c0565b6001600160a01b03831681526040602082018190525f9061171d90830184611680565b5f602082840312156117f5575f80fd5b81518015158114611509575f80fd5b5f60208284031215611814575f80fd5b815161150981611510565b634e487b7160e01b5f52603260045260245ffd5b8181038181111561079157634e487b7160e01b5f52601160045260245ffd5b5f60208284031215611862575f80fd5b5051919050565b5f60208284031215611879575f80fd5b815164ffffffffff81168114611509575f80fd5b5f6020828403121561189d575f80fd5b81516001600160601b0381168114611509575f80fdfe60a060405234801561000f575f80fd5b50604051610e4c380380610e4c83398101604081905261002e9161037c565b828282828161003d828261009e565b50508160405161004c90610340565b6001600160a01b039091168152602001604051809103905ff080158015610075573d5f803e3d5ffd5b506001600160a01b031660805261009361008e60805190565b6100fc565b505050505050610463565b6100a782610169565b6040516001600160a01b038316907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b905f90a28051156100f0576100eb82826101e7565b505050565b6100f861025a565b5050565b7f7e644d79422f17c01e4894b5f4f588d331ebfa28653d42ae832dc59e38c9798f61013b5f80516020610e2c833981519152546001600160a01b031690565b604080516001600160a01b03928316815291841660208301520160405180910390a16101668161027b565b50565b806001600160a01b03163b5f036101a357604051634c9c8ce360e01b81526001600160a01b03821660048201526024015b60405180910390fd5b807f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc5b80546001600160a01b0319166001600160a01b039290921691909117905550565b60605f80846001600160a01b031684604051610203919061044d565b5f60405180830381855af49150503d805f811461023b576040519150601f19603f3d011682016040523d82523d5f602084013e610240565b606091505b5090925090506102518583836102b8565b95945050505050565b34156102795760405163b398979f60e01b815260040160405180910390fd5b565b6001600160a01b0381166102a457604051633173bdd160e11b81525f600482015260240161019a565b805f80516020610e2c8339815191526101c6565b6060826102cd576102c882610317565b610310565b81511580156102e457506001600160a01b0384163b155b1561030d57604051639996b31560e01b81526001600160a01b038516600482015260240161019a565b50805b9392505050565b8051156103275780518082602001fd5b604051630a12f52160e11b815260040160405180910390fd5b6104ef8061093d83390190565b80516001600160a01b0381168114610363575f80fd5b919050565b634e487b7160e01b5f52604160045260245ffd5b5f805f6060848603121561038e575f80fd5b6103978461034d565b92506103a56020850161034d565b60408501519092506001600160401b038111156103c0575f80fd5b8401601f810186136103d0575f80fd5b80516001600160401b038111156103e9576103e9610368565b604051601f8201601f19908116603f011681016001600160401b038111828210171561041757610417610368565b60405281815282820160200188101561042e575f80fd5b8160208401602083015e5f602083830101528093505050509250925092565b5f82518060208501845e5f920191825250919050565b6080516104bd6104805f395f818160350152607201526104bd5ff3fe60806040526004361061001d575f3560e01c80638b3240a014610027575b610025610070565b005b348015610032575f80fd5b507f00000000000000000000000000000000000000000000000000000000000000006040516001600160a01b03909116815260200160405180910390f35b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031633036100dc575f356001600160e01b03191663278f794360e11b146100d2576040516334ad5dbb60e21b815260040160405180910390fd5b6100da6100e9565b565b6100da610117565b905090565b5f806100f83660048184610365565b81019061010591906103a0565b915091506101138282610127565b5050565b6100da610122610181565b6101b3565b610130826101d1565b6040516001600160a01b038316907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b905f90a280511561017957610174828261024c565b505050565b6101136102be565b5f6100e47f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc546001600160a01b031690565b365f80375f80365f845af43d5f803e8080156101cd573d5ff35b3d5ffd5b806001600160a01b03163b5f0361020b57604051634c9c8ce360e01b81526001600160a01b03821660048201526024015b60405180910390fd5b7f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc80546001600160a01b0319166001600160a01b0392909216919091179055565b60605f80846001600160a01b0316846040516102689190610471565b5f60405180830381855af49150503d805f81146102a0576040519150601f19603f3d011682016040523d82523d5f602084013e6102a5565b606091505b50915091506102b58583836102dd565b95945050505050565b34156100da5760405163b398979f60e01b815260040160405180910390fd5b6060826102f2576102ed8261033c565b610335565b815115801561030957506001600160a01b0384163b155b1561033257604051639996b31560e01b81526001600160a01b0385166004820152602401610202565b50805b9392505050565b80511561034c5780518082602001fd5b604051630a12f52160e11b815260040160405180910390fd5b5f8085851115610373575f80fd5b8386111561037f575f80fd5b5050820193919092039150565b634e487b7160e01b5f52604160045260245ffd5b5f80604083850312156103b1575f80fd5b82356001600160a01b03811681146103c7575f80fd5b9150602083013567ffffffffffffffff8111156103e2575f80fd5b8301601f810185136103f2575f80fd5b803567ffffffffffffffff81111561040c5761040c61038c565b604051601f8201601f19908116603f0116810167ffffffffffffffff8111828210171561043b5761043b61038c565b604052818152828201602001871015610452575f80fd5b816020840160208301375f602083830101528093505050509250929050565b5f82518060208501845e5f92019182525091905056fea26469706673582212205f12e4d638be8d591db7c67d942f3e9eeb14e9e44f78ba8cddaca37631bdc49764736f6c634300081a0033608060405234801561000f575f80fd5b506040516104ef3803806104ef83398101604081905261002e916100bb565b806001600160a01b03811661005c57604051631e4fbdf760e01b81525f600482015260240160405180910390fd5b6100658161006c565b50506100e8565b5f80546001600160a01b038381166001600160a01b0319831681178455604051919092169283917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e09190a35050565b5f602082840312156100cb575f80fd5b81516001600160a01b03811681146100e1575f80fd5b9392505050565b6103fa806100f55f395ff3fe608060405260043610610049575f3560e01c8063715018a61461004d5780638da5cb5b146100635780639623609d1461008e578063ad3cb1cc146100a1578063f2fde38b146100de575b5f80fd5b348015610058575f80fd5b506100616100fd565b005b34801561006e575f80fd5b505f546040516001600160a01b0390911681526020015b60405180910390f35b61006161009c366004610260565b610110565b3480156100ac575f80fd5b506100d1604051806040016040528060058152602001640352e302e360dc1b81525081565b6040516100859190610365565b3480156100e9575f80fd5b506100616100f836600461037e565b61017b565b6101056101bd565b61010e5f6101e9565b565b6101186101bd565b60405163278f794360e11b81526001600160a01b03841690634f1ef2869034906101489086908690600401610399565b5f604051808303818588803b15801561015f575f80fd5b505af1158015610171573d5f803e3d5ffd5b5050505050505050565b6101836101bd565b6001600160a01b0381166101b157604051631e4fbdf760e01b81525f60048201526024015b60405180910390fd5b6101ba816101e9565b50565b5f546001600160a01b0316331461010e5760405163118cdaa760e01b81523360048201526024016101a8565b5f80546001600160a01b038381166001600160a01b0319831681178455604051919092169283917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e09190a35050565b6001600160a01b03811681146101ba575f80fd5b634e487b7160e01b5f52604160045260245ffd5b5f805f60608486031215610272575f80fd5b833561027d81610238565b9250602084013561028d81610238565b9150604084013567ffffffffffffffff8111156102a8575f80fd5b8401601f810186136102b8575f80fd5b803567ffffffffffffffff8111156102d2576102d261024c565b604051601f8201601f19908116603f0116810167ffffffffffffffff811182821017156103015761030161024c565b604052818152828201602001881015610318575f80fd5b816020840160208301375f602083830101528093505050509250925092565b5f81518084528060208401602086015e5f602082860101526020601f19601f83011685010191505092915050565b602081525f6103776020830184610337565b9392505050565b5f6020828403121561038e575f80fd5b813561037781610238565b6001600160a01b03831681526040602082018190525f906103bc90830184610337565b94935050505056fea264697066735822122063012ab3c3421087c307802be7295f03bec95db9eea702a4c2db9595befa162464736f6c634300081a0033b53127684a568b3173ae13b9f8a6016e243e63b6e8ee1178d6a717850b5d610307ebcf49758b6ed3af50fa146bec0abe157c0218fe65dc0874c286e9d5da4f00a264697066735822122045fae54797c9ec36e8c9921b16c59e1db93f632c162e04905b46f5cae094919964736f6c634300081a0033",
540
+ "deployedBytecode": "0x608060405234801561000f575f80fd5b506004361061013d575f3560e01c8063675393bf116100b4578063ada9652e11610079578063ada9652e146103c5578063b88da759146103d9578063c987336c146103ec578063e97fac05146103ff578063f7c34ee014610412578063fd0c63d914610425575f80fd5b8063675393bf14610374578063893d20e8146103875780638e9afce61461038f578063933a9ce8146103a2578063946dfcfe146103b3575f80fd5b80631775564d116101055780631775564d146101fe578063214cdb801461021e57806336fc697e146102315780634d459c90146102395780635ab1bd5314610346578063644c45e014610357575f80fd5b806301ffc9a714610141578063058f7a971461018257806307484e80146101975780630d8e6e2c146101c2578063138461e0146101de575b5f80fd5b61016d61014f3660046114e2565b6001600160e01b0319165f9081526020819052604090205460ff1690565b60405190151581526020015b60405180910390f35b610195610190366004611524565b61042d565b005b6101aa6101a53660046115de565b61053c565b6040516001600160a01b039091168152602001610179565b6101ca6106c5565b60405162ffffff9091168152602001610179565b6101e6610735565b6040516001600160601b039091168152602001610179565b61021161020c366004611633565b61073f565b60405161017991906116ae565b61019561022c3660046114e2565b610797565b6101956107c3565b6102e96102473660046116d0565b6040805160a0810182525f808252602082018190529181018290526060810182905260808101919091525062ffffff9081165f90815260036020908152604091829020825160a0810184528154948516815263010000009094046001600160a01b03908116928501929092526001015490811691830191909152600160a01b810464ffffffffff166060830152600160c81b900463ffffffff16608082015290565b60408051825162ffffff1681526020808401516001600160a01b039081169183019190915283830151169181019190915260608083015164ffffffffff169082015260809182015163ffffffff169181019190915260a001610179565b6001546001600160a01b03166101aa565b5f80516020612700833981519152546001600160601b03166101e6565b610195610382366004611524565b610808565b6101aa610915565b61021161039d3660046116eb565b610a46565b6002546001600160a01b03166101aa565b6004545b604051908152602001610179565b6103b75f8051602061270083398151915281565b6101ca6103e7366004611725565b610a99565b6101aa6103fa366004611633565b610ad7565b6101aa61040d366004611633565b610cf0565b61019561042036600461173c565b610e6e565b6101e6610ee4565b7ff0c57e16840df040f15088dc2f81fe391c3923bec73e23a9662efc9c229c6a008054600160401b810460ff16159067ffffffffffffffff165f811580156104725750825b90505f8267ffffffffffffffff16600114801561048e5750303b155b90508115801561049c575080155b156104ba5760405163f92ee8a960e01b815260040160405180910390fd5b845467ffffffffffffffff1916600117855583156104e457845460ff60401b1916600160401b1785555b6104ee3387610e6e565b831561053457845460ff60401b19168555604051600181527fc7f505b2f371ae2175ee4913f4499e1f2633a7b5936321eed1cdaeb6115181d29060200160405180910390a15b505050505050565b5f610545610915565b6001600160a01b0316336001600160a01b03161461057d5760405163086391f760e31b81523360048201526024015b60405180910390fd5b6004541561059e5760405163402b135f60e11b815260040160405180910390fd5b5f6105a7610915565b9050308386826105b7858961073f565b6040516105c3906114d5565b6105cf93929190611773565b8190604051809103905ff59050801580156105ec573d5f803e3d5ffd5b50600280546001600160a01b0319166001600160a01b03929092169182179055604080516303639b8b60e21b81529051919450610678918591630d8e6e2c9160048083019260209291908290030181865afa15801561064d573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061067191906117a7565b8784610efb565b6002546040516001600160a01b038881168252909116907f78922e3fa1abc96399973cb25528ba892214b57da9d1a573937c460d9f5eb4759060200160405180910390a250509392505050565b600254604080516303639b8b60e21b815290515f926001600160a01b031691630d8e6e2c9160048083019260209291908290030181865afa15801561070c573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061073091906117a7565b905090565b5f61073030611291565b60606349bb9e4b60e01b838360405160240161075c9291906117c2565b60408051601f198184030181529190526020810180516001600160e01b03166001600160e01b03199093169290921790915290505b92915050565b61079f61148a565b6001600160e01b0319165f908152602081905260409020805460ff19166001179055565b6107cb61148a565b6301ffc9a760e01b5f9081526020527f67be87c3ff9960ca1e9cfac5cab2ff4747269cf9ed20c9b7306235ac35a491c5805460ff19166001179055565b61081061148a565b806001600160a01b03163b5f036108455760405163fdeac91f60e01b81526001600160a01b0382166004820152602401610574565b600180546001600160a01b0319166001600160a01b0383169081179091556040516301ffc9a760e01b81526318788cbb60e11b60048201526301ffc9a790602401602060405180830381865afa9250505080156108bf575060408051601f3d908101601f191682019092526108bc918101906117e5565b60015b6108e75760405163fdeac91f60e01b81526001600160a01b0382166004820152602401610574565b806109105760405163fdeac91f60e01b81526001600160a01b0383166004820152602401610574565b505b50565b5f805f8051602061270083398151915280546040516330b8415f60e01b81526001600160601b03909116600482015290915073__$94a2c899be079b00d952d0d84fffaa5c34$__906330b8415f90602401602060405180830381865af4158015610981573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906109a591906117e5565b15610a30576001546001600160a01b03168154604051631c5da14d60e11b81526001600160601b0390911660048201526001600160a01b0391909116906338bb429a90602401602060405180830381865afa158015610a06573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610a2a9190611804565b91505090565b54600160601b90046001600160a01b0316919050565b606063329d6e7460e01b82604051602401610a6191906116ae565b60408051601f198184030181529190526020810180516001600160e01b03166001600160e01b03199093169290921790915292915050565b5f60048281548110610aad57610aad61181f565b905f5260205f2090600a91828204019190066003029054906101000a900462ffffff169050919050565b5f610ae0610915565b6001600160a01b0316336001600160a01b031614610b135760405163086391f760e31b8152336004820152602401610574565b6004545f03610b355760405163366dfd2160e21b815260040160405180910390fd5b5f610b3e610915565b90505f610b536002546001600160a01b031690565b6001600160a01b0316638b3240a06040518163ffffffff1660e01b81526004016020604051808303815f875af1158015610b8f573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610bb39190611804565b6002549091506001600160a01b03908116908216639623609d8288610bd789610a46565b6040518463ffffffff1660e01b8152600401610bf593929190611773565b5f604051808303815f87803b158015610c0c575f80fd5b505af1158015610c1e573d5f803e3d5ffd5b5050505060025f9054906101000a90046001600160a01b03169350610ca3846001600160a01b0316630d8e6e2c6040518163ffffffff1660e01b8152600401602060405180830381865afa158015610c78573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610c9c91906117a7565b8785610efb565b6002546040516001600160a01b038881168252909116907f1356a2c922be684528fa1759d1808395e5c5010181dd333cdb6f03e2d8545b659060200160405180910390a250505092915050565b5f610cf9610915565b6001600160a01b0316336001600160a01b031614610d2c5760405163086391f760e31b8152336004820152602401610574565b60045415610d4d5760405163402b135f60e11b815260040160405180910390fd5b5f610d56610915565b9050308481610d65848761073f565b604051610d71906114d5565b610d7d93929190611773565b604051809103905ff080158015610d96573d5f803e3d5ffd5b50600280546001600160a01b0319166001600160a01b03929092169182179055604080516303639b8b60e21b81529051919450610e22918591630d8e6e2c9160048083019260209291908290030181865afa158015610df7573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610e1b91906117a7565b8684610efb565b6002546040516001600160a01b038781168252909116907f78922e3fa1abc96399973cb25528ba892214b57da9d1a573937c460d9f5eb4759060200160405180910390a2505092915050565b610e7661148a565b610e7f81610808565b610e876107c3565b6001600160a01b038216610eae5760405163f17ef42d60e01b815260040160405180910390fd5b505f8051602061270083398151915280546001600160601b0316600160601b6001600160a01b0390931692909202919091179055565b6002545f90610730906001600160a01b0316611291565b610f778373__$8eede297b65ed5a56eb3f84d8232ae93f5$__6304b8f6c56040518163ffffffff1660e01b8152600401602060405180830381865af4158015610f46573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610f6a91906117a7565b62ffffff90811691161490565b15610f95576040516348c618db60e01b815260040160405180910390fd5b600454156110ed5760048054610fad90600190611833565b81548110610fbd57610fbd61181f565b5f9182526020909120600a80830490910154604051635560100760e01b8152919092066003026101000a90910462ffffff16600482015273__$8eede297b65ed5a56eb3f84d8232ae93f5$__90635560100790602401602060405180830381865af415801561102e573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906110529190611852565b604051635560100760e01b815262ffffff8516600482015273__$8eede297b65ed5a56eb3f84d8232ae93f5$__90635560100790602401602060405180830381865af41580156110a4573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906110c89190611852565b116110ed57604051633e614b6d60e11b815262ffffff84166004820152602401610574565b600480546001810182555f829052600a8082047f8a35acfbc15ff81a39ae7d344fd709f28e8600b4aa8c65c6b64bfe7fe36bd19b01805462ffffff808916600394909506939093026101000a848102930219169190911790556040805160a0810182529182526001600160a01b038086166020848101919091529085168383015281516356db0c1960e11b815291519293606085019373__$91d01b1eccbca8d6f94a5eb2a0acb040e9$__9363adb6183293818401939092918290030181865af41580156111bd573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906111e19190611869565b64ffffffffff90811682524363ffffffff90811660209384015262ffffff9687165f90815260038452604090819020855181549587015199166001600160b81b03199095169490941763010000006001600160a01b03998a1602178455840151600190930180546060860151608090960151949098166001600160c81b031990981697909717600160a01b94909216939093021763ffffffff60c81b1916600160c81b9190921602179092555050565b5f805f8051602061270083398151915280546040516330b8415f60e01b81526001600160601b03909116600482015290915073__$94a2c899be079b00d952d0d84fffaa5c34$__906330b8415f90602401602060405180830381865af41580156112fd573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061132191906117e5565b1561134d5780546040516301ab8b6760e21b81526001600160601b039091166004820152602401610574565b6001546001600160a01b031660405163c3c5a54760e01b81526001600160a01b038581166004830152919091169063c3c5a54790602401602060405180830381865afa15801561139f573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906113c391906117e5565b6113eb5760405163b9304b0d60e01b81526001600160a01b0384166004820152602401610574565b6001546001600160a01b0316604051636939560f60e11b81526001600160a01b038581166004830152919091169063d272ac1e90602401602060405180830381865afa15801561143d573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190611461919061188d565b81546bffffffffffffffffffffffff19166001600160601b039190911690811790915592915050565b7ff0c57e16840df040f15088dc2f81fe391c3923bec73e23a9662efc9c229c6a0054600160401b900460ff166114d357604051631afcd79f60e31b815260040160405180910390fd5b565b610e4c806118b483390190565b5f602082840312156114f2575f80fd5b81356001600160e01b031981168114611509575f80fd5b9392505050565b6001600160a01b0381168114610912575f80fd5b5f60208284031215611534575f80fd5b813561150981611510565b634e487b7160e01b5f52604160045260245ffd5b5f82601f830112611562575f80fd5b813567ffffffffffffffff81111561157c5761157c61153f565b604051601f8201601f19908116603f0116810167ffffffffffffffff811182821017156115ab576115ab61153f565b6040528181528382016020018510156115c2575f80fd5b816020850160208301375f918101602001919091529392505050565b5f805f606084860312156115f0575f80fd5b83356115fb81611510565b9250602084013567ffffffffffffffff811115611616575f80fd5b61162286828701611553565b925050604084013590509250925092565b5f8060408385031215611644575f80fd5b823561164f81611510565b9150602083013567ffffffffffffffff81111561166a575f80fd5b61167685828601611553565b9150509250929050565b5f81518084528060208401602086015e5f602082860101526020601f19601f83011685010191505092915050565b602081525f6115096020830184611680565b62ffffff81168114610912575f80fd5b5f602082840312156116e0575f80fd5b8135611509816116c0565b5f602082840312156116fb575f80fd5b813567ffffffffffffffff811115611711575f80fd5b61171d84828501611553565b949350505050565b5f60208284031215611735575f80fd5b5035919050565b5f806040838503121561174d575f80fd5b823561175881611510565b9150602083013561176881611510565b809150509250929050565b6001600160a01b038481168252831660208201526060604082018190525f9061179e90830184611680565b95945050505050565b5f602082840312156117b7575f80fd5b8151611509816116c0565b6001600160a01b03831681526040602082018190525f9061171d90830184611680565b5f602082840312156117f5575f80fd5b81518015158114611509575f80fd5b5f60208284031215611814575f80fd5b815161150981611510565b634e487b7160e01b5f52603260045260245ffd5b8181038181111561079157634e487b7160e01b5f52601160045260245ffd5b5f60208284031215611862575f80fd5b5051919050565b5f60208284031215611879575f80fd5b815164ffffffffff81168114611509575f80fd5b5f6020828403121561189d575f80fd5b81516001600160601b0381168114611509575f80fdfe60a060405234801561000f575f80fd5b50604051610e4c380380610e4c83398101604081905261002e9161037c565b828282828161003d828261009e565b50508160405161004c90610340565b6001600160a01b039091168152602001604051809103905ff080158015610075573d5f803e3d5ffd5b506001600160a01b031660805261009361008e60805190565b6100fc565b505050505050610463565b6100a782610169565b6040516001600160a01b038316907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b905f90a28051156100f0576100eb82826101e7565b505050565b6100f861025a565b5050565b7f7e644d79422f17c01e4894b5f4f588d331ebfa28653d42ae832dc59e38c9798f61013b5f80516020610e2c833981519152546001600160a01b031690565b604080516001600160a01b03928316815291841660208301520160405180910390a16101668161027b565b50565b806001600160a01b03163b5f036101a357604051634c9c8ce360e01b81526001600160a01b03821660048201526024015b60405180910390fd5b807f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc5b80546001600160a01b0319166001600160a01b039290921691909117905550565b60605f80846001600160a01b031684604051610203919061044d565b5f60405180830381855af49150503d805f811461023b576040519150601f19603f3d011682016040523d82523d5f602084013e610240565b606091505b5090925090506102518583836102b8565b95945050505050565b34156102795760405163b398979f60e01b815260040160405180910390fd5b565b6001600160a01b0381166102a457604051633173bdd160e11b81525f600482015260240161019a565b805f80516020610e2c8339815191526101c6565b6060826102cd576102c882610317565b610310565b81511580156102e457506001600160a01b0384163b155b1561030d57604051639996b31560e01b81526001600160a01b038516600482015260240161019a565b50805b9392505050565b8051156103275780518082602001fd5b604051630a12f52160e11b815260040160405180910390fd5b6104ef8061093d83390190565b80516001600160a01b0381168114610363575f80fd5b919050565b634e487b7160e01b5f52604160045260245ffd5b5f805f6060848603121561038e575f80fd5b6103978461034d565b92506103a56020850161034d565b60408501519092506001600160401b038111156103c0575f80fd5b8401601f810186136103d0575f80fd5b80516001600160401b038111156103e9576103e9610368565b604051601f8201601f19908116603f011681016001600160401b038111828210171561041757610417610368565b60405281815282820160200188101561042e575f80fd5b8160208401602083015e5f602083830101528093505050509250925092565b5f82518060208501845e5f920191825250919050565b6080516104bd6104805f395f818160350152607201526104bd5ff3fe60806040526004361061001d575f3560e01c80638b3240a014610027575b610025610070565b005b348015610032575f80fd5b507f00000000000000000000000000000000000000000000000000000000000000006040516001600160a01b03909116815260200160405180910390f35b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031633036100dc575f356001600160e01b03191663278f794360e11b146100d2576040516334ad5dbb60e21b815260040160405180910390fd5b6100da6100e9565b565b6100da610117565b905090565b5f806100f83660048184610365565b81019061010591906103a0565b915091506101138282610127565b5050565b6100da610122610181565b6101b3565b610130826101d1565b6040516001600160a01b038316907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b905f90a280511561017957610174828261024c565b505050565b6101136102be565b5f6100e47f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc546001600160a01b031690565b365f80375f80365f845af43d5f803e8080156101cd573d5ff35b3d5ffd5b806001600160a01b03163b5f0361020b57604051634c9c8ce360e01b81526001600160a01b03821660048201526024015b60405180910390fd5b7f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc80546001600160a01b0319166001600160a01b0392909216919091179055565b60605f80846001600160a01b0316846040516102689190610471565b5f60405180830381855af49150503d805f81146102a0576040519150601f19603f3d011682016040523d82523d5f602084013e6102a5565b606091505b50915091506102b58583836102dd565b95945050505050565b34156100da5760405163b398979f60e01b815260040160405180910390fd5b6060826102f2576102ed8261033c565b610335565b815115801561030957506001600160a01b0384163b155b1561033257604051639996b31560e01b81526001600160a01b0385166004820152602401610202565b50805b9392505050565b80511561034c5780518082602001fd5b604051630a12f52160e11b815260040160405180910390fd5b5f8085851115610373575f80fd5b8386111561037f575f80fd5b5050820193919092039150565b634e487b7160e01b5f52604160045260245ffd5b5f80604083850312156103b1575f80fd5b82356001600160a01b03811681146103c7575f80fd5b9150602083013567ffffffffffffffff8111156103e2575f80fd5b8301601f810185136103f2575f80fd5b803567ffffffffffffffff81111561040c5761040c61038c565b604051601f8201601f19908116603f0116810167ffffffffffffffff8111828210171561043b5761043b61038c565b604052818152828201602001871015610452575f80fd5b816020840160208301375f602083830101528093505050509250929050565b5f82518060208501845e5f92019182525091905056fea26469706673582212205f12e4d638be8d591db7c67d942f3e9eeb14e9e44f78ba8cddaca37631bdc49764736f6c634300081a0033608060405234801561000f575f80fd5b506040516104ef3803806104ef83398101604081905261002e916100bb565b806001600160a01b03811661005c57604051631e4fbdf760e01b81525f600482015260240160405180910390fd5b6100658161006c565b50506100e8565b5f80546001600160a01b038381166001600160a01b0319831681178455604051919092169283917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e09190a35050565b5f602082840312156100cb575f80fd5b81516001600160a01b03811681146100e1575f80fd5b9392505050565b6103fa806100f55f395ff3fe608060405260043610610049575f3560e01c8063715018a61461004d5780638da5cb5b146100635780639623609d1461008e578063ad3cb1cc146100a1578063f2fde38b146100de575b5f80fd5b348015610058575f80fd5b506100616100fd565b005b34801561006e575f80fd5b505f546040516001600160a01b0390911681526020015b60405180910390f35b61006161009c366004610260565b610110565b3480156100ac575f80fd5b506100d1604051806040016040528060058152602001640352e302e360dc1b81525081565b6040516100859190610365565b3480156100e9575f80fd5b506100616100f836600461037e565b61017b565b6101056101bd565b61010e5f6101e9565b565b6101186101bd565b60405163278f794360e11b81526001600160a01b03841690634f1ef2869034906101489086908690600401610399565b5f604051808303818588803b15801561015f575f80fd5b505af1158015610171573d5f803e3d5ffd5b5050505050505050565b6101836101bd565b6001600160a01b0381166101b157604051631e4fbdf760e01b81525f60048201526024015b60405180910390fd5b6101ba816101e9565b50565b5f546001600160a01b0316331461010e5760405163118cdaa760e01b81523360048201526024016101a8565b5f80546001600160a01b038381166001600160a01b0319831681178455604051919092169283917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e09190a35050565b6001600160a01b03811681146101ba575f80fd5b634e487b7160e01b5f52604160045260245ffd5b5f805f60608486031215610272575f80fd5b833561027d81610238565b9250602084013561028d81610238565b9150604084013567ffffffffffffffff8111156102a8575f80fd5b8401601f810186136102b8575f80fd5b803567ffffffffffffffff8111156102d2576102d261024c565b604051601f8201601f19908116603f0116810167ffffffffffffffff811182821017156103015761030161024c565b604052818152828201602001881015610318575f80fd5b816020840160208301375f602083830101528093505050509250925092565b5f81518084528060208401602086015e5f602082860101526020601f19601f83011685010191505092915050565b602081525f6103776020830184610337565b9392505050565b5f6020828403121561038e575f80fd5b813561037781610238565b6001600160a01b03831681526040602082018190525f906103bc90830184610337565b94935050505056fea264697066735822122063012ab3c3421087c307802be7295f03bec95db9eea702a4c2db9595befa162464736f6c634300081a0033b53127684a568b3173ae13b9f8a6016e243e63b6e8ee1178d6a717850b5d610307ebcf49758b6ed3af50fa146bec0abe157c0218fe65dc0874c286e9d5da4f00a264697066735822122045fae54797c9ec36e8c9921b16c59e1db93f632c162e04905b46f5cae094919964736f6c634300081a0033",
541
541
  "linkReferences": {
542
542
  "contracts/type/NftId.sol": {
543
543
  "NftIdLib": [
package/artifacts/contracts/upgradeability/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.dbg.json ADDED
@@ -0,0 +1,4 @@
1
+ {
2
+ "_format": "hh-sol-dbg-1",
3
+ "buildInfo": "../../../build-info/5695401de7c03376933cf5a112bb7c6c.json"
4
+ }
package/artifacts/contracts/{shared → upgradeability}/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.json RENAMED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "_format": "hh-sol-artifact-1",
3
3
  "contractName": "UpgradableProxyWithAdmin",
4
- "sourceName": "contracts/shared/UpgradableProxyWithAdmin.sol",
4
+ "sourceName": "contracts/upgradeability/UpgradableProxyWithAdmin.sol",
5
5
  "abi": [
6
6
  {
7
7
  "inputs": [
@@ -122,8 +122,8 @@
122
122
  "type": "function"
123
123
  }
124
124
  ],
125
- "bytecode": "0x60a060405234801561000f575f80fd5b50604051610e4c380380610e4c83398101604081905261002e9161037c565b828282828161003d828261009e565b50508160405161004c90610340565b6001600160a01b039091168152602001604051809103905ff080158015610075573d5f803e3d5ffd5b506001600160a01b031660805261009361008e60805190565b6100fc565b505050505050610463565b6100a782610169565b6040516001600160a01b038316907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b905f90a28051156100f0576100eb82826101e7565b505050565b6100f861025a565b5050565b7f7e644d79422f17c01e4894b5f4f588d331ebfa28653d42ae832dc59e38c9798f61013b5f80516020610e2c833981519152546001600160a01b031690565b604080516001600160a01b03928316815291841660208301520160405180910390a16101668161027b565b50565b806001600160a01b03163b5f036101a357604051634c9c8ce360e01b81526001600160a01b03821660048201526024015b60405180910390fd5b807f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc5b80546001600160a01b0319166001600160a01b039290921691909117905550565b60605f80846001600160a01b031684604051610203919061044d565b5f60405180830381855af49150503d805f811461023b576040519150601f19603f3d011682016040523d82523d5f602084013e610240565b606091505b5090925090506102518583836102b8565b95945050505050565b34156102795760405163b398979f60e01b815260040160405180910390fd5b565b6001600160a01b0381166102a457604051633173bdd160e11b81525f600482015260240161019a565b805f80516020610e2c8339815191526101c6565b6060826102cd576102c882610317565b610310565b81511580156102e457506001600160a01b0384163b155b1561030d57604051639996b31560e01b81526001600160a01b038516600482015260240161019a565b50805b9392505050565b8051156103275780518082602001fd5b604051630a12f52160e11b815260040160405180910390fd5b6104ef8061093d83390190565b80516001600160a01b0381168114610363575f80fd5b919050565b634e487b7160e01b5f52604160045260245ffd5b5f805f6060848603121561038e575f80fd5b6103978461034d565b92506103a56020850161034d565b60408501519092506001600160401b038111156103c0575f80fd5b8401601f810186136103d0575f80fd5b80516001600160401b038111156103e9576103e9610368565b604051601f8201601f19908116603f011681016001600160401b038111828210171561041757610417610368565b60405281815282820160200188101561042e575f80fd5b8160208401602083015e5f602083830101528093505050509250925092565b5f82518060208501845e5f920191825250919050565b6080516104bd6104805f395f818160350152607201526104bd5ff3fe60806040526004361061001d575f3560e01c80638b3240a014610027575b610025610070565b005b348015610032575f80fd5b507f00000000000000000000000000000000000000000000000000000000000000006040516001600160a01b03909116815260200160405180910390f35b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031633036100dc575f356001600160e01b03191663278f794360e11b146100d2576040516334ad5dbb60e21b815260040160405180910390fd5b6100da6100e9565b565b6100da610117565b905090565b5f806100f83660048184610365565b81019061010591906103a0565b915091506101138282610127565b5050565b6100da610122610181565b6101b3565b610130826101d1565b6040516001600160a01b038316907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b905f90a280511561017957610174828261024c565b505050565b6101136102be565b5f6100e47f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc546001600160a01b031690565b365f80375f80365f845af43d5f803e8080156101cd573d5ff35b3d5ffd5b806001600160a01b03163b5f0361020b57604051634c9c8ce360e01b81526001600160a01b03821660048201526024015b60405180910390fd5b7f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc80546001600160a01b0319166001600160a01b0392909216919091179055565b60605f80846001600160a01b0316846040516102689190610471565b5f60405180830381855af49150503d805f81146102a0576040519150601f19603f3d011682016040523d82523d5f602084013e6102a5565b606091505b50915091506102b58583836102dd565b95945050505050565b34156100da5760405163b398979f60e01b815260040160405180910390fd5b6060826102f2576102ed8261033c565b610335565b815115801561030957506001600160a01b0384163b155b1561033257604051639996b31560e01b81526001600160a01b0385166004820152602401610202565b50805b9392505050565b80511561034c5780518082602001fd5b604051630a12f52160e11b815260040160405180910390fd5b5f8085851115610373575f80fd5b8386111561037f575f80fd5b5050820193919092039150565b634e487b7160e01b5f52604160045260245ffd5b5f80604083850312156103b1575f80fd5b82356001600160a01b03811681146103c7575f80fd5b9150602083013567ffffffffffffffff8111156103e2575f80fd5b8301601f810185136103f2575f80fd5b803567ffffffffffffffff81111561040c5761040c61038c565b604051601f8201601f19908116603f0116810167ffffffffffffffff8111828210171561043b5761043b61038c565b604052818152828201602001871015610452575f80fd5b816020840160208301375f602083830101528093505050509250929050565b5f82518060208501845e5f92019182525091905056fea26469706673582212201de12efcff2877afcc9a3b955c2c6d13d14cd8f5ebf783a67a494b62cb87fb9464736f6c634300081a0033608060405234801561000f575f80fd5b506040516104ef3803806104ef83398101604081905261002e916100bb565b806001600160a01b03811661005c57604051631e4fbdf760e01b81525f600482015260240160405180910390fd5b6100658161006c565b50506100e8565b5f80546001600160a01b038381166001600160a01b0319831681178455604051919092169283917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e09190a35050565b5f602082840312156100cb575f80fd5b81516001600160a01b03811681146100e1575f80fd5b9392505050565b6103fa806100f55f395ff3fe608060405260043610610049575f3560e01c8063715018a61461004d5780638da5cb5b146100635780639623609d1461008e578063ad3cb1cc146100a1578063f2fde38b146100de575b5f80fd5b348015610058575f80fd5b506100616100fd565b005b34801561006e575f80fd5b505f546040516001600160a01b0390911681526020015b60405180910390f35b61006161009c366004610260565b610110565b3480156100ac575f80fd5b506100d1604051806040016040528060058152602001640352e302e360dc1b81525081565b6040516100859190610365565b3480156100e9575f80fd5b506100616100f836600461037e565b61017b565b6101056101bd565b61010e5f6101e9565b565b6101186101bd565b60405163278f794360e11b81526001600160a01b03841690634f1ef2869034906101489086908690600401610399565b5f604051808303818588803b15801561015f575f80fd5b505af1158015610171573d5f803e3d5ffd5b5050505050505050565b6101836101bd565b6001600160a01b0381166101b157604051631e4fbdf760e01b81525f60048201526024015b60405180910390fd5b6101ba816101e9565b50565b5f546001600160a01b0316331461010e5760405163118cdaa760e01b81523360048201526024016101a8565b5f80546001600160a01b038381166001600160a01b0319831681178455604051919092169283917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e09190a35050565b6001600160a01b03811681146101ba575f80fd5b634e487b7160e01b5f52604160045260245ffd5b5f805f60608486031215610272575f80fd5b833561027d81610238565b9250602084013561028d81610238565b9150604084013567ffffffffffffffff8111156102a8575f80fd5b8401601f810186136102b8575f80fd5b803567ffffffffffffffff8111156102d2576102d261024c565b604051601f8201601f19908116603f0116810167ffffffffffffffff811182821017156103015761030161024c565b604052818152828201602001881015610318575f80fd5b816020840160208301375f602083830101528093505050509250925092565b5f81518084528060208401602086015e5f602082860101526020601f19601f83011685010191505092915050565b602081525f6103776020830184610337565b9392505050565b5f6020828403121561038e575f80fd5b813561037781610238565b6001600160a01b03831681526040602082018190525f906103bc90830184610337565b94935050505056fea2646970667358221220caf6b9bdb996e9a89d8eb50cc88de16d08be3a2eadb3b93dcb76b59576d5f8c564736f6c634300081a0033b53127684a568b3173ae13b9f8a6016e243e63b6e8ee1178d6a717850b5d6103",
126
- "deployedBytecode": "0x60806040526004361061001d575f3560e01c80638b3240a014610027575b610025610070565b005b348015610032575f80fd5b507f00000000000000000000000000000000000000000000000000000000000000006040516001600160a01b03909116815260200160405180910390f35b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031633036100dc575f356001600160e01b03191663278f794360e11b146100d2576040516334ad5dbb60e21b815260040160405180910390fd5b6100da6100e9565b565b6100da610117565b905090565b5f806100f83660048184610365565b81019061010591906103a0565b915091506101138282610127565b5050565b6100da610122610181565b6101b3565b610130826101d1565b6040516001600160a01b038316907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b905f90a280511561017957610174828261024c565b505050565b6101136102be565b5f6100e47f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc546001600160a01b031690565b365f80375f80365f845af43d5f803e8080156101cd573d5ff35b3d5ffd5b806001600160a01b03163b5f0361020b57604051634c9c8ce360e01b81526001600160a01b03821660048201526024015b60405180910390fd5b7f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc80546001600160a01b0319166001600160a01b0392909216919091179055565b60605f80846001600160a01b0316846040516102689190610471565b5f60405180830381855af49150503d805f81146102a0576040519150601f19603f3d011682016040523d82523d5f602084013e6102a5565b606091505b50915091506102b58583836102dd565b95945050505050565b34156100da5760405163b398979f60e01b815260040160405180910390fd5b6060826102f2576102ed8261033c565b610335565b815115801561030957506001600160a01b0384163b155b1561033257604051639996b31560e01b81526001600160a01b0385166004820152602401610202565b50805b9392505050565b80511561034c5780518082602001fd5b604051630a12f52160e11b815260040160405180910390fd5b5f8085851115610373575f80fd5b8386111561037f575f80fd5b5050820193919092039150565b634e487b7160e01b5f52604160045260245ffd5b5f80604083850312156103b1575f80fd5b82356001600160a01b03811681146103c7575f80fd5b9150602083013567ffffffffffffffff8111156103e2575f80fd5b8301601f810185136103f2575f80fd5b803567ffffffffffffffff81111561040c5761040c61038c565b604051601f8201601f19908116603f0116810167ffffffffffffffff8111828210171561043b5761043b61038c565b604052818152828201602001871015610452575f80fd5b816020840160208301375f602083830101528093505050509250929050565b5f82518060208501845e5f92019182525091905056fea26469706673582212201de12efcff2877afcc9a3b955c2c6d13d14cd8f5ebf783a67a494b62cb87fb9464736f6c634300081a0033",
125
+ "bytecode": "0x60a060405234801561000f575f80fd5b50604051610e4c380380610e4c83398101604081905261002e9161037c565b828282828161003d828261009e565b50508160405161004c90610340565b6001600160a01b039091168152602001604051809103905ff080158015610075573d5f803e3d5ffd5b506001600160a01b031660805261009361008e60805190565b6100fc565b505050505050610463565b6100a782610169565b6040516001600160a01b038316907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b905f90a28051156100f0576100eb82826101e7565b505050565b6100f861025a565b5050565b7f7e644d79422f17c01e4894b5f4f588d331ebfa28653d42ae832dc59e38c9798f61013b5f80516020610e2c833981519152546001600160a01b031690565b604080516001600160a01b03928316815291841660208301520160405180910390a16101668161027b565b50565b806001600160a01b03163b5f036101a357604051634c9c8ce360e01b81526001600160a01b03821660048201526024015b60405180910390fd5b807f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc5b80546001600160a01b0319166001600160a01b039290921691909117905550565b60605f80846001600160a01b031684604051610203919061044d565b5f60405180830381855af49150503d805f811461023b576040519150601f19603f3d011682016040523d82523d5f602084013e610240565b606091505b5090925090506102518583836102b8565b95945050505050565b34156102795760405163b398979f60e01b815260040160405180910390fd5b565b6001600160a01b0381166102a457604051633173bdd160e11b81525f600482015260240161019a565b805f80516020610e2c8339815191526101c6565b6060826102cd576102c882610317565b610310565b81511580156102e457506001600160a01b0384163b155b1561030d57604051639996b31560e01b81526001600160a01b038516600482015260240161019a565b50805b9392505050565b8051156103275780518082602001fd5b604051630a12f52160e11b815260040160405180910390fd5b6104ef8061093d83390190565b80516001600160a01b0381168114610363575f80fd5b919050565b634e487b7160e01b5f52604160045260245ffd5b5f805f6060848603121561038e575f80fd5b6103978461034d565b92506103a56020850161034d565b60408501519092506001600160401b038111156103c0575f80fd5b8401601f810186136103d0575f80fd5b80516001600160401b038111156103e9576103e9610368565b604051601f8201601f19908116603f011681016001600160401b038111828210171561041757610417610368565b60405281815282820160200188101561042e575f80fd5b8160208401602083015e5f602083830101528093505050509250925092565b5f82518060208501845e5f920191825250919050565b6080516104bd6104805f395f818160350152607201526104bd5ff3fe60806040526004361061001d575f3560e01c80638b3240a014610027575b610025610070565b005b348015610032575f80fd5b507f00000000000000000000000000000000000000000000000000000000000000006040516001600160a01b03909116815260200160405180910390f35b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031633036100dc575f356001600160e01b03191663278f794360e11b146100d2576040516334ad5dbb60e21b815260040160405180910390fd5b6100da6100e9565b565b6100da610117565b905090565b5f806100f83660048184610365565b81019061010591906103a0565b915091506101138282610127565b5050565b6100da610122610181565b6101b3565b610130826101d1565b6040516001600160a01b038316907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b905f90a280511561017957610174828261024c565b505050565b6101136102be565b5f6100e47f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc546001600160a01b031690565b365f80375f80365f845af43d5f803e8080156101cd573d5ff35b3d5ffd5b806001600160a01b03163b5f0361020b57604051634c9c8ce360e01b81526001600160a01b03821660048201526024015b60405180910390fd5b7f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc80546001600160a01b0319166001600160a01b0392909216919091179055565b60605f80846001600160a01b0316846040516102689190610471565b5f60405180830381855af49150503d805f81146102a0576040519150601f19603f3d011682016040523d82523d5f602084013e6102a5565b606091505b50915091506102b58583836102dd565b95945050505050565b34156100da5760405163b398979f60e01b815260040160405180910390fd5b6060826102f2576102ed8261033c565b610335565b815115801561030957506001600160a01b0384163b155b1561033257604051639996b31560e01b81526001600160a01b0385166004820152602401610202565b50805b9392505050565b80511561034c5780518082602001fd5b604051630a12f52160e11b815260040160405180910390fd5b5f8085851115610373575f80fd5b8386111561037f575f80fd5b5050820193919092039150565b634e487b7160e01b5f52604160045260245ffd5b5f80604083850312156103b1575f80fd5b82356001600160a01b03811681146103c7575f80fd5b9150602083013567ffffffffffffffff8111156103e2575f80fd5b8301601f810185136103f2575f80fd5b803567ffffffffffffffff81111561040c5761040c61038c565b604051601f8201601f19908116603f0116810167ffffffffffffffff8111828210171561043b5761043b61038c565b604052818152828201602001871015610452575f80fd5b816020840160208301375f602083830101528093505050509250929050565b5f82518060208501845e5f92019182525091905056fea26469706673582212205f12e4d638be8d591db7c67d942f3e9eeb14e9e44f78ba8cddaca37631bdc49764736f6c634300081a0033608060405234801561000f575f80fd5b506040516104ef3803806104ef83398101604081905261002e916100bb565b806001600160a01b03811661005c57604051631e4fbdf760e01b81525f600482015260240160405180910390fd5b6100658161006c565b50506100e8565b5f80546001600160a01b038381166001600160a01b0319831681178455604051919092169283917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e09190a35050565b5f602082840312156100cb575f80fd5b81516001600160a01b03811681146100e1575f80fd5b9392505050565b6103fa806100f55f395ff3fe608060405260043610610049575f3560e01c8063715018a61461004d5780638da5cb5b146100635780639623609d1461008e578063ad3cb1cc146100a1578063f2fde38b146100de575b5f80fd5b348015610058575f80fd5b506100616100fd565b005b34801561006e575f80fd5b505f546040516001600160a01b0390911681526020015b60405180910390f35b61006161009c366004610260565b610110565b3480156100ac575f80fd5b506100d1604051806040016040528060058152602001640352e302e360dc1b81525081565b6040516100859190610365565b3480156100e9575f80fd5b506100616100f836600461037e565b61017b565b6101056101bd565b61010e5f6101e9565b565b6101186101bd565b60405163278f794360e11b81526001600160a01b03841690634f1ef2869034906101489086908690600401610399565b5f604051808303818588803b15801561015f575f80fd5b505af1158015610171573d5f803e3d5ffd5b5050505050505050565b6101836101bd565b6001600160a01b0381166101b157604051631e4fbdf760e01b81525f60048201526024015b60405180910390fd5b6101ba816101e9565b50565b5f546001600160a01b0316331461010e5760405163118cdaa760e01b81523360048201526024016101a8565b5f80546001600160a01b038381166001600160a01b0319831681178455604051919092169283917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e09190a35050565b6001600160a01b03811681146101ba575f80fd5b634e487b7160e01b5f52604160045260245ffd5b5f805f60608486031215610272575f80fd5b833561027d81610238565b9250602084013561028d81610238565b9150604084013567ffffffffffffffff8111156102a8575f80fd5b8401601f810186136102b8575f80fd5b803567ffffffffffffffff8111156102d2576102d261024c565b604051601f8201601f19908116603f0116810167ffffffffffffffff811182821017156103015761030161024c565b604052818152828201602001881015610318575f80fd5b816020840160208301375f602083830101528093505050509250925092565b5f81518084528060208401602086015e5f602082860101526020601f19601f83011685010191505092915050565b602081525f6103776020830184610337565b9392505050565b5f6020828403121561038e575f80fd5b813561037781610238565b6001600160a01b03831681526040602082018190525f906103bc90830184610337565b94935050505056fea264697066735822122063012ab3c3421087c307802be7295f03bec95db9eea702a4c2db9595befa162464736f6c634300081a0033b53127684a568b3173ae13b9f8a6016e243e63b6e8ee1178d6a717850b5d6103",
126
+ "deployedBytecode": "0x60806040526004361061001d575f3560e01c80638b3240a014610027575b610025610070565b005b348015610032575f80fd5b507f00000000000000000000000000000000000000000000000000000000000000006040516001600160a01b03909116815260200160405180910390f35b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031633036100dc575f356001600160e01b03191663278f794360e11b146100d2576040516334ad5dbb60e21b815260040160405180910390fd5b6100da6100e9565b565b6100da610117565b905090565b5f806100f83660048184610365565b81019061010591906103a0565b915091506101138282610127565b5050565b6100da610122610181565b6101b3565b610130826101d1565b6040516001600160a01b038316907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b905f90a280511561017957610174828261024c565b505050565b6101136102be565b5f6100e47f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc546001600160a01b031690565b365f80375f80365f845af43d5f803e8080156101cd573d5ff35b3d5ffd5b806001600160a01b03163b5f0361020b57604051634c9c8ce360e01b81526001600160a01b03821660048201526024015b60405180910390fd5b7f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc80546001600160a01b0319166001600160a01b0392909216919091179055565b60605f80846001600160a01b0316846040516102689190610471565b5f60405180830381855af49150503d805f81146102a0576040519150601f19603f3d011682016040523d82523d5f602084013e6102a5565b606091505b50915091506102b58583836102dd565b95945050505050565b34156100da5760405163b398979f60e01b815260040160405180910390fd5b6060826102f2576102ed8261033c565b610335565b815115801561030957506001600160a01b0384163b155b1561033257604051639996b31560e01b81526001600160a01b0385166004820152602401610202565b50805b9392505050565b80511561034c5780518082602001fd5b604051630a12f52160e11b815260040160405180910390fd5b5f8085851115610373575f80fd5b8386111561037f575f80fd5b5050820193919092039150565b634e487b7160e01b5f52604160045260245ffd5b5f80604083850312156103b1575f80fd5b82356001600160a01b03811681146103c7575f80fd5b9150602083013567ffffffffffffffff8111156103e2575f80fd5b8301601f810185136103f2575f80fd5b803567ffffffffffffffff81111561040c5761040c61038c565b604051601f8201601f19908116603f0116810167ffffffffffffffff8111828210171561043b5761043b61038c565b604052818152828201602001871015610452575f80fd5b816020840160208301375f602083830101528093505050509250929050565b5f82518060208501845e5f92019182525091905056fea26469706673582212205f12e4d638be8d591db7c67d942f3e9eeb14e9e44f78ba8cddaca37631bdc49764736f6c634300081a0033",
127
127
  "linkReferences": {},
128
128
  "deployedLinkReferences": {}
129
129
  }
package/artifacts/contracts/upgradeability/Versionable.sol/Versionable.dbg.json ADDED
@@ -0,0 +1,4 @@
1
+ {
2
+ "_format": "hh-sol-dbg-1",
3
+ "buildInfo": "../../../build-info/5695401de7c03376933cf5a112bb7c6c.json"
4
+ }
package/artifacts/contracts/{shared → upgradeability}/Versionable.sol/Versionable.json RENAMED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "_format": "hh-sol-artifact-1",
3
3
  "contractName": "Versionable",
4
- "sourceName": "contracts/shared/Versionable.sol",
4
+ "sourceName": "contracts/upgradeability/Versionable.sol",
5
5
  "abi": [
6
6
  {
7
7
  "inputs": [],
package/contracts/authorization/Authorization.sol CHANGED
@@ -134,7 +134,6 @@ contract Authorization
134
134
  RoleIdLib.toComponentRoleId(componentType, 0),
135
135
  _toTargetRoleName(
136
136
  getTargetName()));
137
-
138
137
  }
139
138
 
140
139
  /// @dev Add a contract role for the provided role id and name.
package/contracts/distribution/BasicDistribution.sol CHANGED
@@ -1,25 +1,14 @@
1
1
  // SPDX-License-Identifier: Apache-2.0
2
2
  pragma solidity ^0.8.20;
3
3
 
4
- import {COMPONENT, DISTRIBUTION} from "../type/ObjectType.sol";
5
4
  import {Distribution} from "./Distribution.sol";
6
5
  import {IAuthorization} from "../authorization/IAuthorization.sol";
7
- import {IDistributionService} from "./IDistributionService.sol";
8
- import {IProductService} from "../product/IProductService.sol";
9
- import {NftId, NftIdLib} from "../type/NftId.sol";
10
- import {ReferralId, ReferralStatus, ReferralLib} from "../type/Referral.sol";
11
- import {Fee, FeeLib} from "../type/Fee.sol";
12
- import {InstanceLinkedComponent} from "../shared/InstanceLinkedComponent.sol";
13
- import {IComponentService} from "../shared/IComponentService.sol";
14
- import {IDistribution} from "../instance/module/IDistribution.sol";
15
- import {IDistributionComponent} from "./IDistributionComponent.sol";
16
- import {IRegistry} from "../registry/IRegistry.sol";
17
- import {TokenHandler} from "../shared/TokenHandler.sol";
18
- import {InstanceReader} from "../instance/InstanceReader.sol";
6
+ import {NftId} from "../type/NftId.sol";
7
+ import {ReferralId} from "../type/Referral.sol";
8
+ import {Fee} from "../type/Fee.sol";
19
9
  import {UFixed} from "../type/UFixed.sol";
20
10
  import {DistributorType} from "../type/DistributorType.sol";
21
- import {Timestamp, TimestampLib} from "../type/Timestamp.sol";
22
- import {ITransferInterceptor} from "../registry/ITransferInterceptor.sol";
11
+ import {Timestamp} from "../type/Timestamp.sol";
23
12
 
24
13
 
25
14
  contract BasicDistribution is
package/contracts/distribution/BasicDistributionAuthorization.sol CHANGED
@@ -3,10 +3,11 @@ pragma solidity ^0.8.20;
3
3
 
4
4
  import {Authorization} from "../authorization/Authorization.sol";
5
5
  import {BasicDistribution} from "./BasicDistribution.sol";
6
+ import {Distribution} from "./Distribution.sol";
6
7
  import {DISTRIBUTION} from "../type/ObjectType.sol";
7
8
  import {IAccess} from "../authorization/IAccess.sol";
9
+ import {IInstanceLinkedComponent} from "../shared/IInstanceLinkedComponent.sol";
8
10
  import {PUBLIC_ROLE} from "../../contracts/type/RoleId.sol";
9
- import {RoleId} from "../type/RoleId.sol";
10
11
 
11
12
 
12
13
  contract BasicDistributionAuthorization
@@ -38,6 +39,9 @@ contract BasicDistributionAuthorization
38
39
  _authorize(functions, BasicDistribution.createDistributor.selector, "createDistributor");
39
40
  _authorize(functions, BasicDistribution.updateDistributorType.selector, "updateDistributorType");
40
41
  _authorize(functions, BasicDistribution.createReferral.selector, "createReferral");
42
+
43
+ _authorize(functions, IInstanceLinkedComponent.withdrawFees.selector, "withdrawFees");
44
+ _authorize(functions, Distribution.withdrawCommission.selector, "withdrawCommission");
41
45
  }
42
46
  }
43
47
 
package/contracts/distribution/Distribution.sol CHANGED
@@ -1,24 +1,19 @@
1
1
  // SPDX-License-Identifier: Apache-2.0
2
2
  pragma solidity ^0.8.20;
3
3
 
4
+ import {Amount} from "../type/Amount.sol";
4
5
  import {COMPONENT, DISTRIBUTION} from "../type/ObjectType.sol";
5
6
  import {IAuthorization} from "../authorization/IAuthorization.sol";
6
7
  import {IDistributionService} from "./IDistributionService.sol";
7
- import {IProductService} from "../product/IProductService.sol";
8
8
  import {NftId, NftIdLib} from "../type/NftId.sol";
9
9
  import {ReferralId, ReferralStatus, ReferralLib} from "../type/Referral.sol";
10
- import {Fee, FeeLib} from "../type/Fee.sol";
10
+ import {Fee} from "../type/Fee.sol";
11
11
  import {InstanceLinkedComponent} from "../shared/InstanceLinkedComponent.sol";
12
12
  import {IComponentService} from "../shared/IComponentService.sol";
13
- import {IDistribution} from "../instance/module/IDistribution.sol";
14
13
  import {IDistributionComponent} from "./IDistributionComponent.sol";
15
- import {IRegistry} from "../registry/IRegistry.sol";
16
- import {TokenHandler} from "../shared/TokenHandler.sol";
17
- import {InstanceReader} from "../instance/InstanceReader.sol";
18
14
  import {UFixed} from "../type/UFixed.sol";
19
15
  import {DistributorType} from "../type/DistributorType.sol";
20
- import {Timestamp, TimestampLib} from "../type/Timestamp.sol";
21
- import {ITransferInterceptor} from "../registry/ITransferInterceptor.sol";
16
+ import {Timestamp} from "../type/Timestamp.sol";
22
17
 
23
18
 
24
19
  abstract contract Distribution is
@@ -41,13 +36,13 @@ abstract contract Distribution is
41
36
  _;
42
37
  }
43
38
 
44
-
45
39
  function register()
46
40
  external
47
41
  virtual
48
42
  onlyOwner()
49
43
  {
50
44
  _getDistributionStorage()._componentService.registerDistribution();
45
+ _approveTokenHandler(type(uint256).max);
51
46
  }
52
47
 
53
48
 
@@ -127,7 +122,18 @@ abstract contract Distribution is
127
122
  return true;
128
123
  }
129
124
 
130
-
125
+ /// @inheritdoc IDistributionComponent
126
+ function withdrawCommission(NftId distributorNftId, Amount amount)
127
+ external
128
+ virtual
129
+ restricted()
130
+ onlyDistributor()
131
+ onlyNftOwner(distributorNftId)
132
+ returns (Amount withdrawnAmount)
133
+ {
134
+ return _withdrawCommission(distributorNftId, amount);
135
+ }
136
+
131
137
  function _initializeDistribution(
132
138
  address registry,
133
139
  NftId instanceNftId,
@@ -266,6 +272,12 @@ abstract contract Distribution is
266
272
  data);
267
273
  }
268
274
 
275
+ function _withdrawCommission(NftId distributorNftId, Amount amount)
276
+ internal
277
+ returns (Amount withdrawnAmount)
278
+ {
279
+ return _getDistributionStorage()._distributionService.withdrawCommission(distributorNftId, amount);
280
+ }
269
281
 
270
282
  function _nftTransferFrom(address from, address to, uint256 tokenId) internal virtual override {
271
283
  // keep track of distributor nft owner