@etherisc/gif-next 0.0.2-9105e58-225 → 0.0.2-917cede-703

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (332) hide show
  1. package/README.md +6 -83
  2. package/artifacts/contracts/components/Component.sol/Component.dbg.json +1 -1
  3. package/artifacts/contracts/components/Component.sol/Component.json +78 -100
  4. package/artifacts/contracts/components/Distribution.sol/Distribution.dbg.json +1 -1
  5. package/artifacts/contracts/components/Distribution.sol/Distribution.json +139 -194
  6. package/artifacts/contracts/components/IComponent.sol/IComponent.dbg.json +1 -1
  7. package/artifacts/contracts/components/IComponent.sol/IComponent.json +156 -64
  8. package/artifacts/contracts/components/IDistributionComponent.sol/IDistributionComponent.dbg.json +1 -1
  9. package/artifacts/contracts/components/IDistributionComponent.sol/IDistributionComponent.json +169 -143
  10. package/artifacts/contracts/components/IPoolComponent.sol/IPoolComponent.dbg.json +1 -1
  11. package/artifacts/contracts/components/IPoolComponent.sol/IPoolComponent.json +353 -176
  12. package/artifacts/contracts/components/IProductComponent.sol/IProductComponent.dbg.json +1 -1
  13. package/artifacts/contracts/components/IProductComponent.sol/IProductComponent.json +162 -138
  14. package/artifacts/contracts/components/Pool.sol/Pool.dbg.json +1 -1
  15. package/artifacts/contracts/components/Pool.sol/Pool.json +291 -248
  16. package/artifacts/contracts/components/Product.sol/Product.dbg.json +1 -1
  17. package/artifacts/contracts/components/Product.sol/Product.json +83 -173
  18. package/artifacts/contracts/instance/AccessManagerUpgradeableInitializeable.sol/AccessManagerUpgradeableInitializeable.dbg.json +4 -0
  19. package/artifacts/contracts/instance/AccessManagerUpgradeableInitializeable.sol/AccessManagerUpgradeableInitializeable.json +1206 -0
  20. package/artifacts/contracts/instance/BundleManager.sol/BundleManager.dbg.json +1 -1
  21. package/artifacts/contracts/instance/BundleManager.sol/BundleManager.json +64 -50
  22. package/artifacts/contracts/instance/Cloneable.sol/Cloneable.dbg.json +1 -1
  23. package/artifacts/contracts/instance/Cloneable.sol/Cloneable.json +5 -0
  24. package/artifacts/contracts/instance/IInstance.sol/IInstance.dbg.json +1 -1
  25. package/artifacts/contracts/instance/IInstance.sol/IInstance.json +527 -400
  26. package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.dbg.json +1 -1
  27. package/artifacts/contracts/instance/IInstanceService.sol/IInstanceService.json +166 -181
  28. package/artifacts/contracts/instance/Instance.sol/Instance.dbg.json +1 -1
  29. package/artifacts/contracts/instance/Instance.sol/Instance.json +500 -623
  30. package/artifacts/contracts/instance/InstanceAccessManager.sol/InstanceAccessManager.dbg.json +1 -1
  31. package/artifacts/contracts/instance/InstanceAccessManager.sol/InstanceAccessManager.json +472 -126
  32. package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.dbg.json +1 -1
  33. package/artifacts/contracts/instance/InstanceReader.sol/InstanceReader.json +253 -236
  34. package/artifacts/contracts/instance/InstanceService.sol/InstanceService.dbg.json +1 -1
  35. package/artifacts/contracts/instance/InstanceService.sol/InstanceService.json +300 -384
  36. package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.dbg.json +1 -1
  37. package/artifacts/contracts/instance/InstanceServiceManager.sol/InstanceServiceManager.json +246 -84
  38. package/artifacts/contracts/instance/ObjectManager.sol/ObjectManager.dbg.json +1 -1
  39. package/artifacts/contracts/instance/ObjectManager.sol/ObjectManager.json +8 -13
  40. package/artifacts/contracts/instance/base/ComponentService.sol/ComponentService.dbg.json +1 -1
  41. package/artifacts/contracts/instance/base/ComponentService.sol/ComponentService.json +71 -166
  42. package/artifacts/contracts/instance/base/IKeyValueStore.sol/IKeyValueStore.dbg.json +1 -1
  43. package/artifacts/contracts/instance/base/ILifecycle.sol/ILifecycle.dbg.json +1 -1
  44. package/artifacts/contracts/instance/base/KeyValueStore.sol/KeyValueStore.dbg.json +1 -1
  45. package/artifacts/contracts/instance/base/KeyValueStore.sol/KeyValueStore.json +40 -10
  46. package/artifacts/contracts/instance/base/Lifecycle.sol/Lifecycle.dbg.json +1 -1
  47. package/artifacts/contracts/instance/base/Lifecycle.sol/Lifecycle.json +36 -11
  48. package/artifacts/contracts/instance/module/IAccess.sol/IAccess.dbg.json +1 -1
  49. package/artifacts/contracts/instance/module/IAccess.sol/IAccess.json +56 -73
  50. package/artifacts/contracts/instance/module/IBundle.sol/IBundle.dbg.json +1 -1
  51. package/artifacts/contracts/instance/module/IComponents.sol/IComponents.dbg.json +4 -0
  52. package/artifacts/contracts/instance/module/IComponents.sol/IComponents.json +10 -0
  53. package/artifacts/contracts/instance/module/IDistribution.sol/IDistribution.dbg.json +1 -1
  54. package/artifacts/contracts/instance/module/IPolicy.sol/IPolicy.dbg.json +1 -1
  55. package/artifacts/contracts/instance/module/IRisk.sol/IRisk.dbg.json +1 -1
  56. package/artifacts/contracts/instance/module/ISetup.sol/ISetup.dbg.json +1 -1
  57. package/artifacts/contracts/instance/module/ITreasury.sol/ITreasury.dbg.json +1 -1
  58. package/artifacts/contracts/instance/service/ApplicationService.sol/ApplicationService.dbg.json +1 -1
  59. package/artifacts/contracts/instance/service/ApplicationService.sol/ApplicationService.json +266 -253
  60. package/artifacts/contracts/instance/service/ApplicationServiceManager.sol/ApplicationServiceManager.dbg.json +1 -1
  61. package/artifacts/contracts/instance/service/ApplicationServiceManager.sol/ApplicationServiceManager.json +214 -76
  62. package/artifacts/contracts/instance/service/BundleService.sol/BundleService.dbg.json +1 -1
  63. package/artifacts/contracts/instance/service/BundleService.sol/BundleService.json +409 -386
  64. package/artifacts/contracts/instance/service/BundleServiceManager.sol/BundleServiceManager.dbg.json +1 -1
  65. package/artifacts/contracts/instance/service/BundleServiceManager.sol/BundleServiceManager.json +249 -71
  66. package/artifacts/contracts/instance/service/ClaimService.sol/ClaimService.dbg.json +1 -1
  67. package/artifacts/contracts/instance/service/ClaimService.sol/ClaimService.json +338 -230
  68. package/artifacts/contracts/instance/service/ClaimServiceManager.sol/ClaimServiceManager.dbg.json +1 -1
  69. package/artifacts/contracts/instance/service/ClaimServiceManager.sol/ClaimServiceManager.json +225 -63
  70. package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.dbg.json +1 -1
  71. package/artifacts/contracts/instance/service/DistributionService.sol/DistributionService.json +883 -233
  72. package/artifacts/contracts/instance/service/DistributionServiceManager.sol/DistributionServiceManager.dbg.json +1 -1
  73. package/artifacts/contracts/instance/service/DistributionServiceManager.sol/DistributionServiceManager.json +308 -78
  74. package/artifacts/contracts/instance/service/IApplicationService.sol/IApplicationService.dbg.json +1 -1
  75. package/artifacts/contracts/instance/service/IApplicationService.sol/IApplicationService.json +196 -181
  76. package/artifacts/contracts/instance/service/IBundleService.sol/IBundleService.dbg.json +1 -1
  77. package/artifacts/contracts/instance/service/IBundleService.sol/IBundleService.json +233 -296
  78. package/artifacts/contracts/instance/service/IClaimService.sol/IClaimService.dbg.json +1 -1
  79. package/artifacts/contracts/instance/service/IClaimService.sol/IClaimService.json +231 -177
  80. package/artifacts/contracts/instance/service/IDistributionService.sol/IDistributionService.dbg.json +1 -1
  81. package/artifacts/contracts/instance/service/IDistributionService.sol/IDistributionService.json +594 -134
  82. package/artifacts/contracts/instance/service/IPolicyService.sol/IPolicyService.dbg.json +1 -1
  83. package/artifacts/contracts/instance/service/IPolicyService.sol/IPolicyService.json +405 -190
  84. package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.dbg.json +1 -1
  85. package/artifacts/contracts/instance/service/IPoolService.sol/IPoolService.json +583 -109
  86. package/artifacts/contracts/instance/service/IProductService.sol/IProductService.dbg.json +1 -1
  87. package/artifacts/contracts/instance/service/IProductService.sol/IProductService.json +68 -141
  88. package/artifacts/contracts/instance/service/PolicyService.sol/PolicyService.dbg.json +1 -1
  89. package/artifacts/contracts/instance/service/PolicyService.sol/PolicyService.json +525 -296
  90. package/artifacts/contracts/instance/service/PolicyServiceManager.sol/PolicyServiceManager.dbg.json +1 -1
  91. package/artifacts/contracts/instance/service/PolicyServiceManager.sol/PolicyServiceManager.json +228 -86
  92. package/artifacts/contracts/instance/service/PoolService.sol/PoolService.dbg.json +1 -1
  93. package/artifacts/contracts/instance/service/PoolService.sol/PoolService.json +734 -206
  94. package/artifacts/contracts/instance/service/PoolServiceManager.sol/PoolServiceManager.dbg.json +1 -1
  95. package/artifacts/contracts/instance/service/PoolServiceManager.sol/PoolServiceManager.json +234 -68
  96. package/artifacts/contracts/instance/service/ProductService.sol/ProductService.dbg.json +1 -1
  97. package/artifacts/contracts/instance/service/ProductService.sol/ProductService.json +107 -222
  98. package/artifacts/contracts/instance/service/ProductServiceManager.sol/ProductServiceManager.dbg.json +1 -1
  99. package/artifacts/contracts/instance/service/ProductServiceManager.sol/ProductServiceManager.json +191 -73
  100. package/artifacts/contracts/registry/ChainNft.sol/ChainNft.dbg.json +1 -1
  101. package/artifacts/contracts/registry/ChainNft.sol/ChainNft.json +15 -2
  102. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.dbg.json +1 -1
  103. package/artifacts/contracts/registry/IRegistry.sol/IRegistry.json +19 -0
  104. package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.dbg.json +1 -1
  105. package/artifacts/contracts/registry/IRegistryService.sol/IRegistryService.json +0 -163
  106. package/artifacts/contracts/registry/ITransferInterceptor.sol/ITransferInterceptor.dbg.json +1 -1
  107. package/artifacts/contracts/registry/ITransferInterceptor.sol/ITransferInterceptor.json +18 -0
  108. package/artifacts/contracts/registry/Registry.sol/Registry.dbg.json +1 -1
  109. package/artifacts/contracts/registry/Registry.sol/Registry.json +31 -12
  110. package/artifacts/contracts/registry/RegistryAccessManager.sol/RegistryAccessManager.dbg.json +1 -1
  111. package/artifacts/contracts/registry/RegistryAccessManager.sol/RegistryAccessManager.json +2 -2
  112. package/artifacts/contracts/registry/RegistryService.sol/RegistryService.dbg.json +1 -1
  113. package/artifacts/contracts/registry/RegistryService.sol/RegistryService.json +24 -221
  114. package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.dbg.json +1 -1
  115. package/artifacts/contracts/registry/RegistryServiceManager.sol/RegistryServiceManager.json +184 -70
  116. package/artifacts/contracts/registry/ReleaseManager.sol/ReleaseManager.dbg.json +1 -1
  117. package/artifacts/contracts/registry/ReleaseManager.sol/ReleaseManager.json +23 -11
  118. package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.dbg.json +1 -1
  119. package/artifacts/contracts/registry/TokenRegistry.sol/TokenRegistry.json +2 -2
  120. package/artifacts/contracts/shared/ContractDeployerLib.sol/ContractDeployerLib.dbg.json +1 -1
  121. package/artifacts/contracts/shared/ERC165.sol/ERC165.dbg.json +1 -1
  122. package/artifacts/contracts/shared/INftOwnable.sol/INftOwnable.dbg.json +1 -1
  123. package/artifacts/contracts/shared/IPolicyHolder.sol/IPolicyHolder.dbg.json +1 -1
  124. package/artifacts/contracts/shared/IRegisterable.sol/IRegisterable.dbg.json +1 -1
  125. package/artifacts/contracts/shared/IRegistryLinked.sol/IRegistryLinked.dbg.json +1 -1
  126. package/artifacts/contracts/shared/IService.sol/IService.dbg.json +1 -1
  127. package/artifacts/contracts/shared/IService.sol/IService.json +68 -141
  128. package/artifacts/contracts/shared/IVersionable.sol/IVersionable.dbg.json +1 -1
  129. package/artifacts/contracts/shared/IVersionable.sol/IVersionable.json +0 -150
  130. package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.dbg.json +1 -1
  131. package/artifacts/contracts/shared/NftOwnable.sol/NftOwnable.json +2 -2
  132. package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.dbg.json +1 -1
  133. package/artifacts/contracts/shared/PolicyHolder.sol/PolicyHolder.json +2 -2
  134. package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.dbg.json +1 -1
  135. package/artifacts/contracts/shared/ProxyManager.sol/ProxyManager.json +169 -53
  136. package/artifacts/contracts/shared/Registerable.sol/Registerable.dbg.json +1 -1
  137. package/artifacts/contracts/shared/Registerable.sol/Registerable.json +5 -16
  138. package/artifacts/contracts/shared/RegistryLinked.sol/RegistryLinked.dbg.json +1 -1
  139. package/artifacts/contracts/shared/RegistryLinked.sol/RegistryLinked.json +2 -2
  140. package/artifacts/contracts/shared/Service.sol/Service.dbg.json +1 -1
  141. package/artifacts/contracts/shared/Service.sol/Service.json +82 -161
  142. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.dbg.json +1 -1
  143. package/artifacts/contracts/shared/TokenHandler.sol/TokenHandler.json +2 -2
  144. package/artifacts/contracts/shared/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.dbg.json +1 -1
  145. package/artifacts/contracts/shared/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.json +2 -2
  146. package/artifacts/contracts/shared/Versionable.sol/Versionable.dbg.json +1 -1
  147. package/artifacts/contracts/shared/Versionable.sol/Versionable.json +0 -150
  148. package/artifacts/contracts/test/TestFee.sol/TestFee.dbg.json +1 -1
  149. package/artifacts/contracts/test/TestFee.sol/TestFee.json +2 -2
  150. package/artifacts/contracts/test/TestRegisterable.sol/TestRegisterable.dbg.json +1 -1
  151. package/artifacts/contracts/test/TestRegisterable.sol/TestRegisterable.json +6 -17
  152. package/artifacts/contracts/test/TestRoleId.sol/TestRoleId.dbg.json +1 -1
  153. package/artifacts/contracts/test/TestRoleId.sol/TestRoleId.json +6 -6
  154. package/artifacts/contracts/test/TestService.sol/TestService.dbg.json +1 -1
  155. package/artifacts/contracts/test/TestService.sol/TestService.json +100 -211
  156. package/artifacts/contracts/test/TestToken.sol/TestUsdc.dbg.json +1 -1
  157. package/artifacts/contracts/test/TestVersion.sol/TestVersion.dbg.json +1 -1
  158. package/artifacts/contracts/test/TestVersion.sol/TestVersion.json +2 -2
  159. package/artifacts/contracts/test/TestVersionable.sol/TestVersionable.dbg.json +1 -1
  160. package/artifacts/contracts/test/TestVersionable.sol/TestVersionable.json +6 -188
  161. package/artifacts/contracts/test/Usdc.sol/USDC.dbg.json +1 -1
  162. package/artifacts/contracts/types/AddressSet.sol/LibAddressSet.dbg.json +1 -1
  163. package/artifacts/contracts/types/Amount.sol/AmountLib.dbg.json +4 -0
  164. package/artifacts/contracts/types/Amount.sol/AmountLib.json +209 -0
  165. package/artifacts/contracts/types/Blocknumber.sol/BlocknumberLib.dbg.json +1 -1
  166. package/artifacts/contracts/types/Blocknumber.sol/BlocknumberLib.json +2 -2
  167. package/artifacts/contracts/types/ChainId.sol/ChainIdLib.dbg.json +1 -1
  168. package/artifacts/contracts/types/ClaimId.sol/ClaimIdLib.dbg.json +1 -1
  169. package/artifacts/contracts/types/ClaimId.sol/ClaimIdLib.json +83 -4
  170. package/artifacts/contracts/types/DistributorType.sol/DistributorTypeLib.dbg.json +1 -1
  171. package/artifacts/contracts/types/DistributorType.sol/DistributorTypeLib.json +2 -2
  172. package/artifacts/contracts/types/Fee.sol/FeeLib.dbg.json +1 -1
  173. package/artifacts/contracts/types/Fee.sol/FeeLib.json +40 -9
  174. package/artifacts/contracts/types/Key32.sol/Key32Lib.dbg.json +1 -1
  175. package/artifacts/contracts/types/Key32.sol/Key32Lib.json +2 -2
  176. package/artifacts/contracts/types/NftId.sol/NftIdLib.dbg.json +1 -1
  177. package/artifacts/contracts/types/NftId.sol/NftIdLib.json +17 -4
  178. package/artifacts/contracts/types/NftIdSet.sol/LibNftIdSet.dbg.json +1 -1
  179. package/artifacts/contracts/types/NftIdSet.sol/LibNftIdSet.json +2 -2
  180. package/artifacts/contracts/types/NumberId.sol/NumberIdLib.dbg.json +1 -1
  181. package/artifacts/contracts/types/ObjectType.sol/ObjectTypeLib.dbg.json +1 -1
  182. package/artifacts/contracts/types/ObjectType.sol/ObjectTypeLib.json +2 -2
  183. package/artifacts/contracts/types/PayoutId.sol/PayoutIdLib.dbg.json +1 -1
  184. package/artifacts/contracts/types/PayoutId.sol/PayoutIdLib.json +116 -7
  185. package/artifacts/contracts/types/Referral.sol/ReferralLib.dbg.json +1 -1
  186. package/artifacts/contracts/types/Referral.sol/ReferralLib.json +23 -4
  187. package/artifacts/contracts/types/RiskId.sol/RiskIdLib.dbg.json +1 -1
  188. package/artifacts/contracts/types/RiskId.sol/RiskIdLib.json +2 -2
  189. package/artifacts/contracts/types/RoleId.sol/RoleIdLib.dbg.json +1 -1
  190. package/artifacts/contracts/types/RoleId.sol/RoleIdLib.json +2 -2
  191. package/artifacts/contracts/types/Seconds.sol/SecondsLib.dbg.json +4 -0
  192. package/artifacts/contracts/types/Seconds.sol/SecondsLib.json +124 -0
  193. package/artifacts/contracts/types/StateId.sol/StateIdLib.dbg.json +1 -1
  194. package/artifacts/contracts/types/StateId.sol/StateIdLib.json +2 -2
  195. package/artifacts/contracts/types/Timestamp.sol/TimestampLib.dbg.json +1 -1
  196. package/artifacts/contracts/types/Timestamp.sol/TimestampLib.json +38 -7
  197. package/artifacts/contracts/types/UFixed.sol/MathLib.dbg.json +1 -1
  198. package/artifacts/contracts/types/UFixed.sol/MathLib.json +2 -2
  199. package/artifacts/contracts/types/UFixed.sol/UFixedLib.dbg.json +1 -1
  200. package/artifacts/contracts/types/UFixed.sol/UFixedLib.json +2 -2
  201. package/artifacts/contracts/types/Version.sol/VersionLib.dbg.json +1 -1
  202. package/artifacts/contracts/types/Version.sol/VersionLib.json +2 -2
  203. package/artifacts/contracts/types/Version.sol/VersionPartLib.dbg.json +1 -1
  204. package/artifacts/contracts/types/Version.sol/VersionPartLib.json +2 -2
  205. package/contracts/components/Component.sol +99 -88
  206. package/contracts/components/Distribution.sol +22 -46
  207. package/contracts/components/IComponent.sol +40 -19
  208. package/contracts/components/IDistributionComponent.sol +1 -30
  209. package/contracts/components/IPoolComponent.sol +73 -47
  210. package/contracts/components/IProductComponent.sol +3 -2
  211. package/contracts/components/Pool.sol +178 -130
  212. package/contracts/components/Product.sol +157 -71
  213. package/contracts/instance/AccessManagerUpgradeableInitializeable.sol +13 -0
  214. package/contracts/instance/BundleManager.sol +10 -9
  215. package/contracts/instance/Cloneable.sol +7 -2
  216. package/contracts/instance/IInstance.sol +37 -27
  217. package/contracts/instance/IInstanceService.sol +18 -9
  218. package/contracts/instance/Instance.sol +117 -98
  219. package/contracts/instance/InstanceAccessManager.sol +388 -158
  220. package/contracts/instance/InstanceReader.sol +36 -12
  221. package/contracts/instance/InstanceService.sol +193 -191
  222. package/contracts/instance/ObjectManager.sol +6 -8
  223. package/contracts/instance/base/ComponentService.sol +17 -30
  224. package/contracts/instance/base/KeyValueStore.sol +13 -5
  225. package/contracts/instance/base/Lifecycle.sol +23 -6
  226. package/contracts/instance/module/IAccess.sol +21 -14
  227. package/contracts/instance/module/IBundle.sol +8 -5
  228. package/contracts/instance/module/IComponents.sol +41 -0
  229. package/contracts/instance/module/IDistribution.sol +2 -0
  230. package/contracts/instance/module/IPolicy.sol +37 -7
  231. package/contracts/instance/module/ISetup.sol +7 -21
  232. package/contracts/instance/service/ApplicationService.sol +137 -50
  233. package/contracts/instance/service/BundleService.sol +228 -83
  234. package/contracts/instance/service/ClaimService.sol +114 -26
  235. package/contracts/instance/service/DistributionService.sol +225 -71
  236. package/contracts/instance/service/IApplicationService.sol +9 -13
  237. package/contracts/instance/service/IBundleService.sol +74 -26
  238. package/contracts/instance/service/IClaimService.sol +46 -15
  239. package/contracts/instance/service/IDistributionService.sol +37 -3
  240. package/contracts/instance/service/IPolicyService.sol +69 -21
  241. package/contracts/instance/service/IPoolService.sol +85 -3
  242. package/contracts/instance/service/PolicyService.sol +301 -230
  243. package/contracts/instance/service/PolicyServiceManager.sol +1 -1
  244. package/contracts/instance/service/PoolService.sol +245 -18
  245. package/contracts/instance/service/ProductService.sol +31 -54
  246. package/contracts/instance/service/ProductServiceManager.sol +1 -1
  247. package/contracts/registry/ChainNft.sol +8 -0
  248. package/contracts/registry/IRegistry.sol +2 -0
  249. package/contracts/registry/IRegistryService.sol +4 -3
  250. package/contracts/registry/ITransferInterceptor.sol +1 -0
  251. package/contracts/registry/Registry.sol +23 -20
  252. package/contracts/registry/RegistryService.sol +15 -16
  253. package/contracts/registry/ReleaseManager.sol +26 -33
  254. package/contracts/registry/TokenRegistry.sol +1 -6
  255. package/contracts/shared/IService.sol +4 -4
  256. package/contracts/shared/IVersionable.sol +4 -47
  257. package/contracts/shared/ProxyManager.sol +89 -22
  258. package/contracts/shared/Registerable.sol +2 -6
  259. package/contracts/shared/Service.sol +29 -17
  260. package/contracts/shared/TokenHandler.sol +11 -5
  261. package/contracts/shared/Versionable.sol +1 -90
  262. package/contracts/test/TestService.sol +1 -1
  263. package/contracts/types/Amount.sol +70 -0
  264. package/contracts/types/Blocknumber.sol +1 -0
  265. package/contracts/types/ClaimId.sol +25 -2
  266. package/contracts/types/Fee.sol +13 -5
  267. package/contracts/types/NftId.sol +8 -0
  268. package/contracts/types/ObjectType.sol +6 -5
  269. package/contracts/types/PayoutId.sol +33 -5
  270. package/contracts/types/Referral.sol +4 -0
  271. package/contracts/types/RoleId.sol +13 -6
  272. package/contracts/types/Seconds.sol +54 -0
  273. package/contracts/types/StateId.sol +7 -2
  274. package/contracts/types/Timestamp.sol +18 -13
  275. package/contracts/types/UFixed.sol +1 -0
  276. package/contracts/types/Version.sol +1 -0
  277. package/package.json +1 -1
  278. package/artifacts/contracts/experiment/cloning/Cloner.sol/Cloner.dbg.json +0 -4
  279. package/artifacts/contracts/experiment/cloning/Cloner.sol/Cloner.json +0 -66
  280. package/artifacts/contracts/experiment/cloning/Cloner.sol/Mock1.dbg.json +0 -4
  281. package/artifacts/contracts/experiment/cloning/Cloner.sol/Mock1.json +0 -24
  282. package/artifacts/contracts/experiment/cloning/Cloner.sol/Mock2.dbg.json +0 -4
  283. package/artifacts/contracts/experiment/cloning/Cloner.sol/Mock2.json +0 -42
  284. package/artifacts/contracts/experiment/errors/Require.sol/Require.dbg.json +0 -4
  285. package/artifacts/contracts/experiment/errors/Require.sol/Require.json +0 -105
  286. package/artifacts/contracts/experiment/errors/Revert.sol/Revert.dbg.json +0 -4
  287. package/artifacts/contracts/experiment/errors/Revert.sol/Revert.json +0 -105
  288. package/artifacts/contracts/experiment/inheritance/A.sol/A.dbg.json +0 -4
  289. package/artifacts/contracts/experiment/inheritance/A.sol/A.json +0 -128
  290. package/artifacts/contracts/experiment/inheritance/A.sol/AShared.dbg.json +0 -4
  291. package/artifacts/contracts/experiment/inheritance/A.sol/AShared.json +0 -42
  292. package/artifacts/contracts/experiment/inheritance/B.sol/B.dbg.json +0 -4
  293. package/artifacts/contracts/experiment/inheritance/B.sol/B.json +0 -76
  294. package/artifacts/contracts/experiment/inheritance/C.sol/C.dbg.json +0 -4
  295. package/artifacts/contracts/experiment/inheritance/C.sol/C.json +0 -89
  296. package/artifacts/contracts/experiment/inheritance/IA.sol/IA.dbg.json +0 -4
  297. package/artifacts/contracts/experiment/inheritance/IA.sol/IA.json +0 -128
  298. package/artifacts/contracts/experiment/inheritance/IA.sol/ISharedA.dbg.json +0 -4
  299. package/artifacts/contracts/experiment/inheritance/IA.sol/ISharedA.json +0 -37
  300. package/artifacts/contracts/experiment/inheritance/IB.sol/IB.dbg.json +0 -4
  301. package/artifacts/contracts/experiment/inheritance/IB.sol/IB.json +0 -50
  302. package/artifacts/contracts/experiment/inheritance/IC.sol/IC.dbg.json +0 -4
  303. package/artifacts/contracts/experiment/inheritance/IC.sol/IC.json +0 -63
  304. package/artifacts/contracts/experiment/statemachine/Dummy.sol/LifeCycleModule.dbg.json +0 -4
  305. package/artifacts/contracts/experiment/statemachine/Dummy.sol/LifeCycleModule.json +0 -59
  306. package/artifacts/contracts/experiment/statemachine/ISM.sol/ISM.dbg.json +0 -4
  307. package/artifacts/contracts/experiment/statemachine/ISM.sol/ISM.json +0 -124
  308. package/artifacts/contracts/experiment/statemachine/ISM.sol/ISMEE.dbg.json +0 -4
  309. package/artifacts/contracts/experiment/statemachine/ISM.sol/ISMEE.json +0 -74
  310. package/artifacts/contracts/experiment/statemachine/SM.sol/SM.dbg.json +0 -4
  311. package/artifacts/contracts/experiment/statemachine/SM.sol/SM.json +0 -124
  312. package/artifacts/contracts/experiment/statemachine/SimpleStateMachine.sol/SimpleStateMachine.dbg.json +0 -4
  313. package/artifacts/contracts/experiment/statemachine/SimpleStateMachine.sol/SimpleStateMachine.json +0 -207
  314. package/artifacts/contracts/experiment/types/TypeA.sol/TypeALib.dbg.json +0 -4
  315. package/artifacts/contracts/experiment/types/TypeA.sol/TypeALib.json +0 -10
  316. package/artifacts/contracts/experiment/types/TypeB.sol/TypeBLib.dbg.json +0 -4
  317. package/artifacts/contracts/experiment/types/TypeB.sol/TypeBLib.json +0 -10
  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
@@ -3,6 +3,129 @@
3
3
  "contractName": "IBundleService",
4
4
  "sourceName": "contracts/instance/service/IBundleService.sol",
5
5
  "abi": [
6
+ {
7
+ "inputs": [
8
+ {
9
+ "internalType": "address",
10
+ "name": "authority",
11
+ "type": "address"
12
+ }
13
+ ],
14
+ "name": "AccessManagedInvalidAuthority",
15
+ "type": "error"
16
+ },
17
+ {
18
+ "inputs": [
19
+ {
20
+ "internalType": "address",
21
+ "name": "caller",
22
+ "type": "address"
23
+ },
24
+ {
25
+ "internalType": "uint32",
26
+ "name": "delay",
27
+ "type": "uint32"
28
+ }
29
+ ],
30
+ "name": "AccessManagedRequiredDelay",
31
+ "type": "error"
32
+ },
33
+ {
34
+ "inputs": [
35
+ {
36
+ "internalType": "address",
37
+ "name": "caller",
38
+ "type": "address"
39
+ }
40
+ ],
41
+ "name": "AccessManagedUnauthorized",
42
+ "type": "error"
43
+ },
44
+ {
45
+ "inputs": [
46
+ {
47
+ "internalType": "NftId",
48
+ "name": "bundleNftId",
49
+ "type": "uint96"
50
+ },
51
+ {
52
+ "internalType": "StateId",
53
+ "name": "state",
54
+ "type": "uint8"
55
+ },
56
+ {
57
+ "internalType": "Timestamp",
58
+ "name": "expiredAt",
59
+ "type": "uint40"
60
+ }
61
+ ],
62
+ "name": "ErrorBundleServiceBundleNotOpen",
63
+ "type": "error"
64
+ },
65
+ {
66
+ "inputs": [
67
+ {
68
+ "internalType": "NftId",
69
+ "name": "expectedPoolNftId",
70
+ "type": "uint96"
71
+ },
72
+ {
73
+ "internalType": "NftId",
74
+ "name": "bundlePoolNftId",
75
+ "type": "uint96"
76
+ }
77
+ ],
78
+ "name": "ErrorBundleServiceBundlePoolMismatch",
79
+ "type": "error"
80
+ },
81
+ {
82
+ "inputs": [
83
+ {
84
+ "internalType": "NftId",
85
+ "name": "bundleNftId",
86
+ "type": "uint96"
87
+ }
88
+ ],
89
+ "name": "ErrorBundleServiceBundleUnknown",
90
+ "type": "error"
91
+ },
92
+ {
93
+ "inputs": [
94
+ {
95
+ "internalType": "NftId",
96
+ "name": "bundleNftId",
97
+ "type": "uint96"
98
+ },
99
+ {
100
+ "internalType": "uint256",
101
+ "name": "openPoliciesCount",
102
+ "type": "uint256"
103
+ }
104
+ ],
105
+ "name": "ErrorBundleServiceBundleWithOpenPolicies",
106
+ "type": "error"
107
+ },
108
+ {
109
+ "inputs": [
110
+ {
111
+ "internalType": "NftId",
112
+ "name": "bundleNftId",
113
+ "type": "uint96"
114
+ },
115
+ {
116
+ "internalType": "uint256",
117
+ "name": "capacityAmount",
118
+ "type": "uint256"
119
+ },
120
+ {
121
+ "internalType": "uint256",
122
+ "name": "collateralAmount",
123
+ "type": "uint256"
124
+ }
125
+ ],
126
+ "name": "ErrorBundleServiceCapacityInsufficient",
127
+ "type": "error"
128
+ },
6
129
  {
7
130
  "inputs": [
8
131
  {
@@ -21,7 +144,7 @@
21
144
  "type": "uint256"
22
145
  }
23
146
  ],
24
- "name": "ErrorIBundleServiceInsufficientAllowance",
147
+ "name": "ErrorBundleServiceInsufficientAllowance",
25
148
  "type": "error"
26
149
  },
27
150
  {
@@ -76,27 +199,54 @@
76
199
  {
77
200
  "anonymous": false,
78
201
  "inputs": [
79
- {
80
- "indexed": false,
81
- "internalType": "Version",
82
- "name": "version",
83
- "type": "uint24"
84
- },
85
202
  {
86
203
  "indexed": false,
87
204
  "internalType": "address",
88
- "name": "implementation",
205
+ "name": "authority",
89
206
  "type": "address"
90
- },
207
+ }
208
+ ],
209
+ "name": "AuthorityUpdated",
210
+ "type": "event"
211
+ },
212
+ {
213
+ "anonymous": false,
214
+ "inputs": [
91
215
  {
92
216
  "indexed": false,
217
+ "internalType": "NftId",
218
+ "name": "bundleNftId",
219
+ "type": "uint96"
220
+ }
221
+ ],
222
+ "name": "LogBundleServiceBundleActivated",
223
+ "type": "event"
224
+ },
225
+ {
226
+ "anonymous": false,
227
+ "inputs": [
228
+ {
229
+ "indexed": false,
230
+ "internalType": "NftId",
231
+ "name": "bundleNftId",
232
+ "type": "uint96"
233
+ }
234
+ ],
235
+ "name": "LogBundleServiceBundleLocked",
236
+ "type": "event"
237
+ },
238
+ {
239
+ "inputs": [],
240
+ "name": "authority",
241
+ "outputs": [
242
+ {
93
243
  "internalType": "address",
94
- "name": "activatedBy",
244
+ "name": "",
95
245
  "type": "address"
96
246
  }
97
247
  ],
98
- "name": "LogVersionableInitialized",
99
- "type": "event"
248
+ "stateMutability": "view",
249
+ "type": "function"
100
250
  },
101
251
  {
102
252
  "inputs": [
@@ -105,29 +255,29 @@
105
255
  "name": "instance",
106
256
  "type": "address"
107
257
  },
108
- {
109
- "internalType": "NftId",
110
- "name": "policyNftId",
111
- "type": "uint96"
112
- },
113
258
  {
114
259
  "internalType": "NftId",
115
260
  "name": "bundleNftId",
116
261
  "type": "uint96"
117
- },
118
- {
119
- "internalType": "uint256",
120
- "name": "collateralAmount",
121
- "type": "uint256"
122
262
  }
123
263
  ],
124
- "name": "closePolicy",
264
+ "name": "close",
125
265
  "outputs": [],
126
266
  "stateMutability": "nonpayable",
127
267
  "type": "function"
128
268
  },
129
269
  {
130
270
  "inputs": [
271
+ {
272
+ "internalType": "contract IInstance",
273
+ "name": "instance",
274
+ "type": "address"
275
+ },
276
+ {
277
+ "internalType": "NftId",
278
+ "name": "poolNftId",
279
+ "type": "uint96"
280
+ },
131
281
  {
132
282
  "internalType": "address",
133
283
  "name": "owner",
@@ -151,14 +301,14 @@
151
301
  "type": "tuple"
152
302
  },
153
303
  {
154
- "internalType": "uint256",
155
- "name": "amount",
156
- "type": "uint256"
304
+ "internalType": "Amount",
305
+ "name": "stakingAmount",
306
+ "type": "uint96"
157
307
  },
158
308
  {
159
- "internalType": "uint256",
309
+ "internalType": "Seconds",
160
310
  "name": "lifetime",
161
- "type": "uint256"
311
+ "type": "uint40"
162
312
  },
163
313
  {
164
314
  "internalType": "bytes",
@@ -166,7 +316,7 @@
166
316
  "type": "bytes"
167
317
  }
168
318
  ],
169
- "name": "createBundle",
319
+ "name": "create",
170
320
  "outputs": [
171
321
  {
172
322
  "internalType": "NftId",
@@ -240,32 +390,6 @@
240
390
  "stateMutability": "view",
241
391
  "type": "function"
242
392
  },
243
- {
244
- "inputs": [],
245
- "name": "getInitializedVersion",
246
- "outputs": [
247
- {
248
- "internalType": "uint64",
249
- "name": "",
250
- "type": "uint64"
251
- }
252
- ],
253
- "stateMutability": "view",
254
- "type": "function"
255
- },
256
- {
257
- "inputs": [],
258
- "name": "getMajorVersion",
259
- "outputs": [
260
- {
261
- "internalType": "VersionPart",
262
- "name": "majorVersion",
263
- "type": "uint8"
264
- }
265
- ],
266
- "stateMutability": "view",
267
- "type": "function"
268
- },
269
393
  {
270
394
  "inputs": [],
271
395
  "name": "getNftId",
@@ -331,84 +455,6 @@
331
455
  "stateMutability": "pure",
332
456
  "type": "function"
333
457
  },
334
- {
335
- "inputs": [
336
- {
337
- "internalType": "uint256",
338
- "name": "index",
339
- "type": "uint256"
340
- }
341
- ],
342
- "name": "getVersion",
343
- "outputs": [
344
- {
345
- "internalType": "Version",
346
- "name": "version",
347
- "type": "uint24"
348
- }
349
- ],
350
- "stateMutability": "view",
351
- "type": "function"
352
- },
353
- {
354
- "inputs": [],
355
- "name": "getVersionCount",
356
- "outputs": [
357
- {
358
- "internalType": "uint256",
359
- "name": "numberOfVersions",
360
- "type": "uint256"
361
- }
362
- ],
363
- "stateMutability": "view",
364
- "type": "function"
365
- },
366
- {
367
- "inputs": [
368
- {
369
- "internalType": "Version",
370
- "name": "version",
371
- "type": "uint24"
372
- }
373
- ],
374
- "name": "getVersionInfo",
375
- "outputs": [
376
- {
377
- "components": [
378
- {
379
- "internalType": "Version",
380
- "name": "version",
381
- "type": "uint24"
382
- },
383
- {
384
- "internalType": "address",
385
- "name": "implementation",
386
- "type": "address"
387
- },
388
- {
389
- "internalType": "address",
390
- "name": "activatedBy",
391
- "type": "address"
392
- },
393
- {
394
- "internalType": "Timestamp",
395
- "name": "activatedAt",
396
- "type": "uint40"
397
- },
398
- {
399
- "internalType": "Blocknumber",
400
- "name": "activatedIn",
401
- "type": "uint32"
402
- }
403
- ],
404
- "internalType": "struct IVersionable.VersionInfo",
405
- "name": "versionInfo",
406
- "type": "tuple"
407
- }
408
- ],
409
- "stateMutability": "view",
410
- "type": "function"
411
- },
412
458
  {
413
459
  "inputs": [
414
460
  {
@@ -434,11 +480,6 @@
434
480
  },
435
481
  {
436
482
  "inputs": [
437
- {
438
- "internalType": "address",
439
- "name": "implementation",
440
- "type": "address"
441
- },
442
483
  {
443
484
  "internalType": "address",
444
485
  "name": "activatedBy",
@@ -456,19 +497,13 @@
456
497
  "type": "function"
457
498
  },
458
499
  {
459
- "inputs": [
460
- {
461
- "internalType": "Version",
462
- "name": "version",
463
- "type": "uint24"
464
- }
465
- ],
466
- "name": "isInitialized",
500
+ "inputs": [],
501
+ "name": "isConsumingScheduledOp",
467
502
  "outputs": [
468
503
  {
469
- "internalType": "bool",
504
+ "internalType": "bytes4",
470
505
  "name": "",
471
- "type": "bool"
506
+ "type": "bytes4"
472
507
  }
473
508
  ],
474
509
  "stateMutability": "view",
@@ -489,7 +524,7 @@
489
524
  "type": "uint96"
490
525
  }
491
526
  ],
492
- "name": "lockBundle",
527
+ "name": "lock",
493
528
  "outputs": [],
494
529
  "stateMutability": "nonpayable",
495
530
  "type": "function"
@@ -518,77 +553,53 @@
518
553
  },
519
554
  {
520
555
  "internalType": "uint256",
521
- "name": "netPremium",
556
+ "name": "premium",
522
557
  "type": "uint256"
523
558
  }
524
559
  ],
525
560
  "name": "lockCollateral",
526
- "outputs": [
561
+ "outputs": [],
562
+ "stateMutability": "nonpayable",
563
+ "type": "function"
564
+ },
565
+ {
566
+ "inputs": [
527
567
  {
528
- "components": [
529
- {
530
- "internalType": "NftId",
531
- "name": "poolNftId",
532
- "type": "uint96"
533
- },
534
- {
535
- "components": [
536
- {
537
- "internalType": "UFixed",
538
- "name": "fractionalFee",
539
- "type": "uint256"
540
- },
541
- {
542
- "internalType": "uint256",
543
- "name": "fixedFee",
544
- "type": "uint256"
545
- }
546
- ],
547
- "internalType": "struct Fee",
548
- "name": "fee",
549
- "type": "tuple"
550
- },
551
- {
552
- "internalType": "bytes",
553
- "name": "filter",
554
- "type": "bytes"
555
- },
556
- {
557
- "internalType": "uint256",
558
- "name": "capitalAmount",
559
- "type": "uint256"
560
- },
561
- {
562
- "internalType": "uint256",
563
- "name": "lockedAmount",
564
- "type": "uint256"
565
- },
566
- {
567
- "internalType": "uint256",
568
- "name": "balanceAmount",
569
- "type": "uint256"
570
- },
571
- {
572
- "internalType": "uint256",
573
- "name": "lifetime",
574
- "type": "uint256"
575
- },
576
- {
577
- "internalType": "Timestamp",
578
- "name": "expiredAt",
579
- "type": "uint40"
580
- },
581
- {
582
- "internalType": "Timestamp",
583
- "name": "closedAt",
584
- "type": "uint40"
585
- }
586
- ],
587
- "internalType": "struct IBundle.BundleInfo",
588
- "name": "bundleInfo",
589
- "type": "tuple"
568
+ "internalType": "contract IInstance",
569
+ "name": "instance",
570
+ "type": "address"
571
+ },
572
+ {
573
+ "internalType": "NftId",
574
+ "name": "policyNftId",
575
+ "type": "uint96"
576
+ },
577
+ {
578
+ "internalType": "NftId",
579
+ "name": "bundleNftId",
580
+ "type": "uint96"
581
+ },
582
+ {
583
+ "internalType": "uint256",
584
+ "name": "collateralAmount",
585
+ "type": "uint256"
586
+ }
587
+ ],
588
+ "name": "releaseCollateral",
589
+ "outputs": [],
590
+ "stateMutability": "nonpayable",
591
+ "type": "function"
592
+ },
593
+ {
594
+ "inputs": [
595
+ {
596
+ "internalType": "address",
597
+ "name": "",
598
+ "type": "address"
590
599
  }
591
600
  ],
601
+ "name": "setAuthority",
602
+ "outputs": [],
592
603
  "stateMutability": "nonpayable",
593
604
  "type": "function"
594
605
  },
@@ -617,7 +628,7 @@
617
628
  "type": "tuple"
618
629
  }
619
630
  ],
620
- "name": "setBundleFee",
631
+ "name": "setFee",
621
632
  "outputs": [],
622
633
  "stateMutability": "nonpayable",
623
634
  "type": "function"
@@ -649,7 +660,7 @@
649
660
  "type": "uint96"
650
661
  }
651
662
  ],
652
- "name": "unlockBundle",
663
+ "name": "unlock",
653
664
  "outputs": [],
654
665
  "stateMutability": "nonpayable",
655
666
  "type": "function"
@@ -657,9 +668,9 @@
657
668
  {
658
669
  "inputs": [
659
670
  {
660
- "internalType": "NftId",
661
- "name": "instanceNftId",
662
- "type": "uint96"
671
+ "internalType": "contract IInstance",
672
+ "name": "instance",
673
+ "type": "address"
663
674
  },
664
675
  {
665
676
  "internalType": "NftId",
@@ -667,92 +678,18 @@
667
678
  "type": "uint96"
668
679
  },
669
680
  {
670
- "components": [
671
- {
672
- "internalType": "NftId",
673
- "name": "poolNftId",
674
- "type": "uint96"
675
- },
676
- {
677
- "components": [
678
- {
679
- "internalType": "UFixed",
680
- "name": "fractionalFee",
681
- "type": "uint256"
682
- },
683
- {
684
- "internalType": "uint256",
685
- "name": "fixedFee",
686
- "type": "uint256"
687
- }
688
- ],
689
- "internalType": "struct Fee",
690
- "name": "fee",
691
- "type": "tuple"
692
- },
693
- {
694
- "internalType": "bytes",
695
- "name": "filter",
696
- "type": "bytes"
697
- },
698
- {
699
- "internalType": "uint256",
700
- "name": "capitalAmount",
701
- "type": "uint256"
702
- },
703
- {
704
- "internalType": "uint256",
705
- "name": "lockedAmount",
706
- "type": "uint256"
707
- },
708
- {
709
- "internalType": "uint256",
710
- "name": "balanceAmount",
711
- "type": "uint256"
712
- },
713
- {
714
- "internalType": "uint256",
715
- "name": "lifetime",
716
- "type": "uint256"
717
- },
718
- {
719
- "internalType": "Timestamp",
720
- "name": "expiredAt",
721
- "type": "uint40"
722
- },
723
- {
724
- "internalType": "Timestamp",
725
- "name": "closedAt",
726
- "type": "uint40"
727
- }
728
- ],
729
- "internalType": "struct IBundle.BundleInfo",
730
- "name": "bundleInfo",
731
- "type": "tuple"
732
- },
733
- {
734
- "internalType": "StateId",
735
- "name": "state",
736
- "type": "uint8"
681
+ "internalType": "Amount",
682
+ "name": "feeAmount",
683
+ "type": "uint96"
737
684
  }
738
685
  ],
739
- "name": "updateBundle",
686
+ "name": "updateBundleFees",
740
687
  "outputs": [],
741
688
  "stateMutability": "nonpayable",
742
689
  "type": "function"
743
690
  },
744
691
  {
745
692
  "inputs": [
746
- {
747
- "internalType": "address",
748
- "name": "implementation",
749
- "type": "address"
750
- },
751
- {
752
- "internalType": "address",
753
- "name": "activatedBy",
754
- "type": "address"
755
- },
756
693
  {
757
694
  "internalType": "bytes",
758
695
  "name": "upgradeData",
@@ -1,4 +1,4 @@
1
1
  {
2
2
  "_format": "hh-sol-dbg-1",
3
- "buildInfo": "../../../../build-info/a4fdb8c51f2726ede9f66aef21053805.json"
3
+ "buildInfo": "../../../../build-info/137177d4e95267fdc8bcf3a603ebff2a.json"
4
4
  }