@lidofinance/lsv-cli 1.9.0 → 1.10.0-alpha.1
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.
- package/dist/features/consolidation.d.ts +2 -3
- package/dist/features/consolidation.js +60 -32
- package/dist/features/consolidation.js.map +1 -1
- package/dist/programs/use-cases/consolidation/write.js +4 -4
- package/dist/programs/use-cases/consolidation/write.js.map +1 -1
- package/dist/programs/use-cases/metrics/read.js +4 -4
- package/dist/programs/use-cases/metrics/read.js.map +1 -1
- package/dist/programs/use-cases/report/read.js +4 -4
- package/dist/programs/use-cases/report/read.js.map +1 -1
- package/dist/tests/fixtures/consolidation-fixtures.js +1 -0
- package/dist/tests/fixtures/consolidation-fixtures.js.map +1 -1
- package/dist/tests/utils/consolidation-fee-exemption-calc.test.d.ts +1 -0
- package/dist/tests/utils/consolidation-fee-exemption-calc.test.js +145 -0
- package/dist/tests/utils/consolidation-fee-exemption-calc.test.js.map +1 -0
- package/dist/tests/utils/consolidation-fee-exemption-confirm.test.d.ts +1 -0
- package/dist/tests/utils/consolidation-fee-exemption-confirm.test.js +118 -0
- package/dist/tests/utils/consolidation-fee-exemption-confirm.test.js.map +1 -0
- package/dist/tests/utils/consolidation-fee-exemption.test.d.ts +1 -0
- package/dist/tests/utils/consolidation-fee-exemption.test.js +168 -0
- package/dist/tests/utils/consolidation-fee-exemption.test.js.map +1 -0
- package/dist/tests/utils/first-validator-gindex.test.d.ts +1 -0
- package/dist/tests/utils/first-validator-gindex.test.js +48 -0
- package/dist/tests/utils/first-validator-gindex.test.js.map +1 -0
- package/dist/tests/utils/ipfs-security.test.js +1 -1
- package/dist/tests/utils/ipfs-security.test.js.map +1 -1
- package/dist/tests/utils/ipfs.test.js +32 -4
- package/dist/tests/utils/ipfs.test.js.map +1 -1
- package/dist/utils/consolidation/confirms.js +19 -8
- package/dist/utils/consolidation/confirms.js.map +1 -1
- package/dist/utils/consolidation/fee-exemption.d.ts +19 -0
- package/dist/utils/consolidation/fee-exemption.js +70 -0
- package/dist/utils/consolidation/fee-exemption.js.map +1 -0
- package/dist/utils/consolidation/index.d.ts +1 -0
- package/dist/utils/consolidation/index.js +1 -0
- package/dist/utils/consolidation/index.js.map +1 -1
- package/dist/utils/consolidation/pubkeys.js +2 -0
- package/dist/utils/consolidation/pubkeys.js.map +1 -1
- package/dist/utils/consolidation/types.d.ts +1 -0
- package/dist/utils/consolidation/validator-info.d.ts +2 -1
- package/dist/utils/consolidation/validator-info.js +6 -0
- package/dist/utils/consolidation/validator-info.js.map +1 -1
- package/dist/utils/ipfs.d.ts +6 -1
- package/dist/utils/ipfs.js +34 -17
- package/dist/utils/ipfs.js.map +1 -1
- package/dist/utils/proof/constants.d.ts +1 -0
- package/dist/utils/proof/constants.js +1 -0
- package/dist/utils/proof/constants.js.map +1 -1
- package/dist/utils/proof/first-validator-gindex.js +27 -13
- package/dist/utils/proof/first-validator-gindex.js.map +1 -1
- package/dist/utils/proof/proofs.d.ts +1 -1
- package/dist/utils/proof/proofs.js +1 -1
- package/dist/utils/proof/proofs.js.map +1 -1
- package/dist/version/index.js +1 -1
- package/package.json +13 -9
|
@@ -0,0 +1,118 @@
|
|
|
1
|
+
import { describe, it, expect, vi, beforeEach } from 'vitest';
|
|
2
|
+
const mockConfirmOperation = vi.fn();
|
|
3
|
+
const mockCallReadMethodSilent = vi.fn();
|
|
4
|
+
const mockFindRecentFeeExemptions = vi.fn();
|
|
5
|
+
const mockLogCancel = vi.fn();
|
|
6
|
+
const DAY_SEC = 24n * 60n * 60n;
|
|
7
|
+
const HOUR_SEC = 60n * 60n;
|
|
8
|
+
const NOW_SEC = BigInt(Math.floor(Date.now() / 1000));
|
|
9
|
+
// real loggers: a stubbed printError would hide that it rethrows
|
|
10
|
+
vi.mock('utils', async () => {
|
|
11
|
+
const logging = await vi.importActual('../../utils/logging/console.js');
|
|
12
|
+
const errorHandler = await vi.importActual('../../utils/error-handler.js');
|
|
13
|
+
return {
|
|
14
|
+
...logging,
|
|
15
|
+
...errorHandler,
|
|
16
|
+
callReadMethodSilent: mockCallReadMethodSilent,
|
|
17
|
+
confirmOperation: mockConfirmOperation,
|
|
18
|
+
findRecentFeeExemptions: mockFindRecentFeeExemptions,
|
|
19
|
+
formatFeeExemptionMatch: () => 'formatted-match',
|
|
20
|
+
FEE_EXEMPTION_DUPLICATE_LOOKBACK_SEC: DAY_SEC,
|
|
21
|
+
logCancel: mockLogCancel,
|
|
22
|
+
showSpinner: () => () => { },
|
|
23
|
+
callWriteMethodWithReceipt: vi.fn(),
|
|
24
|
+
callWriteMethodWithReceiptBatchCalls: vi.fn(),
|
|
25
|
+
flattenSourcePubkeys: vi.fn(),
|
|
26
|
+
getSourceAndTargetPubkeysFromEncodedCall: vi.fn(),
|
|
27
|
+
addDummyTargetAndSourceValidator: vi.fn(),
|
|
28
|
+
};
|
|
29
|
+
});
|
|
30
|
+
vi.mock('providers', () => ({ getPublicClient: vi.fn() }));
|
|
31
|
+
vi.mock('contracts', () => ({
|
|
32
|
+
getDashboardContract: vi.fn(),
|
|
33
|
+
getValidatorConsolidationRequestsContract: vi.fn(),
|
|
34
|
+
}));
|
|
35
|
+
vi.mock('abi', () => ({ DashboardAbi: [] }));
|
|
36
|
+
const DASHBOARD_CONTRACT = {
|
|
37
|
+
address: '0x1234567890abcdef1234567890abcdef12345678',
|
|
38
|
+
};
|
|
39
|
+
const FEE_EXEMPTION = 32000000000000000000n;
|
|
40
|
+
const importSubject = async () => {
|
|
41
|
+
const { confirmFeeExemptionIncrease } = await import('../../features/consolidation.js');
|
|
42
|
+
return confirmFeeExemptionIncrease;
|
|
43
|
+
};
|
|
44
|
+
const aMatch = {
|
|
45
|
+
txHash: `0x${'ab'.repeat(32)}`,
|
|
46
|
+
blockNumber: 1n,
|
|
47
|
+
delta: FEE_EXEMPTION,
|
|
48
|
+
timestamp: NOW_SEC,
|
|
49
|
+
};
|
|
50
|
+
describe('confirmFeeExemptionIncrease', () => {
|
|
51
|
+
beforeEach(() => {
|
|
52
|
+
vi.clearAllMocks();
|
|
53
|
+
});
|
|
54
|
+
it('does nothing when there is no exemption to add', async () => {
|
|
55
|
+
const confirmFeeExemptionIncrease = await importSubject();
|
|
56
|
+
const result = await confirmFeeExemptionIncrease(DASHBOARD_CONTRACT, 0n);
|
|
57
|
+
expect(result).toEqual({ shouldAddFeeExemption: false });
|
|
58
|
+
expect(mockCallReadMethodSilent).not.toHaveBeenCalled();
|
|
59
|
+
expect(mockConfirmOperation).not.toHaveBeenCalled();
|
|
60
|
+
});
|
|
61
|
+
it('adds the exemption without prompting when there are no recent corrections', async () => {
|
|
62
|
+
mockCallReadMethodSilent.mockResolvedValue(0n);
|
|
63
|
+
const confirmFeeExemptionIncrease = await importSubject();
|
|
64
|
+
const result = await confirmFeeExemptionIncrease(DASHBOARD_CONTRACT, FEE_EXEMPTION);
|
|
65
|
+
expect(result).toEqual({ shouldAddFeeExemption: true });
|
|
66
|
+
expect(mockFindRecentFeeExemptions).not.toHaveBeenCalled();
|
|
67
|
+
expect(mockConfirmOperation).not.toHaveBeenCalled();
|
|
68
|
+
});
|
|
69
|
+
it('adds the exemption without prompting when no matching exemption is found', async () => {
|
|
70
|
+
mockCallReadMethodSilent.mockResolvedValue(NOW_SEC - HOUR_SEC);
|
|
71
|
+
mockFindRecentFeeExemptions.mockResolvedValue([]);
|
|
72
|
+
const confirmFeeExemptionIncrease = await importSubject();
|
|
73
|
+
const result = await confirmFeeExemptionIncrease(DASHBOARD_CONTRACT, FEE_EXEMPTION);
|
|
74
|
+
expect(result).toEqual({ shouldAddFeeExemption: true });
|
|
75
|
+
expect(mockFindRecentFeeExemptions).toHaveBeenCalledWith(DASHBOARD_CONTRACT.address, FEE_EXEMPTION);
|
|
76
|
+
expect(mockConfirmOperation).not.toHaveBeenCalled();
|
|
77
|
+
});
|
|
78
|
+
// --yes / NODE_ENV=test auto-confirm every prompt, so the first one must mean "add"
|
|
79
|
+
it('adds the exemption when prompts are auto-confirmed', async () => {
|
|
80
|
+
mockCallReadMethodSilent.mockResolvedValue(NOW_SEC - HOUR_SEC);
|
|
81
|
+
mockFindRecentFeeExemptions.mockResolvedValue([aMatch]);
|
|
82
|
+
mockConfirmOperation.mockResolvedValue(true);
|
|
83
|
+
const confirmFeeExemptionIncrease = await importSubject();
|
|
84
|
+
const result = await confirmFeeExemptionIncrease(DASHBOARD_CONTRACT, FEE_EXEMPTION);
|
|
85
|
+
expect(result).toEqual({ shouldAddFeeExemption: true });
|
|
86
|
+
expect(mockConfirmOperation).toHaveBeenCalledTimes(1);
|
|
87
|
+
});
|
|
88
|
+
it('skips only after an explicit decline and an explicit skip confirmation', async () => {
|
|
89
|
+
mockCallReadMethodSilent.mockResolvedValue(NOW_SEC - HOUR_SEC);
|
|
90
|
+
mockFindRecentFeeExemptions.mockResolvedValue([aMatch]);
|
|
91
|
+
mockConfirmOperation
|
|
92
|
+
.mockResolvedValueOnce(false)
|
|
93
|
+
.mockResolvedValueOnce(true);
|
|
94
|
+
const confirmFeeExemptionIncrease = await importSubject();
|
|
95
|
+
const result = await confirmFeeExemptionIncrease(DASHBOARD_CONTRACT, FEE_EXEMPTION);
|
|
96
|
+
expect(result).toEqual({ shouldAddFeeExemption: false });
|
|
97
|
+
expect(mockConfirmOperation).toHaveBeenCalledTimes(2);
|
|
98
|
+
});
|
|
99
|
+
it('cancels consolidation when the operator declines both prompts', async () => {
|
|
100
|
+
mockCallReadMethodSilent.mockResolvedValue(NOW_SEC - HOUR_SEC);
|
|
101
|
+
mockFindRecentFeeExemptions.mockResolvedValue([aMatch]);
|
|
102
|
+
mockConfirmOperation.mockResolvedValue(false);
|
|
103
|
+
const confirmFeeExemptionIncrease = await importSubject();
|
|
104
|
+
await expect(confirmFeeExemptionIncrease(DASHBOARD_CONTRACT, FEE_EXEMPTION)).rejects.toThrow('User cancelled consolidation');
|
|
105
|
+
expect(mockLogCancel).toHaveBeenCalled();
|
|
106
|
+
});
|
|
107
|
+
// fails if fail-soft regresses into a hard abort
|
|
108
|
+
it('falls back to an operator decision when the log scan fails', async () => {
|
|
109
|
+
mockCallReadMethodSilent.mockResolvedValue(NOW_SEC - HOUR_SEC);
|
|
110
|
+
mockFindRecentFeeExemptions.mockRejectedValue(new Error('range too wide'));
|
|
111
|
+
mockConfirmOperation.mockResolvedValue(true);
|
|
112
|
+
const confirmFeeExemptionIncrease = await importSubject();
|
|
113
|
+
const result = await confirmFeeExemptionIncrease(DASHBOARD_CONTRACT, FEE_EXEMPTION);
|
|
114
|
+
expect(result).toEqual({ shouldAddFeeExemption: true });
|
|
115
|
+
expect(mockConfirmOperation).toHaveBeenCalledTimes(1);
|
|
116
|
+
});
|
|
117
|
+
});
|
|
118
|
+
//# sourceMappingURL=consolidation-fee-exemption-confirm.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"consolidation-fee-exemption-confirm.test.js","sourceRoot":"","sources":["../../../tests/utils/consolidation-fee-exemption-confirm.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1,168 @@
|
|
|
1
|
+
import { describe, it, expect, vi, beforeEach } from 'vitest';
|
|
2
|
+
import { matchFeeExemptionLogs, findRecentFeeExemptions, formatFeeExemptionMatch, } from '../../utils/consolidation/fee-exemption.js';
|
|
3
|
+
const mockGetBlockNumber = vi.fn();
|
|
4
|
+
const mockGetContractEvents = vi.fn();
|
|
5
|
+
const mockGetBlock = vi.fn();
|
|
6
|
+
vi.mock('providers', () => ({
|
|
7
|
+
getPublicClient: async () => ({
|
|
8
|
+
getBlockNumber: mockGetBlockNumber,
|
|
9
|
+
getContractEvents: mockGetContractEvents,
|
|
10
|
+
getBlock: mockGetBlock,
|
|
11
|
+
}),
|
|
12
|
+
}));
|
|
13
|
+
const TX_EXEMPTION = '0xaaa1';
|
|
14
|
+
const TX_DISBURSE = '0xbbb2';
|
|
15
|
+
const TX_OTHER = '0xccc3';
|
|
16
|
+
const DASHBOARD = '0x1234567890abcdef1234567890abcdef12345678';
|
|
17
|
+
const settledGrowthLog = (transactionHash, oldSettledGrowth, newSettledGrowth, blockNumber = 100n) => ({
|
|
18
|
+
transactionHash,
|
|
19
|
+
blockNumber,
|
|
20
|
+
args: { oldSettledGrowth, newSettledGrowth },
|
|
21
|
+
});
|
|
22
|
+
describe('matchFeeExemptionLogs', () => {
|
|
23
|
+
it('matches a correction tx with delta equal to the amount', () => {
|
|
24
|
+
const logs = [settledGrowthLog(TX_EXEMPTION, 100n, 132n)];
|
|
25
|
+
const matches = matchFeeExemptionLogs(logs, new Set([TX_EXEMPTION]), 32n);
|
|
26
|
+
expect(matches).toHaveLength(1);
|
|
27
|
+
expect(matches[0]).toMatchObject({ txHash: TX_EXEMPTION, delta: 32n });
|
|
28
|
+
});
|
|
29
|
+
it('ignores SettledGrowthSet from disburseFee (no correction event in tx)', () => {
|
|
30
|
+
const logs = [settledGrowthLog(TX_DISBURSE, 100n, 132n)];
|
|
31
|
+
const matches = matchFeeExemptionLogs(logs, new Set(), 32n);
|
|
32
|
+
expect(matches).toHaveLength(0);
|
|
33
|
+
});
|
|
34
|
+
it('ignores corrections with a different delta', () => {
|
|
35
|
+
const logs = [
|
|
36
|
+
settledGrowthLog(TX_EXEMPTION, 100n, 132n),
|
|
37
|
+
settledGrowthLog(TX_OTHER, 132n, 196n),
|
|
38
|
+
];
|
|
39
|
+
const matches = matchFeeExemptionLogs(logs, new Set([TX_EXEMPTION, TX_OTHER]), 64n);
|
|
40
|
+
expect(matches).toHaveLength(1);
|
|
41
|
+
expect(matches[0]?.txHash).toBe(TX_OTHER);
|
|
42
|
+
});
|
|
43
|
+
it('ignores downward corrections (negative delta)', () => {
|
|
44
|
+
const logs = [settledGrowthLog(TX_OTHER, 132n, 100n)];
|
|
45
|
+
const matches = matchFeeExemptionLogs(logs, new Set([TX_OTHER]), 32n);
|
|
46
|
+
expect(matches).toHaveLength(0);
|
|
47
|
+
});
|
|
48
|
+
it('returns all matching corrections', () => {
|
|
49
|
+
const logs = [
|
|
50
|
+
settledGrowthLog(TX_EXEMPTION, 100n, 132n, 100n),
|
|
51
|
+
settledGrowthLog(TX_OTHER, 132n, 164n, 200n),
|
|
52
|
+
];
|
|
53
|
+
const matches = matchFeeExemptionLogs(logs, new Set([TX_EXEMPTION, TX_OTHER]), 32n);
|
|
54
|
+
expect(matches).toHaveLength(2);
|
|
55
|
+
});
|
|
56
|
+
});
|
|
57
|
+
describe('formatFeeExemptionMatch', () => {
|
|
58
|
+
const VALID_HASH = `0x${'ab'.repeat(32)}`;
|
|
59
|
+
it('renders a valid hash and timestamp', () => {
|
|
60
|
+
const line = formatFeeExemptionMatch({
|
|
61
|
+
txHash: VALID_HASH,
|
|
62
|
+
blockNumber: 100n,
|
|
63
|
+
delta: 32000000000000000000n,
|
|
64
|
+
timestamp: 1700000000n,
|
|
65
|
+
});
|
|
66
|
+
expect(line).toBe(`32 ETH in tx ${VALID_HASH} at 2023-11-14T22:13:20.000Z`);
|
|
67
|
+
});
|
|
68
|
+
it('replaces a tx hash carrying terminal escape sequences', () => {
|
|
69
|
+
const line = formatFeeExemptionMatch({
|
|
70
|
+
txHash: '[2K[1ASkip the exemption',
|
|
71
|
+
blockNumber: 100n,
|
|
72
|
+
delta: 32000000000000000000n,
|
|
73
|
+
timestamp: 1700000000n,
|
|
74
|
+
});
|
|
75
|
+
expect(line).toContain('<invalid tx hash from RPC>');
|
|
76
|
+
expect(line).not.toContain('');
|
|
77
|
+
});
|
|
78
|
+
it('replaces a non-hex tx hash of the right length', () => {
|
|
79
|
+
const line = formatFeeExemptionMatch({
|
|
80
|
+
txHash: `0x${'zz'.repeat(32)}`,
|
|
81
|
+
blockNumber: 100n,
|
|
82
|
+
delta: 1n,
|
|
83
|
+
timestamp: 1700000000n,
|
|
84
|
+
});
|
|
85
|
+
expect(line).toContain('<invalid tx hash from RPC>');
|
|
86
|
+
});
|
|
87
|
+
it('replaces an out-of-range timestamp instead of throwing', () => {
|
|
88
|
+
const line = formatFeeExemptionMatch({
|
|
89
|
+
txHash: VALID_HASH,
|
|
90
|
+
blockNumber: 100n,
|
|
91
|
+
delta: 1n,
|
|
92
|
+
timestamp: 2n ** 64n,
|
|
93
|
+
});
|
|
94
|
+
expect(line).toContain('<invalid timestamp from RPC>');
|
|
95
|
+
});
|
|
96
|
+
});
|
|
97
|
+
describe('findRecentFeeExemptions', () => {
|
|
98
|
+
beforeEach(() => {
|
|
99
|
+
vi.clearAllMocks();
|
|
100
|
+
});
|
|
101
|
+
// mimics an RPC honouring fromBlock/toBlock, so chunked scans see each log once
|
|
102
|
+
const mockChainLogs = (settledGrowthLogs, correctionTxHashes) => {
|
|
103
|
+
mockGetContractEvents.mockImplementation(async ({ eventName, fromBlock, toBlock }) => {
|
|
104
|
+
const inRange = settledGrowthLogs.filter((log) => log.blockNumber >= fromBlock && log.blockNumber <= toBlock);
|
|
105
|
+
if (eventName === 'SettledGrowthSet')
|
|
106
|
+
return inRange;
|
|
107
|
+
return inRange
|
|
108
|
+
.filter((log) => correctionTxHashes.includes(log.transactionHash))
|
|
109
|
+
.map((log) => ({ transactionHash: log.transactionHash }));
|
|
110
|
+
});
|
|
111
|
+
};
|
|
112
|
+
it('returns matching exemptions with block timestamps', async () => {
|
|
113
|
+
mockGetBlockNumber.mockResolvedValue(1000000n);
|
|
114
|
+
mockChainLogs([
|
|
115
|
+
settledGrowthLog(TX_EXEMPTION, 100n, 132n, 999000n),
|
|
116
|
+
settledGrowthLog(TX_DISBURSE, 132n, 150n, 999500n),
|
|
117
|
+
], [TX_EXEMPTION]);
|
|
118
|
+
mockGetBlock.mockResolvedValue({ timestamp: 1700000000n });
|
|
119
|
+
const matches = await findRecentFeeExemptions(DASHBOARD, 32n);
|
|
120
|
+
expect(matches).toHaveLength(1);
|
|
121
|
+
expect(matches[0]).toMatchObject({
|
|
122
|
+
txHash: TX_EXEMPTION,
|
|
123
|
+
delta: 32n,
|
|
124
|
+
timestamp: 1700000000n,
|
|
125
|
+
});
|
|
126
|
+
});
|
|
127
|
+
it('queries both events over the same block range', async () => {
|
|
128
|
+
mockGetBlockNumber.mockResolvedValue(1000000n);
|
|
129
|
+
mockGetContractEvents.mockResolvedValue([]);
|
|
130
|
+
// 1200 sec / 12 sec per block = 100 blocks back, fits in a single chunk
|
|
131
|
+
await findRecentFeeExemptions(DASHBOARD, 32n, 1200n);
|
|
132
|
+
const ranges = mockGetContractEvents.mock.calls.map(([{ fromBlock, toBlock }]) => [fromBlock, toBlock]);
|
|
133
|
+
expect(ranges).toEqual([
|
|
134
|
+
[999900n, 1000000n],
|
|
135
|
+
[999900n, 1000000n],
|
|
136
|
+
]);
|
|
137
|
+
});
|
|
138
|
+
it('splits a wide lookback into chunks without rescanning blocks', async () => {
|
|
139
|
+
mockGetBlockNumber.mockResolvedValue(100000n);
|
|
140
|
+
mockGetContractEvents.mockResolvedValue([]);
|
|
141
|
+
// 25 000 blocks back over a 10 000-block chunk size = 3 chunks per event
|
|
142
|
+
await findRecentFeeExemptions(DASHBOARD, 32n, 25000n * 12n);
|
|
143
|
+
const settledGrowthRanges = mockGetContractEvents.mock.calls
|
|
144
|
+
.filter(([{ eventName }]) => eventName === 'SettledGrowthSet')
|
|
145
|
+
.map(([{ fromBlock, toBlock }]) => [fromBlock, toBlock]);
|
|
146
|
+
expect(settledGrowthRanges).toEqual([
|
|
147
|
+
[75000n, 84999n],
|
|
148
|
+
[85000n, 94999n],
|
|
149
|
+
[95000n, 100000n],
|
|
150
|
+
]);
|
|
151
|
+
});
|
|
152
|
+
it('clamps fromBlock to 0 when the chain is shorter than the lookback', async () => {
|
|
153
|
+
mockGetBlockNumber.mockResolvedValue(10n);
|
|
154
|
+
mockGetContractEvents.mockResolvedValue([]);
|
|
155
|
+
await findRecentFeeExemptions(DASHBOARD, 32n);
|
|
156
|
+
const firstCall = mockGetContractEvents.mock.calls[0];
|
|
157
|
+
expect(firstCall?.[0]?.fromBlock).toBe(0n);
|
|
158
|
+
expect(firstCall?.[0]?.toBlock).toBe(10n);
|
|
159
|
+
});
|
|
160
|
+
it('returns empty when only disburse events exist', async () => {
|
|
161
|
+
mockGetBlockNumber.mockResolvedValue(1000000n);
|
|
162
|
+
mockChainLogs([settledGrowthLog(TX_DISBURSE, 100n, 132n, 999000n)], []);
|
|
163
|
+
const matches = await findRecentFeeExemptions(DASHBOARD, 32n);
|
|
164
|
+
expect(matches).toHaveLength(0);
|
|
165
|
+
expect(mockGetBlock).not.toHaveBeenCalled();
|
|
166
|
+
});
|
|
167
|
+
});
|
|
168
|
+
//# sourceMappingURL=consolidation-fee-exemption.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"consolidation-fee-exemption.test.js","sourceRoot":"","sources":["../../../tests/utils/consolidation-fee-exemption.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1,48 @@
|
|
|
1
|
+
import { describe, expect, test, vi, beforeEach } from 'vitest';
|
|
2
|
+
const mockLogResult = vi.fn();
|
|
3
|
+
vi.mock('utils', () => ({
|
|
4
|
+
logResult: mockLogResult,
|
|
5
|
+
}));
|
|
6
|
+
const importSubject = async () => {
|
|
7
|
+
const { getFirstValidatorGIndex } = await import('../../utils/proof/first-validator-gindex.js');
|
|
8
|
+
return getFirstValidatorGIndex;
|
|
9
|
+
};
|
|
10
|
+
const rowsFor = async (forks) => {
|
|
11
|
+
const getFirstValidatorGIndex = await importSubject();
|
|
12
|
+
getFirstValidatorGIndex(forks);
|
|
13
|
+
return mockLogResult.mock.calls[0]?.[0]?.data;
|
|
14
|
+
};
|
|
15
|
+
// Values the verifiers are deployed with, see deploy params in lidofinance/core
|
|
16
|
+
const CAPELLA_GINDEX = '0x0000000000000000000000000000000000000000000000000056000000000028';
|
|
17
|
+
const ELECTRA_GINDEX = '0x0000000000000000000000000000000000000000000000000096000000000028';
|
|
18
|
+
const GLOAS_GINDEX = '0x0000000000000000000000000000000000000000000000000000000000016600';
|
|
19
|
+
describe('getFirstValidatorGIndex', () => {
|
|
20
|
+
beforeEach(() => {
|
|
21
|
+
mockLogResult.mockClear();
|
|
22
|
+
});
|
|
23
|
+
test('packs first validator gindex with list depth before gloas', async () => {
|
|
24
|
+
const rows = await rowsFor(['capella', 'deneb', 'electra', 'fulu']);
|
|
25
|
+
expect(rows.map((row) => row[1])).toEqual([
|
|
26
|
+
CAPELLA_GINDEX,
|
|
27
|
+
CAPELLA_GINDEX,
|
|
28
|
+
ELECTRA_GINDEX,
|
|
29
|
+
ELECTRA_GINDEX,
|
|
30
|
+
]);
|
|
31
|
+
expect(rows.map((row) => row[2])).toEqual([
|
|
32
|
+
'gIFirstValidatorPreGloas',
|
|
33
|
+
'gIFirstValidatorPreGloas',
|
|
34
|
+
'gIFirstValidatorPreGloas',
|
|
35
|
+
'gIFirstValidatorPreGloas',
|
|
36
|
+
]);
|
|
37
|
+
});
|
|
38
|
+
test('returns the validators field gindex with zero width for gloas', async () => {
|
|
39
|
+
const rows = await rowsFor(['gloas']);
|
|
40
|
+
expect(rows[0]).toEqual(['gloas', GLOAS_GINDEX, 'gIValidators']);
|
|
41
|
+
});
|
|
42
|
+
test('rejects an unknown fork instead of emitting a gindex', async () => {
|
|
43
|
+
const getFirstValidatorGIndex = await importSubject();
|
|
44
|
+
expect(() => getFirstValidatorGIndex(['notafork'])).toThrow('Fork name [notafork] is not supported');
|
|
45
|
+
expect(mockLogResult).not.toHaveBeenCalled();
|
|
46
|
+
});
|
|
47
|
+
});
|
|
48
|
+
//# sourceMappingURL=first-validator-gindex.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"first-validator-gindex.test.js","sourceRoot":"","sources":["../../../tests/utils/first-validator-gindex.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AAEhE,MAAM,aAAa,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC;AAE9B,EAAE,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,EAAE,CAAC,CAAC;IACtB,SAAS,EAAE,aAAa;CACzB,CAAC,CAAC,CAAC;AAEJ,MAAM,aAAa,GAAG,KAAK,IAAI,EAAE;IAC/B,MAAM,EAAE,uBAAuB,EAAE,GAC/B,MAAM,MAAM,CAAC,6CAA6C,CAAC,CAAC;IAC9D,OAAO,uBAAuB,CAAC;AACjC,CAAC,CAAC;AAEF,MAAM,OAAO,GAAG,KAAK,EAAE,KAAe,EAAE,EAAE;IACxC,MAAM,uBAAuB,GAAG,MAAM,aAAa,EAAE,CAAC;IACtD,uBAAuB,CAAC,KAAK,CAAC,CAAC;IAC/B,OAAO,aAAa,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,IAAkB,CAAC;AAC9D,CAAC,CAAC;AAEF,gFAAgF;AAChF,MAAM,cAAc,GAClB,oEAAoE,CAAC;AACvE,MAAM,cAAc,GAClB,oEAAoE,CAAC;AACvE,MAAM,YAAY,GAChB,oEAAoE,CAAC;AAEvE,QAAQ,CAAC,yBAAyB,EAAE,GAAG,EAAE;IACvC,UAAU,CAAC,GAAG,EAAE;QACd,aAAa,CAAC,SAAS,EAAE,CAAC;IAC5B,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,2DAA2D,EAAE,KAAK,IAAI,EAAE;QAC3E,MAAM,IAAI,GAAG,MAAM,OAAO,CAAC,CAAC,SAAS,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC,CAAC;QAEpE,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;YACxC,cAAc;YACd,cAAc;YACd,cAAc;YACd,cAAc;SACf,CAAC,CAAC;QACH,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;YACxC,0BAA0B;YAC1B,0BAA0B;YAC1B,0BAA0B;YAC1B,0BAA0B;SAC3B,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,+DAA+D,EAAE,KAAK,IAAI,EAAE;QAC/E,MAAM,IAAI,GAAG,MAAM,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;QAEtC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,YAAY,EAAE,cAAc,CAAC,CAAC,CAAC;IACnE,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,sDAAsD,EAAE,KAAK,IAAI,EAAE;QACtE,MAAM,uBAAuB,GAAG,MAAM,aAAa,EAAE,CAAC;QAEtD,MAAM,CAAC,GAAG,EAAE,CAAC,uBAAuB,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,OAAO,CACzD,uCAAuC,CACxC,CAAC;QACF,MAAM,CAAC,aAAa,CAAC,CAAC,GAAG,CAAC,gBAAgB,EAAE,CAAC;IAC/C,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ipfs-security.test.js","sourceRoot":"","sources":["../../../tests/utils/ipfs-security.test.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"ipfs-security.test.js","sourceRoot":"","sources":["../../../tests/utils/ipfs-security.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -54,16 +54,44 @@ describe('ipfs helpers', () => {
|
|
|
54
54
|
yield { cid: fakeCid };
|
|
55
55
|
});
|
|
56
56
|
const res = await ipfs.fetchIPFS({ cid: testCid }, false);
|
|
57
|
-
expect(globalThis.fetch).toHaveBeenCalledWith(
|
|
57
|
+
expect(globalThis.fetch).toHaveBeenCalledWith(`${ipfs.IPFS_GATEWAYS.ipfsIo}/${testCid}`);
|
|
58
58
|
expect(res).toEqual({ foo: 1 });
|
|
59
59
|
expect(logInfo).toHaveBeenCalled();
|
|
60
60
|
});
|
|
61
61
|
test('fetchIPFS throws on bad response', async () => {
|
|
62
|
-
globalThis.fetch.
|
|
62
|
+
globalThis.fetch.mockResolvedValue({
|
|
63
63
|
ok: false,
|
|
64
|
+
status: 503,
|
|
64
65
|
statusText: 'bad',
|
|
65
66
|
});
|
|
66
|
-
await expect(ipfs.fetchIPFS({ cid: 'fail' }, false)).rejects.toThrow('Failed to fetch IPFS content
|
|
67
|
+
await expect(ipfs.fetchIPFS({ cid: 'fail' }, false)).rejects.toThrow('Failed to fetch IPFS content from all gateways');
|
|
68
|
+
});
|
|
69
|
+
test('fetchIPFS falls back through gateways', async () => {
|
|
70
|
+
const jsonData = '{"foo":1}';
|
|
71
|
+
const bytes = new TextEncoder().encode(jsonData);
|
|
72
|
+
globalThis.fetch
|
|
73
|
+
.mockResolvedValueOnce({
|
|
74
|
+
ok: false,
|
|
75
|
+
status: 429,
|
|
76
|
+
statusText: 'Too Many Requests',
|
|
77
|
+
})
|
|
78
|
+
.mockResolvedValueOnce({
|
|
79
|
+
ok: false,
|
|
80
|
+
status: 503,
|
|
81
|
+
statusText: 'Service Unavailable',
|
|
82
|
+
})
|
|
83
|
+
.mockResolvedValueOnce({
|
|
84
|
+
ok: true,
|
|
85
|
+
body: streamOf(bytes),
|
|
86
|
+
});
|
|
87
|
+
importer.mockImplementationOnce(async function* () {
|
|
88
|
+
yield { cid: fakeCid };
|
|
89
|
+
});
|
|
90
|
+
const result = await ipfs.fetchIPFS({ cid: fakeCid.toString() }, false);
|
|
91
|
+
expect(globalThis.fetch).toHaveBeenNthCalledWith(1, `${ipfs.IPFS_GATEWAYS.ipfsIo}/${fakeCid}`);
|
|
92
|
+
expect(globalThis.fetch).toHaveBeenNthCalledWith(2, `${ipfs.IPFS_GATEWAYS.filebase}/${fakeCid}`);
|
|
93
|
+
expect(globalThis.fetch).toHaveBeenNthCalledWith(3, `${ipfs.IPFS_GATEWAYS.pinata}/${fakeCid}`);
|
|
94
|
+
expect(result).toEqual({ foo: 1 });
|
|
67
95
|
});
|
|
68
96
|
test('fetchIPFSBuffer returns buffer', async () => {
|
|
69
97
|
const bytes = new Uint8Array(4);
|
|
@@ -72,7 +100,7 @@ describe('ipfs helpers', () => {
|
|
|
72
100
|
body: streamOf(bytes),
|
|
73
101
|
});
|
|
74
102
|
const res = await ipfs.fetchIPFSBuffer({ cid: 'abc' });
|
|
75
|
-
expect(globalThis.fetch).toHaveBeenCalledWith(
|
|
103
|
+
expect(globalThis.fetch).toHaveBeenCalledWith(`${ipfs.IPFS_GATEWAYS.ipfsIo}/abc`);
|
|
76
104
|
expect(res).toEqual(bytes);
|
|
77
105
|
});
|
|
78
106
|
test('calculateIPFSAddCID returns last CID', async () => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ipfs.test.js","sourceRoot":"","sources":["../../../tests/utils/ipfs.test.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"ipfs.test.js","sourceRoot":"","sources":["../../../tests/utils/ipfs.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { formatEther } from 'viem';
|
|
2
|
-
import { logCancel, confirmOperation } from '../index.js';
|
|
2
|
+
import { logCancel, logError, confirmOperation } from '../index.js';
|
|
3
|
+
import { consolidatedBalance } from './validator-info.js';
|
|
3
4
|
export const confirmToConsolidate = async (targetAndSourceValidators, dashboard) => {
|
|
4
5
|
const lines = [
|
|
5
6
|
'Are you sure you want to consolidate the following validators?\n',
|
|
@@ -18,16 +19,26 @@ export const confirmToConsolidate = async (targetAndSourceValidators, dashboard)
|
|
|
18
19
|
};
|
|
19
20
|
export const calculateAndConfirmFeeExemption = async (targetAndSourceValidators) => {
|
|
20
21
|
let feeExemption = 0n;
|
|
21
|
-
for (const [, { sourceValidators }] of targetAndSourceValidators) {
|
|
22
|
+
for (const [target, { sourceValidators }] of targetAndSourceValidators) {
|
|
22
23
|
for (const [source, sourceValidatorInfo] of sourceValidators) {
|
|
23
24
|
if (sourceValidatorInfo.status === 'active_ongoing') {
|
|
24
|
-
feeExemption += sourceValidatorInfo
|
|
25
|
+
feeExemption += consolidatedBalance(sourceValidatorInfo);
|
|
26
|
+
continue;
|
|
27
|
+
}
|
|
28
|
+
// a slashed source is skipped by the consensus layer, so nothing reaches the vault
|
|
29
|
+
if (sourceValidatorInfo.slashed) {
|
|
30
|
+
logError(`Validator ${source} is slashed: its balance will not reach the vault, so it is not exempted.`);
|
|
31
|
+
continue;
|
|
25
32
|
}
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
33
|
+
// an exit epoch is set both by an accepted consolidation request and by a
|
|
34
|
+
// voluntary/triggered exit, and the two need opposite answers here — only the
|
|
35
|
+
// operator knows which one applies, so ask instead of guessing
|
|
36
|
+
const confirm = await confirmOperation(`Validator ${source} is not active (status: ${sourceValidatorInfo.status}), balance ${formatEther(sourceValidatorInfo.balance)} ETH.
|
|
37
|
+
Answer yes only if its consolidation into ${target} was already requested — then that balance still reaches the vault and needs the exemption.
|
|
38
|
+
Answer no if it is exiting for any other reason — then the balance goes to its own withdrawal credentials and must not be exempted.
|
|
39
|
+
Count this validator towards the fee exemption?`);
|
|
40
|
+
if (confirm) {
|
|
41
|
+
feeExemption += consolidatedBalance(sourceValidatorInfo);
|
|
31
42
|
}
|
|
32
43
|
}
|
|
33
44
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"confirms.js","sourceRoot":"","sources":["../../../utils/consolidation/confirms.ts"],"names":[],"mappings":"AAAA,OAAO,EAAW,WAAW,EAAE,MAAM,MAAM,CAAC;AAC5C,OAAO,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"confirms.js","sourceRoot":"","sources":["../../../utils/consolidation/confirms.ts"],"names":[],"mappings":"AAAA,OAAO,EAAW,WAAW,EAAE,MAAM,MAAM,CAAC;AAC5C,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,gBAAgB,EAAE,MAAM,OAAO,CAAC;AAG9D,OAAO,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAE1D,MAAM,CAAC,MAAM,oBAAoB,GAAG,KAAK,EACvC,yBAAoD,EACpD,SAAkB,EACH,EAAE;IACjB,MAAM,KAAK,GAAa;QACtB,kEAAkE;KACnE,CAAC;IACF,KAAK,MAAM,CAAC,MAAM,EAAE,EAAE,gBAAgB,EAAE,CAAC,IAAI,yBAAyB,EAAE,CAAC;QACvE,KAAK,MAAM,CAAC,MAAM,CAAC,IAAI,gBAAgB,EAAE,CAAC;YACxC,KAAK,CAAC,IAAI,CAAC,WAAW,MAAM,aAAa,MAAM,IAAI,CAAC,CAAC;QACvD,CAAC;IACH,CAAC;IACD,KAAK,CAAC,IAAI,CAAC,cAAc,SAAS,EAAE,CAAC,CAAC;IACtC,MAAM,OAAO,GAAG,MAAM,gBAAgB,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;IAEzD,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,SAAS,CAAC,4CAA4C,CAAC,CAAC;QAExD,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAC;IAClD,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,+BAA+B,GAAG,KAAK,EAClD,yBAAoD,EACnC,EAAE;IACnB,IAAI,YAAY,GAAG,EAAE,CAAC;IAEtB,KAAK,MAAM,CAAC,MAAM,EAAE,EAAE,gBAAgB,EAAE,CAAC,IAAI,yBAAyB,EAAE,CAAC;QACvE,KAAK,MAAM,CAAC,MAAM,EAAE,mBAAmB,CAAC,IAAI,gBAAgB,EAAE,CAAC;YAC7D,IAAI,mBAAmB,CAAC,MAAM,KAAK,gBAAgB,EAAE,CAAC;gBACpD,YAAY,IAAI,mBAAmB,CAAC,mBAAmB,CAAC,CAAC;gBACzD,SAAS;YACX,CAAC;YAED,mFAAmF;YACnF,IAAI,mBAAmB,CAAC,OAAO,EAAE,CAAC;gBAChC,QAAQ,CACN,aAAa,MAAM,2EAA2E,CAC/F,CAAC;gBACF,SAAS;YACX,CAAC;YAED,0EAA0E;YAC1E,8EAA8E;YAC9E,+DAA+D;YAC/D,MAAM,OAAO,GAAG,MAAM,gBAAgB,CACpC,aAAa,MAAM,2BAA2B,mBAAmB,CAAC,MAAM,cAAc,WAAW,CAAC,mBAAmB,CAAC,OAAO,CAAC;gDACtF,MAAM;;oDAEF,CAC7C,CAAC;YACF,IAAI,OAAO,EAAE,CAAC;gBACZ,YAAY,IAAI,mBAAmB,CAAC,mBAAmB,CAAC,CAAC;YAC3D,CAAC;QACH,CAAC;IACH,CAAC;IAED,MAAM,mBAAmB,GAAG,MAAM,gBAAgB,CAChD,kBAAkB,WAAW,CAAC,YAAY,CAAC,iBAAiB,CAC7D,CAAC;IAEF,IAAI,CAAC,mBAAmB,EAAE,CAAC;QACzB,SAAS,CAAC,2CAA2C,CAAC,CAAC;QAEvD,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAC;IAClD,CAAC;IAED,OAAO,YAAY,CAAC;AACtB,CAAC,CAAC"}
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
import { Address, Hex } from 'viem';
|
|
2
|
+
export declare const FEE_EXEMPTION_DUPLICATE_LOOKBACK_SEC: bigint;
|
|
3
|
+
export type SettledGrowthSetLog = {
|
|
4
|
+
transactionHash: Hex;
|
|
5
|
+
blockNumber: bigint;
|
|
6
|
+
args: {
|
|
7
|
+
oldSettledGrowth: bigint;
|
|
8
|
+
newSettledGrowth: bigint;
|
|
9
|
+
};
|
|
10
|
+
};
|
|
11
|
+
export type FeeExemptionMatch = {
|
|
12
|
+
txHash: Hex;
|
|
13
|
+
blockNumber: bigint;
|
|
14
|
+
delta: bigint;
|
|
15
|
+
timestamp: bigint;
|
|
16
|
+
};
|
|
17
|
+
export declare const matchFeeExemptionLogs: (settledGrowthLogs: SettledGrowthSetLog[], correctionTxHashes: Set<Hex>, amount: bigint) => Omit<FeeExemptionMatch, "timestamp">[];
|
|
18
|
+
export declare const formatFeeExemptionMatch: (match: FeeExemptionMatch) => string;
|
|
19
|
+
export declare const findRecentFeeExemptions: (dashboard: Address, amount: bigint, lookbackSec?: bigint) => Promise<FeeExemptionMatch[]>;
|