Use electra_enabled in pubsub

This commit is contained in:
dapplion
2024-06-19 11:43:41 +02:00
parent cbb7c5d8f4
commit 70a2d4de10

View File

@@ -159,7 +159,7 @@ impl<E: EthSpec> PubsubMessage<E> {
let signed_aggregate_and_proof = let signed_aggregate_and_proof =
match fork_context.from_context_bytes(gossip_topic.fork_digest) { match fork_context.from_context_bytes(gossip_topic.fork_digest) {
Some(&fork_name) => { Some(&fork_name) => {
if fork_name >= ForkName::Electra { if fork_name.electra_enabled() {
SignedAggregateAndProof::Electra( SignedAggregateAndProof::Electra(
SignedAggregateAndProofElectra::from_ssz_bytes(data) SignedAggregateAndProofElectra::from_ssz_bytes(data)
.map_err(|e| format!("{:?}", e))?, .map_err(|e| format!("{:?}", e))?,
@@ -186,7 +186,7 @@ impl<E: EthSpec> PubsubMessage<E> {
let attestation = let attestation =
match fork_context.from_context_bytes(gossip_topic.fork_digest) { match fork_context.from_context_bytes(gossip_topic.fork_digest) {
Some(&fork_name) => { Some(&fork_name) => {
if fork_name >= ForkName::Electra { if fork_name.electra_enabled() {
Attestation::Electra( Attestation::Electra(
AttestationElectra::from_ssz_bytes(data) AttestationElectra::from_ssz_bytes(data)
.map_err(|e| format!("{:?}", e))?, .map_err(|e| format!("{:?}", e))?,
@@ -284,7 +284,7 @@ impl<E: EthSpec> PubsubMessage<E> {
let attester_slashing = let attester_slashing =
match fork_context.from_context_bytes(gossip_topic.fork_digest) { match fork_context.from_context_bytes(gossip_topic.fork_digest) {
Some(&fork_name) => { Some(&fork_name) => {
if fork_name >= ForkName::Electra { if fork_name.electra_enabled() {
AttesterSlashing::Electra( AttesterSlashing::Electra(
AttesterSlashingElectra::from_ssz_bytes(data) AttesterSlashingElectra::from_ssz_bytes(data)
.map_err(|e| format!("{:?}", e))?, .map_err(|e| format!("{:?}", e))?,