@etherisc/gif-next 0.0.2-f79a517-071 → 0.0.2-f7a5beb-202

Sign up to get free protection for your applications and to get access to all the features.
Files changed (368) hide show
  1. package/README.md +67 -1
  2. package/artifacts/contracts/components/Component.sol/Component.dbg.json +4 -0
  3. package/artifacts/contracts/components/Component.sol/Component.json +613 -0
  4. package/artifacts/contracts/components/Distribution.sol/Distribution.dbg.json +1 -1
  5. package/artifacts/contracts/components/Distribution.sol/Distribution.json +353 -104
  6. package/artifacts/contracts/components/IComponent.sol/IComponent.dbg.json +4 -0
  7. package/artifacts/contracts/{instance/base/ServiceBase.sol/ServiceBase.json → components/IComponent.sol/IComponent.json} +185 -151
  8. package/artifacts/contracts/components/IDistributionComponent.sol/IDistributionComponent.dbg.json +1 -1
  9. package/artifacts/contracts/components/IDistributionComponent.sol/IDistributionComponent.json +527 -9
  10. package/artifacts/contracts/components/IPoolComponent.sol/IPoolComponent.dbg.json +1 -1
  11. package/artifacts/contracts/components/IPoolComponent.sol/IPoolComponent.json +611 -66
  12. package/artifacts/contracts/components/IProductComponent.sol/IProductComponent.dbg.json +1 -1
  13. package/artifacts/contracts/components/IProductComponent.sol/IProductComponent.json +618 -30
  14. package/artifacts/contracts/components/Pool.sol/Pool.dbg.json +1 -1
  15. package/artifacts/contracts/components/Pool.sol/Pool.json +492 -212
  16. package/artifacts/contracts/components/Product.sol/Product.dbg.json +1 -1
  17. package/artifacts/contracts/components/Product.sol/Product.json +429 -137
  18. package/artifacts/contracts/experiment/cloning/Cloner.sol/Cloner.dbg.json +1 -1
  19. package/artifacts/contracts/experiment/cloning/Cloner.sol/Mock1.dbg.json +1 -1
  20. package/artifacts/contracts/experiment/cloning/Cloner.sol/Mock2.dbg.json +1 -1
  21. package/artifacts/contracts/experiment/errors/Require.sol/Require.dbg.json +1 -1
  22. package/artifacts/contracts/experiment/errors/Revert.sol/Revert.dbg.json +1 -1
  23. package/artifacts/contracts/experiment/inheritance/A.sol/A.dbg.json +1 -1
  24. package/artifacts/contracts/experiment/inheritance/A.sol/AShared.dbg.json +1 -1
  25. package/artifacts/contracts/experiment/inheritance/B.sol/B.dbg.json +1 -1
  26. package/artifacts/contracts/experiment/inheritance/C.sol/C.dbg.json +1 -1
  27. package/artifacts/contracts/experiment/inheritance/IA.sol/IA.dbg.json +1 -1
  28. package/artifacts/contracts/experiment/inheritance/IA.sol/ISharedA.dbg.json +1 -1
  29. package/artifacts/contracts/experiment/inheritance/IB.sol/IB.dbg.json +1 -1
  30. package/artifacts/contracts/experiment/inheritance/IC.sol/IC.dbg.json +1 -1
  31. package/artifacts/contracts/experiment/statemachine/Dummy.sol/LifeCycleModule.dbg.json +1 -1
  32. package/artifacts/contracts/experiment/statemachine/Dummy.sol/LifeCycleModule.json +2 -2
  33. package/artifacts/contracts/experiment/statemachine/ISM.sol/ISM.dbg.json +1 -1
  34. package/artifacts/contracts/experiment/statemachine/ISM.sol/ISMEE.dbg.json +1 -1
  35. package/artifacts/contracts/experiment/statemachine/SM.sol/SM.dbg.json +1 -1
  36. package/artifacts/contracts/experiment/statemachine/SM.sol/SM.json +2 -2
  37. package/artifacts/contracts/experiment/statemachine/SimpleStateMachine.sol/SimpleStateMachine.dbg.json +1 -1
  38. package/artifacts/contracts/experiment/statemachine/SimpleStateMachine.sol/SimpleStateMachine.json +2 -2
  39. package/artifacts/contracts/experiment/types/TypeA.sol/TypeALib.dbg.json +1 -1
  40. package/artifacts/contracts/experiment/types/TypeB.sol/TypeBLib.dbg.json +1 -1
  41. package/artifacts/contracts/instance/BundleManager.sol/BundleManager.dbg.json +4 -0
  42. package/artifacts/contracts/instance/BundleManager.sol/BundleManager.json +764 -0
  43. package/artifacts/contracts/instance/Cloneable.sol/Cloneable.dbg.json +4 -0
  44. package/artifacts/contracts/instance/Cloneable.sol/Cloneable.json +185 -0
  45. package/artifacts/contracts/instance/IInstance.sol/IInstance.dbg.json +1 -1
  46. package/artifacts/contracts/instance/IInstance.sol/IInstance.json +1035 -995
  47. package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.dbg.json +4 -0
  48. package/artifacts/contracts/instance/{service/IComponentOwnerService.sol/IComponentOwnerService.json → IInstanceService.sol/IInstanceService.json} +155 -56
  49. package/artifacts/contracts/instance/Instance.sol/Instance.dbg.json +1 -1
  50. package/artifacts/contracts/instance/Instance.sol/Instance.json +1821 -1096
  51. package/artifacts/contracts/instance/InstanceAccessManager.sol/InstanceAccessManager.dbg.json +4 -0
  52. package/artifacts/contracts/instance/InstanceAccessManager.sol/InstanceAccessManager.json +1034 -0
  53. package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.dbg.json +4 -0
  54. package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.json +1381 -0
  55. package/artifacts/contracts/instance/InstanceService.sol/InstanceService.dbg.json +4 -0
  56. package/artifacts/contracts/instance/InstanceService.sol/InstanceService.json +964 -0
  57. package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.dbg.json +4 -0
  58. package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.json +473 -0
  59. package/artifacts/contracts/instance/ObjectManager.sol/ObjectManager.dbg.json +4 -0
  60. package/artifacts/contracts/instance/ObjectManager.sol/ObjectManager.json +261 -0
  61. package/artifacts/contracts/instance/base/ComponentService.sol/ComponentService.dbg.json +4 -0
  62. package/artifacts/contracts/instance/base/{InstanceBase.sol/InstanceBase.json → ComponentService.sol/ComponentService.json} +134 -75
  63. package/artifacts/contracts/instance/base/IKeyValueStore.sol/IKeyValueStore.dbg.json +1 -1
  64. package/artifacts/contracts/instance/base/IKeyValueStore.sol/IKeyValueStore.json +27 -158
  65. package/artifacts/contracts/instance/base/ILifecycle.sol/ILifecycle.dbg.json +1 -1
  66. package/artifacts/contracts/instance/base/KeyValueStore.sol/KeyValueStore.dbg.json +1 -1
  67. package/artifacts/contracts/instance/base/KeyValueStore.sol/KeyValueStore.json +37 -245
  68. package/artifacts/contracts/instance/base/Lifecycle.sol/Lifecycle.dbg.json +1 -1
  69. package/artifacts/contracts/instance/base/Lifecycle.sol/Lifecycle.json +2 -2
  70. package/artifacts/contracts/instance/module/IAccess.sol/IAccess.dbg.json +4 -0
  71. package/artifacts/contracts/instance/module/IAccess.sol/IAccess.json +254 -0
  72. package/artifacts/contracts/instance/module/IBundle.sol/IBundle.dbg.json +4 -0
  73. package/artifacts/contracts/instance/module/{bundle/IBundle.sol → IBundle.sol}/IBundle.json +1 -1
  74. package/artifacts/contracts/instance/module/IDistribution.sol/IDistribution.dbg.json +4 -0
  75. package/artifacts/contracts/instance/module/{distribution/IDistribution.sol → IDistribution.sol}/IDistribution.json +1 -1
  76. package/artifacts/contracts/instance/module/IPolicy.sol/IPolicy.dbg.json +4 -0
  77. package/artifacts/contracts/instance/module/{policy/IPolicy.sol → IPolicy.sol}/IPolicy.json +1 -1
  78. package/artifacts/contracts/instance/module/IRisk.sol/IRisk.dbg.json +4 -0
  79. package/artifacts/contracts/instance/module/{risk/IRisk.sol → IRisk.sol}/IRisk.json +1 -1
  80. package/artifacts/contracts/instance/module/ISetup.sol/ISetup.dbg.json +4 -0
  81. package/artifacts/contracts/instance/{base/ModuleBase.sol/ModuleBase.json → module/ISetup.sol/ISetup.json} +2 -2
  82. package/artifacts/contracts/instance/module/ITreasury.sol/ITreasury.dbg.json +4 -0
  83. package/artifacts/contracts/instance/module/{treasury/ITreasury.sol → ITreasury.sol}/ITreasury.json +1 -1
  84. package/artifacts/contracts/instance/service/BundleService.sol/BundleService.dbg.json +4 -0
  85. package/artifacts/contracts/instance/service/BundleService.sol/BundleService.json +1102 -0
  86. package/artifacts/contracts/instance/service/BundleServiceManager.sol/BundleServiceManager.dbg.json +4 -0
  87. package/artifacts/contracts/instance/service/BundleServiceManager.sol/BundleServiceManager.json +449 -0
  88. package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.dbg.json +1 -1
  89. package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.json +194 -52
  90. package/artifacts/contracts/instance/service/DistributionServiceManager.sol/DistributionServiceManager.dbg.json +4 -0
  91. package/artifacts/contracts/instance/service/DistributionServiceManager.sol/DistributionServiceManager.json +437 -0
  92. package/artifacts/contracts/instance/service/IBundleService.sol/IBundleService.dbg.json +4 -0
  93. package/artifacts/contracts/instance/service/IBundleService.sol/IBundleService.json +715 -0
  94. package/artifacts/contracts/instance/service/IDistributionService.sol/IDistributionService.dbg.json +1 -1
  95. package/artifacts/contracts/instance/service/IDistributionService.sol/IDistributionService.json +13 -18
  96. package/artifacts/contracts/instance/service/IPolicyService.sol/IPolicyService.dbg.json +4 -0
  97. package/artifacts/contracts/instance/service/IPolicyService.sol/IPolicyService.json +766 -0
  98. package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.dbg.json +1 -1
  99. package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.json +15 -82
  100. package/artifacts/contracts/instance/service/IProductService.sol/IProductService.dbg.json +1 -1
  101. package/artifacts/contracts/instance/service/IProductService.sol/IProductService.json +25 -245
  102. package/artifacts/contracts/instance/service/PolicyService.sol/PolicyService.dbg.json +4 -0
  103. package/artifacts/contracts/instance/service/PolicyService.sol/PolicyService.json +1227 -0
  104. package/artifacts/contracts/instance/service/PolicyServiceManager.sol/PolicyServiceManager.dbg.json +4 -0
  105. package/artifacts/contracts/instance/service/PolicyServiceManager.sol/PolicyServiceManager.json +505 -0
  106. package/artifacts/contracts/instance/service/PoolService.sol/PoolService.dbg.json +1 -1
  107. package/artifacts/contracts/instance/service/PoolService.sol/PoolService.json +181 -128
  108. package/artifacts/contracts/instance/service/PoolServiceManager.sol/PoolServiceManager.dbg.json +4 -0
  109. package/artifacts/contracts/instance/service/PoolServiceManager.sol/PoolServiceManager.json +437 -0
  110. package/artifacts/contracts/instance/service/ProductService.sol/ProductService.dbg.json +1 -1
  111. package/artifacts/contracts/instance/service/ProductService.sol/ProductService.json +174 -386
  112. package/artifacts/contracts/instance/service/ProductServiceManager.sol/ProductServiceManager.dbg.json +4 -0
  113. package/artifacts/contracts/instance/service/ProductServiceManager.sol/ProductServiceManager.json +437 -0
  114. package/artifacts/contracts/registry/ChainNft.sol/ChainNft.dbg.json +1 -1
  115. package/artifacts/contracts/registry/ChainNft.sol/ChainNft.json +2 -2
  116. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.dbg.json +1 -1
  117. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.json +339 -59
  118. package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.dbg.json +1 -1
  119. package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.json +220 -111
  120. package/artifacts/contracts/registry/ITransferInterceptor.sol/ITransferInterceptor.dbg.json +1 -1
  121. package/artifacts/contracts/registry/Registry.sol/Registry.dbg.json +1 -1
  122. package/artifacts/contracts/registry/Registry.sol/Registry.json +301 -188
  123. package/artifacts/contracts/registry/RegistryAccessManager.sol/RegistryAccessManager.dbg.json +4 -0
  124. package/artifacts/contracts/registry/RegistryAccessManager.sol/RegistryAccessManager.json +285 -0
  125. package/artifacts/contracts/registry/RegistryService.sol/RegistryService.dbg.json +1 -1
  126. package/artifacts/contracts/registry/RegistryService.sol/RegistryService.json +83 -128
  127. package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.dbg.json +1 -1
  128. package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.json +53 -85
  129. package/artifacts/contracts/registry/ReleaseManager.sol/ReleaseManager.dbg.json +4 -0
  130. package/artifacts/contracts/registry/ReleaseManager.sol/ReleaseManager.json +547 -0
  131. package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.dbg.json +4 -0
  132. package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.json +394 -0
  133. package/artifacts/contracts/shared/ContractDeployerLib.sol/ContractDeployerLib.dbg.json +1 -1
  134. package/artifacts/contracts/shared/ERC165.sol/ERC165.dbg.json +1 -1
  135. package/artifacts/contracts/shared/ERC165.sol/ERC165.json +2 -2
  136. package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.dbg.json +1 -1
  137. package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.dbg.json +1 -1
  138. package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.json +0 -5
  139. package/artifacts/contracts/shared/IService.sol/IService.dbg.json +4 -0
  140. package/artifacts/contracts/{instance/base → shared}/IService.sol/IService.json +14 -19
  141. package/artifacts/contracts/shared/IVersionable.sol/IVersionable.dbg.json +1 -1
  142. package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.dbg.json +1 -1
  143. package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.json +19 -6
  144. package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.dbg.json +1 -1
  145. package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.json +19 -6
  146. package/artifacts/contracts/shared/Registerable.sol/Registerable.dbg.json +1 -1
  147. package/artifacts/contracts/shared/Registerable.sol/Registerable.json +19 -11
  148. package/artifacts/contracts/shared/Service.sol/Service.dbg.json +4 -0
  149. package/artifacts/contracts/{instance/base/ComponentServiceBase.sol/ComponentServiceBase.json → shared/Service.sol/Service.json} +28 -33
  150. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.dbg.json +4 -0
  151. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.json +96 -0
  152. package/artifacts/contracts/shared/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.dbg.json +1 -1
  153. package/artifacts/contracts/shared/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.json +2 -2
  154. package/artifacts/contracts/shared/Versionable.sol/Versionable.dbg.json +1 -1
  155. package/artifacts/contracts/test/TestFee.sol/TestFee.dbg.json +1 -1
  156. package/artifacts/contracts/test/TestRegisterable.sol/TestRegisterable.dbg.json +1 -1
  157. package/artifacts/contracts/test/TestRegisterable.sol/TestRegisterable.json +19 -11
  158. package/artifacts/contracts/test/TestRoleId.sol/TestRoleId.dbg.json +1 -1
  159. package/artifacts/contracts/test/TestRoleId.sol/TestRoleId.json +14 -14
  160. package/artifacts/contracts/test/TestService.sol/TestService.dbg.json +1 -1
  161. package/artifacts/contracts/test/TestService.sol/TestService.json +58 -34
  162. package/artifacts/contracts/test/TestToken.sol/TestUsdc.dbg.json +1 -1
  163. package/artifacts/contracts/test/TestVersion.sol/TestVersion.dbg.json +1 -1
  164. package/artifacts/contracts/test/TestVersion.sol/TestVersion.json +2 -2
  165. package/artifacts/contracts/test/TestVersionable.sol/TestVersionable.dbg.json +1 -1
  166. package/artifacts/contracts/test/TestVersionable.sol/TestVersionable.json +18 -2
  167. package/artifacts/contracts/test/Usdc.sol/USDC.dbg.json +1 -1
  168. package/artifacts/contracts/types/AddressSet.sol/LibAddressSet.dbg.json +1 -1
  169. package/artifacts/contracts/types/Blocknumber.sol/BlocknumberLib.dbg.json +1 -1
  170. package/artifacts/contracts/types/ChainId.sol/ChainIdLib.dbg.json +1 -1
  171. package/artifacts/contracts/types/DistributorType.sol/DistributorTypeLib.dbg.json +4 -0
  172. package/artifacts/contracts/types/DistributorType.sol/DistributorTypeLib.json +104 -0
  173. package/artifacts/contracts/types/Fee.sol/FeeLib.dbg.json +1 -1
  174. package/artifacts/contracts/types/Key32.sol/Key32Lib.dbg.json +1 -1
  175. package/artifacts/contracts/types/Key32.sol/Key32Lib.json +31 -17
  176. package/artifacts/contracts/types/NftId.sol/NftIdLib.dbg.json +1 -1
  177. package/artifacts/contracts/types/NftId.sol/NftIdLib.json +2 -2
  178. package/artifacts/contracts/types/NftIdSet.sol/LibNftIdSet.dbg.json +1 -1
  179. package/artifacts/contracts/types/NftIdSet.sol/LibNftIdSet.json +26 -3
  180. package/artifacts/contracts/types/NumberId.sol/NumberIdLib.dbg.json +4 -0
  181. package/artifacts/contracts/types/NumberId.sol/NumberIdLib.json +100 -0
  182. package/artifacts/contracts/types/ObjectType.sol/ObjectTypeLib.dbg.json +1 -1
  183. package/artifacts/contracts/types/ObjectType.sol/ObjectTypeLib.json +2 -2
  184. package/artifacts/contracts/types/Referral.sol/ReferralLib.dbg.json +4 -0
  185. package/artifacts/contracts/types/Referral.sol/ReferralLib.json +123 -0
  186. package/artifacts/contracts/types/RiskId.sol/RiskIdLib.dbg.json +1 -1
  187. package/artifacts/contracts/types/RiskId.sol/RiskIdLib.json +2 -2
  188. package/artifacts/contracts/types/RoleId.sol/RoleIdLib.dbg.json +1 -1
  189. package/artifacts/contracts/types/RoleId.sol/RoleIdLib.json +134 -8
  190. package/artifacts/contracts/types/StateId.sol/StateIdLib.dbg.json +1 -1
  191. package/artifacts/contracts/types/StateId.sol/StateIdLib.json +2 -2
  192. package/artifacts/contracts/types/Timestamp.sol/TimestampLib.dbg.json +1 -1
  193. package/artifacts/contracts/types/Timestamp.sol/TimestampLib.json +15 -2
  194. package/artifacts/contracts/types/UFixed.sol/MathLib.dbg.json +1 -1
  195. package/artifacts/contracts/types/UFixed.sol/UFixedLib.dbg.json +1 -1
  196. package/artifacts/contracts/types/Version.sol/VersionLib.dbg.json +1 -1
  197. package/artifacts/contracts/types/Version.sol/VersionLib.json +2 -2
  198. package/artifacts/contracts/types/Version.sol/VersionPartLib.dbg.json +1 -1
  199. package/artifacts/contracts/types/Version.sol/VersionPartLib.json +22 -3
  200. package/contracts/components/Component.sol +247 -0
  201. package/contracts/components/Distribution.sol +37 -49
  202. package/contracts/components/IComponent.sol +50 -0
  203. package/contracts/components/IDistributionComponent.sol +6 -5
  204. package/contracts/components/IPoolComponent.sol +42 -29
  205. package/contracts/components/IProductComponent.sol +9 -7
  206. package/contracts/components/Pool.sol +137 -116
  207. package/contracts/components/Product.sol +78 -114
  208. package/contracts/instance/BundleManager.sol +125 -0
  209. package/contracts/instance/Cloneable.sol +46 -0
  210. package/contracts/instance/IInstance.sol +64 -44
  211. package/contracts/instance/IInstanceService.sol +40 -0
  212. package/contracts/instance/Instance.sol +251 -65
  213. package/contracts/instance/InstanceAccessManager.sol +298 -0
  214. package/contracts/instance/InstanceReader.sol +293 -0
  215. package/contracts/instance/InstanceService.sol +362 -0
  216. package/contracts/instance/InstanceServiceManager.sol +54 -0
  217. package/contracts/instance/ObjectManager.sol +84 -0
  218. package/contracts/instance/base/ComponentService.sol +134 -0
  219. package/contracts/instance/base/IKeyValueStore.sol +13 -14
  220. package/contracts/instance/base/ILifecycle.sol +3 -3
  221. package/contracts/instance/base/KeyValueStore.sol +49 -38
  222. package/contracts/instance/base/Lifecycle.sol +1 -1
  223. package/contracts/instance/module/IAccess.sol +48 -0
  224. package/contracts/instance/module/IBundle.sol +20 -0
  225. package/contracts/instance/module/IDistribution.sol +39 -0
  226. package/contracts/instance/module/IPolicy.sol +45 -0
  227. package/contracts/instance/module/IRisk.sol +11 -0
  228. package/contracts/instance/module/ISetup.sol +46 -0
  229. package/contracts/instance/module/ITreasury.sol +23 -0
  230. package/contracts/instance/service/BundleService.sol +293 -0
  231. package/contracts/instance/service/BundleServiceManager.sol +51 -0
  232. package/contracts/instance/service/DistributionService.sol +72 -20
  233. package/contracts/instance/service/DistributionServiceManager.sol +51 -0
  234. package/contracts/instance/service/IBundleService.sol +44 -0
  235. package/contracts/instance/service/IDistributionService.sol +1 -1
  236. package/contracts/instance/service/IPolicyService.sol +94 -0
  237. package/contracts/instance/service/IPoolService.sol +7 -24
  238. package/contracts/instance/service/IProductService.sol +9 -76
  239. package/contracts/instance/service/PolicyService.sol +538 -0
  240. package/contracts/instance/service/PolicyServiceManager.sol +54 -0
  241. package/contracts/instance/service/PoolService.sol +76 -116
  242. package/contracts/instance/service/PoolServiceManager.sol +51 -0
  243. package/contracts/instance/service/ProductService.sol +154 -432
  244. package/contracts/instance/service/ProductServiceManager.sol +54 -0
  245. package/contracts/registry/ChainNft.sol +1 -1
  246. package/contracts/registry/IRegistry.sol +47 -6
  247. package/contracts/registry/IRegistryService.sol +50 -20
  248. package/contracts/registry/Registry.sol +243 -214
  249. package/contracts/registry/RegistryAccessManager.sol +216 -0
  250. package/contracts/registry/RegistryService.sol +84 -263
  251. package/contracts/registry/RegistryServiceManager.sol +20 -22
  252. package/contracts/registry/ReleaseManager.sol +332 -0
  253. package/contracts/registry/TokenRegistry.sol +112 -0
  254. package/contracts/shared/ERC165.sol +6 -2
  255. package/contracts/shared/IRegisterable.sol +1 -3
  256. package/contracts/shared/IService.sol +16 -0
  257. package/contracts/shared/NftOwnable.sol +7 -4
  258. package/contracts/shared/ProxyManager.sol +1 -1
  259. package/contracts/shared/Registerable.sol +11 -14
  260. package/contracts/shared/Service.sol +60 -0
  261. package/contracts/shared/TokenHandler.sol +27 -0
  262. package/contracts/shared/Versionable.sol +2 -2
  263. package/contracts/test/TestRoleId.sol +1 -1
  264. package/contracts/test/TestService.sol +6 -7
  265. package/contracts/types/DistributorType.sol +55 -0
  266. package/contracts/types/Key32.sol +8 -3
  267. package/contracts/types/NftIdSet.sol +26 -24
  268. package/contracts/types/NumberId.sol +52 -0
  269. package/contracts/types/ObjectType.sol +35 -14
  270. package/contracts/types/Referral.sol +85 -0
  271. package/contracts/types/RoleId.sol +60 -15
  272. package/contracts/types/StateId.sol +5 -1
  273. package/contracts/types/Timestamp.sol +7 -3
  274. package/contracts/types/Version.sol +4 -1
  275. package/package.json +1 -1
  276. package/artifacts/contracts/components/BaseComponent.sol/BaseComponent.dbg.json +0 -4
  277. package/artifacts/contracts/components/BaseComponent.sol/BaseComponent.json +0 -301
  278. package/artifacts/contracts/components/IBaseComponent.sol/IBaseComponent.dbg.json +0 -4
  279. package/artifacts/contracts/components/IBaseComponent.sol/IBaseComponent.json +0 -254
  280. package/artifacts/contracts/instance/IInstanceLinked.sol/IInstanceLinked.dbg.json +0 -4
  281. package/artifacts/contracts/instance/IInstanceLinked.sol/IInstanceLinked.json +0 -24
  282. package/artifacts/contracts/instance/base/ComponentServiceBase.sol/ComponentServiceBase.dbg.json +0 -4
  283. package/artifacts/contracts/instance/base/IInstanceBase.sol/IInstanceBase.dbg.json +0 -4
  284. package/artifacts/contracts/instance/base/IInstanceBase.sol/IInstanceBase.json +0 -113
  285. package/artifacts/contracts/instance/base/IService.sol/IService.dbg.json +0 -4
  286. package/artifacts/contracts/instance/base/InstanceBase.sol/InstanceBase.dbg.json +0 -4
  287. package/artifacts/contracts/instance/base/ModuleBase.sol/ModuleBase.dbg.json +0 -4
  288. package/artifacts/contracts/instance/base/ServiceBase.sol/ServiceBase.dbg.json +0 -4
  289. package/artifacts/contracts/instance/module/bundle/BundleModule.sol/BundleModule.dbg.json +0 -4
  290. package/artifacts/contracts/instance/module/bundle/BundleModule.sol/BundleModule.json +0 -297
  291. package/artifacts/contracts/instance/module/bundle/IBundle.sol/IBundle.dbg.json +0 -4
  292. package/artifacts/contracts/instance/module/bundle/IBundle.sol/IBundleModule.dbg.json +0 -4
  293. package/artifacts/contracts/instance/module/bundle/IBundle.sol/IBundleModule.json +0 -297
  294. package/artifacts/contracts/instance/module/component/ComponentModule.sol/ComponentModule.dbg.json +0 -4
  295. package/artifacts/contracts/instance/module/component/ComponentModule.sol/ComponentModule.json +0 -117
  296. package/artifacts/contracts/instance/module/component/IComponent.sol/IComponent.dbg.json +0 -4
  297. package/artifacts/contracts/instance/module/component/IComponent.sol/IComponent.json +0 -10
  298. package/artifacts/contracts/instance/module/component/IComponent.sol/IComponentModule.dbg.json +0 -4
  299. package/artifacts/contracts/instance/module/component/IComponent.sol/IComponentModule.json +0 -117
  300. package/artifacts/contracts/instance/module/distribution/DistributionModule.sol/DistributionModule.dbg.json +0 -4
  301. package/artifacts/contracts/instance/module/distribution/DistributionModule.sol/DistributionModule.json +0 -10
  302. package/artifacts/contracts/instance/module/distribution/IDistribution.sol/IDistribution.dbg.json +0 -4
  303. package/artifacts/contracts/instance/module/distribution/IDistribution.sol/IDistributionModule.dbg.json +0 -4
  304. package/artifacts/contracts/instance/module/distribution/IDistribution.sol/IDistributionModule.json +0 -10
  305. package/artifacts/contracts/instance/module/policy/IPolicy.sol/IPolicy.dbg.json +0 -4
  306. package/artifacts/contracts/instance/module/policy/IPolicy.sol/IPolicyModule.dbg.json +0 -4
  307. package/artifacts/contracts/instance/module/policy/IPolicy.sol/IPolicyModule.json +0 -271
  308. package/artifacts/contracts/instance/module/policy/PolicyModule.sol/PolicyModule.dbg.json +0 -4
  309. package/artifacts/contracts/instance/module/policy/PolicyModule.sol/PolicyModule.json +0 -271
  310. package/artifacts/contracts/instance/module/pool/IPoolModule.sol/IPool.dbg.json +0 -4
  311. package/artifacts/contracts/instance/module/pool/IPoolModule.sol/IPool.json +0 -10
  312. package/artifacts/contracts/instance/module/pool/IPoolModule.sol/IPoolModule.dbg.json +0 -4
  313. package/artifacts/contracts/instance/module/pool/IPoolModule.sol/IPoolModule.json +0 -164
  314. package/artifacts/contracts/instance/module/pool/PoolModule.sol/PoolModule.dbg.json +0 -4
  315. package/artifacts/contracts/instance/module/pool/PoolModule.sol/PoolModule.json +0 -164
  316. package/artifacts/contracts/instance/module/risk/IRisk.sol/IRisk.dbg.json +0 -4
  317. package/artifacts/contracts/instance/module/risk/IRisk.sol/IRiskModule.dbg.json +0 -4
  318. package/artifacts/contracts/instance/module/risk/IRisk.sol/IRiskModule.json +0 -113
  319. package/artifacts/contracts/instance/module/risk/RiskModule.sol/RiskModule.dbg.json +0 -4
  320. package/artifacts/contracts/instance/module/risk/RiskModule.sol/RiskModule.json +0 -131
  321. package/artifacts/contracts/instance/module/treasury/ITreasury.sol/ITreasury.dbg.json +0 -4
  322. package/artifacts/contracts/instance/module/treasury/ITreasury.sol/ITreasuryModule.dbg.json +0 -4
  323. package/artifacts/contracts/instance/module/treasury/ITreasury.sol/ITreasuryModule.json +0 -638
  324. package/artifacts/contracts/instance/module/treasury/TokenHandler.sol/TokenHandler.dbg.json +0 -4
  325. package/artifacts/contracts/instance/module/treasury/TokenHandler.sol/TokenHandler.json +0 -76
  326. package/artifacts/contracts/instance/module/treasury/TreasuryModule.sol/TreasuryModule.dbg.json +0 -4
  327. package/artifacts/contracts/instance/module/treasury/TreasuryModule.sol/TreasuryModule.json +0 -638
  328. package/artifacts/contracts/instance/service/ComponentOwnerService.sol/ComponentOwnerService.dbg.json +0 -4
  329. package/artifacts/contracts/instance/service/ComponentOwnerService.sol/ComponentOwnerService.json +0 -827
  330. package/artifacts/contracts/instance/service/IComponentOwnerService.sol/IComponentOwnerService.dbg.json +0 -4
  331. package/artifacts/contracts/test/TestDistribution.sol/TestDistribution.dbg.json +0 -4
  332. package/artifacts/contracts/test/TestDistribution.sol/TestDistribution.json +0 -557
  333. package/artifacts/contracts/test/TestPool.sol/TestPool.dbg.json +0 -4
  334. package/artifacts/contracts/test/TestPool.sol/TestPool.json +0 -716
  335. package/artifacts/contracts/test/TestProduct.sol/TestProduct.dbg.json +0 -4
  336. package/artifacts/contracts/test/TestProduct.sol/TestProduct.json +0 -744
  337. package/artifacts/contracts/types/ReferralId.sol/ReferralIdLib.dbg.json +0 -4
  338. package/artifacts/contracts/types/ReferralId.sol/ReferralIdLib.json +0 -99
  339. package/contracts/components/BaseComponent.sol +0 -79
  340. package/contracts/components/IBaseComponent.sol +0 -19
  341. package/contracts/instance/IInstanceLinked.sol +0 -8
  342. package/contracts/instance/base/ComponentServiceBase.sol +0 -49
  343. package/contracts/instance/base/IInstanceBase.sol +0 -23
  344. package/contracts/instance/base/IService.sol +0 -15
  345. package/contracts/instance/base/InstanceBase.sol +0 -89
  346. package/contracts/instance/base/ModuleBase.sol +0 -57
  347. package/contracts/instance/base/ServiceBase.sol +0 -44
  348. package/contracts/instance/module/bundle/BundleModule.sol +0 -134
  349. package/contracts/instance/module/bundle/IBundle.sol +0 -53
  350. package/contracts/instance/module/component/ComponentModule.sol +0 -71
  351. package/contracts/instance/module/component/IComponent.sol +0 -28
  352. package/contracts/instance/module/distribution/DistributionModule.sol +0 -17
  353. package/contracts/instance/module/distribution/IDistribution.sol +0 -10
  354. package/contracts/instance/module/policy/IPolicy.sol +0 -63
  355. package/contracts/instance/module/policy/PolicyModule.sol +0 -91
  356. package/contracts/instance/module/pool/IPoolModule.sol +0 -41
  357. package/contracts/instance/module/pool/PoolModule.sol +0 -95
  358. package/contracts/instance/module/risk/IRisk.sol +0 -26
  359. package/contracts/instance/module/risk/RiskModule.sol +0 -62
  360. package/contracts/instance/module/treasury/ITreasury.sol +0 -84
  361. package/contracts/instance/module/treasury/TokenHandler.sol +0 -48
  362. package/contracts/instance/module/treasury/TreasuryModule.sol +0 -131
  363. package/contracts/instance/service/ComponentOwnerService.sol +0 -315
  364. package/contracts/instance/service/IComponentOwnerService.sol +0 -20
  365. package/contracts/test/TestDistribution.sol +0 -22
  366. package/contracts/test/TestPool.sol +0 -27
  367. package/contracts/test/TestProduct.sol +0 -74
  368. package/contracts/types/ReferralId.sol +0 -48
package/artifacts/contracts/test/TestRegisterable.sol/TestRegisterable.json CHANGED
@@ -194,13 +194,21 @@
194
194
  }
195
195
  ],
196
196
  "internalType": "struct IRegistry.ObjectInfo",
197
- "name": "",
197
+ "name": "info",
198
198
  "type": "tuple"
199
- },
199
+ }
200
+ ],
201
+ "stateMutability": "view",
202
+ "type": "function"
203
+ },
204
+ {
205
+ "inputs": [],
206
+ "name": "getInitialOwner",
207
+ "outputs": [
200
208
  {
201
- "internalType": "bytes",
202
- "name": "data",
203
- "type": "bytes"
209
+ "internalType": "address",
210
+ "name": "",
211
+ "type": "address"
204
212
  }
205
213
  ],
206
214
  "stateMutability": "view",
@@ -272,18 +280,18 @@
272
280
  "type": "function"
273
281
  }
274
282
  ],
275
- "bytecode": "0x60806040523480156200001157600080fd5b5060405162000da838038062000da8833981016040819052620000349162000347565b6301ffc9a760e01b60009081526020527f67be87c3ff9960ca1e9cfac5cab2ff4747269cf9ed20c9b7306235ac35a491c5805460ff19166001179055600280546001600160a01b03191633179055604080516020810190915260008152620000a1868686868686620000ad565b50505050505062000563565b620000b982876200017e565b60007f6548007c3f4340f82f348c576c0ff69f4f529cadd5ad41f96aae61abceeaa30080546001600160601b0388166001600160681b0319909116176c0100000000000000000000000060ff8816021760ff60681b19166d01000000000000000000000000008615150217815590506001810162000138838262000472565b506303fb044760e21b60009081526020527fb43e4f3791bfcdefa3a0fbe2a5555f8d6490b90e01de0ff40c66f18b49b562c5805460ff1916600117905550505050505050565b600280546001600160a01b0319166001600160a01b038416179055620001a481620001a8565b5050565b6001546001600160a01b031615620001e75760015460405163fcdbf2d960e01b81526001600160a01b0390911660048201526024015b60405180910390fd5b6001600160a01b0381166200020f5760405163f5c4d07d60e01b815260040160405180910390fd5b806001600160a01b03163b600003620002475760405163fdeac91f60e01b81526001600160a01b0382166004820152602401620001de565b600180546001600160a01b0319166001600160a01b0383169081179091556040516301ffc9a760e01b815263350fb35160e11b60048201526301ffc9a790602401602060405180830381865afa925050508015620002c4575060408051601f3d908101601f19168201909252620002c1918101906200053e565b60015b620002ee5760405163fdeac91f60e01b81526001600160a01b0382166004820152602401620001de565b80620001a45760405163fdeac91f60e01b81526001600160a01b0383166004820152602401620001de565b80516001600160a01b03811681146200033157600080fd5b919050565b805180151581146200033157600080fd5b600080600080600060a086880312156200036057600080fd5b6200036b8662000319565b60208701519095506001600160601b03811681146200038957600080fd5b604087015190945060ff81168114620003a157600080fd5b9250620003b16060870162000336565b9150620003c16080870162000319565b90509295509295909350565b634e487b7160e01b600052604160045260246000fd5b600181811c90821680620003f857607f821691505b6020821081036200041957634e487b7160e01b600052602260045260246000fd5b50919050565b601f8211156200046d57600081815260208120601f850160051c81016020861015620004485750805b601f850160051c820191505b81811015620004695782815560010162000454565b5050505b505050565b81516001600160401b038111156200048e576200048e620003cd565b620004a6816200049f8454620003e3565b846200041f565b602080601f831160018114620004de5760008415620004c55750858301515b600019600386901b1c1916600185901b17855562000469565b600085815260208120601f198616915b828110156200050f57888601518255948401946001909101908401620004ee565b50858210156200052e5787850151600019600388901b60f8161c191681555b5050505050600190811b01905550565b6000602082840312156200055157600080fd5b6200055c8262000336565b9392505050565b61083580620005736000396000f3fe608060405234801561001057600080fd5b506004361061007d5760003560e01c80631eff4b221161005b5780631eff4b22146100e45780635ab1bd5314610119578063644c45e01461013e578063893d20e81461016957600080fd5b806301ffc9a7146100825780630fec111c146100c4578063138461e0146100da575b600080fd5b6100af610090366004610633565b6001600160e01b03191660009081526020819052604090205460ff1690565b60405190151581526020015b60405180910390f35b6100cc610171565b6040516100bb9291906106aa565b6100e26102f3565b005b61010b7f6548007c3f4340f82f348c576c0ff69f4f529cadd5ad41f96aae61abceeaa30081565b6040519081526020016100bb565b6001546001600160a01b03165b6040516001600160a01b0390911681526020016100bb565b600154600160a01b90046001600160601b03166040516001600160601b0390911681526020016100bb565b610126610515565b6040805160e08101825260008082526020820181905291810182905260608082018390526080820183905260a0820183905260c0820181905290917f6548007c3f4340f82f348c576c0ff69f4f529cadd5ad41f96aae61abceeaa30090506040518060e001604052806101f46001546001600160601b03600160a01b9091041690565b6001600160601b0390811682528354908116602083015260ff600160601b820481166040840152600160681b909104161515606082015230608082015260a00161023c610515565b6001600160a01b0316815260200182600101805461025990610751565b80601f016020809104026020016040519081016040528092919081815260200182805461028590610751565b80156102d25780601f106102a7576101008083540402835291602001916102d2565b820191906000526020600020905b8154815290600101906020018083116102b557829003601f168201915b50505050508152506040518060200160405280600081525092509250509091565b6001546040516330b8415f60e01b8152600160a01b9091046001600160601b0316600482015273__$6facc32ab6029a5f5de2a1d5e55ea9da0e$__906330b8415f90602401602060405180830381865af4158015610355573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610379919061078b565b156103c0576001546040516316322c0f60e31b81526001600160a01b0382166004820152600160a01b9091046001600160601b031660248201526044015b60405180910390fd5b6001546001600160a01b03166103e95760405163cf29926160e01b815260040160405180910390fd5b60015460405163c3c5a54760e01b81523060048201819052916001600160a01b03169063c3c5a54790602401602060405180830381865afa158015610432573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610456919061078b565b61047e576040516372657a5160e01b81526001600160a01b03821660048201526024016103b7565b600154604051636939560f60e11b81526001600160a01b0383811660048301529091169063d272ac1e90602401602060405180830381865afa1580156104c8573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906104ec91906107ad565b600160146101000a8154816001600160601b0302191690836001600160601b0316021790555050565b6001546040516330b8415f60e01b8152600160a01b9091046001600160601b0316600482015260009073__$6facc32ab6029a5f5de2a1d5e55ea9da0e$__906330b8415f90602401602060405180830381865af415801561057a573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061059e919061078b565b1561062357600154604051631c5da14d60e11b8152600160a01b82046001600160601b031660048201526001600160a01b03909116906338bb429a90602401602060405180830381865afa1580156105fa573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061061e91906107d6565b905090565b506002546001600160a01b031690565b60006020828403121561064557600080fd5b81356001600160e01b03198116811461065d57600080fd5b9392505050565b6000815180845260005b8181101561068a5760208185018101518683018201520161066e565b506000602082860101526020601f19601f83011685010191505092915050565b6040815260006001600160601b038085511660408401528060208601511660608401525060ff604085015116608083015260608401516106ee60a084018215159052565b5060808401516001600160a01b03811660c08401525060a08401516001600160a01b03811660e08401525060c084015160e0610100840152610734610120840182610664565b905082810360208401526107488185610664565b95945050505050565b600181811c9082168061076557607f821691505b60208210810361078557634e487b7160e01b600052602260045260246000fd5b50919050565b60006020828403121561079d57600080fd5b8151801515811461065d57600080fd5b6000602082840312156107bf57600080fd5b81516001600160601b038116811461065d57600080fd5b6000602082840312156107e857600080fd5b81516001600160a01b038116811461065d57600080fdfea264697066735822122099776171edfff2d6d4b127dc9bf2b52b06f241dda385a27449034e2d6372c0c964736f6c63430008140033",
276
- "deployedBytecode": "0x608060405234801561001057600080fd5b506004361061007d5760003560e01c80631eff4b221161005b5780631eff4b22146100e45780635ab1bd5314610119578063644c45e01461013e578063893d20e81461016957600080fd5b806301ffc9a7146100825780630fec111c146100c4578063138461e0146100da575b600080fd5b6100af610090366004610633565b6001600160e01b03191660009081526020819052604090205460ff1690565b60405190151581526020015b60405180910390f35b6100cc610171565b6040516100bb9291906106aa565b6100e26102f3565b005b61010b7f6548007c3f4340f82f348c576c0ff69f4f529cadd5ad41f96aae61abceeaa30081565b6040519081526020016100bb565b6001546001600160a01b03165b6040516001600160a01b0390911681526020016100bb565b600154600160a01b90046001600160601b03166040516001600160601b0390911681526020016100bb565b610126610515565b6040805160e08101825260008082526020820181905291810182905260608082018390526080820183905260a0820183905260c0820181905290917f6548007c3f4340f82f348c576c0ff69f4f529cadd5ad41f96aae61abceeaa30090506040518060e001604052806101f46001546001600160601b03600160a01b9091041690565b6001600160601b0390811682528354908116602083015260ff600160601b820481166040840152600160681b909104161515606082015230608082015260a00161023c610515565b6001600160a01b0316815260200182600101805461025990610751565b80601f016020809104026020016040519081016040528092919081815260200182805461028590610751565b80156102d25780601f106102a7576101008083540402835291602001916102d2565b820191906000526020600020905b8154815290600101906020018083116102b557829003601f168201915b50505050508152506040518060200160405280600081525092509250509091565b6001546040516330b8415f60e01b8152600160a01b9091046001600160601b0316600482015273__$6facc32ab6029a5f5de2a1d5e55ea9da0e$__906330b8415f90602401602060405180830381865af4158015610355573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610379919061078b565b156103c0576001546040516316322c0f60e31b81526001600160a01b0382166004820152600160a01b9091046001600160601b031660248201526044015b60405180910390fd5b6001546001600160a01b03166103e95760405163cf29926160e01b815260040160405180910390fd5b60015460405163c3c5a54760e01b81523060048201819052916001600160a01b03169063c3c5a54790602401602060405180830381865afa158015610432573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610456919061078b565b61047e576040516372657a5160e01b81526001600160a01b03821660048201526024016103b7565b600154604051636939560f60e11b81526001600160a01b0383811660048301529091169063d272ac1e90602401602060405180830381865afa1580156104c8573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906104ec91906107ad565b600160146101000a8154816001600160601b0302191690836001600160601b0316021790555050565b6001546040516330b8415f60e01b8152600160a01b9091046001600160601b0316600482015260009073__$6facc32ab6029a5f5de2a1d5e55ea9da0e$__906330b8415f90602401602060405180830381865af415801561057a573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061059e919061078b565b1561062357600154604051631c5da14d60e11b8152600160a01b82046001600160601b031660048201526001600160a01b03909116906338bb429a90602401602060405180830381865afa1580156105fa573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061061e91906107d6565b905090565b506002546001600160a01b031690565b60006020828403121561064557600080fd5b81356001600160e01b03198116811461065d57600080fd5b9392505050565b6000815180845260005b8181101561068a5760208185018101518683018201520161066e565b506000602082860101526020601f19601f83011685010191505092915050565b6040815260006001600160601b038085511660408401528060208601511660608401525060ff604085015116608083015260608401516106ee60a084018215159052565b5060808401516001600160a01b03811660c08401525060a08401516001600160a01b03811660e08401525060c084015160e0610100840152610734610120840182610664565b905082810360208401526107488185610664565b95945050505050565b600181811c9082168061076557607f821691505b60208210810361078557634e487b7160e01b600052602260045260246000fd5b50919050565b60006020828403121561079d57600080fd5b8151801515811461065d57600080fd5b6000602082840312156107bf57600080fd5b81516001600160601b038116811461065d57600080fd5b6000602082840312156107e857600080fd5b81516001600160a01b038116811461065d57600080fdfea264697066735822122099776171edfff2d6d4b127dc9bf2b52b06f241dda385a27449034e2d6372c0c964736f6c63430008140033",
283
+ "bytecode": "0x60806040523480156200001157600080fd5b5060405162000e7c38038062000e7c8339810160408190526200003491620003c5565b620000656301ffc9a760e01b600090815260205260008051602062000e5c833981519152805460ff19166001179055565b600280546001600160a01b0319163317905560408051602081019091526000815262000096868686868686620000a2565b505050505050620005e1565b620000d36301ffc9a760e01b600090815260205260008051602062000e5c833981519152805460ff19166001179055565b620000df8287620001a4565b60007f6548007c3f4340f82f348c576c0ff69f4f529cadd5ad41f96aae61abceeaa30080546001600160601b0388166001600160681b0319909116176c0100000000000000000000000060ff8816021760ff60681b19166d0100000000000000000000000000861515021781559050600181016200015e8382620004f0565b506303fb044760e21b60009081526020527fb43e4f3791bfcdefa3a0fbe2a5555f8d6490b90e01de0ff40c66f18b49b562c5805460ff1916600117905550505050505050565b6001600160a01b038216620002005760405162461bcd60e51b815260206004820152601e60248201527f4e66744f776e61626c653a20696e697469616c206f776e65722069732030000060448201526064015b60405180910390fd5b600280546001600160a01b0319166001600160a01b03841617905562000226816200022a565b5050565b6001546001600160a01b031615620002655760015460405163fcdbf2d960e01b81526001600160a01b039091166004820152602401620001f7565b6001600160a01b0381166200028d5760405163f5c4d07d60e01b815260040160405180910390fd5b806001600160a01b03163b600003620002c55760405163fdeac91f60e01b81526001600160a01b0382166004820152602401620001f7565b600180546001600160a01b0319166001600160a01b0383169081179091556040516301ffc9a760e01b81526316c8f9ff60e01b60048201526301ffc9a790602401602060405180830381865afa92505050801562000342575060408051601f3d908101601f191682019092526200033f91810190620005bc565b60015b6200036c5760405163fdeac91f60e01b81526001600160a01b0382166004820152602401620001f7565b80620002265760405163fdeac91f60e01b81526001600160a01b0383166004820152602401620001f7565b80516001600160a01b0381168114620003af57600080fd5b919050565b80518015158114620003af57600080fd5b600080600080600060a08688031215620003de57600080fd5b620003e98662000397565b60208701519095506001600160601b03811681146200040757600080fd5b604087015190945060ff811681146200041f57600080fd5b92506200042f60608701620003b4565b91506200043f6080870162000397565b90509295509295909350565b634e487b7160e01b600052604160045260246000fd5b600181811c908216806200047657607f821691505b6020821081036200049757634e487b7160e01b600052602260045260246000fd5b50919050565b601f821115620004eb57600081815260208120601f850160051c81016020861015620004c65750805b601f850160051c820191505b81811015620004e757828155600101620004d2565b5050505b505050565b81516001600160401b038111156200050c576200050c6200044b565b62000524816200051d845462000461565b846200049d565b602080601f8311600181146200055c5760008415620005435750858301515b600019600386901b1c1916600185901b178555620004e7565b600085815260208120601f198616915b828110156200058d578886015182559484019460019091019084016200056c565b5085821015620005ac5787850151600019600388901b60f8161c191681555b5050505050600190811b01905550565b600060208284031215620005cf57600080fd5b620005da82620003b4565b9392505050565b61086b80620005f16000396000f3fe608060405234801561001057600080fd5b50600436106100885760003560e01c80635ab1bd531161005b5780635ab1bd5314610123578063644c45e014610148578063893d20e814610173578063fb2cb1011461017b57600080fd5b806301ffc9a71461008d5780630fec111c146100cf578063138461e0146100e45780631eff4b22146100ee575b600080fd5b6100ba61009b366004610685565b6001600160e01b03191660009081526020819052604090205460ff1690565b60405190151581526020015b60405180910390f35b6100d761018c565b6040516100c691906106fc565b6100ec610345565b005b6101157f6548007c3f4340f82f348c576c0ff69f4f529cadd5ad41f96aae61abceeaa30081565b6040519081526020016100c6565b6001546001600160a01b03165b6040516001600160a01b0390911681526020016100c6565b600154600160a01b90046001600160601b03166040516001600160601b0390911681526020016100c6565b610130610567565b6002546001600160a01b0316610130565b6040805160e08101825260008082526020820181905291810182905260608082018390526080820183905260a0820183905260c0820152907f6548007c3f4340f82f348c576c0ff69f4f529cadd5ad41f96aae61abceeaa3006040805160808101825282546001600160601b038116825260ff600160601b820481166020840152600160681b9091041615159181019190915260018201805491929160608401919061023790610787565b80601f016020809104026020016040519081016040528092919081815260200182805461026390610787565b80156102b05780601f10610285576101008083540402835291602001916102b0565b820191906000526020600020905b81548152906001019060200180831161029357829003601f168201915b50505050508152505090506040518060e001604052806102ce600090565b6001600160601b0316815260200182600001516001600160601b03168152602001826020015160ff168152602001826040015115158152602001306001600160a01b031681526020016103296002546001600160a01b031690565b6001600160a01b03168152602001826060015181525091505090565b6001546040516330b8415f60e01b8152600160a01b9091046001600160601b0316600482015273__$6facc32ab6029a5f5de2a1d5e55ea9da0e$__906330b8415f90602401602060405180830381865af41580156103a7573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906103cb91906107c1565b15610412576001546040516316322c0f60e31b81526001600160a01b0382166004820152600160a01b9091046001600160601b031660248201526044015b60405180910390fd5b6001546001600160a01b031661043b5760405163cf29926160e01b815260040160405180910390fd5b60015460405163c3c5a54760e01b81523060048201819052916001600160a01b03169063c3c5a54790602401602060405180830381865afa158015610484573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906104a891906107c1565b6104d0576040516372657a5160e01b81526001600160a01b0382166004820152602401610409565b600154604051636939560f60e11b81526001600160a01b0383811660048301529091169063d272ac1e90602401602060405180830381865afa15801561051a573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061053e91906107e3565b600160146101000a8154816001600160601b0302191690836001600160601b0316021790555050565b6001546040516330b8415f60e01b8152600160a01b9091046001600160601b0316600482015260009073__$6facc32ab6029a5f5de2a1d5e55ea9da0e$__906330b8415f90602401602060405180830381865af41580156105cc573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906105f091906107c1565b1561067557600154604051631c5da14d60e11b8152600160a01b82046001600160601b031660048201526001600160a01b03909116906338bb429a90602401602060405180830381865afa15801561064c573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610670919061080c565b905090565b506002546001600160a01b031690565b60006020828403121561069757600080fd5b81356001600160e01b0319811681146106af57600080fd5b9392505050565b6000815180845260005b818110156106dc576020818501810151868301820152016106c0565b506000602082860101526020601f19601f83011685010191505092915050565b6020815260006001600160601b038084511660208401528060208501511660408401525060ff604084015116606083015260608301511515608083015260018060a01b0360808401511660a083015260a083015161076560c08401826001600160a01b03169052565b5060c083015160e08084015261077f6101008401826106b6565b949350505050565b600181811c9082168061079b57607f821691505b6020821081036107bb57634e487b7160e01b600052602260045260246000fd5b50919050565b6000602082840312156107d357600080fd5b815180151581146106af57600080fd5b6000602082840312156107f557600080fd5b81516001600160601b03811681146106af57600080fd5b60006020828403121561081e57600080fd5b81516001600160a01b03811681146106af57600080fdfea2646970667358221220ad3d887ebdea85787b0d21c89ee89e4067579d0cbb19f3227174e75c567ec21764736f6c6343000814003367be87c3ff9960ca1e9cfac5cab2ff4747269cf9ed20c9b7306235ac35a491c5",
284
+ "deployedBytecode": "0x608060405234801561001057600080fd5b50600436106100885760003560e01c80635ab1bd531161005b5780635ab1bd5314610123578063644c45e014610148578063893d20e814610173578063fb2cb1011461017b57600080fd5b806301ffc9a71461008d5780630fec111c146100cf578063138461e0146100e45780631eff4b22146100ee575b600080fd5b6100ba61009b366004610685565b6001600160e01b03191660009081526020819052604090205460ff1690565b60405190151581526020015b60405180910390f35b6100d761018c565b6040516100c691906106fc565b6100ec610345565b005b6101157f6548007c3f4340f82f348c576c0ff69f4f529cadd5ad41f96aae61abceeaa30081565b6040519081526020016100c6565b6001546001600160a01b03165b6040516001600160a01b0390911681526020016100c6565b600154600160a01b90046001600160601b03166040516001600160601b0390911681526020016100c6565b610130610567565b6002546001600160a01b0316610130565b6040805160e08101825260008082526020820181905291810182905260608082018390526080820183905260a0820183905260c0820152907f6548007c3f4340f82f348c576c0ff69f4f529cadd5ad41f96aae61abceeaa3006040805160808101825282546001600160601b038116825260ff600160601b820481166020840152600160681b9091041615159181019190915260018201805491929160608401919061023790610787565b80601f016020809104026020016040519081016040528092919081815260200182805461026390610787565b80156102b05780601f10610285576101008083540402835291602001916102b0565b820191906000526020600020905b81548152906001019060200180831161029357829003601f168201915b50505050508152505090506040518060e001604052806102ce600090565b6001600160601b0316815260200182600001516001600160601b03168152602001826020015160ff168152602001826040015115158152602001306001600160a01b031681526020016103296002546001600160a01b031690565b6001600160a01b03168152602001826060015181525091505090565b6001546040516330b8415f60e01b8152600160a01b9091046001600160601b0316600482015273__$6facc32ab6029a5f5de2a1d5e55ea9da0e$__906330b8415f90602401602060405180830381865af41580156103a7573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906103cb91906107c1565b15610412576001546040516316322c0f60e31b81526001600160a01b0382166004820152600160a01b9091046001600160601b031660248201526044015b60405180910390fd5b6001546001600160a01b031661043b5760405163cf29926160e01b815260040160405180910390fd5b60015460405163c3c5a54760e01b81523060048201819052916001600160a01b03169063c3c5a54790602401602060405180830381865afa158015610484573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906104a891906107c1565b6104d0576040516372657a5160e01b81526001600160a01b0382166004820152602401610409565b600154604051636939560f60e11b81526001600160a01b0383811660048301529091169063d272ac1e90602401602060405180830381865afa15801561051a573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061053e91906107e3565b600160146101000a8154816001600160601b0302191690836001600160601b0316021790555050565b6001546040516330b8415f60e01b8152600160a01b9091046001600160601b0316600482015260009073__$6facc32ab6029a5f5de2a1d5e55ea9da0e$__906330b8415f90602401602060405180830381865af41580156105cc573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906105f091906107c1565b1561067557600154604051631c5da14d60e11b8152600160a01b82046001600160601b031660048201526001600160a01b03909116906338bb429a90602401602060405180830381865afa15801561064c573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610670919061080c565b905090565b506002546001600160a01b031690565b60006020828403121561069757600080fd5b81356001600160e01b0319811681146106af57600080fd5b9392505050565b6000815180845260005b818110156106dc576020818501810151868301820152016106c0565b506000602082860101526020601f19601f83011685010191505092915050565b6020815260006001600160601b038084511660208401528060208501511660408401525060ff604084015116606083015260608301511515608083015260018060a01b0360808401511660a083015260a083015161076560c08401826001600160a01b03169052565b5060c083015160e08084015261077f6101008401826106b6565b949350505050565b600181811c9082168061079b57607f821691505b6020821081036107bb57634e487b7160e01b600052602260045260246000fd5b50919050565b6000602082840312156107d357600080fd5b815180151581146106af57600080fd5b6000602082840312156107f557600080fd5b81516001600160601b03811681146106af57600080fd5b60006020828403121561081e57600080fd5b81516001600160a01b03811681146106af57600080fdfea2646970667358221220ad3d887ebdea85787b0d21c89ee89e4067579d0cbb19f3227174e75c567ec21764736f6c63430008140033",
277
285
  "linkReferences": {
278
286
  "contracts/types/NftId.sol": {
279
287
  "NftIdLib": [
280
288
  {
281
289
  "length": 20,
282
- "start": 2190
290
+ "start": 2398
283
291
  },
284
292
  {
285
293
  "length": 20,
286
- "start": 2739
294
+ "start": 2947
287
295
  }
288
296
  ]
289
297
  }
@@ -293,11 +301,11 @@
293
301
  "NftIdLib": [
294
302
  {
295
303
  "length": 20,
296
- "start": 795
304
+ "start": 877
297
305
  },
298
306
  {
299
307
  "length": 20,
300
- "start": 1344
308
+ "start": 1426
301
309
  }
302
310
  ]
303
311
  }
package/artifacts/contracts/test/TestRoleId.sol/TestRoleId.dbg.json CHANGED
@@ -1,4 +1,4 @@
1
1
  {
2
2
  "_format": "hh-sol-dbg-1",
3
- "buildInfo": "../../../build-info/7ef3f843d4f3052b7e234c5370f71305.json"
3
+ "buildInfo": "../../../build-info/604f4891f44cb775b0a7bb52490d32f8.json"
4
4
  }
package/artifacts/contracts/test/TestRoleId.sol/TestRoleId.json CHANGED
@@ -10,7 +10,7 @@
10
10
  {
11
11
  "internalType": "RoleId",
12
12
  "name": "",
13
- "type": "bytes8"
13
+ "type": "uint64"
14
14
  }
15
15
  ],
16
16
  "stateMutability": "pure",
@@ -36,7 +36,7 @@
36
36
  {
37
37
  "internalType": "RoleId",
38
38
  "name": "",
39
- "type": "bytes8"
39
+ "type": "uint64"
40
40
  }
41
41
  ],
42
42
  "stateMutability": "pure",
@@ -58,9 +58,9 @@
58
58
  {
59
59
  "inputs": [
60
60
  {
61
- "internalType": "string",
62
- "name": "roleName",
63
- "type": "string"
61
+ "internalType": "uint256",
62
+ "name": "roleNum",
63
+ "type": "uint256"
64
64
  }
65
65
  ],
66
66
  "name": "getRole",
@@ -68,29 +68,29 @@
68
68
  {
69
69
  "internalType": "RoleId",
70
70
  "name": "",
71
- "type": "bytes8"
71
+ "type": "uint64"
72
72
  }
73
73
  ],
74
74
  "stateMutability": "pure",
75
75
  "type": "function"
76
76
  }
77
77
  ],
78
- "bytecode": "0x608060405234801561001057600080fd5b50610426806100206000396000f3fe608060405234801561001057600080fd5b50600436106100575760003560e01c80631fa8a7301461005c5780636e9067fb14610082578063775a404814610095578063b844f20e1461009d578063c4ce6e5b146100b2575b600080fd5b6100646100ba565b6040516001600160c01b031990911681526020015b60405180910390f35b6100646100903660046102b5565b6100c9565b61006461014a565b6100a5610154565b60405161007991906103ac565b6100a5610183565b60006100c46101af565b905090565b60405163e14787cb60e01b815260009073__$cd131c2b3ba46b9dbe046aaf4458b9777d$__9063e14787cb906101039085906004016103ac565b602060405180830381865af4158015610120573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061014491906103c6565b92915050565b60006100c4610244565b60606100c460408051808201909152601081526f50726f647563744f776e6572526f6c6560801b602082015290565b60606100c460408051808201909152600d81526c506f6f6c4f776e6572526f6c6560981b602082015290565b60405163e14787cb60e01b815260206004820152600d60248201526c506f6f6c4f776e6572526f6c6560981b604482015260009073__$cd131c2b3ba46b9dbe046aaf4458b9777d$__9063e14787cb906064015b602060405180830381865af4158015610220573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906100c491906103c6565b60405163e14787cb60e01b815260206004820152601060248201526f50726f647563744f776e6572526f6c6560801b604482015260009073__$cd131c2b3ba46b9dbe046aaf4458b9777d$__9063e14787cb90606401610203565b634e487b7160e01b600052604160045260246000fd5b6000602082840312156102c757600080fd5b813567ffffffffffffffff808211156102df57600080fd5b818401915084601f8301126102f357600080fd5b8135818111156103055761030561029f565b604051601f8201601f19908116603f0116810190838211818310171561032d5761032d61029f565b8160405282815287602084870101111561034657600080fd5b826020860160208301376000928101602001929092525095945050505050565b6000815180845260005b8181101561038c57602081850181015186830182015201610370565b506000602082860101526020601f19601f83011685010191505092915050565b6020815260006103bf6020830184610366565b9392505050565b6000602082840312156103d857600080fd5b81516001600160c01b0319811681146103bf57600080fdfea264697066735822122073ab6338907e14e7910a694f69326b6153f8377cd62487bb09ffb767a29fa96664736f6c63430008140033",
79
- "deployedBytecode": "0x608060405234801561001057600080fd5b50600436106100575760003560e01c80631fa8a7301461005c5780636e9067fb14610082578063775a404814610095578063b844f20e1461009d578063c4ce6e5b146100b2575b600080fd5b6100646100ba565b6040516001600160c01b031990911681526020015b60405180910390f35b6100646100903660046102b5565b6100c9565b61006461014a565b6100a5610154565b60405161007991906103ac565b6100a5610183565b60006100c46101af565b905090565b60405163e14787cb60e01b815260009073__$cd131c2b3ba46b9dbe046aaf4458b9777d$__9063e14787cb906101039085906004016103ac565b602060405180830381865af4158015610120573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061014491906103c6565b92915050565b60006100c4610244565b60606100c460408051808201909152601081526f50726f647563744f776e6572526f6c6560801b602082015290565b60606100c460408051808201909152600d81526c506f6f6c4f776e6572526f6c6560981b602082015290565b60405163e14787cb60e01b815260206004820152600d60248201526c506f6f6c4f776e6572526f6c6560981b604482015260009073__$cd131c2b3ba46b9dbe046aaf4458b9777d$__9063e14787cb906064015b602060405180830381865af4158015610220573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906100c491906103c6565b60405163e14787cb60e01b815260206004820152601060248201526f50726f647563744f776e6572526f6c6560801b604482015260009073__$cd131c2b3ba46b9dbe046aaf4458b9777d$__9063e14787cb90606401610203565b634e487b7160e01b600052604160045260246000fd5b6000602082840312156102c757600080fd5b813567ffffffffffffffff808211156102df57600080fd5b818401915084601f8301126102f357600080fd5b8135818111156103055761030561029f565b604051601f8201601f19908116603f0116810190838211818310171561032d5761032d61029f565b8160405282815287602084870101111561034657600080fd5b826020860160208301376000928101602001929092525095945050505050565b6000815180845260005b8181101561038c57602081850181015186830182015201610370565b506000602082860101526020601f19601f83011685010191505092915050565b6020815260006103bf6020830184610366565b9392505050565b6000602082840312156103d857600080fd5b81516001600160c01b0319811681146103bf57600080fdfea264697066735822122073ab6338907e14e7910a694f69326b6153f8377cd62487bb09ffb767a29fa96664736f6c63430008140033",
78
+ "bytecode": "0x608060405234801561001057600080fd5b5061032e806100206000396000f3fe608060405234801561001057600080fd5b50600436106100575760003560e01c80631fa8a7301461005c5780635312fdc214610082578063775a404814610095578063b844f20e1461009d578063c4ce6e5b146100b2575b600080fd5b6100646100ba565b60405167ffffffffffffffff90911681526020015b60405180910390f35b610064610090366004610260565b6100c9565b610064610146565b6100a5610150565b6040516100799190610279565b6100a561017f565b60006100c46101ab565b905090565b6040516368aebf7b60e01b81526004810182905260009073__$cd131c2b3ba46b9dbe046aaf4458b9777d$__906368aebf7b90602401602060405180830381865af415801561011c573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061014091906102c7565b92915050565b60006100c4610224565b60606100c460408051808201909152601081526f50726f647563744f776e6572526f6c6560801b602082015290565b60606100c460408051808201909152600d81526c506f6f6c4f776e6572526f6c6560981b602082015290565b6040516368aebf7b60e01b815261012c600482015260009073__$cd131c2b3ba46b9dbe046aaf4458b9777d$__906368aebf7b906024015b602060405180830381865af4158015610200573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906100c491906102c7565b6040516368aebf7b60e01b8152610190600482015260009073__$cd131c2b3ba46b9dbe046aaf4458b9777d$__906368aebf7b906024016101e3565b60006020828403121561027257600080fd5b5035919050565b600060208083528351808285015260005b818110156102a65785810183015185820160400152820161028a565b506000604082860101526040601f19601f8301168501019250505092915050565b6000602082840312156102d957600080fd5b815167ffffffffffffffff811681146102f157600080fd5b939250505056fea26469706673582212205bc136b4579637c4d35be56f157955ae6026455810a72ac7b3bde08b718983f564736f6c63430008140033",
79
+ "deployedBytecode": "0x608060405234801561001057600080fd5b50600436106100575760003560e01c80631fa8a7301461005c5780635312fdc214610082578063775a404814610095578063b844f20e1461009d578063c4ce6e5b146100b2575b600080fd5b6100646100ba565b60405167ffffffffffffffff90911681526020015b60405180910390f35b610064610090366004610260565b6100c9565b610064610146565b6100a5610150565b6040516100799190610279565b6100a561017f565b60006100c46101ab565b905090565b6040516368aebf7b60e01b81526004810182905260009073__$cd131c2b3ba46b9dbe046aaf4458b9777d$__906368aebf7b90602401602060405180830381865af415801561011c573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061014091906102c7565b92915050565b60006100c4610224565b60606100c460408051808201909152601081526f50726f647563744f776e6572526f6c6560801b602082015290565b60606100c460408051808201909152600d81526c506f6f6c4f776e6572526f6c6560981b602082015290565b6040516368aebf7b60e01b815261012c600482015260009073__$cd131c2b3ba46b9dbe046aaf4458b9777d$__906368aebf7b906024015b602060405180830381865af4158015610200573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906100c491906102c7565b6040516368aebf7b60e01b8152610190600482015260009073__$cd131c2b3ba46b9dbe046aaf4458b9777d$__906368aebf7b906024016101e3565b60006020828403121561027257600080fd5b5035919050565b600060208083528351808285015260005b818110156102a65785810183015185820160400152820161028a565b506000604082860101526040601f19601f8301168501019250505092915050565b6000602082840312156102d957600080fd5b815167ffffffffffffffff811681146102f157600080fd5b939250505056fea26469706673582212205bc136b4579637c4d35be56f157955ae6026455810a72ac7b3bde08b718983f564736f6c63430008140033",
80
80
  "linkReferences": {
81
81
  "contracts/types/RoleId.sol": {
82
82
  "RoleIdLib": [
83
83
  {
84
84
  "length": 20,
85
- "start": 251
85
+ "start": 258
86
86
  },
87
87
  {
88
88
  "length": 20,
89
- "start": 517
89
+ "start": 485
90
90
  },
91
91
  {
92
92
  "length": 20,
93
- "start": 669
93
+ "start": 606
94
94
  }
95
95
  ]
96
96
  }
@@ -100,15 +100,15 @@
100
100
  "RoleIdLib": [
101
101
  {
102
102
  "length": 20,
103
- "start": 219
103
+ "start": 226
104
104
  },
105
105
  {
106
106
  "length": 20,
107
- "start": 485
107
+ "start": 453
108
108
  },
109
109
  {
110
110
  "length": 20,
111
- "start": 637
111
+ "start": 574
112
112
  }
113
113
  ]
114
114
  }
package/artifacts/contracts/test/TestService.sol/TestService.dbg.json CHANGED
@@ -1,4 +1,4 @@
1
1
  {
2
2
  "_format": "hh-sol-dbg-1",
3
- "buildInfo": "../../../build-info/7ef3f843d4f3052b7e234c5370f71305.json"
3
+ "buildInfo": "../../../build-info/604f4891f44cb775b0a7bb52490d32f8.json"
4
4
  }
package/artifacts/contracts/test/TestService.sol/TestService.json CHANGED
@@ -179,6 +179,19 @@
179
179
  "stateMutability": "view",
180
180
  "type": "function"
181
181
  },
182
+ {
183
+ "inputs": [],
184
+ "name": "getDomain",
185
+ "outputs": [
186
+ {
187
+ "internalType": "ObjectType",
188
+ "name": "",
189
+ "type": "uint8"
190
+ }
191
+ ],
192
+ "stateMutability": "pure",
193
+ "type": "function"
194
+ },
182
195
  {
183
196
  "inputs": [],
184
197
  "name": "getInitialInfo",
@@ -222,13 +235,8 @@
222
235
  }
223
236
  ],
224
237
  "internalType": "struct IRegistry.ObjectInfo",
225
- "name": "",
238
+ "name": "info",
226
239
  "type": "tuple"
227
- },
228
- {
229
- "internalType": "bytes",
230
- "name": "data",
231
- "type": "bytes"
232
240
  }
233
241
  ],
234
242
  "stateMutability": "view",
@@ -236,12 +244,12 @@
236
244
  },
237
245
  {
238
246
  "inputs": [],
239
- "name": "getInitializedVersion",
247
+ "name": "getInitialOwner",
240
248
  "outputs": [
241
249
  {
242
- "internalType": "uint64",
250
+ "internalType": "address",
243
251
  "name": "",
244
- "type": "uint64"
252
+ "type": "address"
245
253
  }
246
254
  ],
247
255
  "stateMutability": "view",
@@ -249,12 +257,12 @@
249
257
  },
250
258
  {
251
259
  "inputs": [],
252
- "name": "getMajorVersion",
260
+ "name": "getInitializedVersion",
253
261
  "outputs": [
254
262
  {
255
- "internalType": "VersionPart",
256
- "name": "majorVersion",
257
- "type": "uint8"
263
+ "internalType": "uint64",
264
+ "name": "",
265
+ "type": "uint64"
258
266
  }
259
267
  ],
260
268
  "stateMutability": "view",
@@ -262,15 +270,15 @@
262
270
  },
263
271
  {
264
272
  "inputs": [],
265
- "name": "getName",
273
+ "name": "getMajorVersion",
266
274
  "outputs": [
267
275
  {
268
- "internalType": "string",
269
- "name": "name",
270
- "type": "string"
276
+ "internalType": "VersionPart",
277
+ "name": "majorVersion",
278
+ "type": "uint8"
271
279
  }
272
280
  ],
273
- "stateMutability": "pure",
281
+ "stateMutability": "view",
274
282
  "type": "function"
275
283
  },
276
284
  {
@@ -495,14 +503,14 @@
495
503
  "type": "function"
496
504
  }
497
505
  ],
498
- "bytecode": "0x60806040523480156200001157600080fd5b5060405162001c9238038062001c928339810160408190526200003491620005a2565b6301ffc9a760e01b60009081526020527f67be87c3ff9960ca1e9cfac5cab2ff4747269cf9ed20c9b7306235ac35a491c5805460ff19166001179055600280546001600160a01b031916331790556200008c620000a2565b6200009983838362000156565b5050506200083c565b7ff0c57e16840df040f15088dc2f81fe391c3923bec73e23a9662efc9c229c6a00805468010000000000000000900460ff1615620000f35760405163f92ee8a960e01b815260040160405180910390fd5b80546001600160401b0390811614620001535780546001600160401b0319166001600160401b0390811782556040519081527fc7f505b2f371ae2175ee4913f4499e1f2633a7b5936321eed1cdaeb6115181d29060200160405180910390a15b50565b60006200018160408051808201909152600b81526a546573745365727669636560a81b602082015290565b6200018b62000204565b6040516020016200019e929190620005fa565b60408051808303601f190181529190529050620001c2848460286000868662000291565b631b4612f160e31b60009081526020527ffc58a5a01198e68c5a5d0bcd463f9ab550fc4337b1df271aed6dbb33d25fef25805460ff1916600117905550505050565b60006200021062000362565b60405163c9e66e2960e01b815262ffffff909116600482015273__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__9063c9e66e2990602401602060405180830381865af415801562000266573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906200028c919062000654565b905090565b6200029d8287620003ea565b60007f6548007c3f4340f82f348c576c0ff69f4f529cadd5ad41f96aae61abceeaa30080546001600160601b0388166001600160681b0319909116176c0100000000000000000000000060ff8816021760ff60681b19166d0100000000000000000000000000861515021781559050600181016200031c838262000725565b506303fb044760e21b60009081526020527fb43e4f3791bfcdefa3a0fbe2a5555f8d6490b90e01de0ff40c66f18b49b562c5805460ff1916600117905550505050505050565b604051632efe011360e01b815260036004820152600060248201819052604482018190529073__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__90632efe011390606401602060405180830381865af4158015620003c4573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906200028c9190620007f1565b600280546001600160a01b0319166001600160a01b038416179055620004108162000414565b5050565b6001546001600160a01b031615620004535760015460405163fcdbf2d960e01b81526001600160a01b0390911660048201526024015b60405180910390fd5b6001600160a01b0381166200047b5760405163f5c4d07d60e01b815260040160405180910390fd5b806001600160a01b03163b600003620004b35760405163fdeac91f60e01b81526001600160a01b03821660048201526024016200044a565b600180546001600160a01b0319166001600160a01b0383169081179091556040516301ffc9a760e01b815263350fb35160e11b60048201526301ffc9a790602401602060405180830381865afa92505050801562000530575060408051601f3d908101601f191682019092526200052d9181019062000818565b60015b6200055a5760405163fdeac91f60e01b81526001600160a01b03821660048201526024016200044a565b80620004105760405163fdeac91f60e01b81526001600160a01b03831660048201526024016200044a565b80516001600160a01b03811681146200059d57600080fd5b919050565b600080600060608486031215620005b857600080fd5b620005c38462000585565b60208501519093506001600160601b0381168114620005e157600080fd5b9150620005f16040850162000585565b90509250925092565b604081526000835180604084015260005b818110156200062a57602081870181015160608684010152016200060b565b506000606082850101526060601f19601f83011684010191505060ff831660208301529392505050565b6000602082840312156200066757600080fd5b815160ff811681146200067957600080fd5b9392505050565b634e487b7160e01b600052604160045260246000fd5b600181811c90821680620006ab57607f821691505b602082108103620006cc57634e487b7160e01b600052602260045260246000fd5b50919050565b601f8211156200072057600081815260208120601f850160051c81016020861015620006fb5750805b601f850160051c820191505b818110156200071c5782815560010162000707565b5050505b505050565b81516001600160401b0381111562000741576200074162000680565b620007598162000752845462000696565b84620006d2565b602080601f831160018114620007915760008415620007785750858301515b600019600386901b1c1916600185901b1785556200071c565b600085815260208120601f198616915b82811015620007c257888601518255948401946001909101908401620007a1565b5085821015620007e15787850151600019600388901b60f8161c191681555b5050505050600190811b01905550565b6000602082840312156200080457600080fd5b815162ffffff811681146200067957600080fd5b6000602082840312156200082b57600080fd5b815180151581146200067957600080fd5b611446806200084c6000396000f3fe608060405234801561001057600080fd5b50600436106101165760003560e01c8063644c45e0116100a2578063a745e3df11610071578063a745e3df146103d3578063b3c65015146103e6578063b88da75914610407578063cde749f41461041a578063cf7a1d771461043457600080fd5b8063644c45e01461034f578063893d20e81461037a578063946dfcfe14610382578063a3f4df7e146103a957600080fd5b806317d7de7c116100e957806317d7de7c146101995780631eff4b22146101c95780634d459c90146101fe5780634f421333146103175780635ab1bd531461032a57600080fd5b806301ffc9a71461011b5780630d8e6e2c1461015d5780630fec111c14610179578063138461e01461018f575b600080fd5b610148610129366004611019565b6001600160e01b03191660009081526020819052604090205460ff1690565b60405190151581526020015b60405180910390f35b610165610447565b60405162ffffff9091168152602001610154565b6101816104d1565b604051610154929190611090565b610197610653565b005b60408051808201909152600b81526a546573745365727669636560a81b60208201525b6040516101549190611137565b6101f07f6548007c3f4340f82f348c576c0ff69f4f529cadd5ad41f96aae61abceeaa30081565b604051908152602001610154565b6102ba61020c36600461115e565b6040805160a0810182526000808252602082018190529181018290526060810182905260808101919091526000805160206113f183398151915262ffffff92831660009081526020918252604090819020815160a0810183528154958616815263010000009095046001600160a01b03908116938601939093526001015491821690840152600160a01b810464ffffffffff166060840152600160c81b900463ffffffff1660808301525090565b60408051825162ffffff1681526020808401516001600160a01b039081169183019190915283830151169181019190915260608083015164ffffffffff169082015260809182015163ffffffff169181019190915260a001610154565b61014861032536600461115e565b610875565b6001546001600160a01b03165b6040516001600160a01b039091168152602001610154565b600154600160a01b90046001600160601b03166040516001600160601b039091168152602001610154565b610337610928565b7f4f61291a8ac3d020d0a7d919a76b8592aa88385744dee3f8b4f3873b969ed901546101f0565b6101bc6040518060400160405280600b81526020016a546573745365727669636560a81b81525081565b6101976103e13660046111a6565b610a41565b6103ee610b9e565b60405167ffffffffffffffff9091168152602001610154565b61016561041536600461127c565b610bc0565b610422610c11565b60405160ff9091168152602001610154565b6101976104423660046111a6565b610c94565b604051632efe011360e01b815260036004820152600060248201819052604482018190529073__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__90632efe011390606401602060405180830381865af41580156104a8573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906104cc9190611295565b905090565b6040805160e08101825260008082526020820181905291810182905260608082018390526080820183905260a0820183905260c0820181905290917f6548007c3f4340f82f348c576c0ff69f4f529cadd5ad41f96aae61abceeaa30090506040518060e001604052806105546001546001600160601b03600160a01b9091041690565b6001600160601b0390811682528354908116602083015260ff600160601b820481166040840152600160681b909104161515606082015230608082015260a00161059c610928565b6001600160a01b031681526020018260010180546105b9906112b2565b80601f01602080910402602001604051908101604052809291908181526020018280546105e5906112b2565b80156106325780601f1061060757610100808354040283529160200191610632565b820191906000526020600020905b81548152906001019060200180831161061557829003601f168201915b50505050508152506040518060200160405280600081525092509250509091565b6001546040516330b8415f60e01b8152600160a01b9091046001600160601b0316600482015273__$6facc32ab6029a5f5de2a1d5e55ea9da0e$__906330b8415f90602401602060405180830381865af41580156106b5573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906106d991906112ec565b15610720576001546040516316322c0f60e31b81526001600160a01b0382166004820152600160a01b9091046001600160601b031660248201526044015b60405180910390fd5b6001546001600160a01b03166107495760405163cf29926160e01b815260040160405180910390fd5b60015460405163c3c5a54760e01b81523060048201819052916001600160a01b03169063c3c5a54790602401602060405180830381865afa158015610792573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906107b691906112ec565b6107de576040516372657a5160e01b81526001600160a01b0382166004820152602401610717565b600154604051636939560f60e11b81526001600160a01b0383811660048301529091169063d272ac1e90602401602060405180830381865afa158015610828573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061084c919061130e565b600160146101000a8154816001600160601b0302191690836001600160601b0316021790555050565b6000806000805160206113f183398151915262ffffff84166000908152602091909152604090819020600101549051631bbffab160e21b8152600160c81b90910463ffffffff16600482015273__$5f476116ae21c5294e0c0761c07efa7e1c$__90636effeac490602401602060405180830381865af41580156108fd573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906109219190611337565b1192915050565b6001546040516330b8415f60e01b8152600160a01b9091046001600160601b0316600482015260009073__$6facc32ab6029a5f5de2a1d5e55ea9da0e$__906330b8415f90602401602060405180830381865af415801561098d573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906109b191906112ec565b15610a3157600154604051631c5da14d60e11b8152600160a01b82046001600160601b031660048201526001600160a01b03909116906338bb429a90602401602060405180830381865afa158015610a0d573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906104cc9190611350565b506002546001600160a01b031690565b73__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__63a123b37c610a63610447565b6040516001600160e01b031960e084901b16815262ffffff9091166004820152602401602060405180830381865af4158015610aa3573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610ac7919061136d565b6000805160206113d18339815191528054600160401b900460ff1680610afb5750805467ffffffffffffffff808416911610155b15610b195760405163f92ee8a960e01b815260040160405180910390fd5b805468ffffffffffffffffff191667ffffffffffffffff831617600160401b178155610b458585610d9f565b610b4e83610fdc565b805460ff60401b1916815560405167ffffffffffffffff831681527fc7f505b2f371ae2175ee4913f4499e1f2633a7b5936321eed1cdaeb6115181d2906020015b60405180910390a15050505050565b60006104cc6000805160206113d18339815191525467ffffffffffffffff1690565b60006000805160206113f18339815191526001018281548110610be557610be5611397565b90600052602060002090600a91828204019190066003029054906101000a900462ffffff169050919050565b6000610c1b610447565b60405163c9e66e2960e01b815262ffffff909116600482015273__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__9063c9e66e2990602401602060405180830381865af4158015610c70573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906104cc91906113ad565b6000805160206113d18339815191528054600160401b810460ff16159067ffffffffffffffff16600081158015610cc85750825b905060008267ffffffffffffffff166001148015610ce55750303b155b905081158015610cf3575080155b15610d115760405163f92ee8a960e01b815260040160405180910390fd5b845467ffffffffffffffff191660011785558315610d3b57845460ff60401b1916600160401b1785555b610d458888610d9f565b610d4f8787610fdc565b8315610d9557845460ff60401b19168555604051600181527fc7f505b2f371ae2175ee4913f4499e1f2633a7b5936321eed1cdaeb6115181d29060200160405180910390a15b5050505050505050565b610da7610fe0565b6000805160206113f18339815191526000610dd86000805160206113d18339815191525467ffffffffffffffff1690565b90506000610de4610447565b90508167ffffffffffffffff16600103610e125760028301805462ffffff191662ffffff8316179055610e60565b600283015462ffffff90811690821611610e605760405162461bcd60e51b815260206004820152600f60248201526e24a72b20a624a2102b22a929a4a7a760891b6044820152606401610717565b6001808401805491820181556000908152602090819020600a808404909101805462ffffff808716600394909606939093026101000a858102930219169190911790556040805160a0810182529283526001600160a01b03808916928401929092529086169082015260608101610ed44290565b64ffffffffff1681526020014363ffffffff90811690915262ffffff8084166000908152602087815260409182902085518154928701516001600160a01b039081166301000000026001600160b81b0319909416919095161791909117815584820151600190910180546060870151608090970151909516600160c81b0263ffffffff60c81b1964ffffffffff909716600160a01b026001600160c81b031990961692909416919091179390931793909316179055517fad0a0fc10465a8dd9da3ad5f43e1a7fff4b4578551c76f0ae8deb844f0d0bf6890610b8f9083908890889062ffffff9390931683526001600160a01b03918216602084015216604082015260600190565b6101165b6000805160206113d183398151915254600160401b900460ff1661101757604051631afcd79f60e31b815260040160405180910390fd5b565b60006020828403121561102b57600080fd5b81356001600160e01b03198116811461104357600080fd5b9392505050565b6000815180845260005b8181101561107057602081850181015186830182015201611054565b506000602082860101526020601f19601f83011685010191505092915050565b6040815260006001600160601b038085511660408401528060208601511660608401525060ff604085015116608083015260608401516110d460a084018215159052565b5060808401516001600160a01b03811660c08401525060a08401516001600160a01b03811660e08401525060c084015160e061010084015261111a61012084018261104a565b9050828103602084015261112e818561104a565b95945050505050565b602081526000611043602083018461104a565b62ffffff8116811461115b57600080fd5b50565b60006020828403121561117057600080fd5b81356110438161114a565b6001600160a01b038116811461115b57600080fd5b634e487b7160e01b600052604160045260246000fd5b6000806000606084860312156111bb57600080fd5b83356111c68161117b565b925060208401356111d68161117b565b9150604084013567ffffffffffffffff808211156111f357600080fd5b818601915086601f83011261120757600080fd5b81358181111561121957611219611190565b604051601f8201601f19908116603f0116810190838211818310171561124157611241611190565b8160405282815289602084870101111561125a57600080fd5b8260208601602083013760006020848301015280955050505050509250925092565b60006020828403121561128e57600080fd5b5035919050565b6000602082840312156112a757600080fd5b81516110438161114a565b600181811c908216806112c657607f821691505b6020821081036112e657634e487b7160e01b600052602260045260246000fd5b50919050565b6000602082840312156112fe57600080fd5b8151801515811461104357600080fd5b60006020828403121561132057600080fd5b81516001600160601b038116811461104357600080fd5b60006020828403121561134957600080fd5b5051919050565b60006020828403121561136257600080fd5b81516110438161117b565b60006020828403121561137f57600080fd5b815167ffffffffffffffff8116811461104357600080fd5b634e487b7160e01b600052603260045260246000fd5b6000602082840312156113bf57600080fd5b815160ff8116811461104357600080fdfef0c57e16840df040f15088dc2f81fe391c3923bec73e23a9662efc9c229c6a004f61291a8ac3d020d0a7d919a76b8592aa88385744dee3f8b4f3873b969ed900a26469706673582212204dd2ce357405a67c5ca7f63944432a135442837ac093a6a61b777c20a30314f964736f6c63430008140033",
499
- "deployedBytecode": "0x608060405234801561001057600080fd5b50600436106101165760003560e01c8063644c45e0116100a2578063a745e3df11610071578063a745e3df146103d3578063b3c65015146103e6578063b88da75914610407578063cde749f41461041a578063cf7a1d771461043457600080fd5b8063644c45e01461034f578063893d20e81461037a578063946dfcfe14610382578063a3f4df7e146103a957600080fd5b806317d7de7c116100e957806317d7de7c146101995780631eff4b22146101c95780634d459c90146101fe5780634f421333146103175780635ab1bd531461032a57600080fd5b806301ffc9a71461011b5780630d8e6e2c1461015d5780630fec111c14610179578063138461e01461018f575b600080fd5b610148610129366004611019565b6001600160e01b03191660009081526020819052604090205460ff1690565b60405190151581526020015b60405180910390f35b610165610447565b60405162ffffff9091168152602001610154565b6101816104d1565b604051610154929190611090565b610197610653565b005b60408051808201909152600b81526a546573745365727669636560a81b60208201525b6040516101549190611137565b6101f07f6548007c3f4340f82f348c576c0ff69f4f529cadd5ad41f96aae61abceeaa30081565b604051908152602001610154565b6102ba61020c36600461115e565b6040805160a0810182526000808252602082018190529181018290526060810182905260808101919091526000805160206113f183398151915262ffffff92831660009081526020918252604090819020815160a0810183528154958616815263010000009095046001600160a01b03908116938601939093526001015491821690840152600160a01b810464ffffffffff166060840152600160c81b900463ffffffff1660808301525090565b60408051825162ffffff1681526020808401516001600160a01b039081169183019190915283830151169181019190915260608083015164ffffffffff169082015260809182015163ffffffff169181019190915260a001610154565b61014861032536600461115e565b610875565b6001546001600160a01b03165b6040516001600160a01b039091168152602001610154565b600154600160a01b90046001600160601b03166040516001600160601b039091168152602001610154565b610337610928565b7f4f61291a8ac3d020d0a7d919a76b8592aa88385744dee3f8b4f3873b969ed901546101f0565b6101bc6040518060400160405280600b81526020016a546573745365727669636560a81b81525081565b6101976103e13660046111a6565b610a41565b6103ee610b9e565b60405167ffffffffffffffff9091168152602001610154565b61016561041536600461127c565b610bc0565b610422610c11565b60405160ff9091168152602001610154565b6101976104423660046111a6565b610c94565b604051632efe011360e01b815260036004820152600060248201819052604482018190529073__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__90632efe011390606401602060405180830381865af41580156104a8573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906104cc9190611295565b905090565b6040805160e08101825260008082526020820181905291810182905260608082018390526080820183905260a0820183905260c0820181905290917f6548007c3f4340f82f348c576c0ff69f4f529cadd5ad41f96aae61abceeaa30090506040518060e001604052806105546001546001600160601b03600160a01b9091041690565b6001600160601b0390811682528354908116602083015260ff600160601b820481166040840152600160681b909104161515606082015230608082015260a00161059c610928565b6001600160a01b031681526020018260010180546105b9906112b2565b80601f01602080910402602001604051908101604052809291908181526020018280546105e5906112b2565b80156106325780601f1061060757610100808354040283529160200191610632565b820191906000526020600020905b81548152906001019060200180831161061557829003601f168201915b50505050508152506040518060200160405280600081525092509250509091565b6001546040516330b8415f60e01b8152600160a01b9091046001600160601b0316600482015273__$6facc32ab6029a5f5de2a1d5e55ea9da0e$__906330b8415f90602401602060405180830381865af41580156106b5573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906106d991906112ec565b15610720576001546040516316322c0f60e31b81526001600160a01b0382166004820152600160a01b9091046001600160601b031660248201526044015b60405180910390fd5b6001546001600160a01b03166107495760405163cf29926160e01b815260040160405180910390fd5b60015460405163c3c5a54760e01b81523060048201819052916001600160a01b03169063c3c5a54790602401602060405180830381865afa158015610792573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906107b691906112ec565b6107de576040516372657a5160e01b81526001600160a01b0382166004820152602401610717565b600154604051636939560f60e11b81526001600160a01b0383811660048301529091169063d272ac1e90602401602060405180830381865afa158015610828573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061084c919061130e565b600160146101000a8154816001600160601b0302191690836001600160601b0316021790555050565b6000806000805160206113f183398151915262ffffff84166000908152602091909152604090819020600101549051631bbffab160e21b8152600160c81b90910463ffffffff16600482015273__$5f476116ae21c5294e0c0761c07efa7e1c$__90636effeac490602401602060405180830381865af41580156108fd573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906109219190611337565b1192915050565b6001546040516330b8415f60e01b8152600160a01b9091046001600160601b0316600482015260009073__$6facc32ab6029a5f5de2a1d5e55ea9da0e$__906330b8415f90602401602060405180830381865af415801561098d573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906109b191906112ec565b15610a3157600154604051631c5da14d60e11b8152600160a01b82046001600160601b031660048201526001600160a01b03909116906338bb429a90602401602060405180830381865afa158015610a0d573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906104cc9190611350565b506002546001600160a01b031690565b73__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__63a123b37c610a63610447565b6040516001600160e01b031960e084901b16815262ffffff9091166004820152602401602060405180830381865af4158015610aa3573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610ac7919061136d565b6000805160206113d18339815191528054600160401b900460ff1680610afb5750805467ffffffffffffffff808416911610155b15610b195760405163f92ee8a960e01b815260040160405180910390fd5b805468ffffffffffffffffff191667ffffffffffffffff831617600160401b178155610b458585610d9f565b610b4e83610fdc565b805460ff60401b1916815560405167ffffffffffffffff831681527fc7f505b2f371ae2175ee4913f4499e1f2633a7b5936321eed1cdaeb6115181d2906020015b60405180910390a15050505050565b60006104cc6000805160206113d18339815191525467ffffffffffffffff1690565b60006000805160206113f18339815191526001018281548110610be557610be5611397565b90600052602060002090600a91828204019190066003029054906101000a900462ffffff169050919050565b6000610c1b610447565b60405163c9e66e2960e01b815262ffffff909116600482015273__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__9063c9e66e2990602401602060405180830381865af4158015610c70573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906104cc91906113ad565b6000805160206113d18339815191528054600160401b810460ff16159067ffffffffffffffff16600081158015610cc85750825b905060008267ffffffffffffffff166001148015610ce55750303b155b905081158015610cf3575080155b15610d115760405163f92ee8a960e01b815260040160405180910390fd5b845467ffffffffffffffff191660011785558315610d3b57845460ff60401b1916600160401b1785555b610d458888610d9f565b610d4f8787610fdc565b8315610d9557845460ff60401b19168555604051600181527fc7f505b2f371ae2175ee4913f4499e1f2633a7b5936321eed1cdaeb6115181d29060200160405180910390a15b5050505050505050565b610da7610fe0565b6000805160206113f18339815191526000610dd86000805160206113d18339815191525467ffffffffffffffff1690565b90506000610de4610447565b90508167ffffffffffffffff16600103610e125760028301805462ffffff191662ffffff8316179055610e60565b600283015462ffffff90811690821611610e605760405162461bcd60e51b815260206004820152600f60248201526e24a72b20a624a2102b22a929a4a7a760891b6044820152606401610717565b6001808401805491820181556000908152602090819020600a808404909101805462ffffff808716600394909606939093026101000a858102930219169190911790556040805160a0810182529283526001600160a01b03808916928401929092529086169082015260608101610ed44290565b64ffffffffff1681526020014363ffffffff90811690915262ffffff8084166000908152602087815260409182902085518154928701516001600160a01b039081166301000000026001600160b81b0319909416919095161791909117815584820151600190910180546060870151608090970151909516600160c81b0263ffffffff60c81b1964ffffffffff909716600160a01b026001600160c81b031990961692909416919091179390931793909316179055517fad0a0fc10465a8dd9da3ad5f43e1a7fff4b4578551c76f0ae8deb844f0d0bf6890610b8f9083908890889062ffffff9390931683526001600160a01b03918216602084015216604082015260600190565b6101165b6000805160206113d183398151915254600160401b900460ff1661101757604051631afcd79f60e31b815260040160405180910390fd5b565b60006020828403121561102b57600080fd5b81356001600160e01b03198116811461104357600080fd5b9392505050565b6000815180845260005b8181101561107057602081850181015186830182015201611054565b506000602082860101526020601f19601f83011685010191505092915050565b6040815260006001600160601b038085511660408401528060208601511660608401525060ff604085015116608083015260608401516110d460a084018215159052565b5060808401516001600160a01b03811660c08401525060a08401516001600160a01b03811660e08401525060c084015160e061010084015261111a61012084018261104a565b9050828103602084015261112e818561104a565b95945050505050565b602081526000611043602083018461104a565b62ffffff8116811461115b57600080fd5b50565b60006020828403121561117057600080fd5b81356110438161114a565b6001600160a01b038116811461115b57600080fd5b634e487b7160e01b600052604160045260246000fd5b6000806000606084860312156111bb57600080fd5b83356111c68161117b565b925060208401356111d68161117b565b9150604084013567ffffffffffffffff808211156111f357600080fd5b818601915086601f83011261120757600080fd5b81358181111561121957611219611190565b604051601f8201601f19908116603f0116810190838211818310171561124157611241611190565b8160405282815289602084870101111561125a57600080fd5b8260208601602083013760006020848301015280955050505050509250925092565b60006020828403121561128e57600080fd5b5035919050565b6000602082840312156112a757600080fd5b81516110438161114a565b600181811c908216806112c657607f821691505b6020821081036112e657634e487b7160e01b600052602260045260246000fd5b50919050565b6000602082840312156112fe57600080fd5b8151801515811461104357600080fd5b60006020828403121561132057600080fd5b81516001600160601b038116811461104357600080fd5b60006020828403121561134957600080fd5b5051919050565b60006020828403121561136257600080fd5b81516110438161117b565b60006020828403121561137f57600080fd5b815167ffffffffffffffff8116811461104357600080fd5b634e487b7160e01b600052603260045260246000fd5b6000602082840312156113bf57600080fd5b815160ff8116811461104357600080fdfef0c57e16840df040f15088dc2f81fe391c3923bec73e23a9662efc9c229c6a004f61291a8ac3d020d0a7d919a76b8592aa88385744dee3f8b4f3873b969ed900a26469706673582212204dd2ce357405a67c5ca7f63944432a135442837ac093a6a61b777c20a30314f964736f6c63430008140033",
506
+ "bytecode": "0x60806040523480156200001157600080fd5b5060405162001e0238038062001e0283398101604081905262000034916200069b565b620000656301ffc9a760e01b600090815260205260008051602062001de2833981519152805460ff19166001179055565b600280546001600160a01b031916331790556200008162000096565b6200008d83826200014a565b505050620008eb565b7ff0c57e16840df040f15088dc2f81fe391c3923bec73e23a9662efc9c229c6a00805468010000000000000000900460ff1615620000e75760405163f92ee8a960e01b815260040160405180910390fd5b80546001600160401b0390811614620001475780546001600160401b0319166001600160401b0390811782556040519081527fc7f505b2f371ae2175ee4913f4499e1f2633a7b5936321eed1cdaeb6115181d29060200160405180910390a15b50565b6000606e62000158620001ed565b6040805160ff9384166020820152929091169082015260600160408051601f1981840301815291905290506000620001908462000275565b90506000620001a58583603c848888620002e9565b637b6a51fd60e01b60009081526020527f9104d64c0a509f323b61ab0d4830bb2242bc1a960637a1dcf1f2b72e0a7bd64d805460ff191660011790555050505050565b905090565b6000620001f9620003eb565b60405163c9e66e2960e01b815262ffffff909116600482015273__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__9063c9e66e2990602401602060405180830381865af41580156200024f573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190620001e89190620006e5565b604051636939560f60e11b81526001600160a01b0382166004820181905260009163d272ac1e90602401602060405180830381865afa158015620002bd573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190620002e3919062000711565b92915050565b6200031a6301ffc9a760e01b600090815260205260008051602062001de2833981519152805460ff19166001179055565b62000326828762000473565b60007f6548007c3f4340f82f348c576c0ff69f4f529cadd5ad41f96aae61abceeaa30080546001600160601b0388166001600160681b0319909116176c0100000000000000000000000060ff8816021760ff60681b19166d010000000000000000000000000086151502178155905060018101620003a58382620007d4565b506303fb044760e21b60009081526020527fb43e4f3791bfcdefa3a0fbe2a5555f8d6490b90e01de0ff40c66f18b49b562c5805460ff1916600117905550505050505050565b604051632efe011360e01b815260036004820152600060248201819052604482018190529073__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__90632efe011390606401602060405180830381865af41580156200044d573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190620001e89190620008a0565b6001600160a01b038216620004cf5760405162461bcd60e51b815260206004820152601e60248201527f4e66744f776e61626c653a20696e697469616c206f776e65722069732030000060448201526064015b60405180910390fd5b600280546001600160a01b0319166001600160a01b038416179055620004f581620004f9565b5050565b6001546001600160a01b031615620005345760015460405163fcdbf2d960e01b81526001600160a01b039091166004820152602401620004c6565b6001600160a01b0381166200055c5760405163f5c4d07d60e01b815260040160405180910390fd5b806001600160a01b03163b600003620005945760405163fdeac91f60e01b81526001600160a01b0382166004820152602401620004c6565b600180546001600160a01b0319166001600160a01b0383169081179091556040516301ffc9a760e01b81526316c8f9ff60e01b60048201526301ffc9a790602401602060405180830381865afa92505050801562000611575060408051601f3d908101601f191682019092526200060e91810190620008c7565b60015b6200063b5760405163fdeac91f60e01b81526001600160a01b0382166004820152602401620004c6565b80620004f55760405163fdeac91f60e01b81526001600160a01b0383166004820152602401620004c6565b80516001600160a01b03811681146200067e57600080fd5b919050565b80516001600160601b03811681146200067e57600080fd5b600080600060608486031215620006b157600080fd5b620006bc8462000666565b9250620006cc6020850162000683565b9150620006dc6040850162000666565b90509250925092565b600060208284031215620006f857600080fd5b815160ff811681146200070a57600080fd5b9392505050565b6000602082840312156200072457600080fd5b6200070a8262000683565b634e487b7160e01b600052604160045260246000fd5b600181811c908216806200075a57607f821691505b6020821081036200077b57634e487b7160e01b600052602260045260246000fd5b50919050565b601f821115620007cf57600081815260208120601f850160051c81016020861015620007aa5750805b601f850160051c820191505b81811015620007cb57828155600101620007b6565b5050505b505050565b81516001600160401b03811115620007f057620007f06200072f565b620008088162000801845462000745565b8462000781565b602080601f831160018114620008405760008415620008275750858301515b600019600386901b1c1916600185901b178555620007cb565b600085815260208120601f198616915b82811015620008715788860151825594840194600190910190840162000850565b5085821015620008905787850151600019600388901b60f8161c191681555b5050505050600190811b01905550565b600060208284031215620008b357600080fd5b815162ffffff811681146200070a57600080fd5b600060208284031215620008da57600080fd5b815180151581146200070a57600080fd5b6114e780620008fb6000396000f3fe608060405234801561001057600080fd5b50600436106101215760003560e01c8063893d20e8116100ad578063b68d180911610071578063b68d1809146103ee578063b88da75914610403578063cde749f414610416578063cf7a1d771461041e578063fb2cb1011461043157600080fd5b8063893d20e814610354578063946dfcfe1461035c578063a3f4df7e14610383578063a745e3df146103ba578063b3c65015146103cd57600080fd5b80631eff4b22116100f45780631eff4b22146101a35780634d459c90146101d85780634f421333146102f15780635ab1bd5314610304578063644c45e01461032957600080fd5b806301ffc9a7146101265780630d8e6e2c146101685780630fec111c14610184578063138461e014610199575b600080fd5b6101536101343660046110af565b6001600160e01b03191660009081526020819052604090205460ff1690565b60405190151581526020015b60405180910390f35b610170610442565b60405162ffffff909116815260200161015f565b61018c6104cc565b60405161015f9190611126565b6101a1610685565b005b6101ca7f6548007c3f4340f82f348c576c0ff69f4f529cadd5ad41f96aae61abceeaa30081565b60405190815260200161015f565b6102946101e63660046111c5565b6040805160a08101825260008082526020820181905291810182905260608101829052608081019190915260008051602061149283398151915262ffffff92831660009081526020918252604090819020815160a0810183528154958616815263010000009095046001600160a01b03908116938601939093526001015491821690840152600160a01b810464ffffffffff166060840152600160c81b900463ffffffff1660808301525090565b60408051825162ffffff1681526020808401516001600160a01b039081169183019190915283830151169181019190915260608083015164ffffffffff169082015260809182015163ffffffff169181019190915260a00161015f565b6101536102ff3660046111c5565b6108a7565b6001546001600160a01b03165b6040516001600160a01b03909116815260200161015f565b600154600160a01b90046001600160601b03166040516001600160601b03909116815260200161015f565b61031161095a565b7f4f61291a8ac3d020d0a7d919a76b8592aa88385744dee3f8b4f3873b969ed901546101ca565b6103ad6040518060400160405280600b81526020016a546573745365727669636560a81b81525081565b60405161015f91906111e2565b6101a16103c8366004611220565b610a73565b6103d5610bd0565b60405167ffffffffffffffff909116815260200161015f565b606e5b60405160ff909116815260200161015f565b6101706104113660046112f6565b610bf2565b6103f1610c43565b6101a161042c366004611220565b610cc6565b6002546001600160a01b0316610311565b604051632efe011360e01b815260036004820152600060248201819052604482018190529073__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__90632efe011390606401602060405180830381865af41580156104a3573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906104c7919061130f565b905090565b6040805160e08101825260008082526020820181905291810182905260608082018390526080820183905260a0820183905260c0820152907f6548007c3f4340f82f348c576c0ff69f4f529cadd5ad41f96aae61abceeaa3006040805160808101825282546001600160601b038116825260ff600160601b820481166020840152600160681b909104161515918101919091526001820180549192916060840191906105779061132c565b80601f01602080910402602001604051908101604052809291908181526020018280546105a39061132c565b80156105f05780601f106105c5576101008083540402835291602001916105f0565b820191906000526020600020905b8154815290600101906020018083116105d357829003601f168201915b50505050508152505090506040518060e0016040528061060e600090565b6001600160601b0316815260200182600001516001600160601b03168152602001826020015160ff168152602001826040015115158152602001306001600160a01b031681526020016106696002546001600160a01b031690565b6001600160a01b03168152602001826060015181525091505090565b6001546040516330b8415f60e01b8152600160a01b9091046001600160601b0316600482015273__$6facc32ab6029a5f5de2a1d5e55ea9da0e$__906330b8415f90602401602060405180830381865af41580156106e7573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061070b9190611366565b15610752576001546040516316322c0f60e31b81526001600160a01b0382166004820152600160a01b9091046001600160601b031660248201526044015b60405180910390fd5b6001546001600160a01b031661077b5760405163cf29926160e01b815260040160405180910390fd5b60015460405163c3c5a54760e01b81523060048201819052916001600160a01b03169063c3c5a54790602401602060405180830381865afa1580156107c4573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906107e89190611366565b610810576040516372657a5160e01b81526001600160a01b0382166004820152602401610749565b600154604051636939560f60e11b81526001600160a01b0383811660048301529091169063d272ac1e90602401602060405180830381865afa15801561085a573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061087e9190611388565b600160146101000a8154816001600160601b0302191690836001600160601b0316021790555050565b60008060008051602061149283398151915262ffffff84166000908152602091909152604090819020600101549051631bbffab160e21b8152600160c81b90910463ffffffff16600482015273__$5f476116ae21c5294e0c0761c07efa7e1c$__90636effeac490602401602060405180830381865af415801561092f573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061095391906113b1565b1192915050565b6001546040516330b8415f60e01b8152600160a01b9091046001600160601b0316600482015260009073__$6facc32ab6029a5f5de2a1d5e55ea9da0e$__906330b8415f90602401602060405180830381865af41580156109bf573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906109e39190611366565b15610a6357600154604051631c5da14d60e11b8152600160a01b82046001600160601b031660048201526001600160a01b03909116906338bb429a90602401602060405180830381865afa158015610a3f573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906104c791906113ca565b506002546001600160a01b031690565b73__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__63a123b37c610a95610442565b6040516001600160e01b031960e084901b16815262ffffff9091166004820152602401602060405180830381865af4158015610ad5573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610af991906113e7565b6000805160206114728339815191528054600160401b900460ff1680610b2d5750805467ffffffffffffffff808416911610155b15610b4b5760405163f92ee8a960e01b815260040160405180910390fd5b805468ffffffffffffffffff191667ffffffffffffffff831617600160401b178155610b778585610dd1565b610b8083611072565b805460ff60401b1916815560405167ffffffffffffffff831681527fc7f505b2f371ae2175ee4913f4499e1f2633a7b5936321eed1cdaeb6115181d2906020015b60405180910390a15050505050565b60006104c76000805160206114728339815191525467ffffffffffffffff1690565b60006000805160206114928339815191526001018281548110610c1757610c17611411565b90600052602060002090600a91828204019190066003029054906101000a900462ffffff169050919050565b6000610c4d610442565b60405163c9e66e2960e01b815262ffffff909116600482015273__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__9063c9e66e2990602401602060405180830381865af4158015610ca2573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906104c79190611427565b6000805160206114728339815191528054600160401b810460ff16159067ffffffffffffffff16600081158015610cfa5750825b905060008267ffffffffffffffff166001148015610d175750303b155b905081158015610d25575080155b15610d435760405163f92ee8a960e01b815260040160405180910390fd5b845467ffffffffffffffff191660011785558315610d6d57845460ff60401b1916600160401b1785555b610d778888610dd1565b610d818787611072565b8315610dc757845460ff60401b19168555604051600181527fc7f505b2f371ae2175ee4913f4499e1f2633a7b5936321eed1cdaeb6115181d29060200160405180910390a15b5050505050505050565b610dd9611076565b6000805160206114928339815191526000610e0a6000805160206114728339815191525467ffffffffffffffff1690565b90506000610e16610442565b90508167ffffffffffffffff16600103610e445760028301805462ffffff191662ffffff8316179055610e92565b600283015462ffffff90811690821611610e925760405162461bcd60e51b815260206004820152600f60248201526e24a72b20a624a2102b22a929a4a7a760891b6044820152606401610749565b6001808401805491820181556000908152602090819020600a808404909101805462ffffff808716600394909606939093026101000a858102930219169190911790556040805160a0810182529283526001600160a01b038089168484015287168382015280516356db0c1960e11b81529051606084019273__$d53880c81dc91c20799140d711e5ab8718$__9263adb6183292600480830193928290030181865af4158015610f46573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610f6a919061144a565b64ffffffffff1681526020014363ffffffff90811690915262ffffff8084166000908152602087815260409182902085518154928701516001600160a01b039081166301000000026001600160b81b0319909416919095161791909117815584820151600190910180546060870151608090970151909516600160c81b0263ffffffff60c81b1964ffffffffff909716600160a01b026001600160c81b031990961692909416919091179390931793909316179055517fad0a0fc10465a8dd9da3ad5f43e1a7fff4b4578551c76f0ae8deb844f0d0bf6890610bc19083908890889062ffffff9390931683526001600160a01b03918216602084015216604082015260600190565b6101215b60008051602061147283398151915254600160401b900460ff166110ad57604051631afcd79f60e31b815260040160405180910390fd5b565b6000602082840312156110c157600080fd5b81356001600160e01b0319811681146110d957600080fd5b9392505050565b6000815180845260005b81811015611106576020818501810151868301820152016110ea565b506000602082860101526020601f19601f83011685010191505092915050565b6020815260006001600160601b038084511660208401528060208501511660408401525060ff604084015116606083015260608301511515608083015260018060a01b0360808401511660a083015260a083015161118f60c08401826001600160a01b03169052565b5060c083015160e0808401526111a96101008401826110e0565b949350505050565b62ffffff811681146111c257600080fd5b50565b6000602082840312156111d757600080fd5b81356110d9816111b1565b6020815260006110d960208301846110e0565b6001600160a01b03811681146111c257600080fd5b634e487b7160e01b600052604160045260246000fd5b60008060006060848603121561123557600080fd5b8335611240816111f5565b92506020840135611250816111f5565b9150604084013567ffffffffffffffff8082111561126d57600080fd5b818601915086601f83011261128157600080fd5b8135818111156112935761129361120a565b604051601f8201601f19908116603f011681019083821181831017156112bb576112bb61120a565b816040528281528960208487010111156112d457600080fd5b8260208601602083013760006020848301015280955050505050509250925092565b60006020828403121561130857600080fd5b5035919050565b60006020828403121561132157600080fd5b81516110d9816111b1565b600181811c9082168061134057607f821691505b60208210810361136057634e487b7160e01b600052602260045260246000fd5b50919050565b60006020828403121561137857600080fd5b815180151581146110d957600080fd5b60006020828403121561139a57600080fd5b81516001600160601b03811681146110d957600080fd5b6000602082840312156113c357600080fd5b5051919050565b6000602082840312156113dc57600080fd5b81516110d9816111f5565b6000602082840312156113f957600080fd5b815167ffffffffffffffff811681146110d957600080fd5b634e487b7160e01b600052603260045260246000fd5b60006020828403121561143957600080fd5b815160ff811681146110d957600080fd5b60006020828403121561145c57600080fd5b815164ffffffffff811681146110d957600080fdfef0c57e16840df040f15088dc2f81fe391c3923bec73e23a9662efc9c229c6a004f61291a8ac3d020d0a7d919a76b8592aa88385744dee3f8b4f3873b969ed900a2646970667358221220932b4cc2154ccec4616d89112ce04b3b90ddcbb34334a0d10301ed7e6b99bda964736f6c6343000814003367be87c3ff9960ca1e9cfac5cab2ff4747269cf9ed20c9b7306235ac35a491c5",
507
+ "deployedBytecode": "0x608060405234801561001057600080fd5b50600436106101215760003560e01c8063893d20e8116100ad578063b68d180911610071578063b68d1809146103ee578063b88da75914610403578063cde749f414610416578063cf7a1d771461041e578063fb2cb1011461043157600080fd5b8063893d20e814610354578063946dfcfe1461035c578063a3f4df7e14610383578063a745e3df146103ba578063b3c65015146103cd57600080fd5b80631eff4b22116100f45780631eff4b22146101a35780634d459c90146101d85780634f421333146102f15780635ab1bd5314610304578063644c45e01461032957600080fd5b806301ffc9a7146101265780630d8e6e2c146101685780630fec111c14610184578063138461e014610199575b600080fd5b6101536101343660046110af565b6001600160e01b03191660009081526020819052604090205460ff1690565b60405190151581526020015b60405180910390f35b610170610442565b60405162ffffff909116815260200161015f565b61018c6104cc565b60405161015f9190611126565b6101a1610685565b005b6101ca7f6548007c3f4340f82f348c576c0ff69f4f529cadd5ad41f96aae61abceeaa30081565b60405190815260200161015f565b6102946101e63660046111c5565b6040805160a08101825260008082526020820181905291810182905260608101829052608081019190915260008051602061149283398151915262ffffff92831660009081526020918252604090819020815160a0810183528154958616815263010000009095046001600160a01b03908116938601939093526001015491821690840152600160a01b810464ffffffffff166060840152600160c81b900463ffffffff1660808301525090565b60408051825162ffffff1681526020808401516001600160a01b039081169183019190915283830151169181019190915260608083015164ffffffffff169082015260809182015163ffffffff169181019190915260a00161015f565b6101536102ff3660046111c5565b6108a7565b6001546001600160a01b03165b6040516001600160a01b03909116815260200161015f565b600154600160a01b90046001600160601b03166040516001600160601b03909116815260200161015f565b61031161095a565b7f4f61291a8ac3d020d0a7d919a76b8592aa88385744dee3f8b4f3873b969ed901546101ca565b6103ad6040518060400160405280600b81526020016a546573745365727669636560a81b81525081565b60405161015f91906111e2565b6101a16103c8366004611220565b610a73565b6103d5610bd0565b60405167ffffffffffffffff909116815260200161015f565b606e5b60405160ff909116815260200161015f565b6101706104113660046112f6565b610bf2565b6103f1610c43565b6101a161042c366004611220565b610cc6565b6002546001600160a01b0316610311565b604051632efe011360e01b815260036004820152600060248201819052604482018190529073__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__90632efe011390606401602060405180830381865af41580156104a3573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906104c7919061130f565b905090565b6040805160e08101825260008082526020820181905291810182905260608082018390526080820183905260a0820183905260c0820152907f6548007c3f4340f82f348c576c0ff69f4f529cadd5ad41f96aae61abceeaa3006040805160808101825282546001600160601b038116825260ff600160601b820481166020840152600160681b909104161515918101919091526001820180549192916060840191906105779061132c565b80601f01602080910402602001604051908101604052809291908181526020018280546105a39061132c565b80156105f05780601f106105c5576101008083540402835291602001916105f0565b820191906000526020600020905b8154815290600101906020018083116105d357829003601f168201915b50505050508152505090506040518060e0016040528061060e600090565b6001600160601b0316815260200182600001516001600160601b03168152602001826020015160ff168152602001826040015115158152602001306001600160a01b031681526020016106696002546001600160a01b031690565b6001600160a01b03168152602001826060015181525091505090565b6001546040516330b8415f60e01b8152600160a01b9091046001600160601b0316600482015273__$6facc32ab6029a5f5de2a1d5e55ea9da0e$__906330b8415f90602401602060405180830381865af41580156106e7573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061070b9190611366565b15610752576001546040516316322c0f60e31b81526001600160a01b0382166004820152600160a01b9091046001600160601b031660248201526044015b60405180910390fd5b6001546001600160a01b031661077b5760405163cf29926160e01b815260040160405180910390fd5b60015460405163c3c5a54760e01b81523060048201819052916001600160a01b03169063c3c5a54790602401602060405180830381865afa1580156107c4573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906107e89190611366565b610810576040516372657a5160e01b81526001600160a01b0382166004820152602401610749565b600154604051636939560f60e11b81526001600160a01b0383811660048301529091169063d272ac1e90602401602060405180830381865afa15801561085a573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061087e9190611388565b600160146101000a8154816001600160601b0302191690836001600160601b0316021790555050565b60008060008051602061149283398151915262ffffff84166000908152602091909152604090819020600101549051631bbffab160e21b8152600160c81b90910463ffffffff16600482015273__$5f476116ae21c5294e0c0761c07efa7e1c$__90636effeac490602401602060405180830381865af415801561092f573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061095391906113b1565b1192915050565b6001546040516330b8415f60e01b8152600160a01b9091046001600160601b0316600482015260009073__$6facc32ab6029a5f5de2a1d5e55ea9da0e$__906330b8415f90602401602060405180830381865af41580156109bf573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906109e39190611366565b15610a6357600154604051631c5da14d60e11b8152600160a01b82046001600160601b031660048201526001600160a01b03909116906338bb429a90602401602060405180830381865afa158015610a3f573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906104c791906113ca565b506002546001600160a01b031690565b73__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__63a123b37c610a95610442565b6040516001600160e01b031960e084901b16815262ffffff9091166004820152602401602060405180830381865af4158015610ad5573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610af991906113e7565b6000805160206114728339815191528054600160401b900460ff1680610b2d5750805467ffffffffffffffff808416911610155b15610b4b5760405163f92ee8a960e01b815260040160405180910390fd5b805468ffffffffffffffffff191667ffffffffffffffff831617600160401b178155610b778585610dd1565b610b8083611072565b805460ff60401b1916815560405167ffffffffffffffff831681527fc7f505b2f371ae2175ee4913f4499e1f2633a7b5936321eed1cdaeb6115181d2906020015b60405180910390a15050505050565b60006104c76000805160206114728339815191525467ffffffffffffffff1690565b60006000805160206114928339815191526001018281548110610c1757610c17611411565b90600052602060002090600a91828204019190066003029054906101000a900462ffffff169050919050565b6000610c4d610442565b60405163c9e66e2960e01b815262ffffff909116600482015273__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__9063c9e66e2990602401602060405180830381865af4158015610ca2573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906104c79190611427565b6000805160206114728339815191528054600160401b810460ff16159067ffffffffffffffff16600081158015610cfa5750825b905060008267ffffffffffffffff166001148015610d175750303b155b905081158015610d25575080155b15610d435760405163f92ee8a960e01b815260040160405180910390fd5b845467ffffffffffffffff191660011785558315610d6d57845460ff60401b1916600160401b1785555b610d778888610dd1565b610d818787611072565b8315610dc757845460ff60401b19168555604051600181527fc7f505b2f371ae2175ee4913f4499e1f2633a7b5936321eed1cdaeb6115181d29060200160405180910390a15b5050505050505050565b610dd9611076565b6000805160206114928339815191526000610e0a6000805160206114728339815191525467ffffffffffffffff1690565b90506000610e16610442565b90508167ffffffffffffffff16600103610e445760028301805462ffffff191662ffffff8316179055610e92565b600283015462ffffff90811690821611610e925760405162461bcd60e51b815260206004820152600f60248201526e24a72b20a624a2102b22a929a4a7a760891b6044820152606401610749565b6001808401805491820181556000908152602090819020600a808404909101805462ffffff808716600394909606939093026101000a858102930219169190911790556040805160a0810182529283526001600160a01b038089168484015287168382015280516356db0c1960e11b81529051606084019273__$d53880c81dc91c20799140d711e5ab8718$__9263adb6183292600480830193928290030181865af4158015610f46573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610f6a919061144a565b64ffffffffff1681526020014363ffffffff90811690915262ffffff8084166000908152602087815260409182902085518154928701516001600160a01b039081166301000000026001600160b81b0319909416919095161791909117815584820151600190910180546060870151608090970151909516600160c81b0263ffffffff60c81b1964ffffffffff909716600160a01b026001600160c81b031990961692909416919091179390931793909316179055517fad0a0fc10465a8dd9da3ad5f43e1a7fff4b4578551c76f0ae8deb844f0d0bf6890610bc19083908890889062ffffff9390931683526001600160a01b03918216602084015216604082015260600190565b6101215b60008051602061147283398151915254600160401b900460ff166110ad57604051631afcd79f60e31b815260040160405180910390fd5b565b6000602082840312156110c157600080fd5b81356001600160e01b0319811681146110d957600080fd5b9392505050565b6000815180845260005b81811015611106576020818501810151868301820152016110ea565b506000602082860101526020601f19601f83011685010191505092915050565b6020815260006001600160601b038084511660208401528060208501511660408401525060ff604084015116606083015260608301511515608083015260018060a01b0360808401511660a083015260a083015161118f60c08401826001600160a01b03169052565b5060c083015160e0808401526111a96101008401826110e0565b949350505050565b62ffffff811681146111c257600080fd5b50565b6000602082840312156111d757600080fd5b81356110d9816111b1565b6020815260006110d960208301846110e0565b6001600160a01b03811681146111c257600080fd5b634e487b7160e01b600052604160045260246000fd5b60008060006060848603121561123557600080fd5b8335611240816111f5565b92506020840135611250816111f5565b9150604084013567ffffffffffffffff8082111561126d57600080fd5b818601915086601f83011261128157600080fd5b8135818111156112935761129361120a565b604051601f8201601f19908116603f011681019083821181831017156112bb576112bb61120a565b816040528281528960208487010111156112d457600080fd5b8260208601602083013760006020848301015280955050505050509250925092565b60006020828403121561130857600080fd5b5035919050565b60006020828403121561132157600080fd5b81516110d9816111b1565b600181811c9082168061134057607f821691505b60208210810361136057634e487b7160e01b600052602260045260246000fd5b50919050565b60006020828403121561137857600080fd5b815180151581146110d957600080fd5b60006020828403121561139a57600080fd5b81516001600160601b03811681146110d957600080fd5b6000602082840312156113c357600080fd5b5051919050565b6000602082840312156113dc57600080fd5b81516110d9816111f5565b6000602082840312156113f957600080fd5b815167ffffffffffffffff811681146110d957600080fd5b634e487b7160e01b600052603260045260246000fd5b60006020828403121561143957600080fd5b815160ff811681146110d957600080fd5b60006020828403121561145c57600080fd5b815164ffffffffff811681146110d957600080fdfef0c57e16840df040f15088dc2f81fe391c3923bec73e23a9662efc9c229c6a004f61291a8ac3d020d0a7d919a76b8592aa88385744dee3f8b4f3873b969ed900a2646970667358221220932b4cc2154ccec4616d89112ce04b3b90ddcbb34334a0d10301ed7e6b99bda964736f6c63430008140033",
500
508
  "linkReferences": {
501
509
  "contracts/types/Blocknumber.sol": {
502
510
  "BlocknumberLib": [
503
511
  {
504
512
  "length": 20,
505
- "start": 4367
513
+ "start": 4592
506
514
  }
507
515
  ]
508
516
  },
@@ -510,11 +518,19 @@
510
518
  "NftIdLib": [
511
519
  {
512
520
  "length": 20,
513
- "start": 3783
521
+ "start": 4008
514
522
  },
515
523
  {
516
524
  "length": 20,
517
- "start": 4511
525
+ "start": 4736
526
+ }
527
+ ]
528
+ },
529
+ "contracts/types/Timestamp.sol": {
530
+ "TimestampLib": [
531
+ {
532
+ "length": 20,
533
+ "start": 6151
518
534
  }
519
535
  ]
520
536
  },
@@ -522,23 +538,23 @@
522
538
  "VersionLib": [
523
539
  {
524
540
  "length": 20,
525
- "start": 555
541
+ "start": 532
526
542
  },
527
543
  {
528
544
  "length": 20,
529
- "start": 905
545
+ "start": 1042
530
546
  },
531
547
  {
532
548
  "length": 20,
533
- "start": 3258
549
+ "start": 3428
534
550
  },
535
551
  {
536
552
  "length": 20,
537
- "start": 4751
553
+ "start": 4976
538
554
  },
539
555
  {
540
556
  "length": 20,
541
- "start": 5250
557
+ "start": 5475
542
558
  }
543
559
  ]
544
560
  }
@@ -548,7 +564,7 @@
548
564
  "BlocknumberLib": [
549
565
  {
550
566
  "length": 20,
551
- "start": 2243
567
+ "start": 2293
552
568
  }
553
569
  ]
554
570
  },
@@ -556,11 +572,19 @@
556
572
  "NftIdLib": [
557
573
  {
558
574
  "length": 20,
559
- "start": 1659
575
+ "start": 1709
560
576
  },
561
577
  {
562
578
  "length": 20,
563
- "start": 2387
579
+ "start": 2437
580
+ }
581
+ ]
582
+ },
583
+ "contracts/types/Timestamp.sol": {
584
+ "TimestampLib": [
585
+ {
586
+ "length": 20,
587
+ "start": 3852
564
588
  }
565
589
  ]
566
590
  },
@@ -568,15 +592,15 @@
568
592
  "VersionLib": [
569
593
  {
570
594
  "length": 20,
571
- "start": 1134
595
+ "start": 1129
572
596
  },
573
597
  {
574
598
  "length": 20,
575
- "start": 2627
599
+ "start": 2677
576
600
  },
577
601
  {
578
602
  "length": 20,
579
- "start": 3126
603
+ "start": 3176
580
604
  }
581
605
  ]
582
606
  }
package/artifacts/contracts/test/TestToken.sol/TestUsdc.dbg.json CHANGED
@@ -1,4 +1,4 @@
1
1
  {
2
2
  "_format": "hh-sol-dbg-1",
3
- "buildInfo": "../../../build-info/7ef3f843d4f3052b7e234c5370f71305.json"
3
+ "buildInfo": "../../../build-info/604f4891f44cb775b0a7bb52490d32f8.json"
4
4
  }
package/artifacts/contracts/test/TestVersion.sol/TestVersion.dbg.json CHANGED
@@ -1,4 +1,4 @@
1
1
  {
2
2
  "_format": "hh-sol-dbg-1",
3
- "buildInfo": "../../../build-info/7ef3f843d4f3052b7e234c5370f71305.json"
3
+ "buildInfo": "../../../build-info/604f4891f44cb775b0a7bb52490d32f8.json"
4
4
  }
package/artifacts/contracts/test/TestVersion.sol/TestVersion.json CHANGED
@@ -161,8 +161,8 @@
161
161
  "type": "function"
162
162
  }
163
163
  ],
164
- "bytecode": "0x608060405234801561001057600080fd5b50610544806100206000396000f3fe608060405234801561001057600080fd5b506004361061007d5760003560e01c80636a3dc0ee1161005b5780636a3dc0ee146100ed57806389818c3c1461011057806389d5976814610135578063e038c6251461014857600080fd5b80630f40f5951461008257806312cf04de146100a357806364d4e5d8146100b6575b600080fd5b61008a61015b565b60405162ffffff90911681526020015b60405180910390f35b61008a6100b13660046103ce565b6101cf565b6100c96100c436600461040e565b61025c565b6040805160ff9485168152928416602084015292169181019190915260600161009a565b6101006100fb36600461042b565b6102e8565b604051901515815260200161009a565b61012361011e366004610464565b6102fd565b60405160ff909116815260200161009a565b61010061014336600461042b565b61037d565b61012361015636600461040e565b61038f565b600073__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__6304b8f6c56040518163ffffffff1660e01b8152600401602060405180830381865af41580156101a6573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101ca919061047d565b905090565b604051632efe011360e01b815260048101849052602481018390526044810182905260009073__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__90632efe011390606401602060405180830381865af4158015610230573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610254919061047d565b949350505050565b6040516324d3888d60e11b815262ffffff821660048201526000908190819073__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__906349a7111a90602401606060405180830381865af41580156102b7573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906102db91906104b0565b9250925092509193909250565b600062ffffff808316908416115b9392505050565b604051632392b61b60e21b815260ff8216600482015260009073__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__90638e4ad86c906024015b602060405180830381865af4158015610353573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061037791906104f3565b92915050565b600062ffffff808416908316146102f6565b60405163c9e66e2960e01b815262ffffff8216600482015260009073__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__9063c9e66e2990602401610336565b6000806000606084860312156103e357600080fd5b505081359360208301359350604090920135919050565b62ffffff8116811461040b57600080fd5b50565b60006020828403121561042057600080fd5b81356102f6816103fa565b6000806040838503121561043e57600080fd5b8235610449816103fa565b91506020830135610459816103fa565b809150509250929050565b60006020828403121561047657600080fd5b5035919050565b60006020828403121561048f57600080fd5b81516102f6816103fa565b805160ff811681146104ab57600080fd5b919050565b6000806000606084860312156104c557600080fd5b6104ce8461049a565b92506104dc6020850161049a565b91506104ea6040850161049a565b90509250925092565b60006020828403121561050557600080fd5b6102f68261049a56fea264697066735822122080f150de8b61ad3f87c071a3e90af61131794db3f3d57c03e041374b81317b1564736f6c63430008140033",
165
- "deployedBytecode": "0x608060405234801561001057600080fd5b506004361061007d5760003560e01c80636a3dc0ee1161005b5780636a3dc0ee146100ed57806389818c3c1461011057806389d5976814610135578063e038c6251461014857600080fd5b80630f40f5951461008257806312cf04de146100a357806364d4e5d8146100b6575b600080fd5b61008a61015b565b60405162ffffff90911681526020015b60405180910390f35b61008a6100b13660046103ce565b6101cf565b6100c96100c436600461040e565b61025c565b6040805160ff9485168152928416602084015292169181019190915260600161009a565b6101006100fb36600461042b565b6102e8565b604051901515815260200161009a565b61012361011e366004610464565b6102fd565b60405160ff909116815260200161009a565b61010061014336600461042b565b61037d565b61012361015636600461040e565b61038f565b600073__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__6304b8f6c56040518163ffffffff1660e01b8152600401602060405180830381865af41580156101a6573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101ca919061047d565b905090565b604051632efe011360e01b815260048101849052602481018390526044810182905260009073__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__90632efe011390606401602060405180830381865af4158015610230573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610254919061047d565b949350505050565b6040516324d3888d60e11b815262ffffff821660048201526000908190819073__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__906349a7111a90602401606060405180830381865af41580156102b7573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906102db91906104b0565b9250925092509193909250565b600062ffffff808316908416115b9392505050565b604051632392b61b60e21b815260ff8216600482015260009073__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__90638e4ad86c906024015b602060405180830381865af4158015610353573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061037791906104f3565b92915050565b600062ffffff808416908316146102f6565b60405163c9e66e2960e01b815262ffffff8216600482015260009073__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__9063c9e66e2990602401610336565b6000806000606084860312156103e357600080fd5b505081359360208301359350604090920135919050565b62ffffff8116811461040b57600080fd5b50565b60006020828403121561042057600080fd5b81356102f6816103fa565b6000806040838503121561043e57600080fd5b8235610449816103fa565b91506020830135610459816103fa565b809150509250929050565b60006020828403121561047657600080fd5b5035919050565b60006020828403121561048f57600080fd5b81516102f6816103fa565b805160ff811681146104ab57600080fd5b919050565b6000806000606084860312156104c557600080fd5b6104ce8461049a565b92506104dc6020850161049a565b91506104ea6040850161049a565b90509250925092565b60006020828403121561050557600080fd5b6102f68261049a56fea264697066735822122080f150de8b61ad3f87c071a3e90af61131794db3f3d57c03e041374b81317b1564736f6c63430008140033",
164
+ "bytecode": "0x608060405234801561001057600080fd5b50610544806100206000396000f3fe608060405234801561001057600080fd5b506004361061007d5760003560e01c80636a3dc0ee1161005b5780636a3dc0ee146100ed57806389818c3c1461011057806389d5976814610135578063e038c6251461014857600080fd5b80630f40f5951461008257806312cf04de146100a357806364d4e5d8146100b6575b600080fd5b61008a61015b565b60405162ffffff90911681526020015b60405180910390f35b61008a6100b13660046103ce565b6101cf565b6100c96100c436600461040e565b61025c565b6040805160ff9485168152928416602084015292169181019190915260600161009a565b6101006100fb36600461042b565b6102e8565b604051901515815260200161009a565b61012361011e366004610464565b6102fd565b60405160ff909116815260200161009a565b61010061014336600461042b565b61037d565b61012361015636600461040e565b61038f565b600073__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__6304b8f6c56040518163ffffffff1660e01b8152600401602060405180830381865af41580156101a6573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101ca919061047d565b905090565b604051632efe011360e01b815260048101849052602481018390526044810182905260009073__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__90632efe011390606401602060405180830381865af4158015610230573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610254919061047d565b949350505050565b6040516324d3888d60e11b815262ffffff821660048201526000908190819073__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__906349a7111a90602401606060405180830381865af41580156102b7573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906102db91906104b0565b9250925092509193909250565b600062ffffff808316908416115b9392505050565b604051632392b61b60e21b815260ff8216600482015260009073__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__90638e4ad86c906024015b602060405180830381865af4158015610353573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061037791906104f3565b92915050565b600062ffffff808416908316146102f6565b60405163c9e66e2960e01b815262ffffff8216600482015260009073__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__9063c9e66e2990602401610336565b6000806000606084860312156103e357600080fd5b505081359360208301359350604090920135919050565b62ffffff8116811461040b57600080fd5b50565b60006020828403121561042057600080fd5b81356102f6816103fa565b6000806040838503121561043e57600080fd5b8235610449816103fa565b91506020830135610459816103fa565b809150509250929050565b60006020828403121561047657600080fd5b5035919050565b60006020828403121561048f57600080fd5b81516102f6816103fa565b805160ff811681146104ab57600080fd5b919050565b6000806000606084860312156104c557600080fd5b6104ce8461049a565b92506104dc6020850161049a565b91506104ea6040850161049a565b90509250925092565b60006020828403121561050557600080fd5b6102f68261049a56fea26469706673582212206e529886c2f8439684af8bc60c7d7762a41afcce6ceef512fc94376b5fe8009e64736f6c63430008140033",
165
+ "deployedBytecode": "0x608060405234801561001057600080fd5b506004361061007d5760003560e01c80636a3dc0ee1161005b5780636a3dc0ee146100ed57806389818c3c1461011057806389d5976814610135578063e038c6251461014857600080fd5b80630f40f5951461008257806312cf04de146100a357806364d4e5d8146100b6575b600080fd5b61008a61015b565b60405162ffffff90911681526020015b60405180910390f35b61008a6100b13660046103ce565b6101cf565b6100c96100c436600461040e565b61025c565b6040805160ff9485168152928416602084015292169181019190915260600161009a565b6101006100fb36600461042b565b6102e8565b604051901515815260200161009a565b61012361011e366004610464565b6102fd565b60405160ff909116815260200161009a565b61010061014336600461042b565b61037d565b61012361015636600461040e565b61038f565b600073__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__6304b8f6c56040518163ffffffff1660e01b8152600401602060405180830381865af41580156101a6573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101ca919061047d565b905090565b604051632efe011360e01b815260048101849052602481018390526044810182905260009073__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__90632efe011390606401602060405180830381865af4158015610230573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610254919061047d565b949350505050565b6040516324d3888d60e11b815262ffffff821660048201526000908190819073__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__906349a7111a90602401606060405180830381865af41580156102b7573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906102db91906104b0565b9250925092509193909250565b600062ffffff808316908416115b9392505050565b604051632392b61b60e21b815260ff8216600482015260009073__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__90638e4ad86c906024015b602060405180830381865af4158015610353573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061037791906104f3565b92915050565b600062ffffff808416908316146102f6565b60405163c9e66e2960e01b815262ffffff8216600482015260009073__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__9063c9e66e2990602401610336565b6000806000606084860312156103e357600080fd5b505081359360208301359350604090920135919050565b62ffffff8116811461040b57600080fd5b50565b60006020828403121561042057600080fd5b81356102f6816103fa565b6000806040838503121561043e57600080fd5b8235610449816103fa565b91506020830135610459816103fa565b809150509250929050565b60006020828403121561047657600080fd5b5035919050565b60006020828403121561048f57600080fd5b81516102f6816103fa565b805160ff811681146104ab57600080fd5b919050565b6000806000606084860312156104c557600080fd5b6104ce8461049a565b92506104dc6020850161049a565b91506104ea6040850161049a565b90509250925092565b60006020828403121561050557600080fd5b6102f68261049a56fea26469706673582212206e529886c2f8439684af8bc60c7d7762a41afcce6ceef512fc94376b5fe8009e64736f6c63430008140033",
166
166
  "linkReferences": {
167
167
  "contracts/types/Version.sol": {
168
168
  "VersionLib": [
package/artifacts/contracts/test/TestVersionable.sol/TestVersionable.dbg.json CHANGED
@@ -1,4 +1,4 @@
1
1
  {
2
2
  "_format": "hh-sol-dbg-1",
3
- "buildInfo": "../../../build-info/7ef3f843d4f3052b7e234c5370f71305.json"
3
+ "buildInfo": "../../../build-info/604f4891f44cb775b0a7bb52490d32f8.json"
4
4
  }