chore: v0.6.6 op-alloy (#804)

* fix: update deps * fix: use updated deps * fix: update alloy * chore: update deps * fix * feat: stateful
op-rs · Nov 16, 2024 · 138a8f2 · 138a8f2
1 parent 4a3b928
commit 138a8f2
Show file tree

Hide file tree

Showing 8 changed files with 118 additions and 107 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -74,25 +74,25 @@ kona-proof = { path = "crates/proof-sdk/proof", version = "0.0.1", default-featu
 
 # Alloy
 alloy-rlp = { version = "0.3.9", default-features = false }
-alloy-trie = { version = "0.7.2", default-features = false }
-alloy-eips = { version = "0.5.4", default-features = false }
-alloy-serde = { version = "0.5.4", default-features = false }
-alloy-provider = { version = "0.5.4", default-features = false }
-alloy-primitives = { version = "0.8", default-features = false }
-alloy-consensus = { version = "0.5.4", default-features = false }
-alloy-transport = { version = "0.5.4", default-features = false }
-alloy-rpc-types = { version = "0.5.4", default-features = false }
-alloy-rpc-client = { version = "0.5.4", default-features = false }
-alloy-node-bindings = { version = "0.5.4", default-features = false }
-alloy-transport-http = { version = "0.5.4", default-features = false }
-alloy-rpc-types-engine = { version = "0.5.4", default-features = false }
-alloy-rpc-types-beacon = { version = "0.5.4", default-features = false }
+alloy-trie = { version = "0.7.4", default-features = false }
+alloy-eips = { version = "0.6.4", default-features = false }
+alloy-serde = { version = "0.6.4", default-features = false }
+alloy-provider = { version = "0.6.4", default-features = false }
+alloy-primitives = { version = "0.8.12", default-features = false }
+alloy-consensus = { version = "0.6.4", default-features = false }
+alloy-transport = { version = "0.6.4", default-features = false }
+alloy-rpc-types = { version = "0.6.4", default-features = false }
+alloy-rpc-client = { version = "0.6.4", default-features = false }
+alloy-node-bindings = { version = "0.6.4", default-features = false }
+alloy-transport-http = { version = "0.6.4", default-features = false }
+alloy-rpc-types-engine = { version = "0.6.4", default-features = false }
+alloy-rpc-types-beacon = { version = "0.6.4", default-features = false }
 
 # OP Alloy
-op-alloy-genesis = { version = "0.5.2", default-features = false }
-op-alloy-protocol = { version = "0.5.2", default-features = false }
-op-alloy-consensus = { version = "0.5.2", default-features = false }
-op-alloy-rpc-types-engine = { version = "0.5.2", default-features = false }
+op-alloy-genesis = { version = "0.6.6", default-features = false }
+op-alloy-protocol = { version = "0.6.6", default-features = false }
+op-alloy-consensus = { version = "0.6.6", default-features = false }
+op-alloy-rpc-types-engine = { version = "0.6.6", default-features = false }
 
 # General
 lru = "0.12.4"

diff --git a/bin/host/src/fetcher/mod.rs b/bin/host/src/fetcher/mod.rs
@@ -519,11 +519,7 @@ where
                 let encoded_transactions = transactions
                     .into_iter()
                     .map(|tx| {
-                        let envelope: TxEnvelope = tx.try_into().map_err(|e| {
-                            anyhow!(
-                                "Failed to convert RPC transaction into consensus envelope: {e}"
-                            )
-                        })?;
+                        let envelope: TxEnvelope = tx.into();
 
                         Ok::<_, anyhow::Error>(envelope.encoded_2718())
                     })

diff --git a/bin/host/src/providers/blob.rs b/bin/host/src/providers/blob.rs
@@ -156,9 +156,9 @@ where
                 let hash = blob_hashes
                     .get(i)
                     .ok_or(BlobProviderError::Backend("Missing blob hash".to_string()))?;
-                match sidecar.verify_blob(&alloy_eips::NumHash {
+                match sidecar.verify_blob(&alloy_eips::eip4844::IndexedBlobHash {
                     hash: hash.hash,
-                    number: hash.index as u64,
+                    index: hash.index as u64,
                 }) {
                     Ok(_) => Ok(sidecar.blob),
                     Err(e) => Err(BlobProviderError::Backend(e.to_string())),
@@ -312,9 +312,9 @@ where
                         let hash = blob_hashes.get(i).ok_or(BlobProviderError::Backend(
                             "fallback: failed to get blob hash".to_string(),
                         ))?;
-                        match sidecar.verify_blob(&alloy_eips::NumHash {
+                        match sidecar.verify_blob(&alloy_eips::eip4844::IndexedBlobHash {
                             hash: hash.hash,
-                            number: hash.index as u64,
+                            index: hash.index as u64,
                         }) {
                             Ok(_) => Ok(sidecar.blob),
                             Err(e) => Err(BlobProviderError::Backend(e.to_string())),

diff --git a/crates/derive/src/attributes/stateful.rs b/crates/derive/src/attributes/stateful.rs
@@ -212,6 +212,7 @@ async fn derive_deposits(
         for l in r.logs.iter() {
             let curr_index = global_index;
             global_index += 1;
+            #[allow(clippy::all)]
             if !l.data.topics().first().map_or(false, |i| *i == DEPOSIT_EVENT_ABI_HASH) {
                 continue;
             }

diff --git a/crates/derive/src/sources/calldata.rs b/crates/derive/src/sources/calldata.rs
@@ -92,7 +92,7 @@ mod tests {
     use crate::{errors::PipelineErrorKind, test_utils::TestChainProvider};
     use alloc::{vec, vec::Vec};
     use alloy_consensus::{Signed, TxEip2930, TxEip4844, TxEip4844Variant, TxLegacy};
-    use alloy_primitives::{address, Address, Signature, TxKind};
+    use alloy_primitives::{address, Address, PrimitiveSignature as Signature, TxKind};
 
     pub(crate) fn test_legacy_tx(to: Address) -> TxEnvelope {
         let sig = Signature::test_signature();

diff --git a/crates/derive/src/stages/batch/batch_provider.rs b/crates/derive/src/stages/batch/batch_provider.rs
@@ -155,7 +155,7 @@ where
 {
     fn is_last_in_span(&self) -> bool {
         self.batch_validator.as_ref().map_or_else(
-            || self.batch_queue.as_ref().map_or(false, |batch_queue| batch_queue.is_last_in_span()),
+            || self.batch_queue.as_ref().is_some_and(|batch_queue| batch_queue.is_last_in_span()),
             |batch_validator| batch_validator.is_last_in_span(),
         )
     }

diff --git a/crates/mpt/src/test_util.rs b/crates/mpt/src/test_util.rs
@@ -96,10 +96,7 @@ pub(crate) async fn get_live_derivable_transactions_list(
     let BlockTransactions::Full(txs) = block.transactions else {
         anyhow::bail!("Did not fetch full block");
     };
-    let consensus_txs = txs
-        .into_iter()
-        .map(|tx| TxEnvelope::try_from(tx).map_err(anyhow::Error::from))
-        .collect::<Result<Vec<_>>>()?;
+    let consensus_txs = txs.into_iter().map(TxEnvelope::from).collect::<Vec<_>>();
 
     // Compute the derivable list
     let mut list = ordered_trie_with_encoder(consensus_txs.as_ref(), |rlp: &TxEnvelope, buf| {