All EIP7251 containers passing

prysmaticlabs · Apr 22, 2024 · e1cf4ea · e1cf4ea
1 parent 7dbb9ef
commit e1cf4ea
Show file tree

Hide file tree

Showing 8 changed files with 139 additions and 127 deletions.
diff --git a/beacon-chain/core/blocks/withdrawals_test.go b/beacon-chain/core/blocks/withdrawals_test.go
diff --git a/proto/prysm/v1alpha1/BUILD.bazel b/proto/prysm/v1alpha1/BUILD.bazel
@@ -138,7 +138,7 @@ ssz_gen_marshal(
         "BlobIdentifier",
         "DepositSnapshot",
         "PendingBalanceDeposit",
-        "PartialWithdrawal",
+        "PendingPartialWithdrawal",
         "ExecutionLayerWithdrawalRequest",
         "Consolidation",
         "SignedConsolidation",

diff --git a/proto/prysm/v1alpha1/beacon_state.pb.go b/proto/prysm/v1alpha1/beacon_state.pb.go
diff --git a/proto/prysm/v1alpha1/beacon_state.proto b/proto/prysm/v1alpha1/beacon_state.proto
@@ -402,7 +402,7 @@ message BeaconStateElectra {
   uint64 consolidation_balance_to_consume = 12004;
   uint64 earliest_consolidation_epoch = 12005 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v5/consensus-types/primitives.Epoch"];
   repeated PendingBalanceDeposit pending_balance_deposits = 12006 [(ethereum.eth.ext.ssz_max) = "134217728"];
-  repeated PartialWithdrawal pending_partial_withdrawals = 12007 [(ethereum.eth.ext.ssz_max) = "134217728"];
+  repeated PendingPartialWithdrawal pending_partial_withdrawals = 12007 [(ethereum.eth.ext.ssz_max) = "134217728"];
   repeated PendingConsolidation pending_consolidations = 12008 [(ethereum.eth.ext.ssz_max) = "262144"];
 }
 

diff --git a/proto/prysm/v1alpha1/eip_7251.pb.go b/proto/prysm/v1alpha1/eip_7251.pb.go
diff --git a/proto/prysm/v1alpha1/eip_7251.proto b/proto/prysm/v1alpha1/eip_7251.proto
@@ -32,7 +32,7 @@ message PendingBalanceDeposit {
     uint64 amount = 2;
 }
 
-message PartialWithdrawal {
+message PendingPartialWithdrawal {
     // Validator index for the withdrawal.
     uint64 index = 1 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/prysm/v5/consensus-types/primitives.ValidatorIndex"];
 

diff --git a/proto/prysm/v1alpha1/generated.ssz.go b/proto/prysm/v1alpha1/generated.ssz.go
diff --git a/testing/spectest/shared/electra/ssz_static/ssz_static.go b/testing/spectest/shared/electra/ssz_static/ssz_static.go
@@ -142,6 +142,18 @@ func UnmarshalledSSZ(t *testing.T, serializedBytes []byte, folderName string) (i
 		obj = &ethpb.BLSToExecutionChange{}
 	case "SignedBLSToExecutionChange":
 		obj = &ethpb.SignedBLSToExecutionChange{}
+	case "PendingBalanceDeposit":
+		obj = &ethpb.PendingBalanceDeposit{}
+	case "PendingPartialWithdrawal":
+		obj = &ethpb.PendingPartialWithdrawal{}
+	case "Consolidation":
+		obj = &ethpb.Consolidation{}
+	case "SignedConsolidation":
+		obj = &ethpb.SignedConsolidation{}
+	case "PendingConsolidation":
+		obj = &ethpb.PendingConsolidation{}
+	case "ExecutionLayerWithdrawalRequest":
+		obj = &ethpb.ExecutionLayerWithdrawalRequest{}
 	default:
 		return nil, errors.New("type not found")
 	}