@lodestar/state-transition 1.39.0-dev.ca786a9fc3 → 1.39.0-dev.cc77fcf3a8

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 (66) hide show
  1. package/lib/block/isValidIndexedAttestation.d.ts +4 -5
  2. package/lib/block/isValidIndexedAttestation.d.ts.map +1 -1
  3. package/lib/block/isValidIndexedAttestation.js +9 -10
  4. package/lib/block/isValidIndexedAttestation.js.map +1 -1
  5. package/lib/block/processAttestationPhase0.d.ts.map +1 -1
  6. package/lib/block/processAttestationPhase0.js +1 -1
  7. package/lib/block/processAttestationPhase0.js.map +1 -1
  8. package/lib/block/processAttesterSlashing.d.ts +3 -2
  9. package/lib/block/processAttesterSlashing.d.ts.map +1 -1
  10. package/lib/block/processAttesterSlashing.js +3 -3
  11. package/lib/block/processAttesterSlashing.js.map +1 -1
  12. package/lib/block/processBlsToExecutionChange.d.ts +3 -1
  13. package/lib/block/processBlsToExecutionChange.d.ts.map +1 -1
  14. package/lib/block/processBlsToExecutionChange.js +7 -11
  15. package/lib/block/processBlsToExecutionChange.js.map +1 -1
  16. package/lib/block/processProposerSlashing.d.ts +5 -2
  17. package/lib/block/processProposerSlashing.d.ts.map +1 -1
  18. package/lib/block/processProposerSlashing.js +7 -5
  19. package/lib/block/processProposerSlashing.js.map +1 -1
  20. package/lib/block/processWithdrawals.d.ts +3 -3
  21. package/lib/block/processWithdrawals.d.ts.map +1 -1
  22. package/lib/block/processWithdrawals.js +152 -105
  23. package/lib/block/processWithdrawals.js.map +1 -1
  24. package/lib/cache/epochCache.d.ts +6 -12
  25. package/lib/cache/epochCache.d.ts.map +1 -1
  26. package/lib/cache/epochCache.js +33 -105
  27. package/lib/cache/epochCache.js.map +1 -1
  28. package/lib/cache/epochTransitionCache.d.ts +5 -12
  29. package/lib/cache/epochTransitionCache.d.ts.map +1 -1
  30. package/lib/cache/epochTransitionCache.js +4 -14
  31. package/lib/cache/epochTransitionCache.js.map +1 -1
  32. package/lib/cache/stateCache.d.ts.map +1 -1
  33. package/lib/cache/stateCache.js +1 -2
  34. package/lib/cache/stateCache.js.map +1 -1
  35. package/lib/epoch/processProposerLookahead.d.ts.map +1 -1
  36. package/lib/epoch/processProposerLookahead.js +3 -6
  37. package/lib/epoch/processProposerLookahead.js.map +1 -1
  38. package/lib/signatureSets/blsToExecutionChange.d.ts +1 -2
  39. package/lib/signatureSets/blsToExecutionChange.d.ts.map +1 -1
  40. package/lib/signatureSets/blsToExecutionChange.js +2 -2
  41. package/lib/signatureSets/blsToExecutionChange.js.map +1 -1
  42. package/lib/signatureSets/proposer.d.ts +3 -4
  43. package/lib/signatureSets/proposer.d.ts.map +1 -1
  44. package/lib/signatureSets/proposer.js +5 -6
  45. package/lib/signatureSets/proposer.js.map +1 -1
  46. package/lib/types.d.ts +1 -1
  47. package/lib/types.d.ts.map +1 -1
  48. package/lib/util/epochShuffling.d.ts +1 -34
  49. package/lib/util/epochShuffling.d.ts.map +1 -1
  50. package/lib/util/epochShuffling.js +1 -1
  51. package/lib/util/epochShuffling.js.map +1 -1
  52. package/package.json +7 -7
  53. package/src/block/isValidIndexedAttestation.ts +17 -12
  54. package/src/block/processAttestationPhase0.ts +2 -1
  55. package/src/block/processAttesterSlashing.ts +16 -4
  56. package/src/block/processBlsToExecutionChange.ts +13 -14
  57. package/src/block/processProposerSlashing.ts +21 -11
  58. package/src/block/processWithdrawals.ts +230 -135
  59. package/src/cache/epochCache.ts +40 -118
  60. package/src/cache/epochTransitionCache.ts +9 -34
  61. package/src/cache/stateCache.ts +1 -2
  62. package/src/epoch/processProposerLookahead.ts +3 -7
  63. package/src/signatureSets/blsToExecutionChange.ts +2 -3
  64. package/src/signatureSets/proposer.ts +6 -7
  65. package/src/types.ts +1 -0
  66. package/src/util/epochShuffling.ts +2 -43
@@ -1,7 +1,7 @@
1
1
  import { byteArrayEquals } from "@chainsafe/ssz";
2
2
  import { FAR_FUTURE_EPOCH, ForkSeq, MAX_EFFECTIVE_BALANCE, MAX_PENDING_PARTIALS_PER_WITHDRAWALS_SWEEP, MAX_VALIDATORS_PER_WITHDRAWALS_SWEEP, MAX_WITHDRAWALS_PER_PAYLOAD, MIN_ACTIVATION_BALANCE, } from "@lodestar/params";
3
3
  import { ssz } from "@lodestar/types";
4
- import { MapDef, toRootHex } from "@lodestar/utils";
4
+ import { toRootHex } from "@lodestar/utils";
5
5
  import { isBuilderPaymentWithdrawable, isParentBlockFull } from "../util/gloas.js";
6
6
  import { decreaseBalance, getMaxEffectiveBalance, hasEth1WithdrawalCredential, hasExecutionWithdrawalCredential, isCapellaPayloadHeader, } from "../util/index.js";
7
7
  export function processWithdrawals(fork, state, payload) {
@@ -9,9 +9,10 @@ export function processWithdrawals(fork, state, payload) {
9
9
  if (fork >= ForkSeq.gloas && !isParentBlockFull(state)) {
10
10
  return;
11
11
  }
12
- // processedPartialWithdrawalsCount is withdrawals coming from EL since electra (EIP-7002)
13
12
  // processedBuilderWithdrawalsCount is withdrawals coming from builder payment since gloas (EIP-7732)
14
- const { withdrawals: expectedWithdrawals, processedPartialWithdrawalsCount, processedBuilderWithdrawalsCount, } = getExpectedWithdrawals(fork, state);
13
+ // processedPartialWithdrawalsCount is withdrawals coming from EL since electra (EIP-7002)
14
+ // processedValidatorSweepCount is withdrawals coming from validator sweep
15
+ const { expectedWithdrawals, processedBuilderWithdrawalsCount, processedPartialWithdrawalsCount } = getExpectedWithdrawals(fork, state);
15
16
  const numWithdrawals = expectedWithdrawals.length;
16
17
  // After gloas, withdrawals are verified later in processExecutionPayloadEnvelope
17
18
  if (fork < ForkSeq.gloas) {
@@ -37,11 +38,9 @@ export function processWithdrawals(fork, state, payload) {
37
38
  }
38
39
  }
39
40
  }
40
- for (let i = 0; i < numWithdrawals; i++) {
41
- const withdrawal = expectedWithdrawals[i];
42
- decreaseBalance(state, withdrawal.validatorIndex, Number(withdrawal.amount));
43
- }
41
+ applyWithdrawals(state, expectedWithdrawals);
44
42
  if (fork >= ForkSeq.electra) {
43
+ // https://github.com/ethereum/consensus-specs/blob/v1.7.0-alpha.0/specs/electra/beacon-chain.md#new-update_pending_partial_withdrawals
45
44
  const stateElectra = state;
46
45
  stateElectra.pendingPartialWithdrawals = stateElectra.pendingPartialWithdrawals.sliceFrom(processedPartialWithdrawalsCount);
47
46
  }
@@ -61,10 +60,12 @@ export function processWithdrawals(fork, state, payload) {
61
60
  ]);
62
61
  }
63
62
  // Update the nextWithdrawalIndex
63
+ // https://github.com/ethereum/consensus-specs/blob/v1.7.0-alpha.0/specs/capella/beacon-chain.md#new-update_next_withdrawal_index
64
64
  const latestWithdrawal = expectedWithdrawals.at(-1);
65
65
  if (latestWithdrawal) {
66
66
  state.nextWithdrawalIndex = latestWithdrawal.index + 1;
67
67
  }
68
+ // https://github.com/ethereum/consensus-specs/blob/v1.7.0-alpha.0/specs/capella/beacon-chain.md#new-update_next_withdrawal_validator_index
68
69
  // Update the nextWithdrawalValidatorIndex
69
70
  if (latestWithdrawal && expectedWithdrawals.length === MAX_WITHDRAWALS_PER_PAYLOAD) {
70
71
  // All slots filled, nextWithdrawalValidatorIndex should be validatorIndex having next turn
@@ -77,110 +78,119 @@ export function processWithdrawals(fork, state, payload) {
77
78
  (state.nextWithdrawalValidatorIndex + MAX_VALIDATORS_PER_WITHDRAWALS_SWEEP) % state.validators.length;
78
79
  }
79
80
  }
80
- export function getExpectedWithdrawals(fork, state) {
81
- if (fork < ForkSeq.capella) {
82
- throw new Error(`getExpectedWithdrawals not supported at forkSeq=${fork} < ForkSeq.capella`);
83
- }
81
+ function getBuilderWithdrawals(state, withdrawalIndex, balanceAfterWithdrawals) {
82
+ const builderWithdrawals = [];
84
83
  const epoch = state.epochCtx.epoch;
85
- let withdrawalIndex = state.nextWithdrawalIndex;
86
- const { validators, balances, nextWithdrawalValidatorIndex } = state;
87
- const withdrawals = [];
88
- const withdrawnBalances = new MapDef(() => 0);
89
- const isPostElectra = fork >= ForkSeq.electra;
90
- const isPostGloas = fork >= ForkSeq.gloas;
91
- // partialWithdrawalsCount is withdrawals coming from EL since electra (EIP-7002)
92
- let processedPartialWithdrawalsCount = 0;
93
- // builderWithdrawalsCount is withdrawals coming from builder payments since Gloas (EIP-7732)
94
- let processedBuilderWithdrawalsCount = 0;
95
- if (isPostGloas) {
96
- const stateGloas = state;
97
- const allBuilderPendingWithdrawals = stateGloas.builderPendingWithdrawals.length <= MAX_WITHDRAWALS_PER_PAYLOAD
98
- ? stateGloas.builderPendingWithdrawals.getAllReadonly()
99
- : null;
100
- for (let i = 0; i < stateGloas.builderPendingWithdrawals.length; i++) {
101
- const withdrawal = allBuilderPendingWithdrawals
102
- ? allBuilderPendingWithdrawals[i]
103
- : stateGloas.builderPendingWithdrawals.getReadonly(i);
104
- if (withdrawal.withdrawableEpoch > epoch || withdrawals.length + 1 === MAX_WITHDRAWALS_PER_PAYLOAD) {
105
- break;
84
+ const allBuilderPendingWithdrawals = state.builderPendingWithdrawals.length <= MAX_WITHDRAWALS_PER_PAYLOAD
85
+ ? state.builderPendingWithdrawals.getAllReadonly()
86
+ : null;
87
+ let processedCount = 0;
88
+ for (let i = 0; i < state.builderPendingWithdrawals.length; i++) {
89
+ const withdrawal = allBuilderPendingWithdrawals
90
+ ? allBuilderPendingWithdrawals[i]
91
+ : state.builderPendingWithdrawals.getReadonly(i);
92
+ if (withdrawal.withdrawableEpoch > epoch || builderWithdrawals.length === MAX_WITHDRAWALS_PER_PAYLOAD) {
93
+ break;
94
+ }
95
+ if (isBuilderPaymentWithdrawable(state, withdrawal)) {
96
+ const builderIndex = withdrawal.builderIndex;
97
+ const builder = state.validators.get(withdrawal.builderIndex);
98
+ let balance = balanceAfterWithdrawals.get(builderIndex);
99
+ if (balance === undefined) {
100
+ balance = state.balances.get(builderIndex);
101
+ balanceAfterWithdrawals.set(builderIndex, balance);
106
102
  }
107
- if (isBuilderPaymentWithdrawable(stateGloas, withdrawal)) {
108
- const totalWithdrawn = withdrawnBalances.getOrDefault(withdrawal.builderIndex);
109
- const balance = state.balances.get(withdrawal.builderIndex) - totalWithdrawn;
110
- const builder = state.validators.get(withdrawal.builderIndex);
111
- let withdrawableBalance = 0;
112
- if (builder.slashed) {
113
- withdrawableBalance = balance < withdrawal.amount ? balance : withdrawal.amount;
114
- }
115
- else if (balance > MIN_ACTIVATION_BALANCE) {
116
- withdrawableBalance =
117
- balance - MIN_ACTIVATION_BALANCE < withdrawal.amount ? balance - MIN_ACTIVATION_BALANCE : withdrawal.amount;
118
- }
119
- if (withdrawableBalance > 0) {
120
- withdrawals.push({
121
- index: withdrawalIndex,
122
- validatorIndex: withdrawal.builderIndex,
123
- address: withdrawal.feeRecipient,
124
- amount: BigInt(withdrawableBalance),
125
- });
126
- withdrawalIndex++;
127
- withdrawnBalances.set(withdrawal.builderIndex, totalWithdrawn + withdrawableBalance);
128
- }
103
+ let withdrawableBalance = 0;
104
+ if (builder.slashed) {
105
+ withdrawableBalance = balance < withdrawal.amount ? balance : withdrawal.amount;
129
106
  }
130
- processedBuilderWithdrawalsCount++;
131
- }
132
- }
133
- if (isPostElectra) {
134
- // In pre-gloas, partialWithdrawalBound == MAX_PENDING_PARTIALS_PER_WITHDRAWALS_SWEEP
135
- const partialWithdrawalBound = Math.min(withdrawals.length + MAX_PENDING_PARTIALS_PER_WITHDRAWALS_SWEEP, MAX_WITHDRAWALS_PER_PAYLOAD - 1);
136
- const stateElectra = state;
137
- // MAX_PENDING_PARTIALS_PER_WITHDRAWALS_SWEEP = 8, PENDING_PARTIAL_WITHDRAWALS_LIMIT: 134217728 so we should only call getAllReadonly() if it makes sense
138
- // pendingPartialWithdrawals comes from EIP-7002 smart contract where it takes fee so it's more likely than not validator is in correct condition to withdraw
139
- // also we may break early if withdrawableEpoch > epoch
140
- const allPendingPartialWithdrawals = stateElectra.pendingPartialWithdrawals.length <= partialWithdrawalBound
141
- ? stateElectra.pendingPartialWithdrawals.getAllReadonly()
142
- : null;
143
- // EIP-7002: Execution layer triggerable withdrawals
144
- for (let i = 0; i < stateElectra.pendingPartialWithdrawals.length; i++) {
145
- const withdrawal = allPendingPartialWithdrawals
146
- ? allPendingPartialWithdrawals[i]
147
- : stateElectra.pendingPartialWithdrawals.getReadonly(i);
148
- if (withdrawal.withdrawableEpoch > epoch || withdrawals.length === partialWithdrawalBound) {
149
- break;
107
+ else if (balance > MIN_ACTIVATION_BALANCE) {
108
+ withdrawableBalance =
109
+ balance - MIN_ACTIVATION_BALANCE < withdrawal.amount ? balance - MIN_ACTIVATION_BALANCE : withdrawal.amount;
150
110
  }
151
- const validator = validators.getReadonly(withdrawal.validatorIndex);
152
- const totalWithdrawn = withdrawnBalances.getOrDefault(withdrawal.validatorIndex);
153
- const balance = state.balances.get(withdrawal.validatorIndex) - totalWithdrawn;
154
- if (validator.exitEpoch === FAR_FUTURE_EPOCH &&
155
- validator.effectiveBalance >= MIN_ACTIVATION_BALANCE &&
156
- balance > MIN_ACTIVATION_BALANCE) {
157
- const balanceOverMinActivationBalance = BigInt(balance - MIN_ACTIVATION_BALANCE);
158
- const withdrawableBalance = balanceOverMinActivationBalance < withdrawal.amount ? balanceOverMinActivationBalance : withdrawal.amount;
159
- withdrawals.push({
111
+ if (withdrawableBalance > 0) {
112
+ builderWithdrawals.push({
160
113
  index: withdrawalIndex,
161
- validatorIndex: withdrawal.validatorIndex,
162
- address: validator.withdrawalCredentials.subarray(12),
163
- amount: withdrawableBalance,
114
+ validatorIndex: withdrawal.builderIndex,
115
+ address: withdrawal.feeRecipient,
116
+ amount: BigInt(withdrawableBalance),
164
117
  });
165
118
  withdrawalIndex++;
166
- withdrawnBalances.set(withdrawal.validatorIndex, totalWithdrawn + Number(withdrawableBalance));
119
+ balanceAfterWithdrawals.set(builderIndex, balance - withdrawableBalance);
167
120
  }
168
- processedPartialWithdrawalsCount++;
169
121
  }
122
+ processedCount++;
170
123
  }
171
- const withdrawalBound = Math.min(validators.length, MAX_VALIDATORS_PER_WITHDRAWALS_SWEEP);
172
- let n = 0;
124
+ return { builderWithdrawals, withdrawalIndex, processedCount };
125
+ }
126
+ function getPendingPartialWithdrawals(state, withdrawalIndex, numPriorWithdrawal, balanceAfterWithdrawals) {
127
+ const epoch = state.epochCtx.epoch;
128
+ const pendingPartialWithdrawals = [];
129
+ const validators = state.validators;
130
+ // In pre-gloas, partialWithdrawalBound == MAX_PENDING_PARTIALS_PER_WITHDRAWALS_SWEEP
131
+ const partialWithdrawalBound = Math.min(numPriorWithdrawal + MAX_PENDING_PARTIALS_PER_WITHDRAWALS_SWEEP, MAX_WITHDRAWALS_PER_PAYLOAD - 1);
132
+ // MAX_PENDING_PARTIALS_PER_WITHDRAWALS_SWEEP = 8, PENDING_PARTIAL_WITHDRAWALS_LIMIT: 134217728 so we should only call getAllReadonly() if it makes sense
133
+ // pendingPartialWithdrawals comes from EIP-7002 smart contract where it takes fee so it's more likely than not validator is in correct condition to withdraw
134
+ // also we may break early if withdrawableEpoch > epoch
135
+ const allPendingPartialWithdrawals = state.pendingPartialWithdrawals.length <= partialWithdrawalBound
136
+ ? state.pendingPartialWithdrawals.getAllReadonly()
137
+ : null;
138
+ // EIP-7002: Execution layer triggerable withdrawals
139
+ let processedCount = 0;
140
+ for (let i = 0; i < state.pendingPartialWithdrawals.length; i++) {
141
+ const withdrawal = allPendingPartialWithdrawals
142
+ ? allPendingPartialWithdrawals[i]
143
+ : state.pendingPartialWithdrawals.getReadonly(i);
144
+ if (withdrawal.withdrawableEpoch > epoch ||
145
+ pendingPartialWithdrawals.length + numPriorWithdrawal === partialWithdrawalBound) {
146
+ break;
147
+ }
148
+ const validatorIndex = withdrawal.validatorIndex;
149
+ const validator = validators.getReadonly(validatorIndex);
150
+ let balance = balanceAfterWithdrawals.get(validatorIndex);
151
+ if (balance === undefined) {
152
+ balance = state.balances.get(validatorIndex);
153
+ balanceAfterWithdrawals.set(validatorIndex, balance);
154
+ }
155
+ if (validator.exitEpoch === FAR_FUTURE_EPOCH &&
156
+ validator.effectiveBalance >= MIN_ACTIVATION_BALANCE &&
157
+ balance > MIN_ACTIVATION_BALANCE) {
158
+ const balanceOverMinActivationBalance = BigInt(balance - MIN_ACTIVATION_BALANCE);
159
+ const withdrawableBalance = balanceOverMinActivationBalance < withdrawal.amount ? balanceOverMinActivationBalance : withdrawal.amount;
160
+ pendingPartialWithdrawals.push({
161
+ index: withdrawalIndex,
162
+ validatorIndex,
163
+ address: validator.withdrawalCredentials.subarray(12),
164
+ amount: withdrawableBalance,
165
+ });
166
+ withdrawalIndex++;
167
+ balanceAfterWithdrawals.set(validatorIndex, balance - Number(withdrawableBalance));
168
+ }
169
+ processedCount++;
170
+ }
171
+ return { pendingPartialWithdrawals, withdrawalIndex, processedCount };
172
+ }
173
+ function getValidatorsSweepWithdrawals(fork, state, withdrawalIndex, numPriorWithdrawal, balanceAfterWithdrawals) {
174
+ const sweepWithdrawals = [];
175
+ const epoch = state.epochCtx.epoch;
176
+ const { validators, balances, nextWithdrawalValidatorIndex } = state;
177
+ const isPostElectra = fork >= ForkSeq.electra;
178
+ const validatorsLimit = Math.min(state.validators.length, MAX_VALIDATORS_PER_WITHDRAWALS_SWEEP);
179
+ let processedCount = 0;
173
180
  // Just run a bounded loop max iterating over all withdrawals
174
181
  // however breaks out once we have MAX_WITHDRAWALS_PER_PAYLOAD
175
- for (n = 0; n < withdrawalBound; n++) {
182
+ for (let n = 0; n < validatorsLimit; n++) {
183
+ if (sweepWithdrawals.length + numPriorWithdrawal === MAX_WITHDRAWALS_PER_PAYLOAD) {
184
+ break;
185
+ }
176
186
  // Get next validator in turn
177
187
  const validatorIndex = (nextWithdrawalValidatorIndex + n) % validators.length;
178
188
  const validator = validators.getReadonly(validatorIndex);
179
- const withdrawnBalance = withdrawnBalances.getOrDefault(validatorIndex);
180
- const balance = isPostElectra
181
- ? // Deduct partially withdrawn balance already queued above
182
- balances.get(validatorIndex) - withdrawnBalance
183
- : balances.get(validatorIndex);
189
+ let balance = balanceAfterWithdrawals.get(validatorIndex);
190
+ if (balance === undefined) {
191
+ balance = balances.get(validatorIndex);
192
+ balanceAfterWithdrawals.set(validatorIndex, balance);
193
+ }
184
194
  const { withdrawableEpoch, withdrawalCredentials, effectiveBalance } = validator;
185
195
  const hasWithdrawableCredentials = isPostElectra
186
196
  ? hasExecutionWithdrawalCredential(withdrawalCredentials)
@@ -188,37 +198,74 @@ export function getExpectedWithdrawals(fork, state) {
188
198
  // early skip for balance = 0 as its now more likely that validator has exited/slashed with
189
199
  // balance zero than not have withdrawal credentials set
190
200
  if (balance === 0 || !hasWithdrawableCredentials) {
201
+ processedCount++;
191
202
  continue;
192
203
  }
193
204
  // capella full withdrawal
194
205
  if (withdrawableEpoch <= epoch) {
195
- withdrawals.push({
206
+ sweepWithdrawals.push({
196
207
  index: withdrawalIndex,
197
208
  validatorIndex,
198
209
  address: validator.withdrawalCredentials.subarray(12),
199
210
  amount: BigInt(balance),
200
211
  });
201
212
  withdrawalIndex++;
202
- withdrawnBalances.set(validatorIndex, withdrawnBalance + balance);
213
+ balanceAfterWithdrawals.set(validatorIndex, 0);
203
214
  }
204
215
  else if (effectiveBalance === (isPostElectra ? getMaxEffectiveBalance(withdrawalCredentials) : MAX_EFFECTIVE_BALANCE) &&
205
216
  balance > effectiveBalance) {
206
217
  // capella partial withdrawal
207
218
  const partialAmount = balance - effectiveBalance;
208
- withdrawals.push({
219
+ sweepWithdrawals.push({
209
220
  index: withdrawalIndex,
210
221
  validatorIndex,
211
222
  address: validator.withdrawalCredentials.subarray(12),
212
223
  amount: BigInt(partialAmount),
213
224
  });
214
225
  withdrawalIndex++;
215
- withdrawnBalances.set(validatorIndex, withdrawnBalance + partialAmount);
216
- }
217
- // Break if we have enough to pack the block
218
- if (withdrawals.length >= MAX_WITHDRAWALS_PER_PAYLOAD) {
219
- break;
226
+ balanceAfterWithdrawals.set(validatorIndex, balance - partialAmount);
220
227
  }
228
+ processedCount++;
229
+ }
230
+ return { sweepWithdrawals, processedCount };
231
+ }
232
+ function applyWithdrawals(state, withdrawals) {
233
+ for (const withdrawal of withdrawals) {
234
+ decreaseBalance(state, withdrawal.validatorIndex, Number(withdrawal.amount));
235
+ }
236
+ }
237
+ export function getExpectedWithdrawals(fork, state) {
238
+ if (fork < ForkSeq.capella) {
239
+ throw new Error(`getExpectedWithdrawals not supported at forkSeq=${fork} < ForkSeq.capella`);
240
+ }
241
+ let withdrawalIndex = state.nextWithdrawalIndex;
242
+ const expectedWithdrawals = [];
243
+ // Map to track balances after applying withdrawals
244
+ // https://github.com/ethereum/consensus-specs/blob/v1.7.0-alpha.0/specs/capella/beacon-chain.md#new-get_balance_after_withdrawals
245
+ const balanceAfterWithdrawals = new Map();
246
+ // partialWithdrawalsCount is withdrawals coming from EL since electra (EIP-7002)
247
+ let processedPartialWithdrawalsCount = 0;
248
+ // builderWithdrawalsCount is withdrawals coming from builder payments since Gloas (EIP-7732)
249
+ let processedBuilderWithdrawalsCount = 0;
250
+ if (fork >= ForkSeq.gloas) {
251
+ const { builderWithdrawals, withdrawalIndex: newWithdrawalIndex, processedCount, } = getBuilderWithdrawals(state, withdrawalIndex, balanceAfterWithdrawals);
252
+ expectedWithdrawals.push(...builderWithdrawals);
253
+ withdrawalIndex = newWithdrawalIndex;
254
+ processedBuilderWithdrawalsCount = processedCount;
255
+ }
256
+ if (fork >= ForkSeq.electra) {
257
+ const { pendingPartialWithdrawals, withdrawalIndex: newWithdrawalIndex, processedCount, } = getPendingPartialWithdrawals(state, withdrawalIndex, expectedWithdrawals.length, balanceAfterWithdrawals);
258
+ expectedWithdrawals.push(...pendingPartialWithdrawals);
259
+ withdrawalIndex = newWithdrawalIndex;
260
+ processedPartialWithdrawalsCount = processedCount;
221
261
  }
222
- return { withdrawals, sampledValidators: n, processedPartialWithdrawalsCount, processedBuilderWithdrawalsCount };
262
+ const { sweepWithdrawals, processedCount: processedValidatorSweepCount } = getValidatorsSweepWithdrawals(fork, state, withdrawalIndex, expectedWithdrawals.length, balanceAfterWithdrawals);
263
+ expectedWithdrawals.push(...sweepWithdrawals);
264
+ return {
265
+ expectedWithdrawals,
266
+ processedBuilderWithdrawalsCount,
267
+ processedPartialWithdrawalsCount,
268
+ processedValidatorSweepCount,
269
+ };
223
270
  }
224
271
  //# sourceMappingURL=processWithdrawals.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"processWithdrawals.js","sourceRoot":"","sources":["../../src/block/processWithdrawals.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"processWithdrawals.js","sourceRoot":"","sources":["../../src/block/processWithdrawals.ts"],"names":[],"mappings":"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"}
@@ -5,24 +5,24 @@ import { ForkSeq } from "@lodestar/params";
5
5
  import { Attestation, BLSSignature, CommitteeIndex, Epoch, IndexedAttestation, RootHex, Slot, SubnetID, SyncPeriod, ValidatorIndex, gloas, phase0 } from "@lodestar/types";
6
6
  import { LodestarError } from "@lodestar/utils";
7
7
  import { AttesterDuty } from "../util/calculateCommitteeAssignments.js";
8
- import { EpochShuffling, IShufflingCache } from "../util/epochShuffling.js";
8
+ import { EpochShuffling } from "../util/epochShuffling.js";
9
9
  import { EffectiveBalanceIncrements } from "./effectiveBalanceIncrements.js";
10
10
  import { EpochTransitionCache } from "./epochTransitionCache.js";
11
11
  import { Index2PubkeyCache } from "./pubkeyCache.js";
12
12
  import { CachedBeaconStateAllForks } from "./stateCache.js";
13
13
  import { SyncCommitteeCache } from "./syncCommitteeCache.js";
14
- import { BeaconStateAllForks } from "./types.js";
14
+ import { BeaconStateAllForks, ShufflingGetter } from "./types.js";
15
15
  /** `= PROPOSER_WEIGHT / (WEIGHT_DENOMINATOR - PROPOSER_WEIGHT)` */
16
16
  export declare const PROPOSER_WEIGHT_FACTOR: number;
17
17
  export type EpochCacheImmutableData = {
18
18
  config: BeaconConfig;
19
19
  pubkey2index: PubkeyIndexMap;
20
20
  index2pubkey: Index2PubkeyCache;
21
- shufflingCache?: IShufflingCache;
22
21
  };
23
22
  export type EpochCacheOpts = {
24
23
  skipSyncCommitteeCache?: boolean;
25
24
  skipSyncPubkeys?: boolean;
25
+ shufflingGetter?: ShufflingGetter;
26
26
  };
27
27
  /** Defers computing proposers by persisting only the seed, and dropping it once indexes are computed */
28
28
  type ProposersDeferred = {
@@ -68,11 +68,6 @@ export declare class EpochCache {
68
68
  * $VALIDATOR_COUNT x BLST deserialized pubkey (Jacobian coordinates)
69
69
  */
70
70
  index2pubkey: Index2PubkeyCache;
71
- /**
72
- * ShufflingCache is passed in from `beacon-node` so should be available at runtime but may not be
73
- * present during testing.
74
- */
75
- shufflingCache?: IShufflingCache;
76
71
  /**
77
72
  * Indexes of the block proposers for the current epoch.
78
73
  * For pre-fulu, this is computed and cached from the current shuffling.
@@ -108,7 +103,7 @@ export declare class EpochCache {
108
103
  /** Same as previousShuffling */
109
104
  currentShuffling: EpochShuffling;
110
105
  /** Same as previousShuffling */
111
- nextShuffling: EpochShuffling | null;
106
+ nextShuffling: EpochShuffling;
112
107
  /**
113
108
  * Cache nextActiveIndices so that in afterProcessEpoch the next shuffling can be build synchronously
114
109
  * in case it is not built or the ShufflingCache is not available
@@ -187,7 +182,6 @@ export declare class EpochCache {
187
182
  config: BeaconConfig;
188
183
  pubkey2index: PubkeyIndexMap;
189
184
  index2pubkey: Index2PubkeyCache;
190
- shufflingCache?: IShufflingCache;
191
185
  proposers: number[];
192
186
  proposersPrevEpoch: number[] | null;
193
187
  proposersNextEpoch: ProposersDeferred;
@@ -196,7 +190,7 @@ export declare class EpochCache {
196
190
  nextDecisionRoot: RootHex;
197
191
  previousShuffling: EpochShuffling;
198
192
  currentShuffling: EpochShuffling;
199
- nextShuffling: EpochShuffling | null;
193
+ nextShuffling: EpochShuffling;
200
194
  nextActiveIndices: Uint32Array;
201
195
  effectiveBalanceIncrements: EffectiveBalanceIncrements;
202
196
  totalSlashingsByIncrement: number;
@@ -222,7 +216,7 @@ export declare class EpochCache {
222
216
  *
223
217
  * SLOW CODE - 🐢
224
218
  */
225
- static createFromState(state: BeaconStateAllForks, { config, pubkey2index, index2pubkey, shufflingCache }: EpochCacheImmutableData, opts?: EpochCacheOpts): EpochCache;
219
+ static createFromState(state: BeaconStateAllForks, { config, pubkey2index, index2pubkey }: EpochCacheImmutableData, opts?: EpochCacheOpts): EpochCache;
226
220
  /**
227
221
  * Copies a given EpochCache while avoiding copying its immutable parts.
228
222
  */
@@ -1 +1 @@
1
- {"version":3,"file":"epochCache.d.ts","sourceRoot":"","sources":["../../src/cache/epochCache.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"epochCache.d.ts","sourceRoot":"","sources":["../../src/cache/epochCache.ts"],"names":[],"mappings":"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"}