@lidofinance/lsv-cli 1.5.0 → 1.6.0

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 (293) hide show
  1. package/dist/abi/AccessControlConfirmable.js.map +1 -1
  2. package/dist/abi/Dashboard.js.map +1 -1
  3. package/dist/abi/LazyOracle.js.map +1 -1
  4. package/dist/abi/LidoLocator.js.map +1 -1
  5. package/dist/abi/OperatorGrid.js.map +1 -1
  6. package/dist/abi/PredepositGuarantee.js.map +1 -1
  7. package/dist/abi/StEth.js.map +1 -1
  8. package/dist/abi/StakingVault.js.map +1 -1
  9. package/dist/abi/ValidatorConsolidationRequests.js.map +1 -1
  10. package/dist/abi/VaultFactory.js.map +1 -1
  11. package/dist/abi/VaultHub.js.map +1 -1
  12. package/dist/abi/VaultViewer.js.map +1 -1
  13. package/dist/abi/WstEth.js.map +1 -1
  14. package/dist/abi/defi-wrapper/Distributor.js.map +1 -1
  15. package/dist/abi/defi-wrapper/Factory.js.map +1 -1
  16. package/dist/abi/defi-wrapper/OssifiableProxy.js.map +1 -1
  17. package/dist/abi/defi-wrapper/StrategyFactory.d.ts +59 -0
  18. package/dist/abi/defi-wrapper/StrategyFactory.js +37 -0
  19. package/dist/abi/defi-wrapper/StrategyFactory.js.map +1 -0
  20. package/dist/abi/defi-wrapper/StvPool.js.map +1 -1
  21. package/dist/abi/defi-wrapper/StvStETHPool.js.map +1 -1
  22. package/dist/abi/defi-wrapper/TimeLock.js.map +1 -1
  23. package/dist/abi/defi-wrapper/WithdrawalQueue.js.map +1 -1
  24. package/dist/abi/defi-wrapper/index.d.ts +1 -0
  25. package/dist/abi/defi-wrapper/index.js +1 -0
  26. package/dist/abi/defi-wrapper/index.js.map +1 -1
  27. package/dist/command/index.js +11 -0
  28. package/dist/command/index.js.map +1 -1
  29. package/dist/configs/constants.d.ts +4 -4
  30. package/dist/contracts/dashboard-impl.d.ts +4 -3
  31. package/dist/contracts/dashboard-impl.js +5 -8
  32. package/dist/contracts/dashboard-impl.js.map +1 -1
  33. package/dist/contracts/dashboard.d.ts +4 -3
  34. package/dist/contracts/dashboard.js +1 -1
  35. package/dist/contracts/dashboard.js.map +1 -1
  36. package/dist/contracts/defi-wrapper/distributor.d.ts +5 -4
  37. package/dist/contracts/defi-wrapper/distributor.js +2 -2
  38. package/dist/contracts/defi-wrapper/distributor.js.map +1 -1
  39. package/dist/contracts/defi-wrapper/factory.d.ts +5 -4
  40. package/dist/contracts/defi-wrapper/factory.js +2 -2
  41. package/dist/contracts/defi-wrapper/factory.js.map +1 -1
  42. package/dist/contracts/defi-wrapper/index.d.ts +1 -0
  43. package/dist/contracts/defi-wrapper/index.js +1 -0
  44. package/dist/contracts/defi-wrapper/index.js.map +1 -1
  45. package/dist/contracts/defi-wrapper/ossifiable-proxy.d.ts +5 -4
  46. package/dist/contracts/defi-wrapper/ossifiable-proxy.js +2 -2
  47. package/dist/contracts/defi-wrapper/ossifiable-proxy.js.map +1 -1
  48. package/dist/contracts/defi-wrapper/strategy-factory.d.ts +5 -0
  49. package/dist/contracts/defi-wrapper/strategy-factory.js +12 -0
  50. package/dist/contracts/defi-wrapper/strategy-factory.js.map +1 -0
  51. package/dist/contracts/defi-wrapper/stv-pool.d.ts +5 -4
  52. package/dist/contracts/defi-wrapper/stv-pool.js +2 -2
  53. package/dist/contracts/defi-wrapper/stv-pool.js.map +1 -1
  54. package/dist/contracts/defi-wrapper/stv-steth-pool.d.ts +5 -4
  55. package/dist/contracts/defi-wrapper/stv-steth-pool.js +2 -2
  56. package/dist/contracts/defi-wrapper/stv-steth-pool.js.map +1 -1
  57. package/dist/contracts/defi-wrapper/timelock.d.ts +5 -4
  58. package/dist/contracts/defi-wrapper/timelock.js +2 -2
  59. package/dist/contracts/defi-wrapper/timelock.js.map +1 -1
  60. package/dist/contracts/defi-wrapper/withdrawal-queue.d.ts +5 -4
  61. package/dist/contracts/defi-wrapper/withdrawal-queue.js +2 -2
  62. package/dist/contracts/defi-wrapper/withdrawal-queue.js.map +1 -1
  63. package/dist/contracts/lazy-oracle.d.ts +5 -3
  64. package/dist/contracts/lazy-oracle.js +5 -9
  65. package/dist/contracts/lazy-oracle.js.map +1 -1
  66. package/dist/contracts/locator.d.ts +4 -2
  67. package/dist/contracts/locator.js +5 -8
  68. package/dist/contracts/locator.js.map +1 -1
  69. package/dist/contracts/operator-grid.d.ts +5 -4
  70. package/dist/contracts/operator-grid.js +5 -8
  71. package/dist/contracts/operator-grid.js.map +1 -1
  72. package/dist/contracts/pdg.d.ts +5 -4
  73. package/dist/contracts/pdg.js +5 -8
  74. package/dist/contracts/pdg.js.map +1 -1
  75. package/dist/contracts/steth.d.ts +5 -4
  76. package/dist/contracts/steth.js +5 -9
  77. package/dist/contracts/steth.js.map +1 -1
  78. package/dist/contracts/validator-consolidation-requests.d.ts +3 -3
  79. package/dist/contracts/validator-consolidation-requests.js.map +1 -1
  80. package/dist/contracts/vault-factory.d.ts +5 -3
  81. package/dist/contracts/vault-factory.js +6 -8
  82. package/dist/contracts/vault-factory.js.map +1 -1
  83. package/dist/contracts/vault-hub.d.ts +5 -3
  84. package/dist/contracts/vault-hub.js +5 -9
  85. package/dist/contracts/vault-hub.js.map +1 -1
  86. package/dist/contracts/vault-viewer.d.ts +4 -2
  87. package/dist/contracts/vault-viewer.js +6 -9
  88. package/dist/contracts/vault-viewer.js.map +1 -1
  89. package/dist/contracts/vault.d.ts +5 -4
  90. package/dist/contracts/vault.js +2 -2
  91. package/dist/contracts/vault.js.map +1 -1
  92. package/dist/contracts/wsteth.d.ts +5 -3
  93. package/dist/contracts/wsteth.js +5 -9
  94. package/dist/contracts/wsteth.js.map +1 -1
  95. package/dist/features/consolidation.d.ts +1 -1
  96. package/dist/features/defi-wrapper/create-vault.js +3 -3
  97. package/dist/features/defi-wrapper/create-vault.js.map +1 -1
  98. package/dist/features/defi-wrapper/defi-wrapper-factory.d.ts +14 -4
  99. package/dist/features/defi-wrapper/defi-wrapper-factory.js +21 -4
  100. package/dist/features/defi-wrapper/defi-wrapper-factory.js.map +1 -1
  101. package/dist/features/defi-wrapper/distributor.js +3 -3
  102. package/dist/features/defi-wrapper/pool-info.js +2 -2
  103. package/dist/features/defi-wrapper/timelock.d.ts +3 -3
  104. package/dist/features/defi-wrapper/timelock.js +3 -3
  105. package/dist/features/defi-wrapper/timelock.js.map +1 -1
  106. package/dist/features/deposits/make-pdg-proof.js +4 -4
  107. package/dist/features/deposits/make-pdg-proof.js.map +1 -1
  108. package/dist/features/deposits/validators.js +1 -1
  109. package/dist/features/deposits/validators.js.map +1 -1
  110. package/dist/features/metrics.d.ts +3 -0
  111. package/dist/features/metrics.js +25 -0
  112. package/dist/features/metrics.js.map +1 -1
  113. package/dist/features/mint-burn/mint-limit.js +1 -1
  114. package/dist/features/utils/minting-capacity.js +1 -1
  115. package/dist/features/vault-factory.js +1 -1
  116. package/dist/features/vault-operations/index.d.ts +1 -0
  117. package/dist/features/vault-operations/index.js +1 -0
  118. package/dist/features/vault-operations/index.js.map +1 -1
  119. package/dist/features/vault-operations/share-limit.d.ts +8 -0
  120. package/dist/features/vault-operations/share-limit.js +20 -0
  121. package/dist/features/vault-operations/share-limit.js.map +1 -0
  122. package/dist/features/with-report.d.ts +1 -1
  123. package/dist/index.js +30 -10
  124. package/dist/index.js.map +1 -1
  125. package/dist/programs/account/main.d.ts +1 -1
  126. package/dist/programs/account/write.js +29 -2
  127. package/dist/programs/account/write.js.map +1 -1
  128. package/dist/programs/contracts/dashboard/main.d.ts +1 -1
  129. package/dist/programs/contracts/dashboard/write.js +21 -14
  130. package/dist/programs/contracts/dashboard/write.js.map +1 -1
  131. package/dist/programs/contracts/hub/main.d.ts +1 -1
  132. package/dist/programs/contracts/hub/write.js +2 -1
  133. package/dist/programs/contracts/hub/write.js.map +1 -1
  134. package/dist/programs/contracts/lazy-oracle/main.d.ts +1 -1
  135. package/dist/programs/contracts/main.d.ts +1 -1
  136. package/dist/programs/contracts/operator-grid/main.d.ts +1 -1
  137. package/dist/programs/contracts/operator-grid/write.js +13 -9
  138. package/dist/programs/contracts/operator-grid/write.js.map +1 -1
  139. package/dist/programs/contracts/pdg/main.d.ts +1 -1
  140. package/dist/programs/contracts/pdg/write.js +1 -1
  141. package/dist/programs/contracts/vault/main.d.ts +1 -1
  142. package/dist/programs/contracts/vault-factory/main.d.ts +1 -1
  143. package/dist/programs/contracts/vault-viewer/main.d.ts +1 -1
  144. package/dist/programs/defi-wrapper/contracts/distributor/config.d.ts +1 -1
  145. package/dist/programs/defi-wrapper/contracts/distributor/main.d.ts +1 -1
  146. package/dist/programs/defi-wrapper/contracts/distributor/read.js +2 -2
  147. package/dist/programs/defi-wrapper/contracts/distributor/write.js +1 -1
  148. package/dist/programs/defi-wrapper/contracts/factory/config.d.ts +1 -1
  149. package/dist/programs/defi-wrapper/contracts/factory/main.d.ts +1 -1
  150. package/dist/programs/defi-wrapper/contracts/factory/read.js +2 -2
  151. package/dist/programs/defi-wrapper/contracts/factory/write.js +124 -36
  152. package/dist/programs/defi-wrapper/contracts/factory/write.js.map +1 -1
  153. package/dist/programs/defi-wrapper/contracts/main.d.ts +1 -1
  154. package/dist/programs/defi-wrapper/contracts/stv-pool/config.d.ts +1 -1
  155. package/dist/programs/defi-wrapper/contracts/stv-pool/main.d.ts +1 -1
  156. package/dist/programs/defi-wrapper/contracts/stv-pool/read.js +2 -2
  157. package/dist/programs/defi-wrapper/contracts/stv-pool/write.js +1 -1
  158. package/dist/programs/defi-wrapper/contracts/stv-steth-pool/config.d.ts +1 -1
  159. package/dist/programs/defi-wrapper/contracts/stv-steth-pool/main.d.ts +1 -1
  160. package/dist/programs/defi-wrapper/contracts/stv-steth-pool/read.js +2 -2
  161. package/dist/programs/defi-wrapper/contracts/stv-steth-pool/write.js +1 -1
  162. package/dist/programs/defi-wrapper/contracts/withdrawal-queue/config.d.ts +1 -1
  163. package/dist/programs/defi-wrapper/contracts/withdrawal-queue/main.d.ts +1 -1
  164. package/dist/programs/defi-wrapper/contracts/withdrawal-queue/read.js +2 -2
  165. package/dist/programs/defi-wrapper/contracts/withdrawal-queue/write.js +1 -1
  166. package/dist/programs/defi-wrapper/main.d.ts +1 -1
  167. package/dist/programs/defi-wrapper/use-cases/distributor/main.d.ts +1 -1
  168. package/dist/programs/defi-wrapper/use-cases/distributor/read.js +2 -2
  169. package/dist/programs/defi-wrapper/use-cases/distributor/write.js +3 -3
  170. package/dist/programs/defi-wrapper/use-cases/health/main.d.ts +1 -1
  171. package/dist/programs/defi-wrapper/use-cases/health/read.js +2 -2
  172. package/dist/programs/defi-wrapper/use-cases/health/utils.js +1 -1
  173. package/dist/programs/defi-wrapper/use-cases/health/write.js +3 -3
  174. package/dist/programs/defi-wrapper/use-cases/main.d.ts +1 -1
  175. package/dist/programs/defi-wrapper/use-cases/timelock-governance/common/main.d.ts +1 -1
  176. package/dist/programs/defi-wrapper/use-cases/timelock-governance/common/read.js +8 -8
  177. package/dist/programs/defi-wrapper/use-cases/timelock-governance/common/write.js +1 -1
  178. package/dist/programs/defi-wrapper/use-cases/timelock-governance/dashboard/main.d.ts +1 -1
  179. package/dist/programs/defi-wrapper/use-cases/timelock-governance/dashboard/write.js +3 -3
  180. package/dist/programs/defi-wrapper/use-cases/timelock-governance/main.d.ts +1 -1
  181. package/dist/programs/defi-wrapper/use-cases/timelock-governance/pool/main.d.ts +1 -1
  182. package/dist/programs/defi-wrapper/use-cases/timelock-governance/pool/write.js +3 -3
  183. package/dist/programs/defi-wrapper/use-cases/timelock-governance/proxy/main.d.ts +1 -1
  184. package/dist/programs/defi-wrapper/use-cases/timelock-governance/proxy/read.js +1 -1
  185. package/dist/programs/defi-wrapper/use-cases/timelock-governance/proxy/write.js +3 -3
  186. package/dist/programs/defi-wrapper/use-cases/timelock-governance/withdrawal-queue/main.d.ts +1 -1
  187. package/dist/programs/defi-wrapper/use-cases/timelock-governance/withdrawal-queue/write.js +3 -3
  188. package/dist/programs/defi-wrapper/use-cases/wrapper-operations/main.d.ts +1 -1
  189. package/dist/programs/defi-wrapper/use-cases/wrapper-operations/read.js +3 -3
  190. package/dist/programs/defi-wrapper/use-cases/wrapper-operations/write.js +35 -49
  191. package/dist/programs/defi-wrapper/use-cases/wrapper-operations/write.js.map +1 -1
  192. package/dist/programs/dev-tools/anvil/main.d.ts +1 -1
  193. package/dist/programs/dev-tools/defi-wrapper/main.d.ts +1 -1
  194. package/dist/programs/dev-tools/defi-wrapper/write.js +1 -1
  195. package/dist/programs/dev-tools/main.d.ts +1 -1
  196. package/dist/programs/pdg-helpers.js +4 -0
  197. package/dist/programs/pdg-helpers.js.map +1 -1
  198. package/dist/programs/use-cases/consolidation/main.d.ts +1 -1
  199. package/dist/programs/use-cases/consolidation/write.d.ts +1 -1
  200. package/dist/programs/use-cases/consolidation/write.js +1 -1
  201. package/dist/programs/use-cases/deposits/main.d.ts +1 -1
  202. package/dist/programs/use-cases/metrics/main.d.ts +1 -1
  203. package/dist/programs/use-cases/metrics/read.js +7 -7
  204. package/dist/programs/use-cases/metrics/read.js.map +1 -1
  205. package/dist/programs/use-cases/report/main.d.ts +1 -1
  206. package/dist/programs/use-cases/vault-operations/main.d.ts +1 -1
  207. package/dist/programs/use-cases/vault-operations/write.js +29 -15
  208. package/dist/programs/use-cases/vault-operations/write.js.map +1 -1
  209. package/dist/providers/wallet.d.ts +302 -300
  210. package/dist/providers/wallet.js +10 -2
  211. package/dist/providers/wallet.js.map +1 -1
  212. package/dist/tests/integration/deposits.test.js +1 -1
  213. package/dist/tests/integration/deposits.test.js.map +1 -1
  214. package/dist/tests/integration/helpers/test-client.d.ts +150 -150
  215. package/dist/tests/integration/metrics.test.js.map +1 -1
  216. package/dist/tests/integration/mint-burn.test.js.map +1 -1
  217. package/dist/tests/utils/calculate-overview-v2.test.js +1 -1
  218. package/dist/tests/utils/csv-file.test.js +1 -1
  219. package/dist/tests/utils/error-handler.test.js +5 -8
  220. package/dist/tests/utils/error-handler.test.js.map +1 -1
  221. package/dist/tests/utils/lido-apr.test.js +1 -1
  222. package/dist/tests/utils/logging.test.js +30 -14
  223. package/dist/tests/utils/logging.test.js.map +1 -1
  224. package/dist/tests/utils/rebase-rewards.test.js +44 -43
  225. package/dist/tests/utils/rebase-rewards.test.js.map +1 -1
  226. package/dist/tests/utils/report-statistic.test.d.ts +1 -0
  227. package/dist/tests/utils/report-statistic.test.js +501 -0
  228. package/dist/tests/utils/report-statistic.test.js.map +1 -0
  229. package/dist/tests/utils/snake-to-camel.test.js +1 -1
  230. package/dist/tests/utils/spinner.test.d.ts +1 -0
  231. package/dist/tests/utils/spinner.test.js +113 -0
  232. package/dist/tests/utils/spinner.test.js.map +1 -0
  233. package/dist/tests/utils/timestamp.test.js +1 -1
  234. package/dist/utils/arguments.d.ts +1 -1
  235. package/dist/utils/cache.d.ts +0 -1
  236. package/dist/utils/cache.js +1 -2
  237. package/dist/utils/cache.js.map +1 -1
  238. package/dist/utils/charts/blessed/charts-apr.js +5 -5
  239. package/dist/utils/charts/blessed/charts-apr.js.map +1 -1
  240. package/dist/utils/charts/blessed/charts-rewards.js +4 -4
  241. package/dist/utils/charts/blessed/charts-rewards.js.map +1 -1
  242. package/dist/utils/charts/blessed/datasets/prepare-metrics.d.ts +6 -6
  243. package/dist/utils/charts/blessed/datasets/prepare-metrics.js +12 -13
  244. package/dist/utils/charts/blessed/datasets/prepare-metrics.js.map +1 -1
  245. package/dist/utils/charts/blessed/utils.js +5 -2
  246. package/dist/utils/charts/blessed/utils.js.map +1 -1
  247. package/dist/utils/charts/simple/simple-charts.js +15 -7
  248. package/dist/utils/charts/simple/simple-charts.js.map +1 -1
  249. package/dist/utils/error-handler.js +3 -0
  250. package/dist/utils/error-handler.js.map +1 -1
  251. package/dist/utils/fetchCL.js +26 -35
  252. package/dist/utils/fetchCL.js.map +1 -1
  253. package/dist/utils/index.d.ts +1 -0
  254. package/dist/utils/index.js +1 -0
  255. package/dist/utils/index.js.map +1 -1
  256. package/dist/utils/interrupt-handler.js +14 -6
  257. package/dist/utils/interrupt-handler.js.map +1 -1
  258. package/dist/utils/logging/console.d.ts +5 -1
  259. package/dist/utils/logging/console.js +36 -25
  260. package/dist/utils/logging/console.js.map +1 -1
  261. package/dist/utils/prompts/confirmations.d.ts +1 -1
  262. package/dist/utils/prompts/operations.d.ts +1 -1
  263. package/dist/utils/prompts/predeposit-guarantee.d.ts +1 -1
  264. package/dist/utils/prompts/predeposit-guarantee.js +1 -1
  265. package/dist/utils/proof/create-proof.js +18 -3
  266. package/dist/utils/proof/create-proof.js.map +1 -1
  267. package/dist/utils/rebase-rewards.d.ts +0 -1
  268. package/dist/utils/rebase-rewards.js +12 -3
  269. package/dist/utils/rebase-rewards.js.map +1 -1
  270. package/dist/utils/report/statistic-data.js +31 -16
  271. package/dist/utils/report/statistic-data.js.map +1 -1
  272. package/dist/utils/spinner/spinners.js +5 -3
  273. package/dist/utils/spinner/spinners.js.map +1 -1
  274. package/dist/utils/statistic/report-statistic.d.ts +21 -6
  275. package/dist/utils/statistic/report-statistic.js +65 -25
  276. package/dist/utils/statistic/report-statistic.js.map +1 -1
  277. package/dist/utils/transactions/tx-private-key.d.ts +2 -2
  278. package/dist/utils/transactions/tx-private-key.js +43 -11
  279. package/dist/utils/transactions/tx-private-key.js.map +1 -1
  280. package/dist/utils/transactions/tx-wc.d.ts +12 -11
  281. package/dist/utils/transactions/tx-wc.js +108 -11
  282. package/dist/utils/transactions/tx-wc.js.map +1 -1
  283. package/dist/utils/transactions/utils.d.ts +1 -0
  284. package/dist/utils/transactions/utils.js +11 -0
  285. package/dist/utils/transactions/utils.js.map +1 -1
  286. package/dist/utils/wallet-connect.d.ts +4 -1
  287. package/dist/utils/wallet-connect.js +52 -4
  288. package/dist/utils/wallet-connect.js.map +1 -1
  289. package/dist/utils/with-error.d.ts +7 -0
  290. package/dist/utils/with-error.js +6 -0
  291. package/dist/utils/with-error.js.map +1 -0
  292. package/dist/version/index.js +1 -1
  293. package/package.json +3 -3
@@ -11,24 +11,21 @@ describe('error handler', () => {
11
11
  test('handles error with message', () => {
12
12
  const error = new Error('test error');
13
13
  expect(() => printError(error, 'test message')).toThrow('test error');
14
- expect(logErrorMock).toHaveBeenCalledWith('test message');
14
+ expect(logErrorMock).toHaveBeenCalledTimes(2);
15
+ expect(logErrorMock).toHaveBeenNthCalledWith(1, 'test message');
16
+ expect(logErrorMock).toHaveBeenNthCalledWith(2, 'test error');
15
17
  });
16
18
  test('handles error without message', () => {
17
19
  const error = new Error();
18
20
  expect(() => printError(error, 'test message')).toThrow();
21
+ expect(logErrorMock).toHaveBeenCalledTimes(1);
19
22
  expect(logErrorMock).toHaveBeenCalledWith('test message');
20
23
  });
21
24
  test('handles non-Error object', () => {
22
25
  const error = 'test error';
23
26
  expect(() => printError(error, 'test message')).toThrow();
27
+ expect(logErrorMock).toHaveBeenCalledTimes(1);
24
28
  expect(logErrorMock).toHaveBeenCalledWith('test message');
25
29
  });
26
- test('logs error details when debug is enabled', () => {
27
- process.env.DEBUG = 'true';
28
- const error = new Error('test error');
29
- expect(() => printError(error, 'test message')).toThrow('test error');
30
- expect(logErrorMock).toHaveBeenCalledWith('test message');
31
- delete process.env.DEBUG;
32
- });
33
30
  });
34
31
  //# sourceMappingURL=error-handler.test.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"error-handler.test.js","sourceRoot":"","sources":["../../../tests/utils/error-handler.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAGhE,OAAO,EAAE,QAAQ,EAAE,MAAM,gCAAgC,CAAC;AAC1D,OAAO,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAE1D,EAAE,CAAC,IAAI,CAAC,gCAAgC,EAAE,GAAG,EAAE,CAAC,CAAC,EAAE,QAAQ,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC;AAEzE,IAAI,YAAkB,CAAC;AAEvB,UAAU,CAAC,GAAG,EAAE;IACd,YAAY,GAAG,QAAgB,CAAC;IAChC,EAAE,CAAC,aAAa,EAAE,CAAC;AACrB,CAAC,CAAC,CAAC;AAEH,QAAQ,CAAC,eAAe,EAAE,GAAG,EAAE;IAC7B,IAAI,CAAC,4BAA4B,EAAE,GAAG,EAAE;QACtC,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,YAAY,CAAC,CAAC;QACtC,MAAM,CAAC,GAAG,EAAE,CAAC,UAAU,CAAC,KAAK,EAAE,cAAc,CAAC,CAAC,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;QACtE,MAAM,CAAC,YAAY,CAAC,CAAC,oBAAoB,CAAC,cAAc,CAAC,CAAC;IAC5D,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,+BAA+B,EAAE,GAAG,EAAE;QACzC,MAAM,KAAK,GAAG,IAAI,KAAK,EAAE,CAAC;QAC1B,MAAM,CAAC,GAAG,EAAE,CAAC,UAAU,CAAC,KAAK,EAAE,cAAc,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC;QAC1D,MAAM,CAAC,YAAY,CAAC,CAAC,oBAAoB,CAAC,cAAc,CAAC,CAAC;IAC5D,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,0BAA0B,EAAE,GAAG,EAAE;QACpC,MAAM,KAAK,GAAG,YAAY,CAAC;QAC3B,MAAM,CAAC,GAAG,EAAE,CAAC,UAAU,CAAC,KAAK,EAAE,cAAc,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC;QAC1D,MAAM,CAAC,YAAY,CAAC,CAAC,oBAAoB,CAAC,cAAc,CAAC,CAAC;IAC5D,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,0CAA0C,EAAE,GAAG,EAAE;QACpD,OAAO,CAAC,GAAG,CAAC,KAAK,GAAG,MAAM,CAAC;QAC3B,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,YAAY,CAAC,CAAC;QACtC,MAAM,CAAC,GAAG,EAAE,CAAC,UAAU,CAAC,KAAK,EAAE,cAAc,CAAC,CAAC,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;QACtE,MAAM,CAAC,YAAY,CAAC,CAAC,oBAAoB,CAAC,cAAc,CAAC,CAAC;QAC1D,OAAO,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC;IAC3B,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
1
+ {"version":3,"file":"error-handler.test.js","sourceRoot":"","sources":["../../../tests/utils/error-handler.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAGhE,OAAO,EAAE,QAAQ,EAAE,MAAM,gCAAgC,CAAC;AAC1D,OAAO,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAE1D,EAAE,CAAC,IAAI,CAAC,gCAAgC,EAAE,GAAG,EAAE,CAAC,CAAC,EAAE,QAAQ,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC;AAEzE,IAAI,YAAkB,CAAC;AAEvB,UAAU,CAAC,GAAG,EAAE;IACd,YAAY,GAAG,QAAgB,CAAC;IAChC,EAAE,CAAC,aAAa,EAAE,CAAC;AACrB,CAAC,CAAC,CAAC;AAEH,QAAQ,CAAC,eAAe,EAAE,GAAG,EAAE;IAC7B,IAAI,CAAC,4BAA4B,EAAE,GAAG,EAAE;QACtC,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,YAAY,CAAC,CAAC;QACtC,MAAM,CAAC,GAAG,EAAE,CAAC,UAAU,CAAC,KAAK,EAAE,cAAc,CAAC,CAAC,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;QACtE,MAAM,CAAC,YAAY,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;QAC9C,MAAM,CAAC,YAAY,CAAC,CAAC,uBAAuB,CAAC,CAAC,EAAE,cAAc,CAAC,CAAC;QAChE,MAAM,CAAC,YAAY,CAAC,CAAC,uBAAuB,CAAC,CAAC,EAAE,YAAY,CAAC,CAAC;IAChE,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,+BAA+B,EAAE,GAAG,EAAE;QACzC,MAAM,KAAK,GAAG,IAAI,KAAK,EAAE,CAAC;QAC1B,MAAM,CAAC,GAAG,EAAE,CAAC,UAAU,CAAC,KAAK,EAAE,cAAc,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC;QAC1D,MAAM,CAAC,YAAY,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;QAC9C,MAAM,CAAC,YAAY,CAAC,CAAC,oBAAoB,CAAC,cAAc,CAAC,CAAC;IAC5D,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,0BAA0B,EAAE,GAAG,EAAE;QACpC,MAAM,KAAK,GAAG,YAAY,CAAC;QAC3B,MAAM,CAAC,GAAG,EAAE,CAAC,UAAU,CAAC,KAAK,EAAE,cAAc,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC;QAC1D,MAAM,CAAC,YAAY,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;QAC9C,MAAM,CAAC,YAAY,CAAC,CAAC,oBAAoB,CAAC,cAAc,CAAC,CAAC;IAC5D,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
@@ -1,5 +1,5 @@
1
1
  import { describe, it, expect } from 'vitest';
2
- import { calculateLidoAPR, SECONDS_IN_YEAR } from '../../utils/lido-apr.js';
2
+ import { calculateLidoAPR, SECONDS_IN_YEAR } from 'utils/lido-apr.js';
3
3
  describe('calculateLidoAPR', () => {
4
4
  it('should calculate APR for positive share rate increase', () => {
5
5
  const preShareRate = 1;
@@ -1,5 +1,5 @@
1
1
  import { describe, test, expect, vi, beforeEach, afterEach } from 'vitest';
2
- import { createConsole, logResult, logTable, logInfo, logError, logBold, logCancel, logResultSimple, } from '../../utils/logging/console.js';
2
+ import { createConsole, logResult, logTable, logInfo, logError, logBold, logCancel, logResultSimple, TEST_RESET_JSON_LOG_FLAG, } from '../../utils/logging/console.js';
3
3
  import { program } from '../../command/index.js';
4
4
  beforeEach(() => {
5
5
  vi.spyOn(console, 'info').mockImplementation(() => { });
@@ -47,38 +47,50 @@ describe('createConsole', () => {
47
47
  });
48
48
  describe('JSON mode', () => {
49
49
  beforeEach(() => {
50
+ TEST_RESET_JSON_LOG_FLAG();
50
51
  vi.spyOn(program, 'opts').mockReturnValue({ json: true });
51
52
  });
52
53
  test('outputs JSON format for info type', () => {
54
+ const TEST_DATA = 'test data';
53
55
  const log = createConsole('LOG', 'info');
54
- log('test data');
56
+ log(TEST_DATA);
55
57
  const calls = vi.mocked(console.info).mock.calls;
56
- const jsonOutput = calls.find((call) => call[0] === '<JSON>');
57
- expect(jsonOutput).toBeDefined();
58
+ const jsonOutput = JSON.parse(calls[0]?.[0] ?? '{}');
59
+ expect(jsonOutput).toEqual({
60
+ result: [TEST_DATA],
61
+ });
58
62
  });
59
63
  test('outputs JSON format for table type', () => {
60
64
  const tableLog = createConsole('Result', 'table');
61
- tableLog({ key: 'value' });
65
+ const TEST_DATA = { key: 'value' };
66
+ tableLog(TEST_DATA);
62
67
  const calls = vi.mocked(console.info).mock.calls;
63
- const jsonOutput = calls.find((call) => call[0] === '<JSON>');
64
- expect(jsonOutput).toBeDefined();
68
+ const jsonOutput = JSON.parse(calls[0]?.[0] ?? '{}');
69
+ expect(jsonOutput).toEqual([TEST_DATA]);
65
70
  expect(console.table).not.toHaveBeenCalled();
66
71
  });
67
72
  test('outputs JSON format for bold type', () => {
68
73
  const boldLog = createConsole('Bold', 'bold');
69
- boldLog('important');
74
+ const TEST_DATA = 'important';
75
+ boldLog(TEST_DATA);
70
76
  const calls = vi.mocked(console.info).mock.calls;
71
- const jsonOutput = calls.find((call) => call[0] === '<JSON>');
77
+ const jsonOutput = JSON.parse(calls[0]?.[0] ?? '{}');
78
+ expect(jsonOutput).toEqual({
79
+ result: [TEST_DATA],
80
+ });
72
81
  expect(jsonOutput).toBeDefined();
73
82
  });
74
83
  test('serializes bigint values in JSON mode', () => {
75
84
  const log = createConsole('LOG');
76
85
  const bigIntValue = 1234567890123456789012345678901234567890n;
77
- log({ value: bigIntValue });
86
+ const TEST_DATA = { value: bigIntValue };
87
+ log(TEST_DATA);
78
88
  const calls = vi.mocked(console.info).mock.calls;
79
- // Check that bigint was converted to string in JSON output
80
- const allCalls = calls.flat().join('');
81
- expect(allCalls).toContain(bigIntValue.toString());
89
+ const jsonOutput = JSON.parse(calls[0]?.[0] ?? '{}');
90
+ expect(jsonOutput).toEqual({
91
+ result: [{ value: bigIntValue.toString() }],
92
+ });
93
+ expect(jsonOutput).toBeDefined();
82
94
  });
83
95
  });
84
96
  describe('exported helper functions', () => {
@@ -131,7 +143,11 @@ describe('logResult and logTable', () => {
131
143
  const data = [['key', 'value']];
132
144
  logResult({ data });
133
145
  const calls = vi.mocked(console.info).mock.calls;
134
- const jsonOutput = calls.find((call) => call[0] === '<JSON>');
146
+ const payload = calls[calls.length - 1]?.[0];
147
+ const jsonOutput = JSON.parse(payload);
148
+ expect(jsonOutput).toEqual({
149
+ result: data,
150
+ });
135
151
  expect(jsonOutput).toBeDefined();
136
152
  });
137
153
  test('handles bigint in table data', () => {
@@ -1 +1 @@
1
- {"version":3,"file":"logging.test.js","sourceRoot":"","sources":["../../../tests/utils/logging.test.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"logging.test.js","sourceRoot":"","sources":["../../../tests/utils/logging.test.ts"],"names":[],"mappings":"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"}
@@ -1,15 +1,14 @@
1
1
  import { describe, it, expect } from 'vitest';
2
- import { calculateRebaseReward } from '../../utils/rebase-rewards.js';
2
+ import { calculateRebaseReward } from 'utils/rebase-rewards.js';
3
3
  describe('calculateRebaseReward', () => {
4
- it('should calculate positive rebase reward', () => {
4
+ it('should calculate positive rebase reward (no share change)', () => {
5
5
  const args = {
6
6
  shareRatePrev: 1000000000000000000000000000n, // 1.0 * 10^27
7
7
  shareRateCurr: 1100000000000000000000000000n, // 1.1 * 10^27
8
- sharesPrev: 100000000000000000000n, // 100 shares (10^18 decimals)
9
- sharesCurr: 100000000000000000000n, // 100 shares
8
+ sharesPrev: 100000000000000000000n, // 100 shares
10
9
  };
11
10
  const reward = calculateRebaseReward(args);
12
- // Expected: (1.1 * 100 - 1.0 * 100) / 10^27 * 10^18 = 10 ETH
11
+ // 100 * (1.1 - 1.0) = 100 * 0.1 = 10 ETH
13
12
  expect(reward).toBe(10000000000000000000n);
14
13
  });
15
14
  it('should calculate zero reward when share rate is unchanged', () => {
@@ -17,50 +16,50 @@ describe('calculateRebaseReward', () => {
17
16
  shareRatePrev: 1000000000000000000000000000n,
18
17
  shareRateCurr: 1000000000000000000000000000n,
19
18
  sharesPrev: 100000000000000000000n,
20
- sharesCurr: 100000000000000000000n,
21
19
  };
22
20
  const reward = calculateRebaseReward(args);
23
21
  expect(reward).toBe(0n);
24
22
  });
25
- it('should calculate negative reward (penalty)', () => {
23
+ it('should calculate negative reward (penalty / slashing)', () => {
26
24
  const args = {
27
25
  shareRatePrev: 1100000000000000000000000000n, // 1.1 * 10^27
28
26
  shareRateCurr: 1000000000000000000000000000n, // 1.0 * 10^27
29
27
  sharesPrev: 100000000000000000000n,
30
- sharesCurr: 100000000000000000000n,
31
28
  };
32
29
  const reward = calculateRebaseReward(args);
33
- // Expected: (1.0 * 100 - 1.1 * 100) / 10^27 * 10^18 = -10 ETH
30
+ // 100 * (1.0 - 1.1) = 100 * -0.1 = -10 ETH
34
31
  expect(reward).toBe(-10000000000000000000n);
35
32
  });
36
- it('should handle increased shares with same rate', () => {
33
+ it('should use only opening shares when new stETH was minted mid-period', () => {
34
+ // New shares minted mid-period are treated as arriving at the START of the
35
+ // next period. Their rebase cost appears fully in the following period.
36
+ // This mirrors how calculateLidoAPR uses preShareRate (opening value).
37
37
  const args = {
38
38
  shareRatePrev: 1000000000000000000000000000n,
39
- shareRateCurr: 1000000000000000000000000000n,
40
- sharesPrev: 100000000000000000000n,
41
- sharesCurr: 200000000000000000000n, // doubled shares
39
+ shareRateCurr: 1100000000000000000000000000n, // +10%
40
+ sharesPrev: 100000000000000000000n, // 100 shares at start
41
+ // sharesCurr would be 200 shares (doubled) but is not used
42
42
  };
43
43
  const reward = calculateRebaseReward(args);
44
- // Expected: (1.0 * 200 - 1.0 * 100) / 10^27 * 10^18 = 100 ETH
45
- expect(reward).toBe(100000000000000000000n);
44
+ // 100 * (1.1 - 1.0) = 10 ETH (minted shares ignored, cost deferred to next period)
45
+ expect(reward).toBe(10000000000000000000n);
46
46
  });
47
- it('should handle decreased shares with same rate', () => {
47
+ it('should use only opening shares when stETH was burned mid-period', () => {
48
48
  const args = {
49
49
  shareRatePrev: 1000000000000000000000000000n,
50
- shareRateCurr: 1000000000000000000000000000n,
51
- sharesPrev: 200000000000000000000n,
52
- sharesCurr: 100000000000000000000n, // halved shares
50
+ shareRateCurr: 1200000000000000000000000000n, // +20%
51
+ sharesPrev: 200000000000000000000n, // 200 shares at start
52
+ // sharesCurr would be 100 shares (halved) but is not used
53
53
  };
54
54
  const reward = calculateRebaseReward(args);
55
- // Expected: (1.0 * 100 - 1.0 * 200) / 10^27 * 10^18 = -100 ETH
56
- expect(reward).toBe(-100000000000000000000n);
55
+ // 200 * (1.2 - 1.0) = 200 * 0.2 = 40 ETH
56
+ expect(reward).toBe(40000000000000000000n);
57
57
  });
58
58
  it('should handle zero shares', () => {
59
59
  const args = {
60
60
  shareRatePrev: 1000000000000000000000000000n,
61
61
  shareRateCurr: 1100000000000000000000000000n,
62
62
  sharesPrev: 0n,
63
- sharesCurr: 0n,
64
63
  };
65
64
  const reward = calculateRebaseReward(args);
66
65
  expect(reward).toBe(0n);
@@ -70,10 +69,8 @@ describe('calculateRebaseReward', () => {
70
69
  shareRatePrev: 1000000000000000000000000000n,
71
70
  shareRateCurr: 1000000000000000000100000000n, // tiny increase
72
71
  sharesPrev: 100000000000000000000n,
73
- sharesCurr: 100000000000000000000n,
74
72
  };
75
73
  const reward = calculateRebaseReward(args);
76
- // Should be a small positive reward
77
74
  expect(reward).toBeGreaterThan(0n);
78
75
  expect(reward).toBeLessThan(1000000000n); // less than 1 gwei
79
76
  });
@@ -81,34 +78,38 @@ describe('calculateRebaseReward', () => {
81
78
  const args = {
82
79
  shareRatePrev: 1500000000000000000000000000n, // 1.5 * 10^27
83
80
  shareRateCurr: 1600000000000000000000000000n, // 1.6 * 10^27
84
- sharesPrev: 10000000000000000000000n, // 10,000 ETH worth of shares
85
- sharesCurr: 10000000000000000000000n,
81
+ sharesPrev: 10000000000000000000000n, // 10,000 ETH worth
86
82
  };
87
83
  const reward = calculateRebaseReward(args);
88
- // Expected: (1.6 * 10000 - 1.5 * 10000) / 10^27 * 10^18 = 1000 ETH
84
+ // 10000 * (1.6 - 1.5) = 10000 * 0.1 = 1000 ETH
89
85
  expect(reward).toBe(1000000000000000000000n);
90
86
  });
91
- it('should calculate reward with both rate increase and share increase', () => {
87
+ it('new shares have zero rebase cost in the mint period (deferred to next)', () => {
88
+ // If sharesPrev = 0 (first period after a large deposit), rebase cost is 0
89
+ // regardless of how many shares were minted. The full cost appears next period.
92
90
  const args = {
93
91
  shareRatePrev: 1000000000000000000000000000n,
94
- shareRateCurr: 1100000000000000000000000000n,
95
- sharesPrev: 100000000000000000000n,
96
- sharesCurr: 200000000000000000000n,
92
+ shareRateCurr: 1100000000000000000000000000n, // +10%
93
+ sharesPrev: 0n, // no shares at start of period
97
94
  };
98
95
  const reward = calculateRebaseReward(args);
99
- // Expected: (1.1 * 200 - 1.0 * 100) / 10^27 * 10^18 = 120 ETH
100
- expect(reward).toBe(120000000000000000000n);
96
+ expect(reward).toBe(0n);
101
97
  });
102
- it('should calculate reward with rate increase and share decrease', () => {
103
- const args = {
104
- shareRatePrev: 1000000000000000000000000000n,
105
- shareRateCurr: 1200000000000000000000000000n,
106
- sharesPrev: 200000000000000000000n,
107
- sharesCurr: 100000000000000000000n,
108
- };
109
- const reward = calculateRebaseReward(args);
110
- // Expected: (1.2 * 100 - 1.0 * 200) / 10^27 * 10^18 = -80 ETH
111
- expect(reward).toBe(-80000000000000000000n);
98
+ it('should be consistent with calculateLidoAPR: both use opening value', () => {
99
+ // calculateLidoAPR = ΔshareRate / preShareRate
100
+ // rebaseCost = sharesPrev × ΔshareRate / 1e27
101
+ // Both denominate against the opening (prev) value, so vault APR and
102
+ // Lido APR are directly comparable.
103
+ const shareRatePrev = 1000000000000000000000000000n; // 1.0
104
+ const shareRateCurr = 1030000000000000000000000000n; // 1.03 (+3%)
105
+ const sharesPrev = 1000000000000000000000n; // 1000 shares
106
+ const reward = calculateRebaseReward({
107
+ shareRatePrev,
108
+ shareRateCurr,
109
+ sharesPrev,
110
+ });
111
+ // 1000 shares × 0.03 = 30 ETH rebase cost
112
+ expect(reward).toBe(30000000000000000000n);
112
113
  });
113
114
  });
114
115
  //# sourceMappingURL=rebase-rewards.test.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"rebase-rewards.test.js","sourceRoot":"","sources":["../../../tests/utils/rebase-rewards.test.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"rebase-rewards.test.js","sourceRoot":"","sources":["../../../tests/utils/rebase-rewards.test.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1 @@
1
+ export {};