diff --git a/.gitignore b/.gitignore index de35c11..78c840f 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,6 @@ target/ .env -logs/ \ No newline at end of file +logs/ + +.DS_Store \ No newline at end of file diff --git a/src/db/mongodb/types.rs b/src/db/mongodb/types.rs index a7c2e30..d1998c7 100644 --- a/src/db/mongodb/types.rs +++ b/src/db/mongodb/types.rs @@ -57,11 +57,7 @@ impl TryFrom<&BlockData<'_>> for BlockDocument { number, slot: block_data.slot, timestamp: block.timestamp.as_u64(), - transactions: block_data - .tx_to_versioned_hashes - .keys() - .map(|hash| hash.clone()) - .collect(), + transactions: block_data.tx_to_versioned_hashes.keys().copied().collect(), }) } } @@ -90,8 +86,8 @@ impl TryFrom<&TransactionData<'_>> for TransactionDocument { from: tx.from, to, value: tx.value, - block_hash: block_hash, - block_number: block_number, + block_hash, + block_number, blob_versioned_hashes: tx_data.blob_versioned_hashes.clone(), }) } diff --git a/src/main.rs b/src/main.rs index f794d1a..21e308a 100644 --- a/src/main.rs +++ b/src/main.rs @@ -27,18 +27,16 @@ async fn main() -> Result<(), StdError> { loop { if let Some(latest_beacon_block) = context.beacon_api.get_block(None).await? { - let latest_slot: u32 = latest_beacon_block.slot.parse()?; + let latest_slot: u32 = latest_beacon_block.slot.parse()?; - if current_slot < latest_slot { - slot_processor - .process_slots(current_slot, latest_slot) - .await; + if current_slot < latest_slot { + slot_processor + .process_slots(current_slot, latest_slot) + .await; - current_slot = latest_slot; - } + current_slot = latest_slot; } - }; - + } thread::sleep(Duration::from_secs(1)); } } diff --git a/src/slot_processor.rs b/src/slot_processor.rs index ce285d4..0a092da 100644 --- a/src/slot_processor.rs +++ b/src/slot_processor.rs @@ -39,7 +39,7 @@ impl<'a> SlotProcessor<'a> { panic!(); }; - current_slot = current_slot + 1; + current_slot += 1; } self.save_slot(current_slot).await @@ -108,7 +108,7 @@ impl<'a> SlotProcessor<'a> { let blobs = match beacon_api.get_blobs_sidecar(slot).await? { Some(blobs_sidecar) => { - if blobs_sidecar.blobs.len() == 0 { + if blobs_sidecar.blobs.is_empty() { info!("[Slot {}] Skipping as blobs sidecar is empty", slot); return Ok(()); @@ -168,7 +168,7 @@ impl<'a> SlotProcessor<'a> { commitment, data: blob, versioned_hash, - tx_hash: tx_hash.clone(), + tx_hash: *tx_hash, }, Some(&mut self.db_options), ) diff --git a/src/utils/web3.rs b/src/utils/web3.rs index 00f3f2f..bace3fa 100644 --- a/src/utils/web3.rs +++ b/src/utils/web3.rs @@ -25,7 +25,7 @@ pub fn sha256(value: &str) -> Result { } pub fn calculate_versioned_hash(commitment: &String) -> Result { - let hashed_commitment = sha256(&commitment)?; + let hashed_commitment = sha256(commitment)?; // Replace first byte with the blob commitment version byte let hashed_commitment = &mut hashed_commitment.as_bytes()[1..].to_vec();