chore: remove merge transition code

bindings/napi/transition_opts.zig

@@ -14,7 +14,7 @@ const st = @import("state_transition");
 /// Recognized fields:
 /// - `verifyStateRoot`, `verifyProposer`, `verifySignatures`: bool
 /// - `dontTransferCache`: bool (negated to set `transfer_cache`)
-/// - `executionPayloadStatus`: "valid" | "invalid" | "preMerge"
+/// - `executionPayloadStatus`: "valid" | "invalid"
 /// - `dataAvailabilityStatus`: "Available" | "PreData" | "OutOfRange"
 ///
 /// Throws `error.InvalidExecutionPayloadStatus` / `error.InvalidDataAvailabilityStatus`
@@ -47,8 +47,6 @@ pub fn parseOptions(options: ?js.Value) !st.TransitionOpts {
                         .valid
                     else if (std.mem.eql(u8, status_str, "invalid"))
                         .invalid
-                    else if (std.mem.eql(u8, status_str, "preMerge"))
-                        .pre_merge
                     else
                         return error.InvalidExecutionPayloadStatus;
             }

bindings/src/index.d.ts

@@ -280,8 +280,6 @@ export declare class BeaconStateView {
 
   isExecutionStateType: boolean;
   isMergeTransitionComplete: boolean;
-  /** True iff state is pre-merge AND the given block carries a non-default execution payload. Bellatrix-only. */
-  isMergeTransitionBlock(signedBlockBytes: Uint8Array): boolean;
   /**
    * Check whether execution is enabled for the given block at this state.
    *

src/state_transition/block/process_blob_kzg_commitments.zig

@@ -1,11 +1,8 @@
 const BlockExternalData = @import("../state_transition.zig").BlockExternalData;
 
 pub fn processBlobKzgCommitments(external_data: BlockExternalData) !void {
-    switch (external_data.execution_payload_status) {
-        .pre_merge => return error.ExecutionPayloadStatusPreMerge,
-        .invalid => return error.InvalidExecutionPayload,
-        // ok
-        else => {},
+    if (external_data.execution_payload_status == .invalid) {
+        return error.InvalidExecutionPayload;
     }
 }
 

src/state_transition/block/process_execution_payload.zig

@@ -75,9 +75,7 @@ pub fn processExecutionPayload(
     // the state transition sync
     //
     // Equivalent to `assert executionEngine.notifyNewPayload(payload)
-    if (external_data.execution_payload_status == .pre_merge) {
-        return error.ExecutionPayloadStatusPreMerge;
-    } else if (external_data.execution_payload_status == .invalid) {
+    if (external_data.execution_payload_status == .invalid) {
         return error.InvalidExecutionPayload;
     }
 

src/state_transition/root.zig

@@ -90,7 +90,6 @@ pub const AnchorCheckpoint = @import("./AnchorCheckpoint.zig");
 pub const deinitStateTransition = @import("./state_transition.zig").deinitStateTransition;
 pub const isExecutionEnabled = @import("./utils/execution.zig").isExecutionEnabled;
 pub const isMergeTransitionComplete = @import("./utils/execution.zig").isMergeTransitionComplete;
-pub const isMergeTransitionBlock = @import("./utils/execution.zig").isMergeTransitionBlock;
 pub const getRandaoMix = @import("./utils/seed.zig").getRandaoMix;
 pub const getEffectiveBalanceIncrementsZeroInactive = @import("./utils/balance.zig").getEffectiveBalanceIncrementsZeroInactive;
 

src/state_transition/state_transition.zig

@@ -31,7 +31,6 @@ const upgradeStateToElectra = @import("slot/upgrade_state_to_electra.zig").upgra
 const upgradeStateToFulu = @import("slot/upgrade_state_to_fulu.zig").upgradeStateToFulu;
 
 pub const ExecutionPayloadStatus = enum(u8) {
-    pre_merge,
     invalid,
     valid,
 };

src/state_transition/utils/execution.zig

@@ -23,32 +23,6 @@ pub fn isExecutionEnabled(comptime fork: ForkSeq, state: *BeaconState(fork), com
     }
 }
 
-pub fn isMergeTransitionBlock(
-    comptime fork: ForkSeq,
-    state: *BeaconState(fork),
-    comptime block_type: BlockType,
-    body: *const BeaconBlockBody(block_type, fork),
-) bool {
-    if (comptime fork != .bellatrix) {
-        return false;
-    }
-
-    if (isMergeTransitionComplete(fork, state)) {
-        return false;
-    }
-
-    return switch (block_type) {
-        .full => !ForkTypes(fork).ExecutionPayload.equals(
-            &body.executionPayload().inner,
-            &ForkTypes(fork).ExecutionPayload.default_value,
-        ),
-        .blinded => !ForkTypes(fork).ExecutionPayloadHeader.equals(
-            &body.executionPayloadHeader().inner,
-            &ForkTypes(fork).ExecutionPayloadHeader.default_value,
-        ),
-    };
-}
-
 pub fn isMergeTransitionComplete(comptime fork: ForkSeq, state: *BeaconState(fork)) bool {
     if (comptime fork.lt(.bellatrix)) {
         return false;