@etherisc/gif-next 0.0.2-de220d6-949 → 0.0.2-e37834a-021

Sign up to get free protection for your applications and to get access to all the features.
Files changed (286) hide show
  1. package/README.md +71 -0
  2. package/artifacts/contracts/components/BaseComponent.sol/BaseComponent.dbg.json +1 -1
  3. package/artifacts/contracts/components/BaseComponent.sol/BaseComponent.json +80 -41
  4. package/artifacts/contracts/components/Distribution.sol/Distribution.dbg.json +4 -0
  5. package/artifacts/contracts/components/Distribution.sol/Distribution.json +445 -0
  6. package/artifacts/contracts/components/IBaseComponent.sol/IBaseComponent.dbg.json +1 -1
  7. package/artifacts/contracts/components/IBaseComponent.sol/IBaseComponent.json +43 -40
  8. package/artifacts/contracts/components/IDistributionComponent.sol/IDistributionComponent.dbg.json +4 -0
  9. package/artifacts/contracts/components/IDistributionComponent.sol/IDistributionComponent.json +177 -0
  10. package/artifacts/contracts/components/IPoolComponent.sol/IPoolComponent.dbg.json +1 -1
  11. package/artifacts/contracts/components/IPoolComponent.sol/IPoolComponent.json +108 -156
  12. package/artifacts/contracts/components/IProductComponent.sol/IProductComponent.dbg.json +1 -1
  13. package/artifacts/contracts/components/IProductComponent.sol/IProductComponent.json +67 -139
  14. package/artifacts/contracts/components/Pool.sol/Pool.dbg.json +1 -1
  15. package/artifacts/contracts/components/Pool.sol/Pool.json +299 -84
  16. package/artifacts/contracts/components/Product.sol/Product.dbg.json +1 -1
  17. package/artifacts/contracts/components/Product.sol/Product.json +250 -53
  18. package/artifacts/contracts/experiment/errors/Require.sol/Require.dbg.json +1 -1
  19. package/artifacts/contracts/experiment/errors/Revert.sol/Revert.dbg.json +1 -1
  20. package/artifacts/contracts/experiment/errors/Revert.sol/Revert.json +2 -34
  21. package/artifacts/contracts/experiment/inheritance/A.sol/A.dbg.json +1 -1
  22. package/artifacts/contracts/experiment/inheritance/A.sol/AShared.dbg.json +1 -1
  23. package/artifacts/contracts/experiment/inheritance/B.sol/B.dbg.json +1 -1
  24. package/artifacts/contracts/experiment/inheritance/C.sol/C.dbg.json +1 -1
  25. package/artifacts/contracts/experiment/inheritance/IA.sol/IA.dbg.json +1 -1
  26. package/artifacts/contracts/experiment/inheritance/IA.sol/ISharedA.dbg.json +1 -1
  27. package/artifacts/contracts/experiment/inheritance/IB.sol/IB.dbg.json +1 -1
  28. package/artifacts/contracts/experiment/inheritance/IC.sol/IC.dbg.json +1 -1
  29. package/artifacts/contracts/experiment/statemachine/Dummy.sol/LifeCycleModule.dbg.json +1 -1
  30. package/artifacts/contracts/experiment/statemachine/Dummy.sol/LifeCycleModule.json +2 -2
  31. package/artifacts/contracts/experiment/statemachine/ISM.sol/ISM.dbg.json +1 -1
  32. package/artifacts/contracts/experiment/statemachine/ISM.sol/ISMEE.dbg.json +1 -1
  33. package/artifacts/contracts/experiment/statemachine/SM.sol/SM.dbg.json +1 -1
  34. package/artifacts/contracts/experiment/statemachine/SimpleStateMachine.sol/SimpleStateMachine.dbg.json +1 -1
  35. package/artifacts/contracts/experiment/types/TypeA.sol/TypeALib.dbg.json +1 -1
  36. package/artifacts/contracts/experiment/types/TypeB.sol/TypeBLib.dbg.json +1 -1
  37. package/artifacts/contracts/instance/IInstance.sol/IInstance.dbg.json +1 -1
  38. package/artifacts/contracts/instance/IInstance.sol/IInstance.json +882 -586
  39. package/artifacts/contracts/instance/IInstanceLinked.sol/IInstanceLinked.dbg.json +1 -1
  40. package/artifacts/contracts/instance/Instance.sol/Instance.dbg.json +1 -1
  41. package/artifacts/contracts/instance/Instance.sol/Instance.json +1011 -638
  42. package/artifacts/contracts/instance/base/ComponentServiceBase.sol/ComponentServiceBase.dbg.json +1 -1
  43. package/artifacts/contracts/instance/base/ComponentServiceBase.sol/ComponentServiceBase.json +139 -46
  44. package/artifacts/contracts/instance/base/IInstanceBase.sol/IInstanceBase.dbg.json +1 -1
  45. package/artifacts/contracts/instance/base/IInstanceBase.sol/IInstanceBase.json +51 -1
  46. package/artifacts/contracts/instance/base/IKeyValueStore.sol/IKeyValueStore.dbg.json +1 -1
  47. package/artifacts/contracts/instance/base/IKeyValueStore.sol/IKeyValueStore.json +49 -0
  48. package/artifacts/contracts/instance/base/ILifecycle.sol/ILifecycle.dbg.json +1 -1
  49. package/artifacts/contracts/instance/base/IService.sol/IService.dbg.json +1 -1
  50. package/artifacts/contracts/instance/base/IService.sol/IService.json +99 -55
  51. package/artifacts/contracts/instance/base/InstanceBase.sol/InstanceBase.dbg.json +1 -1
  52. package/artifacts/contracts/instance/base/InstanceBase.sol/InstanceBase.json +178 -48
  53. package/artifacts/contracts/instance/base/KeyValueStore.sol/KeyValueStore.dbg.json +1 -1
  54. package/artifacts/contracts/instance/base/KeyValueStore.sol/KeyValueStore.json +41 -23
  55. package/artifacts/contracts/instance/base/Lifecycle.sol/Lifecycle.dbg.json +1 -1
  56. package/artifacts/contracts/instance/base/Lifecycle.sol/Lifecycle.json +4 -4
  57. package/artifacts/contracts/instance/base/ModuleBase.sol/ModuleBase.dbg.json +1 -1
  58. package/artifacts/contracts/instance/base/ServiceBase.sol/ServiceBase.dbg.json +1 -1
  59. package/artifacts/contracts/instance/base/ServiceBase.sol/ServiceBase.json +135 -55
  60. package/artifacts/contracts/instance/module/access/Access.sol/AccessModule.dbg.json +1 -1
  61. package/artifacts/contracts/instance/module/access/IAccess.sol/IAccess.dbg.json +1 -1
  62. package/artifacts/contracts/instance/module/access/IAccess.sol/IAccessModule.dbg.json +1 -1
  63. package/artifacts/contracts/instance/module/bundle/BundleModule.sol/BundleModule.dbg.json +1 -1
  64. package/artifacts/contracts/instance/module/bundle/BundleModule.sol/BundleModule.json +55 -54
  65. package/artifacts/contracts/instance/module/bundle/IBundle.sol/IBundle.dbg.json +1 -1
  66. package/artifacts/contracts/instance/module/bundle/IBundle.sol/IBundleModule.dbg.json +1 -1
  67. package/artifacts/contracts/instance/module/bundle/IBundle.sol/IBundleModule.json +56 -55
  68. package/artifacts/contracts/instance/module/component/ComponentModule.sol/ComponentModule.dbg.json +1 -1
  69. package/artifacts/contracts/instance/module/component/ComponentModule.sol/ComponentModule.json +22 -93
  70. package/artifacts/contracts/instance/module/component/IComponent.sol/IComponent.dbg.json +1 -1
  71. package/artifacts/contracts/instance/module/component/IComponent.sol/IComponentModule.dbg.json +1 -1
  72. package/artifacts/contracts/instance/module/component/IComponent.sol/IComponentModule.json +22 -93
  73. package/artifacts/contracts/instance/module/distribution/DistributionModule.sol/DistributionModule.dbg.json +4 -0
  74. package/artifacts/contracts/instance/module/distribution/DistributionModule.sol/DistributionModule.json +10 -0
  75. package/artifacts/contracts/instance/module/distribution/IDistribution.sol/IDistribution.dbg.json +4 -0
  76. package/artifacts/contracts/instance/module/{compensation/ICompensation.sol/ICompensation.json → distribution/IDistribution.sol/IDistribution.json} +2 -2
  77. package/artifacts/contracts/instance/module/distribution/IDistribution.sol/IDistributionModule.dbg.json +4 -0
  78. package/artifacts/contracts/instance/module/{compensation/ICompensation.sol/ICompensationModule.json → distribution/IDistribution.sol/IDistributionModule.json} +2 -2
  79. package/artifacts/contracts/instance/module/policy/IPolicy.sol/IPolicy.dbg.json +1 -1
  80. package/artifacts/contracts/instance/module/policy/IPolicy.sol/IPolicyModule.dbg.json +1 -1
  81. package/artifacts/contracts/instance/module/policy/IPolicy.sol/IPolicyModule.json +53 -40
  82. package/artifacts/contracts/instance/module/policy/PolicyModule.sol/PolicyModule.dbg.json +1 -1
  83. package/artifacts/contracts/instance/module/policy/PolicyModule.sol/PolicyModule.json +53 -40
  84. package/artifacts/contracts/instance/module/pool/IPoolModule.sol/IPool.dbg.json +1 -1
  85. package/artifacts/contracts/instance/module/pool/IPoolModule.sol/IPoolModule.dbg.json +1 -1
  86. package/artifacts/contracts/instance/module/pool/IPoolModule.sol/IPoolModule.json +29 -14
  87. package/artifacts/contracts/instance/module/pool/PoolModule.sol/PoolModule.dbg.json +1 -1
  88. package/artifacts/contracts/instance/module/pool/PoolModule.sol/PoolModule.json +28 -13
  89. package/artifacts/contracts/instance/module/risk/IRisk.sol/IRisk.dbg.json +1 -1
  90. package/artifacts/contracts/instance/module/risk/IRisk.sol/IRiskModule.dbg.json +1 -1
  91. package/artifacts/contracts/instance/module/risk/IRisk.sol/IRiskModule.json +104 -1
  92. package/artifacts/contracts/instance/module/risk/RiskModule.sol/RiskModule.dbg.json +1 -1
  93. package/artifacts/contracts/instance/module/risk/RiskModule.sol/RiskModule.json +126 -5
  94. package/artifacts/contracts/instance/module/treasury/ITreasury.sol/ITreasury.dbg.json +1 -1
  95. package/artifacts/contracts/instance/module/treasury/ITreasury.sol/ITreasuryModule.dbg.json +1 -1
  96. package/artifacts/contracts/instance/module/treasury/ITreasury.sol/ITreasuryModule.json +326 -221
  97. package/artifacts/contracts/instance/module/treasury/TokenHandler.sol/TokenHandler.dbg.json +1 -1
  98. package/artifacts/contracts/instance/module/treasury/TokenHandler.sol/TokenHandler.json +2 -2
  99. package/artifacts/contracts/instance/module/treasury/TreasuryModule.sol/TreasuryModule.dbg.json +1 -1
  100. package/artifacts/contracts/instance/module/treasury/TreasuryModule.sol/TreasuryModule.json +326 -221
  101. package/artifacts/contracts/instance/service/ComponentOwnerService.sol/ComponentOwnerService.dbg.json +1 -1
  102. package/artifacts/contracts/instance/service/ComponentOwnerService.sol/ComponentOwnerService.json +251 -84
  103. package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.dbg.json +4 -0
  104. package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.json +526 -0
  105. package/artifacts/contracts/instance/service/IComponentOwnerService.sol/IComponentOwnerService.dbg.json +1 -1
  106. package/artifacts/contracts/instance/service/IComponentOwnerService.sol/IComponentOwnerService.json +99 -74
  107. package/artifacts/contracts/instance/service/IDistributionService.sol/IDistributionService.dbg.json +4 -0
  108. package/artifacts/contracts/instance/service/IDistributionService.sol/IDistributionService.json +369 -0
  109. package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.dbg.json +1 -1
  110. package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.json +158 -50
  111. package/artifacts/contracts/instance/service/IProductService.sol/IProductService.dbg.json +1 -1
  112. package/artifacts/contracts/instance/service/IProductService.sol/IProductService.json +246 -49
  113. package/artifacts/contracts/instance/service/PoolService.sol/PoolService.dbg.json +1 -1
  114. package/artifacts/contracts/instance/service/PoolService.sol/PoolService.json +230 -52
  115. package/artifacts/contracts/instance/service/ProductService.sol/ProductService.dbg.json +1 -1
  116. package/artifacts/contracts/instance/service/ProductService.sol/ProductService.json +361 -70
  117. package/artifacts/contracts/registry/ChainNft.sol/ChainNft.dbg.json +1 -1
  118. package/artifacts/contracts/registry/ChainNft.sol/ChainNft.json +141 -12
  119. package/artifacts/contracts/registry/IChainNft.sol/IChainNft.dbg.json +1 -1
  120. package/artifacts/contracts/registry/IChainNft.sol/IChainNft.json +5 -0
  121. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.dbg.json +1 -1
  122. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.json +293 -40
  123. package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.dbg.json +4 -0
  124. package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.json +668 -0
  125. package/artifacts/contracts/registry/ITransferInterceptor.sol/ITransferInterceptor.dbg.json +4 -0
  126. package/artifacts/contracts/registry/ITransferInterceptor.sol/ITransferInterceptor.json +34 -0
  127. package/artifacts/contracts/registry/Registry.sol/Registry.dbg.json +1 -1
  128. package/artifacts/contracts/registry/Registry.sol/Registry.json +483 -120
  129. package/artifacts/contracts/registry/RegistryService.sol/RegistryService.dbg.json +4 -0
  130. package/artifacts/contracts/registry/RegistryService.sol/RegistryService.json +885 -0
  131. package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.dbg.json +4 -0
  132. package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.json +460 -0
  133. package/artifacts/contracts/shared/ContractDeployerLib.sol/ContractDeployerLib.dbg.json +4 -0
  134. package/artifacts/contracts/shared/ContractDeployerLib.sol/ContractDeployerLib.json +107 -0
  135. package/artifacts/contracts/shared/ERC165.sol/ERC165.dbg.json +1 -1
  136. package/artifacts/contracts/shared/ERC165.sol/ERC165.json +2 -2
  137. package/artifacts/contracts/shared/IOwnable.sol/IOwnable.dbg.json +1 -1
  138. package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.dbg.json +1 -1
  139. package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.json +43 -40
  140. package/artifacts/contracts/shared/IVersionable.sol/IVersionable.dbg.json +1 -1
  141. package/artifacts/contracts/shared/IVersionable.sol/IVersionable.json +55 -14
  142. package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.dbg.json +4 -0
  143. package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.json +132 -0
  144. package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.dbg.json +4 -0
  145. package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.json +344 -0
  146. package/artifacts/contracts/shared/Registerable.sol/Registerable.dbg.json +1 -1
  147. package/artifacts/contracts/shared/Registerable.sol/Registerable.json +76 -37
  148. package/artifacts/contracts/shared/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.dbg.json +4 -0
  149. package/artifacts/contracts/shared/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.json +129 -0
  150. package/artifacts/contracts/shared/Versionable.sol/Versionable.dbg.json +1 -1
  151. package/artifacts/contracts/shared/Versionable.sol/Versionable.json +78 -14
  152. package/artifacts/contracts/test/TestDistribution.sol/TestDistribution.dbg.json +4 -0
  153. package/artifacts/contracts/test/TestDistribution.sol/TestDistribution.json +445 -0
  154. package/artifacts/contracts/test/TestFee.sol/TestFee.dbg.json +1 -1
  155. package/artifacts/contracts/test/TestFee.sol/TestFee.json +2 -2
  156. package/artifacts/contracts/test/TestPool.sol/TestPool.dbg.json +1 -1
  157. package/artifacts/contracts/test/TestPool.sol/TestPool.json +299 -84
  158. package/artifacts/contracts/test/TestProduct.sol/TestProduct.dbg.json +1 -1
  159. package/artifacts/contracts/test/TestProduct.sol/TestProduct.json +297 -58
  160. package/artifacts/contracts/test/TestRegisterable.sol/TestRegisterable.dbg.json +1 -1
  161. package/artifacts/contracts/test/TestRegisterable.sol/TestRegisterable.json +93 -39
  162. package/artifacts/contracts/test/TestRoleId.sol/TestRoleId.dbg.json +1 -1
  163. package/artifacts/contracts/test/TestRoleId.sol/TestRoleId.json +2 -2
  164. package/artifacts/contracts/test/TestService.sol/TestService.dbg.json +1 -1
  165. package/artifacts/contracts/test/TestService.sol/TestService.json +161 -68
  166. package/artifacts/contracts/test/TestToken.sol/TestUsdc.dbg.json +1 -1
  167. package/artifacts/contracts/test/TestVersion.sol/TestVersion.dbg.json +1 -1
  168. package/artifacts/contracts/test/TestVersion.sol/TestVersion.json +2 -2
  169. package/artifacts/contracts/test/TestVersionable.sol/TestVersionable.dbg.json +1 -1
  170. package/artifacts/contracts/test/TestVersionable.sol/TestVersionable.json +89 -25
  171. package/artifacts/contracts/test/Usdc.sol/USDC.dbg.json +1 -1
  172. package/artifacts/contracts/types/AddressSet.sol/LibAddressSet.dbg.json +1 -1
  173. package/artifacts/contracts/types/Blocknumber.sol/BlocknumberLib.dbg.json +1 -1
  174. package/artifacts/contracts/types/ChainId.sol/ChainIdLib.dbg.json +1 -1
  175. package/artifacts/contracts/types/Fee.sol/FeeLib.dbg.json +1 -1
  176. package/artifacts/contracts/types/Fee.sol/FeeLib.json +50 -11
  177. package/artifacts/contracts/types/Key32.sol/Key32Lib.dbg.json +1 -1
  178. package/artifacts/contracts/types/Key32.sol/Key32Lib.json +2 -2
  179. package/artifacts/contracts/types/NftId.sol/NftIdLib.dbg.json +1 -1
  180. package/artifacts/contracts/types/NftId.sol/NftIdLib.json +2 -2
  181. package/artifacts/contracts/types/NftIdSet.sol/LibNftIdSet.dbg.json +1 -1
  182. package/artifacts/contracts/types/NftIdSet.sol/LibNftIdSet.json +2 -2
  183. package/artifacts/contracts/types/ObjectType.sol/ObjectTypeLib.dbg.json +1 -1
  184. package/artifacts/contracts/types/ObjectType.sol/ObjectTypeLib.json +2 -2
  185. package/artifacts/contracts/types/ReferralId.sol/ReferralIdLib.dbg.json +4 -0
  186. package/artifacts/contracts/types/ReferralId.sol/ReferralIdLib.json +99 -0
  187. package/artifacts/contracts/types/RiskId.sol/RiskIdLib.dbg.json +4 -0
  188. package/artifacts/contracts/types/RiskId.sol/RiskIdLib.json +86 -0
  189. package/artifacts/contracts/types/RoleId.sol/RoleIdLib.dbg.json +1 -1
  190. package/artifacts/contracts/types/RoleId.sol/RoleIdLib.json +2 -2
  191. package/artifacts/contracts/types/StateId.sol/StateIdLib.dbg.json +1 -1
  192. package/artifacts/contracts/types/Timestamp.sol/TimestampLib.dbg.json +1 -1
  193. package/artifacts/contracts/types/UFixed.sol/UFixedMathLib.dbg.json +1 -1
  194. package/artifacts/contracts/types/Version.sol/VersionLib.dbg.json +1 -1
  195. package/artifacts/contracts/types/Version.sol/VersionLib.json +40 -2
  196. package/artifacts/contracts/types/Version.sol/VersionPartLib.dbg.json +1 -1
  197. package/artifacts/contracts/types/Version.sol/VersionPartLib.json +2 -2
  198. package/contracts/components/BaseComponent.sol +12 -21
  199. package/contracts/components/Distribution.sol +155 -0
  200. package/contracts/components/IBaseComponent.sol +2 -2
  201. package/contracts/components/IDistributionComponent.sol +46 -0
  202. package/contracts/components/IPoolComponent.sol +15 -8
  203. package/contracts/components/IProductComponent.sol +26 -8
  204. package/contracts/components/Pool.sol +99 -27
  205. package/contracts/components/Product.sol +204 -22
  206. package/contracts/experiment/errors/Revert.sol +4 -13
  207. package/contracts/instance/IInstance.sol +10 -8
  208. package/contracts/instance/Instance.sol +25 -8
  209. package/contracts/instance/base/ComponentServiceBase.sol +13 -6
  210. package/contracts/instance/base/IInstanceBase.sol +11 -2
  211. package/contracts/instance/base/IKeyValueStore.sol +4 -3
  212. package/contracts/instance/base/InstanceBase.sol +19 -10
  213. package/contracts/instance/base/KeyValueStore.sol +12 -7
  214. package/contracts/instance/base/Lifecycle.sol +15 -10
  215. package/contracts/instance/base/ModuleBase.sol +22 -17
  216. package/contracts/instance/base/ServiceBase.sol +19 -13
  217. package/contracts/instance/module/access/Access.sol +3 -3
  218. package/contracts/instance/module/bundle/BundleModule.sol +10 -12
  219. package/contracts/instance/module/bundle/IBundle.sol +6 -11
  220. package/contracts/instance/module/component/ComponentModule.sol +34 -58
  221. package/contracts/instance/module/component/IComponent.sol +7 -32
  222. package/contracts/instance/module/distribution/DistributionModule.sol +17 -0
  223. package/contracts/instance/module/distribution/IDistribution.sol +10 -0
  224. package/contracts/instance/module/policy/IPolicy.sol +10 -8
  225. package/contracts/instance/module/policy/PolicyModule.sol +33 -19
  226. package/contracts/instance/module/pool/IPoolModule.sol +4 -4
  227. package/contracts/instance/module/pool/PoolModule.sol +23 -15
  228. package/contracts/instance/module/risk/IRisk.sol +18 -2
  229. package/contracts/instance/module/risk/RiskModule.sol +56 -2
  230. package/contracts/instance/module/treasury/ITreasury.sol +32 -51
  231. package/contracts/instance/module/treasury/TokenHandler.sol +2 -2
  232. package/contracts/instance/module/treasury/TreasuryModule.sol +68 -89
  233. package/contracts/instance/service/ComponentOwnerService.sol +197 -95
  234. package/contracts/instance/service/DistributionService.sol +54 -0
  235. package/contracts/instance/service/IComponentOwnerService.sol +0 -2
  236. package/contracts/instance/service/IDistributionService.sol +12 -0
  237. package/contracts/instance/service/IPoolService.sol +7 -0
  238. package/contracts/instance/service/IProductService.sol +56 -7
  239. package/contracts/instance/service/PoolService.sol +49 -23
  240. package/contracts/instance/service/ProductService.sol +247 -91
  241. package/contracts/registry/ChainNft.sol +43 -15
  242. package/contracts/registry/IChainNft.sol +3 -2
  243. package/contracts/registry/IRegistry.sol +44 -28
  244. package/contracts/registry/IRegistryService.sol +29 -0
  245. package/contracts/registry/ITransferInterceptor.sol +6 -0
  246. package/contracts/registry/Registry.sol +383 -274
  247. package/contracts/registry/RegistryService.sol +375 -0
  248. package/contracts/registry/RegistryServiceManager.sol +52 -0
  249. package/contracts/shared/ContractDeployerLib.sol +72 -0
  250. package/contracts/shared/ERC165.sol +1 -1
  251. package/contracts/shared/IRegisterable.sol +7 -9
  252. package/contracts/shared/IVersionable.sol +55 -11
  253. package/contracts/shared/NftOwnable.sol +87 -0
  254. package/contracts/shared/ProxyManager.sol +103 -0
  255. package/contracts/shared/Registerable.sol +74 -43
  256. package/contracts/shared/UpgradableProxyWithAdmin.sol +16 -0
  257. package/contracts/shared/Versionable.sol +112 -54
  258. package/contracts/test/TestDistribution.sol +22 -0
  259. package/contracts/test/TestPool.sol +7 -2
  260. package/contracts/test/TestProduct.sol +37 -7
  261. package/contracts/test/TestRegisterable.sol +5 -6
  262. package/contracts/test/TestService.sol +5 -11
  263. package/contracts/types/Fee.sol +8 -3
  264. package/contracts/types/ObjectType.sol +24 -8
  265. package/contracts/types/ReferralId.sol +48 -0
  266. package/contracts/types/RiskId.sol +43 -0
  267. package/contracts/types/RoleId.sol +2 -2
  268. package/contracts/types/Version.sol +9 -0
  269. package/package.json +1 -1
  270. package/artifacts/contracts/experiment/errors/IncrementRevert.sol/IIncrementRevert.dbg.json +0 -4
  271. package/artifacts/contracts/experiment/errors/IncrementRevert.sol/IIncrementRevert.json +0 -27
  272. package/artifacts/contracts/experiment/errors/IncrementRevert.sol/IncrementRevert.dbg.json +0 -4
  273. package/artifacts/contracts/experiment/errors/IncrementRevert.sol/IncrementRevert.json +0 -83
  274. package/artifacts/contracts/experiment/errors/Revert.sol/IRevert.dbg.json +0 -4
  275. package/artifacts/contracts/experiment/errors/Revert.sol/IRevert.json +0 -75
  276. package/artifacts/contracts/instance/module/compensation/CompensationModule.sol/CompensationModule.dbg.json +0 -4
  277. package/artifacts/contracts/instance/module/compensation/CompensationModule.sol/CompensationModule.json +0 -10
  278. package/artifacts/contracts/instance/module/compensation/ICompensation.sol/ICompensation.dbg.json +0 -4
  279. package/artifacts/contracts/instance/module/compensation/ICompensation.sol/ICompensationModule.dbg.json +0 -4
  280. package/artifacts/contracts/registry/IRegistryLinked.sol/IRegistryLinked.dbg.json +0 -4
  281. package/artifacts/contracts/registry/IRegistryLinked.sol/IRegistryLinked.json +0 -24
  282. package/contracts/experiment/errors/IncrementRevert.sol +0 -43
  283. package/contracts/experiment/statemachine/README.md +0 -112
  284. package/contracts/instance/module/compensation/CompensationModule.sol +0 -8
  285. package/contracts/instance/module/compensation/ICompensation.sol +0 -10
  286. package/contracts/registry/IRegistryLinked.sol +0 -8
@@ -136,18 +136,18 @@
136
136
  "type": "function"
137
137
  }
138
138
  ],
139
- "bytecode": "0x608060405234801561001057600080fd5b5061001b6064610049565b6100256078610049565b61002f6082610049565b610037610170565b61003f610315565b610589565b606490565b60ff8116600090815260208181526040808320805460ff191660649081179091556001808452828520918552925282209091610083606e90565b60ff908116825260208083019390935260409182016000908120805460ff19169515159590951790945584168352600191829052822090916100c3606e90565b60ff1660ff16815260200190815260200160002060006100e761004460201b60201c565b60ff908116825260208083019390935260409182016000908120805460ff1916951515959095179094558416835260019182905282209091610127606e90565b60ff1660ff168152602001908152602001600020600061014b61056b60201b60201c565b60ff1681526020810191909152604001600020805460ff191691151591909117905550565b60d2600090815260208190527fc0d27dadfcf8ee0186a0f6fe9b5805a51e99869050491e4a3040efec012a214f805460ff1916606417905560019081906101b560d290565b60ff1660ff16815260200190815260200160002060006101d961004460201b60201c565b60ff1660ff16815260200190815260200160002060006101fd61056660201b60201c565b60ff16815260208101919091526040016000908120805460ff191692151592909217909155600190819061022f60d290565b60ff1660ff168152602001908152602001600020600061025361056660201b60201c565b60ff1660ff168152602001908152602001600020600061027761004460201b60201c565b60ff16815260208101919091526040016000908120805460ff19169215159290921790915560019081906102a960d290565b60ff1660ff16815260200190815260200160002060006102cd61056660201b60201c565b60ff1660ff16815260200190815260200160002060006102f161057060201b60201c565b60ff1681526020810191909152604001600020805460ff1916911515919091179055565b60c8600090815260208190527fc5f2c791ab4e0b1a0b6c600884b07e98575b00ebd7c3166c4272a53bebf71403805460ff1916600a179055600190819061035a60c890565b60ff1660ff168152602001908152602001600020600061037e61057560201b60201c565b60ff1660ff16815260200190815260200160002060006103a261057a60201b60201c565b60ff16815260208101919091526040016000908120805460ff19169215159290921790915560019081906103d460c890565b60ff1660ff16815260200190815260200160002060006103f861057560201b60201c565b60ff1660ff168152602001908152602001600020600061041c61057f60201b60201c565b60ff16815260208101919091526040016000908120805460ff191692151592909217909155600190819061044e60c890565b60ff1660ff168152602001908152602001600020600061047261057560201b60201c565b60ff1660ff168152602001908152602001600020600061049661058460201b60201c565b60ff16815260208101919091526040016000908120805460ff19169215159290921790915560019081906104c860c890565b60ff1660ff16815260200190815260200160002060006104ec61058460201b60201c565b60ff1660ff168152602001908152602001600020600061051061004460201b60201c565b60ff16815260208101919091526040016000908120805460ff191692151592909217909155600190819061054260c890565b60ff1660ff16815260200190815260200160002060006102cd61004460201b60201c565b606e90565b60d290565b60c890565b600a90565b601490565b601e90565b602890565b610366806105986000396000f3fe608060405234801561001057600080fd5b506004361061004c5760003560e01c80630d35818114610051578063a89896751461008e578063bf1db3f9146100a3578063e9e96c70146100c6575b600080fd5b61007761005f36600461029f565b60ff9081166000908152602081905260409020541690565b60405160ff90911681526020015b60405180910390f35b6100a161009c3660046102c3565b610104565b005b6100b66100b136600461029f565b6101fe565b6040519015158152602001610085565b6100b66100d43660046102c3565b60ff9283166000908152600160209081526040808320948616835293815283822092851682529190915220541690565b60ff8381166000908152602081905260409081902054905163037c8cb160e51b81529116600482015273__$2a12cf1a40369f689f3a67e70f4b31dadc$__90636f91962090602401602060405180830381865af4158015610169573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061018d919061030e565b1561019757505050565b60ff8084166000908152600160209081526040808320868516845282528083208585168452909152902054166101f957604051636bb20ea760e01b815260ff808516600483015280841660248301528216604482015260640160405180910390fd5b505050565b60ff81811660009081526020819052604080822054905163b2466acf60e01b8152921660048301529073__$2a12cf1a40369f689f3a67e70f4b31dadc$__9063b2466acf90602401602060405180830381865af4158015610263573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610287919061030e565b92915050565b60ff8116811461029c57600080fd5b50565b6000602082840312156102b157600080fd5b81356102bc8161028d565b9392505050565b6000806000606084860312156102d857600080fd5b83356102e38161028d565b925060208401356102f38161028d565b915060408401356103038161028d565b809150509250925092565b60006020828403121561032057600080fd5b815180151581146102bc57600080fdfea264697066735822122099244c282d291bc7e476dc0eca2e3840dc7d05cb838ed789726a81c851d76ce264736f6c63430008140033",
140
- "deployedBytecode": "0x608060405234801561001057600080fd5b506004361061004c5760003560e01c80630d35818114610051578063a89896751461008e578063bf1db3f9146100a3578063e9e96c70146100c6575b600080fd5b61007761005f36600461029f565b60ff9081166000908152602081905260409020541690565b60405160ff90911681526020015b60405180910390f35b6100a161009c3660046102c3565b610104565b005b6100b66100b136600461029f565b6101fe565b6040519015158152602001610085565b6100b66100d43660046102c3565b60ff9283166000908152600160209081526040808320948616835293815283822092851682529190915220541690565b60ff8381166000908152602081905260409081902054905163037c8cb160e51b81529116600482015273__$2a12cf1a40369f689f3a67e70f4b31dadc$__90636f91962090602401602060405180830381865af4158015610169573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061018d919061030e565b1561019757505050565b60ff8084166000908152600160209081526040808320868516845282528083208585168452909152902054166101f957604051636bb20ea760e01b815260ff808516600483015280841660248301528216604482015260640160405180910390fd5b505050565b60ff81811660009081526020819052604080822054905163b2466acf60e01b8152921660048301529073__$2a12cf1a40369f689f3a67e70f4b31dadc$__9063b2466acf90602401602060405180830381865af4158015610263573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610287919061030e565b92915050565b60ff8116811461029c57600080fd5b50565b6000602082840312156102b157600080fd5b81356102bc8161028d565b9392505050565b6000806000606084860312156102d857600080fd5b83356102e38161028d565b925060208401356102f38161028d565b915060408401356103038161028d565b809150509250925092565b60006020828403121561032057600080fd5b815180151581146102bc57600080fdfea264697066735822122099244c282d291bc7e476dc0eca2e3840dc7d05cb838ed789726a81c851d76ce264736f6c63430008140033",
139
+ "bytecode": "0x608060405234801561001057600080fd5b50610019610036565b6100216101db565b61002961030c565b61003161055d565b6106c7565b60dc600090815260208190527f5bd290414b404036f9d63146803dd83b59a8e1905062a5bfed8b0154d20a390d805460ff19166064179055600190819061007b60dc90565b60ff1660ff168152602001908152602001600020600061009f61069660201b60201c565b60ff1660ff16815260200190815260200160002060006100c36106a060201b60201c565b60ff16815260208101919091526040016000908120805460ff19169215159290921790915560019081906100f560dc90565b60ff1660ff16815260200190815260200160002060006101196106a060201b60201c565b60ff1660ff168152602001908152602001600020600061013d61069660201b60201c565b60ff16815260208101919091526040016000908120805460ff191692151592909217909155600190819061016f60dc90565b60ff1660ff16815260200190815260200160002060006101936106a060201b60201c565b60ff1660ff16815260200190815260200160002060006101b76106a560201b60201c565b60ff1681526020810191909152604001600020805460ff1916911515919091179055565b7f9db7038e59677010ca8f72fa448bad1b4f3c53346b666689163ccac31db467728054606460ff1991821681179092557f1a3062e9a24818c8281fcfb58ec4f3083a2f9a1314ac63f80d8d646661fdc5098054909116600190811790915560009182526020819052907f1bd07f61ef326b4de236f5b68f225f46ff76ee2c375ae31a06da201c49c70c129061026e606e90565b60ff1660ff168152602001908152602001600020600061029261069660201b60201c565b60ff16815260208101919091526040016000908120805460ff19169215159290921790915560019081906102c4606490565b60ff1660ff16815260200190815260200160002060006102e86106a060201b60201c565b60ff1660ff16815260200190815260200160002060006101b76106aa60201b60201c565b60d2600090815260208190527fc0d27dadfcf8ee0186a0f6fe9b5805a51e99869050491e4a3040efec012a214f805460ff1916600a179055600190819061035160d290565b60ff1660ff16815260200190815260200160002060006103756106af60201b60201c565b60ff1660ff16815260200190815260200160002060006103996106b460201b60201c565b60ff16815260208101919091526040016000908120805460ff19169215159290921790915560019081906103cb60d290565b60ff1660ff16815260200190815260200160002060006103ef6106af60201b60201c565b60ff1660ff16815260200190815260200160002060006104136106b960201b60201c565b60ff16815260208101919091526040016000908120805460ff191692151592909217909155600190819061044560d290565b60ff1660ff16815260200190815260200160002060006104696106af60201b60201c565b60ff1660ff168152602001908152602001600020600061048d6106be60201b60201c565b60ff16815260208101919091526040016000908120805460ff19169215159290921790915560019081906104bf60d290565b60ff1660ff16815260200190815260200160002060006104e36106be60201b60201c565b60ff1660ff168152602001908152602001600020600061050761069660201b60201c565b60ff16815260208101919091526040016000908120805460ff191692151592909217909155600190819061053960d290565b60ff1660ff168152602001908152602001600020600061019361069660201b60201c565b60c8600090815260208190527fc5f2c791ab4e0b1a0b6c600884b07e98575b00ebd7c3166c4272a53bebf71403805460ff1916606417905560019081906105a260c890565b60ff1660ff16815260200190815260200160002060006105c661069660201b60201c565b60ff1660ff16815260200190815260200160002060006105ea6106a060201b60201c565b60ff16815260208101919091526040016000908120805460ff191692151592909217909155600190819061061c60c890565b60ff1660ff16815260200190815260200160002060006106406106a060201b60201c565b60ff1660ff168152602001908152602001600020600061066461069660201b60201c565b60ff16815260208101919091526040016000908120805460ff19169215159290921790915560019081906102c460c890565b606490565b905090565b606e90565b60c890565b60d290565b600a90565b601490565b601e90565b6000602861069b565b610366806106d66000396000f3fe608060405234801561001057600080fd5b506004361061004c5760003560e01c80630d35818114610051578063a89896751461008e578063bf1db3f9146100a3578063e9e96c70146100c6575b600080fd5b61007761005f36600461029f565b60ff9081166000908152602081905260409020541690565b60405160ff90911681526020015b60405180910390f35b6100a161009c3660046102c3565b610104565b005b6100b66100b136600461029f565b6101fe565b6040519015158152602001610085565b6100b66100d43660046102c3565b60ff9283166000908152600160209081526040808320948616835293815283822092851682529190915220541690565b60ff8381166000908152602081905260409081902054905163037c8cb160e51b81529116600482015273__$2a12cf1a40369f689f3a67e70f4b31dadc$__90636f91962090602401602060405180830381865af4158015610169573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061018d919061030e565b1561019757505050565b60ff8084166000908152600160209081526040808320868516845282528083208585168452909152902054166101f957604051636bb20ea760e01b815260ff808516600483015280841660248301528216604482015260640160405180910390fd5b505050565b60ff81811660009081526020819052604080822054905163b2466acf60e01b8152921660048301529073__$2a12cf1a40369f689f3a67e70f4b31dadc$__9063b2466acf90602401602060405180830381865af4158015610263573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610287919061030e565b92915050565b60ff8116811461029c57600080fd5b50565b6000602082840312156102b157600080fd5b81356102bc8161028d565b9392505050565b6000806000606084860312156102d857600080fd5b83356102e38161028d565b925060208401356102f38161028d565b915060408401356103038161028d565b809150509250925092565b60006020828403121561032057600080fd5b815180151581146102bc57600080fdfea26469706673582212207325c3077a81608a91830ddc11738d775e30ab7eea476d02cfef80b232d1ac4064736f6c63430008140033",
140
+ "deployedBytecode": "0x608060405234801561001057600080fd5b506004361061004c5760003560e01c80630d35818114610051578063a89896751461008e578063bf1db3f9146100a3578063e9e96c70146100c6575b600080fd5b61007761005f36600461029f565b60ff9081166000908152602081905260409020541690565b60405160ff90911681526020015b60405180910390f35b6100a161009c3660046102c3565b610104565b005b6100b66100b136600461029f565b6101fe565b6040519015158152602001610085565b6100b66100d43660046102c3565b60ff9283166000908152600160209081526040808320948616835293815283822092851682529190915220541690565b60ff8381166000908152602081905260409081902054905163037c8cb160e51b81529116600482015273__$2a12cf1a40369f689f3a67e70f4b31dadc$__90636f91962090602401602060405180830381865af4158015610169573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061018d919061030e565b1561019757505050565b60ff8084166000908152600160209081526040808320868516845282528083208585168452909152902054166101f957604051636bb20ea760e01b815260ff808516600483015280841660248301528216604482015260640160405180910390fd5b505050565b60ff81811660009081526020819052604080822054905163b2466acf60e01b8152921660048301529073__$2a12cf1a40369f689f3a67e70f4b31dadc$__9063b2466acf90602401602060405180830381865af4158015610263573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610287919061030e565b92915050565b60ff8116811461029c57600080fd5b50565b6000602082840312156102b157600080fd5b81356102bc8161028d565b9392505050565b6000806000606084860312156102d857600080fd5b83356102e38161028d565b925060208401356102f38161028d565b915060408401356103038161028d565b809150509250925092565b60006020828403121561032057600080fd5b815180151581146102bc57600080fdfea26469706673582212207325c3077a81608a91830ddc11738d775e30ab7eea476d02cfef80b232d1ac4064736f6c63430008140033",
141
141
  "linkReferences": {
142
142
  "contracts/types/StateId.sol": {
143
143
  "StateIdLib": [
144
144
  {
145
145
  "length": 20,
146
- "start": 1735
146
+ "start": 2053
147
147
  },
148
148
  {
149
149
  "length": 20,
150
- "start": 1985
150
+ "start": 2303
151
151
  }
152
152
  ]
153
153
  }
@@ -1,4 +1,4 @@
1
1
  {
2
2
  "_format": "hh-sol-dbg-1",
3
- "buildInfo": "../../../../build-info/13c4329f81ddc934c5d7a5db64b32ef7.json"
3
+ "buildInfo": "../../../../build-info/23d9cb949ebaded2db536c461b622e36.json"
4
4
  }
@@ -1,4 +1,4 @@
1
1
  {
2
2
  "_format": "hh-sol-dbg-1",
3
- "buildInfo": "../../../../build-info/13c4329f81ddc934c5d7a5db64b32ef7.json"
3
+ "buildInfo": "../../../../build-info/23d9cb949ebaded2db536c461b622e36.json"
4
4
  }
@@ -3,6 +3,29 @@
3
3
  "contractName": "ServiceBase",
4
4
  "sourceName": "contracts/instance/base/ServiceBase.sol",
5
5
  "abi": [
6
+ {
7
+ "inputs": [],
8
+ "name": "InvalidInitialization",
9
+ "type": "error"
10
+ },
11
+ {
12
+ "inputs": [],
13
+ "name": "NotInitializing",
14
+ "type": "error"
15
+ },
16
+ {
17
+ "anonymous": false,
18
+ "inputs": [
19
+ {
20
+ "indexed": false,
21
+ "internalType": "uint64",
22
+ "name": "version",
23
+ "type": "uint64"
24
+ }
25
+ ],
26
+ "name": "Initialized",
27
+ "type": "event"
28
+ },
6
29
  {
7
30
  "anonymous": false,
8
31
  "inputs": [
@@ -25,31 +48,68 @@
25
48
  "type": "address"
26
49
  }
27
50
  ],
28
- "name": "LogVersionableActivated",
51
+ "name": "LogVersionableInitialized",
29
52
  "type": "event"
30
53
  },
31
54
  {
32
- "inputs": [
33
- {
34
- "internalType": "address",
35
- "name": "implementation",
36
- "type": "address"
37
- },
55
+ "inputs": [],
56
+ "name": "REGISTERABLE_LOCATION_V1",
57
+ "outputs": [
38
58
  {
39
- "internalType": "address",
40
- "name": "activatedBy",
41
- "type": "address"
59
+ "internalType": "bytes32",
60
+ "name": "",
61
+ "type": "bytes32"
42
62
  }
43
63
  ],
44
- "name": "activate",
45
- "outputs": [],
46
- "stateMutability": "nonpayable",
64
+ "stateMutability": "view",
47
65
  "type": "function"
48
66
  },
49
67
  {
50
68
  "inputs": [],
51
- "name": "getData",
69
+ "name": "getInitialInfo",
52
70
  "outputs": [
71
+ {
72
+ "components": [
73
+ {
74
+ "internalType": "NftId",
75
+ "name": "nftId",
76
+ "type": "uint96"
77
+ },
78
+ {
79
+ "internalType": "NftId",
80
+ "name": "parentNftId",
81
+ "type": "uint96"
82
+ },
83
+ {
84
+ "internalType": "ObjectType",
85
+ "name": "objectType",
86
+ "type": "uint8"
87
+ },
88
+ {
89
+ "internalType": "bool",
90
+ "name": "isInterceptor",
91
+ "type": "bool"
92
+ },
93
+ {
94
+ "internalType": "address",
95
+ "name": "objectAddress",
96
+ "type": "address"
97
+ },
98
+ {
99
+ "internalType": "address",
100
+ "name": "initialOwner",
101
+ "type": "address"
102
+ },
103
+ {
104
+ "internalType": "bytes",
105
+ "name": "data",
106
+ "type": "bytes"
107
+ }
108
+ ],
109
+ "internalType": "struct IRegistry.ObjectInfo",
110
+ "name": "",
111
+ "type": "tuple"
112
+ },
53
113
  {
54
114
  "internalType": "bytes",
55
115
  "name": "data",
@@ -59,6 +119,19 @@
59
119
  "stateMutability": "view",
60
120
  "type": "function"
61
121
  },
122
+ {
123
+ "inputs": [],
124
+ "name": "getInitializedVersion",
125
+ "outputs": [
126
+ {
127
+ "internalType": "uint64",
128
+ "name": "",
129
+ "type": "uint64"
130
+ }
131
+ ],
132
+ "stateMutability": "view",
133
+ "type": "function"
134
+ },
62
135
  {
63
136
  "inputs": [],
64
137
  "name": "getMajorVersion",
@@ -104,26 +177,13 @@
104
177
  "outputs": [
105
178
  {
106
179
  "internalType": "address",
107
- "name": "owner",
180
+ "name": "",
108
181
  "type": "address"
109
182
  }
110
183
  ],
111
184
  "stateMutability": "view",
112
185
  "type": "function"
113
186
  },
114
- {
115
- "inputs": [],
116
- "name": "getParentNftId",
117
- "outputs": [
118
- {
119
- "internalType": "NftId",
120
- "name": "nftId",
121
- "type": "uint96"
122
- }
123
- ],
124
- "stateMutability": "view",
125
- "type": "function"
126
- },
127
187
  {
128
188
  "inputs": [],
129
189
  "name": "getRegistry",
@@ -137,19 +197,6 @@
137
197
  "stateMutability": "view",
138
198
  "type": "function"
139
199
  },
140
- {
141
- "inputs": [],
142
- "name": "getType",
143
- "outputs": [
144
- {
145
- "internalType": "ObjectType",
146
- "name": "",
147
- "type": "uint8"
148
- }
149
- ],
150
- "stateMutability": "pure",
151
- "type": "function"
152
- },
153
200
  {
154
201
  "inputs": [],
155
202
  "name": "getVersion",
@@ -241,6 +288,29 @@
241
288
  "stateMutability": "view",
242
289
  "type": "function"
243
290
  },
291
+ {
292
+ "inputs": [
293
+ {
294
+ "internalType": "address",
295
+ "name": "implementation",
296
+ "type": "address"
297
+ },
298
+ {
299
+ "internalType": "address",
300
+ "name": "activatedBy",
301
+ "type": "address"
302
+ },
303
+ {
304
+ "internalType": "bytes",
305
+ "name": "data",
306
+ "type": "bytes"
307
+ }
308
+ ],
309
+ "name": "initialize",
310
+ "outputs": [],
311
+ "stateMutability": "nonpayable",
312
+ "type": "function"
313
+ },
244
314
  {
245
315
  "inputs": [
246
316
  {
@@ -249,7 +319,7 @@
249
319
  "type": "uint24"
250
320
  }
251
321
  ],
252
- "name": "isActivated",
322
+ "name": "isInitialized",
253
323
  "outputs": [
254
324
  {
255
325
  "internalType": "bool",
@@ -260,19 +330,6 @@
260
330
  "stateMutability": "view",
261
331
  "type": "function"
262
332
  },
263
- {
264
- "inputs": [],
265
- "name": "register",
266
- "outputs": [
267
- {
268
- "internalType": "NftId",
269
- "name": "nftId",
270
- "type": "uint96"
271
- }
272
- ],
273
- "stateMutability": "nonpayable",
274
- "type": "function"
275
- },
276
333
  {
277
334
  "inputs": [
278
335
  {
@@ -291,6 +348,29 @@
291
348
  ],
292
349
  "stateMutability": "view",
293
350
  "type": "function"
351
+ },
352
+ {
353
+ "inputs": [
354
+ {
355
+ "internalType": "address",
356
+ "name": "implementation",
357
+ "type": "address"
358
+ },
359
+ {
360
+ "internalType": "address",
361
+ "name": "activatedBy",
362
+ "type": "address"
363
+ },
364
+ {
365
+ "internalType": "bytes",
366
+ "name": "data",
367
+ "type": "bytes"
368
+ }
369
+ ],
370
+ "name": "upgrade",
371
+ "outputs": [],
372
+ "stateMutability": "nonpayable",
373
+ "type": "function"
294
374
  }
295
375
  ],
296
376
  "bytecode": "0x",
@@ -1,4 +1,4 @@
1
1
  {
2
2
  "_format": "hh-sol-dbg-1",
3
- "buildInfo": "../../../../../build-info/13c4329f81ddc934c5d7a5db64b32ef7.json"
3
+ "buildInfo": "../../../../../build-info/23d9cb949ebaded2db536c461b622e36.json"
4
4
  }
@@ -1,4 +1,4 @@
1
1
  {
2
2
  "_format": "hh-sol-dbg-1",
3
- "buildInfo": "../../../../../build-info/13c4329f81ddc934c5d7a5db64b32ef7.json"
3
+ "buildInfo": "../../../../../build-info/23d9cb949ebaded2db536c461b622e36.json"
4
4
  }
@@ -1,4 +1,4 @@
1
1
  {
2
2
  "_format": "hh-sol-dbg-1",
3
- "buildInfo": "../../../../../build-info/13c4329f81ddc934c5d7a5db64b32ef7.json"
3
+ "buildInfo": "../../../../../build-info/23d9cb949ebaded2db536c461b622e36.json"
4
4
  }
@@ -1,4 +1,4 @@
1
1
  {
2
2
  "_format": "hh-sol-dbg-1",
3
- "buildInfo": "../../../../../build-info/13c4329f81ddc934c5d7a5db64b32ef7.json"
3
+ "buildInfo": "../../../../../build-info/23d9cb949ebaded2db536c461b622e36.json"
4
4
  }
@@ -38,6 +38,23 @@
38
38
  "name": "poolNftId",
39
39
  "type": "uint96"
40
40
  },
41
+ {
42
+ "components": [
43
+ {
44
+ "internalType": "UFixed",
45
+ "name": "fractionalFee",
46
+ "type": "uint256"
47
+ },
48
+ {
49
+ "internalType": "uint256",
50
+ "name": "fixedFee",
51
+ "type": "uint256"
52
+ }
53
+ ],
54
+ "internalType": "struct Fee",
55
+ "name": "fee",
56
+ "type": "tuple"
57
+ },
41
58
  {
42
59
  "internalType": "uint256",
43
60
  "name": "amount",
@@ -73,13 +90,25 @@
73
90
  "components": [
74
91
  {
75
92
  "internalType": "NftId",
76
- "name": "nftId",
93
+ "name": "poolNftId",
77
94
  "type": "uint96"
78
95
  },
79
96
  {
80
- "internalType": "NftId",
81
- "name": "poolNftId",
82
- "type": "uint96"
97
+ "components": [
98
+ {
99
+ "internalType": "UFixed",
100
+ "name": "fractionalFee",
101
+ "type": "uint256"
102
+ },
103
+ {
104
+ "internalType": "uint256",
105
+ "name": "fixedFee",
106
+ "type": "uint256"
107
+ }
108
+ ],
109
+ "internalType": "struct Fee",
110
+ "name": "fee",
111
+ "type": "tuple"
83
112
  },
84
113
  {
85
114
  "internalType": "bytes",
@@ -120,19 +149,6 @@
120
149
  "stateMutability": "view",
121
150
  "type": "function"
122
151
  },
123
- {
124
- "inputs": [],
125
- "name": "getKeyValueStore",
126
- "outputs": [
127
- {
128
- "internalType": "contract IKeyValueStore",
129
- "name": "keyValueStore",
130
- "type": "address"
131
- }
132
- ],
133
- "stateMutability": "view",
134
- "type": "function"
135
- },
136
152
  {
137
153
  "inputs": [],
138
154
  "name": "getPoolService",
@@ -159,19 +175,6 @@
159
175
  "stateMutability": "nonpayable",
160
176
  "type": "function"
161
177
  },
162
- {
163
- "inputs": [],
164
- "name": "getRegistry",
165
- "outputs": [
166
- {
167
- "internalType": "contract IRegistry",
168
- "name": "registry",
169
- "type": "address"
170
- }
171
- ],
172
- "stateMutability": "view",
173
- "type": "function"
174
- },
175
178
  {
176
179
  "inputs": [
177
180
  {
@@ -198,17 +201,34 @@
198
201
  },
199
202
  {
200
203
  "inputs": [
204
+ {
205
+ "internalType": "NftId",
206
+ "name": "bundleNftId",
207
+ "type": "uint96"
208
+ },
201
209
  {
202
210
  "components": [
203
211
  {
204
212
  "internalType": "NftId",
205
- "name": "nftId",
213
+ "name": "poolNftId",
206
214
  "type": "uint96"
207
215
  },
208
216
  {
209
- "internalType": "NftId",
210
- "name": "poolNftId",
211
- "type": "uint96"
217
+ "components": [
218
+ {
219
+ "internalType": "UFixed",
220
+ "name": "fractionalFee",
221
+ "type": "uint256"
222
+ },
223
+ {
224
+ "internalType": "uint256",
225
+ "name": "fixedFee",
226
+ "type": "uint256"
227
+ }
228
+ ],
229
+ "internalType": "struct Fee",
230
+ "name": "fee",
231
+ "type": "tuple"
212
232
  },
213
233
  {
214
234
  "internalType": "bytes",
@@ -242,7 +262,7 @@
242
262
  }
243
263
  ],
244
264
  "internalType": "struct IBundle.BundleInfo",
245
- "name": "bundleInfo",
265
+ "name": "info",
246
266
  "type": "tuple"
247
267
  }
248
268
  ],
@@ -251,25 +271,6 @@
251
271
  "stateMutability": "nonpayable",
252
272
  "type": "function"
253
273
  },
254
- {
255
- "inputs": [
256
- {
257
- "internalType": "NftId",
258
- "name": "bundleNftId",
259
- "type": "uint96"
260
- }
261
- ],
262
- "name": "toBundleKey32",
263
- "outputs": [
264
- {
265
- "internalType": "Key32",
266
- "name": "key32",
267
- "type": "bytes32"
268
- }
269
- ],
270
- "stateMutability": "view",
271
- "type": "function"
272
- },
273
274
  {
274
275
  "inputs": [
275
276
  {
@@ -1,4 +1,4 @@
1
1
  {
2
2
  "_format": "hh-sol-dbg-1",
3
- "buildInfo": "../../../../../build-info/13c4329f81ddc934c5d7a5db64b32ef7.json"
3
+ "buildInfo": "../../../../../build-info/23d9cb949ebaded2db536c461b622e36.json"
4
4
  }
@@ -1,4 +1,4 @@
1
1
  {
2
2
  "_format": "hh-sol-dbg-1",
3
- "buildInfo": "../../../../../build-info/13c4329f81ddc934c5d7a5db64b32ef7.json"
3
+ "buildInfo": "../../../../../build-info/23d9cb949ebaded2db536c461b622e36.json"
4
4
  }