Skip to content

Commit 855d6ca

Browse files
jclapisjclapis
committed
Optimization based on feedback
1 parent 621e91a commit 855d6ca

6 files changed

Lines changed: 21 additions & 40 deletions

File tree

‎crates/common/src/pbs/builder.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use serde::{Deserialize, Serialize};
55
use crate::pbs::{BUILDER_V1_API_PATH, BUILDER_V2_API_PATH};
66

77
// Version of the builder API for various routes
8-
#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]
8+
#[derive(Debug, Copy, Clone, Serialize, Deserialize, PartialEq, Eq)]
99
#[serde(rename_all = "lowercase")]
1010
pub enum BuilderApiVersion {
1111
V1 = 1,

‎crates/common/src/signer/store.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -542,12 +542,12 @@ mod test {
542542
.join(consensus_signer.pubkey().to_string())
543543
.join("TEST_MODULE")
544544
.join("bls")
545-
.join(format!("{}.json", proxy_signer.pubkey().to_string()));
545+
.join(format!("{}.json", proxy_signer.pubkey()));
546546
let sig_path = keys_path
547547
.join(consensus_signer.pubkey().to_string())
548548
.join("TEST_MODULE")
549549
.join("bls")
550-
.join(format!("{}.sig", proxy_signer.pubkey().to_string()));
550+
.join(format!("{}.sig", proxy_signer.pubkey()));
551551
let pass_path = secrets_path
552552
.join(consensus_signer.pubkey().to_string())
553553
.join("TEST_MODULE")
@@ -674,7 +674,7 @@ mod test {
674674
.join(consensus_signer.pubkey().to_string())
675675
.join("TEST_MODULE")
676676
.join("bls")
677-
.join(format!("{}.sig", proxy_signer.pubkey().to_string()))
677+
.join(format!("{}.sig", proxy_signer.pubkey()))
678678
)
679679
.unwrap()
680680
)

‎crates/common/src/utils.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -457,7 +457,7 @@ mod test {
457457
let jwt = create_jwt(&ModuleId("DA_COMMIT".to_string()), "secret").unwrap();
458458
let module_id = decode_jwt(jwt.clone()).unwrap();
459459
assert_eq!(module_id, ModuleId("DA_COMMIT".to_string()));
460-
let response = validate_jwt(jwt, "secret".as_ref());
460+
let response = validate_jwt(jwt, "secret");
461461
assert!(response.is_ok());
462462

463463
// Check expired JWT

‎crates/pbs/src/mev_boost/submit_block.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ async fn submit_block_with_timeout(
6565
timeout_ms: u64,
6666
api_version: &BuilderApiVersion,
6767
) -> Result<Option<SubmitBlindedBlockResponse>, PbsError> {
68-
let url = relay.submit_block_url(api_version.clone())?;
68+
let url = relay.submit_block_url(*api_version)?;
6969
let mut remaining_timeout_ms = timeout_ms;
7070
let mut retry = 0;
7171
let mut backoff = Duration::from_millis(250);

‎crates/pbs/src/routes/submit_block.rs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ async fn handle_submit_block_impl<S: BuilderApiState, A: BuilderApi<S>>(
4848
Json(signed_blinded_block): Json<SignedBlindedBeaconBlock>,
4949
api_version: BuilderApiVersion,
5050
) -> Result<impl IntoResponse, PbsClientError> {
51-
tracing::Span::current().record("block_api_version", api_version.to_string());
5251
tracing::Span::current().record("slot", signed_blinded_block.slot());
5352
tracing::Span::current()
5453
.record("block_hash", tracing::field::debug(signed_blinded_block.block_hash()));
@@ -60,7 +59,7 @@ async fn handle_submit_block_impl<S: BuilderApiState, A: BuilderApi<S>>(
6059

6160
state.publish_event(BuilderEvent::SubmitBlockRequest(
6261
Box::new(signed_blinded_block.clone()),
63-
api_version.clone(),
62+
api_version,
6463
));
6564

6665
let now = utcnow_ms();

‎crates/signer/src/manager/local.rs‎

Lines changed: 14 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -298,10 +298,8 @@ mod tests {
298298
async fn test_proxy_key_is_valid_proxy_for_consensus_key() {
299299
let (mut signing_manager, consensus_pk) = init_signing_manager();
300300

301-
let signed_delegation = signing_manager
302-
.create_proxy_bls(MODULE_ID.clone(), consensus_pk.clone())
303-
.await
304-
.unwrap();
301+
let signed_delegation =
302+
signing_manager.create_proxy_bls(MODULE_ID.clone(), consensus_pk).await.unwrap();
305303

306304
let validation_result = signed_delegation.validate(CHAIN);
307305

@@ -321,10 +319,8 @@ mod tests {
321319
async fn test_tampered_proxy_key_is_invalid() {
322320
let (mut signing_manager, consensus_pk) = init_signing_manager();
323321

324-
let mut signed_delegation = signing_manager
325-
.create_proxy_bls(MODULE_ID.clone(), consensus_pk.clone())
326-
.await
327-
.unwrap();
322+
let mut signed_delegation =
323+
signing_manager.create_proxy_bls(MODULE_ID.clone(), consensus_pk).await.unwrap();
328324

329325
let m = &mut signed_delegation.signature.0[0];
330326
(*m, _) = m.overflowing_add(1);
@@ -338,18 +334,13 @@ mod tests {
338334
async fn test_proxy_key_signs_message() {
339335
let (mut signing_manager, consensus_pk) = init_signing_manager();
340336

341-
let signed_delegation = signing_manager
342-
.create_proxy_bls(MODULE_ID.clone(), consensus_pk.clone())
343-
.await
344-
.unwrap();
337+
let signed_delegation =
338+
signing_manager.create_proxy_bls(MODULE_ID.clone(), consensus_pk).await.unwrap();
345339
let proxy_pk = signed_delegation.message.proxy;
346340

347341
let data_root = B256::random();
348342

349-
let sig = signing_manager
350-
.sign_proxy_bls(&proxy_pk.try_into().unwrap(), &data_root)
351-
.await
352-
.unwrap();
343+
let sig = signing_manager.sign_proxy_bls(&proxy_pk, &data_root).await.unwrap();
353344

354345
// Verify signature
355346
let domain = compute_domain(CHAIN, COMMIT_BOOST_DOMAIN);
@@ -376,10 +367,8 @@ mod tests {
376367
async fn test_proxy_key_is_valid_proxy_for_consensus_key() {
377368
let (mut signing_manager, consensus_pk) = init_signing_manager();
378369

379-
let signed_delegation = signing_manager
380-
.create_proxy_ecdsa(MODULE_ID.clone(), consensus_pk.clone())
381-
.await
382-
.unwrap();
370+
let signed_delegation =
371+
signing_manager.create_proxy_ecdsa(MODULE_ID.clone(), consensus_pk).await.unwrap();
383372

384373
let validation_result = signed_delegation.validate(CHAIN);
385374

@@ -399,10 +388,8 @@ mod tests {
399388
async fn test_tampered_proxy_key_is_invalid() {
400389
let (mut signing_manager, consensus_pk) = init_signing_manager();
401390

402-
let mut signed_delegation = signing_manager
403-
.create_proxy_ecdsa(MODULE_ID.clone(), consensus_pk.clone())
404-
.await
405-
.unwrap();
391+
let mut signed_delegation =
392+
signing_manager.create_proxy_ecdsa(MODULE_ID.clone(), consensus_pk).await.unwrap();
406393

407394
let m = &mut signed_delegation.signature.0[0];
408395
(*m, _) = m.overflowing_add(1);
@@ -416,18 +403,13 @@ mod tests {
416403
async fn test_proxy_key_signs_message() {
417404
let (mut signing_manager, consensus_pk) = init_signing_manager();
418405

419-
let signed_delegation = signing_manager
420-
.create_proxy_ecdsa(MODULE_ID.clone(), consensus_pk.clone())
421-
.await
422-
.unwrap();
406+
let signed_delegation =
407+
signing_manager.create_proxy_ecdsa(MODULE_ID.clone(), consensus_pk).await.unwrap();
423408
let proxy_pk = signed_delegation.message.proxy;
424409

425410
let data_root = B256::random();
426411

427-
let sig = signing_manager
428-
.sign_proxy_ecdsa(&proxy_pk.try_into().unwrap(), &data_root)
429-
.await
430-
.unwrap();
412+
let sig = signing_manager.sign_proxy_ecdsa(&proxy_pk, &data_root).await.unwrap();
431413

432414
// Verify signature
433415
let domain = compute_domain(CHAIN, COMMIT_BOOST_DOMAIN);

0 commit comments

Comments
 (0)