From ad26180bba5a24684c0b3b79468033f5c041764c Mon Sep 17 00:00:00 2001 From: Alex Stokes Date: Tue, 17 Oct 2023 15:02:25 -0600 Subject: [PATCH] update repo to use new "copy types" from underlying polymorphic types --- Cargo.lock | 8 ++++---- Cargo.toml | 4 ++-- mev-boost-rs/src/relay_mux.rs | 2 +- mev-boost-rs/tests/identity_builder.rs | 2 +- mev-relay-rs/src/relay.rs | 8 ++++---- mev-rs/src/blinded_block_provider/api/server.rs | 2 +- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 525a5abb..e22a4c3a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -610,7 +610,7 @@ checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" [[package]] name = "beacon-api-client" version = "0.1.0" -source = "git+https://github.com/ralexstokes/ethereum-consensus?rev=bfb6af698311226d55ec7c7ba6eabbc1abc072a0#bfb6af698311226d55ec7c7ba6eabbc1abc072a0" +source = "git+https://github.com/ralexstokes/ethereum-consensus?rev=766aca6c5d10ee8dac015fbe705667f60097149d#766aca6c5d10ee8dac015fbe705667f60097149d" dependencies = [ "clap", "ethereum-consensus", @@ -2271,7 +2271,7 @@ dependencies = [ [[package]] name = "ethereum-consensus" version = "0.1.1" -source = "git+https://github.com/ralexstokes/ethereum-consensus?rev=bfb6af698311226d55ec7c7ba6eabbc1abc072a0#bfb6af698311226d55ec7c7ba6eabbc1abc072a0" +source = "git+https://github.com/ralexstokes/ethereum-consensus?rev=766aca6c5d10ee8dac015fbe705667f60097149d#766aca6c5d10ee8dac015fbe705667f60097149d" dependencies = [ "async-stream", "blst", @@ -7359,7 +7359,7 @@ checksum = "3b9b39299b249ad65f3b7e96443bad61c02ca5cd3589f46cb6d610a0fd6c0d6a" [[package]] name = "ssz_rs" version = "0.9.0" -source = "git+https://github.com/ralexstokes/ssz-rs?rev=c00a4659b9d1980d410c487a88e983cf2506c928#c00a4659b9d1980d410c487a88e983cf2506c928" +source = "git+https://github.com/ralexstokes/ssz-rs?rev=20829edcaa48e5f5f39939a69928debc477be4e2#20829edcaa48e5f5f39939a69928debc477be4e2" dependencies = [ "bitvec", "hex", @@ -7372,7 +7372,7 @@ dependencies = [ [[package]] name = "ssz_rs_derive" version = "0.9.0" -source = "git+https://github.com/ralexstokes/ssz-rs?rev=c00a4659b9d1980d410c487a88e983cf2506c928#c00a4659b9d1980d410c487a88e983cf2506c928" +source = "git+https://github.com/ralexstokes/ssz-rs?rev=20829edcaa48e5f5f39939a69928debc477be4e2#20829edcaa48e5f5f39939a69928debc477be4e2" dependencies = [ "proc-macro2", "quote", diff --git a/Cargo.toml b/Cargo.toml index a7924fef..eebd6bcf 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -7,8 +7,8 @@ default-members = ["bin/mev"] version = "0.3.0" [workspace.dependencies] -ethereum-consensus = { git = "https://github.com/ralexstokes/ethereum-consensus", rev = "bfb6af698311226d55ec7c7ba6eabbc1abc072a0" } -beacon-api-client = { git = "https://github.com/ralexstokes/ethereum-consensus", rev = "bfb6af698311226d55ec7c7ba6eabbc1abc072a0" } +ethereum-consensus = { git = "https://github.com/ralexstokes/ethereum-consensus", rev = "766aca6c5d10ee8dac015fbe705667f60097149d" } +beacon-api-client = { git = "https://github.com/ralexstokes/ethereum-consensus", rev = "766aca6c5d10ee8dac015fbe705667f60097149d" } reth-payload-builder = { git = "https://github.com/paradigmxyz/reth", rev = "1b16d804ef01f4ec3c25e7986381c22739c105b9" } reth-primitives = { git = "https://github.com/paradigmxyz/reth", rev = "1b16d804ef01f4ec3c25e7986381c22739c105b9" } diff --git a/mev-boost-rs/src/relay_mux.rs b/mev-boost-rs/src/relay_mux.rs index eab8b128..99207b57 100644 --- a/mev-boost-rs/src/relay_mux.rs +++ b/mev-boost-rs/src/relay_mux.rs @@ -24,7 +24,7 @@ const PROPOSAL_TOLERANCE_DELAY: Slot = 1; const FETCH_BEST_BID_TIME_OUT_SECS: u64 = 1; fn bid_key_from(signed_block: &SignedBlindedBeaconBlock, public_key: &BlsPublicKey) -> BidRequest { - let slot = *signed_block.message().slot(); + let slot = signed_block.message().slot(); let parent_hash = signed_block.message().body().execution_payload_header().parent_hash().clone(); diff --git a/mev-boost-rs/tests/identity_builder.rs b/mev-boost-rs/tests/identity_builder.rs index 519dcd40..88b0cf2d 100644 --- a/mev-boost-rs/tests/identity_builder.rs +++ b/mev-boost-rs/tests/identity_builder.rs @@ -98,7 +98,7 @@ impl BlindedBlockProvider for IdentityBuilder { &self, signed_block: &mut SignedBlindedBeaconBlock, ) -> Result { - let slot = *signed_block.message().slot(); + let slot = signed_block.message().slot(); let state = self.bids.lock().unwrap(); Ok(state.get(&slot).cloned().unwrap()) } diff --git a/mev-relay-rs/src/relay.rs b/mev-relay-rs/src/relay.rs index df43376a..00ffad54 100644 --- a/mev-relay-rs/src/relay.rs +++ b/mev-relay-rs/src/relay.rs @@ -47,7 +47,7 @@ fn validate_execution_payload( // TODO allow for "adjustment cap" per the protocol rules // towards the proposer's preference - if execution_payload.gas_limit() != &preferences.gas_limit { + if execution_payload.gas_limit() != preferences.gas_limit { return Err(Error::InvalidGasLimit) } @@ -81,7 +81,7 @@ fn validate_signed_block( // verify proposer_index is correct // verify parent_root matches - let slot = *block.slot(); + let slot = block.slot(); let signing_root = compute_consensus_signing_root(&mut block, slot, genesis_validators_root, context)?; let signature = signed_block.signature(); @@ -204,11 +204,11 @@ impl BlindedBlockProvider for Relay { signed_block: &mut SignedBlindedBeaconBlock, ) -> Result { let block = signed_block.message(); - let slot = *block.slot(); + let slot = block.slot(); let body = block.body(); let payload_header = body.execution_payload_header(); let parent_hash = payload_header.parent_hash().clone(); - let proposer_index = *block.proposer_index(); + let proposer_index = block.proposer_index(); let public_key = self.validator_registry.get_public_key(proposer_index).map_err(Error::from)?; let bid_request = BidRequest { slot, parent_hash, public_key }; diff --git a/mev-rs/src/blinded_block_provider/api/server.rs b/mev-rs/src/blinded_block_provider/api/server.rs index 1e62d756..680feed4 100644 --- a/mev-rs/src/blinded_block_provider/api/server.rs +++ b/mev-rs/src/blinded_block_provider/api/server.rs @@ -51,7 +51,7 @@ async fn handle_open_bid( ) -> Result>, Error> { let payload = builder.open_bid(&mut block).await?; let block_hash = payload.block_hash(); - let slot = *block.message().slot(); + let slot = block.message().slot(); tracing::info!("returning provided payload in slot {slot} with block_hash {block_hash}"); let version = payload.version(); let response = VersionedValue { version, data: payload, meta: Default::default() };