-
-
Notifications
You must be signed in to change notification settings - Fork 290
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat: add EL triggered consolidation and remove
ExecutionLayer pref…
…ix (#6865) * init commit * Add consolidation request * fix lint * Remove ExecutionLayer prefix * Address comment * Fix verification logic * lint * Add todo
- Loading branch information
Showing
20 changed files
with
144 additions
and
272 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
111 changes: 0 additions & 111 deletions
111
packages/state-transition/src/block/processConsolidation.ts
This file was deleted.
Oops, something went wrong.
74 changes: 74 additions & 0 deletions
74
packages/state-transition/src/block/processConsolidationRequest.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,74 @@ | ||
| import {electra, ssz} from "@lodestar/types"; | ||
| import {FAR_FUTURE_EPOCH, MIN_ACTIVATION_BALANCE, PENDING_CONSOLIDATIONS_LIMIT} from "@lodestar/params"; | ||
|
|
||
| import {CachedBeaconStateElectra} from "../types.js"; | ||
| import {getConsolidationChurnLimit, isActiveValidator} from "../util/validator.js"; | ||
| import {hasExecutionWithdrawalCredential} from "../util/electra.js"; | ||
| import {computeConsolidationEpochAndUpdateChurn} from "../util/epoch.js"; | ||
|
|
||
| export function processConsolidationRequest( | ||
| state: CachedBeaconStateElectra, | ||
| consolidationRequest: electra.ConsolidationRequest | ||
| ): void { | ||
|
|
||
| // If the pending consolidations queue is full, consolidation requests are ignored | ||
| if (state.pendingConsolidations.length >= PENDING_CONSOLIDATIONS_LIMIT) { | ||
| return; | ||
| } | ||
|
|
||
| // If there is too little available consolidation churn limit, consolidation requests are ignored | ||
| if (getConsolidationChurnLimit(state) <= MIN_ACTIVATION_BALANCE) { | ||
| return; | ||
| } | ||
|
|
||
| const {sourcePubkey, targetPubkey} = consolidationRequest; | ||
| const sourceIndex = state.epochCtx.getValidatorIndex(sourcePubkey); | ||
| const targetIndex = state.epochCtx.getValidatorIndex(targetPubkey); | ||
|
|
||
| if (sourceIndex === undefined || targetIndex === undefined) { | ||
| return; | ||
| } | ||
|
|
||
| // Verify that source != target, so a consolidation cannot be used as an exit. | ||
| if (sourceIndex === targetIndex){ | ||
| return; | ||
| } | ||
|
|
||
| const sourceValidator = state.validators.getReadonly(sourceIndex); | ||
| const targetValidator = state.validators.getReadonly(targetIndex); | ||
| const sourceWithdrawalAddress = sourceValidator.withdrawalCredentials.subarray(12); | ||
| const currentEpoch = state.epochCtx.epoch; | ||
|
|
||
| // Verify withdrawal credentials | ||
| if ( | ||
| !hasExecutionWithdrawalCredential(sourceValidator.withdrawalCredentials) || | ||
| !hasExecutionWithdrawalCredential(targetValidator.withdrawalCredentials) | ||
| ) { | ||
| return; | ||
| } | ||
|
|
||
| if (Buffer.compare(sourceWithdrawalAddress, consolidationRequest.sourceAddress) !== 0) { | ||
| return; | ||
| } | ||
|
|
||
| // Verify the source and the target are active | ||
| if (!isActiveValidator(sourceValidator, currentEpoch) || !isActiveValidator(targetValidator, currentEpoch)) { | ||
| return; | ||
| } | ||
|
|
||
| // Verify exits for source and target have not been initiated | ||
| if (sourceValidator.exitEpoch !== FAR_FUTURE_EPOCH || targetValidator.exitEpoch !== FAR_FUTURE_EPOCH) { | ||
| return; | ||
| } | ||
|
|
||
| // TODO Electra: See if we can get rid of big int | ||
| const exitEpoch = computeConsolidationEpochAndUpdateChurn(state, BigInt(sourceValidator.effectiveBalance)); | ||
| sourceValidator.exitEpoch = exitEpoch; | ||
| sourceValidator.withdrawableEpoch = exitEpoch + state.config.MIN_VALIDATOR_WITHDRAWABILITY_DELAY; | ||
|
|
||
| const pendingConsolidation = ssz.electra.PendingConsolidation.toViewDU({ | ||
| sourceIndex, | ||
| targetIndex, | ||
| }); | ||
| state.pendingConsolidations.push(pendingConsolidation); | ||
| } |
Oops, something went wrong.