feat: add inclusion lists for censorship resistance

packages/beacon-node/src/api/impl/config/constants.ts

@@ -18,6 +18,7 @@ import {
   DOMAIN_SYNC_COMMITTEE_SELECTION_PROOF,
   DOMAIN_CONTRIBUTION_AND_PROOF,
   DOMAIN_BLS_TO_EXECUTION_CHANGE,
+  DOMAIN_INCLUSION_LIST_SUMMARY,
   DOMAIN_APPLICATION_BUILDER,
   TIMELY_SOURCE_FLAG_INDEX,
   TIMELY_TARGET_FLAG_INDEX,
@@ -100,4 +101,6 @@ export const specConstants = {
   // Deneb types
   BLOB_TX_TYPE,
   VERSIONED_HASH_VERSION_KZG,
+
+  DOMAIN_INCLUSION_LIST_SUMMARY,
 };

packages/beacon-node/test/spec/presets/fork.test.ts

@@ -5,6 +5,7 @@ import {
   CachedBeaconStateAltair,
   CachedBeaconStatePhase0,
   CachedBeaconStateCapella,
+  CachedBeaconStateDeneb,
 } from "@lodestar/state-transition";
 import * as slotFns from "@lodestar/state-transition/slot";
 import {phase0, ssz} from "@lodestar/types";
@@ -36,7 +37,7 @@ const fork: TestRunnerFn<ForkStateCase, BeaconStateAllForks> = (forkNext) => {
         case ForkName.deneb:
           return slotFns.upgradeStateToDeneb(preState as CachedBeaconStateCapella);
         case ForkName.electra:
-          throw Error("not Implemented");
+          return slotFns.upgradeStateToElectra(preState as CachedBeaconStateDeneb);
       }
     },
     options: {

packages/params/src/forkName.ts

@@ -45,3 +45,9 @@ export type ForkBlobs = Exclude<ForkName, ForkPreBlobs>;
 export function isForkBlobs(fork: ForkName): fork is ForkBlobs {
   return isForkWithdrawals(fork) && fork !== ForkName.capella;
 }
+
+export type ForkPreILs = ForkPreBlobs | ForkName.deneb;
+export type ForkILs = Exclude<ForkName, ForkPreILs>;
+export function isForkILs(fork: ForkName): fork is ForkILs {
+  return isForkBlobs(fork) && fork !== ForkName.deneb;
+}

packages/params/src/index.ts

@@ -128,7 +128,7 @@ export const DOMAIN_SYNC_COMMITTEE = Uint8Array.from([7, 0, 0, 0]);
 export const DOMAIN_SYNC_COMMITTEE_SELECTION_PROOF = Uint8Array.from([8, 0, 0, 0]);
 export const DOMAIN_CONTRIBUTION_AND_PROOF = Uint8Array.from([9, 0, 0, 0]);
 export const DOMAIN_BLS_TO_EXECUTION_CHANGE = Uint8Array.from([10, 0, 0, 0]);
-export const DOMAIN_BLOB_SIDECAR = Uint8Array.from([11, 0, 0, 0]);
+export const DOMAIN_INCLUSION_LIST_SUMMARY = Uint8Array.from([11, 0, 0, 0]);
 
 // Application specific domains
 
@@ -244,3 +244,6 @@ export const KZG_COMMITMENT_SUBTREE_INDEX0 = KZG_COMMITMENT_GINDEX0 - 2 ** KZG_C
 
 // ssz.deneb.BlobSidecars.elementType.fixedSize
 export const BLOBSIDECAR_FIXED_SIZE = ACTIVE_PRESET === PresetName.minimal ? 131672 : 131928;
+
+// might be rounded to nearest power of 2
+export const MAX_TRANSACTIONS_PER_INCLUSION_LIST = 143;

packages/state-transition/src/cache/stateCache.ts

@@ -11,6 +11,7 @@ import {
   BeaconStateBellatrix,
   BeaconStateCapella,
   BeaconStateDeneb,
+  BeaconStateElectra,
 } from "./types.js";
 import {RewardCache, createEmptyRewardCache} from "./rewardCache.js";
 
@@ -131,6 +132,7 @@ export type CachedBeaconStateAltair = CachedBeaconState<BeaconStateAltair>;
 export type CachedBeaconStateBellatrix = CachedBeaconState<BeaconStateBellatrix>;
 export type CachedBeaconStateCapella = CachedBeaconState<BeaconStateCapella>;
 export type CachedBeaconStateDeneb = CachedBeaconState<BeaconStateDeneb>;
+export type CachedBeaconStateElectra = CachedBeaconState<BeaconStateElectra>;
 
 export type CachedBeaconStateAllForks = CachedBeaconState<BeaconStateAllForks>;
 export type CachedBeaconStateExecutions = CachedBeaconState<BeaconStateExecutions>;

packages/state-transition/src/cache/types.ts

@@ -7,6 +7,7 @@ export type BeaconStateAltair = CompositeViewDU<typeof ssz.altair.BeaconState>;
 export type BeaconStateBellatrix = CompositeViewDU<typeof ssz.bellatrix.BeaconState>;
 export type BeaconStateCapella = CompositeViewDU<typeof ssz.capella.BeaconState>;
 export type BeaconStateDeneb = CompositeViewDU<typeof ssz.deneb.BeaconState>;
+export type BeaconStateElectra = CompositeViewDU<typeof ssz.electra.BeaconState>;
 
 // Union at the TreeViewDU level
 // - Works well as function argument and as generic type for allForks functions
@@ -18,8 +19,9 @@ export type BeaconStateAllForks =
   | BeaconStateAltair
   | BeaconStateBellatrix
   | BeaconStateCapella
-  | BeaconStateDeneb;
+  | BeaconStateDeneb
+  | BeaconStateElectra;
 
-export type BeaconStateExecutions = BeaconStateBellatrix | BeaconStateCapella | BeaconStateDeneb;
+export type BeaconStateExecutions = BeaconStateBellatrix | BeaconStateCapella | BeaconStateDeneb | BeaconStateElectra;
 
 export type ShufflingGetter = (shufflingEpoch: Epoch, dependentRoot: RootHex) => EpochShuffling | null;

packages/state-transition/src/slot/index.ts

@@ -7,6 +7,7 @@ export {upgradeStateToAltair} from "./upgradeStateToAltair.js";
 export {upgradeStateToBellatrix} from "./upgradeStateToBellatrix.js";
 export {upgradeStateToCapella} from "./upgradeStateToCapella.js";
 export {upgradeStateToDeneb} from "./upgradeStateToDeneb.js";
+export {upgradeStateToElectra} from "./upgradeStateToElectra.js";
 
 /**
  * Dial state to next slot. Common for all forks

packages/state-transition/src/slot/upgradeStateToElectra.ts

@@ -0,0 +1,36 @@
+import {ssz} from "@lodestar/types";
+import {getCachedBeaconState} from "../cache/stateCache.js";
+import {CachedBeaconStateDeneb} from "../types.js";
+import {CachedBeaconStateElectra} from "../types.js";
+
+/**
+ * Upgrade a state from Capella to Deneb.
+ */
+export function upgradeStateToElectra(stateDeneb: CachedBeaconStateDeneb): CachedBeaconStateElectra {
+  const {config} = stateDeneb;
+
+  const stateDenebNode = ssz.deneb.BeaconState.commitViewDU(stateDeneb);
+  const stateElectraView = ssz.electra.BeaconState.getViewDU(stateDenebNode);
+
+  const stateElectra = getCachedBeaconState(stateElectraView, stateDeneb);
+
+  stateElectra.fork = ssz.phase0.Fork.toViewDU({
+    previousVersion: stateDeneb.fork.currentVersion,
+    currentVersion: config.ELECTRA_FORK_VERSION,
+    epoch: stateDeneb.epochCtx.epoch,
+  });
+
+  // TODO ELECTRA: check if this is following is required, since it seemed to be an issue in deneb state u[grade
+  // (see upgradeStateToDeneb)
+  //
+  // stateElectra.latestExecutionPayloadHeader = ssz.electra.BeaconState.fields.latestExecutionPayloadHeader.toViewDU({
+  //   ...stateDeneb.latestExecutionPayloadHeader.toValue(),
+  //   previousInclusionListSummaryRoot: ssz.Root.defaultValue(),
+  // });
+
+  stateElectra.commit();
+  // Clear cache to ensure the cache of capella fields is not used by new deneb fields
+  stateElectra["clearCache"]();
+
+  return stateElectra;
+}

packages/state-transition/src/stateTransition.ts

@@ -9,6 +9,7 @@ import {
   CachedBeaconStateAltair,
   CachedBeaconStateBellatrix,
   CachedBeaconStateCapella,
+  CachedBeaconStateDeneb,
 } from "./types.js";
 import {computeEpochAtSlot} from "./util/index.js";
 import {verifyProposerSignature} from "./signatureSets/index.js";
@@ -18,6 +19,7 @@ import {
   upgradeStateToBellatrix,
   upgradeStateToCapella,
   upgradeStateToDeneb,
+  upgradeStateToElectra,
 } from "./slot/index.js";
 import {processBlock} from "./block/index.js";
 import {EpochTransitionStep, processEpoch} from "./epoch/index.js";
@@ -230,6 +232,9 @@ function processSlotsWithTransientCache(
       if (stateSlot === config.DENEB_FORK_EPOCH) {
         postState = upgradeStateToDeneb(postState as CachedBeaconStateCapella) as CachedBeaconStateAllForks;
       }
+      if (stateSlot === config.ELECTRA_FORK_EPOCH) {
+        postState = upgradeStateToElectra(postState as CachedBeaconStateDeneb) as CachedBeaconStateAllForks;
+      }
     } else {
       postState.slot++;
     }

packages/state-transition/src/types.ts

@@ -9,6 +9,7 @@ export type {
   CachedBeaconStateBellatrix,
   CachedBeaconStateCapella,
   CachedBeaconStateDeneb,
+  CachedBeaconStateElectra,
 } from "./cache/stateCache.js";
 
 export type {
@@ -19,4 +20,5 @@ export type {
   BeaconStateBellatrix,
   BeaconStateCapella,
   BeaconStateDeneb,
+  BeaconStateElectra,
 } from "./cache/types.js";

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

@@ -214,6 +214,7 @@ export function initializeBeaconStateFromEth1(
     | typeof ssz.bellatrix.ExecutionPayloadHeader
     | typeof ssz.capella.ExecutionPayloadHeader
     | typeof ssz.deneb.ExecutionPayloadHeader
+    | typeof ssz.electra.ExecutionPayloadHeader
   >
 ): CachedBeaconStateAllForks {
   const stateView = getGenesisBeaconState(
@@ -284,6 +285,15 @@ export function initializeBeaconStateFromEth1(
       ssz.deneb.ExecutionPayloadHeader.defaultViewDU();
   }
 
+  if (GENESIS_SLOT >= config.ELECTRA_FORK_EPOCH) {
+    const stateElectra = state as CompositeViewDU<typeof ssz.electra.BeaconState>;
+    stateElectra.fork.previousVersion = config.ELECTRA_FORK_VERSION;
+    stateElectra.fork.currentVersion = config.ELECTRA_FORK_VERSION;
+    stateElectra.latestExecutionPayloadHeader =
+      (executionPayloadHeader as CompositeViewDU<typeof ssz.electra.ExecutionPayloadHeader>) ??
+      ssz.electra.ExecutionPayloadHeader.defaultViewDU();
+  }
+
   state.commit();
 
   return state;

packages/state-transition/test/unit/upgradeState.test.ts

@@ -5,6 +5,7 @@ import {createBeaconConfig, ChainForkConfig, createChainForkConfig} from "@lodes
 import {config as chainConfig} from "@lodestar/config/default";
 
 import {upgradeStateToDeneb} from "../../src/slot/upgradeStateToDeneb.js";
+import {upgradeStateToElectra} from "../../src/slot/upgradeStateToElectra.js";
 import {createCachedBeaconState} from "../../src/cache/stateCache.js";
 import {PubkeyIndexMap} from "../../src/cache/pubkeyCache.js";
 
@@ -24,6 +25,21 @@ describe("upgradeState", () => {
     const newState = upgradeStateToDeneb(stateView);
     expect(() => newState.toValue()).not.toThrow();
   });
+  it("upgradeStateToElectra", () => {
+    const denebState = ssz.deneb.BeaconState.defaultViewDU();
+    const config = getConfig(ForkName.deneb);
+    const stateView = createCachedBeaconState(
+      denebState,
+      {
+        config: createBeaconConfig(config, denebState.genesisValidatorsRoot),
+        pubkey2index: new PubkeyIndexMap(),
+        index2pubkey: [],
+      },
+      {skipSyncCommitteeCache: true}
+    );
+    const newState = upgradeStateToElectra(stateView);
+    expect(() => newState.toValue()).not.toThrow();
+  });
 });
 
 const ZERO_HASH = Buffer.alloc(32, 0);

packages/types/src/allForks/sszTypes.ts

@@ -192,7 +192,7 @@ export const allForksBlobs = {
     ExecutionPayloadAndBlobsBundle: deneb.ExecutionPayloadAndBlobsBundle,
   },
   electra: {
-    BlobSidecar: electra.BlobSidecar,
+    BlobSidecar: deneb.BlobSidecar,
     ExecutionPayloadAndBlobsBundle: electra.ExecutionPayloadAndBlobsBundle,
   },
 };