@etherisc/gif-next 0.0.2-e5a2253-213 → 0.0.2-e69072e-892

Sign up to get free protection for your applications and to get access to all the features.
Files changed (337) hide show
  1. package/README.md +73 -1
  2. package/artifacts/contracts/components/Component.sol/Component.dbg.json +4 -0
  3. package/artifacts/contracts/components/{BaseComponent.sol/BaseComponent.json → Component.sol/Component.json} +340 -59
  4. package/artifacts/contracts/components/Distribution.sol/Distribution.dbg.json +1 -1
  5. package/artifacts/contracts/components/Distribution.sol/Distribution.json +804 -211
  6. package/artifacts/contracts/components/IComponent.sol/IComponent.dbg.json +4 -0
  7. package/artifacts/contracts/components/{IBaseComponent.sol/IBaseComponent.json → IComponent.sol/IComponent.json} +95 -56
  8. package/artifacts/contracts/components/IDistributionComponent.sol/IDistributionComponent.dbg.json +1 -1
  9. package/artifacts/contracts/components/IDistributionComponent.sol/IDistributionComponent.json +699 -22
  10. package/artifacts/contracts/components/IPoolComponent.sol/IPoolComponent.dbg.json +1 -1
  11. package/artifacts/contracts/components/IPoolComponent.sol/IPoolComponent.json +814 -60
  12. package/artifacts/contracts/components/IProductComponent.sol/IProductComponent.dbg.json +1 -1
  13. package/artifacts/contracts/components/IProductComponent.sol/IProductComponent.json +519 -4
  14. package/artifacts/contracts/components/Pool.sol/Pool.dbg.json +1 -1
  15. package/artifacts/contracts/components/Pool.sol/Pool.json +896 -298
  16. package/artifacts/contracts/components/Product.sol/Product.dbg.json +1 -1
  17. package/artifacts/contracts/components/Product.sol/Product.json +442 -129
  18. package/artifacts/contracts/instance/BundleManager.sol/BundleManager.dbg.json +1 -1
  19. package/artifacts/contracts/instance/BundleManager.sol/BundleManager.json +38 -62
  20. package/artifacts/contracts/instance/Cloneable.sol/Cloneable.dbg.json +1 -1
  21. package/artifacts/contracts/instance/IInstance.sol/IInstance.dbg.json +1 -1
  22. package/artifacts/contracts/instance/IInstance.sol/IInstance.json +910 -289
  23. package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.dbg.json +1 -1
  24. package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.json +110 -171
  25. package/artifacts/contracts/instance/Instance.sol/Instance.dbg.json +1 -1
  26. package/artifacts/contracts/instance/Instance.sol/Instance.json +874 -557
  27. package/artifacts/contracts/instance/InstanceAccessManager.sol/InstanceAccessManager.dbg.json +1 -1
  28. package/artifacts/contracts/instance/InstanceAccessManager.sol/InstanceAccessManager.json +52 -115
  29. package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.dbg.json +1 -1
  30. package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.json +101 -168
  31. package/artifacts/contracts/instance/InstanceService.sol/InstanceService.dbg.json +1 -1
  32. package/artifacts/contracts/instance/InstanceService.sol/InstanceService.json +346 -263
  33. package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.dbg.json +1 -1
  34. package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.json +319 -86
  35. package/artifacts/contracts/instance/ObjectManager.sol/ObjectManager.dbg.json +1 -1
  36. package/artifacts/contracts/instance/ObjectManager.sol/ObjectManager.json +8 -32
  37. package/artifacts/contracts/instance/base/ComponentService.sol/ComponentService.dbg.json +4 -0
  38. package/artifacts/contracts/instance/base/{ComponentServiceBase.sol/ComponentServiceBase.json → ComponentService.sol/ComponentService.json} +119 -189
  39. package/artifacts/contracts/instance/base/IKeyValueStore.sol/IKeyValueStore.dbg.json +1 -1
  40. package/artifacts/contracts/instance/base/ILifecycle.sol/ILifecycle.dbg.json +1 -1
  41. package/artifacts/contracts/instance/base/KeyValueStore.sol/KeyValueStore.dbg.json +1 -1
  42. package/artifacts/contracts/instance/base/KeyValueStore.sol/KeyValueStore.json +2 -2
  43. package/artifacts/contracts/instance/base/Lifecycle.sol/Lifecycle.dbg.json +1 -1
  44. package/artifacts/contracts/instance/base/Lifecycle.sol/Lifecycle.json +2 -2
  45. package/artifacts/contracts/instance/module/IAccess.sol/IAccess.dbg.json +1 -1
  46. package/artifacts/contracts/instance/module/IAccess.sol/IAccess.json +13 -13
  47. package/artifacts/contracts/instance/module/IBundle.sol/IBundle.dbg.json +1 -1
  48. package/artifacts/contracts/instance/module/IDistribution.sol/IDistribution.dbg.json +1 -1
  49. package/artifacts/contracts/instance/module/IPolicy.sol/IPolicy.dbg.json +1 -1
  50. package/artifacts/contracts/instance/module/IRisk.sol/IRisk.dbg.json +1 -1
  51. package/artifacts/contracts/instance/module/ISetup.sol/ISetup.dbg.json +1 -1
  52. package/artifacts/contracts/instance/module/ITreasury.sol/ITreasury.dbg.json +1 -1
  53. package/artifacts/contracts/instance/service/ApplicationService.sol/ApplicationService.dbg.json +4 -0
  54. package/artifacts/contracts/instance/service/ApplicationService.sol/ApplicationService.json +968 -0
  55. package/artifacts/contracts/instance/service/ApplicationServiceManager.sol/ApplicationServiceManager.dbg.json +4 -0
  56. package/artifacts/contracts/instance/service/ApplicationServiceManager.sol/ApplicationServiceManager.json +665 -0
  57. package/artifacts/contracts/instance/service/BundleService.sol/BundleService.dbg.json +1 -1
  58. package/artifacts/contracts/instance/service/BundleService.sol/BundleService.json +258 -283
  59. package/artifacts/contracts/instance/service/BundleServiceManager.sol/BundleServiceManager.dbg.json +1 -1
  60. package/artifacts/contracts/instance/service/BundleServiceManager.sol/BundleServiceManager.json +305 -80
  61. package/artifacts/contracts/instance/service/ClaimService.sol/ClaimService.dbg.json +4 -0
  62. package/artifacts/contracts/instance/service/ClaimService.sol/ClaimService.json +754 -0
  63. package/artifacts/contracts/instance/service/ClaimServiceManager.sol/ClaimServiceManager.dbg.json +4 -0
  64. package/artifacts/contracts/instance/service/ClaimServiceManager.sol/ClaimServiceManager.json +637 -0
  65. package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.dbg.json +1 -1
  66. package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.json +983 -221
  67. package/artifacts/contracts/instance/service/DistributionServiceManager.sol/DistributionServiceManager.dbg.json +1 -1
  68. package/artifacts/contracts/instance/service/DistributionServiceManager.sol/DistributionServiceManager.json +441 -72
  69. package/artifacts/contracts/instance/service/IApplicationService.sol/IApplicationService.dbg.json +4 -0
  70. package/artifacts/contracts/instance/service/IApplicationService.sol/IApplicationService.json +556 -0
  71. package/artifacts/contracts/instance/service/IBundleService.sol/IBundleService.dbg.json +1 -1
  72. package/artifacts/contracts/instance/service/IBundleService.sol/IBundleService.json +130 -217
  73. package/artifacts/contracts/instance/service/IClaimService.sol/IClaimService.dbg.json +4 -0
  74. package/artifacts/contracts/{shared/RegisterableUpgradable.sol/RegisterableUpgradable.json → instance/service/IClaimService.sol/IClaimService.json} +146 -179
  75. package/artifacts/contracts/instance/service/IDistributionService.sol/IDistributionService.dbg.json +1 -1
  76. package/artifacts/contracts/instance/service/IDistributionService.sol/IDistributionService.json +552 -140
  77. package/artifacts/contracts/instance/service/IPolicyService.sol/IPolicyService.dbg.json +1 -1
  78. package/artifacts/contracts/instance/service/IPolicyService.sol/IPolicyService.json +40 -292
  79. package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.dbg.json +1 -1
  80. package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.json +22 -174
  81. package/artifacts/contracts/instance/service/IProductService.sol/IProductService.dbg.json +1 -1
  82. package/artifacts/contracts/instance/service/IProductService.sol/IProductService.json +22 -174
  83. package/artifacts/contracts/instance/service/PolicyService.sol/PolicyService.dbg.json +1 -1
  84. package/artifacts/contracts/instance/service/PolicyService.sol/PolicyService.json +161 -407
  85. package/artifacts/contracts/instance/service/PolicyServiceManager.sol/PolicyServiceManager.dbg.json +1 -1
  86. package/artifacts/contracts/instance/service/PolicyServiceManager.sol/PolicyServiceManager.json +311 -114
  87. package/artifacts/contracts/instance/service/PoolService.sol/PoolService.dbg.json +1 -1
  88. package/artifacts/contracts/instance/service/PoolService.sol/PoolService.json +139 -237
  89. package/artifacts/contracts/instance/service/PoolServiceManager.sol/PoolServiceManager.dbg.json +1 -1
  90. package/artifacts/contracts/instance/service/PoolServiceManager.sol/PoolServiceManager.json +302 -77
  91. package/artifacts/contracts/instance/service/ProductService.sol/ProductService.dbg.json +1 -1
  92. package/artifacts/contracts/instance/service/ProductService.sol/ProductService.json +139 -237
  93. package/artifacts/contracts/instance/service/ProductServiceManager.sol/ProductServiceManager.dbg.json +1 -1
  94. package/artifacts/contracts/instance/service/ProductServiceManager.sol/ProductServiceManager.json +302 -77
  95. package/artifacts/contracts/registry/ChainNft.sol/ChainNft.dbg.json +1 -1
  96. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.dbg.json +1 -1
  97. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.json +98 -5
  98. package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.dbg.json +1 -1
  99. package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.json +112 -198
  100. package/artifacts/contracts/registry/ITransferInterceptor.sol/ITransferInterceptor.dbg.json +1 -1
  101. package/artifacts/contracts/registry/Registry.sol/Registry.dbg.json +1 -1
  102. package/artifacts/contracts/registry/Registry.sol/Registry.json +112 -27
  103. package/artifacts/contracts/registry/RegistryAccessManager.sol/RegistryAccessManager.dbg.json +1 -1
  104. package/artifacts/contracts/registry/RegistryAccessManager.sol/RegistryAccessManager.json +18 -18
  105. package/artifacts/contracts/registry/RegistryService.sol/RegistryService.dbg.json +1 -1
  106. package/artifacts/contracts/registry/RegistryService.sol/RegistryService.json +216 -234
  107. package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.dbg.json +1 -1
  108. package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.json +300 -81
  109. package/artifacts/contracts/registry/ReleaseManager.sol/ReleaseManager.dbg.json +1 -1
  110. package/artifacts/contracts/registry/ReleaseManager.sol/ReleaseManager.json +70 -53
  111. package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.dbg.json +1 -1
  112. package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.json +151 -50
  113. package/artifacts/contracts/shared/ContractDeployerLib.sol/ContractDeployerLib.dbg.json +1 -1
  114. package/artifacts/contracts/shared/ERC165.sol/ERC165.dbg.json +1 -1
  115. package/artifacts/contracts/shared/ERC165.sol/ERC165.json +41 -3
  116. package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.dbg.json +1 -1
  117. package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.json +40 -29
  118. package/artifacts/contracts/shared/IPolicyHolder.sol/IPolicyHolder.dbg.json +4 -0
  119. package/artifacts/contracts/shared/IPolicyHolder.sol/IPolicyHolder.json +129 -0
  120. package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.dbg.json +1 -1
  121. package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.json +21 -34
  122. package/artifacts/contracts/shared/IRegistryLinked.sol/IRegistryLinked.dbg.json +4 -0
  123. package/artifacts/contracts/{experiment/inheritance/IB.sol/IB.json → shared/IRegistryLinked.sol/IRegistryLinked.json} +18 -20
  124. package/artifacts/contracts/shared/IService.sol/IService.dbg.json +1 -1
  125. package/artifacts/contracts/shared/IService.sol/IService.json +22 -174
  126. package/artifacts/contracts/shared/IVersionable.sol/IVersionable.dbg.json +1 -1
  127. package/artifacts/contracts/shared/IVersionable.sol/IVersionable.json +2 -152
  128. package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.dbg.json +1 -1
  129. package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.json +120 -27
  130. package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.dbg.json +4 -0
  131. package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.json +248 -0
  132. package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.dbg.json +1 -1
  133. package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.json +294 -61
  134. package/artifacts/contracts/shared/Registerable.sol/Registerable.dbg.json +1 -1
  135. package/artifacts/contracts/shared/Registerable.sol/Registerable.json +129 -51
  136. package/artifacts/contracts/shared/RegistryLinked.sol/RegistryLinked.dbg.json +4 -0
  137. package/artifacts/contracts/shared/RegistryLinked.sol/RegistryLinked.json +84 -0
  138. package/artifacts/contracts/shared/Service.sol/Service.dbg.json +1 -1
  139. package/artifacts/contracts/shared/Service.sol/Service.json +114 -157
  140. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.dbg.json +1 -1
  141. package/artifacts/contracts/shared/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.dbg.json +1 -1
  142. package/artifacts/contracts/shared/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.json +2 -2
  143. package/artifacts/contracts/shared/Versionable.sol/Versionable.dbg.json +1 -1
  144. package/artifacts/contracts/shared/Versionable.sol/Versionable.json +2 -152
  145. package/artifacts/contracts/test/TestFee.sol/TestFee.dbg.json +1 -1
  146. package/artifacts/contracts/test/TestRegisterable.sol/TestRegisterable.dbg.json +1 -1
  147. package/artifacts/contracts/test/TestRegisterable.sol/TestRegisterable.json +129 -51
  148. package/artifacts/contracts/test/TestRoleId.sol/TestRoleId.dbg.json +1 -1
  149. package/artifacts/contracts/test/TestRoleId.sol/TestRoleId.json +2 -2
  150. package/artifacts/contracts/test/TestService.sol/TestService.dbg.json +1 -1
  151. package/artifacts/contracts/test/TestService.sol/TestService.json +135 -214
  152. package/artifacts/contracts/test/TestToken.sol/TestUsdc.dbg.json +1 -1
  153. package/artifacts/contracts/test/TestVersion.sol/TestVersion.dbg.json +1 -1
  154. package/artifacts/contracts/test/TestVersionable.sol/TestVersionable.dbg.json +1 -1
  155. package/artifacts/contracts/test/TestVersionable.sol/TestVersionable.json +8 -190
  156. package/artifacts/contracts/test/Usdc.sol/USDC.dbg.json +1 -1
  157. package/artifacts/contracts/types/AddressSet.sol/LibAddressSet.dbg.json +1 -1
  158. package/artifacts/contracts/types/Blocknumber.sol/BlocknumberLib.dbg.json +1 -1
  159. package/artifacts/contracts/types/ChainId.sol/ChainIdLib.dbg.json +1 -1
  160. package/artifacts/contracts/types/ClaimId.sol/ClaimIdLib.dbg.json +4 -0
  161. package/artifacts/contracts/types/ClaimId.sol/ClaimIdLib.json +100 -0
  162. package/artifacts/contracts/types/DistributorType.sol/DistributorTypeLib.dbg.json +1 -1
  163. package/artifacts/contracts/types/DistributorType.sol/DistributorTypeLib.json +2 -2
  164. package/artifacts/contracts/types/Fee.sol/FeeLib.dbg.json +1 -1
  165. package/artifacts/contracts/types/Key32.sol/Key32Lib.dbg.json +1 -1
  166. package/artifacts/contracts/types/Key32.sol/Key32Lib.json +2 -2
  167. package/artifacts/contracts/types/NftId.sol/NftIdLib.dbg.json +1 -1
  168. package/artifacts/contracts/types/NftId.sol/NftIdLib.json +2 -2
  169. package/artifacts/contracts/types/NftIdSet.sol/LibNftIdSet.dbg.json +1 -1
  170. package/artifacts/contracts/types/NftIdSet.sol/LibNftIdSet.json +2 -2
  171. package/artifacts/contracts/types/NumberId.sol/NumberIdLib.dbg.json +1 -1
  172. package/artifacts/contracts/types/ObjectType.sol/ObjectTypeLib.dbg.json +1 -1
  173. package/artifacts/contracts/types/ObjectType.sol/ObjectTypeLib.json +2 -2
  174. package/artifacts/contracts/types/PayoutId.sol/PayoutIdLib.dbg.json +4 -0
  175. package/artifacts/contracts/types/PayoutId.sol/PayoutIdLib.json +100 -0
  176. package/artifacts/contracts/types/Referral.sol/ReferralLib.dbg.json +1 -1
  177. package/artifacts/contracts/types/Referral.sol/ReferralLib.json +2 -2
  178. package/artifacts/contracts/types/RiskId.sol/RiskIdLib.dbg.json +1 -1
  179. package/artifacts/contracts/types/RiskId.sol/RiskIdLib.json +2 -2
  180. package/artifacts/contracts/types/RoleId.sol/RoleIdLib.dbg.json +1 -1
  181. package/artifacts/contracts/types/RoleId.sol/RoleIdLib.json +2 -2
  182. package/artifacts/contracts/types/Seconds.sol/SecondsLib.dbg.json +4 -0
  183. package/artifacts/contracts/types/Seconds.sol/SecondsLib.json +124 -0
  184. package/artifacts/contracts/types/StateId.sol/StateIdLib.dbg.json +1 -1
  185. package/artifacts/contracts/types/Timestamp.sol/TimestampLib.dbg.json +1 -1
  186. package/artifacts/contracts/types/Timestamp.sol/TimestampLib.json +25 -7
  187. package/artifacts/contracts/types/UFixed.sol/MathLib.dbg.json +1 -1
  188. package/artifacts/contracts/types/UFixed.sol/UFixedLib.dbg.json +1 -1
  189. package/artifacts/contracts/types/Version.sol/VersionLib.dbg.json +1 -1
  190. package/artifacts/contracts/types/Version.sol/VersionPartLib.dbg.json +1 -1
  191. package/contracts/components/Component.sol +221 -0
  192. package/contracts/components/Distribution.sol +206 -67
  193. package/contracts/components/IComponent.sol +68 -0
  194. package/contracts/components/IDistributionComponent.sol +44 -9
  195. package/contracts/components/IPoolComponent.sol +124 -39
  196. package/contracts/components/IProductComponent.sol +8 -3
  197. package/contracts/components/Pool.sol +284 -164
  198. package/contracts/components/Product.sol +110 -116
  199. package/contracts/instance/BundleManager.sol +8 -12
  200. package/contracts/instance/IInstance.sol +41 -9
  201. package/contracts/instance/IInstanceService.sol +20 -1
  202. package/contracts/instance/Instance.sol +90 -61
  203. package/contracts/instance/InstanceAccessManager.sol +18 -24
  204. package/contracts/instance/InstanceReader.sol +3 -25
  205. package/contracts/instance/InstanceService.sol +195 -50
  206. package/contracts/instance/InstanceServiceManager.sol +1 -1
  207. package/contracts/instance/ObjectManager.sol +7 -24
  208. package/contracts/instance/base/{ComponentServiceBase.sol → ComponentService.sol} +9 -13
  209. package/contracts/instance/module/IAccess.sol +3 -4
  210. package/contracts/instance/module/IBundle.sol +2 -1
  211. package/contracts/instance/module/IDistribution.sol +2 -0
  212. package/contracts/instance/module/IPolicy.sol +30 -3
  213. package/contracts/instance/module/ISetup.sol +10 -10
  214. package/contracts/instance/service/ApplicationService.sol +350 -0
  215. package/contracts/instance/service/ApplicationServiceManager.sol +35 -0
  216. package/contracts/instance/service/BundleService.sol +17 -12
  217. package/contracts/instance/service/BundleServiceManager.sol +1 -1
  218. package/contracts/instance/service/ClaimService.sol +151 -0
  219. package/contracts/instance/service/ClaimServiceManager.sol +35 -0
  220. package/contracts/instance/service/DistributionService.sol +312 -33
  221. package/contracts/instance/service/DistributionServiceManager.sol +1 -1
  222. package/contracts/instance/service/IApplicationService.sol +82 -0
  223. package/contracts/instance/service/IBundleService.sol +14 -3
  224. package/contracts/instance/service/IClaimService.sol +61 -0
  225. package/contracts/instance/service/IDistributionService.sol +74 -0
  226. package/contracts/instance/service/IPolicyService.sol +26 -50
  227. package/contracts/instance/service/PolicyService.sol +127 -262
  228. package/contracts/instance/service/PolicyServiceManager.sol +2 -2
  229. package/contracts/instance/service/PoolService.sol +12 -45
  230. package/contracts/instance/service/PoolServiceManager.sol +1 -1
  231. package/contracts/instance/service/ProductService.sol +50 -26
  232. package/contracts/instance/service/ProductServiceManager.sol +2 -2
  233. package/contracts/registry/IRegistry.sol +16 -8
  234. package/contracts/registry/IRegistryService.sol +19 -10
  235. package/contracts/registry/Registry.sol +120 -52
  236. package/contracts/registry/RegistryAccessManager.sol +31 -25
  237. package/contracts/registry/RegistryService.sol +91 -128
  238. package/contracts/registry/RegistryServiceManager.sol +13 -13
  239. package/contracts/registry/ReleaseManager.sol +86 -106
  240. package/contracts/registry/TokenRegistry.sol +19 -13
  241. package/contracts/shared/ERC165.sol +14 -12
  242. package/contracts/shared/INftOwnable.sol +11 -10
  243. package/contracts/shared/IPolicyHolder.sol +26 -0
  244. package/contracts/shared/IRegisterable.sol +4 -4
  245. package/contracts/shared/IRegistryLinked.sol +12 -0
  246. package/contracts/shared/IService.sol +2 -0
  247. package/contracts/shared/IVersionable.sol +4 -47
  248. package/contracts/shared/NftOwnable.sol +66 -80
  249. package/contracts/shared/PolicyHolder.sol +81 -0
  250. package/contracts/shared/ProxyManager.sol +100 -25
  251. package/contracts/shared/Registerable.sol +16 -32
  252. package/contracts/shared/RegistryLinked.sol +48 -0
  253. package/contracts/shared/Service.sol +19 -19
  254. package/contracts/shared/Versionable.sol +4 -92
  255. package/contracts/test/TestRegisterable.sol +1 -1
  256. package/contracts/test/TestService.sol +1 -1
  257. package/contracts/types/ClaimId.sol +52 -0
  258. package/contracts/types/DistributorType.sol +2 -2
  259. package/contracts/types/ObjectType.sol +9 -5
  260. package/contracts/types/PayoutId.sol +54 -0
  261. package/contracts/types/RoleId.sol +12 -7
  262. package/contracts/types/Seconds.sol +54 -0
  263. package/contracts/types/Timestamp.sol +12 -13
  264. package/package.json +3 -3
  265. package/artifacts/contracts/components/BaseComponent.sol/BaseComponent.dbg.json +0 -4
  266. package/artifacts/contracts/components/IBaseComponent.sol/IBaseComponent.dbg.json +0 -4
  267. package/artifacts/contracts/experiment/cloning/Cloner.sol/Cloner.dbg.json +0 -4
  268. package/artifacts/contracts/experiment/cloning/Cloner.sol/Cloner.json +0 -66
  269. package/artifacts/contracts/experiment/cloning/Cloner.sol/Mock1.dbg.json +0 -4
  270. package/artifacts/contracts/experiment/cloning/Cloner.sol/Mock1.json +0 -24
  271. package/artifacts/contracts/experiment/cloning/Cloner.sol/Mock2.dbg.json +0 -4
  272. package/artifacts/contracts/experiment/cloning/Cloner.sol/Mock2.json +0 -42
  273. package/artifacts/contracts/experiment/errors/Require.sol/Require.dbg.json +0 -4
  274. package/artifacts/contracts/experiment/errors/Require.sol/Require.json +0 -105
  275. package/artifacts/contracts/experiment/errors/Revert.sol/Revert.dbg.json +0 -4
  276. package/artifacts/contracts/experiment/errors/Revert.sol/Revert.json +0 -105
  277. package/artifacts/contracts/experiment/inheritance/A.sol/A.dbg.json +0 -4
  278. package/artifacts/contracts/experiment/inheritance/A.sol/A.json +0 -128
  279. package/artifacts/contracts/experiment/inheritance/A.sol/AShared.dbg.json +0 -4
  280. package/artifacts/contracts/experiment/inheritance/A.sol/AShared.json +0 -42
  281. package/artifacts/contracts/experiment/inheritance/B.sol/B.dbg.json +0 -4
  282. package/artifacts/contracts/experiment/inheritance/B.sol/B.json +0 -76
  283. package/artifacts/contracts/experiment/inheritance/C.sol/C.dbg.json +0 -4
  284. package/artifacts/contracts/experiment/inheritance/C.sol/C.json +0 -89
  285. package/artifacts/contracts/experiment/inheritance/IA.sol/IA.dbg.json +0 -4
  286. package/artifacts/contracts/experiment/inheritance/IA.sol/IA.json +0 -128
  287. package/artifacts/contracts/experiment/inheritance/IA.sol/ISharedA.dbg.json +0 -4
  288. package/artifacts/contracts/experiment/inheritance/IA.sol/ISharedA.json +0 -37
  289. package/artifacts/contracts/experiment/inheritance/IB.sol/IB.dbg.json +0 -4
  290. package/artifacts/contracts/experiment/inheritance/IC.sol/IC.dbg.json +0 -4
  291. package/artifacts/contracts/experiment/inheritance/IC.sol/IC.json +0 -63
  292. package/artifacts/contracts/experiment/statemachine/Dummy.sol/LifeCycleModule.dbg.json +0 -4
  293. package/artifacts/contracts/experiment/statemachine/Dummy.sol/LifeCycleModule.json +0 -59
  294. package/artifacts/contracts/experiment/statemachine/ISM.sol/ISM.dbg.json +0 -4
  295. package/artifacts/contracts/experiment/statemachine/ISM.sol/ISM.json +0 -124
  296. package/artifacts/contracts/experiment/statemachine/ISM.sol/ISMEE.dbg.json +0 -4
  297. package/artifacts/contracts/experiment/statemachine/ISM.sol/ISMEE.json +0 -74
  298. package/artifacts/contracts/experiment/statemachine/SM.sol/SM.dbg.json +0 -4
  299. package/artifacts/contracts/experiment/statemachine/SM.sol/SM.json +0 -124
  300. package/artifacts/contracts/experiment/statemachine/SimpleStateMachine.sol/SimpleStateMachine.dbg.json +0 -4
  301. package/artifacts/contracts/experiment/statemachine/SimpleStateMachine.sol/SimpleStateMachine.json +0 -207
  302. package/artifacts/contracts/experiment/types/TypeA.sol/TypeALib.dbg.json +0 -4
  303. package/artifacts/contracts/experiment/types/TypeA.sol/TypeALib.json +0 -10
  304. package/artifacts/contracts/experiment/types/TypeB.sol/TypeBLib.dbg.json +0 -4
  305. package/artifacts/contracts/experiment/types/TypeB.sol/TypeBLib.json +0 -10
  306. package/artifacts/contracts/instance/AccessManagerUpgradeableInitializeable.sol/AccessManagerUpgradeableInitializeable.dbg.json +0 -4
  307. package/artifacts/contracts/instance/AccessManagerUpgradeableInitializeable.sol/AccessManagerUpgradeableInitializeable.json +0 -1206
  308. package/artifacts/contracts/instance/IInstanceBase.sol/IInstanceBase.dbg.json +0 -4
  309. package/artifacts/contracts/instance/IInstanceBase.sol/IInstanceBase.json +0 -448
  310. package/artifacts/contracts/instance/InstanceBase.sol/InstanceBase.dbg.json +0 -4
  311. package/artifacts/contracts/instance/InstanceBase.sol/InstanceBase.json +0 -763
  312. package/artifacts/contracts/instance/base/ComponentServiceBase.sol/ComponentServiceBase.dbg.json +0 -4
  313. package/artifacts/contracts/instance/base/IInstanceBase.sol/IInstanceBase.dbg.json +0 -4
  314. package/artifacts/contracts/instance/base/IInstanceBase.sol/IInstanceBase.json +0 -100
  315. package/artifacts/contracts/shared/RegisterableUpgradable.sol/RegisterableUpgradable.dbg.json +0 -4
  316. package/contracts/components/BaseComponent.sol +0 -168
  317. package/contracts/components/IBaseComponent.sol +0 -35
  318. package/contracts/experiment/cloning/Cloner.sol +0 -47
  319. package/contracts/experiment/errors/Require.sol +0 -38
  320. package/contracts/experiment/errors/Revert.sol +0 -44
  321. package/contracts/experiment/inheritance/A.sol +0 -53
  322. package/contracts/experiment/inheritance/B.sol +0 -28
  323. package/contracts/experiment/inheritance/C.sol +0 -34
  324. package/contracts/experiment/inheritance/IA.sol +0 -13
  325. package/contracts/experiment/inheritance/IB.sol +0 -10
  326. package/contracts/experiment/inheritance/IC.sol +0 -12
  327. package/contracts/experiment/statemachine/Dummy.sol +0 -27
  328. package/contracts/experiment/statemachine/ISM.sol +0 -25
  329. package/contracts/experiment/statemachine/SM.sol +0 -57
  330. package/contracts/experiment/statemachine/SimpleStateMachine.sol +0 -31
  331. package/contracts/experiment/types/TypeA.sol +0 -47
  332. package/contracts/experiment/types/TypeB.sol +0 -29
  333. package/contracts/instance/AccessManagerUpgradeableInitializeable.sol +0 -23
  334. package/contracts/instance/IInstanceBase.sol +0 -25
  335. package/contracts/instance/InstanceBase.sol +0 -39
  336. package/contracts/instance/base/IInstanceBase.sol +0 -21
  337. package/contracts/shared/RegisterableUpgradable.sol +0 -16
@@ -1,4 +1,4 @@
1
1
  {
2
2
  "_format": "hh-sol-dbg-1",
3
- "buildInfo": "../../../build-info/2d0d5ac9f3af33498ef492a7caeac063.json"
3
+ "buildInfo": "../../../build-info/a8e58e3e317904030d8bf765133d5722.json"
4
4
  }
@@ -3,11 +3,6 @@
3
3
  "contractName": "ObjectManager",
4
4
  "sourceName": "contracts/instance/ObjectManager.sol",
5
5
  "abi": [
6
- {
7
- "inputs": [],
8
- "stateMutability": "nonpayable",
9
- "type": "constructor"
10
- },
11
6
  {
12
7
  "inputs": [
13
8
  {
@@ -142,16 +137,10 @@
142
137
  {
143
138
  "anonymous": false,
144
139
  "inputs": [
145
- {
146
- "indexed": false,
147
- "internalType": "NftId",
148
- "name": "instanceNftId",
149
- "type": "uint96"
150
- },
151
140
  {
152
141
  "indexed": false,
153
142
  "internalType": "address",
154
- "name": "instanceReader",
143
+ "name": "instance",
155
144
  "type": "address"
156
145
  }
157
146
  ],
@@ -173,23 +162,10 @@
173
162
  },
174
163
  {
175
164
  "inputs": [],
176
- "name": "getInstanceNftId",
165
+ "name": "getInstance",
177
166
  "outputs": [
178
167
  {
179
- "internalType": "NftId",
180
- "name": "",
181
- "type": "uint96"
182
- }
183
- ],
184
- "stateMutability": "view",
185
- "type": "function"
186
- },
187
- {
188
- "inputs": [],
189
- "name": "getInstanceReader",
190
- "outputs": [
191
- {
192
- "internalType": "contract InstanceReader",
168
+ "internalType": "contract IInstance",
193
169
  "name": "",
194
170
  "type": "address"
195
171
  }
@@ -241,9 +217,9 @@
241
217
  "type": "address"
242
218
  },
243
219
  {
244
- "internalType": "NftId",
245
- "name": "instanceNftId",
246
- "type": "uint96"
220
+ "internalType": "address",
221
+ "name": "instance",
222
+ "type": "address"
247
223
  }
248
224
  ],
249
225
  "name": "initialize",
@@ -278,8 +254,8 @@
278
254
  "type": "function"
279
255
  }
280
256
  ],
281
- "bytecode": "0x608060405234801561001057600080fd5b50600080546001600160a01b0319169055600380546001600160601b031690556109a98061003f6000396000f3fe608060405234801561001057600080fd5b50600436106100885760003560e01c80637e7986691161005b5780637e798669146100f75780638fb3603714610112578063bf7e214f14610133578063c861c2501461015157600080fd5b806302cd30711461008d578063485cc955146100be5780635ab1bd53146100d35780637a9e5e4b146100e4575b600080fd5b600354600160601b90046001600160a01b03165b6040516001600160a01b0390911681526020015b60405180910390f35b6100d16100cc366004610675565b610164565b005b6000546001600160a01b03166100a1565b6100d16100f23660046106ae565b61030b565b6003546040516001600160601b0390911681526020016100b5565b61011a6103a9565b6040516001600160e01b031990911681526020016100b5565b600080516020610954833981519152546001600160a01b03166100a1565b6100d161015f3660046106e7565b6103e2565b7ff0c57e16840df040f15088dc2f81fe391c3923bec73e23a9662efc9c229c6a008054600160401b810460ff16159067ffffffffffffffff166000811580156101aa5750825b905060008267ffffffffffffffff1660011480156101c75750303b155b9050811580156101d5575080155b156101f35760405163f92ee8a960e01b815260040160405180910390fd5b845467ffffffffffffffff19166001178555831561021d57845460ff60401b1916600160401b1785555b6102268761058f565b856001600160a01b03163b6000036102615760405163071669cf60e21b81526001600160a01b03871660048201526024015b60405180910390fd5b600080546001600160a01b0319166001600160a01b0388811691821790925560408051928a16835260208301919091527fa6804c76412ae2d729353ed187a48b0b95177ee5c111049b80878fd127224412910160405180910390a1831561030257845460ff60401b19168555604051600181527fc7f505b2f371ae2175ee4913f4499e1f2633a7b5936321eed1cdaeb6115181d29060200160405180910390a15b50505050505050565b3361032b600080516020610954833981519152546001600160a01b031690565b6001600160a01b0316816001600160a01b0316146103665760405162d1953b60e31b81526001600160a01b0382166004820152602401610258565b816001600160a01b03163b60000361039c576040516361798f2f60e11b81526001600160a01b0383166004820152602401610258565b6103a5826105a3565b5050565b600080516020610954833981519152805460009190600160a01b900460ff166103d35760006103dc565b638fb3603760e01b5b91505090565b6103ec8383610164565b600080546040516305247a1760e51b81526001600160601b03841660048201526001600160a01b039091169063a48f42e090602401600060405180830381865afa15801561043e573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526104669190810190610863565b90506104848160400151610478604690565b60ff9081169116141590565b156104ad57604051632295742160e21b81526001600160601b0383166004820152602401610258565b600081608001519050806001600160a01b03166302cd30716040518163ffffffff1660e01b8152600401602060405180830381865afa1580156104f4573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906105189190610936565b6001600160601b0384166001600160a01b03918216600160601b9081026bffffffffffffffffffffffff1916821760038190556040805193845291900490921660208201527fc23472ef19cd3719232c2fbc22eb87b48424eba43454acefd67a6578fda49d90910160405180910390a15050505050565b610597610604565b6105a08161064f565b50565b60008051602061095483398151915280546001600160a01b0383166001600160a01b03199091168117825560408051918252517f2f658b440c35314f52658ea8a740e05b284cdc84dc9ae01e891f21b8933e7cad9181900360200190a15050565b7ff0c57e16840df040f15088dc2f81fe391c3923bec73e23a9662efc9c229c6a0054600160401b900460ff1661064d57604051631afcd79f60e31b815260040160405180910390fd5b565b610657610604565b6105a0816105a3565b6001600160a01b03811681146105a057600080fd5b6000806040838503121561068857600080fd5b823561069381610660565b915060208301356106a381610660565b809150509250929050565b6000602082840312156106c057600080fd5b81356106cb81610660565b9392505050565b6001600160601b03811681146105a057600080fd5b6000806000606084860312156106fc57600080fd5b833561070781610660565b9250602084013561071781610660565b91506040840135610727816106d2565b809150509250925092565b634e487b7160e01b600052604160045260246000fd5b60405160e0810167ffffffffffffffff8111828210171561076b5761076b610732565b60405290565b604051601f8201601f1916810167ffffffffffffffff8111828210171561079a5761079a610732565b604052919050565b80516107ad816106d2565b919050565b805160ff811681146107ad57600080fd5b805180151581146107ad57600080fd5b80516107ad81610660565b600082601f8301126107ef57600080fd5b815167ffffffffffffffff81111561080957610809610732565b602061081d601f8301601f19168201610771565b828152858284870101111561083157600080fd5b60005b8381101561084f578581018301518282018401528201610834565b506000928101909101919091529392505050565b60006020828403121561087557600080fd5b815167ffffffffffffffff8082111561088d57600080fd5b9083019060e082860312156108a157600080fd5b6108a9610748565b6108b2836107a2565b81526108c0602084016107a2565b60208201526108d1604084016107b2565b60408201526108e2606084016107c3565b60608201526108f3608084016107d3565b608082015261090460a084016107d3565b60a082015260c08301518281111561091b57600080fd5b610927878286016107de565b60c08301525095945050505050565b60006020828403121561094857600080fd5b81516106cb8161066056fef3177357ab46d8af007ab3fdb9af81da189e1068fefdc0073dca88a2cab40a00a264697066735822122047dbf3702ceb32cb2dc6207b62271d1e5858b8c5a08a72dd339d64c612d6e78664736f6c63430008140033",
282
- "deployedBytecode": "0x608060405234801561001057600080fd5b50600436106100885760003560e01c80637e7986691161005b5780637e798669146100f75780638fb3603714610112578063bf7e214f14610133578063c861c2501461015157600080fd5b806302cd30711461008d578063485cc955146100be5780635ab1bd53146100d35780637a9e5e4b146100e4575b600080fd5b600354600160601b90046001600160a01b03165b6040516001600160a01b0390911681526020015b60405180910390f35b6100d16100cc366004610675565b610164565b005b6000546001600160a01b03166100a1565b6100d16100f23660046106ae565b61030b565b6003546040516001600160601b0390911681526020016100b5565b61011a6103a9565b6040516001600160e01b031990911681526020016100b5565b600080516020610954833981519152546001600160a01b03166100a1565b6100d161015f3660046106e7565b6103e2565b7ff0c57e16840df040f15088dc2f81fe391c3923bec73e23a9662efc9c229c6a008054600160401b810460ff16159067ffffffffffffffff166000811580156101aa5750825b905060008267ffffffffffffffff1660011480156101c75750303b155b9050811580156101d5575080155b156101f35760405163f92ee8a960e01b815260040160405180910390fd5b845467ffffffffffffffff19166001178555831561021d57845460ff60401b1916600160401b1785555b6102268761058f565b856001600160a01b03163b6000036102615760405163071669cf60e21b81526001600160a01b03871660048201526024015b60405180910390fd5b600080546001600160a01b0319166001600160a01b0388811691821790925560408051928a16835260208301919091527fa6804c76412ae2d729353ed187a48b0b95177ee5c111049b80878fd127224412910160405180910390a1831561030257845460ff60401b19168555604051600181527fc7f505b2f371ae2175ee4913f4499e1f2633a7b5936321eed1cdaeb6115181d29060200160405180910390a15b50505050505050565b3361032b600080516020610954833981519152546001600160a01b031690565b6001600160a01b0316816001600160a01b0316146103665760405162d1953b60e31b81526001600160a01b0382166004820152602401610258565b816001600160a01b03163b60000361039c576040516361798f2f60e11b81526001600160a01b0383166004820152602401610258565b6103a5826105a3565b5050565b600080516020610954833981519152805460009190600160a01b900460ff166103d35760006103dc565b638fb3603760e01b5b91505090565b6103ec8383610164565b600080546040516305247a1760e51b81526001600160601b03841660048201526001600160a01b039091169063a48f42e090602401600060405180830381865afa15801561043e573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526104669190810190610863565b90506104848160400151610478604690565b60ff9081169116141590565b156104ad57604051632295742160e21b81526001600160601b0383166004820152602401610258565b600081608001519050806001600160a01b03166302cd30716040518163ffffffff1660e01b8152600401602060405180830381865afa1580156104f4573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906105189190610936565b6001600160601b0384166001600160a01b03918216600160601b9081026bffffffffffffffffffffffff1916821760038190556040805193845291900490921660208201527fc23472ef19cd3719232c2fbc22eb87b48424eba43454acefd67a6578fda49d90910160405180910390a15050505050565b610597610604565b6105a08161064f565b50565b60008051602061095483398151915280546001600160a01b0383166001600160a01b03199091168117825560408051918252517f2f658b440c35314f52658ea8a740e05b284cdc84dc9ae01e891f21b8933e7cad9181900360200190a15050565b7ff0c57e16840df040f15088dc2f81fe391c3923bec73e23a9662efc9c229c6a0054600160401b900460ff1661064d57604051631afcd79f60e31b815260040160405180910390fd5b565b610657610604565b6105a0816105a3565b6001600160a01b03811681146105a057600080fd5b6000806040838503121561068857600080fd5b823561069381610660565b915060208301356106a381610660565b809150509250929050565b6000602082840312156106c057600080fd5b81356106cb81610660565b9392505050565b6001600160601b03811681146105a057600080fd5b6000806000606084860312156106fc57600080fd5b833561070781610660565b9250602084013561071781610660565b91506040840135610727816106d2565b809150509250925092565b634e487b7160e01b600052604160045260246000fd5b60405160e0810167ffffffffffffffff8111828210171561076b5761076b610732565b60405290565b604051601f8201601f1916810167ffffffffffffffff8111828210171561079a5761079a610732565b604052919050565b80516107ad816106d2565b919050565b805160ff811681146107ad57600080fd5b805180151581146107ad57600080fd5b80516107ad81610660565b600082601f8301126107ef57600080fd5b815167ffffffffffffffff81111561080957610809610732565b602061081d601f8301601f19168201610771565b828152858284870101111561083157600080fd5b60005b8381101561084f578581018301518282018401528201610834565b506000928101909101919091529392505050565b60006020828403121561087557600080fd5b815167ffffffffffffffff8082111561088d57600080fd5b9083019060e082860312156108a157600080fd5b6108a9610748565b6108b2836107a2565b81526108c0602084016107a2565b60208201526108d1604084016107b2565b60408201526108e2606084016107c3565b60608201526108f3608084016107d3565b608082015261090460a084016107d3565b60a082015260c08301518281111561091b57600080fd5b610927878286016107de565b60c08301525095945050505050565b60006020828403121561094857600080fd5b81516106cb8161066056fef3177357ab46d8af007ab3fdb9af81da189e1068fefdc0073dca88a2cab40a00a264697066735822122047dbf3702ceb32cb2dc6207b62271d1e5858b8c5a08a72dd339d64c612d6e78664736f6c63430008140033",
257
+ "bytecode": "0x608060405234801561001057600080fd5b50600080546001600160a01b03191690556105f0806100306000396000f3fe608060405234801561001057600080fd5b506004361061007d5760003560e01c80638fb360371161005b5780638fb36037146100d4578063bf7e214f146100f5578063c0c53b8b14610113578063de7b5d141461012657600080fd5b8063485cc955146100825780635ab1bd53146100975780637a9e5e4b146100c1575b600080fd5b610095610090366004610502565b610137565b005b6000546001600160a01b03165b6040516001600160a01b0390911681526020015b60405180910390f35b6100956100cf366004610535565b6102de565b6100dc61037c565b6040516001600160e01b031990911681526020016100b8565b60008051602061059b833981519152546001600160a01b03166100a4565b610095610121366004610557565b6103b5565b6003546001600160a01b03166100a4565b7ff0c57e16840df040f15088dc2f81fe391c3923bec73e23a9662efc9c229c6a008054600160401b810460ff16159067ffffffffffffffff1660008115801561017d5750825b905060008267ffffffffffffffff16600114801561019a5750303b155b9050811580156101a8575080155b156101c65760405163f92ee8a960e01b815260040160405180910390fd5b845467ffffffffffffffff1916600117855583156101f057845460ff60401b1916600160401b1785555b6101f987610415565b856001600160a01b03163b6000036102345760405163071669cf60e21b81526001600160a01b03871660048201526024015b60405180910390fd5b600080546001600160a01b0319166001600160a01b0388811691821790925560408051928a16835260208301919091527fa6804c76412ae2d729353ed187a48b0b95177ee5c111049b80878fd127224412910160405180910390a183156102d557845460ff60401b19168555604051600181527fc7f505b2f371ae2175ee4913f4499e1f2633a7b5936321eed1cdaeb6115181d29060200160405180910390a15b50505050505050565b336102fe60008051602061059b833981519152546001600160a01b031690565b6001600160a01b0316816001600160a01b0316146103395760405162d1953b60e31b81526001600160a01b038216600482015260240161022b565b816001600160a01b03163b60000361036f576040516361798f2f60e11b81526001600160a01b038316600482015260240161022b565b61037882610429565b5050565b60008051602061059b833981519152805460009190600160a01b900460ff166103a65760006103af565b638fb3603760e01b5b91505090565b6103bf8383610137565b600380546001600160a01b0319166001600160a01b0383169081179091556040519081527fe89455dcb69bf4efd41cbb10c8064808f360b87b03ae8c96349c71f4934ffa0f9060200160405180910390a1505050565b61041d61048a565b610426816104d5565b50565b60008051602061059b83398151915280546001600160a01b0383166001600160a01b03199091168117825560408051918252517f2f658b440c35314f52658ea8a740e05b284cdc84dc9ae01e891f21b8933e7cad9181900360200190a15050565b7ff0c57e16840df040f15088dc2f81fe391c3923bec73e23a9662efc9c229c6a0054600160401b900460ff166104d357604051631afcd79f60e31b815260040160405180910390fd5b565b6104dd61048a565b61042681610429565b80356001600160a01b03811681146104fd57600080fd5b919050565b6000806040838503121561051557600080fd5b61051e836104e6565b915061052c602084016104e6565b90509250929050565b60006020828403121561054757600080fd5b610550826104e6565b9392505050565b60008060006060848603121561056c57600080fd5b610575846104e6565b9250610583602085016104e6565b9150610591604085016104e6565b9050925092509256fef3177357ab46d8af007ab3fdb9af81da189e1068fefdc0073dca88a2cab40a00a2646970667358221220f2186ab008ce48e77e816ca5b2bd0480012e768991d751d006dff1269d2d0b6d64736f6c63430008140033",
258
+ "deployedBytecode": "0x608060405234801561001057600080fd5b506004361061007d5760003560e01c80638fb360371161005b5780638fb36037146100d4578063bf7e214f146100f5578063c0c53b8b14610113578063de7b5d141461012657600080fd5b8063485cc955146100825780635ab1bd53146100975780637a9e5e4b146100c1575b600080fd5b610095610090366004610502565b610137565b005b6000546001600160a01b03165b6040516001600160a01b0390911681526020015b60405180910390f35b6100956100cf366004610535565b6102de565b6100dc61037c565b6040516001600160e01b031990911681526020016100b8565b60008051602061059b833981519152546001600160a01b03166100a4565b610095610121366004610557565b6103b5565b6003546001600160a01b03166100a4565b7ff0c57e16840df040f15088dc2f81fe391c3923bec73e23a9662efc9c229c6a008054600160401b810460ff16159067ffffffffffffffff1660008115801561017d5750825b905060008267ffffffffffffffff16600114801561019a5750303b155b9050811580156101a8575080155b156101c65760405163f92ee8a960e01b815260040160405180910390fd5b845467ffffffffffffffff1916600117855583156101f057845460ff60401b1916600160401b1785555b6101f987610415565b856001600160a01b03163b6000036102345760405163071669cf60e21b81526001600160a01b03871660048201526024015b60405180910390fd5b600080546001600160a01b0319166001600160a01b0388811691821790925560408051928a16835260208301919091527fa6804c76412ae2d729353ed187a48b0b95177ee5c111049b80878fd127224412910160405180910390a183156102d557845460ff60401b19168555604051600181527fc7f505b2f371ae2175ee4913f4499e1f2633a7b5936321eed1cdaeb6115181d29060200160405180910390a15b50505050505050565b336102fe60008051602061059b833981519152546001600160a01b031690565b6001600160a01b0316816001600160a01b0316146103395760405162d1953b60e31b81526001600160a01b038216600482015260240161022b565b816001600160a01b03163b60000361036f576040516361798f2f60e11b81526001600160a01b038316600482015260240161022b565b61037882610429565b5050565b60008051602061059b833981519152805460009190600160a01b900460ff166103a65760006103af565b638fb3603760e01b5b91505090565b6103bf8383610137565b600380546001600160a01b0319166001600160a01b0383169081179091556040519081527fe89455dcb69bf4efd41cbb10c8064808f360b87b03ae8c96349c71f4934ffa0f9060200160405180910390a1505050565b61041d61048a565b610426816104d5565b50565b60008051602061059b83398151915280546001600160a01b0383166001600160a01b03199091168117825560408051918252517f2f658b440c35314f52658ea8a740e05b284cdc84dc9ae01e891f21b8933e7cad9181900360200190a15050565b7ff0c57e16840df040f15088dc2f81fe391c3923bec73e23a9662efc9c229c6a0054600160401b900460ff166104d357604051631afcd79f60e31b815260040160405180910390fd5b565b6104dd61048a565b61042681610429565b80356001600160a01b03811681146104fd57600080fd5b919050565b6000806040838503121561051557600080fd5b61051e836104e6565b915061052c602084016104e6565b90509250929050565b60006020828403121561054757600080fd5b610550826104e6565b9392505050565b60008060006060848603121561056c57600080fd5b610575846104e6565b9250610583602085016104e6565b9150610591604085016104e6565b9050925092509256fef3177357ab46d8af007ab3fdb9af81da189e1068fefdc0073dca88a2cab40a00a2646970667358221220f2186ab008ce48e77e816ca5b2bd0480012e768991d751d006dff1269d2d0b6d64736f6c63430008140033",
283
259
  "linkReferences": {},
284
260
  "deployedLinkReferences": {}
285
261
  }
@@ -0,0 +1,4 @@
1
+ {
2
+ "_format": "hh-sol-dbg-1",
3
+ "buildInfo": "../../../../build-info/a8e58e3e317904030d8bf765133d5722.json"
4
+ }
@@ -1,35 +1,8 @@
1
1
  {
2
2
  "_format": "hh-sol-artifact-1",
3
- "contractName": "ComponentServiceBase",
4
- "sourceName": "contracts/instance/base/ComponentServiceBase.sol",
3
+ "contractName": "ComponentService",
4
+ "sourceName": "contracts/instance/base/ComponentService.sol",
5
5
  "abi": [
6
- {
7
- "inputs": [
8
- {
9
- "internalType": "ObjectType",
10
- "name": "componentType",
11
- "type": "uint8"
12
- }
13
- ],
14
- "name": "ComponentTypeInvalid",
15
- "type": "error"
16
- },
17
- {
18
- "inputs": [
19
- {
20
- "internalType": "address",
21
- "name": "registry",
22
- "type": "address"
23
- },
24
- {
25
- "internalType": "NftId",
26
- "name": "nftId",
27
- "type": "uint96"
28
- }
29
- ],
30
- "name": "ErrorAlreadyLinked",
31
- "type": "error"
32
- },
33
6
  {
34
7
  "inputs": [
35
8
  {
@@ -50,11 +23,11 @@
50
23
  "inputs": [
51
24
  {
52
25
  "internalType": "address",
53
- "name": "componentAddress",
26
+ "name": "component",
54
27
  "type": "address"
55
28
  }
56
29
  ],
57
- "name": "ErrorComponentServiceBaseComponentLocked",
30
+ "name": "ErrorComponentServiceComponentLocked",
58
31
  "type": "error"
59
32
  },
60
33
  {
@@ -135,81 +108,60 @@
135
108
  "inputs": [
136
109
  {
137
110
  "internalType": "address",
138
- "name": "contractAddress",
139
- "type": "address"
140
- }
141
- ],
142
- "name": "ErrorContractNotRegistered",
143
- "type": "error"
144
- },
145
- {
146
- "inputs": [
147
- {
148
- "internalType": "address",
149
- "name": "account",
111
+ "name": "caller",
150
112
  "type": "address"
151
113
  }
152
114
  ],
153
- "name": "ErrorNotOwner",
115
+ "name": "ErrorIServiceCallerUnknown",
154
116
  "type": "error"
155
117
  },
156
118
  {
157
119
  "inputs": [
158
120
  {
159
- "internalType": "address",
160
- "name": "registryAddress",
161
- "type": "address"
121
+ "internalType": "NftId",
122
+ "name": "nftId",
123
+ "type": "uint96"
162
124
  }
163
125
  ],
164
- "name": "ErrorNotRegistry",
126
+ "name": "ErrorNftOwnableAlreadyLinked",
165
127
  "type": "error"
166
128
  },
167
129
  {
168
130
  "inputs": [
169
131
  {
170
132
  "internalType": "address",
171
- "name": "registryAddress",
133
+ "name": "contractAddress",
172
134
  "type": "address"
173
135
  }
174
136
  ],
175
- "name": "ErrorRegisterableNotRegistry",
137
+ "name": "ErrorNftOwnableContractNotRegistered",
176
138
  "type": "error"
177
139
  },
178
140
  {
179
141
  "inputs": [],
180
- "name": "ErrorRegistryAddressZero",
142
+ "name": "ErrorNftOwnableInitialOwnerZero",
181
143
  "type": "error"
182
144
  },
183
145
  {
184
146
  "inputs": [
185
147
  {
186
148
  "internalType": "address",
187
- "name": "registry",
149
+ "name": "account",
188
150
  "type": "address"
189
151
  }
190
152
  ],
191
- "name": "ErrorRegistryAlreadyInitialized",
192
- "type": "error"
193
- },
194
- {
195
- "inputs": [],
196
- "name": "ErrorRegistryNotInitialized",
153
+ "name": "ErrorNftOwnableNotOwner",
197
154
  "type": "error"
198
155
  },
199
156
  {
200
157
  "inputs": [
201
- {
202
- "internalType": "RoleId",
203
- "name": "expected",
204
- "type": "uint64"
205
- },
206
158
  {
207
159
  "internalType": "address",
208
- "name": "caller",
160
+ "name": "registryAddress",
209
161
  "type": "address"
210
162
  }
211
163
  ],
212
- "name": "ExpectedRoleMissing",
164
+ "name": "ErrorNotRegistry",
213
165
  "type": "error"
214
166
  },
215
167
  {
@@ -236,29 +188,17 @@
236
188
  "type": "event"
237
189
  },
238
190
  {
239
- "anonymous": false,
240
- "inputs": [
241
- {
242
- "indexed": false,
243
- "internalType": "Version",
244
- "name": "version",
245
- "type": "uint24"
246
- },
247
- {
248
- "indexed": false,
249
- "internalType": "address",
250
- "name": "implementation",
251
- "type": "address"
252
- },
191
+ "inputs": [],
192
+ "name": "NFT_OWNABLE_STORAGE_LOCATION_V1",
193
+ "outputs": [
253
194
  {
254
- "indexed": false,
255
- "internalType": "address",
256
- "name": "activatedBy",
257
- "type": "address"
195
+ "internalType": "bytes32",
196
+ "name": "",
197
+ "type": "bytes32"
258
198
  }
259
199
  ],
260
- "name": "LogVersionableInitialized",
261
- "type": "event"
200
+ "stateMutability": "view",
201
+ "type": "function"
262
202
  },
263
203
  {
264
204
  "inputs": [],
@@ -329,26 +269,8 @@
329
269
  }
330
270
  ],
331
271
  "internalType": "struct IRegistry.ObjectInfo",
332
- "name": "",
272
+ "name": "info",
333
273
  "type": "tuple"
334
- },
335
- {
336
- "internalType": "bytes",
337
- "name": "data",
338
- "type": "bytes"
339
- }
340
- ],
341
- "stateMutability": "view",
342
- "type": "function"
343
- },
344
- {
345
- "inputs": [],
346
- "name": "getInitializedVersion",
347
- "outputs": [
348
- {
349
- "internalType": "uint64",
350
- "name": "",
351
- "type": "uint64"
352
274
  }
353
275
  ],
354
276
  "stateMutability": "view",
@@ -421,10 +343,10 @@
421
343
  },
422
344
  {
423
345
  "inputs": [],
424
- "name": "getRegistryService",
346
+ "name": "getRegistryAddress",
425
347
  "outputs": [
426
348
  {
427
- "internalType": "contract IRegistryService",
349
+ "internalType": "address",
428
350
  "name": "",
429
351
  "type": "address"
430
352
  }
@@ -434,25 +356,19 @@
434
356
  },
435
357
  {
436
358
  "inputs": [],
437
- "name": "getVersion",
359
+ "name": "getRegistryService",
438
360
  "outputs": [
439
361
  {
440
- "internalType": "Version",
362
+ "internalType": "contract IRegistryService",
441
363
  "name": "",
442
- "type": "uint24"
364
+ "type": "address"
443
365
  }
444
366
  ],
445
- "stateMutability": "pure",
367
+ "stateMutability": "view",
446
368
  "type": "function"
447
369
  },
448
370
  {
449
- "inputs": [
450
- {
451
- "internalType": "uint256",
452
- "name": "idx",
453
- "type": "uint256"
454
- }
455
- ],
371
+ "inputs": [],
456
372
  "name": "getVersion",
457
373
  "outputs": [
458
374
  {
@@ -461,87 +377,68 @@
461
377
  "type": "uint24"
462
378
  }
463
379
  ],
464
- "stateMutability": "view",
380
+ "stateMutability": "pure",
465
381
  "type": "function"
466
382
  },
467
383
  {
468
384
  "inputs": [],
469
- "name": "getVersionCount",
470
- "outputs": [
471
- {
472
- "internalType": "uint256",
473
- "name": "",
474
- "type": "uint256"
475
- }
476
- ],
477
- "stateMutability": "view",
385
+ "name": "initializeERC165",
386
+ "outputs": [],
387
+ "stateMutability": "nonpayable",
478
388
  "type": "function"
479
389
  },
480
390
  {
481
391
  "inputs": [
482
392
  {
483
- "internalType": "Version",
484
- "name": "_version",
485
- "type": "uint24"
486
- }
487
- ],
488
- "name": "getVersionInfo",
489
- "outputs": [
393
+ "internalType": "address",
394
+ "name": "initialOwner",
395
+ "type": "address"
396
+ },
490
397
  {
491
- "components": [
492
- {
493
- "internalType": "Version",
494
- "name": "version",
495
- "type": "uint24"
496
- },
497
- {
498
- "internalType": "address",
499
- "name": "implementation",
500
- "type": "address"
501
- },
502
- {
503
- "internalType": "address",
504
- "name": "activatedBy",
505
- "type": "address"
506
- },
507
- {
508
- "internalType": "Timestamp",
509
- "name": "activatedAt",
510
- "type": "uint40"
511
- },
512
- {
513
- "internalType": "Blocknumber",
514
- "name": "activatedIn",
515
- "type": "uint32"
516
- }
517
- ],
518
- "internalType": "struct IVersionable.VersionInfo",
519
- "name": "",
520
- "type": "tuple"
398
+ "internalType": "address",
399
+ "name": "registryAddress",
400
+ "type": "address"
521
401
  }
522
402
  ],
523
- "stateMutability": "view",
403
+ "name": "initializeNftOwnable",
404
+ "outputs": [],
405
+ "stateMutability": "nonpayable",
524
406
  "type": "function"
525
407
  },
526
408
  {
527
409
  "inputs": [
528
410
  {
529
411
  "internalType": "address",
530
- "name": "implementation",
412
+ "name": "registryAddress",
531
413
  "type": "address"
532
414
  },
415
+ {
416
+ "internalType": "NftId",
417
+ "name": "parentNftId",
418
+ "type": "uint96"
419
+ },
420
+ {
421
+ "internalType": "ObjectType",
422
+ "name": "objectType",
423
+ "type": "uint8"
424
+ },
425
+ {
426
+ "internalType": "bool",
427
+ "name": "isInterceptor",
428
+ "type": "bool"
429
+ },
533
430
  {
534
431
  "internalType": "address",
535
- "name": "activatedBy",
432
+ "name": "initialOwner",
536
433
  "type": "address"
537
434
  },
538
435
  {
539
436
  "internalType": "bytes",
540
- "name": "data",
437
+ "name": "registryData",
541
438
  "type": "bytes"
542
439
  }
543
440
  ],
544
- "name": "initialize",
441
+ "name": "initializeRegisterable",
545
442
  "outputs": [],
546
443
  "stateMutability": "nonpayable",
547
444
  "type": "function"
@@ -549,20 +446,50 @@
549
446
  {
550
447
  "inputs": [
551
448
  {
552
- "internalType": "Version",
553
- "name": "_version",
554
- "type": "uint24"
449
+ "internalType": "address",
450
+ "name": "registryAddress",
451
+ "type": "address"
555
452
  }
556
453
  ],
557
- "name": "isInitialized",
558
- "outputs": [
454
+ "name": "initializeRegistryLinked",
455
+ "outputs": [],
456
+ "stateMutability": "nonpayable",
457
+ "type": "function"
458
+ },
459
+ {
460
+ "inputs": [
559
461
  {
560
- "internalType": "bool",
561
- "name": "",
562
- "type": "bool"
462
+ "internalType": "address",
463
+ "name": "registry",
464
+ "type": "address"
465
+ },
466
+ {
467
+ "internalType": "address",
468
+ "name": "initialOwner",
469
+ "type": "address"
563
470
  }
564
471
  ],
565
- "stateMutability": "view",
472
+ "name": "initializeService",
473
+ "outputs": [],
474
+ "stateMutability": "nonpayable",
475
+ "type": "function"
476
+ },
477
+ {
478
+ "inputs": [
479
+ {
480
+ "internalType": "address",
481
+ "name": "activatedBy",
482
+ "type": "address"
483
+ },
484
+ {
485
+ "internalType": "bytes",
486
+ "name": "data",
487
+ "type": "bytes"
488
+ }
489
+ ],
490
+ "name": "initializeVersionable",
491
+ "outputs": [],
492
+ "stateMutability": "nonpayable",
566
493
  "type": "function"
567
494
  },
568
495
  {
@@ -572,6 +499,19 @@
572
499
  "stateMutability": "nonpayable",
573
500
  "type": "function"
574
501
  },
502
+ {
503
+ "inputs": [
504
+ {
505
+ "internalType": "bytes4",
506
+ "name": "interfaceId",
507
+ "type": "bytes4"
508
+ }
509
+ ],
510
+ "name": "registerInterface",
511
+ "outputs": [],
512
+ "stateMutability": "nonpayable",
513
+ "type": "function"
514
+ },
575
515
  {
576
516
  "inputs": [
577
517
  {
@@ -593,23 +533,13 @@
593
533
  },
594
534
  {
595
535
  "inputs": [
596
- {
597
- "internalType": "address",
598
- "name": "implementation",
599
- "type": "address"
600
- },
601
- {
602
- "internalType": "address",
603
- "name": "activatedBy",
604
- "type": "address"
605
- },
606
536
  {
607
537
  "internalType": "bytes",
608
538
  "name": "data",
609
539
  "type": "bytes"
610
540
  }
611
541
  ],
612
- "name": "upgrade",
542
+ "name": "upgradeVersionable",
613
543
  "outputs": [],
614
544
  "stateMutability": "nonpayable",
615
545
  "type": "function"
@@ -1,4 +1,4 @@
1
1
  {
2
2
  "_format": "hh-sol-dbg-1",
3
- "buildInfo": "../../../../build-info/2d0d5ac9f3af33498ef492a7caeac063.json"
3
+ "buildInfo": "../../../../build-info/a8e58e3e317904030d8bf765133d5722.json"
4
4
  }
@@ -1,4 +1,4 @@
1
1
  {
2
2
  "_format": "hh-sol-dbg-1",
3
- "buildInfo": "../../../../build-info/2d0d5ac9f3af33498ef492a7caeac063.json"
3
+ "buildInfo": "../../../../build-info/a8e58e3e317904030d8bf765133d5722.json"
4
4
  }
@@ -1,4 +1,4 @@
1
1
  {
2
2
  "_format": "hh-sol-dbg-1",
3
- "buildInfo": "../../../../build-info/2d0d5ac9f3af33498ef492a7caeac063.json"
3
+ "buildInfo": "../../../../build-info/a8e58e3e317904030d8bf765133d5722.json"
4
4
  }