@etherisc/gif-next 0.0.2-efdb520-159 → 0.0.2-efef0ea-320

Sign up to get free protection for your applications and to get access to all the features.
Files changed (274) hide show
  1. package/README.md +58 -11
  2. package/artifacts/contracts/components/BaseComponent.sol/BaseComponent.dbg.json +1 -1
  3. package/artifacts/contracts/components/Distribution.sol/Distribution.dbg.json +4 -0
  4. package/artifacts/contracts/components/Distribution.sol/Distribution.json +405 -0
  5. package/artifacts/contracts/components/IBaseComponent.sol/IBaseComponent.dbg.json +1 -1
  6. package/artifacts/contracts/components/IDistributionComponent.sol/IDistributionComponent.dbg.json +4 -0
  7. package/artifacts/contracts/components/IDistributionComponent.sol/IDistributionComponent.json +340 -0
  8. package/artifacts/contracts/components/IPoolComponent.sol/IPoolComponent.dbg.json +1 -1
  9. package/artifacts/contracts/components/IPoolComponent.sol/IPoolComponent.json +131 -0
  10. package/artifacts/contracts/components/IProductComponent.sol/IProductComponent.dbg.json +1 -1
  11. package/artifacts/contracts/components/IProductComponent.sol/IProductComponent.json +109 -18
  12. package/artifacts/contracts/components/Pool.sol/Pool.dbg.json +1 -1
  13. package/artifacts/contracts/components/Pool.sol/Pool.json +194 -3
  14. package/artifacts/contracts/components/Product.sol/Product.dbg.json +1 -1
  15. package/artifacts/contracts/components/Product.sol/Product.json +160 -21
  16. package/artifacts/contracts/experiment/errors/Require.sol/Require.dbg.json +1 -1
  17. package/artifacts/contracts/experiment/errors/Revert.sol/Revert.dbg.json +1 -1
  18. package/artifacts/contracts/experiment/inheritance/A.sol/A.dbg.json +1 -1
  19. package/artifacts/contracts/experiment/inheritance/A.sol/AShared.dbg.json +1 -1
  20. package/artifacts/contracts/experiment/inheritance/B.sol/B.dbg.json +1 -1
  21. package/artifacts/contracts/experiment/inheritance/C.sol/C.dbg.json +1 -1
  22. package/artifacts/contracts/experiment/inheritance/IA.sol/IA.dbg.json +1 -1
  23. package/artifacts/contracts/experiment/inheritance/IA.sol/ISharedA.dbg.json +1 -1
  24. package/artifacts/contracts/experiment/inheritance/IB.sol/IB.dbg.json +1 -1
  25. package/artifacts/contracts/experiment/inheritance/IC.sol/IC.dbg.json +1 -1
  26. package/artifacts/contracts/experiment/statemachine/Dummy.sol/LifeCycleModule.dbg.json +1 -1
  27. package/artifacts/contracts/experiment/statemachine/Dummy.sol/LifeCycleModule.json +2 -2
  28. package/artifacts/contracts/experiment/statemachine/ISM.sol/ISM.dbg.json +1 -1
  29. package/artifacts/contracts/experiment/statemachine/ISM.sol/ISMEE.dbg.json +1 -1
  30. package/artifacts/contracts/experiment/statemachine/SM.sol/SM.dbg.json +1 -1
  31. package/artifacts/contracts/experiment/statemachine/SM.sol/SM.json +2 -2
  32. package/artifacts/contracts/experiment/statemachine/SimpleStateMachine.sol/SimpleStateMachine.dbg.json +1 -1
  33. package/artifacts/contracts/experiment/statemachine/SimpleStateMachine.sol/SimpleStateMachine.json +2 -2
  34. package/artifacts/contracts/experiment/types/TypeA.sol/TypeALib.dbg.json +1 -1
  35. package/artifacts/contracts/experiment/types/TypeB.sol/TypeBLib.dbg.json +1 -1
  36. package/artifacts/contracts/instance/IInstance.sol/IInstance.dbg.json +1 -1
  37. package/artifacts/contracts/instance/IInstance.sol/IInstance.json +697 -671
  38. package/artifacts/contracts/instance/IInstanceLinked.sol/IInstanceLinked.dbg.json +1 -1
  39. package/artifacts/contracts/instance/Instance.sol/Instance.dbg.json +1 -1
  40. package/artifacts/contracts/instance/Instance.sol/Instance.json +928 -744
  41. package/artifacts/contracts/instance/base/ComponentServiceBase.sol/ComponentServiceBase.dbg.json +4 -0
  42. package/artifacts/contracts/instance/{InstanceBase.sol/InstanceBase.json → base/ComponentServiceBase.sol/ComponentServiceBase.json} +107 -33
  43. package/artifacts/contracts/instance/base/IInstanceBase.sol/IInstanceBase.dbg.json +4 -0
  44. package/artifacts/contracts/instance/base/IInstanceBase.sol/IInstanceBase.json +113 -0
  45. package/artifacts/contracts/instance/base/IKeyValueStore.sol/IKeyValueStore.dbg.json +4 -0
  46. package/artifacts/contracts/instance/base/IKeyValueStore.sol/IKeyValueStore.json +560 -0
  47. package/artifacts/contracts/instance/base/ILifecycle.sol/ILifecycle.dbg.json +4 -0
  48. package/artifacts/contracts/instance/{module/lifecycle/ILifecycle.sol/ILifecycleModule.json → base/ILifecycle.sol/ILifecycle.json} +10 -77
  49. package/artifacts/contracts/instance/base/IService.sol/IService.dbg.json +4 -0
  50. package/artifacts/contracts/instance/{service → base}/IService.sol/IService.json +63 -22
  51. package/artifacts/contracts/instance/base/InstanceBase.sol/InstanceBase.dbg.json +4 -0
  52. package/artifacts/contracts/instance/base/InstanceBase.sol/InstanceBase.json +463 -0
  53. package/artifacts/contracts/instance/base/KeyValueStore.sol/KeyValueStore.dbg.json +4 -0
  54. package/artifacts/contracts/instance/base/KeyValueStore.sol/KeyValueStore.json +710 -0
  55. package/artifacts/contracts/instance/base/Lifecycle.sol/Lifecycle.dbg.json +4 -0
  56. package/artifacts/contracts/instance/base/Lifecycle.sol/Lifecycle.json +169 -0
  57. package/artifacts/contracts/instance/base/ModuleBase.sol/ModuleBase.dbg.json +4 -0
  58. package/artifacts/contracts/instance/{module/product/ProductModule.sol/ProductModule.json → base/ModuleBase.sol/ModuleBase.json} +2 -2
  59. package/artifacts/contracts/instance/base/ServiceBase.sol/ServiceBase.dbg.json +4 -0
  60. package/artifacts/contracts/instance/{service → base}/ServiceBase.sol/ServiceBase.json +93 -6
  61. package/artifacts/contracts/instance/module/access/Access.sol/AccessModule.dbg.json +1 -1
  62. package/artifacts/contracts/instance/module/access/IAccess.sol/IAccess.dbg.json +1 -1
  63. package/artifacts/contracts/instance/module/access/IAccess.sol/IAccessModule.dbg.json +1 -1
  64. package/artifacts/contracts/instance/module/bundle/BundleModule.sol/BundleModule.dbg.json +1 -1
  65. package/artifacts/contracts/instance/module/bundle/BundleModule.sol/BundleModule.json +71 -50
  66. package/artifacts/contracts/instance/module/bundle/IBundle.sol/IBundle.dbg.json +1 -1
  67. package/artifacts/contracts/instance/module/bundle/IBundle.sol/IBundleModule.dbg.json +1 -1
  68. package/artifacts/contracts/instance/module/bundle/IBundle.sol/IBundleModule.json +71 -50
  69. package/artifacts/contracts/instance/module/component/ComponentModule.sol/ComponentModule.dbg.json +1 -1
  70. package/artifacts/contracts/instance/module/component/ComponentModule.sol/ComponentModule.json +22 -93
  71. package/artifacts/contracts/instance/module/component/IComponent.sol/IComponent.dbg.json +1 -1
  72. package/artifacts/contracts/instance/module/component/IComponent.sol/IComponentModule.dbg.json +1 -1
  73. package/artifacts/contracts/instance/module/component/IComponent.sol/IComponentModule.json +22 -93
  74. package/artifacts/contracts/instance/module/distribution/DistributionModule.sol/DistributionModule.dbg.json +4 -0
  75. package/artifacts/contracts/instance/module/distribution/DistributionModule.sol/DistributionModule.json +10 -0
  76. package/artifacts/contracts/instance/module/distribution/IDistribution.sol/IDistribution.dbg.json +4 -0
  77. package/artifacts/contracts/instance/module/distribution/IDistribution.sol/IDistribution.json +10 -0
  78. package/artifacts/contracts/instance/module/distribution/IDistribution.sol/IDistributionModule.dbg.json +4 -0
  79. package/artifacts/contracts/instance/module/distribution/IDistribution.sol/IDistributionModule.json +10 -0
  80. package/artifacts/contracts/instance/module/policy/IPolicy.sol/IPolicy.dbg.json +1 -1
  81. package/artifacts/contracts/instance/module/policy/IPolicy.sol/IPolicyModule.dbg.json +1 -1
  82. package/artifacts/contracts/instance/module/policy/IPolicy.sol/IPolicyModule.json +61 -38
  83. package/artifacts/contracts/instance/module/policy/PolicyModule.sol/PolicyModule.dbg.json +1 -1
  84. package/artifacts/contracts/instance/module/policy/PolicyModule.sol/PolicyModule.json +61 -38
  85. package/artifacts/contracts/instance/module/pool/IPoolModule.sol/IPool.dbg.json +1 -1
  86. package/artifacts/contracts/instance/module/pool/IPoolModule.sol/IPoolModule.dbg.json +1 -1
  87. package/artifacts/contracts/instance/module/pool/IPoolModule.sol/IPoolModule.json +0 -5
  88. package/artifacts/contracts/instance/module/pool/PoolModule.sol/PoolModule.dbg.json +1 -1
  89. package/artifacts/contracts/instance/module/pool/PoolModule.sol/PoolModule.json +0 -5
  90. package/artifacts/contracts/instance/module/risk/IRisk.sol/IRisk.dbg.json +4 -0
  91. package/artifacts/contracts/instance/module/{product/IProductModule.sol/IProductModule.json → risk/IRisk.sol/IRisk.json} +2 -2
  92. package/artifacts/contracts/instance/module/risk/IRisk.sol/IRiskModule.dbg.json +4 -0
  93. package/artifacts/contracts/instance/module/risk/IRisk.sol/IRiskModule.json +113 -0
  94. package/artifacts/contracts/instance/module/risk/RiskModule.sol/RiskModule.dbg.json +4 -0
  95. package/artifacts/contracts/instance/module/risk/RiskModule.sol/RiskModule.json +131 -0
  96. package/artifacts/contracts/instance/module/treasury/ITreasury.sol/ITreasury.dbg.json +1 -1
  97. package/artifacts/contracts/instance/module/treasury/ITreasury.sol/ITreasuryModule.dbg.json +1 -1
  98. package/artifacts/contracts/instance/module/treasury/ITreasury.sol/ITreasuryModule.json +209 -236
  99. package/artifacts/contracts/instance/module/treasury/TokenHandler.sol/TokenHandler.dbg.json +1 -1
  100. package/artifacts/contracts/instance/module/treasury/TokenHandler.sol/TokenHandler.json +2 -2
  101. package/artifacts/contracts/instance/module/treasury/TreasuryModule.sol/TreasuryModule.dbg.json +1 -1
  102. package/artifacts/contracts/instance/module/treasury/TreasuryModule.sol/TreasuryModule.json +209 -236
  103. package/artifacts/contracts/instance/service/ComponentOwnerService.sol/ComponentOwnerService.dbg.json +1 -1
  104. package/artifacts/contracts/instance/service/ComponentOwnerService.sol/ComponentOwnerService.json +141 -42
  105. package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.dbg.json +4 -0
  106. package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.json +507 -0
  107. package/artifacts/contracts/instance/service/IComponentOwnerService.sol/IComponentOwnerService.dbg.json +1 -1
  108. package/artifacts/contracts/instance/service/IComponentOwnerService.sol/IComponentOwnerService.json +62 -21
  109. package/artifacts/contracts/instance/service/IDistributionService.sol/IDistributionService.dbg.json +4 -0
  110. package/artifacts/contracts/instance/service/{ComponentServiceBase.sol/ComponentServiceBase.json → IDistributionService.sol/IDistributionService.json} +96 -30
  111. package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.dbg.json +1 -1
  112. package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.json +127 -22
  113. package/artifacts/contracts/instance/service/IProductService.sol/IProductService.dbg.json +1 -1
  114. package/artifacts/contracts/instance/service/IProductService.sol/IProductService.json +215 -21
  115. package/artifacts/contracts/instance/service/PoolService.sol/PoolService.dbg.json +1 -1
  116. package/artifacts/contracts/instance/service/PoolService.sol/PoolService.json +177 -46
  117. package/artifacts/contracts/instance/service/ProductService.sol/ProductService.dbg.json +1 -1
  118. package/artifacts/contracts/instance/service/ProductService.sol/ProductService.json +322 -62
  119. package/artifacts/contracts/registry/ChainNft.sol/ChainNft.dbg.json +1 -1
  120. package/artifacts/contracts/registry/IChainNft.sol/IChainNft.dbg.json +1 -1
  121. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.dbg.json +1 -1
  122. package/artifacts/contracts/registry/IRegistryLinked.sol/IRegistryLinked.dbg.json +1 -1
  123. package/artifacts/contracts/registry/Registry.sol/Registry.dbg.json +1 -1
  124. package/artifacts/contracts/registry/Registry.sol/Registry.json +2 -2
  125. package/artifacts/contracts/registry/RegistryUpgradeable.sol/RegistryUpgradeable.dbg.json +4 -0
  126. package/artifacts/contracts/registry/RegistryUpgradeable.sol/RegistryUpgradeable.json +724 -0
  127. package/artifacts/contracts/shared/ERC165.sol/ERC165.dbg.json +1 -1
  128. package/artifacts/contracts/shared/IOwnable.sol/IOwnable.dbg.json +1 -1
  129. package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.dbg.json +1 -1
  130. package/artifacts/contracts/shared/IVersionable.sol/IVersionable.dbg.json +1 -1
  131. package/artifacts/contracts/shared/IVersionable.sol/IVersionable.json +58 -17
  132. package/artifacts/contracts/shared/Proxy.sol/ProxyDeployer.dbg.json +4 -0
  133. package/artifacts/contracts/shared/Proxy.sol/ProxyDeployer.json +248 -0
  134. package/artifacts/contracts/shared/Proxy.sol/ProxyWithProxyAdminGetter.dbg.json +4 -0
  135. package/artifacts/contracts/shared/Proxy.sol/ProxyWithProxyAdminGetter.json +129 -0
  136. package/artifacts/contracts/shared/Registerable.sol/Registerable.dbg.json +1 -1
  137. package/artifacts/contracts/shared/Versionable.sol/Versionable.dbg.json +1 -1
  138. package/artifacts/contracts/shared/Versionable.sol/Versionable.json +92 -5
  139. package/artifacts/contracts/shared/VersionableUpgradeable.sol/VersionableUpgradeable.dbg.json +4 -0
  140. package/artifacts/contracts/shared/VersionableUpgradeable.sol/VersionableUpgradeable.json +228 -0
  141. package/artifacts/contracts/test/TestDistribution.sol/TestDistribution.dbg.json +4 -0
  142. package/artifacts/contracts/test/TestDistribution.sol/TestDistribution.json +405 -0
  143. package/artifacts/contracts/test/TestFee.sol/TestFee.dbg.json +1 -1
  144. package/artifacts/contracts/test/TestFee.sol/TestFee.json +28 -4
  145. package/artifacts/contracts/test/TestPool.sol/TestPool.dbg.json +1 -1
  146. package/artifacts/contracts/test/TestPool.sol/TestPool.json +194 -3
  147. package/artifacts/contracts/test/TestProduct.sol/TestProduct.dbg.json +1 -1
  148. package/artifacts/contracts/test/TestProduct.sol/TestProduct.json +209 -27
  149. package/artifacts/contracts/test/TestRegisterable.sol/TestRegisterable.dbg.json +1 -1
  150. package/artifacts/contracts/test/TestRegisterable.sol/TestRegisterable.json +2 -2
  151. package/artifacts/contracts/test/TestRoleId.sol/TestRoleId.dbg.json +1 -1
  152. package/artifacts/contracts/test/TestRoleId.sol/TestRoleId.json +38 -4
  153. package/artifacts/contracts/test/TestService.sol/TestService.dbg.json +1 -1
  154. package/artifacts/contracts/test/TestService.sol/TestService.json +102 -43
  155. package/artifacts/contracts/test/TestToken.sol/TestUsdc.dbg.json +1 -1
  156. package/artifacts/contracts/test/TestVersion.sol/TestVersion.dbg.json +1 -1
  157. package/artifacts/contracts/test/TestVersion.sol/TestVersion.json +14 -18
  158. package/artifacts/contracts/test/TestVersionable.sol/TestVersionable.dbg.json +1 -1
  159. package/artifacts/contracts/test/TestVersionable.sol/TestVersionable.json +102 -39
  160. package/artifacts/contracts/test/Usdc.sol/USDC.dbg.json +4 -0
  161. package/artifacts/contracts/test/Usdc.sol/USDC.json +338 -0
  162. package/artifacts/contracts/types/AddressSet.sol/LibAddressSet.dbg.json +1 -1
  163. package/artifacts/contracts/types/Blocknumber.sol/BlocknumberLib.dbg.json +1 -1
  164. package/artifacts/contracts/types/ChainId.sol/ChainIdLib.dbg.json +1 -1
  165. package/artifacts/contracts/types/Fee.sol/FeeLib.dbg.json +4 -0
  166. package/artifacts/contracts/types/Fee.sol/FeeLib.json +257 -0
  167. package/artifacts/contracts/types/Key32.sol/Key32Lib.dbg.json +4 -0
  168. package/artifacts/contracts/types/Key32.sol/Key32Lib.json +111 -0
  169. package/artifacts/contracts/types/NftId.sol/NftIdLib.dbg.json +1 -1
  170. package/artifacts/contracts/types/NftId.sol/NftIdLib.json +65 -4
  171. package/artifacts/contracts/types/NftIdSet.sol/LibNftIdSet.dbg.json +1 -1
  172. package/artifacts/contracts/types/NftIdSet.sol/LibNftIdSet.json +2 -2
  173. package/artifacts/contracts/types/ObjectType.sol/ObjectTypeLib.dbg.json +1 -1
  174. package/artifacts/contracts/types/ObjectType.sol/ObjectTypeLib.json +2 -2
  175. package/artifacts/contracts/types/ReferralId.sol/ReferralIdLib.dbg.json +4 -0
  176. package/artifacts/contracts/types/ReferralId.sol/ReferralIdLib.json +99 -0
  177. package/artifacts/contracts/types/RiskId.sol/RiskIdLib.dbg.json +4 -0
  178. package/artifacts/contracts/types/RiskId.sol/RiskIdLib.json +86 -0
  179. package/artifacts/contracts/types/RoleId.sol/RoleIdLib.dbg.json +4 -0
  180. package/artifacts/contracts/types/RoleId.sol/RoleIdLib.json +30 -0
  181. package/artifacts/contracts/types/StateId.sol/StateIdLib.dbg.json +1 -1
  182. package/artifacts/contracts/types/StateId.sol/StateIdLib.json +2 -2
  183. package/artifacts/contracts/types/Timestamp.sol/TimestampLib.dbg.json +1 -1
  184. package/artifacts/contracts/types/UFixed.sol/UFixedMathLib.dbg.json +1 -1
  185. package/artifacts/contracts/types/UFixed.sol/UFixedMathLib.json +34 -8
  186. package/artifacts/contracts/types/Version.sol/VersionLib.dbg.json +1 -1
  187. package/artifacts/contracts/types/Version.sol/VersionLib.json +101 -2
  188. package/artifacts/contracts/types/Version.sol/VersionPartLib.dbg.json +1 -1
  189. package/artifacts/contracts/types/Version.sol/VersionPartLib.json +2 -2
  190. package/contracts/components/BaseComponent.sol +7 -2
  191. package/contracts/components/Distribution.sol +132 -0
  192. package/contracts/components/IDistributionComponent.sol +47 -0
  193. package/contracts/components/IPoolComponent.sol +14 -0
  194. package/contracts/components/IProductComponent.sol +24 -5
  195. package/contracts/components/Pool.sol +64 -3
  196. package/contracts/components/Product.sol +123 -13
  197. package/contracts/instance/IInstance.sol +16 -13
  198. package/contracts/instance/Instance.sol +22 -10
  199. package/contracts/instance/{service → base}/ComponentServiceBase.sol +1 -0
  200. package/contracts/instance/base/IInstanceBase.sol +22 -0
  201. package/contracts/instance/base/IKeyValueStore.sol +50 -0
  202. package/contracts/instance/base/ILifecycle.sol +30 -0
  203. package/contracts/instance/{InstanceBase.sol → base/InstanceBase.sol} +34 -17
  204. package/contracts/instance/base/KeyValueStore.sol +161 -0
  205. package/contracts/instance/{module/lifecycle/LifecycleModule.sol → base/Lifecycle.sol} +50 -39
  206. package/contracts/instance/base/ModuleBase.sol +57 -0
  207. package/contracts/instance/{service → base}/ServiceBase.sol +1 -3
  208. package/contracts/instance/module/access/Access.sol +6 -6
  209. package/contracts/instance/module/bundle/BundleModule.sol +24 -118
  210. package/contracts/instance/module/bundle/IBundle.sol +9 -9
  211. package/contracts/instance/module/component/ComponentModule.sol +27 -61
  212. package/contracts/instance/module/component/IComponent.sol +5 -30
  213. package/contracts/instance/module/distribution/DistributionModule.sol +17 -0
  214. package/contracts/instance/module/distribution/IDistribution.sol +10 -0
  215. package/contracts/instance/module/policy/IPolicy.sol +12 -9
  216. package/contracts/instance/module/policy/PolicyModule.sol +33 -26
  217. package/contracts/instance/module/pool/IPoolModule.sol +0 -1
  218. package/contracts/instance/module/pool/PoolModule.sol +12 -9
  219. package/contracts/instance/module/risk/IRisk.sol +26 -0
  220. package/contracts/instance/module/risk/RiskModule.sol +62 -0
  221. package/contracts/instance/module/treasury/ITreasury.sol +30 -52
  222. package/contracts/instance/module/treasury/TreasuryModule.sol +74 -84
  223. package/contracts/instance/service/ComponentOwnerService.sol +33 -50
  224. package/contracts/instance/service/DistributionService.sol +59 -0
  225. package/contracts/instance/service/IComponentOwnerService.sol +1 -1
  226. package/contracts/instance/service/IDistributionService.sol +12 -0
  227. package/contracts/instance/service/IPoolService.sol +8 -1
  228. package/contracts/instance/service/IProductService.sol +56 -7
  229. package/contracts/instance/service/PoolService.sol +64 -13
  230. package/contracts/instance/service/ProductService.sol +234 -83
  231. package/contracts/registry/Registry.sol +4 -4
  232. package/contracts/registry/RegistryUpgradeable.sol +488 -0
  233. package/contracts/shared/IVersionable.sol +19 -6
  234. package/contracts/shared/Proxy.sol +94 -0
  235. package/contracts/shared/Versionable.sol +16 -9
  236. package/contracts/shared/VersionableUpgradeable.sol +136 -0
  237. package/contracts/test/TestDistribution.sol +21 -0
  238. package/contracts/test/TestFee.sol +3 -3
  239. package/contracts/test/TestPool.sol +6 -3
  240. package/contracts/test/TestProduct.sol +36 -8
  241. package/contracts/test/TestRoleId.sol +2 -2
  242. package/contracts/test/TestService.sol +3 -6
  243. package/contracts/test/TestVersion.sol +4 -7
  244. package/contracts/test/TestVersionable.sol +2 -5
  245. package/contracts/test/Usdc.sol +26 -0
  246. package/contracts/types/Fee.sol +44 -20
  247. package/contracts/types/Key32.sol +45 -0
  248. package/contracts/types/NftId.sol +16 -1
  249. package/contracts/types/ObjectType.sol +24 -8
  250. package/contracts/types/ReferralId.sol +48 -0
  251. package/contracts/types/RiskId.sol +43 -0
  252. package/contracts/types/RoleId.sol +12 -10
  253. package/contracts/types/StateId.sol +7 -1
  254. package/contracts/types/UFixed.sol +19 -16
  255. package/contracts/types/Version.sol +37 -25
  256. package/package.json +1 -1
  257. package/artifacts/contracts/instance/IServiceLinked.sol/IServiceLinked.dbg.json +0 -4
  258. package/artifacts/contracts/instance/IServiceLinked.sol/IServiceLinked.json +0 -50
  259. package/artifacts/contracts/instance/InstanceBase.sol/InstanceBase.dbg.json +0 -4
  260. package/artifacts/contracts/instance/module/lifecycle/ILifecycle.sol/ILifecycle.dbg.json +0 -4
  261. package/artifacts/contracts/instance/module/lifecycle/ILifecycle.sol/ILifecycle.json +0 -134
  262. package/artifacts/contracts/instance/module/lifecycle/ILifecycle.sol/ILifecycleModule.dbg.json +0 -4
  263. package/artifacts/contracts/instance/module/lifecycle/LifecycleModule.sol/LifecycleModule.dbg.json +0 -4
  264. package/artifacts/contracts/instance/module/lifecycle/LifecycleModule.sol/LifecycleModule.json +0 -221
  265. package/artifacts/contracts/instance/module/product/IProductModule.sol/IProductModule.dbg.json +0 -4
  266. package/artifacts/contracts/instance/module/product/ProductModule.sol/ProductModule.dbg.json +0 -4
  267. package/artifacts/contracts/instance/service/ComponentServiceBase.sol/ComponentServiceBase.dbg.json +0 -4
  268. package/artifacts/contracts/instance/service/IService.sol/IService.dbg.json +0 -4
  269. package/artifacts/contracts/instance/service/ServiceBase.sol/ServiceBase.dbg.json +0 -4
  270. package/contracts/instance/IServiceLinked.sol +0 -12
  271. package/contracts/instance/module/lifecycle/ILifecycle.sol +0 -47
  272. package/contracts/instance/module/product/IProductModule.sol +0 -6
  273. package/contracts/instance/module/product/ProductModule.sol +0 -8
  274. /package/contracts/instance/{service → base}/IService.sol +0 -0
@@ -0,0 +1,507 @@
1
+ {
2
+ "_format": "hh-sol-artifact-1",
3
+ "contractName": "DistributionService",
4
+ "sourceName": "contracts/instance/service/DistributionService.sol",
5
+ "abi": [
6
+ {
7
+ "inputs": [
8
+ {
9
+ "internalType": "address",
10
+ "name": "registry",
11
+ "type": "address"
12
+ },
13
+ {
14
+ "internalType": "NftId",
15
+ "name": "registryNftId",
16
+ "type": "uint96"
17
+ }
18
+ ],
19
+ "stateMutability": "nonpayable",
20
+ "type": "constructor"
21
+ },
22
+ {
23
+ "inputs": [],
24
+ "name": "InvalidInitialization",
25
+ "type": "error"
26
+ },
27
+ {
28
+ "inputs": [],
29
+ "name": "NotInitializing",
30
+ "type": "error"
31
+ },
32
+ {
33
+ "anonymous": false,
34
+ "inputs": [
35
+ {
36
+ "indexed": false,
37
+ "internalType": "uint64",
38
+ "name": "version",
39
+ "type": "uint64"
40
+ }
41
+ ],
42
+ "name": "Initialized",
43
+ "type": "event"
44
+ },
45
+ {
46
+ "anonymous": false,
47
+ "inputs": [
48
+ {
49
+ "indexed": false,
50
+ "internalType": "Version",
51
+ "name": "version",
52
+ "type": "uint24"
53
+ },
54
+ {
55
+ "indexed": false,
56
+ "internalType": "address",
57
+ "name": "implementation",
58
+ "type": "address"
59
+ },
60
+ {
61
+ "indexed": false,
62
+ "internalType": "address",
63
+ "name": "activatedBy",
64
+ "type": "address"
65
+ }
66
+ ],
67
+ "name": "LogVersionableActivated",
68
+ "type": "event"
69
+ },
70
+ {
71
+ "inputs": [],
72
+ "name": "NAME",
73
+ "outputs": [
74
+ {
75
+ "internalType": "string",
76
+ "name": "",
77
+ "type": "string"
78
+ }
79
+ ],
80
+ "stateMutability": "view",
81
+ "type": "function"
82
+ },
83
+ {
84
+ "inputs": [
85
+ {
86
+ "internalType": "address",
87
+ "name": "implementation",
88
+ "type": "address"
89
+ },
90
+ {
91
+ "internalType": "address",
92
+ "name": "activatedBy",
93
+ "type": "address"
94
+ },
95
+ {
96
+ "internalType": "bytes",
97
+ "name": "activatinData",
98
+ "type": "bytes"
99
+ }
100
+ ],
101
+ "name": "activate",
102
+ "outputs": [],
103
+ "stateMutability": "nonpayable",
104
+ "type": "function"
105
+ },
106
+ {
107
+ "inputs": [],
108
+ "name": "getData",
109
+ "outputs": [
110
+ {
111
+ "internalType": "bytes",
112
+ "name": "data",
113
+ "type": "bytes"
114
+ }
115
+ ],
116
+ "stateMutability": "view",
117
+ "type": "function"
118
+ },
119
+ {
120
+ "inputs": [],
121
+ "name": "getInitializedVersion",
122
+ "outputs": [
123
+ {
124
+ "internalType": "uint64",
125
+ "name": "",
126
+ "type": "uint64"
127
+ }
128
+ ],
129
+ "stateMutability": "view",
130
+ "type": "function"
131
+ },
132
+ {
133
+ "inputs": [],
134
+ "name": "getMajorVersion",
135
+ "outputs": [
136
+ {
137
+ "internalType": "VersionPart",
138
+ "name": "majorVersion",
139
+ "type": "uint8"
140
+ }
141
+ ],
142
+ "stateMutability": "view",
143
+ "type": "function"
144
+ },
145
+ {
146
+ "inputs": [],
147
+ "name": "getName",
148
+ "outputs": [
149
+ {
150
+ "internalType": "string",
151
+ "name": "name",
152
+ "type": "string"
153
+ }
154
+ ],
155
+ "stateMutability": "pure",
156
+ "type": "function"
157
+ },
158
+ {
159
+ "inputs": [],
160
+ "name": "getNftId",
161
+ "outputs": [
162
+ {
163
+ "internalType": "NftId",
164
+ "name": "nftId",
165
+ "type": "uint96"
166
+ }
167
+ ],
168
+ "stateMutability": "view",
169
+ "type": "function"
170
+ },
171
+ {
172
+ "inputs": [],
173
+ "name": "getOwner",
174
+ "outputs": [
175
+ {
176
+ "internalType": "address",
177
+ "name": "owner",
178
+ "type": "address"
179
+ }
180
+ ],
181
+ "stateMutability": "view",
182
+ "type": "function"
183
+ },
184
+ {
185
+ "inputs": [],
186
+ "name": "getParentNftId",
187
+ "outputs": [
188
+ {
189
+ "internalType": "NftId",
190
+ "name": "nftId",
191
+ "type": "uint96"
192
+ }
193
+ ],
194
+ "stateMutability": "view",
195
+ "type": "function"
196
+ },
197
+ {
198
+ "inputs": [],
199
+ "name": "getRegistry",
200
+ "outputs": [
201
+ {
202
+ "internalType": "contract IRegistry",
203
+ "name": "registry",
204
+ "type": "address"
205
+ }
206
+ ],
207
+ "stateMutability": "view",
208
+ "type": "function"
209
+ },
210
+ {
211
+ "inputs": [],
212
+ "name": "getType",
213
+ "outputs": [
214
+ {
215
+ "internalType": "ObjectType",
216
+ "name": "",
217
+ "type": "uint8"
218
+ }
219
+ ],
220
+ "stateMutability": "pure",
221
+ "type": "function"
222
+ },
223
+ {
224
+ "inputs": [],
225
+ "name": "getVersion",
226
+ "outputs": [
227
+ {
228
+ "internalType": "Version",
229
+ "name": "",
230
+ "type": "uint24"
231
+ }
232
+ ],
233
+ "stateMutability": "pure",
234
+ "type": "function"
235
+ },
236
+ {
237
+ "inputs": [
238
+ {
239
+ "internalType": "uint256",
240
+ "name": "idx",
241
+ "type": "uint256"
242
+ }
243
+ ],
244
+ "name": "getVersion",
245
+ "outputs": [
246
+ {
247
+ "internalType": "Version",
248
+ "name": "",
249
+ "type": "uint24"
250
+ }
251
+ ],
252
+ "stateMutability": "view",
253
+ "type": "function"
254
+ },
255
+ {
256
+ "inputs": [],
257
+ "name": "getVersionCount",
258
+ "outputs": [
259
+ {
260
+ "internalType": "uint256",
261
+ "name": "",
262
+ "type": "uint256"
263
+ }
264
+ ],
265
+ "stateMutability": "view",
266
+ "type": "function"
267
+ },
268
+ {
269
+ "inputs": [
270
+ {
271
+ "internalType": "Version",
272
+ "name": "_version",
273
+ "type": "uint24"
274
+ }
275
+ ],
276
+ "name": "getVersionInfo",
277
+ "outputs": [
278
+ {
279
+ "components": [
280
+ {
281
+ "internalType": "Version",
282
+ "name": "version",
283
+ "type": "uint24"
284
+ },
285
+ {
286
+ "internalType": "address",
287
+ "name": "implementation",
288
+ "type": "address"
289
+ },
290
+ {
291
+ "internalType": "address",
292
+ "name": "activatedBy",
293
+ "type": "address"
294
+ },
295
+ {
296
+ "internalType": "Timestamp",
297
+ "name": "activatedAt",
298
+ "type": "uint40"
299
+ },
300
+ {
301
+ "internalType": "Blocknumber",
302
+ "name": "activatedIn",
303
+ "type": "uint32"
304
+ }
305
+ ],
306
+ "internalType": "struct IVersionable.VersionInfo",
307
+ "name": "",
308
+ "type": "tuple"
309
+ }
310
+ ],
311
+ "stateMutability": "view",
312
+ "type": "function"
313
+ },
314
+ {
315
+ "inputs": [
316
+ {
317
+ "internalType": "address",
318
+ "name": "implementation",
319
+ "type": "address"
320
+ },
321
+ {
322
+ "internalType": "address",
323
+ "name": "activatedBy",
324
+ "type": "address"
325
+ },
326
+ {
327
+ "internalType": "bytes",
328
+ "name": "initializationData",
329
+ "type": "bytes"
330
+ }
331
+ ],
332
+ "name": "initialize",
333
+ "outputs": [],
334
+ "stateMutability": "nonpayable",
335
+ "type": "function"
336
+ },
337
+ {
338
+ "inputs": [
339
+ {
340
+ "internalType": "Version",
341
+ "name": "_version",
342
+ "type": "uint24"
343
+ }
344
+ ],
345
+ "name": "isActivated",
346
+ "outputs": [
347
+ {
348
+ "internalType": "bool",
349
+ "name": "",
350
+ "type": "bool"
351
+ }
352
+ ],
353
+ "stateMutability": "view",
354
+ "type": "function"
355
+ },
356
+ {
357
+ "inputs": [],
358
+ "name": "register",
359
+ "outputs": [
360
+ {
361
+ "internalType": "NftId",
362
+ "name": "nftId",
363
+ "type": "uint96"
364
+ }
365
+ ],
366
+ "stateMutability": "nonpayable",
367
+ "type": "function"
368
+ },
369
+ {
370
+ "inputs": [
371
+ {
372
+ "components": [
373
+ {
374
+ "internalType": "UFixed",
375
+ "name": "fractionalFee",
376
+ "type": "uint256"
377
+ },
378
+ {
379
+ "internalType": "uint256",
380
+ "name": "fixedFee",
381
+ "type": "uint256"
382
+ }
383
+ ],
384
+ "internalType": "struct Fee",
385
+ "name": "distributionFee",
386
+ "type": "tuple"
387
+ }
388
+ ],
389
+ "name": "setFees",
390
+ "outputs": [],
391
+ "stateMutability": "nonpayable",
392
+ "type": "function"
393
+ },
394
+ {
395
+ "inputs": [
396
+ {
397
+ "internalType": "bytes4",
398
+ "name": "interfaceId",
399
+ "type": "bytes4"
400
+ }
401
+ ],
402
+ "name": "supportsInterface",
403
+ "outputs": [
404
+ {
405
+ "internalType": "bool",
406
+ "name": "",
407
+ "type": "bool"
408
+ }
409
+ ],
410
+ "stateMutability": "view",
411
+ "type": "function"
412
+ },
413
+ {
414
+ "inputs": [
415
+ {
416
+ "internalType": "address",
417
+ "name": "implementation",
418
+ "type": "address"
419
+ },
420
+ {
421
+ "internalType": "address",
422
+ "name": "activatedBy",
423
+ "type": "address"
424
+ },
425
+ {
426
+ "internalType": "bytes",
427
+ "name": "upgradeData",
428
+ "type": "bytes"
429
+ }
430
+ ],
431
+ "name": "upgrade",
432
+ "outputs": [],
433
+ "stateMutability": "nonpayable",
434
+ "type": "function"
435
+ }
436
+ ],
437
+ "bytecode": "0x60e06040523480156200001157600080fd5b50604051620020c2380380620020c2833981016040819052620000349162000760565b6301ffc9a760e01b60009081526020527f67be87c3ff9960ca1e9cfac5cab2ff4747269cf9ed20c9b7306235ac35a491c5805460ff191660011790558181818181816001600160a01b038216620000d25760405162461bcd60e51b815260206004820152601b60248201527f4552524f523a5247422d3031303a52454749535452595f5a45524f000000000060448201526064015b60405180910390fd5b6001600160a01b03821660808190526040516301ffc9a760e01b81526306ecd8ef60e01b60048201526301ffc9a790602401602060405180830381865afa15801562000122573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190620001489190620007b5565b620001965760405162461bcd60e51b815260206004820152601a60248201527f4552524f523a5247422d3031313a4e4f545f52454749535452590000000000006044820152606401620000c9565b6001600160601b03811660a081905260805160405163e74d052f60e01b815260048101929092526001600160a01b03169063e74d052f90602401602060405180830381865afa158015620001ee573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190620002149190620007b5565b6200026e5760405162461bcd60e51b815260206004820152602360248201527f4552524f523a5247422d3031323a504152454e545f4e4f545f5245474953544560448201526214915160ea1b6064820152608401620000c9565b3360c052631dfba64760e11b60009081526020527f95e5a2564f7af40498dc043c6da135e06324c5edb1f60c2bf4dcdf2da207fa45805460ff1916600117905550620002be905060003362000343565b631b4612f160e31b60009081526020527ffc58a5a01198e68c5a5d0bcd463f9ab550fc4337b1df271aed6dbb33d25fef25805460ff191660011790555050505062000316631fa9607b60e11b6200031e60201b60201c565b505062000859565b6001600160e01b0319166000908152602081905260409020805460ff19166001179055565b60006200034f6200061b565b90506200035c81620006a8565b15620003bb5760405162461bcd60e51b815260206004820152602760248201527f4552524f523a56524e2d3030313a56455253494f4e5f414c52454144595f41436044820152661512559055115160ca1b6064820152608401620000c9565b600254156200047c576002805460009190620003da90600190620007e0565b81548110620003ed57620003ed62000802565b90600052602060002090600a91828204019190066003029054906101000a900462ffffff1690506200042082826200074e565b6200047a5760405162461bcd60e51b8152602060048201526024808201527f4552524f523a56524e2d3030323a56455253494f4e5f4e4f545f494e4352454160448201526353494e4760e01b6064820152608401620000c9565b505b60028054600181018255600091909152600a8082047f405787fa12a823e0f2b7631cc41b3ba8828b3321ca811111fa75cd3aa3bb5ace01805462ffffff808616600394909506939093026101000a848102930219169190911790556040805160a0810182529182526001600160a01b03808616602084015284169082015260608101620005064290565b64ffffffffff1681526020014363ffffffff90811690915262ffffff80841660009081526001602081815260409283902086518154928801516001600160a01b039081166301000000026001600160b81b0319909416919096161791909117815585830151910180546060870151608090970151909516600160c81b0263ffffffff60c81b1964ffffffffff909716600160a01b026001600160c81b031990961692909416919091179390931793909316179055517f68e7327fca0057a787cde34ababb9ef9844ba8065ee03e8781d8122fc15d4419906200060e9083908690869062ffffff9390931683526001600160a01b03918216602084015216604082015260600190565b60405180910390a1505050565b604051632efe011360e01b815260036004820152600060248201819052604482018190529073__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__90632efe011390606401602060405180830381865af41580156200067d573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190620006a3919062000818565b905090565b62ffffff81166000908152600160208190526040808320909101549051631bbffab160e21b8152600160c81b90910463ffffffff166004820152819073__$5f476116ae21c5294e0c0761c07efa7e1c$__90636effeac490602401602060405180830381865af415801562000721573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906200074791906200083f565b1192915050565b62ffffff808216908316115b92915050565b600080604083850312156200077457600080fd5b82516001600160a01b03811681146200078c57600080fd5b60208401519092506001600160601b0381168114620007aa57600080fd5b809150509250929050565b600060208284031215620007c857600080fd5b81518015158114620007d957600080fd5b9392505050565b818103818111156200075a57634e487b7160e01b600052601160045260246000fd5b634e487b7160e01b600052603260045260246000fd5b6000602082840312156200082b57600080fd5b815162ffffff81168114620007d957600080fd5b6000602082840312156200085257600080fd5b5051919050565b60805160a05160c051611808620008ba60003960006109080152600061021c01526000818161037a0152818161061801528181610818015281816108890152818161094b01528181610b6901528181610cc50152610dbb01526118086000f3fe608060405234801561001057600080fd5b50600436106101375760003560e01c80635ab1bd53116100b8578063a3f4df7e1161007c578063a3f4df7e146103e6578063a745e3df146103b2578063b3c6501514610418578063b88da75914610439578063cde749f41461044c578063cf7a1d771461045457600080fd5b80635ab1bd53146103785780635b5b48f5146103b2578063644c45e0146103c5578063893d20e8146103cd578063946dfcfe146103d557600080fd5b80631aa3a008116100ff5780631aa3a008146101fa57806331b62a3b1461021a5780633bc5de30146102405780633f52c0f6146102545780634d459c901461026957600080fd5b806301ffc9a71461013c5780630abd84341461017e5780630d8e6e2c1461019157806315dae03e146101ad57806317d7de7c146101c2575b600080fd5b61016961014a366004611124565b6001600160e01b03191660009081526020819052604090205460ff1690565b60405190151581526020015b60405180910390f35b61016961018c366004611169565b610467565b61019961050a565b60405162ffffff9091168152602001610175565b60285b60405160ff9091168152602001610175565b604080518082019091526013815272446973747269627574696f6e5365727669636560681b60208201525b60405161017591906111d6565b610202610594565b6040516001600160601b039091168152602001610175565b7f0000000000000000000000000000000000000000000000000000000000000000610202565b6040805160208101909152600081526101ed565b6102676102623660046112a0565b61068d565b005b61031b610277366004611169565b6040805160a0810182526000808252602082018190529181018290526060810182905260808101919091525062ffffff908116600090815260016020818152604092839020835160a0810185528154958616815263010000009095046001600160a01b03908116928601929092529091015490811691830191909152600160a01b810464ffffffffff166060830152600160c81b900463ffffffff16608082015290565b60408051825162ffffff1681526020808401516001600160a01b039081169183019190915283830151169181019190915260608083015164ffffffffff169082015260809182015163ffffffff169181019190915260a001610175565b7f00000000000000000000000000000000000000000000000000000000000000005b6040516001600160a01b039091168152602001610175565b6102676103c036600461130f565b505050565b610202610800565b61039a610867565b600254604051908152602001610175565b6101ed60405180604001604052806013815260200172446973747269627574696f6e5365727669636560681b81525081565b6104206109c4565b60405167ffffffffffffffff9091168152602001610175565b6101996104473660046113b4565b6109f8565b6101b0610a39565b61026761046236600461130f565b610b16565b62ffffff81166000908152600160208190526040808320909101549051631bbffab160e21b8152600160c81b90910463ffffffff166004820152819073__$5f476116ae21c5294e0c0761c07efa7e1c$__90636effeac490602401602060405180830381865af41580156104df573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061050391906113cd565b1192915050565b604051632efe011360e01b815260036004820152600060248201819052604482018190529073__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__90632efe011390606401602060405180830381865af415801561056b573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061058f91906113e6565b905090565b600061059e610867565b6001600160a01b0316336001600160a01b0316146106035760405162461bcd60e51b815260206004820152601760248201527f4552524f523a5247422d3030313a4e4f545f4f574e455200000000000000000060448201526064015b60405180910390fd5b604051632210724360e11b81523060048201527f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031690634420e486906024016020604051808303816000875af1158015610669573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061058f919061141f565b60008061069a6078610b20565b8151604051639ae31ff560e01b81526001600160601b03909116600482015291935091506000906001600160a01b03831690639ae31ff590602401602060405180830381865afa1580156106f2573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610716919061141f565b60405163f2b246c360e01b81526001600160601b03821660048201529091506000906001600160a01b0384169063f2b246c3906024016101e060405180830381865afa15801561076a573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061078e9190611475565b61010081018690526040516306a5298b60e01b81529091506001600160a01b038416906306a5298b906107c79085908590600401611534565b600060405180830381600087803b1580156107e157600080fd5b505af11580156107f5573d6000803e3d6000fd5b505050505050505050565b604051636939560f60e11b81523060048201526000907f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03169063d272ac1e90602401602060405180830381865afa158015610669573d6000803e3d6000fd5b604051636939560f60e11b815230600482015260009081906001600160a01b037f0000000000000000000000000000000000000000000000000000000000000000169063d272ac1e90602401602060405180830381865afa1580156108d0573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906108f4919061141f565b9050610901816000610e40565b1561092d577f000000000000000000000000000000000000000000000000000000000000000091505090565b60405163df33330b60e01b81526001600160601b03821660048201527f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03169063df33330b90602401602060405180830381865afa15801561099a573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906109be919061161b565b91505090565b600061058f7ff0c57e16840df040f15088dc2f81fe391c3923bec73e23a9662efc9c229c6a005467ffffffffffffffff1690565b600060028281548110610a0d57610a0d611638565b90600052602060002090600a91828204019190066003029054906101000a900462ffffff169050919050565b6000306001600160a01b0316630d8e6e2c6040518163ffffffff1660e01b8152600401602060405180830381865afa158015610a79573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610a9d91906113e6565b60405163c9e66e2960e01b815262ffffff909116600482015273__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__9063c9e66e2990602401602060405180830381865af4158015610af2573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061058f919061165d565b6103c08383610e56565b6040805160c08101825260008082526020820181905281830181905260608083018290526080830182905260a08301529151636939560f60e11b815233600482015290919081907f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03169063d272ac1e90602401602060405180830381865afa158015610bb8573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610bdc919061141f565b6040516330b8415f60e01b81526001600160601b038216600482015290915073__$6facc32ab6029a5f5de2a1d5e55ea9da0e$__906330b8415f90602401602060405180830381865af4158015610c37573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610c5b919061167a565b610ca75760405162461bcd60e51b815260206004820152601760248201527f4552524f525f434f4d504f4e454e545f554e4b4e4f574e00000000000000000060448201526064016105fa565b6040516305247a1760e51b81526001600160601b03821660048201527f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03169063a48f42e090602401600060405180830381865afa158015610d14573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f19168201604052610d3c91908101906116e9565b9250610d5283604001518560ff90811691161490565b610d945760405162461bcd60e51b815260206004820152601360248201527213d0929150d517d516541157d2539590531251606a1b60448201526064016105fa565b60208301516040516305247a1760e51b81526001600160601b0390911660048201526000907f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03169063a48f42e090602401600060405180830381865afa158015610e0a573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f19168201604052610e3291908101906116e9565b606001519395939450505050565b6001600160601b03828116908216145b92915050565b6000610e6061050a565b9050610e6b81610467565b15610ec85760405162461bcd60e51b815260206004820152602760248201527f4552524f523a56524e2d3030313a56455253494f4e5f414c52454144595f41436044820152661512559055115160ca1b60648201526084016105fa565b60025415610f87576002805460009190610ee4906001906117b1565b81548110610ef457610ef4611638565b90600052602060002090600a91828204019190066003029054906101000a900462ffffff169050610f2d828262ffffff90811691161190565b610f855760405162461bcd60e51b8152602060048201526024808201527f4552524f523a56524e2d3030323a56455253494f4e5f4e4f545f494e4352454160448201526353494e4760e01b60648201526084016105fa565b505b60028054600181018255600091909152600a8082047f405787fa12a823e0f2b7631cc41b3ba8828b3321ca811111fa75cd3aa3bb5ace01805462ffffff808616600394909506939093026101000a848102930219169190911790556040805160a0810182529182526001600160a01b038086166020840152841690820152606081016110104290565b64ffffffffff1681526020014363ffffffff90811690915262ffffff80841660009081526001602081815260409283902086518154928801516001600160a01b039081166301000000026001600160b81b0319909416919096161791909117815585830151910180546060870151608090970151909516600160c81b0263ffffffff60c81b1964ffffffffff909716600160a01b026001600160c81b031990961692909416919091179390931793909316179055517f68e7327fca0057a787cde34ababb9ef9844ba8065ee03e8781d8122fc15d4419906111179083908690869062ffffff9390931683526001600160a01b03918216602084015216604082015260600190565b60405180910390a1505050565b60006020828403121561113657600080fd5b81356001600160e01b03198116811461114e57600080fd5b9392505050565b62ffffff8116811461116657600080fd5b50565b60006020828403121561117b57600080fd5b813561114e81611155565b60005b838110156111a1578181015183820152602001611189565b50506000910152565b600081518084526111c2816020860160208601611186565b601f01601f19169290920160200192915050565b60208152600061114e60208301846111aa565b634e487b7160e01b600052604160045260246000fd5b6040805190810167ffffffffffffffff81118282101715611222576112226111e9565b60405290565b604051610120810167ffffffffffffffff81118282101715611222576112226111e9565b60405160c0810167ffffffffffffffff81118282101715611222576112226111e9565b604051601f8201601f1916810167ffffffffffffffff81118282101715611298576112986111e9565b604052919050565b6000604082840312156112b257600080fd5b6112ba6111ff565b82358152602083013560208201528091505092915050565b6001600160a01b038116811461116657600080fd5b600067ffffffffffffffff821115611301576113016111e9565b50601f01601f191660200190565b60008060006060848603121561132457600080fd5b833561132f816112d2565b9250602084013561133f816112d2565b9150604084013567ffffffffffffffff81111561135b57600080fd5b8401601f8101861361136c57600080fd5b803561137f61137a826112e7565b61126f565b81815287602083850101111561139457600080fd5b816020840160208301376000602083830101528093505050509250925092565b6000602082840312156113c657600080fd5b5035919050565b6000602082840312156113df57600080fd5b5051919050565b6000602082840312156113f857600080fd5b815161114e81611155565b80516001600160601b038116811461141a57600080fd5b919050565b60006020828403121561143157600080fd5b61114e82611403565b805161141a816112d2565b60006040828403121561145757600080fd5b61145f6111ff565b9050815181526020820151602082015292915050565b60006101e0828403121561148857600080fd5b611490611228565b61149983611403565b81526114a760208401611403565b60208201526114b86040840161143a565b60408201526114ca8460608501611445565b60608201526114dc8460a08501611445565b60808201526114ee8460e08501611445565b60a0820152611501846101208501611445565b60c0820152611514846101608501611445565b60e0820152611527846101a08501611445565b6101008201529392505050565b6001600160601b03838116825282511660208083019190915282015161020082019061156b60408401826001600160601b03169052565b5060408301516001600160a01b038116606084015250606083015180516080840152602081015160a0840152506080830151805160c0840152602081015160e08401525060a08301516101006115cd8185018380518252602090810151910152565b60c0850151805161014086015260209081015161016086015260e086015180516101808701528101516101a086015294015180516101c0850152909301516101e09092019190915292915050565b60006020828403121561162d57600080fd5b815161114e816112d2565b634e487b7160e01b600052603260045260246000fd5b60ff8116811461116657600080fd5b60006020828403121561166f57600080fd5b815161114e8161164e565b60006020828403121561168c57600080fd5b8151801515811461114e57600080fd5b600082601f8301126116ad57600080fd5b81516116bb61137a826112e7565b8181528460208386010111156116d057600080fd5b6116e1826020830160208701611186565b949350505050565b6000602082840312156116fb57600080fd5b815167ffffffffffffffff8082111561171357600080fd5b9083019060c0828603121561172757600080fd5b61172f61124c565b61173883611403565b815261174660208401611403565b602082015260408301516117598161164e565b6040820152606083015161176c816112d2565b6060820152608083015161177f816112d2565b608082015260a08301518281111561179657600080fd5b6117a28782860161169c565b60a08301525095945050505050565b81810381811115610e5057634e487b7160e01b600052601160045260246000fdfea2646970667358221220b089303b0c12a78f224dfcc6d6f6dadb8d2758af3952cf072560ed24a0ebfa0b64736f6c63430008140033",
438
+ "deployedBytecode": "0x608060405234801561001057600080fd5b50600436106101375760003560e01c80635ab1bd53116100b8578063a3f4df7e1161007c578063a3f4df7e146103e6578063a745e3df146103b2578063b3c6501514610418578063b88da75914610439578063cde749f41461044c578063cf7a1d771461045457600080fd5b80635ab1bd53146103785780635b5b48f5146103b2578063644c45e0146103c5578063893d20e8146103cd578063946dfcfe146103d557600080fd5b80631aa3a008116100ff5780631aa3a008146101fa57806331b62a3b1461021a5780633bc5de30146102405780633f52c0f6146102545780634d459c901461026957600080fd5b806301ffc9a71461013c5780630abd84341461017e5780630d8e6e2c1461019157806315dae03e146101ad57806317d7de7c146101c2575b600080fd5b61016961014a366004611124565b6001600160e01b03191660009081526020819052604090205460ff1690565b60405190151581526020015b60405180910390f35b61016961018c366004611169565b610467565b61019961050a565b60405162ffffff9091168152602001610175565b60285b60405160ff9091168152602001610175565b604080518082019091526013815272446973747269627574696f6e5365727669636560681b60208201525b60405161017591906111d6565b610202610594565b6040516001600160601b039091168152602001610175565b7f0000000000000000000000000000000000000000000000000000000000000000610202565b6040805160208101909152600081526101ed565b6102676102623660046112a0565b61068d565b005b61031b610277366004611169565b6040805160a0810182526000808252602082018190529181018290526060810182905260808101919091525062ffffff908116600090815260016020818152604092839020835160a0810185528154958616815263010000009095046001600160a01b03908116928601929092529091015490811691830191909152600160a01b810464ffffffffff166060830152600160c81b900463ffffffff16608082015290565b60408051825162ffffff1681526020808401516001600160a01b039081169183019190915283830151169181019190915260608083015164ffffffffff169082015260809182015163ffffffff169181019190915260a001610175565b7f00000000000000000000000000000000000000000000000000000000000000005b6040516001600160a01b039091168152602001610175565b6102676103c036600461130f565b505050565b610202610800565b61039a610867565b600254604051908152602001610175565b6101ed60405180604001604052806013815260200172446973747269627574696f6e5365727669636560681b81525081565b6104206109c4565b60405167ffffffffffffffff9091168152602001610175565b6101996104473660046113b4565b6109f8565b6101b0610a39565b61026761046236600461130f565b610b16565b62ffffff81166000908152600160208190526040808320909101549051631bbffab160e21b8152600160c81b90910463ffffffff166004820152819073__$5f476116ae21c5294e0c0761c07efa7e1c$__90636effeac490602401602060405180830381865af41580156104df573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061050391906113cd565b1192915050565b604051632efe011360e01b815260036004820152600060248201819052604482018190529073__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__90632efe011390606401602060405180830381865af415801561056b573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061058f91906113e6565b905090565b600061059e610867565b6001600160a01b0316336001600160a01b0316146106035760405162461bcd60e51b815260206004820152601760248201527f4552524f523a5247422d3030313a4e4f545f4f574e455200000000000000000060448201526064015b60405180910390fd5b604051632210724360e11b81523060048201527f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031690634420e486906024016020604051808303816000875af1158015610669573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061058f919061141f565b60008061069a6078610b20565b8151604051639ae31ff560e01b81526001600160601b03909116600482015291935091506000906001600160a01b03831690639ae31ff590602401602060405180830381865afa1580156106f2573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610716919061141f565b60405163f2b246c360e01b81526001600160601b03821660048201529091506000906001600160a01b0384169063f2b246c3906024016101e060405180830381865afa15801561076a573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061078e9190611475565b61010081018690526040516306a5298b60e01b81529091506001600160a01b038416906306a5298b906107c79085908590600401611534565b600060405180830381600087803b1580156107e157600080fd5b505af11580156107f5573d6000803e3d6000fd5b505050505050505050565b604051636939560f60e11b81523060048201526000907f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03169063d272ac1e90602401602060405180830381865afa158015610669573d6000803e3d6000fd5b604051636939560f60e11b815230600482015260009081906001600160a01b037f0000000000000000000000000000000000000000000000000000000000000000169063d272ac1e90602401602060405180830381865afa1580156108d0573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906108f4919061141f565b9050610901816000610e40565b1561092d577f000000000000000000000000000000000000000000000000000000000000000091505090565b60405163df33330b60e01b81526001600160601b03821660048201527f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03169063df33330b90602401602060405180830381865afa15801561099a573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906109be919061161b565b91505090565b600061058f7ff0c57e16840df040f15088dc2f81fe391c3923bec73e23a9662efc9c229c6a005467ffffffffffffffff1690565b600060028281548110610a0d57610a0d611638565b90600052602060002090600a91828204019190066003029054906101000a900462ffffff169050919050565b6000306001600160a01b0316630d8e6e2c6040518163ffffffff1660e01b8152600401602060405180830381865afa158015610a79573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610a9d91906113e6565b60405163c9e66e2960e01b815262ffffff909116600482015273__$c0fcb9c1c2e971ebe3d8745a7e2c5cc364$__9063c9e66e2990602401602060405180830381865af4158015610af2573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061058f919061165d565b6103c08383610e56565b6040805160c08101825260008082526020820181905281830181905260608083018290526080830182905260a08301529151636939560f60e11b815233600482015290919081907f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03169063d272ac1e90602401602060405180830381865afa158015610bb8573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610bdc919061141f565b6040516330b8415f60e01b81526001600160601b038216600482015290915073__$6facc32ab6029a5f5de2a1d5e55ea9da0e$__906330b8415f90602401602060405180830381865af4158015610c37573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610c5b919061167a565b610ca75760405162461bcd60e51b815260206004820152601760248201527f4552524f525f434f4d504f4e454e545f554e4b4e4f574e00000000000000000060448201526064016105fa565b6040516305247a1760e51b81526001600160601b03821660048201527f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03169063a48f42e090602401600060405180830381865afa158015610d14573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f19168201604052610d3c91908101906116e9565b9250610d5283604001518560ff90811691161490565b610d945760405162461bcd60e51b815260206004820152601360248201527213d0929150d517d516541157d2539590531251606a1b60448201526064016105fa565b60208301516040516305247a1760e51b81526001600160601b0390911660048201526000907f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03169063a48f42e090602401600060405180830381865afa158015610e0a573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f19168201604052610e3291908101906116e9565b606001519395939450505050565b6001600160601b03828116908216145b92915050565b6000610e6061050a565b9050610e6b81610467565b15610ec85760405162461bcd60e51b815260206004820152602760248201527f4552524f523a56524e2d3030313a56455253494f4e5f414c52454144595f41436044820152661512559055115160ca1b60648201526084016105fa565b60025415610f87576002805460009190610ee4906001906117b1565b81548110610ef457610ef4611638565b90600052602060002090600a91828204019190066003029054906101000a900462ffffff169050610f2d828262ffffff90811691161190565b610f855760405162461bcd60e51b8152602060048201526024808201527f4552524f523a56524e2d3030323a56455253494f4e5f4e4f545f494e4352454160448201526353494e4760e01b60648201526084016105fa565b505b60028054600181018255600091909152600a8082047f405787fa12a823e0f2b7631cc41b3ba8828b3321ca811111fa75cd3aa3bb5ace01805462ffffff808616600394909506939093026101000a848102930219169190911790556040805160a0810182529182526001600160a01b038086166020840152841690820152606081016110104290565b64ffffffffff1681526020014363ffffffff90811690915262ffffff80841660009081526001602081815260409283902086518154928801516001600160a01b039081166301000000026001600160b81b0319909416919096161791909117815585830151910180546060870151608090970151909516600160c81b0263ffffffff60c81b1964ffffffffff909716600160a01b026001600160c81b031990961692909416919091179390931793909316179055517f68e7327fca0057a787cde34ababb9ef9844ba8065ee03e8781d8122fc15d4419906111179083908690869062ffffff9390931683526001600160a01b03918216602084015216604082015260600190565b60405180910390a1505050565b60006020828403121561113657600080fd5b81356001600160e01b03198116811461114e57600080fd5b9392505050565b62ffffff8116811461116657600080fd5b50565b60006020828403121561117b57600080fd5b813561114e81611155565b60005b838110156111a1578181015183820152602001611189565b50506000910152565b600081518084526111c2816020860160208601611186565b601f01601f19169290920160200192915050565b60208152600061114e60208301846111aa565b634e487b7160e01b600052604160045260246000fd5b6040805190810167ffffffffffffffff81118282101715611222576112226111e9565b60405290565b604051610120810167ffffffffffffffff81118282101715611222576112226111e9565b60405160c0810167ffffffffffffffff81118282101715611222576112226111e9565b604051601f8201601f1916810167ffffffffffffffff81118282101715611298576112986111e9565b604052919050565b6000604082840312156112b257600080fd5b6112ba6111ff565b82358152602083013560208201528091505092915050565b6001600160a01b038116811461116657600080fd5b600067ffffffffffffffff821115611301576113016111e9565b50601f01601f191660200190565b60008060006060848603121561132457600080fd5b833561132f816112d2565b9250602084013561133f816112d2565b9150604084013567ffffffffffffffff81111561135b57600080fd5b8401601f8101861361136c57600080fd5b803561137f61137a826112e7565b61126f565b81815287602083850101111561139457600080fd5b816020840160208301376000602083830101528093505050509250925092565b6000602082840312156113c657600080fd5b5035919050565b6000602082840312156113df57600080fd5b5051919050565b6000602082840312156113f857600080fd5b815161114e81611155565b80516001600160601b038116811461141a57600080fd5b919050565b60006020828403121561143157600080fd5b61114e82611403565b805161141a816112d2565b60006040828403121561145757600080fd5b61145f6111ff565b9050815181526020820151602082015292915050565b60006101e0828403121561148857600080fd5b611490611228565b61149983611403565b81526114a760208401611403565b60208201526114b86040840161143a565b60408201526114ca8460608501611445565b60608201526114dc8460a08501611445565b60808201526114ee8460e08501611445565b60a0820152611501846101208501611445565b60c0820152611514846101608501611445565b60e0820152611527846101a08501611445565b6101008201529392505050565b6001600160601b03838116825282511660208083019190915282015161020082019061156b60408401826001600160601b03169052565b5060408301516001600160a01b038116606084015250606083015180516080840152602081015160a0840152506080830151805160c0840152602081015160e08401525060a08301516101006115cd8185018380518252602090810151910152565b60c0850151805161014086015260209081015161016086015260e086015180516101808701528101516101a086015294015180516101c0850152909301516101e09092019190915292915050565b60006020828403121561162d57600080fd5b815161114e816112d2565b634e487b7160e01b600052603260045260246000fd5b60ff8116811461116657600080fd5b60006020828403121561166f57600080fd5b815161114e8161164e565b60006020828403121561168c57600080fd5b8151801515811461114e57600080fd5b600082601f8301126116ad57600080fd5b81516116bb61137a826112e7565b8181528460208386010111156116d057600080fd5b6116e1826020830160208701611186565b949350505050565b6000602082840312156116fb57600080fd5b815167ffffffffffffffff8082111561171357600080fd5b9083019060c0828603121561172757600080fd5b61172f61124c565b61173883611403565b815261174660208401611403565b602082015260408301516117598161164e565b6040820152606083015161176c816112d2565b6060820152608083015161177f816112d2565b608082015260a08301518281111561179657600080fd5b6117a28782860161169c565b60a08301525095945050505050565b81810381811115610e5057634e487b7160e01b600052601160045260246000fdfea2646970667358221220b089303b0c12a78f224dfcc6d6f6dadb8d2758af3952cf072560ed24a0ebfa0b64736f6c63430008140033",
439
+ "linkReferences": {
440
+ "contracts/types/Blocknumber.sol": {
441
+ "BlocknumberLib": [
442
+ {
443
+ "length": 20,
444
+ "start": 1766
445
+ },
446
+ {
447
+ "length": 20,
448
+ "start": 3423
449
+ }
450
+ ]
451
+ },
452
+ "contracts/types/NftId.sol": {
453
+ "NftIdLib": [
454
+ {
455
+ "length": 20,
456
+ "start": 5303
457
+ }
458
+ ]
459
+ },
460
+ "contracts/types/Version.sol": {
461
+ "VersionLib": [
462
+ {
463
+ "length": 20,
464
+ "start": 1602
465
+ },
466
+ {
467
+ "length": 20,
468
+ "start": 3563
469
+ },
470
+ {
471
+ "length": 20,
472
+ "start": 4978
473
+ }
474
+ ]
475
+ }
476
+ },
477
+ "deployedLinkReferences": {
478
+ "contracts/types/Blocknumber.sol": {
479
+ "BlocknumberLib": [
480
+ {
481
+ "length": 20,
482
+ "start": 1189
483
+ }
484
+ ]
485
+ },
486
+ "contracts/types/NftId.sol": {
487
+ "NftIdLib": [
488
+ {
489
+ "length": 20,
490
+ "start": 3069
491
+ }
492
+ ]
493
+ },
494
+ "contracts/types/Version.sol": {
495
+ "VersionLib": [
496
+ {
497
+ "length": 20,
498
+ "start": 1329
499
+ },
500
+ {
501
+ "length": 20,
502
+ "start": 2744
503
+ }
504
+ ]
505
+ }
506
+ }
507
+ }
@@ -1,4 +1,4 @@
1
1
  {
2
2
  "_format": "hh-sol-dbg-1",
3
- "buildInfo": "../../../../build-info/73036ef8d3587a4d497b53a8e5f6bc33.json"
3
+ "buildInfo": "../../../../build-info/5ac43d71ce34a4d504e0bec066491786.json"
4
4
  }
@@ -29,31 +29,26 @@
29
29
  "type": "event"
30
30
  },
31
31
  {
32
- "inputs": [
33
- {
34
- "internalType": "address",
35
- "name": "implementation",
36
- "type": "address"
37
- },
32
+ "inputs": [],
33
+ "name": "getData",
34
+ "outputs": [
38
35
  {
39
- "internalType": "address",
40
- "name": "activatedBy",
41
- "type": "address"
36
+ "internalType": "bytes",
37
+ "name": "data",
38
+ "type": "bytes"
42
39
  }
43
40
  ],
44
- "name": "activate",
45
- "outputs": [],
46
- "stateMutability": "nonpayable",
41
+ "stateMutability": "view",
47
42
  "type": "function"
48
43
  },
49
44
  {
50
45
  "inputs": [],
51
- "name": "getData",
46
+ "name": "getInitializedVersion",
52
47
  "outputs": [
53
48
  {
54
- "internalType": "bytes",
55
- "name": "data",
56
- "type": "bytes"
49
+ "internalType": "uint64",
50
+ "name": "",
51
+ "type": "uint64"
57
52
  }
58
53
  ],
59
54
  "stateMutability": "view",
@@ -241,15 +236,15 @@
241
236
  "name": "activatedBy",
242
237
  "type": "address"
243
238
  },
244
- {
245
- "internalType": "Blocknumber",
246
- "name": "activatedIn",
247
- "type": "uint32"
248
- },
249
239
  {
250
240
  "internalType": "Timestamp",
251
241
  "name": "activatedAt",
252
242
  "type": "uint40"
243
+ },
244
+ {
245
+ "internalType": "Blocknumber",
246
+ "name": "activatedIn",
247
+ "type": "uint32"
253
248
  }
254
249
  ],
255
250
  "internalType": "struct IVersionable.VersionInfo",
@@ -260,6 +255,29 @@
260
255
  "stateMutability": "view",
261
256
  "type": "function"
262
257
  },
258
+ {
259
+ "inputs": [
260
+ {
261
+ "internalType": "address",
262
+ "name": "implementation",
263
+ "type": "address"
264
+ },
265
+ {
266
+ "internalType": "address",
267
+ "name": "activatedBy",
268
+ "type": "address"
269
+ },
270
+ {
271
+ "internalType": "bytes",
272
+ "name": "activationData",
273
+ "type": "bytes"
274
+ }
275
+ ],
276
+ "name": "initialize",
277
+ "outputs": [],
278
+ "stateMutability": "nonpayable",
279
+ "type": "function"
280
+ },
263
281
  {
264
282
  "inputs": [
265
283
  {
@@ -355,6 +373,29 @@
355
373
  "outputs": [],
356
374
  "stateMutability": "nonpayable",
357
375
  "type": "function"
376
+ },
377
+ {
378
+ "inputs": [
379
+ {
380
+ "internalType": "address",
381
+ "name": "implementation",
382
+ "type": "address"
383
+ },
384
+ {
385
+ "internalType": "address",
386
+ "name": "activatedBy",
387
+ "type": "address"
388
+ },
389
+ {
390
+ "internalType": "bytes",
391
+ "name": "upgradeData",
392
+ "type": "bytes"
393
+ }
394
+ ],
395
+ "name": "upgrade",
396
+ "outputs": [],
397
+ "stateMutability": "nonpayable",
398
+ "type": "function"
358
399
  }
359
400
  ],
360
401
  "bytecode": "0x",