@etherisc/gif-next 0.0.2-e46206a-486 → 0.0.2-e4b632c-016

Sign up to get free protection for your applications and to get access to all the features.
Files changed (280) hide show
  1. package/artifacts/contracts/components/BaseComponent.sol/BaseComponent.dbg.json +1 -1
  2. package/artifacts/contracts/components/BaseComponent.sol/BaseComponent.json +13 -0
  3. package/artifacts/contracts/components/Distribution.sol/Distribution.dbg.json +1 -1
  4. package/artifacts/contracts/components/Distribution.sol/Distribution.json +86 -33
  5. package/artifacts/contracts/components/IBaseComponent.sol/IBaseComponent.dbg.json +1 -1
  6. package/artifacts/contracts/components/IBaseComponent.sol/IBaseComponent.json +13 -0
  7. package/artifacts/contracts/components/IDistributionComponent.sol/IDistributionComponent.dbg.json +1 -1
  8. package/artifacts/contracts/components/IDistributionComponent.sol/IDistributionComponent.json +0 -25
  9. package/artifacts/contracts/components/IPoolComponent.sol/IPoolComponent.dbg.json +1 -1
  10. package/artifacts/contracts/components/IPoolComponent.sol/IPoolComponent.json +0 -59
  11. package/artifacts/contracts/components/IProductComponent.sol/IProductComponent.dbg.json +1 -1
  12. package/artifacts/contracts/components/IProductComponent.sol/IProductComponent.json +0 -50
  13. package/artifacts/contracts/components/Pool.sol/Pool.dbg.json +1 -1
  14. package/artifacts/contracts/components/Pool.sol/Pool.json +123 -65
  15. package/artifacts/contracts/components/Product.sol/Product.dbg.json +1 -1
  16. package/artifacts/contracts/components/Product.sol/Product.json +184 -44
  17. package/artifacts/contracts/experiment/cloning/Cloner.sol/Cloner.dbg.json +1 -1
  18. package/artifacts/contracts/experiment/cloning/Cloner.sol/Mock1.dbg.json +1 -1
  19. package/artifacts/contracts/experiment/cloning/Cloner.sol/Mock2.dbg.json +1 -1
  20. package/artifacts/contracts/experiment/errors/Require.sol/Require.dbg.json +1 -1
  21. package/artifacts/contracts/experiment/errors/Revert.sol/Revert.dbg.json +1 -1
  22. package/artifacts/contracts/experiment/inheritance/A.sol/A.dbg.json +1 -1
  23. package/artifacts/contracts/experiment/inheritance/A.sol/AShared.dbg.json +1 -1
  24. package/artifacts/contracts/experiment/inheritance/B.sol/B.dbg.json +1 -1
  25. package/artifacts/contracts/experiment/inheritance/C.sol/C.dbg.json +1 -1
  26. package/artifacts/contracts/experiment/inheritance/IA.sol/IA.dbg.json +1 -1
  27. package/artifacts/contracts/experiment/inheritance/IA.sol/ISharedA.dbg.json +1 -1
  28. package/artifacts/contracts/experiment/inheritance/IB.sol/IB.dbg.json +1 -1
  29. package/artifacts/contracts/experiment/inheritance/IC.sol/IC.dbg.json +1 -1
  30. package/artifacts/contracts/experiment/statemachine/Dummy.sol/LifeCycleModule.dbg.json +1 -1
  31. package/artifacts/contracts/experiment/statemachine/Dummy.sol/LifeCycleModule.json +2 -2
  32. package/artifacts/contracts/experiment/statemachine/ISM.sol/ISM.dbg.json +1 -1
  33. package/artifacts/contracts/experiment/statemachine/ISM.sol/ISMEE.dbg.json +1 -1
  34. package/artifacts/contracts/experiment/statemachine/SM.sol/SM.dbg.json +1 -1
  35. package/artifacts/contracts/experiment/statemachine/SM.sol/SM.json +2 -2
  36. package/artifacts/contracts/experiment/statemachine/SimpleStateMachine.sol/SimpleStateMachine.dbg.json +1 -1
  37. package/artifacts/contracts/experiment/statemachine/SimpleStateMachine.sol/SimpleStateMachine.json +2 -2
  38. package/artifacts/contracts/experiment/types/TypeA.sol/TypeALib.dbg.json +1 -1
  39. package/artifacts/contracts/experiment/types/TypeB.sol/TypeBLib.dbg.json +1 -1
  40. package/artifacts/contracts/instance/AccessManagedSimple.sol/AccessManagedSimple.dbg.json +4 -0
  41. package/artifacts/contracts/instance/AccessManagedSimple.sol/AccessManagedSimple.json +114 -0
  42. package/artifacts/contracts/instance/AccessManagerSimple.sol/AccessManagerSimple.dbg.json +4 -0
  43. package/artifacts/contracts/instance/AccessManagerSimple.sol/AccessManagerSimple.json +1132 -0
  44. package/artifacts/contracts/instance/IAccessManagerSimple.sol/IAccessManagerSimple.dbg.json +4 -0
  45. package/artifacts/contracts/instance/IAccessManagerSimple.sol/IAccessManagerSimple.json +1082 -0
  46. package/artifacts/contracts/instance/IInstance.sol/IInstance.dbg.json +1 -1
  47. package/artifacts/contracts/instance/IInstance.sol/IInstance.json +181 -1677
  48. package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.dbg.json +4 -0
  49. package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.json +480 -0
  50. package/artifacts/contracts/instance/Instance.sol/Instance.dbg.json +1 -1
  51. package/artifacts/contracts/instance/Instance.sol/Instance.json +2198 -1023
  52. package/artifacts/contracts/instance/InstanceAccessManager.sol/InstanceAccessManager.dbg.json +4 -0
  53. package/artifacts/contracts/instance/InstanceAccessManager.sol/InstanceAccessManager.json +930 -0
  54. package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.dbg.json +4 -0
  55. package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.json +1283 -0
  56. package/artifacts/contracts/instance/InstanceService.sol/InstanceService.dbg.json +4 -0
  57. package/artifacts/contracts/instance/InstanceService.sol/InstanceService.json +755 -0
  58. package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.dbg.json +4 -0
  59. package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.json +432 -0
  60. package/artifacts/contracts/instance/base/ComponentServiceBase.sol/ComponentServiceBase.dbg.json +1 -1
  61. package/artifacts/contracts/instance/base/IInstanceBase.sol/IInstanceBase.dbg.json +1 -1
  62. package/artifacts/contracts/instance/base/IKeyValueStore.sol/IKeyValueStore.dbg.json +1 -1
  63. package/artifacts/contracts/instance/base/IKeyValueStore.sol/IKeyValueStore.json +27 -158
  64. package/artifacts/contracts/instance/base/ILifecycle.sol/ILifecycle.dbg.json +1 -1
  65. package/artifacts/contracts/instance/base/KeyValueStore.sol/KeyValueStore.dbg.json +1 -1
  66. package/artifacts/contracts/instance/base/KeyValueStore.sol/KeyValueStore.json +37 -253
  67. package/artifacts/contracts/instance/base/Lifecycle.sol/Lifecycle.dbg.json +1 -1
  68. package/artifacts/contracts/instance/base/Lifecycle.sol/Lifecycle.json +2 -2
  69. package/artifacts/contracts/instance/module/IAccess.sol/IAccess.dbg.json +4 -0
  70. package/artifacts/contracts/instance/module/IAccess.sol/IAccess.json +211 -0
  71. package/artifacts/contracts/instance/module/IBundle.sol/IBundle.dbg.json +4 -0
  72. package/artifacts/contracts/instance/module/{bundle/IBundle.sol → IBundle.sol}/IBundle.json +1 -1
  73. package/artifacts/contracts/instance/module/IDistribution.sol/IDistribution.dbg.json +4 -0
  74. package/artifacts/contracts/instance/module/{distribution/IDistribution.sol → IDistribution.sol}/IDistribution.json +1 -1
  75. package/artifacts/contracts/instance/module/IPolicy.sol/IPolicy.dbg.json +4 -0
  76. package/artifacts/contracts/instance/module/{policy/IPolicy.sol → IPolicy.sol}/IPolicy.json +1 -1
  77. package/artifacts/contracts/instance/module/IRisk.sol/IRisk.dbg.json +4 -0
  78. package/artifacts/contracts/instance/module/{risk/IRisk.sol → IRisk.sol}/IRisk.json +1 -1
  79. package/artifacts/contracts/instance/module/ISetup.sol/ISetup.dbg.json +4 -0
  80. package/artifacts/contracts/instance/{base/ModuleBase.sol/ModuleBase.json → module/ISetup.sol/ISetup.json} +2 -2
  81. package/artifacts/contracts/instance/module/ITreasury.sol/ITreasury.dbg.json +4 -0
  82. package/artifacts/contracts/instance/module/{treasury/ITreasury.sol → ITreasury.sol}/ITreasury.json +1 -1
  83. package/artifacts/contracts/instance/service/ComponentOwnerService.sol/ComponentOwnerService.dbg.json +1 -1
  84. package/artifacts/contracts/instance/service/ComponentOwnerService.sol/ComponentOwnerService.json +32 -48
  85. package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.dbg.json +1 -1
  86. package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.json +18 -60
  87. package/artifacts/contracts/instance/service/DistributionServiceManager.sol/DistributionServiceManager.dbg.json +4 -0
  88. package/artifacts/contracts/instance/service/DistributionServiceManager.sol/DistributionServiceManager.json +428 -0
  89. package/artifacts/contracts/instance/service/IComponentOwnerService.sol/IComponentOwnerService.dbg.json +1 -1
  90. package/artifacts/contracts/instance/service/IDistributionService.sol/IDistributionService.dbg.json +1 -1
  91. package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.dbg.json +1 -1
  92. package/artifacts/contracts/instance/service/IProductService.sol/IProductService.dbg.json +1 -1
  93. package/artifacts/contracts/registry/ChainNft.sol/ChainNft.dbg.json +1 -1
  94. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.dbg.json +1 -1
  95. package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.dbg.json +1 -1
  96. package/artifacts/contracts/registry/ITransferInterceptor.sol/ITransferInterceptor.dbg.json +1 -1
  97. package/artifacts/contracts/registry/Registry.sol/Registry.dbg.json +1 -1
  98. package/artifacts/contracts/registry/Registry.sol/Registry.json +2 -2
  99. package/artifacts/contracts/registry/RegistryService.sol/RegistryService.dbg.json +1 -1
  100. package/artifacts/contracts/registry/RegistryService.sol/RegistryService.json +8 -8
  101. package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.dbg.json +1 -1
  102. package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.json +5 -5
  103. package/artifacts/contracts/shared/ContractDeployerLib.sol/ContractDeployerLib.dbg.json +1 -1
  104. package/artifacts/contracts/shared/ERC165.sol/ERC165.dbg.json +1 -1
  105. package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.dbg.json +1 -1
  106. package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.dbg.json +1 -1
  107. package/artifacts/contracts/shared/IService.sol/IService.dbg.json +4 -0
  108. package/artifacts/contracts/{instance/base → shared}/IService.sol/IService.json +1 -1
  109. package/artifacts/contracts/shared/IVersionable.sol/IVersionable.dbg.json +1 -1
  110. package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.dbg.json +1 -1
  111. package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.json +2 -2
  112. package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.dbg.json +1 -1
  113. package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.json +2 -2
  114. package/artifacts/contracts/shared/Registerable.sol/Registerable.dbg.json +1 -1
  115. package/artifacts/contracts/shared/Registerable.sol/Registerable.json +2 -2
  116. package/artifacts/contracts/shared/RegisterableUpgradable.sol/RegisterableUpgradable.dbg.json +4 -0
  117. package/artifacts/contracts/{instance/base/InstanceBase.sol/InstanceBase.json → shared/RegisterableUpgradable.sol/RegisterableUpgradable.json} +2 -104
  118. package/artifacts/contracts/shared/Service.sol/Service.dbg.json +4 -0
  119. package/artifacts/contracts/{instance/base/ServiceBase.sol/ServiceBase.json → shared/Service.sol/Service.json} +2 -2
  120. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.dbg.json +4 -0
  121. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.json +96 -0
  122. package/artifacts/contracts/shared/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.dbg.json +1 -1
  123. package/artifacts/contracts/shared/Versionable.sol/Versionable.dbg.json +1 -1
  124. package/artifacts/contracts/test/TestFee.sol/TestFee.dbg.json +1 -1
  125. package/artifacts/contracts/test/TestRegisterable.sol/TestRegisterable.dbg.json +1 -1
  126. package/artifacts/contracts/test/TestRegisterable.sol/TestRegisterable.json +2 -2
  127. package/artifacts/contracts/test/TestRoleId.sol/TestRoleId.dbg.json +1 -1
  128. package/artifacts/contracts/test/TestService.sol/TestService.dbg.json +1 -1
  129. package/artifacts/contracts/test/TestService.sol/TestService.json +11 -11
  130. package/artifacts/contracts/test/TestToken.sol/TestUsdc.dbg.json +1 -1
  131. package/artifacts/contracts/test/TestVersion.sol/TestVersion.dbg.json +1 -1
  132. package/artifacts/contracts/test/TestVersionable.sol/TestVersionable.dbg.json +1 -1
  133. package/artifacts/contracts/test/Usdc.sol/USDC.dbg.json +1 -1
  134. package/artifacts/contracts/types/AddressSet.sol/LibAddressSet.dbg.json +1 -1
  135. package/artifacts/contracts/types/Blocknumber.sol/BlocknumberLib.dbg.json +1 -1
  136. package/artifacts/contracts/types/ChainId.sol/ChainIdLib.dbg.json +1 -1
  137. package/artifacts/contracts/types/DistributorType.sol/DistributorTypeLib.dbg.json +1 -1
  138. package/artifacts/contracts/types/Fee.sol/FeeLib.dbg.json +1 -1
  139. package/artifacts/contracts/types/Key32.sol/Key32Lib.dbg.json +1 -1
  140. package/artifacts/contracts/types/NftId.sol/NftIdLib.dbg.json +1 -1
  141. package/artifacts/contracts/types/NftIdSet.sol/LibNftIdSet.dbg.json +1 -1
  142. package/artifacts/contracts/types/NumberId.sol/NumberIdLib.dbg.json +1 -1
  143. package/artifacts/contracts/types/ObjectType.sol/ObjectTypeLib.dbg.json +1 -1
  144. package/artifacts/contracts/types/Referral.sol/ReferralLib.dbg.json +1 -1
  145. package/artifacts/contracts/types/RiskId.sol/RiskIdLib.dbg.json +1 -1
  146. package/artifacts/contracts/types/RoleId.sol/RoleIdLib.dbg.json +1 -1
  147. package/artifacts/contracts/types/StateId.sol/StateIdLib.dbg.json +1 -1
  148. package/artifacts/contracts/types/StateId.sol/StateIdLib.json +2 -2
  149. package/artifacts/contracts/types/Timestamp.sol/TimestampLib.dbg.json +1 -1
  150. package/artifacts/contracts/types/UFixed.sol/MathLib.dbg.json +1 -1
  151. package/artifacts/contracts/types/UFixed.sol/UFixedLib.dbg.json +1 -1
  152. package/artifacts/contracts/types/Version.sol/VersionLib.dbg.json +1 -1
  153. package/artifacts/contracts/types/Version.sol/VersionPartLib.dbg.json +1 -1
  154. package/contracts/components/BaseComponent.sol +9 -2
  155. package/contracts/components/Distribution.sol +25 -14
  156. package/contracts/components/IBaseComponent.sol +7 -2
  157. package/contracts/components/IDistributionComponent.sol +0 -3
  158. package/contracts/components/IPoolComponent.sol +0 -2
  159. package/contracts/components/IProductComponent.sol +1 -3
  160. package/contracts/components/Pool.sol +41 -28
  161. package/contracts/components/Product.sol +40 -42
  162. package/contracts/instance/AccessManagedSimple.sol +122 -0
  163. package/contracts/instance/AccessManagerSimple.sol +692 -0
  164. package/contracts/instance/IAccessManagerSimple.sol +391 -0
  165. package/contracts/instance/IInstance.sol +25 -44
  166. package/contracts/instance/IInstanceService.sol +30 -0
  167. package/contracts/instance/Instance.sol +423 -64
  168. package/contracts/instance/InstanceAccessManager.sol +288 -0
  169. package/contracts/instance/InstanceReader.sol +290 -0
  170. package/contracts/instance/InstanceService.sol +138 -0
  171. package/contracts/instance/InstanceServiceManager.sol +56 -0
  172. package/contracts/instance/base/ComponentServiceBase.sol +3 -13
  173. package/contracts/instance/base/IKeyValueStore.sol +13 -14
  174. package/contracts/instance/base/ILifecycle.sol +3 -3
  175. package/contracts/instance/base/KeyValueStore.sol +49 -39
  176. package/contracts/instance/base/Lifecycle.sol +1 -1
  177. package/contracts/instance/module/IAccess.sol +38 -0
  178. package/contracts/instance/module/IBundle.sol +19 -0
  179. package/contracts/instance/module/IDistribution.sol +39 -0
  180. package/contracts/instance/module/IPolicy.sol +45 -0
  181. package/contracts/instance/module/IRisk.sol +11 -0
  182. package/contracts/instance/module/ISetup.sol +43 -0
  183. package/contracts/instance/module/ITreasury.sol +23 -0
  184. package/contracts/instance/service/ComponentOwnerService.sol +62 -60
  185. package/contracts/instance/service/DistributionService.sol +33 -17
  186. package/contracts/instance/service/DistributionServiceManager.sol +53 -0
  187. package/contracts/instance/service/IComponentOwnerService.sol +1 -1
  188. package/contracts/instance/service/IDistributionService.sol +1 -1
  189. package/contracts/instance/service/IPoolService.sol +1 -1
  190. package/contracts/instance/service/IProductService.sol +2 -2
  191. package/contracts/registry/IRegistry.sol +1 -0
  192. package/contracts/registry/IRegistryService.sol +8 -8
  193. package/contracts/registry/Registry.sol +1 -1
  194. package/contracts/registry/RegistryService.sol +17 -14
  195. package/contracts/{instance/base → shared}/IService.sol +3 -3
  196. package/contracts/shared/RegisterableUpgradable.sol +16 -0
  197. package/contracts/shared/Service.sol +54 -0
  198. package/contracts/shared/TokenHandler.sol +27 -0
  199. package/contracts/test/TestService.sol +3 -5
  200. package/contracts/types/StateId.sol +4 -0
  201. package/package.json +1 -1
  202. package/artifacts/contracts/instance/IInstanceLinked.sol/IInstanceLinked.dbg.json +0 -4
  203. package/artifacts/contracts/instance/IInstanceLinked.sol/IInstanceLinked.json +0 -24
  204. package/artifacts/contracts/instance/base/IService.sol/IService.dbg.json +0 -4
  205. package/artifacts/contracts/instance/base/InstanceBase.sol/InstanceBase.dbg.json +0 -4
  206. package/artifacts/contracts/instance/base/ModuleBase.sol/ModuleBase.dbg.json +0 -4
  207. package/artifacts/contracts/instance/base/ServiceBase.sol/ServiceBase.dbg.json +0 -4
  208. package/artifacts/contracts/instance/module/bundle/BundleModule.sol/BundleModule.dbg.json +0 -4
  209. package/artifacts/contracts/instance/module/bundle/BundleModule.sol/BundleModule.json +0 -297
  210. package/artifacts/contracts/instance/module/bundle/IBundle.sol/IBundle.dbg.json +0 -4
  211. package/artifacts/contracts/instance/module/bundle/IBundle.sol/IBundleModule.dbg.json +0 -4
  212. package/artifacts/contracts/instance/module/bundle/IBundle.sol/IBundleModule.json +0 -297
  213. package/artifacts/contracts/instance/module/component/ComponentModule.sol/ComponentModule.dbg.json +0 -4
  214. package/artifacts/contracts/instance/module/component/ComponentModule.sol/ComponentModule.json +0 -117
  215. package/artifacts/contracts/instance/module/component/IComponent.sol/IComponent.dbg.json +0 -4
  216. package/artifacts/contracts/instance/module/component/IComponent.sol/IComponent.json +0 -10
  217. package/artifacts/contracts/instance/module/component/IComponent.sol/IComponentModule.dbg.json +0 -4
  218. package/artifacts/contracts/instance/module/component/IComponent.sol/IComponentModule.json +0 -117
  219. package/artifacts/contracts/instance/module/distribution/DistributionModule.sol/DistributionModule.dbg.json +0 -4
  220. package/artifacts/contracts/instance/module/distribution/DistributionModule.sol/DistributionModule.json +0 -10
  221. package/artifacts/contracts/instance/module/distribution/IDistribution.sol/IDistribution.dbg.json +0 -4
  222. package/artifacts/contracts/instance/module/distribution/IDistribution.sol/IDistributionModule.dbg.json +0 -4
  223. package/artifacts/contracts/instance/module/distribution/IDistribution.sol/IDistributionModule.json +0 -10
  224. package/artifacts/contracts/instance/module/policy/IPolicy.sol/IPolicy.dbg.json +0 -4
  225. package/artifacts/contracts/instance/module/policy/IPolicy.sol/IPolicyModule.dbg.json +0 -4
  226. package/artifacts/contracts/instance/module/policy/IPolicy.sol/IPolicyModule.json +0 -271
  227. package/artifacts/contracts/instance/module/policy/PolicyModule.sol/PolicyModule.dbg.json +0 -4
  228. package/artifacts/contracts/instance/module/policy/PolicyModule.sol/PolicyModule.json +0 -271
  229. package/artifacts/contracts/instance/module/pool/IPoolModule.sol/IPool.dbg.json +0 -4
  230. package/artifacts/contracts/instance/module/pool/IPoolModule.sol/IPool.json +0 -10
  231. package/artifacts/contracts/instance/module/pool/IPoolModule.sol/IPoolModule.dbg.json +0 -4
  232. package/artifacts/contracts/instance/module/pool/IPoolModule.sol/IPoolModule.json +0 -164
  233. package/artifacts/contracts/instance/module/pool/PoolModule.sol/PoolModule.dbg.json +0 -4
  234. package/artifacts/contracts/instance/module/pool/PoolModule.sol/PoolModule.json +0 -164
  235. package/artifacts/contracts/instance/module/risk/IRisk.sol/IRisk.dbg.json +0 -4
  236. package/artifacts/contracts/instance/module/risk/IRisk.sol/IRiskModule.dbg.json +0 -4
  237. package/artifacts/contracts/instance/module/risk/IRisk.sol/IRiskModule.json +0 -113
  238. package/artifacts/contracts/instance/module/risk/RiskModule.sol/RiskModule.dbg.json +0 -4
  239. package/artifacts/contracts/instance/module/risk/RiskModule.sol/RiskModule.json +0 -131
  240. package/artifacts/contracts/instance/module/treasury/ITreasury.sol/ITreasury.dbg.json +0 -4
  241. package/artifacts/contracts/instance/module/treasury/ITreasury.sol/ITreasuryModule.dbg.json +0 -4
  242. package/artifacts/contracts/instance/module/treasury/ITreasury.sol/ITreasuryModule.json +0 -638
  243. package/artifacts/contracts/instance/module/treasury/TokenHandler.sol/TokenHandler.dbg.json +0 -4
  244. package/artifacts/contracts/instance/module/treasury/TokenHandler.sol/TokenHandler.json +0 -76
  245. package/artifacts/contracts/instance/module/treasury/TreasuryModule.sol/TreasuryModule.dbg.json +0 -4
  246. package/artifacts/contracts/instance/module/treasury/TreasuryModule.sol/TreasuryModule.json +0 -638
  247. package/artifacts/contracts/instance/service/PoolService.sol/PoolService.dbg.json +0 -4
  248. package/artifacts/contracts/instance/service/PoolService.sol/PoolService.json +0 -769
  249. package/artifacts/contracts/instance/service/ProductService.sol/ProductService.dbg.json +0 -4
  250. package/artifacts/contracts/instance/service/ProductService.sol/ProductService.json +0 -1076
  251. package/artifacts/contracts/test/TestDistribution.sol/TestDistribution.dbg.json +0 -4
  252. package/artifacts/contracts/test/TestDistribution.sol/TestDistribution.json +0 -557
  253. package/artifacts/contracts/test/TestPool.sol/TestPool.dbg.json +0 -4
  254. package/artifacts/contracts/test/TestPool.sol/TestPool.json +0 -716
  255. package/artifacts/contracts/test/TestProduct.sol/TestProduct.dbg.json +0 -4
  256. package/artifacts/contracts/test/TestProduct.sol/TestProduct.json +0 -744
  257. package/contracts/instance/IInstanceLinked.sol +0 -8
  258. package/contracts/instance/base/InstanceBase.sol +0 -89
  259. package/contracts/instance/base/ModuleBase.sol +0 -57
  260. package/contracts/instance/base/ServiceBase.sol +0 -44
  261. package/contracts/instance/module/bundle/BundleModule.sol +0 -134
  262. package/contracts/instance/module/bundle/IBundle.sol +0 -53
  263. package/contracts/instance/module/component/ComponentModule.sol +0 -71
  264. package/contracts/instance/module/component/IComponent.sol +0 -28
  265. package/contracts/instance/module/distribution/DistributionModule.sol +0 -17
  266. package/contracts/instance/module/distribution/IDistribution.sol +0 -10
  267. package/contracts/instance/module/policy/IPolicy.sol +0 -63
  268. package/contracts/instance/module/policy/PolicyModule.sol +0 -91
  269. package/contracts/instance/module/pool/IPoolModule.sol +0 -41
  270. package/contracts/instance/module/pool/PoolModule.sol +0 -95
  271. package/contracts/instance/module/risk/IRisk.sol +0 -26
  272. package/contracts/instance/module/risk/RiskModule.sol +0 -62
  273. package/contracts/instance/module/treasury/ITreasury.sol +0 -84
  274. package/contracts/instance/module/treasury/TokenHandler.sol +0 -48
  275. package/contracts/instance/module/treasury/TreasuryModule.sol +0 -131
  276. package/contracts/instance/service/PoolService.sol +0 -149
  277. package/contracts/instance/service/ProductService.sol +0 -510
  278. package/contracts/test/TestDistribution.sol +0 -22
  279. package/contracts/test/TestPool.sol +0 -27
  280. package/contracts/test/TestProduct.sol +0 -74
@@ -495,14 +495,14 @@
495
495
  "type": "function"
496
496
  }
497
497
  ],
498
- "bytecode": "0x60806040523480156200001157600080fd5b5060405162001d1d38038062001d1d8339810160408190526200003491620005a2565b6301ffc9a760e01b60009081526020527f67be87c3ff9960ca1e9cfac5cab2ff4747269cf9ed20c9b7306235ac35a491c5805460ff19166001179055600280546001600160a01b031916331790556200008c620000a2565b6200009983838362000156565b5050506200083c565b7ff0c57e16840df040f15088dc2f81fe391c3923bec73e23a9662efc9c229c6a00805468010000000000000000900460ff1615620000f35760405163f92ee8a960e01b815260040160405180910390fd5b80546001600160401b0390811614620001535780546001600160401b0319166001600160401b0390811782556040519081527fc7f505b2f371ae2175ee4913f4499e1f2633a7b5936321eed1cdaeb6115181d29060200160405180910390a15b50565b60006200018160408051808201909152600b81526a546573745365727669636560a81b602082015290565b6200018b62000204565b6040516020016200019e929190620005fa565b60408051808303601f190181529190529050620001c28484603c6000868662000291565b631b4612f160e31b60009081526020527ffc58a5a01198e68c5a5d0bcd463f9ab550fc4337b1df271aed6dbb33d25fef25805460ff1916600117905550505050565b60006200021062000362565b60405163c9e66e2960e01b815262ffffff909116600482015273__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__9063c9e66e2990602401602060405180830381865af415801562000266573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906200028c919062000654565b905090565b6200029d8287620003ea565b60007f6548007c3f4340f82f348c576c0ff69f4f529cadd5ad41f96aae61abceeaa30080546001600160601b0388166001600160681b0319909116176c0100000000000000000000000060ff8816021760ff60681b19166d0100000000000000000000000000861515021781559050600181016200031c838262000725565b506303fb044760e21b60009081526020527fb43e4f3791bfcdefa3a0fbe2a5555f8d6490b90e01de0ff40c66f18b49b562c5805460ff1916600117905550505050505050565b604051632efe011360e01b815260036004820152600060248201819052604482018190529073__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__90632efe011390606401602060405180830381865af4158015620003c4573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906200028c9190620007f1565b600280546001600160a01b0319166001600160a01b038416179055620004108162000414565b5050565b6001546001600160a01b031615620004535760015460405163fcdbf2d960e01b81526001600160a01b0390911660048201526024015b60405180910390fd5b6001600160a01b0381166200047b5760405163f5c4d07d60e01b815260040160405180910390fd5b806001600160a01b03163b600003620004b35760405163fdeac91f60e01b81526001600160a01b03821660048201526024016200044a565b600180546001600160a01b0319166001600160a01b0383169081179091556040516301ffc9a760e01b815263350fb35160e11b60048201526301ffc9a790602401602060405180830381865afa92505050801562000530575060408051601f3d908101601f191682019092526200052d9181019062000818565b60015b6200055a5760405163fdeac91f60e01b81526001600160a01b03821660048201526024016200044a565b80620004105760405163fdeac91f60e01b81526001600160a01b03831660048201526024016200044a565b80516001600160a01b03811681146200059d57600080fd5b919050565b600080600060608486031215620005b857600080fd5b620005c38462000585565b60208501519093506001600160601b0381168114620005e157600080fd5b9150620005f16040850162000585565b90509250925092565b604081526000835180604084015260005b818110156200062a57602081870181015160608684010152016200060b565b506000606082850101526060601f19601f83011684010191505060ff831660208301529392505050565b6000602082840312156200066757600080fd5b815160ff811681146200067957600080fd5b9392505050565b634e487b7160e01b600052604160045260246000fd5b600181811c90821680620006ab57607f821691505b602082108103620006cc57634e487b7160e01b600052602260045260246000fd5b50919050565b601f8211156200072057600081815260208120601f850160051c81016020861015620006fb5750805b601f850160051c820191505b818110156200071c5782815560010162000707565b5050505b505050565b81516001600160401b0381111562000741576200074162000680565b620007598162000752845462000696565b84620006d2565b602080601f831160018114620007915760008415620007785750858301515b600019600386901b1c1916600185901b1785556200071c565b600085815260208120601f198616915b82811015620007c257888601518255948401946001909101908401620007a1565b5085821015620007e15787850151600019600388901b60f8161c191681555b5050505050600190811b01905550565b6000602082840312156200080457600080fd5b815162ffffff811681146200067957600080fd5b6000602082840312156200082b57600080fd5b815180151581146200067957600080fd5b6114d1806200084c6000396000f3fe608060405234801561001057600080fd5b50600436106101165760003560e01c8063644c45e0116100a2578063a745e3df11610071578063a745e3df146103d3578063b3c65015146103e6578063b88da75914610407578063cde749f41461041a578063cf7a1d771461043457600080fd5b8063644c45e01461034f578063893d20e81461037a578063946dfcfe14610382578063a3f4df7e146103a957600080fd5b806317d7de7c116100e957806317d7de7c146101995780631eff4b22146101c95780634d459c90146101fe5780634f421333146103175780635ab1bd531461032a57600080fd5b806301ffc9a71461011b5780630d8e6e2c1461015d5780630fec111c14610179578063138461e01461018f575b600080fd5b61014861012936600461107d565b6001600160e01b03191660009081526020819052604090205460ff1690565b60405190151581526020015b60405180910390f35b610165610447565b60405162ffffff9091168152602001610154565b6101816104d1565b6040516101549291906110f4565b610197610653565b005b60408051808201909152600b81526a546573745365727669636560a81b60208201525b604051610154919061119b565b6101f07f6548007c3f4340f82f348c576c0ff69f4f529cadd5ad41f96aae61abceeaa30081565b604051908152602001610154565b6102ba61020c3660046111c2565b6040805160a08101825260008082526020820181905291810182905260608101829052608081019190915260008051602061147c83398151915262ffffff92831660009081526020918252604090819020815160a0810183528154958616815263010000009095046001600160a01b03908116938601939093526001015491821690840152600160a01b810464ffffffffff166060840152600160c81b900463ffffffff1660808301525090565b60408051825162ffffff1681526020808401516001600160a01b039081169183019190915283830151169181019190915260608083015164ffffffffff169082015260809182015163ffffffff169181019190915260a001610154565b6101486103253660046111c2565b610875565b6001546001600160a01b03165b6040516001600160a01b039091168152602001610154565b600154600160a01b90046001600160601b03166040516001600160601b039091168152602001610154565b610337610928565b7f4f61291a8ac3d020d0a7d919a76b8592aa88385744dee3f8b4f3873b969ed901546101f0565b6101bc6040518060400160405280600b81526020016a546573745365727669636560a81b81525081565b6101976103e136600461120a565b610a41565b6103ee610b9e565b60405167ffffffffffffffff9091168152602001610154565b6101656104153660046112e0565b610bc0565b610422610c11565b60405160ff9091168152602001610154565b61019761044236600461120a565b610c94565b604051632efe011360e01b815260036004820152600060248201819052604482018190529073__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__90632efe011390606401602060405180830381865af41580156104a8573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906104cc91906112f9565b905090565b6040805160e08101825260008082526020820181905291810182905260608082018390526080820183905260a0820183905260c0820181905290917f6548007c3f4340f82f348c576c0ff69f4f529cadd5ad41f96aae61abceeaa30090506040518060e001604052806105546001546001600160601b03600160a01b9091041690565b6001600160601b0390811682528354908116602083015260ff600160601b820481166040840152600160681b909104161515606082015230608082015260a00161059c610928565b6001600160a01b031681526020018260010180546105b990611316565b80601f01602080910402602001604051908101604052809291908181526020018280546105e590611316565b80156106325780601f1061060757610100808354040283529160200191610632565b820191906000526020600020905b81548152906001019060200180831161061557829003601f168201915b50505050508152506040518060200160405280600081525092509250509091565b6001546040516330b8415f60e01b8152600160a01b9091046001600160601b0316600482015273__$6facc32ab6029a5f5de2a1d5e55ea9da0e$__906330b8415f90602401602060405180830381865af41580156106b5573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906106d99190611350565b15610720576001546040516316322c0f60e31b81526001600160a01b0382166004820152600160a01b9091046001600160601b031660248201526044015b60405180910390fd5b6001546001600160a01b03166107495760405163cf29926160e01b815260040160405180910390fd5b60015460405163c3c5a54760e01b81523060048201819052916001600160a01b03169063c3c5a54790602401602060405180830381865afa158015610792573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906107b69190611350565b6107de576040516372657a5160e01b81526001600160a01b0382166004820152602401610717565b600154604051636939560f60e11b81526001600160a01b0383811660048301529091169063d272ac1e90602401602060405180830381865afa158015610828573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061084c9190611372565b600160146101000a8154816001600160601b0302191690836001600160601b0316021790555050565b60008060008051602061147c83398151915262ffffff84166000908152602091909152604090819020600101549051631bbffab160e21b8152600160c81b90910463ffffffff16600482015273__$5f476116ae21c5294e0c0761c07efa7e1c$__90636effeac490602401602060405180830381865af41580156108fd573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610921919061139b565b1192915050565b6001546040516330b8415f60e01b8152600160a01b9091046001600160601b0316600482015260009073__$6facc32ab6029a5f5de2a1d5e55ea9da0e$__906330b8415f90602401602060405180830381865af415801561098d573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906109b19190611350565b15610a3157600154604051631c5da14d60e11b8152600160a01b82046001600160601b031660048201526001600160a01b03909116906338bb429a90602401602060405180830381865afa158015610a0d573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906104cc91906113b4565b506002546001600160a01b031690565b73__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__63a123b37c610a63610447565b6040516001600160e01b031960e084901b16815262ffffff9091166004820152602401602060405180830381865af4158015610aa3573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610ac791906113d1565b60008051602061145c8339815191528054600160401b900460ff1680610afb5750805467ffffffffffffffff808416911610155b15610b195760405163f92ee8a960e01b815260040160405180910390fd5b805468ffffffffffffffffff191667ffffffffffffffff831617600160401b178155610b458585610d9f565b610b4e83611040565b805460ff60401b1916815560405167ffffffffffffffff831681527fc7f505b2f371ae2175ee4913f4499e1f2633a7b5936321eed1cdaeb6115181d2906020015b60405180910390a15050505050565b60006104cc60008051602061145c8339815191525467ffffffffffffffff1690565b600060008051602061147c8339815191526001018281548110610be557610be56113fb565b90600052602060002090600a91828204019190066003029054906101000a900462ffffff169050919050565b6000610c1b610447565b60405163c9e66e2960e01b815262ffffff909116600482015273__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__9063c9e66e2990602401602060405180830381865af4158015610c70573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906104cc9190611411565b60008051602061145c8339815191528054600160401b810460ff16159067ffffffffffffffff16600081158015610cc85750825b905060008267ffffffffffffffff166001148015610ce55750303b155b905081158015610cf3575080155b15610d115760405163f92ee8a960e01b815260040160405180910390fd5b845467ffffffffffffffff191660011785558315610d3b57845460ff60401b1916600160401b1785555b610d458888610d9f565b610d4f8787611040565b8315610d9557845460ff60401b19168555604051600181527fc7f505b2f371ae2175ee4913f4499e1f2633a7b5936321eed1cdaeb6115181d29060200160405180910390a15b5050505050505050565b610da7611044565b60008051602061147c8339815191526000610dd860008051602061145c8339815191525467ffffffffffffffff1690565b90506000610de4610447565b90508167ffffffffffffffff16600103610e125760028301805462ffffff191662ffffff8316179055610e60565b600283015462ffffff90811690821611610e605760405162461bcd60e51b815260206004820152600f60248201526e24a72b20a624a2102b22a929a4a7a760891b6044820152606401610717565b6001808401805491820181556000908152602090819020600a808404909101805462ffffff808716600394909606939093026101000a858102930219169190911790556040805160a0810182529283526001600160a01b038089168484015287168382015280516356db0c1960e11b81529051606084019273__$d53880c81dc91c20799140d711e5ab8718$__9263adb6183292600480830193928290030181865af4158015610f14573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610f389190611434565b64ffffffffff1681526020014363ffffffff90811690915262ffffff8084166000908152602087815260409182902085518154928701516001600160a01b039081166301000000026001600160b81b0319909416919095161791909117815584820151600190910180546060870151608090970151909516600160c81b0263ffffffff60c81b1964ffffffffff909716600160a01b026001600160c81b031990961692909416919091179390931793909316179055517fad0a0fc10465a8dd9da3ad5f43e1a7fff4b4578551c76f0ae8deb844f0d0bf6890610b8f9083908890889062ffffff9390931683526001600160a01b03918216602084015216604082015260600190565b6101165b60008051602061145c83398151915254600160401b900460ff1661107b57604051631afcd79f60e31b815260040160405180910390fd5b565b60006020828403121561108f57600080fd5b81356001600160e01b0319811681146110a757600080fd5b9392505050565b6000815180845260005b818110156110d4576020818501810151868301820152016110b8565b506000602082860101526020601f19601f83011685010191505092915050565b6040815260006001600160601b038085511660408401528060208601511660608401525060ff6040850151166080830152606084015161113860a084018215159052565b5060808401516001600160a01b03811660c08401525060a08401516001600160a01b03811660e08401525060c084015160e061010084015261117e6101208401826110ae565b9050828103602084015261119281856110ae565b95945050505050565b6020815260006110a760208301846110ae565b62ffffff811681146111bf57600080fd5b50565b6000602082840312156111d457600080fd5b81356110a7816111ae565b6001600160a01b03811681146111bf57600080fd5b634e487b7160e01b600052604160045260246000fd5b60008060006060848603121561121f57600080fd5b833561122a816111df565b9250602084013561123a816111df565b9150604084013567ffffffffffffffff8082111561125757600080fd5b818601915086601f83011261126b57600080fd5b81358181111561127d5761127d6111f4565b604051601f8201601f19908116603f011681019083821181831017156112a5576112a56111f4565b816040528281528960208487010111156112be57600080fd5b8260208601602083013760006020848301015280955050505050509250925092565b6000602082840312156112f257600080fd5b5035919050565b60006020828403121561130b57600080fd5b81516110a7816111ae565b600181811c9082168061132a57607f821691505b60208210810361134a57634e487b7160e01b600052602260045260246000fd5b50919050565b60006020828403121561136257600080fd5b815180151581146110a757600080fd5b60006020828403121561138457600080fd5b81516001600160601b03811681146110a757600080fd5b6000602082840312156113ad57600080fd5b5051919050565b6000602082840312156113c657600080fd5b81516110a7816111df565b6000602082840312156113e357600080fd5b815167ffffffffffffffff811681146110a757600080fd5b634e487b7160e01b600052603260045260246000fd5b60006020828403121561142357600080fd5b815160ff811681146110a757600080fd5b60006020828403121561144657600080fd5b815164ffffffffff811681146110a757600080fdfef0c57e16840df040f15088dc2f81fe391c3923bec73e23a9662efc9c229c6a004f61291a8ac3d020d0a7d919a76b8592aa88385744dee3f8b4f3873b969ed900a26469706673582212209687e6508311d6c7b7baeb1cf38d181b3ce770dc84f6206213d4d577dbbbd14364736f6c63430008140033",
499
- "deployedBytecode": "0x608060405234801561001057600080fd5b50600436106101165760003560e01c8063644c45e0116100a2578063a745e3df11610071578063a745e3df146103d3578063b3c65015146103e6578063b88da75914610407578063cde749f41461041a578063cf7a1d771461043457600080fd5b8063644c45e01461034f578063893d20e81461037a578063946dfcfe14610382578063a3f4df7e146103a957600080fd5b806317d7de7c116100e957806317d7de7c146101995780631eff4b22146101c95780634d459c90146101fe5780634f421333146103175780635ab1bd531461032a57600080fd5b806301ffc9a71461011b5780630d8e6e2c1461015d5780630fec111c14610179578063138461e01461018f575b600080fd5b61014861012936600461107d565b6001600160e01b03191660009081526020819052604090205460ff1690565b60405190151581526020015b60405180910390f35b610165610447565b60405162ffffff9091168152602001610154565b6101816104d1565b6040516101549291906110f4565b610197610653565b005b60408051808201909152600b81526a546573745365727669636560a81b60208201525b604051610154919061119b565b6101f07f6548007c3f4340f82f348c576c0ff69f4f529cadd5ad41f96aae61abceeaa30081565b604051908152602001610154565b6102ba61020c3660046111c2565b6040805160a08101825260008082526020820181905291810182905260608101829052608081019190915260008051602061147c83398151915262ffffff92831660009081526020918252604090819020815160a0810183528154958616815263010000009095046001600160a01b03908116938601939093526001015491821690840152600160a01b810464ffffffffff166060840152600160c81b900463ffffffff1660808301525090565b60408051825162ffffff1681526020808401516001600160a01b039081169183019190915283830151169181019190915260608083015164ffffffffff169082015260809182015163ffffffff169181019190915260a001610154565b6101486103253660046111c2565b610875565b6001546001600160a01b03165b6040516001600160a01b039091168152602001610154565b600154600160a01b90046001600160601b03166040516001600160601b039091168152602001610154565b610337610928565b7f4f61291a8ac3d020d0a7d919a76b8592aa88385744dee3f8b4f3873b969ed901546101f0565b6101bc6040518060400160405280600b81526020016a546573745365727669636560a81b81525081565b6101976103e136600461120a565b610a41565b6103ee610b9e565b60405167ffffffffffffffff9091168152602001610154565b6101656104153660046112e0565b610bc0565b610422610c11565b60405160ff9091168152602001610154565b61019761044236600461120a565b610c94565b604051632efe011360e01b815260036004820152600060248201819052604482018190529073__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__90632efe011390606401602060405180830381865af41580156104a8573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906104cc91906112f9565b905090565b6040805160e08101825260008082526020820181905291810182905260608082018390526080820183905260a0820183905260c0820181905290917f6548007c3f4340f82f348c576c0ff69f4f529cadd5ad41f96aae61abceeaa30090506040518060e001604052806105546001546001600160601b03600160a01b9091041690565b6001600160601b0390811682528354908116602083015260ff600160601b820481166040840152600160681b909104161515606082015230608082015260a00161059c610928565b6001600160a01b031681526020018260010180546105b990611316565b80601f01602080910402602001604051908101604052809291908181526020018280546105e590611316565b80156106325780601f1061060757610100808354040283529160200191610632565b820191906000526020600020905b81548152906001019060200180831161061557829003601f168201915b50505050508152506040518060200160405280600081525092509250509091565b6001546040516330b8415f60e01b8152600160a01b9091046001600160601b0316600482015273__$6facc32ab6029a5f5de2a1d5e55ea9da0e$__906330b8415f90602401602060405180830381865af41580156106b5573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906106d99190611350565b15610720576001546040516316322c0f60e31b81526001600160a01b0382166004820152600160a01b9091046001600160601b031660248201526044015b60405180910390fd5b6001546001600160a01b03166107495760405163cf29926160e01b815260040160405180910390fd5b60015460405163c3c5a54760e01b81523060048201819052916001600160a01b03169063c3c5a54790602401602060405180830381865afa158015610792573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906107b69190611350565b6107de576040516372657a5160e01b81526001600160a01b0382166004820152602401610717565b600154604051636939560f60e11b81526001600160a01b0383811660048301529091169063d272ac1e90602401602060405180830381865afa158015610828573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061084c9190611372565b600160146101000a8154816001600160601b0302191690836001600160601b0316021790555050565b60008060008051602061147c83398151915262ffffff84166000908152602091909152604090819020600101549051631bbffab160e21b8152600160c81b90910463ffffffff16600482015273__$5f476116ae21c5294e0c0761c07efa7e1c$__90636effeac490602401602060405180830381865af41580156108fd573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610921919061139b565b1192915050565b6001546040516330b8415f60e01b8152600160a01b9091046001600160601b0316600482015260009073__$6facc32ab6029a5f5de2a1d5e55ea9da0e$__906330b8415f90602401602060405180830381865af415801561098d573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906109b19190611350565b15610a3157600154604051631c5da14d60e11b8152600160a01b82046001600160601b031660048201526001600160a01b03909116906338bb429a90602401602060405180830381865afa158015610a0d573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906104cc91906113b4565b506002546001600160a01b031690565b73__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__63a123b37c610a63610447565b6040516001600160e01b031960e084901b16815262ffffff9091166004820152602401602060405180830381865af4158015610aa3573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610ac791906113d1565b60008051602061145c8339815191528054600160401b900460ff1680610afb5750805467ffffffffffffffff808416911610155b15610b195760405163f92ee8a960e01b815260040160405180910390fd5b805468ffffffffffffffffff191667ffffffffffffffff831617600160401b178155610b458585610d9f565b610b4e83611040565b805460ff60401b1916815560405167ffffffffffffffff831681527fc7f505b2f371ae2175ee4913f4499e1f2633a7b5936321eed1cdaeb6115181d2906020015b60405180910390a15050505050565b60006104cc60008051602061145c8339815191525467ffffffffffffffff1690565b600060008051602061147c8339815191526001018281548110610be557610be56113fb565b90600052602060002090600a91828204019190066003029054906101000a900462ffffff169050919050565b6000610c1b610447565b60405163c9e66e2960e01b815262ffffff909116600482015273__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__9063c9e66e2990602401602060405180830381865af4158015610c70573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906104cc9190611411565b60008051602061145c8339815191528054600160401b810460ff16159067ffffffffffffffff16600081158015610cc85750825b905060008267ffffffffffffffff166001148015610ce55750303b155b905081158015610cf3575080155b15610d115760405163f92ee8a960e01b815260040160405180910390fd5b845467ffffffffffffffff191660011785558315610d3b57845460ff60401b1916600160401b1785555b610d458888610d9f565b610d4f8787611040565b8315610d9557845460ff60401b19168555604051600181527fc7f505b2f371ae2175ee4913f4499e1f2633a7b5936321eed1cdaeb6115181d29060200160405180910390a15b5050505050505050565b610da7611044565b60008051602061147c8339815191526000610dd860008051602061145c8339815191525467ffffffffffffffff1690565b90506000610de4610447565b90508167ffffffffffffffff16600103610e125760028301805462ffffff191662ffffff8316179055610e60565b600283015462ffffff90811690821611610e605760405162461bcd60e51b815260206004820152600f60248201526e24a72b20a624a2102b22a929a4a7a760891b6044820152606401610717565b6001808401805491820181556000908152602090819020600a808404909101805462ffffff808716600394909606939093026101000a858102930219169190911790556040805160a0810182529283526001600160a01b038089168484015287168382015280516356db0c1960e11b81529051606084019273__$d53880c81dc91c20799140d711e5ab8718$__9263adb6183292600480830193928290030181865af4158015610f14573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610f389190611434565b64ffffffffff1681526020014363ffffffff90811690915262ffffff8084166000908152602087815260409182902085518154928701516001600160a01b039081166301000000026001600160b81b0319909416919095161791909117815584820151600190910180546060870151608090970151909516600160c81b0263ffffffff60c81b1964ffffffffff909716600160a01b026001600160c81b031990961692909416919091179390931793909316179055517fad0a0fc10465a8dd9da3ad5f43e1a7fff4b4578551c76f0ae8deb844f0d0bf6890610b8f9083908890889062ffffff9390931683526001600160a01b03918216602084015216604082015260600190565b6101165b60008051602061145c83398151915254600160401b900460ff1661107b57604051631afcd79f60e31b815260040160405180910390fd5b565b60006020828403121561108f57600080fd5b81356001600160e01b0319811681146110a757600080fd5b9392505050565b6000815180845260005b818110156110d4576020818501810151868301820152016110b8565b506000602082860101526020601f19601f83011685010191505092915050565b6040815260006001600160601b038085511660408401528060208601511660608401525060ff6040850151166080830152606084015161113860a084018215159052565b5060808401516001600160a01b03811660c08401525060a08401516001600160a01b03811660e08401525060c084015160e061010084015261117e6101208401826110ae565b9050828103602084015261119281856110ae565b95945050505050565b6020815260006110a760208301846110ae565b62ffffff811681146111bf57600080fd5b50565b6000602082840312156111d457600080fd5b81356110a7816111ae565b6001600160a01b03811681146111bf57600080fd5b634e487b7160e01b600052604160045260246000fd5b60008060006060848603121561121f57600080fd5b833561122a816111df565b9250602084013561123a816111df565b9150604084013567ffffffffffffffff8082111561125757600080fd5b818601915086601f83011261126b57600080fd5b81358181111561127d5761127d6111f4565b604051601f8201601f19908116603f011681019083821181831017156112a5576112a56111f4565b816040528281528960208487010111156112be57600080fd5b8260208601602083013760006020848301015280955050505050509250925092565b6000602082840312156112f257600080fd5b5035919050565b60006020828403121561130b57600080fd5b81516110a7816111ae565b600181811c9082168061132a57607f821691505b60208210810361134a57634e487b7160e01b600052602260045260246000fd5b50919050565b60006020828403121561136257600080fd5b815180151581146110a757600080fd5b60006020828403121561138457600080fd5b81516001600160601b03811681146110a757600080fd5b6000602082840312156113ad57600080fd5b5051919050565b6000602082840312156113c657600080fd5b81516110a7816111df565b6000602082840312156113e357600080fd5b815167ffffffffffffffff811681146110a757600080fd5b634e487b7160e01b600052603260045260246000fd5b60006020828403121561142357600080fd5b815160ff811681146110a757600080fd5b60006020828403121561144657600080fd5b815164ffffffffff811681146110a757600080fdfef0c57e16840df040f15088dc2f81fe391c3923bec73e23a9662efc9c229c6a004f61291a8ac3d020d0a7d919a76b8592aa88385744dee3f8b4f3873b969ed900a26469706673582212209687e6508311d6c7b7baeb1cf38d181b3ce770dc84f6206213d4d577dbbbd14364736f6c63430008140033",
498
+ "bytecode": "0x60806040523480156200001157600080fd5b5060405162001dc938038062001dc983398101604081905262000034916200063e565b6301ffc9a760e01b60009081526020527f67be87c3ff9960ca1e9cfac5cab2ff4747269cf9ed20c9b7306235ac35a491c5805460ff19166001179055600280546001600160a01b031916331790556200008c620000a1565b62000098838262000155565b505050620008e8565b7ff0c57e16840df040f15088dc2f81fe391c3923bec73e23a9662efc9c229c6a00805468010000000000000000900460ff1615620000f25760405163f92ee8a960e01b815260040160405180910390fd5b80546001600160401b0390811614620001525780546001600160401b0319166001600160401b0390811782556040519081527fc7f505b2f371ae2175ee4913f4499e1f2633a7b5936321eed1cdaeb6115181d29060200160405180910390a15b50565b60006200018060408051808201909152600b81526a546573745365727669636560a81b602082015290565b6200018a62000214565b6040516020016200019d92919062000688565b60408051601f1981840301815291905290506000620001bc84620002a1565b90506000620001d18583603c84888862000315565b631b4612f160e31b60009081526020527ffc58a5a01198e68c5a5d0bcd463f9ab550fc4337b1df271aed6dbb33d25fef25805460ff191660011790555050505050565b600062000220620003e6565b60405163c9e66e2960e01b815262ffffff909116600482015273__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__9063c9e66e2990602401602060405180830381865af415801562000276573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906200029c9190620006e2565b905090565b604051636939560f60e11b81526001600160a01b0382166004820181905260009163d272ac1e90602401602060405180830381865afa158015620002e9573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906200030f91906200070e565b92915050565b6200032182876200046e565b60007f6548007c3f4340f82f348c576c0ff69f4f529cadd5ad41f96aae61abceeaa30080546001600160601b0388166001600160681b0319909116176c0100000000000000000000000060ff8816021760ff60681b19166d010000000000000000000000000086151502178155905060018101620003a08382620007d1565b506303fb044760e21b60009081526020527fb43e4f3791bfcdefa3a0fbe2a5555f8d6490b90e01de0ff40c66f18b49b562c5805460ff1916600117905550505050505050565b604051632efe011360e01b815260036004820152600060248201819052604482018190529073__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__90632efe011390606401602060405180830381865af415801562000448573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906200029c91906200089d565b600280546001600160a01b0319166001600160a01b038416179055620004948162000498565b5050565b6001546001600160a01b031615620004d75760015460405163fcdbf2d960e01b81526001600160a01b0390911660048201526024015b60405180910390fd5b6001600160a01b038116620004ff5760405163f5c4d07d60e01b815260040160405180910390fd5b806001600160a01b03163b600003620005375760405163fdeac91f60e01b81526001600160a01b0382166004820152602401620004ce565b600180546001600160a01b0319166001600160a01b0383169081179091556040516301ffc9a760e01b815263350fb35160e11b60048201526301ffc9a790602401602060405180830381865afa925050508015620005b4575060408051601f3d908101601f19168201909252620005b191810190620008c4565b60015b620005de5760405163fdeac91f60e01b81526001600160a01b0382166004820152602401620004ce565b80620004945760405163fdeac91f60e01b81526001600160a01b0383166004820152602401620004ce565b80516001600160a01b03811681146200062157600080fd5b919050565b80516001600160601b03811681146200062157600080fd5b6000806000606084860312156200065457600080fd5b6200065f8462000609565b92506200066f6020850162000626565b91506200067f6040850162000609565b90509250925092565b604081526000835180604084015260005b81811015620006b8576020818701810151606086840101520162000699565b506000606082850101526060601f19601f83011684010191505060ff831660208301529392505050565b600060208284031215620006f557600080fd5b815160ff811681146200070757600080fd5b9392505050565b6000602082840312156200072157600080fd5b620007078262000626565b634e487b7160e01b600052604160045260246000fd5b600181811c908216806200075757607f821691505b6020821081036200077857634e487b7160e01b600052602260045260246000fd5b50919050565b601f821115620007cc57600081815260208120601f850160051c81016020861015620007a75750805b601f850160051c820191505b81811015620007c857828155600101620007b3565b5050505b505050565b81516001600160401b03811115620007ed57620007ed6200072c565b6200080581620007fe845462000742565b846200077e565b602080601f8311600181146200083d5760008415620008245750858301515b600019600386901b1c1916600185901b178555620007c8565b600085815260208120601f198616915b828110156200086e578886015182559484019460019091019084016200084d565b50858210156200088d5787850151600019600388901b60f8161c191681555b5050505050600190811b01905550565b600060208284031215620008b057600080fd5b815162ffffff811681146200070757600080fd5b600060208284031215620008d757600080fd5b815180151581146200070757600080fd5b6114d180620008f86000396000f3fe608060405234801561001057600080fd5b50600436106101165760003560e01c8063644c45e0116100a2578063a745e3df11610071578063a745e3df146103d3578063b3c65015146103e6578063b88da75914610407578063cde749f41461041a578063cf7a1d771461043457600080fd5b8063644c45e01461034f578063893d20e81461037a578063946dfcfe14610382578063a3f4df7e146103a957600080fd5b806317d7de7c116100e957806317d7de7c146101995780631eff4b22146101c95780634d459c90146101fe5780634f421333146103175780635ab1bd531461032a57600080fd5b806301ffc9a71461011b5780630d8e6e2c1461015d5780630fec111c14610179578063138461e01461018f575b600080fd5b61014861012936600461107d565b6001600160e01b03191660009081526020819052604090205460ff1690565b60405190151581526020015b60405180910390f35b610165610447565b60405162ffffff9091168152602001610154565b6101816104d1565b6040516101549291906110f4565b610197610653565b005b60408051808201909152600b81526a546573745365727669636560a81b60208201525b604051610154919061119b565b6101f07f6548007c3f4340f82f348c576c0ff69f4f529cadd5ad41f96aae61abceeaa30081565b604051908152602001610154565b6102ba61020c3660046111c2565b6040805160a08101825260008082526020820181905291810182905260608101829052608081019190915260008051602061147c83398151915262ffffff92831660009081526020918252604090819020815160a0810183528154958616815263010000009095046001600160a01b03908116938601939093526001015491821690840152600160a01b810464ffffffffff166060840152600160c81b900463ffffffff1660808301525090565b60408051825162ffffff1681526020808401516001600160a01b039081169183019190915283830151169181019190915260608083015164ffffffffff169082015260809182015163ffffffff169181019190915260a001610154565b6101486103253660046111c2565b610875565b6001546001600160a01b03165b6040516001600160a01b039091168152602001610154565b600154600160a01b90046001600160601b03166040516001600160601b039091168152602001610154565b610337610928565b7f4f61291a8ac3d020d0a7d919a76b8592aa88385744dee3f8b4f3873b969ed901546101f0565b6101bc6040518060400160405280600b81526020016a546573745365727669636560a81b81525081565b6101976103e136600461120a565b610a41565b6103ee610b9e565b60405167ffffffffffffffff9091168152602001610154565b6101656104153660046112e0565b610bc0565b610422610c11565b60405160ff9091168152602001610154565b61019761044236600461120a565b610c94565b604051632efe011360e01b815260036004820152600060248201819052604482018190529073__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__90632efe011390606401602060405180830381865af41580156104a8573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906104cc91906112f9565b905090565b6040805160e08101825260008082526020820181905291810182905260608082018390526080820183905260a0820183905260c0820181905290917f6548007c3f4340f82f348c576c0ff69f4f529cadd5ad41f96aae61abceeaa30090506040518060e001604052806105546001546001600160601b03600160a01b9091041690565b6001600160601b0390811682528354908116602083015260ff600160601b820481166040840152600160681b909104161515606082015230608082015260a00161059c610928565b6001600160a01b031681526020018260010180546105b990611316565b80601f01602080910402602001604051908101604052809291908181526020018280546105e590611316565b80156106325780601f1061060757610100808354040283529160200191610632565b820191906000526020600020905b81548152906001019060200180831161061557829003601f168201915b50505050508152506040518060200160405280600081525092509250509091565b6001546040516330b8415f60e01b8152600160a01b9091046001600160601b0316600482015273__$6facc32ab6029a5f5de2a1d5e55ea9da0e$__906330b8415f90602401602060405180830381865af41580156106b5573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906106d99190611350565b15610720576001546040516316322c0f60e31b81526001600160a01b0382166004820152600160a01b9091046001600160601b031660248201526044015b60405180910390fd5b6001546001600160a01b03166107495760405163cf29926160e01b815260040160405180910390fd5b60015460405163c3c5a54760e01b81523060048201819052916001600160a01b03169063c3c5a54790602401602060405180830381865afa158015610792573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906107b69190611350565b6107de576040516372657a5160e01b81526001600160a01b0382166004820152602401610717565b600154604051636939560f60e11b81526001600160a01b0383811660048301529091169063d272ac1e90602401602060405180830381865afa158015610828573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061084c9190611372565b600160146101000a8154816001600160601b0302191690836001600160601b0316021790555050565b60008060008051602061147c83398151915262ffffff84166000908152602091909152604090819020600101549051631bbffab160e21b8152600160c81b90910463ffffffff16600482015273__$5f476116ae21c5294e0c0761c07efa7e1c$__90636effeac490602401602060405180830381865af41580156108fd573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610921919061139b565b1192915050565b6001546040516330b8415f60e01b8152600160a01b9091046001600160601b0316600482015260009073__$6facc32ab6029a5f5de2a1d5e55ea9da0e$__906330b8415f90602401602060405180830381865af415801561098d573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906109b19190611350565b15610a3157600154604051631c5da14d60e11b8152600160a01b82046001600160601b031660048201526001600160a01b03909116906338bb429a90602401602060405180830381865afa158015610a0d573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906104cc91906113b4565b506002546001600160a01b031690565b73__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__63a123b37c610a63610447565b6040516001600160e01b031960e084901b16815262ffffff9091166004820152602401602060405180830381865af4158015610aa3573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610ac791906113d1565b60008051602061145c8339815191528054600160401b900460ff1680610afb5750805467ffffffffffffffff808416911610155b15610b195760405163f92ee8a960e01b815260040160405180910390fd5b805468ffffffffffffffffff191667ffffffffffffffff831617600160401b178155610b458585610d9f565b610b4e83611040565b805460ff60401b1916815560405167ffffffffffffffff831681527fc7f505b2f371ae2175ee4913f4499e1f2633a7b5936321eed1cdaeb6115181d2906020015b60405180910390a15050505050565b60006104cc60008051602061145c8339815191525467ffffffffffffffff1690565b600060008051602061147c8339815191526001018281548110610be557610be56113fb565b90600052602060002090600a91828204019190066003029054906101000a900462ffffff169050919050565b6000610c1b610447565b60405163c9e66e2960e01b815262ffffff909116600482015273__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__9063c9e66e2990602401602060405180830381865af4158015610c70573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906104cc9190611411565b60008051602061145c8339815191528054600160401b810460ff16159067ffffffffffffffff16600081158015610cc85750825b905060008267ffffffffffffffff166001148015610ce55750303b155b905081158015610cf3575080155b15610d115760405163f92ee8a960e01b815260040160405180910390fd5b845467ffffffffffffffff191660011785558315610d3b57845460ff60401b1916600160401b1785555b610d458888610d9f565b610d4f8787611040565b8315610d9557845460ff60401b19168555604051600181527fc7f505b2f371ae2175ee4913f4499e1f2633a7b5936321eed1cdaeb6115181d29060200160405180910390a15b5050505050505050565b610da7611044565b60008051602061147c8339815191526000610dd860008051602061145c8339815191525467ffffffffffffffff1690565b90506000610de4610447565b90508167ffffffffffffffff16600103610e125760028301805462ffffff191662ffffff8316179055610e60565b600283015462ffffff90811690821611610e605760405162461bcd60e51b815260206004820152600f60248201526e24a72b20a624a2102b22a929a4a7a760891b6044820152606401610717565b6001808401805491820181556000908152602090819020600a808404909101805462ffffff808716600394909606939093026101000a858102930219169190911790556040805160a0810182529283526001600160a01b038089168484015287168382015280516356db0c1960e11b81529051606084019273__$d53880c81dc91c20799140d711e5ab8718$__9263adb6183292600480830193928290030181865af4158015610f14573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610f389190611434565b64ffffffffff1681526020014363ffffffff90811690915262ffffff8084166000908152602087815260409182902085518154928701516001600160a01b039081166301000000026001600160b81b0319909416919095161791909117815584820151600190910180546060870151608090970151909516600160c81b0263ffffffff60c81b1964ffffffffff909716600160a01b026001600160c81b031990961692909416919091179390931793909316179055517fad0a0fc10465a8dd9da3ad5f43e1a7fff4b4578551c76f0ae8deb844f0d0bf6890610b8f9083908890889062ffffff9390931683526001600160a01b03918216602084015216604082015260600190565b6101165b60008051602061145c83398151915254600160401b900460ff1661107b57604051631afcd79f60e31b815260040160405180910390fd5b565b60006020828403121561108f57600080fd5b81356001600160e01b0319811681146110a757600080fd5b9392505050565b6000815180845260005b818110156110d4576020818501810151868301820152016110b8565b506000602082860101526020601f19601f83011685010191505092915050565b6040815260006001600160601b038085511660408401528060208601511660608401525060ff6040850151166080830152606084015161113860a084018215159052565b5060808401516001600160a01b03811660c08401525060a08401516001600160a01b03811660e08401525060c084015160e061010084015261117e6101208401826110ae565b9050828103602084015261119281856110ae565b95945050505050565b6020815260006110a760208301846110ae565b62ffffff811681146111bf57600080fd5b50565b6000602082840312156111d457600080fd5b81356110a7816111ae565b6001600160a01b03811681146111bf57600080fd5b634e487b7160e01b600052604160045260246000fd5b60008060006060848603121561121f57600080fd5b833561122a816111df565b9250602084013561123a816111df565b9150604084013567ffffffffffffffff8082111561125757600080fd5b818601915086601f83011261126b57600080fd5b81358181111561127d5761127d6111f4565b604051601f8201601f19908116603f011681019083821181831017156112a5576112a56111f4565b816040528281528960208487010111156112be57600080fd5b8260208601602083013760006020848301015280955050505050509250925092565b6000602082840312156112f257600080fd5b5035919050565b60006020828403121561130b57600080fd5b81516110a7816111ae565b600181811c9082168061132a57607f821691505b60208210810361134a57634e487b7160e01b600052602260045260246000fd5b50919050565b60006020828403121561136257600080fd5b815180151581146110a757600080fd5b60006020828403121561138457600080fd5b81516001600160601b03811681146110a757600080fd5b6000602082840312156113ad57600080fd5b5051919050565b6000602082840312156113c657600080fd5b81516110a7816111df565b6000602082840312156113e357600080fd5b815167ffffffffffffffff811681146110a757600080fd5b634e487b7160e01b600052603260045260246000fd5b60006020828403121561142357600080fd5b815160ff811681146110a757600080fd5b60006020828403121561144657600080fd5b815164ffffffffff811681146110a757600080fdfef0c57e16840df040f15088dc2f81fe391c3923bec73e23a9662efc9c229c6a004f61291a8ac3d020d0a7d919a76b8592aa88385744dee3f8b4f3873b969ed900a26469706673582212202d7c931253b76efecaa2008bc914753099fe3144d0aad01c05e2f284ffd72f2464736f6c63430008140033",
499
+ "deployedBytecode": "0x608060405234801561001057600080fd5b50600436106101165760003560e01c8063644c45e0116100a2578063a745e3df11610071578063a745e3df146103d3578063b3c65015146103e6578063b88da75914610407578063cde749f41461041a578063cf7a1d771461043457600080fd5b8063644c45e01461034f578063893d20e81461037a578063946dfcfe14610382578063a3f4df7e146103a957600080fd5b806317d7de7c116100e957806317d7de7c146101995780631eff4b22146101c95780634d459c90146101fe5780634f421333146103175780635ab1bd531461032a57600080fd5b806301ffc9a71461011b5780630d8e6e2c1461015d5780630fec111c14610179578063138461e01461018f575b600080fd5b61014861012936600461107d565b6001600160e01b03191660009081526020819052604090205460ff1690565b60405190151581526020015b60405180910390f35b610165610447565b60405162ffffff9091168152602001610154565b6101816104d1565b6040516101549291906110f4565b610197610653565b005b60408051808201909152600b81526a546573745365727669636560a81b60208201525b604051610154919061119b565b6101f07f6548007c3f4340f82f348c576c0ff69f4f529cadd5ad41f96aae61abceeaa30081565b604051908152602001610154565b6102ba61020c3660046111c2565b6040805160a08101825260008082526020820181905291810182905260608101829052608081019190915260008051602061147c83398151915262ffffff92831660009081526020918252604090819020815160a0810183528154958616815263010000009095046001600160a01b03908116938601939093526001015491821690840152600160a01b810464ffffffffff166060840152600160c81b900463ffffffff1660808301525090565b60408051825162ffffff1681526020808401516001600160a01b039081169183019190915283830151169181019190915260608083015164ffffffffff169082015260809182015163ffffffff169181019190915260a001610154565b6101486103253660046111c2565b610875565b6001546001600160a01b03165b6040516001600160a01b039091168152602001610154565b600154600160a01b90046001600160601b03166040516001600160601b039091168152602001610154565b610337610928565b7f4f61291a8ac3d020d0a7d919a76b8592aa88385744dee3f8b4f3873b969ed901546101f0565b6101bc6040518060400160405280600b81526020016a546573745365727669636560a81b81525081565b6101976103e136600461120a565b610a41565b6103ee610b9e565b60405167ffffffffffffffff9091168152602001610154565b6101656104153660046112e0565b610bc0565b610422610c11565b60405160ff9091168152602001610154565b61019761044236600461120a565b610c94565b604051632efe011360e01b815260036004820152600060248201819052604482018190529073__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__90632efe011390606401602060405180830381865af41580156104a8573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906104cc91906112f9565b905090565b6040805160e08101825260008082526020820181905291810182905260608082018390526080820183905260a0820183905260c0820181905290917f6548007c3f4340f82f348c576c0ff69f4f529cadd5ad41f96aae61abceeaa30090506040518060e001604052806105546001546001600160601b03600160a01b9091041690565b6001600160601b0390811682528354908116602083015260ff600160601b820481166040840152600160681b909104161515606082015230608082015260a00161059c610928565b6001600160a01b031681526020018260010180546105b990611316565b80601f01602080910402602001604051908101604052809291908181526020018280546105e590611316565b80156106325780601f1061060757610100808354040283529160200191610632565b820191906000526020600020905b81548152906001019060200180831161061557829003601f168201915b50505050508152506040518060200160405280600081525092509250509091565b6001546040516330b8415f60e01b8152600160a01b9091046001600160601b0316600482015273__$6facc32ab6029a5f5de2a1d5e55ea9da0e$__906330b8415f90602401602060405180830381865af41580156106b5573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906106d99190611350565b15610720576001546040516316322c0f60e31b81526001600160a01b0382166004820152600160a01b9091046001600160601b031660248201526044015b60405180910390fd5b6001546001600160a01b03166107495760405163cf29926160e01b815260040160405180910390fd5b60015460405163c3c5a54760e01b81523060048201819052916001600160a01b03169063c3c5a54790602401602060405180830381865afa158015610792573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906107b69190611350565b6107de576040516372657a5160e01b81526001600160a01b0382166004820152602401610717565b600154604051636939560f60e11b81526001600160a01b0383811660048301529091169063d272ac1e90602401602060405180830381865afa158015610828573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061084c9190611372565b600160146101000a8154816001600160601b0302191690836001600160601b0316021790555050565b60008060008051602061147c83398151915262ffffff84166000908152602091909152604090819020600101549051631bbffab160e21b8152600160c81b90910463ffffffff16600482015273__$5f476116ae21c5294e0c0761c07efa7e1c$__90636effeac490602401602060405180830381865af41580156108fd573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610921919061139b565b1192915050565b6001546040516330b8415f60e01b8152600160a01b9091046001600160601b0316600482015260009073__$6facc32ab6029a5f5de2a1d5e55ea9da0e$__906330b8415f90602401602060405180830381865af415801561098d573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906109b19190611350565b15610a3157600154604051631c5da14d60e11b8152600160a01b82046001600160601b031660048201526001600160a01b03909116906338bb429a90602401602060405180830381865afa158015610a0d573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906104cc91906113b4565b506002546001600160a01b031690565b73__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__63a123b37c610a63610447565b6040516001600160e01b031960e084901b16815262ffffff9091166004820152602401602060405180830381865af4158015610aa3573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610ac791906113d1565b60008051602061145c8339815191528054600160401b900460ff1680610afb5750805467ffffffffffffffff808416911610155b15610b195760405163f92ee8a960e01b815260040160405180910390fd5b805468ffffffffffffffffff191667ffffffffffffffff831617600160401b178155610b458585610d9f565b610b4e83611040565b805460ff60401b1916815560405167ffffffffffffffff831681527fc7f505b2f371ae2175ee4913f4499e1f2633a7b5936321eed1cdaeb6115181d2906020015b60405180910390a15050505050565b60006104cc60008051602061145c8339815191525467ffffffffffffffff1690565b600060008051602061147c8339815191526001018281548110610be557610be56113fb565b90600052602060002090600a91828204019190066003029054906101000a900462ffffff169050919050565b6000610c1b610447565b60405163c9e66e2960e01b815262ffffff909116600482015273__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__9063c9e66e2990602401602060405180830381865af4158015610c70573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906104cc9190611411565b60008051602061145c8339815191528054600160401b810460ff16159067ffffffffffffffff16600081158015610cc85750825b905060008267ffffffffffffffff166001148015610ce55750303b155b905081158015610cf3575080155b15610d115760405163f92ee8a960e01b815260040160405180910390fd5b845467ffffffffffffffff191660011785558315610d3b57845460ff60401b1916600160401b1785555b610d458888610d9f565b610d4f8787611040565b8315610d9557845460ff60401b19168555604051600181527fc7f505b2f371ae2175ee4913f4499e1f2633a7b5936321eed1cdaeb6115181d29060200160405180910390a15b5050505050505050565b610da7611044565b60008051602061147c8339815191526000610dd860008051602061145c8339815191525467ffffffffffffffff1690565b90506000610de4610447565b90508167ffffffffffffffff16600103610e125760028301805462ffffff191662ffffff8316179055610e60565b600283015462ffffff90811690821611610e605760405162461bcd60e51b815260206004820152600f60248201526e24a72b20a624a2102b22a929a4a7a760891b6044820152606401610717565b6001808401805491820181556000908152602090819020600a808404909101805462ffffff808716600394909606939093026101000a858102930219169190911790556040805160a0810182529283526001600160a01b038089168484015287168382015280516356db0c1960e11b81529051606084019273__$d53880c81dc91c20799140d711e5ab8718$__9263adb6183292600480830193928290030181865af4158015610f14573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610f389190611434565b64ffffffffff1681526020014363ffffffff90811690915262ffffff8084166000908152602087815260409182902085518154928701516001600160a01b039081166301000000026001600160b81b0319909416919095161791909117815584820151600190910180546060870151608090970151909516600160c81b0263ffffffff60c81b1964ffffffffff909716600160a01b026001600160c81b031990961692909416919091179390931793909316179055517fad0a0fc10465a8dd9da3ad5f43e1a7fff4b4578551c76f0ae8deb844f0d0bf6890610b8f9083908890889062ffffff9390931683526001600160a01b03918216602084015216604082015260600190565b6101165b60008051602061145c83398151915254600160401b900460ff1661107b57604051631afcd79f60e31b815260040160405180910390fd5b565b60006020828403121561108f57600080fd5b81356001600160e01b0319811681146110a757600080fd5b9392505050565b6000815180845260005b818110156110d4576020818501810151868301820152016110b8565b506000602082860101526020601f19601f83011685010191505092915050565b6040815260006001600160601b038085511660408401528060208601511660608401525060ff6040850151166080830152606084015161113860a084018215159052565b5060808401516001600160a01b03811660c08401525060a08401516001600160a01b03811660e08401525060c084015160e061010084015261117e6101208401826110ae565b9050828103602084015261119281856110ae565b95945050505050565b6020815260006110a760208301846110ae565b62ffffff811681146111bf57600080fd5b50565b6000602082840312156111d457600080fd5b81356110a7816111ae565b6001600160a01b03811681146111bf57600080fd5b634e487b7160e01b600052604160045260246000fd5b60008060006060848603121561121f57600080fd5b833561122a816111df565b9250602084013561123a816111df565b9150604084013567ffffffffffffffff8082111561125757600080fd5b818601915086601f83011261126b57600080fd5b81358181111561127d5761127d6111f4565b604051601f8201601f19908116603f011681019083821181831017156112a5576112a56111f4565b816040528281528960208487010111156112be57600080fd5b8260208601602083013760006020848301015280955050505050509250925092565b6000602082840312156112f257600080fd5b5035919050565b60006020828403121561130b57600080fd5b81516110a7816111ae565b600181811c9082168061132a57607f821691505b60208210810361134a57634e487b7160e01b600052602260045260246000fd5b50919050565b60006020828403121561136257600080fd5b815180151581146110a757600080fd5b60006020828403121561138457600080fd5b81516001600160601b03811681146110a757600080fd5b6000602082840312156113ad57600080fd5b5051919050565b6000602082840312156113c657600080fd5b81516110a7816111df565b6000602082840312156113e357600080fd5b815167ffffffffffffffff811681146110a757600080fd5b634e487b7160e01b600052603260045260246000fd5b60006020828403121561142357600080fd5b815160ff811681146110a757600080fd5b60006020828403121561144657600080fd5b815164ffffffffff811681146110a757600080fdfef0c57e16840df040f15088dc2f81fe391c3923bec73e23a9662efc9c229c6a004f61291a8ac3d020d0a7d919a76b8592aa88385744dee3f8b4f3873b969ed900a26469706673582212202d7c931253b76efecaa2008bc914753099fe3144d0aad01c05e2f284ffd72f2464736f6c63430008140033",
500
500
  "linkReferences": {
501
501
  "contracts/types/Blocknumber.sol": {
502
502
  "BlocknumberLib": [
503
503
  {
504
504
  "length": 20,
505
- "start": 4367
505
+ "start": 4539
506
506
  }
507
507
  ]
508
508
  },
@@ -510,11 +510,11 @@
510
510
  "NftIdLib": [
511
511
  {
512
512
  "length": 20,
513
- "start": 3783
513
+ "start": 3955
514
514
  },
515
515
  {
516
516
  "length": 20,
517
- "start": 4511
517
+ "start": 4683
518
518
  }
519
519
  ]
520
520
  },
@@ -522,7 +522,7 @@
522
522
  "TimestampLib": [
523
523
  {
524
524
  "length": 20,
525
- "start": 5926
525
+ "start": 6098
526
526
  }
527
527
  ]
528
528
  },
@@ -530,23 +530,23 @@
530
530
  "VersionLib": [
531
531
  {
532
532
  "length": 20,
533
- "start": 555
533
+ "start": 571
534
534
  },
535
535
  {
536
536
  "length": 20,
537
- "start": 905
537
+ "start": 1037
538
538
  },
539
539
  {
540
540
  "length": 20,
541
- "start": 3258
541
+ "start": 3430
542
542
  },
543
543
  {
544
544
  "length": 20,
545
- "start": 4751
545
+ "start": 4923
546
546
  },
547
547
  {
548
548
  "length": 20,
549
- "start": 5250
549
+ "start": 5422
550
550
  }
551
551
  ]
552
552
  }
@@ -1,4 +1,4 @@
1
1
  {
2
2
  "_format": "hh-sol-dbg-1",
3
- "buildInfo": "../../../build-info/22ace16a46acabda891a4eae781c3ca6.json"
3
+ "buildInfo": "../../../build-info/c520e33bf963a0266cb4c3e3da195de4.json"
4
4
  }
@@ -1,4 +1,4 @@
1
1
  {
2
2
  "_format": "hh-sol-dbg-1",
3
- "buildInfo": "../../../build-info/22ace16a46acabda891a4eae781c3ca6.json"
3
+ "buildInfo": "../../../build-info/c520e33bf963a0266cb4c3e3da195de4.json"
4
4
  }
@@ -1,4 +1,4 @@
1
1
  {
2
2
  "_format": "hh-sol-dbg-1",
3
- "buildInfo": "../../../build-info/22ace16a46acabda891a4eae781c3ca6.json"
3
+ "buildInfo": "../../../build-info/c520e33bf963a0266cb4c3e3da195de4.json"
4
4
  }
@@ -1,4 +1,4 @@
1
1
  {
2
2
  "_format": "hh-sol-dbg-1",
3
- "buildInfo": "../../../build-info/22ace16a46acabda891a4eae781c3ca6.json"
3
+ "buildInfo": "../../../build-info/c520e33bf963a0266cb4c3e3da195de4.json"
4
4
  }
@@ -1,4 +1,4 @@
1
1
  {
2
2
  "_format": "hh-sol-dbg-1",
3
- "buildInfo": "../../../build-info/22ace16a46acabda891a4eae781c3ca6.json"
3
+ "buildInfo": "../../../build-info/c520e33bf963a0266cb4c3e3da195de4.json"
4
4
  }
@@ -1,4 +1,4 @@
1
1
  {
2
2
  "_format": "hh-sol-dbg-1",
3
- "buildInfo": "../../../build-info/22ace16a46acabda891a4eae781c3ca6.json"
3
+ "buildInfo": "../../../build-info/c520e33bf963a0266cb4c3e3da195de4.json"
4
4
  }
@@ -1,4 +1,4 @@
1
1
  {
2
2
  "_format": "hh-sol-dbg-1",
3
- "buildInfo": "../../../build-info/22ace16a46acabda891a4eae781c3ca6.json"
3
+ "buildInfo": "../../../build-info/c520e33bf963a0266cb4c3e3da195de4.json"
4
4
  }
@@ -1,4 +1,4 @@
1
1
  {
2
2
  "_format": "hh-sol-dbg-1",
3
- "buildInfo": "../../../build-info/22ace16a46acabda891a4eae781c3ca6.json"
3
+ "buildInfo": "../../../build-info/c520e33bf963a0266cb4c3e3da195de4.json"
4
4
  }
@@ -1,4 +1,4 @@
1
1
  {
2
2
  "_format": "hh-sol-dbg-1",
3
- "buildInfo": "../../../build-info/22ace16a46acabda891a4eae781c3ca6.json"
3
+ "buildInfo": "../../../build-info/c520e33bf963a0266cb4c3e3da195de4.json"
4
4
  }
@@ -1,4 +1,4 @@
1
1
  {
2
2
  "_format": "hh-sol-dbg-1",
3
- "buildInfo": "../../../build-info/22ace16a46acabda891a4eae781c3ca6.json"
3
+ "buildInfo": "../../../build-info/c520e33bf963a0266cb4c3e3da195de4.json"
4
4
  }
@@ -1,4 +1,4 @@
1
1
  {
2
2
  "_format": "hh-sol-dbg-1",
3
- "buildInfo": "../../../build-info/22ace16a46acabda891a4eae781c3ca6.json"
3
+ "buildInfo": "../../../build-info/c520e33bf963a0266cb4c3e3da195de4.json"
4
4
  }
@@ -1,4 +1,4 @@
1
1
  {
2
2
  "_format": "hh-sol-dbg-1",
3
- "buildInfo": "../../../build-info/22ace16a46acabda891a4eae781c3ca6.json"
3
+ "buildInfo": "../../../build-info/c520e33bf963a0266cb4c3e3da195de4.json"
4
4
  }
@@ -1,4 +1,4 @@
1
1
  {
2
2
  "_format": "hh-sol-dbg-1",
3
- "buildInfo": "../../../build-info/22ace16a46acabda891a4eae781c3ca6.json"
3
+ "buildInfo": "../../../build-info/c520e33bf963a0266cb4c3e3da195de4.json"
4
4
  }
@@ -1,4 +1,4 @@
1
1
  {
2
2
  "_format": "hh-sol-dbg-1",
3
- "buildInfo": "../../../build-info/22ace16a46acabda891a4eae781c3ca6.json"
3
+ "buildInfo": "../../../build-info/c520e33bf963a0266cb4c3e3da195de4.json"
4
4
  }
@@ -1,4 +1,4 @@
1
1
  {
2
2
  "_format": "hh-sol-dbg-1",
3
- "buildInfo": "../../../build-info/22ace16a46acabda891a4eae781c3ca6.json"
3
+ "buildInfo": "../../../build-info/c520e33bf963a0266cb4c3e3da195de4.json"
4
4
  }
@@ -1,4 +1,4 @@
1
1
  {
2
2
  "_format": "hh-sol-dbg-1",
3
- "buildInfo": "../../../build-info/22ace16a46acabda891a4eae781c3ca6.json"
3
+ "buildInfo": "../../../build-info/c520e33bf963a0266cb4c3e3da195de4.json"
4
4
  }
@@ -1,4 +1,4 @@
1
1
  {
2
2
  "_format": "hh-sol-dbg-1",
3
- "buildInfo": "../../../build-info/22ace16a46acabda891a4eae781c3ca6.json"
3
+ "buildInfo": "../../../build-info/c520e33bf963a0266cb4c3e3da195de4.json"
4
4
  }
@@ -1,4 +1,4 @@
1
1
  {
2
2
  "_format": "hh-sol-dbg-1",
3
- "buildInfo": "../../../build-info/22ace16a46acabda891a4eae781c3ca6.json"
3
+ "buildInfo": "../../../build-info/c520e33bf963a0266cb4c3e3da195de4.json"
4
4
  }
@@ -85,8 +85,8 @@
85
85
  "type": "function"
86
86
  }
87
87
  ],
88
- "bytecode": "0x61018c61003a600b82828239805160001a60731461002d57634e487b7160e01b600052600060045260246000fd5b30600052607381538281f3fe73000000000000000000000000000000000000000030146080604052600436106100565760003560e01c80632c2f8a671461005b5780636f91962014610083578063ac43d83414610098578063b2466acf146100c9575b600080fd5b61006e610069366004610108565b6100df565b60405190151581526020015b60405180910390f35b61006e61009136600461013b565b60ff161590565b6100ac6100a636600461013b565b60ff1690565b6040516bffffffffffffffffffffffff909116815260200161007a565b61006e6100d736600461013b565b60ff16151590565b600060ff808416908316145b9392505050565b803560ff8116811461010357600080fd5b919050565b6000806040838503121561011b57600080fd5b610124836100f2565b9150610132602084016100f2565b90509250929050565b60006020828403121561014d57600080fd5b6100eb826100f256fea264697066735822122087c0a1882ea3728cc059e9c0ca0fe6e5855441782f34522a7b4a441b773012a964736f6c63430008140033",
89
- "deployedBytecode": "0x73000000000000000000000000000000000000000030146080604052600436106100565760003560e01c80632c2f8a671461005b5780636f91962014610083578063ac43d83414610098578063b2466acf146100c9575b600080fd5b61006e610069366004610108565b6100df565b60405190151581526020015b60405180910390f35b61006e61009136600461013b565b60ff161590565b6100ac6100a636600461013b565b60ff1690565b6040516bffffffffffffffffffffffff909116815260200161007a565b61006e6100d736600461013b565b60ff16151590565b600060ff808416908316145b9392505050565b803560ff8116811461010357600080fd5b919050565b6000806040838503121561011b57600080fd5b610124836100f2565b9150610132602084016100f2565b90509250929050565b60006020828403121561014d57600080fd5b6100eb826100f256fea264697066735822122087c0a1882ea3728cc059e9c0ca0fe6e5855441782f34522a7b4a441b773012a964736f6c63430008140033",
88
+ "bytecode": "0x61018c61003a600b82828239805160001a60731461002d57634e487b7160e01b600052600060045260246000fd5b30600052607381538281f3fe73000000000000000000000000000000000000000030146080604052600436106100565760003560e01c80632c2f8a671461005b5780636f91962014610083578063ac43d83414610098578063b2466acf146100c9575b600080fd5b61006e610069366004610108565b6100df565b60405190151581526020015b60405180910390f35b61006e61009136600461013b565b60ff161590565b6100ac6100a636600461013b565b60ff1690565b6040516bffffffffffffffffffffffff909116815260200161007a565b61006e6100d736600461013b565b60ff16151590565b600060ff808416908316145b9392505050565b803560ff8116811461010357600080fd5b919050565b6000806040838503121561011b57600080fd5b610124836100f2565b9150610132602084016100f2565b90509250929050565b60006020828403121561014d57600080fd5b6100eb826100f256fea26469706673582212204cd4e6f2bb672e5640aaa5a4af92ef3714ca5bf00495f7a3790a03dec2aaa3fc64736f6c63430008140033",
89
+ "deployedBytecode": "0x73000000000000000000000000000000000000000030146080604052600436106100565760003560e01c80632c2f8a671461005b5780636f91962014610083578063ac43d83414610098578063b2466acf146100c9575b600080fd5b61006e610069366004610108565b6100df565b60405190151581526020015b60405180910390f35b61006e61009136600461013b565b60ff161590565b6100ac6100a636600461013b565b60ff1690565b6040516bffffffffffffffffffffffff909116815260200161007a565b61006e6100d736600461013b565b60ff16151590565b600060ff808416908316145b9392505050565b803560ff8116811461010357600080fd5b919050565b6000806040838503121561011b57600080fd5b610124836100f2565b9150610132602084016100f2565b90509250929050565b60006020828403121561014d57600080fd5b6100eb826100f256fea26469706673582212204cd4e6f2bb672e5640aaa5a4af92ef3714ca5bf00495f7a3790a03dec2aaa3fc64736f6c63430008140033",
90
90
  "linkReferences": {},
91
91
  "deployedLinkReferences": {}
92
92
  }
@@ -1,4 +1,4 @@
1
1
  {
2
2
  "_format": "hh-sol-dbg-1",
3
- "buildInfo": "../../../build-info/22ace16a46acabda891a4eae781c3ca6.json"
3
+ "buildInfo": "../../../build-info/c520e33bf963a0266cb4c3e3da195de4.json"
4
4
  }
@@ -1,4 +1,4 @@
1
1
  {
2
2
  "_format": "hh-sol-dbg-1",
3
- "buildInfo": "../../../build-info/22ace16a46acabda891a4eae781c3ca6.json"
3
+ "buildInfo": "../../../build-info/c520e33bf963a0266cb4c3e3da195de4.json"
4
4
  }
@@ -1,4 +1,4 @@
1
1
  {
2
2
  "_format": "hh-sol-dbg-1",
3
- "buildInfo": "../../../build-info/22ace16a46acabda891a4eae781c3ca6.json"
3
+ "buildInfo": "../../../build-info/c520e33bf963a0266cb4c3e3da195de4.json"
4
4
  }
@@ -1,4 +1,4 @@
1
1
  {
2
2
  "_format": "hh-sol-dbg-1",
3
- "buildInfo": "../../../build-info/22ace16a46acabda891a4eae781c3ca6.json"
3
+ "buildInfo": "../../../build-info/c520e33bf963a0266cb4c3e3da195de4.json"
4
4
  }
@@ -1,4 +1,4 @@
1
1
  {
2
2
  "_format": "hh-sol-dbg-1",
3
- "buildInfo": "../../../build-info/22ace16a46acabda891a4eae781c3ca6.json"
3
+ "buildInfo": "../../../build-info/c520e33bf963a0266cb4c3e3da195de4.json"
4
4
  }
@@ -24,10 +24,12 @@ abstract contract BaseComponent is
24
24
  address internal _wallet;
25
25
  IERC20Metadata internal _token;
26
26
  IInstance internal _instance;
27
+ NftId internal _productNftId;
27
28
 
28
29
  constructor(
29
30
  address registry,
30
31
  NftId instanceNftId,
32
+ NftId productNftId,
31
33
  address token,
32
34
  ObjectType componentType,
33
35
  bool isInterceptor,
@@ -47,6 +49,7 @@ abstract contract BaseComponent is
47
49
  _componentOwnerService = _instance.getComponentOwnerService();
48
50
  _wallet = address(this);
49
51
  _token = IERC20Metadata(token);
52
+ _productNftId = productNftId;
50
53
 
51
54
  _registerInterface(type(IBaseComponent).interfaceId);
52
55
  }
@@ -69,11 +72,15 @@ abstract contract BaseComponent is
69
72
  return _wallet;
70
73
  }
71
74
 
72
- function getToken() external view override returns (IERC20Metadata token) {
75
+ function getToken() public view override returns (IERC20Metadata token) {
73
76
  return _token;
74
77
  }
75
78
 
76
- function getInstance() external view override returns (IInstance instance) {
79
+ function getInstance() public view override returns (IInstance instance) {
77
80
  return _instance;
78
81
  }
82
+
83
+ function getProductNftId() public view override returns (NftId productNftId) {
84
+ return _productNftId;
85
+ }
79
86
  }
@@ -4,19 +4,23 @@ pragma solidity ^0.8.19;
4
4
  import {DISTRIBUTION} from "../types/ObjectType.sol";
5
5
  import {IDistributionService} from "../instance/service/IDistributionService.sol";
6
6
  import {IProductService} from "../instance/service/IProductService.sol";
7
- import {NftId} from "../types/NftId.sol";
7
+ import {NftId, zeroNftId, NftIdLib} from "../types/NftId.sol";
8
8
  import {ReferralId} from "../types/Referral.sol";
9
9
  import {Fee, FeeLib} from "../types/Fee.sol";
10
10
  import {BaseComponent} from "./BaseComponent.sol";
11
11
  import {IDistributionComponent} from "./IDistributionComponent.sol";
12
12
  import {IRegistry} from "../registry/IRegistry.sol";
13
13
  import {IRegisterable} from "../shared/IRegisterable.sol";
14
+ import {ISetup} from "../instance/module/ISetup.sol";
14
15
  import {Registerable} from "../shared/Registerable.sol";
16
+ import {TokenHandler} from "../shared/TokenHandler.sol";
17
+ import {InstanceReader} from "../instance/InstanceReader.sol";
15
18
 
16
19
  contract Distribution is
17
20
  BaseComponent,
18
21
  IDistributionComponent
19
22
  {
23
+ using NftIdLib for NftId;
20
24
 
21
25
  Fee internal _initialDistributionFee;
22
26
  bool internal _isVerifying;
@@ -34,19 +38,21 @@ contract Distribution is
34
38
  constructor(
35
39
  address registry,
36
40
  NftId instanceNftId,
41
+ NftId productNftId,
37
42
  // TODO refactor into tokenNftId
38
43
  address token,
39
44
  bool verifying,
40
45
  Fee memory distributionFee,
41
46
  address initialOwner
42
47
  )
43
- BaseComponent(registry, instanceNftId, token, DISTRIBUTION(), true, initialOwner)
48
+ BaseComponent(registry, instanceNftId, productNftId, token, DISTRIBUTION(), true, initialOwner)
44
49
  {
45
50
  _isVerifying = verifying;
46
51
  _initialDistributionFee = distributionFee;
47
52
 
48
- _distributionService = _instance.getDistributionService();
49
- _productService = _instance.getProductService();
53
+ // TODO: reactivate when services are available again
54
+ // _distributionService = _instance.getDistributionService();
55
+ // _productService = _instance.getProductService();
50
56
 
51
57
  _registerInterface(type(IDistributionComponent).interfaceId);
52
58
  }
@@ -70,7 +76,8 @@ contract Distribution is
70
76
  virtual override
71
77
  returns (uint256 feeAmount)
72
78
  {
73
- Fee memory fee = getDistributionFee();
79
+ ISetup.DistributionSetupInfo memory setupInfo = getSetupInfo();
80
+ Fee memory fee = setupInfo.distributionFee;
74
81
  (feeAmount,) = FeeLib.calculateFee(fee, netPremiumAmount);
75
82
  }
76
83
 
@@ -115,16 +122,20 @@ contract Distribution is
115
122
  return false;
116
123
  }
117
124
 
118
- /// @dev default distribution fee, ie when not using any valid referralId
119
- function getDistributionFee() public view returns (Fee memory distributionFee) {
120
- NftId productNftId = _instance.getProductNftId(getNftId());
121
- if (_instance.hasTreasuryInfo(productNftId)) {
122
- return _instance.getTreasuryInfo(productNftId).distributionFee;
123
- } else {
124
- return _initialDistributionFee;
125
- }
126
- }
125
+ function getSetupInfo() public view returns (ISetup.DistributionSetupInfo memory setupInfo) {
126
+ if (getNftId().eq(zeroNftId())) {
127
+ return ISetup.DistributionSetupInfo(
128
+ _productNftId,
129
+ TokenHandler(address(0)),
130
+ _initialDistributionFee,
131
+ _isVerifying,
132
+ address(0)
133
+ );
134
+ }
127
135
 
136
+ InstanceReader reader = _instance.getInstanceReader();
137
+ return reader.getDistributionSetupInfo(getNftId());
138
+ }
128
139
 
129
140
  /// @dev returns true iff the component needs to be called when selling/renewing policis
130
141
  function isVerifying() external view returns (bool verifying) {
@@ -4,9 +4,10 @@ pragma solidity ^0.8.20;
4
4
  import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
5
5
 
6
6
  import {IRegisterable} from "../shared/IRegisterable.sol";
7
- import {IInstanceLinked} from "../instance/IInstanceLinked.sol";
7
+ import {IInstance} from "../instance/IInstance.sol";
8
+ import {NftId} from "../types/NftId.sol";
8
9
 
9
- interface IBaseComponent is IRegisterable, IInstanceLinked {
10
+ interface IBaseComponent is IRegisterable {
10
11
 
11
12
  function lock() external;
12
13
 
@@ -16,4 +17,8 @@ interface IBaseComponent is IRegisterable, IInstanceLinked {
16
17
 
17
18
  function getWallet() external view returns (address walletAddress);
18
19
 
20
+ function getInstance() external view returns (IInstance instance);
21
+
22
+ function getProductNftId() external view returns (NftId productNftId);
23
+
19
24
  }
@@ -38,9 +38,6 @@ interface IDistributionComponent {
38
38
  /// @dev returns true iff the referral id is valid
39
39
  function referralIsValid(ReferralId referralId) external view returns (bool isValid);
40
40
 
41
- /// @dev default distribution fee, ie when not using any valid referralId
42
- function getDistributionFee() external view returns (Fee memory distributionFee);
43
-
44
41
  /// @dev returns true iff the component needs to be called when selling/renewing policis
45
42
  function isVerifying() external view returns (bool verifying);
46
43
  }
@@ -59,6 +59,4 @@ interface IPoolComponent {
59
59
 
60
60
  function getCollateralizationLevel() external view returns (UFixed collateralizationLevel);
61
61
 
62
- function getFees() external view returns (Fee memory poolFee, Fee memory stakingFee, Fee memory performanceFee);
63
-
64
62
  }
@@ -29,9 +29,7 @@ interface IProductComponent {
29
29
  bytes memory applicationData
30
30
  ) external view returns (uint256 netPremiumAmount);
31
31
 
32
- function getProductFee() external view returns (Fee memory productFee);
33
- function getProcessingFee() external view returns (Fee memory processingFee);
34
-
32
+
35
33
  function getPoolNftId() external view returns (NftId poolNftId);
36
34
  function getDistributionNftId() external view returns (NftId distributionNftId);
37
35
  }