feat: implement maxEB EIP-7251 #6539

ensi321 · 2024-03-13T09:56:02Z

maxeb impl for devnet0

packages/beacon-node/src/chain/chain.ts

packages/beacon-node/src/chain/regen/queued.ts

twoeths · 2024-05-06T04:08:25Z

packages/state-transition/src/block/processDeposit.ts

+        index: cachedIndex,
+        amount: BigInt(amount),
+      });
+      stateElectra.pendingBalanceDeposits.push(pendingBalanceDeposit);


so we add new PendingBalanceDeposit with amount but inside switchToCompoundingValidator() we also add another excess PendingBalanceDeposit with balance - MIN_ACTIVATION_BALANCE

is it correct to add 2 PendingBalanceDeposit for a single deposit? it's not an issue of our implementation just a question for the spec

seems to be correct, so balance - MIN_ACTIVATION_BALANCE is the excess which would have been partially withdrawan, but is not queued to add to balance deposits

packages/state-transition/src/block/processExecutionLayerWithdrawalRequest.ts

packages/state-transition/src/block/processOperations.ts

packages/state-transition/src/block/processWithdrawals.ts

twoeths · 2024-05-06T07:30:53Z

packages/state-transition/src/block/processWithdrawals.ts

+        withdrawals.push({
+          index: withdrawalIndex,
+          validatorIndex: withdrawal.index,
+          address: validator.withdrawalCredentials.slice(12),


use subarray() instead

packages/state-transition/src/util/electra.ts

packages/beacon-node/src/chain/produceBlock/produceBlockBody.ts

* Add immutable in the dependencies * Initial change to pubkeyCache * Added todos * Moved unfinalized cache to epochCache * Move populating finalized cache to afterProcessEpoch * Specify unfinalized cache during state cloning * Move from unfinalized to finalized cache in afterProcessEpoch * Confused myself * Clean up * Change logic * Fix cloning issue * Clean up redundant code * Add CarryoverData in epochCtx.createFromState * Fix typo * Update usage of pubkeyCache * Update pubkeyCache usage * Fix lint * Fix lint * Add 6110 to ChainConfig * Add 6110 to BeaconPreset * Define 6110 fork and container * Add V6110 api to execution engine * Update test * Add depositReceiptsRoot to process_execution_payload * State transitioning to EIP6110 * State transitioning to EIP6110 * Light client change in EIP-6110 * Update tests * produceBlock * Refactor processDeposit to match the spec * Implement processDepositReceipt * Implement 6110 fork guard for pubkeyCache * Handle changes in eth1 deposit * Update eth1 deposit test * Fix typo * Lint * Remove embarassing comments * Address comments * Modify applyDeposit signature * Update packages/state-transition/src/cache/epochCache.ts Co-authored-by: Lion - dapplion <35266934+dapplion@users.noreply.github.com> * Update packages/state-transition/src/cache/epochCache.ts Co-authored-by: Lion - dapplion <35266934+dapplion@users.noreply.github.com> * Update packages/state-transition/src/cache/pubkeyCache.ts Co-authored-by: Lion - dapplion <35266934+dapplion@users.noreply.github.com> * Remove old code * Rename fields in epochCache and immutableData * Remove CarryoverData * Move isAfter6110 from var to method * Fix cyclic import * Fix operations spec runner * Fix for spec test * Fix spec test * state.depositReceiptsStartIndex to BigInt * getDeposit requires cached state * default depositReceiptsStartIndex value in genesis * Fix pubkeyCache bug * newUnfinalizedPubkeyIndexMap in createCachedBeaconState * Lint * Pass epochCache instead of pubkey2IndexFn in apis * Address comments * Add unit test on pubkey cache cloning * Add unfinalizedPubkeyCacheSize to metrics * Add unfinalizedPubkeyCacheSize to metrics * Clean up code * Add besu to el-interop * Add 6110 genesis file * Template for sim test * Add unit test for getEth1DepositCount * Update sim test * Update besudocker * Finish beacon api calls in sim test * Update epochCache.createFromState() * Fix bug unfinalized validators are not finalized * Add sim test to run a few blocks * Lint * Merge branch 'unstable' into 611 * Add more check to sim test * Update besu docker image instruction * Update sim test with correct tx * Address comment + cleanup * Clean up code * Properly handle promise rejection * Lint * Update packages/beacon-node/src/execution/engine/types.ts Co-authored-by: Lion - dapplion <35266934+dapplion@users.noreply.github.com> * Update comments * Accept type undefined in ExecutionPayloadBodyRpc * Update comment and semantic * Remove if statement when adding finalized validator * Comment on repeated insert on finalized cache * rename createFromState * Add comment on getPubkey() * Stash change to reduce diffs * Stash change to reduce diffs * Lint * addFinalizedPubkey on finalized checkpoint * Update comment * Use OrderedMap for unfinalized cache * Pull out logic of deleting pubkeys for batch op * Add updateUnfinalizedPubkeys in regen * Update updateUnfinalizedPubkeys logic * Add comment * Add metrics for state context caches * Address comment * Address comment * Deprecate eth1Data polling when condition is reached * Fix conflicts * Fix sim test * Lint * Fix type * Fix test * Fix test * Lint * Update packages/light-client/src/spec/utils.ts Co-authored-by: Lion - dapplion <35266934+dapplion@users.noreply.github.com> * Fix spec test * Address comments * Improve cache logic on checkpoint finalized * Update sim test according to new cache logic * Update comment * Lint * Finalized pubkey cache only update once per checkpoint * Add perf test for updateUnfinalizedPubkeys * Add perf test for updateUnfinalizedPubkeys * Tweak params for perf test * Freeze besu docker image version for 6110 * Add benchmark result * Use Map instead of OrderedMap. Update benchmark * Minor optimization * Minor optimization * Add memory test for immutable.js * Update test * Reduce code duplication * Lint * Remove try/catch in updateUnfinalizedPubkeys * Introduce EpochCache metric * Add historicalValidatorLengths * Polish code * Migrate state-transition unit tests to vitest * Fix calculation of pivot index * `historicalValidatorLengths` only activate post 6110 * Update sim test * Lint * Update packages/state-transition/src/cache/epochCache.ts Co-authored-by: Lion - dapplion <35266934+dapplion@users.noreply.github.com> * Improve readability on historicalValidatorLengths * Update types * Fix calculation * Add eth1data poll todo * Add epochCache.getValidatorCountAtEpoch * Add todo * Add getStateIterator for state cache * Partial commit * Update perf test * updateUnfinalizedPubkeys directly modify states from regen * Update sim test. Lint * Add todo * some improvements and a fix for effectiveBalanceIncrements fork safeness * rename eip6110 to elctra * fix electra-interop.test.ts --------- Co-authored-by: Lion - dapplion <35266934+dapplion@users.noreply.github.com> Co-authored-by: gajinder <develop@g11tech.io> lint and tsc small cleanup fix rebase issue

* Add immutable in the dependencies * Initial change to pubkeyCache * Added todos * Moved unfinalized cache to epochCache * Move populating finalized cache to afterProcessEpoch * Specify unfinalized cache during state cloning * Move from unfinalized to finalized cache in afterProcessEpoch * Confused myself * Clean up * Change logic * Fix cloning issue * Clean up redundant code * Add CarryoverData in epochCtx.createFromState * Fix typo * Update usage of pubkeyCache * Update pubkeyCache usage * Fix lint * Fix lint * Add 6110 to ChainConfig * Add 6110 to BeaconPreset * Define 6110 fork and container * Add V6110 api to execution engine * Update test * Add depositReceiptsRoot to process_execution_payload * State transitioning to EIP6110 * State transitioning to EIP6110 * Light client change in EIP-6110 * Update tests * produceBlock * Refactor processDeposit to match the spec * Implement processDepositReceipt * Implement 6110 fork guard for pubkeyCache * Handle changes in eth1 deposit * Update eth1 deposit test * Fix typo * Lint * Remove embarassing comments * Address comments * Modify applyDeposit signature * Update packages/state-transition/src/cache/epochCache.ts Co-authored-by: Lion - dapplion <35266934+dapplion@users.noreply.github.com> * Update packages/state-transition/src/cache/epochCache.ts Co-authored-by: Lion - dapplion <35266934+dapplion@users.noreply.github.com> * Update packages/state-transition/src/cache/pubkeyCache.ts Co-authored-by: Lion - dapplion <35266934+dapplion@users.noreply.github.com> * Remove old code * Rename fields in epochCache and immutableData * Remove CarryoverData * Move isAfter6110 from var to method * Fix cyclic import * Fix operations spec runner * Fix for spec test * Fix spec test * state.depositReceiptsStartIndex to BigInt * getDeposit requires cached state * default depositReceiptsStartIndex value in genesis * Fix pubkeyCache bug * newUnfinalizedPubkeyIndexMap in createCachedBeaconState * Lint * Pass epochCache instead of pubkey2IndexFn in apis * Address comments * Add unit test on pubkey cache cloning * Add unfinalizedPubkeyCacheSize to metrics * Add unfinalizedPubkeyCacheSize to metrics * Clean up code * Add besu to el-interop * Add 6110 genesis file * Template for sim test * Add unit test for getEth1DepositCount * Update sim test * Update besudocker * Finish beacon api calls in sim test * Update epochCache.createFromState() * Fix bug unfinalized validators are not finalized * Add sim test to run a few blocks * Lint * Merge branch 'unstable' into 611 * Add more check to sim test * Update besu docker image instruction * Update sim test with correct tx * Address comment + cleanup * Clean up code * Properly handle promise rejection * Lint * Update packages/beacon-node/src/execution/engine/types.ts Co-authored-by: Lion - dapplion <35266934+dapplion@users.noreply.github.com> * Update comments * Accept type undefined in ExecutionPayloadBodyRpc * Update comment and semantic * Remove if statement when adding finalized validator * Comment on repeated insert on finalized cache * rename createFromState * Add comment on getPubkey() * Stash change to reduce diffs * Stash change to reduce diffs * Lint * addFinalizedPubkey on finalized checkpoint * Update comment * Use OrderedMap for unfinalized cache * Pull out logic of deleting pubkeys for batch op * Add updateUnfinalizedPubkeys in regen * Update updateUnfinalizedPubkeys logic * Add comment * Add metrics for state context caches * Address comment * Address comment * Deprecate eth1Data polling when condition is reached * Fix conflicts * Fix sim test * Lint * Fix type * Fix test * Fix test * Lint * Update packages/light-client/src/spec/utils.ts Co-authored-by: Lion - dapplion <35266934+dapplion@users.noreply.github.com> * Fix spec test * Address comments * Improve cache logic on checkpoint finalized * Update sim test according to new cache logic * Update comment * Lint * Finalized pubkey cache only update once per checkpoint * Add perf test for updateUnfinalizedPubkeys * Add perf test for updateUnfinalizedPubkeys * Tweak params for perf test * Freeze besu docker image version for 6110 * Add benchmark result * Use Map instead of OrderedMap. Update benchmark * Minor optimization * Minor optimization * Add memory test for immutable.js * Update test * Reduce code duplication * Lint * Remove try/catch in updateUnfinalizedPubkeys * Introduce EpochCache metric * Add historicalValidatorLengths * Polish code * Migrate state-transition unit tests to vitest * Fix calculation of pivot index * `historicalValidatorLengths` only activate post 6110 * Update sim test * Lint * Update packages/state-transition/src/cache/epochCache.ts Co-authored-by: Lion - dapplion <35266934+dapplion@users.noreply.github.com> * Improve readability on historicalValidatorLengths * Update types * Fix calculation * Add eth1data poll todo * Add epochCache.getValidatorCountAtEpoch * Add todo * Add getStateIterator for state cache * Partial commit * Update perf test * updateUnfinalizedPubkeys directly modify states from regen * Update sim test. Lint * Add todo * some improvements and a fix for effectiveBalanceIncrements fork safeness * rename eip6110 to elctra * fix electra-interop.test.ts --------- Co-authored-by: Lion - dapplion <35266934+dapplion@users.noreply.github.com> Co-authored-by: gajinder <develop@g11tech.io> lint and tsc small cleanup

twoeths · 2024-05-06T08:56:14Z

packages/state-transition/src/block/processDeposit.ts

+    const stateElectra = state as CachedBeaconStateElectra;
+    const pendingBalanceDeposit = ssz.electra.PendingBalanceDeposit.toViewDU({
+      index: validatorIndex,
+      amount: BigInt(amount),


is it needed to model amount as BigInt? in processPendingBalanceDeposits() we need to cast it to Number anyway:

for (const deposit of state.pendingBalanceDeposits.getAllReadonly()) { const {amount} = deposit; if (processedAmount + amount > availableForProcessing) { break; } increaseBalance(state, deposit.index, Number(amount)); processedAmount = processedAmount + amount; nextDepositIndex++; }

twoeths · 2024-05-06T09:00:25Z

packages/state-transition/src/block/processDepositReceipt.ts

+  depositReceipt: electra.DepositReceipt
+): void {
+  if (state.depositReceiptsStartIndex === UNSET_DEPOSIT_RECEIPTS_START_INDEX) {
+    state.depositReceiptsStartIndex = BigInt(depositReceipt.index);


do not use BigInt unless it's really necessary due to performance reason

will review and do a followup of the the new amount types and indexes

lint

subarry

g11tech

lgtm for the electra fork branch, any issues to be fixed will followup PRs on debugging or observations

ensi321 added the status-do-not-merge Merging this issue will break the build. Do not merge! label Mar 13, 2024

g11tech force-pushed the electra-fork branch from 6050e5f to 8f5388d Compare March 13, 2024 16:35

ensi321 mentioned this pull request Mar 14, 2024

Electra tracker #6341

Open

31 tasks

g11tech force-pushed the electra-fork branch from 8f5388d to 990cb1c Compare March 16, 2024 13:08

ensi321 force-pushed the nc/maxeb branch 2 times, most recently from 7df70ee to 02cb2dc Compare April 1, 2024 09:17

g11tech force-pushed the electra-fork branch 2 times, most recently from 8a4f66e to 473a04f Compare April 11, 2024 11:12

ensi321 force-pushed the nc/maxeb branch from 026fca6 to 20fb641 Compare April 12, 2024 13:42

ensi321 force-pushed the nc/maxeb branch from 7d2980f to afde7b7 Compare April 30, 2024 09:38

g11tech force-pushed the electra-fork branch from b19abdf to 46ae715 Compare May 4, 2024 18:11

twoeths reviewed May 6, 2024

View reviewed changes

packages/beacon-node/src/chain/chain.ts Outdated Show resolved Hide resolved

twoeths reviewed May 6, 2024

View reviewed changes

packages/beacon-node/src/chain/regen/queued.ts Outdated Show resolved Hide resolved

twoeths reviewed May 6, 2024

View reviewed changes

packages/state-transition/src/block/processExecutionLayerWithdrawalRequest.ts Outdated Show resolved Hide resolved

twoeths reviewed May 6, 2024

View reviewed changes

packages/state-transition/src/block/processExecutionLayerWithdrawalRequest.ts Outdated Show resolved Hide resolved

twoeths reviewed May 6, 2024

View reviewed changes

packages/state-transition/src/block/processOperations.ts Show resolved Hide resolved

twoeths reviewed May 6, 2024

View reviewed changes

packages/state-transition/src/block/processWithdrawals.ts Outdated Show resolved Hide resolved

twoeths reviewed May 6, 2024

View reviewed changes

packages/state-transition/src/util/electra.ts Outdated Show resolved Hide resolved

twoeths reviewed May 6, 2024

View reviewed changes

packages/beacon-node/src/chain/produceBlock/produceBlockBody.ts Outdated Show resolved Hide resolved

ensi321 and others added 9 commits May 6, 2024 13:45

Add presets

62c76df

Update config

9f1efb2

Add necessary containers

2e0ba78

Update presets

4879368

Update config

e931b18

Add todo comments

9ff94c5

Update constants and params

6ea4e2d

ensi321 and others added 7 commits May 6, 2024 13:56

Update maxEB

ef15bc2

update voluntary exit

5c16ff3

Fix config

2a967fe

Update initiateValidatorExit

2349afa

Remove churn limit in processRegistryUpdates

5646fd5

Fix conflict

ffb5ad1

Add MAX_WITHDRAWAL_REQUESTS_PER_PAYLOAD

bb29c54

twoeths reviewed May 6, 2024

View reviewed changes

Reflect latest spec changes

5aba7f4

twoeths reviewed May 6, 2024

View reviewed changes

g11tech force-pushed the nc/maxeb branch 4 times, most recently from 33c153c to 57c8aaa Compare May 6, 2024 11:04

g11tech removed the status-do-not-merge Merging this issue will break the build. Do not merge! label May 6, 2024

rebase fixes, fixes, improvements and cleanup

271b7c5

lint

g11tech force-pushed the nc/maxeb branch from 57c8aaa to 271b7c5 Compare May 6, 2024 12:12

ensi321 and others added 3 commits May 7, 2024 10:33

Upgrade ssz version

2f6df3d

Use sliceFrom()

a5b5fe0

cleanup as per specs feedback

fa066f4

subarry

g11tech force-pushed the nc/maxeb branch from 93fabdc to fa066f4 Compare May 7, 2024 13:01

simplify

51eaa3e

ensi321 marked this pull request as ready for review May 7, 2024 17:56

ensi321 requested a review from a team as a code owner May 7, 2024 17:56

g11tech added 3 commits May 7, 2024 23:32

fix withdrawals

4a7d167

remove slice

5ca66e2

fix the slashing quotient determination in slashvalidator

d5c4c92

g11tech approved these changes May 7, 2024

View reviewed changes

g11tech merged commit b1efc6e into electra-fork May 7, 2024
13 of 17 checks passed

g11tech deleted the nc/maxeb branch May 7, 2024 18:18

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: implement maxEB EIP-7251 #6539

feat: implement maxEB EIP-7251 #6539

ensi321 commented Mar 13, 2024 •

edited by g11tech

twoeths May 6, 2024

g11tech May 7, 2024

twoeths May 6, 2024

twoeths May 6, 2024

twoeths May 6, 2024

g11tech May 7, 2024

g11tech left a comment

feat: implement maxEB EIP-7251 #6539

feat: implement maxEB EIP-7251 #6539

Conversation

ensi321 commented Mar 13, 2024 • edited by g11tech

twoeths May 6, 2024

Choose a reason for hiding this comment

g11tech May 7, 2024

Choose a reason for hiding this comment

twoeths May 6, 2024

Choose a reason for hiding this comment

twoeths May 6, 2024

Choose a reason for hiding this comment

twoeths May 6, 2024

Choose a reason for hiding this comment

g11tech May 7, 2024

Choose a reason for hiding this comment

g11tech left a comment

Choose a reason for hiding this comment

ensi321 commented Mar 13, 2024 •

edited by g11tech