fix:change to data class

Signed-off-by: Chen Kai <[email protected]>
optimism-java · Oct 7, 2024 · 640e4b4 · 640e4b4
1 parent 5b8eb8a
commit 640e4b4
Show file tree

Hide file tree

Showing 12 changed files with 650 additions and 832 deletions.
diff --git a/src/consensus/altair/types.zig b/src/consensus/altair/types.zig
@@ -98,11 +98,11 @@ pub const BeaconBlockBody = @Type(
     },
 );
 
-pub const BeaconStateSSZ = @Type(
+pub const BeaconState = @Type(
     .{
         .@"struct" = .{
             .layout = .auto,
-            .fields = @typeInfo(phase0.BeaconStateSSZ).@"struct".fields ++ &[_]std.builtin.Type.StructField{
+            .fields = @typeInfo(phase0.BeaconState).@"struct".fields ++ &[_]std.builtin.Type.StructField{
                 .{
                     .name = "inactivity_scores",
                     .type = []u64,
@@ -131,53 +131,8 @@ pub const BeaconStateSSZ = @Type(
     },
 );
 
-pub const BeaconState = struct {
-    beacon_state_ssz: BeaconStateSSZ,
-    allocator: std.mem.Allocator,
-
-    pub fn init(allocator: std.mem.Allocator, beacon_state_ssz: BeaconStateSSZ) !BeaconState {
-        return BeaconState{
-            .beacon_state_ssz = beacon_state_ssz,
-            .allocator = allocator,
-        };
-    }
-
-    pub fn deinit(self: *BeaconState) void {
-        self.allocator.free(self.beacon_state_ssz.validators);
-        self.allocator.free(self.beacon_state_ssz.balances);
-        self.allocator.free(self.beacon_state_ssz.randao_mixes);
-        self.allocator.free(self.beacon_state_ssz.slashings);
-        self.allocator.free(self.beacon_state_ssz.previous_epoch_attestations);
-        self.allocator.free(self.beacon_state_ssz.current_epoch_attestations);
-        self.allocator.free(self.beacon_state_ssz.justification_bits);
-        self.allocator.destroy(self.beacon_state_ssz.previous_justified_checkpoint);
-        self.allocator.destroy(self.beacon_state_ssz.current_justified_checkpoint);
-        if (self.beacon_state_ssz.finalized_checkpoint) |checkpoint| {
-            self.allocator.destroy(checkpoint);
-        }
-        self.allocator.destroy(self.beacon_state_ssz.fork);
-        if (self.beacon_state_ssz.latest_block_header) |latest_block_header| {
-            self.allocator.destroy(latest_block_header);
-        }
-        self.allocator.free(self.beacon_state_ssz.block_roots);
-        self.allocator.free(self.beacon_state_ssz.state_roots);
-        self.allocator.free(self.beacon_state_ssz.historical_roots);
-        if (self.beacon_state_ssz.eth1_data) |eth1_data| {
-            self.allocator.destroy(eth1_data);
-        }
-        self.allocator.free(self.beacon_state_ssz.eth1_data_votes);
-        self.allocator.free(self.beacon_state_ssz.inactivity_scores);
-        if (self.beacon_state_ssz.current_sync_committee) |current_sync_committee| {
-            self.allocator.destroy(current_sync_committee);
-        }
-        if (self.beacon_state_ssz.next_sync_committee) |next_sync_committee| {
-            self.allocator.destroy(next_sync_committee);
-        }
-    }
-};
-
 test "test BeaconState" {
-    const state = BeaconStateSSZ{
+    const state = BeaconState{
         .genesis_time = 0,
         .genesis_validators_root = undefined,
         .slot = 0,

diff --git a/src/consensus/bellatrix/types.zig b/src/consensus/bellatrix/types.zig
@@ -66,11 +66,11 @@ pub const BeaconBlockBody = @Type(
     },
 );
 
-pub const BeaconStateSSZ = @Type(
+pub const BeaconState = @Type(
     .{
         .@"struct" = .{
             .layout = .auto,
-            .fields = @typeInfo(altair.BeaconStateSSZ).@"struct".fields ++ &[_]std.builtin.Type.StructField{
+            .fields = @typeInfo(altair.BeaconState).@"struct".fields ++ &[_]std.builtin.Type.StructField{
                 .{
                     .name = "latest_execution_payload_header",
                     .type = ?*consensus.ExecutionPayloadHeader,
@@ -85,54 +85,6 @@ pub const BeaconStateSSZ = @Type(
     },
 );
 
-pub const BeaconState = struct {
-    beacon_state_ssz: BeaconStateSSZ,
-    allocator: std.mem.Allocator,
-
-    pub fn init(allocator: std.mem.Allocator, beacon_state_ssz: BeaconStateSSZ) !BeaconState {
-        return BeaconState{
-            .beacon_state_ssz = beacon_state_ssz,
-            .allocator = allocator,
-        };
-    }
-
-    pub fn deinit(self: *BeaconState) void {
-        self.allocator.free(self.beacon_state_ssz.validators);
-        self.allocator.free(self.beacon_state_ssz.balances);
-        self.allocator.free(self.beacon_state_ssz.randao_mixes);
-        self.allocator.free(self.beacon_state_ssz.slashings);
-        self.allocator.free(self.beacon_state_ssz.previous_epoch_attestations);
-        self.allocator.free(self.beacon_state_ssz.current_epoch_attestations);
-        self.allocator.free(self.beacon_state_ssz.justification_bits);
-        self.allocator.destroy(self.beacon_state_ssz.previous_justified_checkpoint);
-        self.allocator.destroy(self.beacon_state_ssz.current_justified_checkpoint);
-        if (self.beacon_state_ssz.finalized_checkpoint) |checkpoint| {
-            self.allocator.destroy(checkpoint);
-        }
-        self.allocator.destroy(self.beacon_state_ssz.fork);
-        if (self.beacon_state_ssz.latest_block_header) |latest_block_header| {
-            self.allocator.destroy(latest_block_header);
-        }
-        self.allocator.free(self.beacon_state_ssz.block_roots);
-        self.allocator.free(self.beacon_state_ssz.state_roots);
-        self.allocator.free(self.beacon_state_ssz.historical_roots);
-        if (self.beacon_state_ssz.eth1_data) |eth1_data| {
-            self.allocator.destroy(eth1_data);
-        }
-        self.allocator.free(self.beacon_state_ssz.eth1_data_votes);
-        self.allocator.free(self.beacon_state_ssz.inactivity_scores);
-        if (self.beacon_state_ssz.current_sync_committee) |current_sync_committee| {
-            self.allocator.destroy(current_sync_committee);
-        }
-        if (self.beacon_state_ssz.next_sync_committee) |next_sync_committee| {
-            self.allocator.destroy(next_sync_committee);
-        }
-        if (self.beacon_state_ssz.latest_execution_payload_header) |latest_execution_payload_header| {
-            self.allocator.destroy(latest_execution_payload_header);
-        }
-    }
-};
-
 test "test ExecutionPayloadHeader" {
     const header = ExecutionPayloadHeader{
         .parent_hash = undefined,
@@ -194,7 +146,7 @@ test "test BeaconBlockBody" {
 }
 
 test "test BeaconState" {
-    const state = BeaconStateSSZ{
+    const state = BeaconState{
         .genesis_time = 0,
         .genesis_validators_root = undefined,
         .slot = 0,

diff --git a/src/consensus/capella/types.zig b/src/consensus/capella/types.zig
@@ -109,11 +109,11 @@ pub const BeaconBlockBody = @Type(
     },
 );
 
-pub const BeaconStateSSZ = @Type(
+pub const BeaconState = @Type(
     .{
         .@"struct" = .{
             .layout = .auto,
-            .fields = @typeInfo(bellatrix.BeaconStateSSZ).@"struct".fields ++ &[_]std.builtin.Type.StructField{
+            .fields = @typeInfo(bellatrix.BeaconState).@"struct".fields ++ &[_]std.builtin.Type.StructField{
                 .{
                     .name = "next_withdrawal_index",
                     .type = primitives.WithdrawalIndex,
@@ -142,55 +142,6 @@ pub const BeaconStateSSZ = @Type(
     },
 );
 
-pub const BeaconState = struct {
-    beacon_state_ssz: BeaconStateSSZ,
-    allocator: std.mem.Allocator,
-
-    pub fn init(allocator: std.mem.Allocator, beacon_state_ssz: BeaconStateSSZ) !BeaconState {
-        return BeaconState{
-            .beacon_state_ssz = beacon_state_ssz,
-            .allocator = allocator,
-        };
-    }
-
-    pub fn deinit(self: *BeaconState) void {
-        self.allocator.free(self.beacon_state_ssz.validators);
-        self.allocator.free(self.beacon_state_ssz.balances);
-        self.allocator.free(self.beacon_state_ssz.randao_mixes);
-        self.allocator.free(self.beacon_state_ssz.slashings);
-        self.allocator.free(self.beacon_state_ssz.previous_epoch_attestations);
-        self.allocator.free(self.beacon_state_ssz.current_epoch_attestations);
-        self.allocator.free(self.beacon_state_ssz.justification_bits);
-        self.allocator.destroy(self.beacon_state_ssz.previous_justified_checkpoint);
-        self.allocator.destroy(self.beacon_state_ssz.current_justified_checkpoint);
-        if (self.beacon_state_ssz.finalized_checkpoint) |checkpoint| {
-            self.allocator.destroy(checkpoint);
-        }
-        self.allocator.destroy(self.beacon_state_ssz.fork);
-        if (self.beacon_state_ssz.latest_block_header) |latest_block_header| {
-            self.allocator.destroy(latest_block_header);
-        }
-        self.allocator.free(self.beacon_state_ssz.block_roots);
-        self.allocator.free(self.beacon_state_ssz.state_roots);
-        self.allocator.free(self.beacon_state_ssz.historical_roots);
-        if (self.beacon_state_ssz.eth1_data) |eth1_data| {
-            self.allocator.destroy(eth1_data);
-        }
-        self.allocator.free(self.beacon_state_ssz.eth1_data_votes);
-        self.allocator.free(self.beacon_state_ssz.inactivity_scores);
-        if (self.beacon_state_ssz.current_sync_committee) |current_sync_committee| {
-            self.allocator.destroy(current_sync_committee);
-        }
-        if (self.beacon_state_ssz.next_sync_committee) |next_sync_committee| {
-            self.allocator.destroy(next_sync_committee);
-        }
-        if (self.beacon_state_ssz.latest_execution_payload_header) |latest_execution_payload_header| {
-            self.allocator.destroy(latest_execution_payload_header);
-        }
-        self.allocator.free(self.beacon_state_ssz.historical_summaries);
-    }
-};
-
 test "test ExecutionPayloadHeader" {
     const header = ExecutionPayloadHeader{
         .parent_hash = undefined,
@@ -256,7 +207,7 @@ test "test BeaconBlockBody" {
 }
 
 test "test BeaconState" {
-    const state = BeaconStateSSZ{
+    const state = BeaconState{
         .genesis_time = 0,
         .genesis_validators_root = undefined,
         .slot = 0,

diff --git a/src/consensus/electra/types.zig b/src/consensus/electra/types.zig
@@ -155,11 +155,11 @@ test "test ExecutionPayloadHeader" {
     try std.testing.expectEqual(header.block_number, 21);
 }
 
-pub const BeaconStateSSZ = @Type(
+pub const BeaconState = @Type(
     .{
         .@"struct" = .{
             .layout = .auto,
-            .fields = @typeInfo(capella.BeaconStateSSZ).@"struct".fields ++ &[_]std.builtin.Type.StructField{
+            .fields = @typeInfo(capella.BeaconState).@"struct".fields ++ &[_]std.builtin.Type.StructField{
                 .{
                     .name = "deposit_requests_start_index", // # [New in Electra:EIP6110]
                     .type = u64,
@@ -230,57 +230,49 @@ pub const BeaconStateSSZ = @Type(
     },
 );
 
-pub const BeaconState = struct {
-    beacon_state_ssz: BeaconStateSSZ,
-    allocator: std.mem.Allocator,
-
-    pub fn init(allocator: std.mem.Allocator, beacon_state_ssz: BeaconStateSSZ) !BeaconState {
-        return BeaconState{
-            .beacon_state_ssz = beacon_state_ssz,
-            .allocator = allocator,
-        };
-    }
+test "test BeaconState" {
+    const state = BeaconState{
+        .genesis_time = 0,
+        .genesis_validators_root = undefined,
+        .slot = 0,
+        .fork = undefined,
+        .latest_block_header = undefined,
+        .block_roots = undefined,
+        .state_roots = undefined,
+        .historical_roots = undefined,
+        .eth1_data = undefined,
+        .eth1_data_votes = undefined,
+        .eth1_deposit_index = 0,
+        .validators = undefined,
+        .balances = undefined,
+        .randao_mixes = undefined,
+        .slashings = undefined,
+        .previous_epoch_attestations = undefined,
+        .current_epoch_attestations = undefined,
+        .justification_bits = undefined,
+        .previous_justified_checkpoint = undefined,
+        .current_justified_checkpoint = undefined,
+        .finalized_checkpoint = undefined,
+        .inactivity_scores = undefined,
+        .current_sync_committee = undefined,
+        .next_sync_committee = undefined,
+        .latest_execution_payload_header = undefined,
+        .next_withdrawal_index = 0,
+        .next_withdrawal_validator_index = 0,
+        .historical_summaries = undefined,
+        .deposit_requests_start_index = 0,
+        .deposit_balance_to_consume = 0,
+        .exit_balance_to_consume = 0,
+        .earliest_exit_epoch = 0,
+        .consolidation_balance_to_consume = 0,
+        .earliest_consolidation_epoch = 0,
+        .pending_balance_deposits = undefined,
+        .pending_partial_withdrawals = undefined,
+        .pending_consolidations = undefined,
+    };
 
-    pub fn deinit(self: *BeaconState) void {
-        self.allocator.free(self.beacon_state_ssz.validators);
-        self.allocator.free(self.beacon_state_ssz.balances);
-        self.allocator.free(self.beacon_state_ssz.randao_mixes);
-        self.allocator.free(self.beacon_state_ssz.slashings);
-        self.allocator.free(self.beacon_state_ssz.previous_epoch_attestations);
-        self.allocator.free(self.beacon_state_ssz.current_epoch_attestations);
-        self.allocator.free(self.beacon_state_ssz.justification_bits);
-        self.allocator.destroy(self.beacon_state_ssz.previous_justified_checkpoint);
-        self.allocator.destroy(self.beacon_state_ssz.current_justified_checkpoint);
-        if (self.beacon_state_ssz.finalized_checkpoint) |checkpoint| {
-            self.allocator.destroy(checkpoint);
-        }
-        self.allocator.destroy(self.beacon_state_ssz.fork);
-        if (self.beacon_state_ssz.latest_block_header) |latest_block_header| {
-            self.allocator.destroy(latest_block_header);
-        }
-        self.allocator.free(self.beacon_state_ssz.block_roots);
-        self.allocator.free(self.beacon_state_ssz.state_roots);
-        self.allocator.free(self.beacon_state_ssz.historical_roots);
-        if (self.beacon_state_ssz.eth1_data) |eth1_data| {
-            self.allocator.destroy(eth1_data);
-        }
-        self.allocator.free(self.beacon_state_ssz.eth1_data_votes);
-        self.allocator.free(self.beacon_state_ssz.inactivity_scores);
-        if (self.beacon_state_ssz.current_sync_committee) |current_sync_committee| {
-            self.allocator.destroy(current_sync_committee);
-        }
-        if (self.beacon_state_ssz.next_sync_committee) |next_sync_committee| {
-            self.allocator.destroy(next_sync_committee);
-        }
-        if (self.beacon_state_ssz.latest_execution_payload_header) |latest_execution_payload_header| {
-            self.allocator.destroy(latest_execution_payload_header);
-        }
-        self.allocator.free(self.beacon_state_ssz.historical_summaries);
-        self.allocator.free(self.beacon_state_ssz.pending_balance_deposits);
-        self.allocator.free(self.beacon_state_ssz.pending_partial_withdrawals);
-        self.allocator.free(self.beacon_state_ssz.pending_consolidations);
-    }
-};
+    try std.testing.expectEqual(state.genesis_time, 0);
+}
 
 test "test Attestation" {
     const attestation = Attestation{