rebase fixes

ChainSafe · Aug 1, 2023 · ca236e9 · ca236e9
1 parent 83799df
commit ca236e9
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 5 deletions.
diff --git a/packages/beacon-node/test/spec/presets/transition.ts b/packages/beacon-node/test/spec/presets/transition.ts
@@ -98,7 +98,7 @@ function getTransitionConfig(fork: ForkName, forkEpoch: number): Partial<ChainCo
     case ForkName.capella:
       return {ALTAIR_FORK_EPOCH: 0, BELLATRIX_FORK_EPOCH: 0, CAPELLA_FORK_EPOCH: forkEpoch};
     case ForkName.deneb:
-      return {ALTAIR_FORK_EPOCH: 0, BELLATRIX_FORK_EPOCH: 0, CAPELLA_FORK_EPOCH: 0, EIP4844_FORK_EPOCH: forkEpoch};
+      return {ALTAIR_FORK_EPOCH: 0, BELLATRIX_FORK_EPOCH: 0, CAPELLA_FORK_EPOCH: 0, DENEB_FORK_EPOCH: forkEpoch};
     case ForkName.verge:
       return {
         ALTAIR_FORK_EPOCH: 0,

diff --git a/packages/beacon-node/test/utils/config.ts b/packages/beacon-node/test/utils/config.ts
@@ -36,7 +36,7 @@ export function getConfig(fork: ForkName, forkEpoch = 0): ChainForkConfig {
         ALTAIR_FORK_EPOCH: 0,
         BELLATRIX_FORK_EPOCH: 0,
         CAPELLA_FORK_EPOCH: 0,
-        EIP4844_FORK_EPOCH: 0,
+        DENEB_FORK_EPOCH: 0,
         VERGE_FORK_EPOCH: forkEpoch,
       });
   }

diff --git a/packages/config/src/forkConfig/index.ts b/packages/config/src/forkConfig/index.ts
@@ -55,12 +55,12 @@ export function createForkConfig(config: ChainConfig): ForkConfig {
     prevVersion: config.CAPELLA_FORK_VERSION,
     prevForkName: ForkName.capella,
   };
-  const verge: IForkInfo = {
+  const verge: ForkInfo = {
     name: ForkName.verge,
     seq: ForkSeq.verge,
     epoch: config.VERGE_FORK_EPOCH,
     version: config.VERGE_FORK_VERSION,
-    prevVersion: config.EIP4844_FORK_VERSION,
+    prevVersion: config.DENEB_FORK_VERSION,
     prevForkName: ForkName.deneb,
   };
 

diff --git a/packages/state-transition/src/slot/upgradeStateToVerge.ts b/packages/state-transition/src/slot/upgradeStateToVerge.ts
@@ -15,7 +15,7 @@ export function upgradeStateToVerge(stateDeneb: CachedBeaconStateDeneb): CachedB
 
   stateVerge.fork = ssz.phase0.Fork.toViewDU({
     previousVersion: stateDeneb.fork.currentVersion,
-    currentVersion: config.EIP4844_FORK_VERSION,
+    currentVersion: config.DENEB_FORK_VERSION,
     epoch: stateDeneb.epochCtx.epoch,
   });
 

diff --git a/packages/types/src/allForks/sszTypes.ts b/packages/types/src/allForks/sszTypes.ts
@@ -102,6 +102,7 @@ export const allForksExecution = {
     ExecutionPayloadHeader: verge.ExecutionPayloadHeader,
     BuilderBid: deneb.BuilderBid,
     SignedBuilderBid: deneb.SignedBuilderBid,
+    SSEPayloadAttributes: deneb.SSEPayloadAttributes,
   },
 };