feat(derive): use upstream op-alloy batch types (#746)

bin/client/src/l1/driver.rs

@@ -29,7 +29,7 @@ use kona_mpt::{TrieHinter, TrieProvider};
 use kona_preimage::{CommsClient, PreimageKey, PreimageKeyType};
 use op_alloy_consensus::OpTxType;
 use op_alloy_genesis::RollupConfig;
-use op_alloy_protocol::{BlockInfo, L2BlockInfo};
+use op_alloy_protocol::{BatchValidationProvider, BlockInfo, L2BlockInfo};
 use op_alloy_rpc_types_engine::OpAttributesWithParent;
 use tracing::{error, info, warn};
 

bin/client/src/l2/chain_provider.rs

@@ -13,7 +13,7 @@ use kona_mpt::{OrderedListWalker, TrieHinter, TrieProvider};
 use kona_preimage::{CommsClient, PreimageKey, PreimageKeyType};
 use op_alloy_consensus::{OpBlock, OpTxEnvelope};
 use op_alloy_genesis::{RollupConfig, SystemConfig};
-use op_alloy_protocol::{to_system_config, L2BlockInfo};
+use op_alloy_protocol::{to_system_config, BatchValidationProvider, L2BlockInfo};
 
 /// The oracle-backed L2 chain provider for the client program.
 #[derive(Debug, Clone)]
@@ -71,7 +71,7 @@ impl<T: CommsClient> OracleL2ChainProvider<T> {
 }
 
 #[async_trait]
-impl<T: CommsClient + Send + Sync> L2ChainProvider for OracleL2ChainProvider<T> {
+impl<T: CommsClient + Send + Sync> BatchValidationProvider for OracleL2ChainProvider<T> {
     type Error = anyhow::Error;
 
     async fn l2_block_info_by_number(&mut self, number: u64) -> Result<L2BlockInfo> {
@@ -116,7 +116,10 @@ impl<T: CommsClient + Send + Sync> L2ChainProvider for OracleL2ChainProvider<T>
         };
         Ok(optimism_block)
     }
+}
 
+#[async_trait]
+impl<T: CommsClient + Send + Sync> L2ChainProvider for OracleL2ChainProvider<T> {
     async fn system_config_by_number(
         &mut self,
         number: u64,

crates/derive-alloy/src/alloy_providers.rs

@@ -10,7 +10,7 @@ use kona_derive::traits::{ChainProvider, L2ChainProvider};
 use lru::LruCache;
 use op_alloy_consensus::OpBlock;
 use op_alloy_genesis::{RollupConfig, SystemConfig};
-use op_alloy_protocol::{to_system_config, BlockInfo, L2BlockInfo};
+use op_alloy_protocol::{to_system_config, BatchValidationProvider, BlockInfo, L2BlockInfo};
 use std::{boxed::Box, num::NonZeroUsize, sync::Arc, vec::Vec};
 
 const CACHE_SIZE: usize = 16;
@@ -206,7 +206,7 @@ impl AlloyL2ChainProvider {
 }
 
 #[async_trait]
-impl L2ChainProvider for AlloyL2ChainProvider {
+impl BatchValidationProvider for AlloyL2ChainProvider {
     type Error = RpcError<TransportErrorKind>;
 
     async fn l2_block_info_by_number(&mut self, number: u64) -> Result<L2BlockInfo, Self::Error> {
@@ -234,7 +234,10 @@ impl L2ChainProvider for AlloyL2ChainProvider {
         self.block_by_number_cache.put(number, block.clone());
         Ok(block)
     }
+}
 
+#[async_trait]
+impl L2ChainProvider for AlloyL2ChainProvider {
     async fn system_config_by_number(
         &mut self,
         number: u64,

crates/derive/Cargo.toml

@@ -30,7 +30,6 @@ brotli.workspace = true
 tracing.workspace = true
 miniz_oxide.workspace = true
 async-trait.workspace = true
-unsigned-varint.workspace = true
 alloc-no-stdlib.workspace = true
 derive_more = { workspace = true, features = ["full"] }