@etherisc/gif-next 0.0.2-de0a1d3-009 → 0.0.2-e1e92ab-754

Sign up to get free protection for your applications and to get access to all the features.
Files changed (263) hide show
  1. package/README.md +51 -25
  2. package/artifacts/contracts/components/BaseComponent.sol/BaseComponent.dbg.json +1 -1
  3. package/artifacts/contracts/components/BaseComponent.sol/BaseComponent.json +166 -39
  4. package/artifacts/contracts/components/Distribution.sol/Distribution.dbg.json +1 -1
  5. package/artifacts/contracts/components/Distribution.sol/Distribution.json +212 -60
  6. package/artifacts/contracts/components/IBaseComponent.sol/IBaseComponent.dbg.json +1 -1
  7. package/artifacts/contracts/components/IBaseComponent.sol/IBaseComponent.json +119 -39
  8. package/artifacts/contracts/components/IDistributionComponent.sol/IDistributionComponent.dbg.json +1 -1
  9. package/artifacts/contracts/components/IDistributionComponent.sol/IDistributionComponent.json +0 -163
  10. package/artifacts/contracts/components/IPoolComponent.sol/IPoolComponent.dbg.json +1 -1
  11. package/artifacts/contracts/components/IPoolComponent.sol/IPoolComponent.json +6 -185
  12. package/artifacts/contracts/components/IProductComponent.sol/IProductComponent.dbg.json +1 -1
  13. package/artifacts/contracts/components/IProductComponent.sol/IProductComponent.json +0 -163
  14. package/artifacts/contracts/components/Pool.sol/Pool.dbg.json +1 -1
  15. package/artifacts/contracts/components/Pool.sol/Pool.json +257 -119
  16. package/artifacts/contracts/components/Product.sol/Product.dbg.json +1 -1
  17. package/artifacts/contracts/components/Product.sol/Product.json +220 -50
  18. package/artifacts/contracts/experiment/errors/Require.sol/Require.dbg.json +1 -1
  19. package/artifacts/contracts/experiment/errors/Revert.sol/Revert.dbg.json +1 -1
  20. package/artifacts/contracts/experiment/inheritance/A.sol/A.dbg.json +1 -1
  21. package/artifacts/contracts/experiment/inheritance/A.sol/AShared.dbg.json +1 -1
  22. package/artifacts/contracts/experiment/inheritance/B.sol/B.dbg.json +1 -1
  23. package/artifacts/contracts/experiment/inheritance/C.sol/C.dbg.json +1 -1
  24. package/artifacts/contracts/experiment/inheritance/IA.sol/IA.dbg.json +1 -1
  25. package/artifacts/contracts/experiment/inheritance/IA.sol/ISharedA.dbg.json +1 -1
  26. package/artifacts/contracts/experiment/inheritance/IB.sol/IB.dbg.json +1 -1
  27. package/artifacts/contracts/experiment/inheritance/IC.sol/IC.dbg.json +1 -1
  28. package/artifacts/contracts/experiment/statemachine/Dummy.sol/LifeCycleModule.dbg.json +1 -1
  29. package/artifacts/contracts/experiment/statemachine/ISM.sol/ISM.dbg.json +1 -1
  30. package/artifacts/contracts/experiment/statemachine/ISM.sol/ISMEE.dbg.json +1 -1
  31. package/artifacts/contracts/experiment/statemachine/SM.sol/SM.dbg.json +1 -1
  32. package/artifacts/contracts/experiment/statemachine/SimpleStateMachine.sol/SimpleStateMachine.dbg.json +1 -1
  33. package/artifacts/contracts/experiment/types/TypeA.sol/TypeALib.dbg.json +1 -1
  34. package/artifacts/contracts/experiment/types/TypeB.sol/TypeBLib.dbg.json +1 -1
  35. package/artifacts/contracts/instance/IInstance.sol/IInstance.dbg.json +1 -1
  36. package/artifacts/contracts/instance/IInstance.sol/IInstance.json +247 -355
  37. package/artifacts/contracts/instance/IInstanceLinked.sol/IInstanceLinked.dbg.json +1 -1
  38. package/artifacts/contracts/instance/Instance.sol/Instance.dbg.json +1 -1
  39. package/artifacts/contracts/instance/Instance.sol/Instance.json +369 -507
  40. package/artifacts/contracts/instance/base/ComponentServiceBase.sol/ComponentServiceBase.dbg.json +1 -1
  41. package/artifacts/contracts/instance/base/ComponentServiceBase.sol/ComponentServiceBase.json +144 -50
  42. package/artifacts/contracts/instance/base/IInstanceBase.sol/IInstanceBase.dbg.json +1 -1
  43. package/artifacts/contracts/instance/base/IInstanceBase.sol/IInstanceBase.json +1 -1
  44. package/artifacts/contracts/instance/base/IKeyValueStore.sol/IKeyValueStore.dbg.json +1 -1
  45. package/artifacts/contracts/instance/base/ILifecycle.sol/ILifecycle.dbg.json +1 -1
  46. package/artifacts/contracts/instance/base/IService.sol/IService.dbg.json +1 -1
  47. package/artifacts/contracts/instance/base/IService.sol/IService.json +120 -40
  48. package/artifacts/contracts/instance/base/InstanceBase.sol/InstanceBase.dbg.json +1 -1
  49. package/artifacts/contracts/instance/base/InstanceBase.sol/InstanceBase.json +147 -66
  50. package/artifacts/contracts/instance/base/KeyValueStore.sol/KeyValueStore.dbg.json +1 -1
  51. package/artifacts/contracts/instance/base/Lifecycle.sol/Lifecycle.dbg.json +1 -1
  52. package/artifacts/contracts/instance/base/ModuleBase.sol/ModuleBase.dbg.json +1 -1
  53. package/artifacts/contracts/instance/base/ServiceBase.sol/ServiceBase.dbg.json +1 -1
  54. package/artifacts/contracts/instance/base/ServiceBase.sol/ServiceBase.json +140 -59
  55. package/artifacts/contracts/instance/module/bundle/BundleModule.sol/BundleModule.dbg.json +1 -1
  56. package/artifacts/contracts/instance/module/bundle/IBundle.sol/IBundle.dbg.json +1 -1
  57. package/artifacts/contracts/instance/module/bundle/IBundle.sol/IBundleModule.dbg.json +1 -1
  58. package/artifacts/contracts/instance/module/component/ComponentModule.sol/ComponentModule.dbg.json +1 -1
  59. package/artifacts/contracts/instance/module/component/IComponent.sol/IComponent.dbg.json +1 -1
  60. package/artifacts/contracts/instance/module/component/IComponent.sol/IComponentModule.dbg.json +1 -1
  61. package/artifacts/contracts/instance/module/distribution/DistributionModule.sol/DistributionModule.dbg.json +1 -1
  62. package/artifacts/contracts/instance/module/distribution/DistributionModule.sol/DistributionModule.json +2 -2
  63. package/artifacts/contracts/instance/module/distribution/IDistribution.sol/IDistribution.dbg.json +1 -1
  64. package/artifacts/contracts/instance/module/distribution/IDistribution.sol/IDistributionModule.dbg.json +1 -1
  65. package/artifacts/contracts/instance/module/policy/IPolicy.sol/IPolicy.dbg.json +1 -1
  66. package/artifacts/contracts/instance/module/policy/IPolicy.sol/IPolicyModule.dbg.json +1 -1
  67. package/artifacts/contracts/instance/module/policy/IPolicy.sol/IPolicyModule.json +0 -13
  68. package/artifacts/contracts/instance/module/policy/PolicyModule.sol/PolicyModule.dbg.json +1 -1
  69. package/artifacts/contracts/instance/module/policy/PolicyModule.sol/PolicyModule.json +0 -13
  70. package/artifacts/contracts/instance/module/pool/IPoolModule.sol/IPool.dbg.json +1 -1
  71. package/artifacts/contracts/instance/module/pool/IPoolModule.sol/IPoolModule.dbg.json +1 -1
  72. package/artifacts/contracts/instance/module/pool/IPoolModule.sol/IPoolModule.json +29 -9
  73. package/artifacts/contracts/instance/module/pool/PoolModule.sol/PoolModule.dbg.json +1 -1
  74. package/artifacts/contracts/instance/module/pool/PoolModule.sol/PoolModule.json +28 -8
  75. package/artifacts/contracts/instance/module/risk/IRisk.sol/IRisk.dbg.json +1 -1
  76. package/artifacts/contracts/instance/module/risk/IRisk.sol/IRiskModule.dbg.json +1 -1
  77. package/artifacts/contracts/instance/module/risk/RiskModule.sol/RiskModule.dbg.json +1 -1
  78. package/artifacts/contracts/instance/module/risk/RiskModule.sol/RiskModule.json +2 -2
  79. package/artifacts/contracts/instance/module/treasury/ITreasury.sol/ITreasury.dbg.json +1 -1
  80. package/artifacts/contracts/instance/module/treasury/ITreasury.sol/ITreasuryModule.dbg.json +1 -1
  81. package/artifacts/contracts/instance/module/treasury/ITreasury.sol/ITreasuryModule.json +138 -11
  82. package/artifacts/contracts/instance/module/treasury/TokenHandler.sol/TokenHandler.dbg.json +1 -1
  83. package/artifacts/contracts/instance/module/treasury/TokenHandler.sol/TokenHandler.json +2 -2
  84. package/artifacts/contracts/instance/module/treasury/TreasuryModule.sol/TreasuryModule.dbg.json +1 -1
  85. package/artifacts/contracts/instance/module/treasury/TreasuryModule.sol/TreasuryModule.json +138 -11
  86. package/artifacts/contracts/instance/service/ComponentOwnerService.sol/ComponentOwnerService.dbg.json +1 -1
  87. package/artifacts/contracts/instance/service/ComponentOwnerService.sol/ComponentOwnerService.json +288 -79
  88. package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.dbg.json +1 -1
  89. package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.json +188 -65
  90. package/artifacts/contracts/instance/service/IComponentOwnerService.sol/IComponentOwnerService.dbg.json +1 -1
  91. package/artifacts/contracts/instance/service/IComponentOwnerService.sol/IComponentOwnerService.json +122 -61
  92. package/artifacts/contracts/instance/service/IDistributionService.sol/IDistributionService.dbg.json +1 -1
  93. package/artifacts/contracts/instance/service/IDistributionService.sol/IDistributionService.json +120 -40
  94. package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.dbg.json +1 -1
  95. package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.json +120 -40
  96. package/artifacts/contracts/instance/service/IProductService.sol/IProductService.dbg.json +1 -1
  97. package/artifacts/contracts/instance/service/IProductService.sol/IProductService.json +120 -40
  98. package/artifacts/contracts/instance/service/PoolService.sol/PoolService.dbg.json +1 -1
  99. package/artifacts/contracts/instance/service/PoolService.sol/PoolService.json +190 -67
  100. package/artifacts/contracts/instance/service/ProductService.sol/ProductService.dbg.json +1 -1
  101. package/artifacts/contracts/instance/service/ProductService.sol/ProductService.json +220 -97
  102. package/artifacts/contracts/registry/ChainNft.sol/ChainNft.dbg.json +1 -1
  103. package/artifacts/contracts/registry/ChainNft.sol/ChainNft.json +141 -12
  104. package/artifacts/contracts/registry/IChainNft.sol/IChainNft.dbg.json +1 -1
  105. package/artifacts/contracts/registry/IChainNft.sol/IChainNft.json +5 -0
  106. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.dbg.json +1 -1
  107. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.json +190 -51
  108. package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.dbg.json +4 -0
  109. package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.json +872 -0
  110. package/artifacts/contracts/registry/ITransferInterceptor.sol/ITransferInterceptor.dbg.json +4 -0
  111. package/artifacts/contracts/registry/ITransferInterceptor.sol/ITransferInterceptor.json +34 -0
  112. package/artifacts/contracts/registry/Registry.sol/Registry.dbg.json +1 -1
  113. package/artifacts/contracts/registry/Registry.sol/Registry.json +380 -139
  114. package/artifacts/contracts/registry/RegistryService.sol/RegistryService.dbg.json +4 -0
  115. package/artifacts/contracts/registry/RegistryService.sol/RegistryService.json +1245 -0
  116. package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.dbg.json +4 -0
  117. package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.json +490 -0
  118. package/artifacts/contracts/shared/ContractDeployerLib.sol/ContractDeployerLib.dbg.json +4 -0
  119. package/artifacts/contracts/shared/ContractDeployerLib.sol/ContractDeployerLib.json +107 -0
  120. package/artifacts/contracts/shared/ERC165.sol/ERC165.dbg.json +1 -1
  121. package/artifacts/contracts/shared/ERC165.sol/ERC165.json +2 -2
  122. package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.dbg.json +4 -0
  123. package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.json +127 -0
  124. package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.dbg.json +1 -1
  125. package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.json +117 -37
  126. package/artifacts/contracts/shared/IVersionable.sol/IVersionable.dbg.json +1 -1
  127. package/artifacts/contracts/shared/IVersionable.sol/IVersionable.json +2 -2
  128. package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.dbg.json +4 -0
  129. package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.json +158 -0
  130. package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.dbg.json +4 -0
  131. package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.json +349 -0
  132. package/artifacts/contracts/shared/Registerable.sol/Registerable.dbg.json +1 -1
  133. package/artifacts/contracts/shared/Registerable.sol/Registerable.json +190 -37
  134. package/artifacts/contracts/shared/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.dbg.json +4 -0
  135. package/artifacts/contracts/shared/{Proxy.sol/ProxyWithProxyAdminGetter.json → UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.json} +4 -4
  136. package/artifacts/contracts/shared/Versionable.sol/Versionable.dbg.json +1 -1
  137. package/artifacts/contracts/shared/Versionable.sol/Versionable.json +4 -27
  138. package/artifacts/contracts/test/TestDistribution.sol/TestDistribution.dbg.json +1 -1
  139. package/artifacts/contracts/test/TestDistribution.sol/TestDistribution.json +212 -60
  140. package/artifacts/contracts/test/TestFee.sol/TestFee.dbg.json +1 -1
  141. package/artifacts/contracts/test/TestFee.sol/TestFee.json +4 -4
  142. package/artifacts/contracts/test/TestPool.sol/TestPool.dbg.json +1 -1
  143. package/artifacts/contracts/test/TestPool.sol/TestPool.json +257 -119
  144. package/artifacts/contracts/test/TestProduct.sol/TestProduct.dbg.json +1 -1
  145. package/artifacts/contracts/test/TestProduct.sol/TestProduct.json +225 -56
  146. package/artifacts/contracts/test/TestRegisterable.sol/TestRegisterable.dbg.json +1 -1
  147. package/artifacts/contracts/test/TestRegisterable.sol/TestRegisterable.json +204 -36
  148. package/artifacts/contracts/test/TestRoleId.sol/TestRoleId.dbg.json +1 -1
  149. package/artifacts/contracts/test/TestRoleId.sol/TestRoleId.json +2 -2
  150. package/artifacts/contracts/test/TestService.sol/TestService.dbg.json +1 -1
  151. package/artifacts/contracts/test/TestService.sol/TestService.json +187 -69
  152. package/artifacts/contracts/test/TestToken.sol/TestUsdc.dbg.json +1 -1
  153. package/artifacts/contracts/test/TestToken.sol/TestUsdc.json +91 -53
  154. package/artifacts/contracts/test/TestVersion.sol/TestVersion.dbg.json +1 -1
  155. package/artifacts/contracts/test/TestVersion.sol/TestVersion.json +2 -2
  156. package/artifacts/contracts/test/TestVersionable.sol/TestVersionable.dbg.json +1 -1
  157. package/artifacts/contracts/test/TestVersionable.sol/TestVersionable.json +15 -38
  158. package/artifacts/contracts/test/Usdc.sol/USDC.dbg.json +1 -1
  159. package/artifacts/contracts/test/Usdc.sol/USDC.json +91 -53
  160. package/artifacts/contracts/types/AddressSet.sol/LibAddressSet.dbg.json +1 -1
  161. package/artifacts/contracts/types/Blocknumber.sol/BlocknumberLib.dbg.json +1 -1
  162. package/artifacts/contracts/types/ChainId.sol/ChainIdLib.dbg.json +1 -1
  163. package/artifacts/contracts/types/Fee.sol/FeeLib.dbg.json +1 -1
  164. package/artifacts/contracts/types/Fee.sol/FeeLib.json +4 -4
  165. package/artifacts/contracts/types/Key32.sol/Key32Lib.dbg.json +1 -1
  166. package/artifacts/contracts/types/NftId.sol/NftIdLib.dbg.json +1 -1
  167. package/artifacts/contracts/types/NftIdSet.sol/LibNftIdSet.dbg.json +1 -1
  168. package/artifacts/contracts/types/ObjectType.sol/ObjectTypeLib.dbg.json +1 -1
  169. package/artifacts/contracts/types/ReferralId.sol/ReferralIdLib.dbg.json +1 -1
  170. package/artifacts/contracts/types/RiskId.sol/RiskIdLib.dbg.json +1 -1
  171. package/artifacts/contracts/types/RoleId.sol/RoleIdLib.dbg.json +1 -1
  172. package/artifacts/contracts/types/RoleId.sol/RoleIdLib.json +2 -2
  173. package/artifacts/contracts/types/StateId.sol/StateIdLib.dbg.json +1 -1
  174. package/artifacts/contracts/types/Timestamp.sol/TimestampLib.dbg.json +1 -1
  175. package/artifacts/contracts/types/UFixed.sol/MathLib.dbg.json +4 -0
  176. package/artifacts/contracts/types/UFixed.sol/MathLib.json +10 -0
  177. package/artifacts/contracts/types/UFixed.sol/UFixedLib.dbg.json +4 -0
  178. package/artifacts/contracts/types/UFixed.sol/{UFixedMathLib.json → UFixedLib.json} +3 -3
  179. package/artifacts/contracts/types/Version.sol/VersionLib.dbg.json +1 -1
  180. package/artifacts/contracts/types/Version.sol/VersionLib.json +2 -2
  181. package/artifacts/contracts/types/Version.sol/VersionPartLib.dbg.json +1 -1
  182. package/artifacts/contracts/types/Version.sol/VersionPartLib.json +2 -2
  183. package/contracts/components/BaseComponent.sol +11 -26
  184. package/contracts/components/Distribution.sol +29 -6
  185. package/contracts/components/IBaseComponent.sol +1 -1
  186. package/contracts/components/IDistributionComponent.sol +1 -2
  187. package/contracts/components/IPoolComponent.sol +3 -10
  188. package/contracts/components/IProductComponent.sol +2 -3
  189. package/contracts/components/Pool.sol +84 -73
  190. package/contracts/components/Product.sol +85 -13
  191. package/contracts/instance/IInstance.sol +6 -7
  192. package/contracts/instance/Instance.sol +18 -9
  193. package/contracts/instance/base/ComponentServiceBase.sol +13 -6
  194. package/contracts/instance/base/IInstanceBase.sol +3 -2
  195. package/contracts/instance/base/InstanceBase.sol +6 -8
  196. package/contracts/instance/base/ServiceBase.sol +20 -13
  197. package/contracts/instance/module/component/ComponentModule.sol +4 -3
  198. package/contracts/instance/module/component/IComponent.sol +1 -1
  199. package/contracts/instance/module/policy/IPolicy.sol +1 -1
  200. package/contracts/instance/module/pool/IPoolModule.sol +4 -3
  201. package/contracts/instance/module/pool/PoolModule.sol +12 -7
  202. package/contracts/instance/module/treasury/ITreasury.sol +6 -4
  203. package/contracts/instance/module/treasury/TokenHandler.sol +1 -1
  204. package/contracts/instance/module/treasury/TreasuryModule.sol +23 -30
  205. package/contracts/instance/service/ComponentOwnerService.sol +224 -66
  206. package/contracts/instance/service/DistributionService.sol +6 -11
  207. package/contracts/instance/service/IComponentOwnerService.sol +0 -2
  208. package/contracts/instance/service/PoolService.sol +19 -19
  209. package/contracts/instance/service/ProductService.sol +27 -26
  210. package/contracts/registry/ChainNft.sol +42 -14
  211. package/contracts/registry/IChainNft.sol +2 -1
  212. package/contracts/registry/IRegistry.sol +27 -27
  213. package/contracts/registry/IRegistryService.sol +35 -0
  214. package/contracts/registry/ITransferInterceptor.sol +6 -0
  215. package/contracts/registry/Registry.sol +312 -267
  216. package/contracts/registry/RegistryService.sol +441 -0
  217. package/contracts/registry/RegistryServiceManager.sol +63 -0
  218. package/contracts/shared/ContractDeployerLib.sol +72 -0
  219. package/contracts/shared/INftOwnable.sol +22 -0
  220. package/contracts/shared/IRegisterable.sol +8 -15
  221. package/contracts/shared/IVersionable.sol +40 -9
  222. package/contracts/shared/NftOwnable.sol +136 -0
  223. package/contracts/shared/ProxyManager.sol +94 -0
  224. package/contracts/shared/Registerable.sol +62 -59
  225. package/contracts/shared/UpgradableProxyWithAdmin.sol +16 -0
  226. package/contracts/shared/Versionable.sol +109 -61
  227. package/contracts/test/TestDistribution.sol +3 -2
  228. package/contracts/test/TestFee.sol +2 -2
  229. package/contracts/test/TestPool.sol +4 -2
  230. package/contracts/test/TestProduct.sol +4 -2
  231. package/contracts/test/TestRegisterable.sol +5 -6
  232. package/contracts/test/TestService.sol +5 -11
  233. package/contracts/types/Fee.sol +3 -3
  234. package/contracts/types/RoleId.sol +7 -0
  235. package/contracts/types/UFixed.sol +128 -12
  236. package/contracts/types/Version.sol +1 -0
  237. package/package.json +4 -3
  238. package/artifacts/contracts/instance/module/access/Access.sol/AccessModule.dbg.json +0 -4
  239. package/artifacts/contracts/instance/module/access/Access.sol/AccessModule.json +0 -333
  240. package/artifacts/contracts/instance/module/access/IAccess.sol/IAccess.dbg.json +0 -4
  241. package/artifacts/contracts/instance/module/access/IAccess.sol/IAccess.json +0 -10
  242. package/artifacts/contracts/instance/module/access/IAccess.sol/IAccessModule.dbg.json +0 -4
  243. package/artifacts/contracts/instance/module/access/IAccess.sol/IAccessModule.json +0 -333
  244. package/artifacts/contracts/registry/IRegistryLinked.sol/IRegistryLinked.dbg.json +0 -4
  245. package/artifacts/contracts/registry/IRegistryLinked.sol/IRegistryLinked.json +0 -24
  246. package/artifacts/contracts/registry/RegistryUpgradeable.sol/RegistryUpgradeable.dbg.json +0 -4
  247. package/artifacts/contracts/registry/RegistryUpgradeable.sol/RegistryUpgradeable.json +0 -724
  248. package/artifacts/contracts/shared/IOwnable.sol/IOwnable.dbg.json +0 -4
  249. package/artifacts/contracts/shared/IOwnable.sol/IOwnable.json +0 -24
  250. package/artifacts/contracts/shared/Proxy.sol/ProxyDeployer.dbg.json +0 -4
  251. package/artifacts/contracts/shared/Proxy.sol/ProxyDeployer.json +0 -248
  252. package/artifacts/contracts/shared/Proxy.sol/ProxyWithProxyAdminGetter.dbg.json +0 -4
  253. package/artifacts/contracts/shared/VersionableUpgradeable.sol/VersionableUpgradeable.dbg.json +0 -4
  254. package/artifacts/contracts/shared/VersionableUpgradeable.sol/VersionableUpgradeable.json +0 -228
  255. package/artifacts/contracts/types/UFixed.sol/UFixedMathLib.dbg.json +0 -4
  256. package/contracts/experiment/statemachine/README.md +0 -112
  257. package/contracts/instance/module/access/Access.sol +0 -149
  258. package/contracts/instance/module/access/IAccess.sol +0 -53
  259. package/contracts/registry/IRegistryLinked.sol +0 -8
  260. package/contracts/registry/RegistryUpgradeable.sol +0 -473
  261. package/contracts/shared/IOwnable.sol +0 -6
  262. package/contracts/shared/Proxy.sol +0 -94
  263. package/contracts/shared/VersionableUpgradeable.sol +0 -133
@@ -20,6 +20,11 @@
20
20
  "name": "token",
21
21
  "type": "address"
22
22
  },
23
+ {
24
+ "internalType": "bool",
25
+ "name": "isInterceptor",
26
+ "type": "bool"
27
+ },
23
28
  {
24
29
  "internalType": "bool",
25
30
  "name": "verifying",
@@ -80,11 +85,120 @@
80
85
  "internalType": "struct Fee",
81
86
  "name": "performanceFee",
82
87
  "type": "tuple"
88
+ },
89
+ {
90
+ "internalType": "address",
91
+ "name": "initialOwner",
92
+ "type": "address"
83
93
  }
84
94
  ],
85
95
  "stateMutability": "nonpayable",
86
96
  "type": "constructor"
87
97
  },
98
+ {
99
+ "inputs": [
100
+ {
101
+ "internalType": "address",
102
+ "name": "registry",
103
+ "type": "address"
104
+ },
105
+ {
106
+ "internalType": "NftId",
107
+ "name": "nftId",
108
+ "type": "uint96"
109
+ }
110
+ ],
111
+ "name": "ErrorAlreadyLinked",
112
+ "type": "error"
113
+ },
114
+ {
115
+ "inputs": [
116
+ {
117
+ "internalType": "address",
118
+ "name": "contractAddress",
119
+ "type": "address"
120
+ }
121
+ ],
122
+ "name": "ErrorContractNotRegistered",
123
+ "type": "error"
124
+ },
125
+ {
126
+ "inputs": [
127
+ {
128
+ "internalType": "address",
129
+ "name": "account",
130
+ "type": "address"
131
+ }
132
+ ],
133
+ "name": "ErrorNotOwner",
134
+ "type": "error"
135
+ },
136
+ {
137
+ "inputs": [
138
+ {
139
+ "internalType": "address",
140
+ "name": "registryAddress",
141
+ "type": "address"
142
+ }
143
+ ],
144
+ "name": "ErrorNotRegistry",
145
+ "type": "error"
146
+ },
147
+ {
148
+ "inputs": [
149
+ {
150
+ "internalType": "address",
151
+ "name": "registryAddress",
152
+ "type": "address"
153
+ }
154
+ ],
155
+ "name": "ErrorRegisterableNotRegistry",
156
+ "type": "error"
157
+ },
158
+ {
159
+ "inputs": [],
160
+ "name": "ErrorRegistryAddressZero",
161
+ "type": "error"
162
+ },
163
+ {
164
+ "inputs": [
165
+ {
166
+ "internalType": "address",
167
+ "name": "registry",
168
+ "type": "address"
169
+ }
170
+ ],
171
+ "name": "ErrorRegistryAlreadyInitialized",
172
+ "type": "error"
173
+ },
174
+ {
175
+ "inputs": [],
176
+ "name": "ErrorRegistryNotInitialized",
177
+ "type": "error"
178
+ },
179
+ {
180
+ "inputs": [],
181
+ "name": "InvalidInitialization",
182
+ "type": "error"
183
+ },
184
+ {
185
+ "inputs": [],
186
+ "name": "NotInitializing",
187
+ "type": "error"
188
+ },
189
+ {
190
+ "anonymous": false,
191
+ "inputs": [
192
+ {
193
+ "indexed": false,
194
+ "internalType": "uint64",
195
+ "name": "version",
196
+ "type": "uint64"
197
+ }
198
+ ],
199
+ "name": "Initialized",
200
+ "type": "event"
201
+ },
88
202
  {
89
203
  "anonymous": false,
90
204
  "inputs": [
@@ -110,6 +224,19 @@
110
224
  "name": "LogUnderwrittenByPool",
111
225
  "type": "event"
112
226
  },
227
+ {
228
+ "inputs": [],
229
+ "name": "REGISTERABLE_LOCATION_V1",
230
+ "outputs": [
231
+ {
232
+ "internalType": "bytes32",
233
+ "name": "",
234
+ "type": "bytes32"
235
+ }
236
+ ],
237
+ "stateMutability": "view",
238
+ "type": "function"
239
+ },
113
240
  {
114
241
  "inputs": [
115
242
  {
@@ -171,73 +298,42 @@
171
298
  },
172
299
  {
173
300
  "inputs": [],
174
- "name": "getData",
175
- "outputs": [
176
- {
177
- "internalType": "bytes",
178
- "name": "data",
179
- "type": "bytes"
180
- }
181
- ],
182
- "stateMutability": "view",
183
- "type": "function"
184
- },
185
- {
186
- "inputs": [],
187
- "name": "getInstance",
188
- "outputs": [
189
- {
190
- "internalType": "contract IInstance",
191
- "name": "instance",
192
- "type": "address"
193
- }
194
- ],
195
- "stateMutability": "view",
196
- "type": "function"
197
- },
198
- {
199
- "inputs": [],
200
- "name": "getNftId",
201
- "outputs": [
202
- {
203
- "internalType": "NftId",
204
- "name": "nftId",
205
- "type": "uint96"
206
- }
207
- ],
208
- "stateMutability": "view",
209
- "type": "function"
210
- },
211
- {
212
- "inputs": [],
213
- "name": "getOwner",
301
+ "name": "getFees",
214
302
  "outputs": [
215
303
  {
216
- "internalType": "address",
217
- "name": "owner",
218
- "type": "address"
219
- }
220
- ],
221
- "stateMutability": "view",
222
- "type": "function"
223
- },
224
- {
225
- "inputs": [],
226
- "name": "getParentNftId",
227
- "outputs": [
304
+ "components": [
305
+ {
306
+ "internalType": "UFixed",
307
+ "name": "fractionalFee",
308
+ "type": "uint256"
309
+ },
310
+ {
311
+ "internalType": "uint256",
312
+ "name": "fixedFee",
313
+ "type": "uint256"
314
+ }
315
+ ],
316
+ "internalType": "struct Fee",
317
+ "name": "",
318
+ "type": "tuple"
319
+ },
228
320
  {
229
- "internalType": "NftId",
230
- "name": "nftId",
231
- "type": "uint96"
232
- }
233
- ],
234
- "stateMutability": "view",
235
- "type": "function"
236
- },
237
- {
238
- "inputs": [],
239
- "name": "getPerformanceFee",
240
- "outputs": [
321
+ "components": [
322
+ {
323
+ "internalType": "UFixed",
324
+ "name": "fractionalFee",
325
+ "type": "uint256"
326
+ },
327
+ {
328
+ "internalType": "uint256",
329
+ "name": "fixedFee",
330
+ "type": "uint256"
331
+ }
332
+ ],
333
+ "internalType": "struct Fee",
334
+ "name": "",
335
+ "type": "tuple"
336
+ },
241
337
  {
242
338
  "components": [
243
339
  {
@@ -252,7 +348,7 @@
252
348
  }
253
349
  ],
254
350
  "internalType": "struct Fee",
255
- "name": "performanceFee",
351
+ "name": "",
256
352
  "type": "tuple"
257
353
  }
258
354
  ],
@@ -261,24 +357,54 @@
261
357
  },
262
358
  {
263
359
  "inputs": [],
264
- "name": "getPoolFee",
360
+ "name": "getInitialInfo",
265
361
  "outputs": [
266
362
  {
267
363
  "components": [
268
364
  {
269
- "internalType": "UFixed",
270
- "name": "fractionalFee",
271
- "type": "uint256"
365
+ "internalType": "NftId",
366
+ "name": "nftId",
367
+ "type": "uint96"
272
368
  },
273
369
  {
274
- "internalType": "uint256",
275
- "name": "fixedFee",
276
- "type": "uint256"
370
+ "internalType": "NftId",
371
+ "name": "parentNftId",
372
+ "type": "uint96"
373
+ },
374
+ {
375
+ "internalType": "ObjectType",
376
+ "name": "objectType",
377
+ "type": "uint8"
378
+ },
379
+ {
380
+ "internalType": "bool",
381
+ "name": "isInterceptor",
382
+ "type": "bool"
383
+ },
384
+ {
385
+ "internalType": "address",
386
+ "name": "objectAddress",
387
+ "type": "address"
388
+ },
389
+ {
390
+ "internalType": "address",
391
+ "name": "initialOwner",
392
+ "type": "address"
393
+ },
394
+ {
395
+ "internalType": "bytes",
396
+ "name": "data",
397
+ "type": "bytes"
277
398
  }
278
399
  ],
279
- "internalType": "struct Fee",
280
- "name": "poolFee",
400
+ "internalType": "struct IRegistry.ObjectInfo",
401
+ "name": "",
281
402
  "type": "tuple"
403
+ },
404
+ {
405
+ "internalType": "bytes",
406
+ "name": "",
407
+ "type": "bytes"
282
408
  }
283
409
  ],
284
410
  "stateMutability": "view",
@@ -286,11 +412,11 @@
286
412
  },
287
413
  {
288
414
  "inputs": [],
289
- "name": "getRegistry",
415
+ "name": "getInstance",
290
416
  "outputs": [
291
417
  {
292
- "internalType": "contract IRegistry",
293
- "name": "registry",
418
+ "internalType": "contract IInstance",
419
+ "name": "instance",
294
420
  "type": "address"
295
421
  }
296
422
  ],
@@ -299,24 +425,12 @@
299
425
  },
300
426
  {
301
427
  "inputs": [],
302
- "name": "getStakingFee",
428
+ "name": "getNftId",
303
429
  "outputs": [
304
430
  {
305
- "components": [
306
- {
307
- "internalType": "UFixed",
308
- "name": "fractionalFee",
309
- "type": "uint256"
310
- },
311
- {
312
- "internalType": "uint256",
313
- "name": "fixedFee",
314
- "type": "uint256"
315
- }
316
- ],
317
- "internalType": "struct Fee",
318
- "name": "stakingFee",
319
- "type": "tuple"
431
+ "internalType": "NftId",
432
+ "name": "",
433
+ "type": "uint96"
320
434
  }
321
435
  ],
322
436
  "stateMutability": "view",
@@ -324,11 +438,11 @@
324
438
  },
325
439
  {
326
440
  "inputs": [],
327
- "name": "getToken",
441
+ "name": "getOwner",
328
442
  "outputs": [
329
443
  {
330
- "internalType": "contract IERC20Metadata",
331
- "name": "token",
444
+ "internalType": "address",
445
+ "name": "",
332
446
  "type": "address"
333
447
  }
334
448
  ],
@@ -337,15 +451,28 @@
337
451
  },
338
452
  {
339
453
  "inputs": [],
340
- "name": "getType",
454
+ "name": "getRegistry",
341
455
  "outputs": [
342
456
  {
343
- "internalType": "ObjectType",
457
+ "internalType": "contract IRegistry",
344
458
  "name": "",
345
- "type": "uint8"
459
+ "type": "address"
346
460
  }
347
461
  ],
348
- "stateMutability": "pure",
462
+ "stateMutability": "view",
463
+ "type": "function"
464
+ },
465
+ {
466
+ "inputs": [],
467
+ "name": "getToken",
468
+ "outputs": [
469
+ {
470
+ "internalType": "contract IERC20Metadata",
471
+ "name": "token",
472
+ "type": "address"
473
+ }
474
+ ],
475
+ "stateMutability": "view",
349
476
  "type": "function"
350
477
  },
351
478
  {
@@ -374,6 +501,13 @@
374
501
  "stateMutability": "view",
375
502
  "type": "function"
376
503
  },
504
+ {
505
+ "inputs": [],
506
+ "name": "linkToRegisteredNftId",
507
+ "outputs": [],
508
+ "stateMutability": "nonpayable",
509
+ "type": "function"
510
+ },
377
511
  {
378
512
  "inputs": [],
379
513
  "name": "lock",
@@ -405,19 +539,6 @@
405
539
  "stateMutability": "view",
406
540
  "type": "function"
407
541
  },
408
- {
409
- "inputs": [],
410
- "name": "register",
411
- "outputs": [
412
- {
413
- "internalType": "NftId",
414
- "name": "componentId",
415
- "type": "uint96"
416
- }
417
- ],
418
- "stateMutability": "nonpayable",
419
- "type": "function"
420
- },
421
542
  {
422
543
  "inputs": [
423
544
  {
@@ -562,17 +683,34 @@
562
683
  "type": "function"
563
684
  }
564
685
  ],
565
- "bytecode": "0x60e06040523480156200001157600080fd5b50604051620020663803806200206683398101604081905262000034916200079e565b6301ffc9a760e01b60009081526020527f67be87c3ff9960ca1e9cfac5cab2ff4747269cf9ed20c9b7306235ac35a491c5805460ff1916600117905587878782826001600160a01b038216620000d15760405162461bcd60e51b815260206004820152601b60248201527f4552524f523a5247422d3031303a52454749535452595f5a45524f000000000060448201526064015b60405180910390fd5b6001600160a01b03821660808190526040516301ffc9a760e01b81526306ecd8ef60e01b60048201526301ffc9a790602401602060405180830381865afa15801562000121573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019062000147919062000845565b620001955760405162461bcd60e51b815260206004820152601a60248201527f4552524f523a5247422d3031313a4e4f545f52454749535452590000000000006044820152606401620000c8565b6001600160601b03811660a081905260805160405163e74d052f60e01b815260048101929092526001600160a01b03169063e74d052f90602401602060405180830381865afa158015620001ed573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019062000213919062000845565b6200026d5760405162461bcd60e51b815260206004820152602360248201527f4552524f523a5247422d3031323a504152454e545f4e4f545f5245474953544560448201526214915160ea1b6064820152608401620000c8565b3360c052631dfba64760e11b60009081526020527f95e5a2564f7af40498dc043c6da135e06324c5edb1f60c2bf4dcdf2da207fa45805460ff1916600117905550506080516040516305247a1760e51b81526001600160601b03841660048201526000916001600160a01b03169063a48f42e090602401600060405180830381865afa15801562000302573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526200032c9190810190620008f7565b6060810151600580546001600160a01b0319166001600160a01b0390921691821790556040516301ffc9a760e01b8152630de7806f60e41b6004820152919250906301ffc9a790602401602060405180830381865afa15801562000394573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190620003ba919062000845565b620003e25760405162461bcd60e51b81526020600482015260006024820152604401620000c8565b600560009054906101000a90046001600160a01b03166001600160a01b0316636fa298536040518163ffffffff1660e01b8152600401602060405180830381865afa15801562000436573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906200045c9190620009d1565b600180546001600160a01b039283166001600160a01b0319918216179091556003805482163017905560048054928516929091169190911781556005805460ff60a01b1916905560408051632bd182d360e01b8152815173__$a23651848365a6a5ca15f07b4331037f48$__93632bd182d39383820193909291908290030181865af4158015620004f1573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190620005179190620009f1565b80516006556020908101516007556008805460ff19168b151517905560098990558751600a5587810151600b558651600c5586810151600d558551600e5585810151600f5560055460408051636b9bf08b60e01b815290516001600160a01b039092169650636b9bf08b9550600480820195509293509091908290030181865afa158015620005aa573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190620005d09190620009d1565b601080546001600160a01b0319166001600160a01b0392831617905560055460408051634288121d60e01b815290519190921691634288121d9160048083019260209291908290030181865afa1580156200062f573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190620006559190620009d1565b601180546001600160a01b0319166001600160a01b03929092169190911790555062000a109650505050505050565b6001600160a01b03811681146200069a57600080fd5b50565b8051620006aa8162000684565b919050565b80516001600160601b0381168114620006aa57600080fd5b80518015158114620006aa57600080fd5b634e487b7160e01b600052604160045260246000fd5b60405160c081016001600160401b0381118282101715620007135762000713620006d8565b60405290565b604051601f8201601f191681016001600160401b0381118282101715620007445762000744620006d8565b604052919050565b6000604082840312156200075f57600080fd5b604080519081016001600160401b0381118282101715620007845762000784620006d8565b604052825181526020928301519281019290925250919050565b600080600080600080600080610160898b031215620007bc57600080fd5b8851620007c98162000684565b9750620007d960208a01620006af565b96506040890151620007eb8162000684565b9550620007fb60608a01620006c7565b945060808901519350620008138a60a08b016200074c565b9250620008248a60e08b016200074c565b9150620008368a6101208b016200074c565b90509295985092959890939650565b6000602082840312156200085857600080fd5b6200086382620006c7565b9392505050565b600082601f8301126200087c57600080fd5b81516001600160401b03811115620008985762000898620006d8565b6020620008ae601f8301601f1916820162000719565b8281528582848701011115620008c357600080fd5b60005b83811015620008e3578581018301518282018401528201620008c6565b506000928101909101919091529392505050565b6000602082840312156200090a57600080fd5b81516001600160401b03808211156200092257600080fd5b9083019060c082860312156200093757600080fd5b62000941620006ee565b6200094c83620006af565b81526200095c60208401620006af565b6020820152604083015160ff811681146200097657600080fd5b604082015262000989606084016200069d565b60608201526200099c608084016200069d565b608082015260a083015182811115620009b457600080fd5b620009c2878286016200086a565b60a08301525095945050505050565b600060208284031215620009e457600080fd5b8151620008638162000684565b60006040828403121562000a0457600080fd5b6200086383836200074c565b60805160a05160c05161160362000a636000396000610d120152600061021001526000818161026901528181610382015281816104180152818161093a01528181610c950152610d5501526116036000f3fe608060405234801561001057600080fd5b506004361061014d5760003560e01c8063636450f5116100c3578063893d20e81161007c578063893d20e8146102e3578063a69df4b5146102eb578063d7f5e609146102f3578063dab1232514610306578063de7b5d1414610319578063f83d08ba1461032a57600080fd5b8063636450f51461028d578063644c45e0146102a257806365effc1a146102aa5780636741fad2146102bd57806382678766146102c557806387ef9ba0146102d857600080fd5b8063235c360311610115578063235c3603146101f957806331b62a3b1461020e5780633bc5de30146102345780634b270a461461024e57806354afef63146102565780635ab1bd531461026757600080fd5b806301ffc9a714610152578063132996041461019457806315dae03e146101b95780631aa3a008146101c857806321df0da7146101e8575b600080fd5b61017f61016036600461100b565b6001600160e01b03191660009081526020819052604090205460ff1690565b60405190151581526020015b60405180910390f35b6003546001600160a01b03165b6040516001600160a01b03909116815260200161018b565b604051608c815260200161018b565b6101d0610337565b6040516001600160601b03909116815260200161018b565b6004546001600160a01b03166101a1565b61020161055c565b60405161018b919061103c565b7f00000000000000000000000000000000000000000000000000000000000000006101d0565b6040805160208101825260008152905161018b9190611099565b61020161070b565b60095460405190815260200161018b565b7f00000000000000000000000000000000000000000000000000000000000000006101a1565b6102a061029b366004611157565b6108ba565b005b6101d0610922565b6102a06102b836600461121a565b610989565b6102016109ff565b6102a06102d3366004611298565b610bae565b60085460ff1661017f565b6101a1610c73565b6102a0610dce565b6101d06103013660046112de565b610e60565b61017f610314366004611340565b610eea565b6005546001600160a01b03166101a1565b6102a0610ef3565b905090565b6000610341610c73565b6001600160a01b0316336001600160a01b0316146103805760405162461bcd60e51b815260206004820152600060248201526044015b60405180910390fd5b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03166103f65760405162461bcd60e51b815260206004820152601b60248201527f4552524f523a434f422d3030313a52454749535452595f5a45524f00000000006044820152606401610377565b60055460405163c3c5a54760e01b81526001600160a01b0391821660048201527f00000000000000000000000000000000000000000000000000000000000000009091169063c3c5a54790602401602060405180830381865afa158015610461573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061048591906113a4565b6104db5760405162461bcd60e51b815260206004820152602160248201527f4552524f523a434f423a494e5354414e43455f4e4f545f5245474953544552456044820152601160fa1b6064820152608401610377565b6005805460ff60a01b1916600160a01b179055600154604051632210724360e11b81523060048201526001600160a01b0390911690634420e486906024016020604051808303816000875af1158015610538573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061033291906113d6565b60408051808201909152600080825260208201526005546000906001600160a01b0316639ae31ff561058c610922565b6040516001600160e01b031960e084901b1681526001600160601b039091166004820152602401602060405180830381865afa1580156105d0573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906105f491906113d6565b60055460405163278b381b60e01b81526001600160601b03831660048201529192506001600160a01b03169063278b381b90602401602060405180830381865afa158015610646573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061066a91906113a4565b156106ef5760055460405163f2b246c360e01b81526001600160601b03831660048201526001600160a01b039091169063f2b246c3906024016101e060405180830381865afa1580156106c1573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906106e59190611443565b60e0015191505090565b505060408051808201909152600e548152600f54602082015290565b60408051808201909152600080825260208201526005546000906001600160a01b0316639ae31ff561073b610922565b6040516001600160e01b031960e084901b1681526001600160601b039091166004820152602401602060405180830381865afa15801561077f573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906107a391906113d6565b60055460405163278b381b60e01b81526001600160601b03831660048201529192506001600160a01b03169063278b381b90602401602060405180830381865afa1580156107f5573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061081991906113a4565b1561089e5760055460405163f2b246c360e01b81526001600160601b03831660048201526001600160a01b039091169063f2b246c3906024016101e060405180830381865afa158015610870573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906108949190611443565b60c0015191505090565b505060408051808201909152600c548152600d54602082015290565b60105460405163636450f560e01b81526001600160a01b039091169063636450f5906108ec9085908590600401611502565b600060405180830381600087803b15801561090657600080fd5b505af115801561091a573d6000803e3d6000fd5b505050505050565b604051636939560f60e11b81523060048201526000907f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03169063d272ac1e90602401602060405180830381865afa158015610538573d6000803e3d6000fd5b6011546001600160a01b031633146109ed5760405162461bcd60e51b815260206004820152602160248201527f4552524f523a504f4c2d3030323a4e4f545f50524f445543545f5345525649436044820152604560f81b6064820152608401610377565b6109f984848484610f5b565b50505050565b60408051808201909152600080825260208201526005546000906001600160a01b0316639ae31ff5610a2f610922565b6040516001600160e01b031960e084901b1681526001600160601b039091166004820152602401602060405180830381865afa158015610a73573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610a9791906113d6565b60055460405163278b381b60e01b81526001600160601b03831660048201529192506001600160a01b03169063278b381b90602401602060405180830381865afa158015610ae9573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610b0d91906113a4565b15610b925760055460405163f2b246c360e01b81526001600160601b03831660048201526001600160a01b039091169063f2b246c3906024016101e060405180830381865afa158015610b64573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610b889190611443565b60a0015191505090565b505060408051808201909152600a548152600b54602082015290565b610bb6610c73565b6001600160a01b0316336001600160a01b031614610be65760405162461bcd60e51b815260040161037790611529565b601054604051634133c3b360e11b8152845160048201526020808601516024830152845160448301528085015160648301528351608483015283015160a48201526001600160a01b039091169063826787669060c401600060405180830381600087803b158015610c5657600080fd5b505af1158015610c6a573d6000803e3d6000fd5b50505050505050565b604051636939560f60e11b815230600482015260009081906001600160a01b037f0000000000000000000000000000000000000000000000000000000000000000169063d272ac1e90602401602060405180830381865afa158015610cdc573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610d0091906113d6565b90506001600160601b038116610d37577f000000000000000000000000000000000000000000000000000000000000000091505090565b60405163df33330b60e01b81526001600160601b03821660048201527f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03169063df33330b90602401602060405180830381865afa158015610da4573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610dc89190611560565b91505090565b610dd6610c73565b6001600160a01b0316336001600160a01b031614610e065760405162461bcd60e51b815260040161037790611529565b600154604051630bdb124f60e21b81523060048201526001600160a01b0390911690632f6c493c906024015b600060405180830381600087803b158015610e4c57600080fd5b505af11580156109f9573d6000803e3d6000fd5b60105460405163e3458d5360e01b815260009133916001600160a01b039091169063e3458d5390610e9d9084908a908a908a908a9060040161157d565b6020604051808303816000875af1158015610ebc573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610ee091906113d6565b9695505050505050565b60015b92915050565b610efb610c73565b6001600160a01b0316336001600160a01b031614610f2b5760405162461bcd60e51b815260040161037790611529565b60015460405163f435f5a760e01b81523060048201526001600160a01b039091169063f435f5a790602401610e32565b610f658383610eea565b610fbd5760405162461bcd60e51b8152602060048201526024808201527f4552524f523a504f4c2d3032303a504f4c4943595f42554e444c455f4d49534d604482015263082a886960e31b6064820152608401610377565b604080516001600160601b038616815260208101839052308183015290517ffa749b7f8c958183586325608c5d122eb3a8beb56a4d6ac2c88b78193e9facb99181900360600190a150505050565b60006020828403121561101d57600080fd5b81356001600160e01b03198116811461103557600080fd5b9392505050565b815181526020808301519082015260408101610eed565b6000815180845260005b818110156110795760208185018101518683018201520161105d565b506000602082860101526020601f19601f83011685010191505092915050565b6020815260006110356020830184611053565b6001600160601b03811681146110c157600080fd5b50565b634e487b7160e01b600052604160045260246000fd5b6040805190810167ffffffffffffffff811182821017156110fd576110fd6110c4565b60405290565b604051610120810167ffffffffffffffff811182821017156110fd576110fd6110c4565b60006040828403121561113957600080fd5b6111416110da565b9050813581526020820135602082015292915050565b6000806060838503121561116a57600080fd5b8235611175816110ac565b91506111848460208501611127565b90509250929050565b600082601f83011261119e57600080fd5b813567ffffffffffffffff808211156111b9576111b96110c4565b604051601f8301601f19908116603f011681019082821181831017156111e1576111e16110c4565b816040528381528660208588010111156111fa57600080fd5b836020870160208301376000602085830101528094505050505092915050565b6000806000806080858703121561123057600080fd5b843561123b816110ac565b9350602085013567ffffffffffffffff8082111561125857600080fd5b6112648883890161118d565b9450604087013591508082111561127a57600080fd5b506112878782880161118d565b949793965093946060013593505050565b600080600060c084860312156112ad57600080fd5b6112b78585611127565b92506112c68560408601611127565b91506112d58560808601611127565b90509250925092565b60008060008060a085870312156112f457600080fd5b6112fe8686611127565b93506040850135925060608501359150608085013567ffffffffffffffff81111561132857600080fd5b6113348782880161118d565b91505092959194509250565b6000806040838503121561135357600080fd5b823567ffffffffffffffff8082111561136b57600080fd5b6113778683870161118d565b9350602085013591508082111561138d57600080fd5b5061139a8582860161118d565b9150509250929050565b6000602082840312156113b657600080fd5b8151801515811461103557600080fd5b80516113d1816110ac565b919050565b6000602082840312156113e857600080fd5b8151611035816110ac565b6001600160a01b03811681146110c157600080fd5b80516113d1816113f3565b60006040828403121561142557600080fd5b61142d6110da565b9050815181526020820151602082015292915050565b60006101e0828403121561145657600080fd5b61145e611103565b611467836113c6565b8152611475602084016113c6565b602082015261148660408401611408565b60408201526114988460608501611413565b60608201526114aa8460a08501611413565b60808201526114bc8460e08501611413565b60a08201526114cf846101208501611413565b60c08201526114e2846101608501611413565b60e08201526114f5846101a08501611413565b6101008201529392505050565b6001600160601b038316815260608101611035602083018480518252602090810151910152565b60208082526017908201527f4552524f523a5247422d3030313a4e4f545f4f574e4552000000000000000000604082015260600190565b60006020828403121561157257600080fd5b8151611035816113f3565b6001600160a01b03861681526115a0602082018680518252602090810151910152565b83606082015282608082015260c060a082015260006115c260c0830184611053565b97965050505050505056fea26469706673582212204da30cfbe907c1083130fedc37c1d60619822f2815f269729f28fac2dad1aa8864736f6c63430008140033",
566
- "deployedBytecode": "0x608060405234801561001057600080fd5b506004361061014d5760003560e01c8063636450f5116100c3578063893d20e81161007c578063893d20e8146102e3578063a69df4b5146102eb578063d7f5e609146102f3578063dab1232514610306578063de7b5d1414610319578063f83d08ba1461032a57600080fd5b8063636450f51461028d578063644c45e0146102a257806365effc1a146102aa5780636741fad2146102bd57806382678766146102c557806387ef9ba0146102d857600080fd5b8063235c360311610115578063235c3603146101f957806331b62a3b1461020e5780633bc5de30146102345780634b270a461461024e57806354afef63146102565780635ab1bd531461026757600080fd5b806301ffc9a714610152578063132996041461019457806315dae03e146101b95780631aa3a008146101c857806321df0da7146101e8575b600080fd5b61017f61016036600461100b565b6001600160e01b03191660009081526020819052604090205460ff1690565b60405190151581526020015b60405180910390f35b6003546001600160a01b03165b6040516001600160a01b03909116815260200161018b565b604051608c815260200161018b565b6101d0610337565b6040516001600160601b03909116815260200161018b565b6004546001600160a01b03166101a1565b61020161055c565b60405161018b919061103c565b7f00000000000000000000000000000000000000000000000000000000000000006101d0565b6040805160208101825260008152905161018b9190611099565b61020161070b565b60095460405190815260200161018b565b7f00000000000000000000000000000000000000000000000000000000000000006101a1565b6102a061029b366004611157565b6108ba565b005b6101d0610922565b6102a06102b836600461121a565b610989565b6102016109ff565b6102a06102d3366004611298565b610bae565b60085460ff1661017f565b6101a1610c73565b6102a0610dce565b6101d06103013660046112de565b610e60565b61017f610314366004611340565b610eea565b6005546001600160a01b03166101a1565b6102a0610ef3565b905090565b6000610341610c73565b6001600160a01b0316336001600160a01b0316146103805760405162461bcd60e51b815260206004820152600060248201526044015b60405180910390fd5b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03166103f65760405162461bcd60e51b815260206004820152601b60248201527f4552524f523a434f422d3030313a52454749535452595f5a45524f00000000006044820152606401610377565b60055460405163c3c5a54760e01b81526001600160a01b0391821660048201527f00000000000000000000000000000000000000000000000000000000000000009091169063c3c5a54790602401602060405180830381865afa158015610461573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061048591906113a4565b6104db5760405162461bcd60e51b815260206004820152602160248201527f4552524f523a434f423a494e5354414e43455f4e4f545f5245474953544552456044820152601160fa1b6064820152608401610377565b6005805460ff60a01b1916600160a01b179055600154604051632210724360e11b81523060048201526001600160a01b0390911690634420e486906024016020604051808303816000875af1158015610538573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061033291906113d6565b60408051808201909152600080825260208201526005546000906001600160a01b0316639ae31ff561058c610922565b6040516001600160e01b031960e084901b1681526001600160601b039091166004820152602401602060405180830381865afa1580156105d0573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906105f491906113d6565b60055460405163278b381b60e01b81526001600160601b03831660048201529192506001600160a01b03169063278b381b90602401602060405180830381865afa158015610646573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061066a91906113a4565b156106ef5760055460405163f2b246c360e01b81526001600160601b03831660048201526001600160a01b039091169063f2b246c3906024016101e060405180830381865afa1580156106c1573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906106e59190611443565b60e0015191505090565b505060408051808201909152600e548152600f54602082015290565b60408051808201909152600080825260208201526005546000906001600160a01b0316639ae31ff561073b610922565b6040516001600160e01b031960e084901b1681526001600160601b039091166004820152602401602060405180830381865afa15801561077f573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906107a391906113d6565b60055460405163278b381b60e01b81526001600160601b03831660048201529192506001600160a01b03169063278b381b90602401602060405180830381865afa1580156107f5573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061081991906113a4565b1561089e5760055460405163f2b246c360e01b81526001600160601b03831660048201526001600160a01b039091169063f2b246c3906024016101e060405180830381865afa158015610870573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906108949190611443565b60c0015191505090565b505060408051808201909152600c548152600d54602082015290565b60105460405163636450f560e01b81526001600160a01b039091169063636450f5906108ec9085908590600401611502565b600060405180830381600087803b15801561090657600080fd5b505af115801561091a573d6000803e3d6000fd5b505050505050565b604051636939560f60e11b81523060048201526000907f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03169063d272ac1e90602401602060405180830381865afa158015610538573d6000803e3d6000fd5b6011546001600160a01b031633146109ed5760405162461bcd60e51b815260206004820152602160248201527f4552524f523a504f4c2d3030323a4e4f545f50524f445543545f5345525649436044820152604560f81b6064820152608401610377565b6109f984848484610f5b565b50505050565b60408051808201909152600080825260208201526005546000906001600160a01b0316639ae31ff5610a2f610922565b6040516001600160e01b031960e084901b1681526001600160601b039091166004820152602401602060405180830381865afa158015610a73573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610a9791906113d6565b60055460405163278b381b60e01b81526001600160601b03831660048201529192506001600160a01b03169063278b381b90602401602060405180830381865afa158015610ae9573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610b0d91906113a4565b15610b925760055460405163f2b246c360e01b81526001600160601b03831660048201526001600160a01b039091169063f2b246c3906024016101e060405180830381865afa158015610b64573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610b889190611443565b60a0015191505090565b505060408051808201909152600a548152600b54602082015290565b610bb6610c73565b6001600160a01b0316336001600160a01b031614610be65760405162461bcd60e51b815260040161037790611529565b601054604051634133c3b360e11b8152845160048201526020808601516024830152845160448301528085015160648301528351608483015283015160a48201526001600160a01b039091169063826787669060c401600060405180830381600087803b158015610c5657600080fd5b505af1158015610c6a573d6000803e3d6000fd5b50505050505050565b604051636939560f60e11b815230600482015260009081906001600160a01b037f0000000000000000000000000000000000000000000000000000000000000000169063d272ac1e90602401602060405180830381865afa158015610cdc573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610d0091906113d6565b90506001600160601b038116610d37577f000000000000000000000000000000000000000000000000000000000000000091505090565b60405163df33330b60e01b81526001600160601b03821660048201527f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03169063df33330b90602401602060405180830381865afa158015610da4573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610dc89190611560565b91505090565b610dd6610c73565b6001600160a01b0316336001600160a01b031614610e065760405162461bcd60e51b815260040161037790611529565b600154604051630bdb124f60e21b81523060048201526001600160a01b0390911690632f6c493c906024015b600060405180830381600087803b158015610e4c57600080fd5b505af11580156109f9573d6000803e3d6000fd5b60105460405163e3458d5360e01b815260009133916001600160a01b039091169063e3458d5390610e9d9084908a908a908a908a9060040161157d565b6020604051808303816000875af1158015610ebc573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610ee091906113d6565b9695505050505050565b60015b92915050565b610efb610c73565b6001600160a01b0316336001600160a01b031614610f2b5760405162461bcd60e51b815260040161037790611529565b60015460405163f435f5a760e01b81523060048201526001600160a01b039091169063f435f5a790602401610e32565b610f658383610eea565b610fbd5760405162461bcd60e51b8152602060048201526024808201527f4552524f523a504f4c2d3032303a504f4c4943595f42554e444c455f4d49534d604482015263082a886960e31b6064820152608401610377565b604080516001600160601b038616815260208101839052308183015290517ffa749b7f8c958183586325608c5d122eb3a8beb56a4d6ac2c88b78193e9facb99181900360600190a150505050565b60006020828403121561101d57600080fd5b81356001600160e01b03198116811461103557600080fd5b9392505050565b815181526020808301519082015260408101610eed565b6000815180845260005b818110156110795760208185018101518683018201520161105d565b506000602082860101526020601f19601f83011685010191505092915050565b6020815260006110356020830184611053565b6001600160601b03811681146110c157600080fd5b50565b634e487b7160e01b600052604160045260246000fd5b6040805190810167ffffffffffffffff811182821017156110fd576110fd6110c4565b60405290565b604051610120810167ffffffffffffffff811182821017156110fd576110fd6110c4565b60006040828403121561113957600080fd5b6111416110da565b9050813581526020820135602082015292915050565b6000806060838503121561116a57600080fd5b8235611175816110ac565b91506111848460208501611127565b90509250929050565b600082601f83011261119e57600080fd5b813567ffffffffffffffff808211156111b9576111b96110c4565b604051601f8301601f19908116603f011681019082821181831017156111e1576111e16110c4565b816040528381528660208588010111156111fa57600080fd5b836020870160208301376000602085830101528094505050505092915050565b6000806000806080858703121561123057600080fd5b843561123b816110ac565b9350602085013567ffffffffffffffff8082111561125857600080fd5b6112648883890161118d565b9450604087013591508082111561127a57600080fd5b506112878782880161118d565b949793965093946060013593505050565b600080600060c084860312156112ad57600080fd5b6112b78585611127565b92506112c68560408601611127565b91506112d58560808601611127565b90509250925092565b60008060008060a085870312156112f457600080fd5b6112fe8686611127565b93506040850135925060608501359150608085013567ffffffffffffffff81111561132857600080fd5b6113348782880161118d565b91505092959194509250565b6000806040838503121561135357600080fd5b823567ffffffffffffffff8082111561136b57600080fd5b6113778683870161118d565b9350602085013591508082111561138d57600080fd5b5061139a8582860161118d565b9150509250929050565b6000602082840312156113b657600080fd5b8151801515811461103557600080fd5b80516113d1816110ac565b919050565b6000602082840312156113e857600080fd5b8151611035816110ac565b6001600160a01b03811681146110c157600080fd5b80516113d1816113f3565b60006040828403121561142557600080fd5b61142d6110da565b9050815181526020820151602082015292915050565b60006101e0828403121561145657600080fd5b61145e611103565b611467836113c6565b8152611475602084016113c6565b602082015261148660408401611408565b60408201526114988460608501611413565b60608201526114aa8460a08501611413565b60808201526114bc8460e08501611413565b60a08201526114cf846101208501611413565b60c08201526114e2846101608501611413565b60e08201526114f5846101a08501611413565b6101008201529392505050565b6001600160601b038316815260608101611035602083018480518252602090810151910152565b60208082526017908201527f4552524f523a5247422d3030313a4e4f545f4f574e4552000000000000000000604082015260600190565b60006020828403121561157257600080fd5b8151611035816113f3565b6001600160a01b03861681526115a0602082018680518252602090810151910152565b83606082015282608082015260c060a082015260006115c260c0830184611053565b97965050505050505056fea26469706673582212204da30cfbe907c1083130fedc37c1d60619822f2815f269729f28fac2dad1aa8864736f6c63430008140033",
686
+ "bytecode": "0x60806040523480156200001157600080fd5b50604051620020c1380380620020c1833981016040819052620000349162000817565b898989608c6301ffc9a760e01b60009081526020527f67be87c3ff9960ca1e9cfac5cab2ff4747269cf9ed20c9b7306235ac35a491c5805460ff191660011790558a85600280546001600160a01b03191633179055604080516020810190915260008152620000a887878686868662000495565b6000620000bd6001546001600160a01b031690565b6040516305247a1760e51b81526001600160601b03891660048201526001600160a01b03919091169063a48f42e090602401600060405180830381865afa1580156200010d573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f1916820160405262000137919081019062000988565b6080810151600780546001600160a01b0319166001600160a01b0390921691821790556040516301ffc9a760e01b8152630de7806f60e41b6004820152919250906301ffc9a790602401602060405180830381865afa1580156200019f573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190620001c5919062000a6e565b620001f15760405162461bcd60e51b815260206004820152600060248201526044015b60405180910390fd5b600760009054906101000a90046001600160a01b03166001600160a01b0316636fa298536040518163ffffffff1660e01b8152600401602060405180830381865afa15801562000245573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906200026b919062000a93565b600380546001600160a01b03199081166001600160a01b0393841617909155600580543090831617905560068054909116918816919091179055631b1599eb60e21b60009081526020527f82dc1aafdf8e16d475718790c9464a2912866acb395e292abd1ea37be80f5b28805460ff191660011790555050600780548d1515600160a01b0260ff60a01b198216811790925560088d90558b516009556020808d0151600a558b51600b558b810151600c558a51600d558a810151600e5560408051636b9bf08b60e01b815290516001600160a01b0394851694909316939093179850636b9bf08b9750600480840197509095509093509083900301905081865afa1580156200037e573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190620003a4919062000a93565b600f80546001600160a01b0319166001600160a01b0392831617905560075460408051634288121d60e01b815290519190921691634288121d9160048083019260209291908290030181865afa15801562000403573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019062000429919062000a93565b601080546001600160a01b0319166001600160a01b0392909216919091179055638165cf9760e01b60009081526020527fdbb0e9856bd1e431ccdf71c70f456d2f44178629ace27e773b679a35c573f774805460ff191660011790555050505050505050505062000c0e565b620004a1828762000566565b60007f6548007c3f4340f82f348c576c0ff69f4f529cadd5ad41f96aae61abceeaa30080546001600160601b0388166001600160681b0319909116176c0100000000000000000000000060ff8816021760ff60681b19166d01000000000000000000000000008615150217815590506001810162000520838262000b42565b506303fb044760e21b60009081526020527fb43e4f3791bfcdefa3a0fbe2a5555f8d6490b90e01de0ff40c66f18b49b562c5805460ff1916600117905550505050505050565b600280546001600160a01b0319166001600160a01b0384161790556200058c8162000590565b5050565b6001546001600160a01b031615620005cb5760015460405163fcdbf2d960e01b81526001600160a01b039091166004820152602401620001e8565b6001600160a01b038116620005f35760405163f5c4d07d60e01b815260040160405180910390fd5b806001600160a01b03163b6000036200062b5760405163fdeac91f60e01b81526001600160a01b0382166004820152602401620001e8565b600180546001600160a01b0319166001600160a01b0383169081179091556040516301ffc9a760e01b815263350fb35160e11b60048201526301ffc9a790602401602060405180830381865afa925050508015620006a8575060408051601f3d908101601f19168201909252620006a59181019062000a6e565b60015b620006d25760405163fdeac91f60e01b81526001600160a01b0382166004820152602401620001e8565b806200058c5760405163fdeac91f60e01b81526001600160a01b0383166004820152602401620001e8565b50565b6001600160a01b0381168114620006fd57600080fd5b8051620007238162000700565b919050565b80516001600160601b03811681146200072357600080fd5b805180151581146200072357600080fd5b634e487b7160e01b600052604160045260246000fd5b60405160e081016001600160401b03811182821017156200078c576200078c62000751565b60405290565b604051601f8201601f191681016001600160401b0381118282101715620007bd57620007bd62000751565b604052919050565b600060408284031215620007d857600080fd5b604080519081016001600160401b0381118282101715620007fd57620007fd62000751565b604052825181526020928301519281019290925250919050565b6000806000806000806000806000806101a08b8d0312156200083857600080fd5b8a51620008458162000700565b99506200085560208c0162000728565b985060408b0151620008678162000700565b97506200087760608c0162000740565b96506200088760808c0162000740565b955060a08b015194506200089f8c60c08d01620007c5565b9350620008b18c6101008d01620007c5565b9250620008c38c6101408d01620007c5565b91506101808b0151620008d68162000700565b809150509295989b9194979a5092959850565b805160ff811681146200072357600080fd5b600082601f8301126200090d57600080fd5b81516001600160401b0381111562000929576200092962000751565b60206200093f601f8301601f1916820162000792565b82815285828487010111156200095457600080fd5b60005b838110156200097457858101830151828201840152820162000957565b506000928101909101919091529392505050565b6000602082840312156200099b57600080fd5b81516001600160401b0380821115620009b357600080fd5b9083019060e08286031215620009c857600080fd5b620009d262000767565b620009dd8362000728565b8152620009ed6020840162000728565b602082015262000a0060408401620008e9565b604082015262000a136060840162000740565b606082015262000a266080840162000716565b608082015262000a3960a0840162000716565b60a082015260c08301518281111562000a5157600080fd5b62000a5f87828601620008fb565b60c08301525095945050505050565b60006020828403121562000a8157600080fd5b62000a8c8262000740565b9392505050565b60006020828403121562000aa657600080fd5b815162000a8c8162000700565b600181811c9082168062000ac857607f821691505b60208210810362000ae957634e487b7160e01b600052602260045260246000fd5b50919050565b601f82111562000b3d57600081815260208120601f850160051c8101602086101562000b185750805b601f850160051c820191505b8181101562000b395782815560010162000b24565b5050505b505050565b81516001600160401b0381111562000b5e5762000b5e62000751565b62000b768162000b6f845462000ab3565b8462000aef565b602080601f83116001811462000bae576000841562000b955750858301515b600019600386901b1c1916600185901b17855562000b39565b600085815260208120601f198616915b8281101562000bdf5788860151825594840194600190910190840162000bbe565b508582101562000bfe5787850151600019600388901b60f8161c191681555b5050505050600190811b01905550565b6114a38062000c1e6000396000f3fe608060405234801561001057600080fd5b506004361061012c5760003560e01c806365effc1a116100ad578063d7f5e60911610071578063d7f5e6091461029e578063dab12325146102b1578063db8d55f1146102c7578063de7b5d141461030d578063f83d08ba1461031e57600080fd5b806365effc1a14610256578063826787661461026957806387ef9ba01461027c578063893d20e81461028e578063a69df4b51461029657600080fd5b806321df0da7116100f457806321df0da7146101ed57806354afef63146101fe5780635ab1bd5314610206578063636450f514610217578063644c45e01461022a57600080fd5b806301ffc9a7146101315780630fec111c146101735780631329960414610189578063138461e0146101ae5780631eff4b22146101b8575b600080fd5b61015e61013f366004610dc9565b6001600160e01b03191660009081526020819052604090205460ff1690565b60405190151581526020015b60405180910390f35b61017b610326565b60405161016a929190610e40565b6005546001600160a01b03165b6040516001600160a01b03909116815260200161016a565b6101b66103dc565b005b6101df7f6548007c3f4340f82f348c576c0ff69f4f529cadd5ad41f96aae61abceeaa30081565b60405190815260200161016a565b6006546001600160a01b0316610196565b6008546101df565b6001546001600160a01b0316610196565b6101b6610225366004610f92565b6105fe565b600154600160a01b90046001600160601b03165b6040516001600160601b03909116815260200161016a565b6101b6610264366004611055565b610666565b6101b66102773660046110d3565b6106dc565b600754600160a01b900460ff1661015e565b6101966107b7565b6101b66108d5565b61023e6102ac366004611119565b610983565b61015e6102bf36600461117b565b600192915050565b6102cf610a0d565b60405161016a93929190835181526020938401518482015282516040820152918301516060830152805160808301529091015160a082015260c00190565b6007546001600160a01b0316610196565b6101b6610b78565b6040805160e08101825260008082526020820181905291810182905260608082018390526080820183905260a0820183905260c0820181905290918061036a610bf5565b604080518082018252600754600160a01b900460ff1615158152600854602080830191909152600554600654935195975093955086946103c39492936001600160a01b03938416931691600991600b91600d91016111df565b6040516020818303038152906040529350935050509091565b6001546040516330b8415f60e01b8152600160a01b9091046001600160601b0316600482015273__$6facc32ab6029a5f5de2a1d5e55ea9da0e$__906330b8415f90602401602060405180830381865af415801561043e573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610462919061124c565b156104a9576001546040516316322c0f60e31b81526001600160a01b0382166004820152600160a01b9091046001600160601b031660248201526044015b60405180910390fd5b6001546001600160a01b03166104d25760405163cf29926160e01b815260040160405180910390fd5b60015460405163c3c5a54760e01b81523060048201819052916001600160a01b03169063c3c5a54790602401602060405180830381865afa15801561051b573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061053f919061124c565b610567576040516372657a5160e01b81526001600160a01b03821660048201526024016104a0565b600154604051636939560f60e11b81526001600160a01b0383811660048301529091169063d272ac1e90602401602060405180830381865afa1580156105b1573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906105d5919061127e565b600160146101000a8154816001600160601b0302191690836001600160601b0316021790555050565b600f5460405163636450f560e01b81526001600160a01b039091169063636450f590610630908590859060040161129b565b600060405180830381600087803b15801561064a57600080fd5b505af115801561065e573d6000803e3d6000fd5b505050505050565b6010546001600160a01b031633146106ca5760405162461bcd60e51b815260206004820152602160248201527f4552524f523a504f4c2d3030323a4e4f545f50524f445543545f5345525649436044820152604560f81b60648201526084016104a0565b6106d684848484610d7b565b50505050565b60006106e66107b7565b90506001600160a01b038116158015906107095750336001600160a01b03821614155b156107295760405163700dd81160e01b81523360048201526024016104a0565b600f54604051634133c3b360e11b8152855160048201526020808701516024830152855160448301528086015160648301528451608483015284015160a48201526001600160a01b039091169063826787669060c401600060405180830381600087803b15801561079957600080fd5b505af11580156107ad573d6000803e3d6000fd5b5050505050505050565b6001546040516330b8415f60e01b8152600160a01b9091046001600160601b0316600482015260009073__$6facc32ab6029a5f5de2a1d5e55ea9da0e$__906330b8415f90602401602060405180830381865af415801561081c573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610840919061124c565b156108c557600154604051631c5da14d60e11b8152600160a01b82046001600160601b031660048201526001600160a01b03909116906338bb429a90602401602060405180830381865afa15801561089c573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906108c091906112d7565b905090565b506002546001600160a01b031690565b60006108df6107b7565b90506001600160a01b038116158015906109025750336001600160a01b03821614155b156109225760405163700dd81160e01b81523360048201526024016104a0565b600354604051630bdb124f60e21b81523060048201526001600160a01b0390911690632f6c493c906024015b600060405180830381600087803b15801561096857600080fd5b505af115801561097c573d6000803e3d6000fd5b5050505050565b600f5460405163e3458d5360e01b815260009133916001600160a01b039091169063e3458d53906109c09084908a908a908a908a906004016112f4565b6020604051808303816000875af11580156109df573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610a03919061127e565b9695505050505050565b6040805180820190915260008082526020820152604080518082019091526000808252602082015260408051808201909152600080825260208201526007546000906001600160a01b0316639ae31ff5610a776001546001600160601b03600160a01b9091041690565b6040516001600160e01b031960e084901b1681526001600160601b039091166004820152602401602060405180830381865afa158015610abb573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610adf919061127e565b60075460405163f2b246c360e01b81526001600160601b03831660048201529192506000916001600160a01b039091169063f2b246c3906024016101e060405180830381865afa158015610b37573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610b5b9190611374565b60a081015160c082015160e0909201519097919650945092505050565b6000610b826107b7565b90506001600160a01b03811615801590610ba55750336001600160a01b03821614155b15610bc55760405163700dd81160e01b81523360048201526024016104a0565b60035460405163f435f5a760e01b81523060048201526001600160a01b039091169063f435f5a79060240161094e565b6040805160e08101825260008082526020820181905291810182905260608082018390526080820183905260a082019290925260c0810191909152606060007f6548007c3f4340f82f348c576c0ff69f4f529cadd5ad41f96aae61abceeaa30090506040518060e00160405280610c7c6001546001600160601b03600160a01b9091041690565b6001600160601b0390811682528354908116602083015260ff600160601b820481166040840152600160681b909104161515606082015230608082015260a001610cc46107b7565b6001600160a01b03168152602001826001018054610ce190611433565b80601f0160208091040260200160405190810160405280929190818152602001828054610d0d90611433565b8015610d5a5780601f10610d2f57610100808354040283529160200191610d5a565b820191906000526020600020905b815481529060010190602001808311610d3d57829003601f168201915b50505050508152506040518060200160405280600081525092509250509091565b604080516001600160601b038616815260208101839052308183015290517ffa749b7f8c958183586325608c5d122eb3a8beb56a4d6ac2c88b78193e9facb99181900360600190a150505050565b600060208284031215610ddb57600080fd5b81356001600160e01b031981168114610df357600080fd5b9392505050565b6000815180845260005b81811015610e2057602081850181015186830182015201610e04565b506000602082860101526020601f19601f83011685010191505092915050565b6040815260006001600160601b038085511660408401528060208601511660608401525060ff60408501511660808301526060840151610e8460a084018215159052565b5060808401516001600160a01b03811660c08401525060a08401516001600160a01b03811660e08401525060c084015160e0610100840152610eca610120840182610dfa565b90508281036020840152610ede8185610dfa565b95945050505050565b6001600160601b0381168114610efc57600080fd5b50565b634e487b7160e01b600052604160045260246000fd5b6040805190810167ffffffffffffffff81118282101715610f3857610f38610eff565b60405290565b604051610120810167ffffffffffffffff81118282101715610f3857610f38610eff565b600060408284031215610f7457600080fd5b610f7c610f15565b9050813581526020820135602082015292915050565b60008060608385031215610fa557600080fd5b8235610fb081610ee7565b9150610fbf8460208501610f62565b90509250929050565b600082601f830112610fd957600080fd5b813567ffffffffffffffff80821115610ff457610ff4610eff565b604051601f8301601f19908116603f0116810190828211818310171561101c5761101c610eff565b8160405283815286602085880101111561103557600080fd5b836020870160208301376000602085830101528094505050505092915050565b6000806000806080858703121561106b57600080fd5b843561107681610ee7565b9350602085013567ffffffffffffffff8082111561109357600080fd5b61109f88838901610fc8565b945060408701359150808211156110b557600080fd5b506110c287828801610fc8565b949793965093946060013593505050565b600080600060c084860312156110e857600080fd5b6110f28585610f62565b92506111018560408601610f62565b91506111108560808601610f62565b90509250925092565b60008060008060a0858703121561112f57600080fd5b6111398686610f62565b93506040850135925060608501359150608085013567ffffffffffffffff81111561116357600080fd5b61116f87828801610fc8565b91505092959194509250565b6000806040838503121561118e57600080fd5b823567ffffffffffffffff808211156111a657600080fd5b6111b286838701610fc8565b935060208501359150808211156111c857600080fd5b506111d585828601610fc8565b9150509250929050565b865115158152602080880151908201526001600160a01b0386811660408301528516606082015283546080820152600184015460a08201526101408101835460c0830152600184015460e0830152825461010083015260018301546101208301525b979650505050505050565b60006020828403121561125e57600080fd5b81518015158114610df357600080fd5b805161127981610ee7565b919050565b60006020828403121561129057600080fd5b8151610df381610ee7565b6001600160601b038316815260608101610df3602083018480518252602090810151910152565b6001600160a01b0381168114610efc57600080fd5b6000602082840312156112e957600080fd5b8151610df3816112c2565b6001600160a01b0386168152611317602082018680518252602090810151910152565b83606082015282608082015260c060a0820152600061124160c0830184610dfa565b8051611279816112c2565b60006040828403121561135657600080fd5b61135e610f15565b9050815181526020820151602082015292915050565b60006101e0828403121561138757600080fd5b61138f610f3e565b6113988361126e565b81526113a66020840161126e565b60208201526113b760408401611339565b60408201526113c98460608501611344565b60608201526113db8460a08501611344565b60808201526113ed8460e08501611344565b60a0820152611400846101208501611344565b60c0820152611413846101608501611344565b60e0820152611426846101a08501611344565b6101008201529392505050565b600181811c9082168061144757607f821691505b60208210810361146757634e487b7160e01b600052602260045260246000fd5b5091905056fea2646970667358221220dae13de04891f302ab15b6d3fbfb9ad1d9325793d487e0d2d3694db380ac891564736f6c63430008140033",
687
+ "deployedBytecode": "0x608060405234801561001057600080fd5b506004361061012c5760003560e01c806365effc1a116100ad578063d7f5e60911610071578063d7f5e6091461029e578063dab12325146102b1578063db8d55f1146102c7578063de7b5d141461030d578063f83d08ba1461031e57600080fd5b806365effc1a14610256578063826787661461026957806387ef9ba01461027c578063893d20e81461028e578063a69df4b51461029657600080fd5b806321df0da7116100f457806321df0da7146101ed57806354afef63146101fe5780635ab1bd5314610206578063636450f514610217578063644c45e01461022a57600080fd5b806301ffc9a7146101315780630fec111c146101735780631329960414610189578063138461e0146101ae5780631eff4b22146101b8575b600080fd5b61015e61013f366004610dc9565b6001600160e01b03191660009081526020819052604090205460ff1690565b60405190151581526020015b60405180910390f35b61017b610326565b60405161016a929190610e40565b6005546001600160a01b03165b6040516001600160a01b03909116815260200161016a565b6101b66103dc565b005b6101df7f6548007c3f4340f82f348c576c0ff69f4f529cadd5ad41f96aae61abceeaa30081565b60405190815260200161016a565b6006546001600160a01b0316610196565b6008546101df565b6001546001600160a01b0316610196565b6101b6610225366004610f92565b6105fe565b600154600160a01b90046001600160601b03165b6040516001600160601b03909116815260200161016a565b6101b6610264366004611055565b610666565b6101b66102773660046110d3565b6106dc565b600754600160a01b900460ff1661015e565b6101966107b7565b6101b66108d5565b61023e6102ac366004611119565b610983565b61015e6102bf36600461117b565b600192915050565b6102cf610a0d565b60405161016a93929190835181526020938401518482015282516040820152918301516060830152805160808301529091015160a082015260c00190565b6007546001600160a01b0316610196565b6101b6610b78565b6040805160e08101825260008082526020820181905291810182905260608082018390526080820183905260a0820183905260c0820181905290918061036a610bf5565b604080518082018252600754600160a01b900460ff1615158152600854602080830191909152600554600654935195975093955086946103c39492936001600160a01b03938416931691600991600b91600d91016111df565b6040516020818303038152906040529350935050509091565b6001546040516330b8415f60e01b8152600160a01b9091046001600160601b0316600482015273__$6facc32ab6029a5f5de2a1d5e55ea9da0e$__906330b8415f90602401602060405180830381865af415801561043e573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610462919061124c565b156104a9576001546040516316322c0f60e31b81526001600160a01b0382166004820152600160a01b9091046001600160601b031660248201526044015b60405180910390fd5b6001546001600160a01b03166104d25760405163cf29926160e01b815260040160405180910390fd5b60015460405163c3c5a54760e01b81523060048201819052916001600160a01b03169063c3c5a54790602401602060405180830381865afa15801561051b573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061053f919061124c565b610567576040516372657a5160e01b81526001600160a01b03821660048201526024016104a0565b600154604051636939560f60e11b81526001600160a01b0383811660048301529091169063d272ac1e90602401602060405180830381865afa1580156105b1573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906105d5919061127e565b600160146101000a8154816001600160601b0302191690836001600160601b0316021790555050565b600f5460405163636450f560e01b81526001600160a01b039091169063636450f590610630908590859060040161129b565b600060405180830381600087803b15801561064a57600080fd5b505af115801561065e573d6000803e3d6000fd5b505050505050565b6010546001600160a01b031633146106ca5760405162461bcd60e51b815260206004820152602160248201527f4552524f523a504f4c2d3030323a4e4f545f50524f445543545f5345525649436044820152604560f81b60648201526084016104a0565b6106d684848484610d7b565b50505050565b60006106e66107b7565b90506001600160a01b038116158015906107095750336001600160a01b03821614155b156107295760405163700dd81160e01b81523360048201526024016104a0565b600f54604051634133c3b360e11b8152855160048201526020808701516024830152855160448301528086015160648301528451608483015284015160a48201526001600160a01b039091169063826787669060c401600060405180830381600087803b15801561079957600080fd5b505af11580156107ad573d6000803e3d6000fd5b5050505050505050565b6001546040516330b8415f60e01b8152600160a01b9091046001600160601b0316600482015260009073__$6facc32ab6029a5f5de2a1d5e55ea9da0e$__906330b8415f90602401602060405180830381865af415801561081c573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610840919061124c565b156108c557600154604051631c5da14d60e11b8152600160a01b82046001600160601b031660048201526001600160a01b03909116906338bb429a90602401602060405180830381865afa15801561089c573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906108c091906112d7565b905090565b506002546001600160a01b031690565b60006108df6107b7565b90506001600160a01b038116158015906109025750336001600160a01b03821614155b156109225760405163700dd81160e01b81523360048201526024016104a0565b600354604051630bdb124f60e21b81523060048201526001600160a01b0390911690632f6c493c906024015b600060405180830381600087803b15801561096857600080fd5b505af115801561097c573d6000803e3d6000fd5b5050505050565b600f5460405163e3458d5360e01b815260009133916001600160a01b039091169063e3458d53906109c09084908a908a908a908a906004016112f4565b6020604051808303816000875af11580156109df573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610a03919061127e565b9695505050505050565b6040805180820190915260008082526020820152604080518082019091526000808252602082015260408051808201909152600080825260208201526007546000906001600160a01b0316639ae31ff5610a776001546001600160601b03600160a01b9091041690565b6040516001600160e01b031960e084901b1681526001600160601b039091166004820152602401602060405180830381865afa158015610abb573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610adf919061127e565b60075460405163f2b246c360e01b81526001600160601b03831660048201529192506000916001600160a01b039091169063f2b246c3906024016101e060405180830381865afa158015610b37573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610b5b9190611374565b60a081015160c082015160e0909201519097919650945092505050565b6000610b826107b7565b90506001600160a01b03811615801590610ba55750336001600160a01b03821614155b15610bc55760405163700dd81160e01b81523360048201526024016104a0565b60035460405163f435f5a760e01b81523060048201526001600160a01b039091169063f435f5a79060240161094e565b6040805160e08101825260008082526020820181905291810182905260608082018390526080820183905260a082019290925260c0810191909152606060007f6548007c3f4340f82f348c576c0ff69f4f529cadd5ad41f96aae61abceeaa30090506040518060e00160405280610c7c6001546001600160601b03600160a01b9091041690565b6001600160601b0390811682528354908116602083015260ff600160601b820481166040840152600160681b909104161515606082015230608082015260a001610cc46107b7565b6001600160a01b03168152602001826001018054610ce190611433565b80601f0160208091040260200160405190810160405280929190818152602001828054610d0d90611433565b8015610d5a5780601f10610d2f57610100808354040283529160200191610d5a565b820191906000526020600020905b815481529060010190602001808311610d3d57829003601f168201915b50505050508152506040518060200160405280600081525092509250509091565b604080516001600160601b038616815260208101839052308183015290517ffa749b7f8c958183586325608c5d122eb3a8beb56a4d6ac2c88b78193e9facb99181900360600190a150505050565b600060208284031215610ddb57600080fd5b81356001600160e01b031981168114610df357600080fd5b9392505050565b6000815180845260005b81811015610e2057602081850181015186830182015201610e04565b506000602082860101526020601f19601f83011685010191505092915050565b6040815260006001600160601b038085511660408401528060208601511660608401525060ff60408501511660808301526060840151610e8460a084018215159052565b5060808401516001600160a01b03811660c08401525060a08401516001600160a01b03811660e08401525060c084015160e0610100840152610eca610120840182610dfa565b90508281036020840152610ede8185610dfa565b95945050505050565b6001600160601b0381168114610efc57600080fd5b50565b634e487b7160e01b600052604160045260246000fd5b6040805190810167ffffffffffffffff81118282101715610f3857610f38610eff565b60405290565b604051610120810167ffffffffffffffff81118282101715610f3857610f38610eff565b600060408284031215610f7457600080fd5b610f7c610f15565b9050813581526020820135602082015292915050565b60008060608385031215610fa557600080fd5b8235610fb081610ee7565b9150610fbf8460208501610f62565b90509250929050565b600082601f830112610fd957600080fd5b813567ffffffffffffffff80821115610ff457610ff4610eff565b604051601f8301601f19908116603f0116810190828211818310171561101c5761101c610eff565b8160405283815286602085880101111561103557600080fd5b836020870160208301376000602085830101528094505050505092915050565b6000806000806080858703121561106b57600080fd5b843561107681610ee7565b9350602085013567ffffffffffffffff8082111561109357600080fd5b61109f88838901610fc8565b945060408701359150808211156110b557600080fd5b506110c287828801610fc8565b949793965093946060013593505050565b600080600060c084860312156110e857600080fd5b6110f28585610f62565b92506111018560408601610f62565b91506111108560808601610f62565b90509250925092565b60008060008060a0858703121561112f57600080fd5b6111398686610f62565b93506040850135925060608501359150608085013567ffffffffffffffff81111561116357600080fd5b61116f87828801610fc8565b91505092959194509250565b6000806040838503121561118e57600080fd5b823567ffffffffffffffff808211156111a657600080fd5b6111b286838701610fc8565b935060208501359150808211156111c857600080fd5b506111d585828601610fc8565b9150509250929050565b865115158152602080880151908201526001600160a01b0386811660408301528516606082015283546080820152600184015460a08201526101408101835460c0830152600184015460e0830152825461010083015260018301546101208301525b979650505050505050565b60006020828403121561125e57600080fd5b81518015158114610df357600080fd5b805161127981610ee7565b919050565b60006020828403121561129057600080fd5b8151610df381610ee7565b6001600160601b038316815260608101610df3602083018480518252602090810151910152565b6001600160a01b0381168114610efc57600080fd5b6000602082840312156112e957600080fd5b8151610df3816112c2565b6001600160a01b0386168152611317602082018680518252602090810151910152565b83606082015282608082015260c060a0820152600061124160c0830184610dfa565b8051611279816112c2565b60006040828403121561135657600080fd5b61135e610f15565b9050815181526020820151602082015292915050565b60006101e0828403121561138757600080fd5b61138f610f3e565b6113988361126e565b81526113a66020840161126e565b60208201526113b760408401611339565b60408201526113c98460608501611344565b60608201526113db8460a08501611344565b60808201526113ed8460e08501611344565b60a0820152611400846101208501611344565b60c0820152611413846101608501611344565b60e0820152611426846101a08501611344565b6101008201529392505050565b600181811c9082168061144757607f821691505b60208210810361146757634e487b7160e01b600052602260045260246000fd5b5091905056fea2646970667358221220dae13de04891f302ab15b6d3fbfb9ad1d9325793d487e0d2d3694db380ac891564736f6c63430008140033",
567
688
  "linkReferences": {
568
- "contracts/types/Fee.sol": {
569
- "FeeLib": [
689
+ "contracts/types/NftId.sol": {
690
+ "NftIdLib": [
691
+ {
692
+ "length": 20,
693
+ "start": 4130
694
+ },
570
695
  {
571
696
  "length": 20,
572
- "start": 1205
697
+ "start": 5120
573
698
  }
574
699
  ]
575
700
  }
576
701
  },
577
- "deployedLinkReferences": {}
702
+ "deployedLinkReferences": {
703
+ "contracts/types/NftId.sol": {
704
+ "NftIdLib": [
705
+ {
706
+ "length": 20,
707
+ "start": 1028
708
+ },
709
+ {
710
+ "length": 20,
711
+ "start": 2018
712
+ }
713
+ ]
714
+ }
715
+ }
578
716
  }
@@ -1,4 +1,4 @@
1
1
  {
2
2
  "_format": "hh-sol-dbg-1",
3
- "buildInfo": "../../../build-info/ddc9b0b487d1eff0b437a694ef8bc6d1.json"
3
+ "buildInfo": "../../../build-info/b012f4ed156d977fd771c60cd60f52df.json"
4
4
  }