Skip to content

Commit 51fe0ce

Browse files
jimmygchenjimmygchen
committed
Replace unimplemented electra code path with deneb values.
1 parent 1df31be commit 51fe0ce

File tree

6 files changed

+31
-27
lines changed

6 files changed

+31
-27
lines changed

‎beacon_node/lighthouse_network/src/rpc/protocol.rs‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -115,10 +115,13 @@ lazy_static! {
115115

116116
pub static ref LIGHT_CLIENT_FINALITY_UPDATE_CAPELLA_MAX: usize = LightClientFinalityUpdate::<MainnetEthSpec>::ssz_max_len_for_fork(ForkName::Capella);
117117
pub static ref LIGHT_CLIENT_FINALITY_UPDATE_DENEB_MAX: usize = LightClientFinalityUpdate::<MainnetEthSpec>::ssz_max_len_for_fork(ForkName::Deneb);
118+
pub static ref LIGHT_CLIENT_FINALITY_UPDATE_ELECTRA_MAX: usize = LightClientFinalityUpdate::<MainnetEthSpec>::ssz_max_len_for_fork(ForkName::Electra);
118119
pub static ref LIGHT_CLIENT_OPTIMISTIC_UPDATE_CAPELLA_MAX: usize = LightClientOptimisticUpdate::<MainnetEthSpec>::ssz_max_len_for_fork(ForkName::Capella);
119120
pub static ref LIGHT_CLIENT_OPTIMISTIC_UPDATE_DENEB_MAX: usize = LightClientOptimisticUpdate::<MainnetEthSpec>::ssz_max_len_for_fork(ForkName::Deneb);
121+
pub static ref LIGHT_CLIENT_OPTIMISTIC_UPDATE_ELECTRA_MAX: usize = LightClientOptimisticUpdate::<MainnetEthSpec>::ssz_max_len_for_fork(ForkName::Electra);
120122
pub static ref LIGHT_CLIENT_BOOTSTRAP_CAPELLA_MAX: usize = LightClientBootstrap::<MainnetEthSpec>::ssz_max_len_for_fork(ForkName::Capella);
121123
pub static ref LIGHT_CLIENT_BOOTSTRAP_DENEB_MAX: usize = LightClientBootstrap::<MainnetEthSpec>::ssz_max_len_for_fork(ForkName::Deneb);
124+
pub static ref LIGHT_CLIENT_BOOTSTRAP_ELECTRA_MAX: usize = LightClientBootstrap::<MainnetEthSpec>::ssz_max_len_for_fork(ForkName::Electra);
122125
}
123126

124127
/// The protocol prefix the RPC protocol id.
@@ -183,7 +186,7 @@ fn rpc_light_client_finality_update_limits_by_fork(current_fork: ForkName) -> Rp
183186
RpcLimits::new(altair_fixed_len, *LIGHT_CLIENT_FINALITY_UPDATE_DENEB_MAX)
184187
}
185188
ForkName::Electra => {
186-
unimplemented!("Electra not implemented")
189+
RpcLimits::new(altair_fixed_len, *LIGHT_CLIENT_FINALITY_UPDATE_ELECTRA_MAX)
187190
}
188191
}
189192
}
@@ -201,9 +204,10 @@ fn rpc_light_client_optimistic_update_limits_by_fork(current_fork: ForkName) ->
201204
ForkName::Deneb => {
202205
RpcLimits::new(altair_fixed_len, *LIGHT_CLIENT_OPTIMISTIC_UPDATE_DENEB_MAX)
203206
}
204-
ForkName::Electra => {
205-
unimplemented!("Electra not implemented")
206-
}
207+
ForkName::Electra => RpcLimits::new(
208+
altair_fixed_len,
209+
*LIGHT_CLIENT_OPTIMISTIC_UPDATE_ELECTRA_MAX,
210+
),
207211
}
208212
}
209213

@@ -215,9 +219,7 @@ fn rpc_light_client_bootstrap_limits_by_fork(current_fork: ForkName) -> RpcLimit
215219
ForkName::Altair | ForkName::Merge => RpcLimits::new(altair_fixed_len, altair_fixed_len),
216220
ForkName::Capella => RpcLimits::new(altair_fixed_len, *LIGHT_CLIENT_BOOTSTRAP_CAPELLA_MAX),
217221
ForkName::Deneb => RpcLimits::new(altair_fixed_len, *LIGHT_CLIENT_BOOTSTRAP_DENEB_MAX),
218-
ForkName::Electra => {
219-
unimplemented!("Electra not implemented")
220-
}
222+
ForkName::Electra => RpcLimits::new(altair_fixed_len, *LIGHT_CLIENT_BOOTSTRAP_ELECTRA_MAX),
221223
}
222224
}
223225

‎consensus/types/src/execution_payload_header.rs‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -113,18 +113,17 @@ impl<E: EthSpec> ExecutionPayloadHeader<E> {
113113
#[allow(clippy::arithmetic_side_effects)]
114114
pub fn ssz_max_var_len_for_fork(fork_name: ForkName) -> usize {
115115
// Matching here in case variable fields are added in future forks.
116+
// TODO(electra): review electra changes
116117
match fork_name {
117118
ForkName::Base
118119
| ForkName::Altair
119120
| ForkName::Merge
120121
| ForkName::Capella
121-
| ForkName::Deneb => {
122+
| ForkName::Deneb
123+
| ForkName::Electra => {
122124
// Max size of variable length `extra_data` field
123125
E::max_extra_data_bytes() * <u8 as Encode>::ssz_fixed_len()
124126
}
125-
ForkName::Electra => {
126-
unimplemented!("Electra not implemented")
127-
}
128127
}
129128
}
130129
}

‎consensus/types/src/light_client_bootstrap.rs‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -98,15 +98,17 @@ impl<E: EthSpec> LightClientBootstrap<E> {
9898

9999
#[allow(clippy::arithmetic_side_effects)]
100100
pub fn ssz_max_len_for_fork(fork_name: ForkName) -> usize {
101+
// TODO(electra): review electra changes
101102
match fork_name {
102103
ForkName::Base => 0,
103-
ForkName::Altair | ForkName::Merge | ForkName::Capella | ForkName::Deneb => {
104+
ForkName::Altair
105+
| ForkName::Merge
106+
| ForkName::Capella
107+
| ForkName::Deneb
108+
| ForkName::Electra => {
104109
<LightClientBootstrapAltair<E> as Encode>::ssz_fixed_len()
105110
+ LightClientHeader::<E>::ssz_max_var_len_for_fork(fork_name)
106111
}
107-
ForkName::Electra => {
108-
unimplemented!("Electra not implemented")
109-
}
110112
}
111113
}
112114

‎consensus/types/src/light_client_finality_update.rs‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -167,15 +167,17 @@ impl<E: EthSpec> LightClientFinalityUpdate<E> {
167167

168168
#[allow(clippy::arithmetic_side_effects)]
169169
pub fn ssz_max_len_for_fork(fork_name: ForkName) -> usize {
170+
// TODO(electra): review electra changes
170171
match fork_name {
171172
ForkName::Base => 0,
172-
ForkName::Altair | ForkName::Merge | ForkName::Capella | ForkName::Deneb => {
173+
ForkName::Altair
174+
| ForkName::Merge
175+
| ForkName::Capella
176+
| ForkName::Deneb
177+
| ForkName::Electra => {
173178
<LightClientFinalityUpdateAltair<E> as Encode>::ssz_fixed_len()
174179
+ 2 * LightClientHeader::<E>::ssz_max_var_len_for_fork(fork_name)
175180
}
176-
ForkName::Electra => {
177-
unimplemented!("Electra not implemented")
178-
}
179181
}
180182
}
181183
}

‎consensus/types/src/light_client_header.rs‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -120,12 +120,9 @@ impl<E: EthSpec> LightClientHeader<E> {
120120
pub fn ssz_max_var_len_for_fork(fork_name: ForkName) -> usize {
121121
match fork_name {
122122
ForkName::Base | ForkName::Altair | ForkName::Merge => 0,
123-
ForkName::Capella | ForkName::Deneb => {
123+
ForkName::Capella | ForkName::Deneb | ForkName::Electra => {
124124
ExecutionPayloadHeader::<E>::ssz_max_var_len_for_fork(fork_name)
125125
}
126-
ForkName::Electra => {
127-
unimplemented!("Electra not implemented")
128-
}
129126
}
130127
}
131128
}

‎consensus/types/src/light_client_optimistic_update.rs‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -152,15 +152,17 @@ impl<E: EthSpec> LightClientOptimisticUpdate<E> {
152152

153153
#[allow(clippy::arithmetic_side_effects)]
154154
pub fn ssz_max_len_for_fork(fork_name: ForkName) -> usize {
155+
// TODO(electra): review electra changes
155156
match fork_name {
156157
ForkName::Base => 0,
157-
ForkName::Altair | ForkName::Merge | ForkName::Capella | ForkName::Deneb => {
158+
ForkName::Altair
159+
| ForkName::Merge
160+
| ForkName::Capella
161+
| ForkName::Deneb
162+
| ForkName::Electra => {
158163
<LightClientOptimisticUpdateAltair<E> as Encode>::ssz_fixed_len()
159164
+ LightClientHeader::<E>::ssz_max_var_len_for_fork(fork_name)
160165
}
161-
ForkName::Electra => {
162-
unimplemented!("Electra not implemented")
163-
}
164166
}
165167
}
166168
}

0 commit comments

Comments
 (0)